Modified Files:

1) content_to_html.xsl, expandobj.xsl, html_init.xsl, html_reals.xsl,
html_set.xsl, theory_pres.xsl: now links are uri
Added Files:
1) link.xsl: transformation of uri into url

diff --git a/helm/style/content_to_html.xsl b/helm/style/content_to_html.xsl
index 32d7a542c2b6b08f1cfbf512fcfe0c5888f5546f..9de7d48962cfe82ab3522e65dfd56f9db15cd66b 100644 (file)
--- a/helm/style/content_to_html.xsl
+++ b/helm/style/content_to_html.xsl
@@ -32,27 +32,12 @@
 <!-- HELM Group: Asperti, Padovani, Sacerdoti, Schena                      -->
 <!--***********************************************************************--> 
 
-<xsl:param name="getterURL" select="'http://localhost:8081/'"/>
-<xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
-<xsl:param name="keys" select="'C1,HC2'"/>
-<xsl:param name="naturalLanguage" select="'yes'"/>
-<xsl:param name="annotations" select="'no'"/>
-
-<xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:variable>
-
-<xsl:variable name="header"><xsl:value-of select="$processorURL"/>apply?keys=<xsl:value-of select="$keys"/>&#x26;param.naturalLanguage=<xsl:value-of select="$naturalLanguage"/>&#x26;param.annotations=<xsl:value-of select="$annotations"/>&#x26;param.keys=<xsl:value-of select="$keys"/>&#x26;param.getterURL=<xsl:value-of select="$getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
-
 <xsl:include href="html_init.xsl"/>
 <xsl:include href="html_set.xsl"/>
 <xsl:include href="html_reals.xsl"/>
 
 <xsl:variable name="showcast" select="0"/>
 
-<xsl:template name="makeURL">
- <xsl:param name="url" select="''"/>
- <xsl:value-of select="concat(string($header),string($url),'&#x26;param.CICURI=',string($url))"/>
-</xsl:template>
-
 <!--***********************************************************************-->
 <!-- HTML Head and Body                                                    -->
 <!--***********************************************************************-->
@@ -135,12 +120,7 @@
 <xsl:template mode="inline" match="m:ci">
  <xsl:choose>
   <xsl:when test="boolean(@definitionURL)">
-   <a>
-   <xsl:attribute name="href">
-    <xsl:call-template name="makeURL">
-     <xsl:with-param name="url" select="@definitionURL"/>
-    </xsl:call-template>
-   </xsl:attribute>
+   <a href="{@definitionURL}">
    <xsl:apply-templates/>
    </a>
   </xsl:when>
@@ -837,12 +817,7 @@
 <xsl:template match="m:ci">
  <xsl:choose>
   <xsl:when test="boolean(@definitionURL)">
-   <a>
-   <xsl:attribute name="href">
-    <xsl:call-template name="makeURL">
-     <xsl:with-param name="url" select="@definitionURL"/>
-    </xsl:call-template>
-   </xsl:attribute>
+   <a href="{@definitionURL}">
    <xsl:apply-templates/>
    </a>
   </xsl:when>

diff --git a/helm/style/expandobj.xsl b/helm/style/expandobj.xsl
index ea313b758b6ccd34db78264caadc7c162f7b1b4f..c8d9f33a099fa6df14bbb9274fde7de5e62acbf3 100644 (file)
--- a/helm/style/expandobj.xsl
+++ b/helm/style/expandobj.xsl
@@ -37,16 +37,20 @@
 <xsl:param name="getterURL" select="'http://localhost:8081/'"/>
 <xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
 <!-- Keys contains the keys of the stylesheets to be applied following links-->
-<xsl:param name="keys" select="'C1,C2'"/>
+<xsl:param name="keys" select="'C1,HC2,L'"/>
 <!-- Thkeys contains the keys of the stylesheets to be applied at the first 
 step for expanding objects --> 
-<xsl:param name="thkeys" select="'TC1,C2'"/>
+<xsl:param name="thkeys" select="'TC1,HC2,L'"/>
 <xsl:param name="naturalLanguage" select="'yes'"/>
 <xsl:param name="annotations" select="'no'"/>
+<xsl:param name="media-type" select="'xhtml'"/>
+<xsl:param name="doctype-public" select="'-//W3C//DTD XHTML 1.0 Transitional//EN'"/>
+<xsl:param name="encoding" select="iso-8859-1"/>
 
 <xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:variable>
 
