cvs commit: xml-fop/src/java/org/apache/fop/fo PropertyManager.java
vmote 2003/08/24 10:46:10
Modified:src/java/org/apache/fop/area CTM.java
src/java/org/apache/fop/fo PropertyManager.java
Log:
move property resolution logic from area/CTM.getCTMandRelDims() back to
fo/PropertyManager
Revision ChangesPath
1.4 +2 -3 xml-fop/src/java/org/apache/fop/area/CTM.java
Index: CTM.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/CTM.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CTM.java 23 Aug 2003 19:26:30 - 1.3
+++ CTM.java 24 Aug 2003 17:46:10 - 1.4
@@ -290,8 +290,7 @@
int width, height;
// We will use the absolute reference-orientation to set up the CTM.
// The value here is relative to its ancestor reference area.
-int absRefOrient = pm.getAbsRefOrient(
-
pm.getProperties().get(reference-orientation).getNumber().intValue());
+int absRefOrient = pm.getAbsRefOrient();
if (absRefOrient % 180 == 0) {
width = (int) absVPrect.getWidth();
height = (int) absVPrect.getHeight();
@@ -327,7 +326,7 @@
}
ctm = ctm.rotate(absRefOrient);
}
-int wm = pm.getProperties().get(writing-mode).getEnum();
+int wm = pm.getWritingMode();
/* Since we've already put adjusted width and height values for the
* top and left positions implied by the reference-orientation, we
* can set ipd and bpd appropriately based on the writing mode.
1.11 +6 -2 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PropertyManager.java 23 Aug 2003 19:26:30 - 1.10
+++ PropertyManager.java 24 Aug 2003 17:46:10 - 1.11
@@ -511,8 +511,12 @@
/**
* Calculate absolute reference-orientation relative to media orientation.
*/
-public int getAbsRefOrient(int myRefOrient) {
-return myRefOrient;
+public int getAbsRefOrient() {
+return properties.get(reference-orientation).getNumber().intValue();
+}
+
+public int getWritingMode() {
+return properties.get(writing-mode).getEnum();
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
vmote 2003/08/24 12:22:59
Modified:src/java/org/apache/fop/fo/flow ExternalGraphic.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
move fo/flow/ExternalGraphic.getInlineArea() to
layoutmgr/AddLMVisitor.getExternalGraphicInlineArea()
Revision ChangesPath
1.7 +16 -34xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExternalGraphic.java 22 Aug 2003 17:42:41 - 1.6
+++ ExternalGraphic.java 24 Aug 2003 19:22:59 - 1.7
@@ -54,8 +54,6 @@
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.TextAlign;
import org.apache.fop.fo.properties.Overflow;
import org.apache.fop.fo.properties.DisplayAlign;
@@ -63,9 +61,6 @@
import org.apache.fop.image.ImageFactory;
import org.apache.fop.image.FopImage;
import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.layoutmgr.TraitSetter;
-import org.apache.fop.area.inline.Image;
-import org.apache.fop.area.inline.Viewport;
import org.apache.fop.datatypes.Length;
// Java
@@ -101,34 +96,6 @@
}
/**
- * Get the inline area for this external grpahic.
- * This creates the image area and puts it inside a viewport.
- *
- * @return the viewport containing the image area
- */
-public InlineArea getInlineArea() {
-setup();
-if (url == null) {
-return null;
-}
-Image imArea = new Image(url);
-Viewport vp = new Viewport(imArea);
-vp.setWidth(viewWidth);
-vp.setHeight(viewHeight);
-vp.setClip(clip);
-vp.setContentPosition(placement);
-vp.setOffset(0);
-
-// Common Border, Padding, and Background Properties
-CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
-CommonBackground bProps = propMgr.getBackgroundProps();
-TraitSetter.addBorders(vp, bap);
-TraitSetter.addBackground(vp, bProps);
-
-return vp;
-}
-
-/**
* Setup this image.
* This gets the sizes for the image and the dimensions and clipping.
*/
@@ -286,5 +253,20 @@
fotv.serveVisitor(this);
}
-}
+public String getURL() {
+return url;
+}
+
+public int getViewWidth() {
+return viewWidth;
+}
+
+public boolean getClip() {
+return clip;
+}
+
+public Rectangle2D getPlacement() {
+return placement;
+}
+}
1.5 +34 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddLMVisitor.java 24 Aug 2003 18:52:19 - 1.4
+++ AddLMVisitor.java 24 Aug 2003 19:22:59 - 1.5
@@ -60,6 +60,8 @@
import org.apache.fop.area.inline.FilledArea;
import org.apache.fop.area.inline.Space;
import org.apache.fop.area.inline.Word;
+import org.apache.fop.area.inline.Image;
+import org.apache.fop.area.inline.Viewport;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.fo.FObj;
@@ -89,6 +91,8 @@
import org.apache.fop.fo.pagination.Flow;
import org.apache.fop.fo.properties.LeaderPattern;
+import org.apache.fop.fo.properties.CommonBorderAndPadding;
+import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.layoutmgr.BidiLayoutManager;
import org.apache.fop.layoutmgr.LayoutProcessor;
@@ -396,7 +400,7 @@
* created viewport/image area.
*/
public void serveVisitor(ExternalGraphic node) {
- InlineArea area = node.getInlineArea();
+ InlineArea area = getExternalGraphicInlineArea(node);
if (area != null) {
node.setupID();
LeafNodeLayoutManager lm = new LeafNodeLayoutManager();
@@ -407,6 +411,34 @@
lm.setLead(node.getViewHeight());
currentLMList.add(lm);
}
+ }
+
+ /**
+ * Get the inline area for this external grpahic.
+ * This creates the image area and puts it inside a viewport.
+ *
+ * @return the viewport containing the image area
+ */
+ public InlineArea
Bug report for Fop [2003/08/24]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 635|Opn|Nor|2001-02-18|Doesn't support id= attribute in fo:page-sequence | | 953|Opn|Nor|2001-03-12|Incorrect hyperlinks area rendering in justified t| | 1063|New|Nor|2001-03-21|fop does not handle large fo files| | 1180|New|Maj|2001-04-02|Problem with monospaced font | | 1859|Opn|Min|2001-05-22|org.apache.fop.apps.Driver.reset() doesn't fully r| | 1998|New|Nor|2001-06-05|linefeed-treatment not understood | | 2150|Ass|Maj|2001-06-13|New page with a table-header but without any tabl| | 2475|Ass|Nor|2001-07-06|Borders don't appear to work in fo:table-row| | 2740|New|Maj|2001-07-23|multi-page tables sometimes render badly | | 2909|New|Maj|2001-07-30|Gradient render error | | 2964|Ass|Nor|2001-08-02|problems with height of cells in tables | | 2988|New|Maj|2001-08-03|0.19: list-item-label does not stick to list-item-| | 3044|Ass|Maj|2001-08-08|keep-together not functioning | | 3280|New|Nor|2001-08-27|PCL Renderer doesn't work | | 3305|Opn|Nor|2001-08-28|list-block overlapping footnote body | | 3497|New|Maj|2001-09-07|id already exists error when using span=all attr| | 3824|New|Blk|2001-09-25|MIF option with tables| | 4030|New|Nor|2001-10-08|IOException creating Postscript with graphics on S| | 4126|New|Nor|2001-10-12|FontState.width() returns pts instead of millipts | | 4226|New|Nor|2001-10-17|The orphans property doesn't seem to work | | 4388|New|Nor|2001-10-24|Nullpointer exception in the construction of new D| | 4415|New|Nor|2001-10-25|scaling=uniform does not work on images... | | 4510|New|Nor|2001-10-30|fo:inline common properties ignored? | | 4535|New|Maj|2001-10-31|PCL renderer 1.13 not rendering SVG | | 4614|New|Maj|2001-11-03|wrap property combined with Chinese | | 4767|New|Nor|2001-11-09|SVG text is distored in PDF output| | 5001|New|Nor|2001-11-21|content-width and content-height ignored? | | 5010|New|Enh|2001-11-21|Better error reporting needed | | 5047|Ass|Nor|2001-11-23|Dotted border style is not supported | | 5124|New|Maj|2001-11-27|fo:block-container is not rendered properly using | | 5335|Opn|Min|2001-12-10|Text with embedded CID fonts not retrievable from | | 5655|Ass|Nor|2002-01-02|text-decoration cannot take multiple values | | 6094|Opn|Maj|2002-01-29|0.20.3rc hangs in endless loop| | 6237|Opn|Nor|2002-02-05|#xFB01 (fi ligature) produces a sharp? | | 6305|New|Nor|2002-02-07|Using fo:table-and-caption results in empty output| | 6427|New|Enh|2002-02-13|Adding additional Type 1 fonts problem| | 6437|New|Maj|2002-02-13|Tables without fo:table-column don't render | | 6483|New|Nor|2002-02-15|Table, Loop, footer could not fit on page, moving| | 6844|New|Nor|2002-03-04|No line breaks inserted in list-item-label| | 6918|New|Enh|2002-03-06|reference-orientation has no effect | | 6929|New|Nor|2002-03-06|Cells border hidden by cells background | | 6997|New|Nor|2002-03-09|Row-spanned row data breaks over a page within a c| | 7140|New|Enh|2002-03-15|page-position attribute set to last on condition| | 7241|New|Nor|2002-03-19|keep-with-previous, keep-with-next only working on| | 7283|New|Nor|2002-03-20|Table border misaligned when using margin-left in | | 7337|New|Nor|2002-03-21|border around external image leaves empty space | | 7487|New|Nor|2002-03-26|break-before=page for table inserts empty page | | 7496|New|Nor|2002-03-26|The table header borders are not adjusted to the b| | 7525|New|Cri|2002-03-27|table with spans inside a list-block | | 7919|New|Cri|2002-04-10|problem to use attribute linefeed-treatment and li| | 8003|Ass|Maj|2002-04-12|FopImageFactory never releases cached images | |
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
vmote 2003/08/25 08:37:03
Modified:src/java/org/apache/fop/fo/flow Character.java
ExternalGraphic.java Leader.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
remove unneeded field fo/flow/Leader.leaderArea
Revision ChangesPath
1.7 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/Character.java
Index: Character.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Character.java24 Aug 2003 18:52:19 - 1.6
+++ Character.java25 Aug 2003 15:37:02 - 1.7
@@ -63,7 +63,6 @@
import org.apache.fop.fo.properties.CommonMarginInline;
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.area.inline.InlineArea;
/**
* This class represents the flow object 'fo:character'. Its use is defined by
1.8 +0 -2 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExternalGraphic.java 24 Aug 2003 19:22:59 - 1.7
+++ ExternalGraphic.java 25 Aug 2003 15:37:02 - 1.8
@@ -60,12 +60,10 @@
import org.apache.fop.fo.properties.Scaling;
import org.apache.fop.image.ImageFactory;
import org.apache.fop.image.FopImage;
-import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.datatypes.Length;
// Java
import java.awt.geom.Rectangle2D;
-import org.apache.fop.apps.*;
/**
* External graphic formatting object.
1.11 +0 -2 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Leader.java 22 Aug 2003 06:27:34 - 1.10
+++ Leader.java 25 Aug 2003 15:37:02 - 1.11
@@ -51,7 +51,6 @@
package org.apache.fop.fo.flow;
// FOP
-import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PercentLength;
@@ -85,7 +84,6 @@
protected FOTreeControl fontInfo = null;
/** FontState for this object */
protected Font fontState;
-public InlineArea leaderArea = null;
/**
* @param parent FONode that is the parent of this object
1.7 +8 -15 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AddLMVisitor.java 24 Aug 2003 22:15:51 - 1.6
+++ AddLMVisitor.java 25 Aug 2003 15:37:03 - 1.7
@@ -294,24 +294,16 @@
}
private InlineArea getLeaderInlineArea(Leader node) {
- if (node.leaderArea == null) {
- createLeaderArea(node);
- }
- return node.leaderArea;
- }
-
- protected void createLeaderArea(Leader node) {
node.setup();
+ InlineArea leaderArea = null;
if (node.getLeaderPattern() == LeaderPattern.RULE) {
org.apache.fop.area.inline.Leader leader = new
org.apache.fop.area.inline.Leader();
-
leader.setRuleStyle(node.getRuleStyle());
leader.setRuleThickness(node.getRuleThickness());
-
- node.leaderArea = leader;
+ leaderArea = leader;
} else if (node.getLeaderPattern() == LeaderPattern.SPACE) {
- node.leaderArea = new Space();
+ leaderArea = new Space();
} else if (node.getLeaderPattern() == LeaderPattern.DOTS) {
Word w = new Word();
char dot = '.'; // userAgent.getLeaderDotCharacter();
@@ -337,11 +329,11 @@
}
fa.setHeight(node.getFontState().getAscender());
- node.leaderArea = fa;
+ leaderArea = fa;
} else if (node.getLeaderPattern() == LeaderPattern.USECONTENT) {
if (node.getChildren() == null) {
node.getLogger().error(Leader use-content with no content);
- return;
+ return null;
}
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
vmote 2003/08/25 10:06:46
Modified:src/java/org/apache/fop/fo/flow Leader.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
move fo/flow/Leader.getAllocIPD() to layoutmgr/AddLMVisitor.getLeaderAllocIPD()
Revision ChangesPath
1.12 +1 -11 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Leader.java 25 Aug 2003 15:37:02 - 1.11
+++ Leader.java 25 Aug 2003 17:06:46 - 1.12
@@ -67,7 +67,6 @@
import org.apache.fop.fonts.Font;
import org.apache.fop.fo.properties.CommonMarginInline;
import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.layoutmgr.MinOptMax;
/**
* Class modelling fo:leader object. See Sec. 6.6.9 of the XSL-FO Standard.
@@ -178,16 +177,7 @@
}
-public MinOptMax getAllocIPD(int ipd) {
-// length of the leader
-int opt = getLength(leader-length.optimum, ipd);
-int min = getLength(leader-length.minimum, ipd);
-int max = getLength(leader-length.maximum, ipd);
-
-return new MinOptMax(min, opt, max);
-}
-
-protected int getLength(String prop, int dim) {
+public int getLength(String prop, int dim) {
int length;
Length maxlength = properties.get(prop).getLength();
if (maxlength instanceof PercentLength) {
1.8 +11 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AddLMVisitor.java 25 Aug 2003 15:37:03 - 1.7
+++ AddLMVisitor.java 25 Aug 2003 17:06:46 - 1.8
@@ -278,7 +278,7 @@
}
protected MinOptMax getAllocationIPD(int refIPD) {
-return node.getAllocIPD(refIPD);
+return getLeaderAllocIPD(node, refIPD);
}
/*protected void offsetArea(LayoutContext context) {
@@ -291,6 +291,15 @@
lm.setFObj(node);
lm.setAlignment(node.properties.get(leader-alignment).getEnum());
currentLMList.add(lm);
+ }
+
+ public MinOptMax getLeaderAllocIPD(Leader node, int ipd) {
+ // length of the leader
+ int opt = node.getLength(leader-length.optimum, ipd);
+ int min = node.getLength(leader-length.minimum, ipd);
+ int max = node.getLength(leader-length.maximum, ipd);
+
+ return new MinOptMax(min, opt, max);
}
private InlineArea getLeaderInlineArea(Leader node) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow ListItem.java
vmote 2003/08/25 11:19:03 Modified:src/java/org/apache/fop/fo/flow ListItem.java Log: remove unused import Revision ChangesPath 1.5 +0 -1 xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java Index: ListItem.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ListItem.java 19 Aug 2003 00:53:53 - 1.4 +++ ListItem.java 25 Aug 2003 18:19:03 - 1.5 @@ -63,7 +63,6 @@ import org.apache.fop.fo.properties.CommonBorderAndPadding; import org.apache.fop.fo.properties.CommonMarginBlock; import org.apache.fop.fo.properties.CommonRelativePosition; -import org.apache.fop.layoutmgr.list.ListItemLayoutManager; /** * Class modelling the fo:list-item object. See Sec. 6.8.3 of the XSL-FO - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
[EMAIL PROTECTED] wrote: 1. move fo/flow/InstreamForeignObject.getInlineArea() to layoutmgr/AddLMVisitor.getIFOInlineArea() I wish this wouldn't get ouf of hand. We have way too much weird acronyms in method and even class names already. I'd rather have lond names instead. J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AddLMVisitor.java
vmote 2003/08/25 11:10:30
Modified:src/java/org/apache/fop/fo/flow ListItemBody.java
src/java/org/apache/fop/layoutmgr AddLMVisitor.java
Log:
move fo/flow/ListItemBody.getItemLayoutManager() to
layoutmgr/AddLMVisitor.getListItemBodyLayoutManager()
Revision ChangesPath
1.7 +0 -12 xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ListItemBody.java 22 Aug 2003 17:42:41 - 1.6
+++ ListItemBody.java 25 Aug 2003 18:10:30 - 1.7
@@ -55,8 +55,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.fo.properties.CommonAccessibility;
-import org.apache.fop.layoutmgr.list.Item;
-import org.apache.fop.apps.*;
/**
* Class modelling the fo:list-item-body object. See Sec. 6.8.4 of the XSL-FO
@@ -69,16 +67,6 @@
*/
public ListItemBody(FONode parent) {
super(parent);
-}
-
-/**
- * @return Item layout manager
- */
-public Item getItemLayoutManager() {
-Item item = new Item();
-item.setUserAgent(getUserAgent());
-item.setFObj(this);
-return item;
}
private void setup() {
1.9 +14 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AddLMVisitor.java 25 Aug 2003 17:06:46 - 1.8
+++ AddLMVisitor.java 25 Aug 2003 18:10:30 - 1.9
@@ -84,6 +84,7 @@
import org.apache.fop.fo.flow.BlockContainer;
import org.apache.fop.fo.flow.Footnote;
import org.apache.fop.fo.flow.ListBlock;
+import org.apache.fop.fo.flow.ListItemBody;
import org.apache.fop.fo.flow.InstreamForeignObject;
import org.apache.fop.fo.flow.InlineContainer;
import org.apache.fop.fo.flow.ListItem;
@@ -108,6 +109,7 @@
import org.apache.fop.layoutmgr.table.Body;
import org.apache.fop.layoutmgr.table.Row;
import org.apache.fop.layoutmgr.table.TableLayoutManager;
+import org.apache.fop.layoutmgr.list.Item;
import org.apache.fop.layoutmgr.list.ListBlockLayoutManager;
import org.apache.fop.layoutmgr.list.ListItemLayoutManager;
import org.apache.fop.util.CharUtilities;
@@ -637,11 +639,21 @@
blm.setUserAgent(node.getUserAgent());
blm.setFObj(node);
blm.setLabel(node.getLabel().getItemLayoutManager());
- blm.setBody(node.getBody().getItemLayoutManager());
+ blm.setBody(getListItemBodyLayoutManager(node.getBody()));
currentLMList.add(blm);
} else {
node.getLogger().error(list-item requires list-item-label and
list-item-body);
}
+ }
+
+ /**
+ * @return Item layout manager
+ */
+ public Item getListItemBodyLayoutManager(ListItemBody node) {
+ Item item = new Item();
+ item.setUserAgent(node.getUserAgent());
+ item.setFObj(node);
+ return item;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
