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 2008/03/06 14:34:59 UTC
svn commit: r634267 [22/39] - in
/xmlgraphics/fop/branches/Temp_ProcessingFeedback: ./ examples/embedding/
examples/embedding/java/embedding/
examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xml/
examples/fo/ examples/fo/advanced/...
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_inherit.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_inherit.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_percentages.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_percentages.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_percentages.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_percentages.xml Thu Mar 6 05:33:44 2008
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks margin percentages on fo:block.
- </p>
- </info>
- <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:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block margin="5%" background-color="yellow">
- <fo:block margin="5%" background-color="blue">
- margin="5%" - should have the slightly smaller margin than the enclosing block
- </fo:block>
- </fo:block>
- <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <element-list category="breaker">
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="18000" y="0" z="0"/>
- <box w="14400"/>
- <box w="14400"/>
- <penalty w="0" p="INF"/>
- <glue w="18000" y="0" z="0"/>
- <penalty w="0" p="0"/>
- <box w="14400"/>
- <box w="14400"/>
- <skip>3</skip>
- </element-list>
-
- <eval expected="18000" xpath="//flow/block[1]/@space-before"/>
- <eval expected="324000" xpath="//flow/block[1]/@ipd"/>
- <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>
- <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>
- <eval expected="18000" xpath="//flow/block[1]/@space-start"/>
- <eval expected="18000" xpath="//flow/block[1]/@space-end"/>
-
- <true xpath="not(boolean(//flow/block[1]/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->
- <eval expected="291600" xpath="//flow/block[1]/block[1]/@ipd"/>
- <eval expected="34200" xpath="//flow/block[1]/block[1]/@start-indent"/>
- <eval expected="34200" xpath="//flow/block[1]/block[1]/@end-indent"/>
- <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-start"/>
- <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-end"/>
- <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/> <!-- space collapsed under space resolution rules -->
- <true xpath="not(boolean(//flow/block[1]/block[2]))"/>
-
- <eval expected="18000" xpath="//flow/block[1]/@space-after"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks margin percentages on fo:block.
+ </p>
+ </info>
+ <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:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block margin="5%" background-color="yellow">
+ <fo:block margin="5%" background-color="blue">
+ margin="5%" - should have the slightly smaller margin than the enclosing block
+ </fo:block>
+ </fo:block>
+ <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="18000" y="0" z="0"/>
+ <box w="14400"/>
+ <box w="14400"/>
+ <penalty w="0" p="INF"/>
+ <glue w="18000" y="0" z="0"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
+
+ <eval expected="18000" xpath="//flow/block[1]/@space-before"/>
+ <eval expected="324000" xpath="//flow/block[1]/@ipd"/>
+ <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>
+ <eval expected="18000" xpath="//flow/block[1]/@space-start"/>
+ <eval expected="18000" xpath="//flow/block[1]/@space-end"/>
+
+ <true xpath="not(boolean(//flow/block[1]/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->
+ <eval expected="291600" xpath="//flow/block[1]/block[1]/@ipd"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@start-indent"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@end-indent"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-start"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-end"/>
+ <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/> <!-- space collapsed under space resolution rules -->
+ <true xpath="not(boolean(//flow/block[1]/block[2]))"/>
+
+ <eval expected="18000" xpath="//flow/block[1]/@space-after"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_percentages.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_percentages.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_margin_shorthands.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_overconstrained_ipd.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_2.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_2.xml Thu Mar 6 05:33:44 2008
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks non-conditional before- and after-padding in break-situations.
- </p>
- </info>
- <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="2in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal">
- <fo:flow flow-name="xsl-region-body">
- <fo:block background-color="lightgray" padding-before="30pt" padding-before.conditionality="retain" padding-after="30pt" padding-after.conditionality="retain">
- <fo:block background-color="yellow">line1</fo:block>
- <fo:block background-color="orange">line2</fo:block>
- <fo:block background-color="yellow">line3</fo:block>
- <fo:block background-color="orange">line4</fo:block>
- <fo:block background-color="yellow">line5</fo:block>
- <fo:block background-color="orange">line6</fo:block>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <element-list category="breaker">
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
-
- <box w="14400"/>
-
- <penalty w="0" p="INF"/>
- <glue w="30000"/> <!-- w="30000" is for the padding-after -->
- <penalty w="0" p="0"/>
- <glue w="-60000"/> <!-- difference between break and no-break situation -->
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="30000"/> <!-- w="30000" is for the padding-before -->
-
- <box w="14400"/>
-
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
- <penalty w="0" p="0"/>
- <glue w="-60000"/>
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
-
- <box w="14400"/>
-
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
- <penalty w="0" p="0"/>
- <glue w="-60000"/>
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
-
- <box w="14400"/>
-
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
- <penalty w="0" p="0"/>
- <glue w="-60000"/>
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
-
- <box w="14400"/>
-
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
- <penalty w="0" p="0"/>
- <glue w="-60000"/>
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
-
- <box w="14400"/>
-
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="30000"/>
-
- <skip>1</skip> <!-- helper box -->
- <skip>3</skip>
- </element-list>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks non-conditional before- and after-padding in break-situations.
+ </p>
+ </info>
+ <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="2in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="lightgray" padding-before="30pt" padding-before.conditionality="retain" padding-after="30pt" padding-after.conditionality="retain">
+ <fo:block background-color="yellow">line1</fo:block>
+ <fo:block background-color="orange">line2</fo:block>
+ <fo:block background-color="yellow">line3</fo:block>
+ <fo:block background-color="orange">line4</fo:block>
+ <fo:block background-color="yellow">line5</fo:block>
+ <fo:block background-color="orange">line6</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+
+ <box w="14400"/>
+
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/> <!-- w="30000" is for the padding-after -->
+ <penalty w="0" p="0"/>
+ <glue w="-60000"/> <!-- difference between break and no-break situation -->
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/> <!-- w="30000" is for the padding-before -->
+
+ <box w="14400"/>
+
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+ <penalty w="0" p="0"/>
+ <glue w="-60000"/>
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+
+ <box w="14400"/>
+
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+ <penalty w="0" p="0"/>
+ <glue w="-60000"/>
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+
+ <box w="14400"/>
+
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+ <penalty w="0" p="0"/>
+ <glue w="-60000"/>
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+
+ <box w="14400"/>
+
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+ <penalty w="0" p="0"/>
+ <glue w="-60000"/>
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+
+ <box w="14400"/>
+
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="30000"/>
+
+ <skip>1</skip> <!-- helper box -->
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_percentages.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_percentages.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_percentages.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_percentages.xml Thu Mar 6 05:33:44 2008
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks relative padding on blocks.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block background-color="yellow" padding="5%">
- margin not specified padding="5%"
- </fo:block>
- <fo:block margin="0pt" background-color="yellow" padding="5%">
- margin="0pt" padding="5%"
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>
- <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>
- <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>
- <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>
- <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>
- <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>
- <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>
- <eval expected="color=#ffff00" xpath="//flow/block[2]/@background"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks relative padding on blocks.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="yellow" padding="5%">
+ margin not specified padding="5%"
+ </fo:block>
+ <fo:block margin="0pt" background-color="yellow" padding="5%">
+ margin="0pt" padding="5%"
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>
+ <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>
+ <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>
+ <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[2]/@background"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_percentages.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_percentages.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_padding_shorthands.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_shy_linebreaking.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml Thu Mar 6 05:33:44 2008
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks block-level space properties. This is the space-resolution example in "4.3.1 Space-resolution Rules".
- </p>
- </info>
- <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:region-body background-color="lightgray"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block space-before="10pt" background-color="yellow">
- <fo:block space-before="4pt" space-before.conditionality="retain">
- <fo:block space-before="5pt" background-color="orange">
- In olden times when wishing still helped one, there lived a king whose daughters
- </fo:block>
- </fo:block>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <!-- Only the third space (5pt, discard) survives the space-resolution. -->
- <element-list category="breaker">
- <box w="0"/>
- <penalty w="0" p="INF"/>
- <glue w="5000"/>
- <box w="14400"/>
- <box w="14400"/>
- <skip>3</skip>
- </element-list>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks block-level space properties. This is the space-resolution example in "4.3.1 Space-resolution Rules".
+ </p>
+ </info>
+ <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:region-body background-color="lightgray"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block space-before="10pt" background-color="yellow">
+ <fo:block space-before="4pt" space-before.conditionality="retain">
+ <fo:block space-before="5pt" background-color="orange">
+ In olden times when wishing still helped one, there lived a king whose daughters
+ </fo:block>
+ </fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- Only the third space (5pt, discard) survives the space-resolution. -->
+ <element-list category="breaker">
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="5000"/>
+ <box w="14400"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_4.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_5.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_6.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_7.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_8.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_9.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_start-indent_end-indent.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_1.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_1.xml Thu Mar 6 05:33:44 2008
@@ -1,124 +1,124 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks text-align and text-align-last.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simple" page-height="10in" page-width="5in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="simple">
- <fo:flow flow-name="xsl-region-body">
- <fo:block>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
- <fo:block text-align="start" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
- <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
- <fo:block text-align="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
- <fo:block text-align="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
- <fo:block text-align="justify" text-align-last="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
- <fo:block text-align="justify" text-align-last="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <!-- default settings for text-align -->
- <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[1]/lineArea[2]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[1]/lineArea[3]/@start-indent))"/>
- <true xpath="//flow/block[1]/lineArea[1]/text/@ipd != //flow/block[1]/lineArea[2]/text/@ipd"/>
- <true xpath="//flow/block[1]/lineArea[2]/text/@ipd != //flow/block[1]/lineArea[3]/text/@ipd"/>
-
- <!-- text-align="start" -->
- <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[2]/lineArea[2]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[2]/lineArea[3]/@start-indent))"/>
- <true xpath="//flow/block[2]/lineArea[1]/text/@ipd != //flow/block[2]/lineArea[2]/text/@ipd"/>
- <true xpath="//flow/block[2]/lineArea[2]/text/@ipd != //flow/block[2]/lineArea[3]/text/@ipd"/>
-
- <!-- block 1 and 2 must have the same result -->
- <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>
- <true xpath="//flow/block[1]/lineArea[2]/text/@ipd = //flow/block[2]/lineArea[2]/text/@ipd"/>
- <true xpath="//flow/block[1]/lineArea[3]/text/@ipd = //flow/block[2]/lineArea[3]/text/@ipd"/>
-
- <!-- text-align="justify" -->
- <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[3]/lineArea[2]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[3]/lineArea[3]/@start-indent))"/>
- <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
- <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) < 3000"/>
- <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) > -3000"/>
- <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) < 3000"/>
- <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) > -3000"/>
- <true xpath="//flow/block[3]/lineArea[3]/text/@ipd < 350000"/>
-
- <!-- text-align="center" -->
- <true xpath="//flow/block[4]/lineArea[1]/@start-indent > 10000"/>
- <true xpath="//flow/block[4]/lineArea[2]/@start-indent > 10000"/>
- <true xpath="//flow/block[4]/lineArea[3]/@start-indent > 10000"/>
- <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
- <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) < 4000"/>
- <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) > -4000"/>
- <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) < 4000"/>
- <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) > -4000"/>
- <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) < 4000"/>
- <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) > -4000"/>
-
- <!-- text-align="end" -->
- <true xpath="//flow/block[5]/lineArea[1]/@start-indent > 10000"/>
- <true xpath="//flow/block[5]/lineArea[2]/@start-indent > 10000"/>
- <true xpath="//flow/block[5]/lineArea[3]/@start-indent > 10000"/>
- <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
- <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) < 4000"/>
- <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) > -4000"/>
- <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) < 4000"/>
- <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) > -4000"/>
- <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) < 4000"/>
- <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) > -4000"/>
-
- <!-- text-align="justify" text-align-last="center" -->
- <true xpath="not(boolean(//flow/block[6]/lineArea[1]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[6]/lineArea[2]/@start-indent))"/>
- <true xpath="//flow/block[6]/lineArea[3]/@start-indent > 10000"/>
- <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) < 3000"/>
- <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) > -3000"/>
- <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) < 3000"/>
- <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) > -3000"/>
- <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) < 4000"/>
- <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) > -4000"/>
-
- <!-- text-align="justify" text-align-last="end" -->
- <true xpath="not(boolean(//flow/block[7]/lineArea[1]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[7]/lineArea[2]/@start-indent))"/>
- <true xpath="//flow/block[7]/lineArea[3]/@start-indent > 10000"/>
- <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) < 3000"/>
- <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) > -3000"/>
- <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) < 3000"/>
- <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) > -3000"/>
- <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) < 4000"/>
- <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) > -4000"/>
-
- <!-- TODO Check element list -->
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks text-align and text-align-last.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simple" page-height="10in" page-width="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="simple">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+ <fo:block text-align="start" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+ <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+ <fo:block text-align="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+ <fo:block text-align="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+ <fo:block text-align="justify" text-align-last="center" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+ <fo:block text-align="justify" text-align-last="end">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi suscipit, risus ac congue suscipit, tortor nibh cursus mauris, quis feugiat nunc ante sit amet ante.</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- default settings for text-align -->
+ <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[1]/lineArea[2]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[1]/lineArea[3]/@start-indent))"/>
+ <true xpath="//flow/block[1]/lineArea[1]/text/@ipd != //flow/block[1]/lineArea[2]/text/@ipd"/>
+ <true xpath="//flow/block[1]/lineArea[2]/text/@ipd != //flow/block[1]/lineArea[3]/text/@ipd"/>
+
+ <!-- text-align="start" -->
+ <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[2]/lineArea[2]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[2]/lineArea[3]/@start-indent))"/>
+ <true xpath="//flow/block[2]/lineArea[1]/text/@ipd != //flow/block[2]/lineArea[2]/text/@ipd"/>
+ <true xpath="//flow/block[2]/lineArea[2]/text/@ipd != //flow/block[2]/lineArea[3]/text/@ipd"/>
+
+ <!-- block 1 and 2 must have the same result -->
+ <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>
+ <true xpath="//flow/block[1]/lineArea[2]/text/@ipd = //flow/block[2]/lineArea[2]/text/@ipd"/>
+ <true xpath="//flow/block[1]/lineArea[3]/text/@ipd = //flow/block[2]/lineArea[3]/text/@ipd"/>
+
+ <!-- text-align="justify" -->
+ <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[3]/lineArea[2]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[3]/lineArea[3]/@start-indent))"/>
+ <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
+ <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) < 3000"/>
+ <true xpath="(360000 - //flow/block[3]/lineArea[1]/text/@ipd) > -3000"/>
+ <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) < 3000"/>
+ <true xpath="(360000 - //flow/block[3]/lineArea[2]/text/@ipd) > -3000"/>
+ <true xpath="//flow/block[3]/lineArea[3]/text/@ipd < 350000"/>
+
+ <!-- text-align="center" -->
+ <true xpath="//flow/block[4]/lineArea[1]/@start-indent > 10000"/>
+ <true xpath="//flow/block[4]/lineArea[2]/@start-indent > 10000"/>
+ <true xpath="//flow/block[4]/lineArea[3]/@start-indent > 10000"/>
+ <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
+ <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) < 4000"/>
+ <true xpath="(360000 - //flow/block[4]/lineArea[1]/text/@ipd - (2 * //flow/block[4]/lineArea[1]/@start-indent)) > -4000"/>
+ <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) < 4000"/>
+ <true xpath="(360000 - //flow/block[4]/lineArea[2]/text/@ipd - (2 * //flow/block[4]/lineArea[2]/@start-indent)) > -4000"/>
+ <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) < 4000"/>
+ <true xpath="(360000 - //flow/block[4]/lineArea[3]/text/@ipd - (2 * //flow/block[4]/lineArea[3]/@start-indent)) > -4000"/>
+
+ <!-- text-align="end" -->
+ <true xpath="//flow/block[5]/lineArea[1]/@start-indent > 10000"/>
+ <true xpath="//flow/block[5]/lineArea[2]/@start-indent > 10000"/>
+ <true xpath="//flow/block[5]/lineArea[3]/@start-indent > 10000"/>
+ <!-- Some tolerance seems to be necessary here. Why is that exactly? -->
+ <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) < 4000"/>
+ <true xpath="(360000 - //flow/block[5]/lineArea[1]/text/@ipd - //flow/block[5]/lineArea[1]/@start-indent) > -4000"/>
+ <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) < 4000"/>
+ <true xpath="(360000 - //flow/block[5]/lineArea[2]/text/@ipd - //flow/block[5]/lineArea[2]/@start-indent) > -4000"/>
+ <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) < 4000"/>
+ <true xpath="(360000 - //flow/block[5]/lineArea[3]/text/@ipd - //flow/block[5]/lineArea[3]/@start-indent) > -4000"/>
+
+ <!-- text-align="justify" text-align-last="center" -->
+ <true xpath="not(boolean(//flow/block[6]/lineArea[1]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[6]/lineArea[2]/@start-indent))"/>
+ <true xpath="//flow/block[6]/lineArea[3]/@start-indent > 10000"/>
+ <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) < 3000"/>
+ <true xpath="(360000 - //flow/block[6]/lineArea[1]/text/@ipd) > -3000"/>
+ <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) < 3000"/>
+ <true xpath="(360000 - //flow/block[6]/lineArea[2]/text/@ipd) > -3000"/>
+ <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) < 4000"/>
+ <true xpath="(360000 - //flow/block[6]/lineArea[3]/text/@ipd - (2 * //flow/block[6]/lineArea[3]/@start-indent)) > -4000"/>
+
+ <!-- text-align="justify" text-align-last="end" -->
+ <true xpath="not(boolean(//flow/block[7]/lineArea[1]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[7]/lineArea[2]/@start-indent))"/>
+ <true xpath="//flow/block[7]/lineArea[3]/@start-indent > 10000"/>
+ <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) < 3000"/>
+ <true xpath="(360000 - //flow/block[7]/lineArea[1]/text/@ipd) > -3000"/>
+ <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) < 3000"/>
+ <true xpath="(360000 - //flow/block[7]/lineArea[2]/text/@ipd) > -3000"/>
+ <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) < 4000"/>
+ <true xpath="(360000 - //flow/block[7]/lineArea[3]/text/@ipd - //flow/block[7]/lineArea[3]/@start-indent) > -4000"/>
+
+ <!-- TODO Check element list -->
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_2.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_2.xml Thu Mar 6 05:33:44 2008
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks text-align and text-align-last in special conditions.
- </p>
- </info>
- <fo>
- <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simple" page-height="10in" page-width="5in">
- <fo:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="simple" id="bla1">
- <fo:flow flow-name="xsl-region-body">
- <fo:block text-align-last="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</fo:block>
- <!-- The next block is pretty much like the previous but there is a linefeed that is converted to a space which is then
- removed by LineLM.removeElementsForTrailingSpaces(). There used to be a ClassCastException here. -->
- <fo:block text-align-last="justify" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
- </fo:block>
- <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <!-- all three blocks must be identical -->
- <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>
- <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>
- <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>
- <true xpath="//flow/block[1]/lineArea[1]/text/@ipd > //flow/block[3]/lineArea[1]/text/@ipd"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks text-align and text-align-last in special conditions.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simple" page-height="10in" page-width="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="simple" id="bla1">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block text-align-last="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.</fo:block>
+ <!-- The next block is pretty much like the previous but there is a linefeed that is converted to a space which is then
+ removed by LineLM.removeElementsForTrailingSpaces(). There used to be a ClassCastException here. -->
+ <fo:block text-align-last="justify" background-color="yellow">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+ </fo:block>
+ <fo:block text-align="justify">Lorem ipsum dolor sit amet, consectetuer adipiscing elit. </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- all three blocks must be identical -->
+ <true xpath="not(boolean(//flow/block[1]/lineArea[1]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[2]/lineArea[1]/@start-indent))"/>
+ <true xpath="not(boolean(//flow/block[3]/lineArea[1]/@start-indent))"/>
+ <true xpath="//flow/block[1]/lineArea[1]/text/@ipd = //flow/block[2]/lineArea[1]/text/@ipd"/>
+ <true xpath="//flow/block[1]/lineArea[1]/text/@ipd > //flow/block[3]/lineArea[1]/text/@ipd"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-align_3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_text-indent.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_uax14_linebreaking.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml Thu Mar 6 05:33:44 2008
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- This test checks basic white space handling for white-space-collapse="true".
- </p>
- </info>
- <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:region-body/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <fo:page-sequence master-reference="normal" white-space-collapse="true">
- <fo:flow flow-name="xsl-region-body">
- <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
- spaces
- before
- and
- after
- each
- word <fo:character character="
" />
-<fo:character character=" " /><fo:character character=" " /> and
- linefeeds<fo:character character=" " /><fo:character character=" " />
- everywhere <fo:character character=" " />
- </fo:block>
- <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
- <fo:block background-color="orange">
- nested block level
- </fo:block>
- <fo:block background-color="red">
- nested block level
- </fo:block>
- </fo:block>
- <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
- <fo:inline background-color="orange">
- inline level
- </fo:inline>
- <fo:inline background-color="red">
- inline level
- </fo:inline>
- </fo:block>
- <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
- block level
- <fo:inline background-color="orange">
- inline level
- </fo:inline>
- block
- <fo:inline background-color="red">
- inline level
- </fo:inline>
- block level
- </fo:block>
- <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
- <fo:inline background-color="orange">
- inline level
- <fo:inline background-color="red">
- nested inline level
- </fo:inline>
- </fo:inline>
- </fo:block>
- <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
- <fo:inline background-color="orange">
- <fo:inline background-color="red">
- nested inline level
- </fo:inline>
- inline level
- </fo:inline>
- </fo:block>
- <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
- block level
- <fo:inline background-color="orange">
- <fo:inline background-color="red">
- nested inline level
- </fo:inline>
- inline level
- </fo:inline>
- block level
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
- <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
- <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
- <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
- <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[3]/space)"/>
- <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[4]/word)"/>
-
- <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>
- <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>
- <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>
- <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>
-
- <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>
- <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
- <eval expected="1" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>
- <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>
- <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>
-
- <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>
- <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>
- <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>
- <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>
- <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>
- <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
- <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/word)"/>
- <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/space)"/>
- <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/word)"/>
- <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/space)"/>
-
- <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
- <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>
- <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
- <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
-
- <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
- <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
- <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>
- <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>
-
- <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>
- <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
- <eval expected="1" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>
- <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
- <eval expected="4" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
- <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/word)"/>
- <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/space)"/>
- <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/word)"/>
- <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/space)"/>
- </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks basic white space handling for white-space-collapse="true".
+ </p>
+ </info>
+ <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:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ spaces
+ before
+ and
+ after
+ each
+ word <fo:character character="
" />
+<fo:character character=" " /><fo:character character=" " /> and
+ linefeeds<fo:character character=" " /><fo:character character=" " />
+ everywhere <fo:character character=" " />
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:block background-color="orange">
+ nested block level
+ </fo:block>
+ <fo:block background-color="red">
+ nested block level
+ </fo:block>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ inline level
+ </fo:inline>
+ <fo:inline background-color="red">
+ inline level
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ block level
+ <fo:inline background-color="orange">
+ inline level
+ </fo:inline>
+ block
+ <fo:inline background-color="red">
+ inline level
+ </fo:inline>
+ block level
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ inline level
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ inline level
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ block level
+ <fo:inline background-color="orange">
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ inline level
+ </fo:inline>
+ block level
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+ <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[3]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[4]/word)"/>
+
+ <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>
+ <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>
+ <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="4" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/word)"/>
+ <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/space)"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org