Merge pull request #2834 from HackbrettXXX/context2d-custom-fonts

fix usage of custom fonts in context2d
parallax · Aug 10, 2020 · eb70ab2 · eb70ab2
2 parents 511d4f6 + 1d7221d
commit eb70ab2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/src/modules/context2d.js b/src/modules/context2d.js
@@ -423,11 +423,15 @@ import { console } from "../libs/console.js";
         var fontSizeUnit = rxFontSize.exec(fontSize)[2];
 
         if ("px" === fontSizeUnit) {
-          fontSize = Math.floor(parseFloat(fontSize) * this.pdf.internal.scaleFactor);
+          fontSize = Math.floor(
+            parseFloat(fontSize) * this.pdf.internal.scaleFactor
+          );
         } else if ("em" === fontSizeUnit) {
           fontSize = Math.floor(parseFloat(fontSize) * this.pdf.getFontSize());
         } else {
-          fontSize = Math.floor(parseFloat(fontSize) * this.pdf.internal.scaleFactor);
+          fontSize = Math.floor(
+            parseFloat(fontSize) * this.pdf.internal.scaleFactor
+          );
         }
 
         this.pdf.setFontSize(fontSize);
@@ -450,21 +454,19 @@ import { console } from "../libs/console.js";
         }
 
         var jsPdfFontName = "";
-        var parts = fontFamily
-          .toLowerCase()
-          .replace(/"|'/g, "")
-          .split(/\s*,\s*/);
+        var parts = fontFamily.replace(/"|'/g, "").split(/\s*,\s*/);
 
         var fallbackFonts = {
           arial: "Helvetica",
+          Arial: "Helvetica",
           verdana: "Helvetica",
+          Verdana: "Helvetica",
           helvetica: "Helvetica",
+          Helvetica: "Helvetica",
           "sans-serif": "Helvetica",
           fixed: "Courier",
           monospace: "Courier",
           terminal: "Courier",
-          courier: "Courier",
-          times: "Times",
           cursive: "Times",
           fantasy: "Times",
           serif: "Times"

diff --git a/test/reference/context2d-custom-fonts.pdf b/test/reference/context2d-custom-fonts.pdf
diff --git a/test/specs/context2d.spec.js b/test/specs/context2d.spec.js