convert " " into a Space inline

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

diff --git a/src/org/apache/fop/layoutmgr/TextLayoutManager.java b/src/org/apache/fop/layoutmgr/TextLayoutManager.java
index f3fdc9ae2ac151145115525ef5eddf91098837ee..bda6fdba93e25762cdb57efc037d1c527f07d23b 100644 (file)
--- a/src/org/apache/fop/layoutmgr/TextLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/TextLayoutManager.java
@@ -164,8 +164,8 @@ public class TextLayoutManager extends AbstractLayoutManager {
         if (prevPos != null) {
             // ASSERT (prevPos.getLM() == this)
             if (prevPos.getLM() != this) {
-                //log.error(
-                //  "TextLayoutManager.resetPosition: " + "LM mismatch!!!");
+                getLogger().error(
+                  "TextLayoutManager.resetPosition: " + "LM mismatch!!!");
             }
             LeafPosition tbp = (LeafPosition) prevPos;
             AreaInfo ai =
@@ -477,23 +477,27 @@ public class TextLayoutManager extends AbstractLayoutManager {
         //    " total=" + iAdjust);
 
         // Make an area containing all characters between start and end.
-        Word word = null;
+        InlineArea word = null;
         int adjust = 0;
         // ingnore newline character
         if(chars[ai.iBreakIndex - 1] == NEWLINE) {
             adjust = 1;
         }
         String str = new String(chars, iStart, ai.iBreakIndex - iStart - adjust);
-        //if(!"".equals(str.trim())) {
-            word = createWord(
+        if(" ".equals(str)) {
+            word = new Space();
+            word.setWidth(ai.ipdArea.opt + iAdjust);
+        } else  {
+            Word w = createWord(
                       str,
                       ai.ipdArea.opt + iAdjust, context.getBaseline());
             if (iWScount > 0) {
-                //log.error("Adjustment per word-space= " +
+                //getLogger().error("Adjustment per word-space= " +
                 //                   iAdjust / iWScount);
-                word.setWSadjust(iAdjust / iWScount);
+                w.setWSadjust(iAdjust / iWScount);
             }
-        //}
+            word = w;
+        }
         if ((chars[iStart] == SPACE || chars[iStart] == NBSPACE) &&
                 context.getLeadingSpace().hasSpaces()) {
             context.getLeadingSpace().addSpace(halfWS);