Revert getBaseName usage avoiding in order to not fail on redundant font names usage, add woff support in FontProgramDescriptorFactory

yulian-gaponenko · itext-teamcity · commit bdf6716998eb · 2017-06-23T17:04:38.000+03:00
ITXT-CR-284, DEVSIX-1148

Autoported commit.
Original commit hash: [2762266]
diff --git a/itext/itext.io/itext/io/font/FontProgramDescriptorFactory.cs b/itext/itext.io/itext/io/font/FontProgramDescriptorFactory.cs
@@ -62,7 +62,7 @@ public static FontProgramDescriptor FetchDescriptor(String fontName) {
                 }
             }
             try {
-                String fontNameLowerCase = fontName.ToLowerInvariant();
+                String fontNameLowerCase = baseName.ToLowerInvariant();
                 if (isBuiltinFonts14 || fontNameLowerCase.EndsWith(".afm") || fontNameLowerCase.EndsWith(".pfm")) {
                     fontDescriptor = FetchType1FontDescriptor(fontName, null);
                 }
@@ -71,11 +71,18 @@ public static FontProgramDescriptor FetchDescriptor(String fontName) {
                         fontDescriptor = FetchCidFontDescriptor(fontName);
                     }
                     else {
-                        if (fontNameLowerCase.EndsWith(".ttf") || fontNameLowerCase.EndsWith(".otf")) {
-                            fontDescriptor = FetchTrueTypeFontDescriptor(fontName);
+                        if (fontNameLowerCase.EndsWith(".ttf") || fontNameLowerCase.EndsWith(".otf") || fontNameLowerCase.EndsWith
+                            (".woff")) {
+                            if (fontNameLowerCase.EndsWith(".woff")) {
+                                byte[] fontProgram = WoffConverter.Convert(FontProgramFactory.ReadFontBytesFromPath(baseName));
+                                fontDescriptor = FetchTrueTypeFontDescriptor(fontProgram);
+                            }
+                            else {
+                                fontDescriptor = FetchTrueTypeFontDescriptor(fontName);
+                            }
                         }
                         else {
-                            fontDescriptor = FetchTTCDescriptor(fontName);
+                            fontDescriptor = FetchTTCDescriptor(baseName);
                         }
                     }
                 }
@@ -137,11 +144,11 @@ private static FontProgramDescriptor FetchTTCDescriptor(String baseName) {
                 int ttcIndex;
                 try {
                     ttcName = baseName.JSubstring(0, ttcSplit + 4);
-                    //count(.ttc) = 4
+                    // count(.ttc) = 4
                     ttcIndex = System.Convert.ToInt32(baseName.Substring(ttcSplit + 5));
                 }
                 catch (FormatException nfe) {
-                    //count(.ttc,) = 5)
+                    // count(.ttc,) = 5)
                     throw new iText.IO.IOException(nfe.Message, nfe);
                 }
                 OpenTypeParser parser = new OpenTypeParser(ttcName, ttcIndex);
diff --git a/itext/itext.io/itext/io/font/FontProgramFactory.cs b/itext/itext.io/itext/io/font/FontProgramFactory.cs
@@ -200,9 +200,9 @@ public static FontProgram CreateFont(String name, byte[] fontProgram, bool cache
             }
             else {
                 String fontFileExtension = null;
-                int extensionBeginIndex = name.LastIndexOf('.');
+                int extensionBeginIndex = baseName.LastIndexOf('.');
                 if (extensionBeginIndex > 0) {
-                    fontFileExtension = name.Substring(extensionBeginIndex).ToLowerInvariant();
+                    fontFileExtension = baseName.Substring(extensionBeginIndex).ToLowerInvariant();
                 }
                 if (isBuiltinFonts14 || ".afm".Equals(fontFileExtension) || ".pfm".Equals(fontFileExtension)) {
                     fontBuilt = new Type1Font(name, null, null, null);
@@ -216,7 +216,7 @@ public static FontProgram CreateFont(String name, byte[] fontProgram, bool cache
                             )) {
                             if (".woff".Equals(fontFileExtension)) {
                                 if (fontProgram == null) {
-                                    fontProgram = ReadBytesFromPath(name);
+                                    fontProgram = ReadFontBytesFromPath(baseName);
                                 }
                                 try {
                                     fontProgram = WoffConverter.Convert(fontProgram);
@@ -233,12 +233,12 @@ public static FontProgram CreateFont(String name, byte[] fontProgram, bool cache
                             }
                         }
                         else {
-                            int ttcSplit = name.ToLowerInvariant().IndexOf(".ttc,", StringComparison.Ordinal);
+                            int ttcSplit = baseName.ToLowerInvariant().IndexOf(".ttc,", StringComparison.Ordinal);
                             if (ttcSplit > 0) {
                                 try {
-                                    String ttcName = name.JSubstring(0, ttcSplit + 4);
+                                    String ttcName = baseName.JSubstring(0, ttcSplit + 4);
                                     // count(.ttc) = 4
-                                    int ttcIndex = System.Convert.ToInt32(name.Substring(ttcSplit + 5));
+                                    int ttcIndex = System.Convert.ToInt32(baseName.Substring(ttcSplit + 5));
                                     // count(.ttc,) = 5)
                                     fontBuilt = new TrueTypeFont(ttcName, ttcIndex);
                                 }
@@ -564,7 +564,7 @@ public static void ClearRegisteredFontFamilies() {
         }
 
         /// <exception cref="System.IO.IOException"/>
-        private static byte[] ReadBytesFromPath(String path) {
+        internal static byte[] ReadFontBytesFromPath(String path) {
             RandomAccessFileOrArray raf = new RandomAccessFileOrArray(new RandomAccessSourceFactory().CreateBestSource
                 (path));
             int bufLen = (int)raf.Length();
diff --git a/itext/itext.io/itext/io/font/OpenTypeParser.cs b/itext/itext.io/itext/io/font/OpenTypeParser.cs
@@ -278,10 +278,11 @@ public OpenTypeParser(String ttcPath, int ttcIndex) {
 
         /// <exception cref="System.IO.IOException"/>
         public OpenTypeParser(String name) {
-            String ttcName = GetTTCName(name);
+            String baseName = FontProgram.GetBaseName(name);
+            String ttcName = GetTTCName(baseName);
             this.fileName = ttcName;
-            if (ttcName.Length < name.Length) {
-                ttcIndex = System.Convert.ToInt32(name.Substring(ttcName.Length + 1));
+            if (ttcName.Length < baseName.Length) {
+                ttcIndex = System.Convert.ToInt32(baseName.Substring(ttcName.Length + 1));
             }
             raf = new RandomAccessFileOrArray(new RandomAccessSourceFactory().CreateBestSource(fileName));
             InitializeSfntTables();
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-5d7fa1869148bbbca746e1c92e3541dc3696adeb
+2762266b3de461c006adca4072c1af562d23a81d

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public static FontProgramDescriptor FetchDescriptor(String fontName) {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`try {`
`65`		`- String fontNameLowerCase = fontName.ToLowerInvariant();`
	`65`	`+ String fontNameLowerCase = baseName.ToLowerInvariant();`
`66`	`66`	`if (isBuiltinFonts14 \|\| fontNameLowerCase.EndsWith(".afm") \|\| fontNameLowerCase.EndsWith(".pfm")) {`
`67`	`67`	`fontDescriptor = FetchType1FontDescriptor(fontName, null);`
`68`	`68`	`}`
`@@ -71,11 +71,18 @@ public static FontProgramDescriptor FetchDescriptor(String fontName) {`
`71`	`71`	`fontDescriptor = FetchCidFontDescriptor(fontName);`
`72`	`72`	`}`
`73`	`73`	`else {`
`74`		`- if (fontNameLowerCase.EndsWith(".ttf") \|\| fontNameLowerCase.EndsWith(".otf")) {`
`75`		`- fontDescriptor = FetchTrueTypeFontDescriptor(fontName);`
	`74`	`+ if (fontNameLowerCase.EndsWith(".ttf") \|\| fontNameLowerCase.EndsWith(".otf") \|\| fontNameLowerCase.EndsWith`
	`75`	`+ (".woff")) {`
	`76`	`+ if (fontNameLowerCase.EndsWith(".woff")) {`
	`77`	`+ byte[] fontProgram = WoffConverter.Convert(FontProgramFactory.ReadFontBytesFromPath(baseName));`
	`78`	`+ fontDescriptor = FetchTrueTypeFontDescriptor(fontProgram);`
	`79`	`+ }`
	`80`	`+ else {`
	`81`	`+ fontDescriptor = FetchTrueTypeFontDescriptor(fontName);`
	`82`	`+ }`
`76`	`83`	`}`
`77`	`84`	`else {`
`78`		`- fontDescriptor = FetchTTCDescriptor(fontName);`
	`85`	`+ fontDescriptor = FetchTTCDescriptor(baseName);`
`79`	`86`	`}`
`80`	`87`	`}`
`81`	`88`	`}`
`@@ -137,11 +144,11 @@ private static FontProgramDescriptor FetchTTCDescriptor(String baseName) {`
`137`	`144`	`int ttcIndex;`
`138`	`145`	`try {`
`139`	`146`	`ttcName = baseName.JSubstring(0, ttcSplit + 4);`
`140`		`- //count(.ttc) = 4`
	`147`	`+ // count(.ttc) = 4`
`141`	`148`	`ttcIndex = System.Convert.ToInt32(baseName.Substring(ttcSplit + 5));`
`142`	`149`	`}`
`143`	`150`	`catch (FormatException nfe) {`
`144`		`- //count(.ttc,) = 5)`
	`151`	`+ // count(.ttc,) = 5)`
`145`	`152`	`throw new iText.IO.IOException(nfe.Message, nfe);`
`146`	`153`	`}`
`147`	`154`	`OpenTypeParser parser = new OpenTypeParser(ttcName, ttcIndex);`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-5d7fa1869148bbbca746e1c92e3541dc3696adeb`
	`1`	`+2762266b3de461c006adca4072c1af562d23a81d`