Convert hard wired xsl:number for production into a template

with mode="label.markup" to be consistent with other element numbering.

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index d7b688ad20a12458122135e04a6974125bbc2f09..6c81d4513bdc5b7cc51e41cc00f82194941910c7 100644 (file)
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -791,6 +791,10 @@ element label.</para>
   <xsl:number value="$item-number" format="{$type}"/>
 </xsl:template>
 
+<xsl:template match="production" mode="label.markup">
+  <xsl:number count="production" level="any"/>
+</xsl:template>
+
 <xsl:template match="abstract" mode="label.markup">
   <!-- nop -->
 </xsl:template>

diff --git a/xsl/fo/ebnf.xsl b/xsl/fo/ebnf.xsl
index d9cc04a281147cc922d8c51f70497fbedb74b2b0..8b94ef8b181225225165c6b09d8e08a2b4ed1b05 100644 (file)
--- a/xsl/fo/ebnf.xsl
+++ b/xsl/fo/ebnf.xsl
@@ -99,7 +99,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
     <fo:table-cell>
       <fo:block text-align="start">
         <xsl:text>[</xsl:text>
-        <xsl:number count="production" level="any"/>
+        <xsl:apply-templates select="." mode="label.markup"/>
         <xsl:text>]</xsl:text>
       </fo:block>
     </fo:table-cell>

diff --git a/xsl/html/ebnf.xsl b/xsl/html/ebnf.xsl
index 5aadc1a5f71d356e2062b62d46548aa092dbf1ea..86763ab7814a7cda9ec42c872003a629b4478bc0 100644 (file)
--- a/xsl/html/ebnf.xsl
+++ b/xsl/html/ebnf.xsl
@@ -107,7 +107,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
   <tr>
     <td align="{$direction.align.start}" valign="top" width="3%">
       <xsl:text>[</xsl:text>
-      <xsl:number count="production" level="any"/>
+      <xsl:apply-templates select="." mode="label.markup"/>
       <xsl:text>]</xsl:text>
     </td>
     <td align="{$direction.align.end}" valign="top" width="10%">