Initial revision

[helm.git] / helm / style / params.xsl

diff --git a/helm/style/params.xsl b/helm/style/params.xsl
index eebda7e8793fa0abed1e24043f9a5a45b5b7cc48..d703bfe069c13a396e093acbbb106247a3179348 100644 (file)
--- a/helm/style/params.xsl
+++ b/helm/style/params.xsl
@@ -163,10 +163,14 @@
       </xsl:call-template>
      </xsl:variable>
      <xsl:choose>
-      <xsl:when test="$offset > 0">
-       <xsl:variable name="params"> 
-        <xsl:value-of 
-            select="document(concat(string($absPath),$second_uri))/*/@params"/>
+         <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($second_url)/*/@params"/>
        </xsl:variable>
        <xsl:variable name="minimum">
         <xsl:call-template name="min">
@@ -175,9 +179,7 @@
         </xsl:call-template>
        </xsl:variable>
        <xsl:choose>
-        <xsl:when test="0 > $minimum">
-         0
-        </xsl:when>
+        <xsl:when test="0 > $minimum">0</xsl:when>
         <xsl:otherwise>
          <xsl:variable name="relevant_params">
           <!-- the blank after : in the next line is essential -->
@@ -196,13 +198,11 @@
            <xsl:with-param name="counter" select="0"/>
           </xsl:call-template>
          </xsl:variable>
-         <xsl:value-of select="$tokens - $separators"/>
+         <xsl:value-of select="number($tokens - $separators)"/>
         </xsl:otherwise>
        </xsl:choose>
       </xsl:when>
-      <xsl:otherwise>
-      0
-      </xsl:otherwise>
+      <xsl:otherwise>0</xsl:otherwise>
      </xsl:choose>
 </xsl:template>
 
@@ -309,7 +309,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 +324,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="."/>
@@ -371,9 +372,3 @@
 </xsl:template>
 
 </xsl:stylesheet> 
-
-
-
-
-
-