This fixes a bug that has crept in page number resolution, viz. the text was not...

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

diff --git a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
index f8585e95a6e71875be9ef5404428f023abbb1299..2f83afddae5fede1fc6ab351118fcda2e2cd38c0 100644 (file)
--- a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
+++ b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
@@ -103,7 +103,8 @@ public class UnresolvedPageNumber extends TextArea implements Resolvable {
             }
             // replace the text
             removeText();
-            addWord(page.getPageNumberString(), 0);
+            text = page.getPageNumberString();
+            addWord(text, 0);
             // update ipd
             if (font != null) {
                 updateIPD(font.getWordWidth(text));

diff --git a/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml b/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml
new file mode 100644 (file)
index 0000000..12e610e
--- /dev/null
+++ b/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml
@@ -0,0 +1,52 @@
+<?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 whether the IPD of a forward
+      fo:page-number-citation is correctly adjusted after resolution.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="master1" page-width="5in" page-height="1in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="master1" white-space-collapse="true" initial-page-number="111">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block text-align="justify" id="refbl1">page -<fo:page-number-citation id="second-ref" ref-id="second"/>-</fo:block>
+          <fo:block text-align="justify" id="refbl2">page -<fo:inline><fo:page-number-citation id="second-ref-inline" ref-id="second"/></fo:inline>-</fo:block>
+          <fo:block break-before="page" id="second">This block has id="second".</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- Check the text and width of the text area -->
+    <eval expected="112" xpath="//pageViewport[@nr=111]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text[2]"/>
+    <eval expected="20016" xpath="//pageViewport[@nr=111]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/lineArea/text[2]/@ipd"/>
+    <!-- Check the text and width of the inlineparent area -->
+    <!-- disabled until this feature is fixed
+    <eval expected="112" xpath="//pageViewport[@nr=111]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/inlineparent"/>
+    <eval expected="20016" xpath="//pageViewport[@nr=111]/page/regionViewport/regionBody/mainReference/span/flow/block[2]/lineArea/inlineparent/@ipd"/>
+    -->
+  </checks>
+</testcase>