patch 81654 updates docbook per

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

10 files changed, 93 insertions, 91 deletions

diff --git a/lib/docbook/docbook-xsl/fo/biblio.xsl b/lib/docbook/docbook-xsl/fo/biblio.xsl
index 806ad94c5..0c77d944d 100644
--- a/lib/docbook/docbook-xsl/fo/biblio.xsl
+++ b/lib/docbook/docbook-xsl/fo/biblio.xsl
@@ -37,7 +37,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

diff --git a/lib/docbook/docbook-xsl/fo/component.xsl b/lib/docbook/docbook-xsl/fo/component.xsl
index ad97930c1..6d2261d7a 100644
--- 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}"

                     hyphenate="{$hyphenate}"

                     format="i"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

@@ -114,7 +114,7 @@
   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

                     format="i"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

@@ -153,7 +153,7 @@
   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

                     format="i"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

@@ -194,7 +194,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

@@ -238,7 +238,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

@@ -347,7 +347,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

diff --git a/lib/docbook/docbook-xsl/fo/division.xsl b/lib/docbook/docbook-xsl/fo/division.xsl
index 623740720..6bf12777e 100644
--- a/lib/docbook/docbook-xsl/fo/division.xsl
+++ b/lib/docbook/docbook-xsl/fo/division.xsl
@@ -57,7 +57,7 @@
   <xsl:if test="$preamble">

     <fo:page-sequence id="{$id}"

                       hyphenate="{$hyphenate}"

-                      master-name="{$master-name}">

+                      master-reference="{$master-name}">

       <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-name"/>

       </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-name"/>

       </xsl:apply-templates>

       <fo:flow flow-name="xsl-region-body">

         <xsl:call-template name="set.titlepage"/>

@@ -103,7 +103,7 @@
   <xsl:if test="$preamble">

     <fo:page-sequence id="{$id}"

                       hyphenate="{$hyphenate}"

-                      master-name="{$master-name}">

+                      master-reference="{$master-name}">

       <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-name"/>

       </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-name"/>

       </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-name}">

       <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-name"/>

       </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-name"/>

       </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-name}">

       <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-name"/>

       </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-name"/>

       </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-name}">

       <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-name"/>

       </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-name"/>

       </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-name}">

       <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-name"/>

       </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-name"/>

       </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-name}">

       <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-name"/>

       </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-name"/>

       </xsl:apply-templates>

       <fo:flow flow-name="xsl-region-body">

         <xsl:call-template name="list.of.titles">

@@ -272,7 +272,7 @@
 

     <fo:page-sequence id="{$id}"

                       hyphenate="{$hyphenate}"

-                      master-name="{$master-name}">

+                      master-reference="{$master-name}">

       <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-name"/>

       </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-name"/>

       </xsl:apply-templates>

 

       <fo:flow flow-name="xsl-region-body">

@@ -316,7 +316,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

diff --git a/lib/docbook/docbook-xsl/fo/glossary.xsl b/lib/docbook/docbook-xsl/fo/glossary.xsl
index eef602237..7ddbd3c19 100644
--- a/lib/docbook/docbook-xsl/fo/glossary.xsl
+++ b/lib/docbook/docbook-xsl/fo/glossary.xsl
@@ -75,7 +75,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

diff --git a/lib/docbook/docbook-xsl/fo/index.xsl b/lib/docbook/docbook-xsl/fo/index.xsl
index e2d5ed8dd..05ac09ba2 100644
--- a/lib/docbook/docbook-xsl/fo/index.xsl
+++ b/lib/docbook/docbook-xsl/fo/index.xsl
@@ -40,7 +40,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

diff --git a/lib/docbook/docbook-xsl/fo/pagesetup.xsl b/lib/docbook/docbook-xsl/fo/pagesetup.xsl
index 4b9663424..4aa04dd5a 100644
--- 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 -->

     <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>

@@ -428,4 +428,4 @@
 

 <!-- ==================================================================== -->

 

-</xsl:stylesheet>

+</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 2dd5efb7c..2bec5ea59 100644
--- a/lib/docbook/docbook-xsl/fo/refentry.xsl
+++ b/lib/docbook/docbook-xsl/fo/refentry.xsl
@@ -26,7 +26,7 @@
 

     <fo:page-sequence id="{$id}"

                       hyphenate="{$hyphenate}"

-                      master-name="{$master-name}">

+                      master-reference="{$master-name}">

       <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-name"/>

       </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-name"/>

       </xsl:apply-templates>

 

       <fo:flow flow-name="xsl-region-body">

@@ -65,7 +65,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

@@ -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-name}">

         <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-name"/>

         </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-name"/>

         </xsl:apply-templates>

 

         <fo:flow flow-name="xsl-region-body">

diff --git a/lib/docbook/docbook-xsl/fo/sections.xsl b/lib/docbook/docbook-xsl/fo/sections.xsl
index 5449f410d..a0294b820 100644
--- a/lib/docbook/docbook-xsl/fo/sections.xsl
+++ b/lib/docbook/docbook-xsl/fo/sections.xsl
@@ -38,7 +38,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

@@ -125,7 +125,7 @@
 

   <fo:page-sequence id="{$id}"

                     hyphenate="{$hyphenate}"

-                    master-name="{$master-name}">

+                    master-reference="{$master-name}">

     <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-name"/>

     </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-name"/>

     </xsl:apply-templates>

 

     <fo:flow flow-name="xsl-region-body">

diff --git a/lib/docbook/docbook-xsl/fo/table.xsl b/lib/docbook/docbook-xsl/fo/table.xsl
index 13f27fc0a..ca2f5314b 100644
--- 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>

     </xsl:choose>

   </xsl:variable>

-

+  

   <xsl:variable name="colspecs">

     <xsl:choose>

       <xsl:when test="$use.extensions != 0

@@ -124,10 +124,12 @@ to be incomplete. Don't forget to read the source, too :-)</para>
       </xsl:otherwise>

     </xsl:choose>

   </xsl:variable>

-

-  <xsl:attribute name="width">

-    <xsl:value-of select="$table.width"/>

-  </xsl:attribute>

+  

+  <xsl:if test="position() = 1">

+  	<xsl:attribute name="width">

+      <xsl:value-of select="$table.width"/>

+  	</xsl:attribute>

+  </xsl:if>

 

   <xsl:choose>

     <xsl:when test="$use.extensions != 0

diff --git a/lib/docbook/docbook-xsl/fo/toc.xsl b/lib/docbook/docbook-xsl/fo/toc.xsl
index 68ff937d3..bc2313f8c 100644
--- 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">

         <!-- if the toc isn't empty, process it -->

         <fo:page-sequence hyphenate="{$hyphenate}"

-                          master-name="{$master-name}">

+                          master-reference="{$master-name}">

           <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-name"/>

           </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-name"/>

           </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-name}">

           <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-name"/>

           </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-name"/>

           </xsl:apply-templates>

 

           <fo:flow flow-name="xsl-region-body">