For missing font, use a local font if it exists even if there's no st…

…andard substitution If the font foo is missing we just try lo load local(foo) and maybe we'll be lucky.
mozilla · May 13, 2023 · 8611c48 · 8611c48
1 parent e738e15
commit 8611c48
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
@@ -4197,15 +4197,15 @@ class PartialEvaluator {
         if (standardFontName) {
           file = await this.fetchStandardFontData(standardFontName);
           properties.isInternalFont = !!file;
-          if (!properties.isInternalFont && this.options.useSystemFonts) {
-            properties.systemFontInfo = getFontSubstitution(
-              this.systemFontCache,
-              this.idFactory,
-              this.options.standardFontDataUrl,
-              baseFontName,
-              standardFontName
-            );
-          }
+        }
+        if (!properties.isInternalFont && this.options.useSystemFonts) {
+          properties.systemFontInfo = getFontSubstitution(
+            this.systemFontCache,
+            this.idFactory,
+            this.options.standardFontDataUrl,
+            baseFontName,
+            standardFontName
+          );
         }
         return this.extractDataStructures(dict, dict, properties).then(
           newProperties => {
@@ -4310,15 +4310,15 @@ class PartialEvaluator {
       if (standardFontName) {
         fontFile = await this.fetchStandardFontData(standardFontName);
         isInternalFont = !!fontFile;
-        if (!isInternalFont && this.options.useSystemFonts) {
-          systemFontInfo = getFontSubstitution(
-            this.systemFontCache,
-            this.idFactory,
-            this.options.standardFontDataUrl,
-            fontName.name,
-            standardFontName
-          );
-        }
+      }
+      if (!isInternalFont && this.options.useSystemFonts) {
+        systemFontInfo = getFontSubstitution(
+          this.systemFontCache,
+          this.idFactory,
+          this.options.standardFontDataUrl,
+          fontName.name,
+          standardFontName
+        );
       }
     }
 

diff --git a/src/core/font_substitutions.js b/src/core/font_substitutions.js
@@ -378,8 +378,8 @@ function makeLocal(prepend, local) {
  * @param {Object} idFactory The ids factory.
  * @param {String} localFontPath Path to the fonts directory.
  * @param {String} baseFontName The font name to be substituted.
- * @param {String} standardFontName The standard font name to use if the base
- *   font is not available.
+ * @param {String|undefined} standardFontName The standard font name to use
+ *   if the base font is not available.
  * @returns an Object with the CSS, the loaded name, the src and the style.
  */
 function getFontSubstitution(