Move the ligature fix into html2canvas

Author: eKoopmans

html2pdf.js

@@ -62,7 +62,7 @@ function html2pdf_makeTemplate(source, optCanvas, info) {
 	// Set the overlay and template to be invisible
 	overlayCSS.overflow = 'hidden';
 	// overlayCSS.fontVariantLigatures = 'no-common-ligatures';
-	overlayCSS.fontFeatureSettings = '"liga" 0';
+	// overlayCSS.fontFeatureSettings = '"liga" 0';
 	overlayCSS.opacity = 0;
 
 	// 2016-08-30:

lib/html2canvas.ek.js

@@ -2261,9 +2261,14 @@ 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) {
+    // EK 2017-03-25: Ligature fix.
+    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.fontFeatureSettings = '"liga" 0';
+    }
 
     var weight = container.parent.fontWeight();
     var size = container.parent.css('fontSize');