From ad63b7f43f297fc07689f9d62d9cb85b3936b8e5 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Sun, 12 Nov 2006 08:23:21 +0000
Subject: [PATCH] Finish support for @xml:id everywhere @id is used.

---
 xsl/fo/autoidx.xsl   | 16 +++++++--------
 xsl/fo/biblio.xsl    | 10 +++++----
 xsl/fo/block.xsl     | 28 +++++++-------------------
 xsl/fo/callout.xsl   | 10 +++------
 xsl/fo/fop.xsl       |  7 +++++--
 xsl/fo/index.xsl     |  4 +---
 xsl/fo/inline.xsl    | 48 +++++++++++++-------------------------------
 xsl/fo/sections.xsl  |  2 +-
 xsl/fo/titlepage.xsl |  8 ++------
 xsl/fo/xref.xsl      | 21 ++++++++++++-------
 10 files changed, 61 insertions(+), 93 deletions(-)

diff --git a/xsl/fo/autoidx.xsl b/xsl/fo/autoidx.xsl
index 2217a1686..765cb306d 100644
--- a/xsl/fo/autoidx.xsl
+++ b/xsl/fo/autoidx.xsl
@@ -682,8 +682,8 @@
         <fo:page-number-citation ref-id="{$id}"/>
       </fo:basic-link>
 
-      <xsl:if test="key('endofrange', @id)[&scope;]">
-        <xsl:apply-templates select="key('endofrange', @id)[&scope;][last()]"
+      <xsl:if test="key('endofrange', $id)[&scope;]">
+        <xsl:apply-templates select="key('endofrange', $id)[&scope;][last()]"
                              mode="reference">
           <xsl:with-param name="scope" select="$scope"/>
           <xsl:with-param name="role" select="$role"/>
@@ -1096,7 +1096,7 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-          <xsl:if test="@id">
+          <xsl:if test="$id">
             <xsl:text>&lt;link linkend="</xsl:text>
             <xsl:value-of select="$id"/>
             <xsl:text>"&gt;</xsl:text>
@@ -1104,7 +1104,7 @@
           <fo:basic-link internal-destination="{$id}">
             <fo:page-number-citation ref-id="{$id}"/>
           </fo:basic-link>
-          <xsl:if test="@id">
+          <xsl:if test="$id">
             <xsl:text>&lt;/link&gt;</xsl:text>
           </xsl:if>
           <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
@@ -1131,7 +1131,7 @@
       </xsl:variable>
 
       <xsl:text>&lt;phrase fole="pageno"&gt;</xsl:text>
-      <xsl:if test="$target[1]/@id">
+      <xsl:if test="$target[1]/@id or $target[1]/@xml:id">
         <xsl:text>&lt;link linkend="</xsl:text>
         <xsl:value-of select="$id"/>
         <xsl:text>"&gt;</xsl:text>
@@ -1139,7 +1139,7 @@
       <fo:basic-link internal-destination="{$id}">
         <fo:page-number-citation ref-id="{$id}"/>
       </fo:basic-link>
-      <xsl:if test="$target[1]/@id">
+      <xsl:if test="$target[1]/@id or $target[1]/@xml:id">
         <xsl:text>&lt;/link&gt;</xsl:text>
       </xsl:if>
       <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
@@ -1162,7 +1162,7 @@
       </xsl:variable>
 
       <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-      <xsl:if test="$target[1]/@id">
+      <xsl:if test="$target[1]/@id or target[1]/@xml:id">
         <xsl:text>&lt;link linkend="</xsl:text>
         <xsl:value-of select="$id"/>
         <xsl:text>"&gt;</xsl:text>
@@ -1170,7 +1170,7 @@
       <fo:basic-link internal-destination="{$id}">
         <fo:page-number-citation ref-id="{$id}"/>
       </fo:basic-link>
-      <xsl:if test="$target[1]/@id">
+      <xsl:if test="$target[1]/@id or target[1]/@xml:id">
         <xsl:text>&lt;/link&gt;</xsl:text>
       </xsl:if>
       <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 8d7458a7f..929f65df0 100644
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -153,7 +153,8 @@
   <xsl:choose>
     <xsl:when test="string(.) = ''">
       <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/>
+      <xsl:variable name="entry" select="$bib/bibliography/
+                                         *[@id=$id or @xml:id=$id][1]"/>
       <xsl:choose>
         <xsl:when test="$entry">
           <xsl:choose>
@@ -204,7 +205,8 @@
   <xsl:choose>
     <xsl:when test="string(.) = ''">
       <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/>
+      <xsl:variable name="entry" select="$bib/bibliography/
+                                         *[@id=$id or @xml:id=$id][1]"/>
       <xsl:choose>
         <xsl:when test="$entry">
           <xsl:choose>
@@ -263,9 +265,9 @@
       <xsl:value-of select="$node/@xreflabel"/>
       <xsl:text>] </xsl:text>
     </xsl:when>
-    <xsl:when test="$node/@id">
+    <xsl:when test="$node/@id or $node/@xml:id">
       <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@id"/>
