Merge pull request #707 from fargyriou/702-font-parsing

Issue 702: Fixed font parsing when defined as "font" and not through …
canvg · May 8, 2019 · fbebf8e · fbebf8e
2 parents cef40f0 + 55d67f0
commit fbebf8e
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/canvg.js b/src/canvg.js
@@ -1096,17 +1096,21 @@ function build(opts) {
 
       // font
       if (typeof ctx.font != 'undefined') {
-        ctx.font = svg.Font.CreateFont(
-          this.style('font-style').value,
-          this.style('font-variant').value,
-          this.style('font-weight').value,
-          this.style('font-size').hasValue() ? this.style('font-size').toPixels() + 'px' : '',
-          this.style('font-family').value).toString();
-
-        // update em size if needed
-        var currentFontSize = this.style('font-size', false, false);
-        if (currentFontSize.isPixels()) {
-          svg.emSize = currentFontSize.toPixels();
+        if (this.style('font').hasValue()) {
+          ctx.font = this.style('font').value;
+        } else {
+          ctx.font = svg.Font.CreateFont(
+            this.style('font-style').value,
+            this.style('font-variant').value,
+            this.style('font-weight').value,
+            this.style('font-size').hasValue() ? this.style('font-size').toPixels() + 'px' : '',
+            this.style('font-family').value).toString();
+
+          // update em size if needed
+          var currentFontSize = this.style('font-size', false, false);
+          if (currentFontSize.isPixels()) {
+            svg.emSize = currentFontSize.toPixels();
+          }
         }
       }