Move text layout code into TextLayoutManager; add generatesInlineAreas to FObj

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

1 files changed, 13 insertions, 4 deletions

diff --git a/src/org/apache/fop/fo/pagination/PageSequence.java b/src/org/apache/fop/fo/pagination/PageSequence.java
index da1e22883..1e05cef5c 100644
--- a/src/org/apache/fop/fo/pagination/PageSequence.java
+++ b/src/org/apache/fop/fo/pagination/PageSequence.java
@@ -21,6 +21,7 @@ import org.apache.fop.layout.PageMaster;
 import org.apache.fop.area.AreaTree;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.StreamRenderer;
 
 import org.apache.fop.layoutmgr.PageLayoutManager;
 
@@ -46,6 +47,10 @@ public class PageSequence extends FObj {
     //
     // associations
     //
+    /**
+     * Use to layout and render the page sequence.
+     */
+    private StreamRenderer streamRenderer;
 
     /**
      * The parent root object
@@ -266,12 +271,14 @@ public class PageSequence extends FObj {
 	}
     }
 
+
+    public void setStreamRenderer(StreamRenderer st) {
+	this.streamRenderer = st;
+    }
+
     public void end() {
 	try {
-	    AreaTree at = new AreaTree();
-	    at.setTreeModel(AreaTree.createStorePagesModel());
-	    at.startPageSequence(null);
-	    format(at);
+	    this.streamRenderer.render(this);
 	} catch (FOPException fopex) {
 	    log.error("Error in PageSequence.end(): " +
 		      fopex.getMessage());
@@ -314,6 +321,8 @@ public class PageSequence extends FObj {
 	// If no main flow, nothing to layout!
 	if (this.mainFlow == null) return;
 
+	areaTree.startPageSequence(null);
+
 	// Initialize if already used?
         this.layoutMasterSet.resetPageMasters();