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 ma...@apache.org on 2006/05/06 12:10:11 UTC
svn commit: r400279 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/FOPropertyMapping.java status.xml
test/layoutengine/standard-testcases/inline_vertical-align_1.xml
Author: manuel
Date: Sat May 6 03:10:08 2006
New Revision: 400279
URL: http://svn.apache.org/viewcvs?rev=400279&view=rev
Log:
Fixed incorrect handling of percentages in vertical-align property values and added testcase
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_1.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=400279&r1=400278&r2=400279&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Sat May 6 03:10:08 2006
@@ -2669,6 +2669,7 @@
m.addEnum("bottom", getEnumProperty(EN_BOTTOM, "BOTTOM"));
m.setDatatypeParser(new VerticalAlignShorthandParser());
m.setDefault("baseline");
+ m.setPercentBase(LengthBase.ALIGNMENT_ADJUST);
addPropertyMaker("vertical-align", m);
// white-space
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=400279&r1=400278&r2=400279&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Sat May 6 03:10:08 2006
@@ -27,6 +27,9 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="MM" type="fix">
+ Bugfix: Percentages in vertical-align property values were not correctly handled.
+ </action>
<action context="Code" dev="JM" type="fix" fixes-bug="38243" due-to="Gerhard Oettl">
Bugfix: Gaps in table-columns cause a NullPointerException.
</action>
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_1.xml
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_1.xml?rev=400279&r1=400278&r2=400279&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_1.xml Sat May 6 03:10:08 2006
@@ -24,7 +24,7 @@
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
<fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="6in">
<fo:region-body/>
</fo:simple-page-master>
</fo:layout-master-set>
@@ -58,6 +58,18 @@
Before <fo:inline font-size="10pt" vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After
</fo:block>
<fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="3pt" background-color="yellow">vertical-align="3pt"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="-3pt" background-color="yellow">vertical-align="-3pt"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="50%" background-color="yellow">vertical-align="50%"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="-50%" background-color="yellow">vertical-align="-50%"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
Before <fo:inline vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After
</fo:block>
<fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
@@ -131,18 +143,46 @@
<eval expected="9795" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
<eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
- <eval expected="28960" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+ <eval expected="18500" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
<eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-before"/>
<eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-after"/>
- <eval expected="10460" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
- <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
- <eval expected="10460" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="4180" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
- <eval expected="23730" xpath="//flow/block[11]/lineArea[1]/@bpd"/>
+ <eval expected="19430" xpath="//flow/block[11]/lineArea[1]/@bpd"/>
<eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-before"/>
<eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-after"/>
<eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>
- <eval expected="5230" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="10180" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
<eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[12]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1180" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22430" xpath="//flow/block[13]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="13180" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="28960" xpath="//flow/block[14]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-after"/>
+ <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[14]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="23730" xpath="//flow/block[15]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5230" xpath="//flow/block[15]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[2]/@offset"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org