+      <xsl:value-of select="($node/@id|$node/@xml:id)[1]"/>
       <xsl:text>] </xsl:text>
     </xsl:when>
     <xsl:otherwise><!-- nop --></xsl:otherwise>
diff --git a/xsl/fo/block.xsl b/xsl/fo/block.xsl
index 164d49a96..5157369d0 100644
--- a/xsl/fo/block.xsl
+++ b/xsl/fo/block.xsl
@@ -24,9 +24,7 @@
 
 <xsl:template name="block.object">
   <fo:block>
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
@@ -42,18 +40,14 @@
 
 <xsl:template match="simpara">
   <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
 
 <xsl:template match="formalpara">
   <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
@@ -405,9 +399,7 @@
 
 <xsl:template match="abstract">
   <fo:block xsl:use-attribute-sets="abstract.properties">
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
@@ -512,9 +504,7 @@
 
 <xsl:template match="revhistory">
   <fo:table table-layout="fixed" xsl:use-attribute-sets="revhistory.table.properties">
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
     <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
     <fo:table-column column-number="3" column-width="proportional-column-width(1)"/>
@@ -541,9 +531,7 @@
   <fo:table-row>
     <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
       <fo:block>
-        <xsl:if test="@id">
-          <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-        </xsl:if>
+        <xsl:call-template name="anchor"/>
         <xsl:if test="$revnumber">
           <xsl:call-template name="gentext">
             <xsl:with-param name="key" select="'Revision'"/>
@@ -608,9 +596,7 @@
 
 <xsl:template match="ackno">
   <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates/>
   </fo:block>
 </xsl:template>
diff --git a/xsl/fo/callout.xsl b/xsl/fo/callout.xsl
index 17627120f..87746e050 100644
--- a/xsl/fo/callout.xsl
+++ b/xsl/fo/callout.xsl
@@ -84,7 +84,8 @@
 </xsl:template>
 
 <xsl:template match="co">
-  <fo:inline id="{@id}">
+  <fo:inline>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates select="." mode="callout-bug"/>
   </fo:inline>
 </xsl:template>
@@ -94,7 +95,6 @@
   <!-- "over there" as if it were "right here" -->
 
   <xsl:variable name="co" select="key('id', @linkend)"/>
-  <xsl:variable name="id" select="@id"/>
   <xsl:choose>
     <xsl:when test="not($co)">
       <xsl:message>
@@ -110,11 +110,7 @@
     </xsl:when>
     <xsl:otherwise>
       <fo:inline>
-        <xsl:if test="$id != ''">
-	  <xsl:attribute name="id">
-	    <xsl:value-of select="$id"/>
-	  </xsl:attribute>
-	</xsl:if>
+        <xsl:call-template name="anchor"/>
         <xsl:apply-templates select="$co" mode="callout-bug"/>
       </fo:inline>
     </xsl:otherwise>
diff --git a/xsl/fo/fop.xsl b/xsl/fo/fop.xsl
index 91c0a9780..c3a06bab5 100644
--- a/xsl/fo/fop.xsl
+++ b/xsl/fo/fop.xsl
@@ -23,8 +23,11 @@ translates characters with code>255 back to ASCII.
 "'aaaccccddeeeeeegggghhiiiiijklllllnnnnooorrrsssstttuuuuuuwyzzzAAACCCCDDEEEEEEGGGGHHIIIIIJKLLLLLNNNNOOORRRSSSSTTTUUUUUUWYYZZZ'"/>
 
 <xsl:template match="*" mode="fop.outline">
-  <xsl:if test="@id">
-    <fox:destination internal-destination="{@id}"/>
+  <xsl:variable name="id">
+    <xsl:value-of select="(@id|@xml:id)[1]"/>
+  </xsl:variable>
+  <xsl:if test="$id != ''">
+    <fox:destination internal-destination="{$id}"/>
   </xsl:if>
   <xsl:apply-templates select="*" mode="fop.outline"/>
 </xsl:template>
diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index 25f9f9659..e4ba84426 100644
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -346,9 +346,7 @@
   <xsl:choose>
     <xsl:when test="$xep.extensions != 0">
       <rx:begin-index-range>
-        <xsl:attribute name="id">
-          <xsl:value-of select="@id"/>
-        </xsl:attribute>
+        <xsl:call-template name="anchor"/>
         <xsl:attribute name="rx:key">
           <xsl:value-of select="&primary;"/>
           <xsl:if test="@significance='preferred'"><xsl:value-of select="$significant.flag"/></xsl:if>
diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index b1ef9bc8f..ce95c5eff 100644
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -66,8 +66,13 @@
                   <xsl:text>???</xsl:text>
                 </xsl:when>
                 <xsl:otherwise>
+                  <xsl:variable name="id">
+                    <xsl:call-template name="object.id">
+                      <xsl:with-param name="object" select="$target"/>
+                    </xsl:call-template>
+                  </xsl:variable>
                   <xsl:attribute name="internal-destination">
-                    <xsl:value-of select="$target/@id"/>
+                    <xsl:value-of select="$id"/>
                   </xsl:attribute>
                 </xsl:otherwise>
               </xsl:choose>
