Do not re-create an AlignmentContext instance if one already exists.

Fixes a bug when the changing IPD hack is triggered and the getNextKnuthElements method is called a second time


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

2 files changed, 67 insertions, 5 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
index cbae691b1..964a4e2a5 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
@@ -559,11 +559,13 @@ public class LineLayoutManager extends InlineStackingLayoutManager
 
     /** {@inheritDoc} */
     public List getNextKnuthElements(LayoutContext context, int alignment) {
-        FontInfo fi = fobj.getFOEventHandler().getFontInfo();
-        FontTriplet[] fontkeys = fobj.getCommonFont().getFontState(fi);
-        Font fs = fi.getFontInstance(fontkeys[0], fobj.getCommonFont().fontSize.getValue(this));
-        alignmentContext = new AlignmentContext(fs, lineHeight.getValue(this),
-                context.getWritingMode());
+        if (alignmentContext == null) {
+            FontInfo fi = fobj.getFOEventHandler().getFontInfo();
+            FontTriplet[] fontkeys = fobj.getCommonFont().getFontState(fi);
+            Font fs = fi.getFontInstance(fontkeys[0], fobj.getCommonFont().fontSize.getValue(this));
+            alignmentContext = new AlignmentContext(fs, lineHeight.getValue(this),
+                    context.getWritingMode());
+        }
         context.setAlignmentContext(alignmentContext);
         ipd = context.getRefIPD();
 
diff --git a/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml b/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml
new file mode 100644
index 000000000..37014f49a
--- /dev/null
+++ b/test/layoutengine/standard-testcases/flow_changing-ipd_image.xml
@@ -0,0 +1,60 @@
+<?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 that an image is properly positioned after a page break triggering changing 
+      IPD.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="narrow"
+          page-height="220pt" page-width="320pt" margin="10pt">
+          <fo:region-body background-color="#F0F0F0"/>
+        </fo:simple-page-master>
+        <fo:simple-page-master master-name="wide"
+          page-height="220pt" page-width="420pt" margin="10pt">
+          <fo:region-body background-color="#F0F0F0"/>
+        </fo:simple-page-master>
+        <fo:page-sequence-master master-name="pages">
+          <fo:repeatable-page-master-alternatives>
+            <fo:conditional-page-master-reference odd-or-even="odd"  master-reference="narrow"/>
+            <fo:conditional-page-master-reference odd-or-even="even" master-reference="wide"/>
+          </fo:repeatable-page-master-alternatives>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="pages" font-size="8pt" line-height="10pt">
+        <fo:flow flow-name="xsl-region-body" text-align="justify">
+          <fo:block space-after="180pt">First block</fo:block>
+          <fo:block id="before">Block before the page break.</fo:block>
+          <fo:block id="after">Block after the page break.</fo:block>
+          <fo:block id="image-block"><fo:external-graphic id="image" 
+              src="../../resources/images/fop-logo-color-24bit.png"/></fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="Block before the page break." xpath="//pageViewport[1]//flow/block[2]//text"/>
+    <eval expected="Block after the page break."  xpath="//pageViewport[2]//flow/block[1]//text"/>
+    <eval expected="0"                            xpath="//pageViewport[2]//flow/block[2]//viewport/@offset"/>
+  </checks>
+</testcase>