From 695ccfd41997129acaa6cd94826484adc48f982b Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Sat, 11 Nov 2006 09:32:28 +0000
Subject: [PATCH] replace name() with local-name() in most cases.

---
 xsl/common/common.xsl    | 138 +++++++++++++++++++--------------------
 xsl/common/l10n.xsl      |   2 +-
 xsl/common/labels.xsl    |   2 +-
 xsl/common/olink.xsl     |   2 +-
 xsl/common/subtitles.xsl |   2 +-
 xsl/common/titles.xsl    |   6 +-
 6 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/xsl/common/common.xsl b/xsl/common/common.xsl
index 32b94321c..8edb30d4b 100644
--- a/xsl/common/common.xsl
+++ b/xsl/common/common.xsl
@@ -210,12 +210,12 @@ Defaults to the context node.</para>
 <xsl:template name="section.level">
   <xsl:param name="node" select="."/>
   <xsl:choose>
-    <xsl:when test="name($node)='sect1'">1</xsl:when>
-    <xsl:when test="name($node)='sect2'">2</xsl:when>
-    <xsl:when test="name($node)='sect3'">3</xsl:when>
-    <xsl:when test="name($node)='sect4'">4</xsl:when>
-    <xsl:when test="name($node)='sect5'">5</xsl:when>
-    <xsl:when test="name($node)='section'">
+    <xsl:when test="local-name($node)='sect1'">1</xsl:when>
+    <xsl:when test="local-name($node)='sect2'">2</xsl:when>
+    <xsl:when test="local-name($node)='sect3'">3</xsl:when>
+    <xsl:when test="local-name($node)='sect4'">4</xsl:when>
+    <xsl:when test="local-name($node)='sect5'">5</xsl:when>
+    <xsl:when test="local-name($node)='section'">
       <xsl:choose>
         <xsl:when test="$node/../../../../../../section">6</xsl:when>
         <xsl:when test="$node/../../../../../section">5</xsl:when>
@@ -225,16 +225,16 @@ Defaults to the context node.</para>
         <xsl:otherwise>1</xsl:otherwise>
       </xsl:choose>
     </xsl:when>
-    <xsl:when test="name($node)='refsect1' or
-                    name($node)='refsect2' or
-                    name($node)='refsect3' or
-                    name($node)='refsection' or
-                    name($node)='refsynopsisdiv'">
+    <xsl:when test="local-name($node)='refsect1' or
+                    local-name($node)='refsect2' or
+                    local-name($node)='refsect3' or
+                    local-name($node)='refsection' or
+                    local-name($node)='refsynopsisdiv'">
       <xsl:call-template name="refentry.section.level">
         <xsl:with-param name="node" select="$node"/>
       </xsl:call-template>
     </xsl:when>
-    <xsl:when test="name($node)='simplesect'">
+    <xsl:when test="local-name($node)='simplesect'">
       <xsl:choose>
         <xsl:when test="$node/../../sect1">2</xsl:when>
         <xsl:when test="$node/../../sect2">3</xsl:when>
@@ -308,11 +308,11 @@ Defaults to the context node.</para>
 
   <xsl:variable name="levelinRE">
     <xsl:choose>
-      <xsl:when test="name($node)='refsynopsisdiv'">1</xsl:when>
-      <xsl:when test="name($node)='refsect1'">1</xsl:when>
-      <xsl:when test="name($node)='refsect2'">2</xsl:when>
-      <xsl:when test="name($node)='refsect3'">3</xsl:when>
-      <xsl:when test="name($node)='refsection'">
+      <xsl:when test="local-name($node)='refsynopsisdiv'">1</xsl:when>
+      <xsl:when test="local-name($node)='refsect1'">1</xsl:when>
+      <xsl:when test="local-name($node)='refsect2'">2</xsl:when>
+      <xsl:when test="local-name($node)='refsect3'">3</xsl:when>
+      <xsl:when test="local-name($node)='refsection'">
         <xsl:choose>
           <xsl:when test="$node/../../../../../refsection">5</xsl:when>
           <xsl:when test="$node/../../../../refsection">4</xsl:when>
