Author: adelmelle
Date: Sun Apr 12 19:54:03 2009
New Revision: 764317
URL: http://svn.apache.org/viewvc?rev=764317&view=rev
Log:
Fix the behaviour of pixel-lengths: influenced by target-resolution, rather
than source-resolution (which is meant for images)
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java?rev=764317&r1=764316&r2=764317&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
Sun Apr 12 19:54:03 2009
@@ -99,7 +99,7 @@
/**
* 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 @@
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);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java?rev=764317&r1=764316&r2=764317&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/LengthProperty.java
Sun Apr 12 19:54:03 2009
@@ -59,7 +59,7 @@
//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) {
Added: xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo?rev=764317&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo (added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo Sun Apr 12
19:54:03 2009
@@ -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>
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo
------------------------------------------------------------------------------
svn:executable = *
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/pixel_length.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