@@ -152,11 +157,7 @@
     <xsl:apply-templates/>
   </xsl:param>
   <fo:inline font-style="italic">
-    <xsl:if test="@id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@id"/>
-      </xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:if test="@dir">
       <xsl:attribute name="direction">
         <xsl:choose>
@@ -174,11 +175,7 @@
     <xsl:apply-templates/>
   </xsl:param>
   <fo:inline font-weight="bold" xsl:use-attribute-sets="monospace.properties">
-    <xsl:if test="@id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@id"/>
-      </xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:if test="@dir">
       <xsl:attribute name="direction">
         <xsl:choose>
@@ -196,11 +193,7 @@
     <xsl:apply-templates/>
   </xsl:param>
   <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties">
-    <xsl:if test="@id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@id"/>
-      </xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:if test="@dir">
       <xsl:attribute name="direction">
         <xsl:choose>
@@ -219,11 +212,7 @@
   </xsl:param>
 
   <fo:inline xsl:use-attribute-sets="superscript.properties">
-    <xsl:if test="@id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@id"/>
-      </xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:if test="@dir">
       <xsl:attribute name="direction">
         <xsl:choose>
@@ -250,11 +239,7 @@
   </xsl:param>
 
   <fo:inline xsl:use-attribute-sets="subscript.properties">
-    <xsl:if test="@id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@id"/>
-      </xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:if test="@dir">
       <xsl:attribute name="direction">
         <xsl:choose>
@@ -722,14 +707,9 @@
         </xsl:when>
         <xsl:otherwise>
           <xsl:variable name="id">
-            <xsl:choose>
-              <xsl:when test="$cterm/@id">
-                <xsl:value-of select="$cterm/@id"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="generate-id($cterm)"/>
-              </xsl:otherwise>
-            </xsl:choose>
+            <xsl:call-template name="object.id">
+              <xsl:with-param name="object" select="$cterm"/>
+            </xsl:call-template>
           </xsl:variable>
           <fo:basic-link internal-destination="{$id}"
                          xsl:use-attribute-sets="xref.properties">
diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index cd89dae56..9213d2233 100644
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -18,7 +18,7 @@
 
 <xsl:template match="section">
   <xsl:choose>
-    <xsl:when test="$rootid = @id">
+    <xsl:when test="$rootid = @id or $rootid = @xml:id">
       <xsl:call-template name="section.page.sequence"/>
     </xsl:when>
     <xsl:otherwise>
diff --git a/xsl/fo/titlepage.xsl b/xsl/fo/titlepage.xsl
index 54127e5ad..9df1d8869 100644
--- a/xsl/fo/titlepage.xsl
+++ b/xsl/fo/titlepage.xsl
@@ -242,9 +242,7 @@
 
 <xsl:template match="authorgroup" mode="titlepage.mode">
   <fo:wrapper>
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates mode="titlepage.mode"/>
   </fo:wrapper>
 </xsl:template>
@@ -668,9 +666,7 @@
 <xsl:template match="bookinfo/authorgroup|info/authorgroup"
               mode="titlepage.mode" priority="2">
   <fo:block>
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
+    <xsl:call-template name="anchor"/>
     <xsl:apply-templates mode="titlepage.mode"/>
   </fo:block>
 </xsl:template>
diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index bc61909d7..669fa6261 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -18,7 +18,10 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="anchor">
-  <fo:inline id="{@id}"/>
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+  <fo:inline id="{$id}"/>
 </xsl:template>
 
 <!-- ==================================================================== -->
@@ -420,8 +423,9 @@
   <xsl:choose>
     <xsl:when test="string(.) = ''">
       <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="id" select="@id"/>
-      <xsl:variable name="entry" select="$bib/bibliography/*[@id=$id][1]"/>
+      <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
+      <xsl:variable name="entry" select="$bib/bibliography/
+                                         *[@id=$id or @xml:id=$id][1]"/>
       <xsl:choose>
         <xsl:when test="$entry">
           <xsl:choose>
@@ -433,7 +437,7 @@
               <xsl:apply-templates select="$entry/*[1]"/>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:value-of select="@id"/>
+              <xsl:value-of select="(@id|@xml:id)[1]"/>
             </xsl:otherwise>
           </xsl:choose>
         </xsl:when>
@@ -444,7 +448,7 @@
             <xsl:text> found in </xsl:text>
             <xsl:value-of select="$bibliography.collection"/>
           </xsl:message>
-          <xsl:value-of select="@id"/>
+          <xsl:value-of select="(@id|@xml:id)[1]"/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:when>
@@ -458,7 +462,7 @@
           <xsl:apply-templates select="*[1]"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="@id"/>
+          <xsl:value-of select="(@id|@xml:id)[1]"/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:otherwise>
@@ -1234,7 +1238,10 @@
 </xsl:template>
 
 <xsl:template match="*" mode="pagenumber.markup">
-  <fo:page-number-citation ref-id="{@id}"/>
+  <xsl:variable name="id">
+    <xsl:call-template name="object.id"/>
+  </xsl:variable>
+  <fo:page-number-citation ref-id="{$id}"/>
 </xsl:template>
 
 <!-- ==================================================================== -->
-- 
2.40.0