@@ -378,30 +378,30 @@ Defaults to the context node.</para>
 <!--
  (hnr      (hierarchical-number-recursive (normalize "qandadiv") node))
 
-	 (parsect  (ancestor-member node (section-element-list)))
-
-	 (defnum   (if (and %qanda-inherit-numeration% 
-			    %section-autolabel%)
-		       (if (node-list-empty? parsect)
-			   (section-autolabel-prefix node)
-			   (section-autolabel parsect))
-		       ""))
-
-	 (hnumber  (let loop ((numlist hnr) (number defnum) 
-			      (sep (if (equal? defnum "") "" ".")))
-		     (if (null? numlist)
-			 number
-			 (loop (cdr numlist) 
-			       (string-append number
-					      sep
-					      (number->string (car numlist)))
-			       "."))))
-	 (cnumber  (child-number (parent node)))
-	 (number   (string-append hnumber 
-				  (if (equal? hnumber "")
-				      ""
-				      ".")
-				  (number->string cnumber))))
+         (parsect  (ancestor-member node (section-element-list)))
+
+         (defnum   (if (and %qanda-inherit-numeration% 
+                            %section-autolabel%)
+                       (if (node-list-empty? parsect)
+                           (section-autolabel-prefix node)
+                           (section-autolabel parsect))
+                       ""))
+
+         (hnumber  (let loop ((numlist hnr) (number defnum) 
+                              (sep (if (equal? defnum "") "" ".")))
+                     (if (null? numlist)
+                         number
+                         (loop (cdr numlist) 
+                               (string-append number
+                                              sep
+                                              (number->string (car numlist)))
+                               "."))))
+         (cnumber  (child-number (parent node)))
+         (number   (string-append hnumber 
+                                  (if (equal? hnumber "")
+                                      ""
+                                      ".")
+                                  (number->string cnumber))))
 -->
 
   <xsl:choose>
@@ -506,16 +506,16 @@ Defaults to the context node.</para>
     </xsl:when>
 
     <!-- handle corpauthor as a special case...-->
-    <xsl:when test="name($node)='corpauthor'">
+    <xsl:when test="local-name($node)='corpauthor'">
       <xsl:apply-templates select="$node"/>
     </xsl:when>
 
     <xsl:otherwise>
       <xsl:choose>
-	<!-- Handle case when personname contains only general markup (DocBook 5.0) -->
-	<xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)">
-	  <xsl:apply-templates select="$node/node()"/>
-	</xsl:when>
+        <!-- Handle case when personname contains only general markup (DocBook 5.0) -->
+        <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)">
+          <xsl:apply-templates select="$node/node()"/>
+        </xsl:when>
         <xsl:when test="$style = 'family-given'">
           <xsl:call-template name="person.name.family-given">
             <xsl:with-param name="node" select="$node"/>
@@ -684,7 +684,7 @@ Defaults to the context node.</para>
     <xsl:when test="contains($string, $subst)">
       <xsl:value-of select="substring-before($string, $subst)"/>
       <xsl:call-template name="gentext.element.name">
-        <xsl:with-param name="element.name" select="name($target)"/>
+        <xsl:with-param name="element.name" select="local-name($target)"/>
       </xsl:call-template>
       <xsl:call-template name="xref.g.subst">
         <xsl:with-param name="string"
@@ -975,23 +975,23 @@ recursive process.</para>
         <xsl:variable name="useobject">
           <xsl:choose>
             <!-- The phrase is used only when contains TeX Math and output is FO -->
-            <xsl:when test="name($object)='textobject' and $object/phrase
+            <xsl:when test="local-name($object)='textobject' and $object/phrase
                             and $object/@role='tex' and $stylesheet.result.type = 'fo'
                             and $tex.math.in.alt != ''">
               <xsl:text>1</xsl:text> 
             </xsl:when>
             <!-- The phrase is never used -->
