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 je...@apache.org on 2005/08/20 17:01:43 UTC
svn commit: r234042 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline:
CharacterLayoutManager.java FootnoteLayoutManager.java
LeaderLayoutManager.java LeafNodeLayoutManager.java
Author: jeremias
Date: Sat Aug 20 08:01:37 2005
New Revision: 234042
URL: http://svn.apache.org/viewcvs?rev=234042&view=rev
Log:
Bugfix for Bugzilla #36248 (and inline2.xml):
Nest KnuthElements in inline KnuthSequences.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?rev=234042&r1=234041&r2=234042&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Sat Aug 20 08:01:37 2005
@@ -23,6 +23,7 @@
import org.apache.fop.layoutmgr.KnuthElement;
import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.KnuthPenalty;
+import org.apache.fop.layoutmgr.KnuthSequence;
import org.apache.fop.layoutmgr.LayoutContext;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.Position;
@@ -103,7 +104,7 @@
int alignment) {
MinOptMax ipd;
curArea = get(context);
- LinkedList returnList = new LinkedList();
+ KnuthSequence seq = new KnuthSequence(true);
if (curArea == null) {
setFinished(true);
@@ -146,7 +147,7 @@
// node is a fo:Character
if (letterSpaceIPD.min == letterSpaceIPD.max) {
// constant letter space, only return a box
- returnList.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.lead,
+ seq.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.lead,
areaInfo.total, areaInfo.middle,
new LeafPosition(this, 0), false));
} else {
@@ -154,17 +155,19 @@
// at the moment the character is supposed to have no letter spaces,
// but returning this sequence allows us to change only one element
// if addALetterSpaceTo() is called
- returnList.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.lead,
+ seq.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.lead,
areaInfo.total, areaInfo.middle,
new LeafPosition(this, 0), false));
- returnList.add(new KnuthPenalty(0, KnuthElement.INFINITE, false,
+ seq.add(new KnuthPenalty(0, KnuthElement.INFINITE, false,
new LeafPosition(this, -1), true));
- returnList.add(new KnuthGlue(0, 0, 0,
+ seq.add(new KnuthGlue(0, 0, 0,
new LeafPosition(this, -1), true));
- returnList.add(new KnuthInlineBox(0, 0, 0, 0,
+ seq.add(new KnuthInlineBox(0, 0, 0, 0,
new LeafPosition(this, -1), true));
}
+ LinkedList returnList = new LinkedList();
+ returnList.add(seq);
setFinished(true);
return returnList;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java?rev=234042&r1=234041&r2=234042&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java Sat Aug 20 08:01:37 2005
@@ -74,7 +74,9 @@
if (returnedList.size() == 0) {
//Inline part of the footnote is empty. Need to send back an auxiliary
//zero-width, zero-height inline box so the footnote gets painted.
- returnedList.add(new KnuthInlineBox(0, 0, 0, 0, null, true));
+ KnuthSequence seq = new KnuthSequence(true);
+ seq.add(new KnuthInlineBox(0, 0, 0, 0, null, true));
+ returnedList.add(seq);
}
setFinished(true);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?rev=234042&r1=234041&r2=234042&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Sat Aug 20 08:01:37 2005
@@ -30,6 +30,7 @@
import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.KnuthPenalty;
import org.apache.fop.layoutmgr.KnuthPossPosIter;
+import org.apache.fop.layoutmgr.KnuthSequence;
import org.apache.fop.layoutmgr.LayoutContext;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.Position;
@@ -244,7 +245,7 @@
int alignment) {
MinOptMax ipd;
curArea = get(context);
- LinkedList returnList = new LinkedList();
+ KnuthSequence seq = new KnuthSequence(true);
if (curArea == null) {
setFinished(true);
@@ -273,20 +274,22 @@
lead, total, middle);
// node is a fo:Leader
- returnList.add(new KnuthInlineBox(0, areaInfo.lead, areaInfo.total,
+ seq.add(new KnuthInlineBox(0, areaInfo.lead, areaInfo.total,
areaInfo.middle,
new LeafPosition(this, -1), true));
- returnList.add(new KnuthPenalty(0, KnuthElement.INFINITE, false,
+ seq.add(new KnuthPenalty(0, KnuthElement.INFINITE, false,
new LeafPosition(this, -1), true));
- returnList.add
+ seq.add
(new KnuthGlue(areaInfo.ipdArea.opt,
areaInfo.ipdArea.max - areaInfo.ipdArea.opt,
areaInfo.ipdArea.opt - areaInfo.ipdArea.min,
new LeafPosition(this, 0), false));
- returnList.add(new KnuthInlineBox(0, areaInfo.lead, areaInfo.total,
+ seq.add(new KnuthInlineBox(0, areaInfo.lead, areaInfo.total,
areaInfo.middle,
new LeafPosition(this, -1), true));
+ LinkedList returnList = new LinkedList();
+ returnList.add(seq);
setFinished(true);
return returnList;
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=234042&r1=234041&r2=234042&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Sat Aug 20 08:01:37 2005
@@ -22,6 +22,7 @@
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.fo.FObj;
import org.apache.fop.layoutmgr.AbstractLayoutManager;
+import org.apache.fop.layoutmgr.KnuthSequence;
import org.apache.fop.layoutmgr.LayoutContext;
import org.apache.fop.layoutmgr.LeafPosition;
import org.apache.fop.layoutmgr.Position;
@@ -286,10 +287,12 @@
// node is a fo:ExternalGraphic, fo:InstreamForeignObject,
// fo:PageNumber or fo:PageNumberCitation
- LinkedList returnList = new LinkedList();
- returnList.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.lead,
+ KnuthSequence seq = new KnuthSequence(true);
+ seq.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.lead,
areaInfo.total, areaInfo.middle,
new LeafPosition(this, 0), false));
+ LinkedList returnList = new LinkedList();
+ returnList.add(seq);
setFinished(true);
return returnList;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org