Fix the behaviour of pixel-lengths: influenced by target-resolution, rather than source-resolution (which is meant for images)

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

3 files changed, 37 insertions, 4 deletions

diff --git a/src/java/org/apache/fop/fo/expr/PropertyParser.java b/src/java/org/apache/fop/fo/expr/PropertyParser.java
index 7ae1db7f3..4f1cdbdc6 100644
--- a/src/java/org/apache/fop/fo/expr/PropertyParser.java
+++ b/src/java/org/apache/fop/fo/expr/PropertyParser.java
@@ -99,7 +99,7 @@ public final class PropertyParser extends PropertyTokenizer {
     /**
      * Private constructor. Called by the static parse() method.
      * @param propExpr The specified value (attribute on the xml element).
-     * @param propInfo A PropertyInfo object representing the context in
+     * @param pInfo A PropertyInfo object representing the context in
      * which the property expression is to be evaluated.
      */
     private PropertyParser(String propExpr, PropertyInfo pInfo) {
@@ -310,12 +310,12 @@ public final class PropertyParser extends PropertyTokenizer {
                                     propInfo.currentFontSize());
             } else {
                 if ("px".equals(unitPart)) {
-                    //pass the ratio between source-resolution and
+                    //pass the ratio between target-resolution and
                     //the default resolution of 72dpi
                     prop = FixedLength.getInstance(
                             numPart, unitPart,
                             propInfo.getPropertyList().getFObj()
-                                    .getUserAgent().getSourceResolution() / 72.0f);
+                                    .getUserAgent().getTargetResolution() / 72.0f);
                 } else {
                     //use default resolution of 72dpi
                     prop = FixedLength.getInstance(numPart, unitPart);
diff --git a/src/java/org/apache/fop/fo/properties/LengthProperty.java b/src/java/org/apache/fop/fo/properties/LengthProperty.java
index 4ffe38074..16bbe430c 100644
--- a/src/java/org/apache/fop/fo/properties/LengthProperty.java
+++ b/src/java/org/apache/fop/fo/properties/LengthProperty.java
@@ -59,7 +59,7 @@ public abstract class LengthProperty extends Property
                 //Assume pixels (like in HTML) when there's no unit
                 return FixedLength.getInstance(
                         p.getNumeric().getNumericValue(), "px",
-                        propertyList.getFObj().getUserAgent().getSourceResolution() / 72.0f);
+                        propertyList.getFObj().getUserAgent().getTargetResolution() / 72.0f);
             }
             Length val = p.getLength();
             if (val != null) {
diff --git a/test/fotree/testcases/pixel_length.fo b/test/fotree/testcases/pixel_length.fo
new file mode 100755
index 000000000..2ad1d4a19
--- /dev/null
+++ b/test/fotree/testcases/pixel_length.fo
@@ -0,0 +1,33 @@
+<?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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+      <fo:region-body/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="normal">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block-container inline-progression-dimension="144px">
+        <test:assert property="inline-progression-dimension.optimum" expected="144000mpt" />
+        <fo:block>Block 1</fo:block>
+      </fo:block-container>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>