Merge with upstream

fonts.js

@@ -411,7 +411,7 @@ var Font = (function Font() {
     this.encoding = properties.encoding;
     this.sizes = [];
 
-    var names = name.split("+");
+    var names = name.split('+');
     names = names.length > 1 ? names[1] : names[0];
     names = names.split(/[-,_]/g)[0];
     this.serif = serifFonts[names] || (name.search(/serif/gi) != -1);
@@ -448,8 +448,8 @@ var Font = (function Font() {
         this.mimetype = 'font/opentype';
 
         var subtype = properties.subtype;
-        var cff = (subtype === 'Type1C') ? new Type2CFF(file, properties)
+        var cff = (subtype === 'Type1C') ?
-                                         : new CFF(name, file, properties);
+          new Type2CFF(file, properties) : new CFF(name, file, properties);
 
         // Wrap the CFF data inside an OTF font file
         data = this.convert(name, cff, properties);
@@ -875,7 +875,7 @@ var Font = (function Font() {
         // Check that table are sorted by platformID then encodingID,
         records.sort(function(a, b) {
           return ((a.platformID << 16) + a.encodingID) -
-                 ((b.platformID << 16) + b.encodingID)
+                 ((b.platformID << 16) + b.encodingID);
         });
 
         var tables = [records[0]];
@@ -2340,7 +2340,8 @@ var Type2CFF = (function() {
       return charstrings;
     },
 
-    parseEncoding: function cff_parseencoding(pos, properties, strings, charset) {
+    parseEncoding: function cff_parseencoding(pos, properties, strings,
+                                              charset) {
       var encoding = {};
       var bytes = this.bytes;
 
@@ -2355,8 +2356,8 @@ var Type2CFF = (function() {
 
       if (pos == 0 || pos == 1) {
         var gid = 1;
-        var baseEncoding = pos ? Encodings.ExpertEncoding
+        var baseEncoding =
-                               : Encodings.StandardEncoding;
+          pos ? Encodings.ExpertEncoding : Encodings.StandardEncoding;
         for (var i = 0; i < charset.length; i++) {
           var index = baseEncoding.indexOf(charset[i]);
           if (index != -1)
@@ -2393,7 +2394,7 @@ var Type2CFF = (function() {
             break;
 
           default:
-            error('Unknow encoding format: ' + format + " in CFF");
+            error('Unknow encoding format: ' + format + ' in CFF');
             break;
         }
       }

pdf.js

@@ -825,7 +825,7 @@ var PredictorStream = (function() {
         currentRow[i] = rawBytes[i];
       for (; i < rowBytes; ++i) {
         var up = prevRow[i];
-        var upLeft = lastRow[i - pixBytes];
+        var upLeft = prevRow[i - pixBytes];
         var left = currentRow[i - pixBytes];
         var p = left + up - upLeft;
 
@@ -1553,7 +1553,7 @@ var CCITTFaxStream = (function() {
     this.row = 0;
     this.nextLine2D = this.encoding < 0;
     this.inputBits = 0;
-    this.inputBuf;
+    this.inputBuf = 0;
     this.outputBits = 0;
     this.buf = EOF;
 
@@ -3676,8 +3676,7 @@ var PDFDoc = (function() {
         if (find(stream, 'startxref', 1024, true)) {
           stream.skip(9);
           var ch;
-          while (Lexer.isSpace(ch = stream.getChar()))
+          while (Lexer.isSpace(ch = stream.getChar())) {}
-;
           var str = '';
           while ((ch - '0') <= 9) {
             str += ch;
@@ -4430,7 +4429,7 @@ var PartialEvaluator = (function() {
       var type = dict.get('Subtype');
       assertWellFormed(IsName(type), 'invalid font Subtype');
 
-      var composite = false
+      var composite = false;
       if (type.name == 'Type0') {
         // If font is a composite
         //  - get the descendant font

web/viewer.js

@@ -593,7 +593,7 @@ window.addEventListener('pagechange', function pagechange(evt) {
 }, true);
 
 window.addEventListener('keydown', function keydown(evt) {
-  switch(evt.keyCode) {
+  switch (evt.keyCode) {
     case 61: // FF/Mac '='
     case 107: // FF '+' and '='
     case 187: // Chrome '+'