Update pdf.js

.gitignore

@@ -5,4 +5,5 @@
 *.swp
 *.out
 node_modules/
-
+target/
+.idea

.npmignore

@@ -0,0 +1,11 @@
+## generic files to ignore
+*~
+*.lock
+*.DS_Store
+*.swp
+*.out
+node_modules/
+target/
+
+.gitignore
+test

.travis.yml

@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - "4.5.0"

base/core/fonts.js

@@ -2220,8 +2220,9 @@ var Font = (function FontClosure() {
       // name ArialBlack for example will be replaced by Helvetica.
       this.black = (name.search(/Black/g) != -1);
 
+      //MQZ Dec.03.2013 Disable font.remeasure
       // if at least one width is present, remeasure all chars when exists
-      this.remeasure = Object.keys(this.widths).length > 0;
+      //this.remeasure = Object.keys(this.widths).length > 0;
 
       this.encoding = properties.baseEncoding;
       this.noUnicodeAdaptation = true;

base/core/obj.js

@@ -198,7 +198,8 @@ var RefSetCache = (function RefSetCacheClosure() {
     },
 
     has: function RefSetCache_has(ref) {
-      return ('R' + ref.num + '.' + ref.gen) in this.dict;
+      //MQZ. 03/08/2016 fix https://github.com/modesty/pdf2json/issues/26
+      return !!ref ? ('R' + ref.num + '.' + ref.gen) in this.dict : false;
     },
 
     put: function RefSetCache_put(ref, obj) {

base/core/worker.js

@@ -375,8 +375,9 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
         var start = Date.now();
         page.extractTextContent().then(function(textContent) {
           promise.resolve(textContent);
-          log('text indexing: page=%d - time=%dms', pageNum,
-              Date.now() - start);
+          //MQZ 03/17/2016 comment out log
+          //log('text indexing: page=%d - time=%dms', pageNum,
+          //    Date.now() - start);
         }, function (e) {
           // Skip errored pages
           promise.reject(e);

base/display/canvas.js

@@ -918,12 +918,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       var rule = italic + ' ' + bold + ' ' + browserFontSize + 'px ' + typeface;
       this.ctx.font = rule;
 
-        //MQZ.Oct.23.2012. enable font detection
-        if (!fontObj.spaceWidth) {
-            var spaceId = isArray(fontObj.toFontChar) ? fontObj.toFontChar.indexOf(32) : -1;
-            fontObj.spaceWidth = (spaceId >= 0 && isArray(fontObj.widths)) ? fontObj.widths[spaceId] : 250;
-        }
-        this.ctx.setFont(fontObj);
+      this.ctx.setFont(fontObj);
     },
     setTextRenderingMode: function CanvasGraphics_setTextRenderingMode(mode) {
       this.current.textRenderingMode = mode;
@@ -1100,19 +1095,22 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         this.processingType3 = null;
       } else {
         ctx.save();
-          var tx = 0;
 
 //MQZ Dec.04.2013 handles leading word spacing
+          var tx = 0;
           if (wordSpacing !== 0) {
               var firstGlyph = _.find(glyphs, function(g) { return _.isObject(g);});
               if (firstGlyph && (firstGlyph.fontChar === ' ' || firstGlyph.unicode === ' ')) {
                   if (_.find(glyphs, function(g) { return _.isObject(g) && g.unicode !== ' ';})) {
-                    current.x += wordSpacing * fontSize * textHScale;
+                    tx = wordSpacing * fontSize * textHScale;
                   }
               }
           }
 
+        current.x += tx
         this.applyTextTransforms();
+        current.x -= tx
+        // MQZ-GYJ Apr.20.2017 handles leading word spacing over
 
         var lineWidth = current.lineWidth;
         var a1 = current.textMatrix[0], b1 = current.textMatrix[1];
@@ -1167,9 +1165,6 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
               scaledY = 0;
             }
 
-            //MQZ Dec.03.2013 Disable font.remeasure
-              font.remeasure = false;
-
             if (font.remeasure && width > 0) {
               // some standard fonts may not have the exact width, trying to
               // rescale per character
@@ -1274,7 +1269,12 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       }
 
 //MQZ Nov.28.2012 Adjust Text Positions, and also make it a string
-        var stGlyphs = [];
+      var stGlyphs = [];
+      var spaceWidth = font.spaceWidth;
+      if (!font.spaceWidth) {
+          var spaceId = isArray(font.toFontChar) ? font.toFontChar.indexOf(32) : -1;
+          spaceWidth = (spaceId >= 0 && isArray(font.widths)) ? font.widths[spaceId] : 250;
+      }
 
       for (var i = 0; i < arrLength; ++i) {
         var e = arr[i];
@@ -1289,7 +1289,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
               }
           }
           else {
-              if (-e >= font.spaceWidth) {
+            //MQZ-GYJ. Apr.20.2017 split word when spacing is a positive number but very big
+              if (Math.abs(e) >= spaceWidth) {
                   if (vertical) {
                       current.y += spacingLength;
                   } else {

base/shared/annotation.js

@@ -667,7 +667,7 @@ var LinkAnnotation = (function LinkAnnotationClosure() {
 
   // Lets URLs beginning with 'www.' default to using the 'http://' protocol.
   function addDefaultProtocolToUrl(url) {
-    if (url.indexOf('www.') === 0) {
+    if (url && url.indexOf('www.') === 0) {
       return ('http://' + url);
     }
     return url;

base/shared/util.js

@@ -188,10 +188,10 @@ function error(msg) {
     // Join the arguments into a single string for the lines below.
     msg = [].join.call(arguments, ' ');
   } else {
-    log('Error: ' + msg);
+    //log('Error: ' + msg);
   }
-  log(backtrace());
-  PDFJS.LogManager.notify('error', msg);
+  //log(backtrace());
+  //PDFJS.LogManager.notify('error', msg);
   throw new Error(msg);
 }