pdfkit 0.2.4 → 0.2.8

package/README.md

@@ -19,12 +19,14 @@ Installation uses the [npm](http://npmjs.org/) package manager.  Just type the f
   * Path operations
   * SVG path parser for easy path creation
   * Transformations
+  * Linear and radial gradients
 * Text
   * Line wrapping
   * Text alignments
   * Bulleted lists
 * Font embedding
   * Supports TrueType (.ttf), TrueType Collections (.ttc), and Datafork TrueType (.dfont) fonts
+  * Font subsetting
 * Image embedding
   * Supports JPEG and PNG files (including indexed PNGs, and PNGs with transparency)
 * Annotations
@@ -36,10 +38,9 @@ Installation uses the [npm](http://npmjs.org/) package manager.  Just type the f
   
 ## Coming soon!
 
-* Gradients and patterns
+* Patterns fills
 * Outlines
 * PDF Security
-* Font subsetting
 * Higher level APIs for creating tables and laying out content
 * More performance optimizations
 * Even more awesomeness, perhaps written by you! Please fork this repository and send me pull requests.

package/js/document.js

@@ -127,7 +127,7 @@
       _ref = this.info;
       for (key in _ref) {
         val = _ref[key];
-        if (typeof val === 'string') this.info[key] = PDFObject.s(val);
+        if (typeof val === 'string') this.info[key] = PDFObject.s(val, true);
       }
       return this.embedFonts(function() {
         return _this.embedImages(function() {
@@ -156,7 +156,7 @@
     PDFDocument.prototype.generateBody = function(out, fn) {
       var id, offset, proceed, ref, refs;
       var _this = this;
-      offset = out.join('\n').length;
+      offset = out.join('\n').length + 1;
       refs = (function() {
         var _ref, _results;
         _ref = this.store.objects;
@@ -201,7 +201,7 @@
     PDFDocument.prototype.generateTrailer = function(out) {
       var trailer;
       trailer = PDFObject.convert({
-        Size: this.store.length,
+        Size: this.store.length + 1,
         Root: this.store.root,
         Info: this._info
       });

package/js/font.js

@@ -17,7 +17,7 @@
   zlib = require('zlib');
 
   PDFFont = (function() {
-    var toUnicodeCmap;
+    var WIN_ANSI_MAP, encodeWinAnsi, toUnicodeCmap;
 
     function PDFFont(document, filename, family, id) {
       var _ref;
@@ -50,9 +50,54 @@
       return this.embedTTF(fn);
     };
 
+    WIN_ANSI_MAP = {
+      402: 131,
+      8211: 150,
+      8212: 151,
+      8216: 145,
+      8217: 146,
+      8218: 130,
+      8220: 147,
+      8221: 148,
+      8222: 132,
+      8224: 134,
+      8225: 135,
+      8226: 149,
+      8230: 133,
+      8364: 128,
+      8240: 137,
+      8249: 139,
+      8250: 155,
+      710: 136,
+      8482: 153,
+      338: 140,
+      339: 156,
+      732: 152,
+      352: 138,
+      353: 154,
+      376: 159,
+      381: 142,
+      382: 158
+    };
+
+    encodeWinAnsi = function(text) {
+      var char, i, string, _ref;
+      string = '';
+      for (i = 0, _ref = text.length; 0 <= _ref ? i < _ref : i > _ref; 0 <= _ref ? i++ : i--) {
+        char = text.charCodeAt(i);
+        char = WIN_ANSI_MAP[char] || char;
+        string += String.fromCharCode(char);
+      }
+      return string;
+    };
+
     PDFFont.prototype.encode = function(text) {
       var _ref;
-      return ((_ref = this.subset) != null ? _ref.encodeText(text) : void 0) || text;
+      if (this.isAFM) {
+        return encodeWinAnsi(text);
+      } else {
+        return ((_ref = this.subset) != null ? _ref.encodeText(text) : void 0) || text;
+      }
     };
 
     PDFFont.prototype.registerTTF = function() {
@@ -202,7 +247,8 @@
       return this.ref = this.document.ref({
         Type: 'Font',
         BaseFont: this.filename,
-        Subtype: 'Type1'
+        Subtype: 'Type1',
+        Encoding: 'WinAnsiEncoding'
       });
     };
 

package/js/image/jpeg.js

@@ -1,11 +1,13 @@
 (function() {
-  var Data, JPEG, fs;
+  var Data, JPEG, fs, setImmediate;
   var __hasProp = Object.prototype.hasOwnProperty, __indexOf = Array.prototype.indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (__hasProp.call(this, i) && this[i] === item) return i; } return -1; };
 
   fs = require('fs');
 
   Data = '../data';
 
+  setImmediate = setImmediate != null ? setImmediate : process.nextTick;
+
   JPEG = (function() {
 
     function JPEG(data) {
@@ -54,7 +56,9 @@
         obj.data['Decode'] = [1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0];
       }
       obj.add(this.data.data);
-      return fn(obj);
+      return setImmediate(function() {
+        return fn(obj);
+      });
     };
 
     return JPEG;

package/js/image/png.js

@@ -1,10 +1,12 @@
 (function() {
-  var PNG, PNGImage, zlib;
+  var PNG, PNGImage, setImmediate, zlib;
 
   zlib = require('zlib');
 
   PNG = require('png-js');
 
+  setImmediate = setImmediate != null ? setImmediate : process.nextTick;
+
   PNGImage = (function() {
 
     function PNGImage(data) {
@@ -84,7 +86,9 @@
         obj.data['SMask'] = sMask;
       }
       obj.add(this.imgData);
-      return fn(obj);
+      return setImmediate(function() {
+        return fn(obj);
+      });
     };
 
     PNGImage.prototype.splitAlphaChannel = function(fn) {

package/js/line_wrapper.js

@@ -45,7 +45,7 @@
       this.lineWidth = (options.width - (this.columnGap * (this.columns - 1))) / this.columns;
       this.startY = this.document.y;
       this.column = 1;
-      this.maxY = this.startY + options.height - this.document.currentLineHeight();
+      this.maxY = this.startY + options.height;
       nextY = this.document.y + this.document.currentLineHeight(true);
       if (this.document.y > this.maxY || nextY > this.maxY) this.nextSection();
       wordWidths = {};
@@ -86,12 +86,15 @@
     };
 
     LineWrapper.prototype.nextSection = function(options) {
+      var x;
       this.emit('sectionEnd', options, this);
       if (++this.column > this.columns) {
+        x = this.document.x;
         this.document.addPage();
         this.column = 1;
         this.startY = this.document.page.margins.top;
         this.maxY = this.document.page.maxY();
+        this.document.x = x;
         this.emit('pageBreak', options, this);
       } else {
         this.document.x += this.lineWidth + this.columnGap;

package/js/mixins/text.js

@@ -123,10 +123,9 @@
         }
         return opts;
       })();
-      if ((x != null) || (y != null)) {
-        this.x = x || this.x;
-        this.y = y || this.y;
-      } else {
+      if (x != null) this.x = x;
+      if (y != null) this.y = y;
+      if (options.lineBreak !== false) {
         margins = this.page.margins;
         if ((_ref = options.width) == null) {
           options.width = this.page.width - this.x - margins.right;

package/js/mixins/vector.js

@@ -47,10 +47,10 @@
       return this.addContent("" + m + " M");
     },
     dash: function(length, options) {
-      var phase, space;
+      var phase, space, _ref;
       if (options == null) options = {};
       if (length == null) return this;
-      space = options.space || length;
+      space = (_ref = options.space) != null ? _ref : length;
       phase = options.phase || 0;
       return this.addContent("[" + length + " " + space + "] " + phase + " d");
     },

package/js/object.js

@@ -8,7 +8,7 @@
   var PDFObject, PDFReference;
 
   PDFObject = (function() {
-    var pad;
+    var pad, swapBytes;
 
     function PDFObject() {}
 
@@ -50,8 +50,27 @@
       }
     };
 
-    PDFObject.s = function(string) {
+    swapBytes = function(buff) {
+      var a, i, l, _ref;
+      l = buff.length;
+      if (l & 0x01) {
+        throw new Error("Buffer length must be even");
+      } else {
+        for (i = 0, _ref = l - 1; i < _ref; i += 2) {
+          a = buff[i];
+          buff[i] = buff[i + 1];
+          buff[i + 1] = a;
+        }
+      }
+      return buff;
+    };
+
+    PDFObject.s = function(string, swap) {
+      if (swap == null) swap = false;
       string = string.replace(/\\/g, '\\\\\\\\').replace(/\(/g, '\\(').replace(/\)/g, '\\)').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&amp;/g, '&');
+      if (swap) {
+        string = swapBytes(new Buffer('\ufeff' + string, 'ucs-2')).toString('binary');
+      }
       return {
         isString: true,
         toString: function() {

package/js/reference.js

@@ -5,10 +5,12 @@
   By Devon Govett
   */
 
-  var PDFObject, PDFReference, zlib;
+  var PDFObject, PDFReference, setImmediate, zlib;
 
   zlib = require('zlib');
 
+  setImmediate = setImmediate != null ? setImmediate : process.nextTick;
+
   PDFReference = (function() {
 
     function PDFReference(id, data) {
@@ -69,11 +71,11 @@
         } else {
           this.finalizedStream = data;
           this.data.Length = this.finalizedStream.length;
-          return fn();
+          return setImmediate(fn);
         }
       } else {
         this.finalizedStream = '';
-        return fn();
+        return setImmediate(fn);
       }
     };
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "pdfkit",
   "description": "A PDF generation library for Node.js",
   "keywords": ["pdf", "pdf writer", "pdf generator", "graphics", "document", "vector"],
-  "version": "0.2.4",
+  "version": "0.2.8",
   "homepage": "http://pdfkit.org/",
   "author": {
       "name": "Devon Govett",