Updated master-name/master-reference per the XSL 1.0 Recommendation

diff --git a/xsl/fo/biblio.xsl b/xsl/fo/biblio.xsl
index 98ce02fe2e4dff596ec7411d0eb3fd6942f11b60..0b024222e6bab7688cc47f6d3976be8b6bb580d4 100644 (file)
--- a/xsl/fo/biblio.xsl
+++ b/xsl/fo/biblio.xsl
@@ -31,13 +31,13 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -46,10 +46,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/component.xsl b/xsl/fo/component.xsl
index c396ffafdbdbdb6d91b0817076a7c8a3b9d6c1c4..a4f41e7665e8c837abb0f9de889fd2ff66d89de1 100644 (file)
--- a/xsl/fo/component.xsl
+++ b/xsl/fo/component.xsl
@@ -66,14 +66,14 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
                     format="i"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -82,10 +82,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
@@ -107,14 +107,14 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
                     format="i"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -123,10 +123,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
@@ -146,14 +146,14 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
                     format="i"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -162,10 +162,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
@@ -188,13 +188,13 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -206,10 +206,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
@@ -232,13 +232,13 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -247,10 +247,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
@@ -341,13 +341,13 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -356,10 +356,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/division.xsl b/xsl/fo/division.xsl
index 907a2280e4e6e7147a60bf2ce24a674d99fda712..c0a82ef7f0715ab31568510584d9b8d3eaa0e103 100644 (file)
--- a/xsl/fo/division.xsl
+++ b/xsl/fo/division.xsl
@@ -50,14 +50,14 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <xsl:if test="$preamble">
     <fo:page-sequence id="{$id}"
                       hyphenate="{$hyphenate}"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -66,10 +66,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <fo:flow flow-name="xsl-region-body">
         <xsl:call-template name="set.titlepage"/>
@@ -96,14 +96,14 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <xsl:if test="$preamble">
     <fo:page-sequence id="{$id}"
                       hyphenate="{$hyphenate}"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -112,10 +112,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <fo:flow flow-name="xsl-region-body">
         <xsl:call-template name="book.titlepage"/>
@@ -126,7 +126,7 @@
   <xsl:if test="$generate.book.toc != '0'">
     <fo:page-sequence hyphenate="{$hyphenate}"
                       format="i"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -135,10 +135,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <fo:flow flow-name="xsl-region-body">
         <xsl:call-template name="division.toc"/>
@@ -149,7 +149,7 @@
   <xsl:if test="$generate.book.figure.lot != '0' and .//figure">
     <fo:page-sequence hyphenate="{$hyphenate}"
                       format="i"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -158,10 +158,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <fo:flow flow-name="xsl-region-body">
         <xsl:call-template name="list.of.titles">
@@ -175,7 +175,7 @@
   <xsl:if test="$generate.book.table.lot != '0' and .//table">
     <fo:page-sequence hyphenate="{$hyphenate}"
                       format="i"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -184,10 +184,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <fo:flow flow-name="xsl-region-body">
         <xsl:call-template name="list.of.titles">
@@ -201,7 +201,7 @@
   <xsl:if test="$generate.book.example.lot != '0' and .//example">
     <fo:page-sequence hyphenate="{$hyphenate}"
                       format="i"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -210,10 +210,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <fo:flow flow-name="xsl-region-body">
         <xsl:call-template name="list.of.titles">
@@ -227,7 +227,7 @@
   <xsl:if test="$generate.book.equation.lot != '0' and .//equation">
     <fo:page-sequence hyphenate="{$hyphenate}"
                       format="i"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -236,10 +236,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <fo:flow flow-name="xsl-region-body">
         <xsl:call-template name="list.of.titles">
@@ -266,13 +266,13 @@
     <xsl:variable name="id">
       <xsl:call-template name="object.id"/>
     </xsl:variable>
-    <xsl:variable name="master-name">
+    <xsl:variable name="master-reference">
       <xsl:call-template name="select.pagemaster"/>
     </xsl:variable>
 
     <fo:page-sequence id="{$id}"
                       hyphenate="{$hyphenate}"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -281,10 +281,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
@@ -310,13 +310,13 @@
       <xsl:with-param name="object" select="ancestor::part"/>
     </xsl:call-template>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -325,10 +325,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index 71becc221c03fe9b04d5de00d61f94ff82b677f0..8f30447c237a7a84551b3a3ba7f7e9acd6778816 100644 (file)
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -69,13 +69,13 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -84,10 +84,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/index.xsl b/xsl/fo/index.xsl
index 70054a84f82debcf7d174f282a216cdb5e7b89c5..7e50e2e34e02fa5b48ba4a0ddcdff3c044ff1fad 100644 (file)
--- a/xsl/fo/index.xsl
+++ b/xsl/fo/index.xsl
@@ -34,13 +34,13 @@
   <xsl:variable name="id">
     <xsl:call-template name="object.id"/>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -49,10 +49,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/pagesetup.xsl b/xsl/fo/pagesetup.xsl
