From 092af3cf902f54c565b2e1780992c2ef09683d88 Mon Sep 17 00:00:00 2001
From: "Andreas L. Delmelle" <adelmelle@apache.org>
Date: Sun, 9 Jan 2011 14:40:31 +0000
Subject: [PATCH] Bugzilla 49848: Correct behavior of keep-together.within-line
 in case of nested inlines

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1056945 13f79535-47bb-0310-9956-ffa450edef68
---
 .../layoutmgr/inline/TextLayoutManager.java   |  2 +-
 status.xml                                    |  3 +++
 .../inline_keep-together.xml                  | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index 3f5ed329a..81240dec0 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -705,7 +705,7 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
         if (inWord) {
             processWord(alignment, sequence, prevAreaInfo, ch, false, false);
         } else if (inWhitespace) {
-            processWhitespace(alignment, sequence, true);
+            processWhitespace(alignment, sequence, !keepTogether);
         } else if (areaInfo != null) {
             processLeftoverAreaInfo(alignment, sequence, areaInfo,
                     ch == CharUtilities.ZERO_WIDTH_SPACE);
diff --git a/status.xml b/status.xml
index 7af44400e..16054217d 100644
--- a/status.xml
+++ b/status.xml
@@ -58,6 +58,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Layout" dev="AD" type="fix" fixes-bug="49848">
+        Bugfix: correct behavior of keep-together.within-line in case there are nested inlines
+      </action>
       <action context="Code" dev="AD" type="fix" fixes-bug="50471">
         Bugfix: avoid ArrayIndexOutOfBoundsException for codepoints without a linebreak class
       </action>
diff --git a/test/layoutengine/standard-testcases/inline_keep-together.xml b/test/layoutengine/standard-testcases/inline_keep-together.xml
index 6ec4ce603..0c6ae682a 100644
--- a/test/layoutengine/standard-testcases/inline_keep-together.xml
+++ b/test/layoutengine/standard-testcases/inline_keep-together.xml
@@ -38,6 +38,22 @@
             <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>
+              <fo:inline keep-together.within-line="always">
+                This<fo:inline> entire</fo:inline> sentence
+                <fo:inline>should be </fo:inline>kept 
+                <fo:inline>together
+                  <fo:inline>on
+                    <fo:inline>one
+                      <fo:inline>very,
+                        <fo:inline>very,</fo:inline>
+                        <fo:inline>very,</fo:inline>
+                        <fo:inline>very,</fo:inline>
+                        <fo:inline>long</fo:inline>
+                      </fo:inline></fo:inline></fo:inline>line
+                </fo:inline>
+              </fo:inline>
+            </fo:block>
           </fo:block-container>
         </fo:flow>
       </fo:page-sequence>
@@ -54,6 +70,9 @@
     <!-- The layout engine should warn the user about the overflow in this case. -->
     <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]"/>
+    
+    <!-- check effect of nested inlines (see Bugzilla #49848) -->
+    <eval expected="1" xpath="count(//flow/block[1]/block[1]/block[4]/lineArea)" />
 
   </checks>
 </testcase>
-- 
2.39.5