Minor bug fixes in the 'instantiate' element handling.

diff --git a/helm/style/content.xsl b/helm/style/content.xsl
index e4712613802889706116468f0ebbab55ec97ecfc..f2f7b713a5e1bef33f48793fcdc74cdbfbe81a59 100644 (file)
--- a/helm/style/content.xsl
+++ b/helm/style/content.xsl
@@ -324,7 +324,10 @@ Amaya o da chi di dovere in /really_very_local/helm/PARSER/example/.../]
 </xsl:template>
 
 <xsl:template match="instantiate" mode="pure">
-       <m:apply helm:xref="{@id}">
+       <m:apply>
+         <xsl:if test="@id">
+          <xsl:attribute name="helm:xref" select="@id"/>
+         </xsl:if>
         <m:csymbol>inst</m:csymbol>
         <xsl:apply-templates mode="noannot" select="*[1]" />
         <xsl:for-each select="arg">

diff --git a/helm/style/mmlextension.xsl b/helm/style/mmlextension.xsl
index c74bc4746cfdf5b3fca6f8499f3e60fbd282a359..1c19b50aabf763d780705edab11939dfc3904499 100644 (file)
--- a/helm/style/mmlextension.xsl
+++ b/helm/style/mmlextension.xsl
@@ -1108,17 +1108,13 @@ which generates the toplevel element (see for instance xlink) -->
       <!-- INST -->
       <xsl:when test="$name='inst'">
        <m:mrow>
-        <xsl:if test="@definitionURL">
-         <xsl:attribute name="helm:xref" value="{@helm:xref}"/>
+        <xsl:if test="$id != ''">
+         <xsl:attribute name="xref"><xsl:value-of select="$id"/></xsl:attribute>
         </xsl:if>
         <xsl:apply-templates select="*[2]"/>
         <m:mo stretchy="false">{</m:mo>
         <xsl:for-each select="*[(position()>2) and (position() mod 2 = 1)]">
-         <xsl:if test="name()='m:ci'">
-          <a href="{@definitionURL}">
-           <xsl:apply-templates/>
-          </a>
-         </xsl:if>
+         <xsl:apply-templates/>
          <m:mo stretchy="false">:=</m:mo>
          <xsl:apply-templates select="following-sibling::*[position() = 1]"/>
         </xsl:for-each>