Bug (that I introduced in my last commit to solve the problem of the

free variable $id appearing everywhere in the notation for LAMBDA) fixed.
Now hyperlinks should be generated correctly.

diff --git a/helm/style/mmlextension.xsl b/helm/style/mmlextension.xsl
index 049398f9a9539c1d1492d252ad507cd49897e2c2..eb928b41f183b9f8685525b2898a883ed642a766 100644 (file)
--- a/helm/style/mmlextension.xsl
+++ b/helm/style/mmlextension.xsl
@@ -414,6 +414,7 @@ which generates the toplevel element (see for instance xlink) -->
      <xsl:if test="@id">
       <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
      </xsl:if>
+     <xsl:variable name="id" select="m:csymbol/@id"/>
      <xsl:choose>
       <!-- FORALL -->
       <xsl:when test="$name='forall'">
@@ -1536,8 +1537,8 @@ which generates the toplevel element (see for instance xlink) -->
         <m:mo stretchy="false">[</m:mo>
         <xsl:apply-templates select="*[4]"/>
         <m:mo mathcolor="green">
-         <xsl:if test="@id != ''">
-          <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+         <xsl:if test="$id != ''">
+          <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
          </xsl:if>&#8592;</m:mo>
         <xsl:apply-templates select="*[2]"/>
         <m:mo stretchy="false">]</m:mo>
@@ -1546,8 +1547,8 @@ which generates the toplevel element (see for instance xlink) -->
       <xsl:when test="$name='lift'">
         <m:msup>
          <m:mo mathcolor="green">
-          <xsl:if test="@id != ''">
-           <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
           </xsl:if>&#8593;</m:mo>
         <xsl:apply-templates select="*[2]"/>
         </m:msup>
@@ -1561,8 +1562,8 @@ which generates the toplevel element (see for instance xlink) -->
       <xsl:when test="$name='lift_with_base'">
         <m:msubsup>
          <m:mo mathcolor="green">
-          <xsl:if test="@id != ''">
-           <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
           </xsl:if>&#8593;</m:mo>
         <xsl:apply-templates select="*[3]"/>
         <xsl:apply-templates select="*[4]"/>
@@ -1578,8 +1579,8 @@ which generates the toplevel element (see for instance xlink) -->
         <xsl:apply-templates select="*[2]"/>
         <m:munder>
          <m:mo mathcolor="green">
-          <xsl:if test="@id != ''">
-           <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
           </xsl:if>&#8594;</m:mo>
           <m:mi mathcolor="green">&#946;</m:mi>
         </m:munder>
@@ -1590,8 +1591,8 @@ which generates the toplevel element (see for instance xlink) -->
         <xsl:apply-templates select="*[2]"/>
         <m:munderover>
          <m:mo mathcolor="green">
-          <xsl:if test="@id != ''">
-           <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
           </xsl:if>&#8594;</m:mo>
           <m:mi mathcolor="green">&#946;</m:mi>
           <m:mi mathcolor="green">*</m:mi>
@@ -1603,8 +1604,8 @@ which generates the toplevel element (see for instance xlink) -->
         <xsl:apply-templates select="*[2]"/>
         <m:munder>
          <m:mo mathcolor="green">
-          <xsl:if test="@id != ''">
-           <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
           </xsl:if>&#8658;</m:mo>
           <m:mi mathcolor="green">&#946;</m:mi>
         </m:munder>
@@ -1615,8 +1616,8 @@ which generates the toplevel element (see for instance xlink) -->
         <xsl:apply-templates select="*[2]"/>
         <m:munderover>
          <m:mo mathcolor="green">
-          <xsl:if test="@id != ''">
-           <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+          <xsl:if test="$id != ''">
+           <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
           </xsl:if>&#8658;</m:mo>
           <m:mi mathcolor="green">&#946;</m:mi>
           <m:mi mathcolor="green">*</m:mi>
@@ -1626,8 +1627,8 @@ which generates the toplevel element (see for instance xlink) -->
       <!-- forgetful -->
       <xsl:when test="$name='forgetful'">
        <m:mfenced open="|" close="|">
-        <xsl:if test="@id != ''">
-         <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+        <xsl:if test="$id != ''">
+         <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
         </xsl:if>
         <xsl:apply-templates select="*[2]"/>
        </m:mfenced>
@@ -1636,16 +1637,16 @@ which generates the toplevel element (see for instance xlink) -->
       <xsl:when test="$name='isomorphic'">
         <xsl:apply-templates select="*[2]"/>
         <m:mo mathcolor="green">
-         <xsl:if test="@id != ''">
-          <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+         <xsl:if test="$id != ''">
+          <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
          </xsl:if>&#8773;</m:mo>
         <xsl:apply-templates select="*[3]"/>
       </xsl:when>
       <!-- interp -->
       <xsl:when test="$name='forgetful'">
        <m:mfenced open="[" close="]">
-        <xsl:if test="@id != ''">
-         <xsl:attribute name="m:xref"><xsl:value-of select="@id"/></xsl:attribute>
+        <xsl:if test="$id != ''">
+         <xsl:attribute name="m:xref"><xsl:value-of select="$id"/></xsl:attribute>
         </xsl:if>
         <xsl:apply-templates select="*[2]"/>
        </m:mfenced>