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 ad...@apache.org on 2007/02/06 21:35:50 UTC
svn commit: r504280 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/fo/properties/FontFamilyProperty.java status.xml
test/fotree/testcases/font-family-test.fo
Author: adelmelle
Date: Tue Feb 6 12:35:49 2007
New Revision: 504280
URL: http://svn.apache.org/viewvc?view=rev&rev=504280
Log:
Fix: override PropertyMaker.make() to properly parse font-family names containing spaces.
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/font-family-test.fo (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java?view=diff&rev=504280&r1=504279&r2=504280
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java Tue Feb 6 12:35:49 2007
@@ -21,6 +21,7 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
+import org.apache.fop.fo.expr.PropertyException;
/**
* Property class for the font-family property.
@@ -37,6 +38,55 @@
*/
public Maker(int propId) {
super(propId);
+ }
+
+ /**
+ * @see org.apache.fop.fo.properties.PropertyMaker#make(
+ * org.apache.fop.fo.PropertyList,
+ * java.lang.String,
+ * org.apache.fop.fo.FObj)
+ */
+ public Property make(PropertyList propertyList, String value, FObj fo) throws PropertyException {
+ ListProperty prop = new ListProperty();
+ String tmpVal;
+ int startIndex = 0;
+ int commaIndex = value.indexOf(',');
+ int quoteIndex;
+ int aposIndex;
+ char qChar;
+ boolean parsed = false;
+ while (!parsed) {
+ if (commaIndex == -1) {
+ tmpVal = value.substring(startIndex).trim();
+ parsed = true;
+ } else {
+ tmpVal = value.substring(startIndex, commaIndex).trim();
+ startIndex = commaIndex + 1;
+ commaIndex = value.indexOf(',', startIndex);
+ }
+ aposIndex = tmpVal.indexOf('\'');
+ quoteIndex = tmpVal.indexOf('\"');
+ if (aposIndex != -1 || quoteIndex != -1) {
+ qChar = (aposIndex == -1) ? '\"' : '\'';
+ if (tmpVal.lastIndexOf(qChar) != tmpVal.length() - 1) {
+ Property.log.warn("Skipping malformed value for font-family: "
+ + tmpVal + " in \"" + value + "\".");
+ tmpVal = "";
+ } else {
+ tmpVal = tmpVal.substring(1, tmpVal.length() - 1);
+ }
+ }
+ if (!"".equals(tmpVal)) {
+ int dblSpaceIndex = tmpVal.indexOf(" ");
+ while (dblSpaceIndex != -1) {
+ tmpVal = tmpVal.substring(0, dblSpaceIndex)
+ + tmpVal.substring(dblSpaceIndex + 1);
+ dblSpaceIndex = tmpVal.indexOf(" ");
+ }
+ prop.addProperty(new StringProperty(tmpVal));
+ }
+ }
+ return prop;
}
/**
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?view=diff&rev=504280&r1=504279&r2=504280
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Feb 6 12:35:49 2007
@@ -28,6 +28,9 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="AD" type="fix">
+ Fix for properly parsing font-family names containing spaces.
+ </action>
<action context="Code" dev="JM" type="fix" fixes-bug="41488" due-to="Dominic Brügger">
Fix for NPE with PNG images for RTF output.
</action>
Added: xmlgraphics/fop/trunk/test/fotree/testcases/font-family-test.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/font-family-test.fo?view=auto&rev=504280
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/font-family-test.fo (added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/font-family-test.fo Tue Feb 6 12:35:49 2007
@@ -0,0 +1,49 @@
+<?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="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="simpleA4">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-family="Times New Roman">
+ <test:assert property="font-family" expected="[Times New Roman]"/>
+ Test font-family parsing
+ </fo:block>
+ <fo:block font-family="Helvetica, Times New Roman">
+ <test:assert property="font-family" expected="[Helvetica, Times New Roman]"/>
+ Test font-family parsing
+ </fo:block>
+ <fo:block font-family="Times New Roman, Helvetica">
+ <test:assert property="font-family" expected="[Times New Roman, Helvetica]"/>
+ Test font-family parsing
+ </fo:block>
+ <fo:block font-family="'Times New Roman', serif">
+ <test:assert property="font-family" expected="[Times New Roman, serif]"/>
+ Test font-family parsing
+ </fo:block>
+ <fo:block font-family="'Times New 'Roman, serif">
+ <test:assert property="font-family" expected="[serif]"/>
+ Test malformed font-family parsing
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/font-family-test.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/fotree/testcases/font-family-test.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org