Merged revisions 662417,662807,662991,663045,663493,664347,664349-664350 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r662417 | jeremias | 2008-06-02 13:50:55 +0100 (Mon, 02 Jun 2008) | 1 line
  
  Integer keeps inside multi-line blocks and in between block-paragraphs.
........
  r662807 | jeremias | 2008-06-03 15:13:27 +0100 (Tue, 03 Jun 2008) | 3 lines
  
  Bugzilla #45115:
  Added a PCL-specific extension attribute on simple-page-master for controlling the simplex/duplex mode.
  Submitted by: Martin Edge <Martin.Edge.at.asmorphic.net.au>
........
  r662991 | jeremias | 2008-06-04 07:10:37 +0100 (Wed, 04 Jun 2008) | 1 line
  
  ApacheCon EU 2008 is long over.
........
  r663045 | adelmelle | 2008-06-04 10:53:15 +0100 (Wed, 04 Jun 2008) | 1 line
  
  Minor cleanup: remove spurious white-space
........
  r663493 | jeremias | 2008-06-05 08:41:06 +0100 (Thu, 05 Jun 2008) | 1 line
  
  Restored lost overflow warning in static-content.
........
  r664347 | adelmelle | 2008-06-07 15:49:42 +0100 (Sat, 07 Jun 2008) | 5 lines
  
  Extended behavior of preserved linefeeds to codepoints representing mandatory breaks in Unicode UAX#14:
  - NEXT LINE (U+0085)
  - LINE SEPARATOR (U+2028)
  - PARAGRAPH SEPARATOR (U+2029)
........
  r664349 | adelmelle | 2008-06-07 15:54:13 +0100 (Sat, 07 Jun 2008) | 1 line
  
  Minor cleanup: remove unneeded constant
........
  r664350 | adelmelle | 2008-06-07 16:09:42 +0100 (Sat, 07 Jun 2008) | 1 line
  
  Improve code-readability; add some clarifying comments
........


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

2 files changed, 81 insertions, 0 deletions

diff --git a/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml b/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml
index f6027bf01..8ad263fcb 100644
--- a/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml
+++ b/test/layoutengine/standard-testcases/block_keep-together_integers_1.xml
@@ -54,6 +54,11 @@
             </fo:block>
             <fo:block>block10</fo:block>
           </fo:block>
+          <fo:block keep-together.within-column="5" linefeed-treatment="preserve">The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog.
+          </fo:block>
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
@@ -76,7 +81,9 @@
       <box/>
       <penalty w="0" p="0"/>
       <box/> <!-- block 3 -->
+      <penalty w="0" p="999"/>
       <box/>
+      <penalty w="0" p="999"/>
       <box/>
       <penalty w="0" p="0"/>
       <box/> <!-- block4 -->
@@ -91,7 +98,17 @@
       <penalty w="0" p="INF"/>
       <box/> <!-- block9 -->
       <penalty w="0" p="999"/>
+      <box/> <!-- block10 -->
+      <penalty w="0" p="0"/>
+
+      <box/>
+      <penalty w="0" p="999"/>
+      <box/>
+      <penalty w="0" p="999"/>
       <box/>
+      <penalty w="0" p="999"/>
+      <box/>
+      
       
       <skip>3</skip>
     </element-list>
diff --git a/test/layoutengine/standard-testcases/block_uax14_explicit-breaks.xml b/test/layoutengine/standard-testcases/block_uax14_explicit-breaks.xml
new file mode 100644
index 000000000..7636e9ae4
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block_uax14_explicit-breaks.xml
@@ -0,0 +1,64 @@
+<?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 for the handling of explicit breaking characters:
+      - preserved linefeeds (U+000A)
+      - Unicode next-line (U+0085), line-separator (U+2028) 
+        or paragraph-separator (U+2029)
+      Other possibilities defined in UAX#14, but not applicable for XSL-FO:
+      - carriage return (U+000D) is normalized to a space
+      - line-tabulation (U+000B) and form-feed (U+000C) are illegal XML characters
+    </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" font-size="8pt">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block linefeed-treatment="preserve">This is a piece of text with preserved linefeed&#x0A;character.</fo:block>
+          <fo:block>
+          This is a piece of text with a next-line&#x85;character.
+          </fo:block>
+          <fo:block>
+          This is a piece of text with a line-separator&#x2028;character.
+          </fo:block>
+          <fo:block>
+          This is a piece of text with a paragraph-separator&#x2029;character.
+          </fo:block>
+          <fo:block>
+          There should be 2 empty lines between this one&#x2028;&#x2028;&#x2028;and this one.
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[2]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[3]/lineArea)"/>
+    <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>
+    <eval expected="4" xpath="count(//flow/block[5]/lineArea)"/>
+  </checks>
+</testcase>