index 57f26bbc89d2bf1cc277f89542ee34173df10dec..ac5aab14bedb63057458183a7d996819a48e1778 100644 (file)
--- a/xsl/fo/pagesetup.xsl
+++ b/xsl/fo/pagesetup.xsl
@@ -163,25 +163,25 @@
     <!-- setup for title-page, 1 column -->
     <fo:page-sequence-master master-name="titlepage1">
       <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-name="first1"/>
+        <fo:conditional-page-master-reference master-reference="first1"/>
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
 
     <!-- setup for single-sided, 1 column -->
     <fo:page-sequence-master master-name="oneside1">
       <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-name="simple1"/>
+        <fo:conditional-page-master-reference master-reference="simple1"/>
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
 
     <!-- setup for double-sided, 1 column -->
     <fo:page-sequence-master master-name="twoside1">
       <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-name="blank"
+        <fo:conditional-page-master-reference master-reference="blank"
                                               blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-name="right1"
+        <fo:conditional-page-master-reference master-reference="right1"
                                               odd-or-even="odd"/>
-        <fo:conditional-page-master-reference master-name="left1"
+        <fo:conditional-page-master-reference master-reference="left1"
                                               odd-or-even="even"/>
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
@@ -189,25 +189,25 @@
     <!-- setup for title-page, 2 column -->
     <fo:page-sequence-master master-name="titlepage2">
       <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-name="first2"/>
+        <fo:conditional-page-master-reference master-reference="first2"/>
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
 
     <!-- setup for single-sided, 2 column -->
     <fo:page-sequence-master master-name="oneside2">
       <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-name="simple2"/>
+        <fo:conditional-page-master-reference master-reference="simple2"/>
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
 
     <!-- setup for double-sided, 2 column -->
     <fo:page-sequence-master master-name="twoside2">
       <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-name="blank"
+        <fo:conditional-page-master-reference master-reference="blank"
                                               blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-name="right2"
+        <fo:conditional-page-master-reference master-reference="right2"
                                               odd-or-even="odd"/>
-        <fo:conditional-page-master-reference master-name="left2"
+        <fo:conditional-page-master-reference master-reference="left2"
                                               odd-or-even="even"/>
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
@@ -302,26 +302,26 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="*" mode="running.head.mode">
-  <xsl:param name="master-name" select="'unknown'"/>
+  <xsl:param name="master-reference" select="'unknown'"/>
   <!-- by default, nothing -->
   <xsl:choose>
-    <xsl:when test="$master-name='titlepage1'">
+    <xsl:when test="$master-reference='titlepage1'">
     </xsl:when>
-    <xsl:when test="$master-name='oneside1'">
+    <xsl:when test="$master-reference='oneside1'">
     </xsl:when>
-    <xsl:when test="$master-name='twoside1'">
+    <xsl:when test="$master-reference='twoside1'">
     </xsl:when>
-    <xsl:when test="$master-name='titlepage2'">
+    <xsl:when test="$master-reference='titlepage2'">
     </xsl:when>
-    <xsl:when test="$master-name='oneside2'">
+    <xsl:when test="$master-reference='oneside2'">
     </xsl:when>
-    <xsl:when test="$master-name='twoside2'">
+    <xsl:when test="$master-reference='twoside2'">
     </xsl:when>
   </xsl:choose>
 </xsl:template>
 
 <xsl:template match="chapter|appendix" mode="running.head.mode">
-  <xsl:param name="master-name" select="'unknown'"/>
+  <xsl:param name="master-reference" select="'unknown'"/>
   <xsl:variable name="head">
     <fo:block font-size="{$body.font.size}">
       <xsl:apply-templates select="." mode="object.title.markup"/>
@@ -329,15 +329,15 @@
   </xsl:variable>
 
   <xsl:choose>
-    <xsl:when test="$master-name='titlepage1'"></xsl:when>
-    <xsl:when test="$master-name='oneside1'">
+    <xsl:when test="$master-reference='titlepage1'"></xsl:when>
+    <xsl:when test="$master-reference='oneside1'">
       <fo:static-content flow-name="xsl-region-before">
         <fo:block text-align="center">
           <xsl:copy-of select="$head"/>
         </fo:block>
       </fo:static-content>
     </xsl:when>
-    <xsl:when test="$master-name='twoside1'">
+    <xsl:when test="$master-reference='twoside1'">
       <fo:static-content flow-name="xsl-region-before-left">
         <fo:block text-align="right">
           <xsl:copy-of select="$head"/>
