Added support for keep-togther.within-line="always"

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

3 files changed, 13 insertions, 22 deletions

diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index d81c0dc27..a7cf1a707 100644
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -123,11 +123,6 @@
     <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=37579</reference>
   </testcase>
   <testcase>
-    <name>keeps on inlines NYI</name>
-    <file>inline_keep-together.xml</file>
-    <description>Keeps are not implemented in inline-level elements, yet.</description>
-  </testcase>
-  <testcase>
     <name>NPE for table inside an inline</name>
     <file>inline_block_nested_3.xml</file>
     <description>Placing a table as a child of an fo:inline produces a 
diff --git a/test/layoutengine/standard-testcases/inline_keep-together.xml b/test/layoutengine/standard-testcases/inline_keep-together.xml
index 1bd82c0b8..af9317815 100644
--- a/test/layoutengine/standard-testcases/inline_keep-together.xml
+++ b/test/layoutengine/standard-testcases/inline_keep-together.xml
@@ -33,12 +33,11 @@
         </fo:simple-page-master>

       </fo:layout-master-set>

       <fo:page-sequence master-reference="simple">

-        <fo:flow flow-name="xsl-region-body" hyphenate="true">

+        <fo:flow flow-name="xsl-region-body">

           <fo:block-container width="100pt" background-color="yellow">

-            <fo:block>This is <fo:inline keep-together.within-line="always">BLah-blah-blah-blah!</fo:inline></fo:block>

-            <fo:block>This is <fo:inline keep-together.within-line="always">Blah-blah-blah-blah!</fo:inline></fo:block>

-            <fo:block>This is <fo:inline>Blah blah blah blah!</fo:inline></fo:block>

+            <fo:block keep-together.within-line="always">This is Blah blah blah blah!</fo:block>

             <fo:block>This is <fo:inline keep-together.within-line="always">Blah blah blah blah!</fo:inline></fo:block>

+            <fo:block>This is <fo:wrapper keep-together.within-line="always">Blah blah blah blah!</fo:wrapper></fo:block>

           </fo:block-container>

         </fo:flow>

       </fo:page-sequence>

@@ -46,18 +45,15 @@
   </fo>

   <checks>

     <!-- The layout engine should warn the user about the overflow in this case. -->

-    <eval expected="This is " xpath="//flow/block[1]/block[1]/block[1]/lineArea[1]"/>

-    <eval expected="BLah-blah-blah-blah!" xpath="//flow/block[1]/block[1]/block[1]/lineArea[2]"/>

+    <eval expected="This is Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[1]/lineArea[1]"/>

 

     <!-- The layout engine should warn the user about the overflow in this case. -->

-    <eval expected="This is " xpath="//flow/block[1]/block[1]/block[2]/lineArea[1]"/>

-    <eval expected="Blah-blah-blah-blah!" xpath="//flow/block[1]/block[1]/block[2]/lineArea[2]"/>

-

-    <eval expected="This is Blah blah " xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>

-    <eval expected="blah blah!" xpath="//flow/block[1]/block[1]/block[3]/lineArea[2]"/>

+    <eval expected="This is" xpath="//flow/block[1]/block[1]/block[2]/lineArea[1]"/>

+    <eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[2]/lineArea[2]"/>

 

     <!-- The layout engine should warn the user about the overflow in this case. -->

-    <eval expected="This is " xpath="//flow/block[1]/block[1]/block[4]/lineArea[1]"/>

-    <eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[4]/lineArea[2]"/>

+    <eval expected="This is" xpath="//flow/block[1]/block[1]/block[3]/lineArea[1]"/>

+    <eval expected="Blah blah blah blah!" xpath="//flow/block[1]/block[1]/block[3]/lineArea[2]"/>

+

   </checks>

 </testcase>

diff --git a/test/layoutengine/standard-testcases/page-breaking_5.xml b/test/layoutengine/standard-testcases/page-breaking_5.xml
index ffd337c92..f0067d004 100644
--- a/test/layoutengine/standard-testcases/page-breaking_5.xml
+++ b/test/layoutengine/standard-testcases/page-breaking_5.xml
@@ -41,10 +41,10 @@
       </fo:layout-master-set>
       <fo:page-sequence master-reference="master">
         <fo:flow flow-name="xsl-region-body">
-          <fo:block background-color="orange" keep-together="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
-          <fo:block background-color="orange" keep-together="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
-          <fo:block background-color="orange" keep-together="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
-          <fo:block background-color="orange" keep-together="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
+          <fo:block background-color="orange" keep-together.within-page="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
+          <fo:block background-color="orange" keep-together.within-page="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
+          <fo:block background-color="orange" keep-together.within-page="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
+          <fo:block background-color="orange" keep-together.within-page="always">Apache FOP is a great tool to create PDF documents with.</fo:block>
           <fo:block background-color="yellow">last line in new block</fo:block>
         </fo:flow>
       </fo:page-sequence>