Merge pull request #1433 from MrRio/feature/custom-fonts

[WIP] Feature/custom fonts

Author: MrRio

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "8.2.1"
+  - "8.9.4"
 install:
   - npm -g install yarn
   - yarn

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()
@@ -108,4 +127,4 @@ function renew (code) {
   code = code.replace(/1\.0\.0-trunk/, version + ' ' + date + ':' + whoami)
 
   return code
-}
+}

examples/basic.html

@@ -14,7 +14,7 @@
 
     <script>
         $(function() {
-            $("#accordion-basic, #accordion-text, #accordion-graphic").accordion({
+            $("#accordion-basic, #accordion-text, #accordion-graphic, #accordion-font").accordion({
                 autoHeight: false,
                 navigation: true
             });
@@ -39,6 +39,7 @@ <h1>jsPDF Demos</h1>
         <li><a href="#tabs-basic">Basic elements</a></li>
         <li><a href="#tabs-text">Text elements</a></li>
         <li><a href="#tabs-graphic">Graphic elements</a></li>
+        <li><a href="#tabs-font">Using Fonts</a></li>
     </ul>
 
     <div id="tabs-basic">
@@ -514,6 +515,29 @@ <h2><a href="#">Draw example: Images</a></h2>
 <!-- I'm lazy, so using eval() directly, sorry ;) [diegocr] -->
 <a href="javascript:void(0);" onclick="eval($(this).prev().text())" class="button">Run Code</a>
 </p></div>
+</div>
+</div>
+
+<div id="tabs-font">
+<div id="accordion-font">
+<h2><a href="#">Using a base64-encoded TTF</a></h2>
+<div><p>
+
+<pre>
+    //https://fonts.google.com/specimen/PT+Sans
+    var PTSans = "AAEAAAAUAQA..."; //shortened. see demoUsingTTFFont in examples/js/basic.js for full base64 encoded ttffile
+    var doc = new jsPDF();
+
+    doc.addFileToVFS("PTSans.ttf", PTSans);
+    doc.addFont('PTSans.ttf', 'PTSans', 'normal');
+
+    doc.setFont('PTSans'); // set font
+    doc.setFontSize(10);
+    doc.text("А ну чики брики и в дамки!", 10, 10);
+    
+    doc.save('test.pdf');</pre>
+<a href="javascript:demoUsingTTFFont()" class="button">Run Code</a></p></div>
+
 </div>
 </div>
     </div>