@@ -349,15 +349,15 @@
         </fo:block>
       </fo:static-content>
     </xsl:when>
-    <xsl:when test="$master-name='titlepage2'"></xsl:when>
-    <xsl:when test="$master-name='oneside2'">
+    <xsl:when test="$master-reference='titlepage2'"></xsl:when>
+    <xsl:when test="$master-reference='oneside2'">
       <fo:static-content flow-name="xsl-region-before">
         <fo:block text-align="center">
           <xsl:copy-of select="$head"/>
         </fo:block>
       </fo:static-content>
     </xsl:when>
-    <xsl:when test="$master-name='twoside2'">
+    <xsl:when test="$master-reference='twoside2'">
       <fo:static-content flow-name="xsl-region-before-left">
         <fo:block text-align="right">
           <xsl:copy-of select="$head"/>
@@ -373,21 +373,21 @@
 </xsl:template>
 
 <xsl:template match="*" mode="running.foot.mode">
-  <xsl:param name="master-name" select="'unknown'"/>
+  <xsl:param name="master-reference" select="'unknown'"/>
   <xsl:variable name="foot">
     <fo:page-number/>
   </xsl:variable>
   <!-- by default, the page number -->
   <xsl:choose>
-    <xsl:when test="$master-name='titlepage1'"></xsl:when>
-    <xsl:when test="$master-name='oneside1'">
+    <xsl:when test="$master-reference='titlepage1'"></xsl:when>
+    <xsl:when test="$master-reference='oneside1'">
       <fo:static-content flow-name="xsl-region-after">
         <fo:block text-align="center" font-size="{$body.font.size}">
           <xsl:copy-of select="$foot"/>
         </fo:block>
       </fo:static-content>
     </xsl:when>
-    <xsl:when test="$master-name='twoside1'">
+    <xsl:when test="$master-reference='twoside1'">
       <fo:static-content flow-name="xsl-region-after-left">
         <fo:block text-align="left" font-size="{$body.font.size}">
           <xsl:copy-of select="$foot"/>
@@ -399,15 +399,15 @@
         </fo:block>
       </fo:static-content>
     </xsl:when>
-    <xsl:when test="$master-name='titlepage2'"></xsl:when>
-    <xsl:when test="$master-name='oneside2'">
+    <xsl:when test="$master-reference='titlepage2'"></xsl:when>
+    <xsl:when test="$master-reference='oneside2'">
       <fo:static-content flow-name="xsl-after-before">
         <fo:block text-align="center" font-size="{$body.font.size}">
           <xsl:copy-of select="$foot"/>
         </fo:block>
       </fo:static-content>
     </xsl:when>
-    <xsl:when test="$master-name='twoside2'">
+    <xsl:when test="$master-reference='twoside2'">
       <fo:static-content flow-name="xsl-region-after-left">
         <fo:block text-align="left" font-size="{$body.font.size}">
           <xsl:copy-of select="$foot"/>
@@ -421,8 +421,8 @@
     </xsl:when>
     <xsl:otherwise>
       <xsl:message>
