Browse Source

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
tags/fop-0_92-beta
Andreas L. Delmelle 18 years ago
parent
commit
045fc2577c

+ 6
- 0
src/java/org/apache/fop/fo/properties/FontShorthandProperty.java View File

/* no list, just a single name /* no list, just a single name
* (or first name in the list) * (or first name in the list)
*/ */
if (quoteIndex != -1) {
/* a single name, quoted
*/
fromIndex = quoteIndex;
}
m = FObj.getPropertyMakerFor(PROP_IDS[1]); m = FObj.getPropertyMakerFor(PROP_IDS[1]);
prop = m.make(propertyList, specVal.substring(fromIndex), fo); prop = m.make(propertyList, specVal.substring(fromIndex), fo);
newProp.addProperty(prop, 1); newProp.addProperty(prop, 1);
* fromIndex = index of the first quote * fromIndex = index of the first quote
*/ */
fromIndex = quoteIndex; fromIndex = quoteIndex;
quoteIndex = -1;
} else { } else {
fromIndex = value.lastIndexOf(' ', commaIndex) + 1; fromIndex = value.lastIndexOf(' ', commaIndex) + 1;
} }

+ 3
- 3
test/fotree/testcases/font-shorthand-test.fo View File

</fo:layout-master-set> </fo:layout-master-set>
<fo:page-sequence master-reference="simpleA4"> <fo:page-sequence master-reference="simpleA4">
<fo:flow flow-name="xsl-region-body"> <fo:flow flow-name="xsl-region-body">
<fo:block font="10pt sans-serif">
<test:assert property="font-family" expected="[sans-serif]"/>
<fo:block font="bold 10pt 'Times New Roman'">
<test:assert property="font-family" expected="[Times New Roman]"/>
<test:assert property="font-size" expected="10000mpt"/> <test:assert property="font-size" expected="10000mpt"/>
<test:assert property="font-weight" expected="400" />
<test:assert property="font-weight" expected="700" />
<test:assert property="font-style" expected="NORMAL" /> <test:assert property="font-style" expected="NORMAL" />
<test:assert property="line-height.optimum" expected="120.0%" /> <test:assert property="line-height.optimum" expected="120.0%" />
<test:assert property="font-variant" expected="NORMAL" /> <test:assert property="font-variant" expected="NORMAL" />

Loading…
Cancel
Save