xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From man...@apache.org
Subject svn commit: r329797 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java test/layoutengine/testcases/block_text-indent.xml
Date Mon, 31 Oct 2005 11:17:43 GMT
Author: manuel
Date: Mon Oct 31 03:17:34 2005
New Revision: 329797

URL: http://svn.apache.org/viewcvs?rev=329797&view=rev
Log:
Fix for bug 37306 - for text-align="start" ipd was incorrectly adjusted with text-indent value

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
    xmlgraphics/fop/trunk/test/layoutengine/testcases/block_text-indent.xml

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=329797&r1=329796&r2=329797&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
Mon Oct 31 03:17:34 2005
@@ -618,9 +618,6 @@
         MinOptMax availIPD = context.getStackLimit();
 
         clearPrevIPD();
-        if (textAlignment == EN_START) {
-            availIPD.subtract(new MinOptMax(textIndent.getValue(this)));
-        }
 
         //PHASE 1: Create Knuth elements
         if (knuthParagraphs == null) {

Modified: xmlgraphics/fop/trunk/test/layoutengine/testcases/block_text-indent.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/testcases/block_text-indent.xml?rev=329797&r1=329796&r2=329797&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/testcases/block_text-indent.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/testcases/block_text-indent.xml Mon Oct 31 03:17:34
2005
@@ -63,10 +63,29 @@
   <checks>
     <eval expected="20000" xpath="//flow/block[1]/lineArea[1]/@start-indent"/>
     <true xpath="boolean(not(//flow/block[1]/lineArea[2]/@start-indent))"/>
-    <true xpath="boolean(not(//flow/block[1]/lineArea[10]/@start-indent))"/>
+    <eval expected="11" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
+    <eval expected="10" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/>
+    <eval expected="12" xpath="count(//flow/block[1]/lineArea[3]/text/word)"/>
+    <eval expected="12" xpath="count(//flow/block[1]/lineArea[4]/text/word)"/>
+    <eval expected="14" xpath="count(//flow/block[1]/lineArea[5]/text/word)"/>
+    <eval expected="14" xpath="count(//flow/block[1]/lineArea[6]/text/word)"/>
+    <eval expected="14" xpath="count(//flow/block[1]/lineArea[7]/text/word)"/>
+    <eval expected="15" xpath="count(//flow/block[1]/lineArea[8]/text/word)"/>
+    <eval expected="10" xpath="count(//flow/block[1]/lineArea[9]/text/word)"/>
+    <true xpath="boolean(not(//flow/block[1]/lineArea[9]/@start-indent))"/>
+
     <eval expected="20000" xpath="//flow/block[2]/lineArea[1]/@start-indent"/>
     <true xpath="boolean(not(//flow/block[2]/lineArea[2]/@start-indent))"/>
-    <true xpath="boolean(not(//flow/block[2]/lineArea[10]/@start-indent))"/>
+    <eval expected="11" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
+    <eval expected="11" xpath="count(//flow/block[2]/lineArea[2]/text/word)"/>
+    <eval expected="12" xpath="count(//flow/block[2]/lineArea[3]/text/word)"/>
+    <eval expected="14" xpath="count(//flow/block[2]/lineArea[4]/text/word)"/>
+    <eval expected="14" xpath="count(//flow/block[2]/lineArea[5]/text/word)"/>
+    <eval expected="14" xpath="count(//flow/block[2]/lineArea[6]/text/word)"/>
+    <eval expected="14" xpath="count(//flow/block[2]/lineArea[7]/text/word)"/>
+    <eval expected="15" xpath="count(//flow/block[2]/lineArea[8]/text/word)"/>
+    <eval expected="7" xpath="count(//flow/block[2]/lineArea[9]/text/word)"/>
+    <true xpath="boolean(not(//flow/block[2]/lineArea[9]/@start-indent))"/>
 
     <eval expected="20000" xpath="//flow/block[3]/child::*[1]/@start-indent"/>
     <eval expected="20000" xpath="//flow/block[3]/child::*[2]/lineArea[1]/@start-indent"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message