patch 81654 updates docbook per

http://xml.apache.org/fop/faq.html#no-page-master
(oops - I made .xsl files binary)

diff --git a/lib/docbook/docbook-xsl/fo/biblio.xsl b/lib/docbook/docbook-xsl/fo/biblio.xsl
index 806ad94c5557472b71275a6c2c831d553690cbcd..0c77d944dc2673ae4c486a8744ffb401d8181581 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/biblio.xsl
+++ b/lib/docbook/docbook-xsl/fo/biblio.xsl
@@ -37,7 +37,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -46,10 +46,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r

diff --git a/lib/docbook/docbook-xsl/fo/component.xsl b/lib/docbook/docbook-xsl/fo/component.xsl
index ad97930c160e8b098de01d001062f3d1e06ee368..6d2261d7ad340640bdb03535a562b989941549d7 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/component.xsl
+++ b/lib/docbook/docbook-xsl/fo/component.xsl
@@ -73,7 +73,7 @@
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
                     format="i"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -82,10 +82,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r
@@ -114,7 +114,7 @@
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
                     format="i"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -123,10 +123,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r
@@ -153,7 +153,7 @@
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
                     format="i"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -162,10 +162,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r
@@ -194,7 +194,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -206,10 +206,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r
@@ -238,7 +238,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -247,10 +247,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r
@@ -347,7 +347,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -356,10 +356,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r

diff --git a/lib/docbook/docbook-xsl/fo/division.xsl b/lib/docbook/docbook-xsl/fo/division.xsl
index 6237407201dfee5c52ae04f5f099660712d3262a..6bf12777e3078feb3412bde800ecba2857a263e1 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/division.xsl
+++ b/lib/docbook/docbook-xsl/fo/division.xsl
@@ -57,7 +57,7 @@
   <xsl:if test="$preamble">\r
     <fo:page-sequence id="{$id}"\r
                       hyphenate="{$hyphenate}"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -66,10 +66,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <fo:flow flow-name="xsl-region-body">\r
         <xsl:call-template name="set.titlepage"/>\r
@@ -103,7 +103,7 @@
   <xsl:if test="$preamble">\r
     <fo:page-sequence id="{$id}"\r
                       hyphenate="{$hyphenate}"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -112,10 +112,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <fo:flow flow-name="xsl-region-body">\r
         <xsl:call-template name="book.titlepage"/>\r
@@ -126,7 +126,7 @@
   <xsl:if test="$generate.book.toc != '0'">\r
     <fo:page-sequence hyphenate="{$hyphenate}"\r
                       format="i"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -135,10 +135,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <fo:flow flow-name="xsl-region-body">\r
         <xsl:call-template name="division.toc"/>\r
@@ -149,7 +149,7 @@
   <xsl:if test="$generate.book.figure.lot != '0' and .//figure">\r
     <fo:page-sequence hyphenate="{$hyphenate}"\r
                       format="i"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -158,10 +158,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <fo:flow flow-name="xsl-region-body">\r
         <xsl:call-template name="list.of.titles">\r
@@ -175,7 +175,7 @@
   <xsl:if test="$generate.book.table.lot != '0' and .//table">\r
     <fo:page-sequence hyphenate="{$hyphenate}"\r
                       format="i"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -184,10 +184,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <fo:flow flow-name="xsl-region-body">\r
         <xsl:call-template name="list.of.titles">\r
@@ -201,7 +201,7 @@
   <xsl:if test="$generate.book.example.lot != '0' and .//example">\r
     <fo:page-sequence hyphenate="{$hyphenate}"\r
                       format="i"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -210,10 +210,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <fo:flow flow-name="xsl-region-body">\r
         <xsl:call-template name="list.of.titles">\r
@@ -227,7 +227,7 @@
   <xsl:if test="$generate.book.equation.lot != '0' and .//equation">\r
     <fo:page-sequence hyphenate="{$hyphenate}"\r
                       format="i"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -236,10 +236,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <fo:flow flow-name="xsl-region-body">\r
         <xsl:call-template name="list.of.titles">\r
@@ -272,7 +272,7 @@
 \r
     <fo:page-sequence id="{$id}"\r
                       hyphenate="{$hyphenate}"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -281,10 +281,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
 \r
       <fo:flow flow-name="xsl-region-body">\r
