aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2006-02-12 21:07:19 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2006-02-12 21:07:19 +0000
commit045fc2577c841e6cc1bdd3e60031c9bcba38ff0e (patch)
tree0ece2d24cb27ecff0f5e6238f337470d45d11d34 /src
parent26acc4f9a2f86cb0c634add792b122ec547168e9 (diff)
downloadxmlgraphics-fop-045fc2577c841e6cc1bdd3e60031c9bcba38ff0e.tar.gz
xmlgraphics-fop-045fc2577c841e6cc1bdd3e60031c9bcba38ff0e.zip
Slight correction: single quoted font-family names not properly handled
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@377242 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/java/org/apache/fop/fo/properties/FontShorthandProperty.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java b/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java
index 75101c770..3d1fa6604 100644
--- a/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java
+++ b/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java
@@ -101,6 +101,11 @@ public class FontShorthandProperty extends ListProperty {
/* no list, just a single name
* (or first name in the list)
*/
+ if (quoteIndex != -1) {
+ /* a single name, quoted
+ */
+ fromIndex = quoteIndex;
+ }
m = FObj.getPropertyMakerFor(PROP_IDS[1]);
prop = m.make(propertyList, specVal.substring(fromIndex), fo);
newProp.addProperty(prop, 1);
@@ -112,6 +117,7 @@ public class FontShorthandProperty extends ListProperty {
* fromIndex = index of the first quote
*/
fromIndex = quoteIndex;
+ quoteIndex = -1;
} else {
fromIndex = value.lastIndexOf(' ', commaIndex) + 1;
}