synced with branch

master-name changed to master-reference

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194596 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/errors/foreign.fo b/test/errors/foreign.fo
index 31833717fecb17a7bc32ea840f3a4372d56f63ac..cc77c241d58374fd4cee586dee41e0f5eab76b09 100644 (file)
--- a/test/errors/foreign.fo
+++ b/test/errors/foreign.fo
@@ -15,7 +15,7 @@
     </fo:simple-page-master>
   </fo:layout-master-set>
 
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block line-height="14pt" font-size="10pt"
     text-align="end">Embedding SVG examples</fo:block>

diff --git a/test/errors/inavliddoc.fo b/test/errors/inavliddoc.fo
index c12f23f8240d7fb10fdca41b158eb6dccdf69c6d..23b6ede303fd333ab1c707c74c3d2f2678b37d44 100644 (file)
--- a/test/errors/inavliddoc.fo
+++ b/test/errors/inavliddoc.fo
@@ -2,7 +2,7 @@
 
        <!-- defines page layout -->
        <fo:layout-master-set>
-               <fo:simple-page-master master-name="first"
+               <fo:simple-page-master master-reference="first"
                                                                                                         page-height="29.7cm" page-width="21cm"
                                                                                                         margin-top="1cm"
                                                                                                         margin-bottom="2cm"

diff --git a/test/errors/inavlidxml2.fo b/test/errors/inavlidxml2.fo
index 2e7c583c12da48813fabea0b51c24d28bc649191..4ff0a6941d964d27d9400cbd05b8a07b6c64df43 100644 (file)
--- a/test/errors/inavlidxml2.fo
+++ b/test/errors/inavlidxml2.fo
@@ -19,7 +19,7 @@ fegsdfgdsgfsdgf
   <!-- end: defines page layout -->
 
   <!-- actual layout -->
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">
 
     <!-- text body -->
     <fo:flow flow-name="xsl-region-body">

diff --git a/test/errors/unknown.fo b/test/errors/unknown.fo
index 490a6375b82c6a2f44660841ac01505ca4d6888c..a1ad313d8bda964601f89c0731a8f1783599f541 100644 (file)
--- a/test/errors/unknown.fo
+++ b/test/errors/unknown.fo
@@ -15,7 +15,7 @@
     </fo:simple-page-master>
   </fo:layout-master-set>
 
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">
     <fo:flow source-document="a" flow-name="xsl-region-body">
 
       <fo:block source-document="inherit" space-before.optimum="3pt" space-after.optimum="15pt">

diff --git a/test/xml/bugtests/charwidth.fo b/test/xml/bugtests/charwidth.fo
index 15772a4bc67426c3b7069308ea3b730b9ae70a43..6fd9178fe52801a99b1b8eab4d4143a716b85ac7 100644 (file)
--- a/test/xml/bugtests/charwidth.fo
+++ b/test/xml/bugtests/charwidth.fo
@@ -5,7 +5,7 @@
                <fo:region-body margin-bottom="30pt" margin-top="30pt"/>
                </fo:simple-page-master>
        </fo:layout-master-set>
-       <fo:page-sequence master-name="one">
+       <fo:page-sequence master-reference="one">
                <fo:flow font-size="12pt" flow-name="xsl-region-body">
                        <fo:block>
                                This file contains a list of many characters in various fonts. The text is

diff --git a/test/xml/bugtests/external-graphic.fo b/test/xml/bugtests/external-graphic.fo
index ec7e1d1781b9042ee4da9ea33528fb95ca415b81..34229b9a047a2b2a5598453c14f85273352b919e 100644 (file)
--- a/test/xml/bugtests/external-graphic.fo
+++ b/test/xml/bugtests/external-graphic.fo
@@ -12,7 +12,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                <fo:external-graphic src="file:../graphics/page.gif"/>

diff --git a/test/xml/bugtests/image.fo b/test/xml/bugtests/image.fo
index 8c5b3c7c66d1dfb84f3e2586e104d9099013348f..287b7d35e7ba014c6cf9b62f8ba3ce06da95060a 100644 (file)
--- a/test/xml/bugtests/image.fo
+++ b/test/xml/bugtests/image.fo
@@ -12,7 +12,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block>
                                <fo:external-graphic src="file:../graphics/page.gif"/>

