Author: jeremias
Date: Fri Jan 25 04:14:52 2008
New Revision: 615197
URL: http://svn.apache.org/viewvc?rev=615197&view=rev
Log:
Improved error tolerance: an enum property value with leading or trailing
spaces is still recognized. Example: content-width="scale-to-fit "
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/enum-trim.fo (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java?rev=615197&r1=615196&r2=615197&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyMaker.java
Fri Jan 25 04:14:52 2008
@@ -427,8 +427,8 @@
}
}
} else {
- // Check for keyword shorthand values to be substituted.
- pvalue = checkValueKeywords(pvalue);
+ // Check for keyword shorthand values to be substituted.
+ pvalue = checkValueKeywords(pvalue.trim());
newProp = checkEnumValues(pvalue);
}
if (newProp == null) {
Added: xmlgraphics/fop/trunk/test/fotree/testcases/enum-trim.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/enum-trim.fo?rev=615197&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/enum-trim.fo (added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/enum-trim.fo Fri Jan 25
04:14:52 2008
@@ -0,0 +1,37 @@
+<?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="A4" page-height="29.7cm"
page-width="21cm" margin="2cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="A4">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <!-- the space character after "scale-to-fit" is intentional!!! -->
+ <fo:external-graphic src="test/resources/images/box1.png" width="4cm"
+ content-width="scale-to-fit ">
+ <test:assert property="content-width" expected="SCALE_TO_FIT"/>
+ </fo:external-graphic>
+ Test font-family parsing
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/enum-trim.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/enum-trim.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
