Confirming that last-line-end-indent works as specified in XSL 1.0.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@388536 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index c58e70e48b1b36ea9caf356a72d9be1a7428e858..3f7b7b037ff49a9af078684c1af352c318e0d66b 100644 (file)
--- a/src/documentation/content/xdocs/compliance.ihtml
+++ b/src/documentation/content/xdocs/compliance.ihtml
@@ -3920,8 +3920,8 @@
       <td class="no">
         no
       </td>
-      <td class="no">
-        no
+      <td class="yes">
+        yes
       </td>
       <td align="center">
         &nbsp;
@@ -4513,7 +4513,7 @@
             [0.20.5] works only in table rows
           </li>
           <li>
-            [0.91 beta] works on all implemented FOs.
+            [0.91 beta] works on all implemented block-level FOs, but not on inline-level FOs.
           </li>
           <li>
             [0.91 beta] &lt;integer&gt; values are not supported.
@@ -4543,7 +4543,7 @@
             [0.20.5] works only in table rows
           </li>
           <li>
-            [0.91 beta] works on all implemented FOs.
+            [0.91 beta] works on all implemented block-level FOs, but not on inline-level FOs.
           </li>
           <li>
             [0.91 beta] &lt;integer&gt; values are not supported.
@@ -4573,7 +4573,7 @@
             [0.20.5] works only in table rows
           </li>
           <li>
-            [0.91 beta] works on all implemented FOs, except list- and table-related FOs.
+            [0.91 beta] works on all implemented FOs, except list- and table-related and inline-level FOs.
           </li>
           <li>
             [0.91 beta] &lt;integer&gt; values are not supported.

diff --git a/status.xml b/status.xml
index 964f7d56e546e5b2dcb67c26e37e05bc108e5237..fac11f333338c79b79d813670fa90428cb161dc0 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -27,6 +27,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix">
+        Bugfix for invalid handling of ICC color profiles in JPEG images and for
+        dealing with CMYK JPEG images with the Adobe APPE marker.
+      </action>
       <action context="Code" dev="JM" type="add">
         Initial support for page-position="last" added.
       </action>

diff --git a/test/layoutengine/standard-testcases/block_last-line-end-indent.xml b/test/layoutengine/standard-testcases/block_last-line-end-indent.xml
new file mode 100644 (file)
index 0000000..9ea768b
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block_last-line-end-indent.xml
@@ -0,0 +1,94 @@
+<?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
+
+       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 last-line-end-indent property.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block last-line-end-indent="20pt" text-align="end" id="end">
+In olden times when wishing still helped one, there lived a king whose daughters 
+were all beautiful; and the youngest was so beautiful that the sun itself, which 
+has seen so much, was astonished whenever it shone in her face.
+          </fo:block>
+          <fo:block last-line-end-indent="20pt" text-align="justify" text-align-last="justify" id="justify">
+In olden times when wishing still helped one, there lived a king whose daughters 
+were all beautiful; and the youngest was so beautiful that the sun itself, which 
+has seen so much, was astonished whenever it shone in her face.
+          </fo:block>
+          <fo:block last-line-end-indent="50%" text-align="justify" text-align-last="justify" id="justify50">
+In olden times when wishing still helped one, there lived a king whose daughters 
+were all beautiful; and the youngest was so beautiful that the sun itself, which 
+has seen so much, was astonished whenever it shone in her face.
+          </fo:block>
+          <fo:block last-line-end-indent="50%" text-align="center" id="center">
+In olden times when wishing still helped one, there lived a king whose daughters 
+were all beautiful; and the youngest was so beautiful that the sun itself, which 
+has seen so much, was astonished whenever it shone in her face.
+          </fo:block>
+          <fo:block last-line-end-indent="20pt" text-align="justify" text-align-last="justify" id="nested">
+This is just for testing purpose and this line will be indented.
+
+            <fo:block>This is the nested block.</fo:block>
+
+The text following the nested block should be indented as well. The text following 
+the nested block should be indented as well. 
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="360000" xpath="//block[@prod-id='end']/lineArea[1]/@start-indent + //block[@prod-id='end']/lineArea[1]/text/@ipd"/>
+    <eval expected="360000" xpath="//block[@prod-id='end']/lineArea[2]/@start-indent + //block[@prod-id='end']/lineArea[2]/text/@ipd"/>
+    <eval expected="360000" xpath="//block[@prod-id='end']/lineArea[3]/@start-indent + //block[@prod-id='end']/lineArea[3]/text/@ipd"/>
+    <eval expected="340000" xpath="//block[@prod-id='end']/lineArea[4]/@start-indent + //block[@prod-id='end']/lineArea[4]/text/@ipd"/>
+    <!-- 360000 - 20000 = 340000 -->
+  
+    <eval expected="360000" xpath="//block[@prod-id='justify']/lineArea[1]/text/@ipd"/>
+    <eval expected="360000" xpath="//block[@prod-id='justify']/lineArea[2]/text/@ipd"/>
+    <eval expected="360000" xpath="//block[@prod-id='justify']/lineArea[3]/text/@ipd"/>
+    <eval expected="340000" xpath="//block[@prod-id='justify']/lineArea[4]/text/@ipd"/>
+
+    <eval expected="360000" xpath="//block[@prod-id='justify50']/lineArea[1]/text/@ipd"/>
+    <eval expected="360000" xpath="//block[@prod-id='justify50']/lineArea[2]/text/@ipd"/>
+    <eval expected="360000" xpath="//block[@prod-id='justify50']/lineArea[3]/text/@ipd"/>
+    <eval expected="180000" xpath="//block[@prod-id='justify50']/lineArea[4]/text/@ipd"/>
+
+    <eval expected="360000" xpath="(2 * //block[@prod-id='center']/lineArea[1]/@start-indent) + //block[@prod-id='center']/lineArea[1]/text/@ipd"/>
+    <eval expected="360000" xpath="(2 * //block[@prod-id='center']/lineArea[2]/@start-indent) + //block[@prod-id='center']/lineArea[2]/text/@ipd"/>
+    <eval expected="360000" xpath="(2 * //block[@prod-id='center']/lineArea[3]/@start-indent) + //block[@prod-id='center']/lineArea[3]/text/@ipd"/>
+    <eval expected="360000" xpath="(2 * //block[@prod-id='center']/lineArea[4]/@start-indent) + //block[@prod-id='center']/lineArea[4]/text/@ipd"/>
+    <eval expected="180000" xpath="(2 * //block[@prod-id='center']/lineArea[5]/@start-indent) + //block[@prod-id='center']/lineArea[5]/text/@ipd"/>
+
+    <!-- 7.15.3, XSL 1.0: this block is end-indented because its following sibling is a block and not a line. This is in contrast to the specified behaviour of text-indent. -->
+    <eval expected="340000" xpath="//block[@prod-id='nested']/lineArea[1]/text/@ipd"/>
+    <eval expected="340000" xpath="//block[@prod-id='nested']/block[1]/lineArea[1]/text/@ipd"/>
+    <eval expected="360000" xpath="//block[@prod-id='nested']/lineArea[2]/text/@ipd"/>
+    <eval expected="340000" xpath="//block[@prod-id='nested']/lineArea[3]/text/@ipd"/>
+  </checks>
+</testcase>