Fix ligatures when letter-rendering

niklasvh · Mar 27, 2017 · a6a5e3a · a6a5e3a
1 parent e58fc69
commit a6a5e3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/nodeparser.js b/src/nodeparser.js
@@ -433,9 +433,13 @@ NodeParser.prototype.paintFormValue = function(container) {
 NodeParser.prototype.paintText = function(container) {
     container.applyTextTransform();
     var characters = punycode.ucs2.decode(container.node.data);
-    var textList = (!this.options.letterRendering || noLetterSpacing(container)) && !hasUnicode(container.node.data) ? getWords(characters) : characters.map(function(character) {
+    var wordRendering = (!this.options.letterRendering || noLetterSpacing(container)) && !hasUnicode(container.node.data);
+    var textList = wordRendering ? getWords(characters) : characters.map(function(character) {
         return punycode.ucs2.encode([character]);
     });
+    if (!wordRendering) {
+        container.parent.node.style.fontVariantLigatures = 'none';
+    }
 
     var weight = container.parent.fontWeight();
     var size = container.parent.css('fontSize');

diff --git a/src/renderers/canvas.js b/src/renderers/canvas.js
@@ -90,6 +90,7 @@ CanvasRenderer.prototype.shape = function(shape) {
 };
 
 CanvasRenderer.prototype.font = function(color, style, variant, weight, size, family) {
+    variant = /^(normal|small-caps)$/i.test(variant) ? variant : '';
     this.setFillStyle(color).font = [style, variant, weight, size, family].join(" ").split(",")[0];
 };