Author: vhennebert
Date: Thu Nov 7 12:33:11 2013
New Revision: 1539615
URL: http://svn.apache.org/r1539615
Log:
Added support for <percentage> values on alignment-adjust
Modified:
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment-adjust.xml
Modified:
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java?rev=1539615&r1=1539614&r2=1539615&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_InlineContainer/src/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java
Thu Nov 7 12:33:11 2013
@@ -201,8 +201,9 @@ public class InlineContainerLayoutManage
return getInlineContainerBaselineOffset(baseline);
} else {
int baselineOffset =
getInlineContainerBaselineOffset(dominantBaseline);
+ int lineHeight =
getInlineContainer().getLineHeight().getOptimum(this).getLength().getValue(this);
int adjust = alignmentAdjust.getValue(
- new SimplePercentBaseContext(null,
LengthBase.ALIGNMENT_ADJUST, 0));
+ new SimplePercentBaseContext(null,
LengthBase.ALIGNMENT_ADJUST, lineHeight));
return baselineOffset + adjust;
}
}
Modified:
xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment-adjust.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment-adjust.xml?rev=1539615&r1=1539614&r2=1539615&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment-adjust.xml
(original)
+++
xmlgraphics/fop/branches/Temp_InlineContainer/test/layoutengine/standard-testcases/inline-container_alignment-adjust.xml
Thu Nov 7 12:33:11 2013
@@ -141,6 +141,16 @@
</fo:flow>
</fo:page-sequence>
+ <fo:page-sequence master-reference="page">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-after="10pt">alignment-adjust="10%":</fo:block>
+ <fo:block>The line before. The line before. Before:
<fo:inline-container width="100pt"
+ alignment-adjust="-10%" dominant-baseline="text-before-edge">
+ <fo:block>Inside the inline-container.</fo:block>
+ </fo:inline-container> After the inline-container.</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+
</fo:root>
</fo>
@@ -221,7 +231,14 @@
<eval expected="38664"
xpath="//pageSequence[11]//flow/block[2]/lineArea[2]/text[1]/@offset"/>
<eval expected="8616"
xpath="//pageSequence[11]//flow/block[2]/lineArea[2]/text[1]/@baseline"/>
<eval expected="28800"
xpath="//pageSequence[11]//flow/block[2]/lineArea[2]/viewport/@bpd"/>
- <eval expected="0"
xpath="//pageSequence[11]//flow/block[2]/lineArea[2]/viewport/@offset"/>
+ <eval expected="0"
xpath="//pageSequence[11]//flow/block[2]/lineArea[2]/viewport/@offset"/>
+
+ <!-- 10% -->
+ <eval expected="38856"
xpath="//pageSequence[12]//flow/block[2]/lineArea[2]/@bpd"/>
+ <eval expected="0"
xpath="//pageSequence[12]//flow/block[2]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="8616"
xpath="//pageSequence[12]//flow/block[2]/lineArea[2]/text[1]/@baseline"/>
+ <eval expected="28800"
xpath="//pageSequence[12]//flow/block[2]/lineArea[2]/viewport/@bpd"/>
+ <eval expected="10056"
xpath="//pageSequence[12]//flow/block[2]/lineArea[2]/viewport/@offset"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
