X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fhtml_set.xsl;h=4003d258c48339b7a20b3e1a3fdb64242007a6f8;hb=4faf0e37e7019de16dd6862bb34d84f799a2a230;hp=cafdbefc40cf92cc9fcdafe06ebe6b2dce38e49f;hpb=f079a5948394ada2f2aba69270869058111bb3fe;p=helm.git

diff --git a/helm/style/html_set.xsl b/helm/style/html_set.xsl
index cafdbefc4..4003d258c 100644
--- a/helm/style/html_set.xsl
+++ b/helm/style/html_set.xsl
@@ -32,65 +32,219 @@
 <!-- HELM Group: Asperti, Padovani, Sacerdoti, Schena                      -->
 <!--***********************************************************************--> 
 
-<xsl:variable name="absPath">http://localhost:8081/getciconly?uri=</xsl:variable>
+<xsl:template name="mksymbol">
+ <xsl:param name="symbol" select="''"/>
+  <xsl:choose>
+   <xsl:when test="$UNICODEvsSYMBOL = 'symbol'">
+    <xsl:variable name="fontsymbol">
+     <xsl:choose>
+      <xsl:when test="$symbol = 'emptyset'">
+       <xsl:value-of select="'&#198;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'in'">
+       <xsl:value-of select="'&#206;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'notin'">
+       <xsl:value-of select="'&#207;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'intersect'">
+       <xsl:value-of select="'&#199;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'union'">
+       <xsl:value-of select="'&#200;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'subset'">
+       <xsl:value-of select="'&#205;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'prsubset'">
+       <xsl:value-of select="'&#204;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'setdiff'">
+       <xsl:value-of select="'/'"/>
+      </xsl:when>
+     </xsl:choose>
+    </xsl:variable>
+    <FONT FACE="symbol" mathcolor="blue">
+     <xsl:value-of select="$fontsymbol"/>
+    </FONT>
+   </xsl:when>
+   <xsl:otherwise>
+    <xsl:variable name="unicodesymbol">
+     <xsl:choose>
+      <xsl:when test="$symbol = 'emptyset'">
+       <xsl:value-of select="'&#8709;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'in'">
+       <xsl:value-of select="'&#8712;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'notin'">
+       <xsl:value-of select="'&#8713;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'intersect'">
+       <xsl:value-of select="'&#8745;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'union'">
+       <xsl:value-of select="'&#8746;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'subset'">
+       <xsl:value-of select="'&#8838;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'prsubset'">
+       <xsl:value-of select="'&#8834;'"/>
+      </xsl:when>
+      <xsl:when test="$symbol = 'setdiff'">
+       <xsl:value-of select="'&#47;'"/>
+      </xsl:when>
+     </xsl:choose>
+    </xsl:variable>
+    <xsl:value-of select="$unicodesymbol"/>
+   </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
 
-<!-- IN -->
+<!-- **************************************************************** -->
+<!--                   INLINE MODE                                    -->
+<!-- **************************************************************** -->
 
- <xsl:template match="m:apply[m:in]">
+<!-- SET -->
+
+ <xsl:template mode="inline" match="m:set">
+  <xsl:variable name="uri" select="@definitionURL"/>
+  <xsl:choose>
+   <xsl:when test="count(child::*) = 0">
+    <xsl:call-template name="mksymbol">
+     <xsl:with-param name="symbol" select="'emptyset'"/>
+    </xsl:call-template>
+   </xsl:when>
+   <xsl:otherwise>
+    <xsl:choose>
+     <xsl:when test="name(*[1]) = 'm:bvar'">
+      <xsl:text>{</xsl:text>
+      <xsl:apply-templates mode="inline" select="m:bvar/m:ci"/>
+      <xsl:text>:</xsl:text>
+      <xsl:apply-templates mode="inline" select="m:bvar/m:type"/>
+      <xsl:text>|</xsl:text>
+      <xsl:apply-templates mode="inline" select="*[position()=2]"/>
+      <xsl:text>}</xsl:text>
+     </xsl:when>
+     <xsl:otherwise>
+      <xsl:text>{</xsl:text>
+      <xsl:for-each select="*">
+       <xsl:apply-templates mode="inline" select="."/>
+       <xsl:choose>
+        <xsl:when test="position() = last()">
+         <xsl:text>}</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+         <xsl:text>,</xsl:text>
+        </xsl:otherwise>
+       </xsl:choose>
+      </xsl:for-each>
+     </xsl:otherwise>
+    </xsl:choose>
+   </xsl:otherwise>
+  </xsl:choose>
+ </xsl:template>
+
+
+<!-- CARD -->
+<xsl:template mode="inline" match="m:apply[m:card]">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
   <xsl:variable name="uri">