-        <xsl:text>Unexpected master-name (</xsl:text>
-        <xsl:value-of select="$master-name"/>
+        <xsl:text>Unexpected master-reference (</xsl:text>
+        <xsl:value-of select="$master-reference"/>
         <xsl:text>) in running.foot.mode for </xsl:text>
         <xsl:value-of select="name(.)"/>
         <xsl:text>. No footer generated.</xsl:text>

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index b5a1a70458bab4f0955f109652d6eba1eac7000d..97fa5651e5356d72cc2d6a59235fd5cd3de20d6b 100644 (file)
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -20,13 +20,13 @@
     <xsl:variable name="id">
       <xsl:call-template name="object.id"/>
     </xsl:variable>
-    <xsl:variable name="master-name">
+    <xsl:variable name="master-reference">
       <xsl:call-template name="select.pagemaster"/>
     </xsl:variable>
 
     <fo:page-sequence id="{$id}"
                       hyphenate="{$hyphenate}"
-                      master-name="{$master-name}">
+                      master-reference="{$master-reference}">
       <xsl:attribute name="language">
         <xsl:call-template name="l10n.language"/>
       </xsl:attribute>
@@ -35,10 +35,10 @@
       </xsl:if>
 
       <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
       <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-name" select="$master-name"/>
+        <xsl:with-param name="master-reference" select="$master-reference"/>
       </xsl:apply-templates>
 
       <fo:flow flow-name="xsl-region-body">
@@ -59,13 +59,13 @@
       <xsl:with-param name="object" select="ancestor::reference"/>
     </xsl:call-template>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -74,10 +74,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
@@ -101,7 +101,7 @@
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
@@ -127,7 +127,7 @@
     <xsl:when test="not(parent::*) or parent::reference">
       <!-- make a page sequence -->
       <fo:page-sequence hyphenate="{$hyphenate}"
-                        master-name="{$master-name}">
+                        master-reference="{$master-reference}">
         <xsl:attribute name="language">
           <xsl:call-template name="l10n.language"/>
         </xsl:attribute>
@@ -136,10 +136,10 @@
         </xsl:if>
 
         <xsl:apply-templates select="." mode="running.head.mode">
-          <xsl:with-param name="master-name" select="$master-name"/>
+          <xsl:with-param name="master-reference" select="$master-reference"/>
         </xsl:apply-templates>
         <xsl:apply-templates select="." mode="running.foot.mode">
-          <xsl:with-param name="master-name" select="$master-name"/>
+          <xsl:with-param name="master-reference" select="$master-reference"/>
         </xsl:apply-templates>
 
         <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/sections.xsl b/xsl/fo/sections.xsl
index 3da5bd0556b83bdc9d1a84210d3161415260a225..464c6c9b54b6b16c7078ee0e87b5528cf5cb85ca 100644 (file)
--- a/xsl/fo/sections.xsl
+++ b/xsl/fo/sections.xsl
@@ -32,13 +32,13 @@
       <xsl:with-param name="object" select="ancestor::reference"/>
     </xsl:call-template>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -47,10 +47,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">
@@ -119,13 +119,13 @@
       <xsl:with-param name="object" select="ancestor::reference"/>
     </xsl:call-template>
   </xsl:variable>
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
   <fo:page-sequence id="{$id}"
                     hyphenate="{$hyphenate}"
-                    master-name="{$master-name}">
+                    master-reference="{$master-reference}">
     <xsl:attribute name="language">
       <xsl:call-template name="l10n.language"/>
     </xsl:attribute>
@@ -134,10 +134,10 @@
     </xsl:if>
 
     <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
     <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-name" select="$master-name"/>
+      <xsl:with-param name="master-reference" select="$master-reference"/>
     </xsl:apply-templates>
 
     <fo:flow flow-name="xsl-region-body">

diff --git a/xsl/fo/toc.xsl b/xsl/fo/toc.xsl
index 3893ccb3b98c41d5d6552e40bd48c52b332fa5ab..d913540c375f2da1fc869ad4bff0203aed9d4cab 100644 (file)
--- a/xsl/fo/toc.xsl
+++ b/xsl/fo/toc.xsl
@@ -19,7 +19,7 @@
      the case that a page-sequence is required. Is that true? -->
 
 <xsl:template match="toc">
-  <xsl:variable name="master-name">
+  <xsl:variable name="master-reference">
     <xsl:call-template name="select.pagemaster"/>
   </xsl:variable>
 
@@ -28,7 +28,7 @@
       <xsl:if test="$process.source.toc != 0">
         <!-- if the toc isn't empty, process it -->
         <fo:page-sequence hyphenate="{$hyphenate}"
-                          master-name="{$master-name}">
+                          master-reference="{$master-reference}">
           <xsl:attribute name="language">
             <xsl:call-template name="l10n.language"/>
           </xsl:attribute>
@@ -37,10 +37,10 @@
           </xsl:if>
 
           <xsl:apply-templates select="." mode="running.head.mode">
-            <xsl:with-param name="master-name" select="$master-name"/>
+            <xsl:with-param name="master-reference" select="$master-reference"/>
           </xsl:apply-templates>
           <xsl:apply-templates select="." mode="running.foot.mode">
-            <xsl:with-param name="master-name" select="$master-name"/>
+            <xsl:with-param name="master-reference" select="$master-reference"/>
           </xsl:apply-templates>
 
           <fo:flow flow-name="xsl-region-body">
@@ -55,7 +55,7 @@
     <xsl:otherwise>
       <xsl:if test="$process.empty.source.toc != 0">
         <fo:page-sequence hyphenate="{$hyphenate}"
-                          master-name="{$master-name}">
+                          master-reference="{$master-reference}">
           <xsl:attribute name="language">
             <xsl:call-template name="l10n.language"/>
           </xsl:attribute>
@@ -64,10 +64,10 @@
           </xsl:if>
 
           <xsl:apply-templates select="." mode="running.head.mode">
-            <xsl:with-param name="master-name" select="$master-name"/>
+            <xsl:with-param name="master-reference" select="$master-reference"/>
           </xsl:apply-templates>
           <xsl:apply-templates select="." mode="running.foot.mode">
-            <xsl:with-param name="master-name" select="$master-name"/>
+            <xsl:with-param name="master-reference" select="$master-reference"/>
           </xsl:apply-templates>
 
           <fo:flow flow-name="xsl-region-body">