You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/08/01 08:49:41 UTC

svn commit: r1891946 - in /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff: CFFExpertCharset.java CFFExpertEncoding.java CFFExpertSubsetCharset.java CFFISOAdobeCharset.java CFFStandardEncoding.java

Author: tilman
Date: Sun Aug  1 08:49:40 2021
New Revision: 1891946

URL: http://svn.apache.org/viewvc?rev=1891946&view=rev
Log:
PDFBOX-4892: reduce memory usage by moving private collections to constructors, as suggested by valerybokov

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertEncoding.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFStandardEncoding.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java?rev=1891946&r1=1891945&r2=1891946&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertCharset.java Sun Aug  1 08:49:40 2021
@@ -1,221 +1,219 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.fontbox.cff;
-
-/**
- * This is specialized CFFCharset. It's used if the CharsetId of a font is set to 1.
- * 
- * @author Villu Ruusmann
- */
-public final class CFFExpertCharset extends CFFCharsetType1
-{
-    private static final int CHAR_CODE = 0;
-    private static final int CHAR_NAME = 1;
-    
-    /**
-     * Table of character codes and their corresponding names.
-     */
-    private static final Object[][] CFF_EXPERT_CHARSET_TABLE = {
-            {0, ".notdef"},
-            {1, "space"},
-            {229, "exclamsmall"},
-            {230, "Hungarumlautsmall"},
-            {231, "dollaroldstyle"},
-            {232, "dollarsuperior"},
-            {233, "ampersandsmall"},
-            {234, "Acutesmall"},
-            {235, "parenleftsuperior"},
-            {236, "parenrightsuperior"},
-            {237, "twodotenleader"},
-            {238, "onedotenleader"},
-            {13, "comma"},
-            {14, "hyphen"},
-            {15, "period"},
-            {99, "fraction"},
-            {239, "zerooldstyle"},
-            {240, "oneoldstyle"},
-            {241, "twooldstyle"},
-            {242, "threeoldstyle"},
-            {243, "fouroldstyle"},
-            {244, "fiveoldstyle"},
-            {245, "sixoldstyle"},
-            {246, "sevenoldstyle"},
-            {247, "eightoldstyle"},
-            {248, "nineoldstyle"},
-            {27, "colon"},
-            {28, "semicolon"},
-            {249, "commasuperior"},
-            {250, "threequartersemdash"},
-            {251, "periodsuperior"},
-            {252, "questionsmall"},
-            {253, "asuperior"},
-            {254, "bsuperior"},
-            {255, "centsuperior"},
-            {256, "dsuperior"},
-            {257, "esuperior"},
-            {258, "isuperior"},
-            {259, "lsuperior"},
-            {260, "msuperior"},
-            {261, "nsuperior"},
-            {262, "osuperior"},
-            {263, "rsuperior"},
-            {264, "ssuperior"},
-            {265, "tsuperior"},
-            {266, "ff"},
-            {109, "fi"},
-            {110, "fl"},
-            {267, "ffi"},
-            {268, "ffl"},
-            {269, "parenleftinferior"},
-            {270, "parenrightinferior"},
-            {271, "Circumflexsmall"},
-            {272, "hyphensuperior"},
-            {273, "Gravesmall"},
-            {274, "Asmall"},
-            {275, "Bsmall"},
-            {276, "Csmall"},
-            {277, "Dsmall"},
-            {278, "Esmall"},
-            {279, "Fsmall"},
-            {280, "Gsmall"},
-            {281, "Hsmall"},
-            {282, "Ismall"},
-            {283, "Jsmall"},
-            {284, "Ksmall"},
-            {285, "Lsmall"},
-            {286, "Msmall"},
-            {287, "Nsmall"},
-            {288, "Osmall"},
-            {289, "Psmall"},
-            {290, "Qsmall"},
-            {291, "Rsmall"},
-            {292, "Ssmall"},
-            {293, "Tsmall"},
-            {294, "Usmall"},
-            {295, "Vsmall"},
-            {296, "Wsmall"},
-            {297, "Xsmall"},
-            {298, "Ysmall"},
-            {299, "Zsmall"},
-            {300, "colonmonetary"},
-            {301, "onefitted"},
-            {302, "rupiah"},
-            {303, "Tildesmall"},
-            {304, "exclamdownsmall"},
-            {305, "centoldstyle"},
-            {306, "Lslashsmall"},
-            {307, "Scaronsmall"},
-            {308, "Zcaronsmall"},
-            {309, "Dieresissmall"},
-            {310, "Brevesmall"},
-            {311, "Caronsmall"},
-            {312, "Dotaccentsmall"},
-            {313, "Macronsmall"},
-            {314, "figuredash"},
-            {315, "hypheninferior"},
-            {316, "Ogoneksmall"},
-            {317, "Ringsmall"},
-            {318, "Cedillasmall"},
-            {158, "onequarter"},
-            {155, "onehalf"},
-            {163, "threequarters"},
-            {319, "questiondownsmall"},
-            {320, "oneeighth"},
-            {321, "threeeighths"},
-            {322, "fiveeighths"},
-            {323, "seveneighths"},
-            {324, "onethird"},
-            {325, "twothirds"},
-            {326, "zerosuperior"},
-            {150, "onesuperior"},
-            {164, "twosuperior"},
-            {169, "threesuperior"},
-            {327, "foursuperior"},
-            {328, "fivesuperior"},
-            {329, "sixsuperior"},
-            {330, "sevensuperior"},
-            {331, "eightsuperior"},
-            {332, "ninesuperior"},
-            {333, "zeroinferior"},
-            {334, "oneinferior"},
-            {335, "twoinferior"},
-            {336, "threeinferior"},
-            {337, "fourinferior"},
-            {338, "fiveinferior"},
-            {339, "sixinferior"},
-            {340, "seveninferior"},
-            {341, "eightinferior"},
-            {342, "nineinferior"},
-            {343, "centinferior"},
-            {344, "dollarinferior"},
-            {345, "periodinferior"},
-            {346, "commainferior"},
-            {347, "Agravesmall"},
-            {348, "Aacutesmall"},
-            {349, "Acircumflexsmall"},
-            {350, "Atildesmall"},
-            {351, "Adieresissmall"},
-            {352, "Aringsmall"},
-            {353, "AEsmall"},
-            {354, "Ccedillasmall"},
-            {355, "Egravesmall"},
-            {356, "Eacutesmall"},
-            {357, "Ecircumflexsmall"},
-            {358, "Edieresissmall"},
-            {359, "Igravesmall"},
-            {360, "Iacutesmall"},
-            {361, "Icircumflexsmall"},
-            {362, "Idieresissmall"},
-            {363, "Ethsmall"},
-            {364, "Ntildesmall"},
-            {365, "Ogravesmall"},
-            {366, "Oacutesmall"},
-            {367, "Ocircumflexsmall"},
-            {368, "Otildesmall"},
-            {369, "Odieresissmall"},
-            {370, "OEsmall"},
-            {371, "Oslashsmall"},
-            {372, "Ugravesmall"},
-            {373, "Uacutesmall"},
-            {374, "Ucircumflexsmall"},
-            {375, "Udieresissmall"},
-            {376, "Yacutesmall"},
-            {377, "Thornsmall"},
-            {378, "Ydieresissmall"}
-    };
-
-    private CFFExpertCharset()
-    {
-        int gid = 0;
-        for (Object[] charsetEntry : CFF_EXPERT_CHARSET_TABLE)
-        {
-            addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
-        }
-    }
-
-    /**
-     * Returns an instance of the CFFExpertCharset class.
-     * @return an instance of CFFExpertCharset
-     */
-    public static CFFExpertCharset getInstance()
-    {
-        return CFFExpertCharset.INSTANCE;
-    }
-
-    private static final CFFExpertCharset INSTANCE = new CFFExpertCharset();
-
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.fontbox.cff;
+
+/**
+ * This is specialized CFFCharset. It's used if the CharsetId of a font is set to 1.
+ * 
+ * @author Villu Ruusmann
+ */
+public final class CFFExpertCharset extends CFFCharsetType1
+{
+    private static final int CHAR_CODE = 0;
+    private static final int CHAR_NAME = 1;
+
+    private CFFExpertCharset()
+    {
+        // Table of character codes and their corresponding names.
+        Object[][] CFF_EXPERT_CHARSET_TABLE = {
+                {0, ".notdef"},
+                {1, "space"},
+                {229, "exclamsmall"},
+                {230, "Hungarumlautsmall"},
+                {231, "dollaroldstyle"},
+                {232, "dollarsuperior"},
+                {233, "ampersandsmall"},
+                {234, "Acutesmall"},
+                {235, "parenleftsuperior"},
+                {236, "parenrightsuperior"},
+                {237, "twodotenleader"},
+                {238, "onedotenleader"},
+                {13, "comma"},
+                {14, "hyphen"},
+                {15, "period"},
+                {99, "fraction"},
+                {239, "zerooldstyle"},
+                {240, "oneoldstyle"},
+                {241, "twooldstyle"},
+                {242, "threeoldstyle"},
+                {243, "fouroldstyle"},
+                {244, "fiveoldstyle"},
+                {245, "sixoldstyle"},
+                {246, "sevenoldstyle"},
+                {247, "eightoldstyle"},
+                {248, "nineoldstyle"},
+                {27, "colon"},
+                {28, "semicolon"},
+                {249, "commasuperior"},
+                {250, "threequartersemdash"},
+                {251, "periodsuperior"},
+                {252, "questionsmall"},
+                {253, "asuperior"},
+                {254, "bsuperior"},
+                {255, "centsuperior"},
+                {256, "dsuperior"},
+                {257, "esuperior"},
+                {258, "isuperior"},
+                {259, "lsuperior"},
+                {260, "msuperior"},
+                {261, "nsuperior"},
+                {262, "osuperior"},
+                {263, "rsuperior"},
+                {264, "ssuperior"},
+                {265, "tsuperior"},
+                {266, "ff"},
+                {109, "fi"},
+                {110, "fl"},
+                {267, "ffi"},
+                {268, "ffl"},
+                {269, "parenleftinferior"},
+                {270, "parenrightinferior"},
+                {271, "Circumflexsmall"},
+                {272, "hyphensuperior"},
+                {273, "Gravesmall"},
+                {274, "Asmall"},
+                {275, "Bsmall"},
+                {276, "Csmall"},
+                {277, "Dsmall"},
+                {278, "Esmall"},
+                {279, "Fsmall"},
+                {280, "Gsmall"},
+                {281, "Hsmall"},
+                {282, "Ismall"},
+                {283, "Jsmall"},
+                {284, "Ksmall"},
+                {285, "Lsmall"},
+                {286, "Msmall"},
+                {287, "Nsmall"},
+                {288, "Osmall"},
+                {289, "Psmall"},
+                {290, "Qsmall"},
+                {291, "Rsmall"},
+                {292, "Ssmall"},
+                {293, "Tsmall"},
+                {294, "Usmall"},
+                {295, "Vsmall"},
+                {296, "Wsmall"},
+                {297, "Xsmall"},
+                {298, "Ysmall"},
+                {299, "Zsmall"},
+                {300, "colonmonetary"},
+                {301, "onefitted"},
+                {302, "rupiah"},
+                {303, "Tildesmall"},
+                {304, "exclamdownsmall"},
+                {305, "centoldstyle"},
+                {306, "Lslashsmall"},
+                {307, "Scaronsmall"},
+                {308, "Zcaronsmall"},
+                {309, "Dieresissmall"},
+                {310, "Brevesmall"},
+                {311, "Caronsmall"},
+                {312, "Dotaccentsmall"},
+                {313, "Macronsmall"},
+                {314, "figuredash"},
+                {315, "hypheninferior"},
+                {316, "Ogoneksmall"},
+                {317, "Ringsmall"},
+                {318, "Cedillasmall"},
+                {158, "onequarter"},
+                {155, "onehalf"},
+                {163, "threequarters"},
+                {319, "questiondownsmall"},
+                {320, "oneeighth"},
+                {321, "threeeighths"},
+                {322, "fiveeighths"},
+                {323, "seveneighths"},
+                {324, "onethird"},
+                {325, "twothirds"},
+                {326, "zerosuperior"},
+                {150, "onesuperior"},
+                {164, "twosuperior"},
+                {169, "threesuperior"},
+                {327, "foursuperior"},
+                {328, "fivesuperior"},
+                {329, "sixsuperior"},
+                {330, "sevensuperior"},
+                {331, "eightsuperior"},
+                {332, "ninesuperior"},
+                {333, "zeroinferior"},
+                {334, "oneinferior"},
+                {335, "twoinferior"},
+                {336, "threeinferior"},
+                {337, "fourinferior"},
+                {338, "fiveinferior"},
+                {339, "sixinferior"},
+                {340, "seveninferior"},
+                {341, "eightinferior"},
+                {342, "nineinferior"},
+                {343, "centinferior"},
+                {344, "dollarinferior"},
+                {345, "periodinferior"},
+                {346, "commainferior"},
+                {347, "Agravesmall"},
+                {348, "Aacutesmall"},
+                {349, "Acircumflexsmall"},
+                {350, "Atildesmall"},
+                {351, "Adieresissmall"},
+                {352, "Aringsmall"},
+                {353, "AEsmall"},
+                {354, "Ccedillasmall"},
+                {355, "Egravesmall"},
+                {356, "Eacutesmall"},
+                {357, "Ecircumflexsmall"},
+                {358, "Edieresissmall"},
+                {359, "Igravesmall"},
+                {360, "Iacutesmall"},
+                {361, "Icircumflexsmall"},
+                {362, "Idieresissmall"},
+                {363, "Ethsmall"},
+                {364, "Ntildesmall"},
+                {365, "Ogravesmall"},
+                {366, "Oacutesmall"},
+                {367, "Ocircumflexsmall"},
+                {368, "Otildesmall"},
+                {369, "Odieresissmall"},
+                {370, "OEsmall"},
+                {371, "Oslashsmall"},
+                {372, "Ugravesmall"},
+                {373, "Uacutesmall"},
+                {374, "Ucircumflexsmall"},
+                {375, "Udieresissmall"},
+                {376, "Yacutesmall"},
+                {377, "Thornsmall"},
+                {378, "Ydieresissmall"}
+        };
+
+        int gid = 0;
+        for (Object[] charsetEntry : CFF_EXPERT_CHARSET_TABLE)
+        {
+            addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
+        }
+    }
+
+    /**
+     * Returns an instance of the CFFExpertCharset class.
+     * @return an instance of CFFExpertCharset
+     */
+    public static CFFExpertCharset getInstance()
+    {
+        return CFFExpertCharset.INSTANCE;
+    }
+
+    private static final CFFExpertCharset INSTANCE = new CFFExpertCharset();
+
+}

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertEncoding.java?rev=1891946&r1=1891945&r2=1891946&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertEncoding.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertEncoding.java Sun Aug  1 08:49:40 2021
@@ -1,311 +1,309 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.fontbox.cff;
-
-/**
- * This is specialized CFFEncoding. It's used if the EncodingId of a font is set to 1.
- * 
- * @author Villu Ruusmann
- */
-public final class CFFExpertEncoding extends CFFEncoding
-{
-    
-    private static final int CHAR_CODE = 0;
-    private static final int CHAR_SID = 1;
-    
-    /**
-     * Table of character codes and their corresponding sid.
-     */
-    private static final int[][] CFF_EXPERT_ENCODING_TABLE = {
-            {0, 0},
-            {1, 0},
-            {2, 0},
-            {3, 0},
-            {4, 0},
-            {5, 0},
-            {6, 0},
-            {7, 0},
-            {8, 0},
-            {9, 0},
-            {10, 0},
-            {11, 0},
-            {12, 0},
-            {13, 0},
-            {14, 0},
-            {15, 0},
-            {16, 0},
-            {17, 0},
-            {18, 0},
-            {19, 0},
-            {20, 0},
-            {21, 0},
-            {22, 0},
-            {23, 0},
-            {24, 0},
-            {25, 0},
-            {26, 0},
-            {27, 0},
-            {28, 0},
-            {29, 0},
-            {30, 0},
-            {31, 0},
-            {32, 1},
-            {33, 229},
-            {34, 230},
-            {35, 0},
-            {36, 231},
-            {37, 232},
-            {38, 233},
-            {39, 234},
-            {40, 235},
-            {41, 236},
-            {42, 237},
-            {43, 238},
-            {44, 13},
-            {45, 14},
-            {46, 15},
-            {47, 99},
-            {48, 239},
-            {49, 240},
-            {50, 241},
-            {51, 242},
-            {52, 243},
-            {53, 244},
-            {54, 245},
-            {55, 246},
-            {56, 247},
-            {57, 248},
-            {58, 27},
-            {59, 28},
-            {60, 249},
-            {61, 250},
-            {62, 251},
-            {63, 252},
-            {64, 0},
-            {65, 253},
-            {66, 254},
-            {67, 255},
-            {68, 256},
-            {69, 257},
-            {70, 0},
-            {71, 0},
-            {72, 0},
-            {73, 258},
-            {74, 0},
-            {75, 0},
-            {76, 259},
-            {77, 260},
-            {78, 261},
-            {79, 262},
-            {80, 0},
-            {81, 0},
-            {82, 263},
-            {83, 264},
-            {84, 265},
-            {85, 0},
-            {86, 266},
-            {87, 109},
-            {88, 110},
-            {89, 267},
-            {90, 268},
-            {91, 269},
-            {92, 0},
-            {93, 270},
-            {94, 271},
-            {95, 272},
-            {96, 273},
-            {97, 274},
-            {98, 275},
-            {99, 276},
-            {100, 277},
-            {101, 278},
-            {102, 279},
-            {103, 280},
-            {104, 281},
-            {105, 282},
-            {106, 283},
-            {107, 284},
-            {108, 285},
-            {109, 286},
-            {110, 287},
-            {111, 288},
-            {112, 289},
-            {113, 290},
-            {114, 291},
-            {115, 292},
-            {116, 293},
-            {117, 294},
-            {118, 295},
-            {119, 296},
-            {120, 297},
-            {121, 298},
-            {122, 299},
-            {123, 300},
-            {124, 301},
-            {125, 302},
-            {126, 303},
-            {127, 0},
-            {128, 0},
-            {129, 0},
-            {130, 0},
-            {131, 0},
-            {132, 0},
-            {133, 0},
-            {134, 0},
-            {135, 0},
-            {136, 0},
-            {137, 0},
-            {138, 0},
-            {139, 0},
-            {140, 0},
-            {141, 0},
-            {142, 0},
-            {143, 0},
-            {144, 0},
-            {145, 0},
-            {146, 0},
-            {147, 0},
-            {148, 0},
-            {149, 0},
-            {150, 0},
-            {151, 0},
-            {152, 0},
-            {153, 0},
-            {154, 0},
-            {155, 0},
-            {156, 0},
-            {157, 0},
-            {158, 0},
-            {159, 0},
-            {160, 0},
-            {161, 304},
-            {162, 305},
-            {163, 306},
-            {164, 0},
-            {165, 0},
-            {166, 307},
-            {167, 308},
-            {168, 309},
-            {169, 310},
-            {170, 311},
-            {171, 0},
-            {172, 312},
-            {173, 0},
-            {174, 0},
-            {175, 313},
-            {176, 0},
-            {177, 0},
-            {178, 314},
-            {179, 315},
-            {180, 0},
-            {181, 0},
-            {182, 316},
-            {183, 317},
-            {184, 318},
-            {185, 0},
-            {186, 0},
-            {187, 0},
-            {188, 158},
-            {189, 155},
-            {190, 163},
-            {191, 319},
-            {192, 320},
-            {193, 321},
-            {194, 322},
-            {195, 323},
-            {196, 324},
-            {197, 325},
-            {198, 0},
-            {199, 0},
-            {200, 326},
-            {201, 150},
-            {202, 164},
-            {203, 169},
-            {204, 327},
-            {205, 328},
-            {206, 329},
-            {207, 330},
-            {208, 331},
-            {209, 332},
-            {210, 333},
-            {211, 334},
-            {212, 335},
-            {213, 336},
-            {214, 337},
-            {215, 338},
-            {216, 339},
-            {217, 340},
-            {218, 341},
-            {219, 342},
-            {220, 343},
-            {221, 344},
-            {222, 345},
-            {223, 346},
-            {224, 347},
-            {225, 348},
-            {226, 349},
-            {227, 350},
-            {228, 351},
-            {229, 352},
-            {230, 353},
-            {231, 354},
-            {232, 355},
-            {233, 356},
-            {234, 357},
-            {235, 358},
-            {236, 359},
-            {237, 360},
-            {238, 361},
-            {239, 362},
-            {240, 363},
-            {241, 364},
-            {242, 365},
-            {243, 366},
-            {244, 367},
-            {245, 368},
-            {246, 369},
-            {247, 370},
-            {248, 371},
-            {249, 372},
-            {250, 373},
-            {251, 374},
-            {252, 375},
-            {253, 376},
-            {254, 377},
-            {255, 378}           
-    };
-
-    private CFFExpertEncoding()
-    {
-        for (int[] encodingEntry : CFF_EXPERT_ENCODING_TABLE)
-        {
-            add(encodingEntry[CHAR_CODE], encodingEntry[CHAR_SID]);
-        }
-    }
-
-    /**
-     * Returns an instance of the CFFExportEncoding class.
-     * @return an instance of CFFExportEncoding
-     */
-    public static CFFExpertEncoding getInstance()
-    {
-        return CFFExpertEncoding.INSTANCE;
-    }
-
-    private static final CFFExpertEncoding INSTANCE = new CFFExpertEncoding();
-
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.fontbox.cff;
+
+/**
+ * This is specialized CFFEncoding. It's used if the EncodingId of a font is set to 1.
+ * 
+ * @author Villu Ruusmann
+ */
+public final class CFFExpertEncoding extends CFFEncoding
+{
+    
+    private static final int CHAR_CODE = 0;
+    private static final int CHAR_SID = 1;
+
+    private CFFExpertEncoding()
+    {
+        // Table of character codes and their corresponding sid.
+        int[][] CFF_EXPERT_ENCODING_TABLE = {
+                {0, 0},
+                {1, 0},
+                {2, 0},
+                {3, 0},
+                {4, 0},
+                {5, 0},
+                {6, 0},
+                {7, 0},
+                {8, 0},
+                {9, 0},
+                {10, 0},
+                {11, 0},
+                {12, 0},
+                {13, 0},
+                {14, 0},
+                {15, 0},
+                {16, 0},
+                {17, 0},
+                {18, 0},
+                {19, 0},
+                {20, 0},
+                {21, 0},
+                {22, 0},
+                {23, 0},
+                {24, 0},
+                {25, 0},
+                {26, 0},
+                {27, 0},
+                {28, 0},
+                {29, 0},
+                {30, 0},
+                {31, 0},
+                {32, 1},
+                {33, 229},
+                {34, 230},
+                {35, 0},
+                {36, 231},
+                {37, 232},
+                {38, 233},
+                {39, 234},
+                {40, 235},
+                {41, 236},
+                {42, 237},
+                {43, 238},
+                {44, 13},
+                {45, 14},
+                {46, 15},
+                {47, 99},
+                {48, 239},
+                {49, 240},
+                {50, 241},
+                {51, 242},
+                {52, 243},
+                {53, 244},
+                {54, 245},
+                {55, 246},
+                {56, 247},
+                {57, 248},
+                {58, 27},
+                {59, 28},
+                {60, 249},
+                {61, 250},
+                {62, 251},
+                {63, 252},
+                {64, 0},
+                {65, 253},
+                {66, 254},
+                {67, 255},
+                {68, 256},
+                {69, 257},
+                {70, 0},
+                {71, 0},
+                {72, 0},
+                {73, 258},
+                {74, 0},
+                {75, 0},
+                {76, 259},
+                {77, 260},
+                {78, 261},
+                {79, 262},
+                {80, 0},
+                {81, 0},
+                {82, 263},
+                {83, 264},
+                {84, 265},
+                {85, 0},
+                {86, 266},
+                {87, 109},
+                {88, 110},
+                {89, 267},
+                {90, 268},
+                {91, 269},
+                {92, 0},
+                {93, 270},
+                {94, 271},
+                {95, 272},
+                {96, 273},
+                {97, 274},
+                {98, 275},
+                {99, 276},
+                {100, 277},
+                {101, 278},
+                {102, 279},
+                {103, 280},
+                {104, 281},
+                {105, 282},
+                {106, 283},
+                {107, 284},
+                {108, 285},
+                {109, 286},
+                {110, 287},
+                {111, 288},
+                {112, 289},
+                {113, 290},
+                {114, 291},
+                {115, 292},
+                {116, 293},
+                {117, 294},
+                {118, 295},
+                {119, 296},
+                {120, 297},
+                {121, 298},
+                {122, 299},
+                {123, 300},
+                {124, 301},
+                {125, 302},
+                {126, 303},
+                {127, 0},
+                {128, 0},
+                {129, 0},
+                {130, 0},
+                {131, 0},
+                {132, 0},
+                {133, 0},
+                {134, 0},
+                {135, 0},
+                {136, 0},
+                {137, 0},
+                {138, 0},
+                {139, 0},
+                {140, 0},
+                {141, 0},
+                {142, 0},
+                {143, 0},
+                {144, 0},
+                {145, 0},
+                {146, 0},
+                {147, 0},
+                {148, 0},
+                {149, 0},
+                {150, 0},
+                {151, 0},
+                {152, 0},
+                {153, 0},
+                {154, 0},
+                {155, 0},
+                {156, 0},
+                {157, 0},
+                {158, 0},
+                {159, 0},
+                {160, 0},
+                {161, 304},
+                {162, 305},
+                {163, 306},
+                {164, 0},
+                {165, 0},
+                {166, 307},
+                {167, 308},
+                {168, 309},
+                {169, 310},
+                {170, 311},
+                {171, 0},
+                {172, 312},
+                {173, 0},
+                {174, 0},
+                {175, 313},
+                {176, 0},
+                {177, 0},
+                {178, 314},
+                {179, 315},
+                {180, 0},
+                {181, 0},
+                {182, 316},
+                {183, 317},
+                {184, 318},
+                {185, 0},
+                {186, 0},
+                {187, 0},
+                {188, 158},
+                {189, 155},
+                {190, 163},
+                {191, 319},
+                {192, 320},
+                {193, 321},
+                {194, 322},
+                {195, 323},
+                {196, 324},
+                {197, 325},
+                {198, 0},
+                {199, 0},
+                {200, 326},
+                {201, 150},
+                {202, 164},
+                {203, 169},
+                {204, 327},
+                {205, 328},
+                {206, 329},
+                {207, 330},
+                {208, 331},
+                {209, 332},
+                {210, 333},
+                {211, 334},
+                {212, 335},
+                {213, 336},
+                {214, 337},
+                {215, 338},
+                {216, 339},
+                {217, 340},
+                {218, 341},
+                {219, 342},
+                {220, 343},
+                {221, 344},
+                {222, 345},
+                {223, 346},
+                {224, 347},
+                {225, 348},
+                {226, 349},
+                {227, 350},
+                {228, 351},
+                {229, 352},
+                {230, 353},
+                {231, 354},
+                {232, 355},
+                {233, 356},
+                {234, 357},
+                {235, 358},
+                {236, 359},
+                {237, 360},
+                {238, 361},
+                {239, 362},
+                {240, 363},
+                {241, 364},
+                {242, 365},
+                {243, 366},
+                {244, 367},
+                {245, 368},
+                {246, 369},
+                {247, 370},
+                {248, 371},
+                {249, 372},
+                {250, 373},
+                {251, 374},
+                {252, 375},
+                {253, 376},
+                {254, 377},
+                {255, 378}
+        };
+
+        for (int[] encodingEntry : CFF_EXPERT_ENCODING_TABLE)
+        {
+            add(encodingEntry[CHAR_CODE], encodingEntry[CHAR_SID]);
+        }
+    }
+
+    /**
+     * Returns an instance of the CFFExportEncoding class.
+     * @return an instance of CFFExportEncoding
+     */
+    public static CFFExpertEncoding getInstance()
+    {
+        return CFFExpertEncoding.INSTANCE;
+    }
+
+    private static final CFFExpertEncoding INSTANCE = new CFFExpertEncoding();
+
+}

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java?rev=1891946&r1=1891945&r2=1891946&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFExpertSubsetCharset.java Sun Aug  1 08:49:40 2021
@@ -1,144 +1,141 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.fontbox.cff;
-
-
-/**
- * This is specialized CFFCharset. It's used if the CharsetId of a font is set to 2.
- * 
- * @author Villu Ruusmann
- */
-public final class CFFExpertSubsetCharset extends CFFCharsetType1
-{
-
-    private static final int CHAR_CODE = 0;
-    private static final int CHAR_NAME = 1;
-    
-    /**
-     * Table of character codes and their corresponding names.
-     */
-    private static final Object[][] CFF_EXPERT_SUBSET_CHARSET_TABLE = {
-            {0, ".notdef"},
-            {1, "space"},
-            {231, "dollaroldstyle"},
-            {232, "dollarsuperior"},
-            {235, "parenleftsuperior"},
-            {236, "parenrightsuperior"},
-            {237, "twodotenleader"},
-            {238, "onedotenleader"},
-            {13, "comma"},
-            {14, "hyphen"},
-            {15, "period"},
-            {99, "fraction"},
-            {239, "zerooldstyle"},
-            {240, "oneoldstyle"},
-            {241, "twooldstyle"},
-            {242, "threeoldstyle"},
-            {243, "fouroldstyle"},
-            {244, "fiveoldstyle"},
-            {245, "sixoldstyle"},
-            {246, "sevenoldstyle"},
-            {247, "eightoldstyle"},
-            {248, "nineoldstyle"},
-            {27, "colon"},
-            {28, "semicolon"},
-            {249, "commasuperior"},
-            {250, "threequartersemdash"},
-            {251, "periodsuperior"},
-            {253, "asuperior"},
-            {254, "bsuperior"},
-            {255, "centsuperior"},
-            {256, "dsuperior"},
-            {257, "esuperior"},
-            {258, "isuperior"},
-            {259, "lsuperior"},
-            {260, "msuperior"},
-            {261, "nsuperior"},
-            {262, "osuperior"},
-            {263, "rsuperior"},
-            {264, "ssuperior"},
-            {265, "tsuperior"},
-            {266, "ff"},
-            {109, "fi"},
-            {110, "fl"},
-            {267, "ffi"},
-            {268, "ffl"},
-            {269, "parenleftinferior"},
-            {270, "parenrightinferior"},
-            {272, "hyphensuperior"},
-            {300, "colonmonetary"},
-            {301, "onefitted"},
-            {302, "rupiah"},
-            {305, "centoldstyle"},
-            {314, "figuredash"},
-            {315, "hypheninferior"},
-            {158, "onequarter"},
-            {155, "onehalf"},
-            {163, "threequarters"},
-            {320, "oneeighth"},
-            {321, "threeeighths"},
-            {322, "fiveeighths"},
-            {323, "seveneighths"},
-            {324, "onethird"},
-            {325, "twothirds"},
-            {326, "zerosuperior"},
-            {150, "onesuperior"},
-            {164, "twosuperior"},
-            {169, "threesuperior"},
-            {327, "foursuperior"},
-            {328, "fivesuperior"},
-            {329, "sixsuperior"},
-            {330, "sevensuperior"},
-            {331, "eightsuperior"},
-            {332, "ninesuperior"},
-            {333, "zeroinferior"},
-            {334, "oneinferior"},
-            {335, "twoinferior"},
-            {336, "threeinferior"},
-            {337, "fourinferior"},
-            {338, "fiveinferior"},
-            {339, "sixinferior"},
-            {340, "seveninferior"},
-            {341, "eightinferior"},
-            {342, "nineinferior"},
-            {343, "centinferior"},
-            {344, "dollarinferior"},
-            {345, "periodinferior"},
-            {346, "commainferior"}
-    };
-    
-    private CFFExpertSubsetCharset()
-    {
-        int gid = 0;
-        for (Object[] charsetEntry : CFF_EXPERT_SUBSET_CHARSET_TABLE)
-        {
-            addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
-        }
-    }
-
-    /**
-     * Returns an instance of the CFFExpertSubsetCharset class.
-     * @return an instance of CFFExpertSubsetCharset
-     */
-    public static CFFExpertSubsetCharset getInstance()
-    {
-        return CFFExpertSubsetCharset.INSTANCE;
-    }
-
-    private static final CFFExpertSubsetCharset INSTANCE = new CFFExpertSubsetCharset();
-
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.fontbox.cff;
+
+
+/**
+ * This is specialized CFFCharset. It's used if the CharsetId of a font is set to 2.
+ * 
+ * @author Villu Ruusmann
+ */
+public final class CFFExpertSubsetCharset extends CFFCharsetType1
+{
+
+    private static final int CHAR_CODE = 0;
+    private static final int CHAR_NAME = 1;
+    
+    private CFFExpertSubsetCharset()
+    {
+        // Table of character codes and their corresponding names.
+        Object[][] CFF_EXPERT_SUBSET_CHARSET_TABLE = {
+                {0, ".notdef"},
+                {1, "space"},
+                {231, "dollaroldstyle"},
+                {232, "dollarsuperior"},
+                {235, "parenleftsuperior"},
+                {236, "parenrightsuperior"},
+                {237, "twodotenleader"},
+                {238, "onedotenleader"},
+                {13, "comma"},
+                {14, "hyphen"},
+                {15, "period"},
+                {99, "fraction"},
+                {239, "zerooldstyle"},
+                {240, "oneoldstyle"},
+                {241, "twooldstyle"},
+                {242, "threeoldstyle"},
+                {243, "fouroldstyle"},
+                {244, "fiveoldstyle"},
+                {245, "sixoldstyle"},
+                {246, "sevenoldstyle"},
+                {247, "eightoldstyle"},
+                {248, "nineoldstyle"},
+                {27, "colon"},
+                {28, "semicolon"},
+                {249, "commasuperior"},
+                {250, "threequartersemdash"},
+                {251, "periodsuperior"},
+                {253, "asuperior"},
+                {254, "bsuperior"},
+                {255, "centsuperior"},
+                {256, "dsuperior"},
+                {257, "esuperior"},
+                {258, "isuperior"},
+                {259, "lsuperior"},
+                {260, "msuperior"},
+                {261, "nsuperior"},
+                {262, "osuperior"},
+                {263, "rsuperior"},
+                {264, "ssuperior"},
+                {265, "tsuperior"},
+                {266, "ff"},
+                {109, "fi"},
+                {110, "fl"},
+                {267, "ffi"},
+                {268, "ffl"},
+                {269, "parenleftinferior"},
+                {270, "parenrightinferior"},
+                {272, "hyphensuperior"},
+                {300, "colonmonetary"},
+                {301, "onefitted"},
+                {302, "rupiah"},
+                {305, "centoldstyle"},
+                {314, "figuredash"},
+                {315, "hypheninferior"},
+                {158, "onequarter"},
+                {155, "onehalf"},
+                {163, "threequarters"},
+                {320, "oneeighth"},
+                {321, "threeeighths"},
+                {322, "fiveeighths"},
+                {323, "seveneighths"},
+                {324, "onethird"},
+                {325, "twothirds"},
+                {326, "zerosuperior"},
+                {150, "onesuperior"},
+                {164, "twosuperior"},
+                {169, "threesuperior"},
+                {327, "foursuperior"},
+                {328, "fivesuperior"},
+                {329, "sixsuperior"},
+                {330, "sevensuperior"},
+                {331, "eightsuperior"},
+                {332, "ninesuperior"},
+                {333, "zeroinferior"},
+                {334, "oneinferior"},
+                {335, "twoinferior"},
+                {336, "threeinferior"},
+                {337, "fourinferior"},
+                {338, "fiveinferior"},
+                {339, "sixinferior"},
+                {340, "seveninferior"},
+                {341, "eightinferior"},
+                {342, "nineinferior"},
+                {343, "centinferior"},
+                {344, "dollarinferior"},
+                {345, "periodinferior"},
+                {346, "commainferior"}
+        };
+        int gid = 0;
+        for (Object[] charsetEntry : CFF_EXPERT_SUBSET_CHARSET_TABLE)
+        {
+            addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
+        }
+    }
+
+    /**
+     * Returns an instance of the CFFExpertSubsetCharset class.
+     * @return an instance of CFFExpertSubsetCharset
+     */
+    public static CFFExpertSubsetCharset getInstance()
+    {
+        return CFFExpertSubsetCharset.INSTANCE;
+    }
+
+    private static final CFFExpertSubsetCharset INSTANCE = new CFFExpertSubsetCharset();
+
+}

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java?rev=1891946&r1=1891945&r2=1891946&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFISOAdobeCharset.java Sun Aug  1 08:49:40 2021
@@ -1,285 +1,282 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.fontbox.cff;
-
-
-/**
- * This is specialized CFFCharset. It's used if the CharsetId of a font is set to 0.
- * 
- * @author Villu Ruusmann
- */
-public final class CFFISOAdobeCharset extends CFFCharsetType1
-{
-    private static final int CHAR_CODE = 0;
-    private static final int CHAR_NAME = 1;
-    
-    /**
-     * Table of character codes and their corresponding names.
-     */
-    private static final Object[][] CFF_ISO_ADOBE_CHARSET_TABLE = {
-            {0, ".notdef"},
-            {1, "space"},
-            {2, "exclam"},
-            {3, "quotedbl"},
-            {4, "numbersign"},
-            {5, "dollar"},
-            {6, "percent"},
-            {7, "ampersand"},
-            {8, "quoteright"},
-            {9, "parenleft"},
-            {10, "parenright"},
-            {11, "asterisk"},
-            {12, "plus"},
-            {13, "comma"},
-            {14, "hyphen"},
-            {15, "period"},
-            {16, "slash"},
-            {17, "zero"},
-            {18, "one"},
-            {19, "two"},
-            {20, "three"},
-            {21, "four"},
-            {22, "five"},
-            {23, "six"},
-            {24, "seven"},
-            {25, "eight"},
-            {26, "nine"},
-            {27, "colon"},
-            {28, "semicolon"},
-            {29, "less"},
-            {30, "equal"},
-            {31, "greater"},
-            {32, "question"},
-            {33, "at"},
-            {34, "A"},
-            {35, "B"},
-            {36, "C"},
-            {37, "D"},
-            {38, "E"},
-            {39, "F"},
-            {40, "G"},
-            {41, "H"},
-            {42, "I"},
-            {43, "J"},
-            {44, "K"},
-            {45, "L"},
-            {46, "M"},
-            {47, "N"},
-            {48, "O"},
-            {49, "P"},
-            {50, "Q"},
-            {51, "R"},
-            {52, "S"},
-            {53, "T"},
-            {54, "U"},
-            {55, "V"},
-            {56, "W"},
-            {57, "X"},
-            {58, "Y"},
-            {59, "Z"},
-            {60, "bracketleft"},
-            {61, "backslash"},
-            {62, "bracketright"},
-            {63, "asciicircum"},
-            {64, "underscore"},
-            {65, "quoteleft"},
-            {66, "a"},
-            {67, "b"},
-            {68, "c"},
-            {69, "d"},
-            {70, "e"},
-            {71, "f"},
-            {72, "g"},
-            {73, "h"},
-            {74, "i"},
-            {75, "j"},
-            {76, "k"},
-            {77, "l"},
-            {78, "m"},
-            {79, "n"},
-            {80, "o"},
-            {81, "p"},
-            {82, "q"},
-            {83, "r"},
-            {84, "s"},
-            {85, "t"},
-            {86, "u"},
-            {87, "v"},
-            {88, "w"},
-            {89, "x"},
-            {90, "y"},
-            {91, "z"},
-            {92, "braceleft"},
-            {93, "bar"},
-            {94, "braceright"},
-            {95, "asciitilde"},
-            {96, "exclamdown"},
-            {97, "cent"},
-            {98, "sterling"},
-            {99, "fraction"},
-            {100, "yen"},
-            {101, "florin"},
-            {102, "section"},
-            {103, "currency"},
-            {104, "quotesingle"},
-            {105, "quotedblleft"},
-            {106, "guillemotleft"},
-            {107, "guilsinglleft"},
-            {108, "guilsinglright"},
-            {109, "fi"},
-            {110, "fl"},
-            {111, "endash"},
-            {112, "dagger"},
-            {113, "daggerdbl"},
-            {114, "periodcentered"},
-            {115, "paragraph"},
-            {116, "bullet"},
-            {117, "quotesinglbase"},
-            {118, "quotedblbase"},
-            {119, "quotedblright"},
-            {120, "guillemotright"},
-            {121, "ellipsis"},
-            {122, "perthousand"},
-            {123, "questiondown"},
-            {124, "grave"},
-            {125, "acute"},
-            {126, "circumflex"},
-            {127, "tilde"},
-            {128, "macron"},
-            {129, "breve"},
-            {130, "dotaccent"},
-            {131, "dieresis"},
-            {132, "ring"},
-            {133, "cedilla"},
-            {134, "hungarumlaut"},
-            {135, "ogonek"},
-            {136, "caron"},
-            {137, "emdash"},
-            {138, "AE"},
-            {139, "ordfeminine"},
-            {140, "Lslash"},
-            {141, "Oslash"},
-            {142, "OE"},
-            {143, "ordmasculine"},
-            {144, "ae"},
-            {145, "dotlessi"},
-            {146, "lslash"},
-            {147, "oslash"},
-            {148, "oe"},
-            {149, "germandbls"},
-            {150, "onesuperior"},
-            {151, "logicalnot"},
-            {152, "mu"},
-            {153, "trademark"},
-            {154, "Eth"},
-            {155, "onehalf"},
-            {156, "plusminus"},
-            {157, "Thorn"},
-            {158, "onequarter"},
-            {159, "divide"},
-            {160, "brokenbar"},
-            {161, "degree"},
-            {162, "thorn"},
-            {163, "threequarters"},
-            {164, "twosuperior"},
-            {165, "registered"},
-            {166, "minus"},
-            {167, "eth"},
-            {168, "multiply"},
-            {169, "threesuperior"},
-            {170, "copyright"},
-            {171, "Aacute"},
-            {172, "Acircumflex"},
-            {173, "Adieresis"},
-            {174, "Agrave"},
-            {175, "Aring"},
-            {176, "Atilde"},
-            {177, "Ccedilla"},
-            {178, "Eacute"},
-            {179, "Ecircumflex"},
-            {180, "Edieresis"},
-            {181, "Egrave"},
-            {182, "Iacute"},
-            {183, "Icircumflex"},
-            {184, "Idieresis"},
-            {185, "Igrave"},
-            {186, "Ntilde"},
-            {187, "Oacute"},
-            {188, "Ocircumflex"},
-            {189, "Odieresis"},
-            {190, "Ograve"},
-            {191, "Otilde"},
-            {192, "Scaron"},
-            {193, "Uacute"},
-            {194, "Ucircumflex"},
-            {195, "Udieresis"},
-            {196, "Ugrave"},
-            {197, "Yacute"},
-            {198, "Ydieresis"},
-            {199, "Zcaron"},
-            {200, "aacute"},
-            {201, "acircumflex"},
-            {202, "adieresis"},
-            {203, "agrave"},
-            {204, "aring"},
-            {205, "atilde"},
-            {206, "ccedilla"},
-            {207, "eacute"},
-            {208, "ecircumflex"},
-            {209, "edieresis"},
-            {210, "egrave"},
-            {211, "iacute"},
-            {212, "icircumflex"},
-            {213, "idieresis"},
-            {214, "igrave"},
-            {215, "ntilde"},
-            {216, "oacute"},
-            {217, "ocircumflex"},
-            {218, "odieresis"},
-            {219, "ograve"},
-            {220, "otilde"},
-            {221, "scaron"},
-            {222, "uacute"},
-            {223, "ucircumflex"},
-            {224, "udieresis"},
-            {225, "ugrave"},
-            {226, "yacute"},
-            {227, "ydieresis"},
-            {228, "zcaron"}
-    };
-    
-    private CFFISOAdobeCharset()
-    {
-        int gid = 0;
-        for (Object[] charsetEntry : CFF_ISO_ADOBE_CHARSET_TABLE)
-        {
-            addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
-        }
-    }
-
-    /**
-     * Returns an instance of the CFFExpertSubsetCharset class.
-     * @return an instance of CFFExpertSubsetCharset
-     */
-    public static CFFISOAdobeCharset getInstance()
-    {
-        return CFFISOAdobeCharset.INSTANCE;
-    }
-
-    private static final CFFISOAdobeCharset INSTANCE = new CFFISOAdobeCharset();
-
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.fontbox.cff;
+
+
+/**
+ * This is specialized CFFCharset. It's used if the CharsetId of a font is set to 0.
+ * 
+ * @author Villu Ruusmann
+ */
+public final class CFFISOAdobeCharset extends CFFCharsetType1
+{
+    private static final int CHAR_CODE = 0;
+    private static final int CHAR_NAME = 1;
+    
+    private CFFISOAdobeCharset()
+    {
+        // Table of character codes and their corresponding names.
+        Object[][] CFF_ISO_ADOBE_CHARSET_TABLE = {
+                {0, ".notdef"},
+                {1, "space"},
+                {2, "exclam"},
+                {3, "quotedbl"},
+                {4, "numbersign"},
+                {5, "dollar"},
+                {6, "percent"},
+                {7, "ampersand"},
+                {8, "quoteright"},
+                {9, "parenleft"},
+                {10, "parenright"},
+                {11, "asterisk"},
+                {12, "plus"},
+                {13, "comma"},
+                {14, "hyphen"},
+                {15, "period"},
+                {16, "slash"},
+                {17, "zero"},
+                {18, "one"},
+                {19, "two"},
+                {20, "three"},
+                {21, "four"},
+                {22, "five"},
+                {23, "six"},
+                {24, "seven"},
+                {25, "eight"},
+                {26, "nine"},
+                {27, "colon"},
+                {28, "semicolon"},
+                {29, "less"},
+                {30, "equal"},
+                {31, "greater"},
+                {32, "question"},
+                {33, "at"},
+                {34, "A"},
+                {35, "B"},
+                {36, "C"},
+                {37, "D"},
+                {38, "E"},
+                {39, "F"},
+                {40, "G"},
+                {41, "H"},
+                {42, "I"},
+                {43, "J"},
+                {44, "K"},
+                {45, "L"},
+                {46, "M"},
+                {47, "N"},
+                {48, "O"},
+                {49, "P"},
+                {50, "Q"},
+                {51, "R"},
+                {52, "S"},
+                {53, "T"},
+                {54, "U"},
+                {55, "V"},
+                {56, "W"},
+                {57, "X"},
+                {58, "Y"},
+                {59, "Z"},
+                {60, "bracketleft"},
+                {61, "backslash"},
+                {62, "bracketright"},
+                {63, "asciicircum"},
+                {64, "underscore"},
+                {65, "quoteleft"},
+                {66, "a"},
+                {67, "b"},
+                {68, "c"},
+                {69, "d"},
+                {70, "e"},
+                {71, "f"},
+                {72, "g"},
+                {73, "h"},
+                {74, "i"},
+                {75, "j"},
+                {76, "k"},
+                {77, "l"},
+                {78, "m"},
+                {79, "n"},
+                {80, "o"},
+                {81, "p"},
+                {82, "q"},
+                {83, "r"},
+                {84, "s"},
+                {85, "t"},
+                {86, "u"},
+                {87, "v"},
+                {88, "w"},
+                {89, "x"},
+                {90, "y"},
+                {91, "z"},
+                {92, "braceleft"},
+                {93, "bar"},
+                {94, "braceright"},
+                {95, "asciitilde"},
+                {96, "exclamdown"},
+                {97, "cent"},
+                {98, "sterling"},
+                {99, "fraction"},
+                {100, "yen"},
+                {101, "florin"},
+                {102, "section"},
+                {103, "currency"},
+                {104, "quotesingle"},
+                {105, "quotedblleft"},
+                {106, "guillemotleft"},
+                {107, "guilsinglleft"},
+                {108, "guilsinglright"},
+                {109, "fi"},
+                {110, "fl"},
+                {111, "endash"},
+                {112, "dagger"},
+                {113, "daggerdbl"},
+                {114, "periodcentered"},
+                {115, "paragraph"},
+                {116, "bullet"},
+                {117, "quotesinglbase"},
+                {118, "quotedblbase"},
+                {119, "quotedblright"},
+                {120, "guillemotright"},
+                {121, "ellipsis"},
+                {122, "perthousand"},
+                {123, "questiondown"},
+                {124, "grave"},
+                {125, "acute"},
+                {126, "circumflex"},
+                {127, "tilde"},
+                {128, "macron"},
+                {129, "breve"},
+                {130, "dotaccent"},
+                {131, "dieresis"},
+                {132, "ring"},
+                {133, "cedilla"},
+                {134, "hungarumlaut"},
+                {135, "ogonek"},
+                {136, "caron"},
+                {137, "emdash"},
+                {138, "AE"},
+                {139, "ordfeminine"},
+                {140, "Lslash"},
+                {141, "Oslash"},
+                {142, "OE"},
+                {143, "ordmasculine"},
+                {144, "ae"},
+                {145, "dotlessi"},
+                {146, "lslash"},
+                {147, "oslash"},
+                {148, "oe"},
+                {149, "germandbls"},
+                {150, "onesuperior"},
+                {151, "logicalnot"},
+                {152, "mu"},
+                {153, "trademark"},
+                {154, "Eth"},
+                {155, "onehalf"},
+                {156, "plusminus"},
+                {157, "Thorn"},
+                {158, "onequarter"},
+                {159, "divide"},
+                {160, "brokenbar"},
+                {161, "degree"},
+                {162, "thorn"},
+                {163, "threequarters"},
+                {164, "twosuperior"},
+                {165, "registered"},
+                {166, "minus"},
+                {167, "eth"},
+                {168, "multiply"},
+                {169, "threesuperior"},
+                {170, "copyright"},
+                {171, "Aacute"},
+                {172, "Acircumflex"},
+                {173, "Adieresis"},
+                {174, "Agrave"},
+                {175, "Aring"},
+                {176, "Atilde"},
+                {177, "Ccedilla"},
+                {178, "Eacute"},
+                {179, "Ecircumflex"},
+                {180, "Edieresis"},
+                {181, "Egrave"},
+                {182, "Iacute"},
+                {183, "Icircumflex"},
+                {184, "Idieresis"},
+                {185, "Igrave"},
+                {186, "Ntilde"},
+                {187, "Oacute"},
+                {188, "Ocircumflex"},
+                {189, "Odieresis"},
+                {190, "Ograve"},
+                {191, "Otilde"},
+                {192, "Scaron"},
+                {193, "Uacute"},
+                {194, "Ucircumflex"},
+                {195, "Udieresis"},
+                {196, "Ugrave"},
+                {197, "Yacute"},
+                {198, "Ydieresis"},
+                {199, "Zcaron"},
+                {200, "aacute"},
+                {201, "acircumflex"},
+                {202, "adieresis"},
+                {203, "agrave"},
+                {204, "aring"},
+                {205, "atilde"},
+                {206, "ccedilla"},
+                {207, "eacute"},
+                {208, "ecircumflex"},
+                {209, "edieresis"},
+                {210, "egrave"},
+                {211, "iacute"},
+                {212, "icircumflex"},
+                {213, "idieresis"},
+                {214, "igrave"},
+                {215, "ntilde"},
+                {216, "oacute"},
+                {217, "ocircumflex"},
+                {218, "odieresis"},
+                {219, "ograve"},
+                {220, "otilde"},
+                {221, "scaron"},
+                {222, "uacute"},
+                {223, "ucircumflex"},
+                {224, "udieresis"},
+                {225, "ugrave"},
+                {226, "yacute"},
+                {227, "ydieresis"},
+                {228, "zcaron"}
+        };
+        int gid = 0;
+        for (Object[] charsetEntry : CFF_ISO_ADOBE_CHARSET_TABLE)
+        {
+            addSID(gid++, (Integer) charsetEntry[CHAR_CODE], charsetEntry[CHAR_NAME].toString());
+        }
+    }
+
+    /**
+     * Returns an instance of the CFFExpertSubsetCharset class.
+     * @return an instance of CFFExpertSubsetCharset
+     */
+    public static CFFISOAdobeCharset getInstance()
+    {
+        return CFFISOAdobeCharset.INSTANCE;
+    }
+
+    private static final CFFISOAdobeCharset INSTANCE = new CFFISOAdobeCharset();
+
+}

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFStandardEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFStandardEncoding.java?rev=1891946&r1=1891945&r2=1891946&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFStandardEncoding.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/cff/CFFStandardEncoding.java Sun Aug  1 08:49:40 2021
@@ -1,310 +1,307 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.fontbox.cff;
-
-/**
- * This is specialized CFFEncoding. It's used if the EncodingId of a font is set to 0.
- * 
- * @author Villu Ruusmann
- */
-public final class CFFStandardEncoding extends CFFEncoding
-{
-    private static final int CHAR_CODE = 0;
-    private static final int CHAR_SID = 1;
-    
-    /**
-     * Table of character codes and their corresponding sid.
-     */
-    private static final int[][] CFF_STANDARD_ENCODING_TABLE = {
-            {0, 0},
-            {1, 0},
-            {2, 0},
-            {3, 0},
-            {4, 0},
-            {5, 0},
-            {6, 0},
-            {7, 0},
-            {8, 0},
-            {9, 0},
-            {10, 0},
-            {11, 0},
-            {12, 0},
-            {13, 0},
-            {14, 0},
-            {15, 0},
-            {16, 0},
-            {17, 0},
-            {18, 0},
-            {19, 0},
-            {20, 0},
-            {21, 0},
-            {22, 0},
-            {23, 0},
-            {24, 0},
-            {25, 0},
-            {26, 0},
-            {27, 0},
-            {28, 0},
-            {29, 0},
-            {30, 0},
-            {31, 0},
-            {32, 1},
-            {33, 2},
-            {34, 3},
-            {35, 4},
-            {36, 5},
-            {37, 6},
-            {38, 7},
-            {39, 8},
-            {40, 9},
-            {41, 10},
-            {42, 11},
-            {43, 12},
-            {44, 13},
-            {45, 14},
-            {46, 15},
-            {47, 16},
-            {48, 17},
-            {49, 18},
-            {50, 19},
-            {51, 20},
-            {52, 21},
-            {53, 22},
-            {54, 23},
-            {55, 24},
-            {56, 25},
-            {57, 26},
-            {58, 27},
-            {59, 28},
-            {60, 29},
-            {61, 30},
-            {62, 31},
-            {63, 32},
-            {64, 33},
-            {65, 34},
-            {66, 35},
-            {67, 36},
-            {68, 37},
-            {69, 38},
-            {70, 39},
-            {71, 40},
-            {72, 41},
-            {73, 42},
-            {74, 43},
-            {75, 44},
-            {76, 45},
-            {77, 46},
-            {78, 47},
-            {79, 48},
-            {80, 49},
-            {81, 50},
-            {82, 51},
-            {83, 52},
-            {84, 53},
-            {85, 54},
-            {86, 55},
-            {87, 56},
-            {88, 57},
-            {89, 58},
-            {90, 59},
-            {91, 60},
-            {92, 61},
-            {93, 62},
-            {94, 63},
-            {95, 64},
-            {96, 65},
-            {97, 66},
-            {98, 67},
-            {99, 68},
-            {100, 69},
-            {101, 70},
-            {102, 71},
-            {103, 72},
-            {104, 73},
-            {105, 74},
-            {106, 75},
-            {107, 76},
-            {108, 77},
-            {109, 78},
-            {110, 79},
-            {111, 80},
-            {112, 81},
-            {113, 82},
-            {114, 83},
-            {115, 84},
-            {116, 85},
-            {117, 86},
-            {118, 87},
-            {119, 88},
-            {120, 89},
-            {121, 90},
-            {122, 91},
-            {123, 92},
-            {124, 93},
-            {125, 94},
-            {126, 95},
-            {127, 0},
-            {128, 0},
-            {129, 0},
-            {130, 0},
-            {131, 0},
-            {132, 0},
-            {133, 0},
-            {134, 0},
-            {135, 0},
-            {136, 0},
-            {137, 0},
-            {138, 0},
-            {139, 0},
-            {140, 0},
-            {141, 0},
-            {142, 0},
-            {143, 0},
-            {144, 0},
-            {145, 0},
-            {146, 0},
-            {147, 0},
-            {148, 0},
-            {149, 0},
-            {150, 0},
-            {151, 0},
-            {152, 0},
-            {153, 0},
-            {154, 0},
-            {155, 0},
-            {156, 0},
-            {157, 0},
-            {158, 0},
-            {159, 0},
-            {160, 0},
-            {161, 96},
-            {162, 97},
-            {163, 98},
-            {164, 99},
-            {165, 100},
-            {166, 101},
-            {167, 102},
-            {168, 103},
-            {169, 104},
-            {170, 105},
-            {171, 106},
-            {172, 107},
-            {173, 108},
-            {174, 109},
-            {175, 110},
-            {176, 0},
-            {177, 111},
-            {178, 112},
-            {179, 113},
-            {180, 114},
-            {181, 0},
-            {182, 115},
-            {183, 116},
-            {184, 117},
-            {185, 118},
-            {186, 119},
-            {187, 120},
-            {188, 121},
-            {189, 122},
-            {190, 0},
-            {191, 123},
-            {192, 0},
-            {193, 124},
-            {194, 125},
-            {195, 126},
-            {196, 127},
-            {197, 128},
-            {198, 129},
-            {199, 130},
-            {200, 131},
-            {201, 0},
-            {202, 132},
-            {203, 133},
-            {204, 0},
-            {205, 134},
-            {206, 135},
-            {207, 136},
-            {208, 137},
-            {209, 0},
-            {210, 0},
-            {211, 0},
-            {212, 0},
-            {213, 0},
-            {214, 0},
-            {215, 0},
-            {216, 0},
-            {217, 0},
-            {218, 0},
-            {219, 0},
-            {220, 0},
-            {221, 0},
-            {222, 0},
-            {223, 0},
-            {224, 0},
-            {225, 138},
-            {226, 0},
-            {227, 139},
-            {228, 0},
-            {229, 0},
-            {230, 0},
-            {231, 0},
-            {232, 140},
-            {233, 141},
-            {234, 142},
-            {235, 143},
-            {236, 0},
-            {237, 0},
-            {238, 0},
-            {239, 0},
-            {240, 0},
-            {241, 144},
-            {242, 0},
-            {243, 0},
-            {244, 0},
-            {245, 145},
-            {246, 0},
-            {247, 0},
-            {248, 146},
-            {249, 147},
-            {250, 148},
-            {251, 149},
-            {252, 0},
-            {253, 0},
-            {254, 0},
-            {255, 0}
-    };
-    
-    private CFFStandardEncoding()
-    {
-        for (int[] encodingEntry : CFF_STANDARD_ENCODING_TABLE)
-        {
-            add(encodingEntry[CHAR_CODE], encodingEntry[CHAR_SID]);
-        }
-    }
-
-    /**
-     * Returns an instance of the CFFStandardEncoding class.
-     * @return an instance of CFFStandardEncoding
-     */
-    public static CFFStandardEncoding getInstance()
-    {
-        return CFFStandardEncoding.INSTANCE;
-    }
-
-    private static final CFFStandardEncoding INSTANCE = new CFFStandardEncoding();
-
-}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.fontbox.cff;
+
+/**
+ * This is specialized CFFEncoding. It's used if the EncodingId of a font is set to 0.
+ * 
+ * @author Villu Ruusmann
+ */
+public final class CFFStandardEncoding extends CFFEncoding
+{
+    private static final int CHAR_CODE = 0;
+    private static final int CHAR_SID = 1;
+    
+    private CFFStandardEncoding()
+    {
+        // Table of character codes and their corresponding sid.
+        int[][] CFF_STANDARD_ENCODING_TABLE = {
+                {0, 0},
+                {1, 0},
+                {2, 0},
+                {3, 0},
+                {4, 0},
+                {5, 0},
+                {6, 0},
+                {7, 0},
+                {8, 0},
+                {9, 0},
+                {10, 0},
+                {11, 0},
+                {12, 0},
+                {13, 0},
+                {14, 0},
+                {15, 0},
+                {16, 0},
+                {17, 0},
+                {18, 0},
+                {19, 0},
+                {20, 0},
+                {21, 0},
+                {22, 0},
+                {23, 0},
+                {24, 0},
+                {25, 0},
+                {26, 0},
+                {27, 0},
+                {28, 0},
+                {29, 0},
+                {30, 0},
+                {31, 0},
+                {32, 1},
+                {33, 2},
+                {34, 3},
+                {35, 4},
+                {36, 5},
+                {37, 6},
+                {38, 7},
+                {39, 8},
+                {40, 9},
+                {41, 10},
+                {42, 11},
+                {43, 12},
+                {44, 13},
+                {45, 14},
+                {46, 15},
+                {47, 16},
+                {48, 17},
+                {49, 18},
+                {50, 19},
+                {51, 20},
+                {52, 21},
+                {53, 22},
+                {54, 23},
+                {55, 24},
+                {56, 25},
+                {57, 26},
+                {58, 27},
+                {59, 28},
+                {60, 29},
+                {61, 30},
+                {62, 31},
+                {63, 32},
+                {64, 33},
+                {65, 34},
+                {66, 35},
+                {67, 36},
+                {68, 37},
+                {69, 38},
+                {70, 39},
+                {71, 40},
+                {72, 41},
+                {73, 42},
+                {74, 43},
+                {75, 44},
+                {76, 45},
+                {77, 46},
+                {78, 47},
+                {79, 48},
+                {80, 49},
+                {81, 50},
+                {82, 51},
+                {83, 52},
+                {84, 53},
+                {85, 54},
+                {86, 55},
+                {87, 56},
+                {88, 57},
+                {89, 58},
+                {90, 59},
+                {91, 60},
+                {92, 61},
+                {93, 62},
+                {94, 63},
+                {95, 64},
+                {96, 65},
+                {97, 66},
+                {98, 67},
+                {99, 68},
+                {100, 69},
+                {101, 70},
+                {102, 71},
+                {103, 72},
+                {104, 73},
+                {105, 74},
+                {106, 75},
+                {107, 76},
+                {108, 77},
+                {109, 78},
+                {110, 79},
+                {111, 80},
+                {112, 81},
+                {113, 82},
+                {114, 83},
+                {115, 84},
+                {116, 85},
+                {117, 86},
+                {118, 87},
+                {119, 88},
+                {120, 89},
+                {121, 90},
+                {122, 91},
+                {123, 92},
+                {124, 93},
+                {125, 94},
+                {126, 95},
+                {127, 0},
+                {128, 0},
+                {129, 0},
+                {130, 0},
+                {131, 0},
+                {132, 0},
+                {133, 0},
+                {134, 0},
+                {135, 0},
+                {136, 0},
+                {137, 0},
+                {138, 0},
+                {139, 0},
+                {140, 0},
+                {141, 0},
+                {142, 0},
+                {143, 0},
+                {144, 0},
+                {145, 0},
+                {146, 0},
+                {147, 0},
+                {148, 0},
+                {149, 0},
+                {150, 0},
+                {151, 0},
+                {152, 0},
+                {153, 0},
+                {154, 0},
+                {155, 0},
+                {156, 0},
+                {157, 0},
+                {158, 0},
+                {159, 0},
+                {160, 0},
+                {161, 96},
+                {162, 97},
+                {163, 98},
+                {164, 99},
+                {165, 100},
+                {166, 101},
+                {167, 102},
+                {168, 103},
+                {169, 104},
+                {170, 105},
+                {171, 106},
+                {172, 107},
+                {173, 108},
+                {174, 109},
+                {175, 110},
+                {176, 0},
+                {177, 111},
+                {178, 112},
+                {179, 113},
+                {180, 114},
+                {181, 0},
+                {182, 115},
+                {183, 116},
+                {184, 117},
+                {185, 118},
+                {186, 119},
+                {187, 120},
+                {188, 121},
+                {189, 122},
+                {190, 0},
+                {191, 123},
+                {192, 0},
+                {193, 124},
+                {194, 125},
+                {195, 126},
+                {196, 127},
+                {197, 128},
+                {198, 129},
+                {199, 130},
+                {200, 131},
+                {201, 0},
+                {202, 132},
+                {203, 133},
+                {204, 0},
+                {205, 134},
+                {206, 135},
+                {207, 136},
+                {208, 137},
+                {209, 0},
+                {210, 0},
+                {211, 0},
+                {212, 0},
+                {213, 0},
+                {214, 0},
+                {215, 0},
+                {216, 0},
+                {217, 0},
+                {218, 0},
+                {219, 0},
+                {220, 0},
+                {221, 0},
+                {222, 0},
+                {223, 0},
+                {224, 0},
+                {225, 138},
+                {226, 0},
+                {227, 139},
+                {228, 0},
+                {229, 0},
+                {230, 0},
+                {231, 0},
+                {232, 140},
+                {233, 141},
+                {234, 142},
+                {235, 143},
+                {236, 0},
+                {237, 0},
+                {238, 0},
+                {239, 0},
+                {240, 0},
+                {241, 144},
+                {242, 0},
+                {243, 0},
+                {244, 0},
+                {245, 145},
+                {246, 0},
+                {247, 0},
+                {248, 146},
+                {249, 147},
+                {250, 148},
+                {251, 149},
+                {252, 0},
+                {253, 0},
+                {254, 0},
+                {255, 0}
+        };
+        for (int[] encodingEntry : CFF_STANDARD_ENCODING_TABLE)
+        {
+            add(encodingEntry[CHAR_CODE], encodingEntry[CHAR_SID]);
+        }
+    }
+
+    /**
+     * Returns an instance of the CFFStandardEncoding class.
+     * @return an instance of CFFStandardEncoding
+     */
+    public static CFFStandardEncoding getInstance()
+    {
+        return CFFStandardEncoding.INSTANCE;
+    }
+
+    private static final CFFStandardEncoding INSTANCE = new CFFStandardEncoding();
+
+}