-   <xsl:value-of select="m:in/@definitionURL"/>
-  </xsl:variable>
-  <xsl:variable name="charlength">
-   <xsl:apply-templates select="m:in" mode="charcount"/>
+   <xsl:value-of select="m:card/@definitionURL"/>
   </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$charlength > $framewidth">
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <BR/> 
-     <xsl:call-template name="make_indent">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
-     </xsl:call-template>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#206;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <xsl:text>)</xsl:text>
+  <xsl:text>|</xsl:text>
+  <xsl:apply-templates mode="inline" select="*[2]"/>
+  <xsl:text>|</xsl:text>
+ </xsl:template>
+
+<xsl:template mode="inline" match="m:apply[m:in|m:notin|m:intersect|m:union
+  |m:subset|m:prsubset|m:setdiff]">
+  <xsl:variable name="uri"><xsl:value-of select="*[1]/@definitionURL"/></xsl:variable>
+  <xsl:variable name="symbol">
+   <xsl:choose>
+    <xsl:when test="m:in">
+     <xsl:value-of select="'&#206;'"/>
+    </xsl:when>
+    <xsl:when test="m:notin">
+     <xsl:value-of select="'&#207;'"/>
+    </xsl:when>
+    <xsl:when test="m:intersect">
+     <xsl:value-of select="'&#199;'"/>
+    </xsl:when>
+    <xsl:when test="m:union">
+     <xsl:value-of select="'&#200;'"/>
+    </xsl:when>
+    <xsl:when test="m:subset">
+     <xsl:value-of select="'&#205;'"/>
+    </xsl:when>
+    <xsl:when test="m:prsubset">
+     <xsl:value-of select="'&#204;'"/>
+    </xsl:when>
+    <xsl:when test="m:setdiff">
+     <xsl:value-of select="'/'"/>
     </xsl:when>
-    <xsl:otherwise>
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]"/>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#206;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]"/>
-     <xsl:text>)</xsl:text>
-    </xsl:otherwise>
    </xsl:choose>
+  </xsl:variable>
+  <xsl:text>(</xsl:text>
+  <xsl:apply-templates mode="inline" select="*[2]"/>
+  <xsl:choose>
+  <xsl:when test="$uri != ''">
+   <a href="{$uri}">
+    <xsl:call-template name="mksymbol">
+     <xsl:with-param name="symbol">
+      <xsl:value-of select="local-name(*[1])"/>
+     </xsl:with-param>
+    </xsl:call-template>
+   </a>
+  </xsl:when>
+  <xsl:otherwise>
+    <xsl:call-template name="mksymbol">
+     <xsl:with-param name="symbol">
+      <xsl:value-of select="local-name(*[1])"/>
+     </xsl:with-param>
+    </xsl:call-template>
+  </xsl:otherwise>
+  </xsl:choose>
+  <xsl:apply-templates mode="inline" select="*[3]"/>
+  <xsl:text>)</xsl:text>
  </xsl:template>
 
-<!-- NOTIN -->
+<!-- *************************************************************** -->
 
- <xsl:template match="m:apply[m:notin]">
+<xsl:template match="m:apply[m:in|m:notin|m:intersect|m:union
+  |m:subset|m:prsubset|m:setdiff]">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:notin/@definitionURL"/>
-  </xsl:variable>
+  <xsl:variable name="uri"><xsl:value-of select="*[1]/@definitionURL"/></xsl:variable>
   <xsl:variable name="charlength">
