You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/09/19 21:32:31 UTC
svn commit: r1626301 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font:
ExternalFonts.java PDSimpleFont.java
Author: jahewson
Date: Fri Sep 19 19:32:31 2014
New Revision: 1626301
URL: http://svn.apache.org/r1626301
Log:
PDFBOX-2338: Detect non-symbolic TTF and add Symbol,Italic to substitutes
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java?rev=1626301&r1=1626300&r2=1626301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/ExternalFonts.java Fri Sep 19 19:32:31 2014
@@ -165,19 +165,34 @@ public final class ExternalFonts
// the Adobe Supplement to the ISO 32000 specifies some alternative names for some
// of the standard 14 fonts, so we map these to our fallbacks above
- substitutes.put("CourierCourierNew", substitutes.get("Courier"));
- substitutes.put("CourierNew", substitutes.get("Courier"));
- substitutes.put("CourierNew,Italic", substitutes.get("Courier-Oblique"));
- substitutes.put("CourierNew,Bold", substitutes.get("Courier-Bold"));
- substitutes.put("CourierNew,BoldItalic", substitutes.get("Courier-BoldOblique"));
- substitutes.put("Arial", substitutes.get("Helvetica"));
- substitutes.put("Arial,Italic", substitutes.get("Helvetica-Oblique"));
- substitutes.put("Arial,Bold", substitutes.get("Helvetica-Bold"));
- substitutes.put("Arial,BoldItalic", substitutes.get("Helvetica-BoldOblique"));
- substitutes.put("TimesNewRoman", substitutes.get("Times-Roman"));
- substitutes.put("TimesNewRoman,Italic", substitutes.get("Times-Italic"));
- substitutes.put("TimesNewRoman,Bold", substitutes.get("Times-Bold"));
- substitutes.put("TimesNewRoman,BoldItalic", substitutes.get("Times-BoldItalic"));
+ substitutes.put("CourierCourierNew", copySubstitutes("Courier"));
+ substitutes.put("CourierNew", copySubstitutes("Courier"));
+ substitutes.put("CourierNew,Italic", copySubstitutes("Courier-Oblique"));
+ substitutes.put("CourierNew,Bold", copySubstitutes("Courier-Bold"));
+ substitutes.put("CourierNew,BoldItalic", copySubstitutes("Courier-BoldOblique"));
+ substitutes.put("Arial", copySubstitutes("Helvetica"));
+ substitutes.put("Arial,Italic", copySubstitutes("Helvetica-Oblique"));
+ substitutes.put("Arial,Bold", copySubstitutes("Helvetica-Bold"));
+ substitutes.put("Arial,BoldItalic", copySubstitutes("Helvetica-BoldOblique"));
+ substitutes.put("TimesNewRoman", copySubstitutes("Times-Roman"));
+ substitutes.put("TimesNewRoman,Italic", copySubstitutes("Times-Italic"));
+ substitutes.put("TimesNewRoman,Bold", copySubstitutes("Times-Bold"));
+ substitutes.put("TimesNewRoman,BoldItalic", copySubstitutes("Times-BoldItalic"));
+
+ // Acrobat treats these fonts as "standard 14" too (at least Acrobat preflight says so)
+ substitutes.put("Symbol,Italic", copySubstitutes("Symbol"));
+ substitutes.put("Symbol,Bold", copySubstitutes("Symbol"));
+ substitutes.put("Symbol,BoldItalic", copySubstitutes("Symbol"));
+ }
+
+ /**
+ * Copies a list of font substitutes, adding the original font at the start of the list.
+ */
+ private static List<String> copySubstitutes(String postScriptName)
+ {
+ List<String> copy = new ArrayList<String>(substitutes.get(postScriptName));
+ copy.add(0, postScriptName);
+ return copy;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=1626301&r1=1626300&r2=1626301&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java Fri Sep 19 19:32:31 2014
@@ -132,8 +132,8 @@ public abstract class PDSimpleFont exten
this.encoding = readEncodingFromFont();
}
- // TTFs may have null encoding, but if they're non-symbolic then we know it's Adobe encoding
- if (this.encoding == null && !isSymbolic())
+ // TTFs may have null encoding, but if it's non-symbolic then we have Standard Encoding
+ if (this.encoding == null && getSymbolicFlag() != null && getSymbolicFlag())
{
this.encoding = StandardEncoding.INSTANCE;
}
@@ -184,19 +184,22 @@ public abstract class PDSimpleFont exten
{
return getBaseFont().equals("Symbol") || getBaseFont().equals("ZapfDingbats");
}
- else if (getBaseFont().startsWith("Symbol"))
- {
- return true;
- }
else
{
if (encoding == null)
{
// sanity check, should never happen
- throw new IllegalStateException("recursive definition");
+ if (!(this instanceof PDTrueTypeFont))
+ {
+ throw new IllegalStateException("PDFBox bug: encoding should not be null!");
+ }
+
+ // TTF without its non-symbolic flag set must be symbolic
+ return true;
}
- else if (encoding instanceof WinAnsiEncoding ||encoding instanceof MacRomanEncoding ||
- encoding instanceof StandardEncoding)
+ else if (encoding instanceof WinAnsiEncoding ||
+ encoding instanceof MacRomanEncoding ||
+ encoding instanceof StandardEncoding)
{
return false;
}