Merge branch 'master' of github.com:andreasgal/pdf.js into readme-learning

README.md

@@ -90,7 +90,7 @@ You can add your name to it! :)
 
 
 
-## Running the Tests
+## Running the tests
 
 pdf.js comes with browser-level regression tests that allow one to probe 
 whether it's able to successfully parse PDFs, as well as compare its output
@@ -116,6 +116,16 @@ images. The test type `load` simply tests whether the file loads without
 raising any errors.
 
 
+## Running tests through our bot
+
+If you are a reviewer, you can use our remote bot to issue comprehensive tests 
+against reference images before merging pull requests.
+
+See the bot repo for details:
+
++ https://github.com/arturadib/pdf.js-bot
+
+
 ## Additional resources
 
 Our demo site is here:
@@ -146,7 +156,7 @@ Follow us on twitter: @pdfjs
   
   
   
-## Additional resources to understand the structure of PDF
+## PDF-related resources
 
 A really basic overview of PDF is described here:
 

extensions/firefox/components/pdfContentHandler.js

@@ -62,7 +62,7 @@ function loadDocument(aWindow, aDocumentUrl) {
 }
 
 let WebProgressListener = {
-  init: function(aWindow, aUrl) {
+  init: function WebProgressListenerInit(aWindow, aUrl) {
     this._locationHasChanged = false;
     this._documentUrl = aUrl;
 

fonts.js

@@ -414,6 +414,8 @@ var Font = (function Font() {
   var constructor = function font_constructor(name, file, properties) {
     this.name = name;
     this.encoding = properties.encoding;
+    this.coded = properties.coded;
+    this.resources = properties.resources;
     this.sizes = [];
 
     var names = name.split('+');
@@ -428,6 +430,12 @@ var Font = (function Font() {
       this.loading = false;
       return;
     }
+    this.fontMatrix = properties.fontMatrix;
+    if (properties.type == 'Type3')
+      return;
+
+    // Trying to fix encoding using glyph widths and CIDSystemInfo.
+    this.fixWidths(properties);
 
     if (!file) {
       // The file data is not specified. Trying to fix the font name
@@ -443,6 +451,7 @@ var Font = (function Font() {
 
       this.defaultWidth = properties.defaultWidth;
       this.loadedName = fontName.split('-')[0];
+      this.composite = properties.composite;
       this.loading = false;
       return;
     }
@@ -478,7 +487,7 @@ var Font = (function Font() {
 
     this.data = data;
     this.type = type;
-    this.textMatrix = properties.textMatrix;
+    this.fontMatrix = properties.fontMatrix;
     this.defaultWidth = properties.defaultWidth;
     this.loadedName = getUniqueName();
     this.composite = properties.composite;
@@ -1208,19 +1217,6 @@ var Font = (function Font() {
         }
 
         var encoding = properties.encoding, i;
-        if (!encoding[0]) {
-          // the font is directly characters to glyphs with no encoding
-          // so create an identity encoding
-          var widths = properties.widths;
-          for (i = 0; i < numGlyphs; i++) {
-            var width = widths[i];
-            encoding[i] = {
-              unicode: i <= 0x1f || (i >= 127 && i <= 255) ?
-                i + kCmapGlyphOffset : i,
-              width: isNum(width) ? width : properties.defaultWidth
-            };
-          }
-        } else {
         for (i in encoding) {
           if (encoding.hasOwnProperty(i)) {
             var unicode = encoding[i].unicode;
@@ -1228,7 +1224,6 @@ var Font = (function Font() {
               encoding[i].unicode = unicode += kCmapGlyphOffset;
           }
         }
-        }
 
         var glyphs = [];
         for (i = 1; i < numGlyphs; i++) {
@@ -1402,6 +1397,87 @@ var Font = (function Font() {
       return stringToArray(otf.file);
     },
 
+    fixWidths: function font_fixWidths(properties) {
+      if (properties.type !== 'CIDFontType0' &&
+          properties.type !== 'CIDFontType2')
+          return;
+
+      var encoding = properties.encoding;
+      if (encoding[0])
+        return;
+      var glyphsWidths = properties.widths;
+      if (!glyphsWidths)
+        return;
+
+      var defaultWidth = properties.defaultWidth;
+      var cidSystemInfo = properties.cidSystemInfo;
+      var cidToUnicode;
+      if (cidSystemInfo) {
+        cidToUnicode = CIDToUnicodeMaps[
+          cidSystemInfo.registry + '-' + cidSystemInfo.ordering];
+      }
+      if (!cidToUnicode) {
+        // the font is directly characters to glyphs with no encoding
+        // so create an identity encoding
+        for (i = 0; i < 0xD800; i++) {
+          var width = glyphsWidths[i];
+          encoding[i] = {
+            unicode: i,
+            width: isNum(width) ? width : defaultWidth
+          };
+        }
+        // skipping surrogates + 256-user defined
+        for (i = 0xE100; i <= 0xFFFF; i++) {
+          var width = glyphsWidths[i];
+          encoding[i] = {
+            unicode: i,
+            width: isNum(width) ? width : defaultWidth
+          };
+        }
+        return;
+      }
+
+      encoding[0] = { unicode: 0, width: 0 };
+      var glyph = 1, i, j, k;
+      for (i = 0; i < cidToUnicode.length; ++i) {
+        var unicode = cidToUnicode[i];
+        var width;
+        if (isArray(unicode)) {
+          var length = unicode.length;
+          width = glyphsWidths[glyph];
+          for (j = 0; j < length; j++) {
+            k = unicode[j];
+            encoding[k] = {
+              unicode: k,
+              width: isNum(width) ? width : defaultWidth
+            };
+          }
+          glyph++;
+        } else if (typeof unicode === 'object') {
+          var fillLength = unicode.f;
+          if (fillLength) {
+            k = unicode.c;
+            for (j = 0; j < fillLength; ++j) {
+              width = glyphsWidths[glyph++];
+              encoding[k] = {
+                unicode: k,
+                width: isNum(width) ? width : defaultWidth
+              };
+              k++;
+            }
+          } else
+            glyph += unicode.s;
+        } else if (unicode) {
+          width = glyphsWidths[glyph++];
+          encoding[unicode] = {
+            unicode: unicode,
+            width: isNum(width) ? width : defaultWidth
+          };
+        } else
+          glyph++;
+      }
+    },
+
     bindWorker: function font_bindWorker(data) {
       postMessage({
         action: 'font',
@@ -1929,7 +2005,7 @@ var Type1Parser = function type1Parser() {
             // Make the angle into the right direction
             matrix[2] *= -1;
 
-            properties.textMatrix = matrix;
+            properties.fontMatrix = matrix;
             break;
           case '/Encoding':
             var size = parseInt(getToken(), 10);

pdf.js

@@ -4455,7 +4455,6 @@ var PartialEvaluator = (function partialEvaluator() {
                                                               properties) {
       var type = properties.type, encoding;
       if (properties.composite) {
-        if (type == 'CIDFontType2') {
         var defaultWidth = xref.fetchIfRef(dict.get('DW')) || 1000;
         properties.defaultWidth = defaultWidth;
 
@@ -4481,8 +4480,23 @@ var PartialEvaluator = (function partialEvaluator() {
         }
         properties.widths = glyphsWidths;
 
+        // Glyph ids are big-endian 2-byte values
+        encoding = properties.encoding;
+
+        // CIDSystemInfo might help to match width and glyphs
+        var cidSystemInfo = dict.get('CIDSystemInfo');
+        if (isDict(cidSystemInfo)) {
+          properties.cidSystemInfo = {
+            registry: cidSystemInfo.get('Registry'),
+            ordering: cidSystemInfo.get('Ordering'),
+            supplement: cidSystemInfo.get('Supplement')
+          };
+        }
+
         var cidToGidMap = dict.get('CIDToGIDMap');
         if (!cidToGidMap || !isRef(cidToGidMap)) {
+
+
           return Object.create(GlyphsUnicode);
         }
 
@@ -4490,9 +4504,6 @@ var PartialEvaluator = (function partialEvaluator() {
         var glyphsStream = xref.fetchIfRef(cidToGidMap);
         var glyphsData = glyphsStream.getBytes(0);
 
-          // Glyph ids are big-endian 2-byte values
-          encoding = properties.encoding;
-
         // Set encoding 0 to later verify the font has an encoding
         encoding[0] = { unicode: 0, width: 0 };
         for (var j = 0; j < glyphsData.length; j++) {
@@ -4507,20 +4518,7 @@ var PartialEvaluator = (function partialEvaluator() {
             width: isNum(width) ? width : defaultWidth
           };
         }
-        } else if (type == 'CIDFontType0') {
-          if (isName(encoding)) {
-            // Encoding is a predefined CMap
-            if (encoding.name == 'Identity-H') {
-              TODO('Need to create an identity cmap');
-            } else {
-              TODO('Need to support predefined CMaps see PDF 32000-1:2008 ' +
-                   '9.7.5.2 Predefined CMaps');
-            }
-          } else {
-            TODO('Need to support encoding streams see PDF 32000-1:2008 ' +
-                 '9.7.5.3');
-          }
-        }
+
         return Object.create(GlyphsUnicode);
       }
 
@@ -4559,6 +4557,7 @@ var PartialEvaluator = (function partialEvaluator() {
             baseEncoding = Encodings.WinAnsiEncoding.slice();
             break;
           case 'Type1':
+          case 'Type3':
             baseEncoding = Encodings.StandardEncoding.slice();
             break;
           default:
@@ -4746,15 +4745,20 @@ var PartialEvaluator = (function partialEvaluator() {
         composite = true;
       }
 
+      var descriptor = xref.fetchIfRef(dict.get('FontDescriptor'));
+      if (!descriptor) {
+        if (type.name == 'Type3') {
+          // FontDescriptor is only required for Type3 fonts when the document
+          // is a tagged pdf. Create a barbebones one to get by.
+          descriptor = new Dict();
+          descriptor.set('FontName', new Name(type.name));
+        } else {
           // Before PDF 1.5 if the font was one of the base 14 fonts, having a
           // FontDescriptor was not required.
           // This case is here for compatibility.
-      var descriptor = xref.fetchIfRef(dict.get('FontDescriptor'));
-      if (!descriptor) {
-        // Note for Type3 fonts: it has no no base font, feeding default
-        // font name and trying to get font metrics as the same way as for
-        // a font without descriptor.
-        var baseFontName = dict.get('BaseFont') || new Name('sans-serif');
+          var baseFontName = dict.get('BaseFont');
+          if (!isName(baseFontName))
+            return null;
 
           // Using base font name as a font name.
           baseFontName = baseFontName.name.replace(/,/g, '_');
@@ -4778,6 +4782,8 @@ var PartialEvaluator = (function partialEvaluator() {
           };
         }
 
+      }
+
       // According to the spec if 'FontDescriptor' is declared, 'FirstChar',
       // 'LastChar' and 'Widths' should exists too, but some PDF encoders seems
       // to ignore this rule when a variant of a standart font is used.
@@ -4834,7 +4840,7 @@ var PartialEvaluator = (function partialEvaluator() {
         length2: length2,
         composite: composite,
         fixedPitch: false,
-        textMatrix: IDENTITY_MATRIX,
+        fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
         firstChar: firstChar || 0,
         lastChar: lastChar || 256,
         bbox: descriptor.get('FontBBox'),
@@ -4847,10 +4853,24 @@ var PartialEvaluator = (function partialEvaluator() {
         italicAngle: descriptor.get('ItalicAngle'),
         differences: [],
         widths: glyphWidths,
-        encoding: encoding
+        encoding: encoding,
+        coded: false
       };
       properties.glyphs = this.extractEncoding(dict, xref, properties);
 
+      if (type.name === 'Type3') {
+        properties.coded = true;
+        var charProcs = xref.fetchIfRef(dict.get('CharProcs'));
+        var fontResources = xref.fetchIfRef(dict.get('Resources')) || resources;
+        properties.resources = fontResources;
+        for (var key in charProcs.map) {
+          var glyphStream = xref.fetchIfRef(charProcs.map[key]);
+          properties.glyphs[key].code = this.evaluate(glyphStream,
+                                                       xref,
+                                                       fontResources);
+        }
+      }
+
       return {
         name: fontName.name,
         dict: baseDict,
@@ -4888,8 +4908,8 @@ var CanvasExtraState = (function canvasExtraState() {
     this.fillColorObj = null;
     this.strokeColorObj = null;
     // Default fore and background colors
-    this.fillColor = "#000000";
-    this.strokeColor = "#000000";
+    this.fillColor = '#000000';
+    this.strokeColor = '#000000';
 
     this.old = old;
   }
@@ -5289,22 +5309,52 @@ var CanvasGraphics = (function canvasGraphics() {
       var ctx = this.ctx;
       var current = this.current;
       var font = current.font;
+      var glyphs = font.charsToGlyphs(text);
+      var fontSize = current.fontSize;
+      var charSpacing = current.charSpacing;
+      var wordSpacing = current.wordSpacing;
+      var textHScale = current.textHScale;
+      var glyphsLength = glyphs.length;
+      if (font.coded) {
+        ctx.save();
+        ctx.transform.apply(ctx, current.textMatrix);
+        ctx.translate(current.x, current.y);
+
+        var fontMatrix = font.fontMatrix || IDENTITY_MATRIX;
+        ctx.scale(1 / textHScale, 1);
+        for (var i = 0; i < glyphsLength; ++i) {
+
+          var glyph = glyphs[i];
+          if (glyph === null) {
+            // word break
+            this.ctx.translate(wordSpacing, 0);
+            continue;
+          }
+
+          this.save();
+          ctx.scale(fontSize, fontSize);
+          ctx.transform.apply(ctx, fontMatrix);
+          this.execute(glyph.code, this.xref, font.resources);
+          this.restore();
+
+          var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
+          var width = transformed[0] * fontSize + charSpacing;
 
+          ctx.translate(width, 0);
+          current.x += width;
+
+        }
+        ctx.restore();
+      } else {
         ctx.save();
         ctx.transform.apply(ctx, current.textMatrix);
         ctx.scale(1, -1);
         ctx.translate(current.x, -1 * current.y);
-      ctx.transform.apply(ctx, font.textMatrix || IDENTITY_MATRIX);
+        ctx.transform.apply(ctx, font.fontMatrix || IDENTITY_MATRIX);
 
-      var glyphs = font.charsToGlyphs(text);
-      var fontSize = current.fontSize;
-      var charSpacing = current.charSpacing;
-      var wordSpacing = current.wordSpacing;
-      var textHScale = current.textHScale;
         ctx.scale(1 / textHScale, 1);
 
         var width = 0;
-      var glyphsLength = glyphs.length;
         for (var i = 0; i < glyphsLength; ++i) {
           var glyph = glyphs[i];
           if (glyph === null) {
@@ -5323,7 +5373,8 @@ var CanvasGraphics = (function canvasGraphics() {
         }
         current.x += width;
 
-      this.ctx.restore();
+        ctx.restore();
+      }
     },
     showSpacedText: function canvasGraphicsShowSpacedText(arr) {
       var ctx = this.ctx;
@@ -5361,8 +5412,8 @@ var CanvasGraphics = (function canvasGraphics() {
 
     // Type3 fonts
     setCharWidth: function canvasGraphicsSetCharWidth(xWidth, yWidth) {
-      TODO('type 3 fonts ("d0" operator) xWidth: ' + xWidth + ' yWidth: ' +
-           yWidth);
+      // We can safely ignore this since the width should be the same
+      // as the width in the Widths array.
     },
     setCharWidthAndBounds: function canvasGraphicsSetCharWidthAndBounds(xWidth,
                                                                         yWidth,
@@ -5370,9 +5421,11 @@ var CanvasGraphics = (function canvasGraphics() {
                                                                         lly,
                                                                         urx,
                                                                         ury) {
-      TODO('type 3 fonts ("d1" operator) xWidth: ' + xWidth + ' yWidth: ' +
-           yWidth + ' llx: ' + llx + ' lly: ' + lly + ' urx: ' + urx +
-           ' ury ' + ury);
+      // TODO According to the spec we're also suppose to ignore any operators
+      // that set color or include images while processing this type3 font.
+      this.rectangle(llx, lly, urx - llx, ury - lly);
+      this.clip();
+      this.endPath();
     },
 
     // Color
@@ -6479,6 +6532,7 @@ var PDFImage = (function pdfImage() {
     applyStencilMask: function applyStencilMask(buffer, inverseDecode) {
       var width = this.width, height = this.height;
       var bitStrideLength = (width + 7) >> 3;
+      this.image.reset();
       var imgArray = this.image.getBytes(bitStrideLength * height);
       var imgArrayPos = 0;
       var i, j, mask, buf;
@@ -6507,6 +6561,7 @@ var PDFImage = (function pdfImage() {
 
       // rows start at byte boundary;
       var rowBytes = (width * numComps * bpc + 7) >> 3;
+      this.image.reset();
       var imgArray = this.image.getBytes(height * rowBytes);
 
       var comps = this.colorSpace.getRgbBuffer(
@@ -6534,6 +6589,7 @@ var PDFImage = (function pdfImage() {
 
       // rows start at byte boundary;
       var rowBytes = (width * numComps * bpc + 7) >> 3;
+      this.image.reset();
       var imgArray = this.image.getBytes(height * rowBytes);
 
       var comps = this.getComponents(imgArray);

test/driver.js

@@ -86,7 +86,7 @@ function nextTask() {
 }
 
 function isLastPage(task) {
-  return (task.pageNum > task.pdfDoc.numPages);
+  return task.pageNum > task.pdfDoc.numPages || task.pageNum > task.pageLimit;
 }
 
 function canvasToDataURL() {
@@ -205,7 +205,8 @@ function done() {
 function sendTaskResult(snapshot, task, failure) {
   var result = { browser: browser,
                  id: task.id,
-                 numPages: task.pdfDoc ? task.pdfDoc.numPages : 0,
+                 numPages: task.pdfDoc ?
+                           (task.pageLimit || task.pdfDoc.numPages) : 0,
                  failure: failure,
                  file: task.file,
                  round: task.round,

test/pdfs/simpletype3font.pdf

@@ -0,0 +1,141 @@
+%PDF-1.4
+%öäüß
+1 0 obj
+<<
+/Type /Catalog
+/Version /1.4
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/MediaBox [0 0 612 792]
+/Parent 2 0 R
+/Resources 4 0 R
+/Contents 5 0 R
+>>
+endobj
+4 0 obj
+<<
+/Font 6 0 R
+/XObject <<
+>>
+>>
+endobj
+5 0 obj
+<<
+/Length 7 0 R
+>>
+stream
+/F0 12 Tf
+BT
+100 700 Td
+(ababab) Tj
+ET
+
+endstream
+endobj
+6 0 obj
+<<
+/F0 8 0 R
+>>
+endobj
+7 0 obj
+39
+endobj
+8 0 obj
+<<
+/Type /Font
+/Subtype /Type3
+/FontBBox [0 0 750 750]
+/FontMatrix [0.001 0 0 0.001 0 0]
+/CharProcs 9 0 R
+/Encoding 10 0 R
+/FirstChar 97
+/LastChar 98
+/Widths [1000 1000]
+/FontDescriptor 11 0 R
+>>
+endobj
+9 0 obj
+<<
+/square 12 0 R
+/triangle 13 0 R
+>>
+endobj
+10 0 obj
+<<
+/Type /Encoding
+/Differences [97 /square /triangle]
+>>
+endobj
+11 0 obj
+<<
+/Type /FontDescriptor
+/FontName /SandT
+/Flags 262178
+/Ascent 0
+/CapHeight 0
+/Descent 0
+/ItalicAngle 0
+/StemV 0
+/FontBBox [0 0 750 750]
+>>
+endobj
+12 0 obj
+<<
+/Length 14 0 R
+>>
+stream
+1000 0 0 0 750 750 d1 0 0 750 750 re f
+endstream
+endobj
+13 0 obj
+<<
+/Length 15 0 R
+>>
+stream
+1000 0 0 0 750 750 d1 0 0 m 375 750 l 750 0 l f
+endstream
+endobj
+14 0 obj
+38
+endobj
+15 0 obj
+47
+endobj
+xref
+0 16
+0000000000 65535 f
+0000000015 00000 n
+0000000078 00000 n
+0000000135 00000 n
+0000000239 00000 n
+0000000287 00000 n
+0000000381 00000 n
+0000000412 00000 n
+0000000430 00000 n
+0000000641 00000 n
+0000000694 00000 n
+0000000768 00000 n
+0000000925 00000 n
+0000001020 00000 n
+0000001124 00000 n
+0000001143 00000 n
+trailer
+<<
+/Root 1 0 R
+/ID [<DD02410A8B7AD4A0EE0D50E4180FABAC> <DD02410A8B7AD4A0EE0D50E4180FABAC>]
+/Size 16
+>>
+startxref
+1162
+%%EOF

test/pdfs/tcpdf_033.pdf.link

@@ -0,0 +1 @@
+http://www.tcpdf.org/examples/example_033.pdf

test/test.py

@@ -23,6 +23,8 @@ class TestOptions(OptionParser):
         OptionParser.__init__(self, **kwargs)
         self.add_option("-m", "--masterMode", action="store_true", dest="masterMode",
                         help="Run the script in master mode.", default=False)
+        self.add_option("--noPrompts", action="store_true", dest="noPrompts",
+                        help="Uses default answers (intended for CLOUD TESTS only!).", default=False)
         self.add_option("--manifestFile", action="store", type="string", dest="manifestFile",
                         help="A JSON file in the form of test_manifest.json (the default).")
         self.add_option("-b", "--browser", action="store", type="string", dest="browser",
@@ -321,7 +323,7 @@ def setUp(options):
     if options.masterMode and os.path.isdir(TMPDIR):
         print 'Temporary snapshot dir tmp/ is still around.'
         print 'tmp/ can be removed if it has nothing you need.'
-        if prompt('SHOULD THIS SCRIPT REMOVE tmp/?  THINK CAREFULLY'):
+        if options.noPrompts or prompt('SHOULD THIS SCRIPT REMOVE tmp/?  THINK CAREFULLY'):
             subprocess.call(( 'rm', '-rf', 'tmp' ))
 
     assert not os.path.isdir(TMPDIR)
@@ -414,8 +416,9 @@ def checkEq(task, results, browser, masterMode):
 
         path = os.path.join(pfx, str(page + 1))
         if not os.access(path, os.R_OK):
-            print 'WARNING: no reference snapshot', path
             State.numEqNoSnapshot += 1
+            if not masterMode:
+                print 'WARNING: no reference snapshot', path
         else:
             f = open(path)
             ref = f.read()
@@ -444,6 +447,7 @@ def checkEq(task, results, browser, masterMode):
             try:
                 os.makedirs(tmpTaskDir)
             except OSError, e:
+                if e.errno != 17: # file exists
                     print >>sys.stderr, 'Creating', tmpTaskDir, 'failed!'
         
             of = open(os.path.join(tmpTaskDir, str(page + 1)), 'w')
@@ -503,10 +507,10 @@ def maybeUpdateRefImages(options, browser):
             print '  Yes!  The references in tmp/ can be synced with ref/.'
             if options.reftest:                                                                                                              
                 startReftest(browser, options)
-            if not prompt('Would you like to update the master copy in ref/?'):
+            if options.noPrompts or not prompt('Would you like to update the master copy in ref/?'):
                 print '  OK, not updating.'
             else:
-                sys.stdout.write('  Updating ... ')
+                sys.stdout.write('  Updating ref/ ... ')
 
                 # XXX unclear what to do on errors here ...
                 # NB: do *NOT* pass --delete to rsync.  That breaks this

test/test_manifest.json

@@ -170,5 +170,17 @@
        "rounds": 1,
        "skipPages": [ 16 ],
        "type": "load"
+    },
+    {  "id": "tcpdf_033",
+       "file": "pdfs/tcpdf_033.pdf",
+       "link": true,
+       "rounds": 1,
+       "type": "eq"
+    },
+    {  "id": "simpletype3font",
+       "file": "pdfs/simpletype3font.pdf",
+       "link": false,
+       "rounds": 1,
+       "type": "eq"
     }
 ]

test/test_slave.html

@@ -8,6 +8,7 @@
   <script type="text/javascript" src="/glyphlist.js"></script>
   <script type="text/javascript" src="/metrics.js"></script>
   <script type="text/javascript" src="/charsets.js"></script>
+  <script type="text/javascript" src="/cidmaps.js"></script>
   <script type="text/javascript" src="driver.js"></script>
 </head>
 

utils/fonts_utils.js

@@ -232,7 +232,7 @@ function readFontIndexData(aStream, aIsByte) {
   return objects;
 }
 
-var Type2Parser = function(aFilePath) {
+var Type2Parser = function type2Parser(aFilePath) {
   var font = new Dict();
 
   var xhr = new XMLHttpRequest();
@@ -292,7 +292,7 @@ var Type2Parser = function(aFilePath) {
     }
   }
 
-  this.parse = function(aStream) {
+  this.parse = function type2ParserParse(aStream) {
     font.set('major', aStream.getByte());
     font.set('minor', aStream.getByte());
     font.set('hdrSize', aStream.getByte());

web/compatibility.js

@@ -4,7 +4,7 @@
 'use strict';
 
 // Checking if the typed arrays are supported
-(function() {
+(function checkTypedArrayCompatibility() {
   if (typeof Uint8Array !== 'undefined')
     return;
 
@@ -12,7 +12,7 @@
     return this.slice(start, end);
   }
 
-  function set_function(array, offset) {
+  function setArrayOffset(array, offset) {
     if (arguments.length < 2)
       offset = 0;
     for (var i = 0, n = array.length; i < n; ++i, ++offset)
@@ -31,7 +31,7 @@
     result.subarray = subarray;
     result.buffer = result;
     result.byteLength = result.length;
-    result.set = set_function;
+    result.set = setArrayOffset;
 
     if (typeof arg1 === 'object' && arg1.buffer)
       result.buffer = arg1.buffer;
@@ -49,31 +49,31 @@
 })();
 
 // Object.create() ?
-(function() {
+(function checkObjectCreateCompatibility() {
   if (typeof Object.create !== 'undefined')
     return;
 
-  Object.create = function(proto) {
-    var constructor = function() {};
+  Object.create = function objectCreate(proto) {
+    var constructor = function objectCreateConstructor() {};
     constructor.prototype = proto;
     return new constructor();
   };
 })();
 
 // Object.defineProperty() ?
-(function() {
+(function checkObjectDefinePropertyCompatibility() {
   if (typeof Object.defineProperty !== 'undefined')
     return;
 
-  Object.defineProperty = function(obj, name, def) {
+  Object.defineProperty = function objectDefineProperty(obj, name, def) {
     delete obj[name];
     if ('get' in def)
       obj.__defineGetter__(name, def['get']);
     if ('set' in def)
       obj.__defineSetter__(name, def['set']);
     if ('value' in def) {
-      obj.__defineSetter__(name, function(value) {
-        this.__defineGetter__(name, function() {
+      obj.__defineSetter__(name, function objectDefinePropertySetter(value) {
+        this.__defineGetter__(name, function objectDefinePropertyGetter() {
           return value;
         });
         return value;
@@ -84,7 +84,7 @@
 })();
 
 // No XMLHttpRequest.response ?
-(function() {
+(function checkXMLHttpRequestResponseCompatibility() {
   var xhrPrototype = XMLHttpRequest.prototype;
   if ('response' in xhrPrototype ||
       'mozResponseArrayBuffer' in xhrPrototype ||
@@ -94,7 +94,7 @@
   // IE ?
   if (typeof VBArray !== 'undefined') {
     Object.defineProperty(xhrPrototype, 'response', {
-      get: function() {
+      get: function xmlHttpRequestResponseGet() {
         return new Uint8Array(new VBArray(this.responseBody).toArray());
       }
     });
@@ -122,14 +122,14 @@
 })();
 
 // window.btoa (base64 encode function) ?
-(function() {
+(function checkWindowBtoaCompatibility() {
   if ('btoa' in window)
     return;
 
   var digits =
     'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
-  window.btoa = function(chars) {
+  window.btoa = function windowBtoa(chars) {
     var buffer = '';
     var i, n;
     for (i = 0, n = chars.length; i < n; i += 3) {
@@ -147,13 +147,13 @@
 })();
 
 // Function.prototype.bind ?
-(function() {
+(function checkFunctionPrototypeBindCompatibility() {
   if (typeof Function.prototype.bind !== 'undefined')
     return;
 
-  Function.prototype.bind = function(obj) {
+  Function.prototype.bind = function functionPrototypeBind(obj) {
     var fn = this, headArgs = Array.prototype.slice.call(arguments, 1);
-    var bound = function() {
+    var bound = function functionPrototypeBindBound() {
       var args = Array.prototype.concat.apply(headArgs, arguments);
       return fn.apply(obj, args);
     };
@@ -162,15 +162,15 @@
 })();
 
 // IE9 text/html data URI
-(function() {
+(function checkDocumentDocumentModeCompatibility() {
   if (document.documentMode !== 9)
     return;
   // overriding the src property
   var originalSrcDescriptor = Object.getOwnPropertyDescriptor(
     HTMLIFrameElement.prototype, 'src');
   Object.defineProperty(HTMLIFrameElement.prototype, 'src', {
-    get: function() { return this.$src; },
-    set: function(src) {
+    get: function htmlIFrameElementPrototypeSrcGet() { return this.$src; },
+    set: function htmlIFrameElementPrototypeSrcSet(src) {
       this.$src = src;
       if (src.substr(0, 14) != 'data:text/html') {
         originalSrcDescriptor.set.call(this, src);
@@ -179,7 +179,7 @@
       // for text/html, using blank document and then
       // document's open, write, and close operations
       originalSrcDescriptor.set.call(this, 'about:blank');
-      setTimeout((function() {
+      setTimeout((function htmlIFrameElementPrototypeSrcOpenWriteClose() {
         var doc = this.contentDocument;
         doc.open('text/html');
         doc.write(src.substr(src.indexOf(',') + 1));
@@ -189,3 +189,4 @@
     enumerable: true
   });
 })();
+

web/viewer.html

@@ -12,6 +12,7 @@
         <script type="text/javascript" src="../glyphlist.js"></script>
         <script type="text/javascript" src="../metrics.js"></script>
         <script type="text/javascript" src="../charsets.js"></script>
+        <script type="text/javascript" src="../cidmaps.js"></script>
   </head>
 
   <body>

web/viewer.js

@@ -13,9 +13,9 @@ var kMinScale = 0.25;
 var kMaxScale = 4.0;
 
 
-var Cache = function(size) {
+var Cache = function cacheCache(size) {
   var data = [];
-  this.push = function(view) {
+  this.push = function cachePush(view) {
     data.push(view);
     if (data.length > size)
       data.shift().update();
@@ -31,7 +31,7 @@ var PDFView = {
   currentScale: kDefaultScale,
   initialBookmark: document.location.hash.substring(1),
 
-  setScale: function(val, resetAutoSettings) {
+  setScale: function pdfViewSetScale(val, resetAutoSettings) {
     var pages = this.pages;
     for (var i = 0; i < pages.length; i++)
       pages[i].update(val * kCssUnits);
@@ -47,7 +47,7 @@ var PDFView = {
     window.dispatchEvent(event);
   },
 
-  parseScale: function(value, resetAutoSettings) {
+  parseScale: function pdfViewParseScale(value, resetAutoSettings) {
     if ('custom' == value)
       return;
 
@@ -72,12 +72,12 @@ var PDFView = {
     }
   },
 
-  zoomIn: function() {
+  zoomIn: function pdfViewZoomIn() {
     var newScale = Math.min(kMaxScale, this.currentScale * kDefaultScaleDelta);
     this.setScale(newScale, true);
   },
 
-  zoomOut: function() {
+  zoomOut: function pdfViewZoomOut() {
     var newScale = Math.max(kMinScale, this.currentScale / kDefaultScaleDelta);
     this.setScale(newScale, true);
   },
@@ -104,7 +104,7 @@ var PDFView = {
     return currentPageNumber;
   },
 
-  open: function(url, scale) {
+  open: function pdfViewOpen(url, scale) {
     if (url.indexOf('http') == 0)
       return;
 
@@ -124,7 +124,7 @@ var PDFView = {
       });
   },
 
-  navigateTo: function(dest) {
+  navigateTo: function pdfViewNavigateTo(dest) {
     if (typeof dest === 'string')
       dest = this.destinations[dest];
     if (!(dest instanceof Array))
@@ -140,7 +140,7 @@ var PDFView = {
     }
   },
 
-  getDestinationHash: function(dest) {
+  getDestinationHash: function pdfViewGetDestinationHash(dest) {
     if (typeof dest === 'string')
       return '#' + escape(dest);
     if (dest instanceof Array) {
@@ -155,18 +155,18 @@ var PDFView = {
     return '';
   },
 
-  error: function() {
+  error: function pdfViewError() {
     var loadingIndicator = document.getElementById('loading');
     loadingIndicator.innerHTML = 'Error';
   },
 
-  progress: function(level) {
+  progress: function pdfViewProgress(level) {
     var percent = Math.round(level * 100);
     var loadingIndicator = document.getElementById('loading');
     loadingIndicator.innerHTML = 'Loading... ' + percent + '%';
   },
 
-  load: function(data, scale) {
+  load: function pdfViewLoad(data, scale) {
     var loadingIndicator = document.getElementById('loading');
     loadingIndicator.style.display = 'none';
 
@@ -218,7 +218,7 @@ var PDFView = {
       this.page = 1;
   },
 
-  setHash: function(hash) {
+  setHash: function pdfViewSetHash(hash) {
     if (!hash)
       return;
 
@@ -233,7 +233,7 @@ var PDFView = {
       PDFView.navigateTo(unescape(hash));
   },
 
-  switchSidebarView: function(view) {
+  switchSidebarView: function pdfViewSwitchSidebarView(view) {
     var thumbsScrollView = document.getElementById('sidebarScrollView');
     var outlineScrollView = document.getElementById('outlineScrollView');
     var thumbsSwitchButton = document.getElementById('thumbsSwitch');
@@ -254,7 +254,7 @@ var PDFView = {
     }
   },
 
-  getVisiblePages: function() {
+  getVisiblePages: function pdfViewGetVisiblePages() {
     var pages = this.pages;
     var kBottomMargin = 10;
     var visiblePages = [];
@@ -282,7 +282,7 @@ var PDFView = {
   }
 };
 
-var PageView = function(container, content, id, pageWidth, pageHeight,
+var PageView = function pageView(container, content, id, pageWidth, pageHeight,
                                  stats, navigateTo) {
   this.id = id;
   this.content = content;
@@ -303,7 +303,7 @@ var PageView = function(container, content, id, pageWidth, pageHeight,
   container.appendChild(anchor);
   container.appendChild(div);
 
-  this.update = function(scale) {
+  this.update = function pageViewUpdate(scale) {
     this.scale = scale || this.scale;
     div.style.width = (this.width * this.scale) + 'px';
     div.style.height = (this.height * this.scale) + 'px';
@@ -316,7 +316,7 @@ var PageView = function(container, content, id, pageWidth, pageHeight,
   function setupLinks(content, scale) {
     function bindLink(link, dest) {
       link.href = PDFView.getDestinationHash(dest);
-      link.onclick = function() {
+      link.onclick = function pageViewSetupLinksOnclick() {
         if (dest)
           PDFView.navigateTo(dest);
         return false;
@@ -337,7 +337,7 @@ var PageView = function(container, content, id, pageWidth, pageHeight,
     }
   }
 
-  this.scrollIntoView = function(dest) {
+  this.scrollIntoView = function pageViewScrollIntoView(dest) {
       if (!dest) {
         div.scrollIntoView(true);
         return;
@@ -389,7 +389,7 @@ var PageView = function(container, content, id, pageWidth, pageHeight,
       if (scale)
         PDFView.setScale(scale, true);
 
-      setTimeout(function() {
+      setTimeout(function pageViewScrollIntoViewRelayout() {
         // letting page to re-layout before scrolling
         var scale = PDFView.currentScale;
         var x = Math.min(boundingRect[0].x, boundingRect[1].x);
@@ -410,7 +410,7 @@ var PageView = function(container, content, id, pageWidth, pageHeight,
       }, 0);
   };
 
-  this.draw = function() {
+  this.draw = function pageviewDraw() {
     if (div.hasChildNodes()) {
       this.updateStats();
       return false;
@@ -441,7 +441,7 @@ var PageView = function(container, content, id, pageWidth, pageHeight,
     return true;
   };
 
-  this.updateStats = function() {
+  this.updateStats = function pageViewUpdateStats() {
     var t1 = stats.compile, t2 = stats.fonts, t3 = stats.render;
     var str = 'Time to compile/fonts/render: ' +
               (t1 - stats.begin) + '/' + (t2 - t1) + '/' + (t3 - t2) + ' ms';
@@ -449,7 +449,7 @@ var PageView = function(container, content, id, pageWidth, pageHeight,
   };
 };
 
-var ThumbnailView = function(container, page, id, pageRatio) {
+var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
   var anchor = document.createElement('a');
   anchor.href = '#' + id;
   anchor.onclick = function stopNivigation() {
@@ -464,7 +464,7 @@ var ThumbnailView = function(container, page, id, pageRatio) {
   anchor.appendChild(div);
   container.appendChild(anchor);
 
-  this.draw = function() {
+  this.draw = function thumbnailViewDraw() {
     if (div.hasChildNodes())
       return;
 
@@ -495,16 +495,16 @@ var ThumbnailView = function(container, page, id, pageRatio) {
     div.style.height = (view.height * scaleY) + 'px';
     div.style.lineHeight = (view.height * scaleY) + 'px';
 
-    page.startRendering(ctx, function() { });
+    page.startRendering(ctx, function thumbnailViewDrawStartRendering() {});
   };
 };
 
-var DocumentOutlineView = function(outline) {
+var DocumentOutlineView = function documentOutlineView(outline) {
   var outlineView = document.getElementById('outlineView');
 
   function bindItemLink(domObj, item) {
     domObj.href = PDFView.getDestinationHash(item.dest);
-    domObj.onclick = function(e) {
+    domObj.onclick = function documentOutlineViewOnclick(e) {
       PDFView.navigateTo(item.dest);
       return false;
     };
@@ -535,7 +535,7 @@ var DocumentOutlineView = function(outline) {
   }
 };
 
-window.addEventListener('load', function(evt) {
+window.addEventListener('load', function webViewerLoad(evt) {
   var params = document.location.search.substring(1).split('&');
   for (var i = 0; i < params.length; i++) {
     var param = params[i].split('=');
@@ -550,15 +550,15 @@ window.addEventListener('load', function(evt) {
     document.getElementById('fileInput').value = null;
 }, true);
 
-window.addEventListener('pdfload', function(evt) {
+window.addEventListener('pdfload', function webViewerPdfload(evt) {
   PDFView.load(evt.detail);
 }, true);
 
-window.addEventListener('pdfprogress', function(evt) {
+window.addEventListener('pdfprogress', function webViewerPdfProgress(evt) {
   PDFView.progress(evt.detail);
 }, true);
 
-window.addEventListener('pdferror', function(evt) {
+window.addEventListener('pdferror', function webViewerPdfError(evt) {
   PDFView.error();
 }, true);
 
@@ -582,29 +582,29 @@ function updateViewarea() {
     PDFView.page = firstPage.id;
 }
 
-window.addEventListener('scroll', function onscroll(evt) {
+window.addEventListener('scroll', function webViewerScroll(evt) {
   updateViewarea();
 }, true);
 
-window.addEventListener('resize', function onscroll(evt) {
+window.addEventListener('resize', function webViewerResize(evt) {
   if (document.getElementById('pageWidthOption').selected ||
       document.getElementById('pageFitOption').selected)
       PDFView.parseScale(document.getElementById('scaleSelect').value);
   updateViewarea();
 });
 
-window.addEventListener('hashchange', function(evt) {
+window.addEventListener('hashchange', function webViewerHashchange(evt) {
   PDFView.setHash(document.location.hash.substring(1));
 });
 
-window.addEventListener('change', function(evt) {
+window.addEventListener('change', function webViewerChange(evt) {
   var files = evt.target.files;
   if (!files || files.length == 0)
     return;
 
   // Read the local file into a Uint8Array.
   var fileReader = new FileReader();
-  fileReader.onload = function(evt) {
+  fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
     var data = evt.target.result;
     var buffer = new ArrayBuffer(data.length);
     var uint8Array = new Uint8Array(buffer);
@@ -622,7 +622,7 @@ window.addEventListener('change', function(evt) {
   document.title = file.name;
 }, true);
 
-window.addEventListener('transitionend', function(evt) {
+window.addEventListener('transitionend', function webViewerTransitionend(evt) {
   var pageIndex = 0;
   var pagesCount = PDFView.pages.length;
 

web/viewer_worker.html

@@ -9,16 +9,15 @@
 
 
 var pdfDoc;
-window.onload = function() {
+window.onload = function webViewerWorkerOnload() {
     window.canvas = document.getElementById("canvas");
     window.ctx = canvas.getContext("2d");
 
     pdfDoc = new WorkerPDFDoc(window.canvas);
-    pdfDoc.onChangePage = function(numPage) {
+    pdfDoc.onChangePage = function webViewerWorkerOnChangePage(numPage) {
         document.getElementById("pageNumber").value = numPage;
     }
-    // pdfDoc.open("canvas.pdf", function() {
-    pdfDoc.open("compressed.tracemonkey-pldi-09.pdf", function() {
+    pdfDoc.open("compressed.tracemonkey-pldi-09.pdf", function webViewerWorkerOpen() {
         document.getElementById("numPages").innerHTML = "/" + pdfDoc.numPages;
     })
 }