-   <xsl:apply-templates select="m:notin" mode="charcount"/>
+   <xsl:apply-templates select="*[1]" mode="charcount"/>
+  </xsl:variable>
+  <xsl:variable name="symbol">
+   <xsl:choose>
+    <xsl:when test="m:in">
+     <xsl:value-of select="'&#206;'"/>
+    </xsl:when>
+    <xsl:when test="m:notin">
+     <xsl:value-of select="'&#207;'"/>
+    </xsl:when>
+    <xsl:when test="m:intersect">
+     <xsl:value-of select="'&#199;'"/>
+    </xsl:when>
+    <xsl:when test="m:union">
+     <xsl:value-of select="'&#200;'"/>
+    </xsl:when>
+    <xsl:when test="m:subset">
+     <xsl:value-of select="'&#205;'"/>
+    </xsl:when>
+    <xsl:when test="m:prsubset">
+     <xsl:value-of select="'&#204;'"/>
+    </xsl:when>
+    <xsl:when test="m:setdiff">
+     <xsl:value-of select="'/'"/>
+    </xsl:when>
+   </xsl:choose>
   </xsl:variable>
   <xsl:choose>
     <xsl:when test="$charlength > $framewidth">
@@ -102,42 +256,56 @@
      <xsl:call-template name="make_indent">
       <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
      </xsl:call-template>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#207;</FONT>
+     <xsl:choose>
+     <xsl:when test="$uri != ''"> 
+      <a href="{$uri}">
+       <xsl:call-template name="mksymbol">
+        <xsl:with-param name="symbol">
+         <xsl:value-of select="local-name(*[1])"/>
+        </xsl:with-param>
+       </xsl:call-template>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
+       <xsl:call-template name="mksymbol">
+        <xsl:with-param name="symbol">
+         <xsl:value-of select="local-name(*[1])"/>
+        </xsl:with-param>
+       </xsl:call-template>
+     </xsl:otherwise>
+     </xsl:choose> 
      <xsl:apply-templates select="*[3]">
       <xsl:with-param name="current_indent" select="$current_indent + 2"/>
      </xsl:apply-templates>
      <xsl:text>)</xsl:text>
     </xsl:when>
     <xsl:otherwise>
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]"/>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#207;</FONT>
-     <xsl:apply-templates select="*[3]"/>
-     <xsl:text>)</xsl:text>
+     <xsl:apply-templates mode="inline" select="."/>
     </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
 
+
 <!-- SET -->
 
  <xsl:template match="m:set">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="concat(string($absPath), @definitionURL)"/>
-  </xsl:variable>
+  <xsl:variable name="uri" select="@definitionURL"/>
   <xsl:choose>
    <xsl:when test="count(child::*) = 0">
-    <FONT FACE="symbol" mathcolor="blue">&#198;</FONT>
+    <xsl:call-template name="mksymbol">
+     <xsl:with-param name="symbol" select="'emptyset'"/>
+    </xsl:call-template>
    </xsl:when>
    <xsl:otherwise>
     <xsl:variable name="charlength">
      <xsl:apply-templates select="." mode="charcount"/>
     </xsl:variable>
     <xsl:choose>
-     <xsl:when test="name(*[1]) = 'm:bvar'">
+     <xsl:when test="$charlength > $framewidth">
       <xsl:choose>
-       <xsl:when test="$charlength > $framewidth">
+       <xsl:when test="name(*[1]) = 'm:bvar'">
         <xsl:text>{</xsl:text>
         <xsl:apply-templates select="m:bvar/m:ci"/>
         <xsl:text>:</xsl:text>
@@ -155,19 +323,6 @@
         <xsl:text>}</xsl:text>
        </xsl:when>
        <xsl:otherwise>
