Avoid FontProgram#getBaseName method usage when it's not appropriate, update documentation

ITXT-CR-284

Autoported commit.
Original commit hash: [3873717]

Author: yulian-gaponenko

itext/itext.io/itext/io/font/FontProgramDescriptorFactory.cs

@@ -62,20 +62,20 @@ public static FontProgramDescriptor FetchDescriptor(String fontName) {
                 }
             }
             try {
-                if (isBuiltinFonts14 || fontName.ToLowerInvariant().EndsWith(".afm") || fontName.ToLowerInvariant().EndsWith
-                    (".pfm")) {
+                String fontNameLowerCase = fontName.ToLowerInvariant();
+                if (isBuiltinFonts14 || fontNameLowerCase.EndsWith(".afm") || fontNameLowerCase.EndsWith(".pfm")) {
                     fontDescriptor = FetchType1FontDescriptor(fontName, null);
                 }
                 else {
                     if (isCidFont) {
                         fontDescriptor = FetchCidFontDescriptor(fontName);
                     }
                     else {
-                        if (baseName.ToLowerInvariant().EndsWith(".ttf") || baseName.ToLowerInvariant().EndsWith(".otf")) {
+                        if (fontNameLowerCase.EndsWith(".ttf") || fontNameLowerCase.EndsWith(".otf")) {
                             fontDescriptor = FetchTrueTypeFontDescriptor(fontName);
                         }
                         else {
-                            fontDescriptor = FetchTTCDescriptor(baseName);
+                            fontDescriptor = FetchTTCDescriptor(fontName);
                         }
                     }
                 }

itext/itext.io/itext/io/font/FontProgramFactory.cs

@@ -71,12 +71,9 @@ public static FontProgram CreateFont() {
         /// <summary>Creates a new font program.</summary>
         /// <remarks>
         /// Creates a new font program. This font program can be one of the 14 built in fonts,
-        /// a Type1 font referred to by an AFM or PFM file, a TrueType font (simple or one from collection) or
+        /// a Type1 font referred to by an AFM or PFM file, a TrueType font or
         /// a CJK font from the Adobe Asian Font Pack.
-        /// TrueType fonts and CJK fonts can have an optional style modifier
-        /// appended to the name. These modifiers are: Bold, Italic and BoldItalic. An
-        /// example would be "STSong-Light,Bold". Note that this modifiers do not work if
-        /// the font is embedded. Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
+        /// Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
         /// This would get the second font (indexes start at 0), in this case "MS PGothic".
         /// <p/>
         /// The fonts are cached and if they already exist they are extracted from the cache,
@@ -97,12 +94,9 @@ public static FontProgram CreateFont(String fontProgram) {
         /// <summary>Creates a new font program.</summary>
         /// <remarks>
         /// Creates a new font program. This font program can be one of the 14 built in fonts,
-        /// a Type1 font referred to by an AFM or PFM file, a TrueType font (simple or one from collection) or
+        /// a Type1 font referred to by an AFM or PFM file, a TrueType font or
         /// a CJK font from the Adobe Asian Font Pack.
-        /// TrueType fonts and CJK fonts can have an optional style modifier
-        /// appended to the name. These modifiers are: Bold, Italic and BoldItalic. An
-        /// example would be "STSong-Light,Bold". Note that this modifiers do not work if
-        /// the font is embedded. Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
+        /// Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
         /// This would get the second font (indexes start at 0), in this case "MS PGothic".
         /// <p/>
         /// The fonts are cached and if they already exist they are extracted from the cache,
@@ -124,12 +118,9 @@ public static FontProgram CreateFont(String fontProgram, bool cached) {
         /// <summary>Creates a new font program.</summary>
         /// <remarks>
         /// Creates a new font program. This font program can be one of the 14 built in fonts,
-        /// a Type1 font referred to by an AFM or PFM file, a TrueType font (simple only) or
+        /// a Type1 font referred to by an AFM or PFM file, a TrueType font or
         /// a CJK font from the Adobe Asian Font Pack.
-        /// TrueType fonts and CJK fonts can have an optional style modifier
-        /// appended to the name. These modifiers are: Bold, Italic and BoldItalic. An
-        /// example would be "STSong-Light,Bold". Note that this modifiers do not work if
-        /// the font is embedded. Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
+        /// Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
         /// This would get the second font (indexes start at 0), in this case "MS PGothic".
         /// <p/>
         /// The fonts are cached and if they already exist they are extracted from the cache,
@@ -150,12 +141,9 @@ public static FontProgram CreateFont(byte[] fontProgram) {
         /// <summary>Creates a new font program.</summary>
         /// <remarks>
         /// Creates a new font program. This font program can be one of the 14 built in fonts,
-        /// a Type 1 font referred to by an AFM or PFM file, a TrueType font (simple only) or
+        /// a Type 1 font referred to by an AFM or PFM file, a TrueType font or
         /// a CJK font from the Adobe Asian Font Pack.
-        /// TrueType fonts and CJK fonts can have an optional style modifier
-        /// appended to the name. These modifiers are: Bold, Italic and BoldItalic. An
-        /// example would be "STSong-Light,Bold". Note that this modifiers do not work if
-        /// the font is embedded. Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
+        /// Fonts in TrueType Collections are addressed by index such as "msgothic.ttc,1".
         /// This would get the second font (indexes start at 0), in this case "MS PGothic".
         /// <p/>
         /// The fonts are cached and if they already exist they are extracted from the cache,
@@ -212,20 +200,24 @@ public static FontProgram CreateFont(String name, byte[] fontProgram, bool cache
                 }
             }
             else {
-                if (isBuiltinFonts14 || name.ToLowerInvariant().EndsWith(".afm") || name.ToLowerInvariant().EndsWith(".pfm"
-                    )) {
+                String fontFileExtension = null;
+                int extensionBeginIndex = name.LastIndexOf('.');
+                if (extensionBeginIndex > 0) {
+                    fontFileExtension = name.Substring(extensionBeginIndex).ToLowerInvariant();
+                }
+                if (isBuiltinFonts14 || ".afm".Equals(fontFileExtension) || ".pfm".Equals(fontFileExtension)) {
                     fontBuilt = new Type1Font(name, null, null, null);
                 }
                 else {
                     if (isCidFont) {
                         fontBuilt = new CidFont(name, FontCache.GetCompatibleCmaps(baseName));
                     }
                     else {
-                        if (baseName.ToLowerInvariant().EndsWith(".ttf") || baseName.ToLowerInvariant().EndsWith(".otf") || baseName
-                            .ToLowerInvariant().EndsWith(".woff")) {
-                            if (baseName.ToLowerInvariant().EndsWith(".woff")) {
+                        if (".ttf".Equals(fontFileExtension) || ".otf".Equals(fontFileExtension) || ".woff".Equals(fontFileExtension
+                            )) {
+                            if (".woff".Equals(fontFileExtension)) {
                                 if (fontProgram == null) {
-                                    fontProgram = StreamUtil.InputStreamToArray(new FileStream(baseName, FileMode.Open, FileAccess.Read));
+                                    fontProgram = StreamUtil.InputStreamToArray(new FileStream(name, FileMode.Open, FileAccess.Read));
                                 }
                                 try {
                                     fontProgram = WoffConverter.Convert(fontProgram);
@@ -242,13 +234,13 @@ public static FontProgram CreateFont(String name, byte[] fontProgram, bool cache
                             }
                         }
                         else {
-                            int ttcSplit = baseName.ToLowerInvariant().IndexOf(".ttc,", StringComparison.Ordinal);
+                            int ttcSplit = name.ToLowerInvariant().IndexOf(".ttc,", StringComparison.Ordinal);
                             if (ttcSplit > 0) {
                                 try {
-                                    String ttcName = baseName.JSubstring(0, ttcSplit + 4);
-                                    //count(.ttc) = 4
-                                    int ttcIndex = System.Convert.ToInt32(baseName.Substring(ttcSplit + 5));
-                                    //count(.ttc,) = 5)
+                                    String ttcName = name.JSubstring(0, ttcSplit + 4);
+                                    // count(.ttc) = 4
+                                    int ttcIndex = System.Convert.ToInt32(name.Substring(ttcSplit + 5));
+                                    // count(.ttc,) = 5)
                                     fontBuilt = new TrueTypeFont(ttcName, ttcIndex);
                                 }
                                 catch (FormatException nfe) {

itext/itext.io/itext/io/font/OpenTypeParser.cs

@@ -278,11 +278,10 @@ public OpenTypeParser(String ttcPath, int ttcIndex) {
 
         /// <exception cref="System.IO.IOException"/>
         public OpenTypeParser(String name) {
-            String nameBase = FontProgram.GetBaseName(name);
-            String ttcName = GetTTCName(nameBase);
+            String ttcName = GetTTCName(name);
             this.fileName = ttcName;
-            if (ttcName.Length < nameBase.Length) {
-                ttcIndex = System.Convert.ToInt32(nameBase.Substring(ttcName.Length + 1));
+            if (ttcName.Length < name.Length) {
+                ttcIndex = System.Convert.ToInt32(name.Substring(ttcName.Length + 1));
             }
             raf = new RandomAccessFileOrArray(new RandomAccessSourceFactory().CreateBestSource(fileName));
             InitializeSfntTables();

port-hash

@@ -1 +1 @@
-7b0a4be987e60090352475e4d9c897ff7f73aea9
+38737174a7ce7345f417aa84d761937e54d10da7