From ce4b41cd27c8b1dcf23d231c841f707fbebdb76f Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 6 Sep 2005 18:27:52 +0000
Subject: [PATCH] Fix template rules which use a variable reference in the
 value of the match attribute.  This is not allowed according to "5.3 Defining
 Template Rules" in REC-xslt-19991116, XSL Transformations (XSLT) Version 1.0.
 The xsltproc utility prior to version 1.1.15 allowed this erroneously but in
 the latest version it has been fixed.

Reported by:	scottl
---
 share/sgml/transtable-master.xsl | 87 +++++++++++++++++---------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/share/sgml/transtable-master.xsl b/share/sgml/transtable-master.xsl
index a68603823a..a5a57c380b 100644
--- a/share/sgml/transtable-master.xsl
+++ b/share/sgml/transtable-master.xsl
@@ -26,56 +26,63 @@
   </xsl:template>
 
   <xsl:template match="*">
-    <xsl:copy>
-      <xsl:copy-of select="@*" />
-      <xsl:apply-templates />
-    </xsl:copy>
-  </xsl:template>
+    <xsl:choose>
+      <xsl:when test="local-name() = $transtable-target-element">
+	<xsl:element name="{local-name(.)}" namespace="{namespace-uri(.)}">
+	  <xsl:copy-of select="@*" />
 
-  <xsl:template match="*[local-name() = $transtable-target-element]">
-    <xsl:element name="{local-name(.)}" namespace="{namespace-uri(.)}">
-      <xsl:copy-of select="@*" />
+	  <xsl:call-template name="transtable-sortkey-lookup">
+	    <xsl:with-param name="word" select="." />
+	    <xsl:with-param name="word-group" select="$transtable-word-group" />
+	  </xsl:call-template>
 
-      <xsl:call-template name="transtable-sortkey-lookup">
-	<xsl:with-param name="word" select="." />
-	<xsl:with-param name="word-group" select="$transtable-word-group" />
-      </xsl:call-template>
+	  <xsl:call-template name="transtable-lookup">
+	    <xsl:with-param name="word" select="." />
+	    <xsl:with-param name="word-group" select="$transtable-word-group" />
+	  </xsl:call-template>
+	</xsl:element>
+      </xsl:when>
 
-      <xsl:call-template name="transtable-lookup">
-        <xsl:with-param name="word" select="." />
-        <xsl:with-param name="word-group" select="$transtable-word-group" />
-      </xsl:call-template>
-    </xsl:element>
+      <xsl:otherwise>
+	<xsl:copy>
+	  <xsl:copy-of select="@*" />
+	  <xsl:apply-templates />
+	</xsl:copy>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
  <!-- mode for generating sortkeytable -->
 
   <xsl:template match="*" mode="sortkey">
-    <xsl:apply-templates mode="sortkey"/>
+    <xsl:choose>
+      <xsl:when test="local-name() = $transtable-target-element">
+	<xsl:element name="word">
+	  <xsl:attribute name="name">
+	    <xsl:call-template name="transtable-lookup">
+	      <xsl:with-param name="word" select="." />
+	      <xsl:with-param name="word-group" select="$transtable-word-group" />
+	    </xsl:call-template>
+	  </xsl:attribute>
+
+	  <xsl:attribute name="orig">
+	    <xsl:value-of select="." />
+	  </xsl:attribute>
+
+	  <xsl:attribute name="sortkey">
+	    <xsl:value-of select="'@sortkey@'" />
+	  </xsl:attribute>
+	</xsl:element>
+
+	<xsl:text disable-output-escaping="yes">&#10;</xsl:text>
+      </xsl:when>
+
+      <xsl:otherwise>
+	<xsl:apply-templates mode="sortkey"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template match="text()" mode="sortkey">
   </xsl:template>
-
-  <xsl:template match="*[local-name() = $transtable-target-element]" mode="sortkey">
-    <xsl:element name="word">
-      <xsl:attribute name="name">
-	<xsl:call-template name="transtable-lookup">
-	  <xsl:with-param name="word" select="." />
-	<xsl:with-param name="word-group" select="$transtable-word-group" />
-	</xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="orig">
-	<xsl:value-of select="." />
-      </xsl:attribute>
-
-      <xsl:attribute name="sortkey">
-	<xsl:value-of select="'@sortkey@'" />
-      </xsl:attribute>
-    </xsl:element>
-
-    <xsl:text disable-output-escaping="yes">&#10;</xsl:text>
-
-  </xsl:template>
 </xsl:stylesheet>