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

ITXT-CR-284, DEVSIX-1148

Author: yulian-gaponenko

io/src/main/java/com/itextpdf/io/font/FontProgramDescriptorFactory.java

@@ -66,15 +66,20 @@ public static FontProgramDescriptor fetchDescriptor(String fontName) {
         }
 
         try {
-            String fontNameLowerCase = fontName.toLowerCase();
+            String fontNameLowerCase = baseName.toLowerCase();
             if (isBuiltinFonts14 || fontNameLowerCase.endsWith(".afm") || fontNameLowerCase.endsWith(".pfm")) {
                 fontDescriptor = fetchType1FontDescriptor(fontName, null);
             } else if (isCidFont) {
                 fontDescriptor = fetchCidFontDescriptor(fontName);
-            } else if (fontNameLowerCase.endsWith(".ttf") || fontNameLowerCase.endsWith(".otf")) {
-                fontDescriptor = fetchTrueTypeFontDescriptor(fontName);
+            } else 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);
             }
         } catch (Exception ignored) {
             fontDescriptor = null;
@@ -131,8 +136,8 @@ private static FontProgramDescriptor fetchTTCDescriptor(String baseName) throws
             String ttcName;
             int ttcIndex;
             try {
-                ttcName = baseName.substring(0, ttcSplit + 4);//count(.ttc) = 4
-                ttcIndex = Integer.parseInt(baseName.substring(ttcSplit + 5));//count(.ttc,) = 5)
+                ttcName = baseName.substring(0, ttcSplit + 4); // count(.ttc) = 4
+                ttcIndex = Integer.parseInt(baseName.substring(ttcSplit + 5)); // count(.ttc,) = 5)
             } catch (NumberFormatException nfe) {
                 throw new IOException(nfe.getMessage(), nfe);
             }

io/src/main/java/com/itextpdf/io/font/FontProgramFactory.java

@@ -44,12 +44,9 @@ This file is part of the iText (R) project.
 package com.itextpdf.io.font;
 
 import com.itextpdf.io.IOException;
-import com.itextpdf.io.source.IRandomAccessSource;
 import com.itextpdf.io.source.RandomAccessFileOrArray;
 import com.itextpdf.io.source.RandomAccessSourceFactory;
-import com.itextpdf.io.util.StreamUtil;
 
-import java.io.FileInputStream;
 import java.text.MessageFormat;
 import java.util.Set;
 
@@ -192,9 +189,9 @@ public static FontProgram createFont(String name, byte[] fontProgram, boolean ca
             }
         } else {
             String fontFileExtension = null;
-            int extensionBeginIndex = name.lastIndexOf('.');
+            int extensionBeginIndex = baseName.lastIndexOf('.');
             if (extensionBeginIndex > 0) {
-                fontFileExtension = name.substring(extensionBeginIndex).toLowerCase();
+                fontFileExtension = baseName.substring(extensionBeginIndex).toLowerCase();
             }
             if (isBuiltinFonts14 || ".afm".equals(fontFileExtension) || ".pfm".equals(fontFileExtension)) {
                 fontBuilt = new Type1Font(name, null, null, null);
@@ -203,7 +200,7 @@ public static FontProgram createFont(String name, byte[] fontProgram, boolean ca
             } else if (".ttf".equals(fontFileExtension) || ".otf".equals(fontFileExtension) || ".woff".equals(fontFileExtension)) {
                 if (".woff".equals(fontFileExtension)) {
                     if (fontProgram == null) {
-                        fontProgram = readBytesFromPath(name);
+                        fontProgram = readFontBytesFromPath(baseName);
                     }
                     try {
                         fontProgram = WoffConverter.convert(fontProgram);
@@ -217,11 +214,11 @@ public static FontProgram createFont(String name, byte[] fontProgram, boolean ca
                     fontBuilt = new TrueTypeFont(name);
                 }
             } else {
-                int ttcSplit = name.toLowerCase().indexOf(".ttc,");
+                int ttcSplit = baseName.toLowerCase().indexOf(".ttc,");
                 if (ttcSplit > 0) {
                     try {
-                        String ttcName = name.substring(0, ttcSplit + 4); // count(.ttc) = 4
-                        int ttcIndex = Integer.parseInt(name.substring(ttcSplit + 5)); // count(.ttc,) = 5)
+                        String ttcName = baseName.substring(0, ttcSplit + 4); // count(.ttc) = 4
+                        int ttcIndex = Integer.parseInt(baseName.substring(ttcSplit + 5)); // count(.ttc,) = 5)
                         fontBuilt = new TrueTypeFont(ttcName, ttcIndex);
                     } catch (NumberFormatException nfe) {
                         throw new IOException(nfe.getMessage(), nfe);
@@ -490,7 +487,7 @@ private static FontCacheKey createFontCacheKey(String name, byte[] fontProgram)
 
     public static void clearRegisteredFontFamilies() { fontRegisterProvider.clearRegisteredFontFamilies(); }
 
-    private static byte[] readBytesFromPath(String path) throws java.io.IOException {
+    static byte[] readFontBytesFromPath(String path) throws java.io.IOException {
         RandomAccessFileOrArray raf = new RandomAccessFileOrArray(new RandomAccessSourceFactory().createBestSource(path));
         int bufLen = (int) raf.length();
         if (bufLen < raf.length()) {

io/src/main/java/com/itextpdf/io/font/OpenTypeParser.java

@@ -237,10 +237,11 @@ public OpenTypeParser(String ttcPath, int ttcIndex) throws java.io.IOException {
     }
 
     public OpenTypeParser(String name) throws java.io.IOException {
-        String ttcName = getTTCName(name);
+        String baseName = FontProgram.getBaseName(name);
+        String ttcName = getTTCName(baseName);
         this.fileName = ttcName;
-        if (ttcName.length() < name.length()) {
-            ttcIndex = Integer.parseInt(name.substring(ttcName.length() + 1));
+        if (ttcName.length() < baseName.length()) {
+            ttcIndex = Integer.parseInt(baseName.substring(ttcName.length() + 1));
         }
         raf = new RandomAccessFileOrArray(new RandomAccessSourceFactory().createBestSource(fileName));
         initializeSfntTables();