(xsl:template match="terminal"): Use new attribute names.

(xsl:template match="nonterminal"): Likewise.

diff --git a/data/xslt/xml2text.xsl b/data/xslt/xml2text.xsl
index c21bf21755db11164e765762655593b8960a94a6..621599a3267e6eefb0bd27c8cb5356da0b755ae3 100644 (file)
--- a/data/xslt/xml2text.xsl
+++ b/data/xslt/xml2text.xsl
@@ -115,14 +115,14 @@
 </xsl:template>
 
 <xsl:template match="terminal">
-  <xsl:value-of select="@symbol"/>
+  <xsl:value-of select="@name"/>
   <xsl:call-template name="line-wrap">
     <xsl:with-param
-      name="first-line-length" select="66 - string-length(@symbol)"
+      name="first-line-length" select="66 - string-length(@name)"
     />
     <xsl:with-param name="line-length" select="66" />
     <xsl:with-param name="text">
-      <xsl:value-of select="concat(' (', @type, ')')"/>
+      <xsl:value-of select="concat(' (', @number, ')')"/>
       <xsl:apply-templates select="rule" />
     </xsl:with-param>
   </xsl:call-template>
@@ -134,8 +134,8 @@
 </xsl:template>
 
 <xsl:template match="nonterminal">
-  <xsl:value-of select="@symbol"/>
-  <xsl:value-of select="concat(' (', @type, ')')"/>
+  <xsl:value-of select="@name"/>
+  <xsl:value-of select="concat(' (', @number, ')')"/>
   <xsl:text>&#10;</xsl:text>
   <xsl:variable name="output">
     <xsl:call-template name="line-wrap">

diff --git a/data/xslt/xml2xhtml.xsl b/data/xslt/xml2xhtml.xsl
index 5aea6f1a87787c6d7838d56759f19f5858e38cd9..891aa68f719e69ddeaa7a9584a991b11aab6e6f8 100644 (file)
--- a/data/xslt/xml2xhtml.xsl
+++ b/data/xslt/xml2xhtml.xsl
@@ -297,8 +297,8 @@
 </xsl:template>
 
 <xsl:template match="terminal">
-  <b><xsl:value-of select="@symbol"/></b>
-  <xsl:value-of select="concat(' (', @type, ')')"/>
+  <b><xsl:value-of select="@name"/></b>
+  <xsl:value-of select="concat(' (', @number, ')')"/>
   <xsl:apply-templates select="rule"/>
   <xsl:text>&#10;</xsl:text>
 </xsl:template>
@@ -314,8 +314,8 @@
 </xsl:template>
 
 <xsl:template match="nonterminal">
-  <b><xsl:value-of select="@symbol"/></b>
-  <xsl:value-of select="concat(' (', @type, ')')"/>
+  <b><xsl:value-of select="@name"/></b>
+  <xsl:value-of select="concat(' (', @number, ')')"/>
   <xsl:text>&#10;    </xsl:text>
   <xsl:if test="left/rule">
     <xsl:text>on left:</xsl:text>