Font provider get shipped fonts update

DEVSIX-5267

Author: BezrukovM

src/main/java/com/itextpdf/html2pdf/resolver/font/DefaultFontProvider.java

@@ -47,11 +47,11 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.util.StreamUtil;
 import com.itextpdf.layout.font.Range;
 import com.itextpdf.layout.font.RangeBuilder;
+import com.itextpdf.layout.renderer.TypographyUtils;
 import com.itextpdf.styledxmlparser.resolver.font.BasicFontProvider;
 import org.slf4j.LoggerFactory;
 
 import java.io.InputStream;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -170,15 +170,9 @@ private void addShippedFonts(Range rangeToLoad) {
      * i.e. the unicode range that is to be rendered with any other font contained in this FontProvider
      */
     protected Range addCalligraphFonts() {
-        String methodName = "loadShippedFonts";
-        Class<?> klass = null;
-        try {
-            klass = getTypographyUtilsClass();
-        } catch (ClassNotFoundException ignored) { }
-        if (klass != null) {
+        if (TypographyUtils.isPdfCalligraphAvailable()) {
             try {
-                Method m = klass.getMethod(methodName);
-                Map<String, byte[]> fontStreams = (Map<String, byte[]>) m.invoke(null, null);
+                Map<String, byte[]> fontStreams = TypographyUtils.loadShippedFonts();
                 this.calligraphyFontsTempList.addAll(fontStreams.values());
                 // here we return a unicode range that excludes the loaded from the calligraph module fonts
                 // i.e. the unicode range that is to be rendered with standard or shipped free fonts
@@ -189,9 +183,4 @@ protected Range addCalligraphFonts() {
         }
         return null;
     }
-
-    private static Class<?> getTypographyUtilsClass() throws ClassNotFoundException {
-        String typographyClassFullName = "com.itextpdf.typography.util.TypographyShippedFontsUtil";
-        return Class.forName(typographyClassFullName);
-    }
 }