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 2006/01/25 10:57:08 UTC
svn commit: r372175 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop:
layoutmgr/inline/LineLayoutManager.java render/xml/XMLRenderer.java
Author: jeremias
Date: Wed Jan 25 01:57:01 2006
New Revision: 372175
URL: http://svn.apache.org/viewcvs?rev=372175&view=rev
Log:
My last change broke the test suite. Fix included. The start-indent should not be added to the area tree XML when it is zero.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java?rev=372175&r1=372174&r2=372175&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java Wed Jan 25 01:57:01 2006
@@ -1664,7 +1664,9 @@
= new LineArea((lbp.getLeafPos() < seq.size() - 1
? textAlignment : textAlignmentLast),
lbp.difference, lbp.availableStretch, lbp.availableShrink);
- lineArea.addTrait(Trait.START_INDENT, new Integer(lbp.startIndent));
+ if (lbp.startIndent != 0) {
+ lineArea.addTrait(Trait.START_INDENT, new Integer(lbp.startIndent));
+ }
lineArea.setBPD(lbp.lineHeight);
lineArea.setIPD(lbp.lineWidth);
lineArea.addTrait(Trait.SPACE_BEFORE, new Integer(lbp.spaceBefore));
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java?rev=372175&r1=372174&r2=372175&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java Wed Jan 25 01:57:01 2006
@@ -309,13 +309,14 @@
Iterator iter = traitMap.entrySet().iterator();
while (iter.hasNext()) {
Map.Entry traitEntry = (Map.Entry) iter.next();
- String name = Trait.getTraitName(traitEntry.getKey());
- Class clazz = Trait.getTraitClass(traitEntry.getKey());
+ Object key = traitEntry.getKey();
+ String name = Trait.getTraitName(key);
+ Class clazz = Trait.getTraitClass(key);
if ("break-before".equals(name) || "break-after".equals(name)) {
continue;
}
Object value = traitEntry.getValue();
- if (Trait.getTraitName(Trait.FONT).equals(name)) {
+ if (key == Trait.FONT) {
FontTriplet triplet = (FontTriplet)value;
addAttribute("font-name", triplet.getName());
addAttribute("font-style", triplet.getStyle());
@@ -352,6 +353,10 @@
addAttribute("bkg-horz-offset", bkg.getHoriz());
addAttribute("bkg-vert-offset", bkg.getVertical());
}
+ } else if (key == Trait.START_INDENT || key == Trait.END_INDENT) {
+ if (((Integer)value).intValue() != 0) {
+ addAttribute(name, value.toString());
+ }
} else {
addAttribute(name, value.toString());
}
@@ -681,9 +686,6 @@
atts.clear();
addAreaAttributes(line);
addTraitAttributes(line);
- if (line.getStartIndent() != 0) {
- addAttribute("start-indent", line.getStartIndent());
- }
startElement("lineArea", atts);
super.renderLineArea(line);
endElement("lineArea");
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org