From 12b799cd024f62861235d3b11a68ebf4020c0a52 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Sat, 23 Jun 2012 15:52:30 +0200
Subject: [PATCH 01/16] Use a canvas to measure the width of the text layer div
 instead of using the slow offsetWidth property

---
 web/viewer.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/web/viewer.js b/web/viewer.js
index d371c3242..05aec6075 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1498,6 +1498,9 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
     var renderInterval = 0;
     var resumeInterval = 500; // in ms
 
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+
     // Render the text layer, one div at a time
     function renderTextLayer() {
       if (textDivs.length === 0) {
@@ -1511,9 +1514,12 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
 
         if (textDiv.dataset.textLength > 1) { // avoid div by zero
           // Adjust div width to match canvas text
-          // Due to the .offsetWidth calls, this is slow
-          // This needs to come after appending to the DOM
-          var textScale = textDiv.dataset.canvasWidth / textDiv.offsetWidth;
+
+          ctx.font = textDiv.style.fontSize + ' sans-serif';
+          var width = ctx.measureText(textDiv.textContent).width;
+
+          var textScale = textDiv.dataset.canvasWidth / width;
+
           CustomStyle.setProp('transform' , textDiv,
             'scale(' + textScale + ', 1)');
           CustomStyle.setProp('transformOrigin' , textDiv, '0% 0%');

From 7e5a9b7a394d88b210d0a12d74320a79b857cfd7 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 28 Jun 2012 09:50:25 -0700
Subject: [PATCH 02/16] Adds support for the new mozPrintCallback api.

---
 web/viewer.css  | 32 ++++++++++++-------------
 web/viewer.html |  1 +
 web/viewer.js   | 63 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 17 deletions(-)

diff --git a/web/viewer.css b/web/viewer.css
index b8e86f2c8..b57af0591 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -1113,28 +1113,26 @@ canvas {
   font-size: 10px;
 }
 
+@page {
+  margin: 0;
+} 
+
+#printContainer {
+  display: none;
+}
+
 @media print {
-  #sidebarContainer, .toolbar, #loadingBox, #errorWrapper, .textLayer {
+  #outerContainer {
     display: none;
   }
-
-  #mainContainer, #viewerContainer, .page, .page canvas {
-    position: static;
-    padding: 0;
-    margin: 0;
-  }
-
-  .page {
-    float: left;
-    display: none;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-  }
-
-  .page[data-loaded] {
+  #printContainer {
     display: block;
   }
+  canvas {
+    position: relative;
+    top: 0;
+    left: 0;
+  }
 }
 
 @media all and (max-width: 950px) {
diff --git a/web/viewer.html b/web/viewer.html
index c59d9fcf3..5d66e8b33 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -176,5 +176,6 @@
       </div> <!-- mainContainer -->
 
     </div> <!-- outerContainer -->
+    <div id="printContainer"></div>
   </body>
 </html>
diff --git a/web/viewer.js b/web/viewer.js
index 516081f6f..1a7732e4e 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -379,6 +379,11 @@ var PDFView = {
     return currentPageNumber;
   },
 
+  get supportsPrinting() {
+    var canvas = document.createElement('canvas');
+    return 'mozPrintCallback' in canvas;
+  },
+
   open: function pdfViewOpen(url, scale, password) {
     var parameters = {password: password};
     if (typeof url === 'string') { // URL
@@ -1041,6 +1046,22 @@ var PDFView = {
       params[unescape(key)] = unescape(value);
     }
     return params;
+  },
+
+  beforePrint: function pdfViewSetupBeforePrint() {
+    if (!this.supportsPrinting) {
+      alert('Printing is not supported by this browser.');
+      return;
+    }
+    for (var i = 0, ii = this.pages.length; i < ii; ++i) {
+      this.pages[i].beforePrint();
+    }
+  },
+
+  afterPrint: function pdfViewSetupAfterPrint() {
+    var div = document.getElementById('printContainer');
+    while (div.hasChildNodes())
+      div.removeChild(div.lastChild);
   }
 };
 
@@ -1360,6 +1381,40 @@ var PageView = function pageView(container, pdfPage, id, scale,
     div.setAttribute('data-loaded', true);
   };
 
+  this.beforePrint = function pageViewBeforePrint() {
+    var pdfPage = this.pdfPage;
+    var viewport = pdfPage.getViewport(1);
+
+    var canvas = this.canvas = document.createElement('canvas');
+    canvas.width = viewport.width;
+    canvas.height = viewport.height;
+    canvas.style.width = viewport.width + 'pt';
+    canvas.style.height = viewport.height + 'pt';
+
+    var printContainer = document.getElementById('printContainer');
+    printContainer.appendChild(canvas);
+
+    var self = this;
+    canvas.mozPrintCallback = function(obj) {
+      var ctx = obj.context;
+      var renderContext = {
+        canvasContext: ctx,
+        viewport: viewport
+      };
+
+      pdfPage.render(renderContext).then(function() {
+        // Tell the printEngine that rendering this canvas/page has finished.
+        obj.done();
+        self.pdfPage.destroy();
+      }, function(error) {
+        console.error(error);
+        // Tell the printEngine that rendering this canvas/page has failed.
+        // This will make the print proces stop.
+        obj.abort();
+      });
+    };
+  };
+
   this.updateStats = function pageViewUpdateStats() {
     if (PDFJS.pdfBug && Stats.enabled) {
       var stats = this.stats;
@@ -1960,3 +2015,11 @@ window.addEventListener('keydown', function keydown(evt) {
     evt.preventDefault();
   }
 });
+
+window.addEventListener('beforeprint', function beforePrint(evt) {
+  PDFView.beforePrint();
+});
+
+window.addEventListener('afterprint', function afterPrint(evt) {
+  PDFView.afterPrint();
+});

From 4655ec0c7500fe78282adc16ede9c99c5d83d801 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Mon, 9 Jul 2012 16:04:55 -0700
Subject: [PATCH 03/16] Localize print message.  Show/hide print button.

---
 l10n/en-US/viewer.properties | 2 ++
 web/viewer.html              | 2 --
 web/viewer.js                | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index de6fd95db..ce268a113 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -87,3 +87,5 @@ loading_error=An error occurred while loading the PDF.
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Annotation]
 request_password=PDF is protected by a password:
+
+printing_not_supported=Warning: Printing is not supported by this browser.
diff --git a/web/viewer.html b/web/viewer.html
index 5d66e8b33..28e57f700 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -102,11 +102,9 @@
                    <span data-l10n-id="open_file_label">Open</span>
                 </button>
 
-                <!--
                 <button id="print" class="toolbarButton print" title="Print" tabindex="11" data-l10n-id="print" onclick="window.print()">
                   <span data-l10n-id="print_label">Print</span>
                 </button>
-                -->
 
                 <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" tabindex="12" data-l10n-id="download">
                   <span data-l10n-id="download_label">Download</span>
diff --git a/web/viewer.js b/web/viewer.js
index 1a7732e4e..377a4fc7e 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1050,7 +1050,9 @@ var PDFView = {
 
   beforePrint: function pdfViewSetupBeforePrint() {
     if (!this.supportsPrinting) {
-      alert('Printing is not supported by this browser.');
+      var printMessage = mozL10n.get('printing_not_supported', null,
+                         'Warning: Printing is not supported by this browser.');
+      alert(printMessage);
       return;
     }
     for (var i = 0, ii = this.pages.length; i < ii; ++i) {
@@ -1761,6 +1763,10 @@ window.addEventListener('load', function webViewerLoad(evt) {
     document.querySelector('#viewSearch').classList.remove('hidden');
   }
 
+  if (!PDFView.supportsPrinting) {
+    document.getElementById('print').classList.add('hidden');
+  }
+
   // Listen for warnings to trigger the fallback UI.  Errors should be caught
   // and call PDFView.error() so we don't need to listen for those.
   PDFJS.LogManager.addLogger({

From d32906adc4424672493fe019fafa5bd9f15d51e5 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 12 Jul 2012 10:31:20 -0700
Subject: [PATCH 04/16] Add back basic printing support for non-moz browsers.
 Shadow/cache supports browsing. Destroy pages on error and only abort if
 supported.

---
 l10n/en-US/viewer.properties |  2 +-
 web/viewer.css               | 30 +++++++++++++++++++++++++++---
 web/viewer.js                | 18 +++++++++++++++---
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index ce268a113..1c4dd1cde 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -88,4 +88,4 @@ loading_error=An error occurred while loading the PDF.
 text_annotation_type=[{{type}} Annotation]
 request_password=PDF is protected by a password:
 
-printing_not_supported=Warning: Printing is not supported by this browser.
+printing_not_supported=Warning: Printing is not fully supported by this browser.
diff --git a/web/viewer.css b/web/viewer.css
index b57af0591..80a8c5a40 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -1122,13 +1122,37 @@ canvas {
 }
 
 @media print {
-  #outerContainer {
+  /* Rules for browsers that don't support mozPrintCallback. */
+  #sidebarContainer, .toolbar, #loadingBox, #errorWrapper, .textLayer {
     display: none;
   }
-  #printContainer {
+
+  #mainContainer, #viewerContainer, .page, .page canvas {
+    position: static;
+    padding: 0;
+    margin: 0;
+  }
+
+  .page {
+    float: left;
+    display: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+  }
+
+  .page[data-loaded] {
     display: block;
   }
-  canvas {
+
+  /* Rules for browsers that support mozPrintCallback */
+  body[data-mozPrintCallback] #outerContainer {
+    display: none;
+  }
+  body[data-mozPrintCallback] #printContainer {
+    display: block;
+  }
+  #printContainer canvas {
     position: relative;
     top: 0;
     left: 0;
diff --git a/web/viewer.js b/web/viewer.js
index 377a4fc7e..f75701816 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -381,7 +381,13 @@ var PDFView = {
 
   get supportsPrinting() {
     var canvas = document.createElement('canvas');
-    return 'mozPrintCallback' in canvas;
+    var value = 'mozPrintCallback' in canvas;
+    // shadow
+    Object.defineProperty(this, 'supportsPrinting', { value: value,
+                                                      enumerable: true,
+                                                      configurable: true,
+                                                      writable: false });
+    return value;
   },
 
   open: function pdfViewOpen(url, scale, password) {
@@ -1051,10 +1057,12 @@ var PDFView = {
   beforePrint: function pdfViewSetupBeforePrint() {
     if (!this.supportsPrinting) {
       var printMessage = mozL10n.get('printing_not_supported', null,
-                         'Warning: Printing is not supported by this browser.');
+          'Warning: Printing is not fully supported by this browser.');
       alert(printMessage);
       return;
     }
+    var body = document.querySelector('body');
+    body.setAttribute('data-mozPrintCallback', true);
     for (var i = 0, ii = this.pages.length; i < ii; ++i) {
       this.pages[i].beforePrint();
     }
@@ -1412,7 +1420,11 @@ var PageView = function pageView(container, pdfPage, id, scale,
         console.error(error);
         // Tell the printEngine that rendering this canvas/page has failed.
         // This will make the print proces stop.
-        obj.abort();
+        if ('abort' in object)
+          obj.abort();
+        else
+          obj.done();
+        self.pdfPage.destroy();
       });
     };
   };

From e0378530e2243ee73cc9d80bba7bfce5f4182061 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 12 Jul 2012 11:58:06 -0700
Subject: [PATCH 05/16] Use PDFView.error to avoid issues with alert.

---
 web/viewer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/viewer.js b/web/viewer.js
index f75701816..cbe20bb66 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1058,7 +1058,7 @@ var PDFView = {
     if (!this.supportsPrinting) {
       var printMessage = mozL10n.get('printing_not_supported', null,
           'Warning: Printing is not fully supported by this browser.');
-      alert(printMessage);
+      this.error(printMessage);
       return;
     }
     var body = document.querySelector('body');

From 9de94991e9268ef1b017a065c7554c785bb736b2 Mon Sep 17 00:00:00 2001
From: benbro <ben.browitt@gmail.com>
Date: Fri, 13 Jul 2012 17:41:20 +0300
Subject: [PATCH 06/16] Catch errors when parsing the linearization header so
 we can display corrupted docs

---
 src/core.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/core.js b/src/core.js
index 8e07078ef..5faac7621 100644
--- a/src/core.js
+++ b/src/core.js
@@ -398,10 +398,16 @@ var PDFDocument = (function PDFDocumentClosure() {
     get linearization() {
       var length = this.stream.length;
       var linearization = false;
-      if (length) {
-        linearization = new Linearization(this.stream);
-        if (linearization.length != length)
-          linearization = false;
+      try {
+        if (length) {
+          linearization = new Linearization(this.stream);
+          if (linearization.length != length)
+            linearization = false;
+        }
+      } catch (err) {
+        warn('since pdf is broken pdf.js is trying to recover it ' +
+             'by indexing the object; ' +
+             'the error in firebug shall have a different origin');
       }
       // shadow the prototype getter with a data property
       return shadow(this, 'linearization', linearization);

From 278dc81a5404377889af7f6ecaf4bebb7e4b7304 Mon Sep 17 00:00:00 2001
From: benbro <ben.browitt@gmail.com>
Date: Fri, 13 Jul 2012 18:00:55 +0300
Subject: [PATCH 07/16] Move the try/catch block deeper

---
 src/core.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core.js b/src/core.js
index 5faac7621..46c265298 100644
--- a/src/core.js
+++ b/src/core.js
@@ -398,16 +398,16 @@ var PDFDocument = (function PDFDocumentClosure() {
     get linearization() {
       var length = this.stream.length;
       var linearization = false;
-      try {
-        if (length) {
+      if (length) {
+        try {
           linearization = new Linearization(this.stream);
           if (linearization.length != length)
             linearization = false;
+        } catch (err) {
+          warn('since pdf is broken pdf.js is trying to recover it ' +
+               'by indexing the object; ' +
+               'the error in firebug shall have a different origin');
         }
-      } catch (err) {
-        warn('since pdf is broken pdf.js is trying to recover it ' +
-             'by indexing the object; ' +
-             'the error in firebug shall have a different origin');
       }
       // shadow the prototype getter with a data property
       return shadow(this, 'linearization', linearization);

From a63814e2b920394db9f888de86a05559ad1ef182 Mon Sep 17 00:00:00 2001
From: benbro <ben.browitt@gmail.com>
Date: Fri, 13 Jul 2012 18:09:20 +0300
Subject: [PATCH 08/16] Changed warning

---
 src/core.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/core.js b/src/core.js
index 46c265298..409ae060d 100644
--- a/src/core.js
+++ b/src/core.js
@@ -404,9 +404,8 @@ var PDFDocument = (function PDFDocumentClosure() {
           if (linearization.length != length)
             linearization = false;
         } catch (err) {
-          warn('since pdf is broken pdf.js is trying to recover it ' +
-               'by indexing the object; ' +
-               'the error in firebug shall have a different origin');
+          warn('The linearization data is not available ' +
+               'or unreadable pdf data is found');
         }
       }
       // shadow the prototype getter with a data property

From 276d96557354a6a6d5f074f453b2290d9df8f84a Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 12 Jul 2012 14:49:47 -0700
Subject: [PATCH 09/16] Sync up pdf.js with the mozilla central version.

---
 l10n/en-US/chrome.properties | 1 +
 test/mozcentral/Makefile.in  | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/l10n/en-US/chrome.properties b/l10n/en-US/chrome.properties
index 1885e6036..2b3dce42f 100644
--- a/l10n/en-US/chrome.properties
+++ b/l10n/en-US/chrome.properties
@@ -1,3 +1,4 @@
 # Chrome notification bar messages and buttons
 unsupported_feature=This PDF document might not be displayed correctly.
 open_with_different_viewer=Open With Different Viewer
+open_with_different_viewer.accessKey=o
diff --git a/test/mozcentral/Makefile.in b/test/mozcentral/Makefile.in
index 93ec187e2..ca686d1b4 100644
--- a/test/mozcentral/Makefile.in
+++ b/test/mozcentral/Makefile.in
@@ -9,13 +9,11 @@ VPATH     = @srcdir@
 relativesrcdir  = browser/extensions/pdfjs/test
 
 include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
 
-_BROWSER_TEST_FILES = \
+MOCHITEST_BROWSER_FILES = \
   browser_pdfjs_main.js \
   browser_pdfjs_savedialog.js \
   file_pdfjs_test.pdf \
   $(NULL)
 
-libs:: $(_BROWSER_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) 
+include $(topsrcdir)/config/rules.mk

From f16c6f19aa449e6a6c9db672c95b8e39501b1f33 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Fri, 13 Jul 2012 16:14:37 -0700
Subject: [PATCH 10/16] Address moz central comments for ff16.

---
 extensions/firefox/components/PdfStreamConverter.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js
index a0057ebb6..d371e50cd 100644
--- a/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@@ -132,16 +132,13 @@ ChromeActions.prototype = {
     var originalUrl = data.originalUrl;
     // The data may not be downloaded so we need just retry getting the pdf with
     // the original url.
-    var blobUrl = data.blobUrl || originalUrl;
-    var originalUri = NetUtil.newURI(originalUrl);
-    var blobUri = NetUtil.newURI(blobUrl);
+    var originalUri = NetUtil.newURI(data.originalUrl);
+    var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri;
     var extHelperAppSvc =
           Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
              getService(Ci.nsIExternalHelperAppService);
     var frontWindow = Cc['@mozilla.org/embedcomp/window-watcher;1'].
                          getService(Ci.nsIWindowWatcher).activeWindow;
-    var ioService = Services.io;
-    var channel = ioService.newChannel(originalUrl, null, null);
 
     NetUtil.asyncFetch(blobUri, function(aInputStream, aResult) {
       if (!Components.isSuccessCode(aResult)) {

From e6b75f4a569de815074a45add212b4b23322c47a Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Tue, 17 Jul 2012 13:42:49 -0700
Subject: [PATCH 11/16] Also check abbreviation for colorspace in jpegs.

---
 src/stream.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/stream.js b/src/stream.js
index 5e4b3a47e..bd239dacc 100644
--- a/src/stream.js
+++ b/src/stream.js
@@ -852,7 +852,7 @@ var JpegStream = (function JpegStreamClosure() {
    */
   JpegStream.prototype.isNativelySupported =
     function JpegStream_isNativelySupported(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), xref, res);
+    var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res);
     // when bug 674619 lands, let's check if browser can do
     // normal cmyk and then we won't need to decode in JS
     if (cs.name === 'DeviceGray' || cs.name === 'DeviceRGB')
@@ -867,7 +867,7 @@ var JpegStream = (function JpegStreamClosure() {
    */
   JpegStream.prototype.isNativelyDecodable =
     function JpegStream_isNativelyDecodable(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), xref, res);
+    var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res);
     var numComps = cs.numComps;
     if (numComps == 1 || numComps == 3)
       return true;

From ac005ed359e0e191cfbfa203ce4d5a894b3646c6 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Wed, 18 Jul 2012 16:23:51 -0700
Subject: [PATCH 12/16] Support more type 1 font hsbw formats.

---
 src/fonts.js | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/fonts.js b/src/fonts.js
index c955c4d1a..00937ea08 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -3422,6 +3422,27 @@ var Type1Parser = function type1Parser() {
 
   var kEscapeCommand = 12;
 
+  // The initial stack can have numbers expressed with the div command which
+  // need to be calculated before conversion. Looking at the spec it doesn't
+  // appear div should even be allowed as a first command but there have been
+  // a number of fonts that have this.
+  function evaluateStack(stack) {
+    var newStack = [];
+    for (var i = 0, ii = stack.length; i < ii; i++) {
+      var token = stack[i];
+      if (token === 'div') {
+        var b = newStack.pop();
+        var a = newStack.pop();
+        newStack.push(a / b);
+      } else if (isInt(token)) {
+        newStack.push(token);
+      } else {
+        warn('Unsupported initial stack ' + stack);
+      }
+    }
+    return newStack;
+  }
+
   function decodeCharString(array) {
     var charstring = [];
     var lsb = 0;
@@ -3471,24 +3492,13 @@ var Type1Parser = function type1Parser() {
 
           command = charStringDictionary['12'][escape];
         } else {
-          // TODO Clean this code
           if (value == 13) { // hsbw
-            if (charstring.length == 2) {
-              lsb = charstring[0];
-              width = charstring[1];
-              charstring.splice(0, 1);
-            } else if (charstring.length == 4 && charstring[3] == 'div') {
-              lsb = charstring[0];
-              width = charstring[1] / charstring[2];
-              charstring.splice(0, 1);
-            } else if (charstring.length == 4 && charstring[2] == 'div') {
-              lsb = charstring[0] / charstring[1];
-              width = charstring[3];
-              charstring.splice(0, 3);
-            } else {
-              error('Unsupported hsbw format: ' + charstring);
-            }
-
+            charstring = evaluateStack(charstring);
+            if (charstring.length !== 2)
+              warn('Unsupported hsbw format.');
+            lsb = charstring[0];
+            width = charstring[1];
+            charstring.splice(0, 1);
             charstring.push(lsb, 'hmoveto');
             continue;
           } else if (value == 10) { // callsubr

From 8705d8851fe44551160d6cda4ed830b38c436b61 Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 19 Jul 2012 10:58:07 -0700
Subject: [PATCH 13/16] Add reftest for undefined colorspace.

---
 test/pdfs/issue1419.pdf.link | 1 +
 test/test_manifest.json      | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 test/pdfs/issue1419.pdf.link

diff --git a/test/pdfs/issue1419.pdf.link b/test/pdfs/issue1419.pdf.link
new file mode 100644
index 000000000..7fe9f28bc
--- /dev/null
+++ b/test/pdfs/issue1419.pdf.link
@@ -0,0 +1 @@
+http://www.meal-a-day.asia/sites/default/files/Meal-a-Day%20Asia-Pacific%20Biennial%20Report%202012%20v1.01.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
index 4a0595348..ffcf10bed 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -604,6 +604,15 @@
       "link": true,
       "type": "eq"
     },
+    {  "id": "issue1419.pdf",
+       "file": "pdfs/issue1419.pdf",
+       "md5": "b5b6c6405d7b48418bccf97277957664",
+       "rounds": 1,
+       "link": true,
+       "pageLimit": 1,
+       "skipPages": [1],
+       "type": "eq"
+    },
     {  "id": "issue1317",
       "file": "pdfs/issue1317.pdf",
       "md5": "6fb46275b30c48c8985617d4f86199e3",

From 8fccd199484c7bd1935da23c08c7df39293d8ecd Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Thu, 19 Jul 2012 18:06:37 -0700
Subject: [PATCH 14/16] Leave div commands on stack and change evaluation.

---
 src/fonts.js | 57 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/fonts.js b/src/fonts.js
index 00937ea08..7f005e418 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -3422,25 +3422,35 @@ var Type1Parser = function type1Parser() {
 
   var kEscapeCommand = 12;
 
-  // The initial stack can have numbers expressed with the div command which
-  // need to be calculated before conversion. Looking at the spec it doesn't
-  // appear div should even be allowed as a first command but there have been
-  // a number of fonts that have this.
-  function evaluateStack(stack) {
-    var newStack = [];
-    for (var i = 0, ii = stack.length; i < ii; i++) {
-      var token = stack[i];
-      if (token === 'div') {
-        var b = newStack.pop();
-        var a = newStack.pop();
-        newStack.push(a / b);
-      } else if (isInt(token)) {
-        newStack.push(token);
+  // Breaks up the stack by arguments and also calculates the value.
+  function breakUpArgs(stack, numArgs) {
+    var args = [];
+    var index = stack.length - 1;
+    for (var i = 0; i < numArgs; i++) {
+      if (index < 0) {
+        args.unshift({ arg: [0],
+                       value: 0 });
+        warn('Malformed charstring stack: not enough values on stack.');
+        continue;
+      }
+      if (stack[index] === 'div') {
+        var a = stack[index - 2];
+        var b = stack[index - 1];
+        if (!isInt(a) || !isInt(b)) {
+          warn('Malformed charsting stack: expected ints on stack for div.');
+          a = 0;
+          b = 1;
+        }
+        args.unshift({ arg: [a, b, 'div'],
+                       value: a / b });
+        index -= 3;
       } else {
-        warn('Unsupported initial stack ' + stack);
+        args.unshift({ arg: stack.slice(index, index + 1),
+                       value: stack[index] });
+        index--;
       }
     }
-    return newStack;
+    return args;
   }
 
   function decodeCharString(array) {
@@ -3493,13 +3503,14 @@ var Type1Parser = function type1Parser() {
           command = charStringDictionary['12'][escape];
         } else {
           if (value == 13) { // hsbw
-            charstring = evaluateStack(charstring);
-            if (charstring.length !== 2)
-              warn('Unsupported hsbw format.');
-            lsb = charstring[0];
-            width = charstring[1];
-            charstring.splice(0, 1);
-            charstring.push(lsb, 'hmoveto');
+            var args = breakUpArgs(charstring, 2);
+            lsb = args[0]['value'];
+            width = args[1]['value'];
+            // To convert to type2 we have to move the width value to the first
+            // part of the charstring and then use hmoveto with lsb.
+            charstring = args[1]['arg'];
+            charstring = charstring.concat(args[0]['arg']);
+            charstring.push('hmoveto');
             continue;
           } else if (value == 10) { // callsubr
             if (charstring[charstring.length - 1] < 3) { // subr #0..2

From 24a3e0c8cc30759950972ebf4339c93fbf89e0ef Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Fri, 20 Jul 2012 09:09:48 -0700
Subject: [PATCH 15/16] Don't trigger TODO on marked content.

---
 src/canvas.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/canvas.js b/src/canvas.js
index cc6d50ded..32c171216 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -1196,20 +1196,20 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     // Marked content
 
     markPoint: function CanvasGraphics_markPoint(tag) {
-      TODO('Marked content');
+      // TODO Marked content.
     },
     markPointProps: function CanvasGraphics_markPointProps(tag, properties) {
-      TODO('Marked content');
+      // TODO Marked content.
     },
     beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {
-      TODO('Marked content');
+      // TODO Marked content.
     },
     beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(
                                         tag, properties) {
-      TODO('Marked content');
+      // TODO Marked content.
     },
     endMarkedContent: function CanvasGraphics_endMarkedContent() {
-      TODO('Marked content');
+      // TODO Marked content.
     },
 
     // Compatibility

From 34eb537160feb14d23285696e7a0d2eb76b31a8d Mon Sep 17 00:00:00 2001
From: Brendan Dahl <brendan.dahl@gmail.com>
Date: Fri, 20 Jul 2012 13:48:48 -0700
Subject: [PATCH 16/16] Add another warning for malformed stack.  Fix/add
 variable names.

---
 src/fonts.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/fonts.js b/src/fonts.js
index 7f005e418..a99103f63 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -3433,7 +3433,8 @@ var Type1Parser = function type1Parser() {
         warn('Malformed charstring stack: not enough values on stack.');
         continue;
       }
-      if (stack[index] === 'div') {
+      var token = stack[index];
+      if (token === 'div') {
         var a = stack[index - 2];
         var b = stack[index - 1];
         if (!isInt(a) || !isInt(b)) {
@@ -3444,10 +3445,12 @@ var Type1Parser = function type1Parser() {
         args.unshift({ arg: [a, b, 'div'],
                        value: a / b });
         index -= 3;
-      } else {
+      } else if (isInt(token)) {
         args.unshift({ arg: stack.slice(index, index + 1),
-                       value: stack[index] });
+                       value: token });
         index--;
+      } else {
+        warn('Malformed charsting stack: found bad token ' + token + '.');
       }
     }
     return args;
@@ -3504,12 +3507,14 @@ var Type1Parser = function type1Parser() {
         } else {
           if (value == 13) { // hsbw
             var args = breakUpArgs(charstring, 2);
-            lsb = args[0]['value'];
-            width = args[1]['value'];
+            var arg0 = args[0];
+            var arg1 = args[1];
+            lsb = arg0.value;
+            width = arg1.value;
             // To convert to type2 we have to move the width value to the first
             // part of the charstring and then use hmoveto with lsb.
-            charstring = args[1]['arg'];
-            charstring = charstring.concat(args[0]['arg']);
+            charstring = arg1.arg;
+            charstring = charstring.concat(arg0.arg);
             charstring.push('hmoveto');
             continue;
           } else if (value == 10) { // callsubr