-        <xsl:text>{</xsl:text>
-        <xsl:apply-templates select="m:bvar/m:ci"/>
-        <xsl:text>:</xsl:text>
-        <xsl:apply-templates select="m:bvar/m:type"/>
-        <xsl:text>|</xsl:text>
-        <xsl:apply-templates select="*[position()=2]"/>
-        <xsl:text>}</xsl:text>
-       </xsl:otherwise>
-      </xsl:choose>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:choose>
-       <xsl:when test="$charlength > $framewidth">
         <xsl:text>{</xsl:text>
          <xsl:apply-templates select="*[position()=1]">
           <xsl:with-param name="current_indent" select="$current_indent + 2"/>
@@ -182,263 +337,17 @@
            <xsl:with-param name="current_indent" select="$current_indent + 2"/>
           </xsl:apply-templates>
          </xsl:for-each>
-         <xsl:text>}</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-        <xsl:text>{</xsl:text>
-         <xsl:for-each select="*">
-          <xsl:apply-templates select="."/>
-          <xsl:choose>
-           <xsl:when test="position() = last()">
-            <xsl:text>}</xsl:text>
-           </xsl:when>
-           <xsl:otherwise>
-            <xsl:text>,</xsl:text>
-           </xsl:otherwise>
-          </xsl:choose>
-         </xsl:for-each>
-        </xsl:otherwise>
-       </xsl:choose>
-      </xsl:otherwise>
-     </xsl:choose>
-    </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
-
-<!-- INTERSECTION -->
-
-<xsl:template match="m:apply[m:intersect]">
-  <xsl:param name="current_indent" select="0"/> 
-  <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:intersect/@definitionURL"/>
-  </xsl:variable>
-  <xsl:variable name="charlength">
-   <xsl:apply-templates select="m:intersect" mode="charcount"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$charlength > $framewidth">
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <BR/> 
-     <xsl:call-template name="make_indent">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
-     </xsl:call-template>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#199;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]"/>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#199;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]"/>
-     <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
-<!-- UNION -->
-
-<xsl:template match="m:apply[m:union]">
-  <xsl:param name="current_indent" select="0"/> 
-  <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:union/@definitionURL"/>
-  </xsl:variable>
-  <xsl:variable name="charlength">
-   <xsl:apply-templates select="m:union" mode="charcount"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$charlength > $framewidth">
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <BR/> 
-     <xsl:call-template name="make_indent">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
-     </xsl:call-template>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#200;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]"/>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#200;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]"/>
-     <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
-<!-- SUBSET -->
-<xsl:template match="m:apply[m:subset]">
-  <xsl:param name="current_indent" select="0"/> 
-  <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:subset/@definitionURL"/>
-  </xsl:variable>
-  <xsl:variable name="charlength">
-   <xsl:apply-templates select="m:subset" mode="charcount"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$charlength > $framewidth">
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <BR/> 
-     <xsl:call-template name="make_indent">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
-     </xsl:call-template>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#205;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]"/>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#205;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]"/>
-     <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
-<!-- PRSUBSET -->
-<xsl:template match="m:apply[m:prsubset]">
-  <xsl:param name="current_indent" select="0"/> 
-  <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:prsubset/@definitionURL"/>
-  </xsl:variable>
-  <xsl:variable name="charlength">
-   <xsl:apply-templates select="m:prsubset" mode="charcount"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$charlength > $framewidth">
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <BR/> 
-     <xsl:call-template name="make_indent">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
-     </xsl:call-template>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#204;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]"/>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <FONT FACE="symbol" SIZE="+2" mathcolor="blue">&#204;</FONT>
-     </a>
-     <xsl:apply-templates select="*[3]"/>
-     <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
-
-<!-- SETDIFF -->
-
-<xsl:template match="m:apply[m:setdiff]">
-  <xsl:param name="current_indent" select="0"/> 
-  <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:setdiff/@definitionURL"/>
-  </xsl:variable>
-  <xsl:variable name="charlength">
-   <xsl:apply-templates select="m:setdiff" mode="charcount"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$charlength > $framewidth">
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <BR/> 
-     <xsl:call-template name="make_indent">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
-     </xsl:call-template>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <xsl:text>/</xsl:text>
-     </a>
-     <xsl:apply-templates select="*[3]">
-      <xsl:with-param name="current_indent" select="$current_indent + 2"/>
-     </xsl:apply-templates>
-     <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:text>(</xsl:text>
-     <xsl:apply-templates select="*[2]"/>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:value-of select="concat(string($header),string($uri))"/>
-     </xsl:attribute>
-     <xsl:text>/</xsl:text>
-     </a>
-     <xsl:apply-templates select="*[3]"/>
-     <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
+        <xsl:text>}</xsl:text>
+       </xsl:otherwise>
+      </xsl:choose>
+     </xsl:when>
+     <xsl:otherwise>
+      <xsl:apply-templates mode="inline" select="."/>
+     </xsl:otherwise>
+    </xsl:choose>
+   </xsl:otherwise>
+  </xsl:choose>
+ </xsl:template> 
 
 <!-- CARD -->
 <xsl:template match="m:apply[m:card]">
@@ -478,10 +387,3 @@
 </xsl:template> 
 
 </xsl:stylesheet> 
-
-
-
-
-
-
-