-<xsl:variable name="header"><xsl:value-of select="$processorURL"/>apply?keys=<xsl:value-of select="$thkeys"/>&#x26;param.naturalLanguage=<xsl:value-of select="$naturalLanguage"/>&#x26;param.annotations=<xsl:value-of select="$annotations"/>&#x26;param.keys=<xsl:value-of select="$keys"/>&#x26;param.getterURL=<xsl:value-of select="$getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
+<xsl:variable name="header"><xsl:value-of select="$processorURL"/>apply?keys=<xsl:value-of select="$thkeys"/>&#x26;param.naturalLanguage=<xsl:value-of select="$naturalLanguage"/>&#x26;param.annotations=<xsl:value-of select="$annotations"/>&#x26;prop.media-type=<xsl:value-of select="$media-type"/>&#x26;prop.doctype-public=<xsl:value-of select="$doctype-public"/>&#x26;prop.encoding=<xsl:value-of select="$encoding"/>&#x26;param.keys=<xsl:value-of select="$keys"/>&#x26;param.getterURL=<xsl:value-of select="$getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
+
 
 <xsl:output 
        method="xml"
@@ -105,3 +109,8 @@ step for expanding objects -->
 
 
 
+
+
+
+
+

diff --git a/helm/style/html_init.xsl b/helm/style/html_init.xsl
index 26ddf68d2c83eff3f86a8f1481c6c2a57490cf56..66ff1c030c50a1975236776930997467d7829ebf 100644 (file)
--- a/helm/style/html_init.xsl
+++ b/helm/style/html_init.xsl
@@ -75,12 +75,7 @@
   </xsl:variable>
   <xsl:text>(</xsl:text>
   <xsl:apply-templates mode="inline" select="*[2]"/>
-  <a>
-   <xsl:attribute name="href">
-    <xsl:call-template name="makeURL">
-     <xsl:with-param name="url" select="$uri"/>
-    </xsl:call-template>
-   </xsl:attribute>
+  <a href="{$uri}">
    <FONT FACE="symbol" mathcolor="blue">
     <xsl:value-of select="$symbol"/>
    </FONT>
@@ -97,12 +92,7 @@
   </xsl:variable>
   <xsl:choose>
    <xsl:when test="count(child::*)=2">
-    <a>
-    <xsl:attribute name="href">
-    <xsl:call-template name="makeURL">
-     <xsl:with-param name="url" select="$uri"/>
-    </xsl:call-template>
-    </xsl:attribute>
+    <a href="{$uri}">
     <xsl:text>-</xsl:text>
     </a>
     <xsl:apply-templates mode="inline" select="*[2]"/>
@@ -110,12 +100,7 @@
    <xsl:otherwise>
     <xsl:text>(</xsl:text>
     <xsl:apply-templates mode="inline" select="*[2]"/>
-    <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
+    <a href="{$uri}">
      <xsl:text>-</xsl:text>
     </a>
     <xsl:apply-templates mode="inline" select="*[3]"/>
@@ -130,12 +115,7 @@
   <xsl:variable name="uri">
    <xsl:value-of select="m:not/@definitionURL"/>
   </xsl:variable>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
+     <a href="{$uri}">
      <FONT FACE="symbol" mathcolor="blue">&#216;</FONT>
      </a>
      <xsl:apply-templates mode="inline" select="*[2]"/>
@@ -147,12 +127,7 @@
   <xsl:variable name="uri">
    <xsl:value-of select="m:exists/@definitionURL"/>
   </xsl:variable>
-  <a>
-   <xsl:attribute name="href">
-    <xsl:call-template name="makeURL">
-     <xsl:with-param name="url" select="$uri"/>
-    </xsl:call-template>
-   </xsl:attribute>
+  <a href="{$uri}">
    <FONT FACE="symbol" mathcolor="blue">&#36;</FONT>
   </a>
   <xsl:apply-templates select="m:bvar/m:ci"/>
@@ -220,12 +195,7 @@
      <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:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
+     <a href="{$uri}">
      <FONT FACE="symbol" mathcolor="blue">
       <xsl:value-of select="$symbol"/>
      </FONT>
@@ -251,12 +221,7 @@
   </xsl:variable>
   <xsl:choose>
    <xsl:when test="count(child::*)=2">
-    <a>
-    <xsl:attribute name="href">
-     <xsl:call-template name="makeURL">
-      <xsl:with-param name="url" select="$uri"/>
-     </xsl:call-template>
-    </xsl:attribute>
+    <a href="{$uri}">
     <xsl:text>-</xsl:text>
     </a>
     <xsl:apply-templates select="*[2]">
@@ -277,12 +242,7 @@
       <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:call-template name="makeURL">
-        <xsl:with-param name="url" select="$uri"/>
-       </xsl:call-template>
-      </xsl:attribute>
+      <a href="{$uri}">
       <xsl:text>-</xsl:text>
       </a>
       <xsl:apply-templates select="*[3]">
@@ -306,12 +266,7 @@
   <xsl:variable name="uri">
    <xsl:value-of select="m:not/@definitionURL"/>
   </xsl:variable>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
+     <a href="{$uri}">
      <FONT FACE="symbol" mathcolor="blue">&#216;</FONT>
      </a>
      <xsl:apply-templates select="*[2]"/>
@@ -330,13 +285,8 @@
   </xsl:variable>
   <xsl:choose>
     <xsl:when test="$charlength > $framewidth">
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
-     <FONT FACE="symbol" mathcolor="blue">&#36;</FONT>
+     <a href="{$uri}">
+      <FONT FACE="symbol" mathcolor="blue">&#36;</FONT>
      </a>
      <xsl:apply-templates select="m:bvar/m:ci"/>
      <xsl:text>:</xsl:text>

diff --git a/helm/style/html_reals.xsl b/helm/style/html_reals.xsl
index 72d6dab7d60f1e57360141a069690220c219e317..3403b9dcb8c537e752d448116b87d3b35cd92142 100644 (file)
--- a/helm/style/html_reals.xsl
+++ b/helm/style/html_reals.xsl
@@ -43,13 +43,8 @@
      <xsl:variable name="uri">
       <xsl:value-of select="m:limit/@definitionURL"/>
      </xsl:variable>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
-     <xsl:text>lim</xsl:text>
+     <a href="{$uri}">
+      <xsl:text>lim</xsl:text>
      </a>
      <SUB>
       <xsl:apply-templates select="m:bvar/m:ci"/>
@@ -65,18 +60,13 @@
      <xsl:variable name="uri">
       <xsl:value-of select="m:diff/@definitionURL"/>
      </xsl:variable>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
-     <SUP>d</SUP>
+     <a href="{$uri}">
+      <SUP>d</SUP>
       <xsl:text>/</xsl:text>
-     <SUB>
-      <xsl:text>d</xsl:text>
-      <xsl:value-of select="m:bvar/m:ci"/>
-     </SUB>
+      <SUB>
+       <xsl:text>d</xsl:text>
+       <xsl:value-of select="m:bvar/m:ci"/>
+      </SUB>
      </a>
      <xsl:apply-templates mode="inline" select="*[3]"/>
  </xsl:template>
@@ -140,12 +130,7 @@
     </xsl:when>
    </xsl:choose>
   </xsl:variable>
-  <a>
-   <xsl:attribute name="href">
-    <xsl:call-template name="makeURL">
-     <xsl:with-param name="url" select="$uri"/>
-    </xsl:call-template>
-   </xsl:attribute>
+  <a href="{$uri}">
    <xsl:value-of select="$symbol"/>
   </a>
   <xsl:text>{</xsl:text>
@@ -171,13 +156,8 @@
   </xsl:variable>
   <xsl:choose>
     <xsl:when test="$charlength > $framewidth">
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
-     <xsl:text>lim</xsl:text>
+     <a href="{$uri}">
+      <xsl:text>lim</xsl:text>
      </a>
      <SUB>
       <xsl:apply-templates select="m:bvar/m:ci"/>
@@ -205,18 +185,13 @@
   <xsl:variable name="uri">
    <xsl:value-of select="m:diff/@definitionURL"/>
   </xsl:variable>
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
-     <SUP>d</SUP>
+     <a href="{$uri}">
+      <SUP>d</SUP>
       <xsl:text>/</xsl:text>
-     <SUB>
-      <xsl:text>d</xsl:text>
-      <xsl:value-of select="m:bvar/m:ci"/>
-     </SUB>
+      <SUB>
+       <xsl:text>d</xsl:text>
+       <xsl:value-of select="m:bvar/m:ci"/>
+      </SUB>
      </a>
      <xsl:apply-templates select="*[3]">
       <xsl:with-param name="current_indent" select="$current_indent + 5"/>
@@ -304,13 +279,8 @@
   </xsl:variable>
   <xsl:choose>
     <xsl:when test="$charlength > $framewidth">
-     <a>
-     <xsl:attribute name="href">
-      <xsl:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
-     <xsl:value-of select="$symbol"/>
+     <a href="{$uri}">
+      <xsl:value-of select="$symbol"/>
      </a>
      <xsl:text>{</xsl:text>
      <xsl:apply-templates select="*[2]">

diff --git a/helm/style/html_set.xsl b/helm/style/html_set.xsl
index a8511d65d66596a990fe3d580c48742d99fa82bc..3bff65d2be918111d2bf44f7de7e8635d213a216 100644 (file)
--- a/helm/style/html_set.xsl
+++ b/helm/style/html_set.xsl
@@ -39,9 +39,9 @@
 <!-- SET -->
 
  <xsl:template mode="inline" match="m:set">
-  <xsl:variable name="uri">
-   <xsl:value-of select="concat(string($absPath), @definitionURL)"/>
-  </xsl:variable>
+  <xsl:variable name="uri" select="@definitionURL"/>
+<!--   <xsl:value-of select="concat(string($absPath), @definitionURL)"/>
+  </xsl:variable>-->
   <xsl:choose>
    <xsl:when test="count(child::*) = 0">
     <FONT FACE="symbol" mathcolor="blue">&#198;</FONT>
@@ -121,12 +121,7 @@
   </xsl:variable>
   <xsl:text>(</xsl:text>
   <xsl:apply-templates mode="inline" select="*[2]"/>
-  <a>
-   <xsl:attribute name="href">
-    <xsl:call-template name="makeURL">
-     <xsl:with-param name="url" select="$uri"/>
-    </xsl:call-template>
-   </xsl:attribute>
+  <a href="{$uri}">
    <FONT FACE="symbol" mathcolor="blue">
     <xsl:value-of select="$symbol"/>
    </FONT>
@@ -182,15 +177,10 @@
      <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:call-template name="makeURL">
-       <xsl:with-param name="url" select="$uri"/>
-      </xsl:call-template>
-     </xsl:attribute>
-     <FONT FACE="symbol" mathcolor="blue">
-      <xsl:value-of select="$symbol"/>
-     </FONT>
+     <a href="{$uri}">
+      <FONT FACE="symbol" mathcolor="blue">
+       <xsl:value-of select="$symbol"/>
+      </FONT>
      </a>
      <xsl:apply-templates select="*[3]">
       <xsl:with-param name="current_indent" select="$current_indent + 2"/>
@@ -209,9 +199,9 @@
  <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:value-of select="concat(string($absPath), @definitionURL)"/>
+  </xsl:variable>-->
   <xsl:choose>
    <xsl:when test="count(child::*) = 0">
     <FONT FACE="symbol" mathcolor="blue">&#198;</FONT>

diff --git a/helm/style/link.xsl b/helm/style/link.xsl
new file mode 100644 (file)
index 0000000..78f68e4
--- /dev/null
+++ b/helm/style/link.xsl
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!-- Copyright (C) 2000, HELM Team                                     -->
+<!--                                                                   -->
+<!-- This file is part of HELM, an Hypertextual, Electronic            -->
+<!-- Library of Mathematics, developed at the Computer Science         -->
+<!-- Department, University of Bologna, Italy.                         -->
+<!--                                                                   -->
+<!-- HELM is free software; you can redistribute it and/or             -->
+<!-- modify it under the terms of the GNU General Public License       -->
+<!-- as published by the Free Software Foundation; either version 2    -->
+<!-- of the License, or (at your option) any later version.            -->
+<!--                                                                   -->
+<!-- HELM is distributed in the hope that it will be useful,           -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of    -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the     -->
+<!-- GNU General Public License for more details.                      -->
+<!--                                                                   -->
+<!-- You should have received a copy of the GNU General Public License -->
+<!-- along with HELM; if not, write to the Free Software               -->
+<!-- Foundation, Inc., 59 Temple Place - Suite 330, Boston,            -->
+<!-- MA  02111-1307, USA.                                              -->
+<!--                                                                   -->
+<!-- For details, see the HELM World-Wide-Web page,                    -->
+<!-- http://cs.unibo.it/helm/.                                         -->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                              xmlns:m="http://www.w3.org/1998/Math/MathML"
+                              xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<!--***********************************************************************--> 
+<!-- From MathML presentation or HTML to themselves with links             -->
+<!-- HELM Group: Asperti, Padovani, Sacerdoti, Schena                      -->
+<!-- First draft: March 16 2001, Irene Schena                              -->
+<!--***********************************************************************--> 
+
+<xsl:param name="getterURL" select="'http://localhost:8081/'"/>
+<xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
+<xsl:param name="keys" select="'C1,HC2'"/>
+<xsl:param name="naturalLanguage" select="'yes'"/>
+<xsl:param name="annotations" select="'no'"/>
+<xsl:param name="media-type" select="'xhtml'"/>
+<xsl:param name="doctype-public" select="'-//W3C//DTD XHTML 1.0 Transitional//EN'"/>
+<xsl:param name="encoding" select="iso-8859-1"/>
+
+<xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getxml?uri=</xsl:variable>
+
+<xsl:variable name="header"><xsl:value-of select="$processorURL"/>apply?keys=<xsl:value-of select="$keys"/>&#x26;param.naturalLanguage=<xsl:value-of select="$naturalLanguage"/>&#x26;param.annotations=<xsl:value-of select="$annotations"/>&#x26;prop.media-type=<xsl:value-of select="$media-type"/>&#x26;prop.doctype-public=<xsl:value-of select="$doctype-public"/>&#x26;prop.encoding=<xsl:value-of select="$encoding"/>&#x26;param.keys=<xsl:value-of select="$keys"/>&#x26;param.getterURL=<xsl:value-of select="$getterURL"/>&#x26;param.processorURL=<xsl:value-of select="$processorURL"/>&#x26;xmluri=<xsl:value-of select="$absPath"/></xsl:variable>
+
+<xsl:template name="makeURL">
+<xsl:param name="uri" select="''"/>
+    <xsl:value-of select="concat(string($header),string($uri),'&#x26;param.CICURI=',string($uri))"/>
+</xsl:template>
+
+<xsl:template match="*[@xlink:href]">
+ <xsl:copy>
+    <xsl:copy-of select="@*"/>
+    <xsl:attribute name="xlink:href">
+     <xsl:call-template name="makeURL">
+      <xsl:with-param name="uri" select="@xlink:href"/>
+     </xsl:call-template>
+    </xsl:attribute>
+    <xsl:apply-templates/>
+ </xsl:copy>
+</xsl:template>
+
+<xsl:template match="a[@href]">
+   <xsl:copy>
+    <xsl:copy-of select="@*"/> 
+    <xsl:attribute name="href">
+     <xsl:call-template name="makeURL">
+      <xsl:with-param name="uri" select="@href"/>
+     </xsl:call-template>
+    </xsl:attribute>
+    <xsl:apply-templates/>
+   </xsl:copy>
+</xsl:template>
+
+<xsl:template match = "/|*">
+  <xsl:copy>
+   <xsl:copy-of select="@*"/>
+   <xsl:apply-templates/>
+  </xsl:copy>
+</xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file

diff --git a/helm/style/theory_pres.xsl b/helm/style/theory_pres.xsl
index b4a6e3cd8c864e742d28e6cacff91f19edc7555e..d298418ae374b7a939fef1b693e0aa709f103b00 100644 (file)
--- a/helm/style/theory_pres.xsl
+++ b/helm/style/theory_pres.xsl
@@ -59,12 +59,11 @@
 </xsl:template>
 
 <xsl:template match="THEOREM|LEMMA|COROLLARY|FACT">
-     <h4><xsl:value-of select="name(.)"/><xsl:text>&#x00a0;</xsl:text><a href="{$uri}"><xsl:value-of select="@name"/></a></h4>
+     <h4><xsl:value-of select="name(.)"/><xsl:text>&#x00a0;</xsl:text><a href="{@uri}"><xsl:value-of select="@name"/></a></h4>
     <ENTITY uri="{@uri}" type="1"/>
-</xsl:template>
 
 <xsl:template match="AXIOM|DEFINITION|VARIABLE">
-     <h4><xsl:value-of select="name(.)"/><xsl:text>&#x00a0;</xsl:text><a href="{$uri}"><xsl:value-of select="@name"/></a></h4>
+     <h4><xsl:value-of select="name(.)"/><xsl:text>&#x00a0;</xsl:text><a href="{@uri}"><xsl:value-of select="@name"/></a></h4>
     <ENTITY uri="{@uri}" type="0"/>
 </xsl:template>