Merge branch 'master' of https://github.com/mozilla/pdf.js into cff

2012-03-10 19:22:02 -08:00 · 2012-03-10 19:22:02 -08:00 · 4a50e06e85
commit 4a50e06e85
parent 386ea373a5 d4111ed025
21 changed files with 2162 additions and 145 deletions
--- a/4
+++ b/4
@ -144,9 +144,9 @@ browser-test:
 # To install gjslint, see:
 #
 # <http://code.google.com/closure/utilities/docs/linter_howto.html>
-SRC_DIRS := . src utils web test examples/helloworld extensions/firefox \
+SRC_DIRS := src utils web test examples/helloworld extensions/firefox \
            extensions/firefox/components extensions/chrome test/unit
-GJSLINT_FILES = $(foreach DIR,$(SRC_DIRS),$(wildcard $(DIR)/*.js))
+GJSLINT_FILES = $(foreach DIR, $(SRC_DIRS), $(wildcard $(DIR)/*.js))
 lint:
 	gjslint --nojsdoc $(GJSLINT_FILES)

--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 # PDF.JS
-
+ 

 pdf.js is an HTML5 technology experiment that explores building a faithful
 and efficient Portable Document Format (PDF) renderer without native code 
--- a/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@ -124,6 +124,19 @@ PdfStreamConverter.prototype = {
  asyncConvertData: function(aFromType, aToType, aListener, aCtxt) {
    if (!Services.prefs.getBoolPref('extensions.pdf.js.active'))
      throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+
+    // Ignoring HTTP POST requests -- pdf.js has to repeat the request.
+    var skipConversion = false;
+    try {
+      var request = aCtxt;
+      request.QueryInterface(Ci.nsIHttpChannel);
+      skipConversion = (request.requestMethod === 'POST');
+    } catch (e) {
+      // Non-HTTP request... continue normally.
+    }
+    if (skipConversion)
+      throw Cr.NS_ERROR_NOT_IMPLEMENTED;
+
    // Store the listener passed to us
    this.listener = aListener;
  },
--- a/external/shelljs/LICENSE
+++ b/external/shelljs/LICENSE
@ -0,0 +1,26 @@
+Copyright (c) 2012, Artur Adib <aadib@mozilla.com>
+All rights reserved.
+
+You may use this project under the terms of the New BSD license as follows:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Artur Adib nor the
+      names of the contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL ARTUR ADIB BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/external/shelljs/README.md
+++ b/external/shelljs/README.md
@ -0,0 +1,316 @@
+# ShellJS - Unix shell commands for Node.js [![Build Status](https://secure.travis-ci.org/arturadib/shelljs.png)](http://travis-ci.org/arturadib/shelljs)
+
+ShellJS is a **portable** (Windows included) implementation of Unix shell commands on top of the Node.js API. You can use it to eliminate your shell script's dependency on Unix while still keeping its familiar and powerful commands.
+
+The project is both [unit-tested](http://travis-ci.org/arturadib/shelljs) and battle-tested at Mozilla's [pdf.js](http://github.com/mozilla/pdf.js).
+
+
+### Example
+
+```javascript
+require('shelljs/global');
+
+// Copy files to release dir
+mkdir('-p', 'out/Release');
+cp('-R', 'lib/*.js', 'out/Release');
+
+// Replace macros in each .js file
+cd('lib');
+for (file in ls('*.js')) {
+  sed('-i', 'BUILD_VERSION', 'v0.1.2', file);
+  sed('-i', /.*REMOVE_THIS_LINE.*\n/, '', file);
+  sed('-i', /.*REPLACE_LINE_WITH_MACRO.*\n/, cat('macro.js'), file);
+}
+cd('..');
+
+// Run external tool synchronously
+if (exec('git commit -am "Auto-commit"').code !== 0) {
+  echo('Error: Git commit failed');
+  exit(1);
+}
+```
+
+### Global vs. Local
+
+The example above uses the convenience script `shelljs/global` to reduce verbosity. If polluting your global namespace is not desirable, simply require `shelljs`.
+
+Example:
+
+```javascript
+var shell = require('shelljs');
+shell.echo('hello world');
+```
+
+### Make tool
+
+A convenience script `shelljs/make` is also provided to mimic the behavior of a Unix Makefile. In this case all shell objects are global, and command line arguments will cause the script to execute only the corresponding function in the global `target` object. To avoid redundant calls, target functions are executed only once per script.
+
+Example:
+
+```javascript
+//
+// Example file: make.js
+//
+require('shelljs/make');
+
+target.all = function() {
+  target.bundle();
+  target.docs();
+}
+
+// Bundle JS files
+target.bundle = function() {
+  cd(__dirname);
+  mkdir('build');
+  cd('lib');
+  cat('*.js').to('../build/output.js');
+}
+
+// Generate docs
+target.docs = function() {
+  cd(__dirname);
+  mkdir('docs');
+  cd('lib');
+  for (file in ls('*.js')) {
+    var text = grep('//@', file); // extract special comments
+    text.replace('//@', ''); // remove comment tags
+    text.to('docs/my_docs.md');
+  }
+}
+```
+
+To run the target `all`, call the above script without arguments: `$ node make`. To run the target `docs`: `$ node make docs`, and so on.
+
+### Installing
+
+Via npm:
+
+```bash
+$ npm install shelljs
+```
+
+Or simply copy `shell.js` into your project's directory, and `require()` accordingly.
+
+
+<!-- 
+
+  DO NOT MODIFY BEYOND THIS POINT - IT'S AUTOMATICALLY GENERATED
+
+-->
+
+
+# Command reference
+
+
+All commands run synchronously, unless otherwise stated.
+
+
+#### cd('dir')
+Changes to directory `dir` for the duration of the script
+
+#### pwd()
+Returns the current directory.
+
+#### ls([options ,] path [,path ...])
+#### ls([options ,] path_array)
+Available options:
+
+ `-R`: recursive
+ `-a`: all files (include files beginning with `.`)
+
+Examples:
+
+```javascript
+ls('projs/*.js');
+ls('-R', '/users/me', '/tmp');
+ls('-R', ['/users/me', '/tmp']); // same as above
+```
+
+Returns list of files in the given path, or in current directory if no path provided.
+For convenient iteration via `for (file in ls())`, the format returned is a hash object:
+`{ 'file1':null, 'dir1/file2':null, ...}`.
+
+#### cp('[options ,] source [,source ...], dest')
+#### cp('[options ,] source_array, dest')
+Available options:
+
+ `-f`: force
+ `-r, -R`: recursive
+
+Examples:
+
+```javascript
+cp('file1', 'dir1');
+cp('-Rf', '/tmp/*', '/usr/local/*', '/home/tmp');
+cp('-Rf', ['/tmp/*', '/usr/local/*'], '/home/tmp'); // same as above
+```
+
+Copies files. The wildcard `*` is accepted.
+
+#### rm([options ,] file [, file ...])
+#### rm([options ,] file_array)
+Available options:
+
+ `-f`: force
+ `-r, -R`: recursive
+
+Examples:
+
+```javascript
+rm('-rf', '/tmp/*');
+rm('some_file.txt', 'another_file.txt');
+rm(['some_file.txt', 'another_file.txt']); // same as above
+```
+
+Removes files. The wildcard `*` is accepted. 
+
+#### mv(source [, source ...], dest')
+#### mv(source_array, dest')
+Available options:
+
+ `f`: force
+
+Examples:
+
+```javascript
+mv('-f', 'file', 'dir/');
+mv('file1', 'file2', 'dir/');
+mv(['file1', 'file2'], 'dir/'); // same as above
+```
+
+Moves files. The wildcard `*` is accepted.
+
+#### mkdir([options ,] dir [, dir ...])
+#### mkdir([options ,] dir_array)
+Available options:
+
+ `p`: full path (will create intermediate dirs if necessary)
+
+Examples:
+
+```javascript
+mkdir('-p', '/tmp/a/b/c/d', '/tmp/e/f/g');
+mkdir('-p', ['/tmp/a/b/c/d', '/tmp/e/f/g']); // same as above
+```
+
+Creates directories.
+
+#### cat(file [, file ...])
+#### cat(file_array)
+
+Examples:
+
+```javascript
+var str = cat('file*.txt');
+var str = cat('file1', 'file2');
+var str = cat(['file1', 'file2']); // same as above
+```
+
+Returns a string containing the given file, or a concatenated string
+containing the files if more than one file is given (a new line character is
+introduced between each file). Wildcard `*` accepted.
+
+#### 'string'.to(file)
+
+Examples:
+
+```javascript
+cat('input.txt').to('output.txt');
+```
+
+Analogous to the redirection operator `>` in Unix, but works with JavaScript strings (such as
+those returned by `cat`, `grep`, etc). _Like Unix redirections, `to()` will overwrite any existing file!_
+
+#### sed([options ,] search_regex, replace_str, file)
+Available options:
+
+ `-i`: Replace contents of 'file' in-place. _Note that no backups will be created!_
+
+Examples:
+
+```javascript
+sed('-i', 'PROGRAM_VERSION', 'v0.1.3', 'source.js');
+sed(/.*DELETE_THIS_LINE.*\n/, '', 'source.js');
+```
+
+Reads an input string from `file` and performs a JavaScript `replace()` on the input
+using the given search regex and replacement string. Returns the new string after replacement.
+
+#### grep(regex_filter, file [, file ...])
+#### grep(regex_filter, file_array)
+
+Examples:
+
+```javascript
+grep('GLOBAL_VARIABLE', '*.js');
+```
+
+Reads input string from given files and returns a string containing all lines of the 
+file that match the given `regex_filter`. Wildcard `*` accepted.
+
+#### which(command)
+
+Examples:
+
+```javascript
+var nodeExec = which('node');
+```
+
+Searches for `command` in the system's PATH. On Windows looks for `.exe`, `.cmd`, and `.bat` extensions.
+Returns string containing the absolute path to the command.
+
+#### echo(string [,string ...])
+
+Examples:
+
+```javascript
+echo('hello world');
+var str = echo('hello world');
+```
+
+Prints string to stdout, and returns string with additional utility methods
+like `.to()`.
+
+#### exit(code)
+Exits the current process with the given exit code.
+
+#### env['VAR_NAME']
+Object containing environment variables (both getter and setter). Shortcut to process.env.
+
+#### exec(command [, options] [, callback])
+Available options (all `false` by default):
+
+ `async`: Asynchronous execution. Needs callback.
+ `silent`: Do not echo program output to console.
+
+Examples:
+
+```javascript
+var version = exec('node --version', {silent:true}).output;
+```
+
+Executes the given `command` _synchronously_, unless otherwise specified. 
+When in synchronous mode returns the object `{ code:..., output:... }`, containing the program's 
+`output` (stdout + stderr)  and its exit `code`. Otherwise the `callback` gets the 
+arguments `(code, output)`.
+
+## Non-Unix commands
+
+
+#### tempdir()
+Searches and returns string containing a writeable, platform-dependent temporary directory.
+Follows Python's [tempfile algorithm](http://docs.python.org/library/tempfile.html#tempfile.tempdir).
+
+#### exists(path [, path ...])
+#### exists(path_array)
+Returns true if all the given paths exist.
+
+#### error()
+Tests if error occurred in the last command. Returns `null` if no error occurred,
+otherwise returns string explaining the error
+
+#### verbose()
+Enables all output (default)
+
+#### silent()
+Suppresses all output, except for explict `echo()` calls
--- a/external/shelljs/global.js
+++ b/external/shelljs/global.js
@ -0,0 +1,3 @@
+var shell = require('./shell.js');
+for (cmd in shell)
+  global[cmd] = shell[cmd];
--- a/external/shelljs/make.js
+++ b/external/shelljs/make.js
@ -0,0 +1,46 @@
+require('./global');
+
+global.target = {};
+
+// This ensures we only execute the script targets after the entire script has
+// been evaluated
+var args = process.argv.slice(2);
+setTimeout(function() {
+
+  if (args.length === 1 && args[0] === '--help') {
+    console.log('Available targets:');
+    for (t in target)
+      console.log('  ' + t);
+    return;
+  }
+
+  // Wrap targets to prevent duplicate execution
+  for (t in target) {
+    (function(t, oldTarget){
+
+      // Wrap it
+      target[t] = function(force) {
+        if (oldTarget.done && !force)
+          return;
+        oldTarget.done = true;
+        return oldTarget(arguments);
+      }
+
+    })(t, target[t]);
+  }
+
+  // Execute desired targets
+  if (args.length > 0) {
+    args.forEach(function(arg) {
+      if (arg in target) 
+        target[arg]();
+      else {
+        console.log('no such target: ' + arg);
+        exit(1);
+      }
+    });
+  } else if ('all' in target) {
+    target.all();
+  }
+
+}, 0);
--- a/external/shelljs/package.json
+++ b/external/shelljs/package.json
@ -0,0 +1,12 @@
+{ "name": "shelljs"
+, "version": "0.0.2pre1"
+, "author": "Artur Adib <aadib@mozilla.com>"
+, "description": "Portable Unix shell commands for Node.js"
+, "keywords": ["unix", "shell", "makefile", "make", "jake", "synchronous"]
+, "repository": "git://github.com/arturadib/shelljs"
+, "homepage": "http://github.com/arturadib/shelljs"
+, "main": "./shell.js"
+, "scripts": {
+    "test": "node scripts/run-tests"
+  }
+}
--- a/external/shelljs/shell.js
+++ b/external/shelljs/shell.js
--- a/make.js
+++ b/make.js
@ -0,0 +1,409 @@
+#!/usr/bin/env node
+require('./external/shelljs/make');
+
+var ROOT_DIR = __dirname + '/', // absolute path to project's root
+    BUILD_DIR = 'build/',
+    BUILD_TARGET = BUILD_DIR + 'pdf.js',
+    FIREFOX_BUILD_DIR = BUILD_DIR + '/firefox/',
+    EXTENSION_SRC_DIR = 'extensions/',
+    GH_PAGES_DIR = BUILD_DIR + 'gh-pages/',
+    REPO = 'git@github.com:mozilla/pdf.js.git',
+    PYTHON_BIN = 'python2.7';
+
+//
+// make all
+//
+target.all = function() {
+  // Don't do anything by default
+  echo('Please specify a target. Available targets:');
+  for (t in target)
+    if (t !== 'all') echo('  ' + t);
+};
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+//
+// Production stuff
+//
+
+//
+// make web
+// Generates the website for the project, by checking out the gh-pages branch underneath
+// the build directory, and then moving the various viewer files into place.
+//
+target.web = function() {
+  target.production();
+  target.extension();
+  target.pagesrepo();
+
+  cd(ROOT_DIR);
+  echo();
+  echo('### Creating web site');
+
+  cp(BUILD_TARGET, GH_PAGES_DIR + BUILD_TARGET);
+  cp('-R', 'web/*', GH_PAGES_DIR + '/web');
+  cp(FIREFOX_BUILD_DIR + '/*.xpi', FIREFOX_BUILD_DIR + '/*.rdf',
+    GH_PAGES_DIR + EXTENSION_SRC_DIR + 'firefox/');
+  cp(GH_PAGES_DIR + '/web/index.html.template', GH_PAGES_DIR + '/index.html');
+  mv('-f', GH_PAGES_DIR + '/web/viewer-production.html',
+    GH_PAGES_DIR + '/web/viewer.html');
+  cd(GH_PAGES_DIR);
+  exec('git add -A');
+
+  echo();
+  echo("Website built in " + GH_PAGES_DIR);
+  echo("Don't forget to cd into " + GH_PAGES_DIR +
+    " and issue 'git commit' to push changes.");
+};
+
+//
+// make production
+// Creates production output (pdf.js, and corresponding changes to web/ files)
+//
+target.production = function() {
+  target.bundle();
+  target.viewer();
+};
+
+//
+// make bundle
+// Bundles all source files into one wrapper 'pdf.js' file, in the given order.
+//
+
+target.bundle = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Bundling files into ' + BUILD_TARGET);
+
+  // File order matters
+  var SRC_FILES =
+       ['core.js',
+        'util.js',
+        'canvas.js',
+        'obj.js',
+        'function.js',
+        'charsets.js',
+        'cidmaps.js',
+        'colorspace.js',
+        'crypto.js',
+        'evaluator.js',
+        'fonts.js',
+        'glyphlist.js',
+        'image.js',
+        'metrics.js',
+        'parser.js',
+        'pattern.js',
+        'stream.js',
+        'worker.js',
+        '../external/jpgjs/jpg.js',
+        'jpx.js',
+        'bidi.js'];
+
+  if (!exists(BUILD_DIR))
+    mkdir(BUILD_DIR);
+
+  cd('src');
+  var bundle = cat(SRC_FILES),
+      bundleVersion = exec('git log --format="%h" -n 1',
+        {silent: true}).output.replace('\n', '');
+
+  sed(/.*PDFJSSCRIPT_INCLUDE_ALL.*\n/, bundle, 'pdf.js')
+    .to(ROOT_DIR + BUILD_TARGET);
+  sed('-i', 'PDFJSSCRIPT_BUNDLE_VER', bundleVersion, ROOT_DIR + BUILD_TARGET);
+};
+
+//
+// make viewer
+// Changes development <script> tags in our web viewer to use only 'pdf.js'.
+// Produces 'viewer-production.html'
+//
+target.viewer = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Generating production-level viewer');
+
+  cd('web');
+  // Remove development lines
+  sed(/.*PDFJSSCRIPT_REMOVE_CORE.*\n/g, '', 'viewer.html')
+    .to('viewer-production.html');
+  // Introduce snippet
+  sed('-i', /.*PDFJSSCRIPT_INCLUDE_BUILD.*\n/g, cat('viewer-snippet.html'),
+    'viewer-production.html');
+};
+
+//
+// make pagesrepo
+//
+// This target clones the gh-pages repo into the build directory. It deletes the current contents
+// of the repo, since we overwrite everything with data from the master repo. The 'make web' target
+// then uses 'git add -A' to track additions, modifications, moves, and deletions.
+target.pagesrepo = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Creating fresh clone of gh-pages');
+
+  if (!exists(BUILD_DIR))
+    mkdir(BUILD_DIR);
+
+  if (!exists(GH_PAGES_DIR)) {
+    echo();
+    echo('Cloning project repo...');
+    echo('(This operation can take a while, depending on network conditions)');
+    exec('git clone -b gh-pages --depth=1 ' + REPO + ' ' + ßGH_PAGES_DIR,
+      {silent: true});
+    echo('Done.');
+  }
+
+  rm('-rf', GH_PAGES_DIR + '/*');
+  mkdir('-p', GH_PAGES_DIR + '/web');
+  mkdir('-p', GH_PAGES_DIR + '/web/images');
+  mkdir('-p', GH_PAGES_DIR + BUILD_DIR);
+  mkdir('-p', GH_PAGES_DIR + EXTENSION_SRC_DIR + '/firefox');
+};
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+//
+// Extension stuff
+//
+
+var EXTENSION_WEB_FILES =
+      ['web/images',
+       'web/viewer.css',
+       'web/viewer.js',
+       'web/viewer.html',
+       'web/viewer-production.html'],
+    EXTENSION_BASE_VERSION = '4bb289ec499013de66eb421737a4dbb4a9273eda',
+    EXTENSION_BUILD_NUMBER;
+
+//
+// make extension
+//
+target.extension = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Building extensions');
+
+  target.production();
+  target.firefox();
+  target.chrome();
+};
+
+target.buildnumber = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Getting extension build number');
+
+  // Build number is the number of commits since base version
+  EXTENSION_BUILD_NUMBER = exec('git log --format=oneline ' +
+    EXTENSION_BASE_VERSION + '..', {silent: true})
+    .output.match(/\n/g).length; // get # of lines in git output
+
+  echo('Extension build number: ' + EXTENSION_BUILD_NUMBER);
+};
+
+//
+// make firefox
+//
+target.firefox = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Building Firefox extension');
+
+  var FIREFOX_BUILD_CONTENT_DIR = FIREFOX_BUILD_DIR + '/content/',
+      FIREFOX_CONTENT_DIR = EXTENSION_SRC_DIR + '/firefox/content/',
+      FIREFOX_EXTENSION_FILES_TO_COPY =
+        ['*.js',
+         '*.rdf',
+         'components'];
+      FIREFOX_EXTENSION_FILES =
+        ['content',
+         '*.js',
+         'install.rdf',
+         'components',
+         'content'];
+      FIREFOX_EXTENSION_NAME = 'pdf.js.xpi',
+      FIREFOX_AMO_EXTENSION_NAME = 'pdf.js.amo.xpi';
+
+  target.production();
+  target.buildnumber();
+  cd(ROOT_DIR);
+
+  // Clear out everything in the firefox extension build directory
+  rm('-rf', FIREFOX_BUILD_DIR);
+  mkdir('-p', FIREFOX_BUILD_CONTENT_DIR);
+  mkdir('-p', FIREFOX_BUILD_CONTENT_DIR + BUILD_DIR);
+  mkdir('-p', FIREFOX_BUILD_CONTENT_DIR + '/web');
+
+  // Copy extension files
+  cd('extensions/firefox');
+  cp('-R', FIREFOX_EXTENSION_FILES_TO_COPY, ROOT_DIR + FIREFOX_BUILD_DIR);
+  cd(ROOT_DIR);
+
+  // Copy a standalone version of pdf.js inside the content directory
+  cp(BUILD_TARGET, FIREFOX_BUILD_CONTENT_DIR + BUILD_DIR);
+  cp('-R', EXTENSION_WEB_FILES, FIREFOX_BUILD_CONTENT_DIR + '/web');
+  rm(FIREFOX_BUILD_CONTENT_DIR + '/web/viewer-production.html');
+
+  // Copy over the firefox extension snippet so we can inline pdf.js in it
+  cp('web/viewer-snippet-firefox-extension.html', FIREFOX_BUILD_CONTENT_DIR + '/web');
+
+  // Modify the viewer so it does all the extension-only stuff.
+  cd(FIREFOX_BUILD_CONTENT_DIR + '/web');
+  sed('-i', /.*PDFJSSCRIPT_INCLUDE_BUNDLE.*\n/, cat(ROOT_DIR + BUILD_TARGET), 'viewer-snippet-firefox-extension.html');
+  sed('-i', /.*PDFJSSCRIPT_REMOVE_CORE.*\n/g, '', 'viewer.html');
+  sed('-i', /.*PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION.*\n/g, '', 'viewer.html');
+  sed('-i', /.*PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION.*\n/, cat('viewer-snippet-firefox-extension.html'), 'viewer.html');
+  cd(ROOT_DIR);
+
+  // We don't need pdf.js anymore since its inlined
+  rm('-Rf', FIREFOX_BUILD_CONTENT_DIR + BUILD_DIR);
+
+  // Update the build version number
+  sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR + '/install.rdf');
+  sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR + '/update.rdf');
+
+  // Create the xpi
+  cd(FIREFOX_BUILD_DIR);
+  exec('zip -r ' + FIREFOX_EXTENSION_NAME + ' ' + FIREFOX_EXTENSION_FILES.join(' '));
+  echo('extension created: ' + FIREFOX_EXTENSION_NAME);
+  cd(ROOT_DIR);
+
+  // Build the amo extension too (remove the updateUrl)
+  cd(FIREFOX_BUILD_DIR);
+  sed('-i', /.*updateURL.*\n/, '', 'install.rdf');
+  exec('zip -r ' + FIREFOX_AMO_EXTENSION_NAME + ' ' + FIREFOX_EXTENSION_FILES.join(' '));
+  echo('AMO extension created: ' + FIREFOX_AMO_EXTENSION_NAME);
+  cd(ROOT_DIR);
+};
+
+//
+// make chrome
+//
+target.chrome = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Building Chrome extension');
+
+  var CHROME_BUILD_DIR = BUILD_DIR + '/chrome/',
+      CHROME_CONTENT_DIR = EXTENSION_SRC_DIR + '/chrome/content/',
+      CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR + '/content/',
+      CHROME_EXTENSION_FILES =
+        ['extensions/chrome/*.json',
+         'extensions/chrome/*.html'];
+
+  target.production();
+  target.buildnumber();
+  cd(ROOT_DIR);
+
+  // Clear out everything in the chrome extension build directory
+  rm('-Rf', CHROME_BUILD_DIR);
+  mkdir('-p', CHROME_BUILD_CONTENT_DIR);
+  mkdir('-p', CHROME_BUILD_CONTENT_DIR + BUILD_DIR);
+  mkdir('-p', CHROME_BUILD_CONTENT_DIR + '/web');
+
+  // Copy extension files
+  cp('-R', CHROME_EXTENSION_FILES, CHROME_BUILD_DIR);
+
+  // Copy a standalone version of pdf.js inside the content directory
+  cp(BUILD_TARGET, CHROME_BUILD_CONTENT_DIR + BUILD_DIR);
+  cp('-R', EXTENSION_WEB_FILES, CHROME_BUILD_CONTENT_DIR + '/web');
+  mv('-f', CHROME_BUILD_CONTENT_DIR + '/web/viewer-production.html',
+    CHROME_BUILD_CONTENT_DIR + '/web/viewer.html');
+};
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+//
+// Test stuff
+//
+
+//
+// make test
+//
+target.test = function() {
+  target.browsertest();
+  target.unittest();
+};
+
+//
+// make browsertest
+//
+target.browsertest = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Running browser tests');
+
+  var PDF_TEST = env['PDF_TEST'] || 'test_manifest.json',
+      PDF_BROWSERS = env['PDF_BROWSERS'] || 'resources/browser_manifests/browser_manifest.json';
+
+  if (!exists('test/' + PDF_BROWSERS)) {
+    echo('Browser manifest file test/' + PDF_BROWSERS + ' does not exist.');
+    echo('Try copying one of the examples in test/resources/browser_manifests/');
+    exit(1);
+  }
+
+  cd('test');
+  exec(PYTHON_BIN + ' test.py --reftest --browserManifestFile=' + PDF_BROWSERS +
+    ' --manifestFile=' + PDF_TEST, {async: true});
+};
+
+//
+// make unittest
+//
+target.unittest = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Running unit tests');
+
+  cd('test/unit');
+  exec('make', {async: true});
+};
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+//
+// Other
+//
+
+//
+// make server
+//
+target.server = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Starting local server');
+
+  cd('test');
+  exec(PYTHON_BIN + ' -u test.py --port=8888', {async: true});
+};
+
+//
+// make lint
+//
+target.lint = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Linting JS files (this can take a while!)');
+
+  var LINT_FILES = 'src/*.js \
+                    web/*.js \
+                    test/*.js \
+                    test/unit/*.js \
+                    extensions/firefox/*.js \
+                    extensions/firefox/components/*.js \
+                    extensions/chrome/*.js';
+
+  exec('gjslint --nojsdoc ' + LINT_FILES);
+};
+
+//
+// make clean
+//
+target.clean = function() {
+  cd(ROOT_DIR);
+  echo();
+  echo('### Cleaning up project builds');
+
+  rm('-rf', BUILD_DIR);
+};
--- a/src/bidi.js
+++ b/src/bidi.js
@ -3,7 +3,7 @@

 'use strict';

-var bidi = (function bidiClosure() {
+var bidi = PDFJS.bidi = (function bidiClosure() {
  // Character types for symbols from 0000 to 00FF.
  var baseTypes = [
    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'S', 'B', 'S', 'WS',
--- a/src/fonts.js
+++ b/src/fonts.js
@ -1622,12 +1622,20 @@ var Font = (function FontClosure() {
        var locaData = loca.data;
        // removing the invalid glyphs
        var oldGlyfData = glyf.data;
-        var newGlyfData = new Uint8Array(oldGlyfData.length);
+        var oldGlyfDataLength = oldGlyfData.length;
+        var newGlyfData = new Uint8Array(oldGlyfDataLength);
        var startOffset = itemDecode(locaData, 0);
        var writeOffset = 0;
        itemEncode(locaData, 0, writeOffset);
        for (var i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
          var endOffset = itemDecode(locaData, j);
+          if (endOffset > oldGlyfDataLength) {
+            // glyph end offset points outside glyf data, rejecting the glyph
+            itemEncode(locaData, j, writeOffset);
+            startOffset = endOffset;
+            continue;
+          }
+
          var newLength = sanitizeGlyph(oldGlyfData, startOffset, endOffset,
                                        newGlyfData, writeOffset);
          writeOffset += newLength;
@ -1864,6 +1872,17 @@ var Font = (function FontClosure() {
        var hasShortCmap = !!cmapTable.hasShortCmap;
        var toFontChar = this.toFontChar;

+        if (hasShortCmap && ids.length == numGlyphs) {
+          // Fixes the short cmap tables -- some generators use incorrect
+          // glyph id.
+          for (var i = 0, ii = ids.length; i < ii; i++)
+            ids[i] = i;
+        }
+
+        var unusedUnicode = kCmapGlyphOffset;
+        var glyphNames = properties.glyphNames || [];
+        var encoding = properties.baseEncoding;
+        var differences = properties.differences;
        if (toFontChar && toFontChar.length > 0) {
          // checking if cmap is just identity map
          var isIdentity = true;
@ -1886,7 +1905,6 @@ var Font = (function FontClosure() {
              glyphs[i].unicode = unicode;
              usedUnicodes[unicode] = true;
            }
-            var unusedUnicode = kCmapGlyphOffset;
            for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
              var i = unassignedUnicodeItems[j];
              while (unusedUnicode in usedUnicodes)
@ -1909,9 +1927,11 @@ var Font = (function FontClosure() {
          var usedUnicodes = [];
          for (var i = 0, ii = glyphs.length; i < ii; i++) {
            var code = glyphs[i].unicode;
+            var gid = ids[i];
            glyphs[i].unicode += kCmapGlyphOffset;
+            toFontChar[code] = glyphs[i].unicode;

-            var glyphName = properties.baseEncoding[code];
+            var glyphName = glyphNames[gid] || encoding[code];
            if (glyphName in GlyphsUnicode) {
              var unicode = GlyphsUnicode[glyphName];
              if (unicode in usedUnicodes)
@ -1922,9 +1942,41 @@ var Font = (function FontClosure() {
                unicode: unicode,
                code: glyphs[i].code
              });
-              ids.push(ids[i]);
+              ids.push(gid);
+              toFontChar[code] = unicode;
            }
          }
+          this.useToFontChar = true;
+        } else if (!this.isSymbolicFont && (this.hasEncoding ||
+                    properties.glyphNames || differences.length > 0)) {
+          // Re-encode cmap encoding to unicode, based on the 'post' table data
+          // diffrence array or base encoding
+          var reverseMap = [];
+          for (var i = 0, ii = glyphs.length; i < ii; i++)
+            reverseMap[glyphs[i].unicode] = i;
+
+          for (var i = 0, ii = glyphs.length; i < ii; i++) {
+            var code = glyphs[i].unicode;
+            var changeCode = false;
+            var gid = ids[i];
+
+            var glyphName = glyphNames[gid];
+            if (!glyphName) {
+              glyphName = differences[code] || encoding[code];
+              changeCode = true;
+            }
+            if (glyphName in GlyphsUnicode) {
+              var unicode = GlyphsUnicode[glyphName];
+              if (!unicode || (unicode in reverseMap))
+                continue; // unknown glyph name or its place is taken
+
+              glyphs[i].unicode = unicode;
+              reverseMap[unicode] = i;
+              if (changeCode)
+                toFontChar[code] = unicode;
+            }
+            this.useToFontChar = true;
+          }
        }

        // Moving all symbolic font glyphs into 0xF000 - 0xF0FF range.
--- a/src/glyphlist.js
+++ b/src/glyphlist.js
@ -1508,27 +1508,7 @@ var GlyphsUnicode = {
  dalet: 0x05D3,
  daletdagesh: 0xFB33,
  daletdageshhebrew: 0xFB33,
-  dalethatafpatah: 0x05D305B2,
-  dalethatafpatahhebrew: 0x05D305B2,
-  dalethatafsegol: 0x05D305B1,
-  dalethatafsegolhebrew: 0x05D305B1,
  dalethebrew: 0x05D3,
-  dalethiriq: 0x05D305B4,
-  dalethiriqhebrew: 0x05D305B4,
-  daletholam: 0x05D305B9,
-  daletholamhebrew: 0x05D305B9,
-  daletpatah: 0x05D305B7,
-  daletpatahhebrew: 0x05D305B7,
-  daletqamats: 0x05D305B8,
-  daletqamatshebrew: 0x05D305B8,
-  daletqubuts: 0x05D305BB,
-  daletqubutshebrew: 0x05D305BB,
-  daletsegol: 0x05D305B6,
-  daletsegolhebrew: 0x05D305B6,
-  daletsheva: 0x05D305B0,
-  daletshevahebrew: 0x05D305B0,
-  dalettsere: 0x05D305B5,
-  dalettserehebrew: 0x05D305B5,
  dalfinalarabic: 0xFEAA,
  dammaarabic: 0x064F,
  dammalowarabic: 0x064F,
@ -1845,10 +1825,6 @@ var GlyphsUnicode = {
  finalkafdagesh: 0xFB3A,
  finalkafdageshhebrew: 0xFB3A,
  finalkafhebrew: 0x05DA,
-  finalkafqamats: 0x05DA05B8,
-  finalkafqamatshebrew: 0x05DA05B8,
-  finalkafsheva: 0x05DA05B0,
-  finalkafshevahebrew: 0x05DA05B0,
  finalmem: 0x05DD,
  finalmemhebrew: 0x05DD,
  finalnun: 0x05DF,
@ -2037,14 +2013,7 @@ var GlyphsUnicode = {
  hakatakanahalfwidth: 0xFF8A,
  halantgurmukhi: 0x0A4D,
  hamzaarabic: 0x0621,
-  hamzadammaarabic: 0x0621064F,
-  hamzadammatanarabic: 0x0621064C,
-  hamzafathaarabic: 0x0621064E,
-  hamzafathatanarabic: 0x0621064B,
  hamzalowarabic: 0x0621,
-  hamzalowkasraarabic: 0x06210650,
-  hamzalowkasratanarabic: 0x0621064D,
-  hamzasukunarabic: 0x06210652,
  hangulfiller: 0x3164,
  hardsigncyrillic: 0x044A,
  harpoonleftbarbup: 0x21BC,
@ -2476,10 +2445,6 @@ var GlyphsUnicode = {
  lameddagesh: 0xFB3C,
  lameddageshhebrew: 0xFB3C,
  lamedhebrew: 0x05DC,
-  lamedholam: 0x05DC05B9,
-  lamedholamdagesh: '05DC 05B9 05BC',
-  lamedholamdageshhebrew: '05DC 05B9 05BC',
-  lamedholamhebrew: 0x05DC05B9,
  lamfinalarabic: 0xFEDE,
  lamhahinitialarabic: 0xFCCA,
  laminitialarabic: 0xFEDF,
@ -2489,8 +2454,6 @@ var GlyphsUnicode = {
  lammedialarabic: 0xFEE0,
  lammeemhahinitialarabic: 0xFD88,
  lammeeminitialarabic: 0xFCCC,
-  lammeemjeeminitialarabic: 'FEDF FEE4 FEA0',
-  lammeemkhahinitialarabic: 'FEDF FEE4 FEA8',
  largecircle: 0x25EF,
  lbar: 0x019A,
  lbelt: 0x026C,
@ -2787,7 +2750,6 @@ var GlyphsUnicode = {
  noonfinalarabic: 0xFEE6,
  noonghunnaarabic: 0x06BA,
  noonghunnafinalarabic: 0xFB9F,
-  noonhehinitialarabic: 0xFEE7FEEC,
  nooninitialarabic: 0xFEE7,
  noonjeeminitialarabic: 0xFCD2,
  noonjeemisolatedarabic: 0xFC4B,
@ -3159,27 +3121,7 @@ var GlyphsUnicode = {
  qof: 0x05E7,
  qofdagesh: 0xFB47,
  qofdageshhebrew: 0xFB47,
-  qofhatafpatah: 0x05E705B2,
-  qofhatafpatahhebrew: 0x05E705B2,
-  qofhatafsegol: 0x05E705B1,
-  qofhatafsegolhebrew: 0x05E705B1,
  qofhebrew: 0x05E7,
-  qofhiriq: 0x05E705B4,
-  qofhiriqhebrew: 0x05E705B4,
-  qofholam: 0x05E705B9,
-  qofholamhebrew: 0x05E705B9,
-  qofpatah: 0x05E705B7,
-  qofpatahhebrew: 0x05E705B7,
-  qofqamats: 0x05E705B8,
-  qofqamatshebrew: 0x05E705B8,
-  qofqubuts: 0x05E705BB,
-  qofqubutshebrew: 0x05E705BB,
-  qofsegol: 0x05E705B6,
-  qofsegolhebrew: 0x05E705B6,
-  qofsheva: 0x05E705B0,
-  qofshevahebrew: 0x05E705B0,
-  qoftsere: 0x05E705B5,
-  qoftserehebrew: 0x05E705B5,
  qparen: 0x24AC,
  quarternote: 0x2669,
  qubuts: 0x05BB,
@ -3253,32 +3195,11 @@ var GlyphsUnicode = {
  reharmenian: 0x0580,
  rehfinalarabic: 0xFEAE,
  rehiragana: 0x308C,
-  rehyehaleflamarabic: '0631 FEF3 FE8E 0644',
  rekatakana: 0x30EC,
  rekatakanahalfwidth: 0xFF9A,
  resh: 0x05E8,
  reshdageshhebrew: 0xFB48,
-  reshhatafpatah: 0x05E805B2,
-  reshhatafpatahhebrew: 0x05E805B2,
-  reshhatafsegol: 0x05E805B1,
-  reshhatafsegolhebrew: 0x05E805B1,
  reshhebrew: 0x05E8,
-  reshhiriq: 0x05E805B4,
-  reshhiriqhebrew: 0x05E805B4,
-  reshholam: 0x05E805B9,
-  reshholamhebrew: 0x05E805B9,
-  reshpatah: 0x05E805B7,
-  reshpatahhebrew: 0x05E805B7,
-  reshqamats: 0x05E805B8,
-  reshqamatshebrew: 0x05E805B8,
-  reshqubuts: 0x05E805BB,
-  reshqubutshebrew: 0x05E805BB,
-  reshsegol: 0x05E805B6,
-  reshsegolhebrew: 0x05E805B6,
-  reshsheva: 0x05E805B0,
-  reshshevahebrew: 0x05E805B0,
-  reshtsere: 0x05E805B5,
-  reshtserehebrew: 0x05E805B5,
  reversedtilde: 0x223D,
  reviahebrew: 0x0597,
  reviamugrashhebrew: 0x0597,
@ -3477,7 +3398,6 @@ var GlyphsUnicode = {
  shaddadammaarabic: 0xFC61,
  shaddadammatanarabic: 0xFC5E,
  shaddafathaarabic: 0xFC60,
-  shaddafathatanarabic: 0x0651064B,
  shaddakasraarabic: 0xFC62,
  shaddakasratanarabic: 0xFC5F,
  shade: 0x2592,
@ -3674,7 +3594,6 @@ var GlyphsUnicode = {
  tchehfinalarabic: 0xFB7B,
  tchehinitialarabic: 0xFB7C,
  tchehmedialarabic: 0xFB7D,
-  tchehmeeminitialarabic: 0xFB7CFEE4,
  tcircle: 0x24E3,
  tcircumflexbelow: 0x1E71,
  tcommaaccent: 0x0163,
--- a/src/util.js
+++ b/src/util.js
@ -174,57 +174,6 @@ var Util = (function UtilClosure() {
  return Util;
 })();

-// optimised CSS custom property getter/setter
-var CustomStyle = (function CustomStyleClosure() {
-
-  // As noted on: http://www.zachstronaut.com/posts/2009/02/17/
-  //              animate-css-transforms-firefox-webkit.html
-  // in some versions of IE9 it is critical that ms appear in this list
-  // before Moz
-  var prefixes = ['ms', 'Moz', 'Webkit', 'O'];
-  var _cache = { };
-
-  function CustomStyle() {
-  }
-
-  CustomStyle.getProp = function get(propName, element) {
-    // check cache only when no element is given
-    if (arguments.length == 1 && typeof _cache[propName] == 'string') {
-      return _cache[propName];
-    }
-
-    element = element || document.documentElement;
-    var style = element.style, prefixed, uPropName;
-
-    // test standard property first
-    if (typeof style[propName] == 'string') {
-      return (_cache[propName] = propName);
-    }
-
-    // capitalize
-    uPropName = propName.charAt(0).toUpperCase() + propName.slice(1);
-
-    // test vendor specific properties
-    for (var i = 0, l = prefixes.length; i < l; i++) {
-      prefixed = prefixes[i] + uPropName;
-      if (typeof style[prefixed] == 'string') {
-        return (_cache[propName] = prefixed);
-      }
-    }
-
-    //if all fails then set to undefined
-    return (_cache[propName] = 'undefined');
-  }
-
-  CustomStyle.setProp = function set(propName, element, str) {
-    var prop = this.getProp(propName);
-    if (prop != 'undefined')
-      element.style[prop] = str;
-  }
-
-  return CustomStyle;
-})();
-
 var PDFStringTranslateTable = [
  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  0x2D8, 0x2C7, 0x2C6, 0x2D9, 0x2DD, 0x2DB, 0x2DA, 0x2DC, 0, 0, 0, 0, 0, 0, 0,
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@ -19,7 +19,9 @@
 !issue840.pdf
 !scan-bad.pdf
 !freeculture.pdf
+!pdfkit_compressed.pdf
 !issue918.pdf
+!issue1249.pdf
 !smaskdim.pdf
 !type4psfunc.pdf
 !S2.pdf
--- a/test/pdfs/issue1249.pdf
+++ b/test/pdfs/issue1249.pdf
--- a/test/pdfs/pdfkit_compressed.pdf
+++ b/test/pdfs/pdfkit_compressed.pdf
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@ -417,6 +417,12 @@
      "link": true,
      "type": "eq"
    },
+    {  "id": "issue1249-load",
+      "file": "pdfs/issue1249.pdf",
+      "md5": "4f81339fa09422a7db980f34ea963609",
+      "rounds": 1,
+      "type": "load"
+    },
    {  "id": "liveprogramming",
      "file": "pdfs/liveprogramming.pdf",
      "md5": "7bd4dad1188232ef597d36fd72c33e52",
@ -460,6 +466,12 @@
      "link": true,
      "type": "eq"
    },
+    {  "id": "pdfkit_compressed",
+      "file": "pdfs/pdfkit_compressed.pdf",
+      "md5": "ffe9c571d0a1572e234253e6c7cdee6c",
+      "rounds": 1,
+      "type": "eq"
+    },
    {  "id": "issue925",
      "file": "pdfs/issue925.pdf",
      "md5": "f58fe943090aff89dcc8e771bc0db4c2",
--- a/web/images/zoom-in.svg
+++ b/web/images/zoom-in.svg
@ -419,12 +419,12 @@
       d="M 33.278212 34.94062 A 10.31934 2.320194 0 1 1  12.639532,34.94062 A 10.31934 2.320194 0 1 1  33.278212 34.94062 z"
       transform="matrix(1.550487,0,0,1.978714,-12.4813,-32.49103)" />
    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       style="fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
       d="M 27.514356,37.542682 L 27.514356,28.515722 L 37.492820,28.475543 L 37.492820,21.480219 L 27.523285,21.480219 L 27.514356,11.520049 L 20.498082,11.531210 L 20.502546,21.462362 L 10.512920,21.536022 L 10.477206,28.504561 L 20.511475,28.475543 L 20.518171,37.515896 L 27.514356,37.542682 z "
       id="text1314"
       sodipodi:nodetypes="ccccccccccccc" />
    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       style="opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
       d="M 26.498702,36.533920 L 26.498702,27.499738 L 36.501304,27.499738 L 36.494607,22.475309 L 26.507630,22.475309 L 26.507630,12.480335 L 21.512796,12.498193 L 21.521725,22.475309 L 11.495536,22.493166 L 11.468750,27.466256 L 21.533143,27.475185 L 21.519750,36.502670 L 26.498702,36.533920 z "
       id="path7076"
       sodipodi:nodetypes="ccccccccccccc" />
--- a/web/images/zoom-out.svg
+++ b/web/images/zoom-out.svg
@ -407,12 +407,12 @@
     inkscape:label="Layer 1"
     inkscape:groupmode="layer">
    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       style="fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
       d="M 27.514356,28.359472 L 39.633445,28.475543 L 39.633445,21.480219 L 27.523285,21.480219 L 20.502546,21.462362 L 8.5441705,21.489147 L 8.5084565,28.457686 L 20.511475,28.475543 L 27.514356,28.359472 z "
       id="text1314"
       sodipodi:nodetypes="ccccccccc" />
    <path
-       style="font-size:59.901077px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Bitstream Vera Sans"
+       style="opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
       d="M 38.579429,27.484113 L 38.588357,22.475309 L 9.5267863,22.493166 L 9.5000003,27.466256 L 38.579429,27.484113 z "
       id="path7076"
       sodipodi:nodetypes="ccccc" />
--- a/web/viewer.js
+++ b/web/viewer.js
@ -1022,6 +1022,57 @@ var DocumentOutlineView = function documentOutlineView(outline) {
  }
 };

+// optimised CSS custom property getter/setter
+var CustomStyle = (function CustomStyleClosure() {
+
+  // As noted on: http://www.zachstronaut.com/posts/2009/02/17/
+  //              animate-css-transforms-firefox-webkit.html
+  // in some versions of IE9 it is critical that ms appear in this list
+  // before Moz
+  var prefixes = ['ms', 'Moz', 'Webkit', 'O'];
+  var _cache = { };
+
+  function CustomStyle() {
+  }
+
+  CustomStyle.getProp = function get(propName, element) {
+    // check cache only when no element is given
+    if (arguments.length == 1 && typeof _cache[propName] == 'string') {
+      return _cache[propName];
+    }
+
+    element = element || document.documentElement;
+    var style = element.style, prefixed, uPropName;
+
+    // test standard property first
+    if (typeof style[propName] == 'string') {
+      return (_cache[propName] = propName);
+    }
+
+    // capitalize
+    uPropName = propName.charAt(0).toUpperCase() + propName.slice(1);
+
+    // test vendor specific properties
+    for (var i = 0, l = prefixes.length; i < l; i++) {
+      prefixed = prefixes[i] + uPropName;
+      if (typeof style[prefixed] == 'string') {
+        return (_cache[propName] = prefixed);
+      }
+    }
+
+    //if all fails then set to undefined
+    return (_cache[propName] = 'undefined');
+  }
+
+  CustomStyle.setProp = function set(propName, element, str) {
+    var prop = this.getProp(propName);
+    if (prop != 'undefined')
+      element.style[prop] = str;
+  }
+
+  return CustomStyle;
+})();
+
 var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
  this.textLayerDiv = textLayerDiv;

@ -1097,7 +1148,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
    textDiv.style.fontSize = fontHeight + 'px';
    textDiv.style.left = text.geom.x + 'px';
    textDiv.style.top = (text.geom.y - fontHeight) + 'px';
-    textDiv.textContent = bidi(text, -1);
+    textDiv.textContent = PDFJS.bidi(text, -1);
    textDiv.dir = text.direction;
    textDiv.dataset.textLength = text.length;
    this.textDivs.push(textDiv);