@@ -316,7 +316,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -325,10 +325,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r

diff --git a/lib/docbook/docbook-xsl/fo/glossary.xsl b/lib/docbook/docbook-xsl/fo/glossary.xsl
index eef6022374a2375d00f6b21415094f8c0f671163..7ddbd3c194b1d7e9f2507ec10c3ca371b3fe369f 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/glossary.xsl
+++ b/lib/docbook/docbook-xsl/fo/glossary.xsl
@@ -75,7 +75,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -84,10 +84,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r

diff --git a/lib/docbook/docbook-xsl/fo/index.xsl b/lib/docbook/docbook-xsl/fo/index.xsl
index e2d5ed8dd49c32bf54362cf0907957a8b1aafc46..05ac09ba2a89659bb6e9bdb496534e318efaa787 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/index.xsl
+++ b/lib/docbook/docbook-xsl/fo/index.xsl
@@ -40,7 +40,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -49,10 +49,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r

diff --git a/lib/docbook/docbook-xsl/fo/pagesetup.xsl b/lib/docbook/docbook-xsl/fo/pagesetup.xsl
index 4b96634243c3e8f9a3c1f82db0607120e8961027..4aa04dd5adcd1960fac0062e8056a5ab99bd117f 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/pagesetup.xsl
+++ b/lib/docbook/docbook-xsl/fo/pagesetup.xsl
@@ -163,25 +163,25 @@
     <!-- setup for title-page, 1 column -->\r
     <fo:page-sequence-master master-name="titlepage1">\r
       <fo:repeatable-page-master-alternatives>\r
-        <fo:conditional-page-master-reference master-name="first1"/>\r
+        <fo:conditional-page-master-reference master-reference="first1"/>\r
       </fo:repeatable-page-master-alternatives>\r
     </fo:page-sequence-master>\r
 \r
     <!-- setup for single-sided, 1 column -->\r
     <fo:page-sequence-master master-name="oneside1">\r
       <fo:repeatable-page-master-alternatives>\r
-        <fo:conditional-page-master-reference master-name="simple1"/>\r
+        <fo:conditional-page-master-reference master-reference="simple1"/>\r
       </fo:repeatable-page-master-alternatives>\r
     </fo:page-sequence-master>\r
 \r
     <!-- setup for double-sided, 1 column -->\r
     <fo:page-sequence-master master-name="twoside1">\r
       <fo:repeatable-page-master-alternatives>\r
-        <fo:conditional-page-master-reference master-name="blank"\r
+        <fo:conditional-page-master-reference master-reference="blank"\r
                                               blank-or-not-blank="blank"/>\r
-        <fo:conditional-page-master-reference master-name="right1"\r
+        <fo:conditional-page-master-reference master-reference="right1"\r
                                               odd-or-even="odd"/>\r
-        <fo:conditional-page-master-reference master-name="left1"\r
+        <fo:conditional-page-master-reference master-reference="left1"\r
                                               odd-or-even="even"/>\r
       </fo:repeatable-page-master-alternatives>\r
     </fo:page-sequence-master>\r
@@ -189,25 +189,25 @@
     <!-- setup for title-page, 2 column -->\r
     <fo:page-sequence-master master-name="titlepage2">\r
       <fo:repeatable-page-master-alternatives>\r
-        <fo:conditional-page-master-reference master-name="first2"/>\r
+        <fo:conditional-page-master-reference master-reference="first2"/>\r
       </fo:repeatable-page-master-alternatives>\r
     </fo:page-sequence-master>\r
 \r
     <!-- setup for single-sided, 2 column -->\r
     <fo:page-sequence-master master-name="oneside2">\r
       <fo:repeatable-page-master-alternatives>\r
-        <fo:conditional-page-master-reference master-name="simple2"/>\r
+        <fo:conditional-page-master-reference master-reference="simple2"/>\r
       </fo:repeatable-page-master-alternatives>\r
     </fo:page-sequence-master>\r
 \r
     <!-- setup for double-sided, 2 column -->\r
     <fo:page-sequence-master master-name="twoside2">\r
       <fo:repeatable-page-master-alternatives>\r
