Semantic adjustments.

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

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 52179432102d137e2756addf0f1ac42390e9bc97..a55826f59258747a38faf2f2d10811cd1cf51e78 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -450,9 +450,12 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
                 currentPageNum, isFirstPage, bIsBlank);
             Region body = currentSimplePageMaster.getRegion(FO_REGION_BODY);
             if (!pageSeq.getMainFlow().getFlowName().equals(body.getRegionName())) {
+              // this is fine by the XSL Rec (fo:flow's flow-name can be mapped to
+              // any region), but we don't support it yet.
               throw new FOPException("Flow '" + pageSeq.getMainFlow().getFlowName()
                  + "' does not map to the region-body in page-master '"
-                 + currentSimplePageMaster.getMasterName() + "'");
+                 + currentSimplePageMaster.getMasterName() + "'.  FOP presently "
+                 + "does not support this.");
             }
             curPage = createPageAreas(currentSimplePageMaster);
             isFirstPage = false;
@@ -496,7 +499,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         curFlow = curSpan.getNormalFlow(0);
     }
 
-    private void layoutStaticContent(int regionID) {
+    private void layoutSideRegion(int regionID) {
         SideRegion reg = (SideRegion)currentSimplePageMaster.getRegion(regionID);
         if (reg == null) {
             return;
@@ -556,11 +559,11 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
             curFlow = null;
             return;
         }
-        // Layout static content into the regions
-        layoutStaticContent(FO_REGION_BEFORE); 
-        layoutStaticContent(FO_REGION_AFTER);
-        layoutStaticContent(FO_REGION_START);
-        layoutStaticContent(FO_REGION_END);
+        // Layout side regions
+        layoutSideRegion(FO_REGION_BEFORE); 
+        layoutSideRegion(FO_REGION_AFTER);
+        layoutSideRegion(FO_REGION_START);
+        layoutSideRegion(FO_REGION_END);
         // Queue for ID resolution and rendering
         areaTreeModel.addPage(curPage);
         log.debug("page finished: " + curPage.getPageNumberString() + ", current num: " + currentPageNum);