Change the order of font loading in DefaultFontProvider

DEVSIX-2977

Author: BlackEgoist

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

@@ -109,8 +109,12 @@ public DefaultFontProvider() {
     public DefaultFontProvider(boolean registerStandardPdfFonts, boolean registerShippedFreeFonts, boolean registerSystemFonts) {
         super(registerStandardPdfFonts, registerSystemFonts);
         if (registerShippedFreeFonts) {
-            addShippedFreeFonts(null);
-            addCalligraphFonts();
+            if(checkCalligraphFonts() != null) {
+                addShippedFreeFonts(FREE_FONT_RANGE);
+                addCalligraphFonts();
+            } else {
+                addShippedFreeFonts(null);
+            }
         }
     }
 
@@ -136,15 +140,13 @@ private void addShippedFreeFonts(Range rangeToLoad) {
      * If it's needed to have a DefaultFontProvider without typography fonts loaded,
      * create an extension of DefaultFontProvider and override this method so it does nothing and only returns null.
      *
+     *
      * @return a unicode {@link Range} that excludes the loaded from pdfCalligraph fonts,
      * 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) { }
+        Class<?> klass = checkCalligraphFonts();
         if (klass != null) {
             try {
                 Method m = klass.getMethod(methodName);
@@ -161,6 +163,14 @@ protected Range addCalligraphFonts() {
         return null;
     }
 
+    private Class<?> checkCalligraphFonts() {
+        Class<?> klass = null;
+        try {
+            klass = getTypographyUtilsClass();
+        } catch (ClassNotFoundException ignored) { }
+        return klass;
+    }
+
     private static Class<?> getTypographyUtilsClass() throws ClassNotFoundException {
         String typographyClassFullName = "com.itextpdf.typography.util.TypographyShippedFontsUtil";
         return Class.forName(typographyClassFullName);