cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
jeremias2005/01/24 01:15:54
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
More area dimension traits.
Revision ChangesPath
1.40 +21 -9
xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- XMLRenderer.java 20 Jan 2005 08:40:41 - 1.39
+++ XMLRenderer.java 24 Jan 2005 09:15:54 - 1.40
@@ -245,8 +245,12 @@
protected void addAreaAttributes(Area area) {
addAttribute(ipd, area.getIPD());
addAttribute(bpd, area.getBPD());
-addAttribute(ipda, area.getAllocIPD());
-addAttribute(bpda, area.getAllocBPD());
+if (area.getIPD() != 0) {
+addAttribute(ipda, area.getAllocIPD());
+}
+if (area.getBPD() != 0) {
+addAttribute(bpda, area.getAllocBPD());
+}
addAttribute(bap, area.getBorderAndPaddingWidthStart() +
+ area.getBorderAndPaddingWidthEnd() +
+ area.getBorderAndPaddingWidthBefore() +
@@ -369,27 +373,30 @@
protected void renderRegionViewport(RegionViewport port) {
if (port != null) {
atts.clear();
+addAreaAttributes(port);
addAttribute(rect, port.getViewArea());
startElement(regionViewport, atts);
RegionReference region = port.getRegion();
+atts.clear();
+addAreaAttributes(region);
if (region.getRegionClass() == FO_REGION_BEFORE) {
-startElement(regionBefore);
+startElement(regionBefore, atts);
renderRegion(region);
endElement(regionBefore);
} else if (region.getRegionClass() == FO_REGION_START) {
-startElement(regionStart);
+startElement(regionStart, atts);
renderRegion(region);
endElement(regionStart);
} else if (region.getRegionClass() == FO_REGION_BODY) {
-startElement(regionBody);
+startElement(regionBody, atts);
renderBodyRegion((BodyRegion) region);
endElement(regionBody);
} else if (region.getRegionClass() == FO_REGION_END) {
-startElement(regionEnd);
+startElement(regionEnd, atts);
renderRegion(region);
endElement(regionEnd);
} else if (region.getRegionClass() == FO_REGION_AFTER) {
-startElement(regionAfter);
+startElement(regionAfter, atts);
renderRegion(region);
endElement(regionAfter);
}
@@ -420,6 +427,7 @@
*/
protected void renderMainReference(MainReference mr) {
atts.clear();
+addAreaAttributes(mr);
addAttribute(columnGap, mr.getColumnGap());
addAttribute(width, mr.getWidth());
startElement(mainReference, atts);
@@ -428,7 +436,9 @@
List spans = mr.getSpans();
for (int count = 0; count spans.size(); count++) {
span = (Span) spans.get(count);
-startElement(span);
+atts.clear();
+addAreaAttributes(span);
+startElement(span, atts);
for (int c = 0; c span.getColumnCount(); c++) {
Flow flow = (Flow) span.getFlow(c);
@@ -444,7 +454,9 @@
*/
protected void renderFlow(Flow flow) {
// the normal flow reference area contains stacked blocks
-startElement(flow);
+atts.clear();
+addAreaAttributes(flow);
+startElement(flow, atts);
super.renderFlow(flow);
endElement(flow);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
jeremias2005/01/24 06:03:56
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
normal trait attributes for page-level reference and viewport areas.
Revision ChangesPath
1.41 +5 -0
xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- XMLRenderer.java 24 Jan 2005 09:15:54 - 1.40
+++ XMLRenderer.java 24 Jan 2005 14:03:56 - 1.41
@@ -374,11 +374,13 @@
if (port != null) {
atts.clear();
addAreaAttributes(port);
+addTraitAttributes(port);
addAttribute(rect, port.getViewArea());
startElement(regionViewport, atts);
RegionReference region = port.getRegion();
atts.clear();
addAreaAttributes(region);
+addTraitAttributes(region);
if (region.getRegionClass() == FO_REGION_BEFORE) {
startElement(regionBefore, atts);
renderRegion(region);
@@ -428,6 +430,7 @@
protected void renderMainReference(MainReference mr) {
atts.clear();
addAreaAttributes(mr);
+addTraitAttributes(mr);
addAttribute(columnGap, mr.getColumnGap());
addAttribute(width, mr.getWidth());
startElement(mainReference, atts);
@@ -438,6 +441,7 @@
span = (Span) spans.get(count);
atts.clear();
addAreaAttributes(span);
+addTraitAttributes(span);
startElement(span, atts);
for (int c = 0; c span.getColumnCount(); c++) {
Flow flow = (Flow) span.getFlow(c);
@@ -456,6 +460,7 @@
// the normal flow reference area contains stacked blocks
atts.clear();
addAreaAttributes(flow);
+addTraitAttributes(flow);
startElement(flow, atts);
super.renderFlow(flow);
endElement(flow);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
jeremias2005/01/19 13:45:07
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Safety check
Revision ChangesPath
1.38 +3 -1
xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- XMLRenderer.java 18 Jan 2005 08:55:58 - 1.37
+++ XMLRenderer.java 19 Jan 2005 21:45:07 - 1.38
@@ -313,7 +313,9 @@
* @see org.apache.fop.render.Renderer#stopRenderer()
*/
public void stopRenderer() throws IOException {
-endElement(pageSequence);
+if (startedSequence) {
+endElement(pageSequence);
+}
endElement(areaTree);
try {
handler.endDocument();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
jeremias2005/01/17 02:30:55
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
More info on blocks and block-containers
Revision ChangesPath
1.35 +18 -1
xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XMLRenderer.java 12 Jan 2005 11:51:25 - 1.34
+++ XMLRenderer.java 17 Jan 2005 10:30:55 - 1.35
@@ -455,7 +455,24 @@
addAreaAttributes(block);
addTraitAttributes(block);
if (block instanceof BlockViewport) {
-addAttribute(is-viewport, true);
+BlockViewport bvp = (BlockViewport)block;
+if (bvp.getPositioning() == Block.ABSOLUTE) {
+addAttribute(positioning, absolute);
+} else if (bvp.getPositioning() == Block.FIXED) {
+addAttribute(positioning, fixed);
+}
+addAttribute(left-position, bvp.getXOffset());
+addAttribute(top-position, bvp.getYOffset());
+} else {
+if (block.getPositioning() == Block.RELATIVE) {
+addAttribute(positioning, relative);
+}
+if (block.getXOffset() != 0) {
+addAttribute(left-offset, block.getXOffset());
+}
+if (block.getYOffset() != 0) {
+addAttribute(top-offset, block.getYOffset());
+}
}
startElement(block, atts);
super.renderBlock(block);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
jeremias2005/01/17 22:58:03
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Show top|left-position traits only for abs positioned BCs.
Revision ChangesPath
1.36 +4 -2
xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XMLRenderer.java 17 Jan 2005 10:30:55 - 1.35
+++ XMLRenderer.java 18 Jan 2005 06:58:03 - 1.36
@@ -458,11 +458,13 @@
BlockViewport bvp = (BlockViewport)block;
if (bvp.getPositioning() == Block.ABSOLUTE) {
addAttribute(positioning, absolute);
+addAttribute(left-position, bvp.getXOffset());
+addAttribute(top-position, bvp.getYOffset());
} else if (bvp.getPositioning() == Block.FIXED) {
addAttribute(positioning, fixed);
+addAttribute(left-position, bvp.getXOffset());
+addAttribute(top-position, bvp.getYOffset());
}
-addAttribute(left-position, bvp.getXOffset());
-addAttribute(top-position, bvp.getYOffset());
} else {
if (block.getPositioning() == Block.RELATIVE) {
addAttribute(positioning, relative);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
jeremias2005/01/12 03:51:25
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Some more info on the area-tree.
Revision ChangesPath
1.34 +8 -2
xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XMLRenderer.java 6 Jan 2005 09:11:02 - 1.33
+++ XMLRenderer.java 12 Jan 2005 11:51:25 - 1.34
@@ -45,6 +45,7 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.BeforeFloat;
import org.apache.fop.area.Block;
+import org.apache.fop.area.BlockViewport;
import org.apache.fop.area.BodyRegion;
import org.apache.fop.area.Flow;
import org.apache.fop.area.Footnote;
@@ -453,6 +454,9 @@
atts.clear();
addAreaAttributes(block);
addTraitAttributes(block);
+if (block instanceof BlockViewport) {
+addAttribute(is-viewport, true);
+}
startElement(block, atts);
super.renderBlock(block);
endElement(block);
@@ -474,7 +478,9 @@
* @see org.apache.fop.render.Renderer#renderViewport(Viewport)
*/
protected void renderViewport(Viewport viewport) {
-startElement(viewport);
+atts.clear();
+addAreaAttributes(viewport);
+startElement(viewport, atts);
super.renderViewport(viewport);
endElement(viewport);
}
@@ -504,7 +510,7 @@
* Renders an fo:foreing-object.
* @param fo the foreign object
*/
-public void renderForeignObject(ForeignObject fo) {
+public void renderForeignObject(ForeignObject fo, Rectangle2D pos) {
atts.clear();
addAreaAttributes(fo);
startElement(foreignObject, atts);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
gmazza 2004/09/25 14:55:36
Modified:src/java/org/apache/fop/area AreaTreeHandler.java
AreaTreeModel.java RenderPagesModel.java
StorePagesModel.java
src/java/org/apache/fop/render AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Removed: src/java/org/apache/fop/area Title.java
Log:
Removal of empty Title subclass, now using LineArea.
Revision ChangesPath
1.9 +5 -5 xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java
Index: AreaTreeHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AreaTreeHandler.java 7 Sep 2004 20:47:08 - 1.8
+++ AreaTreeHandler.java 25 Sep 2004 21:55:36 - 1.9
@@ -39,6 +39,7 @@
import org.apache.fop.fo.extensions.Outline;
import org.apache.fop.fo.extensions.Bookmarks;
import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.fo.pagination.Title;
import org.apache.fop.layoutmgr.ContentLayoutManager;
import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
import org.apache.fop.layoutmgr.PageLayoutManager;
@@ -370,7 +371,7 @@
* @throws FOPException if there is an error formatting the contents
*/
private void formatPageSequence(PageSequence pageSeq) {
-Title title = null;
+LineArea title = null;
if (pageSeq.getTitleFO() != null) {
title = getTitleArea(pageSeq.getTitleFO());
}
@@ -422,10 +423,9 @@
/**
* @return the Title area
*/
-private org.apache.fop.area.Title
getTitleArea(org.apache.fop.fo.pagination.Title foTitle) {
+private LineArea getTitleArea(Title foTitle) {
// get breaks then add areas to title
-org.apache.fop.area.Title title =
- new org.apache.fop.area.Title();
+LineArea title = new LineArea();
ContentLayoutManager clm = new ContentLayoutManager(title);
clm.setUserAgent(foTitle.getUserAgent());
1.6 +2 -2 xml-fop/src/java/org/apache/fop/area/AreaTreeModel.java
Index: AreaTreeModel.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AreaTreeModel.java20 Sep 2004 00:37:13 - 1.5
+++ AreaTreeModel.java25 Sep 2004 21:55:36 - 1.6
@@ -34,7 +34,7 @@
* Start a page sequence on this model.
* @param title the title of the new page sequence
*/
-public abstract void startPageSequence(Title title);
+public abstract void startPageSequence(LineArea title);
/**
* Add a page to this moel.
@@ -80,6 +80,6 @@
* @param count the page sequence count
* @return the title of the page sequence
*/
-public abstract Title getTitle(int count);
+public abstract LineArea getTitle(int count);
}
1.5 +1 -1 xml-fop/src/java/org/apache/fop/area/RenderPagesModel.java
Index: RenderPagesModel.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RenderPagesModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RenderPagesModel.java 9 Jul 2004 17:27:12 - 1.4
+++ RenderPagesModel.java 25 Sep 2004 21:55:36 - 1.5
@@ -142,7 +142,7 @@
* started with the given title.
* @param title the title of the new page sequence
*/
-public void startPageSequence(Title title) {
+public void startPageSequence(LineArea title) {
super.startPageSequence(title);
renderer.startPageSequence(title);
}
1.8 +3 -3 xml-fop/src/java/org/apache/fop/area/StorePagesModel.java
Index: StorePagesModel.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/StorePagesModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StorePagesModel.java 23 Sep 2004 10:04:36 - 1.7
+++ StorePagesModel.java 25 Sep 2004 21:55:36 - 1.8
@@ -47,7 +47,7 @@
* This creates a new list for the pages in the new page sequence.
* @param title the title of the page sequence.
*/
-public void startPageSequence(Title title) {
+
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
bckfnn 2004/09/22 01:29:45
Modified:src/java/org/apache/fop/render/ps PSRenderer.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Use content ipd/bpd instead of allocation width/height.
Revision ChangesPath
1.31 +9 -9 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PSRenderer.java 9 Jul 2004 17:27:12 - 1.30
+++ PSRenderer.java 22 Sep 2004 08:29:44 - 1.31
@@ -522,8 +522,8 @@
saveGraphicsState();
int x = bv.getXOffset() + containingIPPosition;
int y = bv.getYOffset() + containingBPPosition;
-int width = bv.getWidth();
-int height = bv.getHeight();
+int width = bv.getIPD();
+int height = bv.getBPD();
clip(x, y, width, height);
}
@@ -556,11 +556,11 @@
double[] vals = ctm.toArray();
//boolean aclock = vals[2] == 1.0;
if (vals[2] == 1.0) {
-ctm = ctm.translate(-saveBP - bv.getHeight(), -saveIP);
+ctm = ctm.translate(-saveBP - bv.getBPD(), -saveIP);
} else if (vals[0] == -1.0) {
-ctm = ctm.translate(-saveIP - bv.getWidth(), -saveBP -
bv.getHeight());
+ctm = ctm.translate(-saveIP - bv.getIPD(), -saveBP -
bv.getBPD());
} else {
-ctm = ctm.translate(saveBP, saveIP - bv.getWidth());
+ctm = ctm.translate(saveBP, saveIP - bv.getIPD());
}
}
@@ -573,8 +573,8 @@
saveGraphicsState();
int x = bv.getXOffset();
int y = bv.getYOffset();
-int width = bv.getWidth();
-int height = bv.getHeight();
+int width = bv.getIPD();
+int height = bv.getBPD();
clip(x, y, width, height);
}
@@ -599,7 +599,7 @@
currentIPPosition = saveIP;
currentBPPosition = saveBP;
-currentBPPosition += (int)(bv.getHeight());
+currentBPPosition += (int)(bv.getAllocBPD());
}
currentFontName = saveFontName;
}
@@ -663,7 +663,7 @@
float startx = currentIPPosition;
float starty = currentBPPosition;
drawBackAndBorders(block, startx, starty,
- block.getWidth(), block.getHeight());
+ block.getIPD(), block.getBPD());
}
/**
1.31 +1 -1 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AWTRenderer.java 9 Sep 2004 07:29:40 - 1.30
+++ AWTRenderer.java 22 Sep 2004 08:29:45 - 1.31
@@ -459,7 +459,7 @@
graphics.drawString(s, 220, 200);
// TODO: render text decorations
-currentBlockIPPosition += text.getWidth();
+currentBlockIPPosition += text.getAllocIPD();
}
/** @see org.apache.fop.render.AbstractRenderer */
1.18 +1 -1 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SVGRenderer.java 9 Jul 2004 20:05:41 - 1.17
+++ SVGRenderer.java 22 Sep 2004 08:29:45 - 1.18
@@ -380,7 +380,7 @@
currentBlockIPPosition / 1000,
(currentBPPosition + area.getOffset()
- area.getRuleThickness() / 2) / 1000,
-(currentBlockIPPosition + area.getWidth()) / 1000,
+(currentBlockIPPosition + area.getIPD()) / 1000,
(currentBPPosition + area.getOffset()
- area.getRuleThickness() / 2) / 1000);
line.setAttributeNS(null, style, style);
1.28 +5 -6 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
spepping2004/09/05 11:16:32 Modified:src/java/org/apache/fop/area/inline Character.java TextArea.java src/java/org/apache/fop/fo PropertyManager.java src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java CharacterLayoutManager.java ContentLayoutManager.java InlineStackingLayoutManager.java LayoutContext.java LayoutManager.java LeaderLayoutManager.java LeafNodeLayoutManager.java LineLayoutManager.java TextLayoutManager.java src/java/org/apache/fop/render/pdf PDFRenderer.java src/java/org/apache/fop/render/xml XMLRenderer.java Log: New line breaking algorithm, patch 29124, submitted by Luca Furini. This patch implements the algorithm for most but not yet all inline layout managers. For the algorithm, see D.E. Knuth and M.F. Plass, Breaking paragraphs into lines, Software, Practice and Experience 11 (1981) 1119-1184; reprinted in: D. E. Knuth, Digital typography, CSLI Lecture Notes Number 78 (CLSI Publications, Stanford, CA, USA) pp. 67-155. Revision ChangesPath 1.5 +55 -4 xml-fop/src/java/org/apache/fop/area/inline/Character.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/area/inline/Character.java.diff?r1=1.4r2=1.5 1.5 +28 -10xml-fop/src/java/org/apache/fop/area/inline/TextArea.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/area/inline/TextArea.java.diff?r1=1.4r2=1.5 1.34 +35 -15xml-fop/src/java/org/apache/fop/fo/PropertyManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java.diff?r1=1.33r2=1.34 1.21 +39 -0 xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java.diff?r1=1.20r2=1.21 1.2 +217 -1 xml-fop/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java.diff?r1=1.1r2=1.2 1.13 +30 -0 xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java.diff?r1=1.12r2=1.13 1.11 +233 -11 xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java.diff?r1=1.10r2=1.11 1.6 +1 -0 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutContext.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutContext.java.diff?r1=1.5r2=1.6 1.11 +15 -0 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java.diff?r1=1.10r2=1.11 1.4 +103 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java.diff?r1=1.3r2=1.4 1.7 +114 -6 xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java.diff?r1=1.6r2=1.7 1.25 +1002 -225 xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java.diff?r1=1.24r2=1.25 1.18 +521 -77 xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java.diff?r1=1.17r2=1.18 1.48 +68 -2 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java.diff?r1=1.47r2=1.48 1.26 +2 -1 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java.diff?r1=1.25r2=1.26 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
gmazza 2004/08/29 13:58:20
Modified:src/java/org/apache/fop/area BodyRegion.java Page.java
RegionReference.java
src/java/org/apache/fop/fo/pagination PageSequence.java
Region.java RegionAfter.java RegionBA.java
RegionBefore.java RegionBody.java RegionEnd.java
RegionSE.java RegionStart.java
SimplePageMaster.java
src/java/org/apache/fop/layoutmgr PageLayoutManager.java
src/java/org/apache/fop/render AbstractRenderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/rtf
PageAttributesConverter.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Removed the redundant Region Class Codes in favor of the FO constant
identifiers.
Revision ChangesPath
1.6 +2 -2 xml-fop/src/java/org/apache/fop/area/BodyRegion.java
Index: BodyRegion.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/BodyRegion.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BodyRegion.java 27 May 2004 10:52:33 - 1.5
+++ BodyRegion.java 29 Aug 2004 20:58:19 - 1.6
@@ -18,7 +18,7 @@
package org.apache.fop.area;
-import org.apache.fop.fo.pagination.Region;
+import org.apache.fop.fo.Constants;
/**
* The body region area.
@@ -40,7 +40,7 @@
* This sets the region reference area class to BODY.
*/
public BodyRegion() {
-super(Region.BODY_CODE);
+super(Constants.FO_REGION_BODY);
}
/**
1.6 +11 -11xml-fop/src/java/org/apache/fop/area/Page.java
Index: Page.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Page.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Page.java 27 May 2004 10:52:33 - 1.5
+++ Page.java 29 Aug 2004 20:58:19 - 1.6
@@ -21,7 +21,7 @@
import java.io.Serializable;
import java.util.Map;
-import org.apache.fop.fo.pagination.Region;
+import org.apache.fop.fo.Constants;
/**
* The page.
@@ -52,15 +52,15 @@
* @param port the region viewport to set
*/
public void setRegionViewport(int areaclass, RegionViewport port) {
-if (areaclass == Region.BEFORE_CODE) {
+if (areaclass == Constants.FO_REGION_BEFORE) {
regionBefore = port;
-} else if (areaclass == Region.START_CODE) {
+} else if (areaclass == Constants.FO_REGION_START) {
regionStart = port;
-} else if (areaclass == Region.BODY_CODE) {
+} else if (areaclass == Constants.FO_REGION_BODY) {
regionBody = port;
-} else if (areaclass == Region.END_CODE) {
+} else if (areaclass == Constants.FO_REGION_END) {
regionEnd = port;
-} else if (areaclass == Region.AFTER_CODE) {
+} else if (areaclass == Constants.FO_REGION_AFTER) {
regionAfter = port;
}
}
@@ -72,15 +72,15 @@
* @return the region viewport or null if none
*/
public RegionViewport getRegionViewport(int areaclass) {
-if (areaclass == Region.BEFORE_CODE) {
+if (areaclass == Constants.FO_REGION_BEFORE) {
return regionBefore;
-} else if (areaclass == Region.START_CODE) {
+} else if (areaclass == Constants.FO_REGION_START) {
return regionStart;
-} else if (areaclass == Region.BODY_CODE) {
+} else if (areaclass == Constants.FO_REGION_BODY) {
return regionBody;
-} else if (areaclass == Region.END_CODE) {
+} else if (areaclass == Constants.FO_REGION_END) {
return regionEnd;
-} else if (areaclass == Region.AFTER_CODE) {
+} else if (areaclass == Constants.FO_REGION_AFTER) {
return regionAfter;
}
return null;
1.5 +2 -2 xml-fop/src/java/org/apache/fop/area/RegionReference.java
Index: RegionReference.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RegionReference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RegionReference.java 27 Feb 2004 17:41:26 - 1.4
+++ RegionReference.java 29 Aug 2004 20:58:19 - 1.5
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.fop.fo.pagination.Region;
+import org.apache.fop.fo.Constants;
/**
* This is a region
