svn commit: r1742442 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding: MacRomanEncoding.java WinAnsiEncoding.java

[lehmi]

Author: lehmi
Date: Thu May  5 15:52:01 2016
New Revision: 1742442

URL: http://svn.apache.org/viewvc?rev=1742442&view=rev
Log:
PDFBOX-3332: don't add the reverse mapping for some special cases to avoid 
overriding the origin mapping

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/MacRomanEncoding.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/WinAnsiEncoding.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/MacRomanEncoding.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/MacRomanEncoding.java?rev=1742442&r1=1742441&r2=1742442&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/MacRomanEncoding.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/MacRomanEncoding.java
 Thu May  5 15:52:01 2016
@@ -240,9 +240,7 @@ public class MacRomanEncoding extends En
             {0330, "ydieresis"},
             {0264, "yen"},
             {0172, "z"},
-            {060, "zero"},
-            // adding an additional mapping as defined in Appendix D of the 
pdf spec
-            {0312, "space"}
+            {060, "zero"}
     };
     
     /**
@@ -261,6 +259,9 @@ public class MacRomanEncoding extends En
         {
             add((Integer) encodingEntry[CHAR_CODE], 
encodingEntry[CHAR_NAME].toString());
         }
+        // adding an additional mapping as defined in Appendix D of the pdf 
spec
+        // don't add the reverse mapping as we have to preserve the origin 
mapping for the given glyph name
+        codeToName.put(0312, "space");
     }
     
     @Override

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/WinAnsiEncoding.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/WinAnsiEncoding.java?rev=1742442&r1=1742441&r2=1742442&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/WinAnsiEncoding.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/WinAnsiEncoding.java
 Thu May  5 15:52:01 2016
@@ -249,10 +249,7 @@ public class WinAnsiEncoding extends Enc
             {0245, "yen"},
             {0172, "z"},
             {0236, "zcaron"},
-            {060, "zero"},
-            // adding some additional mappings as defined in Appendix D of the 
pdf spec
-            {0240, "space"},
-            {0255, "hyphen"}
+            {060, "zero"}
     };
 
     /**
@@ -272,6 +269,11 @@ public class WinAnsiEncoding extends Enc
             add((Integer) encodingEntry[CHAR_CODE], 
encodingEntry[CHAR_NAME].toString());
         }
 
+        // adding some additional mappings as defined in Appendix D of the pdf 
spec
+        // don't add the reverse mapping as we have to preserve the origin 
mapping for the given glyph names
+        codeToName.put(0240, "space");
+        codeToName.put(0255, "hyphen");
+
         // From the PDF specification:
         // In WinAnsiEncoding, all unused codes greater than 40 map to the 
bullet character.
         for (int i = 041; i <= 255; i++)