From 953f898b1e6f101a6315439dba08e73f1c20b4d9 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 7 Nov 2012 20:02:17 +0000
Subject: [PATCH] Convert hard wired xsl:number for production into a template
 with mode="label.markup" to be consistent with other element numbering.

---
 xsl/common/labels.xsl | 4 ++++
 xsl/fo/ebnf.xsl       | 2 +-
 xsl/html/ebnf.xsl     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index d7b688ad2..6c81d4513 100644
--- 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 d9cc04a28..8b94ef8b1 100644
--- 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 5aadc1a5f..86763ab78 100644
--- 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%">
-- 
2.50.1