-        <fo:conditional-page-master-reference master-name="blank"\r
+        <fo:conditional-page-master-reference master-reference="blank"\r
                                               blank-or-not-blank="blank"/>\r
-        <fo:conditional-page-master-reference master-name="right2"\r
+        <fo:conditional-page-master-reference master-reference="right2"\r
                                               odd-or-even="odd"/>\r
-        <fo:conditional-page-master-reference master-name="left2"\r
+        <fo:conditional-page-master-reference master-reference="left2"\r
                                               odd-or-even="even"/>\r
       </fo:repeatable-page-master-alternatives>\r
     </fo:page-sequence-master>\r
@@ -428,4 +428,4 @@
 \r
 <!-- ==================================================================== -->\r
 \r
-</xsl:stylesheet>\r
+</xsl:stylesheet>
\ No newline at end of file

diff --git a/lib/docbook/docbook-xsl/fo/refentry.xsl b/lib/docbook/docbook-xsl/fo/refentry.xsl
index 2dd5efb7ccb7b18abdb0dc419b1385b51900dcf3..2bec5ea59c0d8db459ea256d058b5d04e647171e 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/refentry.xsl
+++ b/lib/docbook/docbook-xsl/fo/refentry.xsl
@@ -26,7 +26,7 @@
 \r
     <fo:page-sequence id="{$id}"\r
                       hyphenate="{$hyphenate}"\r
-                      master-name="{$master-name}">\r
+                      master-reference="{$master-name}">\r
       <xsl:attribute name="language">\r
         <xsl:call-template name="l10n.language"/>\r
       </xsl:attribute>\r
@@ -35,10 +35,10 @@
       </xsl:if>\r
 \r
       <xsl:apply-templates select="." mode="running.head.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
       <xsl:apply-templates select="." mode="running.foot.mode">\r
-        <xsl:with-param name="master-name" select="$master-name"/>\r
+        <xsl:with-param name="master-reference" select="$master-name"/>\r
       </xsl:apply-templates>\r
 \r
       <fo:flow flow-name="xsl-region-body">\r
@@ -65,7 +65,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -74,10 +74,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r
@@ -127,7 +127,7 @@
     <xsl:when test="not(parent::*) or parent::reference">\r
       <!-- make a page sequence -->\r
       <fo:page-sequence hyphenate="{$hyphenate}"\r
-                        master-name="{$master-name}">\r
+                        master-reference="{$master-name}">\r
         <xsl:attribute name="language">\r
           <xsl:call-template name="l10n.language"/>\r
         </xsl:attribute>\r
@@ -136,10 +136,10 @@
         </xsl:if>\r
 \r
         <xsl:apply-templates select="." mode="running.head.mode">\r
-          <xsl:with-param name="master-name" select="$master-name"/>\r
+          <xsl:with-param name="master-reference" select="$master-name"/>\r
         </xsl:apply-templates>\r
         <xsl:apply-templates select="." mode="running.foot.mode">\r
-          <xsl:with-param name="master-name" select="$master-name"/>\r
+          <xsl:with-param name="master-reference" select="$master-name"/>\r
         </xsl:apply-templates>\r
 \r
         <fo:flow flow-name="xsl-region-body">\r

diff --git a/lib/docbook/docbook-xsl/fo/sections.xsl b/lib/docbook/docbook-xsl/fo/sections.xsl
index 5449f410df3b24984de84ad21c74e0c956d99b80..a0294b820a908fad1e3d1318fb1dfdb85d05a831 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/sections.xsl
+++ b/lib/docbook/docbook-xsl/fo/sections.xsl
@@ -38,7 +38,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -47,10 +47,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r
@@ -125,7 +125,7 @@
 \r
   <fo:page-sequence id="{$id}"\r
                     hyphenate="{$hyphenate}"\r
-                    master-name="{$master-name}">\r
+                    master-reference="{$master-name}">\r
     <xsl:attribute name="language">\r
       <xsl:call-template name="l10n.language"/>\r
     </xsl:attribute>\r
@@ -134,10 +134,10 @@
     </xsl:if>\r
 \r
     <xsl:apply-templates select="." mode="running.head.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
     <xsl:apply-templates select="." mode="running.foot.mode">\r
