X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fstyle%2Fparams.xsl;h=3d16f62e2af2836ce8e52d3cfe106dfee2591f4d;hb=0c62b48dd8d961279e780f6fbc2a915d18b77b92;hp=6e7f98545509620df3e99d1b9a4dfc7f9ceb5fca;hpb=5d9c64e007c6eff9447b2ef67d2a680c86c2775d;p=helm.git

diff --git a/helm/style/params.xsl b/helm/style/params.xsl
index 6e7f98545..3d16f62e2 100644
--- a/helm/style/params.xsl
+++ b/helm/style/params.xsl
@@ -165,8 +165,9 @@
      <xsl:choose>
       <xsl:when test="$offset > 0">
        <xsl:variable name="params"> 
+        <xsl:variable name="second_url"><xsl:call-template name="URLofURI4getter"><xsl:with-param name="uri" select="$second_uri"/></xsl:call-template></xsl:variable>
         <xsl:value-of 
-            select="document(concat(string($absPath),$second_uri))/*/@params"/>
+            select="document($second_url)/*/@params"/>
        </xsl:variable>
        <xsl:variable name="minimum">
         <xsl:call-template name="min">
@@ -275,25 +276,57 @@
     <xsl:when test="($noparams != 0) and ((name(.)=string($binder)) or (name(.)=&quot;CAST&quot;))">
      <xsl:choose>
      <xsl:when test="name(.) = string($binder)">
-      <xsl:if test="$target = 0">
-       <xsl:choose>
-       <xsl:when test="string($binder) = &quot;LAMBDA&quot;">
-        <m:ci>
-         <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="target/@binder"/></xsl:with-param></xsl:call-template>
-        </m:ci>
-       </xsl:when>
-       <xsl:otherwise> 
-        <Param name="{target/@binder}">
-         <xsl:apply-templates select="source"/>
-        </Param>
-       </xsl:otherwise>
-       </xsl:choose>
-      </xsl:if>
-      <xsl:apply-templates select="target/*[1]" mode="abstparams">
-       <xsl:with-param name="noparams" select="$noparams - 1"/>
+      <xsl:choose>
+       <xsl:when test="$noparams >= count(decl)">
+        <xsl:for-each select="decl">
+         <xsl:if test="$target = 0">
+          <xsl:choose>
+          <xsl:when test="string($binder) = &quot;LAMBDA&quot;">
+           <m:ci>
+            <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="@binder"/></xsl:with-param></xsl:call-template>
+           </m:ci>
+          </xsl:when>
+          <xsl:otherwise> 
+           <Param name="{@binder}">
+            <xsl:apply-templates select="*[1]"/>
+           </Param>
+          </xsl:otherwise>
+          </xsl:choose>
+         </xsl:if> 
+	</xsl:for-each>
+        <xsl:apply-templates select="target/*[1]" mode="abstparams">
+       <xsl:with-param name="noparams" select="$noparams - count(decl)"/>
        <xsl:with-param name="target" select="$target"/>
        <xsl:with-param name="binder" select="$binder"/>
-      </xsl:apply-templates>
+        </xsl:apply-templates>
+       </xsl:when>
+       <xsl:otherwise>
+        <xsl:for-each select="decl[$noparams > position()]">
+         <xsl:if test="$target = 0">
+          <xsl:choose>
+          <xsl:when test="string($binder) = &quot;LAMBDA&quot;">
+           <m:ci>
+            <xsl:call-template name="insert_subscript"><xsl:with-param name="node_value"><xsl:value-of select="@binder"/></xsl:with-param></xsl:call-template>
+           </m:ci>
+          </xsl:when>
+          <xsl:otherwise> 
+           <Param name="{@binder}">
+            <xsl:apply-templates select="*[1]"/>
+           </Param>
+          </xsl:otherwise>
+          </xsl:choose>
+         </xsl:if> 
+	</xsl:for-each>
+        <xsl:choose>
+	 <xsl:when test="name(.)=&quot;PROD&quot;">
+	  <xsl:apply-templates select="decl[position()=$noparams]" mode="prod"/>
+	 </xsl:when>
+	 <xsl:otherwise>
+	  <xsl:apply-templates select="decl[position()=$noparams]" mode="lambda"/>
+	 </xsl:otherwise>
+	</xsl:choose>
+       </xsl:otherwise>
+      </xsl:choose>
      </xsl:when>
      <xsl:otherwise>
       <xsl:apply-templates select="term/*[1]" mode="abstparams">
@@ -354,10 +387,7 @@
 <xsl:param name="count" select="0"/>
  <xsl:choose>
  <xsl:when test="name(.) = &quot;PROD&quot;">
-  <xsl:apply-templates select="target/*[1]" mode="counting">
-   <xsl:with-param name="noparams" select="$noparams"/>
-   <xsl:with-param name="count" select="$count + 1"/>
-  </xsl:apply-templates>
+  <xsl:value-of select="count(decl)- $noparams"/>
  </xsl:when>
  <xsl:when test="name(.) = &quot;CAST&quot;">
   <xsl:apply-templates select="term/*[1]" mode="counting">