|
From: <vic...@us...> - 2006-05-27 16:54:43
|
Revision: 7293 Author: victormote Date: 2006-05-27 09:54:33 -0700 (Sat, 27 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7293&view=rev Log Message: ----------- Don't remove empty blocks if they are empty on purpose. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-26 22:46:24 UTC (rev 7292) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-27 16:54:33 UTC (rev 7293) @@ -313,11 +313,20 @@ purgeEmptyNodes((Area) object); } } - if (area instanceof LineArea && ! area.hasChildren()) { + + /* Remove empty line areas. */ + if (area instanceof LineArea + && ! area.hasChildren()) { area.remove(); getLogger().debug("Removing empty line-area."); } - if (area instanceof NormalBlockArea && ! area.hasChildren()) { + + /* Remove empty block areas only if they are generated by FONodes that + * actually have children. If the FONode has no children, then an empty + * area is needed in the area tree. */ + if (area instanceof NormalBlockArea + && ! area.hasChildren() + && area.generatedBy.getFONode().hasChildren()) { area.remove(); getLogger().debug("Removing empty normal block-area."); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-05-30 18:19:08
|
Revision: 7318 Author: victormote Date: 2006-05-30 11:18:54 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7318&view=rev Log Message: ----------- Conform to axsl change: Remove pending footnote concepts from the Page. These should be tracked in the layout system. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-30 18:18:47 UTC (rev 7317) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-05-30 18:18:54 UTC (rev 7318) @@ -30,7 +30,6 @@ import org.axsl.areaW.AreaWException; import org.axsl.common.Constants; import org.axsl.foR.FObj; -import org.axsl.foR.fo.FootnoteBody; import org.axsl.foR.fo.Marker; import org.axsl.foR.fo.PageSequence; import org.axsl.foR.fo.Region; @@ -57,8 +56,6 @@ protected int pageNumber = 0; protected String formattedPageNumber; - private ArrayList footnotes = null; - private ArrayList markers = null; PageRA(SimplePageMaster spm, PageCollection areaTree) { @@ -161,25 +158,6 @@ return traitGeneratedBy().traitPageWidth(); } - public List getPendingFootnotes() { - return footnotes; - } - - public void setPendingFootnotes(List footnotes) { - if (footnotes instanceof ArrayList) { - this.footnotes = (ArrayList) footnotes; - } else { - this.footnotes = new ArrayList(footnotes); - } - } - - public void addPendingFootnote(FootnoteBody fb) { - if (footnotes == null) { - footnotes = new ArrayList(); - } - footnotes.add(fb); - } - public void registerMarker(Marker marker) { markers.add(marker); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-14 22:02:20
|
Revision: 7605 Author: victormote Date: 2006-06-14 15:02:13 -0700 (Wed, 14 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7605&view=rev Log Message: ----------- Conform to axsl changes: Remove unnecessary parameters. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-14 22:02:03 UTC (rev 7604) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-14 22:02:13 UTC (rev 7605) @@ -454,43 +454,43 @@ } // search forward if 'first-starting-within-page' or // 'first-including-carryover' - if (retrieve.traitRetrievePosition(this) + if (retrieve.traitRetrievePosition() == Constants.FOVAL_FIRST_INCLUDING_CARRYOVER) { for (int i = 0; i < pageMarkers.size(); i++) { Marker currentMarker = (Marker)pageMarkers.get(i); - if (currentMarker.traitMarkerClassName(this).equals( - retrieve.traitRetrieveClassName(this))) { + if (currentMarker.traitMarkerClassName().equals( + retrieve.traitRetrieveClassName())) { return currentMarker; } } - } else if (retrieve.traitRetrievePosition(this) + } else if (retrieve.traitRetrievePosition() == Constants.FOVAL_FIRST_STARTING_WITHIN_PAGE) { for (int i = 0; i < pageMarkers.size(); i++) { Marker currentMarker = (Marker)pageMarkers.get(i); - if (currentMarker.traitMarkerClassName(this).equals( - retrieve.traitRetrieveClassName(this))) { + if (currentMarker.traitMarkerClassName().equals( + retrieve.traitRetrieveClassName())) { if (startsHere(currentMarker)) { return currentMarker; } } } - } else if (retrieve.traitRetrievePosition(this) + } else if (retrieve.traitRetrievePosition() == Constants.FOVAL_LAST_STARTING_WITHIN_PAGE) { for (int i = pageMarkers.size() - 1; i >= 0; i--) { Marker currentMarker = (Marker)pageMarkers.get(i); - if (currentMarker.traitMarkerClassName(this).equals( - retrieve.traitRetrieveClassName(this))) { + if (currentMarker.traitMarkerClassName().equals( + retrieve.traitRetrieveClassName())) { if (startsHere(currentMarker)) { return currentMarker; } } } - } else if (retrieve.traitRetrievePosition(this) + } else if (retrieve.traitRetrievePosition() == Constants.FOVAL_LAST_ENDING_WITHIN_PAGE) { for (int i = pageMarkers.size() - 1; i >= 0; i--) { Marker currentMarker = (Marker)pageMarkers.get(i); - if (currentMarker.traitMarkerClassName(this).equals( - retrieve.traitRetrieveClassName(this))) { + if (currentMarker.traitMarkerClassName().equals( + retrieve.traitRetrieveClassName())) { if (endsHere(currentMarker)) { return currentMarker; } @@ -501,14 +501,14 @@ // search backward. ArrayList additionalMarkers = null; PageCollection pageCollection = getPageCollection(); - if (retrieve.traitRetrieveBoundary(this) + if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_PAGE_SEQUENCE) { PageSequence pageSequence = pageCollection.getPageSequence(); if (pageSequence == getPageSequence()) { additionalMarkers = pageCollection .getCurrentPageSequenceMarkers(); } - } else if (retrieve.traitRetrieveBoundary(this) + } else if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_DOCUMENT) { additionalMarkers = pageCollection.getDocumentMarkers(); } @@ -517,8 +517,8 @@ } for (int i = additionalMarkers.size() - 1; i >= 0; i--) { Marker currentMarker = (Marker) additionalMarkers.get(i); - if (currentMarker.traitMarkerClassName(this).equals( - retrieve.traitRetrieveClassName(this))) { + if (currentMarker.traitMarkerClassName().equals( + retrieve.traitRetrieveClassName())) { return currentMarker; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
