applied fix from #60143 and rebuilt the FO test outputs Daniel

* libxslt/pattern.c tests/docbook/result/fo/*: applied fix from
  #60143 and rebuilt the FO test outputs
Daniel

ChangeLog

@@ -1,3 +1,8 @@
+Mon Sep 10 22:52:44 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* libxslt/pattern.c tests/docbook/result/fo/*: applied fix from
+	  #60143 and rebuilt the FO test outputs
+
 Mon Sep 10 19:38:54 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
 	* libxslt/attributes.c libxslt/transform.c: fixed bug #59757

libxslt/pattern.c

@@ -381,7 +381,7 @@ xsltTestCompMatch(xsltTransformContextPtr ctxt, xsltCompMatchPtr comp,
             case XSLT_OP_ROOT:
 		if ((node->type == XML_DOCUMENT_NODE) ||
 #ifdef LIBXML_DOCB_ENABLED
-		    (node->type != XML_DOCB_DOCUMENT_NODE) ||
+		    (node->type == XML_DOCB_DOCUMENT_NODE) ||
 #endif
 		    (node->type == XML_HTML_DOCUMENT_NODE))
 		    continue;
@@ -759,6 +759,9 @@ wrong_index:
 		switch (node->type) {
 		    case XML_DOCUMENT_NODE:
 		    case XML_HTML_DOCUMENT_NODE:
+#ifdef LIBXML_DOCB_ENABLED
+		    case XML_DOCB_DOCUMENT_NODE:
+#endif
 		    case XML_ELEMENT_NODE:
 		    case XML_CDATA_SECTION_NODE:
 		    case XML_PI_NODE:

tests/docbook/result/fo/article.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2600807" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2755676" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -138,8 +138,8 @@ This article is just a test. This article is just a test.
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This para contains an <fo:basic-link internal-destination="testfig2">link</fo:basic-link> to a 
 figure.
 </fo:block>
-      <fo:list-block id="id2758679" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+      <fo:list-block id="id2759261" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-        <fo:list-item id="id2758685" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759267" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -147,7 +147,7 @@ figure.
             <fo:block>Test item.</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2758695" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759277" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -155,7 +155,7 @@ figure.
             <fo:block>Test item.</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2758706" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759288" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -164,8 +164,8 @@ figure.
           </fo:list-item-body>
         </fo:list-item>
       </fo:list-block>
-      <fo:list-block id="id2758718" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
+      <fo:list-block id="id2759300" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2em" provisional-label-separation="0.2em">
-        <fo:list-item id="id2758736" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759318" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>1.</fo:block>
           </fo:list-item-label>
@@ -173,7 +173,7 @@ figure.
             <fo:block>Test item.</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2758747" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759329" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>2.</fo:block>
           </fo:list-item-label>
@@ -181,7 +181,7 @@ figure.
             <fo:block>Test item.</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2758757" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759339" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>3.</fo:block>
           </fo:list-item-label>
@@ -196,13 +196,7 @@ This article is just a test. This article is just a test.
 This article is just a test. This article is just a test. 
 This article is just a test. This article is just a test. 
 </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2759364">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -210,13 +204,7 @@ This article is just a test. This article is just a test.
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+        <fo:block id="id2759376">
-            <fo:static-content flow-name="xsl-region-after">
-              <fo:block text-align="center" font-size="10pt">
-                <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-              </fo:block>
-            </fo:static-content>
-            <fo:flow flow-name="xsl-region-body">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -224,13 +212,7 @@ This article is just a test. This article is just a test.
               </fo:block>
             </fo:block>
           </fo:block>
-              <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+          <fo:block id="id2759388">
-                <fo:static-content flow-name="xsl-region-after">
-                  <fo:block text-align="center" font-size="10pt">
-                    <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                  </fo:block>
-                </fo:static-content>
-                <fo:flow flow-name="xsl-region-body">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
               <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                 <fo:block keep-with-next.within-column="always">
@@ -238,13 +220,7 @@ This article is just a test. This article is just a test.
                 </fo:block>
               </fo:block>
             </fo:block>
-                  <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+            <fo:block id="id2759399">
-                    <fo:static-content flow-name="xsl-region-after">
-                      <fo:block text-align="center" font-size="10pt">
-                        <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                      </fo:block>
-                    </fo:static-content>
-                    <fo:flow flow-name="xsl-region-body">
               <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
                 <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                   <fo:block keep-with-next.within-column="always">
@@ -252,13 +228,7 @@ This article is just a test. This article is just a test.
                   </fo:block>
                 </fo:block>
               </fo:block>
-                      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+              <fo:block id="id2759411">
-                        <fo:static-content flow-name="xsl-region-after">
-                          <fo:block text-align="center" font-size="10pt">
-                            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                          </fo:block>
-                        </fo:static-content>
-                        <fo:flow flow-name="xsl-region-body">
                 <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
                   <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                     <fo:block keep-with-next.within-column="always">
@@ -266,13 +236,7 @@ This article is just a test. This article is just a test.
                     </fo:block>
                   </fo:block>
                 </fo:block>
-                          <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+                <fo:block id="id2759441">
-                            <fo:static-content flow-name="xsl-region-after">
-                              <fo:block text-align="center" font-size="10pt">
-                                <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                              </fo:block>
-                            </fo:static-content>
-                            <fo:flow flow-name="xsl-region-body">
                   <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
                     <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                       <fo:block keep-with-next.within-column="always">
@@ -280,13 +244,7 @@ This article is just a test. This article is just a test.
                       </fo:block>
                     </fo:block>
                   </fo:block>
-                              <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+                  <fo:block id="id2759452">
-                                <fo:static-content flow-name="xsl-region-after">
-                                  <fo:block text-align="center" font-size="10pt">
-                                    <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                                  </fo:block>
-                                </fo:static-content>
-                                <fo:flow flow-name="xsl-region-body">
                     <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
                       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                         <fo:block keep-with-next.within-column="always">
@@ -300,21 +258,14 @@ This article is just a test. This article is just a test.
 This article is just a test. This article is just a test. 
 This article is just a test. This article is just a test. 
 </fo:block>
-                                </fo:flow>
+                  </fo:block>
-                              </fo:page-sequence>
+                </fo:block>
-                            </fo:flow>
+              </fo:block>
-                          </fo:page-sequence>
+            </fo:block>
-                        </fo:flow>
+          </fo:block>
-                      </fo:page-sequence>
+        </fo:block>
-                    </fo:flow>
+      </fo:block>
-                  </fo:page-sequence>
+      <fo:block id="id2759489">
-                </fo:flow>
-              </fo:page-sequence>
-            </fo:flow>
-          </fo:page-sequence>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:block id="id2758907">
         <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Appendix</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
       </fo:block>

tests/docbook/result/fo/article2.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2772157" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2755676" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -116,7 +116,7 @@ This article is just a test. This article is just a test.
 This article is just a test. This article is just a test. 
 This article is just a test. This article is just a test. 
 </fo:block>
-      <fo:table-and-caption id="id2759590" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
+      <fo:table-and-caption id="id2760095" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
         <fo:table-caption>
           <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">This is a test table</fo:block>
         </fo:table-caption>
@@ -225,8 +225,8 @@ This article is just a test. This article is just a test.
           </fo:table-body>
         </fo:table>
       </fo:table-and-caption>
-      <fo:list-block id="id2758475" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+      <fo:list-block id="id2759058" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-        <fo:list-item id="id2758481" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759064" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>
               <fo:inline>term</fo:inline>
@@ -236,7 +236,7 @@ This article is just a test. This article is just a test.
             <fo:block>some text</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2758509" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759092" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>
               <fo:inline>term2a, </fo:inline>
@@ -247,7 +247,7 @@ This article is just a test. This article is just a test.
             <fo:block>some text</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2758543" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759126" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>
               <fo:inline>term3</fo:inline>

tests/docbook/result/fo/article3.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2772157" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2755676" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -99,13 +99,7 @@ This article is just a test. This article is just a test.
 This article is just a test. This article is just a test. 
 This article is just a test. This article is just a test. 
 </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2757297">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -113,13 +107,7 @@ This article is just a test. This article is just a test.
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+        <fo:block id="id2772596">
-            <fo:static-content flow-name="xsl-region-after">
-              <fo:block text-align="center" font-size="10pt">
-                <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-              </fo:block>
-            </fo:static-content>
-            <fo:flow flow-name="xsl-region-body">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -127,13 +115,7 @@ This article is just a test. This article is just a test.
               </fo:block>
             </fo:block>
           </fo:block>
-              <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+          <fo:block id="id2772608">
-                <fo:static-content flow-name="xsl-region-after">
-                  <fo:block text-align="center" font-size="10pt">
-                    <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                  </fo:block>
-                </fo:static-content>
-                <fo:flow flow-name="xsl-region-body">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
               <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                 <fo:block keep-with-next.within-column="always">
@@ -141,13 +123,7 @@ This article is just a test. This article is just a test.
                 </fo:block>
               </fo:block>
             </fo:block>
-                  <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+            <fo:block id="id2772712">
-                    <fo:static-content flow-name="xsl-region-after">
-                      <fo:block text-align="center" font-size="10pt">
-                        <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                      </fo:block>
-                    </fo:static-content>
-                    <fo:flow flow-name="xsl-region-body">
               <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
                 <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                   <fo:block keep-with-next.within-column="always">
@@ -155,13 +131,7 @@ This article is just a test. This article is just a test.
                   </fo:block>
                 </fo:block>
               </fo:block>
-                      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+              <fo:block id="id2772724">
-                        <fo:static-content flow-name="xsl-region-after">
-                          <fo:block text-align="center" font-size="10pt">
-                            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                          </fo:block>
-                        </fo:static-content>
-                        <fo:flow flow-name="xsl-region-body">
                 <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
                   <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                     <fo:block keep-with-next.within-column="always">
@@ -170,23 +140,12 @@ This article is just a test. This article is just a test.
                   </fo:block>
                 </fo:block>
                 <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
-                        </fo:flow>
-                      </fo:page-sequence>
-                    </fo:flow>
-                  </fo:page-sequence>
-                </fo:flow>
-              </fo:page-sequence>
-            </fo:flow>
-          </fo:page-sequence>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
               </fo:block>
-        </fo:static-content>
+            </fo:block>
-        <fo:flow flow-name="xsl-region-body">
+          </fo:block>
+        </fo:block>
+      </fo:block>
+      <fo:block id="id2760063">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -194,7 +153,7 @@ This article is just a test. This article is just a test.
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:block id="id2759570">
+        <fo:block id="id2760074">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -204,15 +163,8 @@ This article is just a test. This article is just a test.
           </fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2760098">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -220,13 +172,7 @@ This article is just a test. This article is just a test.
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+        <fo:block id="id2760109">
-            <fo:static-content flow-name="xsl-region-after">
-              <fo:block text-align="center" font-size="10pt">
-                <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-              </fo:block>
-            </fo:static-content>
-            <fo:flow flow-name="xsl-region-body">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -234,7 +180,7 @@ This article is just a test. This article is just a test.
               </fo:block>
             </fo:block>
           </fo:block>
-              <fo:block id="id2759617">
+          <fo:block id="id2760121">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
               <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                 <fo:block keep-with-next.within-column="always">
@@ -244,17 +190,9 @@ This article is just a test. This article is just a test.
             </fo:block>
             <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
           </fo:block>
-            </fo:flow>
-          </fo:page-sequence>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
         </fo:block>
-        </fo:static-content>
+      </fo:block>
-        <fo:flow flow-name="xsl-region-body">
+      <fo:block id="id2760146">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -262,13 +200,7 @@ This article is just a test. This article is just a test.
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+        <fo:block id="id2758792">
-            <fo:static-content flow-name="xsl-region-after">
-              <fo:block text-align="center" font-size="10pt">
-                <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-              </fo:block>
-            </fo:static-content>
-            <fo:flow flow-name="xsl-region-body">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -276,13 +208,7 @@ This article is just a test. This article is just a test.
               </fo:block>
             </fo:block>
           </fo:block>
-              <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+          <fo:block id="id2758803">
-                <fo:static-content flow-name="xsl-region-after">
-                  <fo:block text-align="center" font-size="10pt">
-                    <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-                  </fo:block>
-                </fo:static-content>
-                <fo:flow flow-name="xsl-region-body">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
               <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                 <fo:block keep-with-next.within-column="always">
@@ -290,7 +216,7 @@ This article is just a test. This article is just a test.
                 </fo:block>
               </fo:block>
             </fo:block>
-                  <fo:block id="id2758233">
+            <fo:block id="id2758815">
               <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
                 <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
                   <fo:block keep-with-next.within-column="always">
@@ -300,12 +226,9 @@ This article is just a test. This article is just a test.
               </fo:block>
               <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
             </fo:block>
-                </fo:flow>
+          </fo:block>
-              </fo:page-sequence>
+        </fo:block>
-            </fo:flow>
+      </fo:block>
-          </fo:page-sequence>
-        </fo:flow>
-      </fo:page-sequence>
     </fo:flow>
   </fo:page-sequence>
 </fo:root>

tests/docbook/result/fo/bib.fo

@@ -124,7 +124,7 @@
 a lot of tweaking.  It probably doesn't conform to any specific style.</fo:block>
       <fo:block>
         <fo:block font-size="16pt" font-weight="bold">Books</fo:block>
-        <fo:block id="id2763475" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:block id="id2763906" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:inline>[AhoSethiUllman96] </fo:inline>
           <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
           <fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>
@@ -158,7 +158,7 @@ a lot of tweaking.  It probably doesn't conform to any specific style.</fo:block
     <fo:inline>O'Reilly &amp; Associates, Inc.</fo:inline> and
     <fo:inline>The World Wide Web Consortium</fo:inline>.
     <fo:inline>Winter, 1996</fo:inline></fo:inline>.</fo:block>
-        <fo:block id="id2761625" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:block id="id2762062" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:inline>[Abbrev] </fo:inline>
           <fo:inline><fo:inline font-style="italic">A Really Full BiblioEntry</fo:inline>. </fo:inline>
           <fo:inline>Subtitle. </fo:inline>

tests/docbook/result/fo/book.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2805261" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2805689" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -138,15 +138,15 @@ Some legal notice. Some legal notice. Some legal notice.
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763527"><fo:page-number-citation ref-id="id2763527"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2805790"><fo:page-number-citation ref-id="id2805790"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> </fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763537"><fo:page-number-citation ref-id="id2763537"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762038"><fo:page-number-citation ref-id="id2762038"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">I Part One Title</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761613"><fo:page-number-citation ref-id="id2761613"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762053"><fo:page-number-citation ref-id="id2762053"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block start-indent="2pc">
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
@@ -156,37 +156,37 @@ Some legal notice. Some legal notice. Some legal notice.
           <fo:block start-indent="4pc">
             <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
               <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
-              <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759772"><fo:page-number-citation ref-id="id2759772"/></fo:basic-link></fo:inline>
+              <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760273"><fo:page-number-citation ref-id="id2760273"/></fo:basic-link></fo:inline>
             </fo:block>
             <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
               <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
-              <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759844"><fo:page-number-citation ref-id="id2759844"/></fo:basic-link></fo:inline>
+              <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760342"><fo:page-number-citation ref-id="id2760342"/></fo:basic-link></fo:inline>
             </fo:block>
             <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
               <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
-              <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759865"><fo:page-number-citation ref-id="id2759865"/></fo:basic-link></fo:inline>
+              <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760363"><fo:page-number-citation ref-id="id2760363"/></fo:basic-link></fo:inline>
             </fo:block>
           </fo:block>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">2 First Chapter</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759940"><fo:page-number-citation ref-id="id2759940"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760438"><fo:page-number-citation ref-id="id2760438"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">3 Second Chapter</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760030"><fo:page-number-citation ref-id="id2760030"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760528"><fo:page-number-citation ref-id="id2760528"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">4 Third Chapter</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760322"><fo:page-number-citation ref-id="id2760322"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760820"><fo:page-number-citation ref-id="id2760820"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760344"><fo:page-number-citation ref-id="id2760344"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760842"><fo:page-number-citation ref-id="id2760842"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">B Second Appendix</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759751"><fo:page-number-citation ref-id="id2759751"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760478"><fo:page-number-citation ref-id="id2760478"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
@@ -216,7 +216,7 @@ Some legal notice. Some legal notice. Some legal notice.
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2805380" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2805813" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -411,7 +411,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
 </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2805400" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2763842" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -426,7 +426,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Just a test dedication.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2763527" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2805790" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -441,7 +441,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2763537" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2762038" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -456,7 +456,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test preface.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2761613" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2762053" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -472,13 +472,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="17.28pt" font-weight="bold" margin-left="-4pc" space-before="1em" font-family="Helvetica">PartIntro Title</fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Partintro content<fo:footnote><fo:inline>[1]</fo:inline><fo:footnote-body font-size="8pt"><fo:block>[1] This is a footnote in a partintro.</fo:block></fo:footnote-body></fo:footnote>.</fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2762135">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -487,8 +481,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">PartIntros can actually have section content as well.</fo:block>
-        </fo:flow>
+      </fo:block>
-      </fo:page-sequence>
     </fo:flow>
   </fo:page-sequence>
   <fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
@@ -508,13 +501,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Section Tests</fo:block>
         </fo:block>
       </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2760273">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -529,15 +516,8 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
   ProgramListing
 </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2760342">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -546,15 +526,8 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2760363">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -567,13 +540,12 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
           <fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always">Test Figure</fo:block>
           <fo:block wrap-option="no-wrap" text-align="start" white-space-collapse="false" linefeed-treatment="preserve" font-family="Courier" font-size="9pt">This is a
   ProgramListing
+</fo:block>
         </fo:block>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-    </fo:flow>
+  <fo:page-sequence id="id2760438" hyphenate="true" master-name="oneside1" language="en">
-  </fo:page-sequence>
-  <fo:page-sequence id="id2759940" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. First Chapter</fo:block>
@@ -600,7 +572,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2760030" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760528" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 3. Second Chapter</fo:block>
@@ -618,23 +590,23 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
         </fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.
-<fo:wrapper id="id2760048"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2760546"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2760071"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2760569"><!--ap2--></fo:wrapper>
 
-<fo:wrapper id="id2760094"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2760592"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2760125"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2760623"><!--bp2--></fo:wrapper>
 
-<fo:wrapper id="id2760148"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2760646"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
 
-<fo:wrapper id="id2760186"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2760684"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2760209"><!--cp2see--></fo:wrapper>
+<fo:wrapper id="id2760707"><!--cp2see--></fo:wrapper>
 
-<fo:wrapper id="id2760237"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2760735"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2760268"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2760766"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2760299"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2760796"><!--dp2--></fo:wrapper></fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2760322" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760820" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 4. Third Chapter</fo:block>
@@ -654,7 +626,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2760344" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760842" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
@@ -680,7 +652,7 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2759751" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760478" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix B. Second Appendix</fo:block>
@@ -698,18 +670,18 @@ Blah. Blah blah blah blah. Blah blah. Blah blah blah blah.
         </fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.
-<fo:wrapper id="id2761844"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2760384"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2758449"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2758956"><!--ap2--></fo:wrapper>
 
-<fo:wrapper id="id2758472"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2758977"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2758503"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2759008"><!--bp2--></fo:wrapper>
 
-<fo:wrapper id="id2758526"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2759031"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2758564"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2759070"><!--cp2--></fo:wrapper>
 
-<fo:wrapper id="id2758587"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2759092"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2758618"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2759123"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2758649"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2759154"><!--dp2--></fo:wrapper></fo:block>
     </fo:flow>
   </fo:page-sequence>
 </fo:root>

tests/docbook/result/fo/book3.fo

@@ -143,7 +143,7 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Index</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759254"><fo:page-number-citation ref-id="id2759254"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759764"><fo:page-number-citation ref-id="id2759764"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
@@ -164,7 +164,7 @@
 a lot of tweaking.  It probably doesn't conform to any specific style.</fo:block>
       <fo:block>
         <fo:block font-size="16pt" font-weight="bold">Books</fo:block>
-        <fo:block id="id2854695" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:block id="id2762338" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:inline>[AhoSethiUllman96] </fo:inline>
           <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
           <fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>
@@ -191,7 +191,7 @@ a lot of tweaking.  It probably doesn't conform to any specific style.</fo:block
     <fo:inline>O'Reilly &amp; Associates, Inc.</fo:inline> and
     <fo:inline>The World Wide Web Consortium</fo:inline>.
     <fo:inline>Winter, 1996</fo:inline></fo:inline>.</fo:block>
-        <fo:block id="id2764479" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:block id="id2764160" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:inline>[Abbrev] </fo:inline>
           <fo:inline><fo:inline font-style="italic">A Really Full BiblioEntry</fo:inline>. </fo:inline>
           <fo:inline>Subtitle. </fo:inline>
@@ -293,7 +293,7 @@ USA. </fo:inline>
       </fo:list-block>
       <fo:block font-size="16pt" font-weight="bold">S</fo:block>
       <fo:list-block provisional-distance-between-starts="2in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-        <fo:list-item id="id2758720" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2759230" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>SGML</fo:block>
           </fo:list-item-label>
@@ -331,7 +331,7 @@ USA. </fo:inline>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:inline font-weight="bold" keep-with-next.within-line="always" padding-end="1em">a formal para</fo:inline>this is a formal paragraph.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2759254" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2759764" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>

tests/docbook/result/fo/callout.fo

@@ -96,9 +96,9 @@
         </fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-<fo:wrapper id="id2761825"><!--for loop, DSSSL and--></fo:wrapper>
+<fo:wrapper id="id2760405"><!--for loop, DSSSL and--></fo:wrapper>
-<fo:wrapper id="id2761838"><!--loops, implementing (DSSSL)--></fo:wrapper>
+<fo:wrapper id="id2760419"><!--loops, implementing (DSSSL)--></fo:wrapper>
-<fo:wrapper id="id2761855"><!--tail recursion (DSSSL)--></fo:wrapper>
+<fo:wrapper id="id2760437"><!--tail recursion (DSSSL)--></fo:wrapper>
 
 DSSSL doesn't have any construct that resembles the
 for loop that occurs in most imperative languages like C
@@ -113,9 +113,9 @@ Loops in DSSSL use a special form of
   <fo:inline id="dl3">&#x2778;</fo:inline>(if (&gt; count 10)
     <fo:inline id="dl4">&#x2779;</fo:inline>#t
     (<fo:inline id="dl5">&#x277A;</fo:inline>loopvar <fo:inline id="dl6">&#x277B;</fo:inline>(+ count 1))))</fo:block></fo:block>
-      <fo:block id="id2762031">
+      <fo:block id="id2881202">
         <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.2em" provisional-label-separation="0.2em">
-          <fo:list-item id="id2762038">
+          <fo:list-item id="id2881211">
             <fo:list-item-label end-indent="label-end()">
               <fo:block>&#x2776;</fo:block>
             </fo:list-item-label>
@@ -125,20 +125,20 @@ initial value, immediately after the <fo:inline font-family="Courier">let</fo:in
 operand.</fo:block>
             </fo:list-item-body>
           </fo:list-item>
-          <fo:list-item id="id2762176">
+          <fo:list-item id="id2760163">
             <fo:list-item-label end-indent="label-end()">
               <fo:block>&#x2777;</fo:block>
             </fo:list-item-label>
             <fo:list-item-body start-indent="body-start()">
               <fo:block>
-<fo:wrapper id="id2762200"><!--variables (DSSSL), local, defining after loop variable--></fo:wrapper>
+<fo:wrapper id="id2881206"><!--variables (DSSSL), local, defining after loop variable--></fo:wrapper>
 
 Any number of additional local variables can be defined after
 the loop variable, just as they can in any other
 <fo:inline font-family="Courier">let</fo:inline> expression.</fo:block>
             </fo:list-item-body>
           </fo:list-item>
-          <fo:list-item id="id2761966">
+          <fo:list-item id="id2854957">
             <fo:list-item-label end-indent="label-end()">
               <fo:block>&#x2778;</fo:block>
             </fo:list-item-label>
@@ -147,7 +147,7 @@ the loop variable, just as they can in any other
 test in it.</fo:block>
             </fo:list-item-body>
           </fo:list-item>
-          <fo:list-item id="id2854602">
+          <fo:list-item id="id2854990">
             <fo:list-item-label end-indent="label-end()">
               <fo:block>&#x2779;</fo:block>
             </fo:list-item-label>
@@ -155,7 +155,7 @@ test in it.</fo:block>
               <fo:block>This is the value that will be returned.</fo:block>
             </fo:list-item-body>
           </fo:list-item>
-          <fo:list-item id="id2854652">
+          <fo:list-item id="id2764852">
             <fo:list-item-label end-indent="label-end()">
               <fo:block>&#x277A;</fo:block>
             </fo:list-item-label>
@@ -164,7 +164,7 @@ test in it.</fo:block>
 it was a function name.</fo:block>
             </fo:list-item-body>
           </fo:list-item>
-          <fo:list-item id="id2759526">
+          <fo:list-item id="id2764886">
             <fo:list-item-label end-indent="label-end()">
               <fo:block>&#x277B;</fo:block>
             </fo:list-item-label>

tests/docbook/result/fo/chunk.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2805261" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2805689" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -119,11 +119,11 @@
         <fo:block start-indent="2pc">
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> First sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761792"><fo:page-number-citation ref-id="id2761792"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762227"><fo:page-number-citation ref-id="id2762227"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Second sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761813"><fo:page-number-citation ref-id="id2761813"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762248"><fo:page-number-citation ref-id="id2762248"/></fo:basic-link></fo:inline>
           </fo:block>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
@@ -132,7 +132,7 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">3 Third Chapter</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761747"><fo:page-number-citation ref-id="id2761747"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762156"><fo:page-number-citation ref-id="id2762156"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
@@ -140,7 +140,7 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">B Second Appendix</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759740"><fo:page-number-citation ref-id="id2759740"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760244"><fo:page-number-citation ref-id="id2760244"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
@@ -160,7 +160,7 @@
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Just a test.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2763439" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2763869" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -219,13 +219,7 @@
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         <fo:basic-link internal-destination="appendix">Appendix</fo:basic-link>
       </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2762227">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -234,15 +228,8 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">...</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2762248">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -251,8 +238,7 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">...</fo:block>
-        </fo:flow>
+      </fo:block>
-      </fo:page-sequence>
     </fo:flow>
   </fo:page-sequence>
   <fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en">
@@ -275,7 +261,7 @@
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2761747" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2762156" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 3. Third Chapter</fo:block>
@@ -365,7 +351,7 @@ This makes the appendix long. This makes the appendix long.
 This makes the appendix long. This makes the appendix long.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2759740" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760244" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix B. Second Appendix</fo:block>

tests/docbook/result/fo/classsynop.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2854593" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+  <fo:page-sequence id="id2855050" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Class Synopses</fo:block>

tests/docbook/result/fo/docbook40.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2600737" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2854975" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -115,16 +115,16 @@ included.</fo:block>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">1 Block-level Markup</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2854613"><fo:page-number-citation ref-id="id2854613"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2855035"><fo:page-number-citation ref-id="id2855035"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">2 Inline markup</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761973"><fo:page-number-citation ref-id="id2761973"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762438"><fo:page-number-citation ref-id="id2762438"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2854613" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+  <fo:page-sequence id="id2855035" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Block-level Markup</fo:block>
@@ -160,8 +160,8 @@ included.</fo:block>
 </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Ordered and itemized lists can have titles:</fo:block>
       <fo:block font-size="12pt" font-weight="bold">Itemized List</fo:block>
-      <fo:list-block id="id2759661" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+      <fo:list-block id="id2760166" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-        <fo:list-item id="id2759671" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2760175" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -169,7 +169,7 @@ included.</fo:block>
             <fo:block>First thing</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2772826" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2763897" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -177,7 +177,7 @@ included.</fo:block>
             <fo:block>Second thing</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2772836" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2763908" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -187,8 +187,8 @@ included.</fo:block>
         </fo:list-item>
       </fo:list-block>
       <fo:block font-size="12pt" font-weight="bold">Ordered List</fo:block>
-      <fo:list-block id="id2772848" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+      <fo:list-block id="id2763920" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-        <fo:list-item id="id2772860" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2763931" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -196,7 +196,7 @@ included.</fo:block>
             <fo:block>First thing</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2772870" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2763942" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -204,7 +204,7 @@ included.</fo:block>
             <fo:block>Second thing</fo:block>
           </fo:list-item-body>
         </fo:list-item>
-        <fo:list-item id="id2772881" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+        <fo:list-item id="id2763952" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           <fo:list-item-label end-indent="label-end()">
             <fo:block>&#x2022;</fo:block>
           </fo:list-item-label>
@@ -225,7 +225,7 @@ object-oriented programming language classes. Here's one example:</fo:block>
       <fo:block color="red">&lt;classsynopsis&gt;<fo:block color="red">&lt;ooclass&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block><fo:inline font-family="Courier">TextFileWriter</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;ooclass&gt;<fo:inline font-family="Courier">HandlerBase</fo:inline>&lt;/ooclass&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;private&lt;/modifier&gt;</fo:block>Writer<fo:inline font-family="Courier">writer</fo:inline>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;fieldsynopsis&gt;<fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>String<fo:inline font-family="Courier">writerName</fo:inline><fo:block color="red">&lt;initializer&gt;&quot;MyWriter&quot;&lt;/initializer&gt;</fo:block>&lt;/fieldsynopsis&gt;</fo:block><fo:block color="red">&lt;methodsynopsis&gt;<fo:block color="red">&lt;modifier&gt;static&lt;/modifier&gt;</fo:block><fo:block color="red">&lt;modifier&gt;public&lt;/modifier&gt;</fo:block>();<fo:inline font-family="Courier">write</fo:inline><fo:block color="red">&lt;methodparam&gt;ResultTreeFragment<fo:inline font-style="italic" font-family="Courier">frag</fo:inline>&lt;/methodparam&gt;</fo:block><fo:block color="red">&lt;methodparam&gt;String<fo:inline font-style="italic" font-family="Courier">file</fo:inline>&lt;/methodparam&gt;</fo:block><fo:inline font-family="Courier">SAXException</fo:inline>&lt;/methodsynopsis&gt;</fo:block>&lt;/classsynopsis&gt;</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2761973" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2762438" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 2. Inline markup</fo:block>

tests/docbook/result/fo/external.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2601050" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2601195" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">

tests/docbook/result/fo/figtest.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2772157" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2755676" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>

tests/docbook/result/fo/foottest.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2772157" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2755676" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -171,7 +171,7 @@ This article is just a test. This article is just a test.
           </fo:table-row>
         </fo:table-body>
       </fo:table>
-      <fo:block id="id2758458">
+      <fo:block id="id2759042">
         <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Appendix</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
       </fo:block>

tests/docbook/result/fo/fotest.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2805179" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2805612" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -110,15 +110,15 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2805233"><fo:page-number-citation ref-id="id2805233"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2805666"><fo:page-number-citation ref-id="id2805666"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">1 First Chapter</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2769622"><fo:page-number-citation ref-id="id2769622"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2869133"><fo:page-number-citation ref-id="id2869133"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761492"><fo:page-number-citation ref-id="id2761492"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761901"><fo:page-number-citation ref-id="id2761901"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
@@ -136,7 +136,7 @@
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2805233" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2805666" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -186,7 +186,7 @@
       </fo:table-and-caption>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2769622" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+  <fo:page-sequence id="id2869133" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. First Chapter</fo:block>
@@ -207,7 +207,7 @@
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2761492" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2761901" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>

tests/docbook/result/fo/gdp-handbook.fo

@@ -155,13 +155,7 @@
           </fo:table>
         </fo:block>
       </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="intro">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -306,15 +300,8 @@
        download it anonymously from GNOME CVS under <fo:inline font-family="Courier">gnome-docu/gdp</fo:inline>.
       </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="gettingstarted">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -395,7 +382,7 @@
           people to make announcements and suggestions and to discuss
           issues in the comments section.
         </fo:block>
-              <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2758582">
+            <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759078">
               <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block>
               <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           Note that the information in the
@@ -422,7 +409,7 @@
         source nature of SGML. To contribute to the GDP you should
         learn to use DocBook.
       </fo:block>
-            <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2758671">
+          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759163">
             <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block>
             <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           To get started writing for the GDP you do not need to rush
@@ -503,8 +490,8 @@
           DTD's.  To install the GDP custom DTD with PNG image support
           by hand:
         </fo:block>
-              <fo:list-block id="id2759067" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+            <fo:list-block id="id2759574" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-                <fo:list-item id="id2759079" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2759586" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -519,7 +506,7 @@
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2759252" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2759759" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -633,7 +620,7 @@ V1.1//EN&quot;[]&gt;
           mydocument.sgml</fo:inline>, after which you can print out or
           view the resulting .ps file.  
         </fo:block>
-              <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2881306">
+            <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2881738">
               <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block>
               <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
             The html files you get will not look quite the same as the
@@ -713,8 +700,8 @@ V1.1//EN&quot;[]&gt;
           The following resources on the web are useful for learning
           DocBook:
         </fo:block>
-              <fo:list-block id="id2881596" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+            <fo:list-block id="id2882028" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-                <fo:list-item id="id2881593" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2882026" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -728,7 +715,7 @@ V1.1//EN&quot;[]&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2881649" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2882081" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -741,7 +728,7 @@ V1.1//EN&quot;[]&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2881689" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2882121" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -755,7 +742,7 @@ V1.1//EN&quot;[]&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2881729" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2882161" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -779,8 +766,8 @@ V1.1//EN&quot;[]&gt;
           The following sections of this document are designed to help
           documentation authors write correct and consistent DocBook:
         </fo:block>
-              <fo:list-block id="id2881798" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+            <fo:list-block id="id2882230" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-                <fo:list-item id="id2881795" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2882228" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1055,15 +1042,8 @@ V1.1//EN&quot;[]&gt;
         </fo:block>
           </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="gnomedocsystem">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -1285,15 +1265,8 @@ V1.1//EN&quot;[]&gt;
         </fo:block>
           </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="docbookbasics">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -1400,8 +1373,8 @@ V1.1//EN&quot;[]&gt;
       advised</fo:inline> that the documentation writers conform to XML
       syntax rules. Here are most important differences:
       </fo:block>
-            <fo:list-block id="id2884294" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+          <fo:list-block id="id2884726" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-              <fo:list-item id="id2884300" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+            <fo:list-item id="id2884733" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
               <fo:list-item-label end-indent="label-end()">
                 <fo:block>
                   <fo:inline> <fo:inline font-style="italic">Minimization</fo:inline></fo:inline>
@@ -1422,7 +1395,7 @@ V1.1//EN&quot;[]&gt;
          </fo:block>
               </fo:list-item-body>
             </fo:list-item>
-              <fo:list-item id="id2884433" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+            <fo:list-item id="id2884866" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
               <fo:list-item-label end-indent="label-end()">
                 <fo:block>
                   <fo:inline> <fo:inline font-style="italic">Self-closing tags</fo:inline></fo:inline>
@@ -1442,7 +1415,7 @@ V1.1//EN&quot;[]&gt;
           </fo:block>
               </fo:list-item-body>
             </fo:list-item>
-              <fo:list-item id="id2884516" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+            <fo:list-item id="id2884949" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
               <fo:list-item-label end-indent="label-end()">
                 <fo:block>
                   <fo:inline> <fo:inline font-style="italic">Case sensitive tags</fo:inline></fo:inline>
@@ -1564,7 +1537,7 @@ V1.1//EN&quot;[]&gt;
           
           <fo:block id="shot1" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after.minimum="1em" space-after.optimum="1.5em" space-after.maximum="2em" keep-with-previous.within-column="always"><fo:block font-weight="bold" font-size="12pt" hyphenate="false" keep-with-next.within-column="always">Screenshot</fo:block><fo:block><fo:block><fo:external-graphic src="url(file:figures/example_screenshot)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block></fo:block></fo:block>
         </fo:block>
-              <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2885039">
+            <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2885472">
               <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block>
               <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
             Notice in this example that the screenshot file name does
@@ -1626,7 +1599,7 @@ make: *** No rule to make target `love'.  Stop.
           Note the use of tags <fo:inline font-family="Courier">&lt;prompt&gt;</fo:inline> and
           <fo:inline font-family="Courier">&lt;userinput&gt;</fo:inline> for marking system prompt
           and commands entered by user.
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2885280"><fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2885712"><fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block><fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
               Note that both <fo:inline font-family="Courier">&lt;programlisting&gt;</fo:inline>
               and <fo:inline font-family="Courier">&lt;screen&gt;</fo:inline> preserve linebreaks,
               but interpret SGML tags (unlike LaTeX
@@ -1650,8 +1623,8 @@ make: *** No rule to make target `love'.  Stop.
 	  <fo:inline font-family="Courier">&lt;orderedlist&gt;</fo:inline>, and 
 	  <fo:inline font-family="Courier">&lt;variablelist&gt;</fo:inline>.
 	</fo:block>
-              <fo:list-block id="id2885392" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+            <fo:list-block id="id2885825" provisional-distance-between-starts="1in" provisional-label-separation="0.25in" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-                <fo:list-item id="id2885399" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2885831" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>
                     <fo:inline> <fo:inline font-family="Courier">&lt;itemizedlist&gt;</fo:inline></fo:inline>
@@ -1690,8 +1663,8 @@ make: *** No rule to make target `love'.  Stop.
 		</fo:block>
 		and output:
                 </fo:block>
-                    <fo:list-block id="id2885454" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+                  <fo:list-block id="id2885886" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-                      <fo:list-item id="id2885459" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+                    <fo:list-item id="id2885892" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                       <fo:list-item-label end-indent="label-end()">
                         <fo:block>&#x2022;</fo:block>
                       </fo:list-item-label>
@@ -1703,7 +1676,7 @@ make: *** No rule to make target `love'.  Stop.
 		    </fo:block>
                       </fo:list-item-body>
                     </fo:list-item>
-                      <fo:list-item id="id2885518" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+                    <fo:list-item id="id2885951" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                       <fo:list-item-label end-indent="label-end()">
                         <fo:block>&#x2022;</fo:block>
                       </fo:list-item-label>
@@ -1716,7 +1689,7 @@ make: *** No rule to make target `love'.  Stop.
 		    </fo:block>
                       </fo:list-item-body>
                     </fo:list-item>
-                      <fo:list-item id="id2885550" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+                    <fo:list-item id="id2885983" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                       <fo:list-item-label end-indent="label-end()">
                         <fo:block>&#x2022;</fo:block>
                       </fo:list-item-label>
@@ -1745,7 +1718,7 @@ make: *** No rule to make target `love'.  Stop.
 	      </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2885726" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886159" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>
                     <fo:inline> <fo:inline font-family="Courier">&lt;orderedlist&gt;</fo:inline></fo:inline>
@@ -1768,7 +1741,7 @@ make: *** No rule to make target `love'.  Stop.
 	      </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2885825" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886258" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>
                     <fo:inline> <fo:inline font-family="Courier">&lt;variablelist&gt;</fo:inline></fo:inline>
@@ -1839,8 +1812,8 @@ make: *** No rule to make target `love'.  Stop.
                 </fo:block>
               </fo:block>
             </fo:block>
-              <fo:list-block id="id2886010" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+            <fo:list-block id="id2886442" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-                <fo:list-item id="id2886016" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886449" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1851,7 +1824,7 @@ make: *** No rule to make target `love'.  Stop.
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886042" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886475" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1866,7 +1839,7 @@ make: *** No rule to make target `love'.  Stop.
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886091" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886524" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1877,7 +1850,7 @@ make: *** No rule to make target `love'.  Stop.
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886117" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886550" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1887,7 +1860,7 @@ make: *** No rule to make target `love'.  Stop.
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886141" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886573" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1898,7 +1871,7 @@ make: *** No rule to make target `love'.  Stop.
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886166" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886599" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1978,8 +1951,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
           Here are some tags used to describe operating system-related
           things:  
         </fo:block>
-              <fo:list-block id="id2886555" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+            <fo:list-block id="id2886988" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-                <fo:list-item id="id2886561" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2886994" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -1993,7 +1966,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886616" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887049" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2007,7 +1980,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886678" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887110" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2021,7 +1994,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886733" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887165" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2033,7 +2006,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886774" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887206" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2047,7 +2020,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
             </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2886829" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887261" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2158,8 +2131,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
             <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 	  here is partial list of most commonly used enitites:
 	</fo:block>
-              <fo:list-block id="id2887291" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
+            <fo:list-block id="id2887724" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em">
-                <fo:list-item id="id2887297" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887730" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2169,7 +2142,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
 	  </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2887316" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887749" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2179,7 +2152,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
 	  </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2887335" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887768" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2189,7 +2162,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
 	  </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2887354" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887787" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2199,7 +2172,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
 	  </fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-                <fo:list-item id="id2887373" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2887806" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label end-indent="label-end()">
                   <fo:block>&#x2022;</fo:block>
                 </fo:list-item-label>
@@ -2220,15 +2193,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
 	</fo:block>
           </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="conventions">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2352,15 +2318,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
        </fo:block>
           </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="writingapplicationmanuals">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2377,7 +2336,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
       PNG format only) when appropriate.  They should also describe
       each feature and preference option available.
     </fo:block>
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2887834">
+        <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888266">
           <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Documentation Availability</fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         Applications and applets should not rely on documentation
@@ -2393,7 +2352,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
     versions 1.x and the templates in <fo:basic-link internal-destination="template2-2x">the section called &#x201C;Template 2: Applet Manual For GNOME 2.x&#x201D;</fo:basic-link>
     for GNOME versions 2.x.
     </fo:block>
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2887875">
+        <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888307">
           <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Manuals For Large Applications</fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         Manuals for very large applications, such as GNOME Workshop
@@ -2404,7 +2363,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
         <fo:inline font-family="Courier">&lt;sect1&gt;</fo:inline>).
       </fo:block>
         </fo:block>
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2887990">
+        <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888422">
           <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Applet Manuals in GNOME 2.0</fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         Note that applet manuals in GNOME 2.0 are treated in a special
@@ -2425,15 +2384,8 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
       Applets should make their manuals available by
       right-clicking on the applet. 
     </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="listingdocsinhelpmenu">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2441,7 +2393,7 @@ url=&quot;http://www.gnome.org&quot;&gt;GNOME Web page&lt;/ulink&gt;
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888113">
+        <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888545">
           <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         This section is for developers.  Documentation authors
@@ -2478,7 +2430,7 @@ function-reference.html Gnumeric function reference
       from SGML into HTML with <fo:inline font-weight="bold">db2html</fo:inline>) should be
       placed in this directory too.
     </fo:block>
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888304">
+        <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888736">
           <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
        If the help files are not present in the correct directory, the
@@ -2509,15 +2461,8 @@ GnomeUIInfo helpmenu[] = {
       topics from the Help menu, a help browser
       will be started with the associated HTML documentation.
     </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="applicationhelpbuttons">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2525,7 +2470,7 @@ GnomeUIInfo helpmenu[] = {
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888473">
+        <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888905">
           <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         This section is for developers.  Documentation authors
@@ -2557,22 +2502,15 @@ if (tmp) {
   g_free(tmp);
 }
     </fo:block>
-          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888610">
+        <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2889042">
           <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">NOTE</fo:block>
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         The example above is in the C language, please refer to other
         documentation or forums for other GNOME language bindings.
       </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="packagingappletdocs">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2634,7 +2572,7 @@ if (tmp) {
               </fo:block>
             </fo:block>
           </fo:block>
-            <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2888862">
+          <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2889294">
             <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Developer Information</fo:block>
             <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
           This section is for developers.  Documentation authors
@@ -2681,15 +2619,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
         GNOME panel applets using the GTK+/GTK-- widget set</fo:basic-link><fo:inline hyphenate="false"> [http://developer.gnome.org/doc/tutorials/applet/index.html]</fo:inline>.
       </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="writingcontextsensitivehelp">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2731,15 +2662,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
       small transient window will appear with brief but detailed
       information on the interface item.
     </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="referring">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2753,15 +2677,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
       from one document to another.  The exact mechanism for doing
       this is in development.
     </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="basics">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2823,7 +2740,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
           <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"> 
          Just as you need to juggle expert and novice readers,
          you'll have to juggle a number of other extremes as you write:
-         <fo:list-block id="id2889408" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"><fo:list-item id="id2889413" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
+         <fo:list-block id="id2889840" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="1.5em" provisional-label-separation="0.2em"><fo:list-item id="id2889845" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
               Documents should be complete, yet concise.  You should
               describe every feature, but you'll have decide how much
               detail is really necessary.  It's not, for example,
@@ -2833,7 +2750,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
               you spend fewer words on the obvious, you can spend more
               time clarifying the ambiguous labels and explaining
               items that are more complex.
-            </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2889440" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
+            </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2889872" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
               Be engaging and friendly, yet professional. Games
               documents may be less formal than productivity
               application documents (people don't
@@ -2842,14 +2759,14 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
               maintain a standard of style which holds the reader's
               interest without resorting to jokes and untranslatable
               allusions or puns.
-           </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2889480" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
+           </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2889912" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
               Examples, tips, notes, and screenshots are useful to
               break up long stretches of text, but too many can get in
               the way, and make your documents too choppy to read.
               It's good to provide a screenshot of any dialog windows
               a user might run into, but if a dialog box has several
               tabs, it's not usually necessary to have one for each.
-           </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2889504" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
+           </fo:block></fo:list-item-body></fo:list-item><fo:list-item id="id2889936" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em"><fo:list-item-label end-indent="label-end()"><fo:block>&#x2022;</fo:block></fo:list-item-label><fo:list-item-body start-indent="body-start()"><fo:block>
               The GDP strives to have all of its documentation conform
               to certain standards of style and content, but every
               document (and every writer) is different.  You will need
@@ -2930,15 +2847,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
         documents, and they will help you with yours.
       </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="teamwork">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -2998,15 +2908,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
         packages the documentation with the application.
       </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="finishing">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -3057,15 +2960,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
         there is a new document for them to translate.
       </fo:block>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="resources">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -3143,17 +3039,10 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
         irc.gnome.org.
       </fo:block>
         </fo:block>
-        </fo:flow>
+      </fo:block>
-      </fo:page-sequence>
       <fo:block id="templates">
         <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">Document Templates</fo:block>
-        <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+        <fo:block id="template1">
-          <fo:static-content flow-name="xsl-region-after">
-            <fo:block text-align="center" font-size="10pt">
-              <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-            </fo:block>
-          </fo:static-content>
-          <fo:flow flow-name="xsl-region-body">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -3898,15 +3787,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
 
 </fo:block>
       </fo:block>
-          </fo:flow>
-        </fo:page-sequence>
-        <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-          <fo:static-content flow-name="xsl-region-after">
-            <fo:block text-align="center" font-size="10pt">
-              <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
         </fo:block>
-          </fo:static-content>
+        <fo:block id="template2-1x">
-          <fo:flow flow-name="xsl-region-body">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -4237,15 +4119,8 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
 
 </fo:block>
       </fo:block>
-          </fo:flow>
-        </fo:page-sequence>
-        <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-          <fo:static-content flow-name="xsl-region-after">
-            <fo:block text-align="center" font-size="10pt">
-              <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
         </fo:block>
-          </fo:static-content>
+        <fo:block id="template2-2x">
-          <fo:flow flow-name="xsl-region-body">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
             <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
               <fo:block keep-with-next.within-column="always">
@@ -4880,8 +4755,7 @@ applet_widget_register_stock_callback (APPLET_WIDGET(applet), &quot;about&quot;,
 
 </fo:block>
       </fo:block>
-          </fo:flow>
+        </fo:block>
-        </fo:page-sequence>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>

tests/docbook/result/fo/graphics.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2600871" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2757404" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -93,13 +93,7 @@
           <fo:block keep-with-next.within-column="always" hyphenate="false">Graphics Test Document Title</fo:block>
         </fo:block>
       </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2762073">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -123,15 +117,8 @@
         <fo:block>
           <fo:external-graphic src="url(file:emc2.png)" content-width="20pt" content-height="20pt" width="auto" height="auto"/>
         </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2762192">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -142,15 +129,8 @@
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref: <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">entityref: <fo:external-graphic src="url(test/emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">fileref, scale=200: <fo:external-graphic src="url(file:emc2.png)" content-width="auto" content-height="auto" width="auto" height="auto"/></fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2762272">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -178,8 +158,7 @@
         <fo:block>
           <fo:external-graphic src="url(file:emc2.png)" content-width="20pt" content-height="20pt" width="auto" height="auto"/>
         </fo:block>
-        </fo:flow>
+      </fo:block>
-      </fo:page-sequence>
     </fo:flow>
   </fo:page-sequence>
 </fo:root>

tests/docbook/result/fo/gtest.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2600853" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+  <fo:page-sequence id="id2757287" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Graphics Test</fo:block>

tests/docbook/result/fo/idxbook.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2600853" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2757646" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -110,7 +110,7 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760056"><fo:page-number-citation ref-id="id2760056"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762419"><fo:page-number-citation ref-id="id2762419"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">1 First Chapter</fo:inline>
@@ -119,7 +119,7 @@
         <fo:block start-indent="2pc">
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759763"><fo:page-number-citation ref-id="id2759763"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2762623"><fo:page-number-citation ref-id="id2762623"/></fo:basic-link></fo:inline>
           </fo:block>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
@@ -128,16 +128,16 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2764702"><fo:page-number-citation ref-id="id2764702"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760136"><fo:page-number-citation ref-id="id2760136"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Index</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2765106"><fo:page-number-citation ref-id="id2765106"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760569"><fo:page-number-citation ref-id="id2760569"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2760056" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2762419" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -149,7 +149,7 @@
           <fo:block keep-with-next.within-column="always" hyphenate="false">Foreword</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph<fo:wrapper id="id2760074"><!--paragraph, test--></fo:wrapper>.</fo:block>
+      <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph<fo:wrapper id="id2762437"><!--paragraph, test--></fo:wrapper>.</fo:block>
     </fo:flow>
   </fo:page-sequence>
   <fo:page-sequence id="chapter" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
@@ -169,14 +169,8 @@
           <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. First Chapter</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph<fo:wrapper id="id2759741"><!--paragraph--></fo:wrapper>.</fo:block>
+      <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph<fo:wrapper id="id2762601"><!--paragraph--></fo:wrapper>.</fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2762623">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -184,9 +178,8 @@
             </fo:block>
           </fo:block>
         </fo:block>
-          <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Another paragraph<fo:wrapper id="id2766814"><!--paragraph, another--></fo:wrapper>.</fo:block>
+        <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Another paragraph<fo:wrapper id="id2762641"><!--paragraph, another--></fo:wrapper>.</fo:block>
-        </fo:flow>
+      </fo:block>
-      </fo:page-sequence>
     </fo:flow>
   </fo:page-sequence>
   <fo:page-sequence id="ch2" hyphenate="true" master-name="oneside1" language="en">
@@ -207,24 +200,24 @@
         </fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.
-<fo:wrapper id="id2880868"><!--the ap1--></fo:wrapper>
+<fo:wrapper id="id2762708"><!--the ap1--></fo:wrapper>
-<fo:wrapper id="id2854729"><!--the ap1--></fo:wrapper>
+<fo:wrapper id="id2762739"><!--the ap1--></fo:wrapper>
-<fo:wrapper id="id2854636"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2762604"><!--ap2--></fo:wrapper>
 
-<fo:wrapper id="id2854659"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2762718"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2764510"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2855150"><!--bp2--></fo:wrapper>
 
-<fo:wrapper id="id2764530"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2855186"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
 
-<fo:wrapper id="id2764566"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2881332"><!--cp2--></fo:wrapper>
-<fo:wrapper id="id2764587"><!--cp2see, cp2seesec--></fo:wrapper>
+<fo:wrapper id="id2881351"><!--cp2see, cp2seesec--></fo:wrapper>
 
-<fo:wrapper id="id2764623"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2855093"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2764652"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2855121"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2764681"><!--dp2--></fo:wrapper></fo:block>
+<fo:wrapper id="id2760114"><!--dp2--></fo:wrapper></fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2764702" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760136" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
@@ -242,26 +235,26 @@
         </fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.
-<fo:wrapper id="id2764719"><!--ap1--></fo:wrapper>
+<fo:wrapper id="id2760152"><!--ap1--></fo:wrapper>
-<fo:wrapper id="id2764742"><!--ap2--></fo:wrapper>
+<fo:wrapper id="id2760175"><!--ap2--></fo:wrapper>
 
-<fo:wrapper id="id2764765"><!--bp1, bp1bs1--></fo:wrapper>
+<fo:wrapper id="id2760198"><!--bp1, bp1bs1--></fo:wrapper>
-<fo:wrapper id="id2764796"><!--bp2--></fo:wrapper>
+<fo:wrapper id="id2760229"><!--bp2--></fo:wrapper>
 
-<fo:wrapper id="id2764819"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
+<fo:wrapper id="id2760252"><!--cp1, cp1cs1, cp1cs1ct1--></fo:wrapper>
-<fo:wrapper id="id2764920"><!--cp2--></fo:wrapper>
+<fo:wrapper id="id2760382"><!--cp2--></fo:wrapper>
 
-<fo:wrapper id="id2764942"><!--dp1, dp1ds1--></fo:wrapper>
+<fo:wrapper id="id2760405"><!--dp1, dp1ds1--></fo:wrapper>
-<fo:wrapper id="id2764973"><!--dp1, dp1ds2--></fo:wrapper>
+<fo:wrapper id="id2760435"><!--dp1, dp1ds2--></fo:wrapper>
-<fo:wrapper id="id2765004"><!--dp2--></fo:wrapper>
+<fo:wrapper id="id2760466"><!--dp2--></fo:wrapper>
 
-<fo:wrapper id="id2765026"><!--1 digit test--></fo:wrapper>
+<fo:wrapper id="id2760489"><!--1 digit test--></fo:wrapper>
-<fo:wrapper id="id2765049"><!--[square bracket test]--></fo:wrapper>
+<fo:wrapper id="id2760512"><!--[square bracket test]--></fo:wrapper>
-<fo:wrapper id="id2765072"><!--2 digit test--></fo:wrapper>
+<fo:wrapper id="id2760535"><!--2 digit test--></fo:wrapper>
 </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2765106" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760569" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>

tests/docbook/result/fo/multilingual.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2805261" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2805691" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -205,7 +205,7 @@
           <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tol 1. Catalan</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2763430">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2763863">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Catalan, if I knew any.
@@ -254,7 +254,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitola 2. Czech</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2805393">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2805823">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Pozn&#xE1;mka</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Czech, if I knew any.
@@ -303,7 +303,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitel 3. Danish</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759974">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2760464">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Danish, if I knew any.
@@ -352,7 +352,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tulo 4. Spanish</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2760023">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2760305">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Spanish, if I knew any.
@@ -401,7 +401,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Luku 5. Finnish</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2758705">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759244">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Huomaa</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Finnish, if I knew any.
@@ -450,7 +450,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Chapitre 6. French</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759105">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759704">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in French, if I knew any.
@@ -499,7 +499,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Capitolo 7. Italian</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759505">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2759119">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Italian, if I knew any.
@@ -548,7 +548,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitel 8. German</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2869181">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2869610">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Anmerkung</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in German, if I knew any.
@@ -597,7 +597,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">&#xCA;&#xE5;&#xF6;&#xDC;&#xEB;&#xE1;&#xE9;&#xEF; 9. Greek</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2869521">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2869948">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">&#xD3;&#xE7;&#xEC;&#xE5;&#xDF;&#xF9;&#xF3;&#xE7;</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Greek, if I knew any.
@@ -646,7 +646,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 10. English</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2869860">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2870288">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Note</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph is in English.
@@ -695,7 +695,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">&#x7B2C;11&#x7AE0;</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2870199">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2870627">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">&#x6CE8;&#x610F;</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Japanese, if I knew any.
@@ -744,7 +744,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Cap. 12. Romanian</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2870538">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2870966">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Not&#xE3;</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Romanian, if I knew any.
@@ -793,7 +793,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">&#x413;&#x43B;&#x430;&#x432;&#x430; 13. Russian</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2870878">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2871306">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">&#x417;&#x430;&#x43C;&#x435;&#x447;&#x430;&#x43D;&#x438;&#x435;</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Russian, if I knew any.
@@ -842,7 +842,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Kapittel 14. Norsk</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2871217">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2871645">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Notat</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Norsk, if I knew any.
@@ -891,7 +891,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Hoofdstuk 15. Dutch</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2871556">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2871984">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Opmerking</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Dutch, if I knew any.
@@ -940,7 +940,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Rozdzia&#x142; 16. Polish</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2871895">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2872323">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Notatka</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Polish, if I knew any.
@@ -989,7 +989,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tulo 17. Portuguese</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2872235">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2872663">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Portugeuse, if I knew any.
@@ -1038,7 +1038,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Cap&#xED;tulo 18. Portuguese (Brazilian)</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2872574">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2873002">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Nota</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Brazilian Portugeuse, if I knew any.
@@ -1087,7 +1087,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitola 19. Slovak</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2872914">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2873342">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Pozn&#xE1;mka</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Slovak, if I knew any.
@@ -1136,7 +1136,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Kapitel 20. Swedish</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2873254">
+      <fo:block space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" start-indent="0.25in" end-indent="0.25in" id="id2873682">
         <fo:block font-size="14pt" font-weight="bold" keep-with-next="always">Not</fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
 This paragraph would be in Swedish, if I knew any.
@@ -1180,7 +1180,7 @@ See <fo:basic-link internal-destination="bibl">Bibliography</fo:basic-link>.
           <fo:block keep-with-next.within-column="always" hyphenate="false">Bibliography</fo:block>
         </fo:block>
       </fo:block>
-      <fo:block id="id2873566" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+      <fo:block id="id2873994" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
         <fo:inline>[AhoSethiUllman96] </fo:inline>
         <fo:inline>Alfred V. Aho,Ravi Sethi, and Jeffrey D. Ullman. </fo:inline>
         <fo:inline><fo:inline font-style="italic">Compilers, Principles, Techniques, and Tools</fo:inline>. </fo:inline>

tests/docbook/result/fo/qa2.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2600737" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2760281" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -103,12 +103,12 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">1 chapter test</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761712"><fo:page-number-citation ref-id="id2761712"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760291"><fo:page-number-citation ref-id="id2760291"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2761712" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
+  <fo:page-sequence id="id2760291" hyphenate="true" master-name="oneside1" language="en" initial-page-number="1">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. chapter test</fo:block>
@@ -127,17 +127,17 @@
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Test a cross reference to a question: <fo:basic-link internal-destination="q1">Q: <fo:block color="red">&lt;label&gt;Q1&lt;/label&gt;</fo:block></fo:basic-link>.
 </fo:block>
-      <fo:block id="id2761848">
+      <fo:block id="id2760427">
         <fo:block font-size="16pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
           <title>Q&amp;A Set (unspecified)</title>
         </fo:block>
-        <fo:block id="id2761964">
+        <fo:block id="id2764837">
           <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
             <title>Q&amp;A Div 1</title>
           </fo:block>
           <fo:block start-indent="0pc">
             <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
-              <fo:list-item id="id2761976" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2764849" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label id="q1" end-indent="label-end()">
                   <fo:block/>
                 </fo:list-item-label>
@@ -147,7 +147,7 @@
                   <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-              <fo:list-item id="id2761976" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2764849" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
                 <fo:list-item-label id="a1" end-indent="label-end()">
                   <fo:block/>
                 </fo:list-item-label>
@@ -160,14 +160,14 @@
             </fo:list-block>
           </fo:block>
         </fo:block>
-        <fo:block id="id2762167">
+        <fo:block id="id2765040">
           <fo:block font-size="14pt" font-weight="bold" font-family="Helvetica" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">
             <title>Q&amp;A Div 2</title>
           </fo:block>
           <fo:block start-indent="0pc">
             <fo:list-block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em" provisional-distance-between-starts="2.5em" provisional-label-separation="0.2em">
-              <fo:list-item id="id2762179" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2765052" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-                <fo:list-item-label id="id2762185" end-indent="label-end()">
+                <fo:list-item-label id="id2765058" end-indent="label-end()">
                   <fo:block/>
                 </fo:list-item-label>
                 <fo:list-item-body start-indent="body-start()">
@@ -175,8 +175,8 @@
                   <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-              <fo:list-item id="id2762179" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2765052" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-                <fo:list-item-label id="id2762209" end-indent="label-end()">
+                <fo:list-item-label id="id2765082" end-indent="label-end()">
                   <fo:block/>
                 </fo:list-item-label>
                 <fo:list-item-body start-indent="body-start()">
@@ -184,8 +184,8 @@
                   <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Answer para 2</fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-              <fo:list-item id="id2854528" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2854926" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-                <fo:list-item-label id="id2761862" end-indent="label-end()">
+                <fo:list-item-label id="id2760031" end-indent="label-end()">
                   <fo:block/>
                 </fo:list-item-label>
                 <fo:list-item-body start-indent="body-start()">
@@ -193,8 +193,8 @@
                   <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Question para 2</fo:block>
                 </fo:list-item-body>
               </fo:list-item>
-              <fo:list-item id="id2854528" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
+              <fo:list-item id="id2854926" space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">
-                <fo:list-item-label id="id2761886" end-indent="label-end()">
+                <fo:list-item-label id="id2760055" end-indent="label-end()">
                   <fo:block/>
                 </fo:list-item-label>
                 <fo:list-item-body start-indent="body-start()">

tests/docbook/result/fo/sectest.fo

@@ -131,7 +131,7 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Preface Title</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2868798"><fo:page-number-citation ref-id="id2868798"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2869232"><fo:page-number-citation ref-id="id2869232"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">1 XRef Tests</fo:inline>
@@ -140,17 +140,17 @@
         <fo:block start-indent="2pc">
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Section 1 Title</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759809"><fo:page-number-citation ref-id="id2759809"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2760314"><fo:page-number-citation ref-id="id2760314"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Section 1 Title</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759106"><fo:page-number-citation ref-id="id2759106"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2759612"><fo:page-number-citation ref-id="id2759612"/></fo:basic-link></fo:inline>
           </fo:block>
         </fo:block>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2600871" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2601205" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -168,7 +168,7 @@ of the dedication.</fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is the third para of the dedication.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2868798" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2869232" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -331,13 +331,7 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2760314">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -813,15 +807,8 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2759612">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -955,8 +942,7 @@ blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 blah blah blah blah blah blah blah blah blah blah blah blah blah blah
 </fo:block>
-        </fo:flow>
+      </fo:block>
-      </fo:page-sequence>
     </fo:flow>
   </fo:page-sequence>
 </fo:root>

tests/docbook/result/fo/set.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2805181" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2805612" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="Helvetica">
@@ -90,7 +90,7 @@
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2805191" hyphenate="true" master-name="titlepage1" language="en">
+  <fo:page-sequence id="id2805623" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -119,7 +119,7 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2805248"><fo:page-number-citation ref-id="id2805248"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2805680"><fo:page-number-citation ref-id="id2805680"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">1 Section Tests</fo:inline>
@@ -128,39 +128,39 @@
         <fo:block start-indent="4pc">
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763370"><fo:page-number-citation ref-id="id2763370"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763803"><fo:page-number-citation ref-id="id2763803"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763391"><fo:page-number-citation ref-id="id2763391"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763824"><fo:page-number-citation ref-id="id2763824"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763412"><fo:page-number-citation ref-id="id2763412"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763845"><fo:page-number-citation ref-id="id2763845"/></fo:basic-link></fo:inline>
           </fo:block>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763435"><fo:page-number-citation ref-id="id2763435"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763867"><fo:page-number-citation ref-id="id2763867"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block start-indent="4pc">
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763454"><fo:page-number-citation ref-id="id2763454"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2763887"><fo:page-number-citation ref-id="id2763887"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2868704"><fo:page-number-citation ref-id="id2868704"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2869160"><fo:page-number-citation ref-id="id2869160"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2868739"><fo:page-number-citation ref-id="id2868739"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2869182"><fo:page-number-citation ref-id="id2869182"/></fo:basic-link></fo:inline>
           </fo:block>
         </fo:block>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2805248" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2805680" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -192,13 +192,7 @@
           <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Section Tests</fo:block>
         </fo:block>
       </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2763803">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -207,15 +201,8 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2763824">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -224,15 +211,8 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2763845">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -241,11 +221,10 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
+      </fo:block>
     </fo:flow>
   </fo:page-sequence>
-    </fo:flow>
+  <fo:page-sequence id="id2763867" hyphenate="true" master-name="oneside1" language="en">
-  </fo:page-sequence>
-  <fo:page-sequence id="id2763435" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>
@@ -263,13 +242,7 @@
         </fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is just a test.</fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2763887">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -278,15 +251,8 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2869160">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -295,15 +261,8 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2869182">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -312,11 +271,10 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
+      </fo:block>
     </fo:flow>
   </fo:page-sequence>
-    </fo:flow>
+  <fo:page-sequence id="id2805710" hyphenate="true" master-name="titlepage1" language="en">
-  </fo:page-sequence>
-  <fo:page-sequence id="id2805268" hyphenate="true" master-name="titlepage1" language="en">
     <fo:flow flow-name="xsl-region-body">
       <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="Helvetica" font-weight="bold" font-size="24.8832pt" text-align="center" space-before="18.6624pt">
@@ -345,34 +303,34 @@
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always"> Foreword</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2805325"><fo:page-number-citation ref-id="id2805325"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2757298"><fo:page-number-citation ref-id="id2757298"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">1 Section Tests</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761480"><fo:page-number-citation ref-id="id2761480"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2757319"><fo:page-number-citation ref-id="id2757319"/></fo:basic-link></fo:inline>
         </fo:block>
         <fo:block start-indent="4pc">
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> First Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761494"><fo:page-number-citation ref-id="id2761494"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2757333"><fo:page-number-citation ref-id="id2757333"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Second Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761515"><fo:page-number-citation ref-id="id2761515"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761893"><fo:page-number-citation ref-id="id2761893"/></fo:basic-link></fo:inline>
           </fo:block>
           <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
             <fo:inline keep-with-next.within-line="always"> Third Sect1</fo:inline>
-            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761536"><fo:page-number-citation ref-id="id2761536"/></fo:basic-link></fo:inline>
+            <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761914"><fo:page-number-citation ref-id="id2761914"/></fo:basic-link></fo:inline>
           </fo:block>
         </fo:block>
         <fo:block text-align-last="justify" end-indent="2pc" last-line-end-indent="-2pc">
           <fo:inline keep-with-next.within-line="always">A First Appendix</fo:inline>
-          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761558"><fo:page-number-citation ref-id="id2761558"/></fo:basic-link></fo:inline>
+          <fo:inline keep-together.within-line="always"> <fo:leader leader-pattern="dots" keep-with-next.within-line="always"/> <fo:basic-link internal-destination="id2761937"><fo:page-number-citation ref-id="id2761937"/></fo:basic-link></fo:inline>
         </fo:block>
       </fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2805325" hyphenate="true" format="i" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2757298" hyphenate="true" format="i" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
@@ -387,7 +345,7 @@
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">This is a test paragraph.</fo:block>
     </fo:flow>
   </fo:page-sequence>
-  <fo:page-sequence id="id2761480" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2757319" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Chapter 1. Section Tests</fo:block>
@@ -404,13 +362,7 @@
           <fo:block keep-with-next.within-column="always" hyphenate="false">Chapter 1. Section Tests</fo:block>
         </fo:block>
       </fo:block>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
+      <fo:block id="id2757333">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
-          </fo:block>
-        </fo:static-content>
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -419,15 +371,8 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2761893">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -436,15 +381,8 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-      <fo:page-sequence id="" hyphenate="true" master-name="oneside1" language="en">
-        <fo:static-content flow-name="xsl-region-after">
-          <fo:block text-align="center" font-size="10pt">
-            <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>
       </fo:block>
-        </fo:static-content>
+      <fo:block id="id2761914">
-        <fo:flow flow-name="xsl-region-body">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" margin-left="-4pc" font-family="Helvetica">
             <fo:block keep-with-next.within-column="always">
@@ -453,11 +391,10 @@
           </fo:block>
         </fo:block>
         <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">Paragraph.</fo:block>
+      </fo:block>
     </fo:flow>
   </fo:page-sequence>
-    </fo:flow>
+  <fo:page-sequence id="id2761937" hyphenate="true" master-name="oneside1" language="en">
-  </fo:page-sequence>
-  <fo:page-sequence id="id2761558" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-before">
       <fo:block text-align="center">
         <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-size="10pt">Appendix A. First Appendix</fo:block>

tests/docbook/result/fo/table.fo

@@ -99,7 +99,7 @@
         </fo:block>
       </fo:block>
       <fo:block space-before.optimum="1em" space-before.minimum="0.8em" space-before.maximum="1.2em">How many &#xB0; can you &#xA9;.</fo:block>
-      <fo:table-and-caption id="id2761566" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
+      <fo:table-and-caption id="id2761895" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
         <fo:table-caption>
           <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
         </fo:table-caption>
@@ -217,7 +217,7 @@
           </fo:table-body>
         </fo:table>
       </fo:table-and-caption>
-      <fo:table-and-caption id="id2805304" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
+      <fo:table-and-caption id="id2869139" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
         <fo:table-caption>
           <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
         </fo:table-caption>
@@ -335,7 +335,7 @@
           </fo:table-body>
         </fo:table>
       </fo:table-and-caption>
-      <fo:table-and-caption id="id2759615" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
+      <fo:table-and-caption id="id2763846" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
         <fo:table-caption>
           <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
         </fo:table-caption>
@@ -453,7 +453,7 @@
           </fo:table-body>
         </fo:table>
       </fo:table-and-caption>
-      <fo:table-and-caption id="id2759988" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
+      <fo:table-and-caption id="id2760418" keep-together.within-column="always" space-before.minimum="0.8em" space-before.optimum="1em" space-before.maximum="1.2em" space-after.minimum="0.8em" space-after.optimum="1em" space-after.maximum="1.2em">
         <fo:table-caption>
           <fo:block font-weight="bold" space-after.minimum="0.2em" space-after.optimum="0.5em" space-after.maximum="0.8em" keep-with-next.within-column="always" hyphenate="false">A Table</fo:block>
         </fo:table-caption>

tests/docbook/result/fo/test.fo

@@ -81,7 +81,7 @@
       </fo:repeatable-page-master-alternatives>
     </fo:page-sequence-master>
   </fo:layout-master-set>
-  <fo:page-sequence id="id2600746" hyphenate="true" master-name="oneside1" language="en">
+  <fo:page-sequence id="id2760281" hyphenate="true" master-name="oneside1" language="en">
     <fo:static-content flow-name="xsl-region-after">
       <fo:block text-align="center" font-size="10pt">
         <fo:page-number xmlns:fo="http://www.w3.org/1999/XSL/Format"/>