Merge branch 'master' of git://github.com/mozilla/pdf.js into text-select

arturadib · arturadib · commit a544bed57e9f · 2011-11-29T14:17:05.000-05:00
Conflicts:
	src/canvas.js
diff --git a/src/canvas.js b/src/canvas.js
@@ -619,12 +619,6 @@ var CanvasGraphics = (function canvasGraphics() {
       this.textDivs.push(div);
     },
     showText: function canvasGraphicsShowText(str, skipTextSelection) {
-      function unicodeToChar(unicode) {
-        return (unicode >= 0x10000) ?
-          String.fromCharCode(0xD800 | ((unicode - 0x10000) >> 10),
-          0xDC00 | (unicode & 0x3FF)) : String.fromCharCode(unicode);
-      };
-
       var ctx = this.ctx;
       var current = this.current;
       var font = current.font;
@@ -673,7 +667,7 @@ var CanvasGraphics = (function canvasGraphics() {
           ctx.translate(charWidth, 0);
           current.x += charWidth;
 
-          text.str += unicodeToChar(glyph.unicode);
+          text.str += glyph.fontChar;
           text.length++;
           text.canvasWidth += charWidth;
         }
@@ -691,7 +685,7 @@ var CanvasGraphics = (function canvasGraphics() {
             continue;
           }
 
-          var char = unicodeToChar(glyph.unicode);
+          var char = glyph.fontChar;
           var charWidth = glyph.width * fontSize * 0.001 + charSpacing;
           ctx.fillText(char, width, 0);
           width += charWidth;
diff --git a/src/evaluator.js b/src/evaluator.js
@@ -512,6 +512,7 @@ var PartialEvaluator = (function partialEvaluator() {
           error('Encoding is not a Name nor a Dict');
         }
       }
+
       properties.differences = differences;
       properties.baseEncoding = baseEncoding;
       properties.hasEncoding = hasEncoding;
@@ -554,9 +555,21 @@ var PartialEvaluator = (function partialEvaluator() {
                   var startRange = tokens[j];
                   var endRange = tokens[j + 1];
                   var code = tokens[j + 2];
-                  while (startRange <= endRange) {
-                    charToUnicode[startRange] = code++;
-                    ++startRange;
+                  if (code == 0xFFFF) {
+                    // CMap is broken, assuming code == startRange
+                    code = startRange;
+                  }
+                  if (isArray(code)) {
+                    var codeindex = 0;
+                    while (startRange <= endRange) {
+                      charToUnicode[startRange] = code[codeindex++];
+                      ++startRange;
+                    }
+                  } else {
+                    while (startRange <= endRange) {
+                      charToUnicode[startRange] = code++;
+                      ++startRange;
+                    }
                   }
                 }
                 break;
@@ -595,9 +608,18 @@ var PartialEvaluator = (function partialEvaluator() {
             }
           } else if (byte == 0x3E) {
             if (token.length) {
-              // parsing hex number
-              tokens.push(parseInt(token, 16));
-              token = '';
+              if (token.length <= 4) {
+                // parsing hex number
+                tokens.push(parseInt(token, 16));
+                token = '';
+              } else {
+                // parsing hex UTF-16BE numbers
+                var str = [];
+                for (var i = 0, ii = token.length; i < ii; i += 4)
+                  str.push(parseInt(token.substr(i, 4), 16));
+                tokens.push(String.fromCharCode.apply(String, str));
+                token = '';
+              }
             }
           } else {
             token += String.fromCharCode(byte);
diff --git a/src/fonts.js b/src/fonts.js