-            <xsl:when test="name($object)='textobject' and $object/phrase">
+            <xsl:when test="local-name($object)='textobject' and $object/phrase">
               <xsl:text>0</xsl:text>
             </xsl:when>
-            <xsl:when test="name($object)='textobject'
+            <xsl:when test="local-name($object)='textobject'
                             and $object/ancestor::equation ">
             <!-- The first textobject is not a reasonable fallback
                  for equation image -->
               <xsl:text>0</xsl:text>
             </xsl:when>
             <!-- The first textobject is a reasonable fallback -->
-            <xsl:when test="name($object)='textobject'
+            <xsl:when test="local-name($object)='textobject'
                             and $object[not(@role) or @role!='tex']">
               <xsl:text>1</xsl:text>
             </xsl:when>
@@ -1247,12 +1247,12 @@ pointed to by the link is one of the elements listed in
     <xsl:variable name="target" select="$targets[1]"/>
 
     <xsl:if test="count($target) &gt; 0">
-      <xsl:if test="not(contains(concat(' ', $element-list, ' '), name($target)))">
+      <xsl:if test="not(contains(concat(' ', $element-list, ' '), local-name($target)))">
         <xsl:message>
           <xsl:text>Error: linkend (</xsl:text>
           <xsl:value-of select="$linkend"/>
           <xsl:text>) points to "</xsl:text>
-          <xsl:value-of select="name($target)"/>
+          <xsl:value-of select="local-name($target)"/>
           <xsl:text>" not (one of): </xsl:text>
           <xsl:value-of select="$element-list"/>
         </xsl:message>
@@ -1346,16 +1346,16 @@ pointed to by the link is one of the elements listed in
   <xsl:choose>
     <xsl:when test="not($list/@continuation = 'continues')">
       <xsl:choose>
-	<xsl:when test="@startingnumber">
-	  <xsl:value-of select="@startingnumber"/>
-	</xsl:when>
-	<xsl:when test="$pi-html-start != ''">
-	  <xsl:value-of select="$pi-html-start"/>
-	</xsl:when>
-	<xsl:when test="$pi-fo-start != ''">
-	  <xsl:value-of select="$pi-fo-start"/>
-	</xsl:when>
-	<xsl:otherwise>1</xsl:otherwise>
+        <xsl:when test="@startingnumber">
+          <xsl:value-of select="@startingnumber"/>
+        </xsl:when>
+        <xsl:when test="$pi-html-start != ''">
+          <xsl:value-of select="$pi-html-start"/>
+        </xsl:when>
+        <xsl:when test="$pi-fo-start != ''">
+          <xsl:value-of select="$pi-fo-start"/>
+        </xsl:when>
+        <xsl:otherwise>1</xsl:otherwise>
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
@@ -1909,13 +1909,13 @@ unchanged.</para>
 
     <itemizedlist>
       <listitem>
-	<simpara>if the value of the <sgmltag>choice</sgmltag>
-	pseudo-attribute is "and" or "or", returns a localized "and"
-	or "or"</simpara>
+        <simpara>if the value of the <sgmltag>choice</sgmltag>
+        pseudo-attribute is "and" or "or", returns a localized "and"
+        or "or"</simpara>
       </listitem>
       <listitem>
-	<simpara>otherwise returns the literal value of the
-	<sgmltag>choice</sgmltag> pseudo-attribute</simpara>
+        <simpara>otherwise returns the literal value of the
+        <sgmltag>choice</sgmltag> pseudo-attribute</simpara>
       </listitem>
     </itemizedlist>
 
@@ -1951,7 +1951,7 @@ unchanged.</para>
     <!-- current locale -->
     <xsl:when test="$choice = 'and' or $choice = 'or'">
       <xsl:call-template name="gentext">
