FOP-2855: apply patch from Juan for fixing letter spacing of spaces inside white-space=pre text

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

2 files changed, 54 insertions, 2 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index 7d2c79fd6..8d9e9722c 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -844,8 +844,15 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
                 font.mapChar(ch);
                 // preserved space or non-breaking space:
                 // create the GlyphMapping object
-                mapping = new GlyphMapping(nextStart, nextStart + 1, 1, 0, wordSpaceIPD, false, true,
-                                        breakOpportunity, spaceFont, level, null);
+                MinOptMax areaIPD;
+                if (prevMapping != null && prevMapping.isSpace) {
+                    areaIPD = wordSpaceIPD.minus(letterSpaceIPD);
+                } else {
+                    areaIPD = wordSpaceIPD;
+                }
+
+                mapping = new GlyphMapping(nextStart, nextStart + 1, 1, 0, areaIPD, false, true,
+                        breakOpportunity, spaceFont, level, null);
                 thisStart = nextStart + 1;
             } else if (CharUtilities.isFixedWidthSpace(ch) || CharUtilities.isZeroWidthSpace(ch)) {
                 // create the GlyphMapping object
diff --git a/fop/test/layoutengine/standard-testcases/block_letter-spacing_white-space_pre.xml b/fop/test/layoutengine/standard-testcases/block_letter-spacing_white-space_pre.xml
new file mode 100644
index 000000000..c9f420f8d
--- /dev/null
+++ b/fop/test/layoutengine/standard-testcases/block_letter-spacing_white-space_pre.xml
@@ -0,0 +1,45 @@
+<?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.

+-->

+<testcase>

+  <info>

+    <p>

+      This test checks block level letter-spacing when having white-spaces.

+    </p>

+  </info>

+  <fo>

+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">

+      <fo:layout-master-set>

+        <fo:simple-page-master master-name="A4" page-height="297mm" page-width="210mm" margin="20mm">

+          <fo:region-body/>

+        </fo:simple-page-master>

+      </fo:layout-master-set>

+      <fo:page-sequence master-reference="A4">

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

+          <fo:block letter-spacing="0.5pt" white-space="pre">A A A A A A A A x<fo:inline font-size="70%" vertical-align="top">2</fo:inline></fo:block>

+          <fo:block letter-spacing="0.5pt" white-space="pre">A A A A         x<fo:inline font-size="70%" vertical-align="top">2</fo:inline></fo:block>

+          <fo:block letter-spacing="0.5pt" white-space="pre">                x<fo:inline font-size="70%" vertical-align="top">2</fo:inline></fo:block>

+        </fo:flow>

+      </fo:page-sequence>

+    </fo:root>

+  </fo>

+  <checks>

+    <eval expected="105220" xpath="//flow/block[1]/lineArea/text/@ipd"/>

+    <eval expected="86548" xpath="//flow/block[2]/lineArea/text/@ipd"/>

+    <eval expected="68376" xpath="//flow/block[3]/lineArea/text/@ipd"/>

+  </checks>

+</testcase>