You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by sp...@apache.org on 2006/10/06 19:37:58 UTC

svn commit: r453700 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java test/layoutengine/standard-testcases/page-number-citation_basic_2.xml

Author: spepping
Date: Fri Oct  6 10:37:58 2006
New Revision: 453700

URL: http://svn.apache.org/viewvc?view=rev&rev=453700
Log: (empty)

Added:
    xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml   (with props)
Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java?view=diff&rev=453700&r1=453699&r2=453700
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java Fri Oct  6 10:37:58 2006
@@ -103,7 +103,8 @@
             }
             // replace the text
             removeText();
-            addWord(page.getPageNumberString(), 0);
+            text = page.getPageNumberString();
+            addWord(text, 0);
             // update ipd
             if (font != null) {
                 updateIPD(font.getWordWidth(text));

Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml?view=auto&rev=453700
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml Fri Oct  6 10:37:58 2006
@@ -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>

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_basic_2.xml
------------------------------------------------------------------------------
    svn:keywords = Id



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Re: svn commit: r453700 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java test/layoutengine/standard-testcases/page-number-citation_basic_2.xml

Posted by Simon Pepping <sp...@leverkruid.eu>.
On Fri, Oct 06, 2006 at 05:37:58PM -0000, spepping@apache.org wrote:
> URL: http://svn.apache.org/viewvc?view=rev&rev=453700
> Log: (empty)

Sorry for the empty log message. I am experimenting with
subclipse. This fixes a bug that has crept in page number resolution,
viz. the text was not updated, so that the wrong ipd was calculated.

Simon

-- 
Simon Pepping
home page: http://www.leverkruid.eu