You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2010/03/28 19:57:20 UTC

svn commit: r928462 [1/2] - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: encoding/ pdmodel/font/ pdmodel/graphics/ pdmodel/graphics/color/ pdmodel/graphics/xobject/ util/

Author: lehmi
Date: Sun Mar 28 17:57:19 2010
New Revision: 928462

URL: http://svn.apache.org/viewvc?rev=928462&view=rev
Log:
PDFBOX-626: More COSName constants, removed all COSName constants from the encoding mappings

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/DictionaryEncoding.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/Encoding.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/MacRomanEncoding.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/PdfDocEncoding.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/StandardEncoding.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/WinAnsiEncoding.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1AfmPfbFont.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDExtendedGraphicsState.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDShading.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalGray.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceN.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDIndexed.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDSeparation.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDCcitt.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDJpeg.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/ImageParameters.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java Sun Mar 28 17:57:19 2010
@@ -22,7 +22,6 @@ import org.apache.fontbox.afm.CharMetric
 import org.apache.fontbox.afm.FontMetric;
 
 import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.cos.COSName;
 
 /**
  * This will handle the encoding from an AFM font.
@@ -42,11 +41,11 @@ public class AFMEncoding extends Encodin
     public AFMEncoding( FontMetric fontInfo )
     {
         metric = fontInfo;
-        Iterator characters = metric.getCharMetrics().iterator();
+        Iterator<CharMetric> characters = metric.getCharMetrics().iterator();
         while( characters.hasNext() )
         {
             CharMetric nextMetric = (CharMetric)characters.next();
-            addCharacterEncoding( nextMetric.getCharacterCode(), COSName.getPDFName( nextMetric.getName() ) );
+            addCharacterEncoding( nextMetric.getCharacterCode(), nextMetric.getName() );
         }
     }
 

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/DictionaryEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/DictionaryEncoding.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/DictionaryEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/DictionaryEncoding.java Sun Mar 28 17:57:19 2010
@@ -47,13 +47,13 @@ public class DictionaryEncoding extends 
 
         //first set up the base encoding
         //The previious value WinAnsiEncoding() has been changed to StandardEnding
-        //see p 389 of the PDF 1.5 reférence table 5.11 entries in a dictionary encoding
+        //see p 389 of the PDF 1.5 ref�rence table 5.11 entries in a dictionary encoding
         //"If this entry is absent, the Differences entry describes differences from an implicit
         //base encoding. For a font program that is embedded in the PDF file, the
-        //implicit base encoding is the font program’s built-in encoding, as described
+        //implicit base encoding is the font program�s built-in encoding, as described
         //above and further elaborated in the sections on specific font types below. Otherwise,
         //for a nonsymbolic font, it is StandardEncoding, and for a symbolic font, it
-        //is the font’s built-in encoding."
+        //is the font�s built-in encoding."
 
         //so the default base encoding is standardEncoding
         Encoding baseEncoding = new StandardEncoding();
@@ -81,7 +81,7 @@ public class DictionaryEncoding extends 
             else if( next instanceof COSName )
             {
                 COSName name = (COSName)next;
-                addCharacterEncoding( currentIndex++, name );
+                addCharacterEncoding( currentIndex++, name.getName() );
             }
         }
     }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/Encoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/Encoding.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/Encoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/Encoding.java Sun Mar 28 17:57:19 2010
@@ -43,20 +43,28 @@ public abstract class Encoding implement
     /**
      * This is a mapping from a character code to a character name.
      */
-    protected final Map<Integer, COSName> codeToName =
-        new HashMap<Integer, COSName>();
+//    protected final Map<Integer, COSName> codeToName =
+//        new HashMap<Integer, COSName>();
+    protected final Map<Integer, String> codeToName =
+        new HashMap<Integer, String>();
 
     /**
      * This is a mapping from a character name to a character code.
      */
-    protected final Map<COSName, Integer> nameToCode =
-        new HashMap<COSName, Integer>();
-
-    private static final Map<COSName, String> NAME_TO_CHARACTER =
-        new HashMap<COSName, String>();
-
-    private static final Map<String, COSName> CHARACTER_TO_NAME =
-        new HashMap<String, COSName>();
+//    protected final Map<COSName, Integer> nameToCode =
+//        new HashMap<COSName, Integer>();
+    protected final Map<String, Integer> nameToCode =
+        new HashMap<String, Integer>();
+
+//    private static final Map<COSName, String> NAME_TO_CHARACTER =
+//        new HashMap<COSName, String>();
+    private static final Map<String, String> NAME_TO_CHARACTER =
+        new HashMap<String, String>();
+
+//    private static final Map<String, COSName> CHARACTER_TO_NAME =
+//        new HashMap<String, COSName>();
+    private static final Map<String, String> CHARACTER_TO_NAME =
+        new HashMap<String, String>();
 
     static
     {
@@ -74,24 +82,24 @@ public abstract class Encoding implement
             }
         }
 
-        NAME_TO_CHARACTER.put( COSName.getPDFName( ".notdef" ), "" );
-        NAME_TO_CHARACTER.put( COSName.getPDFName( "fi" ), "fi" );
-        NAME_TO_CHARACTER.put( COSName.getPDFName( "fl" ), "fl" );
-        NAME_TO_CHARACTER.put( COSName.getPDFName( "ffi" ), "ffi" );
-        NAME_TO_CHARACTER.put( COSName.getPDFName( "ff" ), "ff" );
-        NAME_TO_CHARACTER.put( COSName.getPDFName( "pi" ), "pi" );
+        NAME_TO_CHARACTER.put( ".notdef", "" );
+        NAME_TO_CHARACTER.put( "fi", "fi" );
+        NAME_TO_CHARACTER.put( "fl", "fl" );
+        NAME_TO_CHARACTER.put( "ffi", "ffi" );
+        NAME_TO_CHARACTER.put( "ff", "ff" );
+        NAME_TO_CHARACTER.put( "pi", "pi" );
 
         // add some (alternative) glyph mappings. These are missing in
         // the original copy of the adobe glyphlist.txt 
         // also mapped as anglebracketleft
-        NAME_TO_CHARACTER.put(COSName.getPDFName("angbracketleft"), "\u3008");
+        NAME_TO_CHARACTER.put("angbracketleft", "\u3008");
         // also mapped as anglebracketright
-        NAME_TO_CHARACTER.put(COSName.getPDFName("angbracketright"), "\u3009");
+        NAME_TO_CHARACTER.put("angbracketright", "\u3009");
         // also mapped as copyright
-        NAME_TO_CHARACTER.put(COSName.getPDFName("circlecopyrt"), "\u00A9");
-        NAME_TO_CHARACTER.put(COSName.getPDFName("controlNULL"), "\u0000");
+        NAME_TO_CHARACTER.put("circlecopyrt", "\u00A9");
+        NAME_TO_CHARACTER.put("controlNULL", "\u0000");
 
-        for( Map.Entry<COSName, String> entry : NAME_TO_CHARACTER.entrySet() )
+        for( Map.Entry<String, String> entry : NAME_TO_CHARACTER.entrySet() )
         {
             CHARACTER_TO_NAME.put( entry.getValue(), entry.getKey() );
         }
@@ -130,7 +138,7 @@ public abstract class Encoding implement
                                 int characterCode = Integer.parseInt( tokenizer.nextToken(), 16 );
                                 value += (char)characterCode;
                             }
