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 vh...@apache.org on 2012/04/05 18:20:17 UTC
svn commit: r1309921 [42/42] - in
/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript: ./ examples/embedding/
examples/embedding/java/embedding/ examples/embedding/java/embedding/atxml/
examples/embedding/java/embedding/tools/ examples/plan/src/org/apa...
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/fox_disable-column-balancing.xml Thu Apr 5 16:19:19 2012
@@ -216,11 +216,8 @@
</fo>
<checks>
<eval expected="0" xpath="//pageSequence[1]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
- <eval expected="12000" xpath="//pageSequence[1]/pageViewport[3]//span[2]/@bpd"/>
- <!-- TODO Replace with the following test once bugs affecting multiple columns have been
- corrected
- <eval expected="0" xpath="count(//pageSequence[1]/pageViewport[3]//block[@prod-id='span2'])"/>
- -->
+ <eval expected="0" xpath="//pageSequence[1]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
+ <eval expected="0" xpath="count(//pageSequence[1]/pageViewport[3]//block[@prod-id='span2'])"/>
<eval expected="24000" xpath="//pageSequence[2]/pageViewport[2]//span[1]/flow[2]/@bpd"/>
<eval expected="84000" xpath="//pageSequence[2]/pageViewport[3]//span[1]/flow[2]/@bpd"/>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_keep-together.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_keep-together.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_keep-together.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_keep-together.xml Thu Apr 5 16:19:19 2012
@@ -38,6 +38,22 @@
<fo:block keep-together.within-line="always">This is Blah blah blah blah!</fo:block>
<fo:block>This is <fo:inline keep-together.within-line="always">Blah blah blah blah!</fo:inline></fo:block>
<fo:block>This is <fo:wrapper keep-together.within-line="always">Blah blah blah blah!</fo:wrapper></fo:block>
+ <fo:block>
+ <fo:inline keep-together.within-line="always">
+ This<fo:inline> entire</fo:inline> sentence
+ <fo:inline>should be </fo:inline>kept
+ <fo:inline>together
+ <fo:inline>on
+ <fo:inline>one
+ <fo:inline>very,
+ <fo:inline>very,</fo:inline>
+ <fo:inline>very,</fo:inline>
+ <fo:inline>very,</fo:inline>
+ <fo:inline>long</fo:inline>
+ </fo:inline></fo:inline></fo:inline>line
+ </fo:inline>
+ </fo:inline>
+ </fo:block>
</fo:block-container>
</fo:flow>
</fo:page-sequence>
@@ -54,6 +70,9 @@
<!-- The layout engine should warn the user about the overflow in this case. -->
<eval expected="This is" xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>
<eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[3]/lineArea[2]"/>
+
+ <!-- check effect of nested inlines (see Bugzilla #49848) -->
+ <eval expected="1" xpath="count(//flow/block[1]/block[1]/block[4]/lineArea)" />
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml Thu Apr 5 16:19:19 2012
@@ -48,7 +48,7 @@
</fo:root>
</fo>
<checks>
- <eval expected="105384"
+ <eval expected="117384"
xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/@ipd" desc="IPD of
containing inline area"/>
<eval expected="73368"
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_off.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_off.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_off.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_off.xml Thu Apr 5 16:19:19 2012
@@ -47,12 +47,12 @@
<checks>
<eval expected="40020" xpath="//flow/block[1]/block[1]/lineArea/inlineparent/@ipd"/>
<true xpath="not(boolean(//flow/block[1]/block[1]/lineArea/inlineparent/text/@tlsadjust))"/>
- <eval expected="0" xpath="//flow/block[1]/block[1]/lineArea/inlineparent/text/word/@offset"/>
+ <true xpath="not(boolean(//flow/block[1]/block[1]/lineArea/inlineparent/text/word/@offset))"/>
<true xpath="not(boolean(//flow/block[1]/block[1]/lineArea/inlineparent/text/word/@letter-adjust))"/>
<eval expected="44020" xpath="//flow/block[2]/block[1]/lineArea/inlineparent/@ipd"/>
<eval expected="1000" xpath="//flow/block[2]/block[1]/lineArea/inlineparent/text/@tlsadjust"/>
- <eval expected="0" xpath="//flow/block[2]/block[1]/lineArea/inlineparent/text/word/@offset"/>
+ <true xpath="not(boolean(//flow/block[2]/block[1]/lineArea/inlineparent/text/word/@offset))"/>
<true xpath="not(boolean(//flow/block[2]/block[1]/lineArea/inlineparent/text/word/@letter-adjust))"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_on.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_on.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_on.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/kerning_1_on.xml Thu Apr 5 16:19:19 2012
@@ -52,12 +52,12 @@
</fo>
<checks>
<eval expected="36420" xpath="//flow/block[1]/block[1]/lineArea/inlineparent/@ipd"/>
- <eval expected="0" xpath="//flow/block[1]/block[1]/lineArea/inlineparent/text/word/@offset"/>
+ <true xpath="not(boolean(//flow/block[1]/block[1]/lineArea/inlineparent/text/word/@offset))"/>
<eval expected="0 -960 -840 -960 -840" xpath="//flow/block[1]/block[1]/lineArea/inlineparent/text/word/@letter-adjust"/>
<eval expected="40420" xpath="//flow/block[2]/block[1]/lineArea/inlineparent/@ipd"/>
<eval expected="1000" xpath="//flow/block[2]/block[1]/lineArea/inlineparent/text/@tlsadjust"/>
- <eval expected="0" xpath="//flow/block[2]/block[1]/lineArea/inlineparent/text/word/@offset"/>
+ <true xpath="not(boolean(//flow/block[2]/block[1]/lineArea/inlineparent/text/word/@offset))"/>
<eval expected="0 -960 -840 -960 -840" xpath="//flow/block[2]/block[1]/lineArea/inlineparent/text/word/@letter-adjust"/>
</checks>
<if-checks xmlns:if="http://xmlgraphics.apache.org/fop/intermediate">
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/leader-alignment.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/leader-alignment.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/leader-alignment.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/leader-alignment.xml Thu Apr 5 16:19:19 2012
@@ -31,11 +31,11 @@
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
<fo:flow flow-name="xsl-region-body">
- <fo:block margin="0pt" padding-left="10mm">
- margin="0pt" padding-left="10mm"
+ <fo:block margin="0pt" padding-start="10mm">
+ margin="0pt" padding-start="10mm"
</fo:block>
- <fo:block padding-left="10mm">
- padding-left="10mm"
+ <fo:block padding-start="10mm">
+ padding-start="10mm"
</fo:block>
<fo:block>
<fo:leader leader-length.minimum="12pt"
@@ -43,13 +43,13 @@
leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>
leader-alignment="page"
</fo:block>
- <fo:block margin="0pt" padding-left="10mm">
+ <fo:block margin="0pt" padding-start="10mm">
<fo:leader leader-length.minimum="12pt"
leader-length.optimum="80pt"
leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>
leader-alignment="page"
</fo:block>
- <fo:block margin="0pt" padding-left="5mm">
+ <fo:block margin="0pt" padding-start="5mm">
<fo:leader leader-length.minimum="12pt"
leader-length.optimum="80pt"
leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/>
@@ -64,5 +64,79 @@
</fo:root>
</fo>
<checks>
+ <eval expected="331654" xpath="//flow/block[1]/@ipd"/>
+ <eval expected="28346" xpath="//flow/block[1]/@padding-start"/>
+ <eval expected="28346" xpath="//flow/block[1]/@start-indent"/>
+ <eval expected="331654" xpath="//flow/block[1]/lineArea/@ipd"/>
+ <eval expected="140542" xpath="//flow/block[1]/lineArea/@end-indent"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea/*)"/>
+ <eval expected="text" xpath="local-name(//flow/block[1]/lineArea/*[position()=1])"/>
+ <eval expected="191112" xpath="//flow/block[1]/lineArea/text/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
+ <eval expected="28346" xpath="//flow/block[2]/@padding-start"/>
+ <eval expected="-28346" xpath="//flow/block[2]/@space-start"/>
+ <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+ <eval expected="241104" xpath="//flow/block[2]/lineArea/@end-indent"/>
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea/*)"/>
+ <eval expected="text" xpath="local-name(//flow/block[2]/lineArea/*[position()=1])"/>
+ <eval expected="118896" xpath="//flow/block[2]/lineArea/text/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[3]/@ipd"/>
+ <true xpath="//flow/block[3]/@padding-start = 'false'"/>
+ <true xpath="//flow/block[3]/@space-start = 'false'"/>
+ <true xpath="//flow/block[3]/@start-indent = 'false'"/>
+ <true xpath="//flow/block[3]/@end-indent = 'false'"/>
+ <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+ <eval expected="145084" xpath="//flow/block[3]/lineArea/@end-indent"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea/*)"/>
+ <eval expected="inlineparent" xpath="local-name(//flow/block[3]/lineArea/*[position()=1])"/>
+ <eval expected="text" xpath="local-name(//flow/block[3]/lineArea/*[position()=2])"/>
+ <eval expected="80000" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
+ <eval expected="134916" xpath="//flow/block[3]/lineArea/text/@ipd"/>
+
+ <eval expected="331654" xpath="//flow/block[4]/@ipd"/>
+ <eval expected="28346" xpath="//flow/block[4]/@padding-start"/>
+ <eval expected="28346" xpath="//flow/block[4]/@start-indent"/>
+ <true xpath="//flow/block[4]/@space-start = 'false'"/>
+ <true xpath="//flow/block[4]/@end-indent = 'false'"/>
+ <eval expected="331654" xpath="//flow/block[4]/lineArea/@ipd"/>
+ <eval expected="116738" xpath="//flow/block[4]/lineArea/@end-indent"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea/*)"/>
+ <eval expected="inlineparent" xpath="local-name(//flow/block[4]/lineArea/*[position()=1])"/>
+ <eval expected="text" xpath="local-name(//flow/block[4]/lineArea/*[position()=2])"/>
+ <eval expected="80000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+ <eval expected="134916" xpath="//flow/block[4]/lineArea/text/@ipd"/>
+
+ <eval expected="345827" xpath="//flow/block[5]/@ipd"/>
+ <eval expected="14173" xpath="//flow/block[5]/@padding-start"/>
+ <eval expected="14173" xpath="//flow/block[5]/@start-indent"/>
+ <true xpath="//flow/block[5]/@space-start = 'false'"/>
+ <true xpath="//flow/block[5]/@end-indent = 'false'"/>
+ <eval expected="4" xpath="count(//flow/block[5]/lineArea)"/>
+ <eval expected="345827" xpath="//flow/block[5]/lineArea[1]/@ipd"/>
+ <eval expected="78903" xpath="//flow/block[5]/lineArea[1]/@end-indent"/>
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/*)"/>
+ <eval expected="inlineparent" xpath="local-name(//flow/block[5]/lineArea[1]/*[position()=1])"/>
+ <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[1]/*[position()=2])"/>
+ <eval expected="80000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="186924" xpath="//flow/block[5]/lineArea[1]/text/@ipd"/>
+ <eval expected="345827" xpath="//flow/block[5]/lineArea[2]/@ipd"/>
+ <eval expected="34215" xpath="//flow/block[5]/lineArea[2]/@end-indent"/>
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[2]/*)"/>
+ <eval expected="inlineparent" xpath="local-name(//flow/block[5]/lineArea[2]/*[position()=1])"/>
+ <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[2]/*[position()=2])"/>
+ <eval expected="80000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="231612" xpath="//flow/block[5]/lineArea[2]/text/@ipd"/>
+ <eval expected="345827" xpath="//flow/block[5]/lineArea[3]/@ipd"/>
+ <eval expected="15371" xpath="//flow/block[5]/lineArea[3]/@end-indent"/>
+ <eval expected="1" xpath="count(//flow/block[5]/lineArea[3]/*)"/>
+ <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[3]/*[position()=1])"/>
+ <eval expected="330456" xpath="//flow/block[5]/lineArea[3]/text/@ipd"/>
+ <eval expected="345827" xpath="//flow/block[5]/lineArea[4]/@ipd"/>
+ <eval expected="192419" xpath="//flow/block[5]/lineArea[4]/@end-indent"/>
+ <eval expected="1" xpath="count(//flow/block[5]/lineArea[4]/*)"/>
+ <eval expected="text" xpath="local-name(//flow/block[5]/lineArea[4]/*[position()=1])"/>
+ <eval expected="153408" xpath="//flow/block[5]/lineArea[4]/text/@ipd"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml Thu Apr 5 16:19:19 2012
@@ -28,7 +28,7 @@
</p>
</info>
<fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg" id="root">
<fo:layout-master-set>
<fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"
margin="20pt">
@@ -79,6 +79,7 @@
</fo:page-sequence>
<fo:page-sequence master-reference="normal">
<fo:flow flow-name="xsl-region-body" font-size="8pt">
+ <fo:block>root= <fo:page-number-citation-last ref-id="root"/></fo:block>
<fo:block>page-sequence= <fo:page-number-citation-last ref-id="page-sequence1"/></fo:block>
<fo:block>block= <fo:page-number-citation-last ref-id="block1"/></fo:block>
<fo:block>list= <fo:page-number-citation-last ref-id="list1"/></fo:block>
@@ -97,18 +98,19 @@
</fo:root>
</fo>
<checks>
- <true fail-msg="no ID for page-sequence" xpath="'page-sequence= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]"/>
- <true fail-msg="no ID for block" xpath="'block= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]"/>
- <true fail-msg="no ID for list-block" xpath="'list= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]"/>
- <true fail-msg="no ID for list-item" xpath="'item= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]"/>
- <true fail-msg="no ID for list-item-label" xpath="'item-label= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[5]"/>
- <true fail-msg="no ID for list-item-body" xpath="'item-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[6]"/>
- <true fail-msg="no ID for table" xpath="'table= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[7]"/>
- <!-- <true fail-msg="no ID for table-header" xpath="'table-header= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[8]"/>
- <true fail-msg="no ID for table-footer" xpath="'table-footer= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[9]"/>
- <true fail-msg="no ID for table-body" xpath="'table-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[10]"/>
- <true fail-msg="no ID for table-row" xpath="'table-row= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[11]"/>-->
- <true fail-msg="no ID for table-cell" xpath="'table-cell= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[12]"/>
- <true fail-msg="no ID for block-container" xpath="'block-container= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[13]"/>
+ <true fail-msg="no ID for root" xpath="'root= 2' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]"/>
+ <true fail-msg="no ID for page-sequence" xpath="'page-sequence= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[2]"/>
+ <true fail-msg="no ID for block" xpath="'block= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[3]"/>
+ <true fail-msg="no ID for list-block" xpath="'list= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[4]"/>
+ <true fail-msg="no ID for list-item" xpath="'item= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[5]"/>
+ <true fail-msg="no ID for list-item-label" xpath="'item-label= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[6]"/>
+ <true fail-msg="no ID for list-item-body" xpath="'item-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[7]"/>
+ <true fail-msg="no ID for table" xpath="'table= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[8]"/>
+ <!-- <true fail-msg="no ID for table-header" xpath="'table-header= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[9]"/>
+ <true fail-msg="no ID for table-footer" xpath="'table-footer= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[10]"/>
+ <true fail-msg="no ID for table-body" xpath="'table-body= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[11]"/>
+ <true fail-msg="no ID for table-row" xpath="'table-row= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[12]"/>-->
+ <true fail-msg="no ID for table-cell" xpath="'table-cell= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[13]"/>
+ <true fail-msg="no ID for block-container" xpath="'block-container= 1' = //pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[14]"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml Thu Apr 5 16:19:19 2012
@@ -19,12 +19,10 @@
<testcase>
<info>
<p>
- This test checks relative margin on region (region-body).
+ This test checks relative margin on regions when writing mode is right to left,
+ with reference orientation 0.
</p>
</info>
- <variables>
- <img>../../resources/images/bgimg300dpi.jpg</img>
- </variables>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
<fo:layout-master-set>
@@ -32,8 +30,8 @@
<fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
<fo:region-before extent="10%" background-color="blue" precedence="true" />
<fo:region-after extent="5%" background-color="green" precedence="true" />
- <fo:region-start extent="5%" background-color="red" />
- <fo:region-end extent="10%" background-color="orange" />
+ <fo:region-start extent="10%" background-color="red" />
+ <fo:region-end extent="5%" background-color="orange" />
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
@@ -60,7 +58,7 @@
<fo:flow flow-name="xsl-region-body">
<fo:block>
Demonstrates relative 5% margin on the page master, 10% margin on regions before
- and end and 5% margin on regions start and after. Corresponding margins are set
+ and start and 5% margin on regions end and after. Corresponding margins are set
on the region body. The page size is 5in x 3in with the page reference not rotated
and a rl writing-mode.
</fo:block>
@@ -76,23 +74,23 @@
<eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
<eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
<eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
- <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
<!-- region start -->
<eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
- <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
- <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
- <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
- <eval expected="[-1.0 0.0 0.0 1.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
<eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[-1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
<!-- region after -->
<eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
<eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
@@ -100,14 +98,14 @@
<eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
<eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
<eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
<!-- region body -->
<eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
<eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
<eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[-1.0 0.0 0.0 1.0 194400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml Thu Apr 5 16:19:19 2012
@@ -19,12 +19,10 @@
<testcase>
<info>
<p>
- This test checks relative margin on region (region-body).
+ This test checks relative margin on regions when writing mode is right to left,
+ with reference orientation 180.
</p>
</info>
- <variables>
- <img>../../resources/images/bgimg300dpi.jpg</img>
- </variables>
<fo>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
<fo:layout-master-set>
@@ -32,8 +30,8 @@
<fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
<fo:region-before extent="10%" background-color="blue" precedence="true" />
<fo:region-after extent="5%" background-color="green" precedence="true" />
- <fo:region-start extent="5%" background-color="red" />
- <fo:region-end extent="10%" background-color="orange" />
+ <fo:region-start extent="10%" background-color="red" />
+ <fo:region-end extent="5%" background-color="orange" />
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
@@ -60,9 +58,9 @@
<fo:flow flow-name="xsl-region-body">
<fo:block>
Demonstrates relative 5% margin on the page master, 10% margin on regions before
- and end and 5% margin on regions start and after. Corresponding margins are set
- on the region body. The page size is 5in x 3in with the page reference rotated by
- 180 degrees and a rl writing-mode.
+ and start and 5% margin on regions end and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated
+ by 180 degrees and a rl writing-mode.
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -76,23 +74,23 @@
<eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
<eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
<eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
- <eval expected="[1.0 0.0 0.0 -1.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
<!-- region start -->
<eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
- <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
- <eval expected="10800 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
- <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
- <eval expected="[1.0 0.0 0.0 -1.0 10800.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
<eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="183600 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[1.0 0.0 0.0 -1.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
<!-- region after -->
<eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
<eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
@@ -100,14 +98,14 @@
<eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
<eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
<eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[1.0 0.0 0.0 -1.0 10800.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
<!-- region body -->
<eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
<eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
<eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
<eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[1.0 0.0 0.0 -1.0 21600.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml Thu Apr 5 16:19:19 2012
@@ -19,21 +19,19 @@
<testcase>
<info>
<p>
- This test checks relative margin on region (region-body).
+ This test checks relative margin on regions when writing mode is right to left,
+ with reference orientation 270.
</p>
</info>
- <variables>
- <img>../../resources/images/bgimg300dpi.jpg</img>
- </variables>
<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="3in" page-height="5in" margin="5%" reference-orientation="270" writing-mode="rl">
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="3in" margin="5%" reference-orientation="270" writing-mode="rl">
<fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
<fo:region-before extent="10%" background-color="blue" precedence="true" />
<fo:region-after extent="5%" background-color="green" precedence="true" />
- <fo:region-start extent="5%" background-color="red" />
- <fo:region-end extent="10%" background-color="orange" />
+ <fo:region-start extent="10%" background-color="red" />
+ <fo:region-end extent="5%" background-color="orange" />
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
@@ -60,9 +58,9 @@
<fo:flow flow-name="xsl-region-body">
<fo:block>
Demonstrates relative 5% margin on the page master, 10% margin on regions before
- and end and 5% margin on regions start and after. Corresponding margins are set
- on the region body. The page size is 5in x 3in with the page reference rotated by
- 270 degrees and a rl writing-mode.
+ and start and 5% margin on regions end and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated
+ by 270 degrees and a rl writing-mode.
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -71,43 +69,43 @@
<checks>
<!-- region before -->
<eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
- <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
- <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
- <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
- <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
- <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
- <eval expected="[-0.0 -1.0 -1.0 0.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="306000 10800 36000 194400" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 342000.0 10800.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
<!-- region start -->
<eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
- <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
- <eval expected="21600 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
- <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
- <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="36000 183600 270000 21600" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 306000.0 183600.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
<eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="21600 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="36000 10800 270000 10800" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 306000.0 10800.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
<!-- region after -->
<eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[-0.0 -1.0 -1.0 0.0 21600.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="18000 10800 18000 194400" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 36000.0 10800.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
<!-- region body -->
<eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="36000 21600 270000 162000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 306000.0 21600.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml Thu Apr 5 16:19:19 2012
@@ -19,21 +19,19 @@
<testcase>
<info>
<p>
- This test checks relative margin on region (region-body).
+ This test checks relative margin on regions when writing mode is right to left,
+ with reference orientation 90.
</p>
</info>
- <variables>
- <img>../../resources/images/bgimg300dpi.jpg</img>
- </variables>
<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="3in" page-height="5in" margin="5%" reference-orientation="90" writing-mode="rl">
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="3in" margin="5%" reference-orientation="90" writing-mode="rl">
<fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
<fo:region-before extent="10%" background-color="blue" precedence="true" />
<fo:region-after extent="5%" background-color="green" precedence="true" />
- <fo:region-start extent="5%" background-color="red" />
- <fo:region-end extent="10%" background-color="orange" />
+ <fo:region-start extent="10%" background-color="red" />
+ <fo:region-end extent="5%" background-color="orange" />
</fo:simple-page-master>
</fo:layout-master-set>
<fo:page-sequence master-reference="normal" white-space-collapse="true">
@@ -60,9 +58,9 @@
<fo:flow flow-name="xsl-region-body">
<fo:block>
Demonstrates relative 5% margin on the page master, 10% margin on regions before
- and end and 5% margin on regions start and after. Corresponding margins are set
- on the region body. The page size is 5in x 3in with the page reference rotated by
- 90 degrees and a rl writing-mode.
+ and start and 5% margin on regions end and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated
+ by 90 degrees and a rl writing-mode.
</fo:block>
</fo:flow>
</fo:page-sequence>
@@ -71,43 +69,43 @@
<checks>
<!-- region before -->
<eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
- <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
- <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
- <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
- <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
- <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
- <eval expected="[0.0 1.0 1.0 0.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="18000 10800 36000 194400" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 18000.0 205200.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
<!-- region start -->
<eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
- <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
- <eval expected="32400 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
- <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
- <eval expected="[0.0 1.0 1.0 0.0 32400.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="54000 10800 270000 21600" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 54000.0 32400.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
<!-- region end -->
<eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
- <eval expected="32400 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
- <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
- <eval expected="[0.0 1.0 1.0 0.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="54000 194400 270000 10800" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 54000.0 205200.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
<!-- region after -->
<eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
- <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
- <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
- <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
- <eval expected="[0.0 1.0 1.0 0.0 194400.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="324000 10800 18000 194400" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 324000.0 205200.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
<!-- region body -->
<eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
- <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
- <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
- <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
- <eval expected="[0.0 1.0 1.0 0.0 32400.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="54000 32400 270000 162000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 54000.0 194400.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together.xml Thu Apr 5 16:19:19 2012
@@ -32,9 +32,9 @@
<fo:page-sequence master-reference="normal">
<fo:flow flow-name="xsl-region-body">
<fo:block>block1</fo:block>
- <fo:table table-layout="fixed">
- <fo:table-column/>
- <fo:table-column/>
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(1)"/>
+ <fo:table-column column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-row keep-together.within-page="always">
<fo:table-cell id="cell1">
@@ -55,7 +55,7 @@
<checks>
<element-list category="table-cell" id="cell1">
<box w="14400"/>
- <penalty w="0" p="INF"/> <!-- the keep-together on the table-row has to result in an INFINITE penalty here -->
+ <penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2">
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together_2.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-together_2.xml Thu Apr 5 16:19:19 2012
@@ -128,6 +128,38 @@
</fo:flow>
</fo:page-sequence>
+ <!-- table 4 -->
+ <fo:page-sequence master-reference="page" font-size="8pt" line-height="10pt">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-after="110pt">4. Before the table</fo:block>
+ <fo:table width="100%" table-layout="fixed"
+ border-collapse="collapse" border="4pt solid black">
+ <fo:table-column number-columns-repeated="2"
+ column-width="proportional-column-width(1)"/>
+ <fo:table-body>
+ <fo:table-row keep-together.within-page="always">
+ <fo:table-cell border="2pt solid blue" number-rows-spanned="2">
+ <fo:block>Cell 1.1 Line 1</fo:block>
+ <fo:block>Cell 1.1 Line 2</fo:block>
+ <fo:block>Cell 1.1 Line 3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="2pt solid teal">
+ <fo:block>Cell 1.2 Line 1</fo:block>
+ <fo:block>Cell 1.2 Line 2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell border="2pt solid olive">
+ <fo:block>Cell 2.2 Line 1</fo:block>
+ <fo:block>Cell 2.2 Line 2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>After the table</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+
</fo:root>
</fo>
<checks>
@@ -199,5 +231,47 @@
<eval expected="(solid,#808000,2000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-before"/>
<eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=6]//flow/block[1]/block[3]/@border-after"/>
+ <!-- table 4 -->
+ <eval expected="2" xpath="count(//pageSequence[4]/pageViewport)"/>
+ <!-- page 1 -->
+ <eval expected="2" xpath="count(//pageViewport[@nr=7]//flow/block)"/>
+ <eval expected="4. Before the table" xpath="//pageViewport[@nr=7]//flow/block[1]/lineArea"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=7]//flow/block[2]/@bpd"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=7]//flow/block[2]/@bpda"/>
+ <!-- cell 1.1 -->
+ <eval expected="21000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@bpd"/>
+ <eval expected="25000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@bpda"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@border-before"/>
+ <eval expected="" xpath="//pageViewport[@nr=7]//flow/block[2]/block[1]/@border-after"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@bpd"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/@bpda"/>
+ <eval expected="2" xpath="count(//pageViewport[@nr=7]//flow/block[2]/block[2]/block)"/>
+ <eval expected="Cell 1.1 Line 1" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/block[1]/lineArea"/>
+ <eval expected="Cell 1.1 Line 2" xpath="//pageViewport[@nr=7]//flow/block[2]/block[2]/block[2]/lineArea"/>
+ <!-- cell 1.2 -->
+ <eval expected="20000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@bpd"/>
+ <eval expected="26000" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@bpda"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@border-before"/>
+ <eval expected="(solid,#008080,2000,collapse-outer)" xpath="//pageViewport[@nr=7]//flow/block[2]/block[3]/@border-after"/>
+ <!-- page 2 -->
+ <eval expected="2" xpath="count(//pageViewport[@nr=8]//flow/block)"/>
+ <eval expected="After the table" xpath="//pageViewport[@nr=8]//flow/block[2]/lineArea"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=8]//flow/block[1]/@bpd"/>
+ <eval expected="23000" xpath="//pageViewport[@nr=8]//flow/block[1]/@bpda"/>
+ <!-- cell 1.1 -->
+ <eval expected="21000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@bpd"/>
+ <eval expected="25000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@bpda"/>
+ <eval expected="" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@border-before"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[1]/@border-after"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/@bpd"/>
+ <eval expected="21000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/@bpda"/>
+ <eval expected="1" xpath="count(//pageViewport[@nr=8]//flow/block[1]/block[2]/block)"/>
+ <eval expected="Cell 1.1 Line 3" xpath="//pageViewport[@nr=8]//flow/block[1]/block[2]/block[1]/lineArea"/>
+ <!-- cell 2.2 -->
+ <eval expected="20000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@bpd"/>
+ <eval expected="26000" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@bpda"/>
+ <eval expected="(solid,#808000,2000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@border-before"/>
+ <eval expected="(solid,#000000,4000,collapse-outer)" xpath="//pageViewport[@nr=8]//flow/block[1]/block[3]/@border-after"/>
+
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table-row_keep-with-next2.xml Thu Apr 5 16:19:19 2012
@@ -60,7 +60,9 @@
<element-list category="breaker">
<box w="14400"/>
<penalty w="0" p="INF"/>
- <box w="28800"/>
+ <box w="14400"/>
+ <penalty w="0" p="INF"/>
+ <box w="14400"/>
<penalty w="0" p="0"/>
<box w="14400"/>
<skip>3</skip>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table_keep-together.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table_keep-together.xml?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table_keep-together.xml (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/layoutengine/standard-testcases/table_keep-together.xml Thu Apr 5 16:19:19 2012
@@ -92,7 +92,7 @@
<checks>
<element-list category="table-cell" id="cell1">
<box w="14400"/>
- <penalty w="0" p="INF"/> <!-- the keep-together on the table-row has to result in an INFINITE penalty here -->
+ <penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2">
@@ -114,7 +114,7 @@
<!-- the same again but this time with keep="1" -->
<element-list category="table-cell" id="cell1b">
<box w="14400"/>
- <penalty w="0" p="999"/>
+ <penalty w="0" p="0"/>
<box w="14400"/>
</element-list>
<element-list category="table-cell" id="cell2b">
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test-no-xml-metrics.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test-no-xml-metrics.xconf?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test-no-xml-metrics.xconf (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test-no-xml-metrics.xconf Thu Apr 5 16:19:19 2012
@@ -7,7 +7,7 @@
<base>./</base>
<!-- Font Base URL for resolving relative font URLs -->
- <font-base>./test/resources/fonts</font-base>
+ <font-base>./resources/fonts/ttf/</font-base>
<renderers>
<renderer mime="application/pdf">
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test.xconf?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test.xconf (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/test.xconf Thu Apr 5 16:19:19 2012
@@ -19,15 +19,15 @@
<value>null</value>
</filterList>
<fonts>
- <font metrics-url="test/resources/fonts/glb12.ttf.xml" embed-url="test/resources/fonts/glb12.ttf">
+ <font metrics-url="test/resources/fonts/ttf/glb12.ttf.xml" embed-url="test/resources/fonts/ttf/glb12.ttf">
<font-triplet name="Gladiator" style="normal" weight="normal"/>
<font-triplet name="Gladiator" style="normal" weight="bold"/>
</font>
- <font metrics-url="test/resources/fonts/glb12.ttf.ansi.xml" embed-url="test/resources/fonts/glb12.ttf">
+ <font metrics-url="test/resources/fonts/ttf/glb12.ttf.ansi.xml" embed-url="test/resources/fonts/ttf/glb12.ttf">
<font-triplet name="Gladiator-Ansi" style="normal" weight="normal"/>
<font-triplet name="Gladiator-Ansi" style="normal" weight="bold"/>
</font>
- <font metrics-url="test/resources/fonts/glb12.ttf.ansi.xml">
+ <font metrics-url="test/resources/fonts/ttf/glb12.ttf.ansi.xml">
<font-triplet name="Gladiator-Non-Embedded" style="normal" weight="normal"/>
<font-triplet name="Gladiator-Non-Embedded" style="normal" weight="bold"/>
</font>
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/xml/pdf-encoding/pdf-encoding-test.xconf
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/xml/pdf-encoding/pdf-encoding-test.xconf?rev=1309921&r1=1309920&r2=1309921&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/xml/pdf-encoding/pdf-encoding-test.xconf (original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/xml/pdf-encoding/pdf-encoding-test.xconf Thu Apr 5 16:19:19 2012
@@ -39,7 +39,7 @@
<!-- use a custom font to show encoding problems -->
<fonts>
- <font metrics-url="test/resources/fonts/glb12.ttf.xml" embed-url="test/resources/fonts/glb12.ttf">
+ <font metrics-url="test/resources/fonts/ttf/glb12.ttf.xml" embed-url="test/resources/fonts/ttf/glb12.ttf">
<font-triplet name="Gladiator" style="normal" weight="normal"/>
</font>
</fonts>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org