cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
gmazza 2005/03/10 23:23:43
Modified:src/java/org/apache/fop/area BeforeFloat.java
BodyRegion.java Footnote.java MainReference.java
Span.java
src/java/org/apache/fop/layoutmgr LeaderLayoutManager.java
LeafNodeLayoutManager.java
PageSequenceLayoutManager.java
src/java/org/apache/fop/layoutmgr/list
ListBlockLayoutManager.java
src/java/org/apache/fop/render AbstractRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Added: src/java/org/apache/fop/area NormalFlow.java
Removed: src/java/org/apache/fop/area Flow.java
Log:
1.) More commenting, some simplifications in the Area classes and PSLM.
2.) Renamed Area.Flow to NormalFlow, uglier but more in conformance with the
Recommendation (normal-flow-reference-area) and more specific/easier to
understand.
Revision ChangesPath
1.4 +3 -3 xml-fop/src/java/org/apache/fop/area/BeforeFloat.java
Index: BeforeFloat.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/BeforeFloat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeforeFloat.java 22 Sep 2004 08:18:41 - 1.3
+++ BeforeFloat.java 11 Mar 2005 07:23:43 - 1.4
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
package org.apache.fop.area;
/**
- * The before float area.
- * This is used to place the before float areas.
+ * The before-float-reference-area optionally generated by an fo:region-body.
* It has an optional separator and before float block children.
+ * See fo:region-body definition in the XSL Rec for more information.
*/
public class BeforeFloat extends BlockParent {
// this is an optional block area that will be rendered
1.10 +7 -6 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BodyRegion.java 5 Mar 2005 19:53:13 - 1.9
+++ BodyRegion.java 11 Mar 2005 07:23:43 - 1.10
@@ -21,14 +21,15 @@
import org.apache.fop.fo.Constants;
/**
- * The body region area.
- * This area contains a main reference area and optionally a
- * before float and footnote area.
+ * This class is a container for all areas that may be generated by
+ * an fo:region-body. It extends the RegionReference that is used
+ * directly by the other region classes.
+ * See fo:region-body definition in the XSL Rec for more information.
*/
public class BodyRegion extends RegionReference {
-private BeforeFloat beforeFloat;
-private MainReference mainReference;
-private Footnote footnote;
+private BeforeFloat beforeFloat; // optional
+private MainReference mainReference; // mandatory
+private Footnote footnote; // optional
private int columnGap;
private int columnCount;
1.3 +3 -2 xml-fop/src/java/org/apache/fop/area/Footnote.java
Index: Footnote.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Footnote.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Footnote.java 27 Feb 2004 17:41:26 - 1.2
+++ Footnote.java 11 Mar 2005 07:23:43 - 1.3
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,8 +21,9 @@
// may combine with before float into a conditional area
/**
- * Footnote reference area.
+ * The footnote-reference-area optionally generated by an fo:region-body.
* This areas holds footnote areas and an optional separator area.
+ * See fo:region-body definition in the XSL Rec for more information.
*/
public class Footnote extends BlockParent {
private Block separator = null;
1.5 +7 -5 xml-fop/src/java/org/apache/fop/area/MainReference.java
Index: MainReference.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/MainReference.java,v
re
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
gmazza 2005/02/06 12:48:48
Modified:src/java/org/apache/fop/area CachedRenderPagesModel.java
PageViewport.java RenderPagesModel.java
src/java/org/apache/fop/area/inline
UnresolvedPageNumber.java
src/java/org/apache/fop/fo/pagination PageSequence.java
src/java/org/apache/fop/layoutmgr
PageNumberCitationLayoutManager.java
PageSequenceLayoutManager.java
src/java/org/apache/fop/render/ps PSRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Rolled the PageNumberGenerator from PSLM back into PageSequence (slightly
simpler, also this functionality is useful for non-layout render types),
renamed PageViewport.getPageNumber() to .getPageNumberString() to emphasize
what it is actually returning.
Revision ChangesPath
1.8 +1 -1
xml-fop/src/java/org/apache/fop/area/CachedRenderPagesModel.java
Index: CachedRenderPagesModel.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/CachedRenderPagesModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CachedRenderPagesModel.java 16 Dec 2004 23:59:13 - 1.7
+++ CachedRenderPagesModel.java 6 Feb 2005 20:48:47 - 1.8
@@ -83,7 +83,7 @@
if (!p.isResolved()) {
String[] idrefs = p.getIDRefs();
for (int count = 0; count < idrefs.length; count++) {
-log.warn("Page " + p.getPageNumber() +
+log.warn("Page " + p.getPageNumberString() +
": Unresolved id reference \"" +
idrefs[count]
+ "\" found.");
}
1.11 +6 -6 xml-fop/src/java/org/apache/fop/area/PageViewport.java
Index: PageViewport.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PageViewport.java 16 Dec 2004 23:59:13 - 1.10
+++ PageViewport.java 6 Feb 2005 20:48:47 - 1.11
@@ -42,7 +42,7 @@
private Page page;
private Rectangle2D viewArea;
private boolean clip = false;
-private String pageNumber = null;
+private String pageNumberString = null;
// list of id references and the rectangle on the page
private Map idReferences = null;
@@ -100,16 +100,16 @@
* Set the page number for this page.
* @param num the string representing the page number
*/
-public void setPageNumber(String num) {
-pageNumber = num;
+public void setPageNumberString(String num) {
+pageNumberString = num;
}
/**
* Get the page number of this page.
* @return the string that represents this page
*/
-public String getPageNumber() {
-return pageNumber;
+public String getPageNumberString() {
+return pageNumberString;
}
/**
@@ -368,7 +368,7 @@
public String toString() {
StringBuffer sb = new StringBuffer(64);
sb.append("PageViewport: page=");
-sb.append(getPageNumber());
+sb.append(getPageNumberString());
return sb.toString();
}
}
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RenderPagesModel.java 16 Dec 2004 23:59:13 - 1.11
+++ RenderPagesModel.java 6 Feb 2005 20:48:47 - 1.12
@@ -151,7 +151,7 @@
if (!p.isResolved()) {
String[] idrefs = p.getIDRefs();
for (int count = 0; count < idrefs.length; count++) {
-log.warn("Page " + p.getPageNumber() +
+log.warn("Page " + p.getPageNumberString() +
": Unresolved id reference \"" +
idrefs[count]
+ "\" found.");
}
1.9 +1 -1
xml-fop/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
Index: UnresolvedPageNumber.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java,v
retrieving revision 1.8
ret
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
jeremias2005/01/31 05:10:39
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Added the page number to the pageViewport
Revision ChangesPath
1.42 +1 -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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- XMLRenderer.java 24 Jan 2005 14:03:56 - 1.41
+++ XMLRenderer.java 31 Jan 2005 13:10:39 - 1.42
@@ -338,6 +338,7 @@
public void renderPage(PageViewport page) throws IOException,
FOPException {
atts.clear();
addAttribute("bounds", page.getViewArea());
+addAttribute("nr", page.getPageNumber());
startElement("pageViewport", atts);
startElement("page");
super.renderPage(page);
-
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/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/20 00:40:41
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Output clip trait for BlockViewports
Revision ChangesPath
1.39 +3 -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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- XMLRenderer.java 19 Jan 2005 21:45:07 - 1.38
+++ XMLRenderer.java 20 Jan 2005 08:40:41 - 1.39
@@ -471,6 +471,9 @@
addAttribute("top-position", bvp.getYOffset());
}
addAttribute("ctm", bvp.getCTM().toString());
+if (bvp.getClip()) {
+addAttribute("clipped", "true");
+}
} 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/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/18 00:55:58
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
I need the CTM for display-align checks.
Revision ChangesPath
1.37 +6 -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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- XMLRenderer.java 18 Jan 2005 06:58:03 - 1.36
+++ XMLRenderer.java 18 Jan 2005 08:55:58 - 1.37
@@ -456,15 +456,19 @@
addTraitAttributes(block);
if (block instanceof BlockViewport) {
BlockViewport bvp = (BlockViewport)block;
+boolean abspos = false;
if (bvp.getPositioning() == Block.ABSOLUTE) {
addAttribute("positioning", "absolute");
-addAttribute("left-position", bvp.getXOffset());
-addAttribute("top-position", bvp.getYOffset());
+abspos = true;
} else if (bvp.getPositioning() == Block.FIXED) {
addAttribute("positioning", "fixed");
+abspos = true;
+}
+if (abspos) {
addAttribute("left-position", bvp.getXOffset());
addAttribute("top-position", bvp.getYOffset());
}
+addAttribute("ctm", bvp.getCTM().toString());
} 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/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/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/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
jeremias2005/01/06 01:11:02
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Alloc IPD/BPD, too, not just content IPD/BPD.
Revision ChangesPath
1.33 +2 -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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XMLRenderer.java 6 Jan 2005 08:37:52 - 1.32
+++ XMLRenderer.java 6 Jan 2005 09:11:02 - 1.33
@@ -244,6 +244,8 @@
protected void addAreaAttributes(Area area) {
addAttribute("ipd", area.getIPD());
addAttribute("bpd", area.getBPD());
+addAttribute("ipda", area.getAllocIPD());
+addAttribute("bpda", area.getAllocBPD());
addAttribute("bap", area.getBorderAndPaddingWidthStart() + " "
+ area.getBorderAndPaddingWidthEnd() + " "
+ area.getBorderAndPaddingWidthBefore() + " "
-
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/06 00:37:53
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Improved area tree XML generation by filtering uninformative attributes while
adding others.
Revision ChangesPath
1.32 +35 -40
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XMLRenderer.java 5 Jan 2005 21:08:27 - 1.31
+++ XMLRenderer.java 6 Jan 2005 08:37:52 - 1.32
@@ -244,8 +244,32 @@
protected void addAreaAttributes(Area area) {
addAttribute("ipd", area.getIPD());
addAttribute("bpd", area.getBPD());
+addAttribute("bap", area.getBorderAndPaddingWidthStart() + " "
++ area.getBorderAndPaddingWidthEnd() + " "
++ area.getBorderAndPaddingWidthBefore() + " "
++ area.getBorderAndPaddingWidthAfter());
}
+/**
+ * Adds attributes from traits of an Area.
+ * @param area Area to extract traits from
+ */
+protected void addTraitAttributes(Area area) {
+Map traitMap = area.getTraits();
+if (traitMap != null) {
+Iterator iter = traitMap.entrySet().iterator();
+while (iter.hasNext()) {
+Map.Entry traitEntry = (Map.Entry) iter.next();
+String name = Trait.getTraitName(traitEntry.getKey());
+if ("break-before".equals(name) ||
"break-after".equals(name)) {
+continue;
+}
+String value = traitEntry.getValue().toString();
+addAttribute(name, value);
+}
+}
+}
+
private String createString(Rectangle2D rect) {
return "" + (int) rect.getX() + " " + (int) rect.getY() + " "
+ (int) rect.getWidth() + " " + (int) rect.getHeight();
@@ -372,7 +396,7 @@
* @see
org.apache.fop.render.AbstractRenderer#renderBeforeFloat(BeforeFloat)
*/
protected void renderBeforeFloat(BeforeFloat bf) {
-startElement("");
+startElement("beforeFloat");
super.renderBeforeFloat(bf);
endElement("beforeFloat");
}
@@ -426,10 +450,7 @@
protected void renderBlock(Block block) {
atts.clear();
addAreaAttributes(block);
-Map map = block.getTraits();
-if (map != null) {
-addAttribute("props", getPropString(map));
-}
+addTraitAttributes(block);
startElement("block", atts);
super.renderBlock(block);
endElement("block");
@@ -441,10 +462,7 @@
protected void renderLineArea(LineArea line) {
atts.clear();
addAreaAttributes(line);
-Map map = line.getTraits();
-if (map != null) {
-addAttribute("props", getPropString(map));
-}
+addTraitAttributes(line);
startElement("lineArea", atts);
super.renderLineArea(line);
endElement("lineArea");
@@ -500,10 +518,7 @@
*/
protected void renderCharacter(org.apache.fop.area.inline.Character ch) {
atts.clear();
-Map map = ch.getTraits();
-if (map != null) {
-addAttribute("props", getPropString(map));
-}
+addTraitAttributes(ch);
startElement("char", atts);
characters(ch.getChar());
endElement("char");
@@ -524,12 +539,13 @@
*/
protected void renderText(TextArea text) {
atts.clear();
-addAttribute("twsadjust", text.getTextWordSpaceAdjust());
-addAttribute("tlsadjust", text.getTextLetterSpaceAdjust());
-Map map = text.getTraits();
-if (map != null) {
-addAttribute("props", getPropString(map));
+if (text.getTextWordSpaceAdjust() != 0) {
+addAttribute("twsadjust", text.getTextWordSpaceAdjust());
+}
+if (text.getTextLetterSpaceAdjust() != 0) {
+addAttribute("tlsadjust", text.getTextLetterSpaceAdjust());
}
+addTraitAttributes(text);
startElement("text", atts);
characters(text.getTextArea());
endElement("text");
@@ -541,10 +557,7 @@
*/
protected void renderInlineParent(InlineParent ip) {
atts.clear();
-Map map = ip.getTraits();
-if (map != null) {
-addAttribute("props", getPropString(map));
-}
+addTraitAttributes(ip);
startElement("inlineparent", atts);
super.renderInlineParent(ip);
endElement("inlineparent");
@@ -583,24
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) {
+publi
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.4&r2=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.4&r2=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.33&r2=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.20&r2=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.1&r2=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.12&r2=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.10&r2=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.5&r2=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.10&r2=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.3&r2=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.6&r2=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.24&r2=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.17&r2=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.47&r2=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.25&r2=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 refere
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
spepping2004/07/09 13:05:41
Modified:src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/render/pcl PCLRenderer.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/txt TXTRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Adding reporting of mime type to renderers.
Revision ChangesPath
1.28 +9 -0 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- AWTRenderer.java 27 Jun 2004 13:29:32 - 1.27
+++ AWTRenderer.java 9 Jul 2004 20:05:41 - 1.28
@@ -69,6 +69,9 @@
*/
public class AWTRenderer extends AbstractRenderer implements Printable, Pageable {
+/** The MIME type for PostScript */
+public static final String MIME_TYPE = "application/awt";
+
protected double scaleFactor = 100.0;
protected int pageNumber = 0;
private int pageWidth = 0;
@@ -458,4 +461,10 @@
// TODO: render text decorations
currentBlockIPPosition += text.getWidth();
}
+
+/** @see org.apache.fop.render.AbstractRenderer */
+public String getMimeType() {
+return MIME_TYPE;
+}
+
}
1.4 +8 -0 xml-fop/src/java/org/apache/fop/render/pcl/PCLRenderer.java
Index: PCLRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pcl/PCLRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PCLRenderer.java 27 Feb 2004 17:52:12 - 1.3
+++ PCLRenderer.java 9 Jul 2004 20:05:41 - 1.4
@@ -32,6 +32,9 @@
*/
public class PCLRenderer extends PrintRenderer {
+/** The MIME type for PCL */
+public static final String MIME_TYPE = "application/vnd.hp-PCL";
+
/**
* the current stream to add PCL commands to
*/
@@ -172,6 +175,11 @@
}
public void stopRenderer() throws IOException {
+}
+
+/** @see org.apache.fop.render.AbstractRenderer */
+public String getMimeType() {
+return MIME_TYPE;
}
}
1.17 +6 -0 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SVGRenderer.java 19 Jun 2004 13:35:33 - 1.16
+++ SVGRenderer.java 9 Jul 2004 20:05:41 - 1.17
@@ -414,5 +414,11 @@
super.renderCharacter(ch);
}
+
+/** @see org.apache.fop.render.AbstractRenderer */
+public String getMimeType() {
+return SVG_MIME_TYPE;
+}
+
}
1.4 +8 -0 xml-fop/src/java/org/apache/fop/render/txt/TXTRenderer.java
Index: TXTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/txt/TXTRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TXTRenderer.java 27 Feb 2004 17:55:03 - 1.3
+++ TXTRenderer.java 9 Jul 2004 20:05:41 - 1.4
@@ -31,6 +31,9 @@
*/
public class TXTRenderer extends PrintRenderer {
+/** The MIME type for PostScript */
+public static final String MIME_TYPE = "text/plain";
+
/**
* the current stream to add Text commands to
*/
@@ -126,6 +129,11 @@
} else {
decoData[row] = sb;
}
+}
+
+/** @see org.apache.fop.render.AbstractRenderer */
+public String getMimeType() {
+return MIME_TYPE;
}
}
1.24 +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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLRenderer.java 22 Jun 2004 00:44:46 - 1.23
+++ XMLRenderer.java 9 Jul 2004 20:05:41 - 1.24
@@ -495,5 +495,10 @@
return strbuf.toString();
}
+/** @see org.apache.fop.render.AbstractRenderer */
+public String getMimeType() {
+return XML_MIME_TYPE;
+}
+
}
-
To unsubscribe,
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
gmazza 2004/06/14 23:26:57
Modified:src/java/org/apache/fop/apps Document.java Driver.java
src/java/org/apache/fop/fo FOInputHandler.java FONode.java
FOTreeBuilder.java FOTreeHandler.java FObj.java
FObjMixed.java PropertyManager.java
src/java/org/apache/fop/fo/flow BasicLink.java Block.java
ExternalGraphic.java Footnote.java
FootnoteBody.java Inline.java Leader.java
ListBlock.java ListItem.java ListItemLabel.java
PageNumber.java PageNumberCitation.java Table.java
TableBody.java TableCell.java TableColumn.java
TableRow.java
src/java/org/apache/fop/fo/pagination Declarations.java
Flow.java PageSequence.java Root.java Title.java
src/java/org/apache/fop/layoutmgr BlockLayoutManager.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/render/ps PSRenderer.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/fo FOTreeControl.java
Log:
1.) Added restriction to fo:declarations that fo:color-profile is the only XSL
namespace child element allowed.
2.) Switched from fo.FOTreeControl to apps.Document throughout app, to better
clarify that it is the apps.Document object being accessed/used.
Revision ChangesPath
1.20 +2 -3 xml-fop/src/java/org/apache/fop/apps/Document.java
Index: Document.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Document.java 15 Jun 2004 00:30:43 - 1.19
+++ Document.java 15 Jun 2004 06:26:55 - 1.20
@@ -28,7 +28,6 @@
import org.apache.fop.area.AreaTreeModel;
import org.apache.fop.fo.FOInputHandler;
-import org.apache.fop.fo.FOTreeControl;
import org.apache.fop.fonts.FontInfo;
import org.apache.commons.logging.Log;
@@ -40,7 +39,7 @@
* Class storing information for the FOP Document being processed, and managing
* the processing of it.
*/
-public class Document implements FOTreeControl {
+public class Document {
/** The parent Driver object */
private Driver driver;
1.64 +2 -2 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- Driver.java 13 Jun 2004 01:21:17 - 1.63
+++ Driver.java 15 Jun 2004 06:26:55 - 1.64
@@ -511,7 +511,7 @@
foInputHandler.setLogger(getLogger());
treeBuilder.setFOInputHandler(foInputHandler);
-treeBuilder.setFOTreeControl(currentDocument);
+treeBuilder.setDocument(currentDocument);
return new ProxyContentHandler(treeBuilder) {
1.17 +3 -3 xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java
Index: FOInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- FOInputHandler.java 11 Jun 2004 17:18:51 - 1.16
+++ FOInputHandler.java 15 Jun 2004 06:26:55 - 1.17
@@ -94,8 +94,8 @@
}
/**
- * Returns the FOTreeControl object associated with this FOInputHandler.
- * @return the FOTreeControl object
+ * Returns the Document object associated with this FOInputHandler.
+ * @return the Document object
*/
public Document getDocument() {
return doc;
1.22 +6 -5 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FONode.java 15 Jun 2004 00:30:43 - 1.21
+++ FONode.java 15 Jun 2004 06:26:55 - 1.22
@@ -28,9 +28,10 @@
import org.apache.commons.logging.Log;
// FOP
+import org.apache.fop.apps.Document;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.util.CharUtilities;
import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.util.CharUtilities;
import org.apache.fop.fo.extensions.ExtensionElement
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
cbowditch2004/05/18 03:12:39
Modified:src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
added ipd property to block element
Revision ChangesPath
1.21 +6 -5 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XMLRenderer.java 25 Apr 2004 04:45:28 - 1.20
+++ XMLRenderer.java 18 May 2004 10:12:38 - 1.21
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -332,7 +332,8 @@
* @see org.apache.fop.render.AbstractRenderer#renderBlock(Block)
*/
protected void renderBlock(Block block) {
-String prop = " width=\"" + block.getWidth() +
+String prop = " width=\"" + block.getWidth() +
+ "\" ipd=\"" + block.getIPD() +
"\" height=\"" + block.getHeight() + "\"";
Map map = block.getTraits();
if (map != null) {
-
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/04/24 21:45:28
Modified:src/java/org/apache/fop/area/inline TextArea.java
src/java/org/apache/fop/fo FObj.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
BlockLayoutManager.java TextLayoutManager.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
For area.Blocks created in BlockLayoutManager.getParentArea(), I set the
width of the Block to that of its parent block.
This fixes a layout problem where
some text
was causing a line to draw across the entire page, because the cell width present in
fo:table-cell's Block was not copied into the inner fo:block's Block. (This problem
did not
occur if the border-bottom attribute was set in fo:table-cell.)
Revision ChangesPath
1.4 +6 -6 xml-fop/src/java/org/apache/fop/area/inline/TextArea.java
Index: TextArea.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/TextArea.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextArea.java 27 Feb 2004 17:40:58 - 1.3
+++ TextArea.java 25 Apr 2004 04:45:27 - 1.4
@@ -27,7 +27,7 @@
* The text for this inline area
*/
protected String text;
-private int iTSadjust = 0;
+private int iTextSpaceAdjust = 0;
/**
* Create a text inline area
@@ -58,8 +58,8 @@
*
* @return the text space adjustment
*/
-public int getTSadjust() {
-return iTSadjust;
+public int getTextSpaceAdjust() {
+return iTextSpaceAdjust;
}
/**
@@ -67,8 +67,8 @@
*
* @param iTSadjust the text space adjustment
*/
-public void setTSadjust(int iTSadjust) {
-this.iTSadjust = iTSadjust;
+public void setTextSpaceAdjust(int iTSadjust) {
+iTextSpaceAdjust = iTSadjust;
}
}
1.37 +7 -4 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- FObj.java 27 Feb 2004 17:57:40 - 1.36
+++ FObj.java 25 Apr 2004 04:45:28 - 1.37
@@ -448,12 +448,15 @@
fotv.serveFObj(this);
}
-/**
- * Return a string representation of the fo element.
+
+/*
+ * Return a string representation of the fo element.
+ * Deactivated in order to see precise ID of each fo element created
+ *(helpful for debugging)
*/
-public String toString() {
+/*public String toString() {
return getName() + " at line " + line + ":" + column;
}
-
+*/
}
1.39 +2 -6 xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
Index: AddLMVisitor.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- AddLMVisitor.java 22 Apr 2004 21:56:09 - 1.38
+++ AddLMVisitor.java 25 Apr 2004 04:45:28 - 1.39
@@ -282,11 +282,7 @@
}
public void serveBlock(Block node) {
- BlockLayoutManager blm = new BlockLayoutManager();
- blm.setUserAgent(node.getUserAgent());
- blm.setFObj(node);
- TextInfo ti =
node.getPropertyManager().getTextLayoutProps(node.getFOTreeControl());
- blm.setBlockTextInfo(ti);
+ BlockLayoutManager blm = new BlockLayoutManager(node);
currentLMList.add(blm);
}
1.16 +24 -21
xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BlockLayoutManager.java 21 Mar 2004 12:03:07 - 1.15
+++ BlockLayoutManager.java 25 Apr 2004 04:45:28 - 1.16
@@ -28,6 +28,7 @@
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
+import org.apache.fop.area.BlockParent;
import org.apache.fop.area.LineArea;
import org.apache.fop.traits.LayoutProps;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -68,6 +69,20 @@
protected List childBreaks = new java.util.ArrayList();
+public BlockLayoutManager(org.apache.fop.fo.flow.Bl