-	<xsl:with-param name="key" select="$choice"/>
+        <xsl:with-param name="key" select="$choice"/>
       </xsl:call-template>
     </xsl:when>
     <!--  otherwise, just output value of $choice, whatever it is -->
diff --git a/xsl/common/l10n.xsl b/xsl/common/l10n.xsl
index 2e2cdfd0e..86968b1a0 100644
--- a/xsl/common/l10n.xsl
+++ b/xsl/common/l10n.xsl
@@ -194,7 +194,7 @@
 </xsl:template>
 
 <xsl:template name="gentext.element.name">
-  <xsl:param name="element.name" select="name(.)"/>
+  <xsl:param name="element.name" select="local-name(.)"/>
   <xsl:param name="lang">
     <xsl:call-template name="l10n.language"/>
   </xsl:param>
diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index 0d11bd872..8029ca2e9 100644
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -38,7 +38,7 @@ element label.</para>
   <xsl:if test="$verbose">
     <xsl:message>
       <xsl:text>Request for label of unexpected element: </xsl:text>
-      <xsl:value-of select="name(.)"/>
+      <xsl:value-of select="local-name(.)"/>
     </xsl:message>
   </xsl:if>
 </xsl:template>
diff --git a/xsl/common/olink.xsl b/xsl/common/olink.xsl
index 6bd2d4300..7114561c1 100644
--- a/xsl/common/olink.xsl
+++ b/xsl/common/olink.xsl
@@ -957,7 +957,7 @@
       <!-- We are done -->
     </xsl:when>
     <!-- Have we reached the top without a match? -->
-    <xsl:when test="name($dirnode) != 'dir'" >
+    <xsl:when test="local-name($dirnode) != 'dir'" >
         <xsl:message>Olink error: cannot locate targetdoc <xsl:value-of select="$targetdoc"/> in sitemap</xsl:message>
     </xsl:when>
     <!-- Is the target in a descendant? -->
diff --git a/xsl/common/subtitles.xsl b/xsl/common/subtitles.xsl
index 23106e817..8d5d4b36d 100644
--- a/xsl/common/subtitles.xsl
+++ b/xsl/common/subtitles.xsl
@@ -31,7 +31,7 @@ subtitle of the element.
 <xsl:template match="*" mode="subtitle.markup">
   <xsl:message>
     <xsl:text>Request for subtitle of unexpected element: </xsl:text>
-    <xsl:value-of select="name(.)"/>
+    <xsl:value-of select="local-name(.)"/>
   </xsl:message>
   <xsl:text>???SUBTITLE???</xsl:text>
 </xsl:template>
diff --git a/xsl/common/titles.xsl b/xsl/common/titles.xsl
index 56b7b7b54..7805dbcf0 100644
--- a/xsl/common/titles.xsl
+++ b/xsl/common/titles.xsl
@@ -47,7 +47,7 @@ title of the element. This does not include the label.
       <xsl:if test="$verbose != 0">
         <xsl:message>
           <xsl:text>Request for title of element with no title: </xsl:text>
-          <xsl:value-of select="name(.)"/>
+          <xsl:value-of select="local-name(.)"/>
           <xsl:if test="@id">
             <xsl:text> (id="</xsl:text>
             <xsl:value-of select="@id"/>
@@ -116,7 +116,7 @@ title of the element. This does not include the label.
 
 <!--
   <xsl:message>
-    <xsl:value-of select="name(.)"/>
+    <xsl:value-of select="local-name(.)"/>
     <xsl:text> </xsl:text>
     <xsl:value-of select="$allow-anchors"/>
   </xsl:message>
@@ -294,7 +294,7 @@ title of the element. This does not include the label.
     </xsl:when>
     <xsl:otherwise>
       <xsl:call-template name="gentext.element.name">
-        <xsl:with-param name="element.name" select="name(.)"/>
+        <xsl:with-param name="element.name" select="local-name(.)"/>
       </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
-- 
2.49.0