X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fparams.xsl;h=355baef56191355c755db2e628dd4b24122e371c;hb=db593c40165a5ac71b6aa87e43e90b8b45e8ed59;hp=2a0a252e3bb3218beefee7596a09d9542fa48373;hpb=4947a59dbc917f8db8e5cb074418b6197c3960db;p=helm.git

diff --git a/helm/style/params.xsl b/helm/style/params.xsl
index 2a0a252e3..355baef56 100644
--- a/helm/style/params.xsl
+++ b/helm/style/params.xsl
@@ -39,16 +39,18 @@
 <!-- CSC: PROBLEMA: URI CHE NON CONTENGONO / ED INIZIANO CON cic: -->
 <xsl:template name="name_of_uri">
  <xsl:param name="uri" select="&quot;&quot;"/>
+ <xsl:param name="extension" select="'.con'"/>
  <xsl:variable name="suffix" select="substring-after($uri, &quot;/&quot;)"/>
  <xsl:choose>
   <xsl:when test="$suffix = &quot;&quot;">
    <!-- CSC: PROBLEMA: .con PUO' APPARIRE ALL'INTERNO DELLE URI ===>
      SCRIVERE UNA FUNZIONE RICORSIVA CHE RISOLVA -->
-   <xsl:value-of select="substring-before($uri,&quot;.con&quot;)"/>
+   <xsl:value-of select="substring-before($uri,$extension)"/>
   </xsl:when>
   <xsl:otherwise>
    <xsl:call-template name="name_of_uri">
     <xsl:with-param name="uri" select="$suffix"/>
+    <xsl:with-param name="extension" select="$extension"/> 
    </xsl:call-template>
   </xsl:otherwise>
  </xsl:choose>
@@ -98,6 +100,25 @@
  </xsl:choose>   
 </xsl:template>
 
+<!-- path gives the path of a uri, up to the final name -->
+<xsl:template name="path">
+ <xsl:param name="uri" select="&quot;&quot;"/>
+ <xsl:param name="current_path" select="&quot;&quot;"/>
+ <xsl:choose>
+  <xsl:when test="(substring-after($uri,&quot;/&quot;) != &quot;&quot;)">
+   <xsl:call-template name="path">
+    <xsl:with-param 
+        name="uri" select="substring-after($uri,&quot;/&quot;)"/>
+    <xsl:with-param
+        name="current_path" select="concat($current_path,substring-before($uri,&quot;/&quot;),'/')"/> 
+   </xsl:call-template>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:value-of select="$current_path"/>
+  </xsl:otherwise>
+ </xsl:choose>   
+</xsl:template>
+
 <xsl:template name="blank_counting">
  <xsl:param name="string" select="&quot;&quot;"/>
  <xsl:param name="counter" select="0"/>
@@ -165,8 +186,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 +297,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">
@@ -309,7 +363,7 @@
      <xsl:when test="($target = 1) and ($noparams != 0)">
       <m:apply>
       <m:csymbol>app</m:csymbol>
-<!-- Mancava modalita': sono qall'interno di un termine -->
+<!-- Mancava modalita': sono all'interno di un termine -->
       <xsl:apply-templates select="." mode="pure"/>
       <xsl:call-template name="printparam"><xsl:with-param name="noleft" select="$noparams"/></xsl:call-template>
       </m:apply>
@@ -324,7 +378,8 @@
 <!-- Mancava modalita': con target=1 posso provenire sia da un oggetto che da un termine -->
         <xsl:choose>
         <xsl:when test="string($binder) = &quot;LAMBDA&quot;">
-         <xsl:apply-templates select="." mode="pure"/>
+	 <!-- CSC: era pure, ma deve essere noannot. Giusto, Irene? -->
+         <xsl:apply-templates select="." mode="noannot"/>
         </xsl:when>
         <xsl:otherwise>
          <xsl:apply-templates select="."/>
@@ -353,10 +408,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">