Browse Source

cleanuup, updated status for line height


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195090 13f79535-47bb-0310-9956-ffa450edef68
tags/Alt-Design-integration-base
Keiron Liddle 22 years ago
parent
commit
5c677a5dce

+ 0
- 2
src/org/apache/fop/area/LineArea.java View File

package org.apache.fop.area; package org.apache.fop.area;


import org.apache.fop.area.inline.InlineArea; 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.ArrayList;
import java.util.List; import java.util.List;

+ 0
- 2
src/org/apache/fop/area/inline/InlineArea.java View File

import org.apache.fop.render.Renderer; import org.apache.fop.render.Renderer;
import org.apache.fop.traits.BorderProps; import org.apache.fop.traits.BorderProps;


import org.apache.fop.layoutmgr.LayoutInfo;

import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;



+ 0
- 1
src/org/apache/fop/fo/flow/ExternalGraphic.java View File

import org.apache.fop.area.inline.InlineArea; import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.layoutmgr.LayoutManager; import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.LeafNodeLayoutManager; 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.Image;
import org.apache.fop.area.inline.Viewport; import org.apache.fop.area.inline.Viewport;
import org.apache.fop.datatypes.*; import org.apache.fop.datatypes.*;

+ 0
- 1
src/org/apache/fop/fo/flow/InstreamForeignObject.java View File

import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOPException;
import org.apache.fop.layoutmgr.LayoutManager; import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.LeafNodeLayoutManager; import org.apache.fop.layoutmgr.LeafNodeLayoutManager;
import org.apache.fop.layoutmgr.LayoutInfo;


import org.w3c.dom.Document; import org.w3c.dom.Document;



+ 0
- 4
src/org/apache/fop/layoutmgr/LineBPLayoutManager.java View File

BreakPoss curLineBP = new BreakPoss( new LineBreakPosition(this, BreakPoss curLineBP = new BreakPoss( new LineBreakPosition(this,
m_vecInlineBreaks.size() - 1, dAdjust, lineLead + middlefollow, lineLead)); 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.setFlag(BreakPoss.ISLAST, isFinished());
curLineBP.setStackingSize(new MinOptMax(lineLead + middlefollow)); curLineBP.setStackingSize(new MinOptMax(lineLead + middlefollow));
return curLineBP; return curLineBP;

+ 9
- 5
status.xml View File

When doing the static areas the markers wil need to be available for When doing the static areas the markers wil need to be available for
retrieving. The marker can then be layed out as normal. retrieving. The marker can then be layed out as normal.
</action> </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"> <action context="code" dev="open">
implement the caching mechanism to store pages implement the caching mechanism to store pages
when a page contains a forward reference that has not been when a page contains a forward reference that has not been


<changes> <changes>
<release version="?" date="2002"> <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"> <action dev="KLL" type="update" context="code">
Updated batik with change to TextPainter interface and UserAgent. Updated batik with change to TextPainter interface and UserAgent.
Improved PDFTextPainter to handle more types of text. Improved PDFTextPainter to handle more types of text.
<action dev="KL" type="add" context="code"> <action dev="KL" type="add" context="code">
New layout system using layout managers New layout system using layout managers
</action> </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"> <action dev="KLL" type="update" context="code">
Changed area tree xml format to match the area tree hierarchy Changed area tree xml format to match the area tree hierarchy
</action> </action>

Loading…
Cancel
Save