Improved error tolerance: an enum property value with leading or trailing spaces...

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

diff --git a/src/java/org/apache/fop/fo/properties/PropertyMaker.java b/src/java/org/apache/fop/fo/properties/PropertyMaker.java
index 3faf1971e8331ba279c31a5aee166bd4520c1145..b1162563d89fdd9e60295dd59b588c757a514df3 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/PropertyMaker.java
+++ b/src/java/org/apache/fop/fo/properties/PropertyMaker.java
@@ -427,8 +427,8 @@ public class PropertyMaker implements Cloneable {
                     }
                 }
             } 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) {

diff --git a/test/fotree/testcases/enum-trim.fo b/test/fotree/testcases/enum-trim.fo
new file mode 100644 (file)
index 0000000..001243d
--- /dev/null
+++ b/test/fotree/testcases/enum-trim.fo
@@ -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>