git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196406 13f79535-47bb-0310-9956-ffa450edef68tags/Root_Temp_KnuthStylePageBreaking
@@ -248,15 +248,11 @@ public class LayoutHandler extends StructureHandler { | |||
* on the area tree with the page sequence title. | |||
* | |||
* @param pageSeq the page sequence starting | |||
* @param seqTitle the title of the page sequence | |||
* @param lms the layout master set | |||
*/ | |||
public void startPageSequence(PageSequence pageSeq, | |||
org.apache.fop.fo.Title seqTitle, | |||
LayoutMasterSet lms) { | |||
public void startPageSequence(PageSequence pageSeq) { | |||
Title title = null; | |||
if (seqTitle != null) { | |||
title = seqTitle.getTitleArea(); | |||
if (pageSeq.getTitleFO() != null) { | |||
title = pageSeq.getTitleFO().getTitleArea(); | |||
} | |||
areaTree.startPageSequence(title); | |||
} |
@@ -122,7 +122,7 @@ abstract public class StructureHandler extends AbstractLogEnabled { | |||
*/ | |||
abstract public void endDocument() throws SAXException; | |||
abstract public void startPageSequence(PageSequence pageSeq, Title seqTitle, LayoutMasterSet lms); | |||
abstract public void startPageSequence(PageSequence pageSeq); | |||
abstract public void endPageSequence(PageSequence pageSeq) throws FOPException; | |||
@@ -340,7 +340,7 @@ public class PageSequence extends FObj { | |||
*/ | |||
private void startStructuredPageSequence() { | |||
if (!sequenceStarted) { | |||
structHandler.startPageSequence(this, titleFO, layoutMasterSet); | |||
structHandler.startPageSequence(this); | |||
sequenceStarted = true; | |||
} | |||
} | |||
@@ -807,5 +807,14 @@ public class PageSequence extends FObj { | |||
public StaticContent getStaticContent(String name) { | |||
return (StaticContent)flowMap.get(name); | |||
} | |||
public LayoutMasterSet getLayoutMasterSet() { | |||
return layoutMasterSet; | |||
} | |||
public Title getTitleFO() { | |||
return titleFO; | |||
} | |||
} | |||
@@ -147,13 +147,13 @@ public class MIFHandler extends StructureHandler { | |||
* by the following flows and static areas. | |||
* @see org.apache.fop.apps.StructureHandler | |||
*/ | |||
public void startPageSequence(PageSequence pageSeq, Title seqTitle, LayoutMasterSet lms) { | |||
public void startPageSequence(PageSequence pageSeq) { | |||
// get the layout master set | |||
// setup the pages for this sequence | |||
String name = pageSeq.getProperty("master-reference").getString(); | |||
SimplePageMaster spm = lms.getSimplePageMaster(name); | |||
SimplePageMaster spm = pageSeq.getLayoutMasterSet().getSimplePageMaster(name); | |||
if (spm == null) { | |||
PageSequenceMaster psm = lms.getPageSequenceMaster(name); | |||
PageSequenceMaster psm = pageSeq.getLayoutMasterSet().getPageSequenceMaster(name); | |||
} else { | |||
// create simple master with regions | |||
MIFElement prop = new MIFElement("PageType"); |
@@ -150,7 +150,7 @@ public class RTFHandler extends StructureHandler { | |||
/** | |||
* @see org.apache.fop.apps.StructureHandler | |||
*/ | |||
public void startPageSequence(PageSequence pageSeq, Title seqTitle, LayoutMasterSet lms) { | |||
public void startPageSequence(PageSequence pageSeq) { | |||
try { | |||
sect = docArea.newSection(); | |||
if (!warned) { |