You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2002/08/16 15:06:38 UTC
cvs commit: xml-fop/src/org/apache/fop/layoutmgr LineBPLayoutManager.java
keiron 2002/08/16 06:06:38
Modified: . status.xml
src/org/apache/fop/area LineArea.java
src/org/apache/fop/area/inline InlineArea.java
src/org/apache/fop/fo/flow ExternalGraphic.java
InstreamForeignObject.java
src/org/apache/fop/layoutmgr LineBPLayoutManager.java
Log:
cleanuup, updated status for line height
Revision Changes Path
1.9 +9 -5 xml-fop/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/xml-fop/status.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- status.xml 14 Aug 2002 13:45:45 -0000 1.8
+++ status.xml 16 Aug 2002 13:06:38 -0000 1.9
@@ -69,11 +69,6 @@
retrieving. The marker can then be layed out as normal.
</action>
<action context="code" dev="open">
- Calculate line height.
- The line height needs to be calculated while finding breaks. This needs
- to include all the alignment and height details of the inline areas.
- </action>
- <action context="code" dev="open">
implement the caching mechanism to store pages
when a page contains a forward reference that has not been
resolved then we need to be able to save the page contents to
@@ -127,6 +122,11 @@
<changes>
<release version="?" date="2002">
<action dev="KLL" type="update" context="code">
+ Calculate line height.
+ The line height is calculated while finding breaks.
+ Improved alignment to use the breaks and context.
+ </action>
+ <action dev="KLL" type="update" context="code">
Updated batik with change to TextPainter interface and UserAgent.
Improved PDFTextPainter to handle more types of text.
</action>
@@ -282,6 +282,10 @@
</action>
<action dev="KL" type="add" context="code">
New layout system using layout managers
+ </action>
+ <action dev="KL" type="add" context="code">
+ Implemented handlers for whitespace handling that collapse whitespace
+ better in various places
</action>
<action dev="KLL" type="update" context="code">
Changed area tree xml format to match the area tree hierarchy
1.8 +1 -3 xml-fop/src/org/apache/fop/area/LineArea.java
Index: LineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/LineArea.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LineArea.java 16 Aug 2002 12:44:07 -0000 1.7
+++ LineArea.java 16 Aug 2002 13:06:38 -0000 1.8
@@ -8,8 +8,6 @@
package org.apache.fop.area;
import org.apache.fop.area.inline.InlineArea;
-import org.apache.fop.layoutmgr.LayoutInfo;
-import org.apache.fop.fo.properties.VerticalAlign;
import java.util.ArrayList;
import java.util.List;
1.9 +1 -3 xml-fop/src/org/apache/fop/area/inline/InlineArea.java
Index: InlineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/area/inline/InlineArea.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- InlineArea.java 16 Aug 2002 12:44:07 -0000 1.8
+++ InlineArea.java 16 Aug 2002 13:06:38 -0000 1.9
@@ -13,8 +13,6 @@
import org.apache.fop.render.Renderer;
import org.apache.fop.traits.BorderProps;
-import org.apache.fop.layoutmgr.LayoutInfo;
-
import java.util.List;
import java.util.ArrayList;
1.27 +1 -2 xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ExternalGraphic.java 16 Aug 2002 12:44:07 -0000 1.26
+++ ExternalGraphic.java 16 Aug 2002 13:06:38 -0000 1.27
@@ -16,7 +16,6 @@
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
-import org.apache.fop.layoutmgr.LayoutInfo;
import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.datatypes.*;
1.32 +1 -2 xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- InstreamForeignObject.java 16 Aug 2002 12:44:07 -0000 1.31
+++ InstreamForeignObject.java 16 Aug 2002 13:06:38 -0000 1.32
@@ -25,7 +25,6 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
-import org.apache.fop.layoutmgr.LayoutInfo;
import org.w3c.dom.Document;
1.12 +1 -5 xml-fop/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java
Index: LineBPLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LineBPLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LineBPLayoutManager.java 16 Aug 2002 12:44:07 -0000 1.11
+++ LineBPLayoutManager.java 16 Aug 2002 13:06:38 -0000 1.12
@@ -456,10 +456,6 @@
BreakPoss curLineBP = new BreakPoss( new LineBreakPosition(this,
m_vecInlineBreaks.size() - 1, dAdjust, lineLead + middlefollow, lineLead));
- /* FIX ME!!
- * Need to calculate line height based on all inline BP info
- * for this line not just the current inlineBP!
- */
curLineBP.setFlag(BreakPoss.ISLAST, isFinished());
curLineBP.setStackingSize(new MinOptMax(lineLead + middlefollow));
return curLineBP;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org