xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r426576 [27/41] - in /xmlgraphics/fop/trunk: ./ conf/ examples/embedding/ examples/embedding/java/embedding/ examples/embedding/java/embedding/intermediate/ examples/embedding/java/embedding/model/ examples/embedding/java/embedding/tools/ e...
Date Fri, 28 Jul 2006 15:46:32 GMT
Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_1.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_1.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_2.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_2.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_3.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_3.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_3.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_3.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_4.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_4.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_4.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_4.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_5.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_5.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_5.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_positioning_5.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_space-resolution.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_space-resolution.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_space-resolution.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/footnote_space-resolution.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/foreign-attributes.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/foreign-attributes.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/foreign-attributes.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/foreign-attributes.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2006 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_block_nested.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_block_nested.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_block_nested.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_block_nested.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_border_padding.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_border_padding.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_border_padding.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-container_border_padding.xml Fri Jul 28 08:44:37 2006
@@ -1,85 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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 the borders and the like for instream-foreign-object.
-    </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="orange">
-            Before <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
-                <fo:block>inside the container</fo:block>
-            </fo:inline-container> after
-          </fo:block>
-          <fo:block background-color="yellow" font-size="100pt">
-            BC <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
-                <fo:block font-size="12pt">inside the container</fo:block>
-            </fo:inline-container> AC
-          </fo:block>
-          <fo:block font-size="9pt">
-           In both blocks we have a setting of border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" on the i-f-o.
-           In the first block the i-f-o determines the height of the line in the 2nd block the font is bigger than the i-f-o.
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <!-- first e-g -->
-    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
-    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
-    <eval expected="70000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
-    <eval expected="1650" xpath="//flow/block[1]/lineArea/viewport/@offset"/>
-    <eval expected="20000 30000 20000 30000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
-    <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/>
-    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
-    <eval expected="(solid,#000000,20000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
-    <eval expected="(solid,#000000,15000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
-    <eval expected="(solid,#000000,10000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
-    <eval expected="15000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
-    <eval expected="10000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
-    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
-    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
-    <eval expected="20000 20000 20000 20000" xpath="//flow/block[1]/lineArea/viewport/foreignObject/@pos"/>
-    <!-- second e-g -->
-    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="70000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-    <eval expected="15550" xpath="//flow/block[2]/lineArea/viewport/@offset"/>
-    <eval expected="20000 30000 20000 30000" xpath="//flow/block[2]/lineArea/viewport/@bap"/>
-    <eval expected="color=#ffffff" xpath="//flow/block[2]/lineArea/viewport/@background"/>
-    <eval expected="(solid,#000000,5000)" xpath="//flow/block[2]/lineArea/viewport/@border-before"/>
-    <eval expected="(solid,#000000,20000)" xpath="//flow/block[2]/lineArea/viewport/@border-after"/>
-    <eval expected="(solid,#000000,15000)" xpath="//flow/block[2]/lineArea/viewport/@border-start"/>
-    <eval expected="(solid,#000000,10000)" xpath="//flow/block[2]/lineArea/viewport/@border-end"/>
-    <eval expected="15000" xpath="//flow/block[2]/lineArea/viewport/@padding-before"/>
-    <eval expected="10000" xpath="//flow/block[2]/lineArea/viewport/@padding-after"/>
-    <eval expected="5000" xpath="//flow/block[2]/lineArea/viewport/@padding-start"/>
-    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@padding-end"/>
-    <eval expected="20000 20000 20000 20000" xpath="//flow/block[2]/lineArea/viewport/foreignObject/@pos"/>
-  </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 the borders and the like for instream-foreign-object.
+    </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="orange">
+            Before <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
+                <fo:block>inside the container</fo:block>
+            </fo:inline-container> after
+          </fo:block>
+          <fo:block background-color="yellow" font-size="100pt">
+            BC <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
+                <fo:block font-size="12pt">inside the container</fo:block>
+            </fo:inline-container> AC
+          </fo:block>
+          <fo:block font-size="9pt">
+           In both blocks we have a setting of border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" on the i-f-o.
+           In the first block the i-f-o determines the height of the line in the 2nd block the font is bigger than the i-f-o.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- first e-g -->
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
+    <eval expected="70000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
+    <eval expected="1650" xpath="//flow/block[1]/lineArea/viewport/@offset"/>
+    <eval expected="20000 30000 20000 30000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
+    <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
+    <eval expected="(solid,#000000,20000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
+    <eval expected="(solid,#000000,15000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
+    <eval expected="(solid,#000000,10000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
+    <eval expected="15000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
+    <eval expected="10000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
+    <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
+    <eval expected="20000 20000 20000 20000" xpath="//flow/block[1]/lineArea/viewport/foreignObject/@pos"/>
+    <!-- second e-g -->
+    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="70000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="15550" xpath="//flow/block[2]/lineArea/viewport/@offset"/>
+    <eval expected="20000 30000 20000 30000" xpath="//flow/block[2]/lineArea/viewport/@bap"/>
+    <eval expected="color=#ffffff" xpath="//flow/block[2]/lineArea/viewport/@background"/>
+    <eval expected="(solid,#000000,5000)" xpath="//flow/block[2]/lineArea/viewport/@border-before"/>
+    <eval expected="(solid,#000000,20000)" xpath="//flow/block[2]/lineArea/viewport/@border-after"/>
+    <eval expected="(solid,#000000,15000)" xpath="//flow/block[2]/lineArea/viewport/@border-start"/>
+    <eval expected="(solid,#000000,10000)" xpath="//flow/block[2]/lineArea/viewport/@border-end"/>
+    <eval expected="15000" xpath="//flow/block[2]/lineArea/viewport/@padding-before"/>
+    <eval expected="10000" xpath="//flow/block[2]/lineArea/viewport/@padding-after"/>
+    <eval expected="5000" xpath="//flow/block[2]/lineArea/viewport/@padding-start"/>
+    <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@padding-end"/>
+    <eval expected="20000 20000 20000 20000" xpath="//flow/block[2]/lineArea/viewport/foreignObject/@pos"/>
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-level_id.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-level_id.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-level_id.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline-level_id.xml Fri Jul 28 08:44:37 2006
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed 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
+  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
 

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml Fri Jul 28 08:44:37 2006
@@ -1,91 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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 inline level alignment-adjust.
-    </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" font-size="14pt">
-            Before <fo:inline font-size="10pt" background-color="yellow">alignment-adjust not specified</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="auto" background-color="yellow">alignment-adjust="auto"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="baseline" background-color="yellow">alignment-adjust="baseline"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="before-edge" background-color="yellow">alignment-adjust="before-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="text-before-edge" background-color="yellow">alignment-adjust="text-before-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="central" background-color="yellow">alignment-adjust="central"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="middle" background-color="yellow">alignment-adjust="middle"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="after-edge" background-color="yellow">alignment-adjust="after-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="text-after-edge" background-color="yellow">alignment-adjust="text-after-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="ideographic" background-color="yellow">alignment-adjust="ideographic"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="alphabetic" background-color="yellow">alignment-adjust="alphabetic"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="hanging" background-color="yellow">alignment-adjust="hanging"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="mathematical" background-color="yellow">alignment-adjust="mathematical"</fo:inline> After
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="10052" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="10052" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="5427" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="5487" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="802" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="802" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="802" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="8616" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="6462" xpath="//flow/block[13]/lineArea[1]/inlineparent/@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 inline level alignment-adjust.
+    </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" font-size="14pt">
+            Before <fo:inline font-size="10pt" background-color="yellow">alignment-adjust not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="auto" background-color="yellow">alignment-adjust="auto"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="baseline" background-color="yellow">alignment-adjust="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="before-edge" background-color="yellow">alignment-adjust="before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="text-before-edge" background-color="yellow">alignment-adjust="text-before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="central" background-color="yellow">alignment-adjust="central"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="middle" background-color="yellow">alignment-adjust="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="after-edge" background-color="yellow">alignment-adjust="after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="text-after-edge" background-color="yellow">alignment-adjust="text-after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="ideographic" background-color="yellow">alignment-adjust="ideographic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="alphabetic" background-color="yellow">alignment-adjust="alphabetic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="hanging" background-color="yellow">alignment-adjust="hanging"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="mathematical" background-color="yellow">alignment-adjust="mathematical"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="10052" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="10052" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="5427" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="5487" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="802" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="802" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="802" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="8616" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="6462" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml Fri Jul 28 08:44:37 2006
@@ -1,98 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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 inline level alignment-adjust.
-    </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" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="0pt" background-color="yellow">alignment-adjust="0pt"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="0%" background-color="yellow">alignment-adjust="0%"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="3pt" background-color="yellow">alignment-adjust="3pt"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="-3pt" background-color="yellow">alignment-adjust="-3pt"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="30%" background-color="yellow">alignment-adjust="30%"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-adjust="-30%" background-color="yellow">alignment-adjust="-30%"</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="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
-    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
-    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@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="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
-    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
-    
-    <eval expected="13078" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
-    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
-    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
-    
-    <eval expected="15122" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
-    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="5872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
-    
-    <eval expected="13678" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
-    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
-    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
-    
-    <eval expected="15722" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
-    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
-    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="6472" xpath="//flow/block[6]/lineArea[1]/inlineparent/@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 inline level alignment-adjust.
+    </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" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="0pt" background-color="yellow">alignment-adjust="0pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="0%" background-color="yellow">alignment-adjust="0%"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="3pt" background-color="yellow">alignment-adjust="3pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="-3pt" background-color="yellow">alignment-adjust="-3pt"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="30%" background-color="yellow">alignment-adjust="30%"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-adjust="-30%" background-color="yellow">alignment-adjust="-30%"</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="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@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="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="13078" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="15122" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="5872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="13678" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+    
+    <eval expected="15722" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+    <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="6472" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml Fri Jul 28 08:44:37 2006
@@ -1,91 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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 inline level alignment-baseline.
-    </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" font-size="14pt">
-            Before <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
-            Before <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
-    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/inlineparent/@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 inline level alignment-baseline.
+    </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" font-size="14pt">
+            Before <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+            Before <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+  </checks>
+</testcase>

Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml?rev=426576&r1=426575&r2=426576&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml Fri Jul 28 08:44:37 2006
@@ -1,116 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed 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 inline level alignment-baseline.
-    </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" font-size="10pt">
-            Before <fo:inline font-size="14pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
-          </fo:block>
-          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
-            Before <fo:inline font-size="14pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
-          </fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>
-
-    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
-    <eval expected="1436" xpath="//flow/block[13]/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 inline level alignment-baseline.
+    </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" font-size="10pt">
+            Before <fo:inline font-size="14pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+          </fo:block>
+          <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+            Before <fo:inline font-size="14pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>
+
+    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
+    <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>
+  </checks>
+</testcase>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message