Index: fop-core/src/main/java/org/apache/fop/fonts/FontTriplet.java
===================================================================
--- fop-core/src/main/java/org/apache/fop/fonts/FontTriplet.java (revision 1877558)
+++ fop-core/src/main/java/org/apache/fop/fonts/FontTriplet.java (working copy)
@@ -65,7 +65,7 @@
* @param priority priority of this triplet/font mapping
*/
public FontTriplet(String name, String style, int weight, int priority) {
- this.name = name;
+ this.name = name.toLowerCase();
this.style = style;
this.weight = weight;
this.priority = priority;
Index: fop-core/src/test/java/org/apache/fop/config/FontsCaseInsensitiveTripletTestCase.java
===================================================================
--- fop-core/src/test/java/org/apache/fop/config/FontsCaseInsensitiveTripletTestCase.java (nonexistent)
+++ fop-core/src/test/java/org/apache/fop/config/FontsCaseInsensitiveTripletTestCase.java (working copy)
@@ -0,0 +1,83 @@
+package org.apache.fop.config;
+
+import static org.apache.fop.FOPTestUtils.getBaseDir;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.xml.sax.SAXException;
+
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.FopConfBuilder;
+import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.apps.PDFRendererConfBuilder;
+import org.apache.fop.fonts.CustomFontCollection;
+import org.apache.fop.fonts.Font;
+import org.apache.fop.fonts.FontCollection;
+import org.apache.fop.fonts.FontInfo;
+import org.apache.fop.fonts.FontManager;
+import org.apache.fop.fonts.FontTriplet;
+import org.apache.fop.fonts.base14.Base14FontCollection;
+import org.apache.fop.render.PrintRenderer;
+
+/**
+ * Tests that font name case-insensitivity for the {@link FontTriplet} works correctly.
+ *
+ */
+public class FontsCaseInsensitiveTripletTestCase extends BaseConstructiveUserConfigTest {
+
+ public FontsCaseInsensitiveTripletTestCase() throws SAXException, IOException {
+ super(new FopConfBuilder().setStrictValidation(true).startRendererConfig(PDFRendererConfBuilder.class)
+ .startFontsConfig().startFont(null, "test/resources/fonts/ttf/glb12.ttf")
+ .addTriplet("Gladiator", "normal", "bold").endFont().endFontConfig().endRendererConfig().build());
+ }
+
+ protected void testFontLookUp() throws Exception {
+ FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
+ PrintRenderer renderer = (PrintRenderer) foUserAgent.getRendererFactory().createRenderer(foUserAgent,
+ MimeConstants.MIME_PDF);
+ FontInfo fontInfo = new FontInfo();
+ renderer.setupFontInfo(fontInfo);
+ FontManager fontManager = foUserAgent.getFontManager();
+ FontCollection[] fontCollections = new FontCollection[] {
+ new Base14FontCollection(fontManager.isBase14KerningEnabled()),
+ new CustomFontCollection(fontManager.getResourceResolver(), renderer.getFontList(),
+ foUserAgent.isComplexScriptFeaturesEnabled()) };
+ fontManager.setup(fontInfo, fontCollections);
+
+ assertTrue(fontInfo.isSetupValid());
+
+ // Test that case insensitivity is honored for Base 14 fonts and custom fonts.
+ FontTriplet camelCaseLookupTriplet = fontInfo.fontLookup("Gladiator", "normal", Font.WEIGHT_BOLD);
+ FontTriplet lowerCaseLookupTriplet = fontInfo.fontLookup("gladiator", "normal", Font.WEIGHT_BOLD);
+ FontTriplet upperCaseLookupTriplet = fontInfo.fontLookup("GLADIATOR", "normal", Font.WEIGHT_BOLD);
+ FontTriplet base14LookupTriplet = fontInfo.fontLookup("HELVETICA", "normal", Font.WEIGHT_BOLD);
+
+ assertNotNull(camelCaseLookupTriplet);
+ assertEquals(camelCaseLookupTriplet.getName(), "gladiator");
+
+ assertNotNull(camelCaseLookupTriplet);
+ assertEquals(lowerCaseLookupTriplet.getName(), "gladiator");
+
+ assertNotNull(camelCaseLookupTriplet);
+ assertEquals(upperCaseLookupTriplet.getName(), "gladiator");
+
+ assertNotNull(base14LookupTriplet);
+ assertEquals(base14LookupTriplet.getName(), "helvetica");
+
+ assertNotNull(fontInfo.getInternalFontKey(lowerCaseLookupTriplet));
+ assertNotNull(fontInfo.getInternalFontKey(base14LookupTriplet));
+
+ }
+
+ protected void convertFO() throws Exception {
+ File foFile = new File(getBaseDir(), "test/xml/bugtests/mixed-cases-font.fo");
+ final boolean dumpOutput = false;
+ FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
+ convertFO(foFile, foUserAgent, dumpOutput);
+ }
+
+}
Index: fop-core/src/test/java/org/apache/fop/config/UserConfigTestSuite.java
===================================================================
--- fop-core/src/test/java/org/apache/fop/config/UserConfigTestSuite.java (revision 1877558)
+++ fop-core/src/test/java/org/apache/fop/config/UserConfigTestSuite.java (working copy)
@@ -34,7 +34,8 @@
FontMetricsUrlMalformedTestCase.class,
FontsDirectoryRecursiveTestCase.class,
FontsAutoDetectTestCase.class,
- FontsSubstitutionTestCase.class
+ FontsSubstitutionTestCase.class,
+ FontsCaseInsensitiveTripletTestCase.class
})
public class UserConfigTestSuite {
}
Index: fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java
===================================================================
--- fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java (revision 1877558)
+++ fop-core/src/test/java/org/apache/fop/render/ps/PSPainterTestCase.java (working copy)
@@ -149,6 +149,7 @@
IFState ifState = IFState.create();
ifState.setFontSize(fontSize);
+ ifState.setFontFamily(fontName);
PSPainter psPainter = new PSPainter(psDocumentHandler, ifState);
Index: fop/test/layoutengine/standard-testcases/block_font-autoselect.xml
===================================================================
--- fop/test/layoutengine/standard-testcases/block_font-autoselect.xml (revision 1877558)
+++ fop/test/layoutengine/standard-testcases/block_font-autoselect.xml (working copy)
@@ -44,11 +44,11 @@
-
+
-
+
Index: fop/test/layoutengine/standard-testcases/block_font-family.xml
===================================================================
--- fop/test/layoutengine/standard-testcases/block_font-family.xml (revision 1877558)
+++ fop/test/layoutengine/standard-testcases/block_font-family.xml (working copy)
@@ -51,8 +51,8 @@
-
-
+
+
Index: fop/test/xml/bugtests/mixed-cases-font.fo
===================================================================
--- fop/test/xml/bugtests/mixed-cases-font.fo (nonexistent)
+++ fop/test/xml/bugtests/mixed-cases-font.fo (working copy)
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This is a simple fo text in Courier font.
+
+
+ This is a simple fo text in bold.
+
+
+ This is a simple fo text in italic.
+
+
+ This is a simple fo text in italic and bold.
+
+
+ This is a simple fo text in small caps.
+
+
+
+
+
+ This is a simple fo text in Times font.
+
+
+ This is a simple fo text in bold.
+
+
+ This is a simple fo text in italic.
+
+
+ This is a simple fo text in italic and bold.
+
+
+ This is a simple fo text in small caps.
+
+
+
+
+
+ This is a simple fo text in Helvetica font.
+
+
+ This is a simple fo text in bold.
+
+
+ This is a simple fo text in italic.
+
+
+ This is a simple fo text in italic and bold.
+
+
+ This is a simple fo text in small caps.
+
+
+
+
+