svn commit: r1620742 - in /pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox: encoding/GlyphList.java pdmodel/font/PDFontDescriptorAFM.java rendering/font/Type1Glyph2D.java

[jahewson]

Author: jahewson
Date: Tue Aug 26 21:37:15 2014
New Revision: 1620742

URL: http://svn.apache.org/r1620742
Log:
PDFBOX-2262: get symbolic information from AFMs

Modified:
    
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/encoding/GlyphList.java
    
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java
    
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java

Modified: 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/encoding/GlyphList.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/encoding/GlyphList.java?rev=1620742&r1=1620741&r2=1620742&view=diff
==============================================================================
--- 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/encoding/GlyphList.java
 (original)
+++ 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/encoding/GlyphList.java
 Tue Aug 26 21:37:15 2014
@@ -145,7 +145,7 @@ public class GlyphList
         {
             return null;
         }
-        
+
         String unicode = NAME_TO_UNICODE.get(name);
         if (unicode == null)
         {

Modified: 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java?rev=1620742&r1=1620741&r2=1620742&view=diff
==============================================================================
--- 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java
 (original)
+++ 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontDescriptorAFM.java
 Tue Aug 26 21:37:15 2014
@@ -154,6 +154,12 @@ public class PDFontDescriptorAFM extends
         throw new UnsupportedOperationException( "The AFM Font descriptor is 
immutable" );
     }
 
+    @Override
+    public boolean isSymbolic()
+    {
+        return afm.getEncodingScheme().equals("FontSpecific");
+    }
+
     /**
      * This will get the fonts bouding box.
      *

Modified: 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java?rev=1620742&r1=1620741&r2=1620742&view=diff
==============================================================================
--- 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java
 (original)
+++ 
pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/font/Type1Glyph2D.java
 Tue Aug 26 21:37:15 2014
@@ -87,7 +87,7 @@ public class Type1Glyph2D implements Gly
         {
             String name = font.codeToName(code);
             GeneralPath path = null;
-            if (font.hasGlyph(name))
+            if (!name.equals(".notdef") && font.hasGlyph(name))
             {
                 path = font.getPath(name);
             }
@@ -95,7 +95,7 @@ public class Type1Glyph2D implements Gly
             {
                 // try alternative name
                 String altName = ALT_NAMES.get(name);
-                if (altName != null && font.hasGlyph(altName))
+                if (altName != null && !name.equals(".notdef") && 
font.hasGlyph(altName))
                 {
                     path = font.getPath(altName);
                 }