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/07/01 05:34:30 UTC
svn commit: r1606972 - in /pdfbox/trunk/pdfbox/src/main:
java/org/apache/pdfbox/pdmodel/font/PDFFontManager.java
resources/org/apache/pdfbox/resources/ttf/
resources/org/apache/pdfbox/resources/ttf/NimbusSanL-Regu.ttf
Author: jahewson
Date: Tue Jul 1 03:34:30 2014
New Revision: 1606972
URL: http://svn.apache.org/r1606972
Log:
PDFBOX-2169: added TTF fallback font
Added:
pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf/
pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf/NimbusSanL-Regu.ttf (with props)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFFontManager.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFFontManager.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFFontManager.java?rev=1606972&r1=1606971&r2=1606972&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFFontManager.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFFontManager.java Tue Jul 1 03:34:30 2014
@@ -19,12 +19,14 @@ package org.apache.pdfbox.pdmodel.font;
import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fontbox.ttf.TTFParser;
import org.apache.fontbox.ttf.TrueTypeFont;
import org.apache.fontbox.util.SystemFontManager;
import org.apache.pdfbox.util.ResourceLoader;
@@ -115,9 +117,17 @@ public final class PDFFontManager
ttfFallback = SystemFontManager.findTTFont("Liberation Sans");
}
+ // built-in
if (ttfFallback == null)
{
- throw new IOException("Could not find TTF fallback font on the system");
+ String name = "org/apache/pdfbox/resources/ttf/NimbusSanL-Regu.ttf";
+ TTFParser ttfParser = new TTFParser();
+ InputStream fontStream = org.apache.fontbox.util.ResourceLoader.loadResource(name);
+ if (fontStream == null)
+ {
+ throw new IOException("Error loading resource: " + name);
+ }
+ ttfFallback = ttfParser.parseTTF(fontStream);
}
}
return ttfFallback;
Added: pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf/NimbusSanL-Regu.ttf
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf/NimbusSanL-Regu.ttf?rev=1606972&view=auto
==============================================================================
Binary file - no diff available.
Propchange: pdfbox/trunk/pdfbox/src/main/resources/org/apache/pdfbox/resources/ttf/NimbusSanL-Regu.ttf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream