Bugzilla 41652:

Preserved linefeeds now generate an empty line.

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

diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
index f4a83e0fec71ddb42bfb6d04c2df2b8acf54a764..bad741ad41f3d9dcc319e3b9991c5395fdea3dca 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
@@ -702,8 +702,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
                 // the sequence contains inline Knuth elements
                 if (sequence.isInlineSequence()) {
                     // look at the last element 
-                    ListElement lastElement;
-                    lastElement = sequence.getLast();
+                    ListElement lastElement = sequence.getLast();
                     if (lastElement == null) {
                         throw new NullPointerException(
                         "Sequence was empty! lastElement is null");
@@ -743,8 +742,8 @@ public class LineLayoutManager extends InlineStackingLayoutManager
                         lastPar.removeLast();
                         if (!lastPar.containsBox()) {
                             //only a forced linefeed on this line 
-                            //-> compensate with a zero width box
-                            lastPar.add(new KnuthInlineBox(0, null, null, false));
+                            //-> compensate with an auxiliary glue
+                            lastPar.add(new KnuthGlue(iLineWidth, 0, iLineWidth, null, true));
                         }
                         lastPar.endParagraph();
                         ElementListObserver.observe(lastPar, "line", null);

diff --git a/status.xml b/status.xml
index f7e330aec36e4c3b346f0a50c6a107789d1be963..fdeb3c62fdf7a0e1c60bd89daa182b9894c7d769 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,11 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="AD" type="fix" fixes-bug="41652">
+        If a line contained nothing but a linefeed, this didn't produce empty lines.
+        Replaced the auxiliary zero-width box with a glue the width of a line,
+        and shrinkable to zero-width.
+      </action>
       <action context="Code" dev="VH" type="fix" fixes-bug="40120" due-to="Adrian Cumiskey">
         Stricter FOP user configuration checking
       </action>

diff --git a/test/layoutengine/standard-testcases/linefeed-treatment_preserve.xml b/test/layoutengine/standard-testcases/linefeed-treatment_preserve.xml
new file mode 100644 (file)
index 0000000..2306a37
--- /dev/null
+++ b/test/layoutengine/standard-testcases/linefeed-treatment_preserve.xml
@@ -0,0 +1,65 @@
+<?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 linefeed-preservation.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master page-width="21cm" page-height="29.7cm" master-name="spm0">
+          <fo:region-body region-name="region-body" margin-bottom="1cm" margin-top="1.5cm"/>
+          <fo:region-before region-name="header" precedence="false" extent="4cm"/>
+          <fo:region-after region-name="footer" extent="1cm"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="spm0">
+        <fo:flow flow-name="region-body">
+          <fo:block hyphenate="false" font="8pt monospace" 
+                text-align="start" wrap-option="no-wrap" 
+                white-space="pre" line-stacking-strategy="font-height"
+                background-color="yellow">First line yellow background
+<fo:inline background-color="red">Second line red background
+Third line red background</fo:inline>
+<fo:inline background-color="pink"> 
+Fifth line pink background; the above line has one preserved space character.</fo:inline>
+Sixth line yellow background</fo:block>
+          <fo:block linefeed-treatment="preserve" background-color="blue"
+                    text-align="start" font="8pt Courier" color="yellow">1
+            2<fo:inline background-color="orange">
+            3
+            4
+            5
+            6 One line, surrounded by some linefeeds; orange line in blue block
+            7
+            8
+            9
+           10</fo:inline>
+          </fo:block>
+               </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="6" xpath="count(//block[1]/lineArea)" />
+    <eval expected="10" xpath="count(//block[2]/lineArea)" />
+  </checks>
+</testcase>