parallax · MrRio · Feb 20, 2018 · Sep 2, 2017 · Sep 3, 2017 · Sep 3, 2017
diff --git a/build.js b/build.js
@@ -12,14 +12,32 @@ bundle({
 })
 
 // Monkey patching adler32 and filesaver
-function monkeyPatch () {
+function monkeyPatch() {
   return {
     transform: (code, id) => {
       var file = id.split('/').pop()
+
       if (file === 'adler32cs.js') {
+        // Make library assign itself to the jsPDF instance instead
+        // of window to avoid polluting global scope  
         code = code.replace(/this, function/g, 'jsPDF, function')
+
+        // Remove call to require('buffer') since it is not used and
+        // might import a large arbitrary buffer library if a user is
+        // using a commonjs module bundler
         code = code.replace(/require\('buffer'\)/g, '{}')
       }
+
+      // Only one define call per module is allowed by requirejs so
+      // we have to remove calls that other libraries make
+      if (file === 'adler32cs.js') {
+        code = code.replace(/typeof define/g, '0')
+      } else if (file === 'FileSaver.js') {
+        code = code.replace(/define !== null\) && \(define.amd != null/g, '0')
+      } else if (file === 'html2canvas.js') {
+        code = code.replace(/&&\s+define.amd/g, '&& define.amd && false')
+      }
+
       return code
     }
   }
@@ -29,7 +47,7 @@ function monkeyPatch () {
 // This plugin makes sure specified local variables are preserved
 // and kept local. This plugin wouldn't be necessary if es2015
 // modules would be used.
-function rawjs (opts) {
+function rawjs(opts) {
   opts = opts || {}
   return {
     transform: (code, id) => {
@@ -51,9 +69,10 @@ function rawjs (opts) {
   }
 }
 
-function bundle (paths) {
+function bundle(paths) {
   rollup.rollup({
-    entry: './main.js',
+    input: './main.js',
+    context: 'window',
     plugins: [
       monkeyPatch(),
       rawjs({
@@ -72,7 +91,7 @@ function bundle (paths) {
   }).then((bundle) => {
     return bundle.generate({
       format: 'umd',
-      moduleName: 'jspdf'
+      name: 'jsPDF'
     })
   }).then(output => {
     let code = output.code
@@ -97,7 +116,7 @@ function bundle (paths) {
   })
 }
 
-function renew (code) {
+function renew(code) {
   var date = new Date().toISOString()
   var version = require('./package.json').version
   var whoami = execSync('whoami').toString().trim()
@@ -107,4 +126,4 @@ function renew (code) {
   code = code.replace(/1\.0\.0-trunk/, version + ' ' + date + ':' + whoami)
 
   return code
-}
+}
diff --git a/examples/custom_fonts/custom_fonts.html b/examples/custom_fonts/custom_fonts.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<!--
+/**
+ * OpenSans.ttf
+ * Copyright "Digitized data copyright © 2010-2011, Google Corporation."
+ *
+ * "Licensed under the Apache License, Version 2.0"
+ * "http://www.apache.org/licenses/LICENSE-2.0"
+ */
+-->
+<html>
+
+<head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <title>jsPDF custom fonts example</title>
+    <script src="../../dist/jspdf.debug.js"></script>
+    <script src="../../examples/js/defaultVFS.js"></script>
+</head>
+
+<body>
+    <script>
+        var doc = new jsPDF();
+
+
+        doc.addFont('OpenSans-Regular.ttf', 'OpenSans', 'normal');
+        doc.addFont('OpenSans-Bold.ttf', 'OpenSans', 'bold');
+        doc.addFont('OpenSans-Italic.ttf', 'OpenSans', 'italic');
+        doc.addFont('OpenSans-BoldItalic.ttf', 'OpenSans', 'boldItalic');
+
+
+        doc.text(20, 20, 'This is the default font.')
+
+        doc.setFont('OpenSans')
+        doc.setFontType('normal')
+        doc.text(20, 30, 'This is courier normal.')
+
+        doc.setFont('OpenSans')
+        doc.setFontType('italic')
+        doc.text(20, 40, 'This is times italic.')
+
+        doc.setFont('OpenSans')
+        doc.setFontType('bold')
+        doc.text(20, 50, 'This is helvetica bold.')
+
+        doc.setFont('OpenSans')
+        doc.setFontType('bolditalic')
+        doc.text(20, 60, 'This is courier bolditalic.')
+
+        doc.save('custom_fonts.pdf');
+    </script>
+</body>
+
+</html>
diff --git a/examples/js/defaultVFS.js b/examples/js/defaultVFS.js