-      <xsl:with-param name="master-name" select="$master-name"/>\r
+      <xsl:with-param name="master-reference" select="$master-name"/>\r
     </xsl:apply-templates>\r
 \r
     <fo:flow flow-name="xsl-region-body">\r

diff --git a/lib/docbook/docbook-xsl/fo/table.xsl b/lib/docbook/docbook-xsl/fo/table.xsl
index 13f27fc0aa09de14844f1ac392c776f27506f36a..ca2f5314b1a42225c5b3f3b02ead9ea8d6148dc7 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/table.xsl
+++ b/lib/docbook/docbook-xsl/fo/table.xsl
@@ -108,7 +108,7 @@ to be incomplete. Don't forget to read the source, too :-)</para>
       </xsl:otherwise>\r
     </xsl:choose>\r
   </xsl:variable>\r
-\r
+  \r
   <xsl:variable name="colspecs">\r
     <xsl:choose>\r
       <xsl:when test="$use.extensions != 0\r
@@ -124,10 +124,12 @@ to be incomplete. Don't forget to read the source, too :-)</para>
       </xsl:otherwise>\r
     </xsl:choose>\r
   </xsl:variable>\r
-\r
-  <xsl:attribute name="width">\r
-    <xsl:value-of select="$table.width"/>\r
-  </xsl:attribute>\r
+  \r
+  <xsl:if test="position() = 1">\r
+       <xsl:attribute name="width">\r
+      <xsl:value-of select="$table.width"/>\r
+       </xsl:attribute>\r
+  </xsl:if>\r
 \r
   <xsl:choose>\r
     <xsl:when test="$use.extensions != 0\r

diff --git a/lib/docbook/docbook-xsl/fo/toc.xsl b/lib/docbook/docbook-xsl/fo/toc.xsl
index 68ff937d3ab46bec23ec65d6747ee5539ef29984..bc2313f8c27d566e9992967eb1e89239d25e9564 100644 (file)
--- a/lib/docbook/docbook-xsl/fo/toc.xsl
+++ b/lib/docbook/docbook-xsl/fo/toc.xsl
@@ -28,7 +28,7 @@
       <xsl:if test="$process.source.toc != 0">\r
         <!-- if the toc isn't empty, process it -->\r
         <fo:page-sequence hyphenate="{$hyphenate}"\r
-                          master-name="{$master-name}">\r
+                          master-reference="{$master-name}">\r
           <xsl:attribute name="language">\r
             <xsl:call-template name="l10n.language"/>\r
           </xsl:attribute>\r
@@ -37,10 +37,10 @@
           </xsl:if>\r
 \r
           <xsl:apply-templates select="." mode="running.head.mode">\r
-            <xsl:with-param name="master-name" select="$master-name"/>\r
+            <xsl:with-param name="master-reference" select="$master-name"/>\r
           </xsl:apply-templates>\r
           <xsl:apply-templates select="." mode="running.foot.mode">\r
-            <xsl:with-param name="master-name" select="$master-name"/>\r
+            <xsl:with-param name="master-reference" select="$master-name"/>\r
           </xsl:apply-templates>\r
 \r
           <fo:flow flow-name="xsl-region-body">\r
@@ -55,7 +55,7 @@
     <xsl:otherwise>\r
       <xsl:if test="$process.empty.source.toc != 0">\r
         <fo:page-sequence hyphenate="{$hyphenate}"\r
-                          master-name="{$master-name}">\r
+                          master-reference="{$master-name}">\r
           <xsl:attribute name="language">\r
             <xsl:call-template name="l10n.language"/>\r
           </xsl:attribute>\r
@@ -64,10 +64,10 @@
           </xsl:if>\r
 \r
           <xsl:apply-templates select="." mode="running.head.mode">\r
-            <xsl:with-param name="master-name" select="$master-name"/>\r
+            <xsl:with-param name="master-reference" select="$master-name"/>\r
           </xsl:apply-templates>\r
           <xsl:apply-templates select="." mode="running.foot.mode">\r
-            <xsl:with-param name="master-name" select="$master-name"/>\r
+            <xsl:with-param name="master-reference" select="$master-name"/>\r
           </xsl:apply-templates>\r
 \r
           <fo:flow flow-name="xsl-region-body">\r