You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ma...@apache.org on 2008/02/13 10:36:21 UTC
svn commit: r627324 [5/22] - in /xmlgraphics/fop/trunk: ./
examples/embedding/ examples/embedding/xml/xml/ examples/fo/
examples/fo/advanced/ examples/fo/fo-reference/ examples/fo/markers/
examples/hyphenation/ examples/mathml/ examples/plan/ examples/...
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml Wed Feb 13 01:35:01 2008
@@ -1,104 +1,104 @@
-<?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 in-flow block-containers with reference orientation.
- Special case with nested block-containers from Bugzilla #36391.
- </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 column-count="2"/>
- </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>Reference orientation : 0</fo:block>
- <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
- <fo:block-container border="solid 1pt" width="30pt" reference-orientation="0">
- <fo:block>ABC</fo:block>
- </fo:block-container>
- </fo:block-container>
- <fo:block>Reference orientation : 90</fo:block>
- <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
- <fo:block-container border="solid 1pt" width="30pt" reference-orientation="90">
- <fo:block>ABC</fo:block>
- </fo:block-container>
- </fo:block-container>
- <fo:block>Reference orientation : -270</fo:block>
- <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
- <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-270">
- <fo:block>ABC</fo:block>
- </fo:block-container>
- </fo:block-container>
- <fo:block break-before="column">Reference orientation : 180</fo:block>
- <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
- <fo:block-container width="30pt" border="solid 1pt" reference-orientation="180">
- <fo:block>ABC</fo:block>
- </fo:block-container>
- </fo:block-container>
- <fo:block>Reference orientation : -180</fo:block>
- <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
- <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-180">
- <fo:block>ABC</fo:block>
- </fo:block-container>
- </fo:block-container>
- <fo:block>Reference orientation : 270</fo:block>
- <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
- <fo:block-container width="30pt" border="solid 1pt" reference-orientation="270">
- <fo:block>ABC</fo:block>
- </fo:block-container>
- </fo:block-container>
- <fo:block>Reference orientation : -90</fo:block>
- <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
- <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-90">
- <fo:block>ABC</fo:block>
- </fo:block-container>
- </fo:block-container>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <!-- 0 -->
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/@ctm"/>
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/block[1]/block[1]/@ctm"/>
- <!-- 90 -->
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[4]/@ctm"/>
- <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[4]/block[1]/block[1]/@ctm"/>
- <!-- -270 -->
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[6]/@ctm"/>
- <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[6]/block[1]/block[1]/@ctm"/>
- <!-- 180 -->
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[2]/@ctm"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[2]/block[1]/block[1]/@ctm"/>
- <!-- -180 -->
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[4]/@ctm"/>
- <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[4]/block[1]/block[1]/@ctm"/>
- <!-- 270 -->
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>
- <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>
- <!-- -90 -->
- <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>
- <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>
- </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 in-flow block-containers with reference orientation.
+ Special case with nested block-containers from Bugzilla #36391.
+ </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 column-count="2"/>
+ </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>Reference orientation : 0</fo:block>
+ <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+ <fo:block-container border="solid 1pt" width="30pt" reference-orientation="0">
+ <fo:block>ABC</fo:block>
+ </fo:block-container>
+ </fo:block-container>
+ <fo:block>Reference orientation : 90</fo:block>
+ <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+ <fo:block-container border="solid 1pt" width="30pt" reference-orientation="90">
+ <fo:block>ABC</fo:block>
+ </fo:block-container>
+ </fo:block-container>
+ <fo:block>Reference orientation : -270</fo:block>
+ <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+ <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-270">
+ <fo:block>ABC</fo:block>
+ </fo:block-container>
+ </fo:block-container>
+ <fo:block break-before="column">Reference orientation : 180</fo:block>
+ <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+ <fo:block-container width="30pt" border="solid 1pt" reference-orientation="180">
+ <fo:block>ABC</fo:block>
+ </fo:block-container>
+ </fo:block-container>
+ <fo:block>Reference orientation : -180</fo:block>
+ <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+ <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-180">
+ <fo:block>ABC</fo:block>
+ </fo:block-container>
+ </fo:block-container>
+ <fo:block>Reference orientation : 270</fo:block>
+ <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+ <fo:block-container width="30pt" border="solid 1pt" reference-orientation="270">
+ <fo:block>ABC</fo:block>
+ </fo:block-container>
+ </fo:block-container>
+ <fo:block>Reference orientation : -90</fo:block>
+ <fo:block-container border="dotted 1pt" width="90pt" height="60pt">
+ <fo:block-container width="30pt" border="solid 1pt" reference-orientation="-90">
+ <fo:block>ABC</fo:block>
+ </fo:block-container>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- 0 -->
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/@ctm"/>
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[2]/block[1]/block[1]/@ctm"/>
+ <!-- 90 -->
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[4]/@ctm"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[4]/block[1]/block[1]/@ctm"/>
+ <!-- -270 -->
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[1]/block[6]/@ctm"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 0.0 31000.0]" xpath="//mainReference/span/flow[1]/block[6]/block[1]/block[1]/@ctm"/>
+ <!-- 180 -->
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[2]/@ctm"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[2]/block[1]/block[1]/@ctm"/>
+ <!-- -180 -->
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[4]/@ctm"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 30000.0 15400.0]" xpath="//mainReference/span/flow[2]/block[4]/block[1]/block[1]/@ctm"/>
+ <!-- 270 -->
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>
+ <!-- -90 -->
+ <eval expected="[1.0 0.0 0.0 1.0 0.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/@ctm"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 90000.0 1000.0]" xpath="//mainReference/span/flow[2]/block[6]/block[1]/block[1]/@ctm"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_space-before_space-after_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_space-before_space-after_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_space-before_space-after_3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_squeeze-content_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_start-indent.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_width_height.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-level_id.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_basic_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_basic_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_border-style.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_border.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_border_bug43917.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_border_padding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_border_shorthands.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after_bug40230.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after_bug40230.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after_bug40230.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after_bug40230.xml Wed Feb 13 01:35:01 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Id: block_break-after.xml 426576 2006-07-28 15:44:37Z jeremias $ -->
+<!-- $Id$ -->
<testcase>
<info>
<p>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after_bug40230.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-after_bug40230.xml
------------------------------------------------------------------------------
svn:keywords = Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_break-before_bug37964.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_bug39414.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-family.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-size_absolute.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-size_percentage.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-size_relative.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-stretch.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-stretch.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-stretch.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-stretch.xml Wed Feb 13 01:35:01 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 font stretches.
- </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="210mm" page-height="297mm">
- <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 font-family="serif">font-family="serif" font-stretch not given</fo:block>
- <fo:block font-family="serif" font-stretch="ultra-condensed">font-family="serif" font-stretch="ultra-condensed"
- <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
- </fo:block>
- <fo:block font-family="serif" font-stretch="extra-condensed">font-family="serif" font-stretch="extra-condensed"</fo:block>
- <fo:block font-family="serif" font-stretch="condensed">font-family="serif" font-stretch="condensed"</fo:block>
- <fo:block font-family="serif" font-stretch="semi-condensed">font-family="serif" font-stretch="semi-condensed"</fo:block>
- <fo:block font-family="serif" font-stretch="normal">font-family="serif" font-stretch="normal"</fo:block>
- <fo:block font-family="serif" font-stretch="semi-expanded">font-family="serif" font-stretch="semi-expanded"</fo:block>
- <fo:block font-family="serif" font-stretch="expanded">font-family="serif" font-stretch="expanded"</fo:block>
- <fo:block font-family="serif" font-stretch="extra-expanded">font-family="serif" font-stretch="extra-expanded"</fo:block>
- <fo:block font-family="serif" font-stretch="ultra-expanded">font-family="serif" font-stretch="ultra-expanded"
- <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
- </fo:block>
- <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
- <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- </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 font stretches.
+ </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="210mm" page-height="297mm">
+ <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 font-family="serif">font-family="serif" font-stretch not given</fo:block>
+ <fo:block font-family="serif" font-stretch="ultra-condensed">font-family="serif" font-stretch="ultra-condensed"
+ <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
+ </fo:block>
+ <fo:block font-family="serif" font-stretch="extra-condensed">font-family="serif" font-stretch="extra-condensed"</fo:block>
+ <fo:block font-family="serif" font-stretch="condensed">font-family="serif" font-stretch="condensed"</fo:block>
+ <fo:block font-family="serif" font-stretch="semi-condensed">font-family="serif" font-stretch="semi-condensed"</fo:block>
+ <fo:block font-family="serif" font-stretch="normal">font-family="serif" font-stretch="normal"</fo:block>
+ <fo:block font-family="serif" font-stretch="semi-expanded">font-family="serif" font-stretch="semi-expanded"</fo:block>
+ <fo:block font-family="serif" font-stretch="expanded">font-family="serif" font-stretch="expanded"</fo:block>
+ <fo:block font-family="serif" font-stretch="extra-expanded">font-family="serif" font-stretch="extra-expanded"</fo:block>
+ <fo:block font-family="serif" font-stretch="ultra-expanded">font-family="serif" font-stretch="ultra-expanded"
+ <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
+ </fo:block>
+ <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
+ <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-stretch.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-stretch.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-style.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_font-weight.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-together.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-together_overflow_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-next.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-next_nested.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_keep-with-previous_nested.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_last-line-end-indent.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_letter-spacing.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_letter-spacing_text-align_justify.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-height-shift-adjustment.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-height.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-height.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-height.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-height.xml Wed Feb 13 01:35:01 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 line height and its special inheritance behaviour
- </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 line-height="normal" background-color="yellow">line-height="normal"
- <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
- <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
- </fo:block>
- <fo:block line-height="150%" background-color="yellow">line-height="150%"
- <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
- <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
- </fo:block>
- <fo:block line-height="20pt" background-color="yellow">line-height="20pt"
- <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
- <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
- </fo:block>
- <fo:block line-height="1.5" background-color="yellow">line-height="1.5"
- <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
- <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
- </fo:block>
- <fo:block line-height="150% - 5pt" background-color="yellow">line-height="150% - 5pt"
- <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
- <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
- <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpda"/>
- <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-before"/>
- <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-after"/>
- <eval expected="13319" xpath="//flow/block[1]/block[1]/lineArea/@bpd"/>
- <eval expected="17280" xpath="//flow/block[1]/block[1]/lineArea/@bpda"/>
- <eval expected="1980" xpath="//flow/block[1]/block[1]/lineArea/@space-before"/>
- <eval expected="1981" xpath="//flow/block[1]/block[1]/lineArea/@space-after"/>
- <eval expected="9250" xpath="//flow/block[1]/block[2]/lineArea/@bpd"/>
- <eval expected="12000" xpath="//flow/block[1]/block[2]/lineArea/@bpda"/>
- <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-before"/>
- <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-after"/>
-
- <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
- <eval expected="18000" xpath="//flow/block[2]/lineArea/@bpda"/>
- <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-before"/>
- <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-after"/>
- <eval expected="13319" xpath="//flow/block[2]/block[1]/lineArea/@bpd"/>
- <eval expected="18000" xpath="//flow/block[2]/block[1]/lineArea/@bpda"/>
- <eval expected="2340" xpath="//flow/block[2]/block[1]/lineArea/@space-before"/>
- <eval expected="2341" xpath="//flow/block[2]/block[1]/lineArea/@space-after"/>
- <eval expected="9250" xpath="//flow/block[2]/block[2]/lineArea/@bpd"/>
- <eval expected="18000" xpath="//flow/block[2]/block[2]/lineArea/@bpda"/>
- <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-before"/>
- <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-after"/>
-
- <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
- <eval expected="20000" xpath="//flow/block[3]/lineArea/@bpda"/>
- <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-before"/>
- <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-after"/>
- <eval expected="13319" xpath="//flow/block[3]/block[1]/lineArea/@bpd"/>
- <eval expected="20000" xpath="//flow/block[3]/block[1]/lineArea/@bpda"/>
- <eval expected="3340" xpath="//flow/block[3]/block[1]/lineArea/@space-before"/>
- <eval expected="3341" xpath="//flow/block[3]/block[1]/lineArea/@space-after"/>
- <eval expected="9250" xpath="//flow/block[3]/block[2]/lineArea/@bpd"/>
- <eval expected="20000" xpath="//flow/block[3]/block[2]/lineArea/@bpda"/>
- <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-before"/>
- <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-after"/>
-
- <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
- <eval expected="18000" xpath="//flow/block[4]/lineArea/@bpda"/>
- <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-before"/>
- <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-after"/>
- <eval expected="13319" xpath="//flow/block[4]/block[1]/lineArea/@bpd"/>
- <eval expected="21600" xpath="//flow/block[4]/block[1]/lineArea/@bpda"/>
- <eval expected="4140" xpath="//flow/block[4]/block[1]/lineArea/@space-before"/>
- <eval expected="4141" xpath="//flow/block[4]/block[1]/lineArea/@space-after"/>
- <eval expected="9250" xpath="//flow/block[4]/block[2]/lineArea/@bpd"/>
- <eval expected="15000" xpath="//flow/block[4]/block[2]/lineArea/@bpda"/>
- <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-before"/>
- <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-after"/>
-
- <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
- <eval expected="13000" xpath="//flow/block[5]/lineArea/@bpda"/>
- <eval expected="950" xpath="//flow/block[5]/lineArea/@space-before"/>
- <eval expected="950" xpath="//flow/block[5]/lineArea/@space-after"/>
- <eval expected="13319" xpath="//flow/block[5]/block[1]/lineArea/@bpd"/>
- <eval expected="13000" xpath="//flow/block[5]/block[1]/lineArea/@bpda"/>
- <eval expected="-159" xpath="//flow/block[5]/block[1]/lineArea/@space-before"/>
- <eval expected="-160" xpath="//flow/block[5]/block[1]/lineArea/@space-after"/>
- <eval expected="9250" xpath="//flow/block[5]/block[2]/lineArea/@bpd"/>
- <eval expected="13000" xpath="//flow/block[5]/block[2]/lineArea/@bpda"/>
- <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-before"/>
- <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@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 line height and its special inheritance behaviour
+ </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 line-height="normal" background-color="yellow">line-height="normal"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
+ </fo:block>
+ <fo:block line-height="150%" background-color="yellow">line-height="150%"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+ </fo:block>
+ <fo:block line-height="20pt" background-color="yellow">line-height="20pt"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+ </fo:block>
+ <fo:block line-height="1.5" background-color="yellow">line-height="1.5"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
+ </fo:block>
+ <fo:block line-height="150% - 5pt" background-color="yellow">line-height="150% - 5pt"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpda"/>
+ <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-before"/>
+ <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[1]/block[1]/lineArea/@bpd"/>
+ <eval expected="17280" xpath="//flow/block[1]/block[1]/lineArea/@bpda"/>
+ <eval expected="1980" xpath="//flow/block[1]/block[1]/lineArea/@space-before"/>
+ <eval expected="1981" xpath="//flow/block[1]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[1]/block[2]/lineArea/@bpd"/>
+ <eval expected="12000" xpath="//flow/block[1]/block[2]/lineArea/@bpda"/>
+ <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[2]/lineArea/@bpda"/>
+ <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-before"/>
+ <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[2]/block[1]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[2]/block[1]/lineArea/@bpda"/>
+ <eval expected="2340" xpath="//flow/block[2]/block[1]/lineArea/@space-before"/>
+ <eval expected="2341" xpath="//flow/block[2]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[2]/block[2]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[2]/block[2]/lineArea/@bpda"/>
+ <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-before"/>
+ <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[3]/lineArea/@bpda"/>
+ <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-before"/>
+ <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[3]/block[1]/lineArea/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[3]/block[1]/lineArea/@bpda"/>
+ <eval expected="3340" xpath="//flow/block[3]/block[1]/lineArea/@space-before"/>
+ <eval expected="3341" xpath="//flow/block[3]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[3]/block[2]/lineArea/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[3]/block[2]/lineArea/@bpda"/>
+ <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-before"/>
+ <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[4]/lineArea/@bpda"/>
+ <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-before"/>
+ <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[4]/block[1]/lineArea/@bpd"/>
+ <eval expected="21600" xpath="//flow/block[4]/block[1]/lineArea/@bpda"/>
+ <eval expected="4140" xpath="//flow/block[4]/block[1]/lineArea/@space-before"/>
+ <eval expected="4141" xpath="//flow/block[4]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[4]/block[2]/lineArea/@bpd"/>
+ <eval expected="15000" xpath="//flow/block[4]/block[2]/lineArea/@bpda"/>
+ <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-before"/>
+ <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+ <eval expected="13000" xpath="//flow/block[5]/lineArea/@bpda"/>
+ <eval expected="950" xpath="//flow/block[5]/lineArea/@space-before"/>
+ <eval expected="950" xpath="//flow/block[5]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[5]/block[1]/lineArea/@bpd"/>
+ <eval expected="13000" xpath="//flow/block[5]/block[1]/lineArea/@bpda"/>
+ <eval expected="-159" xpath="//flow/block[5]/block[1]/lineArea/@space-before"/>
+ <eval expected="-160" xpath="//flow/block[5]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[5]/block[2]/lineArea/@bpd"/>
+ <eval expected="13000" xpath="//flow/block[5]/block[2]/lineArea/@bpda"/>
+ <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-before"/>
+ <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-after"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-height.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-height.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml Wed Feb 13 01:35:01 2008
@@ -1,165 +1,165 @@
-<?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 line-stacking-strategy font-height against inlines of different sizes.
- </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 line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
- Before
- <fo:inline font-size="20pt"
- background-color="yellow">bigger
- </fo:inline>
- After
- </fo:block>
- <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
- Before
- <fo:inline font-size="20pt"
- border="solid 2pt red"
- padding="3pt"
- background-color="yellow">bigger with b & p
- </fo:inline>
- After
- </fo:block>
- <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
- Before
- <fo:inline font-size="10pt"
- baseline-shift="sub"
- background-color="yellow">sub
- <fo:inline font-size="8pt"
- baseline-shift="sub"
- background-color="red">sub
- </fo:inline>sub
- </fo:inline>
- After
- </fo:block>
- <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
- Before
- <fo:inline font-size="10pt"
- baseline-shift="super"
- background-color="yellow">super
- <fo:inline font-size="8pt"
- baseline-shift="super"
- background-color="red">super
- </fo:inline>super
- </fo:inline>
- After
- </fo:block>
- <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
- Before
- <fo:inline font-size="18pt"
- baseline-shift="super"
- background-color="yellow">super
- <fo:inline font-size="24pt"
- baseline-shift="sub"
- background-color="red">sub
- <fo:inline font-size="30pt"
- baseline-shift="super"
- background-color="green">super
- </fo:inline>sub
- </fo:inline>super
- </fo:inline>
- After
- </fo:block>
- <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
- Before
- <fo:inline font-size="18pt"
- baseline-shift="sub"
- background-color="yellow">sub
- <fo:inline font-size="24pt"
- baseline-shift="super"
- background-color="red">super
- <fo:inline font-size="36pt"
- baseline-shift="sub"
- background-color="green">sub
- </fo:inline>super
- </fo:inline>sub
- </fo:inline>
- After
- </fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
- <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
- <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
- <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
-
- <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
- <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
- <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
- <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
-
- <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
- <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
- <eval expected="5487" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
- <eval expected="3528" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
- <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
- <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
-
- <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
- <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
- <eval expected="-4450" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
- <eval expected="-3794" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
- <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
- <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
-
- <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
- <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
- <eval expected="-10194" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
- <eval expected="1968" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
- <eval expected="-16860" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
- <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
- <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
- <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
-
- <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
- <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
- <eval expected="1835" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
- <eval expected="-13722" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
- <eval expected="798" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
- <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
- <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
- <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
- <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
- </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 line-stacking-strategy font-height against inlines of different sizes.
+ </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 line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="20pt"
+ background-color="yellow">bigger
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="20pt"
+ border="solid 2pt red"
+ padding="3pt"
+ background-color="yellow">bigger with b & p
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="8pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ </fo:inline>sub
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="8pt"
+ baseline-shift="super"
+ background-color="red">super
+ </fo:inline>super
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="18pt"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="24pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ <fo:inline font-size="30pt"
+ baseline-shift="super"
+ background-color="green">super
+ </fo:inline>sub
+ </fo:inline>super
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="18pt"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="24pt"
+ baseline-shift="super"
+ background-color="red">super
+ <fo:inline font-size="36pt"
+ baseline-shift="sub"
+ background-color="green">sub
+ </fo:inline>super
+ </fo:inline>sub
+ </fo:inline>
+ After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5487" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="3528" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-4450" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-3794" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-10194" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="1968" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="-16860" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1835" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-13722" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="798" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_linefeed-treatment.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_linefeed-treatment.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_linefeed-treatment.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_linefeed-treatment.xml Wed Feb 13 01:35:01 2008
@@ -1,81 +1,81 @@
-<?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 white space handling for linefeed-treatment.
- This currently fails because
- a) Preserved linefeeds in fo:character are not handled correctly
- b) ZWSP are not handled correctly
- </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 linefeed-treatment="treat-as-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
-treat-as-space
-all<fo:character character="
"/>linefeeds
-</fo:block>
- <fo:block linefeed-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
-ignore
-all<fo:character character="
"/>linefeeds
-</fo:block>
- <fo:block linefeed-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
-preserve
-all<fo:character character="
"/>linefeeds
-</fo:block>
- <fo:block linefeed-treatment="treat-as-zero-width-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
-treat-as-zero-width-space
-all<fo:character character="
"/>linefeeds
-</fo:block>
- </fo:flow>
- </fo:page-sequence>
- </fo:root>
- </fo>
- <checks>
- <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
- <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
- <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/char)"/>
- <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
- <eval expected="0" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
-
- <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[1]/word)"/>
- <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[1]/space)"/>
- <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[2]/word)"/>
- <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[2]/space)"/>
-
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[1]/text)"/>
- <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
- <eval expected="1" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
- <eval expected="1" xpath="count(//flow/block[3]/lineArea[4]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[3]/lineArea[4]/text/space)"/>
-
- <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
- <eval expected="0" xpath="count(//flow/block[4]/lineArea[1]/text/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 white space handling for linefeed-treatment.
+ This currently fails because
+ a) Preserved linefeeds in fo:character are not handled correctly
+ b) ZWSP are not handled correctly
+ </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 linefeed-treatment="treat-as-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
+treat-as-space
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ <fo:block linefeed-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ignore
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ <fo:block linefeed-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+preserve
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ <fo:block linefeed-treatment="treat-as-zero-width-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
+treat-as-zero-width-space
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/char)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
+ <eval expected="0" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
+
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[1]/word)"/>
+ <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[1]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[2]/word)"/>
+ <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[2]/space)"/>
+
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[1]/text)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[4]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[4]/text/space)"/>
+
+ <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_linefeed-treatment.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_linefeed-treatment.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_linefeed-treatment_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_margin.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_margin_inherit.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_margin_inherit.xml?rev=627324&r1=627323&r2=627324&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_margin_inherit.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_margin_inherit.xml Wed Feb 13 01:35:01 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 with explict inheritance.
- </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="inherit" background-color="blue">
- margin="inherit" - should have the same margin as 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>
-
- <true xpath="not(boolean(//flow/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->
- <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"/>
-
- <eval expected="18000" xpath="//flow/block[1]/block[1]/@space-before"/>
- <eval expected="288000" xpath="//flow/block[1]/block[1]/@ipd"/>
- <eval expected="36000" xpath="//flow/block[1]/block[1]/@start-indent"/>
- <eval expected="36000" xpath="//flow/block[1]/block[1]/@end-indent"/>
- <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-start"/>
- <eval expected="36000" 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 with explict inheritance.
+ </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="inherit" background-color="blue">
+ margin="inherit" - should have the same margin as 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>
+
+ <true xpath="not(boolean(//flow/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->
+ <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"/>
+
+ <eval expected="18000" xpath="//flow/block[1]/block[1]/@space-before"/>
+ <eval expected="288000" xpath="//flow/block[1]/block[1]/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[1]/block[1]/@start-indent"/>
+ <eval expected="36000" xpath="//flow/block[1]/block[1]/@end-indent"/>
+ <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-start"/>
+ <eval expected="36000" 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/trunk/test/layoutengine/standard-testcases/block_margin_inherit.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block_margin_inherit.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Feb 13 01:35:01 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