diff --git a/test/xml/bugtests/list-mountjoy.fo b/test/xml/bugtests/list-mountjoy.fo
index 6ee1fa5ae4081abb03d0a6d59711d96b39ed666c..752034aaa137e5edddabd62f8a4d3d6578b2a4d5 100644 (file)
--- a/test/xml/bugtests/list-mountjoy.fo
+++ b/test/xml/bugtests/list-mountjoy.fo
@@ -16,7 +16,7 @@
   </fo:layout-master-set>
 
   <!-- starts actual layout -->
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">
 
   <!-- Inserts a header with the page number -->
   <fo:static-content flow-name="xsl-region-before">

diff --git a/test/xml/bugtests/list-nested-breaks.fo b/test/xml/bugtests/list-nested-breaks.fo
index 1e7742d89d0a55330417310f43f6af88f8e768ff..c2ec3a7e838e151d1a6d2f27528d86ecc6a3ede8 100644 (file)
--- a/test/xml/bugtests/list-nested-breaks.fo
+++ b/test/xml/bugtests/list-nested-breaks.fo
@@ -16,7 +16,7 @@
   </fo:layout-master-set>
 
   <!-- starts actual layout -->
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">
 
   <!-- Inserts a header with the page number -->
   <fo:static-content flow-name="xsl-region-before">

diff --git a/test/xml/bugtests/list-nested.fo b/test/xml/bugtests/list-nested.fo
index c7f5c70572884927240269b5dd7b2b4e37dfce1b..1c3768d2c38818d6fb1cae39962365c20d9ac3d8 100644 (file)
--- a/test/xml/bugtests/list-nested.fo
+++ b/test/xml/bugtests/list-nested.fo
@@ -16,7 +16,7 @@
   </fo:layout-master-set>
 
   <!-- starts actual layout -->
-  <fo:page-sequence master-name="first">
+  <fo:page-sequence master-reference="first">
 
   <!-- Inserts a header with the page number -->
   <fo:static-content flow-name="xsl-region-before">

diff --git a/test/xml/bugtests/simple-link.fo b/test/xml/bugtests/simple-link.fo
index 75f22ee592c1c28c936b90b3f4862aa282687757..017ba31ab876bcf0ce370cb3af2d4680b85e7333 100644 (file)
--- a/test/xml/bugtests/simple-link.fo
+++ b/test/xml/bugtests/simple-link.fo
@@ -14,7 +14,7 @@
            </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
                        <fo:block text-align="start">
                                <fo:basic-link external-destination="font.pdf">Link to font.pdf</fo:basic-link>

diff --git a/test/xml/bugtests/wrap.fo b/test/xml/bugtests/wrap.fo
index c1e4b6272cb205bbb42b9eb7b0569ddf55d9b352..235082da1c60e3d5e5445c7ad4bef5edd7235ed1 100644 (file)
--- a/test/xml/bugtests/wrap.fo
+++ b/test/xml/bugtests/wrap.fo
@@ -25,7 +25,7 @@
       </fo:simple-page-master>
        </fo:layout-master-set>
 
-       <fo:page-sequence master-name="simplePM">
+       <fo:page-sequence master-reference="simplePM">
            <fo:flow flow-name="xsl-region-body">
       <fo:block>
 This test is to check a number of different possibilities when dealing with
@@ -120,7 +120,7 @@ words with hypenation the activated when not doing lots of wrapping
 </fo:table>
                </fo:flow>
        </fo:page-sequence>
-  <fo:page-sequence master-name="no-overflow">
+  <fo:page-sequence master-reference="no-overflow">
       <fo:flow flow-name="xsl-region-body">
       <fo:block wrap-option="no-wrap">
         <fo:inline>This is a simple fo block.This is a simple fo block.This is a simple fo block.</fo:inline>

diff --git a/test/xsl/doc.xsl b/test/xsl/doc.xsl
index 71a2cc434d0fd4266bb6d2357bb585abd629176d..e6a34c69b5076591aafe4f3817810d176c238eb2 100644 (file)
--- a/test/xsl/doc.xsl
+++ b/test/xsl/doc.xsl
@@ -10,7 +10,7 @@
                                        <fo:region-after extent="1.5cm"/>
                                </fo:simple-page-master>
                        </fo:layout-master-set>
-                       <fo:page-sequence master-name="one">
+                       <fo:page-sequence master-reference="one">
                                <fo:flow font-size="10pt" line-height="10pt" flow-name="xsl-region-body">
                                        <xsl:apply-templates select="data"/>
                                </fo:flow>