-                            NAME_TO_CHARACTER.put( COSName.getPDFName( characterName ), value );
+                            NAME_TO_CHARACTER.put( characterName, value );
                         }
                         catch( NumberFormatException nfe )
                         {
@@ -165,7 +173,7 @@ public abstract class Encoding implement
      * Returns an unmodifiable view of the Code2Name mapping.
      * @return the Code2Name map 
      */
-    public Map<Integer, COSName> getCodeToNameMap()
+    public Map<Integer, String> getCodeToNameMap()
     {
         return Collections.unmodifiableMap(codeToName);
     }
@@ -174,7 +182,7 @@ public abstract class Encoding implement
      * Returns an unmodifiable view of the Name2Code mapping.
      * @return the Name2Code map 
      */
-    public Map<COSName, Integer> getNameToCodeMap()
+    public Map<String, Integer> getNameToCodeMap()
     {
         return Collections.unmodifiableMap(nameToCode);
     }
@@ -185,7 +193,7 @@ public abstract class Encoding implement
      * @param code The character code that matches the character.
      * @param name The name of the character.
      */
-    protected void addCharacterEncoding( int code, COSName name )
+    protected void addCharacterEncoding( int code, String name )
     {
         codeToName.put( code, name );
         nameToCode.put( name, code );
@@ -200,12 +208,12 @@ public abstract class Encoding implement
      *
      * @throws IOException If there is no character code for the name.
      */
-    public int getCode( COSName name ) throws IOException
+    public int getCode( String name ) throws IOException
     {
         Integer code = nameToCode.get( name );
         if( code == null )
         {
-            throw new IOException( "No character code for character name '" + name.getName() + "'" );
+            throw new IOException( "No character code for character name '" + name + "'" );
         }
         return code;
     }
@@ -219,13 +227,13 @@ public abstract class Encoding implement
      *
      * @throws IOException If there is no name for the code.
      */
-    public COSName getName( int code ) throws IOException
+    public String getName( int code ) throws IOException
     {
-        COSName name = codeToName.get( code );
+        String name = codeToName.get( code );
         if( name == null )
         {
             //lets be forgiving for now
-            name = COSName.getPDFName( "space" );
+            name = "space";
             //throw new IOException( getClass().getName() +
             //                       ": No name for character code '" + code + "'" );
         }
@@ -241,9 +249,9 @@ public abstract class Encoding implement
      *
      * @throws IOException If there is no name for the character.
      */
-    public COSName getNameFromCharacter( char c ) throws IOException
+    public String getNameFromCharacter( char c ) throws IOException
     {
-        COSName name = CHARACTER_TO_NAME.get( Character.toString(c) );
+        String name = CHARACTER_TO_NAME.get( Character.toString(c) );
         if( name == null )
         {
             throw new IOException( "No name for character '" + c + "'" );
@@ -273,14 +281,14 @@ public abstract class Encoding implement
      *
      * @return The printable character for the code.
      */
-    public static String getCharacter( COSName name )
+    public static String getCharacter( String name )
     {
-        COSName baseName = name;
+        String baseName = name;
  
         String character = NAME_TO_CHARACTER.get( baseName );
         if( character == null )
         {
-            String nameStr = baseName.getName();
+            String nameStr = baseName;
             // test for Unicode name
             // (uniXXXX - XXXX must be a multiple of four;
             // each representing a hexadecimal Unicode code point)
@@ -320,7 +328,7 @@ public abstract class Encoding implement
                 if ( nameStr.indexOf('.') > 0 ) 
                 {
                     nameStr = nameStr.substring( 0, nameStr.indexOf('.') );
-                    baseName = COSName.getPDFName( nameStr );
+                    baseName = nameStr;
                     getCharacter(baseName);
                 }
 

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/MacRomanEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/MacRomanEncoding.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/MacRomanEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/MacRomanEncoding.java Sun Mar 28 17:57:19 2010
@@ -32,213 +32,213 @@ public class MacRomanEncoding extends En
      */
     public MacRomanEncoding()
     {
-        addCharacterEncoding( 0101, COSName.getPDFName( "A" ) );
-        addCharacterEncoding( 0256, COSName.getPDFName( "AE" ) );
-        addCharacterEncoding( 0347, COSName.getPDFName( "Aacute" ) );
-        addCharacterEncoding( 0345, COSName.getPDFName( "Acircumflex" ) );
-        addCharacterEncoding( 0200, COSName.getPDFName( "Adieresis" ) );
-        addCharacterEncoding( 0313, COSName.getPDFName( "Agrave" ) );
-        addCharacterEncoding( 0201, COSName.getPDFName( "Aring" ) );
-        addCharacterEncoding( 0314, COSName.getPDFName( "Atilde" ) );
-        addCharacterEncoding( 0102, COSName.getPDFName( "B" ) );
-        addCharacterEncoding( 0103, COSName.getPDFName( "C" ) );
-        addCharacterEncoding( 0202, COSName.getPDFName( "Ccedilla" ) );
-        addCharacterEncoding( 0104, COSName.getPDFName( "D" ) );
-        addCharacterEncoding( 0105, COSName.getPDFName( "E" ) );
-        addCharacterEncoding( 0203, COSName.getPDFName( "Eacute" ) );
-        addCharacterEncoding( 0346, COSName.getPDFName( "Ecircumflex" ) );
-        addCharacterEncoding( 0350, COSName.getPDFName( "Edieresis" ) );
-        addCharacterEncoding( 0351, COSName.getPDFName( "Egrave" ) );
-        addCharacterEncoding( 0106, COSName.getPDFName( "F" ) );
-        addCharacterEncoding( 0107, COSName.getPDFName( "G" ) );
-        addCharacterEncoding( 0110, COSName.getPDFName( "H" ) );
-        addCharacterEncoding( 0111, COSName.getPDFName( "I" ) );
-        addCharacterEncoding( 0352, COSName.getPDFName( "Iacute" ) );
-        addCharacterEncoding( 0353, COSName.getPDFName( "Icircumflex" ) );
-        addCharacterEncoding( 0354, COSName.getPDFName( "Idieresis" ) );
-        addCharacterEncoding( 0355, COSName.getPDFName( "Igrave" ) );
-        addCharacterEncoding( 0112, COSName.getPDFName( "J" ) );
-        addCharacterEncoding( 0113, COSName.getPDFName( "K" ) );
-        addCharacterEncoding( 0114, COSName.getPDFName( "L" ) );
-        addCharacterEncoding( 0115, COSName.getPDFName( "M" ) );
-        addCharacterEncoding( 0116, COSName.getPDFName( "N" ) );
-        addCharacterEncoding( 0204, COSName.getPDFName( "Ntilde" ) );
-        addCharacterEncoding( 0117, COSName.getPDFName( "O" ) );
-        addCharacterEncoding( 0316, COSName.getPDFName( "OE" ) );
-        addCharacterEncoding( 0356, COSName.getPDFName( "Oacute" ) );
-        addCharacterEncoding( 0357, COSName.getPDFName( "Ocircumflex" ) );
-        addCharacterEncoding( 0205, COSName.getPDFName( "Odieresis" ) );
-        addCharacterEncoding( 0361, COSName.getPDFName( "Ograve" ) );
-        addCharacterEncoding( 0257, COSName.getPDFName( "Oslash" ) );
-        addCharacterEncoding( 0315, COSName.getPDFName( "Otilde" ) );
-        addCharacterEncoding( 0120, COSName.getPDFName( "P" ) );
-        addCharacterEncoding( 0121, COSName.getPDFName( "Q" ) );
-        addCharacterEncoding( 0122, COSName.getPDFName( "R" ) );
-        addCharacterEncoding( 0123, COSName.getPDFName( "S" ) );
-        addCharacterEncoding( 0124, COSName.getPDFName( "T" ) );
-        addCharacterEncoding( 0125, COSName.getPDFName( "U" ) );
-        addCharacterEncoding( 0362, COSName.getPDFName( "Uacute" ) );
-        addCharacterEncoding( 0363, COSName.getPDFName( "Ucircumflex" ) );
-        addCharacterEncoding( 0206, COSName.getPDFName( "Udieresis" ) );
-        addCharacterEncoding( 0364, COSName.getPDFName( "Ugrave" ) );
-        addCharacterEncoding( 0126, COSName.getPDFName( "V" ) );
-        addCharacterEncoding( 0127, COSName.getPDFName( "W" ) );
-        addCharacterEncoding( 0130, COSName.getPDFName( "X" ) );
-        addCharacterEncoding( 0131, COSName.getPDFName( "Y" ) );
-        addCharacterEncoding( 0331, COSName.getPDFName( "Ydieresis" ) );
-        addCharacterEncoding( 0132, COSName.getPDFName( "Z" ) );
-        addCharacterEncoding( 0141, COSName.getPDFName( "a" ) );
-        addCharacterEncoding( 0207, COSName.getPDFName( "aacute" ) );
-        addCharacterEncoding( 0211, COSName.getPDFName( "acircumflex" ) );
-        addCharacterEncoding( 0253, COSName.getPDFName( "acute" ) );
-        addCharacterEncoding( 0212, COSName.getPDFName( "adieresis" ) );
-        addCharacterEncoding( 0276, COSName.getPDFName( "ae" ) );
-        addCharacterEncoding( 0210, COSName.getPDFName( "agrave" ) );
-        addCharacterEncoding( 046, COSName.getPDFName( "ampersand" ) );
-        addCharacterEncoding( 0214, COSName.getPDFName( "aring" ) );
-        addCharacterEncoding( 0136, COSName.getPDFName( "asciicircum" ) );
-        addCharacterEncoding( 0176, COSName.getPDFName( "asciitilde" ) );
-        addCharacterEncoding( 052, COSName.getPDFName( "asterisk" ) );
-        addCharacterEncoding( 0100, COSName.getPDFName( "at" ) );
-        addCharacterEncoding( 0213, COSName.getPDFName( "atilde" ) );
-        addCharacterEncoding( 0142, COSName.getPDFName( "b" ) );
-        addCharacterEncoding( 0134, COSName.getPDFName( "backslash" ) );
-        addCharacterEncoding( 0174, COSName.getPDFName( "bar" ) );
-        addCharacterEncoding( 0173, COSName.getPDFName( "braceleft" ) );
-        addCharacterEncoding( 0175, COSName.getPDFName( "braceright" ) );
-        addCharacterEncoding( 0133, COSName.getPDFName( "bracketleft" ) );
-        addCharacterEncoding( 0135, COSName.getPDFName( "bracketright" ) );
-        addCharacterEncoding( 0371, COSName.getPDFName( "breve" ) );
-        addCharacterEncoding( 0245, COSName.getPDFName( "bullet" ) );
-        addCharacterEncoding( 0143, COSName.getPDFName( "c" ) );
-        addCharacterEncoding( 0377, COSName.getPDFName( "caron" ) );
-        addCharacterEncoding( 0215, COSName.getPDFName( "ccedilla" ) );
-        addCharacterEncoding( 0374, COSName.getPDFName( "cedilla" ) );
-        addCharacterEncoding( 0242, COSName.getPDFName( "cent" ) );
-        addCharacterEncoding( 0366, COSName.getPDFName( "circumflex" ) );
-        addCharacterEncoding( 072, COSName.getPDFName( "colon" ) );
-        addCharacterEncoding( 054, COSName.getPDFName( "comma" ) );
-        addCharacterEncoding( 0251, COSName.getPDFName( "copyright" ) );
-        addCharacterEncoding( 0333, COSName.getPDFName( "currency1" ) );
-        addCharacterEncoding( 0144, COSName.getPDFName( "d" ) );
-        addCharacterEncoding( 0240, COSName.getPDFName( "dagger" ) );
-        addCharacterEncoding( 0340, COSName.getPDFName( "daggerdbl" ) );
-        addCharacterEncoding( 0241, COSName.getPDFName( "degree" ) );
-        addCharacterEncoding( 0254, COSName.getPDFName( "dieresis" ) );
-        addCharacterEncoding( 0326, COSName.getPDFName( "divide" ) );
-        addCharacterEncoding( 044, COSName.getPDFName( "dollar" ) );
-        addCharacterEncoding( 0372, COSName.getPDFName( "dotaccent" ) );
-        addCharacterEncoding( 0365, COSName.getPDFName( "dotlessi" ) );
-        addCharacterEncoding( 0145, COSName.getPDFName( "e" ) );
-        addCharacterEncoding( 0216, COSName.getPDFName( "eacute" ) );
-        addCharacterEncoding( 0220, COSName.getPDFName( "ecircumflex" ) );
-        addCharacterEncoding( 0221, COSName.getPDFName( "edieresis" ) );
-        addCharacterEncoding( 0217, COSName.getPDFName( "egrave" ) );
-        addCharacterEncoding( 070, COSName.getPDFName( "eight" ) );
-        addCharacterEncoding( 0311, COSName.getPDFName( "ellipsis" ) );
-        addCharacterEncoding( 0321, COSName.getPDFName( "emdash" ) );
-        addCharacterEncoding( 0320, COSName.getPDFName( "endash" ) );
-        addCharacterEncoding( 075, COSName.getPDFName( "equal" ) );
-        addCharacterEncoding( 041, COSName.getPDFName( "exclam" ) );
-        addCharacterEncoding( 0301, COSName.getPDFName( "exclamdown" ) );
-        addCharacterEncoding( 0146, COSName.getPDFName( "f" ) );
-        addCharacterEncoding( 0336, COSName.getPDFName( "fi" ) );
-        addCharacterEncoding( 065, COSName.getPDFName( "five" ) );
-        addCharacterEncoding( 0337, COSName.getPDFName( "fl" ) );
-        addCharacterEncoding( 0304, COSName.getPDFName( "florin" ) );
-        addCharacterEncoding( 064, COSName.getPDFName( "four" ) );
-        addCharacterEncoding( 0332, COSName.getPDFName( "fraction" ) );
-        addCharacterEncoding( 0147, COSName.getPDFName( "g" ) );
-        addCharacterEncoding( 0247, COSName.getPDFName( "germandbls" ) );
-        addCharacterEncoding( 0140, COSName.getPDFName( "grave" ) );
-        addCharacterEncoding( 076, COSName.getPDFName( "greater" ) );
-        addCharacterEncoding( 0307, COSName.getPDFName( "guillemotleft" ) );
-        addCharacterEncoding( 0310, COSName.getPDFName( "guillemotright" ) );
-        addCharacterEncoding( 0334, COSName.getPDFName( "guilsinglleft" ) );
-        addCharacterEncoding( 0335, COSName.getPDFName( "guilsinglright" ) );
-        addCharacterEncoding( 0150, COSName.getPDFName( "h" ) );
-        addCharacterEncoding( 0375, COSName.getPDFName( "hungarumlaut" ) );
-        addCharacterEncoding( 055, COSName.getPDFName( "hyphen" ) );
-        addCharacterEncoding( 0151, COSName.getPDFName( "i" ) );
-        addCharacterEncoding( 0222, COSName.getPDFName( "iacute" ) );
-        addCharacterEncoding( 0224, COSName.getPDFName( "icircumflex" ) );
-        addCharacterEncoding( 0225, COSName.getPDFName( "idieresis" ) );
-        addCharacterEncoding( 0223, COSName.getPDFName( "igrave" ) );
-        addCharacterEncoding( 0152, COSName.getPDFName( "j" ) );
-        addCharacterEncoding( 0153, COSName.getPDFName( "k" ) );
-        addCharacterEncoding( 0154, COSName.getPDFName( "l" ) );
-        addCharacterEncoding( 074, COSName.getPDFName( "less" ) );
-        addCharacterEncoding( 0302, COSName.getPDFName( "logicalnot" ) );
-        addCharacterEncoding( 0155, COSName.getPDFName( "m" ) );
-        addCharacterEncoding( 0370, COSName.getPDFName( "macron" ) );
-        addCharacterEncoding( 0265, COSName.getPDFName( "mu" ) );
-        addCharacterEncoding( 0156, COSName.getPDFName( "n" ) );
-        addCharacterEncoding( 071, COSName.getPDFName( "nine" ) );
-        addCharacterEncoding( 0226, COSName.getPDFName( "ntilde" ) );
-        addCharacterEncoding( 043, COSName.getPDFName( "numbersign" ) );
-        addCharacterEncoding( 0157, COSName.getPDFName( "o" ) );
-        addCharacterEncoding( 0227, COSName.getPDFName( "oacute" ) );
-        addCharacterEncoding( 0231, COSName.getPDFName( "ocircumflex" ) );
-        addCharacterEncoding( 0232, COSName.getPDFName( "odieresis" ) );
-        addCharacterEncoding( 0317, COSName.getPDFName( "oe" ) );
-        addCharacterEncoding( 0376, COSName.getPDFName( "ogonek" ) );
-        addCharacterEncoding( 0230, COSName.getPDFName( "ograve" ) );
-        addCharacterEncoding( 061, COSName.getPDFName( "one" ) );
-        addCharacterEncoding( 0273, COSName.getPDFName( "ordfeminine" ) );
-        addCharacterEncoding( 0274, COSName.getPDFName( "ordmasculine" ) );
-        addCharacterEncoding( 0277, COSName.getPDFName( "oslash" ) );
-        addCharacterEncoding( 0233, COSName.getPDFName( "otilde" ) );
-        addCharacterEncoding( 0160, COSName.getPDFName( "p" ) );
-        addCharacterEncoding( 0246, COSName.getPDFName( "paragraph" ) );
-        addCharacterEncoding( 050, COSName.getPDFName( "parenleft" ) );
-        addCharacterEncoding( 051, COSName.getPDFName( "parenright" ) );
-        addCharacterEncoding( 045, COSName.getPDFName( "percent" ) );
-        addCharacterEncoding( 056, COSName.getPDFName( "period" ) );
-        addCharacterEncoding( 0341, COSName.getPDFName( "periodcentered" ) );
-        addCharacterEncoding( 0344, COSName.getPDFName( "perthousand" ) );
-        addCharacterEncoding( 053, COSName.getPDFName( "plus" ) );
-        addCharacterEncoding( 0261, COSName.getPDFName( "plusminus" ) );
-        addCharacterEncoding( 0161, COSName.getPDFName( "q" ) );
-        addCharacterEncoding( 077, COSName.getPDFName( "question" ) );
-        addCharacterEncoding( 0300, COSName.getPDFName( "questiondown" ) );
-        addCharacterEncoding( 042, COSName.getPDFName( "quotedbl" ) );
-        addCharacterEncoding( 0343, COSName.getPDFName( "quotedblbase" ) );
-        addCharacterEncoding( 0322, COSName.getPDFName( "quotedblleft" ) );
-        addCharacterEncoding( 0323, COSName.getPDFName( "quotedblright" ) );
-        addCharacterEncoding( 0324, COSName.getPDFName( "quoteleft" ) );
-        addCharacterEncoding( 0325, COSName.getPDFName( "quoteright" ) );
-        addCharacterEncoding( 0342, COSName.getPDFName( "quotesinglbase" ) );
-        addCharacterEncoding( 047, COSName.getPDFName( "quotesingle" ) );
-        addCharacterEncoding( 0162, COSName.getPDFName( "r" ) );
-        addCharacterEncoding( 0250, COSName.getPDFName( "registered" ) );
-        addCharacterEncoding( 0373, COSName.getPDFName( "ring" ) );
-        addCharacterEncoding( 0163, COSName.getPDFName( "s" ) );
-        addCharacterEncoding( 0244, COSName.getPDFName( "section" ) );
-        addCharacterEncoding( 073, COSName.getPDFName( "semicolon" ) );
-        addCharacterEncoding( 067, COSName.getPDFName( "seven" ) );
-        addCharacterEncoding( 066, COSName.getPDFName( "six" ) );
-        addCharacterEncoding( 057, COSName.getPDFName( "slash" ) );
-        addCharacterEncoding( 040, COSName.getPDFName( "space" ) );
-        addCharacterEncoding( 0243, COSName.getPDFName( "sterling" ) );
-        addCharacterEncoding( 0164, COSName.getPDFName( "t" ) );
-        addCharacterEncoding( 063, COSName.getPDFName( "three" ) );
-        addCharacterEncoding( 0367, COSName.getPDFName( "tilde" ) );
-        addCharacterEncoding( 0252, COSName.getPDFName( "trademark" ) );
-        addCharacterEncoding( 062, COSName.getPDFName( "two" ) );
-        addCharacterEncoding( 0165, COSName.getPDFName( "u" ) );
-        addCharacterEncoding( 0234, COSName.getPDFName( "uacute" ) );
-        addCharacterEncoding( 0236, COSName.getPDFName( "ucircumflex" ) );
-        addCharacterEncoding( 0237, COSName.getPDFName( "udieresis" ) );
-        addCharacterEncoding( 0235, COSName.getPDFName( "ugrave" ) );
-        addCharacterEncoding( 0137, COSName.getPDFName( "underscore" ) );
-        addCharacterEncoding( 0166, COSName.getPDFName( "v" ) );
-        addCharacterEncoding( 0167, COSName.getPDFName( "w" ) );
-        addCharacterEncoding( 0170, COSName.getPDFName( "x" ) );
-        addCharacterEncoding( 0171, COSName.getPDFName( "y" ) );
-        addCharacterEncoding( 0330, COSName.getPDFName( "ydieresis" ) );
-        addCharacterEncoding( 0264, COSName.getPDFName( "yen" ) );
-        addCharacterEncoding( 0172, COSName.getPDFName( "z" ) );
-        addCharacterEncoding( 060, COSName.getPDFName( "zero" ) );
+        addCharacterEncoding( 0101, "A" );
+        addCharacterEncoding( 0256, "AE" );
+        addCharacterEncoding( 0347, "Aacute" );
+        addCharacterEncoding( 0345, "Acircumflex" );
+        addCharacterEncoding( 0200, "Adieresis" );
+        addCharacterEncoding( 0313, "Agrave" );
+        addCharacterEncoding( 0201, "Aring" );
+        addCharacterEncoding( 0314, "Atilde" );
+        addCharacterEncoding( 0102, "B" );
+        addCharacterEncoding( 0103, "C" );
+        addCharacterEncoding( 0202, "Ccedilla" );
+        addCharacterEncoding( 0104, "D" );
+        addCharacterEncoding( 0105, "E" );
+        addCharacterEncoding( 0203, "Eacute" );
+        addCharacterEncoding( 0346, "Ecircumflex" );
+        addCharacterEncoding( 0350, "Edieresis" );
+        addCharacterEncoding( 0351, "Egrave" );
+        addCharacterEncoding( 0106, "F" );
+        addCharacterEncoding( 0107, "G" );
+        addCharacterEncoding( 0110, "H" );
+        addCharacterEncoding( 0111, "I" );
+        addCharacterEncoding( 0352, "Iacute" );
+        addCharacterEncoding( 0353, "Icircumflex" );
+        addCharacterEncoding( 0354, "Idieresis" );
+        addCharacterEncoding( 0355, "Igrave" );
+        addCharacterEncoding( 0112, "J" );
+        addCharacterEncoding( 0113, "K" );
+        addCharacterEncoding( 0114, "L" );
+        addCharacterEncoding( 0115, "M" );
+        addCharacterEncoding( 0116, "N" );
+        addCharacterEncoding( 0204, "Ntilde" );
+        addCharacterEncoding( 0117, "O" );
+        addCharacterEncoding( 0316, "OE" );
+        addCharacterEncoding( 0356, "Oacute" );
+        addCharacterEncoding( 0357, "Ocircumflex" );
+        addCharacterEncoding( 0205, "Odieresis" );
+        addCharacterEncoding( 0361, "Ograve" );
+        addCharacterEncoding( 0257, "Oslash" );
+        addCharacterEncoding( 0315, "Otilde" );
+        addCharacterEncoding( 0120, "P" );
+        addCharacterEncoding( 0121, "Q" );
+        addCharacterEncoding( 0122, "R" );
+        addCharacterEncoding( 0123, "S" );
+        addCharacterEncoding( 0124, "T" );
+        addCharacterEncoding( 0125, "U" );
+        addCharacterEncoding( 0362, "Uacute" );
+        addCharacterEncoding( 0363, "Ucircumflex" );
+        addCharacterEncoding( 0206, "Udieresis" );
+        addCharacterEncoding( 0364, "Ugrave" );
+        addCharacterEncoding( 0126, "V" );
+        addCharacterEncoding( 0127, "W" );
+        addCharacterEncoding( 0130, "X" );
+        addCharacterEncoding( 0131, "Y" );
+        addCharacterEncoding( 0331, "Ydieresis" );
+        addCharacterEncoding( 0132, "Z" );
+        addCharacterEncoding( 0141, "a" );
+        addCharacterEncoding( 0207, "aacute" );
+        addCharacterEncoding( 0211, "acircumflex" );
+        addCharacterEncoding( 0253, "acute" );
+        addCharacterEncoding( 0212, "adieresis" );
+        addCharacterEncoding( 0276, "ae" );
+        addCharacterEncoding( 0210, "agrave" );
+        addCharacterEncoding( 046, "ampersand" );
+        addCharacterEncoding( 0214, "aring" );
+        addCharacterEncoding( 0136, "asciicircum" );
+        addCharacterEncoding( 0176, "asciitilde" );
+        addCharacterEncoding( 052, "asterisk" );
+        addCharacterEncoding( 0100, "at" );
+        addCharacterEncoding( 0213, "atilde" );
+        addCharacterEncoding( 0142, "b" );
+        addCharacterEncoding( 0134, "backslash" );
+        addCharacterEncoding( 0174, "bar" );
+        addCharacterEncoding( 0173, "braceleft" );
+        addCharacterEncoding( 0175, "braceright" );
+        addCharacterEncoding( 0133, "bracketleft" );
+        addCharacterEncoding( 0135, "bracketright" );
+        addCharacterEncoding( 0371, "breve" );
+        addCharacterEncoding( 0245, "bullet" );
+        addCharacterEncoding( 0143, "c" );
+        addCharacterEncoding( 0377, "caron" );
+        addCharacterEncoding( 0215, "ccedilla" );
+        addCharacterEncoding( 0374, "cedilla" );
+        addCharacterEncoding( 0242, "cent" );
+        addCharacterEncoding( 0366, "circumflex" );
+        addCharacterEncoding( 072, "colon" );
+        addCharacterEncoding( 054, "comma" );
+        addCharacterEncoding( 0251, "copyright" );
+        addCharacterEncoding( 0333, "currency1" );
+        addCharacterEncoding( 0144, "d" );
+        addCharacterEncoding( 0240, "dagger" );
+        addCharacterEncoding( 0340, "daggerdbl" );
+        addCharacterEncoding( 0241, "degree" );
+        addCharacterEncoding( 0254, "dieresis" );
+        addCharacterEncoding( 0326, "divide" );
+        addCharacterEncoding( 044, "dollar" );
+        addCharacterEncoding( 0372, "dotaccent" );
+        addCharacterEncoding( 0365, "dotlessi" );
+        addCharacterEncoding( 0145, "e" );
+        addCharacterEncoding( 0216, "eacute" );
+        addCharacterEncoding( 0220, "ecircumflex" );
+        addCharacterEncoding( 0221, "edieresis" );
+        addCharacterEncoding( 0217, "egrave" );
+        addCharacterEncoding( 070, "eight" );
+        addCharacterEncoding( 0311, "ellipsis" );
+        addCharacterEncoding( 0321, "emdash" );
+        addCharacterEncoding( 0320, "endash" );
+        addCharacterEncoding( 075, "equal" );
+        addCharacterEncoding( 041, "exclam" );
+        addCharacterEncoding( 0301, "exclamdown" );
+        addCharacterEncoding( 0146, "f" );
+        addCharacterEncoding( 0336, "fi" );
+        addCharacterEncoding( 065, "five" );
+        addCharacterEncoding( 0337, "fl" );
+        addCharacterEncoding( 0304, "florin" );
+        addCharacterEncoding( 064, "four" );
+        addCharacterEncoding( 0332, "fraction" );
+        addCharacterEncoding( 0147, "g" );
+        addCharacterEncoding( 0247, "germandbls" );
+        addCharacterEncoding( 0140, "grave" );
+        addCharacterEncoding( 076, "greater" );
+        addCharacterEncoding( 0307, "guillemotleft" );
+        addCharacterEncoding( 0310, "guillemotright" );
+        addCharacterEncoding( 0334, "guilsinglleft" );
+        addCharacterEncoding( 0335, "guilsinglright" );
+        addCharacterEncoding( 0150, "h" );
+        addCharacterEncoding( 0375, "hungarumlaut" );
+        addCharacterEncoding( 055, "hyphen" );
+        addCharacterEncoding( 0151, "i" );
+        addCharacterEncoding( 0222, "iacute" );
+        addCharacterEncoding( 0224, "icircumflex" );
+        addCharacterEncoding( 0225, "idieresis" );
+        addCharacterEncoding( 0223, "igrave" );
+        addCharacterEncoding( 0152, "j" );
+        addCharacterEncoding( 0153, "k" );
+        addCharacterEncoding( 0154, "l" );
+        addCharacterEncoding( 074, "less" );
+        addCharacterEncoding( 0302, "logicalnot" );
+        addCharacterEncoding( 0155, "m" );
+        addCharacterEncoding( 0370, "macron" );
+        addCharacterEncoding( 0265, "mu" );
+        addCharacterEncoding( 0156, "n" );
+        addCharacterEncoding( 071, "nine" );
+        addCharacterEncoding( 0226, "ntilde" );
+        addCharacterEncoding( 043, "numbersign" );
+        addCharacterEncoding( 0157, "o" );
+        addCharacterEncoding( 0227, "oacute" );
+        addCharacterEncoding( 0231, "ocircumflex" );
+        addCharacterEncoding( 0232, "odieresis" );
+        addCharacterEncoding( 0317, "oe" );
+        addCharacterEncoding( 0376, "ogonek" );
+        addCharacterEncoding( 0230, "ograve" );
+        addCharacterEncoding( 061, "one" );
+        addCharacterEncoding( 0273, "ordfeminine" );
+        addCharacterEncoding( 0274, "ordmasculine" );
+        addCharacterEncoding( 0277, "oslash" );
+        addCharacterEncoding( 0233, "otilde" );
+        addCharacterEncoding( 0160, "p" );
+        addCharacterEncoding( 0246, "paragraph" );
+        addCharacterEncoding( 050, "parenleft" );
+        addCharacterEncoding( 051, "parenright" );
+        addCharacterEncoding( 045, "percent" );
+        addCharacterEncoding( 056, "period" );
+        addCharacterEncoding( 0341, "periodcentered" );
+        addCharacterEncoding( 0344, "perthousand" );
+        addCharacterEncoding( 053, "plus" );
+        addCharacterEncoding( 0261, "plusminus" );
+        addCharacterEncoding( 0161, "q" );
+        addCharacterEncoding( 077, "question" );
+        addCharacterEncoding( 0300, "questiondown" );
+        addCharacterEncoding( 042, "quotedbl" );
+        addCharacterEncoding( 0343, "quotedblbase" );
+        addCharacterEncoding( 0322, "quotedblleft" );
+        addCharacterEncoding( 0323, "quotedblright" );
+        addCharacterEncoding( 0324, "quoteleft" );
+        addCharacterEncoding( 0325, "quoteright" );
+        addCharacterEncoding( 0342, "quotesinglbase" );
+        addCharacterEncoding( 047, "quotesingle" );
+        addCharacterEncoding( 0162, "r" );
+        addCharacterEncoding( 0250, "registered" );
+        addCharacterEncoding( 0373, "ring" );
+        addCharacterEncoding( 0163, "s" );
+        addCharacterEncoding( 0244, "section" );
+        addCharacterEncoding( 073, "semicolon" );
+        addCharacterEncoding( 067, "seven" );
+        addCharacterEncoding( 066, "six" );
+        addCharacterEncoding( 057, "slash" );
+        addCharacterEncoding( 040, "space" );
+        addCharacterEncoding( 0243, "sterling" );
+        addCharacterEncoding( 0164, "t" );
+        addCharacterEncoding( 063, "three" );
+        addCharacterEncoding( 0367, "tilde" );
+        addCharacterEncoding( 0252, "trademark" );
+        addCharacterEncoding( 062, "two" );
+        addCharacterEncoding( 0165, "u" );
+        addCharacterEncoding( 0234, "uacute" );
+        addCharacterEncoding( 0236, "ucircumflex" );
+        addCharacterEncoding( 0237, "udieresis" );
+        addCharacterEncoding( 0235, "ugrave" );
+        addCharacterEncoding( 0137, "underscore" );
+        addCharacterEncoding( 0166, "v" );
+        addCharacterEncoding( 0167, "w" );
+        addCharacterEncoding( 0170, "x" );
+        addCharacterEncoding( 0171, "y" );
+        addCharacterEncoding( 0330, "ydieresis" );
+        addCharacterEncoding( 0264, "yen" );
+        addCharacterEncoding( 0172, "z" );
+        addCharacterEncoding( 060, "zero" );
     }
 
     /**

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/PdfDocEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/PdfDocEncoding.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/PdfDocEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/PdfDocEncoding.java Sun Mar 28 17:57:19 2010
@@ -32,235 +32,235 @@ public class PdfDocEncoding extends Enco
      */
     public PdfDocEncoding()
     {
-        addCharacterEncoding( 0101, COSName.getPDFName( "A" ) );
-        addCharacterEncoding( 0306, COSName.getPDFName( "AE" ) );
-        addCharacterEncoding( 0301, COSName.getPDFName( "Aacute" ) );
-        addCharacterEncoding( 0302, COSName.getPDFName( "Acircumflex" ) );
-        addCharacterEncoding( 0304, COSName.getPDFName( "Adieresis" ) );
-        addCharacterEncoding( 0300, COSName.getPDFName( "Agrave" ) );
-        addCharacterEncoding( 0305, COSName.getPDFName( "Aring" ) );
-        addCharacterEncoding( 0303, COSName.getPDFName( "Atilde" ) );
-        addCharacterEncoding( 0102, COSName.getPDFName( "B" ) );
-        addCharacterEncoding( 0103, COSName.getPDFName( "C" ) );
-        addCharacterEncoding( 0307, COSName.getPDFName( "Ccedilla" ) );
-        addCharacterEncoding( 0104, COSName.getPDFName( "D" ) );
-        addCharacterEncoding( 0105, COSName.getPDFName( "E" ) );
-        addCharacterEncoding( 0311, COSName.getPDFName( "Eacute" ) );
-        addCharacterEncoding( 0312, COSName.getPDFName( "Ecircumflex" ) );
-        addCharacterEncoding( 0313, COSName.getPDFName( "Edieresis" ) );
-        addCharacterEncoding( 0310, COSName.getPDFName( "Egrave" ) );
-        addCharacterEncoding( 0320, COSName.getPDFName( "Eth" ) );
-        addCharacterEncoding( 0240, COSName.getPDFName( "Euro" ) );
-        addCharacterEncoding( 0106, COSName.getPDFName( "F" ) );
-        addCharacterEncoding( 0107, COSName.getPDFName( "G" ) );
-        addCharacterEncoding( 0110, COSName.getPDFName( "H" ) );
-        addCharacterEncoding( 0111, COSName.getPDFName( "I" ) );
-        addCharacterEncoding( 0315, COSName.getPDFName( "Iacute" ) );
-        addCharacterEncoding( 0316, COSName.getPDFName( "Icircumflex" ) );
-        addCharacterEncoding( 0317, COSName.getPDFName( "Idieresis" ) );
-        addCharacterEncoding( 0314, COSName.getPDFName( "Igrave" ) );
-        addCharacterEncoding( 0112, COSName.getPDFName( "J" ) );
-        addCharacterEncoding( 0113, COSName.getPDFName( "K" ) );
-        addCharacterEncoding( 0114, COSName.getPDFName( "L" ) );
-        addCharacterEncoding( 0225, COSName.getPDFName( "Lslash" ) );
-        addCharacterEncoding( 0115, COSName.getPDFName( "M" ) );
-        addCharacterEncoding( 0116, COSName.getPDFName( "N" ) );
-        addCharacterEncoding( 0321, COSName.getPDFName( "Ntilde" ) );
-        addCharacterEncoding( 0117, COSName.getPDFName( "O" ) );
-        addCharacterEncoding( 0226, COSName.getPDFName( "OE" ) );
-        addCharacterEncoding( 0323, COSName.getPDFName( "Oacute" ) );
-        addCharacterEncoding( 0324, COSName.getPDFName( "Ocircumflex" ) );
-        addCharacterEncoding( 0326, COSName.getPDFName( "Odieresis" ) );
-        addCharacterEncoding( 0322, COSName.getPDFName( "Ograve" ) );
-        addCharacterEncoding( 0330, COSName.getPDFName( "Oslash" ) );
-        addCharacterEncoding( 0325, COSName.getPDFName( "Otilde" ) );
-        addCharacterEncoding( 0120, COSName.getPDFName( "P" ) );
-        addCharacterEncoding( 0121, COSName.getPDFName( "Q" ) );
-        addCharacterEncoding( 0122, COSName.getPDFName( "R" ) );
-        addCharacterEncoding( 0123, COSName.getPDFName( "S" ) );
-        addCharacterEncoding( 0227, COSName.getPDFName( "Scaron" ) );
-        addCharacterEncoding( 0124, COSName.getPDFName( "T" ) );
-        addCharacterEncoding( 0336, COSName.getPDFName( "Thorn" ) );
-        addCharacterEncoding( 0125, COSName.getPDFName( "U" ) );
-        addCharacterEncoding( 0332, COSName.getPDFName( "Uacute" ) );
-        addCharacterEncoding( 0333, COSName.getPDFName( "Ucircumflex" ) );
-        addCharacterEncoding( 0334, COSName.getPDFName( "Udieresis" ) );
-        addCharacterEncoding( 0331, COSName.getPDFName( "Ugrave" ) );
-        addCharacterEncoding( 0126, COSName.getPDFName( "V" ) );
-        addCharacterEncoding( 0127, COSName.getPDFName( "W" ) );
-        addCharacterEncoding( 0130, COSName.getPDFName( "X" ) );
-        addCharacterEncoding( 0131, COSName.getPDFName( "Y" ) );
-        addCharacterEncoding( 0335, COSName.getPDFName( "Yacute" ) );
-        addCharacterEncoding( 0230, COSName.getPDFName( "Ydieresis" ) );
-        addCharacterEncoding( 0132, COSName.getPDFName( "Z" ) );
-        addCharacterEncoding( 0231, COSName.getPDFName( "Zcaron" ) );
-        addCharacterEncoding( 0141, COSName.getPDFName( "a" ) );
-        addCharacterEncoding( 0341, COSName.getPDFName( "aacute" ) );
-        addCharacterEncoding( 0342, COSName.getPDFName( "acircumflex" ) );
-        addCharacterEncoding( 0264, COSName.getPDFName( "acute" ) );
-        addCharacterEncoding( 0344, COSName.getPDFName( "adieresis" ) );
-        addCharacterEncoding( 0346, COSName.getPDFName( "ae" ) );
-        addCharacterEncoding( 0340, COSName.getPDFName( "agrave" ) );
-        addCharacterEncoding( 046, COSName.getPDFName( "ampersand" ) );
-        addCharacterEncoding( 0345, COSName.getPDFName( "aring" ) );
-        addCharacterEncoding( 0136, COSName.getPDFName( "asciicircum" ) );
-        addCharacterEncoding( 0176, COSName.getPDFName( "asciitilde" ) );
-        addCharacterEncoding( 052, COSName.getPDFName( "asterisk" ) );
-        addCharacterEncoding( 0100, COSName.getPDFName( "at" ) );
-        addCharacterEncoding( 0343, COSName.getPDFName( "atilde" ) );
-        addCharacterEncoding( 0142, COSName.getPDFName( "b" ) );
-        addCharacterEncoding( 0134, COSName.getPDFName( "backslash" ) );
-        addCharacterEncoding( 0174, COSName.getPDFName( "bar" ) );
-        addCharacterEncoding( 0173, COSName.getPDFName( "braceleft" ) );
-        addCharacterEncoding( 0175, COSName.getPDFName( "braceright" ) );
-        addCharacterEncoding( 0133, COSName.getPDFName( "bracketleft" ) );
-        addCharacterEncoding( 0135, COSName.getPDFName( "bracketright" ) );
-        addCharacterEncoding( 030, COSName.getPDFName( "breve" ) );
-        addCharacterEncoding( 0246, COSName.getPDFName( "brokenbar" ) );
-        addCharacterEncoding( 0200, COSName.getPDFName( "bullet" ) );
-        addCharacterEncoding( 0143, COSName.getPDFName( "c" ) );
-        addCharacterEncoding( 031, COSName.getPDFName( "caron" ) );
-        addCharacterEncoding( 0347, COSName.getPDFName( "ccedilla" ) );
-        addCharacterEncoding( 0270, COSName.getPDFName( "cedilla" ) );
-        addCharacterEncoding( 0242, COSName.getPDFName( "cent" ) );
-        addCharacterEncoding( 032, COSName.getPDFName( "circumflex" ) );
-        addCharacterEncoding( 072, COSName.getPDFName( "colon" ) );
-        addCharacterEncoding( 054, COSName.getPDFName( "comma" ) );
-        addCharacterEncoding( 0251, COSName.getPDFName( "copyright" ) );
-        addCharacterEncoding( 0244, COSName.getPDFName( "currency1" ) );
-        addCharacterEncoding( 0144, COSName.getPDFName( "d" ) );
-        addCharacterEncoding( 0201, COSName.getPDFName( "dagger" ) );
-        addCharacterEncoding( 0202, COSName.getPDFName( "daggerdbl" ) );
-        addCharacterEncoding( 0260, COSName.getPDFName( "degree" ) );
-        addCharacterEncoding( 0250, COSName.getPDFName( "dieresis" ) );
-        addCharacterEncoding( 0367, COSName.getPDFName( "divide" ) );
-        addCharacterEncoding( 044, COSName.getPDFName( "dollar" ) );
-        addCharacterEncoding( 033, COSName.getPDFName( "dotaccent" ) );
-        addCharacterEncoding( 0232, COSName.getPDFName( "dotlessi" ) );
-        addCharacterEncoding( 0145, COSName.getPDFName( "e" ) );
-        addCharacterEncoding( 0351, COSName.getPDFName( "eacute" ) );
-        addCharacterEncoding( 0352, COSName.getPDFName( "ecircumflex" ) );
-        addCharacterEncoding( 0353, COSName.getPDFName( "edieresis" ) );
-        addCharacterEncoding( 0350, COSName.getPDFName( "egrave" ) );
-        addCharacterEncoding( 070, COSName.getPDFName( "eight" ) );
-        addCharacterEncoding( 0203, COSName.getPDFName( "ellipsis" ) );
-        addCharacterEncoding( 0204, COSName.getPDFName( "emdash" ) );
-        addCharacterEncoding( 0205, COSName.getPDFName( "endash" ) );
-        addCharacterEncoding( 075, COSName.getPDFName( "equal" ) );
-        addCharacterEncoding( 0360, COSName.getPDFName( "eth" ) );
-        addCharacterEncoding( 041, COSName.getPDFName( "exclam" ) );
-        addCharacterEncoding( 0241, COSName.getPDFName( "exclamdown" ) );
-        addCharacterEncoding( 0146, COSName.getPDFName( "f" ) );
-        addCharacterEncoding( 0223, COSName.getPDFName( "fi" ) );
-        addCharacterEncoding( 065, COSName.getPDFName( "five" ) );
-        addCharacterEncoding( 0224, COSName.getPDFName( "fl" ) );
-        addCharacterEncoding( 0206, COSName.getPDFName( "florin" ) );
-        addCharacterEncoding( 064, COSName.getPDFName( "four" ) );
-        addCharacterEncoding( 0207, COSName.getPDFName( "fraction" ) );
-        addCharacterEncoding( 0147, COSName.getPDFName( "g" ) );
-        addCharacterEncoding( 0337, COSName.getPDFName( "germandbls" ) );
-        addCharacterEncoding( 0140, COSName.getPDFName( "grave" ) );
-        addCharacterEncoding( 076, COSName.getPDFName( "greater" ) );
-        addCharacterEncoding( 0253, COSName.getPDFName( "guillemotleft" ) );
-        addCharacterEncoding( 0273, COSName.getPDFName( "guillemotright" ) );
-        addCharacterEncoding( 0210, COSName.getPDFName( "guilsinglleft" ) );
-        addCharacterEncoding( 0211, COSName.getPDFName( "guilsinglright" ) );
-        addCharacterEncoding( 0150, COSName.getPDFName( "h" ) );
-        addCharacterEncoding( 034, COSName.getPDFName( "hungarumlaut" ) );
-        addCharacterEncoding( 055, COSName.getPDFName( "hyphen" ) );
-        addCharacterEncoding( 0151, COSName.getPDFName( "i" ) );
-        addCharacterEncoding( 0355, COSName.getPDFName( "iacute" ) );
-        addCharacterEncoding( 0356, COSName.getPDFName( "icircumflex" ) );
-        addCharacterEncoding( 0357, COSName.getPDFName( "idieresis" ) );
-        addCharacterEncoding( 0354, COSName.getPDFName( "igrave" ) );
-        addCharacterEncoding( 0152, COSName.getPDFName( "j" ) );
-        addCharacterEncoding( 0153, COSName.getPDFName( "k" ) );
-        addCharacterEncoding( 0154, COSName.getPDFName( "l" ) );
-        addCharacterEncoding( 074, COSName.getPDFName( "less" ) );
-        addCharacterEncoding( 0254, COSName.getPDFName( "logicalnot" ) );
-        addCharacterEncoding( 0233, COSName.getPDFName( "lslash" ) );
-        addCharacterEncoding( 0155, COSName.getPDFName( "m" ) );
-        addCharacterEncoding( 0257, COSName.getPDFName( "macron" ) );
-        addCharacterEncoding( 0212, COSName.getPDFName( "minus" ) );
-        addCharacterEncoding( 0265, COSName.getPDFName( "mu" ) );
-        addCharacterEncoding( 0327, COSName.getPDFName( "multiply" ) );
-        addCharacterEncoding( 0156, COSName.getPDFName( "n" ) );
-        addCharacterEncoding( 071, COSName.getPDFName( "nine" ) );
-        addCharacterEncoding( 0361, COSName.getPDFName( "ntilde" ) );
-        addCharacterEncoding( 043, COSName.getPDFName( "numbersign" ) );
-        addCharacterEncoding( 0157, COSName.getPDFName( "o" ) );
-        addCharacterEncoding( 0363, COSName.getPDFName( "oacute" ) );
-        addCharacterEncoding( 0364, COSName.getPDFName( "ocircumflex" ) );
-        addCharacterEncoding( 0366, COSName.getPDFName( "odieresis" ) );
-        addCharacterEncoding( 0234, COSName.getPDFName( "oe" ) );
-        addCharacterEncoding( 035, COSName.getPDFName( "ogonek" ) );
-        addCharacterEncoding( 0362, COSName.getPDFName( "ograve" ) );
-        addCharacterEncoding( 061, COSName.getPDFName( "one" ) );
-        addCharacterEncoding( 0275, COSName.getPDFName( "onehalf" ) );
-        addCharacterEncoding( 0274, COSName.getPDFName( "onequarter" ) );
-        addCharacterEncoding( 0271, COSName.getPDFName( "onesuperior" ) );
-        addCharacterEncoding( 0252, COSName.getPDFName( "ordfeminine" ) );
-        addCharacterEncoding( 0272, COSName.getPDFName( "ordmasculine" ) );
-        addCharacterEncoding( 0370, COSName.getPDFName( "oslash" ) );
-        addCharacterEncoding( 0365, COSName.getPDFName( "otilde" ) );
-        addCharacterEncoding( 0160, COSName.getPDFName( "p" ) );
-        addCharacterEncoding( 0266, COSName.getPDFName( "paragraph" ) );
-        addCharacterEncoding( 050, COSName.getPDFName( "parenleft" ) );
-        addCharacterEncoding( 051, COSName.getPDFName( "parenright" ) );
-        addCharacterEncoding( 045, COSName.getPDFName( "percent" ) );
-        addCharacterEncoding( 056, COSName.getPDFName( "period" ) );
-        addCharacterEncoding( 0267, COSName.getPDFName( "periodcentered" ) );
-        addCharacterEncoding( 0213, COSName.getPDFName( "perthousand" ) );
-        addCharacterEncoding( 053, COSName.getPDFName( "plus" ) );
-        addCharacterEncoding( 0261, COSName.getPDFName( "plusminus" ) );
-        addCharacterEncoding( 0161, COSName.getPDFName( "q" ) );
-        addCharacterEncoding( 077, COSName.getPDFName( "question" ) );
-        addCharacterEncoding( 0277, COSName.getPDFName( "questiondown" ) );
-        addCharacterEncoding( 042, COSName.getPDFName( "quotedbl" ) );
-        addCharacterEncoding( 0214, COSName.getPDFName( "quotedblbase" ) );
-        addCharacterEncoding( 0215, COSName.getPDFName( "quotedblleft" ) );
-        addCharacterEncoding( 0216, COSName.getPDFName( "quotedblright" ) );
-        addCharacterEncoding( 0217, COSName.getPDFName( "quoteleft" ) );
-        addCharacterEncoding( 0220, COSName.getPDFName( "quoteright" ) );
-        addCharacterEncoding( 0221, COSName.getPDFName( "quotesinglbase" ) );
-        addCharacterEncoding( 047, COSName.getPDFName( "quotesingle" ) );
-        addCharacterEncoding( 0162, COSName.getPDFName( "r" ) );
-        addCharacterEncoding( 0256, COSName.getPDFName( "registered" ) );
-        addCharacterEncoding( 036, COSName.getPDFName( "ring" ) );
-        addCharacterEncoding( 0163, COSName.getPDFName( "s" ) );
-        addCharacterEncoding( 0235, COSName.getPDFName( "scaron" ) );
-        addCharacterEncoding( 0247, COSName.getPDFName( "section" ) );
-        addCharacterEncoding( 073, COSName.getPDFName( "semicolon" ) );
-        addCharacterEncoding( 067, COSName.getPDFName( "seven" ) );
-        addCharacterEncoding( 066, COSName.getPDFName( "six" ) );
-        addCharacterEncoding( 057, COSName.getPDFName( "slash" ) );
-        addCharacterEncoding( 040, COSName.getPDFName( "space" ) );
-        addCharacterEncoding( 0243, COSName.getPDFName( "sterling" ) );
-        addCharacterEncoding( 0164, COSName.getPDFName( "t" ) );
-        addCharacterEncoding( 0376, COSName.getPDFName( "thorn" ) );
-        addCharacterEncoding( 063, COSName.getPDFName( "three" ) );
-        addCharacterEncoding( 0276, COSName.getPDFName( "threequarters" ) );
-        addCharacterEncoding( 0263, COSName.getPDFName( "threesuperior" ) );
-        addCharacterEncoding( 037, COSName.getPDFName( "tilde" ) );
-        addCharacterEncoding( 0222, COSName.getPDFName( "trademark" ) );
-        addCharacterEncoding( 062, COSName.getPDFName( "two" ) );
-        addCharacterEncoding( 0262, COSName.getPDFName( "twosuperior" ) );
-        addCharacterEncoding( 0165, COSName.getPDFName( "u" ) );
-        addCharacterEncoding( 0372, COSName.getPDFName( "uacute" ) );
-        addCharacterEncoding( 0373, COSName.getPDFName( "ucircumflex" ) );
-        addCharacterEncoding( 0374, COSName.getPDFName( "udieresis" ) );
-        addCharacterEncoding( 0371, COSName.getPDFName( "ugrave" ) );
-        addCharacterEncoding( 0137, COSName.getPDFName( "underscore" ) );
-        addCharacterEncoding( 0166, COSName.getPDFName( "v" ) );
-        addCharacterEncoding( 0167, COSName.getPDFName( "w" ) );
-        addCharacterEncoding( 0170, COSName.getPDFName( "x" ) );
-        addCharacterEncoding( 0171, COSName.getPDFName( "y" ) );
-        addCharacterEncoding( 0375, COSName.getPDFName( "yacute" ) );
-        addCharacterEncoding( 0377, COSName.getPDFName( "ydieresis" ) );
-        addCharacterEncoding( 0245, COSName.getPDFName( "yen" ) );
-        addCharacterEncoding( 0172, COSName.getPDFName( "z" ) );
-        addCharacterEncoding( 0236, COSName.getPDFName( "zcaron" ) );
-        addCharacterEncoding( 060, COSName.getPDFName( "zero" ) );
+        addCharacterEncoding( 0101, "A" );
+        addCharacterEncoding( 0306, "AE" );
+        addCharacterEncoding( 0301, "Aacute" );
+        addCharacterEncoding( 0302, "Acircumflex" );
+        addCharacterEncoding( 0304, "Adieresis" );
+        addCharacterEncoding( 0300, "Agrave" );
+        addCharacterEncoding( 0305, "Aring" );
+        addCharacterEncoding( 0303, "Atilde" );
+        addCharacterEncoding( 0102, "B" );
+        addCharacterEncoding( 0103, "C" );
+        addCharacterEncoding( 0307, "Ccedilla" );
+        addCharacterEncoding( 0104, "D" );
+        addCharacterEncoding( 0105, "E" );
+        addCharacterEncoding( 0311, "Eacute" );
+        addCharacterEncoding( 0312, "Ecircumflex" );
+        addCharacterEncoding( 0313, "Edieresis" );
+        addCharacterEncoding( 0310, "Egrave" );
+        addCharacterEncoding( 0320, "Eth" );
+        addCharacterEncoding( 0240, "Euro" );
+        addCharacterEncoding( 0106, "F" );
+        addCharacterEncoding( 0107, "G" );
+        addCharacterEncoding( 0110, "H" );
+        addCharacterEncoding( 0111, "I" );
+        addCharacterEncoding( 0315, "Iacute" );
+        addCharacterEncoding( 0316, "Icircumflex" );
+        addCharacterEncoding( 0317, "Idieresis" );
+        addCharacterEncoding( 0314, "Igrave" );
+        addCharacterEncoding( 0112, "J" );
+        addCharacterEncoding( 0113, "K" );
+        addCharacterEncoding( 0114, "L" );
+        addCharacterEncoding( 0225, "Lslash" );
+        addCharacterEncoding( 0115, "M" );
+        addCharacterEncoding( 0116, "N" );
+        addCharacterEncoding( 0321, "Ntilde" );
+        addCharacterEncoding( 0117, "O" );
+        addCharacterEncoding( 0226, "OE" );
+        addCharacterEncoding( 0323, "Oacute" );
+        addCharacterEncoding( 0324, "Ocircumflex" );
+        addCharacterEncoding( 0326, "Odieresis" );
+        addCharacterEncoding( 0322, "Ograve" );
+        addCharacterEncoding( 0330, "Oslash" );
+        addCharacterEncoding( 0325, "Otilde" );
+        addCharacterEncoding( 0120, "P" );
+        addCharacterEncoding( 0121, "Q" );
+        addCharacterEncoding( 0122, "R" );
+        addCharacterEncoding( 0123, "S" );
+        addCharacterEncoding( 0227, "Scaron" );
+        addCharacterEncoding( 0124, "T" );
+        addCharacterEncoding( 0336, "Thorn" );
+        addCharacterEncoding( 0125, "U" );
+        addCharacterEncoding( 0332, "Uacute" );
+        addCharacterEncoding( 0333, "Ucircumflex" );
+        addCharacterEncoding( 0334, "Udieresis" );
+        addCharacterEncoding( 0331, "Ugrave" );
+        addCharacterEncoding( 0126, "V" );
+        addCharacterEncoding( 0127, "W" );
+        addCharacterEncoding( 0130, "X" );
+        addCharacterEncoding( 0131, "Y" );
+        addCharacterEncoding( 0335, "Yacute" );
+        addCharacterEncoding( 0230, "Ydieresis" );
+        addCharacterEncoding( 0132, "Z" );
+        addCharacterEncoding( 0231, "Zcaron" );
+        addCharacterEncoding( 0141, "a" );
+        addCharacterEncoding( 0341, "aacute" );
+        addCharacterEncoding( 0342, "acircumflex" );
+        addCharacterEncoding( 0264, "acute" );
+        addCharacterEncoding( 0344, "adieresis" );
+        addCharacterEncoding( 0346, "ae" );
+        addCharacterEncoding( 0340, "agrave" );
+        addCharacterEncoding( 046, "ampersand" );
+        addCharacterEncoding( 0345, "aring" );
+        addCharacterEncoding( 0136, "asciicircum" );
+        addCharacterEncoding( 0176, "asciitilde" );
+        addCharacterEncoding( 052, "asterisk" );
+        addCharacterEncoding( 0100, "at" );
+        addCharacterEncoding( 0343, "atilde" );
+        addCharacterEncoding( 0142, "b" );
+        addCharacterEncoding( 0134, "backslash" );
+        addCharacterEncoding( 0174, "bar" );
+        addCharacterEncoding( 0173, "braceleft" );
+        addCharacterEncoding( 0175, "braceright" );
+        addCharacterEncoding( 0133, "bracketleft" );
+        addCharacterEncoding( 0135, "bracketright" );
+        addCharacterEncoding( 030, "breve" );
+        addCharacterEncoding( 0246, "brokenbar" );
+        addCharacterEncoding( 0200, "bullet" );
+        addCharacterEncoding( 0143, "c" );
+        addCharacterEncoding( 031, "caron" );
+        addCharacterEncoding( 0347, "ccedilla" );
+        addCharacterEncoding( 0270, "cedilla" );
+        addCharacterEncoding( 0242, "cent" );
+        addCharacterEncoding( 032, "circumflex" );
+        addCharacterEncoding( 072, "colon" );
+        addCharacterEncoding( 054, "comma" );
+        addCharacterEncoding( 0251, "copyright" );
+        addCharacterEncoding( 0244, "currency1" );
+        addCharacterEncoding( 0144, "d" );
+        addCharacterEncoding( 0201, "dagger" );
+        addCharacterEncoding( 0202, "daggerdbl" );
+        addCharacterEncoding( 0260, "degree" );
+        addCharacterEncoding( 0250, "dieresis" );
+        addCharacterEncoding( 0367, "divide" );
+        addCharacterEncoding( 044, "dollar" );
+        addCharacterEncoding( 033, "dotaccent" );
+        addCharacterEncoding( 0232, "dotlessi" );
+        addCharacterEncoding( 0145, "e" );
+        addCharacterEncoding( 0351, "eacute" );
+        addCharacterEncoding( 0352, "ecircumflex" );
+        addCharacterEncoding( 0353, "edieresis" );
+        addCharacterEncoding( 0350, "egrave" );
+        addCharacterEncoding( 070, "eight" );
+        addCharacterEncoding( 0203, "ellipsis" );
+        addCharacterEncoding( 0204, "emdash" );
+        addCharacterEncoding( 0205, "endash" );
+        addCharacterEncoding( 075, "equal" );
+        addCharacterEncoding( 0360, "eth" );
+        addCharacterEncoding( 041, "exclam" );
+        addCharacterEncoding( 0241, "exclamdown" );
+        addCharacterEncoding( 0146, "f" );
+        addCharacterEncoding( 0223, "fi" );
+        addCharacterEncoding( 065, "five" );
+        addCharacterEncoding( 0224, "fl" );
+        addCharacterEncoding( 0206, "florin" );
+        addCharacterEncoding( 064, "four" );
+        addCharacterEncoding( 0207, "fraction" );
+        addCharacterEncoding( 0147, "g" );
+        addCharacterEncoding( 0337, "germandbls" );
+        addCharacterEncoding( 0140, "grave" );
+        addCharacterEncoding( 076, "greater" );
+        addCharacterEncoding( 0253, "guillemotleft" );
+        addCharacterEncoding( 0273, "guillemotright" );
+        addCharacterEncoding( 0210, "guilsinglleft" );
+        addCharacterEncoding( 0211, "guilsinglright" );
+        addCharacterEncoding( 0150, "h" );
+        addCharacterEncoding( 034, "hungarumlaut" );
+        addCharacterEncoding( 055, "hyphen" );
+        addCharacterEncoding( 0151, "i" );
+        addCharacterEncoding( 0355, "iacute" );
+        addCharacterEncoding( 0356, "icircumflex" );
+        addCharacterEncoding( 0357, "idieresis" );
+        addCharacterEncoding( 0354, "igrave" );
+        addCharacterEncoding( 0152, "j" );
+        addCharacterEncoding( 0153, "k" );
+        addCharacterEncoding( 0154, "l" );
+        addCharacterEncoding( 074, "less" );
+        addCharacterEncoding( 0254, "logicalnot" );
+        addCharacterEncoding( 0233, "lslash" );
+        addCharacterEncoding( 0155, "m" );
+        addCharacterEncoding( 0257, "macron" );
+        addCharacterEncoding( 0212, "minus" );
+        addCharacterEncoding( 0265, "mu" );
+        addCharacterEncoding( 0327, "multiply" );
+        addCharacterEncoding( 0156, "n" );
+        addCharacterEncoding( 071, "nine" );
+        addCharacterEncoding( 0361, "ntilde" );
+        addCharacterEncoding( 043, "numbersign" );
+        addCharacterEncoding( 0157, "o" );
+        addCharacterEncoding( 0363, "oacute" );
+        addCharacterEncoding( 0364, "ocircumflex" );
+        addCharacterEncoding( 0366, "odieresis" );
+        addCharacterEncoding( 0234, "oe" );
+        addCharacterEncoding( 035, "ogonek" );
+        addCharacterEncoding( 0362, "ograve" );
+        addCharacterEncoding( 061, "one" );
+        addCharacterEncoding( 0275, "onehalf" );
+        addCharacterEncoding( 0274, "onequarter" );
+        addCharacterEncoding( 0271, "onesuperior" );
+        addCharacterEncoding( 0252, "ordfeminine" );
+        addCharacterEncoding( 0272, "ordmasculine" );
+        addCharacterEncoding( 0370, "oslash" );
+        addCharacterEncoding( 0365, "otilde" );
+        addCharacterEncoding( 0160, "p" );
+        addCharacterEncoding( 0266, "paragraph" );
+        addCharacterEncoding( 050, "parenleft" );
+        addCharacterEncoding( 051, "parenright" );
+        addCharacterEncoding( 045, "percent" );
+        addCharacterEncoding( 056, "period" );
+        addCharacterEncoding( 0267, "periodcentered" );
+        addCharacterEncoding( 0213, "perthousand" );
+        addCharacterEncoding( 053, "plus" );
+        addCharacterEncoding( 0261, "plusminus" );
+        addCharacterEncoding( 0161, "q" );
+        addCharacterEncoding( 077, "question" );
+        addCharacterEncoding( 0277, "questiondown" );
+        addCharacterEncoding( 042, "quotedbl" );
+        addCharacterEncoding( 0214, "quotedblbase" );
+        addCharacterEncoding( 0215, "quotedblleft" );
+        addCharacterEncoding( 0216, "quotedblright" );
+        addCharacterEncoding( 0217, "quoteleft" );
+        addCharacterEncoding( 0220, "quoteright" );
+        addCharacterEncoding( 0221, "quotesinglbase" );
+        addCharacterEncoding( 047, "quotesingle" );
+        addCharacterEncoding( 0162, "r" );
+        addCharacterEncoding( 0256, "registered" );
+        addCharacterEncoding( 036, "ring" );
+        addCharacterEncoding( 0163, "s" );
+        addCharacterEncoding( 0235, "scaron" );
+        addCharacterEncoding( 0247, "section" );
+        addCharacterEncoding( 073, "semicolon" );
+        addCharacterEncoding( 067, "seven" );
+        addCharacterEncoding( 066, "six" );
+        addCharacterEncoding( 057, "slash" );
+        addCharacterEncoding( 040, "space" );
+        addCharacterEncoding( 0243, "sterling" );
+        addCharacterEncoding( 0164, "t" );
+        addCharacterEncoding( 0376, "thorn" );
+        addCharacterEncoding( 063, "three" );
+        addCharacterEncoding( 0276, "threequarters" );
+        addCharacterEncoding( 0263, "threesuperior" );
+        addCharacterEncoding( 037, "tilde" );
+        addCharacterEncoding( 0222, "trademark" );
+        addCharacterEncoding( 062, "two" );
+        addCharacterEncoding( 0262, "twosuperior" );
+        addCharacterEncoding( 0165, "u" );
+        addCharacterEncoding( 0372, "uacute" );
+        addCharacterEncoding( 0373, "ucircumflex" );
+        addCharacterEncoding( 0374, "udieresis" );
+        addCharacterEncoding( 0371, "ugrave" );
+        addCharacterEncoding( 0137, "underscore" );
+        addCharacterEncoding( 0166, "v" );
+        addCharacterEncoding( 0167, "w" );
+        addCharacterEncoding( 0170, "x" );
+        addCharacterEncoding( 0171, "y" );
+        addCharacterEncoding( 0375, "yacute" );
+        addCharacterEncoding( 0377, "ydieresis" );
+        addCharacterEncoding( 0245, "yen" );
+        addCharacterEncoding( 0172, "z" );
+        addCharacterEncoding( 0236, "zcaron" );
+        addCharacterEncoding( 060, "zero" );
     }
 
     /**

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/StandardEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/StandardEncoding.java?rev=928462&r1=928461&r2=928462&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/StandardEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/StandardEncoding.java Sun Mar 28 17:57:19 2010
@@ -32,155 +32,155 @@ public class StandardEncoding extends En
      */
     public StandardEncoding()
     {
-        addCharacterEncoding( 0101, COSName.getPDFName( "A" ) );
-        addCharacterEncoding( 0341, COSName.getPDFName( "AE" ) );
-        addCharacterEncoding( 0102, COSName.getPDFName( "B" ) );
-        addCharacterEncoding( 0103, COSName.getPDFName( "C" ) );
-        addCharacterEncoding( 0104, COSName.getPDFName( "D" ) );
-        addCharacterEncoding( 0105, COSName.getPDFName( "E" ) );
-        addCharacterEncoding( 0106, COSName.getPDFName( "F" ) );
-        addCharacterEncoding( 0107, COSName.getPDFName( "G" ) );
-        addCharacterEncoding( 0110, COSName.getPDFName( "H" ) );
-        addCharacterEncoding( 0111, COSName.getPDFName( "I" ) );
-        addCharacterEncoding( 0112, COSName.getPDFName( "J" ) );
-        addCharacterEncoding( 0113, COSName.getPDFName( "K" ) );
-        addCharacterEncoding( 0114, COSName.getPDFName( "L" ) );
-        addCharacterEncoding( 0350, COSName.getPDFName( "Lslash" ) );
-        addCharacterEncoding( 0115, COSName.getPDFName( "M" ) );
-        addCharacterEncoding( 0116, COSName.getPDFName( "N" ) );
-        addCharacterEncoding( 0117, COSName.getPDFName( "O" ) );
-        addCharacterEncoding( 0352, COSName.getPDFName( "OE" ) );
-        addCharacterEncoding( 0351, COSName.getPDFName( "Oslash" ) );
-        addCharacterEncoding( 0120, COSName.getPDFName( "P" ) );
-        addCharacterEncoding( 0121, COSName.getPDFName( "Q" ) );
-        addCharacterEncoding( 0122, COSName.getPDFName( "R" ) );
-        addCharacterEncoding( 0123, COSName.getPDFName( "S" ) );
-        addCharacterEncoding( 0124, COSName.getPDFName( "T" ) );
-        addCharacterEncoding( 0125, COSName.getPDFName( "U" ) );
-        addCharacterEncoding( 0126, COSName.getPDFName( "V" ) );
-        addCharacterEncoding( 0127, COSName.getPDFName( "W" ) );
-        addCharacterEncoding( 0130, COSName.getPDFName( "X" ) );
-        addCharacterEncoding( 0131, COSName.getPDFName( "Y" ) );
-        addCharacterEncoding( 0132, COSName.getPDFName( "Z" ) );
-        addCharacterEncoding( 0141, COSName.getPDFName( "a" ) );
-        addCharacterEncoding( 0302, COSName.getPDFName( "acute" ) );
-        addCharacterEncoding( 0361, COSName.getPDFName( "ae" ) );
-        addCharacterEncoding( 0046, COSName.getPDFName( "ampersand" ) );
-        addCharacterEncoding( 0136, COSName.getPDFName( "asciicircum" ) );
-        addCharacterEncoding( 0176, COSName.getPDFName( "asciitilde" ) );
-        addCharacterEncoding( 0052, COSName.getPDFName( "asterisk" ) );
-        addCharacterEncoding( 0100, COSName.getPDFName( "at" ) );
-        addCharacterEncoding( 0142, COSName.getPDFName( "b" ) );
-        addCharacterEncoding( 0134, COSName.getPDFName( "backslash" ) );
-        addCharacterEncoding( 0174, COSName.getPDFName( "bar" ) );
-        addCharacterEncoding( 0173, COSName.getPDFName( "braceleft" ) );
-        addCharacterEncoding( 0175, COSName.getPDFName( "braceright" ) );
-        addCharacterEncoding( 0133, COSName.getPDFName( "bracketleft" ) );
-        addCharacterEncoding( 0135, COSName.getPDFName( "bracketright" ) );
-        addCharacterEncoding( 0306, COSName.getPDFName( "breve" ) );
-        addCharacterEncoding( 0267, COSName.getPDFName( "bullet" ) );
-        addCharacterEncoding( 0143, COSName.getPDFName( "c" ) );
-        addCharacterEncoding( 0317, COSName.getPDFName( "caron" ) );
-        addCharacterEncoding( 0313, COSName.getPDFName( "cedilla" ) );
-        addCharacterEncoding( 0242, COSName.getPDFName( "cent" ) );
-        addCharacterEncoding( 0303, COSName.getPDFName( "circumflex" ) );
-        addCharacterEncoding( 0072, COSName.getPDFName( "colon" ) );
-        addCharacterEncoding( 0054, COSName.getPDFName( "comma" ) );
-        addCharacterEncoding( 0250, COSName.getPDFName( "currency1" ) );
-        addCharacterEncoding( 0144, COSName.getPDFName( "d" ) );
-        addCharacterEncoding( 0262, COSName.getPDFName( "dagger" ) );
-        addCharacterEncoding( 0263, COSName.getPDFName( "daggerdbl" ) );
-        addCharacterEncoding( 0310, COSName.getPDFName( "dieresis" ) );
-        addCharacterEncoding( 0044, COSName.getPDFName( "dollar" ) );
-        addCharacterEncoding( 0307, COSName.getPDFName( "dotaccent" ) );
-        addCharacterEncoding( 0365, COSName.getPDFName( "dotlessi" ) );
-        addCharacterEncoding( 0145, COSName.getPDFName( "e" ) );
-        addCharacterEncoding( 0070, COSName.getPDFName( "eight" ) );
-        addCharacterEncoding( 0274, COSName.getPDFName( "ellipsis" ) );
-        addCharacterEncoding( 0320, COSName.getPDFName( "emdash" ) );
-        addCharacterEncoding( 0261, COSName.getPDFName( "endash" ) );
-        addCharacterEncoding( 0075, COSName.getPDFName( "equal" ) );
-        addCharacterEncoding( 0041, COSName.getPDFName( "exclam" ) );
-        addCharacterEncoding( 0241, COSName.getPDFName( "exclamdown" ) );
-        addCharacterEncoding( 0146, COSName.getPDFName( "f" ) );
-        addCharacterEncoding( 0256, COSName.getPDFName( "fi" ) );
-        addCharacterEncoding( 0065, COSName.getPDFName( "five" ) );
-        addCharacterEncoding( 0257, COSName.getPDFName( "fl" ) );
-        addCharacterEncoding( 0246, COSName.getPDFName( "florin" ) );
-        addCharacterEncoding( 0064, COSName.getPDFName( "four" ) );
-        addCharacterEncoding( 0244, COSName.getPDFName( "fraction" ) );
-        addCharacterEncoding( 0147, COSName.getPDFName( "g" ) );
-        addCharacterEncoding( 0373, COSName.getPDFName( "germandbls" ) );
-        addCharacterEncoding( 0301, COSName.getPDFName( "grave" ) );
-        addCharacterEncoding( 0076, COSName.getPDFName( "greater" ) );
-        addCharacterEncoding( 0253, COSName.getPDFName( "guillemotleft" ) );
-        addCharacterEncoding( 0273, COSName.getPDFName( "guillemotright" ) );
-        addCharacterEncoding( 0254, COSName.getPDFName( "guilsinglleft" ) );
-        addCharacterEncoding( 0255, COSName.getPDFName( "guilsinglright" ) );
-        addCharacterEncoding( 0150, COSName.getPDFName( "h" ) );
-        addCharacterEncoding( 0315, COSName.getPDFName( "hungarumlaut" ) );
-        addCharacterEncoding( 0055, COSName.getPDFName( "hyphen" ) );
-        addCharacterEncoding( 0151, COSName.getPDFName( "i" ) );
-        addCharacterEncoding( 0152, COSName.getPDFName( "j" ) );
-        addCharacterEncoding( 0153, COSName.getPDFName( "k" ) );
-        addCharacterEncoding( 0154, COSName.getPDFName( "l" ) );
-        addCharacterEncoding( 0074, COSName.getPDFName( "less" ) );
-        addCharacterEncoding( 0370, COSName.getPDFName( "lslash" ) );
-        addCharacterEncoding( 0155, COSName.getPDFName( "m" ) );
-        addCharacterEncoding( 0305, COSName.getPDFName( "macron" ) );
-        addCharacterEncoding( 0156, COSName.getPDFName( "n" ) );
-        addCharacterEncoding( 0071, COSName.getPDFName( "nine" ) );
-        addCharacterEncoding( 0043, COSName.getPDFName( "numbersign" ) );
-        addCharacterEncoding( 0157, COSName.getPDFName( "o" ) );
-        addCharacterEncoding( 0372, COSName.getPDFName( "oe" ) );
-        addCharacterEncoding( 0316, COSName.getPDFName( "ogonek" ) );
-        addCharacterEncoding( 0061, COSName.getPDFName( "one" ) );
-        addCharacterEncoding( 0343, COSName.getPDFName( "ordfeminine" ) );
-        addCharacterEncoding( 0353, COSName.getPDFName( "ordmasculine" ) );
-        addCharacterEncoding( 0371, COSName.getPDFName( "oslash" ) );
-        addCharacterEncoding( 0160, COSName.getPDFName( "p" ) );
-        addCharacterEncoding( 0266, COSName.getPDFName( "paragraph" ) );
-        addCharacterEncoding( 0050, COSName.getPDFName( "parenleft" ) );
-        addCharacterEncoding( 0051, COSName.getPDFName( "parenright" ) );
-        addCharacterEncoding( 0045, COSName.getPDFName( "percent" ) );
-        addCharacterEncoding( 0056, COSName.getPDFName( "period" ) );
-        addCharacterEncoding( 0264, COSName.getPDFName( "periodcentered" ) );
-        addCharacterEncoding( 0275, COSName.getPDFName( "perthousand" ) );
-        addCharacterEncoding( 0053, COSName.getPDFName( "plus" ) );
-        addCharacterEncoding( 0161, COSName.getPDFName( "q" ) );
-        addCharacterEncoding( 0077, COSName.getPDFName( "question" ) );
-        addCharacterEncoding( 0277, COSName.getPDFName( "questiondown" ) );
-        addCharacterEncoding( 0042, COSName.getPDFName( "quotedbl" ) );
-        addCharacterEncoding( 0271, COSName.getPDFName( "quotedblbase" ) );
-        addCharacterEncoding( 0252, COSName.getPDFName( "quotedblleft" ) );
-        addCharacterEncoding( 0272, COSName.getPDFName( "quotedblright" ) );
-        addCharacterEncoding( 0140, COSName.getPDFName( "quoteleft" ) );
-        addCharacterEncoding( 0047, COSName.getPDFName( "quoteright" ) );
-        addCharacterEncoding( 0270, COSName.getPDFName( "quotesinglbase" ) );
-        addCharacterEncoding( 0251, COSName.getPDFName( "quotesingle" ) );
-        addCharacterEncoding( 0162, COSName.getPDFName( "r" ) );
-        addCharacterEncoding( 0312, COSName.getPDFName( "ring" ) );
-        addCharacterEncoding( 0163, COSName.getPDFName( "s" ) );
-        addCharacterEncoding( 0247, COSName.getPDFName( "section" ) );
-        addCharacterEncoding( 0073, COSName.getPDFName( "semicolon" ) );
-        addCharacterEncoding( 0067, COSName.getPDFName( "seven" ) );
-        addCharacterEncoding( 0066, COSName.getPDFName( "six" ) );
-        addCharacterEncoding( 0057, COSName.getPDFName( "slash" ) );
-        addCharacterEncoding( 0040, COSName.getPDFName( "space" ) );
-        addCharacterEncoding( 0243, COSName.getPDFName( "sterling" ) );
-        addCharacterEncoding( 0164, COSName.getPDFName( "t" ) );
-        addCharacterEncoding( 0063, COSName.getPDFName( "three" ) );
-        addCharacterEncoding( 0304, COSName.getPDFName( "tilde" ) );
-        addCharacterEncoding( 0062, COSName.getPDFName( "two" ) );
-        addCharacterEncoding( 0165, COSName.getPDFName( "u" ) );
-        addCharacterEncoding( 0137, COSName.getPDFName( "underscore" ) );
-        addCharacterEncoding( 0166, COSName.getPDFName( "v" ) );
-        addCharacterEncoding( 0167, COSName.getPDFName( "w" ) );
-        addCharacterEncoding( 0170, COSName.getPDFName( "x" ) );
-        addCharacterEncoding( 0171, COSName.getPDFName( "y" ) );
-        addCharacterEncoding( 0245, COSName.getPDFName( "yen" ) );
-        addCharacterEncoding( 0172, COSName.getPDFName( "z" ) );
-        addCharacterEncoding( 0060, COSName.getPDFName( "zero" ) );
+        addCharacterEncoding( 0101, "A" );
+        addCharacterEncoding( 0341, "AE" );
+        addCharacterEncoding( 0102, "B" );
+        addCharacterEncoding( 0103, "C" );
+        addCharacterEncoding( 0104, "D" );
+        addCharacterEncoding( 0105, "E" );
+        addCharacterEncoding( 0106, "F" );
+        addCharacterEncoding( 0107, "G" );
+        addCharacterEncoding( 0110, "H" );
+        addCharacterEncoding( 0111, "I" );
+        addCharacterEncoding( 0112, "J" );
+        addCharacterEncoding( 0113, "K" );
+        addCharacterEncoding( 0114, "L" );
+        addCharacterEncoding( 0350, "Lslash" );
+        addCharacterEncoding( 0115, "M" );
+        addCharacterEncoding( 0116, "N" );
+        addCharacterEncoding( 0117, "O" );
+        addCharacterEncoding( 0352, "OE" );
+        addCharacterEncoding( 0351, "Oslash" );
+        addCharacterEncoding( 0120, "P" );
+        addCharacterEncoding( 0121, "Q" );
+        addCharacterEncoding( 0122, "R" );
+        addCharacterEncoding( 0123, "S" );
+        addCharacterEncoding( 0124, "T" );
+        addCharacterEncoding( 0125, "U" );
+        addCharacterEncoding( 0126, "V" );
+        addCharacterEncoding( 0127, "W" );
+        addCharacterEncoding( 0130, "X" );
+        addCharacterEncoding( 0131, "Y" );
+        addCharacterEncoding( 0132, "Z" );
+        addCharacterEncoding( 0141, "a" );
+        addCharacterEncoding( 0302, "acute" );
+        addCharacterEncoding( 0361, "ae" );
+        addCharacterEncoding( 0046, "ampersand" );
+        addCharacterEncoding( 0136, "asciicircum" );
+        addCharacterEncoding( 0176, "asciitilde" );
+        addCharacterEncoding( 0052, "asterisk" );
+        addCharacterEncoding( 0100, "at" );
+        addCharacterEncoding( 0142, "b" );
+        addCharacterEncoding( 0134, "backslash" );
+        addCharacterEncoding( 0174, "bar" );
+        addCharacterEncoding( 0173, "braceleft" );
+        addCharacterEncoding( 0175, "braceright" );
+        addCharacterEncoding( 0133, "bracketleft" );
+        addCharacterEncoding( 0135, "bracketright" );
+        addCharacterEncoding( 0306, "breve" );
+        addCharacterEncoding( 0267, "bullet" );
+        addCharacterEncoding( 0143, "c" );
+        addCharacterEncoding( 0317, "caron" );
+        addCharacterEncoding( 0313, "cedilla" );
+        addCharacterEncoding( 0242, "cent" );
+        addCharacterEncoding( 0303, "circumflex" );
+        addCharacterEncoding( 0072, "colon" );
+        addCharacterEncoding( 0054, "comma" );
+        addCharacterEncoding( 0250, "currency1" );
+        addCharacterEncoding( 0144, "d" );
+        addCharacterEncoding( 0262, "dagger" );
+        addCharacterEncoding( 0263, "daggerdbl" );
+        addCharacterEncoding( 0310, "dieresis" );
+        addCharacterEncoding( 0044, "dollar" );
+        addCharacterEncoding( 0307, "dotaccent" );
+        addCharacterEncoding( 0365, "dotlessi" );
+        addCharacterEncoding( 0145, "e" );
+        addCharacterEncoding( 0070, "eight" );
+        addCharacterEncoding( 0274, "ellipsis" );
+        addCharacterEncoding( 0320, "emdash" );
+        addCharacterEncoding( 0261, "endash" );
+        addCharacterEncoding( 0075, "equal" );
+        addCharacterEncoding( 0041, "exclam" );
+        addCharacterEncoding( 0241, "exclamdown" );
+        addCharacterEncoding( 0146, "f" );
+        addCharacterEncoding( 0256, "fi" );
+        addCharacterEncoding( 0065, "five" );
+        addCharacterEncoding( 0257, "fl" );
+        addCharacterEncoding( 0246, "florin" );
+        addCharacterEncoding( 0064, "four" );
+        addCharacterEncoding( 0244, "fraction" );
+        addCharacterEncoding( 0147, "g" );
+        addCharacterEncoding( 0373, "germandbls" );
+        addCharacterEncoding( 0301, "grave" );
+        addCharacterEncoding( 0076, "greater" );
+        addCharacterEncoding( 0253, "guillemotleft" );
+        addCharacterEncoding( 0273, "guillemotright" );
+        addCharacterEncoding( 0254, "guilsinglleft" );
+        addCharacterEncoding( 0255, "guilsinglright" );
+        addCharacterEncoding( 0150, "h" );
+        addCharacterEncoding( 0315, "hungarumlaut" );
+        addCharacterEncoding( 0055, "hyphen" );
+        addCharacterEncoding( 0151, "i" );
+        addCharacterEncoding( 0152, "j" );
+        addCharacterEncoding( 0153, "k" );
+        addCharacterEncoding( 0154, "l" );
+        addCharacterEncoding( 0074, "less" );
+        addCharacterEncoding( 0370, "lslash" );
+        addCharacterEncoding( 0155, "m" );
+        addCharacterEncoding( 0305, "macron" );
+        addCharacterEncoding( 0156, "n" );
+        addCharacterEncoding( 0071, "nine" );
+        addCharacterEncoding( 0043, "numbersign" );
+        addCharacterEncoding( 0157, "o" );
+        addCharacterEncoding( 0372, "oe" );
+        addCharacterEncoding( 0316, "ogonek" );
+        addCharacterEncoding( 0061, "one" );
+        addCharacterEncoding( 0343, "ordfeminine" );
+        addCharacterEncoding( 0353, "ordmasculine" );
+        addCharacterEncoding( 0371, "oslash" );
+        addCharacterEncoding( 0160, "p" );
+        addCharacterEncoding( 0266, "paragraph" );
+        addCharacterEncoding( 0050, "parenleft" );
+        addCharacterEncoding( 0051, "parenright" );
+        addCharacterEncoding( 0045, "percent" );
+        addCharacterEncoding( 0056, "period" );
+        addCharacterEncoding( 0264, "periodcentered" );
+        addCharacterEncoding( 0275, "perthousand" );
+        addCharacterEncoding( 0053, "plus" );
+        addCharacterEncoding( 0161, "q" );
+        addCharacterEncoding( 0077, "question" );
+        addCharacterEncoding( 0277, "questiondown" );
+        addCharacterEncoding( 0042, "quotedbl" );
+        addCharacterEncoding( 0271, "quotedblbase" );
+        addCharacterEncoding( 0252, "quotedblleft" );
+        addCharacterEncoding( 0272, "quotedblright" );
+        addCharacterEncoding( 0140, "quoteleft" );
+        addCharacterEncoding( 0047, "quoteright" );
+        addCharacterEncoding( 0270, "quotesinglbase" );
+        addCharacterEncoding( 0251, "quotesingle" );
+        addCharacterEncoding( 0162, "r" );
+        addCharacterEncoding( 0312, "ring" );
+        addCharacterEncoding( 0163, "s" );
+        addCharacterEncoding( 0247, "section" );
+        addCharacterEncoding( 0073, "semicolon" );
+        addCharacterEncoding( 0067, "seven" );
+        addCharacterEncoding( 0066, "six" );
+        addCharacterEncoding( 0057, "slash" );
+        addCharacterEncoding( 0040, "space" );
+        addCharacterEncoding( 0243, "sterling" );
+        addCharacterEncoding( 0164, "t" );
+        addCharacterEncoding( 0063, "three" );
+        addCharacterEncoding( 0304, "tilde" );
+        addCharacterEncoding( 0062, "two" );
+        addCharacterEncoding( 0165, "u" );
+        addCharacterEncoding( 0137, "underscore" );
+        addCharacterEncoding( 0166, "v" );
+        addCharacterEncoding( 0167, "w" );
+        addCharacterEncoding( 0170, "x" );
+        addCharacterEncoding( 0171, "y" );
+        addCharacterEncoding( 0245, "yen" );
+        addCharacterEncoding( 0172, "z" );
+        addCharacterEncoding( 0060, "zero" );
     }
 
     /**