diff --git a/.gitignore b/.gitignore
index 52c6e5489888..93ffa306da47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@ parser/html/java/javaparser/
 .cproject
 .settings/
 
+# Python stuff installed at build-time
+*.egg-info/
diff --git a/.hgignore b/.hgignore
index 45e1bf866722..6c4a78e9093d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -45,3 +45,6 @@ _OPT\.OBJ/
 \.project$
 \.cproject$
 \.settings/
+
+# Python stuff installed at build-time
+\.egg-info/
diff --git a/accessible/src/atk/AccessibleWrap.cpp b/accessible/src/atk/AccessibleWrap.cpp
index 676334f4b48f..8e96cc3082a1 100644
--- a/accessible/src/atk/AccessibleWrap.cpp
+++ b/accessible/src/atk/AccessibleWrap.cpp
@@ -376,7 +376,7 @@ AccessibleWrap::CreateMaiInterfaces(void)
     interfacesBits |= 1 << MAI_INTERFACE_ACTION;
 
   // Text, Editabletext, and Hypertext interface.
-  nsHyperTextAccessible* hyperText = AsHyperText();
+  HyperTextAccessible* hyperText = AsHyperText();
   if (hyperText && hyperText->IsTextRole()) {
     interfacesBits |= 1 << MAI_INTERFACE_TEXT;
     interfacesBits |= 1 << MAI_INTERFACE_EDITABLE_TEXT;
diff --git a/accessible/src/atk/nsHyperTextAccessibleWrap.h b/accessible/src/atk/HyperTextAccessibleWrap.h
similarity index 63%
rename from accessible/src/atk/nsHyperTextAccessibleWrap.h
rename to accessible/src/atk/HyperTextAccessibleWrap.h
index 55fc35a22e57..f178fe7aac97 100644
--- a/accessible/src/atk/nsHyperTextAccessibleWrap.h
+++ b/accessible/src/atk/HyperTextAccessibleWrap.h
@@ -4,12 +4,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H
-#define _NSHYPERTEXTACCESSIBLEWRAP_H
+#ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
+#define mozilla_a11y_HyperTextAccessibleWrap_h__
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
-typedef class nsHyperTextAccessible nsHyperTextAccessibleWrap;
+typedef class HyperTextAccessible HyperTextAccessibleWrap;
 
 #endif
 
diff --git a/accessible/src/atk/nsMaiInterfaceEditableText.cpp b/accessible/src/atk/nsMaiInterfaceEditableText.cpp
index d3083fc1bd41..eb79261f93c8 100644
--- a/accessible/src/atk/nsMaiInterfaceEditableText.cpp
+++ b/accessible/src/atk/nsMaiInterfaceEditableText.cpp
@@ -6,7 +6,7 @@
 
 #include "InterfaceInitFuncs.h"
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 #include "nsMai.h"
 
 #include "nsString.h"
diff --git a/accessible/src/atk/nsMaiInterfaceHypertext.cpp b/accessible/src/atk/nsMaiInterfaceHypertext.cpp
index 5cfc193c0256..9cd065c4bdb0 100644
--- a/accessible/src/atk/nsMaiInterfaceHypertext.cpp
+++ b/accessible/src/atk/nsMaiInterfaceHypertext.cpp
@@ -6,7 +6,7 @@
 
 #include "InterfaceInitFuncs.h"
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 #include "nsMai.h"
 #include "nsMaiHyperlink.h"
 
@@ -19,7 +19,7 @@ getLinkCB(AtkHypertext *aText, gint aLinkIndex)
   if (!accWrap)
     return nsnull;
 
-  nsHyperTextAccessible* hyperText = accWrap->AsHyperText();
+  HyperTextAccessible* hyperText = accWrap->AsHyperText();
   NS_ENSURE_TRUE(hyperText, nsnull);
 
   Accessible* hyperLink = hyperText->GetLinkAt(aLinkIndex);
@@ -42,7 +42,7 @@ getLinkCountCB(AtkHypertext *aText)
   if (!accWrap)
     return -1;
 
-  nsHyperTextAccessible* hyperText = accWrap->AsHyperText();
+  HyperTextAccessible* hyperText = accWrap->AsHyperText();
   NS_ENSURE_TRUE(hyperText, -1);
 
   return hyperText->GetLinkCount();
@@ -55,7 +55,7 @@ getLinkIndexCB(AtkHypertext *aText, gint aCharIndex)
   if (!accWrap)
     return -1;
 
-  nsHyperTextAccessible* hyperText = accWrap->AsHyperText();
+  HyperTextAccessible* hyperText = accWrap->AsHyperText();
   NS_ENSURE_TRUE(hyperText, -1);
 
   PRInt32 index = -1;
diff --git a/accessible/src/atk/nsMaiInterfaceText.cpp b/accessible/src/atk/nsMaiInterfaceText.cpp
index f34dda003392..66b4ed2b5263 100644
--- a/accessible/src/atk/nsMaiInterfaceText.cpp
+++ b/accessible/src/atk/nsMaiInterfaceText.cpp
@@ -6,7 +6,7 @@
 
 #include "InterfaceInitFuncs.h"
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 #include "nsMai.h"
 
 #include "nsIPersistentProperties2.h"
@@ -314,7 +314,7 @@ getCharacterCountCB(AtkText *aText)
   if (!accWrap)
     return 0;
 
-  nsHyperTextAccessible* textAcc = accWrap->AsHyperText();
+  HyperTextAccessible* textAcc = accWrap->AsHyperText();
   return textAcc->IsDefunct() ?
     0 : static_cast<gint>(textAcc->CharacterCount());
 }
diff --git a/accessible/src/base/NotificationController.cpp b/accessible/src/base/NotificationController.cpp
index 5cfa0581533e..b4693364aafd 100644
--- a/accessible/src/base/NotificationController.cpp
+++ b/accessible/src/base/NotificationController.cpp
@@ -646,7 +646,7 @@ NotificationController::CreateTextChangeEventFor(AccMutationEvent* aEvent)
   if (!container)
     return;
 
-  nsHyperTextAccessible* textAccessible = container->AsHyperText();
+  HyperTextAccessible* textAccessible = container->AsHyperText();
   if (!textAccessible)
     return;
 
diff --git a/accessible/src/base/TextAttrs.cpp b/accessible/src/base/TextAttrs.cpp
index d8ea070d4794..ef1184d27451 100644
--- a/accessible/src/base/TextAttrs.cpp
+++ b/accessible/src/base/TextAttrs.cpp
@@ -5,9 +5,9 @@
 
 #include "TextAttrs.h"
 
+#include "HyperTextAccessibleWrap.h"
 #include "nsAccUtils.h"
 #include "nsCoreUtils.h"
-#include "nsHyperTextAccessibleWrap.h"
 #include "StyleInfo.h"
 
 #include "gfxFont.h"
@@ -199,7 +199,7 @@ TextAttrsMgr::GetRange(TextAttr* aAttrArray[], PRUint32 aAttrArrayLen,
 ////////////////////////////////////////////////////////////////////////////////
 
 TextAttrsMgr::LangTextAttr::
-  LangTextAttr(nsHyperTextAccessible* aRoot,
+  LangTextAttr(HyperTextAccessible* aRoot,
                nsIContent* aRootElm, nsIContent* aElm) :
   TTextAttr<nsString>(!aElm), mRootContent(aRootElm)
 {
diff --git a/accessible/src/base/TextAttrs.h b/accessible/src/base/TextAttrs.h
index 69a112fc75d1..3d1d252b6b92 100644
--- a/accessible/src/base/TextAttrs.h
+++ b/accessible/src/base/TextAttrs.h
@@ -11,17 +11,17 @@
 #include "nsIPersistentProperties2.h"
 #include "nsStyleConsts.h"
 
-class nsHyperTextAccessible;
+class HyperTextAccessible;
 
 namespace mozilla {
 namespace a11y {
 
 /**
  * Used to expose text attributes for the hyper text accessible (see
- * nsHyperTextAccessible class).
+ * HyperTextAccessible class).
  *
  * @note "invalid: spelling" text attribute is implemented entirely in
- *       nsHyperTextAccessible class.
+ *       HyperTextAccessible class.
  */
 class TextAttrsMgr
 {
@@ -29,7 +29,7 @@ public:
   /**
    * Constructor. Used to expose default text attributes.
    */
-  TextAttrsMgr(nsHyperTextAccessible* aHyperTextAcc) :
+  TextAttrsMgr(HyperTextAccessible* aHyperTextAcc) :
     mOffsetAcc(nsnull),  mHyperTextAcc(aHyperTextAcc),
     mOffsetAccIdx(-1), mIncludeDefAttrs(true) { }
 
@@ -45,7 +45,7 @@ public:
    *                          should be calculated for
    * @param oOffsetAccIdx    [optional] index in parent of offset accessible
    */
-  TextAttrsMgr(nsHyperTextAccessible* aHyperTextAcc,
+  TextAttrsMgr(HyperTextAccessible* aHyperTextAcc,
                bool aIncludeDefAttrs,
                Accessible* aOffsetAcc,
                PRInt32 aOffsetAccIdx) :
@@ -84,7 +84,7 @@ protected:
 
 private:
   Accessible* mOffsetAcc;
-  nsHyperTextAccessible* mHyperTextAcc;
+  HyperTextAccessible* mHyperTextAcc;
   PRInt32 mOffsetAccIdx;
   bool mIncludeDefAttrs;
 
@@ -191,7 +191,7 @@ protected:
   class LangTextAttr : public TTextAttr<nsString>
   {
   public:
-    LangTextAttr(nsHyperTextAccessible* aRoot, nsIContent* aRootElm,
+    LangTextAttr(HyperTextAccessible* aRoot, nsIContent* aRootElm,
                  nsIContent* aElm);
     virtual ~LangTextAttr() { }
 
diff --git a/accessible/src/base/TextUpdater.h b/accessible/src/base/TextUpdater.h
index 033b4739f4c6..3d6e24c11f53 100644
--- a/accessible/src/base/TextUpdater.h
+++ b/accessible/src/base/TextUpdater.h
@@ -7,7 +7,7 @@
 #define TextUpdater_h_
 
 #include "AccEvent.h"
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
 /**
  * Used to find a difference between old and new text and fire text change
@@ -85,7 +85,7 @@ private:
 private:
   DocAccessible* mDocument;
   mozilla::a11y::TextLeafAccessible* mTextLeaf;
-  nsHyperTextAccessible* mHyperText;
+  HyperTextAccessible* mHyperText;
   PRInt32 mTextOffset;
 };
 
diff --git a/accessible/src/base/nsAccUtils.cpp b/accessible/src/base/nsAccUtils.cpp
index f048737e98e9..7b828bf5e574 100644
--- a/accessible/src/base/nsAccUtils.cpp
+++ b/accessible/src/base/nsAccUtils.cpp
@@ -10,7 +10,7 @@
 #include "nsARIAMap.h"
 #include "nsCoreUtils.h"
 #include "DocAccessible.h"
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 #include "nsIAccessibleTypes.h"
 #include "Role.h"
 #include "States.h"
@@ -254,7 +254,7 @@ nsAccUtils::IsARIASelected(Accessible* aAccessible)
                 nsGkAtoms::_true, eCaseMatters);
 }
 
-nsHyperTextAccessible*
+HyperTextAccessible*
 nsAccUtils::GetTextAccessibleFromSelection(nsISelection* aSelection)
 {
   // Get accessible from selection's focus DOM point (the DOM point where
@@ -283,7 +283,7 @@ nsAccUtils::GetTextAccessibleFromSelection(nsISelection* aSelection)
   }
 
   do {
-    nsHyperTextAccessible* textAcc = accessible->AsHyperText();
+    HyperTextAccessible* textAcc = accessible->AsHyperText();
     if (textAcc)
       return textAcc;
 
diff --git a/accessible/src/base/nsAccUtils.h b/accessible/src/base/nsAccUtils.h
index e6bc7cd465d1..62d7a5e86940 100644
--- a/accessible/src/base/nsAccUtils.h
+++ b/accessible/src/base/nsAccUtils.h
@@ -23,7 +23,7 @@
 
 class nsAccessNode;
 class Accessible;
-class nsHyperTextAccessible;
+class HyperTextAccessible;
 class nsHTMLTableAccessible;
 class DocAccessible;
 struct nsRoleMapEntry;
@@ -157,7 +157,7 @@ public:
    * @param aSelection  [in] the given selection
    * @return            text accessible
    */
-  static nsHyperTextAccessible*
+  static HyperTextAccessible*
     GetTextAccessibleFromSelection(nsISelection* aSelection);
 
   /**
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index eabc98b50531..6f202174f908 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -14,6 +14,7 @@
 #endif
 #include "FocusManager.h"
 #include "HTMLListAccessible.h"
+#include "HyperTextAccessibleWrap.h"
 #include "nsAccessiblePivot.h"
 #include "nsAccUtils.h"
 #include "nsARIAMap.h"
@@ -24,7 +25,6 @@
 #include "nsHTMLSelectAccessible.h"
 #include "nsHTMLTableAccessibleWrap.h"
 #include "nsHTMLTextAccessible.h"
-#include "nsHyperTextAccessibleWrap.h"
 #include "nsXFormsFormControlsAccessible.h"
 #include "nsXFormsWidgetsAccessible.h"
 #include "OuterDocAccessible.h"
@@ -205,7 +205,7 @@ nsAccessibilityService::CreateHyperTextAccessible(nsIContent* aContent,
                                                   nsIPresShell* aPresShell)
 {
   Accessible* accessible =
-    new nsHyperTextAccessibleWrap(aContent, GetDocAccessible(aPresShell));
+    new HyperTextAccessibleWrap(aContent, GetDocAccessible(aPresShell));
   NS_ADDREF(accessible);
   return accessible;
 }
@@ -1052,7 +1052,7 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
       return nsnull;
     }
 
-    newAcc = new nsHyperTextAccessibleWrap(content, docAcc);
+    newAcc = new HyperTextAccessibleWrap(content, docAcc);
     if (docAcc->BindToDocument(newAcc, aria::GetRoleMap(aNode)))
       return newAcc;
     return nsnull;
@@ -1227,7 +1227,7 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
     // other accessibles can point to it, or so that it can hold a state, etc.
     if (isHTML) {
       // Interesting HTML container which may have selectable text and/or embedded objects
-      newAcc = new nsHyperTextAccessibleWrap(content, docAcc);
+      newAcc = new HyperTextAccessibleWrap(content, docAcc);
     }
     else {  // XUL, SVG, MathML etc.
       // Interesting generic non-HTML container
@@ -1657,7 +1657,7 @@ nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame* aFrame,
     nsRoleMapEntry* roleMapEntry = aria::GetRoleMap(aContent);
     if (roleMapEntry && roleMapEntry->role != roles::NOTHING &&
         roleMapEntry->role != roles::LINK) {
-      Accessible* accessible = new nsHyperTextAccessibleWrap(aContent, aDoc);
+      Accessible* accessible = new HyperTextAccessibleWrap(aContent, aDoc);
       NS_IF_ADDREF(accessible);
       return accessible;
     }
@@ -1690,7 +1690,7 @@ nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame* aFrame,
       tag == nsGkAtoms::h5 ||
       tag == nsGkAtoms::h6 ||
       tag == nsGkAtoms::q) {
-    Accessible* accessible = new nsHyperTextAccessibleWrap(aContent, aDoc);
+    Accessible* accessible = new HyperTextAccessibleWrap(aContent, aDoc);
     NS_IF_ADDREF(accessible);
     return accessible;
   }
diff --git a/accessible/src/base/nsAccessiblePivot.cpp b/accessible/src/base/nsAccessiblePivot.cpp
index 38871dcb9d68..707e1ddef70c 100644
--- a/accessible/src/base/nsAccessiblePivot.cpp
+++ b/accessible/src/base/nsAccessiblePivot.cpp
@@ -7,9 +7,9 @@
 #include "nsAccessiblePivot.h"
 
 #include "Accessible-inl.h"
-#include "nsAccUtils.h"
-#include "nsHyperTextAccessible.h"
 #include "DocAccessible.h"
+#include "HyperTextAccessible.h"
+#include "nsAccUtils.h"
 #include "States.h"
 
 #include "nsArrayUtils.h"
@@ -155,7 +155,7 @@ nsAccessiblePivot::SetTextRange(nsIAccessibleText* aTextAccessible,
                  (aStartOffset >= 0 || (aStartOffset != -1 && aEndOffset != -1)),
                  NS_ERROR_INVALID_ARG);
 
-  nsRefPtr<nsHyperTextAccessible> newPosition = do_QueryObject(aTextAccessible);
+  nsRefPtr<HyperTextAccessible> newPosition = do_QueryObject(aTextAccessible);
   if (!newPosition || !IsRootDescendant(newPosition))
     return NS_ERROR_INVALID_ARG;
 
diff --git a/accessible/src/base/nsBaseWidgetAccessible.cpp b/accessible/src/base/nsBaseWidgetAccessible.cpp
index 242aabd00098..4624eb4f18c9 100644
--- a/accessible/src/base/nsBaseWidgetAccessible.cpp
+++ b/accessible/src/base/nsBaseWidgetAccessible.cpp
@@ -6,10 +6,10 @@
 #include "nsBaseWidgetAccessible.h"
 
 #include "Accessible-inl.h"
+#include "HyperTextAccessibleWrap.h"
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "nsCoreUtils.h"
-#include "nsHyperTextAccessibleWrap.h"
 #include "Role.h"
 #include "States.h"
 
diff --git a/accessible/src/base/nsBaseWidgetAccessible.h b/accessible/src/base/nsBaseWidgetAccessible.h
index 33adc28af4dd..5bdbb8b7d68c 100644
--- a/accessible/src/base/nsBaseWidgetAccessible.h
+++ b/accessible/src/base/nsBaseWidgetAccessible.h
@@ -7,7 +7,7 @@
 #define _nsBaseWidgetAccessible_H_
 
 #include "AccessibleWrap.h"
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 #include "nsIContent.h"
 
 /**
diff --git a/accessible/src/base/nsCaretAccessible.cpp b/accessible/src/base/nsCaretAccessible.cpp
index f7dd71cb786a..f5ec59100d4a 100644
--- a/accessible/src/base/nsCaretAccessible.cpp
+++ b/accessible/src/base/nsCaretAccessible.cpp
@@ -243,7 +243,7 @@ nsCaretAccessible::NormalSelectionChanged(nsISelection* aSelection)
     return; // No selection
   }
 
-  nsHyperTextAccessible* textAcc =
+  HyperTextAccessible* textAcc =
     nsAccUtils::GetTextAccessibleFromSelection(aSelection);
   if (!textAcc)
     return;
@@ -278,7 +278,7 @@ nsCaretAccessible::SpellcheckSelectionChanged(nsISelection* aSelection)
   // misspelled word). If spellchecking is disabled (for example,
   // @spellcheck="false" on html:body) then we won't fire any event.
 
-  nsHyperTextAccessible* textAcc =
+  HyperTextAccessible* textAcc =
     nsAccUtils::GetTextAccessibleFromSelection(aSelection);
   if (!textAcc)
     return;
diff --git a/accessible/src/base/nsCaretAccessible.h b/accessible/src/base/nsCaretAccessible.h
index 4662af461938..1a4c9ca212e2 100644
--- a/accessible/src/base/nsCaretAccessible.h
+++ b/accessible/src/base/nsCaretAccessible.h
@@ -6,8 +6,8 @@
 #ifndef __nsCaretAccessible_h__
 #define __nsCaretAccessible_h__
 
+#include "HyperTextAccessible.h"
 #include "NotificationController.h"
-#include "nsHyperTextAccessible.h"
 
 #include "nsISelectionListener.h"
 
@@ -118,7 +118,7 @@ private:
   // If it was on a control, then its control's selection. Otherwise, it's for
   // a document where the selection changed.
   nsCOMPtr<nsIWeakReference> mLastUsedSelection; // Weak ref to nsISelection
-  nsRefPtr<nsHyperTextAccessible> mLastTextAccessible;
+  nsRefPtr<HyperTextAccessible> mLastTextAccessible;
   PRInt32 mLastCaretOffset;
 
   mozilla::a11y::RootAccessible* mRootAccessible;
diff --git a/accessible/src/generic/ARIAGridAccessible.cpp b/accessible/src/generic/ARIAGridAccessible.cpp
index 4dae5f719f2f..6e95f6b5e1a5 100644
--- a/accessible/src/generic/ARIAGridAccessible.cpp
+++ b/accessible/src/generic/ARIAGridAccessible.cpp
@@ -774,7 +774,7 @@ ARIAGridAccessible::GetSelectedColumnsArray(PRUint32* aColumnCount,
 
 ARIAGridCellAccessible::
   ARIAGridCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -782,7 +782,7 @@ ARIAGridCellAccessible::
 // nsISupports
 
 NS_IMPL_ISUPPORTS_INHERITED1(ARIAGridCellAccessible,
-                             nsHyperTextAccessible,
+                             HyperTextAccessible,
                              nsIAccessibleTableCell)
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -956,7 +956,7 @@ ARIAGridCellAccessible::IsSelected(bool* aIsSelected)
 void
 ARIAGridCellAccessible::ApplyARIAState(PRUint64* aState) const
 {
-  nsHyperTextAccessibleWrap::ApplyARIAState(aState);
+  HyperTextAccessibleWrap::ApplyARIAState(aState);
 
   // Return if the gridcell has aria-selected="true".
   if (*aState & states::SELECTED)
@@ -982,7 +982,7 @@ ARIAGridCellAccessible::GetAttributesInternal(nsIPersistentProperties* aAttribut
   if (IsDefunct())
     return NS_ERROR_FAILURE;
   
-  nsresult rv = nsHyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
+  nsresult rv = HyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Expose "table-cell-index" attribute.
diff --git a/accessible/src/generic/ARIAGridAccessible.h b/accessible/src/generic/ARIAGridAccessible.h
index f3dd2caec2f7..c35effeb38aa 100644
--- a/accessible/src/generic/ARIAGridAccessible.h
+++ b/accessible/src/generic/ARIAGridAccessible.h
@@ -8,7 +8,7 @@
 
 #include "nsIAccessibleTable.h"
 
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 #include "TableAccessible.h"
 #include "xpcAccessibleTable.h"
 
@@ -88,7 +88,7 @@ protected:
 /**
  * Accessible for ARIA gridcell and rowheader/columnheader.
  */
-class ARIAGridCellAccessible : public nsHyperTextAccessibleWrap,
+class ARIAGridCellAccessible : public HyperTextAccessibleWrap,
                                public nsIAccessibleTableCell
 {
 public:
diff --git a/accessible/src/generic/Accessible.cpp b/accessible/src/generic/Accessible.cpp
index d787fe49b911..293c10d9c46d 100644
--- a/accessible/src/generic/Accessible.cpp
+++ b/accessible/src/generic/Accessible.cpp
@@ -2736,7 +2736,7 @@ Accessible::StartOffset()
 {
   NS_PRECONDITION(IsLink(), "StartOffset is called not on hyper link!");
 
-  nsHyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull;
+  HyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull;
   return hyperText ? hyperText->GetChildOffset(this) : 0;
 }
 
@@ -2745,7 +2745,7 @@ Accessible::EndOffset()
 {
   NS_PRECONDITION(IsLink(), "EndOffset is called on not hyper link!");
 
-  nsHyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull;
+  HyperTextAccessible* hyperText = mParent ? mParent->AsHyperText() : nsnull;
   return hyperText ? (hyperText->GetChildOffset(this) + 1) : 0;
 }
 
diff --git a/accessible/src/generic/Accessible.h b/accessible/src/generic/Accessible.h
index b2bb5baa6bba..226543f2c44a 100644
--- a/accessible/src/generic/Accessible.h
+++ b/accessible/src/generic/Accessible.h
@@ -26,7 +26,7 @@ class AccGroupInfo;
 class EmbeddedObjCollector;
 class KeyBinding;
 class Accessible;
-class nsHyperTextAccessible;
+class HyperTextAccessible;
 class nsHTMLImageAccessible;
 class nsHTMLImageMapAccessible;
 struct nsRoleMapEntry;
@@ -244,7 +244,6 @@ public:
    */
   virtual mozilla::a11y::GroupPos GroupPosition();
 
-  /**
   /**
    * Used by ChildAtPoint() method to get direct or deepest child at point.
    */
@@ -473,7 +472,7 @@ public:
   DocAccessible* AsDoc();
 
   inline bool IsHyperText() const { return mFlags & eHyperTextAccessible; }
-  nsHyperTextAccessible* AsHyperText();
+  HyperTextAccessible* AsHyperText();
 
   inline bool IsHTMLFileInput() const { return mFlags & eHTMLFileInputAccessible; }
 
diff --git a/accessible/src/generic/DocAccessible.cpp b/accessible/src/generic/DocAccessible.cpp
index e8bb4a104988..17d0585ce5c1 100644
--- a/accessible/src/generic/DocAccessible.cpp
+++ b/accessible/src/generic/DocAccessible.cpp
@@ -78,7 +78,7 @@ static const PRUint32 kRelationAttrsLen = NS_ARRAY_LENGTH(kRelationAttrs);
 DocAccessible::
   DocAccessible(nsIDocument* aDocument, nsIContent* aRootContent,
                   nsIPresShell* aPresShell) :
-  nsHyperTextAccessibleWrap(aRootContent, this),
+  HyperTextAccessibleWrap(aRootContent, this),
   mDocument(aDocument), mScrollPositionChangedTicks(0),
   mLoadState(eTreeConstructionPending), mLoadEventType(0),
   mVirtualCursor(nsnull),
@@ -162,14 +162,13 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DocAccessible)
 
   nsresult status;
   if (!foundInterface) {
-    // HTML document accessible must inherit from nsHyperTextAccessible to get
+    // HTML document accessible must inherit from HyperTextAccessible to get
     // support text interfaces. XUL document accessible doesn't need this.
     // However at some point we may push <body> to implement the interfaces and
     // return DocAccessible to inherit from AccessibleWrap.
 
     status = IsHyperText() ? 
-      nsHyperTextAccessible::QueryInterface(aIID,
-                                            (void**)&foundInterface) :
+      HyperTextAccessible::QueryInterface(aIID, (void**)&foundInterface) :
       Accessible::QueryInterface(aIID, (void**)&foundInterface);
   } else {
     NS_ADDREF(foundInterface);
@@ -180,8 +179,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(DocAccessible)
   return status;
 }
 
-NS_IMPL_ADDREF_INHERITED(DocAccessible, nsHyperTextAccessible)
-NS_IMPL_RELEASE_INHERITED(DocAccessible, nsHyperTextAccessible)
+NS_IMPL_ADDREF_INHERITED(DocAccessible, HyperTextAccessible)
+NS_IMPL_RELEASE_INHERITED(DocAccessible, HyperTextAccessible)
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessible
@@ -531,7 +530,7 @@ DocAccessible::GetVirtualCursor(nsIAccessiblePivot** aVirtualCursor)
   return NS_OK;
 }
 
-// nsHyperTextAccessible method
+// HyperTextAccessible method
 already_AddRefed<nsIEditor>
 DocAccessible::GetEditor() const
 {
@@ -663,7 +662,7 @@ DocAccessible::Shutdown()
   mNodeToAccessibleMap.Clear();
   ClearCache(mAccessibleCache);
 
-  nsHyperTextAccessibleWrap::Shutdown();
+  HyperTextAccessibleWrap::Shutdown();
 
   GetAccService()->NotifyOfDocumentShutdown(kungFuDeathGripDoc);
 }
@@ -1305,7 +1304,7 @@ DocAccessible::HandleAccEvent(AccEvent* aEvent)
   if (logging::IsEnabled(logging::eDocLoad))
     logging::DocLoadEventHandled(aEvent);
 
-  return nsHyperTextAccessible::HandleAccEvent(aEvent);
+  return HyperTextAccessible::HandleAccEvent(aEvent);
 }
 #endif
 
@@ -1762,7 +1761,7 @@ DocAccessible::ProcessPendingEvent(AccEvent* aEvent)
 {
   PRUint32 eventType = aEvent->GetEventType();
   if (eventType == nsIAccessibleEvent::EVENT_TEXT_CARET_MOVED) {
-    nsHyperTextAccessible* hyperText = aEvent->GetAccessible()->AsHyperText();
+    HyperTextAccessible* hyperText = aEvent->GetAccessible()->AsHyperText();
     PRInt32 caretOffset;
     if (hyperText &&
         NS_SUCCEEDED(hyperText->GetCaretOffset(&caretOffset))) {
diff --git a/accessible/src/generic/DocAccessible.h b/accessible/src/generic/DocAccessible.h
index 89f116d4768c..a9f3d8db53c1 100644
--- a/accessible/src/generic/DocAccessible.h
+++ b/accessible/src/generic/DocAccessible.h
@@ -10,8 +10,8 @@
 #include "nsIAccessibleDocument.h"
 #include "nsIAccessiblePivot.h"
 
+#include "HyperTextAccessibleWrap.h"
 #include "nsEventShell.h"
-#include "nsHyperTextAccessibleWrap.h"
 #include "NotificationController.h"
 
 #include "nsClassHashtable.h"
@@ -31,7 +31,7 @@ class nsAccessiblePivot;
 
 const PRUint32 kDefaultCacheSize = 256;
 
-class DocAccessible : public nsHyperTextAccessibleWrap,
+class DocAccessible : public HyperTextAccessibleWrap,
                       public nsIAccessibleDocument,
                       public nsIDocumentObserver,
                       public nsIObserver,
@@ -91,7 +91,7 @@ public:
 
   virtual void GetBoundsRect(nsRect& aRect, nsIFrame** aRelativeFrame);
 
-  // nsHyperTextAccessible
+  // HyperTextAccessible
   virtual already_AddRefed<nsIEditor> GetEditor() const;
 
   // DocAccessible
diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/generic/HyperTextAccessible.cpp
similarity index 88%
rename from accessible/src/html/nsHyperTextAccessible.cpp
rename to accessible/src/generic/HyperTextAccessible.cpp
index f8ca950621bb..dd3cde3f9023 100644
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/generic/HyperTextAccessible.cpp
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
 #include "Accessible-inl.h"
 #include "nsAccessibilityService.h"
@@ -37,25 +37,26 @@
 using namespace mozilla::a11y;
 
 ////////////////////////////////////////////////////////////////////////////////
-// nsHyperTextAccessible
+// HyperTextAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-nsHyperTextAccessible::
-  nsHyperTextAccessible(nsIContent* aNode, DocAccessible* aDoc) :
+HyperTextAccessible::
+  HyperTextAccessible(nsIContent* aNode, DocAccessible* aDoc) :
   AccessibleWrap(aNode, aDoc)
 {
   mFlags |= eHyperTextAccessible;
 }
 
-NS_IMPL_ADDREF_INHERITED(nsHyperTextAccessible, AccessibleWrap)
-NS_IMPL_RELEASE_INHERITED(nsHyperTextAccessible, AccessibleWrap)
+NS_IMPL_ADDREF_INHERITED(HyperTextAccessible, AccessibleWrap)
+NS_IMPL_RELEASE_INHERITED(HyperTextAccessible, AccessibleWrap)
 
-nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr)
+nsresult
+HyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 {
   *aInstancePtr = nsnull;
 
-  if (aIID.Equals(NS_GET_IID(nsHyperTextAccessible))) {
-    *aInstancePtr = static_cast<nsHyperTextAccessible*>(this);
+  if (aIID.Equals(NS_GET_IID(HyperTextAccessible))) {
+    *aInstancePtr = static_cast<HyperTextAccessible*>(this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -86,7 +87,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
 }
 
 role
-nsHyperTextAccessible::NativeRole()
+HyperTextAccessible::NativeRole()
 {
   nsIAtom *tag = mContent->Tag();
 
@@ -127,7 +128,7 @@ nsHyperTextAccessible::NativeRole()
 }
 
 PRUint64
-nsHyperTextAccessible::NativeState()
+HyperTextAccessible::NativeState()
 {
   PRUint64 states = AccessibleWrap::NativeState();
 
@@ -147,8 +148,9 @@ nsHyperTextAccessible::NativeState()
 }
 
 // Substring must be entirely within the same text node
-nsIntRect nsHyperTextAccessible::GetBoundsForString(nsIFrame *aFrame, PRUint32 aStartRenderedOffset,
-                                                    PRUint32 aEndRenderedOffset)
+nsIntRect
+HyperTextAccessible::GetBoundsForString(nsIFrame* aFrame, PRUint32 aStartRenderedOffset,
+                                        PRUint32 aEndRenderedOffset)
 {
   nsIntRect screenRect;
   NS_ENSURE_TRUE(aFrame, screenRect);
@@ -215,11 +217,11 @@ nsIntRect nsHyperTextAccessible::GetBoundsForString(nsIFrame *aFrame, PRUint32 a
  * Gets the specified text.
  */
 nsIFrame*
-nsHyperTextAccessible::GetPosAndText(PRInt32& aStartOffset, PRInt32& aEndOffset,
-                                     nsAString *aText, nsIFrame **aEndFrame,
-                                     nsIntRect *aBoundsRect,
-                                     Accessible** aStartAcc,
-                                     Accessible** aEndAcc)
+HyperTextAccessible::GetPosAndText(PRInt32& aStartOffset, PRInt32& aEndOffset,
+                                   nsAString* aText, nsIFrame** aEndFrame,
+                                   nsIntRect* aBoundsRect,
+                                   Accessible** aStartAcc,
+                                   Accessible** aEndAcc)
 {
   if (aStartOffset == nsIAccessibleText::TEXT_OFFSET_END_OF_TEXT) {
     aStartOffset = CharacterCount();
@@ -414,8 +416,8 @@ nsHyperTextAccessible::GetPosAndText(PRInt32& aStartOffset, PRInt32& aEndOffset,
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetText(PRInt32 aStartOffset, PRInt32 aEndOffset,
-                               nsAString &aText)
+HyperTextAccessible::GetText(PRInt32 aStartOffset, PRInt32 aEndOffset,
+                             nsAString& aText)
 {
   aText.Truncate();
 
@@ -469,7 +471,8 @@ nsHyperTextAccessible::GetText(PRInt32 aStartOffset, PRInt32 aEndOffset,
 /*
  * Gets the character count.
  */
-NS_IMETHODIMP nsHyperTextAccessible::GetCharacterCount(PRInt32 *aCharacterCount)
+NS_IMETHODIMP
+HyperTextAccessible::GetCharacterCount(PRInt32* aCharacterCount)
 {
   NS_ENSURE_ARG_POINTER(aCharacterCount);
   *aCharacterCount = 0;
@@ -484,7 +487,8 @@ NS_IMETHODIMP nsHyperTextAccessible::GetCharacterCount(PRInt32 *aCharacterCount)
 /*
  * Gets the specified character.
  */
-NS_IMETHODIMP nsHyperTextAccessible::GetCharacterAtOffset(PRInt32 aOffset, PRUnichar *aCharacter)
+NS_IMETHODIMP
+HyperTextAccessible::GetCharacterAtOffset(PRInt32 aOffset, PRUnichar* aCharacter)
 {
   NS_ENSURE_ARG_POINTER(aCharacter);
   *aCharacter = nsnull;
@@ -502,10 +506,10 @@ NS_IMETHODIMP nsHyperTextAccessible::GetCharacterAtOffset(PRInt32 aOffset, PRUni
 }
 
 Accessible*
-nsHyperTextAccessible::DOMPointToHypertextOffset(nsINode *aNode,
-                                                 PRInt32 aNodeOffset,
-                                                 PRInt32 *aHyperTextOffset,
-                                                 bool aIsEndOffset)
+HyperTextAccessible::DOMPointToHypertextOffset(nsINode* aNode,
+                                               PRInt32 aNodeOffset,
+                                               PRInt32* aHyperTextOffset,
+                                               bool aIsEndOffset)
 {
   if (!aHyperTextOffset)
     return nsnull;
@@ -637,9 +641,9 @@ nsHyperTextAccessible::DOMPointToHypertextOffset(nsINode *aNode,
 }
 
 nsresult
-nsHyperTextAccessible::HypertextOffsetToDOMPoint(PRInt32 aHTOffset,
-                                                 nsIDOMNode **aNode,
-                                                 PRInt32 *aOffset)
+HyperTextAccessible::HypertextOffsetToDOMPoint(PRInt32 aHTOffset,
+                                               nsIDOMNode** aNode,
+                                               PRInt32* aOffset)
 {
   nsCOMPtr<nsIDOMNode> endNode;
   PRInt32 endOffset;
@@ -649,12 +653,12 @@ nsHyperTextAccessible::HypertextOffsetToDOMPoint(PRInt32 aHTOffset,
 }
 
 nsresult
-nsHyperTextAccessible::HypertextOffsetsToDOMRange(PRInt32 aStartHTOffset,
-                                                  PRInt32 aEndHTOffset,
-                                                  nsIDOMNode **aStartNode,
-                                                  PRInt32 *aStartOffset,
-                                                  nsIDOMNode **aEndNode,
-                                                  PRInt32 *aEndOffset)
+HyperTextAccessible::HypertextOffsetsToDOMRange(PRInt32 aStartHTOffset,
+                                                PRInt32 aEndHTOffset,
+                                                nsIDOMNode** aStartNode,
+                                                PRInt32* aStartOffset,
+                                                nsIDOMNode** aEndNode,
+                                                PRInt32* aEndOffset)
 {
   NS_ENSURE_ARG_POINTER(aStartNode);
   *aStartNode = nsnull;
@@ -725,13 +729,13 @@ nsHyperTextAccessible::HypertextOffsetsToDOMRange(PRInt32 aStartHTOffset,
 }
 
 PRInt32
-nsHyperTextAccessible::GetRelativeOffset(nsIPresShell *aPresShell,
-                                         nsIFrame *aFromFrame,
-                                         PRInt32 aFromOffset,
-                                         Accessible* aFromAccessible,
-                                         nsSelectionAmount aAmount,
-                                         nsDirection aDirection,
-                                         bool aNeedsStart)
+HyperTextAccessible::GetRelativeOffset(nsIPresShell* aPresShell,
+                                       nsIFrame* aFromFrame,
+                                       PRInt32 aFromOffset,
+                                       Accessible* aFromAccessible,
+                                       nsSelectionAmount aAmount,
+                                       nsDirection aDirection,
+                                       bool aNeedsStart)
 {
   const bool kIsJumpLinesOk = true;          // okay to jump lines
   const bool kIsScrollViewAStop = false;     // do not stop at scroll views
@@ -834,9 +838,9 @@ BOUNDARY_LINE_END         From the line end before/at/after the offset to the ne
 */
 
 nsresult
-nsHyperTextAccessible::GetTextHelper(EGetTextType aType, AccessibleTextBoundary aBoundaryType,
-                                              PRInt32 aOffset, PRInt32 *aStartOffset, PRInt32 *aEndOffset,
-                                              nsAString &aText)
+HyperTextAccessible::GetTextHelper(EGetTextType aType, AccessibleTextBoundary aBoundaryType,
+                                   PRInt32 aOffset, PRInt32* aStartOffset, PRInt32* aEndOffset,
+                                   nsAString& aText)
 {
   aText.Truncate();
 
@@ -1017,8 +1021,10 @@ nsHyperTextAccessible::GetTextHelper(EGetTextType aType, AccessibleTextBoundary
   * nsIAccessibleText impl.
   */
 NS_IMETHODIMP
-nsHyperTextAccessible::GetTextBeforeOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType,
-                                                         PRInt32 *aStartOffset, PRInt32 *aEndOffset, nsAString & aText)
+HyperTextAccessible::GetTextBeforeOffset(PRInt32 aOffset,
+                                         AccessibleTextBoundary aBoundaryType,
+                                         PRInt32* aStartOffset,
+                                         PRInt32* aEndOffset, nsAString& aText)
 {
   if (aBoundaryType == BOUNDARY_CHAR) {
     GetCharAt(aOffset, eGetBefore, aText, aStartOffset, aEndOffset);
@@ -1029,8 +1035,10 @@ nsHyperTextAccessible::GetTextBeforeOffset(PRInt32 aOffset, AccessibleTextBounda
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetTextAtOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType,
-                                                     PRInt32 *aStartOffset, PRInt32 *aEndOffset, nsAString & aText)
+HyperTextAccessible::GetTextAtOffset(PRInt32 aOffset,
+                                     AccessibleTextBoundary aBoundaryType,
+                                     PRInt32* aStartOffset,
+                                     PRInt32* aEndOffset, nsAString& aText)
 {
   if (aBoundaryType == BOUNDARY_CHAR) {
     GetCharAt(aOffset, eGetAt, aText, aStartOffset, aEndOffset);
@@ -1041,8 +1049,8 @@ nsHyperTextAccessible::GetTextAtOffset(PRInt32 aOffset, AccessibleTextBoundary a
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetTextAfterOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType,
-                                                        PRInt32 *aStartOffset, PRInt32 *aEndOffset, nsAString & aText)
+HyperTextAccessible::GetTextAfterOffset(PRInt32 aOffset, AccessibleTextBoundary aBoundaryType,
+                                        PRInt32* aStartOffset, PRInt32* aEndOffset, nsAString& aText)
 {
   if (aBoundaryType == BOUNDARY_CHAR) {
     GetCharAt(aOffset, eGetAfter, aText, aStartOffset, aEndOffset);
@@ -1058,11 +1066,11 @@ nsHyperTextAccessible::GetTextAfterOffset(PRInt32 aOffset, AccessibleTextBoundar
 //                                      out long rangeStartOffset,
 //                                      out long rangeEndOffset);
 NS_IMETHODIMP
-nsHyperTextAccessible::GetTextAttributes(bool aIncludeDefAttrs,
-                                         PRInt32 aOffset,
-                                         PRInt32 *aStartOffset,
-                                         PRInt32 *aEndOffset,
-                                         nsIPersistentProperties **aAttributes)
+HyperTextAccessible::GetTextAttributes(bool aIncludeDefAttrs,
+                                       PRInt32 aOffset,
+                                       PRInt32* aStartOffset,
+                                       PRInt32* aEndOffset,
+                                       nsIPersistentProperties** aAttributes)
 {
   // 1. Get each attribute and its ranges one after another.
   // 2. As we get each new attribute, we pass the current start and end offsets
@@ -1134,7 +1142,7 @@ nsHyperTextAccessible::GetTextAttributes(bool aIncludeDefAttrs,
 // nsIPersistentProperties
 // nsIAccessibleText::defaultTextAttributes
 NS_IMETHODIMP
-nsHyperTextAccessible::GetDefaultTextAttributes(nsIPersistentProperties **aAttributes)
+HyperTextAccessible::GetDefaultTextAttributes(nsIPersistentProperties** aAttributes)
 {
   NS_ENSURE_ARG_POINTER(aAttributes);
   *aAttributes = nsnull;
@@ -1154,7 +1162,7 @@ nsHyperTextAccessible::GetDefaultTextAttributes(nsIPersistentProperties **aAttri
 }
 
 PRInt32
-nsHyperTextAccessible::GetLevelInternal()
+HyperTextAccessible::GetLevelInternal()
 {
   nsIAtom *tag = mContent->Tag();
   if (tag == nsGkAtoms::h1)
@@ -1174,7 +1182,7 @@ nsHyperTextAccessible::GetLevelInternal()
 }
 
 nsresult
-nsHyperTextAccessible::GetAttributesInternal(nsIPersistentProperties *aAttributes)
+HyperTextAccessible::GetAttributesInternal(nsIPersistentProperties* aAttributes)
 {
   nsresult rv = AccessibleWrap::GetAttributesInternal(aAttributes);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -1223,9 +1231,10 @@ nsHyperTextAccessible::GetAttributesInternal(nsIPersistentProperties *aAttribute
 /*
  * Given an offset, the x, y, width, and height values are filled appropriately.
  */
-NS_IMETHODIMP nsHyperTextAccessible::GetCharacterExtents(PRInt32 aOffset, PRInt32 *aX, PRInt32 *aY,
-                                                         PRInt32 *aWidth, PRInt32 *aHeight,
-                                                         PRUint32 aCoordType)
+NS_IMETHODIMP
+HyperTextAccessible::GetCharacterExtents(PRInt32 aOffset, PRInt32* aX, PRInt32* aY,
+                                         PRInt32* aWidth, PRInt32* aHeight,
+                                         PRUint32 aCoordType)
 {
   return GetRangeExtents(aOffset, aOffset + 1, aX, aY, aWidth, aHeight, aCoordType);
 }
@@ -1233,10 +1242,11 @@ NS_IMETHODIMP nsHyperTextAccessible::GetCharacterExtents(PRInt32 aOffset, PRInt3
 /*
  * Given a start & end offset, the x, y, width, and height values are filled appropriately.
  */
-NS_IMETHODIMP nsHyperTextAccessible::GetRangeExtents(PRInt32 aStartOffset, PRInt32 aEndOffset,
-                                                     PRInt32 *aX, PRInt32 *aY,
-                                                     PRInt32 *aWidth, PRInt32 *aHeight,
-                                                     PRUint32 aCoordType)
+NS_IMETHODIMP
+HyperTextAccessible::GetRangeExtents(PRInt32 aStartOffset, PRInt32 aEndOffset,
+                                     PRInt32* aX, PRInt32* aY,
+                                     PRInt32* aWidth, PRInt32* aHeight,
+                                     PRUint32 aCoordType)
 {
   nsIntRect boundsRect;
   nsIFrame *endFrameUnused;
@@ -1258,8 +1268,8 @@ NS_IMETHODIMP nsHyperTextAccessible::GetRangeExtents(PRInt32 aStartOffset, PRInt
  * the screen or this widget's window depending on coords.
  */
 NS_IMETHODIMP
-nsHyperTextAccessible::GetOffsetAtPoint(PRInt32 aX, PRInt32 aY,
-                                        PRUint32 aCoordType, PRInt32 *aOffset)
+HyperTextAccessible::GetOffsetAtPoint(PRInt32 aX, PRInt32 aY,
+                                      PRUint32 aCoordType, PRInt32* aOffset)
 {
   *aOffset = -1;
 
@@ -1339,7 +1349,7 @@ nsHyperTextAccessible::GetOffsetAtPoint(PRInt32 aX, PRInt32 aY,
 // nsIAccessibleHyperText
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetLinkCount(PRInt32 *aLinkCount)
+HyperTextAccessible::GetLinkCount(PRInt32* aLinkCount)
 {
   NS_ENSURE_ARG_POINTER(aLinkCount);
   *aLinkCount = 0;
@@ -1352,7 +1362,7 @@ nsHyperTextAccessible::GetLinkCount(PRInt32 *aLinkCount)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetLinkAt(PRInt32 aIndex, nsIAccessibleHyperLink** aLink)
+HyperTextAccessible::GetLinkAt(PRInt32 aIndex, nsIAccessibleHyperLink** aLink)
 {
   NS_ENSURE_ARG_POINTER(aLink);
   *aLink = nsnull;
@@ -1368,8 +1378,8 @@ nsHyperTextAccessible::GetLinkAt(PRInt32 aIndex, nsIAccessibleHyperLink** aLink)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetLinkIndex(nsIAccessibleHyperLink* aLink,
-                                    PRInt32* aIndex)
+HyperTextAccessible::GetLinkIndex(nsIAccessibleHyperLink* aLink,
+                                  PRInt32* aIndex)
 {
   NS_ENSURE_ARG_POINTER(aLink);
 
@@ -1382,8 +1392,7 @@ nsHyperTextAccessible::GetLinkIndex(nsIAccessibleHyperLink* aLink,
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aOffset,
-                                            PRInt32* aLinkIndex)
+HyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aOffset, PRInt32* aLinkIndex)
 {
   NS_ENSURE_ARG_POINTER(aLinkIndex);
   *aLinkIndex = -1; // API says this magic value means 'not found'
@@ -1398,13 +1407,15 @@ nsHyperTextAccessible::GetLinkIndexAtOffset(PRInt32 aOffset,
 /**
   * nsIAccessibleEditableText impl.
   */
-NS_IMETHODIMP nsHyperTextAccessible::SetAttributes(PRInt32 aStartPos, PRInt32 aEndPos,
-                                                   nsISupports *aAttributes)
+NS_IMETHODIMP
+HyperTextAccessible::SetAttributes(PRInt32 aStartPos, PRInt32 aEndPos,
+                                   nsISupports* aAttributes)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-NS_IMETHODIMP nsHyperTextAccessible::SetTextContents(const nsAString &aText)
+NS_IMETHODIMP
+HyperTextAccessible::SetTextContents(const nsAString& aText)
 {
   PRInt32 numChars = CharacterCount();
   if (numChars == 0 || NS_SUCCEEDED(DeleteText(0, numChars))) {
@@ -1414,7 +1425,7 @@ NS_IMETHODIMP nsHyperTextAccessible::SetTextContents(const nsAString &aText)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::InsertText(const nsAString &aText, PRInt32 aPosition)
+HyperTextAccessible::InsertText(const nsAString& aText, PRInt32 aPosition)
 {
   if (IsDefunct())
     return NS_ERROR_FAILURE;
@@ -1431,7 +1442,7 @@ nsHyperTextAccessible::InsertText(const nsAString &aText, PRInt32 aPosition)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::CopyText(PRInt32 aStartPos, PRInt32 aEndPos)
+HyperTextAccessible::CopyText(PRInt32 aStartPos, PRInt32 aEndPos)
 {
   if (IsDefunct())
     return NS_ERROR_FAILURE;
@@ -1446,7 +1457,7 @@ nsHyperTextAccessible::CopyText(PRInt32 aStartPos, PRInt32 aEndPos)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::CutText(PRInt32 aStartPos, PRInt32 aEndPos)
+HyperTextAccessible::CutText(PRInt32 aStartPos, PRInt32 aEndPos)
 {
   if (IsDefunct())
     return NS_ERROR_FAILURE;
@@ -1461,7 +1472,7 @@ nsHyperTextAccessible::CutText(PRInt32 aStartPos, PRInt32 aEndPos)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::DeleteText(PRInt32 aStartPos, PRInt32 aEndPos)
+HyperTextAccessible::DeleteText(PRInt32 aStartPos, PRInt32 aEndPos)
 {
   if (IsDefunct())
     return NS_ERROR_FAILURE;
@@ -1476,7 +1487,7 @@ nsHyperTextAccessible::DeleteText(PRInt32 aStartPos, PRInt32 aEndPos)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::PasteText(PRInt32 aPosition)
+HyperTextAccessible::PasteText(PRInt32 aPosition)
 {
   if (IsDefunct())
     return NS_ERROR_FAILURE;
@@ -1491,13 +1502,13 @@ nsHyperTextAccessible::PasteText(PRInt32 aPosition)
 }
 
 already_AddRefed<nsIEditor>
-nsHyperTextAccessible::GetEditor() const
+HyperTextAccessible::GetEditor() const
 {
   if (!mContent->HasFlag(NODE_IS_EDITABLE)) {
     // If we're inside an editable container, then return that container's editor
     Accessible* ancestor = Parent();
     while (ancestor) {
-      nsHyperTextAccessible* hyperText = ancestor->AsHyperText();
+      HyperTextAccessible* hyperText = ancestor->AsHyperText();
       if (hyperText) {
         // Recursion will stop at container doc because it has its own impl
         // of GetEditor()
@@ -1528,7 +1539,7 @@ nsHyperTextAccessible::GetEditor() const
   */
 
 nsresult
-nsHyperTextAccessible::SetSelectionRange(PRInt32 aStartPos, PRInt32 aEndPos)
+HyperTextAccessible::SetSelectionRange(PRInt32 aStartPos, PRInt32 aEndPos)
 {
   bool isFocusable = State() & states::FOCUSABLE;
 
@@ -1581,7 +1592,7 @@ nsHyperTextAccessible::SetSelectionRange(PRInt32 aStartPos, PRInt32 aEndPos)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::SetCaretOffset(PRInt32 aCaretOffset)
+HyperTextAccessible::SetCaretOffset(PRInt32 aCaretOffset)
 {
   return SetSelectionRange(aCaretOffset, aCaretOffset);
 }
@@ -1590,7 +1601,7 @@ nsHyperTextAccessible::SetCaretOffset(PRInt32 aCaretOffset)
  * Gets the offset position of the caret (cursor).
  */
 NS_IMETHODIMP
-nsHyperTextAccessible::GetCaretOffset(PRInt32 *aCaretOffset)
+HyperTextAccessible::GetCaretOffset(PRInt32* aCaretOffset)
 {
   NS_ENSURE_ARG_POINTER(aCaretOffset);
   *aCaretOffset = -1;
@@ -1647,7 +1658,7 @@ nsHyperTextAccessible::GetCaretOffset(PRInt32 *aCaretOffset)
 }
 
 PRInt32
-nsHyperTextAccessible::CaretLineNumber()
+HyperTextAccessible::CaretLineNumber()
 {
   // Provide the line number for the caret, relative to the
   // currently focused node. Use a 1-based index
@@ -1714,15 +1725,15 @@ nsHyperTextAccessible::CaretLineNumber()
 }
 
 already_AddRefed<nsFrameSelection>
-nsHyperTextAccessible::FrameSelection()
+HyperTextAccessible::FrameSelection()
 {
   nsIFrame* frame = GetFrame();
   return frame ? frame->GetFrameSelection() : nsnull;
 }
 
 void
-nsHyperTextAccessible::GetSelectionDOMRanges(PRInt16 aType,
-                                             nsTArray<nsRange*>* aRanges)
+HyperTextAccessible::GetSelectionDOMRanges(PRInt16 aType,
+                                           nsTArray<nsRange*>* aRanges)
 {
   nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
   if (!frameSelection)
@@ -1765,7 +1776,7 @@ nsHyperTextAccessible::GetSelectionDOMRanges(PRInt16 aType,
  * Gets the number of selected regions.
  */
 NS_IMETHODIMP
-nsHyperTextAccessible::GetSelectionCount(PRInt32* aSelectionCount)
+HyperTextAccessible::GetSelectionCount(PRInt32* aSelectionCount)
 {
   NS_ENSURE_ARG_POINTER(aSelectionCount);
   *aSelectionCount = 0;
@@ -1781,9 +1792,9 @@ nsHyperTextAccessible::GetSelectionCount(PRInt32* aSelectionCount)
  * Gets the start and end offset of the specified selection.
  */
 NS_IMETHODIMP
-nsHyperTextAccessible::GetSelectionBounds(PRInt32 aSelectionNum,
-                                          PRInt32* aStartOffset,
-                                          PRInt32* aEndOffset)
+HyperTextAccessible::GetSelectionBounds(PRInt32 aSelectionNum,
+                                        PRInt32* aStartOffset,
+                                        PRInt32* aEndOffset)
 {
   NS_ENSURE_ARG_POINTER(aStartOffset);
   NS_ENSURE_ARG_POINTER(aEndOffset);
@@ -1830,9 +1841,9 @@ nsHyperTextAccessible::GetSelectionBounds(PRInt32 aSelectionNum,
  * Changes the start and end offset of the specified selection.
  */
 NS_IMETHODIMP
-nsHyperTextAccessible::SetSelectionBounds(PRInt32 aSelectionNum,
-                                          PRInt32 aStartOffset,
-                                          PRInt32 aEndOffset)
+HyperTextAccessible::SetSelectionBounds(PRInt32 aSelectionNum,
+                                        PRInt32 aStartOffset,
+                                        PRInt32 aEndOffset)
 {
   nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
   NS_ENSURE_STATE(frameSelection);
@@ -1887,7 +1898,7 @@ nsHyperTextAccessible::SetSelectionBounds(PRInt32 aSelectionNum,
  * Adds a selection bounded by the specified offsets.
  */
 NS_IMETHODIMP
-nsHyperTextAccessible::AddSelection(PRInt32 aStartOffset, PRInt32 aEndOffset)
+HyperTextAccessible::AddSelection(PRInt32 aStartOffset, PRInt32 aEndOffset)
 {
   nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
   NS_ENSURE_STATE(frameSelection);
@@ -1906,7 +1917,7 @@ nsHyperTextAccessible::AddSelection(PRInt32 aStartOffset, PRInt32 aEndOffset)
  * Removes the specified selection.
  */
 NS_IMETHODIMP
-nsHyperTextAccessible::RemoveSelection(PRInt32 aSelectionNum)
+HyperTextAccessible::RemoveSelection(PRInt32 aSelectionNum)
 {
   nsRefPtr<nsFrameSelection> frameSelection = FrameSelection();
   NS_ENSURE_STATE(frameSelection);
@@ -1929,8 +1940,8 @@ nsHyperTextAccessible::RemoveSelection(PRInt32 aSelectionNum)
 //   scrollSubstringTo(in long startIndex, in long endIndex,
 //                     in unsigned long scrollType);
 NS_IMETHODIMP
-nsHyperTextAccessible::ScrollSubstringTo(PRInt32 aStartIndex, PRInt32 aEndIndex,
-                                         PRUint32 aScrollType)
+HyperTextAccessible::ScrollSubstringTo(PRInt32 aStartIndex, PRInt32 aEndIndex,
+                                       PRUint32 aScrollType)
 {
   PRInt32 startOffset, endOffset;
   nsCOMPtr<nsIDOMNode> startNode, endNode;
@@ -1951,10 +1962,10 @@ nsHyperTextAccessible::ScrollSubstringTo(PRInt32 aStartIndex, PRInt32 aEndIndex,
 //                          in unsigned long coordinateType,
 //                          in long x, in long y);
 NS_IMETHODIMP
-nsHyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex,
-                                              PRInt32 aEndIndex,
-                                              PRUint32 aCoordinateType,
-                                              PRInt32 aX, PRInt32 aY)
+HyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex,
+                                            PRInt32 aEndIndex,
+                                            PRUint32 aCoordinateType,
+                                            PRInt32 aX, PRInt32 aY)
 {
   nsIFrame *frame = GetFrame();
   if (!frame)
@@ -2023,7 +2034,7 @@ nsHyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex,
 // Accessible public
 
 nsresult
-nsHyperTextAccessible::GetNameInternal(nsAString& aName)
+HyperTextAccessible::GetNameInternal(nsAString& aName)
 {
   nsresult rv = AccessibleWrap::GetNameInternal(aName);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -2042,7 +2053,7 @@ nsHyperTextAccessible::GetNameInternal(nsAString& aName)
 }
 
 void
-nsHyperTextAccessible::InvalidateChildren()
+HyperTextAccessible::InvalidateChildren()
 {
   mOffsets.Clear();
 
@@ -2050,7 +2061,7 @@ nsHyperTextAccessible::InvalidateChildren()
 }
 
 bool
-nsHyperTextAccessible::RemoveChild(Accessible* aAccessible)
+HyperTextAccessible::RemoveChild(Accessible* aAccessible)
 {
   PRInt32 childIndex = aAccessible->IndexInParent();
   PRInt32 count = mOffsets.Length() - childIndex;
@@ -2061,10 +2072,11 @@ nsHyperTextAccessible::RemoveChild(Accessible* aAccessible)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// nsHyperTextAccessible public static
+// HyperTextAccessible public static
 
-nsresult nsHyperTextAccessible::ContentToRenderedOffset(nsIFrame *aFrame, PRInt32 aContentOffset,
-                                                        PRUint32 *aRenderedOffset)
+nsresult
+HyperTextAccessible::ContentToRenderedOffset(nsIFrame* aFrame, PRInt32 aContentOffset,
+                                             PRUint32* aRenderedOffset)
 {
   if (!aFrame) {
     // Current frame not rendered -- this can happen if text is set on
@@ -2092,8 +2104,9 @@ nsresult nsHyperTextAccessible::ContentToRenderedOffset(nsIFrame *aFrame, PRInt3
   return NS_OK;
 }
 
-nsresult nsHyperTextAccessible::RenderedToContentOffset(nsIFrame *aFrame, PRUint32 aRenderedOffset,
-                                                        PRInt32 *aContentOffset)
+nsresult
+HyperTextAccessible::RenderedToContentOffset(nsIFrame* aFrame, PRUint32 aRenderedOffset,
+                                             PRInt32* aContentOffset)
 {
   *aContentOffset = 0;
   NS_ENSURE_TRUE(aFrame, NS_ERROR_FAILURE);
@@ -2118,12 +2131,12 @@ nsresult nsHyperTextAccessible::RenderedToContentOffset(nsIFrame *aFrame, PRUint
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// nsHyperTextAccessible public
+// HyperTextAccessible public
 
 bool
-nsHyperTextAccessible::GetCharAt(PRInt32 aOffset, EGetTextType aShift,
-                                 nsAString& aChar, PRInt32* aStartOffset,
-                                 PRInt32* aEndOffset)
+HyperTextAccessible::GetCharAt(PRInt32 aOffset, EGetTextType aShift,
+                               nsAString& aChar, PRInt32* aStartOffset,
+                               PRInt32* aEndOffset)
 {
   aChar.Truncate();
 
@@ -2144,8 +2157,8 @@ nsHyperTextAccessible::GetCharAt(PRInt32 aOffset, EGetTextType aShift,
 }
 
 PRInt32
-nsHyperTextAccessible::GetChildOffset(PRUint32 aChildIndex,
-                                      bool aInvalidateAfter)
+HyperTextAccessible::GetChildOffset(PRUint32 aChildIndex,
+                                    bool aInvalidateAfter)
 {
   if (aChildIndex == 0) {
     if (aInvalidateAfter)
@@ -2175,7 +2188,7 @@ nsHyperTextAccessible::GetChildOffset(PRUint32 aChildIndex,
 }
 
 PRInt32
-nsHyperTextAccessible::GetChildIndexAtOffset(PRUint32 aOffset)
+HyperTextAccessible::GetChildIndexAtOffset(PRUint32 aOffset)
 {
   PRUint32 lastOffset = 0;
   PRUint32 offsetCount = mOffsets.Length();
@@ -2216,14 +2229,14 @@ nsHyperTextAccessible::GetChildIndexAtOffset(PRUint32 aOffset)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// nsHyperTextAccessible protected
+// HyperTextAccessible protected
 
 nsresult
-nsHyperTextAccessible::GetDOMPointByFrameOffset(nsIFrame* aFrame,
-                                                PRInt32 aOffset,
-                                                Accessible* aAccessible,
-                                                nsIDOMNode** aNode,
-                                                PRInt32* aNodeOffset)
+HyperTextAccessible::GetDOMPointByFrameOffset(nsIFrame* aFrame,
+                                              PRInt32 aOffset,
+                                              Accessible* aAccessible,
+                                              nsIDOMNode** aNode,
+                                              PRInt32* aNodeOffset)
 {
   NS_ENSURE_ARG(aAccessible);
 
@@ -2268,12 +2281,12 @@ nsHyperTextAccessible::GetDOMPointByFrameOffset(nsIFrame* aFrame,
   return NS_OK;
 }
 
-// nsHyperTextAccessible
+// HyperTextAccessible
 nsresult
-nsHyperTextAccessible::RangeBoundToHypertextOffset(nsRange *aRange,
-                                                   bool aIsStartBound,
-                                                   bool aIsStartHTOffset,
-                                                   PRInt32 *aHTOffset)
+HyperTextAccessible::RangeBoundToHypertextOffset(nsRange* aRange,
+                                                 bool aIsStartBound,
+                                                 bool aIsStartHTOffset,
+                                                 PRInt32* aHTOffset)
 {
   nsINode* node = nsnull;
   PRInt32 nodeOffset = 0;
@@ -2295,13 +2308,13 @@ nsHyperTextAccessible::RangeBoundToHypertextOffset(nsRange *aRange,
   return NS_OK;
 }
 
-// nsHyperTextAccessible
+// HyperTextAccessible
 nsresult
-nsHyperTextAccessible::GetSpellTextAttribute(nsINode* aNode,
-                                             PRInt32 aNodeOffset,
-                                             PRInt32 *aHTStartOffset,
-                                             PRInt32 *aHTEndOffset,
-                                             nsIPersistentProperties *aAttributes)
+HyperTextAccessible::GetSpellTextAttribute(nsINode* aNode,
+                                           PRInt32 aNodeOffset,
+                                           PRInt32* aHTStartOffset,
+                                           PRInt32* aHTEndOffset,
+                                           nsIPersistentProperties* aAttributes)
 {
   nsTArray<nsRange*> ranges;
   GetSelectionDOMRanges(nsISelectionController::SELECTION_SPELLCHECK, &ranges);
@@ -2372,7 +2385,7 @@ nsHyperTextAccessible::GetSpellTextAttribute(nsINode* aNode,
 }
 
 bool 
-nsHyperTextAccessible::IsTextRole()
+HyperTextAccessible::IsTextRole()
 {
   if (mRoleMapEntry &&
       (mRoleMapEntry->role == roles::GRAPHIC ||
diff --git a/accessible/src/html/nsHyperTextAccessible.h b/accessible/src/generic/HyperTextAccessible.h
similarity index 94%
rename from accessible/src/html/nsHyperTextAccessible.h
rename to accessible/src/generic/HyperTextAccessible.h
index 08ec9bfc65c9..bf0a4b6c1c01 100644
--- a/accessible/src/html/nsHyperTextAccessible.h
+++ b/accessible/src/generic/HyperTextAccessible.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef _nsHyperTextAccessible_H_
-#define _nsHyperTextAccessible_H_
+#ifndef mozilla_a11y_HyperTextAccessible_h__
+#define mozilla_a11y_HyperTextAccessible_h__
 
 #include "nsIAccessibleText.h"
 #include "nsIAccessibleHyperText.h"
@@ -35,14 +35,14 @@ const PRUnichar kForcedNewLineChar = '\n';
 /**
   * Special Accessible that knows how contain both text and embedded objects
   */
-class nsHyperTextAccessible : public AccessibleWrap,
-                              public nsIAccessibleText,
-                              public nsIAccessibleHyperText,
-                              public nsIAccessibleEditableText
+class HyperTextAccessible : public AccessibleWrap,
+                            public nsIAccessibleText,
+                            public nsIAccessibleHyperText,
+                            public nsIAccessibleEditableText
 {
 public:
-  nsHyperTextAccessible(nsIContent* aContent, DocAccessible* aDoc);
-  virtual ~nsHyperTextAccessible() { }
+  HyperTextAccessible(nsIContent* aContent, DocAccessible* aDoc);
+  virtual ~HyperTextAccessible() { }
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIACCESSIBLETEXT
@@ -60,7 +60,7 @@ public:
   virtual void InvalidateChildren();
   virtual bool RemoveChild(Accessible* aAccessible);
 
-  // nsHyperTextAccessible (static helper method)
+  // HyperTextAccessible (static helper method)
 
   // Convert content offset to rendered text offset  
   static nsresult ContentToRenderedOffset(nsIFrame *aFrame, PRInt32 aContentOffset,
@@ -107,7 +107,7 @@ public:
   }
 
   //////////////////////////////////////////////////////////////////////////////
-  // nsHyperTextAccessible: DOM point to text offset conversions.
+  // HyperTextAccessible: DOM point to text offset conversions.
 
   /**
     * Turn a DOM Node and offset into a character offset into this hypertext.
@@ -121,7 +121,7 @@ public:
     *                      if >=0 and aNode is text, this represents a char offset
     *                      if >=0 and aNode is not text, this represents a child node offset
     * @param aResultOffset - the character offset into the current
-    *                        nsHyperTextAccessible
+    *                        HyperTextAccessible
     * @param aIsEndOffset - if true, then then this offset is not inclusive. The character
     *                       indicated by the offset returned is at [offset - 1]. This means
     *                       if the passed-in offset is really in a descendant, then the offset returned
@@ -131,7 +131,7 @@ public:
     *                       descendant, then the returned offset will be on the relevant embedded object char.
     *
     * @return               the accessible child which contained the offset, if
-    *                       it is within the current nsHyperTextAccessible,
+    *                       it is within the current HyperTextAccessible,
     *                       otherwise nsnull
     */
   Accessible* DOMPointToHypertextOffset(nsINode *aNode,
@@ -261,7 +261,7 @@ public:
   virtual already_AddRefed<nsIEditor> GetEditor() const;
 
 protected:
-  // nsHyperTextAccessible
+  // HyperTextAccessible
 
   /**
    * Transform magic offset into text offset.
@@ -410,19 +410,19 @@ private:
   nsTArray<PRUint32> mOffsets;
 };
 
-NS_DEFINE_STATIC_IID_ACCESSOR(nsHyperTextAccessible,
+NS_DEFINE_STATIC_IID_ACCESSOR(HyperTextAccessible,
                               NS_HYPERTEXTACCESSIBLE_IMPL_CID)
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // Accessible downcasting method
 
-inline nsHyperTextAccessible*
+inline HyperTextAccessible*
 Accessible::AsHyperText()
 {
   return mFlags & eHyperTextAccessible ?
-    static_cast<nsHyperTextAccessible*>(this) : nsnull;
+    static_cast<HyperTextAccessible*>(this) : nsnull;
 }
 
-#endif  // _nsHyperTextAccessible_H_
+#endif
 
diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in
index c671722a92d3..383c679a7457 100644
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -20,10 +20,12 @@ CPPSRCS = \
   ARIAGridAccessible.cpp \
   DocAccessible.cpp \
   FormControlAccessible.cpp \
+  HyperTextAccessible.cpp \
   OuterDocAccessible.cpp \
   RootAccessible.cpp \
   TextLeafAccessible.cpp \
   $(NULL)
+
 EXPORTS_NAMESPACES = mozilla/a11y
 
 EXPORTS_mozilla/a11y = \
diff --git a/accessible/src/html/HTMLFormControlAccessible.cpp b/accessible/src/html/HTMLFormControlAccessible.cpp
index 5333998bea5b..0853943c898b 100644
--- a/accessible/src/html/HTMLFormControlAccessible.cpp
+++ b/accessible/src/html/HTMLFormControlAccessible.cpp
@@ -204,7 +204,7 @@ HTMLRadioButtonAccessible::GetPositionAndSizeInternal(PRInt32* aPosInSet,
 
 HTMLButtonAccessible::
   HTMLButtonAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -237,7 +237,7 @@ HTMLButtonAccessible::DoAction(PRUint8 aIndex)
 PRUint64
 HTMLButtonAccessible::State()
 {
-  PRUint64 state = nsHyperTextAccessibleWrap::State();
+  PRUint64 state = HyperTextAccessibleWrap::State();
   if (state == states::DEFUNCT)
     return state;
 
@@ -256,7 +256,7 @@ HTMLButtonAccessible::State()
 PRUint64
 HTMLButtonAccessible::NativeState()
 {
-  PRUint64 state = nsHyperTextAccessibleWrap::NativeState();
+  PRUint64 state = HyperTextAccessibleWrap::NativeState();
 
   nsEventStates elmState = mContent->AsElement()->State();
   if (elmState.HasState(NS_EVENT_STATE_DEFAULT))
@@ -320,13 +320,13 @@ HTMLButtonAccessible::IsWidget() const
 
 HTMLTextFieldAccessible::
   HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
 NS_IMPL_ISUPPORTS_INHERITED3(HTMLTextFieldAccessible,
                              Accessible,
-                             nsHyperTextAccessible,
+                             HyperTextAccessible,
                              nsIAccessibleText,
                              nsIAccessibleEditableText)
 
@@ -393,7 +393,7 @@ HTMLTextFieldAccessible::Value(nsString& aValue)
 void
 HTMLTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
 {
-  nsHyperTextAccessibleWrap::ApplyARIAState(aState);
+  HyperTextAccessibleWrap::ApplyARIAState(aState);
 
   aria::MapToState(aria::eARIAAutoComplete, mContent->AsElement(), aState);
 }
@@ -401,7 +401,7 @@ HTMLTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
 PRUint64
 HTMLTextFieldAccessible::State()
 {
-  PRUint64 state = nsHyperTextAccessibleWrap::State();
+  PRUint64 state = HyperTextAccessibleWrap::State();
   if (state & states::DEFUNCT)
     return state;
 
@@ -420,7 +420,7 @@ HTMLTextFieldAccessible::State()
 PRUint64
 HTMLTextFieldAccessible::NativeState()
 {
-  PRUint64 state = nsHyperTextAccessibleWrap::NativeState();
+  PRUint64 state = HyperTextAccessibleWrap::NativeState();
 
   // can be focusable, focused, protected. readonly, unavailable, selected
   if (mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::type,
@@ -557,7 +557,7 @@ HTMLTextFieldAccessible::ContainerWidget() const
 
 HTMLFileInputAccessible::
 HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
   mFlags |= eHTMLFileInputAccessible;
 }
@@ -573,7 +573,7 @@ HTMLFileInputAccessible::NativeRole()
 nsresult
 HTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent)
 {
-  nsresult rv = nsHyperTextAccessibleWrap::HandleAccEvent(aEvent);
+  nsresult rv = HyperTextAccessibleWrap::HandleAccEvent(aEvent);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Redirect state change events for inherited states to child controls. Note,
@@ -612,7 +612,7 @@ HTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent)
 
 HTMLGroupboxAccessible::
   HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -658,7 +658,7 @@ HTMLGroupboxAccessible::GetNameInternal(nsAString& aName)
 Relation
 HTMLGroupboxAccessible::RelationByType(PRUint32 aType)
 {
-  Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType);
+  Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
     // No override for label, so use <legend> for this <fieldset>
   if (aType == nsIAccessibleRelation::RELATION_LABELLED_BY)
     rel.AppendTarget(mDoc, GetLegend());
@@ -672,14 +672,14 @@ HTMLGroupboxAccessible::RelationByType(PRUint32 aType)
 
 HTMLLegendAccessible::
   HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
 Relation
 HTMLLegendAccessible::RelationByType(PRUint32 aType)
 {
-  Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType);
+  Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
   if (aType != nsIAccessibleRelation::RELATION_LABEL_FOR)
     return rel;
 
@@ -702,14 +702,14 @@ HTMLLegendAccessible::NativeRole()
 
 HTMLFigureAccessible::
   HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
 nsresult
 HTMLFigureAccessible::GetAttributesInternal(nsIPersistentProperties* aAttributes)
 {
-  nsresult rv = nsHyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
+  nsresult rv = HyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Expose figure xml-role.
@@ -727,7 +727,7 @@ HTMLFigureAccessible::NativeRole()
 nsresult
 HTMLFigureAccessible::GetNameInternal(nsAString& aName)
 {
-  nsresult rv = nsHyperTextAccessibleWrap::GetNameInternal(aName);
+  nsresult rv = HyperTextAccessibleWrap::GetNameInternal(aName);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (!aName.IsEmpty())
@@ -745,7 +745,7 @@ HTMLFigureAccessible::GetNameInternal(nsAString& aName)
 Relation
 HTMLFigureAccessible::RelationByType(PRUint32 aType)
 {
-  Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType);
+  Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
   if (aType == nsIAccessibleRelation::RELATION_LABELLED_BY)
     rel.AppendTarget(mDoc, Caption());
 
@@ -772,7 +772,7 @@ HTMLFigureAccessible::Caption() const
 
 HTMLFigcaptionAccessible::
   HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -785,7 +785,7 @@ HTMLFigcaptionAccessible::NativeRole()
 Relation
 HTMLFigcaptionAccessible::RelationByType(PRUint32 aType)
 {
-  Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType);
+  Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
   if (aType != nsIAccessibleRelation::RELATION_LABEL_FOR)
     return rel;
 
diff --git a/accessible/src/html/HTMLFormControlAccessible.h b/accessible/src/html/HTMLFormControlAccessible.h
index 6deb55d83396..21f9f6329ffd 100644
--- a/accessible/src/html/HTMLFormControlAccessible.h
+++ b/accessible/src/html/HTMLFormControlAccessible.h
@@ -7,7 +7,7 @@
 #define MOZILLA_A11Y_HTMLFormControlAccessible_H_
 
 #include "FormControlAccessible.h"
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 
 namespace mozilla {
 namespace a11y {
@@ -64,7 +64,7 @@ public:
  * Accessible for HTML input@type="button", @type="submit", @type="image"
  * and HTML button elements.
  */
-class HTMLButtonAccessible : public nsHyperTextAccessibleWrap
+class HTMLButtonAccessible : public HyperTextAccessibleWrap
 {
 
 public:
@@ -93,7 +93,7 @@ public:
 /**
  * Accessible for HTML input@type="text" element.
  */
-class HTMLTextFieldAccessible : public nsHyperTextAccessibleWrap
+class HTMLTextFieldAccessible : public HyperTextAccessibleWrap
 {
 
 public:
@@ -107,7 +107,7 @@ public:
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
   NS_IMETHOD DoAction(PRUint8 index);
 
-  // nsHyperTextAccessible
+  // HyperTextAccessible
   virtual already_AddRefed<nsIEditor> GetEditor() const;
 
   // Accessible
@@ -130,7 +130,7 @@ public:
 /**
  * Accessible for input@type="file" element.
  */
-class HTMLFileInputAccessible : public nsHyperTextAccessibleWrap
+class HTMLFileInputAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLFileInputAccessible(nsIContent* aContent, DocAccessible* aDoc);
@@ -143,7 +143,7 @@ public:
 /**
  * Accessible for HTML fieldset element.
  */
-class HTMLGroupboxAccessible : public nsHyperTextAccessibleWrap
+class HTMLGroupboxAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLGroupboxAccessible(nsIContent* aContent, DocAccessible* aDoc);
@@ -161,7 +161,7 @@ protected:
 /**
  * Accessible for HTML legend element.
  */
-class HTMLLegendAccessible : public nsHyperTextAccessibleWrap
+class HTMLLegendAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLLegendAccessible(nsIContent* aContent, DocAccessible* aDoc);
@@ -174,7 +174,7 @@ public:
 /**
  * Accessible for HTML5 figure element.
  */
-class HTMLFigureAccessible : public nsHyperTextAccessibleWrap
+class HTMLFigureAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLFigureAccessible(nsIContent* aContent, DocAccessible* aDoc);
@@ -193,7 +193,7 @@ protected:
 /**
  * Accessible for HTML5 figcaption element.
  */
-class HTMLFigcaptionAccessible : public nsHyperTextAccessibleWrap
+class HTMLFigcaptionAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLFigcaptionAccessible(nsIContent* aContent, DocAccessible* aDoc);
diff --git a/accessible/src/html/HTMLListAccessible.cpp b/accessible/src/html/HTMLListAccessible.cpp
index bf0b74e24fcb..aef759281784 100644
--- a/accessible/src/html/HTMLListAccessible.cpp
+++ b/accessible/src/html/HTMLListAccessible.cpp
@@ -20,7 +20,7 @@ using namespace mozilla::a11y;
 // HTMLListAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLListAccessible, nsHyperTextAccessible)
+NS_IMPL_ISUPPORTS_INHERITED0(HTMLListAccessible, HyperTextAccessible)
 
 role
 HTMLListAccessible::NativeRole()
@@ -34,7 +34,7 @@ HTMLListAccessible::NativeRole()
 PRUint64
 HTMLListAccessible::NativeState()
 {
-  return nsHyperTextAccessibleWrap::NativeState() | states::READONLY;
+  return HyperTextAccessibleWrap::NativeState() | states::READONLY;
 }
 
 
@@ -44,7 +44,7 @@ HTMLListAccessible::NativeState()
 
 HTMLLIAccessible::
   HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc), mBullet(nsnull)
+  HyperTextAccessibleWrap(aContent, aDoc), mBullet(nsnull)
 {
   mFlags |= eHTMLListItemAccessible;
 
@@ -56,14 +56,14 @@ HTMLLIAccessible::
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLLIAccessible, nsHyperTextAccessible)
+NS_IMPL_ISUPPORTS_INHERITED0(HTMLLIAccessible, HyperTextAccessible)
 
 void
 HTMLLIAccessible::Shutdown()
 {
   mBullet = nsnull;
 
-  nsHyperTextAccessibleWrap::Shutdown();
+  HyperTextAccessibleWrap::Shutdown();
 }
 
 role
@@ -78,7 +78,7 @@ HTMLLIAccessible::NativeRole()
 PRUint64
 HTMLLIAccessible::NativeState()
 {
-  return nsHyperTextAccessibleWrap::NativeState() | states::READONLY;
+  return HyperTextAccessibleWrap::NativeState() | states::READONLY;
 }
 
 NS_IMETHODIMP
diff --git a/accessible/src/html/HTMLListAccessible.h b/accessible/src/html/HTMLListAccessible.h
index a840fb9a2ab3..fb4e3ad32f2e 100644
--- a/accessible/src/html/HTMLListAccessible.h
+++ b/accessible/src/html/HTMLListAccessible.h
@@ -7,7 +7,7 @@
 #ifndef mozilla_a11y_HTMLListAccessible_h__
 #define mozilla_a11y_HTMLListAccessible_h__
 
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 #include "nsBaseWidgetAccessible.h"
 
 namespace mozilla {
@@ -18,11 +18,11 @@ class HTMLListBulletAccessible;
 /**
  * Used for HTML list (like HTML ul).
  */
-class HTMLListAccessible : public nsHyperTextAccessibleWrap
+class HTMLListAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLListAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-    nsHyperTextAccessibleWrap(aContent, aDoc) { }
+    HyperTextAccessibleWrap(aContent, aDoc) { }
   virtual ~HTMLListAccessible() { }
 
   // nsISupports
@@ -37,7 +37,7 @@ public:
 /**
  * Used for HTML list item (e.g. HTML li).
  */
-class HTMLLIAccessible : public nsHyperTextAccessibleWrap
+class HTMLLIAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc);
diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in
index e45427eef5a5..9ed1155b4925 100644
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -26,11 +26,6 @@ CPPSRCS = \
   nsHTMLSelectAccessible.cpp \
   nsHTMLTableAccessible.cpp \
   nsHTMLTextAccessible.cpp \
-  nsHyperTextAccessible.cpp \
-  $(NULL)
-
-EXPORTS = \
-  nsHyperTextAccessible.h \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
diff --git a/accessible/src/html/nsHTMLCanvasAccessible.cpp b/accessible/src/html/nsHTMLCanvasAccessible.cpp
index 6ffdcc99adde..c3d25adc1304 100644
--- a/accessible/src/html/nsHTMLCanvasAccessible.cpp
+++ b/accessible/src/html/nsHTMLCanvasAccessible.cpp
@@ -11,7 +11,7 @@ using namespace mozilla::a11y;
 
 nsHTMLCanvasAccessible::
   nsHTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessible(aContent, aDoc)
+  HyperTextAccessible(aContent, aDoc)
 {
 }
 
diff --git a/accessible/src/html/nsHTMLCanvasAccessible.h b/accessible/src/html/nsHTMLCanvasAccessible.h
index 8ed4ae4fdbf8..8b79bc1686d5 100644
--- a/accessible/src/html/nsHTMLCanvasAccessible.h
+++ b/accessible/src/html/nsHTMLCanvasAccessible.h
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
 #ifndef _nsHTMLCanvasAccessible_H_
 #define _nsHTMLCanvasAccessible_H_
@@ -11,7 +11,7 @@
 /**
  * HTML canvas accessible (html:canvas).
  */
-class nsHTMLCanvasAccessible : public nsHyperTextAccessible
+class nsHTMLCanvasAccessible : public HyperTextAccessible
 {
 public:
   nsHTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc);
diff --git a/accessible/src/html/nsHTMLLinkAccessible.cpp b/accessible/src/html/nsHTMLLinkAccessible.cpp
index 8d06b9daefc5..4bbb2459cf2b 100644
--- a/accessible/src/html/nsHTMLLinkAccessible.cpp
+++ b/accessible/src/html/nsHTMLLinkAccessible.cpp
@@ -22,12 +22,12 @@ using namespace mozilla::a11y;
 
 nsHTMLLinkAccessible::
   nsHTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
 // Expose nsIAccessibleHyperLink unconditionally
-NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLLinkAccessible, nsHyperTextAccessibleWrap,
+NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLLinkAccessible, HyperTextAccessibleWrap,
                              nsIAccessibleHyperLink)
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@ nsHTMLLinkAccessible::NativeRole()
 PRUint64
 nsHTMLLinkAccessible::NativeState()
 {
-  PRUint64 states = nsHyperTextAccessibleWrap::NativeState();
+  PRUint64 states = HyperTextAccessibleWrap::NativeState();
 
   states  &= ~states::READONLY;
 
@@ -77,7 +77,7 @@ nsHTMLLinkAccessible::Value(nsString& aValue)
 {
   aValue.Truncate();
 
-  nsHyperTextAccessible::Value(aValue);
+  HyperTextAccessible::Value(aValue);
   if (aValue.IsEmpty())
     nsContentUtils::GetLinkLocation(mContent->AsElement(), aValue);
 }
@@ -85,7 +85,7 @@ nsHTMLLinkAccessible::Value(nsString& aValue)
 PRUint8
 nsHTMLLinkAccessible::ActionCount()
 {
-  return IsLinked() ? 1 : nsHyperTextAccessible::ActionCount();
+  return IsLinked() ? 1 : HyperTextAccessible::ActionCount();
 }
 
 NS_IMETHODIMP
@@ -94,7 +94,7 @@ nsHTMLLinkAccessible::GetActionName(PRUint8 aIndex, nsAString& aName)
   aName.Truncate();
 
   if (!IsLinked())
-    return nsHyperTextAccessible::GetActionName(aIndex, aName);
+    return HyperTextAccessible::GetActionName(aIndex, aName);
 
   // Action 0 (default action): Jump to link
   if (aIndex != eAction_Jump)
@@ -108,7 +108,7 @@ NS_IMETHODIMP
 nsHTMLLinkAccessible::DoAction(PRUint8 aIndex)
 {
   if (!IsLinked())
-    return nsHyperTextAccessible::DoAction(aIndex);
+    return HyperTextAccessible::DoAction(aIndex);
 
   // Action 0 (default action): Jump to link
   if (aIndex != eAction_Jump)
diff --git a/accessible/src/html/nsHTMLLinkAccessible.h b/accessible/src/html/nsHTMLLinkAccessible.h
index 3d6db0a6315f..c0f8db3ad8d6 100644
--- a/accessible/src/html/nsHTMLLinkAccessible.h
+++ b/accessible/src/html/nsHTMLLinkAccessible.h
@@ -6,9 +6,9 @@
 #ifndef _nsHTMLLinkAccessible_H_
 #define _nsHTMLLinkAccessible_H_
 
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 
-class nsHTMLLinkAccessible : public nsHyperTextAccessibleWrap
+class nsHTMLLinkAccessible : public HyperTextAccessibleWrap
 {
 public:
   nsHTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc);
diff --git a/accessible/src/html/nsHTMLSelectAccessible.cpp b/accessible/src/html/nsHTMLSelectAccessible.cpp
index 6796b4f6342b..fb0cd64fd8f6 100644
--- a/accessible/src/html/nsHTMLSelectAccessible.cpp
+++ b/accessible/src/html/nsHTMLSelectAccessible.cpp
@@ -174,7 +174,7 @@ nsHTMLSelectListAccessible::CacheOptSiblings(nsIContent *aParentContent)
 
 nsHTMLSelectOptionAccessible::
   nsHTMLSelectOptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -225,7 +225,7 @@ nsHTMLSelectOptionAccessible::NativeState()
 {
   // As a nsHTMLSelectOptionAccessible we can have the following states:
   // SELECTABLE, SELECTED, FOCUSED, FOCUSABLE, OFFSCREEN
-  // Upcall to Accessible, but skip nsHyperTextAccessible impl
+  // Upcall to Accessible, but skip HyperTextAccessible impl
   // because we don't want EDITABLE or SELECTABLE_TEXT
   PRUint64 state = Accessible::NativeState();
 
@@ -307,7 +307,7 @@ nsHTMLSelectOptionAccessible::GetBoundsRect(nsRect& aTotalBounds,
   if (combobox && (combobox->State() & states::COLLAPSED))
     combobox->GetBoundsRect(aTotalBounds, aBoundingFrame);
   else
-    nsHyperTextAccessibleWrap::GetBoundsRect(aTotalBounds, aBoundingFrame);
+    HyperTextAccessibleWrap::GetBoundsRect(aTotalBounds, aBoundingFrame);
 }
 
 /** select us! close combo box if necessary*/
diff --git a/accessible/src/html/nsHTMLSelectAccessible.h b/accessible/src/html/nsHTMLSelectAccessible.h
index 9758e23991b7..44429a1c964a 100644
--- a/accessible/src/html/nsHTMLSelectAccessible.h
+++ b/accessible/src/html/nsHTMLSelectAccessible.h
@@ -69,7 +69,7 @@ protected:
 /*
  * Options inside the select, contained within the list
  */
-class nsHTMLSelectOptionAccessible : public nsHyperTextAccessibleWrap
+class nsHTMLSelectOptionAccessible : public HyperTextAccessibleWrap
 {
 public:
   enum { eAction_Select = 0 };  
diff --git a/accessible/src/html/nsHTMLTableAccessible.cpp b/accessible/src/html/nsHTMLTableAccessible.cpp
index ea1f12cbeaba..a5d7237fc480 100644
--- a/accessible/src/html/nsHTMLTableAccessible.cpp
+++ b/accessible/src/html/nsHTMLTableAccessible.cpp
@@ -44,7 +44,7 @@ using namespace mozilla::a11y;
 
 nsHTMLTableCellAccessible::
   nsHTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -52,7 +52,7 @@ nsHTMLTableCellAccessible::
 // nsHTMLTableCellAccessible: nsISupports implementation
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLTableCellAccessible,
-                             nsHyperTextAccessible,
+                             HyperTextAccessible,
                              nsIAccessibleTableCell)
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ nsHTMLTableCellAccessible::NativeRole()
 PRUint64
 nsHTMLTableCellAccessible::NativeState()
 {
-  PRUint64 state = nsHyperTextAccessibleWrap::NativeState();
+  PRUint64 state = HyperTextAccessibleWrap::NativeState();
 
   nsIFrame *frame = mContent->GetPrimaryFrame();
   NS_ASSERTION(frame, "No frame for valid cell accessible!");
@@ -87,7 +87,7 @@ nsHTMLTableCellAccessible::GetAttributesInternal(nsIPersistentProperties *aAttri
   if (IsDefunct())
     return NS_ERROR_FAILURE;
 
-  nsresult rv = nsHyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
+  nsresult rv = HyperTextAccessibleWrap::GetAttributesInternal(aAttributes);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // table-cell-index attribute
@@ -1512,7 +1512,7 @@ nsHTMLTableAccessible::IsProbablyLayoutTable()
 Relation
 nsHTMLCaptionAccessible::RelationByType(PRUint32 aType)
 {
-  Relation rel = nsHyperTextAccessible::RelationByType(aType);
+  Relation rel = HyperTextAccessible::RelationByType(aType);
   if (aType == nsIAccessibleRelation::RELATION_LABEL_FOR)
     rel.AppendTarget(Parent());
 
diff --git a/accessible/src/html/nsHTMLTableAccessible.h b/accessible/src/html/nsHTMLTableAccessible.h
index 3d83e766fced..e10dd939adaa 100644
--- a/accessible/src/html/nsHTMLTableAccessible.h
+++ b/accessible/src/html/nsHTMLTableAccessible.h
@@ -6,7 +6,7 @@
 #ifndef _nsHTMLTableAccessible_H_
 #define _nsHTMLTableAccessible_H_
 
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 #include "nsIAccessibleTable.h"
 #include "TableAccessible.h"
 #include "xpcAccessibleTable.h"
@@ -17,7 +17,7 @@ class nsITableCellLayout;
 /**
  * HTML table cell accessible (html:td).
  */
-class nsHTMLTableCellAccessible : public nsHyperTextAccessibleWrap,
+class nsHTMLTableCellAccessible : public HyperTextAccessibleWrap,
                                   public nsIAccessibleTableCell
 {
 public:
@@ -178,11 +178,11 @@ protected:
 /**
  * HTML caption accessible (html:caption).
  */
-class nsHTMLCaptionAccessible : public nsHyperTextAccessibleWrap
+class nsHTMLCaptionAccessible : public HyperTextAccessibleWrap
 {
 public:
   nsHTMLCaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-    nsHyperTextAccessibleWrap(aContent, aDoc) { }
+    HyperTextAccessibleWrap(aContent, aDoc) { }
   virtual ~nsHTMLCaptionAccessible() { }
 
   // nsIAccessible
diff --git a/accessible/src/html/nsHTMLTextAccessible.cpp b/accessible/src/html/nsHTMLTextAccessible.cpp
index da1f4bb53b9a..9fb55e3103b9 100644
--- a/accessible/src/html/nsHTMLTextAccessible.cpp
+++ b/accessible/src/html/nsHTMLTextAccessible.cpp
@@ -67,11 +67,11 @@ nsHTMLBRAccessible::GetNameInternal(nsAString& aName)
 
 nsHTMLLabelAccessible::
   nsHTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLLabelAccessible, nsHyperTextAccessible)
+NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLLabelAccessible, HyperTextAccessible)
 
 nsresult
 nsHTMLLabelAccessible::GetNameInternal(nsAString& aName)
@@ -91,11 +91,11 @@ nsHTMLLabelAccessible::NativeRole()
 
 nsHTMLOutputAccessible::
   nsHTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLOutputAccessible, nsHyperTextAccessible)
+NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLOutputAccessible, HyperTextAccessible)
 
 Relation
 nsHTMLOutputAccessible::RelationByType(PRUint32 aType)
diff --git a/accessible/src/html/nsHTMLTextAccessible.h b/accessible/src/html/nsHTMLTextAccessible.h
index 46a2075253db..717d70d123b4 100644
--- a/accessible/src/html/nsHTMLTextAccessible.h
+++ b/accessible/src/html/nsHTMLTextAccessible.h
@@ -38,7 +38,7 @@ public:
 /**
  * Used for HTML label element.
  */
-class nsHTMLLabelAccessible : public nsHyperTextAccessibleWrap
+class nsHTMLLabelAccessible : public HyperTextAccessibleWrap
 {
 public:
   nsHTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc);
@@ -53,7 +53,7 @@ public:
 /**
  * Used for HTML output element.
  */
-class nsHTMLOutputAccessible : public nsHyperTextAccessibleWrap
+class nsHTMLOutputAccessible : public HyperTextAccessibleWrap
 {
 public:
   nsHTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc);
diff --git a/accessible/src/other/nsHyperTextAccessibleWrap.h b/accessible/src/mac/HyperTextAccessibleWrap.h
similarity index 60%
rename from accessible/src/other/nsHyperTextAccessibleWrap.h
rename to accessible/src/mac/HyperTextAccessibleWrap.h
index f249ad709cb6..a212a53955de 100644
--- a/accessible/src/other/nsHyperTextAccessibleWrap.h
+++ b/accessible/src/mac/HyperTextAccessibleWrap.h
@@ -3,12 +3,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H
-#define _NSHYPERTEXTACCESSIBLEWRAP_H
+#ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
+#define mozilla_a11y_HyperTextAccessibleWrap_h__
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
-typedef class nsHyperTextAccessible nsHyperTextAccessibleWrap;
+typedef class HyperTextAccessible HyperTextAccessibleWrap;
 
 #endif
 
diff --git a/accessible/src/mac/mozHTMLAccessible.mm b/accessible/src/mac/mozHTMLAccessible.mm
index a3c758311ddf..00cbe9eac564 100644
--- a/accessible/src/mac/mozHTMLAccessible.mm
+++ b/accessible/src/mac/mozHTMLAccessible.mm
@@ -7,7 +7,7 @@
 
 #import "mozHTMLAccessible.h"
 
-#import "nsHyperTextAccessible.h"
+#import "HyperTextAccessible.h"
 
 #import "nsCocoaUtils.h"
 
diff --git a/accessible/src/mac/mozTextAccessible.h b/accessible/src/mac/mozTextAccessible.h
index 9cc52c3a460b..d3668f1bbd1f 100644
--- a/accessible/src/mac/mozTextAccessible.h
+++ b/accessible/src/mac/mozTextAccessible.h
@@ -4,13 +4,13 @@
 
 #import "mozAccessible.h"
 
-#import "nsHyperTextAccessible.h"
+#import "HyperTextAccessible.h"
 
 @interface mozTextAccessible : mozAccessible
 {
   // both of these are the same old mGeckoAccessible, but already
   // QI'd for us, to the right type, for convenience.
-  nsHyperTextAccessible     *mGeckoTextAccessible;         // strong
+  HyperTextAccessible *mGeckoTextAccessible; // strong
   nsIAccessibleEditableText *mGeckoEditableTextAccessible; // strong
 }
 @end
diff --git a/accessible/src/msaa/ARIAGridAccessibleWrap.cpp b/accessible/src/msaa/ARIAGridAccessibleWrap.cpp
index 5d3136676528..84fec414bd96 100644
--- a/accessible/src/msaa/ARIAGridAccessibleWrap.cpp
+++ b/accessible/src/msaa/ARIAGridAccessibleWrap.cpp
@@ -30,6 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED0(ARIAGridCellAccessibleWrap,
                              ARIAGridCellAccessible)
 
 IMPL_IUNKNOWN_INHERITED1(ARIAGridCellAccessibleWrap,
-                         nsHyperTextAccessibleWrap,
+                         HyperTextAccessibleWrap,
                          CAccessibleTableCell)
 
diff --git a/accessible/src/msaa/CAccessibleEditableText.cpp b/accessible/src/msaa/CAccessibleEditableText.cpp
index 795ef14e26ae..9f90aa1989a0 100644
--- a/accessible/src/msaa/CAccessibleEditableText.cpp
+++ b/accessible/src/msaa/CAccessibleEditableText.cpp
@@ -8,7 +8,7 @@
 #include "CAccessibleEditableText.h"
 
 #include "AccessibleEditableText_i.c"
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
 #include "nsCOMPtr.h"
 #include "nsString.h"
@@ -38,7 +38,7 @@ STDMETHODIMP
 CAccessibleEditableText::copyText(long aStartOffset, long aEndOffset)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -53,7 +53,7 @@ STDMETHODIMP
 CAccessibleEditableText::deleteText(long aStartOffset, long aEndOffset)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -68,7 +68,7 @@ STDMETHODIMP
 CAccessibleEditableText::insertText(long aOffset, BSTR *aText)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -86,7 +86,7 @@ STDMETHODIMP
 CAccessibleEditableText::cutText(long aStartOffset, long aEndOffset)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -101,7 +101,7 @@ STDMETHODIMP
 CAccessibleEditableText::pasteText(long aOffset)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -117,7 +117,7 @@ CAccessibleEditableText::replaceText(long aStartOffset, long aEndOffset,
                                      BSTR *aText)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
diff --git a/accessible/src/msaa/CAccessibleText.cpp b/accessible/src/msaa/CAccessibleText.cpp
index c1ddc148a205..16ed7ef3281c 100644
--- a/accessible/src/msaa/CAccessibleText.cpp
+++ b/accessible/src/msaa/CAccessibleText.cpp
@@ -10,7 +10,7 @@
 #include "Accessible2.h"
 #include "AccessibleText_i.c"
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
 #include "nsIPersistentProperties2.h"
 
@@ -40,7 +40,7 @@ STDMETHODIMP
 CAccessibleText::addSelection(long aStartOffset, long aEndOffset)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -63,7 +63,7 @@ __try {
   *aEndOffset = 0;
   *aTextAttributes = NULL;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -95,7 +95,7 @@ CAccessibleText::get_caretOffset(long *aOffset)
 __try {
   *aOffset = -1;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -123,7 +123,7 @@ __try {
   *aWidth = 0;
   *aHeight = 0;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -153,7 +153,7 @@ CAccessibleText::get_nSelections(long *aNSelections)
 __try {
   *aNSelections = 0;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -177,7 +177,7 @@ CAccessibleText::get_offsetAtPoint(long aX, long aY,
 __try {
   *aOffset = 0;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -205,7 +205,7 @@ __try {
   *aStartOffset = 0;
   *aEndOffset = 0;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -229,7 +229,7 @@ CAccessibleText::get_text(long aStartOffset, long aEndOffset, BSTR *aText)
 __try {
   *aText = NULL;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -259,7 +259,7 @@ __try {
   *aEndOffset = 0;
   *aText = NULL;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -306,7 +306,7 @@ __try {
   *aEndOffset = 0;
   *aText = NULL;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -353,7 +353,7 @@ __try {
   *aEndOffset = 0;
   *aText = NULL;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -393,7 +393,7 @@ STDMETHODIMP
 CAccessibleText::removeSelection(long aSelectionIndex)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -408,7 +408,7 @@ STDMETHODIMP
 CAccessibleText::setCaretOffset(long aOffset)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -424,7 +424,7 @@ CAccessibleText::setSelection(long aSelectionIndex, long aStartOffset,
                               long aEndOffset)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -442,7 +442,7 @@ CAccessibleText::get_nCharacters(long *aNCharacters)
 __try {
   *aNCharacters = 0;
 
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -458,7 +458,7 @@ CAccessibleText::scrollSubstringTo(long aStartIndex, long aEndIndex,
                                    enum IA2ScrollType aScrollType)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -475,7 +475,7 @@ CAccessibleText::scrollSubstringToPoint(long aStartIndex, long aEndIndex,
                                         long aX, long aY)
 {
 __try {
-  nsRefPtr<nsHyperTextAccessible> textAcc(do_QueryObject(this));
+  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
diff --git a/accessible/src/msaa/DocAccessibleWrap.cpp b/accessible/src/msaa/DocAccessibleWrap.cpp
index 9d283d7c6d3e..90c272b01703 100644
--- a/accessible/src/msaa/DocAccessibleWrap.cpp
+++ b/accessible/src/msaa/DocAccessibleWrap.cpp
@@ -67,7 +67,7 @@ DocAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_ISimpleDOMDocument != iid)
-    return nsHyperTextAccessibleWrap::QueryInterface(iid, ppv);
+    return HyperTextAccessibleWrap::QueryInterface(iid, ppv);
 
   statistics::ISimpleDOMUsed();
   *ppv = static_cast<ISimpleDOMDocument*>(this);
diff --git a/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp b/accessible/src/msaa/HyperTextAccessibleWrap.cpp
similarity index 75%
rename from accessible/src/msaa/nsHyperTextAccessibleWrap.cpp
rename to accessible/src/msaa/HyperTextAccessibleWrap.cpp
index f3987170ec68..3421910fe417 100644
--- a/accessible/src/msaa/nsHyperTextAccessibleWrap.cpp
+++ b/accessible/src/msaa/HyperTextAccessibleWrap.cpp
@@ -5,20 +5,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 
 #include "nsEventShell.h"
 
-NS_IMPL_ISUPPORTS_INHERITED0(nsHyperTextAccessibleWrap,
-                             nsHyperTextAccessible)
+NS_IMPL_ISUPPORTS_INHERITED0(HyperTextAccessibleWrap,
+                             HyperTextAccessible)
 
-IMPL_IUNKNOWN_INHERITED2(nsHyperTextAccessibleWrap,
+IMPL_IUNKNOWN_INHERITED2(HyperTextAccessibleWrap,
                          AccessibleWrap,
                          ia2AccessibleHypertext,
                          CAccessibleEditableText);
 
 nsresult
-nsHyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent)
+HyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent)
 {
   PRUint32 eventType = aEvent->GetEventType();
 
@@ -41,14 +41,14 @@ nsHyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent)
     }
   }
 
-  return nsHyperTextAccessible::HandleAccEvent(aEvent);
+  return HyperTextAccessible::HandleAccEvent(aEvent);
 }
 
 nsresult
-nsHyperTextAccessibleWrap::GetModifiedText(bool aGetInsertedText,
-                                           nsAString& aText,
-                                           PRUint32 *aStartOffset,
-                                           PRUint32 *aEndOffset)
+HyperTextAccessibleWrap::GetModifiedText(bool aGetInsertedText,
+                                         nsAString& aText,
+                                         PRUint32* aStartOffset,
+                                         PRUint32* aEndOffset)
 {
   aText.Truncate();
   *aStartOffset = 0;
diff --git a/accessible/src/msaa/nsHyperTextAccessibleWrap.h b/accessible/src/msaa/HyperTextAccessibleWrap.h
similarity index 65%
rename from accessible/src/msaa/nsHyperTextAccessibleWrap.h
rename to accessible/src/msaa/HyperTextAccessibleWrap.h
index bb3f06c39ce3..fdde2f1b7e52 100644
--- a/accessible/src/msaa/nsHyperTextAccessibleWrap.h
+++ b/accessible/src/msaa/HyperTextAccessibleWrap.h
@@ -5,21 +5,21 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H
-#define _NSHYPERTEXTACCESSIBLEWRAP_H
+#ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
+#define mozilla_a11y_HyperTextAccessibleWrap_h__
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 #include "CAccessibleText.h"
 #include "CAccessibleEditableText.h"
 #include "ia2AccessibleHyperText.h"
 
-class nsHyperTextAccessibleWrap : public nsHyperTextAccessible,
-                                  public ia2AccessibleHypertext,
-                                  public CAccessibleEditableText
+class HyperTextAccessibleWrap : public HyperTextAccessible,
+                                public ia2AccessibleHypertext,
+                                public CAccessibleEditableText
 {
 public:
-  nsHyperTextAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
-    nsHyperTextAccessible(aContent, aDoc) {}
+  HyperTextAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
+    HyperTextAccessible(aContent, aDoc) {}
 
   // IUnknown
   DECL_IUNKNOWN_INHERITED
diff --git a/accessible/src/msaa/Makefile.in b/accessible/src/msaa/Makefile.in
index 43fb963e7b69..b71e5ee314f1 100644
--- a/accessible/src/msaa/Makefile.in
+++ b/accessible/src/msaa/Makefile.in
@@ -20,12 +20,12 @@ CPPSRCS = \
   ApplicationAccessibleWrap.cpp \
   ARIAGridAccessibleWrap.cpp \
   DocAccessibleWrap.cpp \
+  HyperTextAccessibleWrap.cpp \
   nsAccessNodeWrap.cpp \
   nsHTMLWin32ObjectAccessible.cpp \
   nsXULMenuAccessibleWrap.cpp \
   nsXULListboxAccessibleWrap.cpp \
   nsXULTreeGridAccessibleWrap.cpp \
-  nsHyperTextAccessibleWrap.cpp \
   nsHTMLImageAccessibleWrap.cpp \
   nsHTMLTableAccessibleWrap.cpp \
   nsWinUtils.cpp \
diff --git a/accessible/src/msaa/ia2AccessibleHypertext.cpp b/accessible/src/msaa/ia2AccessibleHypertext.cpp
index 196ab5a1e97a..98f82235f51d 100644
--- a/accessible/src/msaa/ia2AccessibleHypertext.cpp
+++ b/accessible/src/msaa/ia2AccessibleHypertext.cpp
@@ -9,7 +9,7 @@
 
 #include "AccessibleHypertext_i.c"
 
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 
 // IUnknown
 
@@ -18,7 +18,7 @@ ia2AccessibleHypertext::QueryInterface(REFIID iid, void** ppv)
 {
   *ppv = NULL;
   if (IID_IAccessibleHypertext == iid) {
-    nsHyperTextAccessibleWrap* hyperAcc = static_cast<nsHyperTextAccessibleWrap*>(this);
+    HyperTextAccessibleWrap* hyperAcc = static_cast<HyperTextAccessibleWrap*>(this);
     if (hyperAcc->IsTextRole()) {
       *ppv = static_cast<IAccessibleHypertext*>(this);
       (reinterpret_cast<IUnknown*>(*ppv))->AddRef();
@@ -38,7 +38,7 @@ ia2AccessibleHypertext::get_nHyperlinks(long* aHyperlinkCount)
 __try {
   *aHyperlinkCount = 0;
 
-  nsHyperTextAccessibleWrap* hyperText = static_cast<nsHyperTextAccessibleWrap*>(this);
+  HyperTextAccessibleWrap* hyperText = static_cast<HyperTextAccessibleWrap*>(this);
   if (hyperText->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -56,7 +56,7 @@ ia2AccessibleHypertext::get_hyperlink(long aLinkIndex,
 __try {
   *aHyperlink = NULL;
 
-  nsHyperTextAccessibleWrap* hyperText = static_cast<nsHyperTextAccessibleWrap*>(this);
+  HyperTextAccessibleWrap* hyperText = static_cast<HyperTextAccessibleWrap*>(this);
   if (hyperText->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -84,7 +84,7 @@ ia2AccessibleHypertext::get_hyperlinkIndex(long aCharIndex, long* aHyperlinkInde
 __try {
   *aHyperlinkIndex = 0;
 
-  nsHyperTextAccessibleWrap* hyperAcc = static_cast<nsHyperTextAccessibleWrap*>(this);
+  HyperTextAccessibleWrap* hyperAcc = static_cast<HyperTextAccessibleWrap*>(this);
   if (hyperAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h
index 10af94c43c2e..64f86ec722c2 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.h
+++ b/accessible/src/msaa/nsAccessNodeWrap.h
@@ -132,7 +132,7 @@ protected:
   ISimpleDOMNode *MakeAccessNode(nsINode *aNode);
 
     /**
-     * It is used in nsHyperTextAccessibleWrap for IA2::newText/oldText
+     * It is used in HyperTextAccessibleWrap for IA2::newText/oldText
      * implementation.
      */
     static AccTextChangeEvent* gTextEvent;
diff --git a/accessible/src/msaa/nsHTMLTableAccessibleWrap.cpp b/accessible/src/msaa/nsHTMLTableAccessibleWrap.cpp
index b273267b3247..6c1d169a9236 100644
--- a/accessible/src/msaa/nsHTMLTableAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsHTMLTableAccessibleWrap.cpp
@@ -27,7 +27,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTableCellAccessibleWrap,
                              nsHTMLTableCellAccessible)
 
 IMPL_IUNKNOWN_INHERITED1(nsHTMLTableCellAccessibleWrap,
-                         nsHyperTextAccessibleWrap,
+                         HyperTextAccessibleWrap,
                          CAccessibleTableCell)
 
 
@@ -39,5 +39,5 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTableHeaderCellAccessibleWrap,
                              nsHTMLTableHeaderCellAccessible)
 
 IMPL_IUNKNOWN_INHERITED1(nsHTMLTableHeaderCellAccessibleWrap,
-                         nsHyperTextAccessibleWrap,
+                         HyperTextAccessibleWrap,
                          CAccessibleTableCell)
diff --git a/accessible/src/msaa/nsXULListboxAccessibleWrap.cpp b/accessible/src/msaa/nsXULListboxAccessibleWrap.cpp
index a572d9a1aac5..9a409e307d91 100644
--- a/accessible/src/msaa/nsXULListboxAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsXULListboxAccessibleWrap.cpp
@@ -38,5 +38,5 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsXULListCellAccessibleWrap,
                              nsXULListCellAccessible)
 
 IMPL_IUNKNOWN_INHERITED1(nsXULListCellAccessibleWrap,
-                         nsHyperTextAccessibleWrap,
+                         HyperTextAccessibleWrap,
                          CAccessibleTableCell)
diff --git a/accessible/src/mac/nsHyperTextAccessibleWrap.h b/accessible/src/other/HyperTextAccessibleWrap.h
similarity index 60%
rename from accessible/src/mac/nsHyperTextAccessibleWrap.h
rename to accessible/src/other/HyperTextAccessibleWrap.h
index f249ad709cb6..a212a53955de 100644
--- a/accessible/src/mac/nsHyperTextAccessibleWrap.h
+++ b/accessible/src/other/HyperTextAccessibleWrap.h
@@ -3,12 +3,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef _NSHYPERTEXTACCESSIBLEWRAP_H
-#define _NSHYPERTEXTACCESSIBLEWRAP_H
+#ifndef mozilla_a11y_HyperTextAccessibleWrap_h__
+#define mozilla_a11y_HyperTextAccessibleWrap_h__
 
-#include "nsHyperTextAccessible.h"
+#include "HyperTextAccessible.h"
 
-typedef class nsHyperTextAccessible nsHyperTextAccessibleWrap;
+typedef class HyperTextAccessible HyperTextAccessibleWrap;
 
 #endif
 
diff --git a/accessible/src/xforms/nsXFormsAccessible.cpp b/accessible/src/xforms/nsXFormsAccessible.cpp
index 3d76caaadce6..8ad3eed58add 100644
--- a/accessible/src/xforms/nsXFormsAccessible.cpp
+++ b/accessible/src/xforms/nsXFormsAccessible.cpp
@@ -48,7 +48,7 @@ nsXFormsAccessibleBase::nsXFormsAccessibleBase()
 
 nsXFormsAccessible::
   nsXFormsAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -135,7 +135,7 @@ nsXFormsAccessible::NativeState()
   rv = sXFormsService->IsValid(DOMNode, &isValid);
   NS_ENSURE_SUCCESS(rv, 0);
 
-  PRUint64 states = nsHyperTextAccessibleWrap::NativeState();
+  PRUint64 states = HyperTextAccessibleWrap::NativeState();
 
   if (!isRelevant)
     states |= states::UNAVAILABLE;
diff --git a/accessible/src/xforms/nsXFormsAccessible.h b/accessible/src/xforms/nsXFormsAccessible.h
index ab2ccb3e84d3..de353243d741 100644
--- a/accessible/src/xforms/nsXFormsAccessible.h
+++ b/accessible/src/xforms/nsXFormsAccessible.h
@@ -6,7 +6,7 @@
 #ifndef _nsXFormsAccessible_H_
 #define _nsXFormsAccessible_H_
 
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 #include "nsIXFormsUtilityService.h"
 
 #define NS_NAMESPACE_XFORMS "http://www.w3.org/2002/xforms"
@@ -33,7 +33,7 @@ protected:
  * XForms hint and XForms label elements should have accessible object. This
  * class is base class for accessible objects for these XForms elements.
  */
-class nsXFormsAccessible : public nsHyperTextAccessibleWrap,
+class nsXFormsAccessible : public HyperTextAccessibleWrap,
                            public nsXFormsAccessibleBase
 {
 public:
@@ -109,7 +109,7 @@ class nsXFormsEditableAccessible : public nsXFormsAccessible
 public:
   nsXFormsEditableAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  // nsHyperTextAccessible
+  // HyperTextAccessible
   virtual already_AddRefed<nsIEditor> GetEditor() const;
 
   // Accessible
diff --git a/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp b/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp
index ce73a6d16201..cd01b3bceb35 100644
--- a/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp
+++ b/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp
@@ -119,7 +119,11 @@ nsXFormsInputAccessible::
 {
 }
 
-NS_IMPL_ISUPPORTS_INHERITED3(nsXFormsInputAccessible, Accessible, nsHyperTextAccessible, nsIAccessibleText, nsIAccessibleEditableText)
+NS_IMPL_ISUPPORTS_INHERITED3(nsXFormsInputAccessible,
+                             Accessible,
+                             HyperTextAccessible,
+                             nsIAccessibleText,
+                             nsIAccessibleEditableText)
 
 role
 nsXFormsInputAccessible::NativeRole()
diff --git a/accessible/src/xul/XULFormControlAccessible.cpp b/accessible/src/xul/XULFormControlAccessible.cpp
index d4ccfa068db9..fad076dced13 100644
--- a/accessible/src/xul/XULFormControlAccessible.cpp
+++ b/accessible/src/xul/XULFormControlAccessible.cpp
@@ -688,13 +688,13 @@ XULToolbarSeparatorAccessible::NativeState()
 
 XULTextFieldAccessible::
  XULTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc) :
- nsHyperTextAccessibleWrap(aContent, aDoc)
+ HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
 NS_IMPL_ISUPPORTS_INHERITED3(XULTextFieldAccessible,
                              Accessible,
-                             nsHyperTextAccessible,
+                             HyperTextAccessible,
                              nsIAccessibleText,
                              nsIAccessibleEditableText)
 
@@ -722,7 +722,7 @@ XULTextFieldAccessible::Value(nsString& aValue)
 void
 XULTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
 {
-  nsHyperTextAccessibleWrap::ApplyARIAState(aState);
+  HyperTextAccessibleWrap::ApplyARIAState(aState);
 
   aria::MapToState(aria::eARIAAutoComplete, mContent->AsElement(), aState);
 }
@@ -730,7 +730,7 @@ XULTextFieldAccessible::ApplyARIAState(PRUint64* aState) const
 PRUint64
 XULTextFieldAccessible::NativeState()
 {
-  PRUint64 state = nsHyperTextAccessibleWrap::NativeState();
+  PRUint64 state = HyperTextAccessibleWrap::NativeState();
 
   nsCOMPtr<nsIContent> inputField(GetInputField());
   NS_ENSURE_TRUE(inputField, state);
@@ -846,7 +846,7 @@ XULTextFieldAccessible::CacheChildren()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// XULTextFieldAccessible: nsHyperTextAccessible protected
+// XULTextFieldAccessible: HyperTextAccessible protected
 
 already_AddRefed<nsFrameSelection>
 XULTextFieldAccessible::FrameSelection()
diff --git a/accessible/src/xul/XULFormControlAccessible.h b/accessible/src/xul/XULFormControlAccessible.h
index 5a6f48cc88f5..a3597fda3b0a 100644
--- a/accessible/src/xul/XULFormControlAccessible.h
+++ b/accessible/src/xul/XULFormControlAccessible.h
@@ -9,7 +9,7 @@
 // NOTE: alphabetically ordered
 #include "AccessibleWrap.h"
 #include "FormControlAccessible.h"
-#include "nsHyperTextAccessibleWrap.h"
+#include "HyperTextAccessibleWrap.h"
 #include "XULSelectControlAccessible.h"
 
 namespace mozilla {
@@ -213,7 +213,7 @@ public:
 /**
  * Used for XUL textbox element.
  */
-class XULTextFieldAccessible : public nsHyperTextAccessibleWrap
+class XULTextFieldAccessible : public HyperTextAccessibleWrap
 {
 public:
   enum { eAction_Click = 0 };
@@ -226,7 +226,7 @@ public:
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
   NS_IMETHOD DoAction(PRUint8 index);
 
-  // nsHyperTextAccessible
+  // HyperTextAccessible
   virtual already_AddRefed<nsIEditor> GetEditor() const;
 
   // Accessible
@@ -243,7 +243,7 @@ protected:
   // Accessible
   virtual void CacheChildren();
 
-  // nsHyperTextAccessible
+  // HyperTextAccessible
   virtual already_AddRefed<nsFrameSelection> FrameSelection();
 
   // nsXULTextFieldAccessible
diff --git a/accessible/src/xul/nsXULListboxAccessible.cpp b/accessible/src/xul/nsXULListboxAccessible.cpp
index 927967fe9f03..2193d0a77675 100644
--- a/accessible/src/xul/nsXULListboxAccessible.cpp
+++ b/accessible/src/xul/nsXULListboxAccessible.cpp
@@ -926,7 +926,7 @@ nsXULListitemAccessible::ContainerWidget() const
 
 nsXULListCellAccessible::
   nsXULListCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -934,7 +934,7 @@ nsXULListCellAccessible::
 // nsISupports
 
 NS_IMPL_ISUPPORTS_INHERITED1(nsXULListCellAccessible,
-                             nsHyperTextAccessible,
+                             HyperTextAccessible,
                              nsIAccessibleTableCell)
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/accessible/src/xul/nsXULListboxAccessible.h b/accessible/src/xul/nsXULListboxAccessible.h
index 62eaf631159b..7091db18c95f 100644
--- a/accessible/src/xul/nsXULListboxAccessible.h
+++ b/accessible/src/xul/nsXULListboxAccessible.h
@@ -135,7 +135,7 @@ private:
 /**
  * Class represents xul:listcell.
  */
-class nsXULListCellAccessible : public nsHyperTextAccessibleWrap,
+class nsXULListCellAccessible : public HyperTextAccessibleWrap,
                                 public nsIAccessibleTableCell
 {
 public:
diff --git a/accessible/src/xul/nsXULTextAccessible.cpp b/accessible/src/xul/nsXULTextAccessible.cpp
index 8789b6b44032..c8974f7b7927 100644
--- a/accessible/src/xul/nsXULTextAccessible.cpp
+++ b/accessible/src/xul/nsXULTextAccessible.cpp
@@ -29,7 +29,7 @@ using namespace mozilla::a11y;
 
 nsXULTextAccessible::
   nsXULTextAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
@@ -53,13 +53,13 @@ nsXULTextAccessible::NativeState()
 {
   // Labels and description have read only state
   // They are not focusable or selectable
-  return nsHyperTextAccessibleWrap::NativeState() | states::READONLY;
+  return HyperTextAccessibleWrap::NativeState() | states::READONLY;
 }
 
 Relation
 nsXULTextAccessible::RelationByType(PRUint32 aType)
 {
-  Relation rel = nsHyperTextAccessibleWrap::RelationByType(aType);
+  Relation rel = HyperTextAccessibleWrap::RelationByType(aType);
   if (aType == nsIAccessibleRelation::RELATION_LABEL_FOR) {
     // Caption is the label for groupbox
     nsIContent *parent = mContent->GetParent();
@@ -107,12 +107,12 @@ nsXULTooltipAccessible::NativeRole()
 
 nsXULLinkAccessible::
   nsXULLinkAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  nsHyperTextAccessibleWrap(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
 // Expose nsIAccessibleHyperLink unconditionally
-NS_IMPL_ISUPPORTS_INHERITED1(nsXULLinkAccessible, nsHyperTextAccessibleWrap,
+NS_IMPL_ISUPPORTS_INHERITED1(nsXULLinkAccessible, HyperTextAccessibleWrap,
                              nsIAccessibleHyperLink)
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/accessible/src/xul/nsXULTextAccessible.h b/accessible/src/xul/nsXULTextAccessible.h
index 3844f4929c2b..1d83ca3621a4 100644
--- a/accessible/src/xul/nsXULTextAccessible.h
+++ b/accessible/src/xul/nsXULTextAccessible.h
@@ -6,13 +6,13 @@
 #ifndef _nsXULTextAccessible_H_
 #define _nsXULTextAccessible_H_
 
+#include "HyperTextAccessibleWrap.h"
 #include "nsBaseWidgetAccessible.h"
-#include "nsHyperTextAccessibleWrap.h"
 
 /**
  * Used for XUL description and label elements.
  */
-class nsXULTextAccessible : public nsHyperTextAccessibleWrap
+class nsXULTextAccessible : public HyperTextAccessibleWrap
 {
 public:
   nsXULTextAccessible(nsIContent* aContent, DocAccessible* aDoc);
@@ -38,7 +38,7 @@ public:
   virtual PRUint64 NativeState();
 };
 
-class nsXULLinkAccessible : public nsHyperTextAccessibleWrap
+class nsXULLinkAccessible : public HyperTextAccessibleWrap
 {
 
 public:
diff --git a/accessible/tests/mochitest/role/test_general.html b/accessible/tests/mochitest/role/test_general.html
index 22f1402fbed5..0a6892081416 100644
--- a/accessible/tests/mochitest/role/test_general.html
+++ b/accessible/tests/mochitest/role/test_general.html
@@ -76,7 +76,7 @@
     Mozilla Bug 472326
   </a><br>
   <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=474261"
-      title="Test remaining implementations in nsHypertextAccessible::GetRole">
+      title="Test remaining implementations in nsHyperTextAccessible::GetRole">
     bug 474261
   </a><br>
   <a target="_blank"
diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 41c19cf4445a..5e6ed53b61cc 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -489,3 +489,5 @@ pref("ui.click_hold_context_menus.delay", 1000);
 
 // Enable device storage
 pref("device.storage.enabled", true);
+
+pref("media.plugins.enabled", true);
diff --git a/b2g/chrome/content/content.css b/b2g/chrome/content/content.css
index ff2a92639b0d..d0d8f3716a37 100644
--- a/b2g/chrome/content/content.css
+++ b/b2g/chrome/content/content.css
@@ -78,3 +78,8 @@ xul|thumb {
   border-radius: 3px;
 }
 
+/* -moz-touch-enabled? media elements */
+video > xul|videocontrols,
+audio > xul|videocontrols {
+  -moz-binding: url("chrome://global/content/bindings/videocontrols.xml#touchControls");
+}
diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index a1d85e0f6cbf..5ea6fed05677 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -639,6 +639,7 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/components/B2GComponents.manifest
 @BINPATH@/components/B2GComponents.xpt
 @BINPATH@/components/CameraContent.js
+@BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
 @BINPATH@/chrome/marionette@JAREXT@
 @BINPATH@/chrome/marionette.manifest
 @BINPATH@/components/MarionetteComponents.manifest
diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla
index e8d7559ef99f..5efc31e09723 100644
--- a/browser/extensions/pdfjs/README.mozilla
+++ b/browser/extensions/pdfjs/README.mozilla
@@ -1,4 +1,4 @@
 This is the pdf.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 0.2.536
+Current extension version is: 0.3.266
 
diff --git a/browser/extensions/pdfjs/bootstrap.js b/browser/extensions/pdfjs/bootstrap.js
index 826db512a727..5bf66d444c00 100644
--- a/browser/extensions/pdfjs/bootstrap.js
+++ b/browser/extensions/pdfjs/bootstrap.js
@@ -1,8 +1,4 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
@@ -14,13 +10,26 @@ let Cc = Components.classes;
 let Ci = Components.interfaces;
 let Cm = Components.manager;
 let Cu = Components.utils;
-let application = Cc['@mozilla.org/fuel/application;1']
-                    .getService(Ci.fuelIApplication);
 
 Cu.import('resource://gre/modules/Services.jsm');
 
+function getBoolPref(pref, def) {
+  try {
+    return Services.prefs.getBoolPref(pref);
+  } catch (ex) {
+    return def;
+  }
+}
+
+function setStringPref(pref, value) {
+  let str = Cc['@mozilla.org/supports-string;1']
+              .createInstance(Ci.nsISupportsString);
+  str.data = value;
+  Services.prefs.setComplexValue(pref, Ci.nsISupportsString, str);
+}
+
 function log(str) {
-  if (!application.prefs.getValue(EXT_PREFIX + '.pdfBugEnabled', false))
+  if (!getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false))
     return;
   dump(str + '\n');
 }
@@ -97,6 +106,6 @@ function install(aData, aReason) {
 }
 
 function uninstall(aData, aReason) {
-  application.prefs.setValue(EXT_PREFIX + '.database', '{}');
+  setStringPref(EXT_PREFIX + '.database', '{}');
 }
 
diff --git a/browser/extensions/pdfjs/chrome.manifest b/browser/extensions/pdfjs/chrome.manifest
index 2618c476b5d6..8348f377ed8b 100644
--- a/browser/extensions/pdfjs/chrome.manifest
+++ b/browser/extensions/pdfjs/chrome.manifest
@@ -1,3 +1,8 @@
 resource pdf.js content/
 component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js
 contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1}
+
+# Additional resources for pdf.js
+
+# PDFJS_SUPPORTED_LOCALES
+
diff --git a/browser/extensions/pdfjs/components/PdfStreamConverter.js b/browser/extensions/pdfjs/components/PdfStreamConverter.js
index d6e376a0e0a2..1bcccbe22ad4 100644
--- a/browser/extensions/pdfjs/components/PdfStreamConverter.js
+++ b/browser/extensions/pdfjs/components/PdfStreamConverter.js
@@ -1,8 +1,4 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
@@ -17,18 +13,51 @@ const PDFJS_EVENT_ID = 'pdf.js.message';
 const PDF_CONTENT_TYPE = 'application/pdf';
 const EXT_PREFIX = 'extensions.uriloader@pdf.js';
 const MAX_DATABASE_LENGTH = 4096;
+const FIREFOX_ID = '{ec8030f7-c20a-464f-9b0e-13a3a9e97384}';
+const SEAMONKEY_ID = '{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}';
 
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import('resource://gre/modules/Services.jsm');
+Cu.import('resource://gre/modules/NetUtil.jsm');
 
-let application = Cc['@mozilla.org/fuel/application;1']
-                    .getService(Ci.fuelIApplication);
-let privateBrowsing = Cc['@mozilla.org/privatebrowsing;1']
-                        .getService(Ci.nsIPrivateBrowsingService);
-let inPrivateBrowswing = privateBrowsing.privateBrowsingEnabled;
+let appInfo = Cc['@mozilla.org/xre/app-info;1']
+                  .getService(Ci.nsIXULAppInfo);
+let privateBrowsing, inPrivateBrowsing;
+
+if (appInfo.ID === FIREFOX_ID) {
+  privateBrowsing = Cc['@mozilla.org/privatebrowsing;1']
+                          .getService(Ci.nsIPrivateBrowsingService);
+  inPrivateBrowsing = privateBrowsing.privateBrowsingEnabled;
+} else if (appInfo.ID === SEAMONKEY_ID) {
+  privateBrowsing = null;
+  inPrivateBrowsing = false;
+}
+
+function getBoolPref(pref, def) {
+  try {
+    return Services.prefs.getBoolPref(pref);
+  } catch (ex) {
+    return def;
+  }
+}
+
+function setStringPref(pref, value) {
+  let str = Cc['@mozilla.org/supports-string;1']
+              .createInstance(Ci.nsISupportsString);
+  str.data = value;
+  Services.prefs.setComplexValue(pref, Ci.nsISupportsString, str);
+}
+
+function getStringPref(pref, def) {
+  try {
+    return Services.prefs.getComplexValue(pref, Ci.nsISupportsString).data;
+  } catch (ex) {
+    return def;
+  }
+}
 
 function log(aMsg) {
-  if (!application.prefs.getValue(EXT_PREFIX + '.pdfBugEnabled', false))
+  if (!getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false))
     return;
   let msg = 'PdfStreamConverter.js: ' + (aMsg.join ? aMsg.join('') : aMsg);
   Services.console.logStringMessage(msg);
@@ -41,29 +70,97 @@ function getDOMWindow(aChannel) {
   return win;
 }
 
+function getLocalizedStrings(path) {
+  var stringBundle = Cc['@mozilla.org/intl/stringbundle;1'].
+      getService(Ci.nsIStringBundleService).
+      createBundle('chrome://pdf.js/locale/' + path);
+
+  var map = {};
+  var enumerator = stringBundle.getSimpleEnumeration();
+  while (enumerator.hasMoreElements()) {
+    var string = enumerator.getNext().QueryInterface(Ci.nsIPropertyElement);
+    var key = string.key, property = 'textContent';
+    var i = key.lastIndexOf('.');
+    if (i >= 0) {
+      property = key.substring(i + 1);
+      key = key.substring(0, i);
+    }
+    if (!(key in map))
+      map[key] = {};
+    map[key][property] = string.value;
+  }
+  return map;
+}
+
 // All the priviledged actions.
 function ChromeActions() {
-  this.inPrivateBrowswing = privateBrowsing.privateBrowsingEnabled;
 }
+
 ChromeActions.prototype = {
   download: function(data) {
-    Services.wm.getMostRecentWindow('navigator:browser').saveURL(data);
+    let mimeService = Cc['@mozilla.org/mime;1'].getService(Ci.nsIMIMEService);
+    var handlerInfo = mimeService.
+                        getFromTypeAndExtension('application/pdf', 'pdf');
+    var uri = NetUtil.newURI(data);
+
+    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(data, null, null);
+    var listener = {
+      extListener: null,
+      onStartRequest: function(aRequest, aContext) {
+        this.extListener = extHelperAppSvc.doContent('application/pdf',
+                              aRequest, frontWindow, false);
+        this.extListener.onStartRequest(aRequest, aContext);
+      },
+      onStopRequest: function(aRequest, aContext, aStatusCode) {
+        if (this.extListener)
+          this.extListener.onStopRequest(aRequest, aContext, aStatusCode);
+      },
+      onDataAvailable: function(aRequest, aContext, aInputStream, aOffset,
+                                aCount) {
+        this.extListener.onDataAvailable(aRequest, aContext, aInputStream,
+                                         aOffset, aCount);
+      }
+    };
+
+    channel.asyncOpen(listener, null);
   },
   setDatabase: function(data) {
-    if (this.inPrivateBrowswing)
+    if (inPrivateBrowsing)
       return;
     // Protect against something sending tons of data to setDatabase.
     if (data.length > MAX_DATABASE_LENGTH)
       return;
-    application.prefs.setValue(EXT_PREFIX + '.database', data);
+    setStringPref(EXT_PREFIX + '.database', data);
   },
   getDatabase: function() {
-    if (this.inPrivateBrowswing)
+    if (inPrivateBrowsing)
       return '{}';
-    return application.prefs.getValue(EXT_PREFIX + '.database', '{}');
+    return getStringPref(EXT_PREFIX + '.database', '{}');
+  },
+  getLocale: function() {
+    return getStringPref('general.useragent.locale', 'en-US');
+  },
+  getStrings: function(data) {
+    try {
+      // Lazy initialization of localizedStrings
+      if (!('localizedStrings' in this))
+        this.localizedStrings = getLocalizedStrings('viewer.properties');
+
+      var result = this.localizedStrings[data];
+      return JSON.stringify(result || null);
+    } catch (e) {
+      log('Unable to retrive localized strings: ' + e);
+      return 'null';
+    }
   },
   pdfBugEnabled: function() {
-    return application.prefs.getValue(EXT_PREFIX + '.pdfBugEnabled', false);
+    return getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false);
   }
 };
 
diff --git a/browser/extensions/pdfjs/content/web/debugger.js b/browser/extensions/pdfjs/content/web/debugger.js
index ee00121df45d..aeb3ab4ce5a9 100644
--- a/browser/extensions/pdfjs/content/web/debugger.js
+++ b/browser/extensions/pdfjs/content/web/debugger.js
@@ -1,8 +1,4 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
@@ -167,29 +163,29 @@ var StepperManager = (function StepperManagerClosure() {
     enabled: false,
     active: false,
     // Stepper specific functions.
-    create: function create(pageNumber) {
+    create: function create(pageIndex) {
       var debug = document.createElement('div');
-      debug.id = 'stepper' + pageNumber;
+      debug.id = 'stepper' + pageIndex;
       debug.setAttribute('hidden', true);
       debug.className = 'stepper';
       stepperDiv.appendChild(debug);
       var b = document.createElement('option');
-      b.textContent = 'Page ' + (pageNumber + 1);
-      b.value = pageNumber;
+      b.textContent = 'Page ' + (pageIndex + 1);
+      b.value = pageIndex;
       stepperChooser.appendChild(b);
-      var initBreakPoints = breakPoints[pageNumber] || [];
-      var stepper = new Stepper(debug, pageNumber, initBreakPoints);
+      var initBreakPoints = breakPoints[pageIndex] || [];
+      var stepper = new Stepper(debug, pageIndex, initBreakPoints);
       steppers.push(stepper);
       if (steppers.length === 1)
-        this.selectStepper(pageNumber, false);
+        this.selectStepper(pageIndex, false);
       return stepper;
     },
-    selectStepper: function selectStepper(pageNumber, selectPanel) {
+    selectStepper: function selectStepper(pageIndex, selectPanel) {
       if (selectPanel)
         this.manager.selectPanel(1);
       for (var i = 0; i < steppers.length; ++i) {
         var stepper = steppers[i];
-        if (stepper.pageNumber == pageNumber)
+        if (stepper.pageIndex == pageIndex)
           stepper.panel.removeAttribute('hidden');
         else
           stepper.panel.setAttribute('hidden', true);
@@ -197,11 +193,11 @@ var StepperManager = (function StepperManagerClosure() {
       var options = stepperChooser.options;
       for (var i = 0; i < options.length; ++i) {
         var option = options[i];
-        option.selected = option.value == pageNumber;
+        option.selected = option.value == pageIndex;
       }
     },
-    saveBreakPoints: function saveBreakPoints(pageNumber, bps) {
-      breakPoints[pageNumber] = bps;
+    saveBreakPoints: function saveBreakPoints(pageIndex, bps) {
+      breakPoints[pageIndex] = bps;
       sessionStorage.setItem('pdfjsBreakPoints', JSON.stringify(breakPoints));
     }
   };
@@ -209,12 +205,12 @@ var StepperManager = (function StepperManagerClosure() {
 
 // The stepper for each page's IRQueue.
 var Stepper = (function StepperClosure() {
-  function Stepper(panel, pageNumber, initialBreakPoints) {
+  function Stepper(panel, pageIndex, initialBreakPoints) {
     this.panel = panel;
     this.len;
     this.breakPoint = 0;
     this.nextBreakPoint = null;
-    this.pageNumber = pageNumber;
+    this.pageIndex = pageIndex;
     this.breakPoints = initialBreakPoints;
     this.currentIdx = -1;
   }
@@ -260,7 +256,7 @@ var Stepper = (function StepperClosure() {
               self.breakPoints.push(x);
             else
               self.breakPoints.splice(self.breakPoints.indexOf(x), 1);
-            StepperManager.saveBreakPoints(self.pageNumber, self.breakPoints);
+            StepperManager.saveBreakPoints(self.pageIndex, self.breakPoints);
           }
         })(i);
 
@@ -282,7 +278,7 @@ var Stepper = (function StepperClosure() {
       return null;
     },
     breakIt: function breakIt(idx, callback) {
-      StepperManager.selectStepper(this.pageNumber, true);
+      StepperManager.selectStepper(this.pageIndex, true);
       var self = this;
       var dom = document;
       self.currentIdx = idx;
@@ -427,8 +423,9 @@ var PDFBug = (function PDFBugClosure() {
       panels.setAttribute('class', 'panels');
       ui.appendChild(panels);
 
-      document.body.appendChild(ui);
-      document.body.style.paddingRight = panelWidth + 'px';
+      var container = document.getElementById('viewerContainer');
+      container.appendChild(ui);
+      container.style.right = panelWidth + 'px';
 
       // Initialize all the debugging tools.
       var tools = this.tools;
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-check.svg b/browser/extensions/pdfjs/content/web/images/annotation-check.svg
new file mode 100644
index 000000000000..e0e1590a937c
--- /dev/null
+++ b/browser/extensions/pdfjs/content/web/images/annotation-check.svg
@@ -0,0 +1,3 @@
+<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
+  <path d="M2.379,14.729 5.208,11.899 12.958,19.648 25.877,6.733 28.707,9.561 12.958,25.308z" fill="#333333"></path>
+</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/comment.svg b/browser/extensions/pdfjs/content/web/images/annotation-comment.svg
similarity index 57%
rename from browser/extensions/pdfjs/content/web/images/comment.svg
rename to browser/extensions/pdfjs/content/web/images/annotation-comment.svg
index 596dc33b5ec4..84feef1c89f7 100644
--- a/browser/extensions/pdfjs/content/web/images/comment.svg
+++ b/browser/extensions/pdfjs/content/web/images/annotation-comment.svg
@@ -1,7 +1,3 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
   <path d="M16,5.333c-7.732,0-14,4.701-14,10.5c0,1.982,0.741,3.833,2.016,5.414L2,25.667l5.613-1.441c2.339,1.317,5.237,2.107,8.387,2.107c7.732,0,14-4.701,14-10.5C30,10.034,23.732,5.333,16,5.333z" fill="#333333"></path>
 </svg>
diff --git a/browser/extensions/pdfjs/content/web/images/annotation-text.svg b/browser/extensions/pdfjs/content/web/images/annotation-text.svg
new file mode 100644
index 000000000000..25df8f466b23
--- /dev/null
+++ b/browser/extensions/pdfjs/content/web/images/annotation-text.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<svg
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="40"
+   width="40"
+   id="svg2995"
+   version="1.1">
+  
+  <rect
+     style="fill:#f1e47b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-opacity:1"
+     id="rect3009"
+     width="30.169491"
+     height="24.576269"
+     x="4.237288"
+     y="6.7796612" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3781"
+     width="23.38983"
+     height="1.1864407"
+     x="7.6271186"
+     y="11.389831" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3781-1"
+     width="23.38983"
+     height="0.67796612"
+     x="7.6271191"
+     y="21.61017" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3781-7"
+     width="23.38983"
+     height="0.67796612"
+     x="7.4576273"
+     y="26.152542" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3781-1-4"
+     width="23.38983"
+     height="0.67796612"
+     x="7.6271186"
+     y="17.033899" />
+</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/bookmark.svg b/browser/extensions/pdfjs/content/web/images/bookmark.svg
deleted file mode 100644
index bee6efefdfb4..000000000000
--- a/browser/extensions/pdfjs/content/web/images/bookmark.svg
+++ /dev/null
@@ -1,662 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="240.00000"
-   inkscape:export-xdpi="240.00000"
-   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
-   sodipodi:docname="bookmark.svg"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:version="0.32"
-   id="svg249"
-   height="48.000000px"
-   width="48.000000px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective100" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2906">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2908" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2910" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2896">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2898" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2900" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2598">
-      <stop
-         style="stop-color:#859dbc;stop-opacity:1;"
-         offset="0"
-         id="stop2600" />
-      <stop
-         style="stop-color:#547299;stop-opacity:1;"
-         offset="1"
-         id="stop2602" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2590">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2592" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2594" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5897">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop5899" />
-      <stop
-         id="stop5905"
-         offset="0.50000000"
-         style="stop-color:#000000;stop-opacity:0.56701028;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop5901" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5866">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5868" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5870" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4404">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4406" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4408" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4542">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4544" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4546" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         id="stop270"
-         offset="0.0000000"
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
-      <stop
-         id="stop271"
-         offset="1.0000000"
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12512">
-      <stop
-         id="stop12513"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop12517"
-         offset="0.50000000"
-         style="stop-color:#fff520;stop-opacity:0.89108908;" />
-      <stop
-         id="stop12514"
-         offset="1.0000000"
-         style="stop-color:#fff300;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="14.375000"
-       fy="125.00000"
-       fx="55.000000"
-       cy="125.00000"
-       cx="55.000000"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient278"
-       xlink:href="#linearGradient12512"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient15656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
-       cx="8.8244190"
-       cy="3.7561285"
-       fx="8.8244190"
-       fy="3.7561285"
-       r="37.751713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient15658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
-       fy="35.736916"
-       r="86.708450" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15662"
-       id="radialGradient15668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
-       cx="8.1435566"
-       cy="7.2678967"
-       fx="8.1435566"
-       fy="7.2678967"
-       r="38.158695" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4542"
-       id="radialGradient4548"
-       cx="24.306795"
-       cy="42.07798"
-       fx="24.306795"
-       fy="42.07798"
-       r="15.821514"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4404"
-       id="linearGradient4410"
-       x1="16.812500"
-       y1="1.8750000"
-       x2="16.812500"
-       y2="4.7187500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5866"
-       id="linearGradient5872"
-       x1="19.452349"
-       y1="13.174174"
-       x2="19.685436"
-       y2="27.095339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5897"
-       id="linearGradient5903"
-       x1="19.000000"
-       y1="9.7738247"
-       x2="19.000000"
-       y2="15.635596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2590"
-       id="linearGradient2596"
-       x1="19.970377"
-       y1="6.1167107"
-       x2="19.970377"
-       y2="2.53125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2598"
-       id="linearGradient2604"
-       x1="18.431311"
-       y1="19.119474"
-       x2="18.402472"
-       y2="4.2702327"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2896"
-       id="linearGradient2902"
-       x1="14.584077"
-       y1="1.6392649"
-       x2="14.552828"
-       y2="2.4912448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2906"
-       id="linearGradient2912"
-       x1="13.354311"
-       y1="1.4866425"
-       x2="14.075844"
-       y2="2.4017651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="158"
-     inkscape:window-x="433"
-     inkscape:window-height="690"
-     inkscape:window-width="872"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer5"
-     inkscape:cy="24"
-     inkscape:cx="24"
-     inkscape:zoom="9.8333333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>New Bookmark</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>bookmark</rdf:li>
-            <rdf:li>remember</rdf:li>
-            <rdf:li>favorite</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <dc:description>create bookmark action</dc:description>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Shadow">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1">
-    <rect
-       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="rect15391"
-       width="34.875000"
-       height="41.063431"
-       x="6.5000000"
-       y="3.5000000"
-       ry="1.1490481"
-       rx="1.1490486" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="32.937012"
-       height="39.028210"
-       x="7.5024552"
-       y="4.5010486"
-       ry="0.14904849"
-       rx="0.14904852" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
-       d="M 11.505723,5.4942766 L 11.505723,43.400869"
-       id="path15672"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
-       d="M 12.500000,5.0205154 L 12.500000,43.038228"
-       id="path15674"
-       sodipodi:nodetypes="cc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Text"
-     style="display:inline">
-    <g
-       id="g2188">
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15686"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="9.0000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15688"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="11.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15690"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="13.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15692"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="15.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15694"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="17.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15696"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="19.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15698"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="21.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15700"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="23.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15732"
-         width="9.0000057"
-         height="1.0000000"
-         x="15.999986"
-         y="25.000000"
-         rx="0.062003858"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15736"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="29.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15738"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="31.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15740"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="33.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15742"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="35.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15744"
-         width="14.000014"
-         height="1.0000000"
-         x="15.999986"
-         y="37.000000"
-         rx="0.096450485"
-         ry="0.065390877" />
-    </g>
-    <path
-       style="opacity:0.28021976;fill:url(#linearGradient5872);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 28.245858,31.324906 L 21.147869,27.133701 L 14.30757,30.8838 L 13.761859,3.9475667 L 28.549598,3.9475667 L 28.245858,31.324906 z "
-       id="path5138"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="fill:url(#linearGradient2604);fill-opacity:1;fill-rule:evenodd;stroke:#364878;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 12.427339,3.5180202 C 12.427339,3.5180202 12.240033,0.60520607 15.107867,0.54270607 L 25.119343,0.50728624 C 26.277287,0.50728624 26.581888,1.1910178 26.581888,2.1095589 L 26.581888,29.729916 L 20.545426,24.533862 L 14.674346,29.729916 L 14.591655,3.519629 L 12.427339,3.5180202 z "
-       id="path2204"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="opacity:0.4450549;fill:url(#linearGradient4410);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 13.030252,3.0117919 C 13.011046,2.225362 13.312918,1.0801307 15.375418,1.0176307 L 25.027906,1 C 25.640922,1 26.090152,1.1674319 26.090152,1.7994802 L 26.060994,10.491851 L 15.317102,10.491851 L 15.192102,2.9993251 C 15.192102,2.9993251 13.030252,3.0117919 13.030252,3.0117919 z "
-       id="path3668"
-       sodipodi:nodetypes="cccccccs" />
-    <rect
-       style="opacity:0.28021976;fill:url(#linearGradient5903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5895"
-       width="10.556392"
-       height="12.803556"
-       x="15.317101"
-       y="6.6907959"
-       rx="0.062003858"
-       ry="0.065390877" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2596);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.19125683;display:inline"
-       d="M 24.476832,2.2095507 L 25.575535,3.113139 L 25.547445,27.511911 L 20.497463,23.203758 L 15.704084,27.415203 L 15.699081,2.7495618 L 24.476832,2.2095507 z "
-       id="path5969"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="opacity:0.48295456;color:#000000;fill:url(#linearGradient2912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 15.158602,3.9384083 L 15.114407,1.0335178 C 12.983906,1.0335178 12.993087,2.9680775 12.993087,3.9384083 L 15.158602,3.9384083 z "
-       id="path2894"
-       sodipodi:nodetypes="cccc" />
-    <path
-       sodipodi:nodetypes="cccc"
-       id="path2904"
-       d="M 15.158602,3.9384086 L 15.114407,1.8247593 C 12.81631,1.8426926 12.993087,3.9384086 12.993087,3.9384086 L 15.158602,3.9384086 z "
-       style="opacity:0.35795455;color:#000000;fill:url(#linearGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/check.svg b/browser/extensions/pdfjs/content/web/images/check.svg
deleted file mode 100644
index ebb376166a8c..000000000000
--- a/browser/extensions/pdfjs/content/web/images/check.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
-  <path d="M2.379,14.729 5.208,11.899 12.958,19.648 25.877,6.733 28.707,9.561 12.958,25.308z" fill="#333333"></path>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/document-print.svg b/browser/extensions/pdfjs/content/web/images/document-print.svg
deleted file mode 100644
index 4d062fbb69a9..000000000000
--- a/browser/extensions/pdfjs/content/web/images/document-print.svg
+++ /dev/null
@@ -1,533 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-print.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg2994"
-   height="48px"
-   width="48px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective84" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7612">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7614" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7616" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7612"
-       id="radialGradient7618"
-       cx="24.000000"
-       cy="41.875000"
-       fx="24.000000"
-       fy="41.875000"
-       r="19.125000"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,27.91667)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.12371134;"
-         offset="0.0000000"
-         id="stop4764" />
-      <stop
-         id="stop4768"
-         offset="0.10344828"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4766" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4741">
-      <stop
-         id="stop4743"
-         offset="0.0000000"
-         style="stop-color:#dcdcda;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4745"
-         offset="1.0000000"
-         style="stop-color:#bab9b7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4733">
-      <stop
-         id="stop4735"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.23711340;" />
-      <stop
-         id="stop4737"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4698">
-      <stop
-         id="stop4700"
-         offset="0.0000000"
-         style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#bbbbb9;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop4706" />
-      <stop
-         id="stop4702"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4688">
-      <stop
-         id="stop4690"
-         offset="0.0000000"
-         style="stop-color:#666666;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4692"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4680"
-       inkscape:collect="always">
-      <stop
-         id="stop4682"
-         offset="0"
-         style="stop-color:#f7f6f5;stop-opacity:1;" />
-      <stop
-         id="stop4684"
-         offset="1"
-         style="stop-color:#f7f6f5;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4668">
-      <stop
-         id="stop4670"
-         offset="0"
-         style="stop-color:#8e8d87;stop-opacity:1;" />
-      <stop
-         style="stop-color:#cbc9c1;stop-opacity:1.0000000;"
-         offset="0.27586207"
-         id="stop4676" />
-      <stop
-         id="stop4672"
-         offset="1.0000000"
-         style="stop-color:#8e8d87;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.40546969"
-         id="stop4886" />
-      <stop
-         style="stop-color:#cdcdcd;stop-opacity:1.0000000;"
-         offset="0.53448278"
-         id="stop4884" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#494949;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="2.1227016"
-       fy="26.925594"
-       fx="9.1295490"
-       cy="26.925594"
-       cx="9.1295490"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1433"
-       xlink:href="#linearGradient4698"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="72.064316"
-       x2="9.9128132"
-       y1="57.227650"
-       x1="9.8698082"
-       gradientTransform="matrix(2.772086,0.000000,0.000000,0.360739,0.618718,2.883883)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1447"
-       xlink:href="#linearGradient4733"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="54.136139"
-       x2="10.338233"
-       y1="64.652260"
-       x1="10.338233"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1451"
-       xlink:href="#linearGradient4680"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="62.282467"
-       x2="9.7052784"
-       y1="70.724976"
-       x1="9.7316532"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1453"
-       xlink:href="#linearGradient4688"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="19.337463"
-       x2="20.717800"
-       y1="25.140253"
-       x1="20.771229"
-       gradientTransform="matrix(1.198769,0,0,0.853565,-0.143086,2.034513)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1456"
-       xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="25.247311"
-       x2="24.789707"
-       y1="3.6785457"
-       x1="25.056711"
-       gradientTransform="matrix(0.944939,0,0,1.076147,6.844577e-2,4.093177)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1459"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="58.831264"
-       x2="15.487823"
-       y1="32.539238"
-       x1="15.387969"
-       gradientTransform="matrix(1.490161,0,0,0.668741,8.895132e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1464"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294930"
-       x2="18.972126"
-       y1="88.294930"
-       x1="1.8456430"
-       gradientTransform="matrix(2.291824,0,0,0.434269,8.855179e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1468"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294933"
-       x2="18.972126"
-       y1="88.294933"
-       x1="1.8456431"
-       gradientTransform="matrix(2.30272,0,0,0.437918,0,0.584034)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1471"
-       xlink:href="#linearGradient4668"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="160"
-     inkscape:window-x="331"
-     inkscape:window-height="688"
-     inkscape:window-width="872"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="-18.264187"
-     inkscape:cx="-72.591911"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.090196078"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#729fcf" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Print Document</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>document</rdf:li>
-            <rdf:li>lpr</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>local</rdf:li>
-            <rdf:li>laser</rdf:li>
-            <rdf:li>bubblejet</rdf:li>
-            <rdf:li>inkjet</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>cups</rdf:li>
-            <rdf:li>lpd</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,39.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       ry="1.7115477"
-       rx="1.7115483"
-       y="36.004189"
-       x="4.75"
-       height="6.4915943"
-       width="38.4375"
-       id="rect4652"
-       style="fill:url(#linearGradient1471);fill-opacity:1;stroke:#595959;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cssssssssssss"
-       id="rect4609"
-       d="M 7.1308961,21.5 L 40.870615,21.5 C 41.255661,21.5 41.747648,21.788155 42.051049,22.223919 C 42.354451,22.659684 43.787518,24.83394 44.109448,25.297964 C 44.431378,25.761987 44.502397,26.201852 44.502397,26.774049 L 44.502397,38.850951 C 44.502397,39.764524 43.770402,40.5 42.861152,40.5 L 5.1403596,40.5 C 4.2311094,40.5 3.4991138,39.764524 3.4991138,38.850951 L 3.4991138,26.774049 C 3.4991138,26.280031 3.6002798,25.571641 3.9455202,25.120718 C 4.3811666,24.551713 5.5498664,22.57277 5.8581276,22.153118 C 6.1663887,21.733467 6.7324461,21.5 7.1308961,21.5 z "
-       style="color:#000000;fill:url(#linearGradient1468);fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cssssssss"
-       id="path4718"
-       d="M 7.705278,21.975532 C 7.20729,21.975532 6.5669691,22.107308 6.3043987,22.511224 L 4.4657443,25.339651 C 4.169761,25.794966 4.4993705,26.868141 5.3900051,26.868141 L 42.678553,26.868141 C 43.883282,26.868141 43.8868,25.858073 43.602814,25.428039 L 41.851714,22.776389 C 41.534204,22.295589 41.418956,21.975532 40.625945,21.975532 L 7.705278,21.975532 z "
-       style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1464);stroke-width:0.94696701;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.6002951,22.445756 L 40.374658,22.445756 C 40.739745,22.445756 41.206233,22.718629 41.493909,23.131283 C 41.781585,23.543938 42.788049,25.160945 43.093293,25.60036 C 43.398536,26.039775 43.528159,26.456312 43.528159,26.998164 L 43.528159,38.279261 C 43.528159,39.144385 43.394653,39.528356 42.532529,39.528356 L 5.530506,39.528356 C 4.6683828,39.528356 4.472593,39.144385 4.472593,38.279261 L 4.472593,26.998164 C 4.472593,26.530345 4.6930819,25.859523 5.0204282,25.432514 C 5.4334949,24.893685 6.1012112,23.461633 6.393495,23.064237 C 6.6857789,22.666841 7.222497,22.445756 7.6002951,22.445756 z "
-       id="path4750"
-       sodipodi:nodetypes="cssssssssssss" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="rect15391"
-       d="M 11.68177,4.4977642 L 36.313839,4.4977642 C 36.964072,4.4977642 37.487546,5.007949 37.487546,5.6416762 L 37.487546,24.348117 L 10.508063,24.348117 L 10.508063,5.6416762 C 10.508063,5.007949 11.031536,4.4977642 11.68177,4.4977642 z "
-       style="color:#000000;fill:url(#linearGradient1459);fill-opacity:1;fill-rule:nonzero;stroke:#898989;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1456);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="25.000576"
-       height="18.836374"
-       x="11.498513"
-       y="5.4992466"
-       ry="0.17677675"
-       rx="0.17677672" />
-    <rect
-       ry="1.7115483"
-       rx="1.7115483"
-       y="27.375000"
-       x="6.8750000"
-       height="5.1875000"
-       width="33.750000"
-       id="rect4678"
-       style="fill:url(#linearGradient1451);fill-opacity:1.0000000;stroke:url(#linearGradient1453);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       transform="translate(0.000000,2.000000)"
-       d="M 10.871767 27.626486 A 1.2816310 1.2816310 0 1 1  8.3085046,27.626486 A 1.2816310 1.2816310 0 1 1  10.871767 27.626486 z"
-       sodipodi:ry="1.2816310"
-       sodipodi:rx="1.2816310"
-       sodipodi:cy="27.626486"
-       sodipodi:cx="9.5901356"
-       id="path4696"
-       style="fill:url(#radialGradient1433);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="csscssssc"
-       id="path4731"
-       d="M 11.743718,25.416053 L 37.306218,25.478553 C 37.993716,25.480234 38.294038,25.107558 38.243718,24.478553 L 38.118718,22.916053 L 39.984835,22.916053 C 40.797335,22.916053 40.975035,23.108616 41.172335,23.478553 L 41.672335,24.416053 C 42.199130,25.403793 43.483508,26.390165 42.170495,26.390165 C 37.667784,26.390165 13.993718,26.041053 11.743718,25.416053 z "
-       style="fill:url(#linearGradient1447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.36571429" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 42.9375,26.5 L 4.8125,26.5"
-       id="path4760"
-       sodipodi:nodetypes="cc" />
-    <g
-       transform="translate(0.000000,2.000000)"
-       style="opacity:0.43575415"
-       id="g4849">
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4831"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="5.0000000" />
-      <rect
-         y="7.0000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4833"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4835"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="9.0000000" />
-      <rect
-         y="11.000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4837"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4839"
-         width="11.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="13.000000" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="arrow">
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 21.02159,20.989431 L 27.989391,20.989431 L 27.989391,16.064984 L 31,16.064984 L 24.553756,8 L 17.435622,15.986875 L 21.023684,15.986875 L 21.02159,20.989431 z "
-       style="opacity:1;color:#000000;fill:#a7a7a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/download.svg b/browser/extensions/pdfjs/content/web/images/download.svg
deleted file mode 100644
index 884e3deed553..000000000000
--- a/browser/extensions/pdfjs/content/web/images/download.svg
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="document-save.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg2913"
-   height="48px"
-   width="48px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective104" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6925">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="0"
-         id="stop6927" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop6929" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6901">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop6903" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop6905" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4991">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4993" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4995" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4991"
-       id="radialGradient4997"
-       cx="23.447077"
-       cy="6.4576745"
-       fx="23.447077"
-       fy="6.4576745"
-       r="19.0625"
-       gradientTransform="matrix(-1.314471,-1.006312e-2,-1.022964e-2,1.336221,46.22108,-4.909887)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2187"
-       inkscape:collect="always">
-      <stop
-         id="stop2189"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2191"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2187"
-       id="linearGradient1764"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.914114,1.412791e-16,-1.412791e-16,0.914114,-3.868698,-2.706902)"
-       x1="33.059906"
-       y1="27.394117"
-       x2="12.624337"
-       y2="12.583769" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient8668"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737"
-       gradientTransform="matrix(1.000000,-7.816467e-32,-1.132409e-32,0.536723,-5.897962e-14,16.87306)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2555">
-      <stop
-         id="stop2557"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop2561" />
-      <stop
-         id="stop2563"
-         offset="0.75000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#e1e1e1;stop-opacity:1.0000000;"
-         offset="0.84166664"
-         id="stop2565" />
-      <stop
-         id="stop2559"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4274">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25490198;"
-         offset="0.0000000"
-         id="stop4276" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4278" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4264"
-       inkscape:collect="always">
-      <stop
-         id="stop4266"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4268"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4254"
-       inkscape:collect="always">
-      <stop
-         id="stop4256"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4258"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4244">
-      <stop
-         id="stop4246"
-         offset="0.0000000"
-         style="stop-color:#e4e4e4;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4248"
-         offset="1.0000000"
-         style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4236"
-       inkscape:collect="always">
-      <stop
-         id="stop4238"
-         offset="0"
-         style="stop-color:#eeeeee;stop-opacity:1;" />
-      <stop
-         id="stop4240"
-         offset="1"
-         style="stop-color:#eeeeee;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4228">
-      <stop
-         id="stop4230"
-         offset="0.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4232"
-         offset="1.0000000"
-         style="stop-color:#9f9f9f;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4184">
-      <stop
-         id="stop4186"
-         offset="0.0000000"
-         style="stop-color:#838383;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4188"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0.795493,3.799180)"
-       y2="35.281250"
-       x2="24.687500"
-       y1="35.281250"
-       x1="7.0625000"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4209"
-       xlink:href="#linearGradient4184"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="40.943935"
-       x2="36.183067"
-       y1="28.481176"
-       x1="7.6046205"
-       id="linearGradient4234"
-       xlink:href="#linearGradient4228"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="33.758667"
-       x2="12.221823"
-       y1="37.205811"
-       x1="12.277412"
-       id="linearGradient4242"
-       xlink:href="#linearGradient4236"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.286242,0.781698,-0.710782,1.169552,-2.354348,0.248140)"
-       r="20.935817"
-       fy="2.9585190"
-       fx="15.571491"
-       cy="2.9585190"
-       cx="15.571491"
-       id="radialGradient4250"
-       xlink:href="#linearGradient4244"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="47.620636"
-       x2="44.096100"
-       y1="4.4331360"
-       x1="12.378357"
-       id="linearGradient4260"
-       xlink:href="#linearGradient4254"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651032,-2.885063e-16,9.455693)"
-       r="23.555494"
-       fy="27.096155"
-       fx="23.201941"
-       cy="27.096155"
-       cx="23.201941"
-       id="radialGradient4270"
-       xlink:href="#linearGradient4264"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="26.357183"
-       x2="23.688078"
-       y1="11.318835"
-       x1="23.688078"
-       id="linearGradient4272"
-       xlink:href="#linearGradient4274"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2555"
-       id="linearGradient2553"
-       x1="33.431175"
-       y1="31.964777"
-       x2="21.747974"
-       y2="11.780679"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6901"
-       id="linearGradient6907"
-       x1="14.751649"
-       y1="15.868432"
-       x2="8.8953285"
-       y2="16.743431"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6925"
-       id="linearGradient6931"
-       x1="12.25"
-       y1="18.25"
-       x2="7"
-       y2="21.118431"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="999"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer2"
-     inkscape:cy="11.891468"
-     inkscape:cx="-133.68151"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.22745098"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#3465a4"
-     stroke="#204a87" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Save</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>hdd</rdf:li>
-            <rdf:li>hard drive</rdf:li>
-            <rdf:li>save</rdf:li>
-            <rdf:li>io</rdf:li>
-            <rdf:li>store</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:identifier />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="pix"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,41.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <path
-       sodipodi:nodetypes="cccsccccccccc"
-       id="path4196"
-       d="M 11.28569,13.087628 C 10.66069,13.087628 10.254441,13.377808 10.004442,13.931381 C 10.004441,13.931381 3.5356915,31.034938 3.5356915,31.034938 C 3.5356915,31.034938 3.2856915,31.706497 3.2856915,32.816188 C 3.2856915,32.816188 3.2856915,42.466156 3.2856915,42.466156 C 3.2856915,43.548769 3.943477,44.091158 4.9419415,44.091156 L 43.50444,44.091156 C 44.489293,44.091156 45.09819,43.372976 45.09819,42.247406 L 45.09819,32.597438 C 45.09819,32.597438 45.204153,31.827015 45.00444,31.284938 L 38.28569,14.087631 C 38.101165,13.575725 37.648785,13.099533 37.16069,13.087628 L 11.28569,13.087628 z "
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path4170"
-       d="M 3.2735915,32.121812 L 4.0381936,31.429597 L 41.647883,31.492097 L 45.11029,31.809395 L 45.11029,42.247927 C 45.11029,43.373496 44.503272,44.091258 43.518419,44.091258 L 4.9354314,44.091258 C 3.9369667,44.091258 3.2735915,43.549207 3.2735915,42.466594 L 3.2735915,32.121812 z "
-       style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.02044296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="csccccccs"
-       id="path3093"
-       d="M 3.5490842,31.039404 C 2.8347985,32.50369 3.5484686,33.432261 4.5847985,33.432261 C 4.5847985,33.432261 43.584797,33.432261 43.584797,33.432261 C 44.703844,33.408451 45.430035,32.420356 45.013368,31.289403 L 38.299082,14.078704 C 38.114558,13.566798 37.64432,13.090606 37.156225,13.078701 L 11.299083,13.078701 C 10.674083,13.078701 10.263369,13.382274 10.01337,13.935847 C 10.01337,13.935847 3.5490842,31.039404 3.5490842,31.039404 z "
-       style="fill:url(#radialGradient4250);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <rect
-       y="36.299183"
-       x="7.857996"
-       height="5.5625"
-       width="17.625"
-       id="rect4174"
-       style="opacity:1;color:#000000;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cscc"
-       id="path4194"
-       d="M 7.8579947,41.86168 C 7.8579947,41.86168 7.8579947,37.850195 7.8579947,37.850195 C 9.6935221,41.029421 16.154485,41.86168 20.795492,41.86168 C 20.795492,41.86168 7.8579947,41.86168 7.8579947,41.86168 z "
-       style="opacity:0.81142853;fill:url(#linearGradient4242);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path4201"
-       d="M 44.796162,30.753688 C 44.859684,32.003662 44.382159,33.069528 43.474046,33.097438 C 43.474046,33.097438 5.3553296,33.097437 5.3553297,33.097438 C 4.0660978,33.097438 3.4875937,32.772491 3.271279,32.229382 C 3.3630404,33.173714 4.0970964,33.878688 5.3553297,33.878688 C 5.3553296,33.878687 43.474046,33.878688 43.474046,33.878688 C 44.550053,33.845617 45.226851,32.454664 44.82621,30.883897 L 44.796162,30.753688 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4211"
-       d="M 10.96875,15.28125 C 10.922675,15.481571 10.78125,15.668047 10.78125,15.875 C 10.78125,16.823605 11.37223,17.664474 12.125,18.46875 C 12.365268,18.314675 12.490117,18.114342 12.75,17.96875 C 11.809691,17.152746 11.196604,16.252168 10.96875,15.28125 z M 37.625,15.28125 C 37.396273,16.250866 36.782988,17.153676 35.84375,17.96875 C 36.117894,18.122332 36.247738,18.33699 36.5,18.5 C 37.257262,17.693344 37.8125,16.826956 37.8125,15.875 C 37.8125,15.668047 37.670906,15.481571 37.625,15.28125 z M 39.8125,23.71875 C 39.198709,27.758861 32.513887,30.96875 24.28125,30.96875 C 16.068996,30.968751 9.4211001,27.775964 8.78125,23.75 C 8.7488928,23.947132 8.65625,24.141882 8.65625,24.34375 C 8.6562503,28.661697 15.645354,32.187501 24.28125,32.1875 C 32.917146,32.1875 39.937499,28.661698 39.9375,24.34375 C 39.9375,24.130826 39.848449,23.926394 39.8125,23.71875 z "
-       style="opacity:0.69142857;color:#000000;fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       transform="translate(8.838843e-2,5.301780)"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       sodipodi:ry="1.016466"
-       sodipodi:rx="1.3700194"
-       sodipodi:cy="25.593554"
-       sodipodi:cx="7.2036505"
-       id="path4224"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path4226"
-       sodipodi:cx="7.2036505"
-       sodipodi:cy="25.593554"
-       sodipodi:rx="1.3700194"
-       sodipodi:ry="1.016466"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       transform="translate(33.96705,5.213390)" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 11.642515,13.540723 C 11.040823,13.540723 10.649724,13.820081 10.409049,14.35301 C 10.409048,14.35301 3.9940341,30.943732 3.9940341,30.943732 C 3.9940341,30.943732 3.7533573,31.590247 3.7533573,32.658555 C 3.7533573,32.658555 3.7533573,41.948651 3.7533573,41.948651 C 3.7533573,43.303391 4.1974134,43.57555 5.3478414,43.57555 L 43.034746,43.57555 C 44.357872,43.57555 44.569062,43.259153 44.569062,41.738058 L 44.569062,32.447962 C 44.569062,32.447962 44.671072,31.706271 44.478807,31.184409 L 37.885616,14.378434 C 37.707973,13.885617 37.334964,13.552184 36.865071,13.540723 L 11.642515,13.540723 z "
-       id="path4252"
-       sodipodi:nodetypes="cccsccccccccc" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 40.5,36.554166 L 40.5,41.575101"
-       id="path4282" />
-    <path
-       id="path4284"
-       d="M 38.5,36.613943 L 38.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 36.5,36.613943 L 36.5,41.634878"
-       id="path4286" />
-    <path
-       id="path4288"
-       d="M 34.5,36.613943 L 34.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 32.5,36.613943 L 32.5,41.634878"
-       id="path4290" />
-    <path
-       id="path4292"
-       d="M 30.5,36.613943 L 30.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       id="path4294"
-       d="M 39.5,36.604065 L 39.5,41.625"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 37.5,36.663842 L 37.5,41.684777"
-       id="path4296" />
-    <path
-       id="path4298"
-       d="M 35.5,36.663842 L 35.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33.5,36.663842 L 33.5,41.684777"
-       id="path4300" />
-    <path
-       id="path4302"
-       d="M 31.5,36.663842 L 31.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4572"
-       d="M 7.875,36.3125 L 7.875,41.84375 L 20.4375,41.84375 L 8.21875,41.5 L 7.875,36.3125 z "
-       style="opacity:0.43999999;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.20571427;color:#000000;fill:url(#linearGradient2553);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93365198;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42372879;visibility:visible;display:inline;overflow:visible"
-       id="path2545"
-       sodipodi:cx="25"
-       sodipodi:cy="19.5625"
-       sodipodi:rx="14.875"
-       sodipodi:ry="6.6875"
-       d="M 39.875 19.5625 A 14.875 6.6875 0 1 1  10.125,19.5625 A 14.875 6.6875 0 1 1  39.875 19.5625 z"
-       transform="matrix(1.037815,0.000000,0.000000,1.060747,-1.632878,3.030370)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="down">
-    <path
-       transform="matrix(1.130190,1.178179e-16,7.918544e-17,-0.759601,-3.909725,53.66554)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.14117647;color:#000000;fill:url(#radialGradient8668);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient6907);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient6931);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 3.2034501,25.835194 C 2.1729477,-5.3853369 28.741616,-0.4511153 28.582416,15.788689 L 35.89533,15.788689 L 24.517652,28.774671 L 12.585426,15.788689 C 12.585426,15.788689 20.126859,15.788689 20.126859,15.788689 C 20.583921,4.8193225 3.4092324,1.6100346 3.2034501,25.835194 z "
-       id="path1432"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2177"
-       d="M 7.6642103,9.1041047 C 12.40638,-0.0400306 28.122336,2.7175443 27.761604,16.579393 L 34.078976,16.579393 C 34.078976,16.579393 24.513151,27.536769 24.513151,27.536769 L 14.41668,16.579393 C 14.41668,16.579393 20.87332,16.579393 20.87332,16.579393 C 21.144975,5.0041615 10.922265,5.5345215 7.6642103,9.1041047 z "
-       style="opacity:0.47159091;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1764);stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <path
-       style="opacity:0.49431817;color:#000000;fill:url(#radialGradient4997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 34.767155,16.211613 L 32.782979,18.757322 C 27.372947,17.241029 24.896829,21.486664 17.109284,20.489112 L 13.247998,16.080077 L 20.434468,16.162862 C 20.483219,4.3164571 8.3443098,4.998966 5.0292663,13.627829 C 8.8372201,-1.2611216 27.893316,0.8064118 28.28332,16.114112 L 34.767155,16.211613 z "
-       id="path4989"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/go-down.svg b/browser/extensions/pdfjs/content/web/images/go-down.svg
deleted file mode 100644
index 655fdba16dcd..000000000000
--- a/browser/extensions/pdfjs/content/web/images/go-down.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-down.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective24" />
-    <linearGradient
-       id="linearGradient1442">
-      <stop
-         id="stop1444"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop1446"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1442"
-       id="radialGradient1469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="35.292667"
-       cy="20.494493"
-       fx="35.292667"
-       fy="20.494493"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1471"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.749427e-16,-2.046729,-1.557610,-2.853404e-16,44.11559,66.93275)"
-       cx="15.987216"
-       cy="1.5350308"
-       fx="15.987216"
-       fy="1.5350308"
-       r="17.171415" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="23.239067"
-     inkscape:cx="15.972815"
-     inkscape:zoom="11.313708"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Go Down</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>lower</rdf:li>
-            <rdf:li>down</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.20454545;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <g
-       id="g1464"
-       transform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.02856,43.99921)">
-      <path
-         style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1469);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 14.519136,38.500000 L 32.524165,38.496094 L 32.524165,25.504468 L 40.519531,25.496656 L 23.374809,5.4992135 L 6.5285585,25.497284 L 14.524440,25.501074 L 14.519136,38.500000 z "
-         id="path8643"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 39.429889,24.993467 L 32.023498,25.005186 L 32.026179,37.998023 L 16.647623,37.98887 C 17.417545,19.64788 27.370272,26.995797 32.029282,16.341991 L 39.429889,24.993467 z "
-         id="path8645"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path8658"
-         d="M 15.520704,37.496094 L 31.522109,37.500000 L 31.522109,24.507050 L 38.338920,24.491425 L 23.384644,7.0388396 L 8.6781173,24.495782 L 15.518018,24.501029 L 15.520704,37.496094 z "
-         style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/go-up.svg b/browser/extensions/pdfjs/content/web/images/go-up.svg
deleted file mode 100644
index 5e2f9a2c645b..000000000000
--- a/browser/extensions/pdfjs/content/web/images/go-up.svg
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="go-up.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective23" />
-    <linearGradient
-       id="linearGradient2304">
-      <stop
-         id="stop2306"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop2308"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
-       cx="24.53788"
-       cy="0.40010813"
-       fx="24.53788"
-       fy="0.40010813"
-       r="17.171415" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2304"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="11.319205"
-       cy="22.454971"
-       fx="11.319205"
-       fy="22.454971"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="25.620377"
-     inkscape:cx="9.6380363"
-     inkscape:zoom="13.059378"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#73d216"
-     stroke="#73d216" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Go Up</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>higher</rdf:li>
-            <rdf:li>up</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946521;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 14.491792,38.500000 L 32.469477,38.500000 L 32.469477,25.547437 L 40.500000,25.547437 L 23.374809,5.4992135 L 6.5285585,25.489471 L 14.497096,25.555762 L 14.491792,38.500000 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cccscc"
-       id="path8645"
-       d="M 7.5855237,25.03253 L 14.995821,25.03253 L 15.062422,31.594339 C 20.718034,20.593878 31.055517,22.749928 31.656768,15.966674 C 31.656768,15.966674 23.366938,6.4219692 23.366938,6.4219692 L 7.5855237,25.03253 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1438);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 15.602735,37.500000 L 31.502578,37.500000 L 31.502578,24.507050 L 38.311576,24.507050 L 23.361206,7.0700896 L 8.6546798,24.550470 L 15.475049,24.528373 L 15.602735,37.500000 z "
-       id="path8658"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/nav-outline.svg b/browser/extensions/pdfjs/content/web/images/nav-outline.svg
deleted file mode 100644
index 0f053530f59b..000000000000
--- a/browser/extensions/pdfjs/content/web/images/nav-outline.svg
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3007"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="nav-outline.svg">
-  <defs
-     id="defs3009">
-    <filter
-       inkscape:collect="always"
-       id="filter5333"
-       x="-0.16623206"
-       width="1.3324641"
-       y="-0.030014125"
-       height="1.0600282">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.47888561"
-         id="feGaussianBlur5335" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.945051"
-     inkscape:cx="20.614872"
-     inkscape:cy="23.423899"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3012">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#f0f0f0;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       id="rect3783"
-       width="46.16272"
-       height="45.59861"
-       x="1.0341953"
-       y="0.99112236" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect3787"
-       width="2.8205326"
-       height="2.7823999"
-       x="4.2307992"
-       y="4.093708" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5257"
-       width="24.68285"
-       height="1.4102663"
-       x="8.0855274"
-       y="4.657815" />
-    <rect
-       y="8.4185247"
-       x="8.4615984"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5259"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="9.0766497"
-       x="12.410344"
-       height="1.4102663"
-       width="30.498053"
-       id="rect5261"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5263"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.4615984"
-       y="13.307448" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5265"
-       width="24.972752"
-       height="1.4102663"
-       x="12.410344"
-       y="13.965573" />
-    <rect
-       y="17.444229"
-       x="4.3248172"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5267"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="18.008337"
-       x="8.1795454"
-       height="1.4102663"
-       width="25.101433"
-       id="rect5269"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5271"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.5556164"
-       y="21.769047" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5273"
-       width="28.782515"
-       height="1.4102663"
-       x="12.880433"
-       y="22.427172" />
-    <rect
-       y="26.65797"
-       x="13.475181"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5275"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="27.316095"
-       x="17.479"
-       height="1.4102663"
-       width="23.681646"
-       id="rect5277"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5279"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.5130949"
-       y="31.006269" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5281"
-       width="24.557148"
-       height="1.4102663"
-       x="12.592034"
-       y="31.636858" />
-    <rect
-       y="35.464046"
-       x="13.475181"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5283"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="36.055695"
-       x="17.744923"
-       height="1.4102663"
-       width="18.577394"
-       id="rect5285"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5287"
-       width="2.8205326"
-       height="2.7823999"
-       x="13.54166"
-       y="40.35297" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5289"
-       width="23.080858"
-       height="1.4102663"
-       x="17.678442"
-       y="40.944618" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/nav-thumbs.svg b/browser/extensions/pdfjs/content/web/images/nav-thumbs.svg
deleted file mode 100644
index 58a36dcac6e9..000000000000
--- a/browser/extensions/pdfjs/content/web/images/nav-thumbs.svg
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg3007"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="nav-thumbs.svg">
-  <defs
-     id="defs3009">
-    <filter
-       inkscape:collect="always"
-       id="filter5333"
-       x="-0.16623206"
-       width="1.3324641"
-       y="-0.030014125"
-       height="1.0600282">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.47888561"
-         id="feGaussianBlur5335" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter5966">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.3570515"
-         id="feGaussianBlur5968" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.945051"
-     inkscape:cx="9.375932"
-     inkscape:cy="24.942259"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3012">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#484848;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       id="rect3783"
-       width="46.16272"
-       height="45.59861"
-       x="1.0341953"
-       y="0.99112236" />
-    <rect
-       y="4.7876148"
-       x="14.359808"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5960"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,-2.1141417)" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect5958"
-       width="9.7061672"
-       height="12.764274"
-       x="18.897236"
-       y="3.1920807" />
-    <rect
-       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,13.043433)"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       id="rect5970"
-       width="9.7061672"
-       height="12.764274"
-       x="14.359808"
-       y="4.7876148" />
-    <rect
-       y="18.349655"
-       x="18.897236"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5972"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    <rect
-       y="4.7876148"
-       x="14.359808"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5974"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       transform="matrix(1.0465713,0,0,0.9368834,3.6426579,29.209842)" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect5976"
-       width="9.7061672"
-       height="11.833546"
-       x="18.897236"
-       y="33.906113" />
-    <rect
-       y="4.905829"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect5995"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6177"
-       width="3.6219761"
-       height="0.66480595"
-       x="19.960924"
-       y="6.0340419" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6179"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.960924"
-       y="7.2562728" />
-    <rect
-       y="8.3844862"
-       x="19.960924"
-       height="0.66480595"
-       width="5.6903667"
-       id="rect6181"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="9.7007341"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6183"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6185"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.960924"
-       y="10.828948" />
-    <rect
-       y="12.051179"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6187"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="14.213587"
-       x="23.204536"
-       height="0.66480595"
-       width="1.2245234"
-       id="rect6189"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6209"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="19.854652" />
-    <rect
-       y="39.08128"
-       x="19.913914"
-       height="0.66480595"
-       width="3.6219761"
-       id="rect6211"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="22.205095"
-       x="19.772888"
-       height="0.66480595"
-       width="6.6305442"
-       id="rect6213"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6215"
-       width="7.7587576"
-       height="0.66480595"
-       x="19.866905"
-       y="37.859051" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6217"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="21.029873" />
-    <rect
-       y="25.777771"
-       x="19.772888"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6219"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6221"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="27.000002" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6223"
-       width="1.2245234"
-       height="0.66480595"
-       x="23.204536"
-       y="28.974375" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6225"
-       width="3.6219761"
-       height="0.66480595"
-       x="19.960922"
-       y="42.983021" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6227"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.913914"
-       y="36.777847" />
-    <rect
-       y="35.602627"
-       x="19.913914"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6231"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6233"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.913914"
-       y="40.350525" />
-    <rect
-       y="41.572754"
-       x="19.913914"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6235"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#0000e6;fill-opacity:0.44444448;stroke:none"
-       id="rect6237"
-       width="3.5256658"
-       height="1.927364"
-       x="22.077036"
-       y="23.367346" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/pin-down.svg b/browser/extensions/pdfjs/content/web/images/pin-down.svg
deleted file mode 100644
index e48bba0741c1..000000000000
--- a/browser/extensions/pdfjs/content/web/images/pin-down.svg
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg3075"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="pin-down.svg"
-   viewPort="0 0 48 48">
-  <defs
-     id="defs3077">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3804">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3806" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3808" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         id="stop3967"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3885">
-      <stop
-         style="stop-color:#a8b5e9;stop-opacity:1;"
-         offset="0"
-         id="stop3889" />
-      <stop
-         id="stop3891"
-         offset="1"
-         style="stop-color:#1d4488;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3865">
-      <stop
-         style="stop-color:#0e0ec3;stop-opacity:0"
-         offset="0"
-         id="stop3867" />
-      <stop
-         id="stop3883"
-         offset="0.5"
-         style="stop-color:#95b1e4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0d29c0;stop-opacity:1;"
-         offset="1"
-         id="stop3869" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3853">
-      <stop
-         style="stop-color:#717171;stop-opacity:1;"
-         offset="0"
-         id="stop3855" />
-      <stop
-         id="stop3861"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#818181;stop-opacity:1;"
-         offset="1"
-         id="stop3857" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3792"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3802"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3812"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947"
-       gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3822"
-       cx="23.985939"
-       cy="24.847366"
-       fx="23.985939"
-       fy="24.847366"
-       r="10.593476"
-       gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter3856"
-       x="-0.30370581"
-       width="1.6074116"
-       y="-0.32771564"
-       height="1.6554313">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.7808869"
-         id="feGaussianBlur3858" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3867"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3869"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3871"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
-       cx="23.985939"
-       cy="24.847366"
-       fx="23.985939"
-       fy="24.847366"
-       r="10.593476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98683814,0,0,0.9524914,3.4991888,1004.1467)"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3877"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.195641,0.23932984,-0.18533175,0.95255553,4.5333676,999.33159)"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3880"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5847553,0.52693722,-0.99805104,2.7064773,14.11088,-45.304477)"
-       cx="18.133854"
-       cy="19.778509"
-       fx="18.133854"
-       fy="19.778509"
-       r="10.593476" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3882"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.9558805"
-     inkscape:cx="3.0237013"
-     inkscape:cy="17.287267"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1291"
-     inkscape:window-height="776"
-     inkscape:window-x="16"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3080">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3856)"
-       d="m 14.326415,1019.2702 c -8.3327876,4.0675 -9.8235436,10.8833 -8.8783416,15.1336 4.6840646,7.9754 8.3608166,13.8165 24.0118786,12.9139 9.657617,-3.7312 12.9762,-9.3269 13.519293,-15.7389 -0.547269,-4.3839 -1.957958,-9.3396 -5.649854,-14.9317 -3.965534,-2.471 -6.300859,-4.4246 -10.290805,-4.2374 -8.25193,0.5026 -8.752485,4.4502 -12.712171,6.8605 z"
-       id="path3826"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       transform="matrix(0.69099294,0,0,0.75978808,7.3427938,249.11025)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3882);fill-opacity:1;stroke:none"
-       id="path3011"
-       sodipodi:cx="21.176477"
-       sodipodi:cy="31.393986"
-       sodipodi:rx="13.254341"
-       sodipodi:ry="13.863736"
-       d="m 34.430819,31.393986 a 13.254341,13.863736 0 1 1 -26.5086827,0 13.254341,13.863736 0 1 1 26.5086827,0 z"
-       transform="matrix(0.98683814,0,0,0.83062636,2.696034,1005.3655)" />
-    <path
-       style="fill:url(#linearGradient3875);fill-opacity:1;stroke:url(#radialGradient3877);stroke-width:0.9695127;stroke-opacity:1"
-       d="m 17.246758,1026.7905 c -1.7156,4.5052 -2.482464,10.6205 8.726963,10.7476 4.849099,-1.8941 3.522783,-5.3561 6.021544,-11.8282 l -10.973104,-1.5977 z"
-       id="path3794"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-       id="path3814"
-       sodipodi:cx="24.718111"
-       sodipodi:cy="23.38278"
-       sodipodi:rx="10.593476"
-       sodipodi:ry="9.6854639"
-       d="m 35.311587,23.38278 a 10.593476,9.6854639 0 1 1 -21.186952,0 10.593476,9.6854639 0 1 1 21.186952,0 z"
-       transform="matrix(0.85425691,0,0,0.84187503,3.9779774,1006.7561)" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/pin-up.svg b/browser/extensions/pdfjs/content/web/images/pin-up.svg
deleted file mode 100644
index c830382e2d2c..000000000000
--- a/browser/extensions/pdfjs/content/web/images/pin-up.svg
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg3075"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="pin-up.svg"
-   viewPort="0 0 48 48">
-  <defs
-     id="defs3077">
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         id="stop3967"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3885">
-      <stop
-         style="stop-color:#a8b5e9;stop-opacity:1;"
-         offset="0"
-         id="stop3889" />
-      <stop
-         id="stop3891"
-         offset="1"
-         style="stop-color:#1d4488;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3865">
-      <stop
-         style="stop-color:#0e0ec3;stop-opacity:1;"
-         offset="0"
-         id="stop3867" />
-      <stop
-         id="stop3883"
-         offset="0.5"
-         style="stop-color:#95b1e4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0d29c0;stop-opacity:1;"
-         offset="1"
-         id="stop3869" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3853">
-      <stop
-         style="stop-color:#717171;stop-opacity:1;"
-         offset="0"
-         id="stop3855" />
-      <stop
-         id="stop3861"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#818181;stop-opacity:1;"
-         offset="1"
-         id="stop3857" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3853"
-       id="linearGradient3859"
-       x1="7.7696066"
-       y1="34.979828"
-       x2="11.854106"
-       y2="39.107044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.8388015,1001.6582)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3871"
-       cx="14.801222"
-       cy="1030.6609"
-       fx="14.801222"
-       fy="1030.6609"
-       r="10.177785"
-       gradientTransform="matrix(1,0,0,1.0108042,4.8388015,-13.880529)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3865"
-       id="linearGradient3881"
-       x1="15.012629"
-       y1="11.922465"
-       x2="31.098303"
-       y2="28.858271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97315436,4.8388015,1002.4769)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3909"
-       cx="16.437693"
-       cy="22.596292"
-       fx="16.437693"
-       fy="22.596292"
-       r="1.7789712"
-       gradientTransform="matrix(1,0,0,8.3599999,0,-166.30871)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3865"
-       id="linearGradient3927"
-       x1="26.47109"
-       y1="1010.7343"
-       x2="35.294788"
-       y2="1019.8425"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.5541661,-2.1347654)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3995"
-       cx="23.189369"
-       cy="25.704245"
-       fx="23.189369"
-       fy="25.704245"
-       r="37.336674"
-       gradientTransform="matrix(1,0,0,1.0332422,0,-0.85446479)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter4009"
-       x="-0.19299152"
-       width="1.385983"
-       y="-0.18351803"
-       height="1.3670361">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.8667902"
-         id="feGaussianBlur4011" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.2819435"
-     inkscape:cx="18.697469"
-     inkscape:cy="17.287267"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="970"
-     inkscape:window-height="778"
-     inkscape:window-x="284"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3080">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       style="fill:url(#radialGradient3995);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0;filter:url(#filter4009)"
-       d="M -0.85390618,50.988672 14.231769,27.790888 C 12.21393,25.133052 9.5514307,24.605255 9.9622384,18.824874 13.947134,14.236899 17.362759,16.258973 21.347654,16.54779 l 8.966014,-8.6813789 c 1.467204,-2.4778468 -1.023584,-4.6422045 0.569271,-7.25820222 4.802307,-0.84764718 6.662499,1.15219542 11.527733,6.26197842 4.061691,4.1873637 5.648882,7.0611607 4.411848,9.5352857 -1.075122,2.776443 -4.518349,-0.692782 -5.835025,0.56927 l -9.108332,10.104556 c -0.418785,3.74872 2.078647,7.861968 -1.280859,11.243098 -4.132171,0.818036 -6.734336,-1.933944 -9.819921,-3.557942 z"
-       id="path3955"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1004.3622)"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <g
-       id="g3929">
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3083"
-         d="m 3.2884874,1051.0662 c 3.1862139,-6.2911 11.3693156,-15.19 15.4471616,-20.0327 l 2.86533,3.0086 c -3.476851,3.6575 -10.192375,10.8664 -18.3124916,17.0241 z"
-         style="fill:url(#linearGradient3859);fill-opacity:1;stroke:#a5a5a5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3863"
-         d="m 11.10078,1023.3294 c 5.038264,10.1095 11.83652,14.8875 18.358981,18.2167 1.196291,-2.5422 1.454996,-5.6203 0,-9.6776 l -8.539061,-8.6814 c -3.704654,-1.8936 -6.871076,-1.3652 -9.81992,0.1423 z"
-         style="fill:url(#radialGradient3871);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3873"
-         d="m 33.729292,1011.5171 -13.235545,11.4952 c 2.869602,4.2703 6.221839,7.4544 9.108332,9.1408 l 11.385416,-13.0187 z"
-         style="fill:url(#linearGradient3881);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3893"
-         d="m 33.228885,1011.6148 c 1.843189,2.7806 3.431654,5.6597 7.19852,7.6953 l 5.398891,1.7423 c -7.6738,-4.7914 -10.989683,-9.5828 -13.947133,-14.3741 z"
-         style="fill:url(#linearGradient3927);fill-opacity:1;stroke:none" />
-      <path
-         transform="matrix(0.68275275,-0.5590416,0.45791123,0.47036287,17.42507,1012.2127)"
-         d="m 18.216664,22.596292 a 1.7789712,14.872199 0 1 1 -3.557943,0 1.7789712,14.872199 0 1 1 3.557943,0 z"
-         sodipodi:ry="14.872199"
-         sodipodi:rx="1.7789712"
-         sodipodi:cy="22.596292"
-         sodipodi:cx="16.437693"
-         id="path3901"
-         style="fill:url(#radialGradient3909);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/texture.png b/browser/extensions/pdfjs/content/web/images/texture.png
new file mode 100644
index 000000000000..df0086493236
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/texture.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-bookmark.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-bookmark.png
new file mode 100644
index 000000000000..1e5259a97ae3
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-bookmark.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-download.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-download.png
new file mode 100644
index 000000000000..8676d8e2c2c0
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-download.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-menuArrows.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-menuArrows.png
new file mode 100644
index 000000000000..31b06b5af9e5
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-menuArrows.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-openFile.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-openFile.png
new file mode 100644
index 000000000000..12ce45f876b1
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-openFile.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png
new file mode 100644
index 000000000000..c0051f8f0408
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown-rtl.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown.png
new file mode 100644
index 000000000000..762ac43e08cf
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageDown.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png
new file mode 100644
index 000000000000..0d49d8e95e3f
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp-rtl.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp.png
new file mode 100644
index 000000000000..3155b8bd235c
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-pageUp.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-print.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-print.png
new file mode 100644
index 000000000000..fef84dd59493
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-print.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle.png
new file mode 100644
index 000000000000..5a937c712b05
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-sidebarToggle.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline.png
new file mode 100644
index 000000000000..cb3967b7f3c5
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-viewOutline.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail.png
new file mode 100644
index 000000000000..3a27f0439399
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-viewThumbnail.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomIn.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomIn.png
new file mode 100644
index 000000000000..670acd93f532
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomIn.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomOut.png b/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomOut.png
new file mode 100644
index 000000000000..810fbf9895d5
Binary files /dev/null and b/browser/extensions/pdfjs/content/web/images/toolbarButton-zoomOut.png differ
diff --git a/browser/extensions/pdfjs/content/web/images/zoom-in.svg b/browser/extensions/pdfjs/content/web/images/zoom-in.svg
deleted file mode 100644
index 48ee42dd9b80..000000000000
--- a/browser/extensions/pdfjs/content/web/images/zoom-in.svg
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-add.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs6433">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective70" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15686275"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-123.56934"
-     inkscape:cy="0.031886897"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="818"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Add</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>add</rdf:li>
-            <rdf:li>plus</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.10824742;fill:url(#radialGradient2097);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1361"
-       sodipodi:cx="22.958872"
-       sodipodi:cy="34.94062"
-       sodipodi:rx="10.31934"
-       sodipodi:ry="2.320194"
-       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="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="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" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 11.000000,25.000000 C 11.000000,26.937500 36.984375,24.031250 36.984375,24.968750 L 36.984375,21.968750 L 27.000000,22.000000 L 27.000000,12.034772 L 21.000000,12.034772 L 21.000000,22.000000 L 11.000000,22.000000 L 11.000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccccccc" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/images/zoom-out.svg b/browser/extensions/pdfjs/content/web/images/zoom-out.svg
deleted file mode 100644
index eb13b60e376c..000000000000
--- a/browser/extensions/pdfjs/content/web/images/zoom-out.svg
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-remove.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs6433">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective69" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.10980392"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-123.27226"
-     inkscape:cy="26.474252"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="818"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Remove</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>remove</rdf:li>
-            <rdf:li>delete</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       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="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" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 9.0000000,25.000000 C 9.0000000,26.937500 39.125000,24.062500 39.125000,25.000000 L 39.125000,22.000000 L 9.0000000,22.000000 L 9.0000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
diff --git a/browser/extensions/pdfjs/content/web/l10n.js b/browser/extensions/pdfjs/content/web/l10n.js
new file mode 100644
index 000000000000..b16636e31cbe
--- /dev/null
+++ b/browser/extensions/pdfjs/content/web/l10n.js
@@ -0,0 +1,114 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+'use strict';
+
+// Small subset of the webL10n API by Fabien Cazenave for pdf.js extension.
+(function(window) {
+  var gLanguage = '';
+
+  // fetch an l10n objects
+  function getL10nData(key) {
+    var response = FirefoxCom.request('getStrings', key);
+    var data = JSON.parse(response);
+    if (!data)
+      console.warn('[l10n] #' + key + ' missing for [' + gLanguage + ']');
+    return data;
+  }
+
+  // replace {{arguments}} with their values
+  function substArguments(text, args) {
+    if (!args)
+      return text;
+
+    return text.replace(/\{\{\s*(\w+)\s*\}\}/g, function(all, name) {
+      return name in args ? args[name] : '{{' + name + '}}';
+    });
+  }
+
+  // translate a string
+  function translateString(key, args, fallback) {
+    var data = getL10nData(key);
+    if (!data && fallback)
+      data = {textContent: fallback};
+    if (!data)
+      return '{{' + key + '}}';
+    return substArguments(data.textContent, args);
+  }
+
+  // translate an HTML element
+  function translateElement(element) {
+    if (!element || !element.dataset)
+      return;
+
+    // get the related l10n object
+    var data = getL10nData(element.dataset.l10nId);
+    if (!data)
+      return;
+
+    // get arguments (if any)
+    // TODO: more flexible parser?
+    var args;
+    if (element.dataset.l10nArgs) try {
+      args = JSON.parse(element.dataset.l10nArgs);
+    } catch (e) {
+      console.warn('[l10n] could not parse arguments for #' + key + '');
+    }
+
+    // translate element
+    // TODO: security check?
+    for (var k in data)
+      element[k] = substArguments(data[k], args);
+  }
+
+
+  // translate an HTML subtree
+  function translateFragment(element) {
+    element = element || document.querySelector('html');
+
+    // check all translatable children (= w/ a `data-l10n-id' attribute)
+    var children = element.querySelectorAll('*[data-l10n-id]');
+    var elementCount = children.length;
+    for (var i = 0; i < elementCount; i++)
+      translateElement(children[i]);
+
+    // translate element itself if necessary
+    if (element.dataset.l10nId)
+      translateElement(element);
+  }
+
+  window.addEventListener('DOMContentLoaded', function() {
+    gLanguage = FirefoxCom.request('getLocale', null);
+
+    translateFragment();
+
+    // fire a 'localized' DOM event
+    var evtObject = document.createEvent('Event');
+    evtObject.initEvent('localized', false, false);
+    evtObject.language = gLanguage;
+    window.dispatchEvent(evtObject);
+  });
+
+  // Public API
+  document.mozL10n = {
+    // get a localized string
+    get: translateString,
+
+    // get|set the document language and direction
+    get language() {
+      return {
+        // get|set the document language (ISO-639-1)
+        get code() { return gLanguage; },
+
+        // get the direction (ltr|rtl) of the current language
+        get direction() {
+          // http://www.w3.org/International/questions/qa-scripts
+          // Arabic, Hebrew, Farsi, Pashto, Urdu
+          var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
+          return (rtlList.indexOf(gLanguage) >= 0) ? 'rtl' : 'ltr';
+        }
+      };
+    }
+  };
+})(this);
+
diff --git a/browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html b/browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html
deleted file mode 100644
index 3fe953e620af..000000000000
--- a/browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html
+++ /dev/null
@@ -1,32304 +0,0 @@
-<!-- This snippet is used in firefox extension, see Makefile -->
-<base href="resource://pdf.js/web/" />
-<script type="text/javascript" id="PDFJS_SCRIPT_TAG">
-<!--
-// pdf.js is inlined here because resource:// urls won't work
-// for loading workers.
-/* PDFJSSCRIPT_INCLUDE_BUNDLE */
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-var PDFJS = {};
-
-(function pdfjsWrapper() {
-  // Use strict in our context only - users might not want it
-  'use strict';
-
-  PDFJS.build = '2e92c0e';
-
-  // Files are inserted below - see Makefile
-  /* PDFJSSCRIPT_INCLUDE_ALL */
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var globalScope = (typeof window === 'undefined') ? this : window;
-
-var isWorker = (typeof window == 'undefined');
-
-var ERRORS = 0, WARNINGS = 1, TODOS = 5;
-var verbosity = WARNINGS;
-
-// The global PDFJS object exposes the API
-// In production, it will be declared outside a global wrapper
-// In development, it will be declared here
-if (!globalScope.PDFJS) {
-  globalScope.PDFJS = {};
-}
-
-// getPdf()
-// Convenience function to perform binary Ajax GET
-// Usage: getPdf('http://...', callback)
-//        getPdf({
-//                 url:String ,
-//                 [,progress:Function, error:Function]
-//               },
-//               callback)
-function getPdf(arg, callback) {
-  var params = arg;
-  if (typeof arg === 'string')
-    params = { url: arg };
-
-  var xhr = new XMLHttpRequest();
-  xhr.open('GET', params.url);
-  xhr.mozResponseType = xhr.responseType = 'arraybuffer';
-  var protocol = params.url.indexOf(':') < 0 ? window.location.protocol :
-    params.url.substring(0, params.url.indexOf(':') + 1);
-  xhr.expected = (protocol === 'http:' || protocol === 'https:') ? 200 : 0;
-
-  if ('progress' in params)
-    xhr.onprogress = params.progress || undefined;
-
-  if ('error' in params)
-    xhr.onerror = params.error || undefined;
-
-  xhr.onreadystatechange = function getPdfOnreadystatechange(e) {
-    if (xhr.readyState === 4) {
-      if (xhr.status === xhr.expected) {
-        var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
-                    xhr.responseArrayBuffer || xhr.response);
-        callback(data);
-      } else if (params.error) {
-        params.error(e);
-      }
-    }
-  };
-  xhr.send(null);
-}
-globalScope.PDFJS.getPdf = getPdf;
-globalScope.PDFJS.pdfBug = false;
-
-var Page = (function PageClosure() {
-  function Page(xref, pageNumber, pageDict, ref) {
-    this.pageNumber = pageNumber;
-    this.pageDict = pageDict;
-    this.stats = new StatTimer();
-    this.stats.enabled = !!globalScope.PDFJS.enableStats;
-    this.xref = xref;
-    this.ref = ref;
-
-    this.displayReadyPromise = null;
-  }
-
-  Page.prototype = {
-    getPageProp: function Page_getPageProp(key) {
-      return this.pageDict.get(key);
-    },
-    inheritPageProp: function Page_inheritPageProp(key) {
-      var dict = this.pageDict;
-      var obj = dict.get(key);
-      while (obj === undefined) {
-        dict = dict.get('Parent');
-        if (!dict)
-          break;
-        obj = dict.get(key);
-      }
-      return obj;
-    },
-    get content() {
-      return shadow(this, 'content', this.getPageProp('Contents'));
-    },
-    get resources() {
-      return shadow(this, 'resources', this.inheritPageProp('Resources'));
-    },
-    get mediaBox() {
-      var obj = this.inheritPageProp('MediaBox');
-      // Reset invalid media box to letter size.
-      if (!isArray(obj) || obj.length !== 4)
-        obj = [0, 0, 612, 792];
-      return shadow(this, 'mediaBox', obj);
-    },
-    get view() {
-      var cropBox = this.inheritPageProp('CropBox');
-      var view = {
-        x: 0,
-        y: 0,
-        width: this.width,
-        height: this.height
-      };
-      if (!isArray(cropBox) || cropBox.length !== 4)
-        return shadow(this, 'view', view);
-
-      var mediaBox = this.mediaBox;
-      var offsetX = mediaBox[0], offsetY = mediaBox[1];
-
-      // From the spec, 6th ed., p.963:
-      // "The crop, bleed, trim, and art boxes should not ordinarily
-      // extend beyond the boundaries of the media box. If they do, they are
-      // effectively reduced to their intersection with the media box."
-      cropBox = Util.intersect(cropBox, mediaBox);
-      if (!cropBox)
-        return shadow(this, 'view', view);
-
-      var tl = this.rotatePoint(cropBox[0] - offsetX, cropBox[1] - offsetY);
-      var br = this.rotatePoint(cropBox[2] - offsetX, cropBox[3] - offsetY);
-      view.x = Math.min(tl.x, br.x);
-      view.y = Math.min(tl.y, br.y);
-      view.width = Math.abs(tl.x - br.x);
-      view.height = Math.abs(tl.y - br.y);
-
-      return shadow(this, 'view', view);
-    },
-    get annotations() {
-      return shadow(this, 'annotations', this.inheritPageProp('Annots'));
-    },
-    get width() {
-      var mediaBox = this.mediaBox;
-      var rotate = this.rotate;
-      var width;
-      if (rotate == 0 || rotate == 180) {
-        width = (mediaBox[2] - mediaBox[0]);
-      } else {
-        width = (mediaBox[3] - mediaBox[1]);
-      }
-      return shadow(this, 'width', width);
-    },
-    get height() {
-      var mediaBox = this.mediaBox;
-      var rotate = this.rotate;
-      var height;
-      if (rotate == 0 || rotate == 180) {
-        height = (mediaBox[3] - mediaBox[1]);
-      } else {
-        height = (mediaBox[2] - mediaBox[0]);
-      }
-      return shadow(this, 'height', height);
-    },
-    get rotate() {
-      var rotate = this.inheritPageProp('Rotate') || 0;
-      // Normalize rotation so it's a multiple of 90 and between 0 and 270
-      if (rotate % 90 != 0) {
-        rotate = 0;
-      } else if (rotate >= 360) {
-        rotate = rotate % 360;
-      } else if (rotate < 0) {
-        // The spec doesn't cover negatives, assume its counterclockwise
-        // rotation. The following is the other implementation of modulo.
-        rotate = ((rotate % 360) + 360) % 360;
-      }
-      return shadow(this, 'rotate', rotate);
-    },
-
-    startRenderingFromOperatorList:
-      function Page_startRenderingFromOperatorList(operatorList, fonts) {
-      var self = this;
-      this.operatorList = operatorList;
-
-      var displayContinuation = function pageDisplayContinuation() {
-        // Always defer call to display() to work around bug in
-        // Firefox error reporting from XHR callbacks.
-        setTimeout(function pageSetTimeout() {
-          self.displayReadyPromise.resolve();
-        });
-      };
-
-      this.ensureFonts(fonts,
-        function pageStartRenderingFromOperatorListEnsureFonts() {
-          displayContinuation();
-        }
-      );
-    },
-
-    getOperatorList: function Page_getOperatorList(handler, dependency) {
-      if (this.operatorList) {
-        // content was compiled
-        return this.operatorList;
-      }
-
-      this.stats.time('Build IR Queue');
-
-      var xref = this.xref;
-      var content = this.content;
-      var resources = this.resources;
-      if (isArray(content)) {
-        // fetching items
-        var i, n = content.length;
-        for (i = 0; i < n; ++i)
-          content[i] = xref.fetchIfRef(content[i]);
-        content = new StreamsSequenceStream(content);
-      } else if (!content) {
-        // replacing non-existent page content with empty one
-        content = new Stream(new Uint8Array(0));
-      }
-
-      var pe = this.pe = new PartialEvaluator(
-                                xref, handler, 'p' + this.pageNumber + '_');
-
-      this.operatorList = pe.getOperatorList(content, resources, dependency);
-      this.stats.timeEnd('Build IR Queue');
-      return this.operatorList;
-    },
-
-    ensureFonts: function Page_ensureFonts(fonts, callback) {
-      this.stats.time('Font Loading');
-      // Convert the font names to the corresponding font obj.
-      for (var i = 0, ii = fonts.length; i < ii; i++) {
-        fonts[i] = this.objs.objs[fonts[i]].data;
-      }
-
-      // Load all the fonts
-      FontLoader.bind(
-        fonts,
-        function pageEnsureFontsFontObjs(fontObjs) {
-          this.stats.timeEnd('Font Loading');
-
-          callback.call(this);
-        }.bind(this)
-      );
-    },
-
-    display: function Page_display(gfx, callback) {
-      var stats = this.stats;
-      stats.time('Rendering');
-      var xref = this.xref;
-      var resources = this.resources;
-      var mediaBox = this.mediaBox;
-      assertWellFormed(isDict(resources), 'invalid page resources');
-
-      gfx.xref = xref;
-      gfx.res = resources;
-      gfx.beginDrawing({ x: mediaBox[0], y: mediaBox[1],
-            width: this.width,
-            height: this.height,
-            rotate: this.rotate });
-
-      var startIdx = 0;
-      var length = this.operatorList.fnArray.length;
-      var operatorList = this.operatorList;
-      var stepper = null;
-      if (PDFJS.pdfBug && StepperManager.enabled) {
-        stepper = StepperManager.create(this.pageNumber);
-        stepper.init(operatorList);
-        stepper.nextBreakPoint = stepper.getNextBreakPoint();
-      }
-
-      var self = this;
-      function next() {
-        startIdx =
-          gfx.executeOperatorList(operatorList, startIdx, next, stepper);
-        if (startIdx == length) {
-          gfx.endDrawing();
-          stats.timeEnd('Rendering');
-          stats.timeEnd('Overall');
-          if (callback) callback();
-        }
-      }
-      next();
-    },
-    rotatePoint: function Page_rotatePoint(x, y, reverse) {
-      var rotate = reverse ? (360 - this.rotate) : this.rotate;
-      switch (rotate) {
-        case 180:
-          return {x: this.width - x, y: y};
-        case 90:
-          return {x: this.width - y, y: this.height - x};
-        case 270:
-          return {x: y, y: x};
-        case 360:
-        case 0:
-        default:
-          return {x: x, y: this.height - y};
-      }
-    },
-    getLinks: function Page_getLinks() {
-      var links = [];
-      var annotations = pageGetAnnotations();
-      var i, n = annotations.length;
-      for (i = 0; i < n; ++i) {
-        if (annotations[i].type != 'Link')
-          continue;
-        links.push(annotations[i]);
-      }
-      return links;
-    },
-    getAnnotations: function Page_getAnnotations() {
-      var xref = this.xref;
-      function getInheritableProperty(annotation, name) {
-        var item = annotation;
-        while (item && !item.has(name)) {
-          item = item.get('Parent');
-        }
-        if (!item)
-          return null;
-        return item.get(name);
-      }
-      function isValidUrl(url) {
-        if (!url)
-          return false;
-        var colon = url.indexOf(':');
-        if (colon < 0)
-          return false;
-        var protocol = url.substr(0, colon);
-        switch (protocol) {
-          case 'http':
-          case 'https':
-          case 'ftp':
-            return true;
-          default:
-            return false;
-        }
-      }
-
-      var annotations = this.annotations || [];
-      var i, n = annotations.length;
-      var items = [];
-      for (i = 0; i < n; ++i) {
-        var annotationRef = annotations[i];
-        var annotation = xref.fetch(annotationRef);
-        if (!isDict(annotation))
-          continue;
-        var subtype = annotation.get('Subtype');
-        if (!isName(subtype))
-          continue;
-        var rect = annotation.get('Rect');
-        var topLeftCorner = this.rotatePoint(rect[0], rect[1]);
-        var bottomRightCorner = this.rotatePoint(rect[2], rect[3]);
-
-        var item = {};
-        item.type = subtype.name;
-        item.x = Math.min(topLeftCorner.x, bottomRightCorner.x);
-        item.y = Math.min(topLeftCorner.y, bottomRightCorner.y);
-        item.width = Math.abs(topLeftCorner.x - bottomRightCorner.x);
-        item.height = Math.abs(topLeftCorner.y - bottomRightCorner.y);
-        switch (subtype.name) {
-          case 'Link':
-            var a = annotation.get('A');
-            if (a) {
-              switch (a.get('S').name) {
-                case 'URI':
-                  var url = a.get('URI');
-                  // TODO: pdf spec mentions urls can be relative to a Base
-                  // entry in the dictionary.
-                  if (!isValidUrl(url))
-                    url = '';
-                  item.url = url;
-                  break;
-                case 'GoTo':
-                  item.dest = a.get('D');
-                  break;
-                default:
-                  TODO('other link types');
-              }
-            } else if (annotation.has('Dest')) {
-              // simple destination link
-              var dest = annotation.get('Dest');
-              item.dest = isName(dest) ? dest.name : dest;
-            }
-            break;
-          case 'Widget':
-            var fieldType = getInheritableProperty(annotation, 'FT');
-            if (!isName(fieldType))
-              break;
-            item.fieldType = fieldType.name;
-            // Building the full field name by collecting the field and
-            // its ancestors 'T' properties and joining them using '.'.
-            var fieldName = [];
-            var namedItem = annotation, ref = annotationRef;
-            while (namedItem) {
-              var parent = namedItem.get('Parent');
-              var parentRef = namedItem.getRaw('Parent');
-              var name = namedItem.get('T');
-              if (name) {
-                fieldName.unshift(stringToPDFString(name));
-              } else {
-                // The field name is absent, that means more than one field
-                // with the same name may exist. Replacing the empty name
-                // with the '`' plus index in the parent's 'Kids' array.
-                // This is not in the PDF spec but necessary to id the
-                // the input controls.
-                var kids = parent.get('Kids');
-                var j, jj;
-                for (j = 0, jj = kids.length; j < jj; j++) {
-                  var kidRef = kids[j];
-                  if (kidRef.num == ref.num && kidRef.gen == ref.gen)
-                    break;
-                }
-                fieldName.unshift('`' + j);
-              }
-              namedItem = parent;
-              ref = parentRef;
-            }
-            item.fullName = fieldName.join('.');
-            var alternativeText = stringToPDFString(annotation.get('TU') || '');
-            item.alternativeText = alternativeText;
-            var da = getInheritableProperty(annotation, 'DA') || '';
-            var m = /([\d\.]+)\sTf/.exec(da);
-            if (m)
-              item.fontSize = parseFloat(m[1]);
-            item.textAlignment = getInheritableProperty(annotation, 'Q');
-            item.flags = getInheritableProperty(annotation, 'Ff') || 0;
-            break;
-          case 'Text':
-            var content = annotation.get('Contents');
-            var title = annotation.get('T');
-            item.content = stringToPDFString(content || '');
-            item.title = stringToPDFString(title || '');
-            item.name = annotation.get('Name').name;
-            break;
-          default:
-            TODO('unimplemented annotation type: ' + subtype.name);
-            break;
-        }
-        items.push(item);
-      }
-      return items;
-    },
-    startRendering: function Page_startRendering(ctx, callback, textLayer)  {
-      var stats = this.stats;
-      stats.time('Overall');
-      // If there is no displayReadyPromise yet, then the operatorList was never
-      // requested before. Make the request and create the promise.
-      if (!this.displayReadyPromise) {
-        this.pdf.startRendering(this);
-        this.displayReadyPromise = new Promise();
-      }
-
-      // Once the operatorList and fonts are loaded, do the actual rendering.
-      this.displayReadyPromise.then(
-        function pageDisplayReadyPromise() {
-          var gfx = new CanvasGraphics(ctx, this.objs, textLayer);
-          try {
-            this.display(gfx, callback);
-          } catch (e) {
-            if (callback)
-              callback(e);
-            else
-              error(e);
-          }
-        }.bind(this),
-        function pageDisplayReadPromiseError(reason) {
-          if (callback)
-            callback(reason);
-          else
-            error(reason);
-        }
-      );
-    }
-  };
-
-  return Page;
-})();
-
-/**
- * The `PDFDocModel` holds all the data of the PDF file. Compared to the
- * `PDFDoc`, this one doesn't have any job management code.
- * Right now there exists one PDFDocModel on the main thread + one object
- * for each worker. If there is no worker support enabled, there are two
- * `PDFDocModel` objects on the main thread created.
- */
-var PDFDocModel = (function PDFDocModelClosure() {
-  function PDFDocModel(arg, callback) {
-    if (isStream(arg))
-      init.call(this, arg);
-    else if (isArrayBuffer(arg))
-      init.call(this, new Stream(arg));
-    else
-      error('PDFDocModel: Unknown argument type');
-  }
-
-  function init(stream) {
-    assertWellFormed(stream.length > 0, 'stream must have data');
-    this.stream = stream;
-    this.setup();
-    this.acroForm = this.catalog.catDict.get('AcroForm');
-  }
-
-  function find(stream, needle, limit, backwards) {
-    var pos = stream.pos;
-    var end = stream.end;
-    var str = '';
-    if (pos + limit > end)
-      limit = end - pos;
-    for (var n = 0; n < limit; ++n)
-      str += stream.getChar();
-    stream.pos = pos;
-    var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
-    if (index == -1)
-      return false; /* not found */
-    stream.pos += index;
-    return true; /* found */
-  }
-
-  PDFDocModel.prototype = {
-    get linearization() {
-      var length = this.stream.length;
-      var linearization = false;
-      if (length) {
-        linearization = new Linearization(this.stream);
-        if (linearization.length != length)
-          linearization = false;
-      }
-      // shadow the prototype getter with a data property
-      return shadow(this, 'linearization', linearization);
-    },
-    get startXRef() {
-      var stream = this.stream;
-      var startXRef = 0;
-      var linearization = this.linearization;
-      if (linearization) {
-        // Find end of first obj.
-        stream.reset();
-        if (find(stream, 'endobj', 1024))
-          startXRef = stream.pos + 6;
-      } else {
-        // Find startxref by jumping backward from the end of the file.
-        var step = 1024;
-        var found = false, pos = stream.end;
-        while (!found && pos > 0) {
-          pos -= step - 'startxref'.length;
-          if (pos < 0)
-            pos = 0;
-          stream.pos = pos;
-          found = find(stream, 'startxref', step, true);
-        }
-        if (found) {
-          stream.skip(9);
-          var ch;
-          do {
-            ch = stream.getChar();
-          } while (Lexer.isSpace(ch));
-          var str = '';
-          while ((ch - '0') <= 9) {
-            str += ch;
-            ch = stream.getChar();
-          }
-          startXRef = parseInt(str, 10);
-          if (isNaN(startXRef))
-            startXRef = 0;
-        }
-      }
-      // shadow the prototype getter with a data property
-      return shadow(this, 'startXRef', startXRef);
-    },
-    get mainXRefEntriesOffset() {
-      var mainXRefEntriesOffset = 0;
-      var linearization = this.linearization;
-      if (linearization)
-        mainXRefEntriesOffset = linearization.mainXRefEntriesOffset;
-      // shadow the prototype getter with a data property
-      return shadow(this, 'mainXRefEntriesOffset', mainXRefEntriesOffset);
-    },
-    // Find the header, remove leading garbage and setup the stream
-    // starting from the header.
-    checkHeader: function PDFDocModel_checkHeader() {
-      var stream = this.stream;
-      stream.reset();
-      if (find(stream, '%PDF-', 1024)) {
-        // Found the header, trim off any garbage before it.
-        stream.moveStart();
-        return;
-      }
-      // May not be a PDF file, continue anyway.
-    },
-    setup: function PDFDocModel_setup(ownerPassword, userPassword) {
-      this.checkHeader();
-      var xref = new XRef(this.stream,
-                          this.startXRef,
-                          this.mainXRefEntriesOffset);
-      this.xref = xref;
-      this.catalog = new Catalog(xref);
-    },
-    get numPages() {
-      var linearization = this.linearization;
-      var num = linearization ? linearization.numPages : this.catalog.numPages;
-      // shadow the prototype getter
-      return shadow(this, 'numPages', num);
-    },
-    getDocumentInfo: function PDFDocModel_getDocumentInfo() {
-      var info;
-      if (this.xref.trailer.has('Info')) {
-        var infoDict = this.xref.trailer.get('Info');
-
-        info = {};
-        infoDict.forEach(function(key, value) {
-          info[key] = typeof value !== 'string' ? value :
-            stringToPDFString(value);
-        });
-      }
-
-      return shadow(this, 'getDocumentInfo', info);
-    },
-    getFingerprint: function PDFDocModel_getFingerprint() {
-      var xref = this.xref, fileID;
-      if (xref.trailer.has('ID')) {
-        fileID = '';
-        var id = xref.trailer.get('ID')[0];
-        id.split('').forEach(function(el) {
-          fileID += Number(el.charCodeAt(0)).toString(16);
-        });
-      } else {
-        // If we got no fileID, then we generate one,
-        // from the first 100 bytes of PDF
-        var data = this.stream.bytes.subarray(0, 100);
-        var hash = calculateMD5(data, 0, data.length);
-        fileID = '';
-        for (var i = 0, length = hash.length; i < length; i++) {
-          fileID += Number(hash[i]).toString(16);
-        }
-      }
-
-      return shadow(this, 'getFingerprint', fileID);
-    },
-    getPage: function PDFDocModel_getPage(n) {
-      return this.catalog.getPage(n);
-    }
-  };
-
-  return PDFDocModel;
-})();
-
-var PDFDoc = (function PDFDocClosure() {
-  function PDFDoc(arg, callback) {
-    var stream = null;
-    var data = null;
-
-    if (isStream(arg)) {
-      stream = arg;
-      data = arg.bytes;
-    } else if (isArrayBuffer(arg)) {
-      stream = new Stream(arg);
-      data = arg;
-    } else {
-      error('PDFDoc: Unknown argument type');
-    }
-
-    this.data = data;
-    this.stream = stream;
-    this.pdfModel = new PDFDocModel(stream);
-    this.fingerprint = this.pdfModel.getFingerprint();
-    this.info = this.pdfModel.getDocumentInfo();
-    this.catalog = this.pdfModel.catalog;
-    this.objs = new PDFObjects();
-
-    this.pageCache = [];
-    this.fontsLoading = {};
-    this.workerReadyPromise = new Promise('workerReady');
-
-    // If worker support isn't disabled explicit and the browser has worker
-    // support, create a new web worker and test if it/the browser fullfills
-    // all requirements to run parts of pdf.js in a web worker.
-    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
-    // as it arrives on the worker. Chrome added this with version 15.
-    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
-      var workerSrc = PDFJS.workerSrc;
-      if (typeof workerSrc === 'undefined') {
-        error('No PDFJS.workerSrc specified');
-      }
-
-      try {
-        var worker;
-        if (PDFJS.isFirefoxExtension) {
-          // The firefox extension can't load the worker from the resource://
-          // url so we have to inline the script and then use the blob loader.
-          var bb = new MozBlobBuilder();
-          bb.append(document.querySelector('#PDFJS_SCRIPT_TAG').textContent);
-          var blobUrl = window.URL.createObjectURL(bb.getBlob());
-          worker = new Worker(blobUrl);
-        } else {
-          // Some versions of FF can't create a worker on localhost, see:
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
-          worker = new Worker(workerSrc);
-        }
-
-        var messageHandler = new MessageHandler('main', worker);
-
-        messageHandler.on('test', function pdfDocTest(supportTypedArray) {
-          if (supportTypedArray) {
-            this.worker = worker;
-            this.setupMessageHandler(messageHandler);
-          } else {
-            globalScope.PDFJS.disableWorker = true;
-            this.setupFakeWorker();
-          }
-        }.bind(this));
-
-        var testObj = new Uint8Array(1);
-        // Some versions of Opera throw a DATA_CLONE_ERR on
-        // serializing the typed array.
-        messageHandler.send('test', testObj);
-        return;
-      } catch (e) {
-        warn('The worker has been disabled.');
-      }
-    }
-    // Either workers are disabled, not supported or have thrown an exception.
-    // Thus, we fallback to a faked worker.
-    globalScope.PDFJS.disableWorker = true;
-    this.setupFakeWorker();
-  }
-
-  PDFDoc.prototype = {
-    setupFakeWorker: function PDFDoc_setupFakeWorker() {
-      // If we don't use a worker, just post/sendMessage to the main thread.
-      var fakeWorker = {
-        postMessage: function PDFDoc_postMessage(obj) {
-          fakeWorker.onmessage({data: obj});
-        },
-        terminate: function PDFDoc_terminate() {}
-      };
-
-      var messageHandler = new MessageHandler('main', fakeWorker);
-      this.setupMessageHandler(messageHandler);
-
-      // If the main thread is our worker, setup the handling for the messages
-      // the main thread sends to it self.
-      WorkerMessageHandler.setup(messageHandler);
-    },
-
-
-    setupMessageHandler: function PDFDoc_setupMessageHandler(messageHandler) {
-      this.messageHandler = messageHandler;
-
-      messageHandler.on('page', function pdfDocPage(data) {
-        var pageNum = data.pageNum;
-        var page = this.pageCache[pageNum];
-        var depFonts = data.depFonts;
-
-        page.stats.timeEnd('Page Request');
-        page.startRenderingFromOperatorList(data.operatorList, depFonts);
-      }, this);
-
-      messageHandler.on('obj', function pdfDocObj(data) {
-        var id = data[0];
-        var type = data[1];
-
-        switch (type) {
-          case 'JpegStream':
-            var imageData = data[2];
-            loadJpegStream(id, imageData, this.objs);
-            break;
-          case 'Image':
-            var imageData = data[2];
-            this.objs.resolve(id, imageData);
-            break;
-          case 'Font':
-            var name = data[2];
-            var file = data[3];
-            var properties = data[4];
-
-            if (file) {
-              // Rewrap the ArrayBuffer in a stream.
-              var fontFileDict = new Dict();
-              file = new Stream(file, 0, file.length, fontFileDict);
-            }
-
-            // At this point, only the font object is created but the font is
-            // not yet attached to the DOM. This is done in `FontLoader.bind`.
-            var font = new Font(name, file, properties);
-            this.objs.resolve(id, font);
-            break;
-          default:
-            error('Got unkown object type ' + type);
-        }
-      }, this);
-
-      messageHandler.on('page_error', function pdfDocError(data) {
-        var page = this.pageCache[data.pageNum];
-        if (page.displayReadyPromise)
-          page.displayReadyPromise.reject(data.error);
-        else
-          error(data.error);
-      }, this);
-
-      messageHandler.on('jpeg_decode', function(data, promise) {
-        var imageData = data[0];
-        var components = data[1];
-        if (components != 3 && components != 1)
-          error('Only 3 component or 1 component can be returned');
-
-        var img = new Image();
-        img.onload = (function messageHandler_onloadClosure() {
-          var width = img.width;
-          var height = img.height;
-          var size = width * height;
-          var rgbaLength = size * 4;
-          var buf = new Uint8Array(size * components);
-          var tmpCanvas = createScratchCanvas(width, height);
-          var tmpCtx = tmpCanvas.getContext('2d');
-          tmpCtx.drawImage(img, 0, 0);
-          var data = tmpCtx.getImageData(0, 0, width, height).data;
-
-          if (components == 3) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
-              buf[j] = data[i];
-              buf[j + 1] = data[i + 1];
-              buf[j + 2] = data[i + 2];
-            }
-          } else if (components == 1) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j++) {
-              buf[j] = data[i];
-            }
-          }
-          promise.resolve({ data: buf, width: width, height: height});
-        }).bind(this);
-        var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
-        img.src = src;
-      });
-
-      setTimeout(function pdfDocFontReadySetTimeout() {
-        messageHandler.send('doc', this.data);
-        this.workerReadyPromise.resolve(true);
-      }.bind(this));
-    },
-
-    get numPages() {
-      return this.pdfModel.numPages;
-    },
-
-    startRendering: function PDFDoc_startRendering(page) {
-      // The worker might not be ready to receive the page request yet.
-      this.workerReadyPromise.then(function pdfDocStartRenderingThen() {
-        page.stats.time('Page Request');
-        this.messageHandler.send('page_request', page.pageNumber + 1);
-      }.bind(this));
-    },
-
-    getPage: function PDFDoc_getPage(n) {
-      if (this.pageCache[n])
-        return this.pageCache[n];
-
-      var page = this.pdfModel.getPage(n);
-      // Add a reference to the objects such that Page can forward the reference
-      // to the CanvasGraphics and so on.
-      page.objs = this.objs;
-      page.pdf = this;
-      return (this.pageCache[n] = page);
-    },
-
-    destroy: function PDFDoc_destroy() {
-      if (this.worker)
-        this.worker.terminate();
-
-      if (this.fontWorker)
-        this.fontWorker.terminate();
-
-      for (var n in this.pageCache)
-        delete this.pageCache[n];
-
-      delete this.data;
-      delete this.stream;
-      delete this.pdf;
-      delete this.catalog;
-    }
-  };
-
-  return PDFDoc;
-})();
-
-globalScope.PDFJS.PDFDoc = PDFDoc;
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-function log(msg) {
-  if (console && console.log)
-    console.log(msg);
-  else if (print)
-    print(msg);
-}
-
-function warn(msg) {
-  if (verbosity >= WARNINGS)
-    log('Warning: ' + msg);
-}
-
-function backtrace() {
-  try {
-    throw new Error();
-  } catch (e) {
-    return e.stack ? e.stack.split('\n').slice(2).join('\n') : '';
-  }
-}
-
-function error(msg) {
-  log('Error: ' + msg);
-  log(backtrace());
-  throw new Error(msg);
-}
-
-function TODO(what) {
-  if (verbosity >= TODOS)
-    log('TODO: ' + what);
-}
-
-function malformed(msg) {
-  error('Malformed PDF: ' + msg);
-}
-
-function assert(cond, msg) {
-  if (!cond)
-    error(msg);
-}
-
-// In a well-formed PDF, |cond| holds.  If it doesn't, subsequent
-// behavior is undefined.
-function assertWellFormed(cond, msg) {
-  if (!cond)
-    malformed(msg);
-}
-
-function shadow(obj, prop, value) {
-  Object.defineProperty(obj, prop, { value: value,
-                                     enumerable: true,
-                                     configurable: true,
-                                     writable: false });
-  return value;
-}
-
-function bytesToString(bytes) {
-  var str = '';
-  var length = bytes.length;
-  for (var n = 0; n < length; ++n)
-    str += String.fromCharCode(bytes[n]);
-  return str;
-}
-
-function stringToBytes(str) {
-  var length = str.length;
-  var bytes = new Uint8Array(length);
-  for (var n = 0; n < length; ++n)
-    bytes[n] = str.charCodeAt(n) & 0xFF;
-  return bytes;
-}
-
-var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
-
-var Util = (function UtilClosure() {
-  function Util() {}
-
-  Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
-    var ri = (255 * r) | 0, gi = (255 * g) | 0, bi = (255 * b) | 0;
-    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
-  };
-
-  Util.makeCssCmyk = function Util_makeCssCmyk(c, m, y, k) {
-    c = (new DeviceCmykCS()).getRgb([c, m, y, k]);
-    var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0;
-    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
-  };
-
-  // For 2d affine transforms
-  Util.applyTransform = function Util_applyTransform(p, m) {
-    var xt = p[0] * m[0] + p[1] * m[2] + m[4];
-    var yt = p[0] * m[1] + p[1] * m[3] + m[5];
-    return [xt, yt];
-  };
-
-  // Apply a generic 3d matrix M on a 3-vector v:
-  //   | a b c |   | X |
-  //   | d e f | x | Y |
-  //   | g h i |   | Z |
-  // M is assumed to be serialized as [a,b,c,d,e,f,g,h,i],
-  // with v as [X,Y,Z]
-  Util.apply3dTransform = function Util_apply3dTransform(m, v) {
-    return [
-      m[0] * v[0] + m[1] * v[1] + m[2] * v[2],
-      m[3] * v[0] + m[4] * v[1] + m[5] * v[2],
-      m[6] * v[0] + m[7] * v[1] + m[8] * v[2]
-    ];
-  }
-
-  // Normalize rectangle rect=[x1, y1, x2, y2] so that (x1,y1) < (x2,y2)
-  // For coordinate systems whose origin lies in the bottom-left, this
-  // means normalization to (BL,TR) ordering. For systems with origin in the
-  // top-left, this means (TL,BR) ordering.
-  Util.normalizeRect = function Util_normalizeRect(rect) {
-    var r = rect.slice(0); // clone rect
-    if (rect[0] > rect[2]) {
-      r[0] = rect[2];
-      r[2] = rect[0];
-    }
-    if (rect[1] > rect[3]) {
-      r[1] = rect[3];
-      r[3] = rect[1];
-    }
-    return r;
-  }
-
-  // Returns a rectangle [x1, y1, x2, y2] corresponding to the
-  // intersection of rect1 and rect2. If no intersection, returns 'false'
-  // The rectangle coordinates of rect1, rect2 should be [x1, y1, x2, y2]
-  Util.intersect = function Util_intersect(rect1, rect2) {
-    function compare(a, b) {
-      return a - b;
-    };
-
-    // Order points along the axes
-    var orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare),
-        orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare),
-        result = [];
-
-    rect1 = Util.normalizeRect(rect1);
-    rect2 = Util.normalizeRect(rect2);
-
-    // X: first and second points belong to different rectangles?
-    if ((orderedX[0] === rect1[0] && orderedX[1] === rect2[0]) ||
-        (orderedX[0] === rect2[0] && orderedX[1] === rect1[0])) {
-      // Intersection must be between second and third points
-      result[0] = orderedX[1];
-      result[2] = orderedX[2];
-    } else {
-      return false;
-    }
-
-    // Y: first and second points belong to different rectangles?
-    if ((orderedY[0] === rect1[1] && orderedY[1] === rect2[1]) ||
-        (orderedY[0] === rect2[1] && orderedY[1] === rect1[1])) {
-      // Intersection must be between second and third points
-      result[1] = orderedY[1];
-      result[3] = orderedY[2];
-    } else {
-      return false;
-    }
-
-    return result;
-  }
-
-  Util.sign = function Util_sign(num) {
-    return num < 0 ? -1 : 1;
-  };
-
-  return Util;
-})();
-
-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,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014,
-  0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C,
-  0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160,
-  0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC
-];
-
-function stringToPDFString(str) {
-  var i, n = str.length, str2 = '';
-  if (str[0] === '\xFE' && str[1] === '\xFF') {
-    // UTF16BE BOM
-    for (i = 2; i < n; i += 2)
-      str2 += String.fromCharCode(
-        (str.charCodeAt(i) << 8) | str.charCodeAt(i + 1));
-  } else {
-    for (i = 0; i < n; ++i) {
-      var code = PDFStringTranslateTable[str.charCodeAt(i)];
-      str2 += code ? String.fromCharCode(code) : str.charAt(i);
-    }
-  }
-  return str2;
-}
-
-function isBool(v) {
-  return typeof v == 'boolean';
-}
-
-function isInt(v) {
-  return typeof v == 'number' && ((v | 0) == v);
-}
-
-function isNum(v) {
-  return typeof v == 'number';
-}
-
-function isString(v) {
-  return typeof v == 'string';
-}
-
-function isNull(v) {
-  return v === null;
-}
-
-function isName(v) {
-  return v instanceof Name;
-}
-
-function isCmd(v, cmd) {
-  return v instanceof Cmd && (!cmd || v.cmd == cmd);
-}
-
-function isDict(v, type) {
-  return v instanceof Dict && (!type || v.get('Type').name == type);
-}
-
-function isArray(v) {
-  return v instanceof Array;
-}
-
-function isStream(v) {
-  return typeof v == 'object' && v != null && ('getChar' in v);
-}
-
-function isArrayBuffer(v) {
-  return typeof v == 'object' && v != null && ('byteLength' in v);
-}
-
-function isRef(v) {
-  return v instanceof Ref;
-}
-
-function isPDFFunction(v) {
-  var fnDict;
-  if (typeof v != 'object')
-    return false;
-  else if (isDict(v))
-    fnDict = v;
-  else if (isStream(v))
-    fnDict = v.dict;
-  else
-    return false;
-  return fnDict.has('FunctionType');
-}
-
-/**
- * 'Promise' object.
- * Each object that is stored in PDFObjects is based on a Promise object that
- * contains the status of the object and the data. There migth be situations,
- * where a function want to use the value of an object, but it isn't ready at
- * that time. To get a notification, once the object is ready to be used, s.o.
- * can add a callback using the `then` method on the promise that then calls
- * the callback once the object gets resolved.
- * A promise can get resolved only once and only once the data of the promise
- * can be set. If any of these happens twice or the data is required before
- * it was set, an exception is throw.
- */
-var Promise = (function PromiseClosure() {
-  var EMPTY_PROMISE = {};
-
-  /**
-   * If `data` is passed in this constructor, the promise is created resolved.
-   * If there isn't data, it isn't resolved at the beginning.
-   */
-  function Promise(name, data) {
-    this.name = name;
-    this.isRejected = false;
-    this.error = null;
-    // If you build a promise and pass in some data it's already resolved.
-    if (data != null) {
-      this.isResolved = true;
-      this._data = data;
-      this.hasData = true;
-    } else {
-      this.isResolved = false;
-      this._data = EMPTY_PROMISE;
-    }
-    this.callbacks = [];
-    this.errbacks = [];
-  };
-  /**
-   * Builds a promise that is resolved when all the passed in promises are
-   * resolved.
-   * @param {Promise[]} promises Array of promises to wait for.
-   * @return {Promise} New dependant promise.
-   */
-  Promise.all = function Promise_all(promises) {
-    var deferred = new Promise();
-    var unresolved = promises.length;
-    var results = [];
-    if (unresolved === 0) {
-      deferred.resolve(results);
-      return deferred;
-    }
-    for (var i = 0; i < unresolved; ++i) {
-      var promise = promises[i];
-      promise.then((function(i) {
-        return function(value) {
-          results[i] = value;
-          unresolved--;
-          if (unresolved === 0)
-            deferred.resolve(results);
-        };
-      })(i));
-    }
-    return deferred;
-  };
-  Promise.prototype = {
-    hasData: false,
-
-    set data(value) {
-      if (value === undefined) {
-        return;
-      }
-      if (this._data !== EMPTY_PROMISE) {
-        error('Promise ' + this.name +
-              ': Cannot set the data of a promise twice');
-      }
-      this._data = value;
-      this.hasData = true;
-
-      if (this.onDataCallback) {
-        this.onDataCallback(value);
-      }
-    },
-
-    get data() {
-      if (this._data === EMPTY_PROMISE) {
-        error('Promise ' + this.name + ': Cannot get data that isn\'t set');
-      }
-      return this._data;
-    },
-
-    onData: function Promise_onData(callback) {
-      if (this._data !== EMPTY_PROMISE) {
-        callback(this._data);
-      } else {
-        this.onDataCallback = callback;
-      }
-    },
-
-    resolve: function Promise_resolve(data) {
-      if (this.isResolved) {
-        error('A Promise can be resolved only once ' + this.name);
-      }
-      if (this.isRejected) {
-        error('The Promise was already rejected ' + this.name);
-      }
-
-      this.isResolved = true;
-      this.data = data || null;
-      var callbacks = this.callbacks;
-
-      for (var i = 0, ii = callbacks.length; i < ii; i++) {
-        callbacks[i].call(null, data);
-      }
-    },
-
-    reject: function Promise_reject(reason) {
-      if (this.isRejected) {
-        error('A Promise can be rejected only once ' + this.name);
-      }
-      if (this.isResolved) {
-        error('The Promise was already resolved ' + this.name);
-      }
-
-      this.isRejected = true;
-      this.error = reason || null;
-      var errbacks = this.errbacks;
-
-      for (var i = 0, ii = errbacks.length; i < ii; i++) {
-        errbacks[i].call(null, reason);
-      }
-    },
-
-    then: function Promise_then(callback, errback) {
-      if (!callback) {
-        error('Requiring callback' + this.name);
-      }
-
-      // If the promise is already resolved, call the callback directly.
-      if (this.isResolved) {
-        var data = this.data;
-        callback.call(null, data);
-      } else if (this.isRejected && errback) {
-        var error = this.error;
-        errback.call(null, error);
-      } else {
-        this.callbacks.push(callback);
-        if (errback)
-          this.errbacks.push(errback);
-      }
-    }
-  };
-
-  return Promise;
-})();
-
-var StatTimer = (function StatTimerClosure() {
-  function rpad(str, pad, length) {
-    while (str.length < length)
-      str += pad;
-    return str;
-  }
-  function StatTimer() {
-    this.started = {};
-    this.times = [];
-    this.enabled = true;
-  }
-  StatTimer.prototype = {
-    time: function StatTimer_time(name) {
-      if (!this.enabled)
-        return;
-      if (name in this.started)
-        throw 'Timer is already running for ' + name;
-      this.started[name] = Date.now();
-    },
-    timeEnd: function StatTimer_timeEnd(name) {
-      if (!this.enabled)
-        return;
-      if (!(name in this.started))
-        throw 'Timer has not been started for ' + name;
-      this.times.push({
-        'name': name,
-        'start': this.started[name],
-        'end': Date.now()
-      });
-      // Remove timer from started so it can be called again.
-      delete this.started[name];
-    },
-    toString: function StatTimer_toString() {
-      var times = this.times;
-      var out = '';
-      // Find the longest name for padding purposes.
-      var longest = 0;
-      for (var i = 0, ii = times.length; i < ii; ++i) {
-        var name = times[i]['name'];
-        if (name.length > longest)
-          longest = name.length;
-      }
-      for (var i = 0, ii = times.length; i < ii; ++i) {
-        var span = times[i];
-        var duration = span.end - span.start;
-        out += rpad(span['name'], ' ', longest) + ' ' + duration + 'ms\n';
-      }
-      return out;
-    }
-  };
-  return StatTimer;
-})();
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-// <canvas> contexts store most of the state we need natively.
-// However, PDF needs a bit more state, which we store here.
-
-var TextRenderingMode = {
-  FILL: 0,
-  STROKE: 1,
-  FILL_STROKE: 2,
-  INVISIBLE: 3,
-  FILL_ADD_TO_PATH: 4,
-  STROKE_ADD_TO_PATH: 5,
-  FILL_STROKE_ADD_TO_PATH: 6,
-  ADD_TO_PATH: 7
-};
-
-// Minimal font size that would be used during canvas fillText operations.
-var MIN_FONT_SIZE = 1;
-
-function createScratchCanvas(width, height) {
-  var canvas = document.createElement('canvas');
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
-}
-
-function addContextCurrentTransform(ctx) {
-  // If the context doesn't expose a `mozCurrentTransform`, add a JS based on.
-  if (!ctx.mozCurrentTransform) {
-    // Store the original context
-    ctx._originalSave = ctx.save;
-    ctx._originalRestore = ctx.restore;
-    ctx._originalRotate = ctx.rotate;
-    ctx._originalScale = ctx.scale;
-    ctx._originalTranslate = ctx.translate;
-    ctx._originalTransform = ctx.transform;
-
-    ctx._transformMatrix = [1, 0, 0, 1, 0, 0];
-    ctx._transformStack = [];
-
-    Object.defineProperty(ctx, 'mozCurrentTransform', {
-      get: function getCurrentTransform() {
-        return this._transformMatrix;
-      }
-    });
-
-    Object.defineProperty(ctx, 'mozCurrentTransformInverse', {
-      get: function getCurrentTransformInverse() {
-        // Calculation done using WolframAlpha:
-        // http://www.wolframalpha.com/input/?
-        //   i=Inverse+{{a%2C+c%2C+e}%2C+{b%2C+d%2C+f}%2C+{0%2C+0%2C+1}}
-
-        var m = this._transformMatrix;
-        var a = m[0], b = m[1], c = m[2], d = m[3], e = m[4], f = m[5];
-
-        var ad_bc = a * d - b * c;
-        var bc_ad = b * c - a * d;
-
-        return [
-          d / ad_bc,
-          b / bc_ad,
-          c / bc_ad,
-          a / ad_bc,
-          (d * e - c * f) / bc_ad,
-          (b * e - a * f) / ad_bc
-        ];
-      }
-    });
-
-    ctx.save = function ctxSave() {
-      var old = this._transformMatrix;
-      this._transformStack.push(old);
-      this._transformMatrix = old.slice(0, 6);
-
-      this._originalSave();
-    };
-
-    ctx.restore = function ctxRestore() {
-      var prev = this._transformStack.pop();
-      if (prev) {
-        this._transformMatrix = prev;
-        this._originalRestore();
-      }
-    };
-
-    ctx.translate = function ctxTranslate(x, y) {
-      var m = this._transformMatrix;
-      m[4] = m[0] * x + m[2] * y + m[4];
-      m[5] = m[1] * x + m[3] * y + m[5];
-
-      this._originalTranslate(x, y);
-    };
-
-    ctx.scale = function ctxScale(x, y) {
-      var m = this._transformMatrix;
-      m[0] = m[0] * x;
-      m[1] = m[1] * x;
-      m[2] = m[2] * y;
-      m[3] = m[3] * y;
-
-      this._originalScale(x, y);
-    };
-
-    ctx.transform = function ctxTransform(a, b, c, d, e, f) {
-      var m = this._transformMatrix;
-      this._transformMatrix = [
-        m[0] * a + m[2] * b,
-        m[1] * a + m[3] * b,
-        m[0] * c + m[2] * d,
-        m[1] * c + m[3] * d,
-        m[0] * e + m[2] * f + m[4],
-        m[1] * e + m[3] * f + m[5]
-      ];
-
-      ctx._originalTransform(a, b, c, d, e, f);
-    };
-
-    ctx.rotate = function ctxRotate(angle) {
-      var cosValue = Math.cos(angle);
-      var sinValue = Math.sin(angle);
-
-      var m = this._transformMatrix;
-      this._transformMatrix = [
-        m[0] * cosValue + m[2] * sinValue,
-        m[1] * cosValue + m[3] * sinValue,
-        m[0] * (-sinValue) + m[2] * cosValue,
-        m[1] * (-sinValue) + m[3] * cosValue,
-        m[4],
-        m[5]
-      ];
-
-      this._originalRotate(angle);
-    };
-  }
-}
-
-var CanvasExtraState = (function CanvasExtraStateClosure() {
-  function CanvasExtraState(old) {
-    // Are soft masks and alpha values shapes or opacities?
-    this.alphaIsShape = false;
-    this.fontSize = 0;
-    this.fontSizeScale = 1;
-    this.textMatrix = IDENTITY_MATRIX;
-    this.fontMatrix = IDENTITY_MATRIX;
-    this.leading = 0;
-    // Current point (in user coordinates)
-    this.x = 0;
-    this.y = 0;
-    // Start of text line (in text coordinates)
-    this.lineX = 0;
-    this.lineY = 0;
-    // Character and word spacing
-    this.charSpacing = 0;
-    this.wordSpacing = 0;
-    this.textHScale = 1;
-    this.textRenderingMode = TextRenderingMode.FILL;
-    // Color spaces
-    this.fillColorSpace = new DeviceGrayCS();
-    this.fillColorSpaceObj = null;
-    this.strokeColorSpace = new DeviceGrayCS();
-    this.strokeColorSpaceObj = null;
-    this.fillColorObj = null;
-    this.strokeColorObj = null;
-    // Default fore and background colors
-    this.fillColor = '#000000';
-    this.strokeColor = '#000000';
-    // Note: fill alpha applies to all non-stroking operations
-    this.fillAlpha = 1;
-    this.strokeAlpha = 1;
-    this.lineWidth = 1;
-
-    this.old = old;
-  }
-
-  CanvasExtraState.prototype = {
-    clone: function CanvasExtraState_clone() {
-      return Object.create(this);
-    },
-    setCurrentPoint: function CanvasExtraState_setCurrentPoint(x, y) {
-      this.x = x;
-      this.y = y;
-    }
-  };
-  return CanvasExtraState;
-})();
-
-var CanvasGraphics = (function CanvasGraphicsClosure() {
-  // Defines the time the executeOperatorList is going to be executing
-  // before it stops and shedules a continue of execution.
-  var kExecutionTime = 15;
-
-  function CanvasGraphics(canvasCtx, objs, textLayer) {
-    this.ctx = canvasCtx;
-    this.current = new CanvasExtraState();
-    this.stateStack = [];
-    this.pendingClip = null;
-    this.res = null;
-    this.xobjs = null;
-    this.objs = objs;
-    this.textLayer = textLayer;
-    if (canvasCtx) {
-      addContextCurrentTransform(canvasCtx);
-    }
-  }
-
-  var LINE_CAP_STYLES = ['butt', 'round', 'square'];
-  var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
-  var NORMAL_CLIP = {};
-  var EO_CLIP = {};
-
-  CanvasGraphics.prototype = {
-    slowCommands: {
-      'stroke': true,
-      'closeStroke': true,
-      'fill': true,
-      'eoFill': true,
-      'fillStroke': true,
-      'eoFillStroke': true,
-      'closeFillStroke': true,
-      'closeEOFillStroke': true,
-      'showText': true,
-      'showSpacedText': true,
-      'setStrokeColorSpace': true,
-      'setFillColorSpace': true,
-      'setStrokeColor': true,
-      'setStrokeColorN': true,
-      'setFillColor': true,
-      'setFillColorN': true,
-      'setStrokeGray': true,
-      'setFillGray': true,
-      'setStrokeRGBColor': true,
-      'setFillRGBColor': true,
-      'setStrokeCMYKColor': true,
-      'setFillCMYKColor': true,
-      'paintJpegXObject': true,
-      'paintImageXObject': true,
-      'paintImageMaskXObject': true,
-      'shadingFill': true
-    },
-
-    beginDrawing: function CanvasGraphics_beginDrawing(mediaBox) {
-      var cw = this.ctx.canvas.width, ch = this.ctx.canvas.height;
-      this.ctx.save();
-      switch (mediaBox.rotate) {
-        case 0:
-          this.ctx.transform(1, 0, 0, -1, 0, ch);
-          break;
-        case 90:
-          this.ctx.transform(0, 1, 1, 0, 0, 0);
-          break;
-        case 180:
-          this.ctx.transform(-1, 0, 0, 1, cw, 0);
-          break;
-        case 270:
-          this.ctx.transform(0, -1, -1, 0, cw, ch);
-          break;
-      }
-      // Scale so that canvas units are the same as PDF user space units
-      this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
-      // Move the media left-top corner to the (0,0) canvas position
-      this.ctx.translate(-mediaBox.x, -mediaBox.y);
-
-      if (this.textLayer)
-        this.textLayer.beginLayout();
-    },
-
-    executeOperatorList: function CanvasGraphics_executeOperatorList(
-                                    operatorList,
-                                    executionStartIdx, continueCallback,
-                                    stepper) {
-      var argsArray = operatorList.argsArray;
-      var fnArray = operatorList.fnArray;
-      var i = executionStartIdx || 0;
-      var argsArrayLen = argsArray.length;
-
-      // Sometimes the OperatorList to execute is empty.
-      if (argsArrayLen == i) {
-        return i;
-      }
-
-      var executionEndIdx;
-      var endTime = Date.now() + kExecutionTime;
-
-      var objs = this.objs;
-      var fnName;
-      var slowCommands = this.slowCommands;
-
-      while (true) {
-        if (stepper && i === stepper.nextBreakPoint) {
-          stepper.breakIt(i, continueCallback);
-          return i;
-        }
-
-        fnName = fnArray[i];
-
-        if (fnName !== 'dependency') {
-          this[fnName].apply(this, argsArray[i]);
-        } else {
-          var deps = argsArray[i];
-          for (var n = 0, nn = deps.length; n < nn; n++) {
-            var depObjId = deps[n];
-
-            // If the promise isn't resolved yet, add the continueCallback
-            // to the promise and bail out.
-            if (!objs.isResolved(depObjId)) {
-              objs.get(depObjId, continueCallback);
-              return i;
-            }
-          }
-        }
-
-        i++;
-
-        // If the entire operatorList was executed, stop as were done.
-        if (i == argsArrayLen) {
-          return i;
-        }
-
-        // If the execution took longer then a certain amount of time, shedule
-        // to continue exeution after a short delay.
-        // However, this is only possible if a 'continueCallback' is passed in.
-        if (continueCallback && slowCommands[fnName] && Date.now() > endTime) {
-          setTimeout(continueCallback, 0);
-          return i;
-        }
-
-        // If the operatorList isn't executed completely yet OR the execution
-        // time was short enough, do another execution round.
-      }
-    },
-
-    endDrawing: function CanvasGraphics_endDrawing() {
-      this.ctx.restore();
-
-      if (this.textLayer)
-        this.textLayer.endLayout();
-    },
-
-    // Graphics state
-    setLineWidth: function CanvasGraphics_setLineWidth(width) {
-      this.current.lineWidth = width;
-      this.ctx.lineWidth = width;
-    },
-    setLineCap: function CanvasGraphics_setLineCap(style) {
-      this.ctx.lineCap = LINE_CAP_STYLES[style];
-    },
-    setLineJoin: function CanvasGraphics_setLineJoin(style) {
-      this.ctx.lineJoin = LINE_JOIN_STYLES[style];
-    },
-    setMiterLimit: function CanvasGraphics_setMiterLimit(limit) {
-      this.ctx.miterLimit = limit;
-    },
-    setDash: function CanvasGraphics_setDash(dashArray, dashPhase) {
-      this.ctx.mozDash = dashArray;
-      this.ctx.mozDashOffset = dashPhase;
-      this.ctx.webkitLineDash = dashArray;
-      this.ctx.webkitLineDashOffset = dashPhase;
-    },
-    setRenderingIntent: function CanvasGraphics_setRenderingIntent(intent) {
-      TODO('set rendering intent: ' + intent);
-    },
-    setFlatness: function CanvasGraphics_setFlatness(flatness) {
-      TODO('set flatness: ' + flatness);
-    },
-    setGState: function CanvasGraphics_setGState(states) {
-      for (var i = 0, ii = states.length; i < ii; i++) {
-        var state = states[i];
-        var key = state[0];
-        var value = state[1];
-
-        switch (key) {
-          case 'LW':
-            this.setLineWidth(value);
-            break;
-          case 'LC':
-            this.setLineCap(value);
-            break;
-          case 'LJ':
-            this.setLineJoin(value);
-            break;
-          case 'ML':
-            this.setMiterLimit(value);
-            break;
-          case 'D':
-            this.setDash(value[0], value[1]);
-            break;
-          case 'RI':
-            this.setRenderingIntent(value);
-            break;
-          case 'FL':
-            this.setFlatness(value);
-            break;
-          case 'Font':
-            this.setFont(state[1], state[2]);
-            break;
-          case 'CA':
-            this.current.strokeAlpha = state[1];
-            break;
-          case 'ca':
-            this.current.fillAlpha = state[1];
-            this.ctx.globalAlpha = state[1];
-            break;
-        }
-      }
-    },
-    save: function CanvasGraphics_save() {
-      this.ctx.save();
-      var old = this.current;
-      this.stateStack.push(old);
-      this.current = old.clone();
-    },
-    restore: function CanvasGraphics_restore() {
-      var prev = this.stateStack.pop();
-      if (prev) {
-        this.current = prev;
-        this.ctx.restore();
-      }
-    },
-    transform: function CanvasGraphics_transform(a, b, c, d, e, f) {
-      this.ctx.transform(a, b, c, d, e, f);
-    },
-
-    // Path
-    moveTo: function CanvasGraphics_moveTo(x, y) {
-      this.ctx.moveTo(x, y);
-      this.current.setCurrentPoint(x, y);
-    },
-    lineTo: function CanvasGraphics_lineTo(x, y) {
-      this.ctx.lineTo(x, y);
-      this.current.setCurrentPoint(x, y);
-    },
-    curveTo: function CanvasGraphics_curveTo(x1, y1, x2, y2, x3, y3) {
-      this.ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
-      this.current.setCurrentPoint(x3, y3);
-    },
-    curveTo2: function CanvasGraphics_curveTo2(x2, y2, x3, y3) {
-      var current = this.current;
-      this.ctx.bezierCurveTo(current.x, current.y, x2, y2, x3, y3);
-      current.setCurrentPoint(x3, y3);
-    },
-    curveTo3: function CanvasGraphics_curveTo3(x1, y1, x3, y3) {
-      this.curveTo(x1, y1, x3, y3, x3, y3);
-      this.current.setCurrentPoint(x3, y3);
-    },
-    closePath: function CanvasGraphics_closePath() {
-      this.ctx.closePath();
-    },
-    rectangle: function CanvasGraphics_rectangle(x, y, width, height) {
-      this.ctx.rect(x, y, width, height);
-    },
-    stroke: function CanvasGraphics_stroke(consumePath) {
-      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
-      var ctx = this.ctx;
-      var strokeColor = this.current.strokeColor;
-      if (this.current.lineWidth === 0)
-        ctx.lineWidth = this.getSinglePixelWidth();
-      // For stroke we want to temporarily change the global alpha to the
-      // stroking alpha.
-      ctx.globalAlpha = this.current.strokeAlpha;
-      if (strokeColor && strokeColor.hasOwnProperty('type') &&
-          strokeColor.type === 'Pattern') {
-        // for patterns, we transform to pattern space, calculate
-        // the pattern, call stroke, and restore to user space
-        ctx.save();
-        ctx.strokeStyle = strokeColor.getPattern(ctx);
-        ctx.stroke();
-        ctx.restore();
-      } else {
-        ctx.stroke();
-      }
-      if (consumePath)
-        this.consumePath();
-      // Restore the global alpha to the fill alpha
-      ctx.globalAlpha = this.current.fillAlpha;
-    },
-    closeStroke: function CanvasGraphics_closeStroke() {
-      this.closePath();
-      this.stroke();
-    },
-    fill: function CanvasGraphics_fill(consumePath) {
-      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
-      var ctx = this.ctx;
-      var fillColor = this.current.fillColor;
-
-      if (fillColor && fillColor.hasOwnProperty('type') &&
-          fillColor.type === 'Pattern') {
-        ctx.save();
-        ctx.fillStyle = fillColor.getPattern(ctx);
-        ctx.fill();
-        ctx.restore();
-      } else {
-        ctx.fill();
-      }
-      if (consumePath)
-        this.consumePath();
-    },
-    eoFill: function CanvasGraphics_eoFill() {
-      var savedFillRule = this.setEOFillRule();
-      this.fill();
-      this.restoreFillRule(savedFillRule);
-    },
-    fillStroke: function CanvasGraphics_fillStroke() {
-      this.fill(false);
-      this.stroke(false);
-
-      this.consumePath();
-    },
-    eoFillStroke: function CanvasGraphics_eoFillStroke() {
-      var savedFillRule = this.setEOFillRule();
-      this.fillStroke();
-      this.restoreFillRule(savedFillRule);
-    },
-    closeFillStroke: function CanvasGraphics_closeFillStroke() {
-      this.closePath();
-      this.fillStroke();
-    },
-    closeEOFillStroke: function CanvasGraphics_closeEOFillStroke() {
-      var savedFillRule = this.setEOFillRule();
-      this.closePath();
-      this.fillStroke();
-      this.restoreFillRule(savedFillRule);
-    },
-    endPath: function CanvasGraphics_endPath() {
-      this.consumePath();
-    },
-
-    // Clipping
-    clip: function CanvasGraphics_clip() {
-      this.pendingClip = NORMAL_CLIP;
-    },
-    eoClip: function CanvasGraphics_eoClip() {
-      this.pendingClip = EO_CLIP;
-    },
-
-    // Text
-    beginText: function CanvasGraphics_beginText() {
-      this.current.textMatrix = IDENTITY_MATRIX;
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    endText: function CanvasGraphics_endText() {
-    },
-    setCharSpacing: function CanvasGraphics_setCharSpacing(spacing) {
-      this.current.charSpacing = spacing;
-    },
-    setWordSpacing: function CanvasGraphics_setWordSpacing(spacing) {
-      this.current.wordSpacing = spacing;
-    },
-    setHScale: function CanvasGraphics_setHScale(scale) {
-      this.current.textHScale = scale / 100;
-    },
-    setLeading: function CanvasGraphics_setLeading(leading) {
-      this.current.leading = -leading;
-    },
-    setFont: function CanvasGraphics_setFont(fontRefName, size) {
-      var fontObj = this.objs.get(fontRefName);
-      var current = this.current;
-
-      if (!fontObj)
-        error('Can\'t find font for ' + fontRefName);
-
-      // Slice-clone matrix so we can manipulate it without affecting original
-      if (fontObj.fontMatrix)
-        current.fontMatrix = fontObj.fontMatrix.slice(0);
-      else
-        current.fontMatrix = IDENTITY_MATRIX.slice(0);
-
-      // A valid matrix needs all main diagonal elements to be non-zero
-      // This also ensures we bypass FF bugzilla bug #719844.
-      if (current.fontMatrix[0] === 0 ||
-          current.fontMatrix[3] === 0) {
-        warn('Invalid font matrix for font ' + fontRefName);
-      }
-
-      // The spec for Tf (setFont) says that 'size' specifies the font 'scale',
-      // and in some docs this can be negative (inverted x-y axes).
-      // We implement this condition with fontMatrix.
-      if (size < 0) {
-        size = -size;
-        current.fontMatrix[0] *= -1;
-        current.fontMatrix[3] *= -1;
-      }
-
-      this.current.font = fontObj;
-      this.current.fontSize = size;
-
-      if (fontObj.coded)
-        return; // we don't need ctx.font for Type3 fonts
-
-      var name = fontObj.loadedName || 'sans-serif';
-      var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
-                                 (fontObj.bold ? 'bold' : 'normal');
-
-      var italic = fontObj.italic ? 'italic' : 'normal';
-      var serif = fontObj.isSerifFont ? 'serif' : 'sans-serif';
-      var typeface = '"' + name + '", ' + serif;
-
-      // Some font backends cannot handle fonts below certain size.
-      // Keeping the font at minimal size and using the fontSizeScale to change
-      // the current transformation matrix before the fillText/strokeText.
-      // See https://bugzilla.mozilla.org/show_bug.cgi?id=726227
-      var browserFontSize = size >= MIN_FONT_SIZE ? size : MIN_FONT_SIZE;
-      this.current.fontSizeScale = browserFontSize != MIN_FONT_SIZE ? 1.0 :
-                                   size / MIN_FONT_SIZE;
-
-      var rule = italic + ' ' + bold + ' ' + browserFontSize + 'px ' + typeface;
-      this.ctx.font = rule;
-    },
-    setTextRenderingMode: function CanvasGraphics_setTextRenderingMode(mode) {
-      if (mode >= TextRenderingMode.FILL_ADD_TO_PATH)
-        TODO('unsupported text rendering mode: ' + mode);
-      this.current.textRenderingMode = mode;
-    },
-    setTextRise: function CanvasGraphics_setTextRise(rise) {
-      TODO('text rise: ' + rise);
-    },
-    moveText: function CanvasGraphics_moveText(x, y) {
-      this.current.x = this.current.lineX += x;
-      this.current.y = this.current.lineY += y;
-    },
-    setLeadingMoveText: function CanvasGraphics_setLeadingMoveText(x, y) {
-      this.setLeading(-y);
-      this.moveText(x, y);
-    },
-    setTextMatrix: function CanvasGraphics_setTextMatrix(a, b, c, d, e, f) {
-      this.current.textMatrix = [a, b, c, d, e, f];
-
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    nextLine: function CanvasGraphics_nextLine() {
-      this.moveText(0, this.current.leading);
-    },
-    applyTextTransforms: function CanvasGraphics_applyTextTransforms() {
-      var ctx = this.ctx;
-      var current = this.current;
-      var textHScale = current.textHScale;
-      var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
-
-      ctx.transform.apply(ctx, current.textMatrix);
-      ctx.scale(1, -1);
-      ctx.translate(current.x, -1 * current.y);
-      ctx.transform.apply(ctx, fontMatrix);
-      ctx.scale(textHScale, 1);
-    },
-    getTextGeometry: function CanvasGraphics_getTextGeometry() {
-      var geometry = {};
-      var ctx = this.ctx;
-      var font = this.current.font;
-      var ctxMatrix = ctx.mozCurrentTransform;
-      if (ctxMatrix) {
-        var bl = Util.applyTransform([0, 0], ctxMatrix);
-        var tr = Util.applyTransform([1, 1], ctxMatrix);
-        geometry.x = bl[0];
-        geometry.y = bl[1];
-        geometry.hScale = tr[0] - bl[0];
-        geometry.vScale = tr[1] - bl[1];
-      }
-      geometry.spaceWidth = font.spaceWidth;
-      return geometry;
-    },
-
-    showText: function CanvasGraphics_showText(str, skipTextSelection) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var glyphs = font.charsToGlyphs(str);
-      var fontSize = current.fontSize;
-      var fontSizeScale = current.fontSizeScale;
-      var charSpacing = current.charSpacing;
-      var wordSpacing = current.wordSpacing;
-      var textHScale = current.textHScale;
-      var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
-      var textHScale2 = textHScale * fontMatrix[0];
-      var glyphsLength = glyphs.length;
-      var textLayer = this.textLayer;
-      var text = {str: '', length: 0, canvasWidth: 0, geom: {}};
-      var textSelection = textLayer && !skipTextSelection ? true : false;
-      var textRenderingMode = current.textRenderingMode;
-
-      // Type3 fonts - each glyph is a "mini-PDF"
-      if (font.coded) {
-        ctx.save();
-        ctx.transform.apply(ctx, current.textMatrix);
-        ctx.translate(current.x, current.y);
-
-        ctx.scale(textHScale, 1);
-
-        if (textSelection) {
-          this.save();
-          ctx.scale(1, -1);
-          text.geom = this.getTextGeometry();
-          this.restore();
-        }
-        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.executeOperatorList(glyph.operatorList);
-          this.restore();
-
-          var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
-          var width = transformed[0] * fontSize +
-              Util.sign(current.fontMatrix[0]) * charSpacing;
-
-          ctx.translate(width, 0);
-          current.x += width * textHScale;
-
-          text.str += glyph.unicode;
-          text.length++;
-          text.canvasWidth += width;
-        }
-        ctx.restore();
-      } else {
-        ctx.save();
-        this.applyTextTransforms();
-
-        var lineWidth = current.lineWidth;
-        var scale = Math.abs(current.textMatrix[0] * fontMatrix[0]);
-        if (scale == 0 || lineWidth == 0)
-          lineWidth = this.getSinglePixelWidth();
-        else
-          lineWidth /= scale;
-
-        if (textSelection)
-          text.geom = this.getTextGeometry();
-
-        if (fontSizeScale != 1.0) {
-          ctx.scale(fontSizeScale, fontSizeScale);
-          lineWidth /= fontSizeScale;
-        }
-
-        ctx.lineWidth = lineWidth;
-
-        var x = 0;
-        for (var i = 0; i < glyphsLength; ++i) {
-          var glyph = glyphs[i];
-          if (glyph === null) {
-            // word break
-            x += Util.sign(current.fontMatrix[0]) * wordSpacing;
-            continue;
-          }
-
-          var character = glyph.fontChar;
-          var charWidth = glyph.width * fontSize * 0.001 +
-              Util.sign(current.fontMatrix[0]) * charSpacing;
-
-          if (!glyph.disabled) {
-            var scaledX = x / fontSizeScale;
-            switch (textRenderingMode) {
-              default: // other unsupported rendering modes
-              case TextRenderingMode.FILL:
-              case TextRenderingMode.FILL_ADD_TO_PATH:
-                ctx.fillText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.STROKE:
-              case TextRenderingMode.STROKE_ADD_TO_PATH:
-                ctx.strokeText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.FILL_STROKE:
-              case TextRenderingMode.FILL_STROKE_ADD_TO_PATH:
-                ctx.fillText(character, scaledX, 0);
-                ctx.strokeText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.INVISIBLE:
-                break;
-            }
-          }
-
-          x += charWidth;
-
-          var glyphUnicode = glyph.unicode === ' ' ? '\u00A0' : glyph.unicode;
-          var glyphUnicodeLength = glyphUnicode.length;
-          //reverse an arabic ligature
-          if (glyphUnicodeLength > 1 &&
-              isRTLRangeFor(glyphUnicode.charCodeAt(0))) {
-            for (var ii = glyphUnicodeLength - 1; ii >= 0; ii--)
-              text.str += glyphUnicode[ii];
-          } else
-            text.str += glyphUnicode;
-          text.length += glyphUnicodeLength;
-          text.canvasWidth += charWidth;
-        }
-        current.x += x * textHScale2;
-        ctx.restore();
-      }
-
-      if (textSelection)
-        this.textLayer.appendText(text, font.loadedName, fontSize);
-
-      return text;
-    },
-    showSpacedText: function CanvasGraphics_showSpacedText(arr) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var fontSize = current.fontSize;
-      var textHScale = current.textHScale;
-      if (!font.coded)
-        textHScale *= (current.fontMatrix || IDENTITY_MATRIX)[0];
-      var arrLength = arr.length;
-      var textLayer = this.textLayer;
-      var text = {str: '', length: 0, canvasWidth: 0, geom: {}};
-      var textSelection = textLayer ? true : false;
-
-      if (textSelection) {
-        ctx.save();
-        // Type3 fonts - each glyph is a "mini-PDF" (see also showText)
-        if (font.coded) {
-          ctx.transform.apply(ctx, current.textMatrix);
-          ctx.scale(1, -1);
-          ctx.translate(current.x, -1 * current.y);
-          ctx.scale(textHScale, 1);
-        } else
-          this.applyTextTransforms();
-        text.geom = this.getTextGeometry();
-        ctx.restore();
-      }
-
-      for (var i = 0; i < arrLength; ++i) {
-        var e = arr[i];
-        if (isNum(e)) {
-          var spacingLength = -e * 0.001 * fontSize * textHScale;
-          current.x += spacingLength;
-
-          if (textSelection) {
-            // Emulate precise spacing via HTML spaces
-            text.canvasWidth += spacingLength;
-            if (e < 0 && text.geom.spaceWidth > 0) { // avoid div by zero
-              var numFakeSpaces = Math.round(-e / text.geom.spaceWidth);
-              if (numFakeSpaces > 0) {
-                text.str += '\u00A0';
-                text.length++;
-              }
-            }
-          }
-        } else if (isString(e)) {
-          var shownText = this.showText(e, true);
-
-          if (textSelection) {
-            if (shownText.str === ' ') {
-              text.str += '\u00A0';
-            } else {
-              text.str += shownText.str;
-            }
-            text.canvasWidth += shownText.canvasWidth;
-            text.length += shownText.length;
-          }
-        } else {
-          malformed('TJ array element ' + e + ' is not string or num');
-        }
-      }
-
-      if (textSelection)
-        this.textLayer.appendText(text, font.loadedName, fontSize);
-    },
-    nextLineShowText: function CanvasGraphics_nextLineShowText(text) {
-      this.nextLine();
-      this.showText(text);
-    },
-    nextLineSetSpacingShowText:
-      function CanvasGraphics_nextLineSetSpacingShowText(wordSpacing,
-                                                         charSpacing,
-                                                         text) {
-      this.setWordSpacing(wordSpacing);
-      this.setCharSpacing(charSpacing);
-      this.nextLineShowText(text);
-    },
-
-    // Type3 fonts
-    setCharWidth: function CanvasGraphics_setCharWidth(xWidth, yWidth) {
-      // We can safely ignore this since the width should be the same
-      // as the width in the Widths array.
-    },
-    setCharWidthAndBounds: function CanvasGraphics_setCharWidthAndBounds(xWidth,
-                                                                        yWidth,
-                                                                        llx,
-                                                                        lly,
-                                                                        urx,
-                                                                        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
-    setStrokeColorSpace: function CanvasGraphics_setStrokeColorSpace(raw) {
-      this.current.strokeColorSpace = ColorSpace.fromIR(raw);
-    },
-    setFillColorSpace: function CanvasGraphics_setFillColorSpace(raw) {
-      this.current.fillColorSpace = ColorSpace.fromIR(raw);
-    },
-    setStrokeColor: function CanvasGraphics_setStrokeColor(/*...*/) {
-      var cs = this.current.strokeColorSpace;
-      var rgbColor = cs.getRgb(arguments);
-      var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    getColorN_Pattern: function CanvasGraphics_getColorN_Pattern(IR, cs) {
-      if (IR[0] == 'TilingPattern') {
-        var args = IR[1];
-        var base = cs.base;
-        var color;
-        if (base) {
-          var baseComps = base.numComps;
-
-          color = [];
-          for (var i = 0; i < baseComps; ++i)
-            color.push(args[i]);
-
-          color = base.getRgb(color);
-        }
-        var pattern = new TilingPattern(IR, color, this.ctx, this.objs);
-      } else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
-        var pattern = Pattern.shadingFromIR(IR);
-      } else {
-        error('Unkown IR type ' + IR[0]);
-      }
-      return pattern;
-    },
-    setStrokeColorN: function CanvasGraphics_setStrokeColorN(/*...*/) {
-      var cs = this.current.strokeColorSpace;
-
-      if (cs.name == 'Pattern') {
-        this.current.strokeColor = this.getColorN_Pattern(arguments, cs);
-      } else {
-        this.setStrokeColor.apply(this, arguments);
-      }
-    },
-    setFillColor: function CanvasGraphics_setFillColor(/*...*/) {
-      var cs = this.current.fillColorSpace;
-      var rgbColor = cs.getRgb(arguments);
-      var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setFillColorN: function CanvasGraphics_setFillColorN(/*...*/) {
-      var cs = this.current.fillColorSpace;
-
-      if (cs.name == 'Pattern') {
-        this.current.fillColor = this.getColorN_Pattern(arguments, cs);
-      } else {
-        this.setFillColor.apply(this, arguments);
-      }
-    },
-    setStrokeGray: function CanvasGraphics_setStrokeGray(gray) {
-      if (!(this.current.strokeColorSpace instanceof DeviceGrayCS))
-        this.current.strokeColorSpace = new DeviceGrayCS();
-
-      var color = Util.makeCssRgb(gray, gray, gray);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillGray: function CanvasGraphics_setFillGray(gray) {
-      if (!(this.current.fillColorSpace instanceof DeviceGrayCS))
-        this.current.fillColorSpace = new DeviceGrayCS();
-
-      var color = Util.makeCssRgb(gray, gray, gray);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
-      if (!(this.current.strokeColorSpace instanceof DeviceRgbCS))
-        this.current.strokeColorSpace = new DeviceRgbCS();
-
-      var color = Util.makeCssRgb(r, g, b);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
-      if (!(this.current.fillColorSpace instanceof DeviceRgbCS))
-        this.current.fillColorSpace = new DeviceRgbCS();
-
-      var color = Util.makeCssRgb(r, g, b);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setStrokeCMYKColor: function CanvasGraphics_setStrokeCMYKColor(c, m, y, k) {
-      if (!(this.current.strokeColorSpace instanceof DeviceCmykCS))
-        this.current.strokeColorSpace = new DeviceCmykCS();
-
-      var color = Util.makeCssCmyk(c, m, y, k);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillCMYKColor: function CanvasGraphics_setFillCMYKColor(c, m, y, k) {
-      if (!(this.current.fillColorSpace instanceof DeviceCmykCS))
-        this.current.fillColorSpace = new DeviceCmykCS();
-
-      var color = Util.makeCssCmyk(c, m, y, k);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-
-    shadingFill: function CanvasGraphics_shadingFill(patternIR) {
-      var ctx = this.ctx;
-
-      this.save();
-      var pattern = Pattern.shadingFromIR(patternIR);
-      ctx.fillStyle = pattern.getPattern(ctx);
-
-      var inv = ctx.mozCurrentTransformInverse;
-      if (inv) {
-        var canvas = ctx.canvas;
-        var width = canvas.width;
-        var height = canvas.height;
-
-        var bl = Util.applyTransform([0, 0], inv);
-        var br = Util.applyTransform([0, height], inv);
-        var ul = Util.applyTransform([width, 0], inv);
-        var ur = Util.applyTransform([width, height], inv);
-
-        var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
-        var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
-        var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
-        var y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
-
-        this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
-      } else {
-        // HACK to draw the gradient onto an infinite rectangle.
-        // PDF gradients are drawn across the entire image while
-        // Canvas only allows gradients to be drawn in a rectangle
-        // The following bug should allow us to remove this.
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=664884
-
-        this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
-      }
-
-      this.restore();
-    },
-
-    // Images
-    beginInlineImage: function CanvasGraphics_beginInlineImage() {
-      error('Should not call beginInlineImage');
-    },
-    beginImageData: function CanvasGraphics_beginImageData() {
-      error('Should not call beginImageData');
-    },
-
-    paintFormXObjectBegin: function CanvasGraphics_paintFormXObjectBegin(matrix,
-                                                                        bbox) {
-      this.save();
-
-      if (matrix && isArray(matrix) && 6 == matrix.length)
-        this.transform.apply(this, matrix);
-
-      if (bbox && isArray(bbox) && 4 == bbox.length) {
-        var width = bbox[2] - bbox[0];
-        var height = bbox[3] - bbox[1];
-        this.rectangle(bbox[0], bbox[1], width, height);
-        this.clip();
-        this.endPath();
-      }
-    },
-
-    paintFormXObjectEnd: function CanvasGraphics_paintFormXObjectEnd() {
-      this.restore();
-    },
-
-    paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
-      var domImage = this.objs.get(objId);
-      if (!domImage) {
-        error('Dependent image isn\'t ready yet');
-      }
-
-      this.save();
-
-      var ctx = this.ctx;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
-                    0, -h, w, h);
-
-      this.restore();
-    },
-
-    paintImageMaskXObject: function CanvasGraphics_paintImageMaskXObject(
-                             imgArray, inverseDecode, width, height) {
-      function applyStencilMask(buffer, inverseDecode) {
-        var imgArrayPos = 0;
-        var i, j, mask, buf;
-        // removing making non-masked pixels transparent
-        var bufferPos = 3; // alpha component offset
-        for (i = 0; i < height; i++) {
-          mask = 0;
-          for (j = 0; j < width; j++) {
-            if (!mask) {
-              buf = imgArray[imgArrayPos++];
-              mask = 128;
-            }
-            if (!(buf & mask) == inverseDecode) {
-              buffer[bufferPos] = 0;
-            }
-            bufferPos += 4;
-            mask >>= 1;
-          }
-        }
-      }
-
-      this.save();
-
-      var ctx = this.ctx;
-      var w = width, h = height;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      var tmpCanvas = createScratchCanvas(w, h);
-      var tmpCtx = tmpCanvas.getContext('2d');
-
-      var fillColor = this.current.fillColor;
-      tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
-                          fillColor.type === 'Pattern') ?
-                          fillColor.getPattern(tmpCtx) : fillColor;
-      tmpCtx.fillRect(0, 0, w, h);
-
-      var imgData = tmpCtx.getImageData(0, 0, w, h);
-      var pixels = imgData.data;
-
-      applyStencilMask(pixels, inverseDecode);
-
-      tmpCtx.putImageData(imgData, 0, 0);
-      ctx.drawImage(tmpCanvas, 0, -h);
-      this.restore();
-    },
-
-    paintImageXObject: function CanvasGraphics_paintImageXObject(objId) {
-      var imgData = this.objs.get(objId);
-      if (!imgData)
-        error('Dependent image isn\'t ready yet');
-
-      this.save();
-      var ctx = this.ctx;
-      var w = imgData.width;
-      var h = imgData.height;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      var tmpCanvas = createScratchCanvas(w, h);
-      var tmpCtx = tmpCanvas.getContext('2d');
-      this.putBinaryImageData(tmpCtx, imgData, w, h);
-
-      ctx.drawImage(tmpCanvas, 0, -h);
-      this.restore();
-    },
-
-    putBinaryImageData: function CanvasGraphics_putBinaryImageData() {
-      //
-    },
-
-    // Marked content
-
-    markPoint: function CanvasGraphics_markPoint(tag) {
-      TODO('Marked content');
-    },
-    markPointProps: function CanvasGraphics_markPointProps(tag, properties) {
-      TODO('Marked content');
-    },
-    beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {
-      TODO('Marked content');
-    },
-    beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(
-                                        tag, properties) {
-      TODO('Marked content');
-    },
-    endMarkedContent: function CanvasGraphics_endMarkedContent() {
-      TODO('Marked content');
-    },
-
-    // Compatibility
-
-    beginCompat: function CanvasGraphics_beginCompat() {
-      TODO('ignore undefined operators (should we do that anyway?)');
-    },
-    endCompat: function CanvasGraphics_endCompat() {
-      TODO('stop ignoring undefined operators');
-    },
-
-    // Helper functions
-
-    consumePath: function CanvasGraphics_consumePath() {
-      if (this.pendingClip) {
-        var savedFillRule = null;
-        if (this.pendingClip == EO_CLIP)
-          savedFillRule = this.setEOFillRule();
-
-        this.ctx.clip();
-
-        this.pendingClip = null;
-        if (savedFillRule !== null)
-          this.restoreFillRule(savedFillRule);
-      }
-      this.ctx.beginPath();
-    },
-    // We generally keep the canvas context set for
-    // nonzero-winding, and just set evenodd for the operations
-    // that need them.
-    setEOFillRule: function CanvasGraphics_setEOFillRule() {
-      var savedFillRule = this.ctx.mozFillRule;
-      this.ctx.mozFillRule = 'evenodd';
-      return savedFillRule;
-    },
-    restoreFillRule: function CanvasGraphics_restoreFillRule(rule) {
-      this.ctx.mozFillRule = rule;
-    },
-    getSinglePixelWidth: function CanvasGraphics_getSinglePixelWidth(scale) {
-      var inverse = this.ctx.mozCurrentTransformInverse;
-      return Math.abs(inverse[0] + inverse[2]);
-    }
-  };
-
-  return CanvasGraphics;
-})();
-
-if (!isWorker) {
-  // Feature detection if the browser can use an Uint8Array directly as imgData.
-  var canvas = document.createElement('canvas');
-  canvas.width = 1;
-  canvas.height = 1;
-  var ctx = canvas.getContext('2d');
-
-  try {
-    ctx.putImageData({
-      width: 1,
-      height: 1,
-      data: new Uint8Array(4)
-    }, 0, 0);
-
-    CanvasGraphics.prototype.putBinaryImageData =
-      function CanvasGraphicsPutBinaryImageDataNative(ctx, imgData) {
-        ctx.putImageData(imgData, 0, 0);
-      };
-  } catch (e) {
-    CanvasGraphics.prototype.putBinaryImageData =
-      function CanvasGraphicsPutBinaryImageDataShim(ctx, imgData, w, h) {
-        var tmpImgData = ctx.getImageData(0, 0, w, h);
-
-        // Copy over the imageData pixel by pixel.
-        var tmpImgDataPixels = tmpImgData.data;
-        var len = tmpImgDataPixels.length;
-
-        while (len--) {
-          tmpImgDataPixels[len] = imgData.data[len];
-        }
-
-        ctx.putImageData(tmpImgData, 0, 0);
-      };
-  }
-}
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var Name = (function NameClosure() {
-  function Name(name) {
-    this.name = name;
-  }
-
-  Name.prototype = {};
-
-  return Name;
-})();
-
-var Cmd = (function CmdClosure() {
-  function Cmd(cmd) {
-    this.cmd = cmd;
-  }
-
-  Cmd.prototype = {};
-
-  var cmdCache = {};
-
-  Cmd.get = function Cmd_get(cmd) {
-    var cmdValue = cmdCache[cmd];
-    if (cmdValue)
-      return cmdValue;
-
-    return cmdCache[cmd] = new Cmd(cmd);
-  };
-
-  return Cmd;
-})();
-
-var Dict = (function DictClosure() {
-  // xref is optional
-  function Dict(xref) {
-    // Map should only be used internally, use functions below to access.
-    this.map = Object.create(null);
-    this.xref = xref;
-  }
-
-  Dict.prototype = {
-    // automatically dereferences Ref objects
-    get: function Dict_get(key1, key2, key3) {
-      var value;
-      var xref = this.xref;
-      if (typeof (value = this.map[key1]) != 'undefined' || key1 in this.map ||
-          typeof key2 == 'undefined') {
-        return xref ? this.xref.fetchIfRef(value) : value;
-      }
-      if (typeof (value = this.map[key2]) != 'undefined' || key2 in this.map ||
-          typeof key3 == 'undefined') {
-        return xref ? this.xref.fetchIfRef(value) : value;
-      }
-      value = this.map[key3] || null;
-      return xref ? this.xref.fetchIfRef(value) : value;
-    },
-    // no dereferencing
-    getRaw: function Dict_getRaw(key) {
-      return this.map[key];
-    },
-    // creates new map and dereferences all Refs
-    getAll: function Dict_getAll() {
-      var all = {};
-      for (var key in this.map)
-        all[key] = this.get(key);
-      return all;
-    },
-
-    set: function Dict_set(key, value) {
-      this.map[key] = value;
-    },
-
-    has: function Dict_has(key) {
-      return key in this.map;
-    },
-
-    forEach: function Dict_forEach(callback) {
-      for (var key in this.map) {
-        callback(key, this.get(key));
-      }
-    }
-  };
-
-  return Dict;
-})();
-
-var Ref = (function RefClosure() {
-  function Ref(num, gen) {
-    this.num = num;
-    this.gen = gen;
-  }
-
-  Ref.prototype = {};
-
-  return Ref;
-})();
-
-// The reference is identified by number and generation,
-// this structure stores only one instance of the reference.
-var RefSet = (function RefSetClosure() {
-  function RefSet() {
-    this.dict = {};
-  }
-
-  RefSet.prototype = {
-    has: function RefSet_has(ref) {
-      return !!this.dict['R' + ref.num + '.' + ref.gen];
-    },
-
-    put: function RefSet_put(ref) {
-      this.dict['R' + ref.num + '.' + ref.gen] = ref;
-    }
-  };
-
-  return RefSet;
-})();
-
-var Catalog = (function CatalogClosure() {
-  function Catalog(xref) {
-    this.xref = xref;
-    var obj = xref.getCatalogObj();
-    assertWellFormed(isDict(obj), 'catalog object is not a dictionary');
-    this.catDict = obj;
-  }
-
-  Catalog.prototype = {
-    get metadata() {
-      var stream = this.catDict.get('Metadata');
-      var metadata;
-      if (stream && isDict(stream.dict)) {
-        var type = stream.dict.get('Type');
-        var subtype = stream.dict.get('Subtype');
-
-        if (isName(type) && isName(subtype) &&
-            type.name === 'Metadata' && subtype.name === 'XML') {
-          metadata = stringToPDFString(bytesToString(stream.getBytes()));
-        }
-      }
-
-      return shadow(this, 'metadata', metadata);
-    },
-    get toplevelPagesDict() {
-      var pagesObj = this.catDict.get('Pages');
-      assertWellFormed(isDict(pagesObj), 'invalid top-level pages dictionary');
-      // shadow the prototype getter
-      return shadow(this, 'toplevelPagesDict', pagesObj);
-    },
-    get documentOutline() {
-      var xref = this.xref;
-      var obj = this.catDict.get('Outlines');
-      var root = { items: [] };
-      if (isDict(obj)) {
-        obj = obj.getRaw('First');
-        var processed = new RefSet();
-        if (isRef(obj)) {
-          var queue = [{obj: obj, parent: root}];
-          // to avoid recursion keeping track of the items
-          // in the processed dictionary
-          processed.put(obj);
-          while (queue.length > 0) {
-            var i = queue.shift();
-            var outlineDict = xref.fetchIfRef(i.obj);
-            if (outlineDict === null)
-              continue;
-            if (!outlineDict.has('Title'))
-              error('Invalid outline item');
-            var dest = outlineDict.get('A');
-            if (dest)
-              dest = dest.get('D');
-            else if (outlineDict.has('Dest')) {
-              dest = outlineDict.getRaw('Dest');
-              if (isName(dest))
-                dest = dest.name;
-            }
-            var title = outlineDict.get('Title');
-            var outlineItem = {
-              dest: dest,
-              title: stringToPDFString(title),
-              color: outlineDict.get('C') || [0, 0, 0],
-              count: outlineDict.get('Count'),
-              bold: !!(outlineDict.get('F') & 2),
-              italic: !!(outlineDict.get('F') & 1),
-              items: []
-            };
-            i.parent.items.push(outlineItem);
-            obj = outlineDict.getRaw('First');
-            if (isRef(obj) && !processed.has(obj)) {
-              queue.push({obj: obj, parent: outlineItem});
-              processed.put(obj);
-            }
-            obj = outlineDict.getRaw('Next');
-            if (isRef(obj) && !processed.has(obj)) {
-              queue.push({obj: obj, parent: i.parent});
-              processed.put(obj);
-            }
-          }
-        }
-      }
-      obj = root.items.length > 0 ? root.items : null;
-      return shadow(this, 'documentOutline', obj);
-    },
-    get numPages() {
-      var obj = this.toplevelPagesDict.get('Count');
-      assertWellFormed(
-        isInt(obj),
-        'page count in top level pages object is not an integer'
-      );
-      // shadow the prototype getter
-      return shadow(this, 'num', obj);
-    },
-    traverseKids: function Catalog_traverseKids(pagesDict) {
-      var pageCache = this.pageCache;
-      var kids = pagesDict.get('Kids');
-      assertWellFormed(isArray(kids),
-                       'page dictionary kids object is not an array');
-      for (var i = 0, ii = kids.length; i < ii; ++i) {
-        var kid = kids[i];
-        assertWellFormed(isRef(kid),
-                        'page dictionary kid is not a reference');
-        var obj = this.xref.fetch(kid);
-        if (isDict(obj, 'Page') || (isDict(obj) && !obj.has('Kids'))) {
-          pageCache.push(new Page(this.xref, pageCache.length, obj, kid));
-        } else { // must be a child page dictionary
-          assertWellFormed(
-            isDict(obj),
-            'page dictionary kid reference points to wrong type of object'
-          );
-          this.traverseKids(obj);
-        }
-      }
-    },
-    get destinations() {
-      function fetchDestination(dest) {
-        return isDict(dest) ? dest.get('D') : dest;
-      }
-
-      var xref = this.xref;
-      var dests = {}, nameTreeRef, nameDictionaryRef;
-      var obj = this.catDict.get('Names');
-      if (obj)
-        nameTreeRef = obj.getRaw('Dests');
-      else if (this.catDict.has('Dests'))
-        nameDictionaryRef = this.catDict.get('Dests');
-
-      if (nameDictionaryRef) {
-        // reading simple destination dictionary
-        obj = nameDictionaryRef;
-        obj.forEach(function catalogForEach(key, value) {
-          if (!value) return;
-          dests[key] = fetchDestination(value);
-        });
-      }
-      if (nameTreeRef) {
-        // reading name tree
-        var processed = new RefSet();
-        processed.put(nameTreeRef);
-        var queue = [nameTreeRef];
-        while (queue.length > 0) {
-          var i, n;
-          obj = xref.fetch(queue.shift());
-          if (obj.has('Kids')) {
-            var kids = obj.get('Kids');
-            for (i = 0, n = kids.length; i < n; i++) {
-              var kid = kids[i];
-              if (processed.has(kid))
-                error('invalid destinations');
-              queue.push(kid);
-              processed.put(kid);
-            }
-            continue;
-          }
-          var names = obj.get('Names');
-          for (i = 0, n = names.length; i < n; i += 2) {
-            dests[names[i]] = fetchDestination(xref.fetchIfRef(names[i + 1]));
-          }
-        }
-      }
-      return shadow(this, 'destinations', dests);
-    },
-    getPage: function Catalog_getPage(n) {
-      var pageCache = this.pageCache;
-      if (!pageCache) {
-        pageCache = this.pageCache = [];
-        this.traverseKids(this.toplevelPagesDict);
-      }
-      return this.pageCache[n - 1];
-    }
-  };
-
-  return Catalog;
-})();
-
-var XRef = (function XRefClosure() {
-  function XRef(stream, startXRef, mainXRefEntriesOffset) {
-    this.stream = stream;
-    this.entries = [];
-    this.xrefstms = {};
-    var trailerDict = this.readXRef(startXRef);
-    trailerDict.xref = this;
-    this.trailer = trailerDict;
-    // prepare the XRef cache
-    this.cache = [];
-
-    var encrypt = trailerDict.get('Encrypt');
-    if (encrypt) {
-      var fileId = trailerDict.get('ID');
-      this.encrypt = new CipherTransformFactory(encrypt,
-                                                fileId[0] /*, password */);
-    }
-
-    // get the root dictionary (catalog) object
-    if (!(this.root = trailerDict.get('Root')))
-      error('Invalid root reference');
-  }
-
-  XRef.prototype = {
-    readXRefTable: function XRef_readXRefTable(parser) {
-      // Example of cross-reference table:
-      // xref
-      // 0 1                    <-- subsection header (first obj #, obj count)
-      // 0000000000 65535 f     <-- actual object (offset, generation #, f/n)
-      // 23 2                   <-- subsection header ... and so on ...
-      // 0000025518 00002 n
-      // 0000025635 00000 n
-      // trailer
-      // ...
-
-      // Outer loop is over subsection headers
-      var obj;
-      while (!isCmd(obj = parser.getObj(), 'trailer')) {
-        var first = obj,
-            count = parser.getObj();
-
-        if (!isInt(first) || !isInt(count))
-          error('Invalid XRef table: wrong types in subsection header');
-
-        // Inner loop is over objects themselves
-        for (var i = 0; i < count; i++) {
-          var entry = {};
-          entry.offset = parser.getObj();
-          entry.gen = parser.getObj();
-          var type = parser.getObj();
-
-          if (isCmd(type, 'f'))
-            entry.free = true;
-          else if (isCmd(type, 'n'))
-            entry.uncompressed = true;
-
-          // Validate entry obj
-          if (!isInt(entry.offset) || !isInt(entry.gen) ||
-              !(entry.free || entry.uncompressed)) {
-            error('Invalid entry in XRef subsection: ' + first + ', ' + count);
-          }
-
-          if (!this.entries[i + first])
-            this.entries[i + first] = entry;
-        }
-      }
-
-      // Sanity check: as per spec, first object must have these properties
-      if (this.entries[0] &&
-          !(this.entries[0].gen === 65535 && this.entries[0].free))
-        error('Invalid XRef table: unexpected first object');
-
-      // Sanity check
-      if (!isCmd(obj, 'trailer'))
-        error('Invalid XRef table: could not find trailer dictionary');
-
-      // Read trailer dictionary, e.g.
-      // trailer
-      //    << /Size 22
-      //      /Root 20R
-      //      /Info 10R
-      //      /ID [ <81b14aafa313db63dbd6f981e49f94f4> ]
-      //    >>
-      // The parser goes through the entire stream << ... >> and provides
-      // a getter interface for the key-value table
-      var dict = parser.getObj();
-      if (!isDict(dict))
-        error('Invalid XRef table: could not parse trailer dictionary');
-
-      return dict;
-    },
-    readXRefStream: function XRef_readXRefStream(stream) {
-      var streamParameters = stream.parameters;
-      var byteWidths = streamParameters.get('W');
-      var range = streamParameters.get('Index');
-      if (!range)
-        range = [0, streamParameters.get('Size')];
-      var i, j;
-      while (range.length > 0) {
-        var first = range[0], n = range[1];
-        if (!isInt(first) || !isInt(n))
-          error('Invalid XRef range fields: ' + first + ', ' + n);
-        var typeFieldWidth = byteWidths[0];
-        var offsetFieldWidth = byteWidths[1];
-        var generationFieldWidth = byteWidths[2];
-        if (!isInt(typeFieldWidth) || !isInt(offsetFieldWidth) ||
-            !isInt(generationFieldWidth)) {
-          error('Invalid XRef entry fields length: ' + first + ', ' + n);
-        }
-        for (i = 0; i < n; ++i) {
-          var type = 0, offset = 0, generation = 0;
-          for (j = 0; j < typeFieldWidth; ++j)
-            type = (type << 8) | stream.getByte();
-          // if type field is absent, its default value = 1
-          if (typeFieldWidth == 0)
-            type = 1;
-          for (j = 0; j < offsetFieldWidth; ++j)
-            offset = (offset << 8) | stream.getByte();
-          for (j = 0; j < generationFieldWidth; ++j)
-            generation = (generation << 8) | stream.getByte();
-          var entry = {};
-          entry.offset = offset;
-          entry.gen = generation;
-          switch (type) {
-            case 0:
-              entry.free = true;
-              break;
-            case 1:
-              entry.uncompressed = true;
-              break;
-            case 2:
-              break;
-            default:
-              error('Invalid XRef entry type: ' + type);
-          }
-          if (!this.entries[first + i])
-            this.entries[first + i] = entry;
-        }
-        range.splice(0, 2);
-      }
-      return streamParameters;
-    },
-    indexObjects: function XRef_indexObjects() {
-      // Simple scan through the PDF content to find objects,
-      // trailers and XRef streams.
-      function readToken(data, offset) {
-        var token = '', ch = data[offset];
-        while (ch !== 13 && ch !== 10) {
-          if (++offset >= data.length)
-            break;
-          token += String.fromCharCode(ch);
-          ch = data[offset];
-        }
-        return token;
-      }
-      function skipUntil(data, offset, what) {
-        var length = what.length, dataLength = data.length;
-        var skipped = 0;
-        // finding byte sequence
-        while (offset < dataLength) {
-          var i = 0;
-          while (i < length && data[offset + i] == what[i])
-            ++i;
-          if (i >= length)
-            break; // sequence found
-
-          offset++;
-          skipped++;
-        }
-        return skipped;
-      }
-      var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
-      var startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114,
-                                          101, 102]);
-      var endobjBytes = new Uint8Array([101, 110, 100, 111, 98, 106]);
-      var xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
-
-      var stream = this.stream;
-      stream.pos = 0;
-      var buffer = stream.getBytes();
-      var position = stream.start, length = buffer.length;
-      var trailers = [], xrefStms = [];
-      var state = 0;
-      var currentToken;
-      while (position < length) {
-        var ch = buffer[position];
-        if (ch === 32 || ch === 9 || ch === 13 || ch === 10) {
-          ++position;
-          continue;
-        }
-        if (ch === 37) { // %-comment
-          do {
-            ++position;
-            ch = buffer[position];
-          } while (ch !== 13 && ch !== 10);
-          continue;
-        }
-        var token = readToken(buffer, position);
-        var m;
-        if (token === 'xref') {
-          position += skipUntil(buffer, position, trailerBytes);
-          trailers.push(position);
-          position += skipUntil(buffer, position, startxrefBytes);
-        } else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) {
-          this.entries[m[1]] = {
-            offset: position,
-            gen: m[2] | 0,
-            uncompressed: true
-          };
-
-          var contentLength = skipUntil(buffer, position, endobjBytes) + 7;
-          var content = buffer.subarray(position, position + contentLength);
-
-          // checking XRef stream suspect
-          // (it shall have '/XRef' and next char is not a letter)
-          var xrefTagOffset = skipUntil(content, 0, xrefBytes);
-          if (xrefTagOffset < contentLength &&
-              content[xrefTagOffset + 5] < 64) {
-            xrefStms.push(position);
-            this.xrefstms[position] = 1; // don't read it recursively
-          }
-
-          position += contentLength;
-        } else
-          position += token.length + 1;
-      }
-      // reading XRef streams
-      for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
-          this.readXRef(xrefStms[i]);
-      }
-      // finding main trailer
-      var dict;
-      for (var i = 0, ii = trailers.length; i < ii; ++i) {
-        stream.pos = trailers[i];
-        var parser = new Parser(new Lexer(stream), true, null);
-        var obj = parser.getObj();
-        if (!isCmd(obj, 'trailer'))
-          continue;
-        // read the trailer dictionary
-        if (!isDict(dict = parser.getObj()))
-          continue;
-        // taking the first one with 'ID'
-        if (dict.has('ID'))
-          return dict;
-      }
-      // no tailer with 'ID', taking last one (if exists)
-      if (dict)
-        return dict;
-      // nothing helps
-      error('Invalid PDF structure');
-    },
-    readXRef: function XRef_readXRef(startXRef) {
-      var stream = this.stream;
-      stream.pos = startXRef;
-
-      try {
-        var parser = new Parser(new Lexer(stream), true, null);
-        var obj = parser.getObj();
-        var dict;
-
-        // Get dictionary
-        if (isCmd(obj, 'xref')) {
-          // Parse end-of-file XRef
-          dict = this.readXRefTable(parser);
-
-          // Recursively get other XRefs 'XRefStm', if any
-          obj = dict.get('XRefStm');
-          if (isInt(obj)) {
-            var pos = obj;
-            // ignore previously loaded xref streams
-            // (possible infinite recursion)
-            if (!(pos in this.xrefstms)) {
-              this.xrefstms[pos] = 1;
-              this.readXRef(pos);
-            }
-          }
-        } else if (isInt(obj)) {
-          // Parse in-stream XRef
-          if (!isInt(parser.getObj()) ||
-              !isCmd(parser.getObj(), 'obj') ||
-              !isStream(obj = parser.getObj())) {
-            error('Invalid XRef stream');
-          }
-          dict = this.readXRefStream(obj);
-        }
-
-        // Recursively get previous dictionary, if any
-        obj = dict.get('Prev');
-        if (isInt(obj))
-          this.readXRef(obj);
-        else if (isRef(obj)) {
-          // The spec says Prev must not be a reference, i.e. "/Prev NNN"
-          // This is a fallback for non-compliant PDFs, i.e. "/Prev NNN 0 R"
-          this.readXRef(obj.num);
-        }
-
-        return dict;
-      } catch (e) {
-        log('(while reading XRef): ' + e);
-      }
-
-      warn('Indexing all PDF objects');
-      return this.indexObjects();
-    },
-    getEntry: function XRef_getEntry(i) {
-      var e = this.entries[i];
-      if (e === null)
-        return null;
-      return e.free ? null : e; // returns null is the entry is free
-    },
-    fetchIfRef: function XRef_fetchIfRef(obj) {
-      if (!isRef(obj))
-        return obj;
-      return this.fetch(obj);
-    },
-    fetch: function XRef_fetch(ref, suppressEncryption) {
-      assertWellFormed(isRef(ref), 'ref object is not a reference');
-      var num = ref.num;
-      if (num in this.cache)
-        return this.cache[num];
-
-      var e = this.getEntry(num);
-
-      // the referenced entry can be free
-      if (e === null)
-        return (this.cache[num] = e);
-
-      var gen = ref.gen;
-      var stream, parser;
-      if (e.uncompressed) {
-        if (e.gen != gen)
-          error('inconsistent generation in XRef');
-        stream = this.stream.makeSubStream(e.offset);
-        parser = new Parser(new Lexer(stream), true, this);
-        var obj1 = parser.getObj();
-        var obj2 = parser.getObj();
-        var obj3 = parser.getObj();
-        if (!isInt(obj1) || obj1 != num ||
-            !isInt(obj2) || obj2 != gen ||
-            !isCmd(obj3)) {
-          error('bad XRef entry');
-        }
-        if (!isCmd(obj3, 'obj')) {
-          // some bad pdfs use "obj1234" and really mean 1234
-          if (obj3.cmd.indexOf('obj') == 0) {
-            num = parseInt(obj3.cmd.substring(3), 10);
-            if (!isNaN(num))
-              return num;
-          }
-          error('bad XRef entry');
-        }
-        if (this.encrypt && !suppressEncryption) {
-          try {
-            e = parser.getObj(this.encrypt.createCipherTransform(num, gen));
-          } catch (ex) {
-            // almost all streams must be encrypted, but sometimes
-            // they are not probably due to some broken generators
-            // re-trying without encryption
-            return this.fetch(ref, true);
-          }
-        } else {
-          e = parser.getObj();
-        }
-        // Don't cache streams since they are mutable (except images).
-        if (!isStream(e) || e instanceof JpegStream)
-          this.cache[num] = e;
-        return e;
-      }
-
-      // compressed entry
-      stream = this.fetch(new Ref(e.offset, 0));
-      if (!isStream(stream))
-        error('bad ObjStm stream');
-      var first = stream.parameters.get('First');
-      var n = stream.parameters.get('N');
-      if (!isInt(first) || !isInt(n)) {
-        error('invalid first and n parameters for ObjStm stream');
-      }
-      parser = new Parser(new Lexer(stream), false, this);
-      var i, entries = [], nums = [];
-      // read the object numbers to populate cache
-      for (i = 0; i < n; ++i) {
-        num = parser.getObj();
-        if (!isInt(num)) {
-          error('invalid object number in the ObjStm stream: ' + num);
-        }
-        nums.push(num);
-        var offset = parser.getObj();
-        if (!isInt(offset)) {
-          error('invalid object offset in the ObjStm stream: ' + offset);
-        }
-      }
-      // read stream objects for cache
-      for (i = 0; i < n; ++i) {
-        entries.push(parser.getObj());
-        this.cache[nums[i]] = entries[i];
-      }
-      e = entries[e.gen];
-      if (!e) {
-        error('bad XRef entry for compressed object');
-      }
-      return e;
-    },
-    getCatalogObj: function XRef_getCatalogObj() {
-      return this.root;
-    }
-  };
-
-  return XRef;
-})();
-
-/**
- * A PDF document and page is built of many objects. E.g. there are objects
- * for fonts, images, rendering code and such. These objects might get processed
- * inside of a worker. The `PDFObjects` implements some basic functions to
- * manage these objects.
- */
-var PDFObjects = (function PDFObjectsClosure() {
-  function PDFObjects() {
-    this.objs = {};
-  }
-
-  PDFObjects.prototype = {
-    objs: null,
-
-    /**
-     * Internal function.
-     * Ensures there is an object defined for `objId`. Stores `data` on the
-     * object *if* it is created.
-     */
-    ensureObj: function PDFObjects_ensureObj(objId, data) {
-      if (this.objs[objId])
-        return this.objs[objId];
-      return this.objs[objId] = new Promise(objId, data);
-    },
-
-    /**
-     * If called *without* callback, this returns the data of `objId` but the
-     * object needs to be resolved. If it isn't, this function throws.
-     *
-     * If called *with* a callback, the callback is called with the data of the
-     * object once the object is resolved. That means, if you call this
-     * function and the object is already resolved, the callback gets called
-     * right away.
-     */
-    get: function PDFObjects_get(objId, callback) {
-      // If there is a callback, then the get can be async and the object is
-      // not required to be resolved right now
-      if (callback) {
-        this.ensureObj(objId).then(callback);
-        return null;
-      }
-
-      // If there isn't a callback, the user expects to get the resolved data
-      // directly.
-      var obj = this.objs[objId];
-
-      // If there isn't an object yet or the object isn't resolved, then the
-      // data isn't ready yet!
-      if (!obj || !obj.isResolved)
-        error('Requesting object that isn\'t resolved yet ' + objId);
-
-      return obj.data;
-    },
-
-    /**
-     * Resolves the object `objId` with optional `data`.
-     */
-    resolve: function PDFObjects_resolve(objId, data) {
-      var objs = this.objs;
-
-      // In case there is a promise already on this object, just resolve it.
-      if (objs[objId]) {
-        objs[objId].resolve(data);
-      } else {
-        this.ensureObj(objId, data);
-      }
-    },
-
-    onData: function PDFObjects_onData(objId, callback) {
-      this.ensureObj(objId).onData(callback);
-    },
-
-    isResolved: function PDFObjects_isResolved(objId) {
-      var objs = this.objs;
-      if (!objs[objId]) {
-        return false;
-      } else {
-        return objs[objId].isResolved;
-      }
-    },
-
-    hasData: function PDFObjects_hasData(objId) {
-      var objs = this.objs;
-      if (!objs[objId]) {
-        return false;
-      } else {
-        return objs[objId].hasData;
-      }
-    },
-
-    /**
-     * Sets the data of an object but *doesn't* resolve it.
-     */
-    setData: function PDFObjects_setData(objId, data) {
-      // Watchout! If you call `this.ensureObj(objId, data)` you're going to
-      // create a *resolved* promise which shouldn't be the case!
-      this.ensureObj(objId).data = data;
-    }
-  };
-  return PDFObjects;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PDFFunction = (function PDFFunctionClosure() {
-  var CONSTRUCT_SAMPLED = 0;
-  var CONSTRUCT_INTERPOLATED = 2;
-  var CONSTRUCT_STICHED = 3;
-  var CONSTRUCT_POSTSCRIPT = 4;
-
-  return {
-    getSampleArray: function PDFFunction_getSampleArray(size, outputSize, bps,
-                                                       str) {
-      var length = 1;
-      for (var i = 0, ii = size.length; i < ii; i++)
-        length *= size[i];
-      length *= outputSize;
-
-      var array = [];
-      var codeSize = 0;
-      var codeBuf = 0;
-      // 32 is a valid bps so shifting won't work
-      var sampleMul = 1.0 / (Math.pow(2.0, bps) - 1);
-
-      var strBytes = str.getBytes((length * bps + 7) / 8);
-      var strIdx = 0;
-      for (var i = 0; i < length; i++) {
-        while (codeSize < bps) {
-          codeBuf <<= 8;
-          codeBuf |= strBytes[strIdx++];
-          codeSize += 8;
-        }
-        codeSize -= bps;
-        array.push((codeBuf >> codeSize) * sampleMul);
-        codeBuf &= (1 << codeSize) - 1;
-      }
-      return array;
-    },
-
-    getIR: function PDFFunction_getIR(xref, fn) {
-      var dict = fn.dict;
-      if (!dict)
-        dict = fn;
-
-      var types = [this.constructSampled,
-                   null,
-                   this.constructInterpolated,
-                   this.constructStiched,
-                   this.constructPostScript];
-
-      var typeNum = dict.get('FunctionType');
-      var typeFn = types[typeNum];
-      if (!typeFn)
-        error('Unknown type of function');
-
-      return typeFn.call(this, fn, dict, xref);
-    },
-
-    fromIR: function PDFFunction_fromIR(IR) {
-      var type = IR[0];
-      switch (type) {
-        case CONSTRUCT_SAMPLED:
-          return this.constructSampledFromIR(IR);
-        case CONSTRUCT_INTERPOLATED:
-          return this.constructInterpolatedFromIR(IR);
-        case CONSTRUCT_STICHED:
-          return this.constructStichedFromIR(IR);
-        case CONSTRUCT_POSTSCRIPT:
-        default:
-          return this.constructPostScriptFromIR(IR);
-      }
-    },
-
-    parse: function PDFFunction_parse(xref, fn) {
-      var IR = this.getIR(xref, fn);
-      return this.fromIR(IR);
-    },
-
-    constructSampled: function PDFFunction_constructSampled(str, dict) {
-      function toMultiArray(arr) {
-        var inputLength = arr.length;
-        var outputLength = arr.length / 2;
-        var out = [];
-        var index = 0;
-        for (var i = 0; i < inputLength; i += 2) {
-          out[index] = [arr[i], arr[i + 1]];
-          ++index;
-        }
-        return out;
-      }
-      var domain = dict.get('Domain');
-      var range = dict.get('Range');
-
-      if (!domain || !range)
-        error('No domain or range');
-
-      var inputSize = domain.length / 2;
-      var outputSize = range.length / 2;
-
-      domain = toMultiArray(domain);
-      range = toMultiArray(range);
-
-      var size = dict.get('Size');
-      var bps = dict.get('BitsPerSample');
-      var order = dict.get('Order');
-      if (!order)
-        order = 1;
-      if (order !== 1)
-        error('No support for cubic spline interpolation: ' + order);
-
-      var encode = dict.get('Encode');
-      if (!encode) {
-        encode = [];
-        for (var i = 0; i < inputSize; ++i) {
-          encode.push(0);
-          encode.push(size[i] - 1);
-        }
-      }
-      encode = toMultiArray(encode);
-
-      var decode = dict.get('Decode');
-      if (!decode)
-        decode = range;
-      else
-        decode = toMultiArray(decode);
-
-      var samples = this.getSampleArray(size, outputSize, bps, str);
-
-      return [
-        CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size,
-        outputSize, Math.pow(2, bps) - 1, range
-      ];
-    },
-
-    constructSampledFromIR: function PDFFunction_constructSampledFromIR(IR) {
-      // See chapter 3, page 109 of the PDF reference
-      function interpolate(x, xmin, xmax, ymin, ymax) {
-        return ymin + ((x - xmin) * ((ymax - ymin) / (xmax - xmin)));
-      }
-
-      return function constructSampledFromIRResult(args) {
-        // See chapter 3, page 110 of the PDF reference.
-        var m = IR[1];
-        var domain = IR[2];
-        var encode = IR[3];
-        var decode = IR[4];
-        var samples = IR[5];
-        var size = IR[6];
-        var n = IR[7];
-        var mask = IR[8];
-        var range = IR[9];
-
-        if (m != args.length)
-          error('Incorrect number of arguments: ' + inputSize + ' != ' +
-                args.length);
-
-        var x = args;
-
-        // Building the cube vertices: its part and sample index
-        // http://rjwagner49.com/Mathematics/Interpolation.pdf
-        var cubeVertices = 1 << m;
-        var cubeN = new Float64Array(cubeVertices);
-        var cubeVertex = new Uint32Array(cubeVertices);
-        for (var j = 0; j < cubeVertices; j++)
-          cubeN[j] = 1;
-
-        var k = n, pos = 1;
-        // Map x_i to y_j for 0 <= i < m using the sampled function.
-        for (var i = 0; i < m; ++i) {
-          // x_i' = min(max(x_i, Domain_2i), Domain_2i+1)
-          var domain_2i = domain[i][0];
-          var domain_2i_1 = domain[i][1];
-          var xi = Math.min(Math.max(x[i], domain_2i), domain_2i_1);
-
-          // e_i = Interpolate(x_i', Domain_2i, Domain_2i+1,
-          //                   Encode_2i, Encode_2i+1)
-          var e = interpolate(xi, domain_2i, domain_2i_1,
-                              encode[i][0], encode[i][1]);
-
-          // e_i' = min(max(e_i, 0), Size_i - 1)
-          var size_i = size[i];
-          e = Math.min(Math.max(e, 0), size_i - 1);
-
-          // Adjusting the cube: N and vertex sample index
-          var e0 = e < size_i - 1 ? Math.floor(e) : e - 1; // e1 = e0 + 1;
-          var n0 = e0 + 1 - e; // (e1 - e) / (e1 - e0);
-          var n1 = e - e0; // (e - e0) / (e1 - e0);
-          var offset0 = e0 * k;
-          var offset1 = offset0 + k; // e1 * k
-          for (var j = 0; j < cubeVertices; j++) {
-            if (j & pos) {
-              cubeN[j] *= n1;
-              cubeVertex[j] += offset1;
-            } else {
-              cubeN[j] *= n0;
-              cubeVertex[j] += offset0;
-            }
-          }
-
-          k *= size_i;
-          pos <<= 1;
-        }
-
-        var y = new Float64Array(n);
-        for (var j = 0; j < n; ++j) {
-          // Sum all cube vertices' samples portions
-          var rj = 0;
-          for (var i = 0; i < cubeVertices; i++)
-            rj += samples[cubeVertex[i] + j] * cubeN[i];
-
-          // r_j' = Interpolate(r_j, 0, 2^BitsPerSample - 1,
-          //                    Decode_2j, Decode_2j+1)
-          rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]);
-
-          // y_j = min(max(r_j, range_2j), range_2j+1)
-          y[j] = Math.min(Math.max(rj, range[j][0]), range[j][1]);
-        }
-
-        return y;
-      }
-    },
-
-    constructInterpolated: function PDFFunction_constructInterpolated(str,
-                                                                      dict) {
-      var c0 = dict.get('C0') || [0];
-      var c1 = dict.get('C1') || [1];
-      var n = dict.get('N');
-
-      if (!isArray(c0) || !isArray(c1))
-        error('Illegal dictionary for interpolated function');
-
-      var length = c0.length;
-      var diff = [];
-      for (var i = 0; i < length; ++i)
-        diff.push(c1[i] - c0[i]);
-
-      return [CONSTRUCT_INTERPOLATED, c0, diff, n];
-    },
-
-    constructInterpolatedFromIR:
-      function PDFFunction_constructInterpolatedFromIR(IR) {
-      var c0 = IR[1];
-      var diff = IR[2];
-      var n = IR[3];
-
-      var length = diff.length;
-
-      return function constructInterpolatedFromIRResult(args) {
-        var x = n == 1 ? args[0] : Math.pow(args[0], n);
-
-        var out = [];
-        for (var j = 0; j < length; ++j)
-          out.push(c0[j] + (x * diff[j]));
-
-        return out;
-
-      }
-    },
-
-    constructStiched: function PDFFunction_constructStiched(fn, dict, xref) {
-      var domain = dict.get('Domain');
-
-      if (!domain)
-        error('No domain');
-
-      var inputSize = domain.length / 2;
-      if (inputSize != 1)
-        error('Bad domain for stiched function');
-
-      var fnRefs = dict.get('Functions');
-      var fns = [];
-      for (var i = 0, ii = fnRefs.length; i < ii; ++i)
-        fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i])));
-
-      var bounds = dict.get('Bounds');
-      var encode = dict.get('Encode');
-
-      return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
-    },
-
-    constructStichedFromIR: function PDFFunction_constructStichedFromIR(IR) {
-      var domain = IR[1];
-      var bounds = IR[2];
-      var encode = IR[3];
-      var fnsIR = IR[4];
-      var fns = [];
-
-      for (var i = 0, ii = fnsIR.length; i < ii; i++) {
-        fns.push(PDFFunction.fromIR(fnsIR[i]));
-      }
-
-      return function constructStichedFromIRResult(args) {
-        var clip = function constructStichedFromIRClip(v, min, max) {
-          if (v > max)
-            v = max;
-          else if (v < min)
-            v = min;
-          return v;
-        };
-
-        // clip to domain
-        var v = clip(args[0], domain[0], domain[1]);
-        // calulate which bound the value is in
-        for (var i = 0, ii = bounds.length; i < ii; ++i) {
-          if (v < bounds[i])
-            break;
-        }
-
-        // encode value into domain of function
-        var dmin = domain[0];
-        if (i > 0)
-          dmin = bounds[i - 1];
-        var dmax = domain[1];
-        if (i < bounds.length)
-          dmax = bounds[i];
-
-        var rmin = encode[2 * i];
-        var rmax = encode[2 * i + 1];
-
-        var v2 = rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
-
-        // call the appropropriate function
-        return fns[i]([v2]);
-      };
-    },
-
-    constructPostScript: function PDFFunction_constructPostScript(fn, dict,
-                                                                  xref) {
-      var domain = dict.get('Domain');
-      var range = dict.get('Range');
-
-      if (!domain)
-        error('No domain.');
-
-      if (!range)
-        error('No range.');
-
-      var lexer = new PostScriptLexer(fn);
-      var parser = new PostScriptParser(lexer);
-      var code = parser.parse();
-
-      return [CONSTRUCT_POSTSCRIPT, domain, range, code];
-    },
-
-    constructPostScriptFromIR: function PDFFunction_constructPostScriptFromIR(
-                                          IR) {
-      var domain = IR[1];
-      var range = IR[2];
-      var code = IR[3];
-      var numOutputs = range.length / 2;
-      var evaluator = new PostScriptEvaluator(code);
-      // Cache the values for a big speed up, the cache size is limited though
-      // since the number of possible values can be huge from a PS function.
-      var cache = new FunctionCache();
-      return function constructPostScriptFromIRResult(args) {
-        var initialStack = [];
-        for (var i = 0, ii = (domain.length / 2); i < ii; ++i) {
-          initialStack.push(args[i]);
-        }
-
-        var key = initialStack.join('_');
-        if (cache.has(key))
-          return cache.get(key);
-
-        var stack = evaluator.execute(initialStack);
-        var transformed = [];
-        for (i = numOutputs - 1; i >= 0; --i) {
-          var out = stack.pop();
-          var rangeIndex = 2 * i;
-          if (out < range[rangeIndex])
-            out = range[rangeIndex];
-          else if (out > range[rangeIndex + 1])
-            out = range[rangeIndex + 1];
-          transformed[i] = out;
-        }
-        cache.set(key, transformed);
-        return transformed;
-      };
-    }
-  };
-})();
-
-var FunctionCache = (function FunctionCacheClosure() {
-  // Of 10 PDF's with type4 functions the maxium number of distinct values seen
-  // was 256. This still may need some tweaking in the future though.
-  var MAX_CACHE_SIZE = 1024;
-  function FunctionCache() {
-    this.cache = {};
-    this.total = 0;
-  }
-  FunctionCache.prototype = {
-    has: function FunctionCache_has(key) {
-      return key in this.cache;
-    },
-    get: function FunctionCache_get(key) {
-      return this.cache[key];
-    },
-    set: function FunctionCache_set(key, value) {
-      if (this.total < MAX_CACHE_SIZE) {
-        this.cache[key] = value;
-        this.total++;
-      }
-    }
-  };
-  return FunctionCache;
-})();
-
-var PostScriptStack = (function PostScriptStackClosure() {
-  var MAX_STACK_SIZE = 100;
-  function PostScriptStack(initialStack) {
-    this.stack = initialStack || [];
-  }
-
-  PostScriptStack.prototype = {
-    push: function PostScriptStack_push(value) {
-      if (this.stack.length >= MAX_STACK_SIZE)
-        error('PostScript function stack overflow.');
-      this.stack.push(value);
-    },
-    pop: function PostScriptStack_pop() {
-      if (this.stack.length <= 0)
-        error('PostScript function stack underflow.');
-      return this.stack.pop();
-    },
-    copy: function PostScriptStack_copy(n) {
-      if (this.stack.length + n >= MAX_STACK_SIZE)
-        error('PostScript function stack overflow.');
-      var stack = this.stack;
-      for (var i = stack.length - n, j = n - 1; j >= 0; j--, i++)
-        stack.push(stack[i]);
-    },
-    index: function PostScriptStack_index(n) {
-      this.push(this.stack[this.stack.length - n - 1]);
-    },
-    // rotate the last n stack elements p times
-    roll: function PostScriptStack_roll(n, p) {
-      var stack = this.stack;
-      var l = stack.length - n;
-      var r = stack.length - 1, c = l + (p - Math.floor(p / n) * n), i, j, t;
-      for (i = l, j = r; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-      for (i = l, j = c - 1; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-      for (i = c, j = r; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-    }
-  };
-  return PostScriptStack;
-})();
-var PostScriptEvaluator = (function PostScriptEvaluatorClosure() {
-  function PostScriptEvaluator(operators, operands) {
-    this.operators = operators;
-    this.operands = operands;
-  }
-  PostScriptEvaluator.prototype = {
-    execute: function PostScriptEvaluator_execute(initialStack) {
-      var stack = new PostScriptStack(initialStack);
-      var counter = 0;
-      var operators = this.operators;
-      var length = operators.length;
-      var operator, a, b;
-      while (counter < length) {
-        operator = operators[counter++];
-        if (typeof operator == 'number') {
-          // Operator is really an operand and should be pushed to the stack.
-          stack.push(operator);
-          continue;
-        }
-        switch (operator) {
-          // non standard ps operators
-          case 'jz': // jump if false
-            b = stack.pop();
-            a = stack.pop();
-            if (!a)
-              counter = b;
-            break;
-          case 'j': // jump
-            a = stack.pop();
-            counter = a;
-            break;
-
-          // all ps operators in alphabetical order (excluding if/ifelse)
-          case 'abs':
-            a = stack.pop();
-            stack.push(Math.abs(a));
-            break;
-          case 'add':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a + b);
-            break;
-          case 'and':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a && b);
-            else
-              stack.push(a & b);
-            break;
-          case 'atan':
-            a = stack.pop();
-            stack.push(Math.atan(a));
-            break;
-          case 'bitshift':
-            b = stack.pop();
-            a = stack.pop();
-            if (a > 0)
-              stack.push(a << b);
-            else
-              stack.push(a >> b);
-            break;
-          case 'ceiling':
-            a = stack.pop();
-            stack.push(Math.ceil(a));
-            break;
-          case 'copy':
-            a = stack.pop();
-            stack.copy(a);
-            break;
-          case 'cos':
-            a = stack.pop();
-            stack.push(Math.cos(a));
-            break;
-          case 'cvi':
-            a = stack.pop() | 0;
-            stack.push(a);
-            break;
-          case 'cvr':
-            // noop
-            break;
-          case 'div':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a / b);
-            break;
-          case 'dup':
-            stack.copy(1);
-            break;
-          case 'eq':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a == b);
-            break;
-          case 'exch':
-            stack.roll(2, 1);
-            break;
-          case 'exp':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(Math.pow(a, b));
-            break;
-          case 'false':
-            stack.push(false);
-            break;
-          case 'floor':
-            a = stack.pop();
-            stack.push(Math.floor(a));
-            break;
-          case 'ge':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a >= b);
-            break;
-          case 'gt':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a > b);
-            break;
-          case 'idiv':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push((a / b) | 0);
-            break;
-          case 'index':
-            a = stack.pop();
-            stack.index(a);
-            break;
-          case 'le':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a <= b);
-            break;
-          case 'ln':
-            a = stack.pop();
-            stack.push(Math.log(a));
-            break;
-          case 'log':
-            a = stack.pop();
-            stack.push(Math.log(a) / Math.LN10);
-            break;
-          case 'lt':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a < b);
-            break;
-          case 'mod':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a % b);
-            break;
-          case 'mul':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a * b);
-            break;
-          case 'ne':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a != b);
-            break;
-          case 'neg':
-            a = stack.pop();
-            stack.push(-b);
-            break;
-          case 'not':
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a && b);
-            else
-              stack.push(a & b);
-            break;
-          case 'or':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a || b);
-            else
-              stack.push(a | b);
-            break;
-          case 'pop':
-            stack.pop();
-            break;
-          case 'roll':
-            b = stack.pop();
-            a = stack.pop();
-            stack.roll(a, b);
-            break;
-          case 'round':
-            a = stack.pop();
-            stack.push(Math.round(a));
-            break;
-          case 'sin':
-            a = stack.pop();
-            stack.push(Math.sin(a));
-            break;
-          case 'sqrt':
-            a = stack.pop();
-            stack.push(Math.sqrt(a));
-            break;
-          case 'sub':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a - b);
-            break;
-          case 'true':
-            stack.push(true);
-            break;
-          case 'truncate':
-            a = stack.pop();
-            a = a < 0 ? Math.ceil(a) : Math.floor(a);
-            stack.push(a);
-            break;
-          case 'xor':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a != b);
-            else
-              stack.push(a ^ b);
-            break;
-          default:
-            error('Unknown operator ' + operator);
-            break;
-        }
-      }
-      return stack.stack;
-    }
-  };
-  return PostScriptEvaluator;
-})();
-
-var PostScriptParser = (function PostScriptParserClosure() {
-  function PostScriptParser(lexer) {
-    this.lexer = lexer;
-    this.operators = [];
-    this.token;
-    this.prev;
-  }
-  PostScriptParser.prototype = {
-    nextToken: function PostScriptParser_nextToken() {
-      this.prev = this.token;
-      this.token = this.lexer.getToken();
-    },
-    accept: function PostScriptParser_accept(type) {
-      if (this.token.type == type) {
-        this.nextToken();
-        return true;
-      }
-      return false;
-    },
-    expect: function PostScriptParser_expect(type) {
-      if (this.accept(type))
-        return true;
-      error('Unexpected symbol: found ' + this.token.type + ' expected ' +
-            type + '.');
-    },
-    parse: function PostScriptParser_parse() {
-      this.nextToken();
-      this.expect(PostScriptTokenTypes.LBRACE);
-      this.parseBlock();
-      this.expect(PostScriptTokenTypes.RBRACE);
-      return this.operators;
-    },
-    parseBlock: function PostScriptParser_parseBlock() {
-      while (true) {
-        if (this.accept(PostScriptTokenTypes.NUMBER)) {
-          this.operators.push(this.prev.value);
-        } else if (this.accept(PostScriptTokenTypes.OPERATOR)) {
-          this.operators.push(this.prev.value);
-        } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-          this.parseCondition();
-        } else {
-          return;
-        }
-      }
-    },
-    parseCondition: function PostScriptParser_parseCondition() {
-      // Add two place holders that will be updated later
-      var conditionLocation = this.operators.length;
-      this.operators.push(null, null);
-
-      this.parseBlock();
-      this.expect(PostScriptTokenTypes.RBRACE);
-      if (this.accept(PostScriptTokenTypes.IF)) {
-        // The true block is right after the 'if' so it just falls through on
-        // true else it jumps and skips the true block.
-        this.operators[conditionLocation] = this.operators.length;
-        this.operators[conditionLocation + 1] = 'jz';
-      } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-        var jumpLocation = this.operators.length;
-        this.operators.push(null, null);
-        var endOfTrue = this.operators.length;
-        this.parseBlock();
-        this.expect(PostScriptTokenTypes.RBRACE);
-        this.expect(PostScriptTokenTypes.IFELSE);
-        // The jump is added at the end of the true block to skip the false
-        // block.
-        this.operators[jumpLocation] = this.operators.length;
-        this.operators[jumpLocation + 1] = 'j';
-
-        this.operators[conditionLocation] = endOfTrue;
-        this.operators[conditionLocation + 1] = 'jz';
-      } else {
-        error('PS Function: error parsing conditional.');
-      }
-    }
-  };
-  return PostScriptParser;
-})();
-
-var PostScriptTokenTypes = {
-  LBRACE: 0,
-  RBRACE: 1,
-  NUMBER: 2,
-  OPERATOR: 3,
-  IF: 4,
-  IFELSE: 5
-};
-
-var PostScriptToken = (function PostScriptTokenClosure() {
-  function PostScriptToken(type, value) {
-    this.type = type;
-    this.value = value;
-  }
-
-  var opCache = {};
-
-  PostScriptToken.getOperator = function PostScriptToken_getOperator(op) {
-    var opValue = opCache[op];
-    if (opValue)
-      return opValue;
-
-    return opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
-  };
-
-  PostScriptToken.LBRACE = new PostScriptToken(PostScriptTokenTypes.LBRACE,
-                                                '{');
-  PostScriptToken.RBRACE = new PostScriptToken(PostScriptTokenTypes.RBRACE,
-                                                '}');
-  PostScriptToken.IF = new PostScriptToken(PostScriptTokenTypes.IF, 'IF');
-  PostScriptToken.IFELSE = new PostScriptToken(PostScriptTokenTypes.IFELSE,
-                                                'IFELSE');
-  return PostScriptToken;
-})();
-
-var PostScriptLexer = (function PostScriptLexerClosure() {
-  function PostScriptLexer(stream) {
-    this.stream = stream;
-  }
-  PostScriptLexer.prototype = {
-    getToken: function PostScriptLexer_getToken() {
-      var s = '';
-      var ch;
-      var comment = false;
-      var stream = this.stream;
-
-      // skip comments
-      while (true) {
-        if (!(ch = stream.getChar()))
-          return EOF;
-
-        if (comment) {
-          if (ch == '\x0a' || ch == '\x0d')
-            comment = false;
-        } else if (ch == '%') {
-          comment = true;
-        } else if (!Lexer.isSpace(ch)) {
-          break;
-        }
-      }
-      switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case '+': case '-': case '.':
-          return new PostScriptToken(PostScriptTokenTypes.NUMBER,
-                                      this.getNumber(ch));
-        case '{':
-          return PostScriptToken.LBRACE;
-        case '}':
-          return PostScriptToken.RBRACE;
-      }
-      // operator
-      var str = ch.toLowerCase();
-      while (true) {
-        ch = stream.lookChar().toLowerCase();
-        if (ch >= 'a' && ch <= 'z')
-          str += ch;
-        else
-          break;
-        stream.skip();
-      }
-      switch (str) {
-        case 'if':
-          return PostScriptToken.IF;
-        case 'ifelse':
-          return PostScriptToken.IFELSE;
-        default:
-          return PostScriptToken.getOperator(str);
-      }
-    },
-    getNumber: function PostScriptLexer_getNumber(ch) {
-      var str = ch;
-      var stream = this.stream;
-      while (true) {
-        ch = stream.lookChar();
-        if ((ch >= '0' && ch <= '9') || ch == '-' || ch == '.')
-          str += ch;
-        else
-          break;
-        stream.skip();
-      }
-      var value = parseFloat(str);
-      if (isNaN(value))
-        error('Invalid floating point number: ' + value);
-      return value;
-    }
-  };
-  return PostScriptLexer;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var ISOAdobeCharset = [
-  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
-  'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
-  'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
-  'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
-  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
-  'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-  'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
-  'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
-  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-  'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
-  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
-  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase',
-  'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
-  'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde',
-  'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla',
-  'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine',
-  'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash',
-  'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu',
-  'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter',
-  'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior',
-  'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright',
-  'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde',
-  'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute',
-  'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex',
-  'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex',
-  'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute',
-  'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla',
-  'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex',
-  'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis',
-  'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis',
-  'ugrave', 'yacute', 'ydieresis', 'zcaron'
-];
-
-var ExpertCharset = [
-  '.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
-  'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
-  'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
-  'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
-  'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
-  'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle',
-  'colon', 'semicolon', 'commasuperior', 'threequartersemdash',
-  'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior',
-  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
-  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
-  'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
-  'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
-  'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
-  'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
-  'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
-  'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle',
-  'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall',
-  'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall',
-  'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall',
-  'Cedillasmall', 'onequarter', 'onehalf', 'threequarters',
-  'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
-  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
-  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
-  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
-  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
-  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
-  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
-  'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall',
-  'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall',
-  'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
-  'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
-  'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
-  'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
-  'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
-  'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
-  'Ydieresissmall'
-];
-
-var ExpertSubsetCharset = [
-  '.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
-  'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
-  'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
-  'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
-  'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
-  'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
-  'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior',
-  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
-  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
-  'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted',
-  'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter',
-  'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
-  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
-  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
-  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
-  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
-  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
-  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
-  'periodinferior', 'commainferior'
-];
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var CIDToUnicodeMaps = {
-  'Adobe-Japan1': [[32, 160], {f: 12, c: 33}, [45, 8209], {f: 46, c: 46}, 165,
-    {f: 2, c: 93}, [95, 818], [96, 768], {f: 27, c: 97}, 166, 125, [732, 771],
-    [700, 8217], 92, [699, 8216], 124, [126, 8764], {f: 3, c: 161}, 8260, 402,
-    0, 164, 8220, 171, {f: 2, c: 8249}, {f: 2, c: 64257}, [8210, 8211], 0, 0,
-    [183, 8729], 0, 8226, 8218, 8222, 8221, 187, 0, 0, 191, {f: 2, c: 769},
-    [175, 772], {f: 3, c: 774}, 778, [184, 807], 779, 808, 780, [822, 8212],
-    198, 170, 321, 216, 338, 186, 230, 305, 322, 248, 339, 223, 173, 169, 172,
-    174, 0, 0, {f: 2, c: 178}, 181, 185, {f: 3, c: 188}, {f: 6, c: 192},
-    {f: 16, c: 199}, 0, {f: 6, c: 217}, {f: 6, c: 224}, {f: 16, c: 231}, 0,
-    {f: 7, c: 249}, 352, 376, 381, [773, 8254], 353, 8482, 382, 0, 8194,
-    {s: 91}, 65512, {s: 3}, {f: 63, c: 65377}, {s: 243}, [8195, 12288],
-    {f: 2, c: 12289}, 65292, 65294, 12539, {f: 2, c: 65306}, 65311, 65281,
-    {f: 2, c: 12443}, 180, 65344, 168, 65342, 65507, 65343, {f: 2, c: 12541},
-    {f: 2, c: 12445}, 12291, 20189, {f: 3, c: 12293}, 12540, 8213, 8208, 65295,
-    65340, [12316, 65374], 8214, 65372, 8230, 8229, {s: 4}, {f: 2, c: 65288},
-    {f: 2, c: 12308}, 65339, 65341, 65371, 65373, {f: 10, c: 12296}, 65291,
-    [8722, 65293], 177, 215, 247, 65309, 8800, 65308, 65310, {f: 2, c: 8806},
-    8734, 8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65509, 65284,
-    {f: 2, c: 65504}, 65285, 65283, 65286, 65290, 65312, 167, 9734, 9733, 9675,
-    9679, 9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8251, 12306,
-    8594, {f: 2, c: 8592}, 8595, 12307, 8712, 8715, {f: 2, c: 8838},
-    {f: 2, c: 8834}, 8746, 8745, {f: 2, c: 8743}, 65506, 8658, 8660, 8704,
-    8707, 8736, 8869, 8978, 8706, 8711, 8801, 8786, {f: 2, c: 8810}, 8730,
-    8765, 8733, 8757, {f: 2, c: 8747}, 8491, 8240, 9839, 9837, 9834,
-    {f: 2, c: 8224}, 182, 9711, {f: 10, c: 65296}, {f: 26, c: 65313},
-    {f: 26, c: 65345}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 17, c: 913},
-    {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, {f: 6, c: 1040}, 1025,
-    {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 20124, 21782, 23043, 38463,
-    21696, 24859, 25384, 23030, 36898, 33909, 33564, 31312, 24746, 25569,
-    28197, 26093, 33894, 33446, 39925, 26771, 22311, 26017, 25201, 23451,
-    22992, 34427, 39156, 32098, 32190, 39822, 25110, 31903, 34999, 23433,
-    24245, 25353, 26263, 26696, 38343, 38797, 26447, 20197, 20234, 20301,
-    20381, 20553, 22258, 22839, 22996, 23041, 23561, 24799, 24847, 24944,
-    26131, 26885, 28858, 30031, 30064, 31227, 32173, 32239, 32963, 33806,
-    [12176, 34915], 35586, 36949, 36986, 21307, 20117, 20133, 22495, 32946,
-    37057, 30959, [12032, 19968], 22769, 28322, 36920, 31282, 33576, 33419,
-    39983, 20801, 21360, 21693, 21729, 22240, 23035, 24341, 39154, 28139,
-    32996, 34093, 38498, 38512, 38560, 38907, 21515, 21491, 23431, 28879,
-    [12155, 32701], 36802, [12204, 38632], 21359, 40284, 31418, 19985, 30867,
-    [12165, 33276], 28198, 22040, 21764, 27421, 34074, 39995, 23013, 21417,
-    28006, [12128, 29916], 38287, 22082, 20113, 36939, 38642, 33615, 39180,
-    21473, 21942, 23344, 24433, 26144, 26355, 26628, 27704, 27891, 27945,
-    29787, 30408, 31310, 38964, 33521, 34907, 35424, 37613, 28082, 30123,
-    30410, 39365, 24742, 35585, 36234, 38322, 27022, 21421, 20870, 22290,
-    22576, 22852, 23476, 24310, 24616, 25513, 25588, 27839, 28436, 28814,
-    28948, 29017, 29141, 29503, 32257, 33398, 33489, 34199, 36960, 37467,
-    40219, 22633, 26044, 27738, 29989, 20985, 22830, 22885, 24448, 24540,
-    25276, 26106, 27178, 27431, 27572, 29579, 32705, 35158, 40236, 40206,
-    [12009, 40644], 23713, 27798, 33659, 20740, 23627, 25014, 33222, 26742,
-    29281, [12036, 20057], 20474, 21368, 24681, 28201, 31311, [12211, 38899],
-    19979, 21270, 20206, 20309, 20285, 20385, 20339, 21152, 21487, 22025,
-    22799, 23233, 23478, 23521, 31185, 26247, 26524, 26550, 27468, 27827,
-    [12117, 28779], 29634, 31117, [12146, 31166], 31292, 31623, 33457, 33499,
-    33540, 33655, 33775, 33747, 34662, 35506, 22057, 36008, 36838, 36942,
-    38686, 34442, 20420, 23784, 25105, [12123, 29273], 30011, 33253, 33469,
-    34558, 36032, 38597, 39187, 39381, 20171, 20250, 35299, 22238, 22602,
-    22730, 24315, 24555, 24618, 24724, 24674, 25040, 25106, 25296, 25913,
-    39745, 26214, 26800, 28023, 28784, 30028, 30342, 32117, 33445, 34809,
-    38283, 38542, [12185, 35997], 20977, 21182, 22806, 21683, 23475, 23830,
-    24936, 27010, 28079, 30861, 33995, 34903, 35442, 37799, 39608, 28012,
-    39336, 34521, 22435, 26623, 34510, 37390, 21123, 22151, 21508, 24275,
-    25313, 25785, 26684, 26680, 27579, 29554, 30906, 31339, 35226,
-    [12179, 35282], 36203, 36611, 37101, 38307, 38548, [12208, 38761], 23398,
-    23731, 27005, {f: 2, c: 38989}, 25499, 31520, 27179, 27263, 26806, 39949,
-    28511, 21106, 21917, 24688, 25324, 27963, 28167, 28369, 33883, 35088,
-    36676, 19988, 39993, 21494, 26907, 27194, 38788, 26666, 20828, 31427,
-    33970, 37340, 37772, 22107, 40232, 26658, 33541, 33841, 31909, 21000,
-    33477, [12129, 29926], 20094, 20355, 20896, 23506, 21002, 21208, 21223,
-    24059, 21914, 22570, 23014, 23436, 23448, 23515, [12082, 24178], 24185,
-    24739, 24863, 24931, 25022, 25563, 25954, 26577, 26707, 26874, 27454,
-    27475, 27735, 28450, 28567, 28485, 29872, [12130, 29976], 30435, 30475,
-    31487, 31649, 31777, 32233, [12152, 32566], 32752, 32925, 33382, 33694,
-    35251, 35532, 36011, 36996, 37969, 38291, 38289, 38306, 38501, 38867,
-    39208, 33304, 20024, 21547, 23736, 24012, 29609, 30284, 30524, 23721,
-    32747, 36107, 38593, 38929, 38996, 39000, 20225, 20238, 21361, 21916,
-    22120, 22522, 22855, 23305, 23492, 23696, 24076, 24190, 24524, 25582,
-    26426, 26071, 26082, 26399, 26827, 26820, 27231, 24112, 27589, 27671,
-    27773, 30079, 31048, 23395, 31232, 32000, 24509, 35215, 35352, 36020,
-    36215, 36556, 36637, 39138, 39438, [12004, 12225, 39740], [12018, 20096],
-    20605, 20736, 22931, 23452, 25135, 25216, 25836, 27450, 29344, 30097,
-    31047, 32681, 34811, 35516, 35696, 25516, 33738, 38816, 21513, 21507,
-    21931, 26708, 27224, 35440, 30759, 26485, [12233, 40653], 21364, 23458,
-    33050, 34384, 36870, 19992, 20037, 20167, 20241, 21450, 21560, 23470,
-    [12088, 24339], 24613, 25937, 26429, 27714, 27762, 27875, 28792, 29699,
-    31350, 31406, 31496, 32026, 31998, 32102, 26087, [12124, 29275], 21435,
-    23621, 24040, 25298, 25312, 25369, 28192, 34394, 35377, 36317, 37624,
-    28417, 31142, [12226, 39770], 20136, {f: 2, c: 20139}, 20379, 20384, 20689,
-    20807, 31478, 20849, 20982, 21332, 21281, 21375, 21483, 21932, 22659,
-    23777, 24375, 24394, 24623, 24656, 24685, 25375, 25945, 27211, 27841,
-    29378, 29421, 30703, 33016, 33029, 33288, 34126, 37111, 37857, 38911,
-    39255, 39514, 20208, 20957, 23597, 26241, 26989, 23616, 26354, 26997,
-    [12127, 29577], 26704, 31873, 20677, 21220, 22343, [12081, 24062], 37670,
-    [12100, 26020], 27427, 27453, 29748, 31105, 31165, 31563, 32202, 33465,
-    33740, 34943, 35167, 35641, 36817, [12198, 37329], 21535, 37504, 20061,
-    20534, 21477, 21306, 29399, 29590, 30697, 33510, 36527, 39366, 39368,
-    39378, 20855, 24858, 34398, 21936, 31354, 20598, 23507, 36935, 38533,
-    20018, 27355, 37351, 23633, 23624, 25496, 31391, 27795, 38772, 36705,
-    31402, 29066, 38536, 31874, 26647, 32368, 26705, 37740, 21234, 21531,
-    34219, 35347, 32676, 36557, 37089, 21350, 34952, 31041, 20418, 20670,
-    21009, 20804, 21843, 22317, 29674, 22411, 22865, 24418, 24452, 24693,
-    24950, 24935, 25001, 25522, 25658, 25964, 26223, 26690, 28179, 30054,
-    31293, 31995, 32076, 32153, 32331, 32619, 33550, 33610, 34509, 35336,
-    35427, 35686, 36605, 38938, 40335, 33464, 36814, 39912, 21127, 25119,
-    25731, 28608, 38553, 26689, 20625, [12107, 27424], 27770, 28500,
-    [12147, 31348], 32080, [12174, 34880], 35363, [12105, 26376], 20214, 20537,
-    20518, 20581, 20860, 21048, 21091, 21927, 22287, 22533, 23244, 24314,
-    25010, 25080, 25331, 25458, 26908, 27177, 29309, [12125, 29356], 29486,
-    30740, 30831, 32121, 30476, 32937, [12178, 35211], 35609, 36066, 36562,
-    36963, 37749, 38522, 38997, 39443, 40568, 20803, 21407, 21427, 24187,
-    24358, 28187, 28304, [12126, 29572], 29694, 32067, 33335, [12180, 35328],
-    35578, 38480, 20046, 20491, 21476, 21628, 22266, 22993, 23396,
-    [12080, 24049], 24235, 24359, [12094, 25144], 25925, 26543, 28246, 29392,
-    31946, 34996, 32929, 32993, 33776, [11969, 34382], 35463, 36328, 37431,
-    38599, 39015, [12238, 40723], 20116, 20114, 20237, 21320, 21577, 21566,
-    23087, 24460, 24481, 24735, 26791, 27278, 29786, 30849, 35486, 35492,
-    35703, 37264, 20062, 39881, 20132, 20348, 20399, 20505, 20502, 20809,
-    20844, 21151, 21177, 21246, 21402, [12061, 21475], 21521, 21518, 21897,
-    22353, 22434, 22909, 23380, 23389, 23439, [12079, 24037], 24039, 24055,
-    24184, 24195, 24218, 24247, 24344, 24658, 24908, 25239, 25304, 25511,
-    25915, 26114, 26179, 26356, 26477, 26657, 26775, 27083, 27743, 27946,
-    28009, 28207, 28317, 30002, 30343, 30828, 31295, 31968, 32005, 32024,
-    32094, 32177, 32789, 32771, 32943, 32945, 33108, 33167, 33322, 33618,
-    [12175, 34892], 34913, 35611, 36002, 36092, 37066, 37237, 37489, 30783,
-    37628, 38308, 38477, 38917, [12217, 39321], [12220, 39640], 40251, 21083,
-    21163, 21495, 21512, 22741, 25335, 28640, 35946, 36703, 40633, 20811,
-    21051, 21578, 22269, 31296, 37239, 40288, [12234, 40658], 29508, 28425,
-    33136, 29969, 24573, 24794, [12219, 39592], 29403, 36796, 27492, 38915,
-    20170, 22256, 22372, 22718, 23130, 24680, 25031, 26127, 26118, 26681,
-    26801, 28151, 30165, 32058, [12169, 33390], 39746, 20123, 20304, 21449,
-    21766, 23919, 24038, 24046, 26619, 27801, 29811, 30722, 35408, 37782,
-    35039, 22352, 24231, 25387, 20661, 20652, 20877, 26368, 21705, 22622,
-    22971, 23472, 24425, 25165, 25505, 26685, 27507, 28168, 28797, 37319,
-    29312, 30741, 30758, 31085, 25998, 32048, 33756, 35009, 36617, 38555,
-    21092, 22312, 26448, 32618, 36001, 20916, 22338, 38442, 22586, 27018,
-    32948, 21682, 23822, 22524, 30869, 40442, 20316, 21066, 21643, 25662,
-    26152, 26388, 26613, 31364, 31574, 32034, 37679, 26716, 39853, 31545,
-    21273, 20874, 21047, 23519, 25334, 25774, 25830, 26413, 27578, 34217,
-    38609, 30352, 39894, 25420, 37638, 39851, [12139, 30399], 26194, 19977,
-    20632, 21442, [12077, 23665], 24808, 25746, 25955, 26719, 29158, 29642,
-    29987, 31639, 32386, 34453, 35715, 36059, 37240, 39184, 26028, 26283,
-    27531, 20181, 20180, 20282, 20351, 21050, 21496, 21490, 21987, 22235,
-    [12064, 22763], 22987, 22985, 23039, [12070, 23376], 23629, 24066, 24107,
-    24535, 24605, 25351, [12096, 25903], 23388, 26031, 26045, 26088, 26525,
-    [12108, 27490], 27515, [12114, 27663], 29509, 31049, 31169, [12151, 31992],
-    32025, 32043, 32930, 33026, [12164, 33267], 35222, 35422, 35433, 35430,
-    35468, 35566, 36039, 36060, 38604, 39164, [12013, 27503], 20107, 20284,
-    20365, 20816, 23383, 23546, 24904, 25345, 26178, 27425, 28363, 27835,
-    29246, 29885, 30164, 30913, [12144, 31034], [12157, 32780], [12159, 32819],
-    [12163, 33258], 33940, 36766, 27728, [12229, 40575], 24335, 35672, 40235,
-    31482, 36600, 23437, 38635, 19971, 21489, 22519, 22833, 23241, 23460,
-    24713, 28287, 28422, 30142, 36074, 23455, 34048, 31712, 20594, 26612,
-    33437, 23649, 34122, 32286, 33294, 20889, 23556, 25448, 36198, 26012,
-    29038, 31038, 32023, 32773, 35613, [12190, 36554], 36974, 34503, 37034,
-    20511, 21242, 23610, 26451, 28796, 29237, 37196, 37320, 37675, 33509,
-    23490, 24369, 24825, 20027, 21462, 23432, [12095, 25163], 26417, 27530,
-    29417, 29664, 31278, 33131, 36259, 37202, [12216, 39318], 20754, 21463,
-    21610, 23551, 25480, 27193, 32172, 38656, 22234, 21454, 21608, 23447,
-    23601, 24030, 20462, 24833, 25342, 27954, 31168, 31179, 32066, 32333,
-    32722, 33261, [12168, 33311], 33936, 34886, 35186, 35728, 36468, 36655,
-    36913, 37195, 37228, 38598, 37276, 20160, 20303, 20805, [12055, 21313],
-    24467, 25102, 26580, 27713, 28171, 29539, 32294, 37325, 37507, 21460,
-    22809, 23487, 28113, 31069, 32302, 31899, 22654, 29087, 20986, 34899,
-    36848, 20426, 23803, 26149, 30636, 31459, 33308, 39423, 20934, 24490,
-    26092, 26991, 27529, 28147, 28310, 28516, 30462, 32020, 24033, 36981,
-    37255, 38918, 20966, 21021, 25152, 26257, 26329, 28186, 24246, 32210,
-    32626, 26360, 34223, 34295, 35576, 21161, 21465, [12069, 22899], 24207,
-    24464, 24661, 37604, 38500, 20663, 20767, 21213, 21280, 21319, 21484,
-    21736, 21830, 21809, 22039, 22888, 22974, 23100, 23477, 23558,
-    [12073, 23567], 23569, 23578, 24196, 24202, 24288, 24432, 25215, 25220,
-    25307, 25484, 25463, 26119, 26124, 26157, 26230, 26494, 26786, 27167,
-    27189, 27836, 28040, 28169, 28248, 28988, 28966, 29031, 30151, 30465,
-    30813, 30977, 31077, 31216, 31456, 31505, 31911, 32057, 32918, 33750,
-    33931, 34121, 34909, 35059, 35359, 35388, 35412, 35443, 35937, 36062,
-    37284, 37478, 37758, 37912, 38556, 38808, 19978, 19976, 19998, 20055,
-    20887, 21104, 22478, 22580, 22732, 23330, 24120, 24773, 25854, 26465,
-    26454, 27972, 29366, 30067, 31331, 33976, 35698, 37304, 37664, 22065,
-    22516, 39166, 25325, 26893, 27542, 29165, 32340, 32887, [12170, 33394],
-    35302, [12215, 39135], 34645, 36785, 23611, 20280, 20449, 20405, 21767,
-    23072, 23517, 23529, [12092, 24515], 24910, 25391, 26032, 26187, 26862,
-    27035, 28024, 28145, 30003, 30137, 30495, 31070, 31206, 32051,
-    [12162, 33251], 33455, 34218, 35242, 35386, [12189, 36523], [12191, 36763],
-    36914, 37341, 38663, [12040, 20154], 20161, 20995, 22645, 22764, 23563,
-    29978, 23613, 33102, 35338, 36805, 38499, 38765, 31525, 35535, 38920,
-    37218, 22259, 21416, 36887, 21561, 22402, 24101, 25512, [12116, 27700],
-    28810, 30561, 31883, 32736, 34928, 36930, 37204, 37648, 37656, 38543,
-    29790, 39620, 23815, 23913, 25968, 26530, 36264, 38619, 25454, 26441,
-    26905, 33733, 38935, 38592, 35070, 28548, 25722, [12072, 23544], 19990,
-    28716, 30045, 26159, 20932, 21046, 21218, 22995, 24449, 24615, 25104,
-    25919, 25972, 26143, 26228, 26866, 26646, 27491, 28165, 29298,
-    [12131, 29983], 30427, 31934, 32854, 22768, 35069, [11972, 35199], 35488,
-    35475, 35531, 36893, 37266, [11992, 38738], 38745, [12011, 25993], 31246,
-    33030, 38587, 24109, 24796, 25114, 26021, 26132, 26512, [12143, 30707],
-    31309, 31821, 32318, 33034, 36012, [12186, 36196], 36321, 36447, 30889,
-    20999, 25305, 25509, 25666, 25240, 35373, 31363, 31680, 35500, 38634,
-    32118, [12166, 33292], 34633, 20185, 20808, 21315, 21344, 23459, 23554,
-    23574, 24029, 25126, 25159, 25776, 26643, 26676, 27849, 27973, 27927,
-    26579, 28508, 29006, 29053, 26059, 31359, 31661, 32218, 32330, 32680,
-    33146, [12167, 33307], 33337, 34214, 35438, 36046, 36341, 36984, 36983,
-    37549, 37521, 38275, 39854, 21069, 21892, 28472, 28982, 20840, 31109,
-    32341, 33203, 31950, 22092, 22609, 23720, 25514, 26366, 26365, 26970,
-    29401, 30095, 30094, 30990, 31062, 31199, 31895, 32032, 32068, 34311,
-    35380, 38459, 36961, [12239, 40736], 20711, 21109, 21452, 21474, 20489,
-    21930, 22766, 22863, 29245, 23435, 23652, 21277, 24803, 24819, 25436,
-    25475, 25407, 25531, 25805, 26089, 26361, 24035, 27085, 27133, 28437,
-    29157, 20105, 30185, 30456, 31379, 31967, 32207, 32156, 32865, 33609,
-    33624, 33900, 33980, 34299, 35013, [12187, 36208], 36865, 36973, 37783,
-    38684, 39442, 20687, 22679, 24974, 33235, 34101, 36104, 36896, 20419,
-    20596, 21063, 21363, 24687, 25417, 26463, 28204, [12188, 36275], 36895,
-    20439, 23646, 36042, 26063, 32154, 21330, 34966, 20854, 25539, 23384,
-    23403, 23562, 25613, 26449, 36956, 20182, 22810, 22826, 27760, 35409,
-    21822, 22549, 22949, 24816, 25171, 26561, 33333, 26965, 38464, 39364,
-    39464, 20307, 22534, 23550, 32784, 23729, 24111, 24453, 24608, 24907,
-    25140, 26367, 27888, 28382, 32974, 33151, 33492, 34955, 36024, 36864,
-    36910, 38538, 40667, 39899, 20195, 21488, [12068, 22823], 31532, 37261,
-    38988, 40441, 28381, 28711, 21331, 21828, 23429, 25176, 25246, 25299,
-    27810, 28655, 29730, 35351, 37944, 28609, 35582, 33592, 20967, 34552,
-    21482, 21481, 20294, 36948, [12192, 36784], 22890, 33073, 24061, 31466,
-    36799, 26842, [12181, 35895], 29432, 40008, 27197, 35504, 20025, 21336,
-    22022, 22374, 25285, 25506, 26086, 27470, 28129, 28251, 28845, 30701,
-    31471, 31658, 32187, 32829, 32966, 34507, 35477, 37723, 22243, 22727,
-    24382, 26029, 26262, 27264, 27573, 30007, 35527, 20516, 30693, 22320,
-    24347, 24677, 26234, 27744, 30196, 31258, 32622, 33268, 34584, 36933,
-    39347, 31689, 30044, [12149, 31481], 31569, 33988, 36880, 31209, 31378,
-    33590, 23265, 30528, 20013, 20210, 23449, 24544, 25277, 26172, 26609,
-    27880, [12173, 34411], 34935, 35387, 37198, 37619, 39376, 27159, 28710,
-    29482, 33511, 33879, 36015, 19969, 20806, 20939, 21899, 23541, 24086,
-    24115, 24193, 24340, 24373, 24427, 24500, 25074, 25361, 26274, 26397,
-    28526, 29266, 30010, 30522, 32884, 33081, 33144, 34678, 35519, 35548,
-    36229, 36339, 37530, [11985, 12199, 38263], 38914, [12227, 40165], 21189,
-    25431, 30452, 26389, 27784, 29645, 36035, 37806, 38515, 27941, 22684,
-    26894, 27084, 36861, 37786, 30171, 36890, 22618, 26626, 25524, 27131,
-    20291, 28460, 26584, 36795, 34086, 32180, 37716, 26943, 28528, 22378,
-    22775, 23340, 32044, [12118, 29226], 21514, 37347, 40372, 20141, 20302,
-    20572, 20597, 21059, 35998, 21576, 22564, 23450, 24093, 24213, 24237,
-    24311, 24351, 24716, 25269, 25402, 25552, 26799, 27712, 30855, 31118,
-    31243, 32224, 33351, 35330, 35558, 36420, 36883, 37048, 37165, 37336,
-    [12237, 40718], 27877, 25688, 25826, 25973, 28404, 30340, 31515, 36969,
-    37841, 28346, 21746, 24505, 25764, 36685, 36845, 37444, 20856, 22635,
-    22825, 23637, 24215, 28155, 32399, 29980, 36028, 36578, 39003, 28857,
-    20253, 27583, 28593, [12133, 30000], 38651, 20814, 21520, 22581, 22615,
-    22956, 23648, 24466, [12099, 26007], 26460, 28193, 30331, 33759, 36077,
-    36884, 37117, 37709, 30757, 30778, 21162, 24230, [12063, 22303], 22900,
-    24594, 20498, 20826, 20908, 20941, [12049, 20992], 21776, 22612, 22616,
-    22871, 23445, 23798, 23947, 24764, 25237, 25645, 26481, 26691, 26812,
-    26847, 30423, 28120, 28271, 28059, 28783, 29128, 24403, 30168, 31095,
-    31561, 31572, 31570, 31958, 32113, 21040, 33891, 34153, 34276, 35342,
-    35588, [12182, 35910], 36367, 36867, 36879, 37913, 38518, 38957, 39472,
-    38360, 20685, 21205, 21516, 22530, 23566, 24999, 25758, 27934, 30643,
-    31461, 33012, 33796, 36947, 37509, 23776, 40199, 21311, 24471, 24499,
-    28060, 29305, 30563, 31167, 31716, 27602, 29420, 35501, 26627, 27233,
-    20984, 31361, 26932, 23626, 40182, 33515, 23493, [12195, 37193], 28702,
-    22136, 23663, 24775, 25958, 27788, 35930, 36929, 38931, 21585, 26311,
-    37389, 22856, 37027, 20869, 20045, 20970, 34201, 35598, 28760, 25466,
-    37707, 26978, 39348, 32260, 30071, 21335, 26976, 36575, 38627, 27741,
-    [12038, 20108], 23612, 24336, 36841, 21250, 36049, [12161, 32905], 34425,
-    24319, [12103, 26085], 20083, [12042, 20837], 22914, 23615, 38894, 20219,
-    22922, 24525, 35469, 28641, 31152, 31074, 23527, 33905, 29483, 29105,
-    24180, 24565, 25467, 25754, 29123, 31896, 20035, 24316, 20043, 22492,
-    22178, 24745, 28611, 32013, 33021, 33075, 33215, 36786, 35223, 34468,
-    24052, 25226, 25773, 35207, 26487, 27874, 27966, 29750, 30772, 23110,
-    32629, 33453, [12218, 39340], 20467, 24259, 25309, 25490, 25943, 26479,
-    30403, 29260, 32972, 32954, 36649, 37197, 20493, 22521, 23186, 26757,
-    26995, 29028, 29437, 36023, 22770, 36064, 38506, 36889, 34687, 31204,
-    30695, 33833, 20271, 21093, 21338, 25293, 26575, 27850, [12137, 30333],
-    31636, 31893, 33334, 34180, 36843, 26333, 28448, 29190, 32283, 33707,
-    39361, [12008, 40614], 20989, 31665, 30834, 31672, 32903, 31560, 27368,
-    24161, 32908, 30033, 30048, [12043, 20843], 37474, 28300, 30330, 37271,
-    39658, 20240, 32624, 25244, 31567, 38309, 40169, 22138, 22617, 34532,
-    38588, 20276, 21028, 21322, 21453, 21467, 24070, 25644, 26001, 26495,
-    27710, 27726, 29256, 29359, 29677, 30036, 32321, 33324, 34281, 36009,
-    31684, [12196, 37318], 29033, 38930, 39151, 25405, 26217, 30058, 30436,
-    30928, 34115, 34542, 21290, 21329, 21542, 22915, 24199, 24444, 24754,
-    25161, 25209, 25259, 26000, [12112, 27604], 27852, 30130, [12138, 30382],
-    30865, 31192, 32203, 32631, 32933, 34987, 35513, 36027, 36991,
-    [12206, 38750], [12214, 39131], 27147, 31800, 20633, 23614, 24494, 26503,
-    27608, 29749, 30473, 32654, [12240, 40763], 26570, 31255, 21305,
-    [12134, 30091], 39661, 24422, 33181, 33777, 32920, 24380, 24517, 30050,
-    31558, 36924, 26727, 23019, 23195, 32016, 30334, 35628, 20469, 24426,
-    27161, 27703, 28418, 29922, 31080, 34920, 35413, 35961, 24287, 25551,
-    30149, 31186, 33495, 37672, 37618, 33948, 34541, 39981, 21697, 24428,
-    25996, 27996, 28693, 36007, 36051, 38971, 25935, 29942, 19981, 20184,
-    22496, 22827, 23142, 23500, 20904, 24067, 24220, 24598, 25206, 25975,
-    26023, 26222, 28014, [12119, 29238], 31526, 33104, 33178, 33433, 35676,
-    36000, 36070, 36212, [12201, 38428], 38468, 20398, 25771, 27494, 33310,
-    33889, 34154, 37096, 23553, 26963, [12213, 39080], 33914, 34135, 20239,
-    21103, 24489, 24133, 26381, 31119, 33145, 35079, 35206, 28149, 24343,
-    25173, 27832, 20175, 29289, 39826, 20998, 21563, 22132, 22707, 24996,
-    25198, 28954, 22894, 31881, 31966, 32027, 38640, [12098, 25991], 32862,
-    19993, 20341, 20853, 22592, 24163, 24179, 24330, 26564, 20006, 34109,
-    38281, 38491, [12150, 31859], [12212, 38913], 20731, 22721, 30294, 30887,
-    21029, 30629, 34065, 31622, 20559, 22793, [12122, 29255], 31687, 32232,
-    36794, 36820, 36941, 20415, 21193, 23081, 24321, 38829, 20445, 33303,
-    37610, 22275, 25429, 27497, 29995, 35036, 36628, 31298, 21215, 22675,
-    24917, 25098, 26286, [11935, 27597], 31807, 33769, 20515, 20472, 21253,
-    21574, 22577, 22857, 23453, 23792, 23791, 23849, 24214, 25265, 25447,
-    25918, [12101, 26041], 26379, 27861, 27873, 28921, 30770, 32299, 32990,
-    33459, 33804, 34028, 34562, 35090, 35370, 35914, 37030, 37586, 39165,
-    40179, 40300, 20047, 20129, 20621, 21078, 22346, 22952, 24125,
-    {f: 2, c: 24536}, 25151, 26292, 26395, 26576, 26834, 20882, 32033, 32938,
-    33192, 35584, 35980, 36031, 37502, 38450, 21536, 38956, 21271, 20693,
-    [12056, 21340], 22696, 25778, 26420, 29287, 30566, 31302, 37350, 21187,
-    27809, 27526, 22528, 24140, 22868, 26412, 32763, 20961, 30406, 25705,
-    30952, 39764, [12231, 40635], 22475, 22969, 26151, 26522, 27598, 21737,
-    27097, 24149, 33180, 26517, 39850, 26622, 40018, 26717, 20134, 20451,
-    [12060, 21448], 25273, 26411, 27819, 36804, 20397, 32365, 40639, 19975,
-    24930, 28288, 28459, 34067, 21619, 26410, 39749, [11922, 24051], 31637,
-    23724, 23494, 34588, 28234, 34001, 31252, 33032, 22937, 31885,
-    [11936, 27665], 30496, 21209, 22818, 28961, 29279, [12141, 30683], 38695,
-    40289, 26891, 23167, 23064, 20901, 21517, 21629, 26126, 30431, 36855,
-    37528, 40180, 23018, 29277, 28357, 20813, 26825, 32191, 32236,
-    [12207, 38754], 40634, 25720, 27169, 33538, 22916, 23391, [12113, 27611],
-    29467, 30450, 32178, 32791, 33945, 20786, [12106, 26408], 40665,
-    [12140, 30446], 26466, 21247, 39173, 23588, 25147, 31870, 36016, 21839,
-    24758, 32011, [12200, 38272], 21249, 20063, 20918, 22812, 29242, 32822,
-    37326, 24357, [12142, 30690], 21380, 24441, 32004, 34220, 35379, 36493,
-    38742, 26611, 34222, 37971, 24841, 24840, 27833, 30290, 35565, 36664,
-    21807, 20305, 20778, 21191, 21451, 23461, 24189, 24736, 24962, 25558,
-    26377, 26586, 28263, 28044, {f: 2, c: 29494}, 30001, 31056, 35029, 35480,
-    36938, [12194, 37009], 37109, 38596, 34701, [12067, 22805], 20104, 20313,
-    19982, 35465, 36671, 38928, 20653, 24188, 22934, 23481, 24248, 25562,
-    25594, 25793, 26332, 26954, 27096, 27915, 28342, 29076, [12132, 29992],
-    31407, [12154, 32650], 32768, 33865, 33993, 35201, 35617, 36362, 36965,
-    38525, 39178, 24958, 25233, 27442, 27779, 28020, 32716, 32764, 28096,
-    32645, 34746, 35064, 26469, 33713, 38972, 38647, 27931, 32097, 33853,
-    37226, 20081, 21365, 23888, 27396, 28651, 34253, 34349, 35239, 21033,
-    21519, 23653, 26446, 26792, 29702, 29827, 30178, 35023, 35041,
-    [12197, 37324], 38626, 38520, 24459, 29575, [12148, 31435], 33870, 25504,
-    30053, 21129, 27969, 28316, 29705, 30041, 30827, 31890, 38534,
-    [12015, 31452], [12243, 40845], 20406, 24942, 26053, 34396, 20102, 20142,
-    20698, 20001, 20940, 23534, 26009, 26753, 28092, 29471, 30274, 30637,
-    31260, 31975, 33391, 35538, 36988, 37327, 38517, 38936, [12050, 21147],
-    32209, 20523, 21400, 26519, 28107, 29136, 29747, 33256, 36650, 38563,
-    40023, 40607, 29792, 22593, 28057, 32047, 39006, 20196, 20278, 20363,
-    20919, 21169, 23994, 24604, 29618, 31036, 33491, 37428, 38583, 38646,
-    38666, 40599, 40802, 26278, 27508, 21015, 21155, 28872, 35010, 24265,
-    24651, 24976, 28451, 29001, 31806, 32244, 32879, 34030, 36899, 37676,
-    21570, 39791, 27347, 28809, 36034, 36335, 38706, 21172, 23105, 24266,
-    24324, 26391, 27004, 27028, 28010, 28431, 29282, 29436, 31725,
-    [12156, 32769], 32894, 34635, 37070, 20845, 40595, 31108, 32907, 37682,
-    35542, 20525, 21644, 35441, 27498, 36036, 33031, 24785, 26528, 40434,
-    20121, 20120, 39952, 35435, 34241, 34152, 26880, 28286, 30871, 33109,
-    24332, 19984, 19989, 20010, 20017, [12034, 20022], 20028, [12035, 20031],
-    20034, 20054, 20056, 20098, [12037, 20101], 35947, 20106, 33298, 24333,
-    20110, {f: 2, c: 20126}, [12039, 20128], 20130, 20144, 20147, 20150, 20174,
-    20173, 20164, 20166, 20162, 20183, 20190, 20205, 20191, 20215, 20233,
-    20314, 20272, 20315, 20317, 20311, 20295, 20342, 20360, 20367, 20376,
-    20347, 20329, 20336, 20369, 20335, 20358, 20374, 20760, 20436, 20447,
-    20430, 20440, 20443, 20433, 20442, 20432, {f: 2, c: 20452}, 20506, 20520,
-    20500, 20522, 20517, 20485, 20252, 20470, 20513, 20521, 20524, 20478,
-    20463, 20497, 20486, 20547, 20551, 26371, 20565, 20560, 20552, 20570,
-    20566, 20588, 20600, 20608, 20634, 20613, 20660, 20658, {f: 2, c: 20681},
-    20659, 20674, 20694, 20702, 20709, 20717, 20707, 20718, 20729, 20725,
-    20745, {f: 2, c: 20737}, 20758, 20757, 20756, 20762, 20769, 20794, 20791,
-    20796, 20795, [12041, 20799], [11918, 20800], 20818, 20812, 20820, 20834,
-    31480, {f: 2, c: 20841}, 20846, 20864, [12044, 20866], 22232, 20876, 20873,
-    20879, 20881, 20883, 20885, [12045, 20886], 20900, 20902, 20898,
-    {f: 2, c: 20905}, [12046, 20907], 20915, {f: 2, c: 20913}, 20912, 20917,
-    20925, 20933, 20937, 20955, [12047, 20960], 34389, 20969, 20973, 20976,
-    [12048, 20981], 20990, 20996, 21003, 21012, 21006, 21031, 21034, 21038,
-    21043, 21049, 21071, 21060, {f: 2, c: 21067}, 21086, 21076, 21098, 21108,
-    21097, 21107, 21119, 21117, 21133, 21140, 21138, 21105, 21128, 21137,
-    36776, 36775, {f: 2, c: 21164}, 21180, 21173, 21185, 21197, 21207, 21214,
-    21219, 21222, 39149, 21216, 21235, 21237, 21240, [12051, 21241], 21254,
-    21256, 30008, 21261, 21264, 21263, [12052, 21269], [12053, 21274], 21283,
-    21295, 21297, 21299, [12054, 21304], 21312, 21318, 21317, 19991, 21321,
-    21325, 20950, 21342, [12057, 21353], 21358, 22808, 21371, 21367,
-    [12058, 21378], 21398, 21408, 21414, 21413, 21422, 21424, [12059, 21430],
-    21443, 31762, 38617, 21471, 26364, 29166, 21486, 21480, 21485, 21498,
-    21505, 21565, 21568, {f: 2, c: 21548}, 21564, 21550, 21558, 21545, 21533,
-    21582, 21647, 21621, 21646, 21599, 21617, 21623, 21616, 21650, 21627,
-    21632, 21622, 21636, 21648, 21638, 21703, 21666, 21688, 21669, 21676,
-    21700, 21704, 21672, 21675, 21698, 21668, 21694, 21692, 21720,
-    {f: 2, c: 21733}, 21775, 21780, 21757, 21742, 21741, 21754, 21730, 21817,
-    21824, 21859, 21836, 21806, 21852, 21829, {f: 2, c: 21846}, 21816, 21811,
-    21853, 21913, 21888, 21679, 21898, 21919, 21883, 21886, 21912, 21918,
-    21934, 21884, 21891, 21929, 21895, 21928, 21978, 21957, 21983, 21956,
-    21980, 21988, 21972, 22036, 22007, 22038, 22014, 22013, 22043, 22009,
-    22094, 22096, 29151, 22068, 22070, 22066, 22072, 22123, 22116, 22063,
-    22124, 22122, 22150, 22144, 22154, 22176, 22164, 22159, 22181, 22190,
-    22198, 22196, 22210, 22204, 22209, 22211, 22208, 22216, 22222, 22225,
-    22227, [12062, 22231], 22254, 22265, 22272, 22271, 22276, 22281, 22280,
-    22283, 22285, 22291, 22296, 22294, 21959, 22300, 22310, {f: 2, c: 22327},
-    22350, 22331, 22336, 22351, 22377, 22464, 22408, 22369, 22399, 22409,
-    22419, 22432, 22451, 22436, 22442, 22448, 22467, 22470, 22484,
-    {f: 2, c: 22482}, 22538, 22486, 22499, 22539, 22553, 22557, 22642, 22561,
-    22626, 22603, 22640, 27584, 22610, 22589, 22649, 22661, 22713, 22687,
-    22699, 22714, 22750, 22715, 22712, 22702, 22725, 22739, 22737, 22743,
-    22745, 22744, 22757, 22748, 22756, 22751, 22767, 22778, 22777,
-    {f: 3, c: 22779}, [12065, 22786], [12066, 22794], 22800, 22811, 26790,
-    22821, {f: 2, c: 22828}, 22834, 22840, 22846, 31442, 22869, 22864, 22862,
-    22874, 22872, 22882, 22880, 22887, 22892, 22889, 22904, 22913, 22941,
-    20318, 20395, 22947, 22962, 22982, 23016, 23004, 22925, {f: 2, c: 23001},
-    23077, 23071, 23057, 23068, 23049, 23066, 23104, 23148, 23113,
-    {f: 2, c: 23093}, 23138, 23146, 23194, 23228, 23230, 23243, 23234, 23229,
-    23267, 23255, 23270, 23273, 23254, {f: 2, c: 23290}, 23308, 23307, 23318,
-    23346, 23248, 23338, 23350, 23358, 23363, 23365, 23360, 23377, 23381,
-    {f: 2, c: 23386}, 23397, 23401, 23408, 23411, 23413, 23416, 25992, 23418,
-    [12071, 23424], 23427, 23462, 23480, 23491, 23495, 23497, 23508, 23504,
-    23524, 23526, 23522, 23518, 23525, 23531, 23536, 23542, 23539, 23557,
-    {f: 2, c: 23559}, 23565, 23571, 23584, [11920, 12074, 23586], 23592,
-    [12075, 23608], 23609, 23617, 23622, 23630, 23635, 23632, 23631, 23409,
-    23660, [12076, 23662], 20066, 23670, 23673, 23692, 23697, 23700, 22939,
-    23723, 23739, 23734, 23740, 23735, 23749, 23742, 23751, 23769, 23785,
-    23805, 23802, 23789, 23948, 23786, 23819, 23829, 23831, 23900, 23839,
-    23835, 23825, 23828, 23842, 23834, 23833, 23832, 23884, 23890, 23886,
-    23883, 23916, 23923, 23926, 23943, 23940, 23938, 23970, 23965, 23980,
-    23982, 23997, 23952, 23991, 23996, 24009, 24013, 24019, 24018, 24022,
-    [12078, 24027], 24043, 24050, 24053, 24075, 24090, 24089, 24081, 24091,
-    {f: 2, c: 24118}, 24132, 24131, 24128, 24142, 24151, 24148, 24159, 24162,
-    24164, 24135, {f: 2, c: 24181}, [11923, 12083, 24186], 40636,
-    [12084, 24191], 24224, {f: 2, c: 24257}, 24264, 24272, 24271, 24278, 24291,
-    24285, {f: 2, c: 24282}, 24290, 24289, {f: 2, c: 24296}, 24300, 24305,
-    24307, 24304, [12085, 24308], 24312, [12086, 24318], 24323, 24329, 24413,
-    24412, [12087, 24331], 24337, 24342, 24361, 24365, 24376, 24385, 24392,
-    24396, 24398, 24367, [11924, 24401], {f: 2, c: 24406}, 24409,
-    [12090, 24417], 24429, [12091, 24435], 24439, 24451, 24450, 24447, 24458,
-    24456, 24465, 24455, 24478, 24473, 24472, 24480, 24488, 24493, 24508,
-    24534, 24571, 24548, 24568, 24561, 24541, 24755, 24575, 24609, 24672,
-    24601, 24592, 24617, 24590, 24625, 24603, 24597, 24619, 24614, 24591,
-    24634, 24666, 24641, 24682, 24695, 24671, 24650, 24646, 24653, 24675,
-    24643, 24676, 24642, 24684, 24683, 24665, 24705, 24717, 24807, 24707,
-    24730, 24708, 24731, {f: 2, c: 24726}, 24722, 24743, 24715, 24801, 24760,
-    24800, 24787, 24756, 24560, 24765, 24774, 24757, 24792, 24909, 24853,
-    24838, {f: 2, c: 24822}, 24832, 24820, 24826, 24835, 24865, 24827, 24817,
-    {f: 2, c: 24845}, 24903, 24894, 24872, 24871, 24906, 24895, 24892, 24876,
-    24884, 24893, 24898, 24900, 24947, 24951, {f: 3, c: 24920}, 24939, 24948,
-    24943, 24933, 24945, 24927, 24925, 24915, 24949, 24985, 24982, 24967,
-    25004, 24980, 24986, 24970, 24977, 25003, 25006, 25036, 25034, 25033,
-    25079, 25032, 25027, 25030, 25018, 25035, 32633, 25037, 25062, 25059,
-    25078, 25082, 25076, 25087, 25085, 25084, 25086, 25088, [12093, 25096],
-    25097, 25101, 25100, 25108, 25115, 25118, 25121, 25130, 25134, 25136,
-    {f: 2, c: 25138}, 25153, 25166, 25182, 25187, 25179, 25184, 25192, 25212,
-    25218, 25225, 25214, {f: 2, c: 25234}, 25238, 25300, 25219, 25236, 25303,
-    25297, 25275, 25295, 25343, 25286, 25812, 25288, 25308, 25292, 25290,
-    25282, 25287, 25243, 25289, 25356, 25326, 25329, 25383, 25346, 25352,
-    25327, 25333, 25424, 25406, 25421, 25628, 25423, 25494, 25486, 25472,
-    25515, 25462, 25507, 25487, 25481, 25503, 25525, 25451, 25449, 25534,
-    25577, 25536, 25542, 25571, 25545, 25554, 25590, 25540, 25622, 25652,
-    25606, 25619, 25638, 25654, 25885, 25623, 25640, 25615, 25703, 25711,
-    25718, 25678, 25898, 25749, 25747, 25765, 25769, 25736, 25788, 25818,
-    25810, 25797, 25799, 25787, 25816, 25794, 25841, 25831, 33289,
-    {f: 2, c: 25824}, 25260, 25827, 25839, 25900, 25846, 25844, 25842, 25850,
-    25856, 25853, 25880, 25884, 25861, 25892, 25891, 25899, [12097, 25908],
-    [11929, 25909], 25911, 25910, 25912, 30027, 25928, 25942, 25941, 25933,
-    25944, 25950, 25949, 25970, 25976, {f: 2, c: 25986}, 35722, 26011, 26015,
-    26027, 26039, 26051, 26054, 26049, 26052, 26060, 26066, 26075, 26073,
-    [12102, 26080], [11931, 26081], 26097, 26482, 26122, 26115, 26107, 26483,
-    {f: 2, c: 26165}, 26164, 26140, 26191, 26180, 26185, 26177, 26206, 26205,
-    26212, {f: 2, c: 26215}, 26207, 26210, 26224, 26243, 26248, 26254, 26249,
-    26244, 26264, 26269, 26305, 26297, 26313, 26302, 26300, 26308, 26296,
-    26326, 26330, 26336, 26175, 26342, 26345, [12104, 26352], 26357, 26359,
-    26383, 26390, 26398, {f: 2, c: 26406}, 38712, 26414, 26431, 26422, 26433,
-    26424, 26423, 26438, 26462, 26464, 26457, {f: 2, c: 26467}, 26505, 26480,
-    26537, 26492, 26474, 26508, 26507, 26534, 26529, 26501, 26551, 26607,
-    26548, 26604, 26547, 26601, 26552, 26596, 26590, 26589, 26594, 26606,
-    26553, 26574, 26566, 26599, 27292, 26654, 26694, 26665, 26688, 26701,
-    26674, 26702, 26803, 26667, 26713, 26723, 26743, 26751, 26783, 26767,
-    26797, 26772, 26781, 26779, 26755, 27310, 26809, 26740, 26805, 26784,
-    26810, 26895, 26765, 26750, 26881, 26826, 26888, 26840, 26914, 26918,
-    26849, 26892, 26829, 26836, 26855, 26837, 26934, 26898, 26884, 26839,
-    26851, 26917, 26873, 26848, 26863, 26920, 26922, 26906, 26915, 26913,
-    26822, 27001, 26999, 26972, 27000, 26987, 26964, 27006, 26990, 26937,
-    26996, 26941, 26969, 26928, 26977, 26974, 26973, 27009, 26986, 27058,
-    27054, 27088, 27071, 27073, 27091, 27070, 27086, 23528, 27082, 27101,
-    27067, 27075, 27047, 27182, 27025, 27040, 27036, 27029, 27060, 27102,
-    27112, 27138, 27163, 27135, 27402, 27129, 27122, 27111, 27141, 27057,
-    27166, 27117, 27156, 27115, 27146, 27154, 27329, 27171, 27155, 27204,
-    27148, 27250, 27190, 27256, 27207, 27234, 27225, 27238, 27208, 27192,
-    27170, 27280, 27277, 27296, 27268, {f: 2, c: 27298}, 27287, 34327, 27323,
-    27331, 27330, 27320, 27315, 27308, 27358, 27345, 27359, 27306, 27354,
-    27370, 27387, 27397, 34326, 27386, 27410, 27414, 39729, 27423, 27448,
-    27447, 30428, 27449, 39150, 27463, 27459, 27465, 27472, 27481, 27476,
-    27483, 27487, 27489, 27512, [12109, 27513], {f: 2, c: 27519}, 27524, 27523,
-    27533, 27544, 27541, 27550, 27556, {f: 2, c: 27562}, 27567, 27570, 27569,
-    [12110, 27571], 27575, 27580, 27590, [12111, 27595], 27603, 27615, 27628,
-    27627, 27635, 27631, 40638, 27656, 27667, [12115, 27668], 27675, 27684,
-    27683, 27742, 27733, 27746, 27754, 27778, 27789, 27802, 27777, 27803,
-    27774, 27752, 27763, 27794, 27792, 27844, 27889, 27859, 27837, 27863,
-    27845, 27869, 27822, 27825, 27838, 27834, 27867, 27887, 27865, 27882,
-    27935, 34893, 27958, 27947, 27965, 27960, 27929, 27957, 27955, 27922,
-    27916, 28003, 28051, 28004, 27994, 28025, 27993, 28046, 28053, 28644,
-    28037, 28153, 28181, 28170, 28085, 28103, 28134, 28088, 28102, 28140,
-    28126, 28108, 28136, 28114, 28101, 28154, 28121, 28132, 28117, 28138,
-    28142, 28205, 28270, 28206, 28185, 28274, 28255, 28222, 28195, 28267,
-    28203, 28278, 28237, 28191, 28227, 28218, 28238, 28196, 28415, 28189,
-    28216, 28290, 28330, 28312, 28361, 28343, 28371, 28349, 28335, 28356,
-    28338, {f: 2, c: 28372}, 28303, 28325, 28354, 28319, 28481, 28433, 28748,
-    28396, 28408, 28414, 28479, 28402, 28465, 28399, 28466, 28364, 28478,
-    28435, 28407, 28550, 28538, 28536, 28545, 28544, 28527, 28507, 28659,
-    28525, 28546, 28540, 28504, 28558, 28561, 28610, 28518, 28595, 28579,
-    28577, 28580, 28601, 28614, 28586, 28639, 28629, 28652, 28628, 28632,
-    28657, 28654, 28635, 28681, 28683, 28666, 28689, 28673, 28687, 28670,
-    28699, 28698, 28532, 28701, 28696, 28703, 28720, 28734, 28722, 28753,
-    28771, 28825, 28818, 28847, 28913, 28844, 28856, 28851, 28846, 28895,
-    28875, 28893, 28889, 28937, 28925, 28956, 28953, 29029, 29013, 29064,
-    29030, 29026, 29004, 29014, 29036, 29071, 29179, 29060, 29077, 29096,
-    29100, 29143, 29113, 29118, 29138, 29129, 29140, 29134, 29152, 29164,
-    29159, 29173, 29180, 29177, 29183, 29197, 29200, 29211, 29224, 29229,
-    29228, 29232, 29234, [12120, 29243], 29244, [12121, 29247], 29248, 29254,
-    29259, 29272, 29300, 29310, 29314, 29313, 29319, 29330, 29334, 29346,
-    29351, 29369, 29362, 29379, 29382, 29380, 29390, 29394, 29410,
-    {f: 2, c: 29408}, 29433, 29431, 20495, 29463, 29450, 29468, 29462, 29469,
-    29492, 29487, 29481, 29477, 29502, {f: 2, c: 29518}, 40664, 29527, 29546,
-    29544, 29552, 29560, 29557, 29563, 29562, 29640, 29619, 29646, 29627,
-    29632, 29669, 29678, 29662, 29858, 29701, 29807, 29733, 29688, 29746,
-    29754, 29781, 29759, 29791, 29785, 29761, 29788, 29801, 29808, 29795,
-    29802, 29814, 29822, 29835, 29854, 29863, 29898, 29903, 29908, 29681,
-    29920, 29923, 29927, 29929, 29934, 29938, {f: 2, c: 29936}, 29944, 29943,
-    29956, 29955, 29957, 29964, 29966, 29965, 29973, 29971, 29982, 29990,
-    29996, 30012, 30020, 30029, 30026, 30025, 30043, 30022, 30042, 30057,
-    30052, 30055, 30059, 30061, 30072, 30070, {f: 2, c: 30086}, 30068, 30090,
-    30089, 30082, 30100, 30106, 30109, 30117, 30115, 30146, 30131, 30147,
-    30133, 30141, 30136, 30140, 30129, 30157, 30154, 30162, 30169, 30179,
-    30174, {f: 2, c: 30206}, 30204, 30209, 30192, 30202, {f: 2, c: 30194},
-    30219, 30221, 30217, 30239, 30247, {f: 3, c: 30240}, 30244, 30260, 30256,
-    30267, {f: 2, c: 30279}, 30278, 30300, 30296, {f: 2, c: 30305},
-    {f: 3, c: 30312}, 30311, 30316, 30320, 30322, [12136, 30326], 30328, 30332,
-    30336, 30339, 30344, 30347, 30350, 30358, 30355, {f: 2, c: 30361}, 30384,
-    30388, {f: 3, c: 30392}, 30402, 30413, 30422, 30418, 30430, 30433, 30437,
-    30439, 30442, 34351, 30459, 30472, 30471, 30468, 30505, 30500, 30494,
-    {f: 2, c: 30501}, 30491, {f: 2, c: 30519}, 30535, 30554, 30568, 30571,
-    30555, 30565, 30591, 30590, 30585, 30606, 30603, 30609, 30624, 30622,
-    30640, 30646, 30649, 30655, {f: 2, c: 30652}, 30651, 30663, 30669, 30679,
-    30682, 30684, 30691, 30702, 30716, 30732, 30738, 31014, 30752, 31018,
-    30789, 30862, 30836, 30854, 30844, 30874, 30860, 30883, 30901, 30890,
-    30895, 30929, 30918, 30923, 30932, 30910, 30908, 30917, 30922, 30956,
-    30951, 30938, 30973, 30964, 30983, 30994, 30993, 31001, 31020, 31019,
-    31040, 31072, 31063, 31071, 31066, 31061, 31059, 31098, 31103, 31114,
-    31133, 31143, 40779, 31146, 31150, 31155, {f: 2, c: 31161}, 31177, 31189,
-    31207, 31212, 31201, 31203, 31240, 31245, {f: 2, c: 31256}, 31264, 31263,
-    31104, 31281, 31291, 31294, 31287, 31299, 31319, 31305, {f: 2, c: 31329},
-    31337, 40861, 31344, 31353, 31357, 31368, 31383, 31381, 31384, 31382,
-    31401, 31432, 31408, 31414, 31429, 31428, 31423, 36995, 31431, 31434,
-    31437, 31439, 31445, 31443, {f: 2, c: 31449}, 31453, {f: 2, c: 31457},
-    31462, 31469, 31472, 31490, 31503, 31498, 31494, 31539, {f: 2, c: 31512},
-    31518, 31541, 31528, 31542, 31568, 31610, 31492, 31565, 31499, 31564,
-    31557, 31605, 31589, 31604, 31591, {f: 2, c: 31600}, 31596, 31598, 31645,
-    31640, 31647, 31629, 31644, 31642, 31627, 31634, 31631, 31581, 31641,
-    31691, 31681, 31692, 31695, 31668, 31686, 31709, 31721, 31761, 31764,
-    31718, 31717, 31840, 31744, 31751, 31763, 31731, 31735, 31767, 31757,
-    31734, 31779, 31783, 31786, 31775, 31799, 31787, 31805, 31820, 31811,
-    31828, 31823, 31808, 31824, 31832, 31839, 31844, 31830, 31845, 31852,
-    31861, 31875, 31888, 31908, 31917, 31906, 31915, 31905, 31912, 31923,
-    31922, 31921, 31918, 31929, 31933, 31936, 31941, 31938, 31960, 31954,
-    31964, 31970, 39739, 31983, 31986, 31988, 31990, 31994, 32006, 32002,
-    32028, 32021, 32010, 32069, 32075, 32046, 32050, 32063, 32053, 32070,
-    32115, 32086, 32078, 32114, 32104, 32110, 32079, 32099, 32147, 32137,
-    32091, 32143, 32125, 32155, 32186, 32174, 32163, 32181, 32199, 32189,
-    32171, 32317, 32162, 32175, 32220, 32184, 32159, 32176, 32216, 32221,
-    32228, 32222, 32251, 32242, 32225, 32261, 32266, 32291, 32289, 32274,
-    32305, 32287, 32265, 32267, 32290, 32326, 32358, 32315, 32309, 32313,
-    32323, 32311, 32306, 32314, 32359, 32349, 32342, 32350, {f: 2, c: 32345},
-    32377, 32362, 32361, 32380, 32379, 32387, 32213, 32381, 36782, 32383,
-    {f: 2, c: 32392}, 32396, 32402, 32400, {f: 2, c: 32403}, 32406, 32398,
-    {f: 2, c: 32411}, 32568, 32570, 32581, {f: 3, c: 32588}, 32592,
-    [12153, 32593], 32597, 32596, 32600, {f: 2, c: 32607}, {f: 2, c: 32616},
-    32615, 32632, 32642, 32646, 32643, 32648, 32647, 32652, 32660, 32670,
-    32669, 32666, 32675, 32687, 32690, 32697, 32686, 32694, 32696, 35697,
-    {f: 2, c: 32709}, 32714, 32725, 32724, 32737, 32742, 32745, 32755, 32761,
-    39132, 32774, 32772, 32779, [12158, 32786], {f: 2, c: 32792}, 32796, 32801,
-    32808, 32831, 32827, 32842, 32838, 32850, 32856, 32858, 32863, 32866,
-    32872, 32883, 32882, 32880, 32886, 32889, 32893, [12160, 32895], 32900,
-    32902, 32901, 32923, 32915, 32922, 32941, 20880, 32940, 32987, 32997,
-    32985, 32989, 32964, 32986, 32982, 33033, 33007, 33009, 33051, 33065,
-    33059, 33071, 33099, 38539, 33094, 33086, 33107, 33105, 33020, 33137,
-    33134, {f: 2, c: 33125}, 33140, 33155, 33160, 33162, 33152, 33154, 33184,
-    33173, 33188, 33187, 33119, 33171, 33193, 33200, 33205, 33214, 33208,
-    33213, 33216, 33218, 33210, 33225, 33229, 33233, 33241, 33240, 33224,
-    33242, {f: 2, c: 33247}, 33255, {f: 2, c: 33274}, 33278, {f: 2, c: 33281},
-    33285, 33287, 33290, 33293, 33296, 33302, 33321, 33323, 33336, 33331,
-    33344, 33369, 33368, 33373, 33370, 33375, 33380, 33378, 33384,
-    {f: 2, c: 33386}, 33326, 33393, 33399, [12171, 33400], 33406, 33421, 33426,
-    33451, 33439, 33467, 33452, 33505, 33507, 33503, 33490, 33524, 33523,
-    33530, 33683, 33539, 33531, 33529, 33502, 33542, 33500, 33545, 33497,
-    33589, 33588, 33558, 33586, 33585, 33600, 33593, 33616, 33605, 33583,
-    33579, {f: 2, c: 33559}, 33669, 33690, 33706, 33695, 33698, 33686, 33571,
-    33678, 33671, 33674, 33660, 33717, 33651, 33653, 33696, 33673, 33704,
-    33780, 33811, 33771, 33742, 33789, 33795, 33752, 33803, 33729, 33783,
-    33799, 33760, 33778, 33805, 33826, 33824, 33725, 33848, 34054, 33787,
-    33901, 33834, 33852, 34138, 33924, 33911, 33899, 33965, 33902, 33922,
-    33897, 33862, 33836, 33903, 33913, 33845, 33994, 33890, 33977, 33983,
-    33951, 34009, 33997, 33979, 34010, 34000, 33985, 33990, 34006, 33953,
-    34081, 34047, 34036, {f: 2, c: 34071}, 34092, 34079, 34069, 34068, 34044,
-    34112, 34147, 34136, 34120, 34113, 34306, 34123, 34133, 34176, 34212,
-    34184, 34193, 34186, 34216, 34157, 34196, 34203, 34282, 34183, 34204,
-    34167, 34174, 34192, 34249, 34234, 34255, 34233, 34256, 34261, 34269,
-    34277, 34268, 34297, 34314, 34323, 34315, 34302, 34298, 34310, 34338,
-    34330, 34352, 34367, [12172, 34381], 20053, 34388, 34399, 34407, 34417,
-    34451, 34467, {f: 2, c: 34473}, {f: 2, c: 34443}, 34486, 34479, 34500,
-    34502, 34480, 34505, 34851, 34475, 34516, 34526, 34537, 34540, 34527,
-    34523, 34543, 34578, 34566, 34568, 34560, 34563, 34555, 34577, 34569,
-    34573, 34553, 34570, 34612, 34623, 34615, 34619, 34597, 34601, 34586,
-    34656, 34655, 34680, 34636, 34638, 34676, 34647, 34664, 34670, 34649,
-    34643, 34659, 34666, 34821, 34722, 34719, 34690, 34735, 34763, 34749,
-    34752, 34768, 38614, 34731, 34756, 34739, 34759, 34758, 34747, 34799,
-    34802, 34784, 34831, 34829, 34814, {f: 2, c: 34806}, 34830, 34770, 34833,
-    34838, 34837, 34850, 34849, 34865, 34870, 34873, 34855, 34875, 34884,
-    34882, 34898, 34905, 34910, 34914, 34923, 34945, 34942, 34974, 34933,
-    34941, 34997, 34930, 34946, 34967, 34962, 34990, 34969, 34978, 34957,
-    34980, 34992, 35007, 34993, {f: 2, c: 35011}, 35028, {f: 2, c: 35032},
-    35037, 35065, 35074, 35068, 35060, 35048, 35058, 35076, 35084, 35082,
-    35091, 35139, 35102, 35109, {f: 2, c: 35114}, 35137, 35140, 35131, 35126,
-    35128, 35148, 35101, 35168, 35166, 35174, 35172, 35181, 35178, 35183,
-    35188, 35191, [12177, 35198], 35203, 35208, 35210, 35219, 35224, 35233,
-    35241, 35238, 35244, 35247, 35250, 35258, 35261, {f: 2, c: 35263}, 35290,
-    {f: 2, c: 35292}, 35303, 35316, 35320, 35331, 35350, 35344, 35340, 35355,
-    35357, 35365, 35382, 35393, 35419, 35410, 35398, 35400, 35452, 35437,
-    35436, 35426, 35461, 35458, 35460, 35496, 35489, 35473, {f: 2, c: 35493},
-    35482, 35491, 35524, 35533, 35522, 35546, 35563, 35571, 35559, 35556,
-    35569, 35604, 35552, 35554, 35575, 35550, 35547, 35596, 35591, 35610,
-    35553, 35606, 35600, 35607, 35616, 35635, 38827, 35622, 35627, 35646,
-    35624, 35649, 35660, 35663, 35662, 35657, 35670, 35675, 35674, 35691,
-    35679, 35692, 35695, 35700, 35709, 35712, 35724, 35726, {f: 2, c: 35730},
-    35734, {f: 2, c: 35737}, 35898, 35905, 35903, 35912, 35916, 35918, 35920,
-    [12183, 35925], 35938, 35948, [12184, 35960], 35962, 35970, 35977, 35973,
-    35978, {f: 2, c: 35981}, 35988, 35964, 35992, 25117, 36013, 36010, 36029,
-    {f: 2, c: 36018}, 36014, 36022, 36040, 36033, 36068, 36067, 36058, 36093,
-    {f: 2, c: 36090}, {f: 2, c: 36100}, 36106, 36103, 36111, 36109, 36112,
-    40782, 36115, 36045, 36116, 36118, 36199, 36205, 36209, 36211, 36225,
-    36249, 36290, 36286, 36282, 36303, 36314, 36310, 36300, 36315, 36299,
-    {f: 2, c: 36330}, 36319, 36323, 36348, {f: 2, c: 36360}, 36351,
-    {f: 2, c: 36381}, 36368, 36383, 36418, 36405, 36400, 36404, 36426, 36423,
-    36425, 36428, 36432, 36424, 36441, 36452, 36448, 36394, 36451, 36437,
-    36470, 36466, 36476, 36481, 36487, 36485, 36484, 36491, 36490, 36499,
-    36497, 36500, 36505, 36522, 36513, 36524, 36528, 36550, 36529, 36542,
-    36549, 36552, 36555, 36571, 36579, 36604, 36603, 36587, 36606, 36618,
-    36613, 36629, 36626, 36633, 36627, 36636, 36639, 36635, 36620, 36646,
-    36659, 36667, 36665, 36677, 36674, 36670, 36684, 36681, 36678, 36686,
-    36695, 36700, {f: 3, c: 36706}, 36764, 36767, 36771, 36781, 36783, 36791,
-    36826, 36837, 36834, 36842, 36847, 36999, 36852, 36869, {f: 2, c: 36857},
-    36881, 36885, 36897, 36877, 36894, 36886, 36875, 36903, 36918, 36917,
-    36921, 36856, {f: 4, c: 36943}, 36878, 36937, 36926, 36950, 36952, 36958,
-    36968, 36975, 36982, 38568, 36978, 36994, 36989, 36993, 36992, 37002,
-    37001, 37007, 37032, 37039, 37041, 37045, 37090, 37092, 25160, 37083,
-    37122, 37138, 37145, 37170, 37168, 37194, 37206, 37208, 37219, 37221,
-    37225, 37235, 37234, 37259, 37257, 37250, 37282, 37291, 37295, 37290,
-    37301, 37300, 37306, {f: 2, c: 37312}, 37321, 37323, 37328, 37334, 37343,
-    37345, 37339, 37372, {f: 2, c: 37365}, 37406, 37375, 37396, 37420, 37397,
-    37393, 37470, 37463, 37445, 37449, 37476, 37448, 37525, 37439, 37451,
-    37456, 37532, 37526, 37523, 37531, 37466, 37583, 37561, 37559, 37609,
-    37647, 37626, 37700, 37678, 37657, 37666, 37658, 37667, 37690, 37685,
-    37691, 37724, 37728, 37756, 37742, 37718, 37808, {f: 2, c: 37804}, 37780,
-    37817, {f: 2, c: 37846}, 37864, 37861, 37848, 37827, 37853, 37840, 37832,
-    37860, 37914, 37908, 37907, 37891, 37895, 37904, 37942, 37931, 37941,
-    37921, 37946, 37953, 37970, 37956, 37979, 37984, 37986, 37982, 37994,
-    37417, 38000, 38005, 38007, 38013, 37978, 38012, 38014, 38017, 38015,
-    38274, 38279, 38282, 38292, 38294, {f: 2, c: 38296}, 38304, 38312, 38311,
-    38317, 38332, 38331, 38329, 38334, 38346, 28662, 38339, 38349, 38348,
-    38357, 38356, 38358, 38364, 38369, 38373, 38370, 38433, 38440,
-    {f: 2, c: 38446}, 38466, 38476, 38479, 38475, 38519, 38492, 38494, 38493,
-    38495, 38502, 38514, 38508, 38541, 38552, 38549, 38551, 38570, 38567,
-    {f: 2, c: 38577}, 38576, 38580, [12202, 38582], 38584, [12203, 38585],
-    38606, 38603, 38601, 38605, 35149, 38620, 38669, 38613, 38649, 38660,
-    38662, 38664, 38675, 38670, 38673, 38671, 38678, 38681, 38692, 38698,
-    38704, 38713, {f: 2, c: 38717}, 38724, 38726, 38728, 38722, 38729, 38748,
-    38752, 38756, 38758, 38760, 21202, 38763, 38769, 38777, 38789, 38780,
-    38785, 38778, 38790, 38795, {f: 2, c: 38799}, 38812, 38824, 38822, 38819,
-    {f: 2, c: 38835}, 38851, 38854, 38856, [12209, 38859], 38876,
-    [12210, 38893], 40783, 38898, 31455, 38902, 38901, 38927, 38924, 38968,
-    38948, 38945, 38967, 38973, 38982, 38991, 38987, 39019, {f: 3, c: 39023},
-    39028, 39027, 39082, 39087, 39089, 39094, 39108, 39107, 39110, 39145,
-    39147, 39171, 39177, 39186, 39188, 39192, 39201, {f: 2, c: 39197}, 39204,
-    39200, 39212, 39214, {f: 2, c: 39229}, 39234, 39241, 39237, 39248, 39243,
-    {f: 2, c: 39249}, 39244, 39253, {f: 2, c: 39319}, 39333, {f: 2, c: 39341},
-    39356, 39391, 39387, 39389, 39384, 39377, {f: 2, c: 39405},
-    {f: 2, c: 39409}, 39419, 39416, 39425, 39439, 39429, 39394, 39449, 39467,
-    39479, 39493, 39490, 39488, 39491, 39486, 39509, 39501, 39515, 39511,
-    39519, 39522, 39525, 39524, 39529, 39531, 39530, 39597, 39600, 39612,
-    39616, 39631, 39633, {f: 2, c: 39635}, 39646, [12221, 39647],
-    {f: 2, c: 39650}, 39654, 39663, 39659, 39662, 39668, 39665, 39671, 39675,
-    39686, 39704, 39706, 39711, {f: 2, c: 39714}, [12222, 39717],
-    {f: 4, c: 39719}, 39726, [12223, 39727], [12224, 39730], 39748, 39747,
-    39759, {f: 2, c: 39757}, 39761, 39768, 39796, 39827, 39811, 39825,
-    {f: 2, c: 39830}, {f: 2, c: 39839}, 39848, 39860, 39872, 39882, 39865,
-    39878, 39887, {f: 2, c: 39889}, 39907, 39906, 39908, 39892, 39905, 39994,
-    39922, 39921, 39920, 39957, 39956, 39945, 39955, 39948, 39942, 39944,
-    39954, 39946, 39940, 39982, 39963, 39973, 39972, 39969, 39984, 40007,
-    39986, 40006, 39998, 40026, 40032, 40039, 40054, 40056, 40167, 40172,
-    40176, 40201, 40200, 40171, 40195, 40198, 40234, 40230, 40367, 40227,
-    40223, 40260, 40213, 40210, 40257, 40255, 40254, 40262, 40264,
-    {f: 2, c: 40285}, 40292, 40273, 40272, 40281, 40306, 40329, 40327, 40363,
-    40303, 40314, 40346, 40356, 40361, 40370, 40388, 40385, 40379, 40376,
-    40378, 40390, 40399, 40386, 40409, 40403, 40440, 40422, 40429, 40431,
-    40445, {f: 2, c: 40474}, 40478, [12228, 40565], 40569, 40573, 40577, 40584,
-    {f: 2, c: 40587}, 40594, 40597, 40593, 40605, [12230, 40613], 40617, 40632,
-    40618, 40621, 38753, 40652, {f: 3, c: 40654}, 40660, 40668, 40670, 40669,
-    40672, 40677, 40680, 40687, 40692, {f: 2, c: 40694}, [12235, 40697],
-    {f: 2, c: 40699}, [12236, 40701], {f: 2, c: 40711}, 30391, 40725, 40737,
-    40748, 40766, [12241, 40778], [12242, 40786], 40788, 40803,
-    {f: 3, c: 40799}, {f: 2, c: 40806}, 40812, 40810, 40823, 40818, 40822,
-    40853, [12244, 40860], [12245, 40864], 22575, 27079, 36953, 29796, 0,
-    {f: 76, c: 9472}, {f: 20, c: 9312}, {f: 10, c: 8544}, 13129, 13076, 0,
-    13133, 0, 13095, 0, 13110, 13137, 0, 13069, 13094, 0, 13099, 13130, 0,
-    {f: 3, c: 13212}, {f: 2, c: 13198}, 13252, 13217, 12317, 12319, 8470,
-    13261, 0, {f: 5, c: 12964}, {f: 2, c: 12849}, 12857, 13182, 13181, 13180,
-    8750, 8721, {s: 3}, 8735, 8895, 0, 0, 21854, {s: 7}, 167133, 0, 0, 28976,
-    0, 40407, {s: 4}, 64054, 0, 0, 22169, 15694, {s: 4}, 20448, 0, 0, 36544, 0,
-    194797, {s: 4}, 153716, 32363, 33606, 167670, {s: 3}, 40572, 0, 0, 26171,
-    0, 40628, {s: 4}, 26629, {s: 5}, 23650, 0, 194780, 0, 32353, 0, 0, 64070,
-    {s: 5}, 34083, 37292, {s: 7}, 34796, {s: 8}, 25620, 0, 0, 39506, {s: 4},
-    64074, 0, 194692, {s: 4}, 31774, {s: 6}, 64016, 25681, 0, 0, 63980, 22625,
-    39002, 0, 194679, {s: 3}, 31153, 0, 28678, {s: 9}, 22218, {s: 3}, 21085, 0,
-    28497, 37297, {s: 10}, 64106, {s: 6}, 38960, 0, 40629, {s: 9}, 33802,
-    63939, {f: 2, c: 63890}, 63897, 0, 34847, 194575, 0, 194771, 194584,
-    {s: 7}, 137754, 23643, {s: 4}, 25890, 0, 0, 26618, 0, 26766, 0, 148432,
-    194848, {s: 21}, 34110, {s: 15}, 30562, {s: 12}, 65075, 0,
-    {f: 2, c: 65073}, {s: 4}, 65072, {f: 2, c: 65077}, {f: 2, c: 65081}, 0, 0,
-    {f: 2, c: 65079}, {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089},
-    {f: 2, c: 65083}, {s: 41}, {f: 3, c: 12436}, 0, 0, 22099, {s: 41}, 65508,
-    65287, 65282, 0, 9665, 9655, 8681, 8679, 8678, 8680, 9634, 9831, 9825,
-    9828, 9826, 13216, 13218, {f: 2, c: 13220}, 13207, 8467, 13208, 13235,
-    13234, 13233, 13232, {f: 3, c: 13189}, 13259, 13200, 13268, 13206, 13090,
-    13078, 13080, 13077, 13059, 13091, 13143, 13122, 13113, 13115, 13056,
-    13105, 13127, 13086, 13098, 0, 13183, 8481, 9742, 12342, 12320, {s: 3},
-    {f: 9, c: 9352}, {f: 20, c: 9332}, 12881, {f: 10, c: 8560},
-    {f: 10, c: 12882}, {f: 26, c: 9372}, 12867, 12861, 12863, 12852, 12856,
-    12851, 12860, 12866, 12862, 12854, 12853, 12859, 12864, 12858, 12976,
-    12973, 12969, 12975, 12948, 12970, 12952, 12971, 12946, 12945, 12947,
-    12972, 12974, 12950, {s: 8}, {f: 3, c: 9131}, 0, {f: 3, c: 9127}, 0, 13260,
-    13061, 0, 0, 13215, 13219, 13222, 0, 0, 12958, {f: 2, c: 13192}, 13256,
-    8749, 0, 12848, {f: 6, c: 12842}, 12855, 12865, 10145, {s: 3}, 9673, 9824,
-    9829, 9827, 9830, {f: 4, c: 9728}, 9758, {f: 2, c: 9756}, 9759, 12953,
-    9450, {f: 2, c: 8554}, {s: 3}, {f: 8, c: 9601}, 9615, 9614, 9613, 9612,
-    9611, 9610, 9609, {f: 2, c: 9620}, {f: 2, c: 9581}, 9584, 9583, 9552, 9566,
-    9578, 9569, {f: 2, c: 9698}, 9701, 9700, 0, 0, {f: 3, c: 9585}, {s: 20},
-    20956, 29081, {f: 9, c: 10102}, {s: 3}, {f: 2, c: 8570}, {s: 3}, 8575,
-    8458, 8457, 0, 0, 12292, 8646, {f: 2, c: 8644}, 0, {f: 4, c: 12535}, 0, 0,
-    12957, {s: 3}, 13179, {s: 3}, 13107, 13134, {s: 30}, 32394, 35100, 37704,
-    37512, 34012, 20425, 28859, 26161, 26824, 37625, 26363, 24389,
-    [12033, 20008], 20193, 20220, 20224, 20227, 20281, 20310, 20370, 20362,
-    20378, 20372, 20429, 20544, 20514, 20479, 20510, 20550, 20592, 20546,
-    20628, 20724, 20696, 20810, 20836, 20893, 20926, 20972, 21013, 21148,
-    21158, 21184, 21211, 21248, 0, 21284, 21362, 21395, 21426, 21469, 64014,
-    21660, 21642, 21673, 21759, 21894, 22361, 22373, 22444, 22472, 22471,
-    64015, 0, 22686, 22706, 22795, 22867, 22875, 22877, 22883, 22948, 22970,
-    23382, 23488, 29999, 23512, 0, 23582, 23718, 23738, 23797, 23847, 23891, 0,
-    23874, 23917, {f: 2, c: 23992}, 24016, 24353, 24372, 24423, 24503, 24542,
-    24669, 24709, 24714, 24798, 24789, 24864, 24818, 24849, 24887, 24880,
-    24984, 25107, 25254, 25589, 25696, 25757, 25806, 25934, 26112, 26133,
-    26121, 26158, 0, 26148, 26213, 26199, 26201, 64018, 26227, 26265, 26272,
-    26290, 26303, 26362, 26382, 0, 26470, 26555, 26706, 26560, 0, 26692, 26831,
-    64019, 26984, 64020, 27032, 27106, 27184, 27243, 27206, 27251, 27262,
-    27362, 27364, 27606, 27711, 27740, 27782, 27759, 27866, 27908, 28039,
-    28015, 28054, 28076, 28111, 28152, 28146, 28156, 28217, 28252, 28199,
-    28220, 28351, 28552, 28597, 28661, 28677, 28679, 28712, 28805, 28843,
-    28943, 28932, 29020, {f: 2, c: 28998}, 0, 29121, 29182, 29361, 29374,
-    29476, 64022, 29559, 29629, 29641, 29654, 29667, 29650, 29703, 29685,
-    29734, 29738, 29737, 29742, 0, 29833, 29855, 29953, 30063, 30338, 30364,
-    30366, 30363, 30374, 64023, 30534, 21167, 30753, 30798, 30820, 30842,
-    31024, {f: 3, c: 64024}, 31124, 64027, 31131, 31441, 31463, 64028, 31467,
-    31646, 64029, 32072, 0, 32183, 32160, 32214, 32338, 32583, 32673, 64030,
-    33537, 33634, 33663, 33735, 33782, 33864, 33972, 34131, 34137, 34155,
-    64031, 34224, {f: 2, c: 64032}, 34823, 35061, 35346, 35383, 35449, 35495,
-    35518, 35551, 64034, 35574, 35667, 35711, 36080, 36084, 36114, 36214,
-    64035, 36559, 0, 64037, 36967, 37086, 64038, 37141, 37159, 37338, 37335,
-    37342, {f: 2, c: 37357}, {f: 2, c: 37348}, 37382, 37392, 37386, 37434,
-    37440, 37436, 37454, 37465, 37457, 37433, 37479, 37543, {f: 2, c: 37495},
-    37607, 37591, 37593, 37584, 64039, 37589, 37600, 37587, 37669, 37665,
-    37627, 64040, 37662, 37631, 37661, 37634, 37744, 37719, 37796, 37830,
-    37854, 37880, 37937, 37957, 37960, 38290, 0, 64041, 38557, 38575, 38707,
-    38715, 38723, 38733, 38735, [12205, 38737], 0, 38999, 39013,
-    {f: 2, c: 64042}, 39207, 64044, 39326, 39502, 39641, 39644, 39797, 39794,
-    39823, 39857, 39867, 39936, 40304, 40299, 64045, 40473, 40657, {s: 636},
-    8364, 8486, 0, 0, 64256, {f: 2, c: 64259}, 257, 299, 363, 275, 333, 256,
-    298, 362, 274, 332, {f: 4, c: 8539}, {f: 2, c: 8531}, 8304,
-    {f: 6, c: 8308}, {f: 10, c: 8320}, 461, 282, 0, 7868, 463, 0, 296, 465, 0,
-    467, 366, 360, 462, 283, 0, 7869, 464, 0, 297, 466, 0, 468, 367, 361, 593,
-    8049, 8048, 509, 0, 596, 0, 0, 601, 0, 0, 602, 0, 0, 603, 8051, 8050, 0,
-    331, 629, 652, 0, 0, 658, 643, 720, {s: 682}, {f: 10, c: 12832}, {s: 108},
-    {f: 4, c: 12892}, {f: 15, c: 12977}, {s: 50}, {f: 26, c: 9424},
-    {f: 26, c: 9398}, {s: 48}, {f: 47, c: 13008}, 0, {f: 10, c: 12928}, 12944,
-    {f: 6, c: 12938}, 0, 12959, {s: 6}, {f: 2, c: 12960}, 12955, 12954, 12963,
-    12962, 12951, 0, 12956, 12949, {s: 6}, 9676, {s: 11}, 10111,
-    {f: 10, c: 9451}, {s: 510}, 8414, {s: 815}, 13274, {s: 3}, 8448, 13250, 0,
-    0, 8453, 0, 13169, 0, 0, 13197, 13211, {s: 3}, {f: 2, c: 13271}, {s: 3},
-    {f: 2, c: 13057}, 13060, 13062, 0, 13064, 0, 13063, 13066, 0, 13065, 0,
-    13067, 0, 13068, {f: 6, c: 13070}, 0, 13079, 0, 13081, 0, {f: 4, c: 13082},
-    {f: 3, c: 13087}, 13092, 0, 13093, 0, 0, {f: 2, c: 13096}, 0, 13101, 0, 0,
-    {f: 3, c: 13102}, 13106, 0, 0, {f: 2, c: 13108}, 13116, {s: 3}, 13111, 0,
-    13112, 13114, 13117, 13121, {f: 3, c: 13118}, {f: 4, c: 13123}, 13128,
-    {f: 2, c: 13131}, {f: 2, c: 13135}, 0, 0, 13138, 13140, 0, 0, 13139,
-    {f: 2, c: 13141}, {s: 132}, 8501, 976, 8714, 8463, 0, 981, 987, 977, 0,
-    {f: 2, c: 9832}, 9836, {s: 5}, 12347, 0, {f: 3, c: 12339}, 8252, 8265,
-    {s: 5}, 8723, 0, 8771, {f: 2, c: 8818}, {s: 6}, {f: 2, c: 12312},
-    {f: 2, c: 65375}, {s: 10}, 9115, {f: 2, c: 9117}, 9120, {s: 4}, 9121,
-    {f: 2, c: 9123}, 9126, {s: 12}, [9116, 9119, 9122, 9125, 9130], {s: 8},
-    9986, 0, 0, 12349, 0, 12447, 0, 0, 8709, 8864, 8854, 8856, 8853, 8855,
-    {s: 4}, 9664, 9654, {s: 4}, 8656, 8596, {f: 2, c: 8600}, {f: 2, c: 8598},
-    8652, 8651, {s: 10}, 12336, 8967, {s: 8}, 10048, 10047, {s: 7}, 9643, 0,
-    9642, 0, 10010, {s: 12}, 9702, {s: 4}, 10070, {s: 379}, {f: 2, c: 65093},
-    {s: 679}, 64103, 64098, 32227, [12232, 40643], 28331, 64082, 64061, 64069,
-    64062, 27114, 28212, 64096, 64071, 64056, 64066, 64078, 34395, 64105,
-    64052, 64099, 25581, 25802, 30799, 64084, 63856, 64077, 64097, 64072,
-    64076, {f: 2, c: 64091}, 64081, 64067, 64090, 28041, 29376, 0, 194885,
-    64086, 64080, 64049, 64059, 24034, 64063, 64101, 21373, 64055, 64095,
-    24501, 64064, 0, 64083, 0, 64085, 64104, 64068, 64089, 26202, 64053, 64075,
-    64100, 64065, 64048, 0, 64057, 64051, 27493, 64058, 27599, 64050, 25150,
-    64079, 63773, 63964, 63798, 28122, 63952, 26310, 27511, 64087, 37706, 0,
-    37636, {s: 120}, 133390, {s: 120}, 35999, 11991, [11965, 158033], {s: 5},
-    37555, 38321, 0, 0, 194812, {s: 13}, 194965, {s: 8}, 194794, 0, 26478,
-    11974, 0, 194594, {s: 13}, 13314, 0, 0, 26083, {s: 4}, 134071, {s: 10},
-    171339, 0, 194611, 24378, {s: 8}, 11945, 0, 20465, {s: 7}, 63753, {s: 7},
-    11964, 0, 0, 194732, 26435, {s: 3}, 133732, 35329, 25142, 0, 0, 21555,
-    23067, {s: 3}, 25221, 0, 0, 194819, {s: 6}, 21567, {s: 9}, 27506, {s: 4},
-    29986, 19256, 0, 0, 24063, {s: 6}, 194827, 29626, 134047, {s: 3}, 194600,
-    0, 194849, {s: 5}, 194623, {s: 16}, 194675, {f: 2, c: 11916}, 23577,
-    {s: 3}, 131083, 23426, 194642, {s: 5}, 11997, [11999, 39136],
-    [11998, 169599], 14221, 0, [11927, 14586], 0, 194887, 0, [11909, 20155],
-    131490, {s: 7}, 13599, 0, 194738, 0, 0, [11971, 35200], {s: 4}, 31237,
-    {s: 4}, 35498, 0, 32085, 0, 28568, {s: 7}, 25591, 30246, {s: 4},
-    [11978, 163767], {s: 5}, 146686, {s: 5}, 13351, 0, 0, 33067, 0, 0, 194842,
-    {s: 5}, 11950, {s: 5}, 194714, {s: 3}, 194831, {s: 19}, 22305, 135741,
-    194586, 0, 64003, {s: 7}, 21534, 15240, 20839, {s: 4}, 63839, {s: 9},
-    20023, {s: 13}, [11946, 150804], 24421, 23020, 194658, 0, 24217, {s: 46},
-    13416, {s: 8}, 21200, {s: 9}, 26625, 0, 195024, 195039, {s: 5}, 153215, 0,
-    0, 11959, {s: 4}, 36534, 63775, {s: 3}, 63875, {s: 5}, 31867, 63906, 0,
-    63898, 0, [11961, 32770], 157360, {s: 4}, [11911, 132648], 0, 0, 131210,
-    194604, [11915, 13630], {s: 4}, 21589, 0, 22841, 0, 0, 23414, 194669,
-    23572, 14306, 23782, 0, 20040, 0, 0, 194742, {s: 4}, 158105, 25371, 0, 0,
-    26211, 0, 194779, 0, 0, 27126, 27014, {s: 3}, 27596, 0, 28183, 0, 0, 27818,
-    {s: 3}, [11942, 20012], 0, 0, 29935, 30069, 30188, 30286, 16305, 30570,
-    30633, {s: 6}, 31571, 0, 0, 16996, {s: 3}, 194924, 0, 0, 32328, {s: 5},
-    11955, {s: 4}, 33089, 17491, 0, [11966, 33401], [11967, 64094],
-    [11968, 64093], 0, 20857, 33626, {s: 3}, 17701, 0, 34292, 131248, {s: 4},
-    34429, 0, 13358, 35014, {s: 6}, 18406, {s: 8}, 36808, {s: 19}, 166279, 0,
-    0, 167447, 0, 0, 38969, {s: 6}, 39432, {s: 4}, 39903, {s: 10}, 148206,
-    {s: 5}, 21385, 0, 64017, 194785, 0, 146622, 132625, 0, {f: 2, c: 19972},
-    19999, 20011, {f: 2, c: 20015}, {f: 2, c: 20032}, 20036, [11907, 20058],
-    20095, 20109, 20118, 20153, 20176, 20192, 20221, 20223, 20235, 20245,
-    20320, 20283, 20297, 20308, 20346, {f: 2, c: 20349}, 20375, 20414, 20431,
-    20477, {f: 2, c: 20480}, 20496, 20507, 20519, 20526, 20567, 20582, 20586,
-    20539, 20623, 20630, 20636, 20684, 20710, 20713, 20719, 20744, 20747,
-    20752, 20763, 20766, 20831, 20897, 20924, 0, 20974, 20980, 20993,
-    [11913, 20994], 21011, 21065, 21089, 21094, 21139, 21192, 21232,
-    {f: 2, c: 21258}, 21310, 21324, 21323, 21345, 21356, 21419, 21466, 21478,
-    21493, 21543, 21581, 21606, 21611, 21620, 21645, 21654, 21665, 21677,
-    21689, 21695, 21702, 21709, 21774, 21803, 21813, 21834, 21856, 0, 21896,
-    21902, 22024, {f: 2, c: 22030}, 22071, 22079, 22089, 22091, 22095, 22118,
-    22121, 22127, {f: 2, c: 22129}, 22165, 22170, {f: 2, c: 22188}, 22193,
-    22217, 22237, 22244, 22282, 22293, 22307, 22319, {f: 2, c: 22323}, 22348,
-    22384, 22412, 22428, 22456, 22502, 22509, {f: 2, c: 22517}, 22527, 22537,
-    22560, 22578, 22652, 22656, 22697, 22734, 22736, 22740, 22746, 22761,
-    22796, 22820, 22831, 22881, 22893, 22986, 22994, 23005, {f: 2, c: 23011},
-    23044, 23052, 23075, 23111, 23125, 23139, 23149, 23166, 23198, 23207,
-    23212, 23219, 23264, 23296, 23321, 23333, 23341, 23361, 23420,
-    {f: 2, c: 23422}, 23434, [11919, 23587], 23595, 23600, 23651, 23657, 23676,
-    23755, 23762, 23796, 23844, 23846, 23875, 23878, 23882, 23954, 23956,
-    23961, 23968, 24024, 24032, 24056, 24064, 24082, {f: 2, c: 24084}, 24088,
-    24110, 24152, {f: 2, c: 24171}, 24232, 24234, {f: 2, c: 24254}, 0, 24274,
-    24327, 24334, {f: 2, c: 24348}, 24354, 24360, 24374, 24379, 24384,
-    [12089, 24400], 24408, 24420, 24457, 24476, 24487, 24484, 24495, 24504,
-    [11926, 24516], 24521, 24545, 24553, 24557, 24572, 24599, 24602, 24627,
-    24673, 24703, 24734, 24740, 24752, 24779, 24795, 24824, {f: 3, c: 24850},
-    24860, 24956, 24973, 24991, 25000, 25026, 25055, 25109, 25129, 25155,
-    25158, [11928, 25164], 25169, 25174, 25284, 25340, 25354, 25357, 25368,
-    25401, {f: 2, c: 25410}, 25445, 25460, 25469, 25476, 25479, 25488, 25502,
-    25553, 25564, 25609, 25616, 25634, 25684, 25691, 25709, 25723,
-    {f: 2, c: 25790}, 25829, 25847, 25851, 25860, 25878, 25881, 25927, 25959,
-    25985, 25989, 26050, 26096, 26098, 26156, 26188, {f: 2, c: 26203}, 26209,
-    26219, 0, 26276, 26312, 26348, 26373, 26387, 26419, 26440, 26444, 26486,
-    26491, 26544, 26546, 26617, 26583, 26585, 26608, 26668, {f: 2, c: 26672},
-    26715, 26738, 26741, 26746, 26756, 26789, 26802, 26832, 26838, 26856,
-    26861, {f: 2, c: 26864}, 26876, 26897, 26899, 26933, 26939, 26967, 26979,
-    26994, {f: 2, c: 27007}, 27046, 27053, 27063, {f: 2, c: 27094}, 27137,
-    27151, 27157, 27176, 27188, 27198, 27205, {f: 2, c: 27216}, 27222, 27227,
-    27267, 27273, 27281, {f: 3, c: 27293}, 27356, 27367, 27372, 27422, 27428,
-    27445, 27462, 27478, 27488, 27522, 27582, 27617, 27633, 27664, 27699,
-    [11937, 27701], 11938, 27737, 27766, 27771, 27781, 27797, 27804, 27856,
-    27860, 27862, 27872, {f: 2, c: 27883}, 27886, 27914, 27918, 27921, 27950,
-    27991, 27998, 28005, 28034, 28095, 28100, 28106, 28118, 28137, 28194,
-    28241, 28359, 28362, 28366, 28413, 28442, 28458, 28463, 28467, 28506,
-    28510, 28514, 28541, 28555, 28557, 28562, 28564, 28570, {f: 2, c: 28583},
-    28598, 28634, 28638, 0, 28729, 28732, 0, 28756, {f: 2, c: 28765}, 28772,
-    [11939, 28780], 28798, 28801, 28821, 28855, {f: 2, c: 28883}, 28888, 28892,
-    28935, 28960, 28977, 29002, 29010, 29024, 29049, 29074, 0, 29131, 29139,
-    29142, 29184, 29213, 29227, 29240, 29249, 29267, {f: 2, c: 29269}, 29276,
-    29325, [11944, 29357], 29364, 29383, 29435, {f: 2, c: 29444}, 29480, 29489,
-    29507, 29548, 29564, 29571, {f: 2, c: 29573}, 29589, {f: 3, c: 29598},
-    29606, 29611, 29621, 29623, 29628, 29647, 29657, 29673, 29684, 29693,
-    29700, 29706, {f: 2, c: 29722}, 29732, 29736, 29740, {f: 3, c: 29743},
-    29753, 29764, 29767, 29771, 29773, 29777, 29783, 29798, 29803, 29809,
-    29824, {f: 3, c: 29829}, 29840, 29848, 29852, 29856, 29859, 29864, 29867,
-    29877, 29887, 29896, 29914, 29918, 30030, 30073, 30081, 30096,
-    [12135, 30098], 30099, 30132, 30180, 30201, 30208, 30218, {f: 2, c: 30229},
-    30233, 30238, 30253, 30261, 30275, 30283, 30309, 30317, 30319, 30321,
-    30324, {f: 2, c: 30372}, 30405, 30412, 30444, 30460, 30516, 30518, 30556,
-    {f: 2, c: 30559}, 30578, 30589, 30613, 30634, 30694, 30704, 30708, 30726,
-    30754, {f: 2, c: 30765}, 30768, 30773, 30824, 30878, 30920, 30924, 30926,
-    30948, {f: 2, c: 30944}, 30962, 30967, 30971, 31025, 0, [11949, 31035],
-    31037, 31045, {f: 2, c: 31067}, 31115, 31126, 31128, [12145, 31160], 31163,
-    31178, 31194, 31235, 31241, 31249, 31262, 31277, 31289, 31301, 31308,
-    31325, 0, 31341, 31352, 31392, 31395, 31411, {f: 2, c: 31419}, 31430,
-    31495, 31508, 31527, 31537, 31559, 31566, 31584, 31593, 31597, 31602,
-    31633, 31663, 31703, 31705, 31755, 31759, 31776, 31782, 31793, 31798,
-    31825, 31833, 31847, 31854, 31856, 31932, 31935, {f: 2, c: 31944}, 31959,
-    31961, 31965, 31979, {f: 3, c: 32007}, 32019, 32029, 32035, 32065, 32083,
-    32089, 32093, 32122, 32134, {f: 2, c: 32139}, 32204, 32235, 32241, 32249,
-    32264, 32273, 32277, 32288, 32327, 32354, 32366, 32371, 32397, 32401,
-    32408, 32580, 32591, [11947, 11954, 32594], [11953, 32595], 32609, 32657,
-    32703, 32718, 32735, 32741, 32748, {f: 2, c: 32750}, 32762, 32782, 32785,
-    32788, 32804, 32806, 32826, 32828, 32864, 32881, 32885, 32926, 32934,
-    32939, {f: 2, c: 32983}, 33046, 33048, 33082, 33098, 33100, 33153, 33156,
-    33204, 33231, 33273, 33283, 33313, 33330, 33332, 33350, 33355, 33359,
-    33422, 33454, 33463, 33470, 33478, 33534, 33603, 33617, 33621, 33670,
-    33677, 33682, 33688, 33705, {f: 2, c: 33727}, 33770, 33807, 33809, 33866,
-    33910, 33960, 33967, 33984, 33986, 34032, 34045, 34060, 34100, 34142,
-    34191, 34231, 34254, 34221, 34322, 34345, 34386, 34403, 34412, 34415,
-    34426, 34445, 34449, 34456, {f: 2, c: 34471}, 34554, 34557, 34571, 34579,
-    34585, 34590, 34600, 34622, 34673, 34696, 34713, {f: 2, c: 34732}, 34741,
-    34774, 34795, 34797, 34817, 0, 34822, 34827, 34836, 34844, 34902, 34911,
-    [11970, 34916], 34968, 34986, {f: 2, c: 35005}, 35018, 35026, 35035,
-    {f: 2, c: 35056}, 35078, {f: 3, c: 35096}, 35111, 35120, 35134, 35195,
-    35284, 35286, 35301, 35313, 35335, 35343, 35349, 35362, 35406, 35455,
-    35572, 35615, 35639, {f: 2, c: 35651}, 35668, 35740, 35742, 35911, 35924,
-    35955, 36004, 36057, 36065, 36088, 36094, 36123, 36201, 36204, 36228,
-    36237, 36245, 36262, 36294, 36302, 36324, 36332, 36384, 36427, 36460,
-    36464, 36474, 36498, 36526, 36531, 36561, 36564, 36601, 36631, 36662,
-    36774, [12193, 36789], [11981, 36790], 0, 36832, 36836, 36854, 36866,
-    36908, 36932, 37000, 37013, 37017, 37019, 37026, 37044, 37079, 37085,
-    37108, 37143, 37148, 37169, 37178, 37181, 37192, 37211, 37217, 37220,
-    37262, 37278, 37288, {f: 2, c: 37293}, 37298, 37308, 37360, 37367, 37371,
-    37383, 37416, 37427, 37432, 37443, 37447, 37455, 37472, 37570,
-    {f: 2, c: 37579}, 37599, 37645, 37653, 37663, 37671, 37703, 37714, 0,
-    37738, 37741, 37787, 37818, 37801, 37825, 37834, 37858, 37882, 37885,
-    37903, 37940, 37951, 37973, 37995, 38002, [11986, 38264], 38310, 38313, 0,
-    38324, 38333, 38362, [11983, 11990, 38429], 38465, 38488, 38532, 38564,
-    38569, 38610, 195060, 38622, 38633, 38641, 38658, 38665, 38746, 38755,
-    38766, 38771, 38810, 38818, {f: 2, c: 38837}, 38873, 38878, 38900, 38922,
-    38926, 38942, 38947, 38955, 38974, {f: 2, c: 38994}, 39001, 39020, 39096,
-    39098, 39103, 39112, 39141, {f: 2, c: 39218}, 39232, 39245, 39260, 39263,
-    39345, {f: 2, c: 39353}, 39369, 39426, 39446, 39460, 39463,
-    {f: 2, c: 39469}, 39478, 39480, 39498, 39510, {f: 2, c: 39605}, 39673,
-    39683, 39712, {f: 2, c: 39731}, 39795, 39801, 39847, 39873, 39879, 39895,
-    39911, 39915, 39927, 39930, 39933, 39947, 39975, 39978, 39990, 40001,
-    40019, 40035, 40048, 40055, 40194, 40258, 40263, 40291, 40297, 40316,
-    40318, 40333, 40369, 40387, 40391, 40406, 40415, 40427, 40436, 40469,
-    40477, 40612, 40616, 40620, 40679, 40686, 40720, 40722, 40727, 40729,
-    40751, 40759, 40761, 40769, 40773, 40791, 40808, 40817, 40821, 40848,
-    40852, 40866, 0, 13317, 194564, 22048, 24267, 11925, 0, 144954, 0, 28665,
-    28390, 29107, [11940, 64073], {s: 4}, [11980, 64102], 0, 23986, 0, 20435,
-    20697, 20720, 20931, 22134, 27220, 27905, 28112, 28226, 28377, 29668,
-    29729, 30060, 30801, 34805, 144382, 29608, 15091, 13531, 17420, 16010, 0,
-    0, 19432, 0, 16090, 15138, 0, 17786, 16531, 0, 18021, 16643, 17043, 18094,
-    13448, 140809, {f: 3, c: 63584}, 63610, 63615, {s: 23}, {f: 2, c: 8836},
-    {f: 2, c: 8842}, 8713, 0, {f: 2, c: 8965}, {s: 9}, {f: 2, c: 8741},
-    {s: 14}, 8802, 0, 8773, 8776, {f: 2, c: 8822}, {s: 4}, 8487, {s: 209},
-    {f: 2, c: 8922}, 8533, 8984, {f: 2, c: 7742}, {f: 2, c: 504}, 470, 472,
-    474, 476, 260, 728, 317, 346, 350, 356, 377, 379, 261, 731, 318, 347, 711,
-    351, 357, 378, 733, 380, 340, 258, 313, 262, 268, 280, 270, 323, 327, 336,
-    344, 368, 354, 341, 259, 314, 263, 269, 281, 271, 273, 324, 328, 337, 345,
-    369, 355, 729, 264, 284, 292, 308, 348, 364, 265, 285, 293, 309, 349, 365,
-    625, 651, 638, 620, 622, 633, 648, 598, 627, 637, 642, 656, 635, 621, 607,
-    626, 669, 654, 609, 624, 641, 295, 661, 660, 614, 664, 450, 595, 599, 644,
-    608, 403, 616, 649, 600, 604, 606, 592, 623, 650, 612, 594, 653, 613, 674,
-    673, 597, 657, 634, 615, 865, 712, 716, 721, 8255, 783, {f: 5, c: 741}, 0,
-    0, 805, 812, 825, 796, {f: 2, c: 799}, 829, 809, 815, 734, 804, 816, 828,
-    820, {f: 2, c: 797}, {f: 2, c: 792}, 810, {f: 2, c: 826}, 794, {s: 3},
-    {f: 2, c: 610}, 618, 628, 630, 632, 640, 655, 665, 668, 671, 688, 690, 695,
-    704, {f: 2, c: 736}, {s: 6}, 8862, {s: 287}, 12348, 12543, 0,
-    {f: 2, c: 12310}, 9838, 9835, {f: 2, c: 10548}, 10687, 0, 12448, 0,
-    {f: 2, c: 10746}, {s: 13}, 962, {f: 10, c: 9461}, {f: 2, c: 9750}, 9649,
-    {f: 10, c: 12784}, 0, {f: 6, c: 12794}, {f: 15, c: 9150}, 0, 0, 10003, 0,
-    9251, 9166, {f: 4, c: 9680}, {f: 2, c: 8263}, 0, 8273, 8258,
-    {f: 16, c: 12688}, {s: 13}, {f: 2, c: 9136}, {f: 12, c: 9842},
-    {f: 2, c: 12441}, 8413, {s: 450}, 20296, 20319, 20330, 20332, 20494, 20504,
-    20545, 20722, 20688, 20742, 20739, 20789, 20821, 20823, 13493, 20938,
-    20962, 21079, 21196, 21206, 21243, 21276, 21347, 21405, 21522, 21631,
-    21640, 21840, 21889, 21933, 21966, 22075, 22174, 22185, 22195, 22391,
-    22396, 135963, 22479, 22500, 22628, 22665, 136302, 22738, 22752, 34369,
-    22923, 22930, 22979, 23059, 23143, 23159, 23172, 23236, 137405, 23421,
-    23443, 23570, 64060, 136884, 23674, 23695, 23711, 23715, 23722, 23760,
-    138804, 23821, 23879, 23937, 23972, 23975, 24011, 24158, 24313, 24320,
-    24322, 24355, 24381, 24404, 24445, 24589, 24596, 24600, 24629, 24647,
-    24733, 24788, 24797, 24875, 25020, 25017, 25122, 25178, 25199, 25302,
-    25468, 25573, 25721, 25796, 25808, 25897, 26013, 26170, 26146, 26155,
-    26160, 26163, 26184, 143812, {f: 2, c: 26231}, 26253, 26299, 26331, 26344,
-    26439, 26497, 26515, 26520, 26523, 26620, 26653, 26787, 26890, 26953,
-    144836, 26946, 26980, 27045, 27087, 15286, 15299, 27113, 27125, 145215,
-    27195, 145251, 27284, 27301, 15375, 27419, 27436, 27495, 27561, 27565,
-    27607, 27647, 27653, 27764, 27800, 27899, 27846, 27953, 27961, 27967,
-    27992, 28052, 28074, 28123, 28125, 28228, 28254, 28337, 28353, 28432,
-    28505, 28513, 28542, 28556, 28576, 28604, 28615, 28618, 28656, 28750,
-    28789, 28836, 28900, 28971, 28958, 28974, 29009, 29032, 29061, 29063,
-    29114, 29124, 29205, 15935, 29339, 149489, 29479, 29520, 29542, 29602,
-    29739, 29766, 29794, 29805, 29862, 29865, 29897, 29951, 29975, 16242,
-    30158, 30210, 30216, 30308, 30337, 30365, 30378, 30390, 30414, 30420,
-    30438, 30449, 30474, 30489, {f: 2, c: 30541}, 30586, 30592, 30612, 30688,
-    152718, 30787, 30830, 30896, 152846, 30893, 30976, 31004, 31022, 31028,
-    31046, 31097, 31176, 153457, 31188, 31198, 31211, 31213, 31365, 154052,
-    31438, 31485, 31506, 31533, 31547, 31599, 31745, 31795, 155041, 31853,
-    31865, 31887, 31892, 31904, 31957, 32049, 32092, 32131, 32166, 32194,
-    32296, 32663, 32731, 32821, 32823, 32970, 32992, 33011, 33120,
-    {f: 2, c: 33127}, 33133, 33211, 33226, 33239, 17499, 33376, 33396, 158463,
-    33441, {f: 2, c: 33443}, 33449, 33471, 33493, 33533, 33536, 33570, 33581,
-    33594, 33607, 33661, 33703, 33743, 33745, 33761, 33793, 33798, 33887,
-    33904, 33907, 33925, 33950, 33978, 159296, 34098, 34078, 34095, 34148,
-    34170, 34188, 34210, 34251, 34285, 34303, {f: 2, c: 34308}, 34320, 159988,
-    34328, 34360, 34391, 34402, 17821, 34421, 34488, 34556, 34695, 17898,
-    34826, 34832, 35022, 161412, 35122, 35129, 35136, 35220, 35318, 35399,
-    35421, 35425, 35445, 35536, 35654, 35673, 35689, 35741, 35913, 35944,
-    36271, 36305, 36311, 36387, 36413, 36475, 164471, 18500, 36602, 36638,
-    36653, 36692, 164813, 36840, 36846, 36872, 36909, 37015, 37043, 37054,
-    {f: 2, c: 37060}, 37063, 37103, 37140, 37142, {f: 2, c: 37154}, 37167,
-    37172, 37251, 37361, 37705, {f: 2, c: 37732}, 37795, 37855, 37892, 37939,
-    37962, 37987, 38001, 38286, 38303, 38316, 38326, 38347, 38352, 38355,
-    18864, 38366, 38565, 38639, 38734, 38805, 38830, 38842, 38849, 38857,
-    38875, 38998, 39143, 39256, 39427, 39617, 39619, 39630, 39638, 39682,
-    39688, 19479, 39725, 39774, 39782, 39812, 39818, 39838, 39886, 39909,
-    39928, 39971, {f: 2, c: 40015}, 40037, {f: 2, c: 40221}, 40259, 40274,
-    40330, 40342, 40384, 40364, 40380, 172432, 40423, 40455, 40606, 40623,
-    40855, 131209, 19970, 19983, 19986, 20009, 20014, 20039, 131234, 20049,
-    13318, 131236, 20073, 20125, 13356, 20156, 20163, 20168, 20203, 20186,
-    20209, 20213, 20246, 20324, 20279, 20286, 20312, 131603, {f: 2, c: 20343},
-    20354, 20357, 20454, 20402, 20421, 20427, 20434, 13418, 20466, 20499,
-    20508, 20558, 20563, 20579, 20643, 20616, {f: 2, c: 20626}, 20629, 20650,
-    131883, 20657, {f: 2, c: 20666}, 20676, 20679, 20723, 131969, 20686,
-    131953, 20692, 20705, 13458, 132089, 20759, 132170, 20832, 132361, 20851,
-    20867, 20875, 13500, 20888, 20899, 20909, 13511, 132566, 20979, 21010,
-    21014, 132943, 21077, 21084, 21100, 21111, 21124, 21122, 133127, 21144,
-    133178, 21156, {f: 2, c: 21178}, 21194, 21201, 133305, 21239, 21301, 21314,
-    133500, 133533, 21351, 21370, 21412, 21428, 133843, 21431, 21440, 133917,
-    {f: 2, c: 13661}, 21461, 13667, 21492, 21540, 21544, 13678, 21571, 21602,
-    21612, 21653, 21664, 21670, 21678, 21687, 21690, 21699, 134469, 21740,
-    21743, 21745, 21747, {f: 2, c: 21760}, 21769, 21820, 21825, 13734, 21831,
-    13736, 21860, 134625, 21885, 21890, 21905, 13765, 21970, 134805, 134765,
-    21951, 21961, 21964, 21969, 21981, 13786, 21986, 134756, 21993, 22056,
-    135007, 22023, 22032, 22064, 13812, 22077, 22080, 22087, 22110, 22112,
-    22125, 13829, 22152, 22156, 22173, 22184, 22194, 22213, 22221, 22239,
-    22248, {f: 2, c: 22262}, 135681, 135765, 22313, 135803, {f: 2, c: 22341},
-    22349, 135796, 22376, 22383, {f: 3, c: 22387}, 22395, 135908, 135895,
-    22426, {f: 2, c: 22429}, 22440, 22487, 135933, 22476, 135990, 136004,
-    22494, 22512, 13898, 22520, 22523, 22525, 22532, 22558, 22567, 22585,
-    136132, 22601, 22604, 22631, {f: 2, c: 22666}, 22669, {f: 2, c: 22671},
-    22676, 22685, 22698, 22705, 136301, 22723, 22733, 22754, {f: 2, c: 22771},
-    {f: 2, c: 22789}, 22797, 22804, 136663, 13969, 22845, 13977, 22854, 13974,
-    158761, 22879, 136775, {f: 2, c: 22901}, 22908, 22943, 22958, 22972, 22984,
-    22989, 23006, 23015, 23022, 136966, 137026, 14031, 23053, 23063, 23079,
-    23085, 23141, 23162, 23179, 23196, {f: 2, c: 23199}, 23202, 23217, 23221,
-    23226, 23231, 23258, 23260, 23269, 23280, 23278, 23285, 23304, 23319,
-    23348, 23372, 23378, 23400, 23407, 23425, 23428, 137667, 23446, 23468,
-    {f: 2, c: 14177}, 23502, 23510, 14188, 14187, 23537, 23549, 14197, 23555,
-    23593, 138326, 23647, {f: 2, c: 23655}, 23664, 138541, 138565, 138616,
-    138594, 23688, 23690, 14273, 138657, 138652, 23712, 23714, 23719, 138642,
-    23725, 23733, 138679, 23753, 138720, 138803, 23814, 23824, 23851, 23837,
-    23840, 23857, 23865, 14312, 23905, 23914, 14324, 23920, 139038, 14333,
-    23944, 14336, 23959, 23984, 23988, 139126, 24017, 24023, 139258, 24036,
-    24041, 14383, 14390, 14400, 24095, 24126, 24137, 14428, 24150, 14433,
-    {f: 2, c: 24173}, 139643, 24229, 24236, 24249, 24262, 24281, 140062, 24317,
-    24328, 140205, 24350, 24391, 24419, 24434, 24446, 24463, 24482, 24519,
-    24523, {f: 3, c: 24530}, 24546, {f: 2, c: 24558}, 24563, 14615, 24610,
-    24612, 14618, 24652, 24725, 24744, 141043, 24753, 24766, 24776, 24793,
-    24814, 24821, 24848, 24857, 24862, 24890, 14703, 24897, 24902, 24928,
-    141403, {f: 2, c: 24978}, 24983, 24997, 25005, 141483, 25045, 25053, 25077,
-    141711, 25123, 25170, 25185, 25188, 25211, 25197, 25203, 25241, 25301,
-    142008, 25341, 25347, 25360, {f: 2, c: 142159}, 25394, 25397,
-    {f: 2, c: 25403}, 25409, 25412, 25422, 142150, 25433, 142365, 142246,
-    25452, 25497, 142372, 25492, 25533, {f: 2, c: 25556}, 25568,
-    {f: 2, c: 25579}, 25586, 25630, 25637, 25641, 25647, 25690, 25693, 25715,
-    25725, 25735, 25745, 25759, {f: 2, c: 25803}, 25813, 25815, 142817, 25828,
-    25855, 14958, 25871, 25876, 14963, 25886, 25906, 25924, 25940, 25963,
-    25978, 25988, 25994, 26034, 26037, 26040, 26047, 26057, 26068, 15062,
-    26105, 26108, 26116, 26120, 26145, 26154, 26181, 26193, 26190, 15082,
-    143811, 143861, 143798, 26218, {f: 2, c: 26220}, 26235, 26240, 26256,
-    26258, 15118, 26285, 26289, 26293, 15130, 15132, 15063, 26369, 26386,
-    144242, 26393, 144339, 144338, 26445, 26452, 26461, 144336, 144356, 144341,
-    26484, 144346, 26514, 144351, 33635, 26640, 26563, 26568, 26578, 26587,
-    26615, 144458, 144465, 144459, 26648, 26655, 26669, 144485, 26675, 26683,
-    26686, 26693, 26697, 26700, 26709, 26711, 15223, 26731, 26734, 26748,
-    26754, 26768, 26774, 15213, {f: 3, c: 26776}, 26780, {f: 2, c: 26794},
-    26804, 26811, 26875, 144612, 144730, 26819, 26821, 26828, 26841,
-    {f: 2, c: 26852}, 26860, 26871, 26883, 26887, 15239, 144788, 15245, 26950,
-    26985, 26988, 27002, 27026, 15268, 27030, 27056, 27066, 27068, 27072,
-    27089, 144953, 144967, 144952, 27107, {f: 2, c: 27118}, 27123, 15309,
-    27124, 27134, 27153, 27162, 27165, 145180, {f: 2, c: 27186}, 27199, 27209,
-    27258, 27214, 27218, 27236, 145164, 27275, 15344, 27297, 145252, 27307,
-    27325, 27334, 27348, 27344, 27357, 145407, 145383, {f: 3, c: 27377}, 27389,
-    145444, 27403, {f: 3, c: 27407}, 145469, 27415, 15398, 27439, 27466, 27480,
-    27500, 27509, [11934, 27514], 27521, 27547, 27566, 146072, 27581,
-    {f: 3, c: 27591}, 27610, {f: 2, c: 27622}, 27630, 27650, 27658, 27662,
-    27702, 146559, 27725, 27739, 27757, 27780, 27785, 15555, 27796, 27799,
-    27821, 27842, 15570, 27868, 27881, 27885, 146688, 27904, 27940,
-    {f: 2, c: 27942}, 27751, 27951, 27964, 27995, 28000, 28016,
-    {f: 2, c: 28032}, 28042, 28045, 28049, 28056, 146752, 146938, 146937,
-    146899, 28075, 28078, 28084, 28098, 27956, 28104, 28110, 28127, 28150,
-    28214, 28190, 15633, 28210, {f: 2, c: 28232}, {f: 2, c: 28235}, 28239,
-    {f: 2, c: 28243}, 28247, 28259, 15646, 28307, 28327, 28340, 28355, 28469,
-    28395, 28409, 28411, 28426, 28428, 28440, 28453, 28470, 28476, 147326,
-    28498, 28503, 28512, 28520, 28560, 28566, 28606, 28575, 28581, 28591,
-    15716, {f: 2, c: 28616}, 28649, 147606, 28668, 28672, 28682, 28707, 147715,
-    28730, 28739, 28743, 28747, 15770, 28773, 28777, 28782, 28790, 28806,
-    28823, 147910, 28831, 28849, 147966, 28908, 28874, 28881, 28931, 28934,
-    28936, 28940, 15808, 28975, 29008, 29011, 29022, 15828, 29078, 29056,
-    29083, 29088, 29090, {f: 2, c: 29102}, 148412, 29145, 29148, 29191, 15877,
-    29236, 29241, 29250, 29271, 29283, 149033, {f: 2, c: 29294}, 29304, 29311,
-    29326, 149157, 29358, 29360, 29377, 15968, 29388, 15974, 15976, 29427,
-    29434, 29447, 29458, {f: 2, c: 29464}, 16003, 29497, 29484, 29491, 29501,
-    29522, 16020, 29547, 149654, {f: 2, c: 29550}, 29553, 29569, 29578, 29588,
-    29592, 29596, 29605, 29625, 29631, 29637, 29643, 29665, 29671, 29689,
-    29715, 29690, 29697, 29779, 29760, 29763, 29778, 29789, 29825, 29832,
-    150093, 29842, 29847, 29849, 29857, 29861, 29866, 29881, 29883, 29882,
-    29910, 29912, 29931, 150358, 29946, 150383, 29984, 29988, 29994, 16215,
-    150550, {f: 2, c: 30013}, 30016, 30024, 30032, 30034, 30066, 30065, 30074,
-    {f: 2, c: 30077}, 30092, 16245, 30114, 16247, 30128, 30135,
-    {f: 2, c: 30143}, 30150, 30159, 30163, 30173, {f: 2, c: 30175}, 30183,
-    30190, 30193, 30211, 30232, 30215, 30223, 16302, 151054, 30227,
-    {f: 2, c: 30235}, 151095, 30245, 30248, 30268, 30259, 151146, 16329, 30273,
-    151179, 30281, 30293, 16343, 30318, 30357, 30369, 30368, {f: 2, c: 30375},
-    30383, 151626, 30409, 151637, 30440, 151842, 30487, 30490, 30509, 30517,
-    151977, 16441, 152037, 152013, 30552, 152094, 30588, 152140, 16472, 30618,
-    30623, 30626, 30628, {f: 2, c: 30686}, 30692, 30698, 30700, 30715, 152622,
-    30725, 30729, 30733, 30745, 30764, 30791, 30826, 152793, 30858, 30868,
-    30884, 30877, 30879, 30907, 30933, 30950, {f: 2, c: 30969}, 30974, 152999,
-    30992, 31003, 31013, 31050, 31064, 16645, 31079, 31090, 31125, 31137,
-    31145, 31156, 31170, 31175, {f: 2, c: 31180}, 31190, 16712, 153513, 153524,
-    16719, 31242, 31253, 31259, 16739, 31288, 31303, 31318, 31321, 31324,
-    31327, 31335, 31338, 31349, 31362, 31370, 31376, 31404, 154068, 16820,
-    31417, 31422, 16831, 31436, 31464, 31476, 154340, 154339, 154353, 31549,
-    31530, {f: 2, c: 31534}, 16870, 16883, 31615, 31553, 16878, 31573, 31609,
-    31588, 31590, 31603, 154546, 16903, 31632, 31643, 16910, 31669, 31676,
-    31685, 31690, 154699, 154724, 31700, 31702, 31706, 31722, 31728, 31747,
-    31758, 31813, 31818, 31831, 31838, 31841, 31849, 31855, 155182, 155222,
-    155237, 31910, 155234, {f: 2, c: 31926}, 155352, 31940, 155330, 31949,
-    155368, 155427, 31974, 155484, 31989, 32003, 17094, 32018, 32030, 155616,
-    155604, {f: 2, c: 32061}, 32064, 32071, 155660, 155643, 17110, 32090,
-    32106, 32112, 17117, 32127, 155671, 32136, 32151, 155744, 32157, 32167,
-    32170, 32182, 32192, 32215, 32217, 32230, 17154, 155885, 64088, 32272,
-    32279, 32285, 32295, 32300, 32325, 32373, 32382, {f: 2, c: 32390}, 17195,
-    32410, 17219, 32572, 32571, 32574, 32579, 13505, 156272, 156294,
-    {f: 2, c: 32611}, 32621, {f: 2, c: 32637}, 32656, 20859, 146702, 32662,
-    32668, 32685, 156674, 32707, 32719, 32739, 32754, 32778, 32776, 32790,
-    32812, 32816, 32835, 32870, 32891, 32921, 32924, 32932, 32935, 32952,
-    157310, 32965, 32981, 32998, 33037, 33013, 33019, 17390, 33077, 33054,
-    17392, 33060, 33063, 33068, 157469, 33085, 17416, 33129, 17431, 17436,
-    33157, 17442, 33176, 33202, 33217, 33219, 33238, 33243, 157917, 33252,
-    157930, 33260, 33277, 33279, 158063, 33284, 158173, 33305, 33314, 158238,
-    33340, 33353, 33349, 158296, 17526, 17530, 33367, 158348, 33372, 33379,
-    158391, 17553, 33405, 33407, 33411, 33418, 33427, {f: 2, c: 33447}, 33458,
-    33460, 33466, 33468, 33506, 33512, 33527, {f: 2, c: 33543}, 33548, 33620,
-    33563, 33565, 33584, 33596, 33604, 33623, 17598, 17620, 17587,
-    {f: 2, c: 33684}, 33691, 33693, 33737, 33744, 33748, 33757, 33765, 33785,
-    33813, 158835, 33815, 33849, 33871, {f: 2, c: 33873}, {f: 2, c: 33881},
-    33884, 158941, 33893, 33912, 33916, 33921, 17677, 33943, 33958, 33982,
-    17672, {f: 2, c: 33998}, 34003, 159333, 34023, 34026, 34031, 34033, 34042,
-    34075, {f: 2, c: 34084}, 34091, 34127, 34159, 17731, 34129,
-    {f: 2, c: 34145}, 159636, 34171, 34173, 34175, 34177, 34182, 34195, 34205,
-    34207, 159736, {f: 2, c: 159734}, 34236, 34247, 34250, {f: 2, c: 34264},
-    34271, 34273, 34278, 34294, 34304, 34321, 34334, 34337, 34340, 34343,
-    160013, 34361, 34364, 160057, 34368, 34387, 34390, 34423, 34439, 34441,
-    {f: 2, c: 34460}, 34481, 34483, 34497, 34499, 34513, 34517, 34519, 34531,
-    34534, 17848, 34565, 34567, 34574, 34576, 34591, 34593, 34595, 34609,
-    34618, 34624, 34627, 34641, 34648, {f: 2, c: 34660}, 34674, 34684, 160731,
-    160730, 34727, 34697, 34699, 34707, 34720, 160766, 17893, 34750, 160784,
-    34753, 34766, 34783, 160841, 34787, {f: 2, c: 34789}, 34794, 34835, 34856,
-    34862, 34866, 34876, 17935, 34890, 34904, 161301, 161300, 34921, 161329,
-    34927, 34976, 35004, 35008, 161427, 35025, 35027, 17985, 35073, 161550,
-    35127, 161571, 35138, 35141, 35145, 161618, 35170, 35209, 35216, 35231,
-    35248, 35255, 35288, 35307, 18081, 35315, 35325, 35327, 18095, 35345,
-    35348, 162181, 35361, 35381, 35390, 35397, 35405, 35416, 35502, 35472,
-    35511, 35543, 35580, 162436, 35594, 35589, 35597, 35612, 35629, 18188,
-    35665, 35678, 35702, 35713, 35723, {f: 2, c: 35732}, 35897, 162739, 35901,
-    162750, 162759, 35909, 35919, 35927, 35945, 35949, 163000, 35987, 35986,
-    35993, 18276, 35995, 36054, 36053, 163232, 36081, 163344, 36105, 36110,
-    36296, 36313, 36364, 18429, 36349, 36358, 163978, 36372, 36374,
-    {f: 2, c: 36385}, 36391, 164027, 18454, 36406, 36409, 36436, 36450, 36461,
-    36463, 36504, 36510, 36533, 36539, 164482, 18510, 164595, 36608, 36616,
-    36651, 36672, 36682, 36696, 164876, 36772, 36788, 164949, 36801, 36806,
-    64036, 36810, 36813, 36819, 36821, 36849, 36853, 36859, 36876, 36919,
-    165227, 36931, 36957, {f: 2, c: 165320}, 36997, 37004, 37008, 37025, 18613,
-    37040, 37046, 37059, 37064, 165591, 37084, 37087, 165626, 37110, 37106,
-    37120, 37099, {f: 2, c: 37118}, 37124, 37126, 37144, 37150, 37175, 37177,
-    {f: 2, c: 37190}, 37207, 37209, 37236, 37241, 37253, 37299, 37302,
-    {f: 2, c: 37315}, 166217, 166214, 37356, 37377, {f: 2, c: 37398}, 166251,
-    37442, 37450, 37462, 37473, 37477, 37480, 166280, {f: 2, c: 37500}, 37503,
-    37513, 37517, 37527, 37529, 37535, 37547, {f: 2, c: 166330}, 37554,
-    {f: 2, c: 37567}, 37574, 37582, 37605, 37649, 166430, 166441, 37623, 37673,
-    166513, 166467, 37713, 37722, 37739, 37745, 37747, 37793, 166553, 166605,
-    37768, 37771, 37775, 37790, 37877, 166628, 166621, 37873, 37831, 37852,
-    37863, 37897, {f: 2, c: 37910}, 37883, 37938, 37947, 166849, 166895, 37997,
-    37999, 38265, 38278, {f: 2, c: 38284}, 167184, 167281, 38344, 167419,
-    167455, 38444, {f: 2, c: 38451}, 167478, 38460, 38497, 167561, 38530,
-    167659, 38554, 167730, 18919, 38579, 38586, 38589, 18938, 167928, 38616,
-    38618, 38621, 18948, 38676, 38691, 18985, 38710, 38721, 38727, 38743,
-    38747, 38762, 168608, 168625, 38806, 38814, {f: 2, c: 38833}, 38846, 38860,
-    38865, 38868, 38872, 38881, 38897, 38916, 38925, 38932, 38934, 19132,
-    169104, {f: 2, c: 38962}, 38949, 38983, 39014, 39083, 39085, 39088, 169423,
-    39095, {f: 2, c: 39099}, 39106, 39111, 39115, 39137, 39139, 39146,
-    {f: 2, c: 39152}, 39155, 39176, 19259, 169712, {f: 2, c: 39190}, 169753,
-    {f: 3, c: 39194}, 169808, 39217, {f: 3, c: 39226}, 39233, 39238, 39246,
-    39264, 39331, 39334, 39357, 39359, 39363, 39380, 39385, 39390, 170182,
-    39408, 39417, 39420, 39434, 39441, 39450, 39456, 39473, 39492, 39500,
-    39512, 19394, 39599, 19402, 39607, 19410, 39609, 170610, 39622, 39632,
-    39634, 39637, 39648, 39653, 39657, 39692, 39696, 39698, 39702, 39708,
-    39723, 39741, 19488, 39755, 39779, 39781, {f: 2, c: 39787},
-    {f: 2, c: 39798}, 39846, 39852, 171483, 39858, 39864, 39870, 39923, 39896,
-    39901, 39914, 39919, 39918, 171541, 171658, 171593, 39958,
-    {f: 3, c: 39960}, 39965, 39970, 39977, 171716, 39985, 39991, 40005, 40028,
-    171753, {f: 2, c: 40009}, 171739, 40020, 40024, 40027, 40029, 40031,
-    {f: 3, c: 40041}, {f: 2, c: 40045}, 40050, 40053, 40058, 40166, 40178,
-    40203, [171982, 171991], 40209, {f: 2, c: 40215}, 172079, 19652, 172058,
-    40242, 19665, 40266, 40287, 40290, 172281, 172162, 40307, {f: 2, c: 40310},
-    40324, 40345, 40353, 40383, 40373, 40377, 40381, 40393, 40410, 40416,
-    40419, 19719, 40458, 40450, 40461, 40476, 40571, 139800, 40576, 40581,
-    40603, 172940, 40637, 173111, 40671, 40703, 40706, 19831, 40707, 40762,
-    40765, 40774, 40787, 40789, 40792, 173553, 40797, 173570, 40809, 40813,
-    40816, 173746, 11948, 13844, 14509, 15820, 16348, 17854, 17936, 19326,
-    19512, 19681, 19980, {f: 2, c: 20003}, 20089, 20211, 20236, 20249, 20267,
-    20270, 20273, 20356, 20382, 20407, 20484, 20492, 20556, 20575, 20578,
-    20599, 20622, 20638, 20642, 20675, 20712, 20721, 20734, 20743,
-    {f: 3, c: 20748}, 20787, 20792, 20852, 20868, 20920, 20922, 20936, 20943,
-    20945, {f: 2, c: 20947}, 20952, 20959, 20997, 21030, 21032, 21035,
-    {f: 2, c: 21041}, 21045, 21052, 21082, 21088, 21102, {f: 2, c: 21112},
-    21130, 21132, 21217, 21225, 21233, 21251, 21265, 21279, 21293, 21298,
-    21309, 21349, 21357, 21369, 21374, 21396, 21401, 21418, 21423, 21434,
-    21441, {f: 2, c: 21444}, 21472, 21523, 21546, 21553, {f: 2, c: 21556},
-    21580, 21671, 21674, 21681, 21691, 21710, 21738, 21756, 21765, 21768,
-    21781, 21799, 21802, 21814, 21841, 21862, 21903, 21906, 21908, 21924,
-    21938, 21955, 21958, 21971, 21979, 21996, 21998, 22001, 22006, 22008,
-    22021, 22029, {f: 2, c: 22033}, 22060, 22069, 22073, 22093, 22100, 22149,
-    22175, 22182, 22199, 22220, 22223, 22233, 22241, 22251, 22253, 22257,
-    22279, 22284, {f: 2, c: 22298}, 22301, 22316, 22318, {f: 2, c: 22333},
-    22367, 22379, 22381, 22394, 22403, 22423, 22446, 22485, 22503, 22541,
-    22566, 22605, 22607, 22623, 22637, 22655, 22657, 22680, 22716, 22815,
-    22819, 22873, 22905, 22935, 22959, 22963, 23007, 23025, 23032, 23218,
-    23224, 23274, 23286, 23323, 23325, 23329, 23352, 23479, 23511, 23520,
-    23583, 23594, 23596, 23606, 23641, 23644, 23661, 23773, 23809, 23860,
-    23869, 23897, 23934, 23939, 24007, 24057, 24104, 24114, 24117, 24155,
-    24168, 24170, 24183, 24192, 24203, 24243, 24253, 24273, {f: 2, c: 24276},
-    24397, 24492, 24554, 24583, 24649, 24660, 24679, 24763, 24772, 24829,
-    24842, 24854, 24874, 24886, 24926, 24932, 24955, 24957, 24959, 24989,
-    25016, 25052, 25058, 25061, 25064, 25092, 25095, 25137, 25145, 25149,
-    25210, 25232, 25256, 25306, 25332, 25366, 25386, 25398, 25414, 25419,
-    25427, 25457, 25461, 25471, 25474, 25482, {f: 2, c: 25518}, 25578,
-    {f: 2, c: 25592}, 25618, 25624, 25632, 25636, 25642, 25653, 25661, 25663,
-    25682, 25695, 25716, 25744, {f: 2, c: 25752}, 25772, 25779, 25837, 25840,
-    25883, 25887, 25902, 25929, 25952, 26002, 26005, 26036, 26046, 26056,
-    26062, 26064, 26079, 26238, {f: 2, c: 26251}, 26291, 26304, 26319, 26405,
-    26421, 26453, 26496, 26511, 26513, 26532, 26545, 26549, 26558, 26664,
-    26758, 26859, 26869, 26903, 26931, 26936, 26971, 26981, 27048, 27051,
-    27055, 27109, 27121, 27210, 27221, 27239, 27249, 27311, {f: 2, c: 27336},
-    27395, 27451, 27455, {f: 2, c: 27517}, 27568, 27639, 27641, 27652, 27657,
-    27661, 27692, 27722, 27730, 27732, 27769, 27820, 27828, 27858, 28001,
-    28028, 28089, 28144, 28229, 28275, 28283, 28285, 28297, 28348,
-    {f: 2, c: 28378}, 28454, 28457, 28464, 28551, 28573, 28590, 28599, 28685,
-    28704, 28745, 28824, 28848, {f: 2, c: 28885}, 28997, 29106, 29172, 29207,
-    29215, 29251, {f: 2, c: 29263}, 29274, 29280, 29288, 29303, 29316, 29385,
-    29413, 29428, 29442, 29451, 29470, 29474, {f: 2, c: 29498}, 29517, 29528,
-    29543, 29810, 29871, 29919, 29924, 29940, 29947, 29974, 29985, 30015,
-    30046, 30105, 30116, 30145, 30148, 30156, 30167, 30172, 30177, 30191,
-    30212, 30220, 30237, 30258, 30264, 30277, 30282, 30303, 30381, 30397,
-    30425, 30443, 30448, 30457, 30464, 30478, 30498, 30504, 30511, 30521,
-    30526, 30533, 30538, 30543, 30558, 30564, 30567, 30572, 30596,
-    {f: 2, c: 30604}, 30614, 30631, 30639, 30647, 30654, 30665, 30673, 30681,
-    30705, 30775, 30812, 30846, 30872, 30881, 30897, 30899, 30921, 30931,
-    30988, 31007, {f: 2, c: 31015}, 31039, 31042, 31060, 31083, 31100, 31147,
-    31172, 31210, 31234, 31244, 31280, 31290, 31300, 31360, 31366, 31380,
-    31413, 31421, 31486, 31531, 31607, 31648, 31660, 31664, 31720, 31730,
-    31736, 31740, 31742, 31753, 31784, 31791, 31810, {f: 2, c: 31826},
-    {f: 3, c: 31835}, 31858, 31869, 31879, 31902, 31930, 31943, 31955, 31962,
-    32060, 32077, 32130, 32133, 32141, 32145, 32158, 32179, 32185, 32208,
-    32229, {f: 2, c: 32245}, 32303, 32310, 32324, 32367, 32376, 32385, 32573,
-    32603, 32605, 32613, 32625, {f: 2, c: 32639}, 32651, 32674,
-    {f: 3, c: 32765}, 32775, 32781, 32798, 32825, 32904, 32910, 32975, 32980,
-    33005, 33008, 33015, 33018, 33022, 33027, 33047, 33072, 33111, 33135,
-    33139, 33163, 33168, 33179, 33182, 33227, 33237, {f: 2, c: 33245}, 33249,
-    33263, 33270, 33280, 33291, {f: 2, c: 33299}, 33306, 33338, 33348, 33389,
-    33412, 33417, 33425, 33450, 33456, 33488, 33514, 33519, 33526, 33622,
-    33656, 33784, 33788, 33880, 33939, 33969, 33981, 34043, 34118, 34134,
-    34141, 34181, 34200, 34370, 34374, 34496, 34580, 34594, 34606, 34617,
-    34653, 34683, 34700, 34702, {f: 2, c: 34711}, 34718, 34723, 34734, 34751,
-    34761, 34778, 34840, 34843, 34861, 34874, 34885, 34891, 34894, 34901,
-    34906, 34926, {f: 3, c: 34970}, 35021, 35040, 35055, {f: 2, c: 35086},
-    35110, 35125, 35162, 35164, 35179, 35184, 35196, 35237, 35253, 35260,
-    35285, 35401, 35415, 35431, 35454, 35462, 35478, 35510, 35529, 35537,
-    35549, 35564, 35573, 35590, 35599, 35601, 35653, 35666, 35693, 35704,
-    35708, 35710, 35717, 35743, 35915, 35923, 35963, 36026, 36037, 36041,
-    36050, 36076, 36085, 36087, 36097, 36099, 36119, 36124, 36206, 36241,
-    36255, 36267, 36274, 36309, 36327, {f: 2, c: 36337}, 36340, 36353, 36363,
-    36390, 36401, {f: 2, c: 36416}, 36429, 36431, 36444, 36449, 36457, 36465,
-    36469, 36471, 36489, 36496, 36501, 36506, 36519, 36521, 36525, 36584,
-    36592, 36615, 36632, 36645, 36647, 36652, 36661, 36666, 36675, 36679,
-    36689, 36693, {f: 3, c: 36768}, 36773, 36868, 36891, 36911, 36940, 36955,
-    36976, 36980, 36985, 37003, 37016, 37024, 37042, 37053, 37065, 37104,
-    37125, 37157, 37210, 37223, 37242, 37258, 37265, 37269, 37296, 37307,
-    37309, 37314, 37317, 37376, 37385, 37411, 37494, 37518, 37551,
-    {f: 2, c: 37563}, 37569, 37571, 37573, 37576, 37652, 37683, 37686, 37720,
-    37759, 37762, 37770, 37819, 37836, 37862, 37881, 37890, {f: 2, c: 37901},
-    37934, 37964, 38280, 38305, 38335, 38342, 38345, {f: 2, c: 38353}, 38368,
-    38372, 38374, 38436, 38449, 38456, 38461, 38484, 38516, 38523, 38527,
-    38529, 38531, 38537, 38550, 38574, 38659, 38683, {f: 2, c: 38689}, 38696,
-    38705, 38759, 38774, 38781, 38783, 38809, 38815, 38828, 38841, 38861,
-    38880, 38895, 38919, 38950, 38958, {f: 2, c: 39010}, 39092, 39109, 39170,
-    39185, 39189, 39221, 39240, 39252, 39262, 39393, 39436, 39440, 39459,
-    39489, 39505, {f: 2, c: 39613}, 39681, 39689, 39691, {f: 2, c: 39693},
-    39705, 39733, 39752, 39765, 39784, 39808, 39814, 39824, 39837, 39856,
-    39871, 39880, 39935, 39938, 39964, 39989, 40004, 40022, 40033, 40040,
-    40240, 40253, 40298, 40315, 40421, 40425, 40435, 40570, {f: 3, c: 40578},
-    40624, 40676, 40688, 40690, 40713, 40719, 40724, 40731, 40738, 40742,
-    {f: 2, c: 40746}, 40756, 40794, 40815, 40862, 40869, 131317, 151044,
-    151538, 163187, 194581, 194630, 194713, 194726, 194789, 195038, 13790,
-    {s: 4}, 172722, 0, 0, 131416, {s: 4}, 132529, 0, 0, 132844, {s: 6}, 134488,
-    {s: 21}, 154060, {s: 9}, 14756, 14776, 142914, 0, 0, 14940, 0, 0, 143339,
-    0, 0, 162228, 0, 15044, 15051, {s: 5}, 14981, {s: 8}, 15347, 27384, {s: 5},
-    15665, {s: 9}, 147531, 0, 15936, 14497, {s: 34}, 158878, {s: 12}, 18207,
-    162876, {s: 4}, 18462, {s: 71}, 39709, 39724, 20482, 20958, 21255, 23532,
-    63784, 26142, 63785, 28746, 64021, 21857, 27706, 31328, 156492, 34819,
-    38315, 38741, 171581, 173594],
-  'Adobe-Korea1': [{f: 95, c: 32}, 8361, 8208, 169, 0, 0, [12288, 12644],
-    {f: 2, c: 12289}, 12539, 8229, [8230, 8943], 168, 12291, {f: 2, c: 8211},
-    8214, 65340, 65374, {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12308},
-    {f: 10, c: 12296}, 177, 215, 247, 8800, {f: 2, c: 8804}, 8734, 8756, 176,
-    {f: 2, c: 8242}, 8451, 8491, {f: 2, c: 65504}, 65509, 9794, 9792, 8736,
-    8869, 8978, 8706, 8711, 8801, 8786, 167, 8251, 9734, 9733, 9675, 9679,
-    9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8594,
-    {f: 2, c: 8592}, {f: 2, c: 8595}, 12307, 171, 187, 8730, 8765, 8733, 8757,
-    {f: 2, c: 8747}, 8712, 8715, {f: 2, c: 8838}, {f: 2, c: 8834}, 8746, 8745,
-    {f: 2, c: 8743}, 65506, 8658, 8660, 8704, 8707, 180, 732, 711, 728, 733,
-    730, 729, 184, 731, 161, 191, 8758, 8750, 8721, 8719, 164, 8457, 8240,
-    9665, 9664, 9655, 9654, 9828, {f: 2, c: 9824}, 9829, 9831, 9827, 9673,
-    9672, 9635, {f: 2, c: 9680}, 9618, {f: 2, c: 9636}, 9640, 9639, 9638, 9641,
-    9832, 9743, 9742, 9756, 9758, 182, {f: 2, c: 8224}, 8597, 8599, 8601, 8598,
-    8600, 9837, {f: 2, c: 9833}, 9836, 12927, 12828, 8470, 13255, 8482, 13250,
-    13272, 8481, {f: 59, c: 65281}, 65510, {f: 33, c: 65341}, 65507,
-    {f: 51, c: 12593}, {f: 42, c: 12645}, {f: 10, c: 8560}, {f: 10, c: 8544},
-    {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, 9472,
-    9474, 9484, 9488, 9496, 9492, 9500, 9516, 9508, 9524, 9532, 9473, 9475,
-    9487, 9491, 9499, 9495, 9507, 9523, 9515, 9531, 9547, 9504, 9519, 9512,
-    9527, 9535, 9501, 9520, 9509, 9528, 9538, 9490, 9489, 9498, 9497, 9494,
-    9493, 9486, 9485, {f: 2, c: 9502}, {f: 2, c: 9505}, {f: 2, c: 9510},
-    {f: 2, c: 9513}, {f: 2, c: 9517}, {f: 2, c: 9521}, {f: 2, c: 9525},
-    {f: 2, c: 9529}, {f: 2, c: 9533}, {f: 2, c: 9536}, {f: 8, c: 9539},
-    {f: 3, c: 13205}, 8467, 13208, 13252, {f: 4, c: 13219}, {f: 10, c: 13209},
-    13258, {f: 3, c: 13197}, 13263, {f: 2, c: 13192}, 13256, {f: 2, c: 13223},
-    {f: 10, c: 13232}, {f: 5, c: 13184}, {f: 6, c: 13242}, {f: 5, c: 13200},
-    8486, {f: 2, c: 13248}, {f: 3, c: 13194}, 13270, 13253, {f: 3, c: 13229},
-    13275, {f: 4, c: 13225}, 13277, 13264, 13267, 13251, 13257, 13276, 13254,
-    198, 208, 170, 294, 306, 319, 321, 216, 338, 186, 222, 358, 330,
-    {f: 28, c: 12896}, {f: 26, c: 9424}, {f: 15, c: 9312}, 189,
-    {f: 2, c: 8531}, 188, 190, {f: 4, c: 8539}, 230, 273, 240, 295, 305, 307,
-    312, 320, 322, 248, 339, 223, 254, 359, 331, 329, {f: 28, c: 12800},
-    {f: 26, c: 9372}, {f: 15, c: 9332}, 185, {f: 2, c: 178}, 8308, 8319,
-    {f: 4, c: 8321}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 6, c: 1040},
-    1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, {f: 2, c: 44032}, 44036,
-    {f: 4, c: 44039}, {f: 8, c: 44048}, {f: 5, c: 44057}, 44064, 44068,
-    {f: 2, c: 44076}, {f: 3, c: 44079}, {f: 2, c: 44088}, 44092, 44096, 44107,
-    44109, 44116, 44120, 44124, {f: 2, c: 44144}, 44148, {f: 2, c: 44151},
-    44154, {f: 2, c: 44160}, {f: 4, c: 44163}, {f: 4, c: 44169}, 44176, 44180,
-    {f: 2, c: 44188}, {f: 3, c: 44191}, {f: 3, c: 44200}, 44204,
-    {f: 2, c: 44207}, {f: 2, c: 44216}, {f: 3, c: 44219}, 44225, 44228, 44232,
-    44236, 44245, 44247, {f: 2, c: 44256}, 44260, {f: 2, c: 44263}, 44266,
-    44268, {f: 3, c: 44271}, 44275, {f: 2, c: 44277}, {f: 2, c: 44284}, 44288,
-    44292, 44294, {f: 2, c: 44300}, 44303, 44305, 44312, 44316, 44320, 44329,
-    {f: 2, c: 44332}, {f: 2, c: 44340}, 44344, 44348, {f: 2, c: 44356}, 44359,
-    44361, 44368, 44372, 44376, 44385, 44387, {f: 2, c: 44396}, 44400,
-    {f: 4, c: 44403}, {f: 3, c: 44411}, 44415, {f: 2, c: 44417},
-    {f: 2, c: 44424}, 44428, 44432, {f: 2, c: 44444}, 44452, 44471,
-    {f: 2, c: 44480}, 44484, 44488, {f: 2, c: 44496}, 44499, 44508, 44512,
-    44516, {f: 2, c: 44536}, 44540, {f: 3, c: 44543}, {f: 2, c: 44552}, 44555,
-    44557, 44564, {f: 2, c: 44592}, 44596, {f: 2, c: 44599}, 44602,
-    {f: 2, c: 44608}, 44611, {f: 2, c: 44613}, 44618, {f: 3, c: 44620}, 44624,
-    44628, 44630, {f: 2, c: 44636}, {f: 3, c: 44639}, 44645, {f: 2, c: 44648},
-    44652, 44656, {f: 2, c: 44664}, {f: 3, c: 44667}, {f: 2, c: 44676}, 44684,
-    {f: 3, c: 44732}, 44736, 44740, {f: 2, c: 44748}, {f: 3, c: 44751},
-    {f: 2, c: 44760}, 44764, 44776, 44779, 44781, 44788, 44792, 44796,
-    {f: 2, c: 44807}, 44813, 44816, {f: 2, c: 44844}, 44848, 44850, 44852,
-    {f: 2, c: 44860}, 44863, {f: 3, c: 44865}, {f: 2, c: 44872}, 44880,
-    {f: 2, c: 44892}, {f: 2, c: 44900}, 44921, 44928, 44932, 44936,
-    {f: 2, c: 44944}, 44949, 44956, {f: 2, c: 44984}, 44988, 44992,
-    {f: 3, c: 44999}, 45003, {f: 2, c: 45005}, 45012, 45020, {f: 2, c: 45032},
-    {f: 2, c: 45040}, 45044, 45048, {f: 2, c: 45056}, 45060, 45068, 45072,
-    45076, {f: 2, c: 45084}, 45096, {f: 2, c: 45124}, 45128, 45130, 45132,
-    45134, {f: 3, c: 45139}, 45143, 45145, 45149, {f: 2, c: 45180}, 45184,
-    45188, {f: 2, c: 45196}, 45199, 45201, {f: 3, c: 45208}, 45212,
-    {f: 4, c: 45215}, {f: 2, c: 45224}, {f: 5, c: 45227}, 45233,
-    {f: 3, c: 45235}, 45240, 45244, {f: 2, c: 45252}, {f: 3, c: 45255},
-    {f: 2, c: 45264}, 45268, 45272, 45280, 45285, {f: 2, c: 45320},
-    {f: 2, c: 45323}, 45328, {f: 2, c: 45330}, {f: 2, c: 45336},
-    {f: 3, c: 45339}, {f: 3, c: 45347}, 45352, 45356, {f: 2, c: 45364},
-    {f: 3, c: 45367}, {f: 2, c: 45376}, 45380, 45384, {f: 2, c: 45392},
-    {f: 2, c: 45396}, 45400, 45404, 45408, {f: 2, c: 45432}, 45436, 45440,
-    45442, {f: 2, c: 45448}, 45451, 45453, {f: 3, c: 45458}, 45464, 45468,
-    45480, 45516, 45520, 45524, {f: 2, c: 45532}, 45535, {f: 2, c: 45544},
-    45548, 45552, 45561, 45563, 45565, {f: 2, c: 45572}, 45576,
-    {f: 2, c: 45579}, {f: 2, c: 45588}, 45591, 45593, 45600, 45620, 45628,
-    45656, 45660, 45664, {f: 2, c: 45672}, {f: 2, c: 45684}, 45692,
-    {f: 2, c: 45700}, 45705, {f: 2, c: 45712}, 45716, {f: 3, c: 45720},
-    {f: 2, c: 45728}, 45731, {f: 2, c: 45733}, 45738, 45740, 45744, 45748,
-    {f: 2, c: 45768}, 45772, 45776, 45778, {f: 2, c: 45784}, 45787, 45789,
-    45794, {f: 3, c: 45796}, 45800, {f: 5, c: 45803}, {f: 3, c: 45811},
-    {f: 5, c: 45815}, {f: 3, c: 45823}, 45828, 45832, {f: 2, c: 45840},
-    {f: 3, c: 45843}, 45852, {f: 3, c: 45908}, 45912, {f: 2, c: 45915},
-    {f: 2, c: 45918}, {f: 2, c: 45924}, 45927, 45929, 45931, 45934,
-    {f: 2, c: 45936}, 45940, 45944, {f: 2, c: 45952}, {f: 3, c: 45955}, 45964,
-    45968, 45972, {f: 2, c: 45984}, 45992, 45996, {f: 2, c: 46020}, 46024,
-    {f: 2, c: 46027}, 46030, 46032, {f: 2, c: 46036}, 46039, 46041, 46043,
-    46045, 46048, 46052, 46056, 46076, 46096, 46104, 46108, 46112,
-    {f: 2, c: 46120}, 46123, 46132, {f: 2, c: 46160}, 46164, 46168,
-    {f: 2, c: 46176}, 46179, 46181, 46188, 46208, 46216, 46237, 46244, 46248,
-    46252, 46261, 46263, 46265, 46272, 46276, 46280, 46288, 46293,
-    {f: 2, c: 46300}, 46304, {f: 2, c: 46307}, 46310, {f: 2, c: 46316}, 46319,
-    46321, 46328, {f: 2, c: 46356}, 46360, {f: 2, c: 46363}, {f: 2, c: 46372},
-    {f: 4, c: 46375}, {f: 2, c: 46384}, 46388, 46392, {f: 2, c: 46400},
-    {f: 3, c: 46403}, {f: 3, c: 46411}, 46416, 46420, {f: 2, c: 46428},
-    {f: 3, c: 46431}, {f: 2, c: 46496}, 46500, 46504, {f: 2, c: 46506},
-    {f: 2, c: 46512}, {f: 3, c: 46515}, {f: 3, c: 46523}, 46528, 46532,
-    {f: 2, c: 46540}, {f: 3, c: 46543}, 46552, 46572, {f: 2, c: 46608}, 46612,
-    46616, 46629, 46636, 46644, 46664, 46692, 46696, {f: 2, c: 46748}, 46752,
-    46756, {f: 2, c: 46763}, 46769, 46804, 46832, 46836, 46840,
-    {f: 2, c: 46848}, 46853, {f: 2, c: 46888}, 46892, {f: 2, c: 46895},
-    {f: 2, c: 46904}, 46907, 46916, 46920, 46924, {f: 2, c: 46932}, 46944,
-    46948, 46952, {f: 2, c: 46960}, 46963, 46965, {f: 2, c: 46972}, 46976,
-    46980, {f: 2, c: 46988}, {f: 4, c: 46991}, {f: 4, c: 46998}, 47004, 47008,
-    {f: 2, c: 47016}, {f: 3, c: 47019}, {f: 2, c: 47028}, 47032, 47047, 47049,
-    {f: 2, c: 47084}, 47088, 47092, {f: 2, c: 47100}, {f: 3, c: 47103},
-    {f: 3, c: 47111}, 47116, 47120, {f: 2, c: 47128}, 47131, 47133,
-    {f: 2, c: 47140}, 47144, 47148, {f: 2, c: 47156}, {f: 3, c: 47159}, 47168,
-    47172, 47185, 47187, {f: 2, c: 47196}, 47200, 47204, {f: 2, c: 47212},
-    47215, 47217, 47224, 47228, 47245, 47272, 47280, 47284, 47288,
-    {f: 2, c: 47296}, 47299, 47301, 47308, 47312, 47316, 47325, 47327, 47329,
-    {f: 2, c: 47336}, 47340, 47344, {f: 2, c: 47352}, 47355, 47357, 47364,
-    47384, 47392, {f: 2, c: 47420}, 47424, 47428, 47436, 47439, 47441,
-    {f: 2, c: 47448}, 47452, 47456, {f: 2, c: 47464}, 47467, 47469,
-    {f: 2, c: 47476}, 47480, 47484, {f: 2, c: 47492}, 47495, {f: 2, c: 47497},
-    {f: 2, c: 47501}, {f: 2, c: 47532}, 47536, 47540, {f: 2, c: 47548}, 47551,
-    47553, {f: 2, c: 47560}, 47564, {f: 5, c: 47566}, {f: 2, c: 47576}, 47579,
-    {f: 2, c: 47581}, 47585, {f: 3, c: 47587}, 47592, 47596, {f: 2, c: 47604},
-    {f: 4, c: 47607}, {f: 2, c: 47616}, 47624, 47637, {f: 2, c: 47672}, 47676,
-    47680, 47682, {f: 2, c: 47688}, 47691, {f: 2, c: 47693}, {f: 3, c: 47699},
-    47704, 47708, {f: 2, c: 47716}, {f: 3, c: 47719}, {f: 2, c: 47728}, 47732,
-    47736, {f: 3, c: 47747}, 47751, 47756, {f: 2, c: 47784}, {f: 2, c: 47787},
-    47792, 47794, {f: 2, c: 47800}, 47803, 47805, 47812, 47816,
-    {f: 2, c: 47832}, 47868, 47872, 47876, 47885, 47887, 47889, 47896, 47900,
-    47904, 47913, 47915, {f: 3, c: 47924}, 47928, {f: 4, c: 47931},
-    {f: 2, c: 47940}, 47943, 47945, 47949, {f: 2, c: 47951}, 47956, 47960,
-    47969, 47971, 47980, 48008, 48012, 48016, 48036, 48040, 48044, 48052,
-    48055, 48064, 48068, 48072, 48080, 48083, {f: 2, c: 48120}, 48124,
-    {f: 2, c: 48127}, 48130, {f: 2, c: 48136}, {f: 3, c: 48139}, 48143, 48145,
-    {f: 5, c: 48148}, {f: 5, c: 48155}, {f: 2, c: 48164}, 48167, 48169, 48173,
-    {f: 2, c: 48176}, 48180, 48184, {f: 2, c: 48192}, {f: 3, c: 48195}, 48201,
-    {f: 2, c: 48204}, 48208, 48221, {f: 2, c: 48260}, 48264, {f: 2, c: 48267},
-    48270, {f: 2, c: 48276}, 48279, {f: 2, c: 48281}, {f: 2, c: 48288}, 48292,
-    {f: 2, c: 48295}, {f: 2, c: 48304}, {f: 3, c: 48307}, {f: 2, c: 48316},
-    48320, 48324, 48333, {f: 3, c: 48335}, 48341, 48344, 48348,
-    {f: 3, c: 48372}, 48376, 48380, {f: 2, c: 48388}, 48391, 48393, 48400,
-    48404, 48420, 48428, 48448, {f: 2, c: 48456}, 48460, 48464,
-    {f: 2, c: 48472}, 48484, 48488, {f: 2, c: 48512}, 48516, {f: 4, c: 48519},
-    {f: 2, c: 48528}, 48531, 48533, {f: 2, c: 48537}, 48540, 48548, 48560,
-    48568, {f: 2, c: 48596}, 48600, 48604, 48617, 48624, 48628, 48632, 48640,
-    48643, 48645, {f: 2, c: 48652}, 48656, 48660, {f: 2, c: 48668}, 48671,
-    {f: 2, c: 48708}, 48712, 48716, 48718, {f: 2, c: 48724}, 48727,
-    {f: 3, c: 48729}, {f: 2, c: 48736}, 48740, 48744, 48746, {f: 2, c: 48752},
-    {f: 3, c: 48755}, {f: 3, c: 48763}, 48768, 48772, {f: 2, c: 48780},
-    {f: 3, c: 48783}, {f: 2, c: 48792}, 48808, {f: 2, c: 48848}, 48852,
-    {f: 2, c: 48855}, 48864, {f: 3, c: 48867}, 48876, 48897, {f: 2, c: 48904},
-    {f: 2, c: 48920}, {f: 3, c: 48923}, {f: 2, c: 48960}, 48964, 48968,
-    {f: 2, c: 48976}, 48981, 49044, 49072, 49093, {f: 2, c: 49100}, 49104,
-    49108, 49116, 49119, 49121, 49212, 49233, 49240, 49244, 49248,
-    {f: 2, c: 49256}, {f: 2, c: 49296}, 49300, 49304, {f: 2, c: 49312}, 49315,
-    49317, {f: 2, c: 49324}, {f: 2, c: 49327}, {f: 4, c: 49331},
-    {f: 2, c: 49340}, {f: 3, c: 49343}, 49349, {f: 2, c: 49352}, 49356, 49360,
-    {f: 2, c: 49368}, {f: 3, c: 49371}, {f: 2, c: 49380}, 49384, 49388,
-    {f: 2, c: 49396}, 49399, 49401, 49408, 49412, 49416, 49424, 49429,
-    {f: 5, c: 49436}, {f: 2, c: 49443}, {f: 2, c: 49446}, {f: 2, c: 49452},
-    {f: 3, c: 49455}, 49462, {f: 2, c: 49464}, 49468, 49472, {f: 2, c: 49480},
-    {f: 3, c: 49483}, {f: 2, c: 49492}, 49496, 49500, {f: 2, c: 49508},
-    {f: 3, c: 49511}, 49520, 49524, 49528, 49541, {f: 3, c: 49548}, 49552,
-    49556, 49558, {f: 2, c: 49564}, 49567, 49569, 49573, {f: 2, c: 49576},
-    49580, 49584, 49597, 49604, 49608, 49612, 49620, {f: 2, c: 49623}, 49632,
-    49636, 49640, {f: 2, c: 49648}, 49651, {f: 2, c: 49660}, 49664, 49668,
-    {f: 2, c: 49676}, 49679, 49681, {f: 2, c: 49688}, 49692, {f: 2, c: 49695},
-    {f: 2, c: 49704}, 49707, 49709, 49711, {f: 2, c: 49713}, 49716, 49736,
-    {f: 2, c: 49744}, 49748, 49752, 49760, 49765, {f: 2, c: 49772}, 49776,
-    49780, {f: 2, c: 49788}, 49791, 49793, {f: 2, c: 49800}, 49808, 49816,
-    49819, 49821, {f: 2, c: 49828}, 49832, {f: 2, c: 49836}, {f: 2, c: 49844},
-    49847, 49849, {f: 2, c: 49884}, 49888, {f: 2, c: 49891}, {f: 3, c: 49899},
-    49903, 49905, 49910, {f: 2, c: 49912}, {f: 2, c: 49915}, 49920,
-    {f: 2, c: 49928}, {f: 2, c: 49932}, {f: 3, c: 49939}, 49944, 49948,
-    {f: 2, c: 49956}, {f: 2, c: 49960}, 49989, {f: 2, c: 50024}, 50028, 50032,
-    50034, {f: 2, c: 50040}, {f: 2, c: 50044}, 50052, 50056, 50060, 50112,
-    {f: 2, c: 50136}, 50140, {f: 2, c: 50143}, 50146, {f: 2, c: 50152}, 50157,
-    {f: 2, c: 50164}, 50168, 50184, 50192, 50212, 50220, 50224, 50228,
-    {f: 2, c: 50236}, 50248, {f: 2, c: 50276}, 50280, 50284, {f: 2, c: 50292},
-    50297, 50304, 50324, 50332, 50360, 50364, 50409, {f: 2, c: 50416}, 50420,
-    50424, 50426, {f: 3, c: 50431}, 50444, 50448, 50452, 50460,
-    {f: 2, c: 50472}, 50476, 50480, {f: 2, c: 50488}, 50491, 50493,
-    {f: 2, c: 50500}, {f: 3, c: 50504}, {f: 3, c: 50508}, {f: 3, c: 50515},
-    {f: 3, c: 50519}, {f: 2, c: 50525}, {f: 2, c: 50528}, 50532, 50536,
-    {f: 2, c: 50544}, {f: 3, c: 50547}, {f: 2, c: 50556}, 50560, 50564, 50567,
-    {f: 2, c: 50572}, 50575, 50577, 50581, {f: 2, c: 50583}, 50588, 50592,
-    50601, {f: 2, c: 50612}, {f: 2, c: 50616}, {f: 4, c: 50619},
-    {f: 7, c: 50628}, 50636, 50638, {f: 2, c: 50640}, 50644, 50648,
-    {f: 2, c: 50656}, 50659, 50661, {f: 3, c: 50668}, 50672, 50676,
-    {f: 2, c: 50678}, {f: 6, c: 50684}, {f: 4, c: 50693}, 50700, 50704,
-    {f: 2, c: 50712}, {f: 2, c: 50715}, {f: 2, c: 50724}, 50728,
-    {f: 3, c: 50732}, 50736, {f: 3, c: 50739}, 50743, 50745, 50747,
-    {f: 2, c: 50752}, 50756, 50760, {f: 2, c: 50768}, {f: 3, c: 50771},
-    {f: 2, c: 50780}, 50784, 50796, 50799, 50801, {f: 2, c: 50808}, 50812,
-    50816, {f: 2, c: 50824}, 50827, 50829, {f: 2, c: 50836}, 50840, 50844,
-    {f: 2, c: 50852}, 50855, 50857, {f: 2, c: 50864}, 50868, {f: 3, c: 50872},
-    {f: 2, c: 50880}, 50883, 50885, {f: 2, c: 50892}, 50896, 50900,
-    {f: 2, c: 50908}, {f: 2, c: 50912}, {f: 2, c: 50920}, 50924, 50928,
-    {f: 2, c: 50936}, 50941, {f: 2, c: 50948}, 50952, 50956, {f: 2, c: 50964},
-    50967, 50969, {f: 2, c: 50976}, 50980, 50984, {f: 2, c: 50992}, 50995,
-    50997, 50999, {f: 2, c: 51004}, 51008, 51012, 51018, {f: 2, c: 51020},
-    51023, {f: 8, c: 51025}, 51036, 51040, 51048, 51051, {f: 2, c: 51060},
-    51064, {f: 3, c: 51068}, {f: 3, c: 51075}, {f: 4, c: 51079}, 51086,
-    {f: 2, c: 51088}, 51092, {f: 3, c: 51094}, 51098, {f: 2, c: 51104},
-    {f: 4, c: 51107}, {f: 2, c: 51116}, 51120, 51124, {f: 2, c: 51132},
-    {f: 3, c: 51135}, {f: 2, c: 51144}, 51148, 51150, 51152, 51160, 51165,
-    51172, 51176, 51180, {f: 2, c: 51200}, 51204, 51208, 51210,
-    {f: 2, c: 51216}, 51219, {f: 2, c: 51221}, {f: 2, c: 51228}, 51232, 51236,
-    {f: 2, c: 51244}, 51247, 51249, 51256, 51260, 51264, {f: 2, c: 51272},
-    {f: 2, c: 51276}, 51284, {f: 2, c: 51312}, 51316, 51320, 51322,
-    {f: 2, c: 51328}, 51331, {f: 3, c: 51333}, {f: 3, c: 51339}, 51348, 51357,
-    51359, 51361, 51368, {f: 2, c: 51388}, 51396, 51400, 51404,
-    {f: 2, c: 51412}, 51415, 51417, {f: 2, c: 51424}, 51428, 51445,
-    {f: 2, c: 51452}, 51456, {f: 3, c: 51460}, {f: 2, c: 51468}, 51471, 51473,
-    51480, 51500, 51508, {f: 2, c: 51536}, 51540, 51544, {f: 2, c: 51552},
-    51555, 51564, 51568, 51572, 51580, {f: 2, c: 51592}, 51596, 51600,
-    {f: 2, c: 51608}, 51611, 51613, {f: 2, c: 51648}, 51652, {f: 2, c: 51655},
-    51658, {f: 2, c: 51664}, 51667, {f: 2, c: 51669}, {f: 2, c: 51673},
-    {f: 2, c: 51676}, 51680, 51682, 51684, 51687, {f: 2, c: 51692},
-    {f: 3, c: 51695}, {f: 2, c: 51704}, 51708, 51712, {f: 2, c: 51720},
-    {f: 3, c: 51723}, 51732, 51736, 51753, {f: 2, c: 51788}, 51792, 51796,
-    {f: 2, c: 51804}, {f: 3, c: 51807}, 51816, 51837, 51844, 51864,
-    {f: 2, c: 51900}, 51904, 51908, {f: 2, c: 51916}, 51919, 51921, 51923,
-    {f: 2, c: 51928}, 51936, 51948, 51956, 51976, 51984, 51988, 51992,
-    {f: 2, c: 52000}, 52033, {f: 2, c: 52040}, 52044, 52048, {f: 2, c: 52056},
-    52061, 52068, {f: 2, c: 52088}, 52124, 52152, 52180, 52196, 52199, 52201,
-    {f: 2, c: 52236}, 52240, 52244, {f: 2, c: 52252}, {f: 2, c: 52257},
-    {f: 3, c: 52263}, 52268, 52270, 52272, {f: 2, c: 52280}, {f: 4, c: 52283},
-    {f: 2, c: 52292}, 52296, 52300, {f: 2, c: 52308}, {f: 3, c: 52311}, 52320,
-    52324, 52326, 52328, 52336, 52341, {f: 2, c: 52376}, 52380, 52384,
-    {f: 2, c: 52392}, {f: 3, c: 52395}, {f: 2, c: 52404}, 52408, 52412,
-    {f: 2, c: 52420}, 52423, 52425, 52432, 52436, 52452, 52460, 52464, 52481,
-    {f: 2, c: 52488}, 52492, 52496, {f: 2, c: 52504}, 52507, 52509, 52516,
-    52520, 52524, 52537, 52572, 52576, 52580, {f: 2, c: 52588}, 52591, 52593,
-    52600, 52616, {f: 2, c: 52628}, 52632, 52636, {f: 2, c: 52644}, 52647,
-    52649, 52656, 52676, 52684, 52688, 52712, 52716, 52720, {f: 2, c: 52728},
-    52731, 52733, 52740, 52744, 52748, 52756, 52761, {f: 2, c: 52768}, 52772,
-    52776, {f: 2, c: 52784}, 52787, 52789, {f: 2, c: 52824}, 52828,
-    {f: 3, c: 52831}, {f: 2, c: 52840}, 52843, 52845, {f: 2, c: 52852}, 52856,
-    52860, {f: 2, c: 52868}, 52871, 52873, {f: 2, c: 52880}, 52884, 52888,
-    {f: 2, c: 52896}, {f: 3, c: 52899}, {f: 2, c: 52908}, 52929,
-    {f: 2, c: 52964}, 52968, {f: 2, c: 52971}, {f: 2, c: 52980},
-    {f: 3, c: 52983}, {f: 2, c: 52992}, 52996, 53000, {f: 2, c: 53008}, 53011,
-    53013, 53020, 53024, 53028, {f: 2, c: 53036}, {f: 3, c: 53039}, 53048,
-    {f: 2, c: 53076}, 53080, 53084, {f: 2, c: 53092}, 53095, 53097,
-    {f: 2, c: 53104}, 53108, 53112, 53120, 53125, 53132, 53153, 53160, 53168,
-    53188, {f: 2, c: 53216}, 53220, 53224, {f: 2, c: 53232}, 53235, 53237,
-    53244, 53248, 53252, 53265, 53272, 53293, {f: 2, c: 53300}, 53304, 53308,
-    {f: 2, c: 53316}, 53319, 53321, 53328, 53332, 53336, 53344,
-    {f: 2, c: 53356}, 53360, 53364, {f: 2, c: 53372}, 53377, {f: 2, c: 53412},
-    53416, 53420, {f: 2, c: 53428}, 53431, 53433, {f: 2, c: 53440}, 53444,
-    {f: 2, c: 53448}, {f: 2, c: 53456}, {f: 3, c: 53459}, {f: 2, c: 53468},
-    53472, 53476, {f: 2, c: 53484}, {f: 3, c: 53487}, 53496, 53517,
-    {f: 2, c: 53552}, 53556, 53560, 53562, {f: 2, c: 53568}, {f: 3, c: 53571},
-    {f: 2, c: 53580}, 53584, 53588, {f: 2, c: 53596}, 53599, 53601, 53608,
-    53612, 53628, 53636, 53640, {f: 2, c: 53664}, 53668, 53672,
-    {f: 2, c: 53680}, 53683, 53685, 53690, 53692, 53696, 53720, 53748, 53752,
-    53767, 53769, 53776, {f: 2, c: 53804}, 53808, 53812, {f: 2, c: 53820},
-    53823, 53825, 53832, 53852, 53860, {f: 2, c: 53888}, 53892, 53896,
-    {f: 2, c: 53904}, 53909, 53916, 53920, 53924, 53932, 53937,
-    {f: 2, c: 53944}, 53948, {f: 2, c: 53951}, 53954, {f: 2, c: 53960}, 53963,
-    53972, 53976, 53980, {f: 2, c: 53988}, {f: 2, c: 54000}, 54004, 54008,
-    {f: 2, c: 54016}, 54019, 54021, {f: 3, c: 54028}, 54032, 54036, 54038,
-    {f: 2, c: 54044}, {f: 3, c: 54047}, 54053, {f: 2, c: 54056}, 54060, 54064,
-    {f: 2, c: 54072}, {f: 3, c: 54075}, {f: 2, c: 54084}, {f: 2, c: 54140},
-    54144, 54148, {f: 2, c: 54156}, {f: 3, c: 54159}, {f: 2, c: 54168}, 54172,
-    54176, {f: 2, c: 54184}, 54187, 54189, 54196, 54200, 54204,
-    {f: 2, c: 54212}, {f: 2, c: 54216}, 54224, 54232, 54241, 54243,
-    {f: 2, c: 54252}, 54256, 54260, {f: 2, c: 54268}, 54271, 54273, 54280,
-    54301, 54336, 54340, 54364, 54368, 54372, 54381, 54383, {f: 2, c: 54392},
-    54396, {f: 2, c: 54399}, 54402, {f: 2, c: 54408}, 54411, 54413, 54420,
-    54441, 54476, 54480, 54484, 54492, 54495, 54504, 54508, 54512, 54520,
-    54523, 54525, 54532, 54536, 54540, {f: 2, c: 54548}, 54551,
-    {f: 2, c: 54588}, 54592, 54596, {f: 2, c: 54604}, 54607, 54609,
-    {f: 2, c: 54616}, 54620, 54624, 54629, {f: 2, c: 54632}, 54635, 54637,
-    {f: 2, c: 54644}, 54648, 54652, {f: 2, c: 54660}, {f: 3, c: 54663}, 54672,
-    54693, {f: 2, c: 54728}, 54732, 54736, 54738, {f: 2, c: 54744}, 54747,
-    54749, {f: 2, c: 54756}, 54760, 54764, {f: 2, c: 54772}, 54775, 54777,
-    {f: 2, c: 54784}, 54788, 54792, {f: 2, c: 54800}, {f: 3, c: 54803}, 54812,
-    54816, 54820, 54829, {f: 2, c: 54840}, 54844, 54848, 54853,
-    {f: 2, c: 54856}, 54859, 54861, 54865, {f: 2, c: 54868}, 54872, 54876,
-    54887, 54889, {f: 2, c: 54896}, 54900, 54915, 54917, {f: 2, c: 54924},
-    54928, 54932, 54941, 54943, 54945, 54952, 54956, 54960, 54969, 54971,
-    {f: 2, c: 54980}, 54984, 54988, 54993, 54996, 54999, 55001, 55008, 55012,
-    55016, 55024, 55029, {f: 2, c: 55036}, 55040, 55044, 55057,
-    {f: 2, c: 55064}, 55068, 55072, {f: 2, c: 55080}, 55083, 55085,
-    {f: 2, c: 55092}, 55096, 55100, 55108, 55111, 55113, {f: 2, c: 55120},
-    55124, {f: 4, c: 55126}, {f: 2, c: 55136}, 55139, 55141, 55145, 55148,
-    55152, 55156, {f: 2, c: 55164}, 55169, {f: 2, c: 55176}, 55180, 55184,
-    {f: 2, c: 55192}, 55195, 55197, 20285, 20339, 20551, 20729, 21152, 21487,
-    21621, 21733, 22025, 23233, 23478, 26247, {f: 2, c: 26550}, 26607, 27468,
-    29634, 30146, 31292, 33499, 33540, 34903, 34952, 35382, [36040, 63747],
-    36303, 36603, 36838, 39381, 21051, 21364, 21508, 24682, 24932, 27580,
-    29647, 33050, 35258, [12179, 35282], 38307, 20355, 21002, 22718, 22904,
-    23014, [12082, 24178], 24185, 25031, 25536, 26438, 26604, 26751, 28567,
-    30286, 30475, 30965, 31240, 31487, 31777, 32925, [12169, 33390], 33393,
-    35563, 38291, 20075, 21917, 26359, 28212, 30883, 31469, 33883, 35088,
-    34638, 38824, 21208, 22350, 22570, 23884, 24863, 25022, 25121, 25954,
-    26577, 27204, 28187, [12130, 29976], 30131, 30435, 30640, 32058, 37039,
-    {f: 2, c: 37969}, 40853, 21283, 23724, 30002, 32987, 37440, 38296, 21083,
-    22536, 23004, 23713, 23831, 24247, 24378, 24394, 24951, 27743, 30074,
-    30086, 31968, 32115, 32177, 32652, 33108, 33313, 34193, 35137, 35611,
-    37628, [38477, 64009], 40007, 20171, 20215, 20491, 20977, 22607, 24887,
-    24894, 24936, 25913, 27114, 28433, 30117, 30342, 30422, 31623, 33445,
-    33995, 37799, 38283, 21888, 23458, 22353, 31923, 32697, 37301, 20520,
-    21435, 23621, 24040, 25298, 25454, 25818, 25831, 28192, 28844, 31067,
-    36317, 36382, 36989, 37445, 37624, 20094, 20214, 20581, [12081, 24062],
-    24314, 24838, 26967, 33137, 34388, 36423, 37749, 39467, 20062, 20625,
-    26480, 26688, 20745, 21133, 21138, 27298, 30652, 37392, 40660, 21163,
-    24623, 36850, 20552, 25001, 25581, 25802, 26684, 27268, 28608, 33160,
-    35233, 38548, 22533, 29309, [12125, 29356], 29956, 32121, 32365, 32937,
-    [12178, 35211, 64010], 35700, 36963, 40273, 25225, 27770, 28500, 32080,
-    32570, 35363, 20860, 24906, 31645, 35609, 37463, 37772, 20140, 20435,
-    20510, 20670, 20742, 21185, 21197, 21375, 22384, 22659, 24218, 24465,
-    24950, 25004, 25806, 25964, 26223, 26299, [26356, 63745], 26775, 28039,
-    28805, 28913, 29855, 29861, 29898, 30169, 30828, 30956, 31455, 31478,
-    32069, 32147, 32789, 32831, 33051, 33686, 35686, 36629, 36885, 37857,
-    38915, 38968, 39514, 39912, 20418, 21843, 22586, [22865, 63753], 23395,
-    23622, 24760, 25106, 26690, 26800, 26856, 28330, 30028, 30328, 30926,
-    31293, 31995, 32363, 32380, 35336, 35489, 35903, 38542, 40388, 21476,
-    21481, 21578, 21617, 22266, 22993, 23396, 23611, 24235, 25335, 25911,
-    25925, 25970, 26272, 26543, 27073, 27837, 30204, 30352, 30590, 31295,
-    32660, 32771, 32929, 33167, 33510, 33533, 33776, 34241, 34865, 34996,
-    35493, 36764, 37678, 38599, 39015, [12220, 39640], [12238, 40723], 21741,
-    26011, 26354, 26767, 31296, [12181, 35895], 40288, 22256, 22372, 23825,
-    26118, 26801, 26829, 28414, 29736, 34974, 39908, 27752, [12219, 39592],
-    20379, 20844, 20849, 21151, 23380, [12079, 24037], 24656, 24685, 25329,
-    25511, 25915, 29657, 31354, 34467, 36002, 38799, [20018, 63749], 23521,
-    [12093, 25096], 26524, [12128, 29916], 31185, 33747, 35463, 35506, 36328,
-    36942, 37707, 38982, [24275, 64011], 27112, 34303, 37101, 20896, 23448,
-    23532, 24931, 26874, 27454, 28748, 29743, 29912, 31649, 32592, 33733,
-    35264, 36011, 38364, 39208, 21038, 24669, 25324, 36866, 20362, 20809,
-    21281, 22745, 24291, 26336, 27960, 28826, 29378, 29654, 31568, 33009,
-    37979, 21350, 25499, 32619, 20054, 20608, 22602, 22750, 24618, 24871,
-    25296, 27088, 39745, 23439, 32024, 32945, 36703, 20132, 20689, 21676,
-    21932, 23308, 23968, 24039, 25898, 25934, 26657, 27211, 29409, 30350,
-    30703, 32094, 32761, 33184, 34126, 34527, 36611, 36686, 37066, 39171,
-    39509, 39851, 19992, 20037, 20061, 20167, 20465, 20855, 21246, 21312,
-    [12061, 21475], [21477, 63750], 21646, 22036, 22389, 22434, 23495, 23943,
-    24272, 25084, 25304, 25937, 26552, 26601, 27083, 27472, 27590, 27628,
-    27714, 28317, 28792, 29399, 29590, 29699, 30655, 30697, 31350, 32127,
-    32777, [12165, 33276], 33285, 33290, 33503, 34914, 35635, 36092, 36544,
-    36881, 37041, 37476, 37558, 39378, 39493, 40169, 40407,
-    [12244, 40860, 63751, 63752], 22283, 23616, 33738, 38816, 38827, 40628,
-    21531, 31384, 32676, 35033, 36557, 37089, 22528, 23624, 25496, 31391,
-    23470, [12088, 24339], 31353, 31406, 33422, 36524, 20518, 21048, 21240,
-    21367, 22280, 25331, 25458, 27402, 28099, 30519, 21413, 29527, 34152,
-    36470, 38357, 26426, 27331, 28528, 35437, 36556, 39243, 26231, 27512,
-    36020, [12225, 39740], 21483, 22317, 22862, 25542, 27131, 29674, 30789,
-    31418, 31429, 31998, 33909, 35215, 36211, 36917, 38312, 21243, 22343,
-    30023, 31584, 33740, 37406, 27224, 20811, 21067, 21127, 25119, 26840,
-    26997, 38553, 20677, 21156, 21220, 25027, [12100, 26020], 26681, 27135,
-    29822, 31563, 33465, 33771, 35250, 35641, 36817, 39241, 20170, 22935,
-    25810, 26129, 27278, 29748, 31105, 31165, 33449, {f: 2, c: 34942}, 35167,
-    37670, 20235, 21450, 24613, 25201, 27762, 32026, 32102, 20120, 20834,
-    30684, 32943, 20225, 20238, 20854, 20864, 21980, 22120, 22331, 22522,
-    22524, 22804, 22855, 22931, 23492, 23696, 23822, [12080, 24049], 24190,
-    24524, 25216, 26071, 26083, {f: 2, c: 26398}, 26462, 26827, 26820, 27231,
-    27450, 27683, 27773, 27778, 28103, 29592, 29734, 29738, 29826, 29859,
-    30072, 30079, 30849, 30959, 31041, {f: 2, c: 31047}, 31098, 31637, 32000,
-    32186, 32648, 32774, 32813, 32908, 35352, 35663, [35912, 63744], 36215,
-    37665, 37668, 39138, 39249, {f: 2, c: 39438}, 39525, 40594, 32202, 20342,
-    21513, 25326, 26708, [12198, 37329, 63754], 21931, 20794, 23068, 25062,
-    [25295, 63835], 25343, 37027, [35582, 63837], 26262, 29014, 38627, 25423,
-    25466, 21335, 26511, 26976, 28275, 30007, 32013, 34930, 22218, 23064,
-    20035, 20839, [22856, 63756], 26608, 32784, [12069, 22899, 63873],
-    [24180, 63886], [25754, 63889], [31178, 63893], [24565, 63907], 24684,
-    25288, [25467, 63908], [23527, 63839, 63914], 23511, 21162, 22900, 24361,
-    [24594, 63840], 29785, 39377, 28611, 33215, 36786, 24817, 33126,
-    [23615, 63933], 23273, 35365, [26491, 63944], [32016, 63951], 33021, 23612,
-    [27877, 63971], [21311, 63979], [28346, 63980], 22810, [33590, 63998],
-    [20025, 63838], 20150, 20294, 21934, 22296, 22727, 24406, 26039, 26086,
-    27264, 27573, 28237, 30701, 31471, 31774, 32222, 34507, 34962, 37170,
-    37723, 25787, 28606, 29562, 30136, 36948, 21846, 22349, 25018, 25812,
-    26311, 28129, 28251, 28525, 28601, 30192, 32835, 33213, 34113, 35203,
-    35527, 35674, 37663, 27795, 30035, 31572, 36367, 36957, 21776, 22530,
-    22616, 24162, 25095, 25758, 26848, 30070, [31958, 64003], 34739, 40680,
-    20195, 22408, 22382, [12068, 22823], 23565, 23729, 24118, 24453, 25140,
-    25825, 29619, 33274, 34955, 36024, 38538, 40667, [23429, 64004], 24503,
-    24755, 20498, [12049, 20992], 21040, 22294, 22581, 22615, 23566, 23648,
-    23798, 23947, [24230, 64001], 24466, 24764, 25361, 25481, 25623, 26691,
-    26873, 27330, 28120, 28193, 28372, 28644, 29182, 30428, 30585, 31153,
-    31291, 33796, 35241, 36077, 36339, 36424, 36867, 36884, 36947, 37117,
-    37709, 38518, 38876, 27602, 28678, 29272, 29346, 29544, 30563, 31167,
-    31716, 32411, [35712, 63834], 22697, 24775, 25958, 26109, 26302, 27788,
-    28958, 29129, 35930, 38931, 20077, 31361, 20189, 20908, 20941, 21205,
-    21516, 24999, 26481, 26704, 26847, [27934, 64005], 28540, 30140, 30643,
-    31461, 33012, 33891, 37509, 20828, [12099, 26007], 26460, 26515, 30168,
-    31431, 33651, [12182, 35910], 36887, 38957, 23663, 33216, 33434, 36929,
-    36975, 37389, 24471, 23965, 27225, 29128, 30331, 31561, 34276, 35588,
-    37159, 39472, [21895, 63755], [25078, 63757], [30313, 63758],
-    [32645, 63759], [34367, 63760], [34746, 63761], [35064, 63762],
-    [37007, 63763], [27931, 63765], [28889, 63766], [29662, 63767], 32097,
-    [33853, 63768], [37226, 63769], [39409, 63770], [20098, 63771],
-    [21365, 63772], [27396, 63773], 27410, 28734, [29211, 63774],
-    [34349, 63775], [40478, 63776], 21068, 36771, [23888, 63777], 25829, 25900,
-    27414, [28651, 63778], 31811, 32412, [34253, 63779], [35172, 63780], 35261,
-    [25289, 63781], [33240, 63782], [34847, 63783], [24266, 63784],
-    [26391, 63785], [28010, 63786], [29436, 63787], 29701, 29807, 34690,
-    [37086, 63788], [20358, 63789], 23821, 24480, 33802, [20919, 63790],
-    [25504, 63861], [30053, 63862], [20142, 63863], 20486, [20841, 63864],
-    [20937, 63865], [26753, 63866], 27153, 31918, 31921, [31975, 63867],
-    [33391, 63868], [35538, 63869], 36635, [37327, 63870], 20406, 20791,
-    [21237, 63871], [21570, 63872], [24300, 63874], 24942, 25150,
-    [26053, 63875], 27354, [28670, 63876], [31018, 63877], 34268, 34851,
-    [38317, 63878], 39522, [39530, 63879], [40599, 63880], [40654, 63881],
-    [12050, 21147, 63882], [26310, 63883], [27511, 63884], 28701, 31019,
-    [36706, 63885], 38722, [24976, 63887], [25088, 63888], 25891,
-    [28451, 63890], [29001, 63891], [29833, 63892], [32244, 63894],
-    [32879, 63895], [34030, 63897], [36646, 63896], [36899, 63898],
-    [37706, 63899], 20925, [21015, 63900], [21155, 63901], 27916,
-    [28872, 63903], [35010, 63904], [24265, 63906], 25986, [27566, 63909],
-    28610, [31806, 63910], [29557, 63911], [20196, 63912], 20278,
-    [22265, 63913], 23738, [23994, 63915], [24604, 63916], [29618, 63917],
-    31533, [32666, 63919], 32718, [32838, 63920], 36894, [37428, 63921],
-    [38646, 63922], [38728, 63923], [38936, 63924], 40801, [20363, 63925],
-    28583, [31150, 63926], [37300, 63927], [38583, 63928], [21214, 63791],
-    25736, [25796, 63792], [27347, 63793], 28510, 28696, [29200, 63794],
-    [30439, 63795], [12156, 32769, 63796], [34310, 63797], [34396, 63798],
-    [36335, 63799], 36613, [38706, 63800], [39791, 63801], [40442, 63802],
-    [12228, 40565], [30860, 63803], [31103, 63804], [32160, 63805],
-    [33737, 63806], [37636, 63807], [12229, 40575, 63808], 40595,
-    [35542, 63809], [22751, 63810], [24324, 63811], 26407, 28711, 29903,
-    [31840, 63812], [32894, 63813], 20769, 28712, [29282, 63814],
-    [30922, 63815], [36034, 63816], 36058, 36084, [38647, 63817],
-    [20102, 63930], [20698, 63931], [23534, 63932], 24278, [26009, 63934],
-    [29134, 63936], [30274, 63937], 30637, 32842, [34044, 63938],
-    [36988, 63939], 39719, [12243, 40845, 63940], [22744, 63818], 23105,
-    [23650, 63819], [27155, 63820], [28122, 63821], [28431, 63822], 30267,
-    [32047, 63823], [32311, 63824], 34078, 35128, 37860, [38475, 63825],
-    [21129, 63943], 26066, [26611, 63945], 27060, [27969, 63946],
-    [28316, 63947], 28687, [29705, 63948], 29792, [30041, 63949], 30244,
-    [30827, 63950], 35628, [39006, 63952], [20845, 63953], [25134, 63954],
-    [38520, 63955], 20374, [20523, 63956], [23833, 63957], [28138, 63958],
-    32184, [36650, 63959], [24459, 63960], [24900, 63961], [26647, 63962],
-    [38534, 63964], [21202, 63826], [32907, 63827], [20956, 63828],
-    [20940, 63829], 26974, [31260, 63830], [32190, 63831], [33777, 63832],
-    [38517, 63833], 20442, [21033, 63965], 21400, [21519, 63966], 21774,
-    [23653, 63967], 24743, [26446, 63969], [26792, 63970], 28012, 29313, 29432,
-    [29702, 63972], 29827, [30178, 63973], 31852, [32633, 63974], 32696, 33673,
-    [35023, 63975], [35041, 63976], [12197, 37324, 63977], 37328,
-    [38626, 63978], 39881, [21533, 63981], 28542, [29136, 63982],
-    [29848, 63983], [34298, 63984], 36522, [38563, 63985], [40023, 63986],
-    [40607, 63987], [26519, 63988], [28107, 63989], 29747, [33256, 63990],
-    38678, 30764, [12148, 31435, 63991], [31520, 63992], [31890, 63993], 25705,
-    29802, 30194, 30908, 30952, [12218, 39340], 39764, [12231, 40635], 23518,
-    24149, 28448, 33180, 33707, 37000, 19975, 21325, 23081, 24018, 24398,
-    24930, 25405, 26217, 26364, 28415, 28459, 28771, 30622, 33836, 34067,
-    34875, 36627, 39237, 39995, 21788, 25273, 26411, 27819, 33545, 35178,
-    38778, 20129, 22916, {f: 2, c: 24536}, 26395, 32178, 32596, 33426, 33579,
-    33725, 36638, 37017, 22475, 22969, 23186, 23504, 26151, 26522, 26757,
-    27599, 29028, 32629, 36023, 36067, 36993, 39749, 33032, 35978, 38476,
-    39488, [12230, 40613], 23391, 27667, 29467, 30450, 30431, 33804, 20906,
-    35219, 20813, 20885, 21193, 26825, 27796, 30468, 30496, 32191, 32236,
-    [12207, 38754], 40629, 28357, 34065, 20901, 21517, 21629, 26126, 26269,
-    26919, 28319, [12139, 30399], 30609, 33559, 33986, 34719, 37225, 37528,
-    40180, 34946, 20398, 20882, 21215, 22982, 24125, 24917, {f: 2, c: 25720},
-    26286, 26576, 27169, 27597, [12113, 27611], 29279, 29281, 29761, 30520,
-    [12141, 30683], 32791, 33468, 33541, 35584, 35624, 35980, [12106, 26408],
-    27792, 29287, [12140, 30446], 30566, 31302, 40361, 27519, 27794, 22818,
-    26406, 33945, 21359, 22675, 22937, 24287, 25551, 26164, 26483, 28218,
-    29483, 31447, 33495, 37672, 21209, 24043, 25006, 25035, 25098, 25287,
-    25771, [12102, 26080], 26969, 27494, [12111, 27595], 28961, 29687, 30045,
-    32326, 33310, 33538, 34154, 35491, 36031, 38695, 40289, 22696, 40664,
-    20497, 21006, 21563, 21839, [12098, 25991], 27766, {f: 2, c: 32010}, 32862,
-    34442, [12200, 38272], 38639, 21247, 27797, 29289, 21619, 23194, 23614,
-    23883, 24396, 24494, 26410, 26806, 26979, 28220, 28228, 30473,
-    [12150, 31859], 32654, 34183, 35598, 36855, 38753, 40692, 23735, 24758,
-    24845, 25003, 25935, {f: 2, c: 26107}, 27665, 27887, 29599, 29641, 32225,
-    38292, 23494, 34588, 35600, 21085, 21338, 25293, 25615, 25778, 26420,
-    27192, 27850, 29632, 29854, 31636, 31893, 32283, 33162, 33334, 34180,
-    36843, 38649, 39361, 20276, 21322, 21453, 21467, 25292, 25644, 25856,
-    26001, 27075, 27886, 28504, 29677, 30036, 30242, 30436, 30460, 30928,
-    [30971, 63844], 31020, 32070, 33324, 34784, 36820, 38930, 39151, 21187,
-    25300, 25765, 28196, 28497, 30332, 36299, 37297, 37474, 39662, 39747,
-    20515, 20621, 22346, 22952, 23592, 24135, 24439, 25151, 25918,
-    [12101, 26041], 26049, 26121, 26507, 27036, 28354, 30917, 32033, 32938,
-    33152, 33323, 33459, 33953, 34444, 35370, 35607, 37030, 38450, 40848,
-    20493, 20467, 22521, 24472, 25308, 25490, 26479, 28227, 28953, 30403,
-    32972, 32986, {f: 2, c: 35060}, 35097, 36064, 36649, 37197, 38506, 20271,
-    20336, 24091, 26575, 26658, [12137, 30333], 30334, 39748, 24161, 27146,
-    29033, 29140, 30058, 32321, 34115, 34281, 39132, 20240, 31567, 32624,
-    38309, 20961, 24070, 26805, 27710, 27726, 27867, 29359, 31684, 33539,
-    27861, 29754, 20731, 21128, 22721, 25816, 27287, 29863, 30294, 30887,
-    34327, 38370, 38713, 21342, 24321, 35722, 36776, 36783, 37002, 21029,
-    30629, 40009, 40712, 19993, 20482, 20853, 23643, 24183, 26142, 26170,
-    26564, 26821, 28851, 29953, 30149, 31177, 31453, 36647, 39200, 39432,
-    20445, 22561, 22577, 23542, 26222, 27493, 27921, 28282, 28541, 29668,
-    29995, 33769, 35036, 35091, 35676, 36628, 20239, 20693, 21264,
-    [12056, 21340], 23443, [24489, 63846], 26381, 31119, 33145, 33583, 34068,
-    35079, 35206, 36665, [36667, 64007], 39333, 39954, 26412, 20086, 20472,
-    22857, 23553, {f: 2, c: 23791}, 25447, 26834, 28925, 29090, 29739, 32299,
-    34028, 34562, 36898, 37586, 40179, [19981, 63847], 20184, 20463, 20613,
-    21078, 21103, 21542, 21648, 22496, 22827, 23142, 23386, 23413, 23500,
-    24220, 25206, 25975, 26023, 28014, 28325, [12119, 29238], 31526, 31807,
-    [12152, 32566], {f: 2, c: 33104}, 33178, 33344, 33433, 33705, 35331, 36000,
-    36070, 36091, 36212, 36282, 37096, 37340, [12201, 38428], 38468, 39385,
-    40167, [21271, 63843], 20998, 21545, 22132, 22707, 22868, 22894, 24575,
-    24996, 25198, 26128, 27774, 28954, 30406, 31881, 31966, 32027, 33452,
-    36033, 38640, 20315, 24343, 24447, 25282, 23849, 26379, 26842, 30844,
-    32323, 40300, 19989, 20633, [12052, 21269], 21290, 21329, 22915, 23138,
-    24199, 24754, 24970, 25161, 25209, 26000, 26503, 27047, [12112, 27604],
-    {f: 3, c: 27606}, 27832, 29749, 30202, 30738, 30865, 31189, 31192, 31875,
-    32203, 32737, 32933, 33086, 33218, 33778, 34586, 35048, 35513, 35692,
-    36027, 37145, [12206, 38750], [12214, 39131], [12240, 40763], 22188, 23338,
-    24428, 25996, 27315, 27567, 27996, 28657, 28693, 29277, 29613, 36007,
-    36051, 38971, 24977, 27703, 32856, 39425, 20045, 20107, 20123, 20181,
-    20282, 20284, 20351, 20447, 20735, 21490, 21496, 21766, 21987, 22235,
-    [12064, 22763], 22882, 23057, 23531, 23546, 23556, 24051, 24107, 24473,
-    24605, 25448, 26012, 26031, 26614, 26619, 26797, 27515, 27801, 27863,
-    28195, 28681, 29509, 30722, 31038, 31040, 31072, 31169, 31721, 32023,
-    32114, 32902, 33293, 33678, 34001, 34503, 35039, 35408, 35422, 35613,
-    36060, 36198, 36781, 37034, 39164, 39391, 40605, 21066, 26388, 20632,
-    21034, [12077, 23665], 25955, 27733, 29642, 29987, 30109, 31639, 33948,
-    37240, 38704, 20087, 25746, [27578, 63856], 29022, 34217, 19977, 26441,
-    26862, 28183, 33439, 34072, 34923, 25591, 28545, 37394, 39087, 19978,
-    20663, 20687, 20767, 21830, 21930, 22039, 23360, 23577, 23776, 24120,
-    24202, 24224, 24258, 24819, 26705, 27233, 28248, 29245, 29248,
-    [29376, 63994], 30456, 31077, 31665, 32724, 35059, 35316, 35443, 35937,
-    36062, 38684, [22622, 63852], 29885, 36093, 21959, 31329, [32034, 63850],
-    [12170, 33394], 29298, [12131, 29983], 29989, 31513, 22661, 22779, 23996,
-    24207, 24246, 24464, 24661, 25234, 25471, 25933, 26257, 26329, 26360,
-    26646, 26866, 29312, 29790, 31598, 32110, 32214, 32626, 32997, 33298,
-    34223, 35199, 35475, 36893, 37604, [12233, 40653], [12239, 40736],
-    [12067, 22805], 22893, 24109, 24796, 26132, 26227, 26512, 27728, 28101,
-    28511, [12143, 30707], 30889, 33990, 37323, 37675, 20185, 20682, 20808,
-    21892, 23307, 23459, 25159, 25982, 26059, 28210, 29053, 29697, 29764,
-    29831, 29887, 30316, 31146, 32218, 32341, 32680, 33146, 33203, 33337,
-    34330, 34796, 35445, 36323, 36984, 37521, 37925, 39245, 39854, 21352,
-    23633, 26964, 27844, 27945, 28203, [12166, 33292], 34203, 35131, 35373,
-    [35498, 63855, 63905], 38634, 40807, 21089, 26297, 27570, 32406, 34814,
-    36109, 38275, 38493, 25885, 28041, 29166, 22478, 22995, 23468, 24615,
-    24826, 25104, 26143, 26207, 29481, 29689, 30427, [30465, 63853], 31596,
-    32854, 32882, 33125, 35488, 37266, 19990, 21218, 27506, 27927, 31237,
-    31545, 32048, 36016, 21484, 22063, 22609, 23477, [12073, 23567], 23569,
-    24034, 25152, 25475, 25620, 26157, 26803, 27836, 28040, 28335, 28703,
-    28836, 29138, 29990, 30095, 30094, 30233, 31505, 31712, 31787, 32032,
-    32057, 34092, 34157, 34311, 35380, 36877, 36961, 37045, 37559, 38902,
-    39479, 20439, 23660, 26463, 28049, 31903, 32396, 35606, 36118, 36895,
-    23403, 24061, 25613, 33984, 36956, 39137, [29575, 63841, 63963], 23435,
-    24730, 26494, 28126, 35359, 35494, 36865, 38924, 21047, 28753, 30862,
-    37782, 34928, 37335, 20462, 21463, 22013, 22234, 22402, 22781, 23234,
-    23432, 23723, 23744, 24101, 24833, 25101, [12095, 25163], 25480, 25628,
-    25910, [25976, 63849], 27193, 27530, [12116, 27700], 27929, 28465, 29159,
-    29417, 29560, 29703, 29874, 30246, 30561, 31168, 31319, 31466, 31929,
-    32143, 32172, 32353, 32670, 33065, 33585, 33936, 34010, 34282, 34966,
-    35504, 35728, 36664, 36930, 36995, 37228, 37526, 37561, 38539,
-    {f: 2, c: 38567}, 38614, 38656, 38920, [12216, 39318], 39635, 39706, 21460,
-    22654, 22809, 23408, 23487, 28113, 28506, 29087, 29729, 29881, 32901,
-    33789, 24033, 24455, 24490, 24642, 26092, 26642, 26991, 27219, 27529,
-    27957, 28147, 29667, 30462, 30636, 31565, 32020, 33059, 33308, 33600,
-    34036, 34147, 35426, 35524, 37255, 37662, 38918, 39348, 25100, 34899,
-    36848, 37477, 23815, 23847, 23913, 29791, 33181, 34664, 28629,
-    [25342, 63859], 32722, 35126, 35186, 19998, 20056, 20711, 21213, 21319,
-    25215, 26119, 32361, 34821, 38494, 20365, 21273, 22070, 22987, 23204,
-    [12075, 23608], 23630, 23629, 24066, 24337, 24643, 26045, 26159, 26178,
-    26558, 26612, 29468, [12142, 30690], [12144, 31034], 32709, 33940, 33997,
-    35222, 35430, 35433, 35553, [12183, 35925], 35962, 22516, 23508, 24335,
-    24687, 25325, 26893, 27542, 28252, 29060, 31698, 34645, [35672, 63996],
-    36606, [12215, 39135], 39166, 20280, 20353, 20449, 21627, 23072, 23480,
-    24892, 26032, 26216, 29180, 30003, 31070, 32051, 33102, [12162, 33251],
-    33688, 34218, 34254, 34563, 35338, [12189, 36523], [12191, 36763], 36805,
-    22833, 23460, 23526, 24713, 23529, 23563, [12092, 24515], 27777, 28145,
-    28683, 29978, 33455, 35574, [20160, 63997], [12055, 21313], 38617,
-    [12114, 27663], 20126, 20420, 20818, 21854, 23077, 23784, 25105,
-    [12123, 29273], 33469, 33706, 34558, 34905, 35357, 38463, 38597, 39187,
-    40201, 40285, 22538, 23731, 23997, 24132, [24801, 63929], 24853, 25569,
-    [27138, 63764, 63836, 63935], 28197, 37122, 37716, 38990, 39952, 40823,
-    23433, 23736, 25353, 26191, 26696, 30524, 38593, 38797, 38996, 39839,
-    26017, 35585, 36555, 38332, 21813, 23721, 24022, 24245, 26263, 30284,
-    33780, 38343, 22739, 25276, 29390, 40232, 20208, 22830, 24591, 26171,
-    27523, 31207, 40230, 21395, 21696, 22467, 23830, 24859, 26326, 28079,
-    30861, 33406, 38552, 38724, 21380, 25212, 25494, 28082, 32266, 33099,
-    38989, 27387, 32588, 40367, 40474, 20063, 20539, 20918, 22812, 24825,
-    25590, 26928, 29242, 32822, 37326, 24369, 32004, [33509, 63860], 33903,
-    33979, 34277, 36493, 20335, 22756, 23363, 24665, 25562, 25880, 25965,
-    26264, 26954, 27171, 27915, 28673, 29036, 30162, 30221, 31155, 31344,
-    [12154, 32650], 35140, 35731, 37312, 38525, 39178, 22276, 24481, 26044,
-    28417, 30208, 31142, 35486, 39341, [12226, 39770], 40812, 20740, 25014,
-    25233, 27277, 33222, 20547, 22576, 24422, 28937, [12180, 35328], 35578,
-    23420, 34326, 20474, 20796, 22196, 22852, 25513, 28153, 23978, 26989,
-    20870, 20104, 20313, 22914, 27487, 27741, 29877, 30998, 33287, 33349,
-    33593, 36671, 36701, 39192, 20134, 22495, 24441, [26131, 63968], 30123,
-    32377, 35695, 36870, 39515, 22181, 22567, 23032, 23071, 23476, 24310,
-    25424, 25403, 26941, 27783, 27839, 28046, 28051, 28149, 28436, 28895,
-    28982, 29017, 29123, 29141, 30799, 30831, 31605, 32227, 32303, 34893,
-    36575, 37467, 40182, 24709, 28037, 29105, 38321, 21421, 26579, 28814,
-    28976, 29744, 33398, 33490, 38331, 39653, 40573, 26308, 29121,
-    [33865, 63854], 22603, 23992, 24433, 26144, 26254, 27001, 27054, 27704,
-    27891, 28214, 28481, 28634, 28699, 28719, 29008, 29151, 29552, 29787,
-    29908, 30408, 31310, 32403, 33521, 35424, 36814, 37704, 38681, 20034,
-    20522, 21000, 21473, 26355, 27757, 28618, 29450, 30591, 31330, 33454,
-    34269, 34306, 35028, 35427, 35709, 35947, 37555, 38675, 38928, 20116,
-    20237, 20425, 20658, 21320, 21566, 21555, 21978, 22626, 22714, 22887,
-    23067, 23524, 24735, 25034, 25942, 26111, 26212, 26791, 27738, 28595,
-    28879, 29100, 29522, 31613, 34568, 35492, 39986, 40711, 23627, 27779,
-    29508, [12127, 29577], 37434, 28331, 29797, 30239, 31337, 32277, 34314,
-    20800, 22725, 25793, 29934, 29973, 30320, 32705, 37013, 38605, 39252,
-    28198, [12129, 29926], {f: 2, c: 31401}, 33253, 34521, 34680, 35355, 23113,
-    23436, 23451, 26785, 26880, 28003, 29609, 29715, 29740, 30871, 32233,
-    32747, 33048, 33109, 33694, 35916, [38446, 63942], 38929, [12104, 26352],
-    24448, 26106, 26505, 27754, 29579, 20525, 23043, 27498, 30702, 22806,
-    23916, 24013, 29477, 30031, 20709, 20985, 22575, 22829, 22934, 23002,
-    23525, 23970, 25303, 25622, 25747, 25854, 26332, 27208, 29183, 29796,
-    31368, 31407, 32327, 32350, 32768, 33136, 34799, 35201, 35616, 36953,
-    36992, 39250, 24958, 27442, 28020, 32287, 35109, 36785, 20433, 20653,
-    20887, 21191, 22471, 22665, 23481, 24248, 24898, 27029, 28044, 28263,
-    28342, 29076, 29794, [12132, 29992], 29996, 32883, 33592, 33993, 36362,
-    37780, 37854, 20110, 20305, 20598, 20778, [12060, 21448], 21451, 21491,
-    23431, 23507, 23588, 24858, 24962, 26100, [12124, 29275], 29591, 29760,
-    30402, 31056, 31121, 31161, 32006, [12155, 32701], 33419, 34261, 34398,
-    36802, 36935, 37109, 37354, 38533, [12204, 38632], 38633, 21206, 24423,
-    26093, 26161, 26671, 29020, 31286, 37057, 38922, 20113, 27218, 27550,
-    28560, 29065, 32792, 33464, 34131, 36939, 38549, 38642, 38907, 34074,
-    39729, 20112, 29066, 38596, 20803, 21407, 21729, 22291, 22290, 22435,
-    23195, 23236, 23491, 24616, 24895, 25588, 27781, 27961, 28274, 28304,
-    29232, 29503, 29783, 33489, 34945, 36677, 36960, 38498, 39000, 40219,
-    [12105, 26376], 36234, 37470, 20301, 20553, 20702, 21361, 22285, 22996,
-    23041, 23561, 24944, 26256, 28205, 29234, 29771, 32239, 32963, 33806,
-    33894, 34111, 34655, 34907, 35096, 35586, 36949, [12209, 38859], 39759,
-    20083, 20369, 20754, 20842, 21807, 21929, 23418, 23461, {f: 2, c: 24188},
-    24254, 24736, 24799, {f: 2, c: 24840}, 25540, 25912, 26377, 26580, 26586,
-    {f: 2, c: 26977}, 27833, 27943, 28216, 28641, {f: 2, c: 29494}, 29788,
-    30001, 30290, 32173, 33278, 33848, 35029, 35480, 35547, 35565, 36400,
-    36418, 36938, 36926, 36986, [12195, 37193], 37321, 37742, 22537, 27603,
-    [12161, 32905], 32946, 20801, 22891, 23609, 28516, 29607, 32996, 36103,
-    37399, 38287, [12160, 32895], 25102, 28700, 32104, 34701, 22432, 24681,
-    24903, 27575, 35518, 37504, 38577, [12036, 20057], 21535, 28139, 34093,
-    38512, [12211, 38899], 39150, 25558, 27875, [12194, 37009], 20957, 25033,
-    33210, 40441, 20381, 20506, 20736, 23452, 24847, 25087, 25836, 26885,
-    27589, 30097, 30691, 32681, 33380, 34191, 34811, [12176, 34915], 35516,
-    35696, 37291, [12038, 20108], 20197, 20234, 22839, 23016, 24050, 24347,
-    24411, 24609, 29246, 29669, [30064, 63842], 30157, 31227, [12157, 32780],
-    [12159, 32819], 32900, 33505, 33617, 36029, 36019, 36999, 39156, 39180,
-    28727, 30410, 32714, 32716, 32764, 35610, [12040, 20154], 20161, 20995,
-    21360, [21693, 63902], 22240, 23035, 23493, 24341, 24525, 28270, 32106,
-    33589, 34451, 35469, 38765, 38775, [12032, 19968], 20314, 20350, 22777,
-    [12103, 26085], 28322, 36920, 37808, 39353, 20219, 22764, 22922, 23001,
-    24641, 31252, 33615, 36035, [12042, 20837], 21316, 20173, 21097, 23381,
-    33471, 20180, [21050, 63999], 21672, 22985, 23039, [12070, 23376], 23383,
-    23388, 24675, 24904, 28363, [28825, 63995], 29038, 29574, 29943, 30133,
-    30913, 32043, 32773, [12163, 33258], 33576, 34071, 34249, 35566, 36039,
-    38604, 20316, 21242, 22204, 26027, 26152, 28796, 28856, 29237, 32189,
-    33421, 37196, 38592, 40306, 23409, 26855, 27544, 28538, 30430, 23697,
-    26283, 28507, 31668, 31786, 34870, 38620, 19976, 20183, 21280, 22580,
-    22715, 22767, 22892, 23559, 24115, 24196, 24373, 25484, 26290, 26454,
-    27167, 27299, 27404, 28479, 29254, 29520, 29835, 31456, 31911, 33144,
-    33247, 33255, 33674, 33900, 34083, 34196, 34255, 35037, 36115, 37292,
-    [12199, 38263], 38556, 20877, 21705, 22312, 23472, 25165, 26448, 26685,
-    26771, 28221, 28371, 28797, 32289, 35009, 36001, 36617, 40779, 40782,
-    29229, 31631, 35533, 37658, 20295, 20302, 20786, 21632, 22992, 24213,
-    25269, 26485, 26990, 27159, 27822, 28186, 29401, 29482, 30141, 31672,
-    32053, 33511, 33785, 33879, 34295, 35419, 36015, 36487, 36889, 37048,
-    38606, 40799, 21219, 21514, 23265, 23490, 25688, 25973, 28404, 29380,
-    30340, 31309, 31515, 31821, 32318, 32735, 33659, 35627, 36042,
-    [12186, 36196], 36321, 36447, 36842, 36857, 36969, 37841, 20291, 20346,
-    20659, 20840, 20856, 21069, 21098, 22625, 22652, 22880, 23560, 23637,
-    24283, 24731, 25136, 26643, 27583, 27656, 28593, 29006, 29728,
-    [12133, 30000], 30008, 30033, 30322, 31564, 31627, 31661, 31686, 32399,
-    35438, 36670, 36681, 37439, 37523, 37666, 37931, 38651, 39002, 39019,
-    39198, [20999, 64000], 25130, 25240, 27993, 30308, 31434, 31680, 32118,
-    21344, 23742, 24215, 28472, 28857, 31896, 38673, 39822, 40670, 25509,
-    25722, 34678, 19969, 20117, 20141, 20572, 20597, 21576, 22979, 23450,
-    24128, 24237, 24311, 24449, 24773, 25402, 25919, 25972, 26060, 26230,
-    26232, 26622, 26984, 27273, 27491, 27712, 28096, 28136, 28191, 28254,
-    28702, 28833, 29582, 29693, 30010, 30555, 30855, 31118, 31243, 31357,
-    31934, 32142, 33351, 35330, 35562, 35998, 37165, 37194, 37336, 37478,
-    37580, 37664, 38662, 38742, 38748, 38914, [12237, 40718], 21046, 21137,
-    21884, 22564, 24093, 24351, 24716, 25552, 26799, 28639, 31085, 31532,
-    33229, 34234, 35069, 35576, 36420, 37261, 38500, 38555, 38717, 38988,
-    [12241, 40778], 20430, 20806, 20939, 21161, 22066, 24340, 24427, 25514,
-    25805, 26089, 26177, 26362, 26361, 26397, 26781, 26839, 27133, 28437,
-    28526, 29031, 29157, [12118, 29226], 29866, 30522, 31062, 31066, 31199,
-    31264, 31381, 31895, 31967, 32068, 32368, 32903, 34299, 34468, 35412,
-    35519, 36249, 36481, 36896, 36973, 37347, 38459, 38613, [12227, 40165],
-    26063, 31751, [12188, 36275], 37827, 23384, 23562, 21330, 25305, 29469,
-    20519, 23447, 24478, 24752, 24939, 26837, 28121, 29742, 31278, 32066,
-    32156, 32305, 33131, 36394, 36405, 37758, 37912, 20304, 22352, 24038,
-    24231, 25387, 32618, 20027, 20303, 20367, 20570, 23005, 32964, 21610,
-    21608, 22014, 22863, 23449, 24030, 24282, 26205, 26417, 26609, 26666,
-    27880, 27954, 28234, 28557, 28855, 29664, 30087, 31820, 32002, 32044,
-    32162, [12168, 33311], 34523, 35387, 35461, [12187, 36208], 36490, 36659,
-    36913, 37198, 37202, 37956, 39376, [12149, 31481], 31909, 20426, 20737,
-    20934, 22472, 23535, 23803, 26201, 27197, 27994, 28310, 28652, 28940,
-    30063, 31459, 34850, 36897, 36981, 38603, 39423, 33537, 20013, 20210,
-    34886, 37325, 21373, 27355, 26987, 27713, 33914, 22686, 24974, 26366,
-    25327, 28893, 29969, 30151, 32338, 33976, 35657, 36104, 20043, 21482,
-    21675, 22320, 22336, 24535, 25345, 25351, 25711, [12096, 25903], 26088,
-    26234, 26525, 26547, [12108, 27490], 27744, 27802, 28460, 30693, 30757,
-    31049, 31063, 32025, 32930, 33026, [12164, 33267], 33437, 33463, 34584,
-    35468, 36100, 36286, 36978, 30452, 31257, 31287, 32340, 32887, 21767,
-    21972, 22645, 25391, 25634, 26185, 26187, 26733, 27035, 27524, 27941,
-    28337, 29645, 29800, 29857, 30043, 30137, 30433, 30494, 30603, 31206,
-    32265, 32285, 33275, 34095, 34967, 35386, 36049, 36587,
-    [12192, 36784, 63857], 36914, 37805, 38499, 38515, 38663, 20356, 21489,
-    23018, 23241, 24089, 26702, 29894, 30142, 31209, 31378, 33187, 34541,
-    36074, 36300, 36845, 26015, 26389, 22519, 28503, 32221, 36655, 37878,
-    38598, 24501, 25074, 28548, 19988, 20376, 20511, 21449, 21983, 23919,
-    24046, 27425, 27492, 30923, 31642, 36425, [12190, 36554, 63746], 36974,
-    25417, 25662, 30528, 31364, 37679, 38015, 40810, 25776, 28591, 29158,
-    29864, 29914, 31428, 31762, 32386, 31922, 32408, 35738, 36106, 38013,
-    39184, 39244, 21049, 23519, 25830, 26413, 32046, 20717, [21443, 63851],
-    22649, {f: 2, c: 24920}, 25082, 26028, 31449, 35730, 35734, 20489, 20513,
-    21109, 21809, 23100, 24288, 24432, 24884, 25950, 26124, 26166, 26274,
-    27085, 28356, 28466, 29462, 30241, 31379, 33081, 33369, 33750, 33980,
-    20661, 22512, 23488, 23528, 24425, 25505, 30758, 32181, 33756, 34081,
-    37319, 37365, 20874, 26613, 31574, 36012, 20932, 22971, 24765, 34389,
-    20508, 21076, 23610, 24957, 25114, [25299, 64002], 25842, 26021, 28364,
-    30240, 33034, 36448, 38495, 38587, 20191, 21315, 21912, 22825, 24029,
-    25797, 27849, 28154, 29588, 31359, [12167, 33307], 34214, 36068, 36368,
-    36983, 37351, 38369, 38433, 38854, 20984, 21746, 21894, 24505, 25764,
-    28552, 32180, 36639, 36685, 37941, 20681, 23574, 27838, 28155, 29979,
-    30651, 31805, 31844, 35449, 35522, 22558, 22974, 24086, 25463, 29266,
-    30090, 30571, 35548, 36028, 36626, 24307, 26228, 28152, 32893, 33729,
-    35531, [12205, 38737], 39894, 21059, 26367, 28053, 28399, 32224, 35558,
-    36910, 36958, 39636, 21021, 21119, 21736, 24980, 25220, 25307, 26786,
-    26898, 26970, 27189, 28818, 28966, 30813, 30977, 30990, 31186, 31245,
-    32918, [12171, 33400], 33493, 33609, 34121, 35970, 36229, 37218, 37259,
-    37294, 20419, 22225, 29165, 30679, 34560, 35320, [12072, 23544], 24534,
-    26449, 37032, 21474, 22618, 23541, 24740, 24961, 25696, 32317, 32880,
-    34085, 37507, 25774, 20652, 23828, 26368, 22684, 25277, 25512, 26894,
-    27000, 27166, 28267, 30394, 31179, 33467, 33833, 35535, 36264, 36861,
-    37138, 37195, 37276, 37648, 37656, 37786, 38619, 39478, 39949, 19985,
-    30044, 31069, 31482, 31569, 31689, 32302, 33988, 36441, 36468, 36600,
-    36880, 26149, 26943, 29763, 20986, 26414, 40668, 20805, 24544, 27798,
-    34802, 34909, 34935, 24756, 33205, 33795, 36101, 21462, 21561, 22068,
-    23094, 23601, 28810, 32736, 32858, 33030, 33261, 36259, 37257, 39519,
-    40434, 20596, 20164, 21408, 24827, 28204, 23652, 20360, 20516, 21988,
-    23769, 24159, 24677, 26772, 27835, 28100, 29118, 30164, 30196, 30305,
-    31258, 31305, 32199, 32251, 32622, 33268, 34473, 36636, 38601, 39347,
-    [12242, 40786], 21063, 21189, 39149, 35242, 19971, 26578, 28422, 20405,
-    23522, 26517, [27784, 63858], 28024, 29723, 30759, 37341, 37756, 34756,
-    31204, 31281, 24555, 20182, 21668, 21822, 22702, 22949, 24816, 25171,
-    25302, 26422, 26965, 33333, 38464, 39345, 39389, 20524, 21331, 21828,
-    22396, 25176, 25826, 26219, 26589, 28609, 28655, 29730, 29752, 35351,
-    37944, 21585, 22022, 22374, 24392, 24986, 27470, 28760, 28845, 32187,
-    35477, 22890, 33067, 25506, 30472, 32829, 36010, 22612, 25645, 27067,
-    23445, 24081, 28271, 34153, 20812, 21488, 22826, 24608, 24907, 27526,
-    27760, 27888, 31518, 32974, 33492, 36294, 37040, 39089, 25799, 28580,
-    25745, 25860, 20814, 21520, [12063, 22303], 35342, 24927, 26742, 30171,
-    31570, 32113, 36890, 22534, 27084, 33151, 35114, 36864, 38969, 20600,
-    22871, 22956, 25237, 36879, 39722, 24925, 29305, 38358, 22369, 23110,
-    24052, 25226, 25773, 25850, 26487, 27874, 27966, 29228, 29750, 30772,
-    32631, 33453, 36315, 38935, 21028, 22338, 26495, 29256, 29923, 36009,
-    36774, 37393, 38442, [12043, 20843], 21485, 25420, 20329, 21764, 24726,
-    25943, 27803, 28031, 29260, 29437, 31255, 35207, [12185, 35997], 24429,
-    28558, 28921, 33192, 24846, [20415, 63845], 20559, 25153, [12122, 29255],
-    31687, 32232, 32745, 36941, 38829, 39449, 36022, 22378, 24179, 26544,
-    33805, 35413, 21536, 23318, 24163, 24290, 24330, 25987, 32954, 34109,
-    38281, 38491, 20296, 21253, 21261, 21263, 21638, 21754, 22275, 24067,
-    24598, 25243, 25265, 25429, 27873, 28006, 30129, 30770, 32990, 33071,
-    33502, 33889, 33970, 34957, 35090, 36875, 37610, 39165, 39825, 24133,
-    [26292, 64006], 26333, 28689, 29190, 20469, 21117, 24426, 24915, 26451,
-    27161, 28418, 29922, 31080, 34920, 35961, 39111, 39108, 39491, 21697,
-    31263, 26963, 35575, 35914, [12213, 39080], 39342, 24444, 25259, 30130,
-    [12138, 30382], 34987, 36991, 38466, 21305, 24380, 24517, [27852, 63848],
-    29644, 30050, [12134, 30091], 31558, 33534, 39325, 20047, 36924, 19979,
-    20309, 21414, 22799, 24264, 26160, 27827, 29781, 33655, 34662, 36032,
-    36944, 38686, 39957, 22737, 23416, 34384, 35604, 40372, 23506, 24680,
-    24717, 26097, 27735, 28450, 28579, 28698, 32597, 32752, {f: 2, c: 38289},
-    38480, 38867, 21106, 36676, 20989, 21547, 21688, 21859, 21898, 27323,
-    28085, 32216, 33382, 37532, 38519, 40569, 21512, 21704, 30418, 34532,
-    38308, 38356, 38492, 20130, 20233, 23022, 23270, 24055, 24658, 25239,
-    26477, 26689, 27782, 28207, 32568, 32923, 33322, 38917, 20133, 20565,
-    21683, 22419, 22874, 23401, 23475, 25032, 26999, 28023, 28707, 34809,
-    35299, 35442, 35559, 36994, 39405, 39608, 21182, 26680, 20502, 24184,
-    26447, 33607, [12175, 34892, 64008], 20139, 21521, 22190, 29670, 37141,
-    38911, 39177, 39255, [12217, 39321], 22099, 22687, 34395, 35377, 25010,
-    27382, 29563, 36562, 27463, 38570, 39511, 22869, 29184, 36203,
-    [12208, 38761], 20436, 23796, 24358, 25080, 26203, 27883, 28843,
-    [12126, 29572], 29625, 29694, 30505, 30541, 32067, 32098, 32291, 33335,
-    34898, 36066, 37449, 39023, 23377, [12147, 31348], [12174, 34880],
-    [12212, 38913], 23244, 20448, 21332, 22846, 23805, 25406, 28025, 29433,
-    33029, 33031, 33698, 37583, 38960, 20136, 20804, 21009, 22411, 24418,
-    27842, 28366, 28677, 28752, 28847, 29074, 29673, [29801, 63918], 33610,
-    34722, 34913, 36872, 37026, 37795, 39336, 20846, 24407, 24800, 24935,
-    26291, 34137, 36426, 37295, 38795, 20046, 20114, 21628, 22741, 22778,
-    22909, 23733, 24359, [12094, 25142], 25160, 26122, 26215, 27627, 28009,
-    28111, 28246, 28408, 28564, 28640, 28649, 28765, 29392, 29733, 29786,
-    29920, 30355, 31068, 31946, 32286, 32993, 33446, 33899, 33983, 34382,
-    34399, 34676, 35703, 35946, 37804, 38912, 39013, 24785, 25110, 37239,
-    23130, 26127, 28151, 28222, 29759, 39746, 24573, 24794, 31503, 21700,
-    24344, 27742, 27859, 27946, 28888, 32005, 34425, 35340, 40251, 21270,
-    21644, 23301, 27194, [12117, 28779], 30069, 31117, [12146, 31166], 33457,
-    33775, 35441, 35649, 36008, 38772, 25844, 25899, {f: 2, c: 30906}, 31339,
-    20024, 21914, 22864, 23462, 24187, 24739, 25563, 27489, 26213, 26707,
-    28185, 29029, 29872, 32008, 36996, 39529, 39973, 27963, [28369, 63748],
-    29502, 35905, 38346, 20976, 24140, 24488, 24653, 24822, 24880, 24908,
-    {f: 2, c: 26179}, 27045, 27841, 28255, 28361, 28514, 29004, 29852, 30343,
-    31681, 31783, 33618, 34647, 36945, 38541, [12232, 40643], 21295, 22238,
-    24315, 24458, 24674, 24724, 25079, 26214, 26371, 27292, 28142, 28590,
-    28784, 29546, 32362, 33214, 33588, 34516, 35496, 36036, 21123, 29554,
-    23446, 27243, 37892, 21742, 22150, 23389, 25928, 25989, 26313, 26783,
-    28045, 28102, [12120, 29243], 32948, 37237, 39501, 20399, 20505, 21402,
-    21518, 21564, 21897, 21957, 24127, 24460, 26429, 29030, 29661, 36869,
-    21211, 21235, 22628, 22734, 28932, 29071, 29179, 34224, 35347,
-    [26248, 63941], 34216, 21927, 26244, 29002, 33841, 21321, 21913, 27585,
-    24409, 24509, 25582, 26249, 28999, 35569, 36637, 40638, 20241, 25658,
-    28875, 30054, 34407, 24676, 35662, 40440, 20807, 20982, 21256, 27958,
-    33016, [12234, 40657], 26133, 27427, 28824, 30165, 21507, 23673, 32007,
-    35350, [12107, 27424], 27453, 27462, 21560, 24688, 27965, 32725, 33288,
-    20694, 20958, 21916, 22123, 22221, 23020, 23305, 24076, 24985, 24984,
-    25137, 26206, 26342, 29081, {f: 2, c: 29113}, 29351, 31143, 31232, 32690,
-    35440, {s: 163}, {f: 4, c: 12310}, {s: 14}, 8223, 8219, {f: 2, c: 8314},
-    {s: 7}, 8316, 0, {f: 2, c: 8317}, {s: 23}, 700, {s: 44}, 8942, 8759,
-    {s: 20}, {f: 10, c: 10122}, {s: 36}, {f: 26, c: 9398}, {s: 61},
-    {f: 2, c: 8826}, {f: 2, c: 8910}, {f: 2, c: 8832}, {f: 4, c: 8816}, 0,
-    8842, 0, 8843, {f: 2, c: 8822}, 8825, {f: 2, c: 8922}, {s: 5}, 8773, 8771,
-    8776, 0, 8868, {s: 78}, 8244, {s: 11}, 9839, {s: 4}, 8258, {s: 4}, 10045,
-    0, 0, 8226, {s: 4}, {f: 2, c: 8249}, {s: 16}, 10010, 10006, 0, 9711,
-    {s: 3}, 10070, 0, 9676, {s: 24}, 9775, {s: 6}, 12320, 0, {f: 10, c: 10102},
-    {s: 17}, 12306, 12342, {s: 13}, 8710, 0, 8735, 0, {f: 2, c: 8741}, 0, 8787,
-    8785, {f: 2, c: 8806}, 8723, {f: 3, c: 8853}, 0, 8980, 0, 0, 8802, 0, 9649,
-    0, 8738, 8784, 0, 0, 8867, 0, 0, {f: 2, c: 8814}, 8837, 8836, 8713, 8716,
-    {f: 2, c: 8891}, 8794, 8966, {s: 6}, 12958, 0, 8252, {s: 11}, 9702, {s: 3},
-    9663, 9653, 9657, 9667, {s: 4}, 9674, 12849, 12857, 13259, {f: 5, c: 9327},
-    {s: 18}, 8656, 8655, 8653, {s: 37}, 8657, 8659, {s: 8}, 8626, 8625, 0,
-    8628, 8624, 8627, {s: 14}, 8636, 8640, {s: 10}, {f: 2, c: 8644}, {s: 144},
-    {f: 5, c: 9347}, {s: 33}, 12948, {s: 15}, 12965, {s: 93}, 8672, 8674, 8673,
-    8675, {s: 4}, 8678, 8680, 8679, 8681, {s: 20}, 9757, 9759, {s: 76}, 12944,
-    {f: 6, c: 12938}, {s: 15}, {f: 2, c: 12318}, 8246, 0, 8245, {s: 3}, 12540,
-    0, 0, {f: 2, c: 44034}, {f: 2, c: 44037}, {f: 5, c: 44043}, 44056,
-    {f: 2, c: 44062}, {f: 3, c: 44065}, {f: 7, c: 44069}, 44078,
-    {f: 6, c: 44082}, {f: 2, c: 44090}, {f: 3, c: 44093}, {f: 10, c: 44097},
-    44108, {f: 6, c: 44110}, {f: 3, c: 44117}, {f: 3, c: 44121},
-    {f: 19, c: 44125}, {f: 2, c: 44146}, {f: 2, c: 44149}, 44153,
-    {f: 5, c: 44155}, 44162, {f: 2, c: 44167}, {f: 3, c: 44173},
-    {f: 3, c: 44177}, {f: 7, c: 44181}, 44190, {f: 6, c: 44194}, 44203,
-    {f: 2, c: 44205}, {f: 7, c: 44209}, 44218, {f: 3, c: 44222},
-    {f: 2, c: 44226}, {f: 3, c: 44229}, {f: 3, c: 44233}, {f: 8, c: 44237},
-    44246, {f: 8, c: 44248}, {f: 2, c: 44258}, {f: 2, c: 44261}, 44265, 44267,
-    {f: 2, c: 44269}, 44274, 44276, {f: 5, c: 44279}, {f: 2, c: 44286},
-    {f: 3, c: 44289}, 44293, {f: 5, c: 44295}, 44302, 44304, {f: 6, c: 44306},
-    {f: 3, c: 44313}, {f: 3, c: 44317}, {f: 8, c: 44321}, {f: 2, c: 44330},
-    {f: 6, c: 44334}, {f: 2, c: 44342}, {f: 3, c: 44345}, {f: 7, c: 44349},
-    44358, 44360, {f: 6, c: 44362}, {f: 3, c: 44369}, {f: 3, c: 44373},
-    {f: 8, c: 44377}, 44386, {f: 8, c: 44388}, {f: 2, c: 44398},
-    {f: 2, c: 44401}, {f: 4, c: 44407}, 44414, 44416, {f: 5, c: 44419},
-    {f: 2, c: 44426}, {f: 3, c: 44429}, {f: 11, c: 44433}, {f: 6, c: 44446},
-    {f: 18, c: 44453}, {f: 8, c: 44472}, {f: 2, c: 44482}, {f: 3, c: 44485},
-    {f: 7, c: 44489}, 44498, {f: 8, c: 44500}, {f: 3, c: 44509},
-    {f: 3, c: 44513}, {f: 19, c: 44517}, {f: 2, c: 44538}, {f: 2, c: 44541},
-    {f: 6, c: 44546}, 44554, 44556, {f: 6, c: 44558}, {f: 27, c: 44565},
-    {f: 2, c: 44594}, {f: 2, c: 44597}, 44601, {f: 5, c: 44603}, 44610, 44612,
-    {f: 3, c: 44615}, 44619, 44623, {f: 3, c: 44625}, 44629, {f: 5, c: 44631},
-    44638, {f: 3, c: 44642}, {f: 2, c: 44646}, {f: 2, c: 44650},
-    {f: 3, c: 44653}, {f: 7, c: 44657}, 44666, {f: 6, c: 44670},
-    {f: 6, c: 44678}, {f: 47, c: 44685}, 44735, {f: 3, c: 44737},
-    {f: 7, c: 44741}, 44750, {f: 6, c: 44754}, {f: 2, c: 44762},
-    {f: 11, c: 44765}, {f: 2, c: 44777}, 44780, {f: 6, c: 44782},
-    {f: 3, c: 44789}, {f: 3, c: 44793}, {f: 10, c: 44797}, {f: 4, c: 44809},
-    {f: 2, c: 44814}, {f: 27, c: 44817}, {f: 2, c: 44846}, 44849, 44851,
-    {f: 7, c: 44853}, 44862, 44864, {f: 4, c: 44868}, {f: 6, c: 44874},
-    {f: 11, c: 44881}, {f: 6, c: 44894}, {f: 19, c: 44902}, {f: 6, c: 44922},
-    {f: 3, c: 44929}, {f: 3, c: 44933}, {f: 7, c: 44937}, {f: 3, c: 44946},
-    {f: 6, c: 44950}, {f: 27, c: 44957}, {f: 2, c: 44986}, {f: 3, c: 44989},
-    {f: 6, c: 44993}, 45002, 45004, {f: 5, c: 45007}, {f: 7, c: 45013},
-    {f: 11, c: 45021}, {f: 6, c: 45034}, {f: 2, c: 45042}, {f: 3, c: 45045},
-    {f: 7, c: 45049}, {f: 2, c: 45058}, {f: 7, c: 45061}, {f: 3, c: 45069},
-    {f: 3, c: 45073}, {f: 7, c: 45077}, {f: 10, c: 45086}, {f: 27, c: 45097},
-    {f: 2, c: 45126}, 45129, 45131, 45133, {f: 4, c: 45135}, 45142, 45144,
-    {f: 3, c: 45146}, {f: 30, c: 45150}, {f: 2, c: 45182}, {f: 3, c: 45185},
-    {f: 7, c: 45189}, 45198, 45200, {f: 6, c: 45202}, 45211, {f: 2, c: 45213},
-    {f: 5, c: 45219}, 45226, 45232, 45234, {f: 2, c: 45238}, {f: 3, c: 45241},
-    {f: 7, c: 45245}, 45254, {f: 6, c: 45258}, {f: 2, c: 45266},
-    {f: 3, c: 45269}, {f: 7, c: 45273}, {f: 4, c: 45281}, {f: 34, c: 45286},
-    45322, {f: 3, c: 45325}, 45329, {f: 4, c: 45332}, 45338, {f: 5, c: 45342},
-    {f: 2, c: 45350}, {f: 3, c: 45353}, {f: 7, c: 45357}, 45366,
-    {f: 6, c: 45370}, {f: 2, c: 45378}, {f: 3, c: 45381}, {f: 7, c: 45385},
-    {f: 2, c: 45394}, {f: 2, c: 45398}, {f: 3, c: 45401}, {f: 3, c: 45405},
-    {f: 23, c: 45409}, {f: 2, c: 45434}, {f: 3, c: 45437}, 45441,
-    {f: 5, c: 45443}, 45450, 45452, {f: 4, c: 45454}, {f: 3, c: 45461},
-    {f: 3, c: 45465}, {f: 11, c: 45469}, {f: 35, c: 45481}, {f: 3, c: 45517},
-    {f: 3, c: 45521}, {f: 7, c: 45525}, 45534, {f: 8, c: 45536},
-    {f: 2, c: 45546}, {f: 3, c: 45549}, {f: 8, c: 45553}, 45562, 45564,
-    {f: 6, c: 45566}, {f: 2, c: 45574}, {f: 2, c: 45577}, {f: 7, c: 45581},
-    45590, 45592, {f: 6, c: 45594}, {f: 19, c: 45601}, {f: 7, c: 45621},
-    {f: 27, c: 45629}, {f: 3, c: 45657}, {f: 3, c: 45661}, {f: 7, c: 45665},
-    {f: 10, c: 45674}, {f: 6, c: 45686}, {f: 7, c: 45693}, {f: 3, c: 45702},
-    {f: 6, c: 45706}, {f: 2, c: 45714}, {f: 3, c: 45717}, {f: 5, c: 45723},
-    45730, 45732, {f: 3, c: 45735}, 45739, {f: 3, c: 45741}, {f: 3, c: 45745},
-    {f: 19, c: 45749}, {f: 2, c: 45770}, {f: 3, c: 45773}, 45777,
-    {f: 5, c: 45779}, 45786, 45788, {f: 4, c: 45790}, 45795, 45799,
-    {f: 2, c: 45801}, {f: 3, c: 45808}, 45814, {f: 3, c: 45820},
-    {f: 2, c: 45826}, {f: 3, c: 45829}, {f: 7, c: 45833}, 45842,
-    {f: 6, c: 45846}, {f: 55, c: 45853}, 45911, {f: 2, c: 45913}, 45917,
-    {f: 4, c: 45920}, 45926, 45928, 45930, {f: 2, c: 45932}, 45935,
-    {f: 2, c: 45938}, {f: 3, c: 45941}, {f: 7, c: 45945}, 45954,
-    {f: 6, c: 45958}, {f: 3, c: 45965}, {f: 3, c: 45969}, {f: 11, c: 45973},
-    {f: 6, c: 45986}, {f: 3, c: 45993}, {f: 23, c: 45997}, {f: 2, c: 46022},
-    {f: 2, c: 46025}, 46029, 46031, {f: 3, c: 46033}, 46038, 46040, 46042,
-    46044, {f: 2, c: 46046}, {f: 3, c: 46049}, {f: 3, c: 46053},
-    {f: 19, c: 46057}, {f: 19, c: 46077}, {f: 7, c: 46097}, {f: 3, c: 46105},
-    {f: 3, c: 46109}, {f: 7, c: 46113}, 46122, {f: 8, c: 46124},
-    {f: 27, c: 46133}, {f: 2, c: 46162}, {f: 3, c: 46165}, {f: 7, c: 46169},
-    46178, 46180, {f: 6, c: 46182}, {f: 19, c: 46189}, {f: 7, c: 46209},
-    {f: 20, c: 46217}, {f: 6, c: 46238}, {f: 3, c: 46245}, {f: 3, c: 46249},
-    {f: 8, c: 46253}, 46262, 46264, {f: 6, c: 46266}, {f: 3, c: 46273},
-    {f: 3, c: 46277}, {f: 7, c: 46281}, {f: 4, c: 46289}, {f: 6, c: 46294},
-    {f: 2, c: 46302}, {f: 2, c: 46305}, 46309, {f: 5, c: 46311}, 46318, 46320,
-    {f: 6, c: 46322}, {f: 27, c: 46329}, {f: 2, c: 46358}, {f: 2, c: 46361},
-    {f: 7, c: 46365}, 46374, {f: 5, c: 46379}, {f: 2, c: 46386},
-    {f: 3, c: 46389}, {f: 7, c: 46393}, 46402, {f: 5, c: 46406},
-    {f: 2, c: 46414}, {f: 3, c: 46417}, {f: 7, c: 46421}, 46430,
-    {f: 62, c: 46434}, {f: 2, c: 46498}, {f: 3, c: 46501}, 46505,
-    {f: 4, c: 46508}, 46514, {f: 5, c: 46518}, {f: 2, c: 46526},
-    {f: 3, c: 46529}, {f: 7, c: 46533}, 46542, {f: 6, c: 46546},
-    {f: 19, c: 46553}, {f: 35, c: 46573}, {f: 2, c: 46610}, {f: 3, c: 46613},
-    {f: 12, c: 46617}, {f: 6, c: 46630}, {f: 7, c: 46637}, {f: 19, c: 46645},
-    {f: 27, c: 46665}, {f: 3, c: 46693}, {f: 51, c: 46697}, {f: 2, c: 46750},
-    {f: 3, c: 46753}, {f: 6, c: 46757}, {f: 4, c: 46765}, {f: 34, c: 46770},
-    {f: 27, c: 46805}, {f: 3, c: 46833}, {f: 3, c: 46837}, {f: 7, c: 46841},
-    {f: 3, c: 46850}, {f: 34, c: 46854}, {f: 2, c: 46890}, {f: 2, c: 46893},
-    {f: 7, c: 46897}, 46906, {f: 8, c: 46908}, {f: 3, c: 46917},
-    {f: 3, c: 46921}, {f: 7, c: 46925}, {f: 10, c: 46934}, {f: 3, c: 46945},
-    {f: 3, c: 46949}, {f: 7, c: 46953}, 46962, 46964, {f: 6, c: 46966},
-    {f: 2, c: 46974}, {f: 3, c: 46977}, {f: 7, c: 46981}, 46990,
-    {f: 3, c: 46995}, {f: 2, c: 47002}, {f: 3, c: 47005}, {f: 7, c: 47009},
-    47018, {f: 6, c: 47022}, {f: 2, c: 47030}, {f: 14, c: 47033}, 47048,
-    {f: 34, c: 47050}, {f: 2, c: 47086}, {f: 3, c: 47089}, {f: 7, c: 47093},
-    47102, {f: 5, c: 47106}, {f: 2, c: 47114}, {f: 3, c: 47117},
-    {f: 7, c: 47121}, 47130, 47132, {f: 6, c: 47134}, {f: 2, c: 47142},
-    {f: 3, c: 47145}, {f: 7, c: 47149}, 47158, {f: 6, c: 47162},
-    {f: 3, c: 47169}, {f: 12, c: 47173}, 47186, {f: 8, c: 47188},
-    {f: 2, c: 47198}, {f: 3, c: 47201}, {f: 7, c: 47205}, 47214, 47216,
-    {f: 6, c: 47218}, {f: 3, c: 47225}, {f: 16, c: 47229}, {f: 26, c: 47246},
-    {f: 7, c: 47273}, {f: 3, c: 47281}, {f: 3, c: 47285}, {f: 7, c: 47289},
-    47298, 47300, {f: 6, c: 47302}, {f: 3, c: 47309}, {f: 3, c: 47313},
-    {f: 8, c: 47317}, 47326, 47328, {f: 6, c: 47330}, {f: 2, c: 47338},
-    {f: 3, c: 47341}, {f: 7, c: 47345}, 47354, 47356, {f: 6, c: 47358},
-    {f: 19, c: 47365}, {f: 7, c: 47385}, {f: 27, c: 47393}, {f: 2, c: 47422},
-    {f: 3, c: 47425}, {f: 7, c: 47429}, {f: 2, c: 47437}, 47440,
-    {f: 6, c: 47442}, {f: 2, c: 47450}, {f: 3, c: 47453}, {f: 7, c: 47457},
-    47466, 47468, {f: 6, c: 47470}, {f: 2, c: 47478}, {f: 3, c: 47481},
-    {f: 7, c: 47485}, 47494, 47496, {f: 2, c: 47499}, {f: 29, c: 47503},
-    {f: 2, c: 47534}, {f: 3, c: 47537}, {f: 7, c: 47541}, 47550, 47552,
-    {f: 6, c: 47554}, {f: 2, c: 47562}, 47565, {f: 5, c: 47571}, 47578, 47580,
-    {f: 2, c: 47583}, 47586, {f: 2, c: 47590}, {f: 3, c: 47593},
-    {f: 7, c: 47597}, 47606, {f: 5, c: 47611}, {f: 6, c: 47618},
-    {f: 12, c: 47625}, {f: 34, c: 47638}, {f: 2, c: 47674}, {f: 3, c: 47677},
-    47681, {f: 5, c: 47683}, 47690, 47692, {f: 4, c: 47695}, {f: 2, c: 47702},
-    {f: 3, c: 47705}, {f: 7, c: 47709}, 47718, {f: 6, c: 47722},
-    {f: 2, c: 47730}, {f: 3, c: 47733}, {f: 10, c: 47737}, 47750,
-    {f: 4, c: 47752}, {f: 27, c: 47757}, 47786, {f: 3, c: 47789}, 47793,
-    {f: 5, c: 47795}, 47802, 47804, {f: 6, c: 47806}, {f: 3, c: 47813},
-    {f: 15, c: 47817}, {f: 34, c: 47834}, {f: 3, c: 47869}, {f: 3, c: 47873},
-    {f: 8, c: 47877}, 47886, 47888, {f: 6, c: 47890}, {f: 3, c: 47897},
-    {f: 3, c: 47901}, {f: 8, c: 47905}, 47914, {f: 8, c: 47916}, 47927,
-    {f: 2, c: 47929}, {f: 5, c: 47935}, 47942, 47944, {f: 3, c: 47946}, 47950,
-    {f: 3, c: 47953}, {f: 3, c: 47957}, {f: 8, c: 47961}, 47970,
-    {f: 8, c: 47972}, {f: 27, c: 47981}, {f: 3, c: 48009}, {f: 3, c: 48013},
-    {f: 19, c: 48017}, {f: 3, c: 48037}, {f: 3, c: 48041}, {f: 7, c: 48045},
-    {f: 2, c: 48053}, {f: 8, c: 48056}, {f: 3, c: 48065}, {f: 3, c: 48069},
-    {f: 7, c: 48073}, {f: 2, c: 48081}, {f: 36, c: 48084}, {f: 2, c: 48122},
-    {f: 2, c: 48125}, 48129, {f: 5, c: 48131}, 48138, 48142, 48144,
-    {f: 2, c: 48146}, {f: 2, c: 48153}, {f: 4, c: 48160}, 48166, 48168,
-    {f: 3, c: 48170}, {f: 2, c: 48174}, {f: 2, c: 48178}, {f: 3, c: 48181},
-    {f: 7, c: 48185}, 48194, {f: 3, c: 48198}, {f: 2, c: 48202},
-    {f: 2, c: 48206}, {f: 12, c: 48209}, {f: 38, c: 48222}, {f: 2, c: 48262},
-    {f: 2, c: 48265}, 48269, {f: 5, c: 48271}, 48278, 48280, {f: 5, c: 48283},
-    {f: 2, c: 48290}, {f: 2, c: 48293}, {f: 7, c: 48297}, 48306,
-    {f: 6, c: 48310}, {f: 2, c: 48318}, {f: 3, c: 48321}, {f: 8, c: 48325},
-    48334, {f: 3, c: 48338}, {f: 2, c: 48342}, {f: 3, c: 48345},
-    {f: 23, c: 48349}, 48375, {f: 3, c: 48377}, {f: 7, c: 48381}, 48390, 48392,
-    {f: 6, c: 48394}, {f: 3, c: 48401}, {f: 15, c: 48405}, {f: 7, c: 48421},
-    {f: 19, c: 48429}, {f: 7, c: 48449}, {f: 2, c: 48458}, {f: 3, c: 48461},
-    {f: 7, c: 48465}, {f: 10, c: 48474}, {f: 3, c: 48485}, {f: 23, c: 48489},
-    {f: 2, c: 48514}, {f: 2, c: 48517}, {f: 5, c: 48523}, 48530, 48532,
-    {f: 3, c: 48534}, 48539, {f: 7, c: 48541}, {f: 11, c: 48549},
-    {f: 7, c: 48561}, {f: 27, c: 48569}, {f: 2, c: 48598}, {f: 3, c: 48601},
-    {f: 12, c: 48605}, {f: 6, c: 48618}, {f: 3, c: 48625}, {f: 3, c: 48629},
-    {f: 7, c: 48633}, {f: 2, c: 48641}, 48644, {f: 6, c: 48646},
-    {f: 2, c: 48654}, {f: 3, c: 48657}, {f: 7, c: 48661}, 48670,
-    {f: 36, c: 48672}, {f: 2, c: 48710}, {f: 3, c: 48713}, 48717,
-    {f: 5, c: 48719}, 48726, 48728, {f: 4, c: 48732}, {f: 2, c: 48738},
-    {f: 3, c: 48741}, 48745, {f: 5, c: 48747}, 48754, {f: 5, c: 48758},
-    {f: 2, c: 48766}, {f: 3, c: 48769}, {f: 7, c: 48773}, 48782,
-    {f: 6, c: 48786}, {f: 14, c: 48794}, {f: 39, c: 48809}, {f: 2, c: 48850},
-    {f: 2, c: 48853}, {f: 7, c: 48857}, {f: 2, c: 48865}, {f: 6, c: 48870},
-    {f: 20, c: 48877}, {f: 6, c: 48898}, {f: 14, c: 48906}, 48922,
-    {f: 34, c: 48926}, {f: 2, c: 48962}, {f: 3, c: 48965}, {f: 7, c: 48969},
-    {f: 3, c: 48978}, {f: 62, c: 48982}, {f: 27, c: 49045}, {f: 20, c: 49073},
-    {f: 6, c: 49094}, {f: 2, c: 49102}, {f: 3, c: 49105}, {f: 7, c: 49109},
-    {f: 2, c: 49117}, 49120, {f: 90, c: 49122}, {f: 20, c: 49213},
-    {f: 6, c: 49234}, {f: 3, c: 49241}, {f: 3, c: 49245}, {f: 7, c: 49249},
-    {f: 38, c: 49258}, {f: 2, c: 49298}, {f: 3, c: 49301}, {f: 7, c: 49305},
-    49314, 49316, {f: 6, c: 49318}, 49326, {f: 2, c: 49329}, {f: 5, c: 49335},
-    49342, {f: 3, c: 49346}, {f: 2, c: 49350}, {f: 2, c: 49354},
-    {f: 3, c: 49357}, {f: 7, c: 49361}, 49370, {f: 6, c: 49374},
-    {f: 2, c: 49382}, {f: 3, c: 49385}, {f: 7, c: 49389}, 49398, 49400,
-    {f: 6, c: 49402}, {f: 3, c: 49409}, {f: 3, c: 49413}, {f: 7, c: 49417},
-    {f: 4, c: 49425}, {f: 6, c: 49430}, {f: 2, c: 49441}, 49445,
-    {f: 4, c: 49448}, 49454, {f: 4, c: 49458}, 49463, {f: 2, c: 49466},
-    {f: 3, c: 49469}, {f: 7, c: 49473}, 49482, {f: 6, c: 49486},
-    {f: 2, c: 49494}, {f: 3, c: 49497}, {f: 7, c: 49501}, 49510,
-    {f: 6, c: 49514}, {f: 3, c: 49521}, {f: 3, c: 49525}, {f: 12, c: 49529},
-    {f: 6, c: 49542}, 49551, {f: 3, c: 49553}, 49557, {f: 5, c: 49559}, 49566,
-    49568, {f: 3, c: 49570}, {f: 2, c: 49574}, {f: 2, c: 49578},
-    {f: 3, c: 49581}, {f: 12, c: 49585}, {f: 6, c: 49598}, {f: 3, c: 49605},
-    {f: 3, c: 49609}, {f: 7, c: 49613}, {f: 2, c: 49621}, {f: 7, c: 49625},
-    {f: 3, c: 49633}, {f: 3, c: 49637}, {f: 7, c: 49641}, 49650,
-    {f: 8, c: 49652}, {f: 2, c: 49662}, {f: 3, c: 49665}, {f: 7, c: 49669},
-    49678, 49680, {f: 6, c: 49682}, {f: 2, c: 49690}, {f: 2, c: 49693},
-    {f: 7, c: 49697}, 49706, 49708, 49710, 49712, 49715, {f: 19, c: 49717},
-    {f: 7, c: 49737}, {f: 2, c: 49746}, {f: 3, c: 49749}, {f: 7, c: 49753},
-    {f: 4, c: 49761}, {f: 6, c: 49766}, {f: 2, c: 49774}, {f: 3, c: 49777},
-    {f: 7, c: 49781}, 49790, 49792, {f: 6, c: 49794}, {f: 6, c: 49802},
-    {f: 7, c: 49809}, {f: 2, c: 49817}, 49820, {f: 6, c: 49822},
-    {f: 2, c: 49830}, {f: 3, c: 49833}, {f: 6, c: 49838}, 49846, 49848,
-    {f: 34, c: 49850}, {f: 2, c: 49886}, {f: 2, c: 49889}, {f: 6, c: 49893},
-    49902, 49904, {f: 4, c: 49906}, 49911, 49914, {f: 3, c: 49917},
-    {f: 7, c: 49921}, {f: 2, c: 49930}, {f: 5, c: 49934}, {f: 2, c: 49942},
-    {f: 3, c: 49945}, {f: 7, c: 49949}, {f: 2, c: 49958}, {f: 27, c: 49962},
-    {f: 34, c: 49990}, {f: 2, c: 50026}, {f: 3, c: 50029}, 50033,
-    {f: 5, c: 50035}, {f: 2, c: 50042}, {f: 6, c: 50046}, {f: 3, c: 50053},
-    {f: 3, c: 50057}, {f: 51, c: 50061}, {f: 23, c: 50113}, {f: 2, c: 50138},
-    {f: 2, c: 50141}, 50145, {f: 5, c: 50147}, {f: 3, c: 50154},
-    {f: 6, c: 50158}, {f: 2, c: 50166}, {f: 15, c: 50169}, {f: 7, c: 50185},
-    {f: 19, c: 50193}, {f: 7, c: 50213}, {f: 3, c: 50221}, {f: 3, c: 50225},
-    {f: 7, c: 50229}, {f: 10, c: 50238}, {f: 27, c: 50249}, {f: 2, c: 50278},
-    {f: 3, c: 50281}, {f: 7, c: 50285}, {f: 3, c: 50294}, {f: 6, c: 50298},
-    {f: 19, c: 50305}, {f: 7, c: 50325}, {f: 27, c: 50333}, {f: 3, c: 50361},
-    {f: 44, c: 50365}, {f: 6, c: 50410}, {f: 2, c: 50418}, {f: 3, c: 50421},
-    50425, {f: 4, c: 50427}, {f: 10, c: 50434}, {f: 3, c: 50445},
-    {f: 3, c: 50449}, {f: 7, c: 50453}, {f: 11, c: 50461}, {f: 2, c: 50474},
-    {f: 3, c: 50477}, {f: 7, c: 50481}, 50490, 50492, {f: 6, c: 50494},
-    {f: 2, c: 50502}, 50507, {f: 4, c: 50511}, 50518, {f: 3, c: 50522}, 50527,
-    {f: 2, c: 50530}, {f: 3, c: 50533}, {f: 7, c: 50537}, 50546,
-    {f: 6, c: 50550}, {f: 2, c: 50558}, {f: 3, c: 50561}, {f: 2, c: 50565},
-    {f: 4, c: 50568}, 50574, 50576, {f: 3, c: 50578}, 50582, {f: 3, c: 50585},
-    {f: 3, c: 50589}, {f: 8, c: 50593}, {f: 10, c: 50602}, {f: 2, c: 50614},
-    50618, {f: 5, c: 50623}, 50635, 50637, 50639, {f: 2, c: 50642},
-    {f: 3, c: 50645}, {f: 7, c: 50649}, 50658, 50660, {f: 6, c: 50662}, 50671,
-    {f: 3, c: 50673}, 50677, {f: 4, c: 50680}, {f: 3, c: 50690},
-    {f: 3, c: 50697}, {f: 3, c: 50701}, {f: 7, c: 50705}, 50714,
-    {f: 7, c: 50717}, {f: 2, c: 50726}, {f: 3, c: 50729}, 50735,
-    {f: 2, c: 50737}, 50742, 50744, 50746, {f: 4, c: 50748}, {f: 2, c: 50754},
-    {f: 3, c: 50757}, {f: 7, c: 50761}, 50770, {f: 6, c: 50774},
-    {f: 2, c: 50782}, {f: 11, c: 50785}, {f: 2, c: 50797}, 50800,
-    {f: 6, c: 50802}, {f: 2, c: 50810}, {f: 3, c: 50813}, {f: 7, c: 50817},
-    50826, 50828, {f: 6, c: 50830}, {f: 2, c: 50838}, {f: 3, c: 50841},
-    {f: 7, c: 50845}, 50854, 50856, {f: 6, c: 50858}, {f: 2, c: 50866},
-    {f: 3, c: 50869}, {f: 5, c: 50875}, 50882, 50884, {f: 6, c: 50886},
-    {f: 2, c: 50894}, {f: 3, c: 50897}, {f: 7, c: 50901}, {f: 2, c: 50910},
-    {f: 6, c: 50914}, {f: 2, c: 50922}, {f: 3, c: 50925}, {f: 7, c: 50929},
-    {f: 3, c: 50938}, {f: 6, c: 50942}, {f: 2, c: 50950}, {f: 3, c: 50953},
-    {f: 7, c: 50957}, 50966, 50968, {f: 6, c: 50970}, {f: 2, c: 50978},
-    {f: 3, c: 50981}, {f: 7, c: 50985}, 50994, 50996, 50998, {f: 4, c: 51000},
-    {f: 2, c: 51006}, {f: 3, c: 51009}, {f: 5, c: 51013}, 51019, 51022, 51024,
-    {f: 3, c: 51033}, {f: 3, c: 51037}, {f: 7, c: 51041}, {f: 2, c: 51049},
-    {f: 8, c: 51052}, {f: 2, c: 51062}, {f: 3, c: 51065}, {f: 4, c: 51071},
-    51078, {f: 3, c: 51083}, 51087, {f: 2, c: 51090}, 51093, 51097,
-    {f: 5, c: 51099}, 51106, {f: 5, c: 51111}, {f: 2, c: 51118},
-    {f: 3, c: 51121}, {f: 7, c: 51125}, 51134, {f: 6, c: 51138},
-    {f: 2, c: 51146}, 51149, 51151, {f: 7, c: 51153}, {f: 4, c: 51161},
-    {f: 6, c: 51166}, {f: 3, c: 51173}, {f: 3, c: 51177}, {f: 19, c: 51181},
-    {f: 2, c: 51202}, {f: 3, c: 51205}, 51209, {f: 5, c: 51211}, 51218, 51220,
-    {f: 5, c: 51223}, {f: 2, c: 51230}, {f: 3, c: 51233}, {f: 7, c: 51237},
-    51246, 51248, {f: 6, c: 51250}, {f: 3, c: 51257}, {f: 3, c: 51261},
-    {f: 7, c: 51265}, {f: 2, c: 51274}, {f: 6, c: 51278}, {f: 27, c: 51285},
-    {f: 2, c: 51314}, {f: 3, c: 51317}, 51321, {f: 5, c: 51323}, 51330, 51332,
-    {f: 3, c: 51336}, {f: 6, c: 51342}, {f: 8, c: 51349}, 51358, 51360,
-    {f: 6, c: 51362}, {f: 19, c: 51369}, {f: 6, c: 51390}, {f: 3, c: 51397},
-    {f: 3, c: 51401}, {f: 7, c: 51405}, 51414, 51416, {f: 6, c: 51418},
-    {f: 2, c: 51426}, {f: 16, c: 51429}, {f: 6, c: 51446}, {f: 2, c: 51454},
-    {f: 3, c: 51457}, {f: 5, c: 51463}, 51470, 51472, {f: 6, c: 51474},
-    {f: 19, c: 51481}, {f: 7, c: 51501}, {f: 27, c: 51509}, {f: 2, c: 51538},
-    {f: 3, c: 51541}, {f: 7, c: 51545}, 51554, {f: 8, c: 51556},
-    {f: 3, c: 51565}, {f: 3, c: 51569}, {f: 7, c: 51573}, {f: 11, c: 51581},
-    {f: 2, c: 51594}, {f: 3, c: 51597}, {f: 7, c: 51601}, 51610, 51612,
-    {f: 34, c: 51614}, {f: 2, c: 51650}, {f: 2, c: 51653}, 51657,
-    {f: 5, c: 51659}, 51666, 51668, {f: 2, c: 51671}, 51675, {f: 2, c: 51678},
-    51681, 51683, {f: 2, c: 51685}, {f: 4, c: 51688}, 51694, {f: 6, c: 51698},
-    {f: 2, c: 51706}, {f: 3, c: 51709}, {f: 7, c: 51713}, 51722,
-    {f: 6, c: 51726}, {f: 3, c: 51733}, {f: 16, c: 51737}, {f: 34, c: 51754},
-    {f: 2, c: 51790}, {f: 3, c: 51793}, {f: 7, c: 51797}, 51806,
-    {f: 6, c: 51810}, {f: 20, c: 51817}, {f: 6, c: 51838}, {f: 19, c: 51845},
-    {f: 35, c: 51865}, {f: 2, c: 51902}, {f: 3, c: 51905}, {f: 7, c: 51909},
-    51918, 51920, 51922, {f: 4, c: 51924}, {f: 6, c: 51930}, {f: 11, c: 51937},
-    {f: 7, c: 51949}, {f: 19, c: 51957}, {f: 7, c: 51977}, {f: 3, c: 51985},
-    {f: 3, c: 51989}, {f: 7, c: 51993}, {f: 31, c: 52002}, {f: 6, c: 52034},
-    {f: 2, c: 52042}, {f: 3, c: 52045}, {f: 7, c: 52049}, {f: 3, c: 52058},
-    {f: 6, c: 52062}, {f: 19, c: 52069}, {f: 34, c: 52090}, {f: 27, c: 52125},
-    {f: 27, c: 52153}, {f: 15, c: 52181}, {f: 2, c: 52197}, 52200,
-    {f: 34, c: 52202}, {f: 2, c: 52238}, {f: 3, c: 52241}, {f: 7, c: 52245},
-    {f: 3, c: 52254}, {f: 4, c: 52259}, {f: 2, c: 52266}, 52269, 52271,
-    {f: 7, c: 52273}, 52282, {f: 5, c: 52287}, {f: 2, c: 52294},
-    {f: 3, c: 52297}, {f: 7, c: 52301}, 52310, {f: 6, c: 52314},
-    {f: 3, c: 52321}, 52325, 52327, {f: 7, c: 52329}, {f: 4, c: 52337},
-    {f: 34, c: 52342}, {f: 2, c: 52378}, {f: 3, c: 52381}, {f: 7, c: 52385},
-    52394, {f: 6, c: 52398}, {f: 2, c: 52406}, {f: 3, c: 52409},
-    {f: 7, c: 52413}, 52422, 52424, {f: 6, c: 52426}, {f: 3, c: 52433},
-    {f: 15, c: 52437}, {f: 7, c: 52453}, {f: 3, c: 52461}, {f: 16, c: 52465},
-    {f: 6, c: 52482}, {f: 2, c: 52490}, {f: 3, c: 52493}, {f: 7, c: 52497},
-    52506, 52508, {f: 6, c: 52510}, {f: 3, c: 52517}, {f: 3, c: 52521},
-    {f: 12, c: 52525}, {f: 34, c: 52538}, {f: 3, c: 52573}, {f: 3, c: 52577},
-    {f: 7, c: 52581}, 52590, 52592, {f: 6, c: 52594}, {f: 15, c: 52601},
-    {f: 11, c: 52617}, {f: 2, c: 52630}, {f: 3, c: 52633}, {f: 7, c: 52637},
-    52646, 52648, {f: 6, c: 52650}, {f: 19, c: 52657}, {f: 7, c: 52677},
-    {f: 3, c: 52685}, {f: 23, c: 52689}, {f: 3, c: 52713}, {f: 3, c: 52717},
-    {f: 7, c: 52721}, 52730, 52732, {f: 6, c: 52734}, {f: 3, c: 52741},
-    {f: 3, c: 52745}, {f: 7, c: 52749}, {f: 4, c: 52757}, {f: 6, c: 52762},
-    {f: 2, c: 52770}, {f: 3, c: 52773}, {f: 7, c: 52777}, 52786, 52788,
-    {f: 34, c: 52790}, {f: 2, c: 52826}, {f: 2, c: 52829}, {f: 6, c: 52834},
-    52842, 52844, {f: 6, c: 52846}, {f: 2, c: 52854}, {f: 3, c: 52857},
-    {f: 7, c: 52861}, 52870, 52872, {f: 6, c: 52874}, {f: 2, c: 52882},
-    {f: 3, c: 52885}, {f: 7, c: 52889}, 52898, {f: 6, c: 52902},
-    {f: 19, c: 52910}, {f: 34, c: 52930}, {f: 2, c: 52966}, {f: 2, c: 52969},
-    {f: 7, c: 52973}, 52982, {f: 6, c: 52986}, {f: 2, c: 52994},
-    {f: 3, c: 52997}, {f: 7, c: 53001}, 53010, 53012, {f: 6, c: 53014},
-    {f: 3, c: 53021}, {f: 3, c: 53025}, {f: 7, c: 53029}, 53038,
-    {f: 6, c: 53042}, {f: 27, c: 53049}, {f: 2, c: 53078}, {f: 3, c: 53081},
-    {f: 7, c: 53085}, 53094, 53096, {f: 6, c: 53098}, {f: 2, c: 53106},
-    {f: 3, c: 53109}, {f: 7, c: 53113}, {f: 4, c: 53121}, {f: 6, c: 53126},
-    {f: 20, c: 53133}, {f: 6, c: 53154}, {f: 7, c: 53161}, {f: 19, c: 53169},
-    {f: 27, c: 53189}, {f: 2, c: 53218}, {f: 3, c: 53221}, {f: 7, c: 53225},
-    53234, 53236, {f: 6, c: 53238}, {f: 3, c: 53245}, {f: 3, c: 53249},
-    {f: 12, c: 53253}, {f: 6, c: 53266}, {f: 20, c: 53273}, {f: 6, c: 53294},
-    {f: 2, c: 53302}, {f: 3, c: 53305}, {f: 7, c: 53309}, 53318, 53320,
-    {f: 6, c: 53322}, {f: 3, c: 53329}, {f: 3, c: 53333}, {f: 7, c: 53337},
-    {f: 11, c: 53345}, {f: 2, c: 53358}, {f: 3, c: 53361}, {f: 7, c: 53365},
-    {f: 3, c: 53374}, {f: 34, c: 53378}, {f: 2, c: 53414}, {f: 3, c: 53417},
-    {f: 7, c: 53421}, 53430, 53432, {f: 6, c: 53434}, {f: 2, c: 53442},
-    {f: 3, c: 53445}, {f: 6, c: 53450}, 53458, {f: 6, c: 53462},
-    {f: 2, c: 53470}, {f: 3, c: 53473}, {f: 7, c: 53477}, 53486,
-    {f: 6, c: 53490}, {f: 20, c: 53497}, {f: 34, c: 53518}, {f: 2, c: 53554},
-    {f: 3, c: 53557}, 53561, {f: 5, c: 53563}, 53570, {f: 6, c: 53574},
-    {f: 2, c: 53582}, {f: 3, c: 53585}, {f: 7, c: 53589}, 53598, 53600,
-    {f: 6, c: 53602}, {f: 3, c: 53609}, {f: 15, c: 53613}, {f: 7, c: 53629},
-    {f: 3, c: 53637}, {f: 23, c: 53641}, {f: 2, c: 53666}, {f: 3, c: 53669},
-    {f: 7, c: 53673}, 53682, 53684, {f: 4, c: 53686}, 53691, {f: 3, c: 53693},
-    {f: 23, c: 53697}, {f: 27, c: 53721}, {f: 3, c: 53749}, {f: 14, c: 53753},
-    53768, {f: 6, c: 53770}, {f: 27, c: 53777}, {f: 2, c: 53806},
-    {f: 3, c: 53809}, {f: 7, c: 53813}, 53822, 53824, {f: 6, c: 53826},
-    {f: 19, c: 53833}, {f: 7, c: 53853}, {f: 27, c: 53861}, {f: 2, c: 53890},
-    {f: 3, c: 53893}, {f: 7, c: 53897}, {f: 3, c: 53906}, {f: 6, c: 53910},
-    {f: 3, c: 53917}, {f: 3, c: 53921}, {f: 7, c: 53925}, {f: 4, c: 53933},
-    {f: 6, c: 53938}, {f: 2, c: 53946}, {f: 2, c: 53949}, 53953,
-    {f: 5, c: 53955}, 53962, {f: 8, c: 53964}, {f: 3, c: 53973},
-    {f: 3, c: 53977}, {f: 7, c: 53981}, {f: 10, c: 53990}, {f: 2, c: 54002},
-    {f: 3, c: 54005}, {f: 7, c: 54009}, 54018, 54020, {f: 6, c: 54022}, 54031,
-    {f: 3, c: 54033}, 54037, {f: 5, c: 54039}, 54046, {f: 3, c: 54050},
-    {f: 2, c: 54054}, {f: 2, c: 54058}, {f: 3, c: 54061}, {f: 7, c: 54065},
-    54074, {f: 6, c: 54078}, {f: 54, c: 54086}, {f: 2, c: 54142},
-    {f: 3, c: 54145}, {f: 7, c: 54149}, 54158, {f: 6, c: 54162},
-    {f: 2, c: 54170}, {f: 3, c: 54173}, {f: 7, c: 54177}, 54186, 54188,
-    {f: 6, c: 54190}, {f: 3, c: 54197}, {f: 3, c: 54201}, {f: 7, c: 54205},
-    {f: 2, c: 54214}, {f: 6, c: 54218}, {f: 7, c: 54225}, {f: 8, c: 54233},
-    54242, {f: 8, c: 54244}, {f: 2, c: 54254}, {f: 3, c: 54257},
-    {f: 7, c: 54261}, 54270, 54272, {f: 6, c: 54274}, {f: 20, c: 54281},
-    {f: 34, c: 54302}, {f: 3, c: 54337}, {f: 23, c: 54341}, {f: 3, c: 54365},
-    {f: 3, c: 54369}, {f: 8, c: 54373}, 54382, {f: 8, c: 54384},
-    {f: 2, c: 54394}, {f: 2, c: 54397}, 54401, {f: 5, c: 54403}, 54410, 54412,
-    {f: 6, c: 54414}, {f: 20, c: 54421}, {f: 34, c: 54442}, {f: 3, c: 54477},
-    {f: 3, c: 54481}, {f: 7, c: 54485}, {f: 2, c: 54493}, {f: 8, c: 54496},
-    {f: 3, c: 54505}, {f: 3, c: 54509}, {f: 7, c: 54513}, {f: 2, c: 54521},
-    54524, {f: 6, c: 54526}, {f: 3, c: 54533}, {f: 3, c: 54537},
-    {f: 7, c: 54541}, 54550, {f: 36, c: 54552}, {f: 2, c: 54590},
-    {f: 3, c: 54593}, {f: 7, c: 54597}, 54606, 54608, {f: 6, c: 54610},
-    {f: 2, c: 54618}, {f: 3, c: 54621}, {f: 4, c: 54625}, {f: 2, c: 54630},
-    54634, 54636, {f: 6, c: 54638}, {f: 2, c: 54646}, {f: 3, c: 54649},
-    {f: 7, c: 54653}, 54662, {f: 6, c: 54666}, {f: 20, c: 54673},
-    {f: 34, c: 54694}, {f: 2, c: 54730}, {f: 3, c: 54733}, 54737,
-    {f: 5, c: 54739}, 54746, 54748, {f: 6, c: 54750}, {f: 2, c: 54758},
-    {f: 3, c: 54761}, {f: 7, c: 54765}, 54774, 54776, {f: 6, c: 54778},
-    {f: 2, c: 54786}, {f: 3, c: 54789}, {f: 7, c: 54793}, 54802,
-    {f: 6, c: 54806}, {f: 3, c: 54813}, {f: 3, c: 54817}, {f: 8, c: 54821},
-    {f: 10, c: 54830}, {f: 2, c: 54842}, {f: 3, c: 54845}, {f: 4, c: 54849},
-    {f: 2, c: 54854}, 54858, 54860, {f: 3, c: 54862}, {f: 2, c: 54866},
-    {f: 2, c: 54870}, {f: 3, c: 54873}, {f: 10, c: 54877}, 54888,
-    {f: 6, c: 54890}, {f: 2, c: 54898}, {f: 14, c: 54901}, 54916,
-    {f: 6, c: 54918}, {f: 2, c: 54926}, {f: 3, c: 54929}, {f: 8, c: 54933},
-    54942, 54944, {f: 6, c: 54946}, {f: 3, c: 54953}, {f: 3, c: 54957},
-    {f: 8, c: 54961}, 54970, {f: 8, c: 54972}, {f: 2, c: 54982},
-    {f: 3, c: 54985}, {f: 4, c: 54989}, {f: 2, c: 54994}, {f: 2, c: 54997},
-    55000, {f: 6, c: 55002}, {f: 3, c: 55009}, {f: 3, c: 55013},
-    {f: 7, c: 55017}, {f: 4, c: 55025}, {f: 6, c: 55030}, {f: 2, c: 55038},
-    {f: 3, c: 55041}, {f: 12, c: 55045}, {f: 6, c: 55058}, {f: 2, c: 55066},
-    {f: 3, c: 55069}, {f: 7, c: 55073}, 55082, 55084, {f: 6, c: 55086},
-    {f: 2, c: 55094}, {f: 3, c: 55097}, {f: 7, c: 55101}, {f: 2, c: 55109},
-    55112, {f: 6, c: 55114}, {f: 2, c: 55122}, 55125, {f: 6, c: 55130}, 55138,
-    55140, {f: 3, c: 55142}, {f: 2, c: 55146}, {f: 3, c: 55149},
-    {f: 3, c: 55153}, {f: 7, c: 55157}, {f: 3, c: 55166}, {f: 6, c: 55170},
-    {f: 2, c: 55178}, {f: 3, c: 55181}, {f: 7, c: 55185}, 55194, 55196,
-    {f: 6, c: 55198}],
-  'Adobe-CNS1': [{f: 95, c: 32}, {s: 3}, 12288, 65292, {f: 2, c: 12289}, 65294,
-    8226, 65307, 65306, 65311, 65281, 65072, 8230, 8229, 65104, 65380, 65106,
-    183, {f: 4, c: 65108}, 65372, 8211, 65073, 8212, {s: 4}, {f: 2, c: 65288},
-    {f: 2, c: 65077}, 65371, 65373, {f: 2, c: 65079}, {f: 2, c: 12308},
-    {f: 2, c: 65081}, {f: 2, c: 12304}, {f: 2, c: 65083}, {f: 2, c: 12298},
-    {f: 2, c: 65085}, {f: 2, c: 12296}, {f: 2, c: 65087}, {f: 2, c: 12300},
-    {f: 2, c: 65089}, {f: 2, c: 12302}, {f: 2, c: 65091}, {f: 6, c: 65113},
-    {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12317}, 8245, 8242, 65283,
-    65286, 65290, 8251, 167, 12291, 9675, 9679, 9651, 9650, 9678, 9734, 9733,
-    9671, 9670, 9633, 9632, 9661, 9660, 12963, 8453, 8254, 0, 65343, 0,
-    {f: 2, c: 65097}, {f: 2, c: 65101}, {f: 2, c: 65099}, {f: 3, c: 65119},
-    65291, 65293, 215, 247, 177, 8730, 65308, 65310, 65309, {f: 2, c: 8806},
-    8800, 8734, 8786, 8801, {f: 5, c: 65122}, 8764, {f: 2, c: 8745}, 8869,
-    8736, 8735, 8895, 13266, 13265, 8747, 8750, 8757, 8756, 9792, 9794, 9793,
-    9737, 8593, 8595, 8594, 8592, {f: 2, c: 8598}, 8601, 8600, 8741, 8739, 0,
-    0, 65295, 65340, 65284, 165, 12306, {f: 2, c: 162}, 65285, 65312, 8451,
-    8457, {f: 3, c: 65129}, 13269, {f: 3, c: 13212}, 13262, 13217,
-    {f: 2, c: 13198}, 13252, 176, [20825, 58834], [20827, 58835],
-    [20830, 58837], [20829, 58836], 20833, 20835, 21991, [29929, 58044],
-    [31950, 58191], {f: 8, c: 9601}, 9615, 9614, 9613, 9612, 9611, 9610, 9609,
-    9532, 9524, 9516, 9508, 9500, 9620, 9472, 9474, 9621, 9484, 9488, 9492,
-    9496, {f: 2, c: 9581}, 9584, 9583, 9552, 9566, 9578, 9569, {f: 2, c: 9698},
-    9701, 9700, {f: 3, c: 9585}, {f: 10, c: 65296}, {f: 10, c: 8544},
-    {f: 9, c: 12321}, 0, [21316, 57443], 0, {f: 26, c: 65313},
-    {f: 26, c: 65345}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
-    {f: 7, c: 963}, {f: 37, c: 12549}, 729, 714, 711, 715, [9312, 63153],
-    [9313, 63154], [9314, 63155], [9315, 63156], [9316, 63157], [9317, 63158],
-    [9318, 63159], [9319, 63160], [9320, 63161], [9321, 63162], [9332, 63163],
-    [9333, 63164], [9334, 63165], [9335, 63166], [9336, 63167], [9337, 63168],
-    [9338, 63169], [9339, 63170], [9340, 63171], [9341, 63172], [8560, 63173],
-    [8561, 63174], [8562, 63175], [8563, 63176], [8564, 63177], [8565, 63178],
-    [8566, 63179], [8567, 63180], [8568, 63181], [8569, 63182], [12033, 20008],
-    [12034, 20022, 63183], [12035, 20031, 63184], [12037, 20101, 63185],
-    [12039, 20128, 63186], [12044, 20866, 63187], [12045, 20886, 63188],
-    [12046, 20907, 63189], [12051, 21241, 63190], [12054, 21304, 63191],
-    [12057, 21353, 63192], [12059, 21430, 63193],
-    [12065, 12066, 22786, 22794, 63194], [12071, 23424, 63195],
-    [12078, 24027, 63196], [12083, 24186, 63197], [12084, 24191, 63198],
-    [12085, 24308], [12089, 24400, 63200], [12090, 24417, 63201],
-    [12097, 25908, 63202], [12102, 26080], [12135, 30098, 63204],
-    [12136, 30326], [12193, 36789, 63206], [12202, 38582], {f: 32, c: 9216},
-    9249, [12032, 19968], [12036, 20057], 19969, 19971, 20035, 20061, 20102,
-    [12038, 20108], [12040, 20154], [12041, 20799], [12042, 20837],
-    [12043, 20843], [12047, 20960], [12049, 20992], 20993, [12050, 21147],
-    [12052, 21269], [12055, 21313], [12056, 21340], [12060, 21448], 19977,
-    19979, 19976, 19978, 20011, 20024, 20961, 20037, 20040, 20063, 20062,
-    20110, 20129, [20800, 64012], 20995, 21242, 21315, 21449, [12061, 21475],
-    [12063, 22303], [12064, 22763], [12067, 22805], [12068, 22823],
-    [12069, 22899], [12070, 23376], 23377, 23379, [12072, 23544],
-    [12073, 23567], [12074, 23586], [12075, 23608], [12077, 23665], 24029,
-    [12079, 24037], [12080, 24049], {f: 2, c: 24050}, [12081, 24062],
-    [12082, 24178], [12086, 24318], [12087, 24331], [12088, 24339], 25165,
-    19985, 19984, 19981, 20013, 20016, 20025, 20043, 23609, 20104, 20113,
-    20117, 20114, 20116, 20130, 20161, 20160, 20163, {f: 2, c: 20166}, 20173,
-    {f: 2, c: 20170}, 20164, 20803, 20801, 20839, {f: 2, c: 20845}, 20844,
-    20887, 20982, {f: 3, c: 20998}, 21243, {f: 2, c: 21246}, 21270, 21305,
-    21320, 21319, 21317, 21342, 21380, 21451, 21450, 21453, 22764, 22825,
-    22827, 22826, 22829, 23380, 23569, 23588, 23610, 23663, 24052, 24187,
-    24319, {f: 2, c: 24340}, [12092, 24515], [12093, 25096], [12094, 25142],
-    [12095, 25163], 25166, [12096, 25903], [12098, 25991], [12099, 26007],
-    [12100, 26020], [12101, 26041], [12103, 26085], [12104, 26352],
-    [12105, 26376], [12106, 26408], [12107, 27424], [12108, 27490],
-    [12109, 27513], [12111, 27595], [12112, 27604], [12113, 27611],
-    [12114, 27663], [12116, 27700], [12117, 28779], [12118, 29226],
-    [12119, 29238], [12120, 29243], [12122, 29255], [12123, 29273],
-    [12124, 29275], [12125, 29356], 29579, 19993, 19990, 19989, 19988, 19992,
-    20027, 20045, 20047, 20046, 20197, 20184, {f: 4, c: 20180},
-    {f: 2, c: 20195}, 20185, 20190, 20805, 20804, {f: 2, c: 20873}, 20908,
-    {f: 2, c: 20985}, 20984, 21002, 21152, 21151, [21253, 57435], 21254, 21271,
-    21277, 20191, 21322, 21321, 21345, 21344, 21359, 21358, 21435, 21487,
-    21476, 21491, 21484, 21486, 21481, 21480, 21500, 21496, 21493, 21483,
-    21478, 21482, 21490, 21489, 21488, 21477, 21485, 21499, 22235, 22234,
-    22806, 22830, 22833, 22900, 22902, 23381, 23427, 23612, 24040, 24039,
-    24038, {f: 2, c: 24066}, 24179, 24188, 24321, 24344, 24343, 24517, 25098,
-    {f: 2, c: 25171}, 25170, 25169, 26021, 26086, 26414, 26412,
-    {f: 2, c: 26410}, 26413, 27491, 27597, 27665, 27664, 27704, 27713, 27712,
-    27710, 29359, [12126, 29572], [12127, 29577], [12128, 29916],
-    [12129, 29926], [12130, 29976], [12131, 29983], [12132, 29992], 29993,
-    [12133, 30000], {f: 3, c: 30001}, [12134, 30091], [12137, 30333],
-    [12138, 30382], [12139, 30399], [12140, 30446], [12141, 30683],
-    [12142, 30690], [12143, 30707], [12144, 31034], [12146, 31166],
-    [12147, 31348], [12148, 31435], {f: 2, c: 19998}, {f: 2, c: 20050}, 20073,
-    20121, 20132, 20134, 20133, 20223, 20233, 20249, 20234, 20245, 20237,
-    {f: 2, c: 20240}, 20239, 20210, 20214, 20219, 20208, 20211, 20221, 20225,
-    20235, 20809, 20807, 20806, 20808, 20840, 20849, 20877, 20912, 21015,
-    {f: 2, c: 21009}, 21006, 21014, 21155, 21256, 21281, 21280,
-    {f: 2, c: 21360}, 21513, 21519, 21516, 21514, 21520, 21505, 21515, 21508,
-    21521, 21517, 21512, 21507, 21518, 21510, 21522, 22240, 22238, 22237,
-    22323, 22320, 22312, 22317, 22316, 22319, 22313, {f: 2, c: 22809},
-    {f: 2, c: 22839}, 22916, 22904, 22915, 22909, 22905, 22914, 22913,
-    {f: 2, c: 23383}, {f: 2, c: 23431}, 23429, 23433, 23546, 23574, 23673,
-    24030, 24070, 24182, 24180, 24335, 24347, 24537, 24534, 25102,
-    {f: 2, c: 25100}, 25104, 25187, 25179, 25176, 25910, 26089, 26088,
-    {f: 2, c: 26092}, {f: 2, c: 26354}, 26377, 26429, 26420, 26417, 26421,
-    27425, 27492, 27515, 27670, 27741, 27735, 27737, {f: 2, c: 27743}, 27728,
-    27733, 27745, 27739, {f: 2, c: 27725}, 28784, 29279, 29277, 30334,
-    [12149, 31481], [12150, 31859], [12151, 31992], [12152, 32566],
-    [12154, 32650], [12155, 32701], [12156, 32769], 32771, [12157, 32780],
-    [12158, 32786], [12159, 32819], [12160, 32895], [12161, 32905],
-    {f: 2, c: 32907}, [12162, 33251], [12163, 33258], [12164, 33267],
-    [12165, 33276], [12166, 33292], [12167, 33307], [12168, 33311],
-    [12169, 33390], [12170, 33394], 33406, [12173, 34411], [12174, 34880],
-    [12175, 34892], [12176, 34915], 35199, 38433, 20018, 20136, 20301, 20303,
-    20295, 20311, 20318, 20276, 20315, 20309, 20272, {f: 2, c: 20304}, 20285,
-    20282, 20280, 20291, 20308, 20284, 20294, 20323, 20316, 20320, 20271,
-    20302, 20278, 20313, 20317, 20296, 20314, 20812, 20811, 20813, 20853,
-    {f: 2, c: 20918}, 21029, 21028, {f: 2, c: 21033}, 21032, 21163,
-    {f: 2, c: 21161}, 21164, 21283, 21363, 21365, 21533, 21549, 21534, 21566,
-    21542, 21582, 21543, 21574, 21571, 21555, 21576, 21570, 21531, 21545,
-    21578, 21561, 21563, 21560, 21550, {f: 2, c: 21557}, 21536, 21564, 21568,
-    21553, 21547, 21535, 21548, 22250, 22256, 22244, 22251, 22346, 22353,
-    22336, 22349, 22343, 22350, 22334, 22352, 22351, 22331, 22767, 22846,
-    22941, 22930, 22952, 22942, 22947, 22937, 22934, 22925, 22948, 22931,
-    22922, 22949, 23389, 23388, {f: 2, c: 23386}, 23436, 23435, 23439, 23596,
-    {f: 2, c: 23616}, 23615, 23614, {f: 2, c: 23696}, 23700, 23692, 24043,
-    24076, 24207, 24199, 24202, 24311, 24324, 24351, 24420, 24418, 24439,
-    24441, 24536, 24524, 24535, 24525, 24561, 24555, 24568, 24554, 25106,
-    25105, 25220, 25239, 25238, 25216, 25206, 25225, 25197, 25226, 25212,
-    25214, 25209, 25203, 25234, 25199, 25240, 25198, 25237, 25235, 25233,
-    25222, 25913, 25915, 25912, 26097, 26356, 26463, {f: 4, c: 26446}, 26460,
-    26454, [26462, 57801], 26441, 26438, 26464, 26451, 26455, 27493, 27599,
-    27714, 27742, 27801, 27777, {f: 2, c: 27784}, 27781, 27803, 27754, 27770,
-    27792, 27760, 27788, 27752, 27798, 27794, 27773, 27779, 27762, 27774,
-    27764, 27782, 27766, 27789, 27796, 27800, 27778, 28790, {f: 2, c: 28796},
-    28792, 29282, 29281, 29280, 29380, 29378, 29590, 29996, 29995,
-    {f: 2, c: 30007}, 30338, 30447, 30691, 31169, 31168, 31167, 31350, 31995,
-    32597, 32918, 32915, 32925, 32920, 32923, 32922, 32946, 33391, 33426,
-    33419, 33421, [12178, 35211], [12179, 35282], [12180, 35328],
-    [12181, 35895], [12182, 35910], [12183, 35925], [12185, 35997],
-    [12186, 36196], [12187, 36208], [12188, 36275], [12189, 36523],
-    [12190, 36554], [12191, 36763], [12192, 36784], 36802, 36806, 36805, 36804,
-    24033, [12194, 37009], 37026, 37034, 37030, 37027, [12195, 37193],
-    [12196, 37318], [12197, 37324], 38450, 38446, 38449, 38442, 38444, 20006,
-    20054, 20083, 20107, 20123, 20126, {f: 2, c: 20139}, 20335, 20381, 20365,
-    20339, 20351, 20332, 20379, 20363, 20358, 20355, 20336, 20341, 20360,
-    20329, 20347, 20374, 20350, 20367, 20369, 20346, 20820, 20818, 20821,
-    20841, 20855, 20854, 20856, 20925, 20989, 21051, 21048, 21047, 21050,
-    21040, 21038, 21046, 21057, 21182, 21179, 21330, 21332, 21331, 21329,
-    21350, {f: 3, c: 21367}, 21462, 21460, 21463, 21619, 21621, 21654, 21624,
-    21653, 21632, 21627, 21623, 21636, 21650, 21638, 21628, 21648, 21617,
-    21622, 21644, 21658, 21602, 21608, 21643, 21629, 21646, 22266, 22403,
-    22391, 22378, 22377, 22369, 22374, 22372, 22396, 22812, 22857,
-    {f: 2, c: 22855}, 22852, 22868, 22974, 22971, 22996, 22969, 22958, 22993,
-    22982, 22992, 22989, 22987, 22995, 22986, 22959, 22963, 22994, 22981,
-    23391, 23396, 23395, 23447, 23450, 23448, 23452, 23449, 23451, 23578,
-    23624, {f: 2, c: 23621}, 23735, 23713, 23736, 23721, 23723, 23729, 23731,
-    24088, 24090, 24086, 24085, 24091, 24081, 24184, 24218, 24215, 24220,
-    {f: 2, c: 24213}, 24310, {f: 2, c: 24358}, 24361, {f: 2, c: 24448}, 24447,
-    24444, 24541, 24544, 24573, 24565, 24575, 24591, 24596, 24623, 24629,
-    24598, 24618, 24597, 24609, 24615, 24617, 24619, 24603, 25110, 25109,
-    25151, 25150, 25152, 25215, 25289, 25292, 25284, 25279, 25282, 25273,
-    25298, 25307, 25259, {f: 2, c: 25299}, 25291, 25288, 25256, 25277, 25276,
-    [25296, 60582], 25305, 25287, 25293, 25269, 25306, 25265, 25304,
-    {f: 2, c: 25302}, 25286, 25260, [25294, 61010], 25918, 26023, 26044, 26106,
-    26132, 26131, 26124, 26118, 26114, 26126, 26112, 26127, 26133, 26122,
-    26119, 26381, 26379, 26477, 26507, 26517, 26481, 26524, 26483, 26487,
-    26503, 26525, 26519, {f: 2, c: 26479}, 26495, 26505, 26494, 26512, 26485,
-    26522, 26515, 26492, 26474, 26482, 27427, {f: 2, c: 27494}, 27519, 27667,
-    27675, 27875, 27880, 27891, 27825, 27852, 27877, 27827, {f: 2, c: 27837},
-    27836, 27874, 27819, 27861, 27859, 27832, 27844, 27833, 27841, 27822,
-    27863, 27845, 27889, 27839, 27835, 27873, 27867, 27850, 27820, 27887,
-    27868, 27862, 27872, 28821, 28814, 28818, 28810, 28825, {f: 2, c: 29228},
-    29240, 29256, 29287, 29289, 29376, 29390, 29401, 29399, 29392, 29609,
-    29608, 29599, 29611, 29605, 30013, 30109, {f: 2, c: 30105}, 30340, 30402,
-    30450, 30452, 30693, 30717, 31038, {f: 2, c: 31040}, 31177, 31176, 31354,
-    31353, 31482, 31998, 32596, 32652, 32651, [32773, 58236], 32954, 32933,
-    32930, 32945, 32929, 32939, 32937, 32948, 32938, 32943, 33253, 33278,
-    33293, 33459, 33437, 33433, 33453, 33469, 33439, 33465, 33457, 33452,
-    33445, 33455, 33464, 33443, 33456, 33470, 33463, 34382, 34417, 21021,
-    34920, 36555, 36814, 36820, 36817, 37045, 37048, 37041, 37046, 37319,
-    [12198, 37329], [12199, 38263], [12200, 38272], [12201, 38428], 38464,
-    38463, 38459, 38468, 38466, [12203, 38585], [12204, 38632], 38738,
-    [12206, 38750], 20127, {f: 2, c: 20141}, 20449, 20405, 20399, 20415, 20448,
-    20433, 20431, 20445, 20419, 20406, 20440, 20447, 20426, 20439, 20398,
-    20432, 20420, 20418, 20442, 20430, 20446, 20407, 20823, 20882, 20881,
-    20896, 21070, 21059, 21066, 21069, 21068, 21067, 21063, 21191, 21193,
-    21187, 21185, 21261, 21335, 21371, 21402, 21467, 21676, 21696, 21672,
-    21710, 21705, 21688, 21670, 21683, 21703, 21698, 21693, 21674, 21697,
-    21700, 21704, 21679, 21675, 21681, 21691, 21673, 21671, 21695, 22271,
-    22402, 22411, 22432, 22435, 22434, 22478, 22446, 22419, 22869, 22865,
-    22863, 22862, 22864, 23004, 23000, 23039, 23011, 23016, 23043, 23013,
-    23018, 23002, 23014, 23041, 23035, 23401, 23459, 23462, 23460, 23458,
-    23461, 23553, {f: 2, c: 23630}, 23629, 23627, 23769, 23762, 24055, 24093,
-    24101, 24095, 24189, 24224, 24230, 24314, 24328, 24365, 24421, 24456,
-    24453, {f: 2, c: 24458}, 24455, 24460, 24457, 24594, 24605, 24608, 24613,
-    24590, 24616, 24653, 24688, 24680, [24674, 60712], 24646, 24643, 24684,
-    24683, 24682, 24676, 25153, 25308, 25366, 25353, 25340, 25325, 25345,
-    25326, 25341, 25351, 25329, 25335, 25327, 25324, 25342, 25332, 25361,
-    25346, 25919, 25925, 26027, 26045, 26082, 26149, 26157, 26144, 26151,
-    26159, 26143, 26152, 26161, 26148, 26359, 26623, 26579, 26609, 26580,
-    26576, 26604, 26550, 26543, 26613, 26601, 26607, 26564, 26577, 26548,
-    26586, 26597, 26552, 26575, 26590, 26611, 26544, 26585, 26594, 26589,
-    26578, 27498, 27523, 27526, 27573, 27602, 27607, 27679, 27849, 27915,
-    27954, 27946, 27969, 27941, 27916, 27953, 27934, 27927, 27963,
-    {f: 2, c: 27965}, 27958, 27931, 27893, 27961, 27943, 27960, 27945, 27950,
-    27957, 27918, 27947, 28843, 28858, 28851, 28844, 28847, 28845, 28856,
-    28846, 28836, 29232, 29298, 29295, 29300, 29417, {f: 2, c: 29408}, 29623,
-    29642, 29627, 29618, 29645, 29632, 29619, 29978, 29997, 30031, 30028,
-    30030, 30027, 30123, {f: 2, c: 30116}, {f: 2, c: 30114}, 30328,
-    {f: 3, c: 30342}, 30408, 30406, 30403, 30405, 30465, 30457, 30456, 30473,
-    30475, 30462, 30460, 30471, 30684, 30722, 30740, {f: 2, c: 30732}, 31046,
-    31049, 31048, 31047, {f: 2, c: 31161}, {f: 2, c: 31185}, 31179, 31359,
-    31361, 31487, 31485, 31869, 32002, 32005, 32000, 32009, 32007, 32004,
-    32006, 32568, 32654, 32703, 32784, 32781, 32785, 32822, 32982, 32997,
-    32986, {f: 2, c: 32963}, 32972, 32993, 32987, 32974, 32990, 32996, 32989,
-    33268, 33314, 33511, 33539, 33541, 33507, 33499, 33510, 33540, 33509,
-    33538, 33545, 33490, 33495, 33521, 33537, 33500, 33492, 33489, 33502,
-    33491, 33503, 33519, 33542, 34384, 34425, 34427, 34426, 34893, 34923,
-    35201, 35284, 35336, {f: 2, c: 35330}, 35998, 36000, 36212, 36211, 36276,
-    36557, 36556, 36848, 36838, 36834, 36842, 36837, 36845, 36843, 36836,
-    36840, 37066, 37070, 37057, 37059, 37195, 37194, 37325, 38274, 38480,
-    {f: 3, c: 38475}, [12207, 38754], [12208, 38761], [12209, 38859],
-    [12210, 38893], [12211, 38899], [12212, 38913], [12213, 39080],
-    [12214, 39131], [12215, 39135], [12216, 39318], [12217, 39321], 20056,
-    20147, {f: 2, c: 20492}, 20515, 20463, 20518, 20517, 20472, [20521, 57375],
-    20502, 20486, 20540, 20511, 20506, 20498, 20497, 20474, 20480, 20500,
-    20520, 20465, 20513, 20491, 20505, 20504, 20467, 20462, 20525, 20522,
-    20478, 20523, 20489, 20860, {f: 2, c: 20900}, 20898, 20941, 20940, 20934,
-    20939, 21078, 21084, 21076, 21083, 21085, 21290, [21375, 57459], 21407,
-    21405, 21471, 21736, 21776, 21761, 21815, 21756, 21733, 21746, 21766,
-    21754, 21780, 21737, 21741, 21729, 21769, 21742, 21738, 21734, 21799,
-    21767, 21757, 21775, {f: 2, c: 22275}, 22466, 22484, 22475, 22467, 22537,
-    22799, {f: 2, c: 22871}, 22874, 23057, 23064, 23068, 23071, 23067, 23059,
-    23020, 23072, 23075, 23081, 23077, 23052, 23049, 23403, 23640, 23472,
-    23475, 23478, 23476, 23470, 23477, 23481, 23480, 23556, 23633, 23637,
-    23632, 23789, 23805, 23803, 23786, 23784, 23792, 23798, 23809, 23796,
-    24046, 24109, 24107, 24235, 24237, 24231, 24369, 24466, 24465, 24464,
-    24665, 24675, 24677, 24656, 24661, 24685, 24681, 24687, 24708, 24735,
-    24730, 24717, 24724, 24716, 24709, 24726, 25159, 25331, 25352, 25343,
-    25422, 25406, 25391, 25429, 25410, 25414, 25423, 25417, 25402, 25424,
-    25405, {f: 2, c: 25386}, 25384, 25421, 25420, {f: 2, c: 25928}, 26009,
-    26049, 26053, 26178, 26185, 26191, 26179, 26194, 26188, 26181, 26177,
-    26360, {f: 2, c: 26388}, 26391, 26657, 26680, 26696, 26694, 26707, 26681,
-    26690, 26708, 26665, 26803, 26647, 26700, 26705, 26685, 26612, 26704,
-    26688, 26684, 26691, 26666, 26693, 26643, 26648, 26689, 27530, 27529,
-    27575, 27683, {f: 2, c: 27687}, 27686, 27684, 27888, 28010, 28053, 28040,
-    28039, 28006, 28024, 28023, 27993, 28051, 28012, 28041, 28014, 27994,
-    28020, 28009, 28044, 28042, 28025, 28037, 28005, 28052, 28874, 28888,
-    28900, 28889, 28872, 28879, 29241, 29305, 29436, 29433, 29437, 29432,
-    29431, 29574, 29677, 29705, 29678, 29664, 29674, 29662, 30036, 30045,
-    30044, 30042, 30041, 30142, 30149, 30151, {f: 2, c: 30130}, 30141, 30140,
-    30137, 30146, 30136, 30347, 30384, 30410, {f: 2, c: 30413}, 30505,
-    {f: 2, c: 30495}, 30504, 30697, 30768, 30759, 30776, 30749, 30772, 30775,
-    30757, 30765, 30752, 30751, 30770, 31061, 31056, 31072, 31071, 31062,
-    31070, 31069, 31063, 31066, 31204, [31203, 60418], 31207, 31199, 31206,
-    31209, 31192, 31364, 31368, 31449, 31494, 31505, 31881, 32033, 32023,
-    32011, 32010, 32032, 32034, 32020, 32016, 32021, 32026, 32028, 32013,
-    32025, 32027, 32570, 32607, 32660, 32709, 32705, 32774, 32772, 32792,
-    32789, 32793, 32791, 32829, 32831, 33009, 33026, 33008, 33029, 33005,
-    33012, 33030, 33016, 33011, 33032, 33021, 33034, 33020, 33007, 33261,
-    33260, 33280, 33296, {f: 2, c: 33322}, 33320, 33324, 33467, 33579, 33618,
-    33620, 33610, 33592, 33616, 33609, 33589, 33588, 33615, 33586, 33593,
-    33590, 33559, 33600, 33585, 33576, 33603, 34388, 34442, 34474, 34451,
-    34468, 34473, 34444, 34467, 34460, 34928, 34935, {f: 2, c: 34945}, 34941,
-    34937, 35352, 35344, 35342, 35340, 35349, 35338, 35351, 35347, 35350,
-    35343, 35345, 35912, 35962, 35961, {f: 2, c: 36001}, [36215, 58442], 36524,
-    36562, 36564, 36559, 36785, 36865, 36870, 36855, 36864, 36858, 36852,
-    36867, 36861, 36869, 36856, 37013, 37089, 37085, 37090, 37202, 37197,
-    37196, 37336, 37341, 37335, 37340, 37337, 38275, {f: 2, c: 38498}, 38497,
-    38491, 38493, 38500, 38488, 38494, 38587, 39138, [12218, 39340],
-    [12219, 39592], [12220, 39640], [12222, 39717], [12224, 39730],
-    [12225, 39740], 20094, 20602, [20605, 57382], 20572, 20551, 20547, 20556,
-    20570, 20553, 20581, 20598, 20558, 20565, 20597, 20596, 20599, 20559,
-    20495, 20591, 20589, 20828, 20885, 20976, 21098, 21103, 21202, 21209,
-    21208, 21205, 21264, 21263, 21273, {f: 2, c: 21311}, 21310, 21443, 26364,
-    21830, 21866, 21862, 21828, 21854, 21857, 21827, 21834, 21809, 21846,
-    21839, 21845, 21807, 21860, 21816, 21806, 21852, 21804, 21859, 21811,
-    21825, 21847, 22280, 22283, 22281, 22495, 22533, 22538, 22534, 22496,
-    22500, 22522, 22530, 22581, 22519, 22521, 22816, 22882, 23094, 23105,
-    23113, 23142, 23146, 23104, 23100, 23138, 23130, 23110, 23114, 23408,
-    23495, 23493, 23492, 23490, 23487, 23494, 23561, 23560, 23559, 23648,
-    {f: 2, c: 23644}, 23815, 23814, 23822, 23835, 23830, 23842, 23825, 23849,
-    23828, 23833, 23844, 23847, 23831, 24034, 24120, 24118, 24115, 24119,
-    {f: 2, c: 24247}, 24246, 24245, 24254, 24373, 24375, 24407, 24428, 24425,
-    24427, 24471, 24473, 24478, 24472, 24481, 24480, 24476, 24703, 24739,
-    24713, 24736, 24744, 24779, 24756, 24806, 24765, 24773, 24763, 24757,
-    24796, 24764, 24792, 24789, 24774, 24799, 24760, 24794, 24775,
-    {f: 2, c: 25114}, 25160, 25504, 25511, 25458, 25494, 25506, 25509, 25463,
-    25447, 25496, 25514, 25457, 25513, 25481, 25475, 25499, 25451, 25512,
-    25476, 25480, 25497, 25505, 25516, 25490, 25487, 25472, 25467, 25449,
-    25448, 25466, 25949, 25942, 25937, 25945, 25943, 21855, 25935, 25944,
-    25941, 25940, 26012, 26011, 26028, 26063, {f: 2, c: 26059}, 26062, 26205,
-    26202, 26212, 26216, 26214, 26206, 26361, 21207, 26395, 26753, 26799,
-    26786, 26771, 26805, 26751, 26742, 26801, 26791, 26775, 26800, 26755,
-    26820, 26797, 26758, 26757, 26772, 26781, 26792, 26783, 26785, 26754,
-    27442, 27578, {f: 2, c: 27627}, 27691, 28046, 28092, 28147, 28121, 28082,
-    28129, 28108, 28132, 28155, 28154, 28165, 28103, 28107, 28079, 28113,
-    28078, 28126, 28153, 28088, 28151, 28149, 28101, 28114, 28186, 28085,
-    28122, 28139, 28120, 28138, 28145, 28142, 28136, 28102, 28100, 28074,
-    28140, 28095, 28134, 28921, {f: 2, c: 28937}, 28925, 28911, 29245, 29309,
-    29313, 29468, 29467, 29462, 29459, 29465, 29575, 29701, 29706, 29699,
-    29702, 29694, 29709, 29920, {f: 2, c: 29942}, 29980, 29986,
-    {f: 2, c: 30053}, 30050, 30064, 30095, {f: 2, c: 30164}, 30133, 30154,
-    30157, 30350, 30420, 30418, 30427, 30519, 30526, 30524, 30518, 30520,
-    30522, 30827, 30787, 30798, 31077, 31080, 31085, 31227, 31378, 31381,
-    31520, 31528, 31515, 31532, 31526, 31513, 31518, 31534, 31890, 31895,
-    31893, 32070, 32067, 32113, 32046, 32057, 32060, 32064, 32048, 32051,
-    32068, 32047, 32066, 32050, 32049, 32573, 32670, 32666, 32716, 32718,
-    32722, 32796, 32842, 32838, 33071, 33046, 33059, 33067, 33065, 33072,
-    33060, 33282, 33333, 33335, 33334, 33337, 33678, 33694, 33688, 33656,
-    33698, 33686, 33725, 33707, 33682, 33674, 33683, 33673, 33696, 33655,
-    {f: 2, c: 33659}, 33670, 33703, 34389, 24426, 34503, 34496, 34486, 34500,
-    34485, 34502, 34507, 34481, 34479, 34505, 34899, 34974, 34952, 34987,
-    34962, 34966, 34957, 34955, 35219, 35215, 35370, 35357, 35363, 35365,
-    35377, 35373, 35359, 35355, 35362, 35913, 35930, 36009, 36012, 36011,
-    36008, 36010, 36007, 36199, 36198, 36286, 36282, 36571, 36575, 36889,
-    36877, 36890, 36887, 36899, 36895, 36893, 36880, 36885, 36894, 36896,
-    36879, 36898, 36886, 36891, 36884, 37096, 37101, [37117, 58488], 37207,
-    37326, 37365, 37350, 37347, 37351, 37357, 37353, 38281, 38506, 38517,
-    38515, 38520, 38512, 38516, {f: 2, c: 38518}, 38508, 38592, 38634, 38633,
-    31456, 31455, {f: 2, c: 38914}, [12226, 39770], [12227, 40165],
-    [12228, 40565], [12229, 40575], [12230, 40613], [12231, 40635], 20642,
-    20621, 20613, 20633, 20625, 20608, 20630, 20632, 20634, 26368, 20977,
-    21106, {f: 2, c: 21108}, 21097, 21214, 21213, 21211, 21338, 21413, 21883,
-    21888, 21927, 21884, 21898, 21917, 21912, 21890, 21916, 21930, 21908,
-    21895, 21899, 21891, 21939, 21934, 21919, 21822, 21938, 21914, 21947,
-    21932, 21937, 21886, 21897, 21931, 21913, 22285, 22575, 22570, 22580,
-    22564, {f: 2, c: 22576}, 22561, 22557, 22560, {f: 2, c: 22777}, 22880,
-    [23159, 57587], 23194, 23167, 23186, 23195, 23207, 23411, 23409, 23506,
-    23500, 23507, 23504, {f: 2, c: 23562}, 23601, 23884, 23888, 23860, 23879,
-    24061, 24133, 24125, 24128, 24131, 24190, 24266, {f: 2, c: 24257}, 24260,
-    24380, 24429, {f: 2, c: 24489}, 24488, 24785, 24801, 24754, 24758, 24800,
-    24860, 24867, 24826, 24853, 24816, 24827, 24820, 24936, 24817, 24846,
-    24822, 24841, 24832, 24850, 25119, 25161, 25507, 25484, 25551, 25536,
-    25577, 25545, 25542, 25549, 25554, 25571, 25552, 25569, 25558,
-    {f: 2, c: 25581}, 25462, 25588, 25578, 25563, 25682, 25562, 25593, 25950,
-    25958, {f: 2, c: 25954}, 26001, 26000, 26031, 26222, 26224, [26228, 57786],
-    26230, 26223, 26257, 26234, 26238, 26231, {f: 2, c: 26366}, 26399, 26397,
-    26874, 26837, 26848, 26840, 26839, 26885, 26847, 26869, 26862, 26855,
-    26873, 26834, 26866, 26851, 26827, 26829, 26893, 26898, 26894, 26825,
-    26842, 26990, 26875, 27454, 27450, 27453, 27544, 27542, 27580, 27631,
-    {f: 2, c: 27694}, 27692, [28207, 57904], 28216, 28244, 28193, 28210, 28263,
-    28234, 28192, 28197, 28195, 28187, 28251, 28248, 28196, 28246, 28270,
-    28205, 28198, 28271, 28212, 28237, 28218, 28204, 28227, [28189, 57901],
-    28222, 28363, 28297, 28185, 28238, 28259, 28228, 28274, 28265, 28255,
-    {f: 2, c: 28953}, 28966, 28976, 28961, 28982, [29038, 57958], 28956, 29260,
-    29316, 29312, 29494, 29477, 29492, 29481, 29754, 29738, 29747, 29730,
-    29733, {f: 2, c: 29749}, 29748, 29743, 29723, 29734, 29736,
-    {f: 2, c: 29989}, 30059, 30058, 30178, 30171, 30179, 30169, 30168, 30174,
-    30176, {f: 2, c: 30331}, 30358, 30355, 30388, 30428, 30543, 30701, 30813,
-    30828, 30831, 31245, 31240, 31243, 31237, 31232, 31384, 31383, 31382,
-    31461, 31459, 31561, 31574, 31558, 31568, 31570, 31572, 31565, 31563,
-    31567, [31569, 60510], 31903, 31909, 32094, 32080, 32104, 32085, 32043,
-    32110, 32114, 32097, 32102, 32098, 32112, 32115, 21892, {f: 2, c: 32724},
-    32779, 32850, 32901, 33109, 33108, 33099, 33105, 33102, 33081, 33094,
-    33086, 33100, 33107, 33140, 33298, 33308, 33769, 33795, 33784, 33805,
-    33760, 33733, 33803, [33729, 58309], 33775, 33777, 33780, 33879, 33802,
-    33776, 33804, 33740, 33789, 33778, 33738, 33848, 33806, 33796, 33756,
-    33799, 33748, 33759, 34395, 34527, 34521, 34541, 34516, 34523, 34532,
-    34512, 34526, 34903, {f: 2, c: 35009}, 34993, 35203, 35222, 35387, 35424,
-    35413, 35422, 35388, 35393, 35412, 35419, 35408, 35398, 35380, 35386,
-    35382, 35414, 35937, 35970, 36015, 36028, 36019, 36029, 36033, 36027,
-    36032, 36020, 36023, 36022, 36031, 36024, 36234, 36229, 36225, 36302,
-    36317, 36299, 36314, 36305, 36300, 36315, 36294, 36603, 36600, 36604,
-    36764, 36910, 36917, 36913, 36920, 36914, 36918, 37122, 37109, 37129,
-    37118, 37219, 37221, 37327, {f: 2, c: 37396}, 37411, 37385, 37406, 37389,
-    37392, 37383, 37393, 38292, 38287, 38283, 38289, 38291, 38290, 38286,
-    38538, 38542, 38539, 38525, {f: 2, c: 38533}, 38541, 38514, 38532, 38593,
-    38597, 38596, {f: 2, c: 38598}, 38639, 38642, 38860, {f: 2, c: 38917},
-    38920, 39143, 39146, 39151, 39145, 39154, 39149, 39342, 39341,
-    [12232, 40643], [12233, 40653], [12234, 40657], 20098, 20653, 20661,
-    {f: 2, c: 20658}, 20677, 20670, 20652, 20663, 20667, 20655, 20679, 21119,
-    21111, 21117, 21215, 21222, 21220, {f: 2, c: 21218}, 21295, 21983, 21992,
-    21971, 21990, 21966, 21980, 21959, 21969, {f: 2, c: 21987}, 21999, 21978,
-    21985, {f: 2, c: 21957}, 21989, 21961, {f: 2, c: 22290}, 22622, 22609,
-    22616, 22615, 22618, 22612, 22635, 22604, 22637, 22602, 22626, 22610,
-    22603, 22887, 23233, 23241, 23244, 23230, 23229, 23228, 23219, 23234,
-    23218, 23913, 23919, 24140, 24185, 24265, 24264, 24338, 24409, 24492,
-    24494, 24858, 24847, 24904, 24863, 24819, 24859, 24825, 24833, 24840,
-    24910, 24908, 24900, 24909, 24894, 24884, 24871, 24845, 24838, 24887,
-    {f: 2, c: 25121}, 25619, 25662, 25630, 25642, 25645, 25661, 25644, 25615,
-    25628, 25620, 25613, 25654, {f: 2, c: 25622}, 25606, 25964, 26015, 26032,
-    26263, 26249, {f: 2, c: 26247}, 26262, 26244, 26264, 26253, 26371, 27028,
-    26989, 26970, 26999, 26976, 26964, 26997, 26928, 27010, 26954, 26984,
-    26987, 26974, 26963, 27001, 27014, 26973, 26979, 26971, 27463, 27506,
-    27584, 27583, 27603, 27645, 28322, 28335, 28371, 28342, 28354, 28304,
-    28317, 28359, 28357, 28325, 28312, 28348, 28346, 28331, 28369, 28310,
-    28316, 28356, 28372, 28330, 28327, 28340, 29006, 29017, 29033, 29028,
-    29001, 29031, 29020, 29036, 29030, 29004, 29029, 29022, 28998, 29032,
-    29014, 29242, 29266, 29495, 29509, 29503, 29502, 29807, 29786, 29781,
-    29791, 29790, 29761, 29759, 29785, 29787, [29788, 58019], 30070, 30072,
-    30208, 30192, 30209, 30194, 30193, 30202, 30207, 30196, 30195,
-    {f: 2, c: 30430}, 30555, 30571, 30566, 30558, 30563, 30585, 30570, 30572,
-    30556, 30565, 30568, 30562, 30702, 30862, 30896, {f: 2, c: 30871}, 30860,
-    30857, 30844, 30865, 30867, 30847, 31098, 31103, 31105, 33836, 31165,
-    31260, 31258, 31264, 31252, 31263, 31262, {f: 2, c: 31391}, 31607, 31680,
-    31584, 31598, 31591, 31921, 31923, 31925, 32147, 32121, 32145, 32129,
-    32143, 32091, 32622, {f: 2, c: 32617}, 32626, 32681, 32680, 32676, 32854,
-    32856, 32902, 32900, 33137, 33136, 33144, 33125, 33134, 33139, 33131,
-    {f: 2, c: 33145}, 33126, 33285, 33351, 33922, 33911, 33853, 33841, 33909,
-    33894, 33899, 33865, 33900, 33883, 33852, 33845, 33889, 33891, 33897,
-    33901, 33862, 34398, 34396, 34399, 34553, 34579, 34568, 34567, 34560,
-    34558, 34555, {f: 2, c: 34562}, 34566, 34570, 34905, 35039, 35028, 35033,
-    35036, 35032, 35037, 35041, 35018, 35029, 35026, 35228, 35299, 35435,
-    {f: 2, c: 35442}, 35430, 35433, 35440, 35463, 35452, 35427, 35488, 35441,
-    35461, 35437, 35426, 35438, 35436, 35449, 35451, 35390, 35432, 35938,
-    35978, 35977, 36042, {f: 2, c: 36039}, 36036, 36018, 36035, 36034, 36037,
-    36321, 36319, 36328, 36335, 36339, 36346, 36330, 36324, 36326, 36530,
-    36611, 36617, 36606, 36618, 36767, 36786, 36939, 36938, 36947, 36930,
-    36948, 36924, 36949, 36944, 36935, 36943, 36942, 36941, 36945, 36926,
-    36929, 37138, 37143, 37228, 37226, 37225, 37321, 37431, 37463, 37432,
-    37437, 37440, 37438, 37467, 37451, 37476, 37457, 37428, 37449, 37453,
-    37445, 37433, 37439, 37466, 38296, 38552, {f: 2, c: 38548}, 38605, 38603,
-    {f: 2, c: 38601}, 38647, 38651, 38649, 38646, 38742, 38772, 38774,
-    {f: 2, c: 38928}, 38931, 38922, 38930, 38924, 39164, 39156,
-    {f: 2, c: 39165}, 39347, 39345, 39348, 39649, 40169, 40578, [12237, 40718],
-    [12238, 40723], [12239, 40736], 20711, 20718, 20709, 20694, [20717, 60903],
-    20698, 20693, 20687, 20689, 20721, 20686, 20713, 20834, 20979, 21123,
-    21122, 21297, 21421, 22014, 22016, 22043, 22039, 22013, 22036, 22022,
-    22025, {f: 2, c: 22029}, 22007, 22038, 22047, 22024, 22032, 22006, 22296,
-    22294, 22645, 22654, 22659, 22675, 22666, 22649, 22661, 22653, 22781,
-    22821, 22818, 22820, 22890, 22889, 23265, 23270, 23273, 23255, 23254,
-    23256, 23267, 23413, 23518, 23527, 23521, {f: 2, c: 23525}, 23528, 23522,
-    23524, 23519, 23565, 23650, 23940, 23943, 24155, 24163, 24149, 24151,
-    24148, 24275, 24278, 24330, 24390, 24432, 24505, 24903, 24895, 24907,
-    24951, {f: 2, c: 24930}, 24927, 24922, 24920, 24949, 25130, 25735, 25688,
-    25684, 25764, 25720, 25695, 25722, 25681, 25703, 25652, 25709, 25723,
-    25970, 26017, 26071, 26070, 26274, 26280, 26269, 27036, 27048, 27029,
-    27073, 27054, 27091, 27083, 27035, 27063, 27067, 27051, 27060, 27088,
-    27085, 27053, 27084, 27046, 27075, 27043, 27465, 27468, 27699, 28467,
-    28436, 28414, 28435, 28404, 28457, 28478, 28448, 28460, 28431, 28418,
-    28450, 28415, 28399, 28422, 28465, 28472, 28466, 28451, 28437, 28459,
-    28463, 28552, 28458, 28396, 28417, 28402, 28364, 28407, 29076, 29081,
-    29053, 29066, 29060, 29074, 29246, 29330, 29334, 29508, 29520, 29796,
-    29795, 29802, 29808, 29805, 29956, 30097, 30247, 30221, 30219, 30217,
-    30227, 30433, 30435, 30596, 30589, 30591, 30561, 30913, 30879, 30887,
-    30899, 30889, 30883, {f: 2, c: 31118}, 31117, 31278, 31281, 31402, 31401,
-    31469, 31471, 31649, 31637, 31627, 31605, 31639, 31645, 31636, 31631,
-    [31672, 58170], 31623, 31620, 31929, {f: 2, c: 31933}, 32187, 32176, 32156,
-    {f: 2, c: 32189}, 32160, 32202, 32180, 32178, 32177, 32186, 32162, 32191,
-    32181, 32184, 32173, [32210, 58202], 32199, 32172, 32624, {f: 2, c: 32736},
-    32735, 32862, 32858, 32903, 33104, 33152, 33167, 33160, 33162, 33151,
-    33154, 33255, 33274, 33287, 33300, 33310, 33355, 33993, 33983, 33990,
-    33988, 33945, 33950, 33970, 33948, 33995, 33976, 33984, 34003, 33936,
-    33980, 34001, 33994, 34623, 34588, 34619, 34594, 34597, 34612, 34584,
-    34645, 34615, 34601, 35059, 35074, 35060, 35065, 35064, 35069, 35048,
-    35098, 35055, 35494, 35468, 35486, 35491, 35469, 35489, 35475, 35492,
-    35498, 35493, 35496, 35480, 35473, 35482, 35495, 35946, 35981, 35980,
-    36051, {f: 2, c: 36049}, 36203, 36249, 36245, 36348, 36628, 36626, 36629,
-    36627, 36771, 36960, 36952, 36956, 36963, 36953, 36958, 36962, 36957,
-    36955, 37145, 37144, 37150, 37237, 37240, 37239, 37236, 37496, 37548,
-    37504, 37509, 37528, 37526, 37499, 37523, 37532, 37544, 37500, 37521,
-    38305, {f: 2, c: 38312}, 38307, 38309, 38308, 38553, 38556, 38555, 38604,
-    38610, 38656, 38780, 38789, 38902, {f: 2, c: 38935}, 39087, 39089, 39171,
-    39173, 39180, 39177, 39361, {f: 2, c: 39599}, 39654, {f: 2, c: 39745},
-    40180, 40182, 40179, 40636, [12240, 40763], [12241, 40778], 20740, 20736,
-    20731, 20725, 20729, 20738, {f: 2, c: 20744}, 20741, 20956,
-    {f: 3, c: 21127}, 21133, 21130, 21232, 21426, 22062, 22075, 22073, 22066,
-    22079, 22068, 22057, 22099, 22094, 22103, 22132, 22070, {f: 2, c: 22063},
-    22656, 22687, 22686, 22707, 22684, 22702, 22697, 22694, 22893, 23305,
-    23291, 23307, 23285, 23308, 23304, 23534, 23532, 23529, 23531,
-    {f: 2, c: 23652}, 23965, 23956, 24162, 24159, 24161, 24290, 24282, 24287,
-    24285, 24291, 24288, 24392, 24433, 24503, 24501, 24950, 24935, 24942,
-    24925, 24917, 24962, 24956, 24944, 24939, 24958, 24999, 24976, 25003,
-    24974, 25004, 24986, 24996, 24980, 25006, 25134, 25705, 25711, 25721,
-    25758, 25778, 25736, [25744, 57745], 25776, 25765, 25747, 25749, 25769,
-    25746, 25774, 25773, 25771, 25754, 25772, 25753, 25762, 25779, 25973,
-    {f: 2, c: 25975}, 26286, 26283, 26292, 26289, 27171, 27167, 27112, 27137,
-    27166, 27161, 27133, 27169, 27155, 27146, 27123, 27138, 27141, 27117,
-    27153, 27472, 27470, 27556, {f: 2, c: 27589}, 28479, 28540, 28548, 28497,
-    28518, 28500, 28550, 28525, 28507, 28536, 28526, 28558, 28538, 28528,
-    28516, 28567, 28504, 28373, 28527, 28512, 28511, 29087, 29100, 29105,
-    29096, 29270, 29339, 29518, 29527, 29801, 29835, 29827, 29822, 29824,
-    30079, 30240, 30249, 30239, 30244, 30246, {f: 2, c: 30241}, 30362, 30394,
-    30436, 30606, 30599, 30604, 30609, 30603, 30923, 30917, 30906, 30922,
-    30910, 30933, 30908, 30928, 31295, 31292, 31296, 31293, 31287, 31291,
-    31407, 31406, 31661, 31665, 31684, 31668, {f: 2, c: 31686}, 31681, 31648,
-    31692, 31946, 32224, 32244, 32239, 32251, 32216, 32236, 32221, 32232,
-    32227, 32218, 32222, 32233, 32158, 32217, 32242, 32249, 32629, 32631,
-    32687, 32745, 32806, {f: 3, c: 33179}, 33184, 33178, 33176, 34071, 34109,
-    34074, 34030, {f: 2, c: 34092}, 34067, 34065, 34083, 34081, 34068, 34028,
-    34085, 34047, 34054, 34690, 34676, 34678, 34656, 34662, 34680, 34664,
-    34649, 34647, 34636, 34643, 34907, 34909, 35088, 35079, {f: 2, c: 35090},
-    35093, 35082, 35516, 35538, 35527, 35524, 35477, 35531, 35576, 35506,
-    35529, 35522, 35519, 35504, 35542, 35533, 35510, 35513, 35547, 35916,
-    35918, 35948, 36064, 36062, 36070, 36068, {f: 2, c: 36076},
-    {f: 2, c: 36066}, 36060, 36074, 36065, 36205, 36255, 36259, 36395, 36368,
-    36381, 36386, 36367, 36393, 36383, 36385, 36382, 36538, 36637, 36635,
-    36639, 36649, 36646, 36650, 36636, 36638, 36645, 36969, 36974, 36968,
-    36973, 36983, 37168, 37165, 37159, 37169, 37255, 37257, 37259, 37251,
-    37573, 37563, 37559, 37610, 37604, 37569, 37555, 37564, 37586, 37575,
-    37616, 37554, 38317, 38321, 38660, {f: 2, c: 38662}, 38665, 38752, 38797,
-    38795, 38799, 38945, 38955, 38940, 39091, 39178, 39187, 39186, 39192,
-    39389, 39376, 39391, 39387, 39377, 39381, 39378, 39385, 39607,
-    {f: 2, c: 39662}, 39719, 39749, 39748, 39799, 39791, 40198, 40201, 40195,
-    40617, 40638, 40654, 22696, [12242, 40786], 20754, 20760, 20756, 20752,
-    20757, 20864, 20906, 20957, 21137, 21139, 21235, 22105, 22123, 22137,
-    22121, 22116, 22136, 22122, 22120, 22117, 22129, 22127, 22124, 22114,
-    22134, 22721, 22718, 22727, 22725, 22894, 23325, 23348, 23416, 23536,
-    23566, 24394, 25010, 24977, 25001, 24970, 25037, 25014, 25022, 25034,
-    25032, 25136, 25797, 25793, 25803, {f: 2, c: 25787}, 25818, 25796, 25799,
-    25794, 25805, 25791, 25810, 25812, 25790, 25972, 26310, 26313, 26297,
-    26308, 26311, 26296, 27197, 27192, 27194, 27225, 27243, 27224, 27193,
-    27204, 27234, 27233, 27211, 27207, 27189, 27231, 27208, 27481, 27511,
-    27653, 28610, 28593, 28577, 28611, 28580, 28609, 28583, 28595, 28608,
-    28601, [28598, 60318], 28582, 28576, 28596, 29118, 29129, 29136, 29138,
-    29128, 29141, 29113, 29134, 29145, 29148, {f: 2, c: 29123}, 29544, 29852,
-    29859, 29848, 29855, 29854, 29922, {f: 2, c: 29964}, 30260, 30264, 30266,
-    30439, 30437, 30624, {f: 2, c: 30622}, 30629, 30952, 30938, 30956, 30951,
-    31142, {f: 2, c: 31309}, 31302, 31308, 31307, 31418, 31705, 31761, 31689,
-    31716, 31707, 31713, 31721, 31718, {f: 2, c: 31957}, 32266, 32273, 32264,
-    32283, 32291, 32286, [32285, 58211], 32265, 32272, 32633, 32690,
-    {f: 2, c: 32752}, 32750, [32808, 58239], 33203, 33193, 33192, 33275, 33288,
-    {f: 2, c: 33368}, 34122, 34137, 34120, {f: 2, c: 34152}, 34115, 34121,
-    34157, 34154, 34142, 34691, 34719, 34718, 34722, 34701, 34913, 35114,
-    35122, 35109, 35115, 35105, 35242, [35238, 58391], 35558, 35578, 35563,
-    35569, 35584, 35548, 35559, 35566, 35582, {f: 2, c: 35585}, 35575, 35565,
-    35571, 35574, 35580, 35947, 35949, 35987, 36084, 36420, 36401, 36404,
-    36418, 36409, 36405, 36667, 36655, 36664, 36659, 36776, 36774, 36981,
-    36980, 36984, 36978, 36988, 36986, 37172, 37266, 37664, 37686, 37624,
-    37683, 37679, 37666, 37628, 37675, 37636, 37658, 37648, 37670, 37665,
-    37653, 37678, 37657, 38331, {f: 2, c: 38567}, 38570, 38613, 38670, 38673,
-    38678, 38669, 38675, 38671, 38747, [38748, 58565], 38758, 38808, 38960,
-    38968, 38971, 38967, 38957, 38969, 38948, 39184, 39208, 39198, 39195,
-    39201, 39194, 39405, 39394, 39409, 39608, 39612, 39675, 39661, 39720,
-    39825, 40213, 40227, 40230, 40232, 40210, 40219, 40664, 40660,
-    [12243, 40845], [12244, 40860], 20778, 20767, 20769, 20786, 21237, 22158,
-    22144, 22160, 22149, 22151, 22159, 22741, 22739, 22737, 22734, 23344,
-    23338, 23332, 23418, 23607, 23656, 23996, 23994, 23997, 23992, 24171,
-    24396, 24509, 25033, 25026, 25031, 25062, 25035, 25138, 25140, 25806,
-    25802, 25816, 25824, 25840, 25830, 25836, 25841, 25826, 25837,
-    {f: 2, c: 25986}, 26329, 26326, 27264, 27284, 27268, 27298, 27292, 27355,
-    27299, 27262, 27287, 27280, 27296, 27484, 27566, 27610, 27656, 28632,
-    28657, {f: 2, c: 28639}, 28635, 28644, 28651, 28655, 28544, 28652, 28641,
-    28649, 28629, 28654, 28656, 29159, [29151, 60361], 29166, 29158, 29157,
-    29165, 29164, 29172, 29152, 29237, 29254, 29552, 29554, 29865, 29872,
-    29862, 29864, 30278, 30274, 30284, 30442, 30643, 30634, 30640, 30636,
-    30631, 30637, 30703, 30967, 30970, 30964, 30959, 30977, 31143, 31146,
-    31319, 31423, 31751, 31757, 31742, 31735, 31756, 31712, 31968, 31964,
-    31966, 31970, 31967, 31961, 31965, 32302, 32318, 32326, 32311, 32306,
-    32323, 32299, 32317, 32305, 32325, 32321, 32308, 32313, 32328, 32309,
-    32319, 32303, 32580, 32755, 32764, {f: 2, c: 32881}, 32880, 32879, 32883,
-    33222, 33219, 33210, 33218, 33216, 33215, 33213, 33225, 33214, 33256,
-    33289, 33393, 34218, 34180, 34174, 34204, 34193, 34196, 34223, 34203,
-    34183, 34216, 34186, 34214, 34407, 34752, 34769, 34739, 34770, 34758,
-    34731, 34747, 34746, 34760, 34763, 35131, 35126, 35140, 35128, 35133,
-    35244, 35598, 35607, 35609, 35611, 35594, 35616, 35613, 35588, 35600,
-    35905, 35903, 35955, 36090, 36093, 36092, 36088, 36091, 36264, 36425,
-    36427, 36424, 36426, 36676, 36670, 36674, 36677, 36671, 36991, 36989,
-    36996, {f: 2, c: 36993}, 36992, 37177, 37283, 37278, 37276, 37709, 37762,
-    37672, 37749, 37706, 37733, 37707, 37656, 37758, 37740, 37723, 37744,
-    37722, 37716, {f: 3, c: 38346}, 38344, 38342, 38577, 38584, 38614, 38684,
-    38686, 38816, 38867, 38982, 39094, 39221, 39425, 39423, 39854, 39851,
-    39850, 39853, 40251, 40255, 40587, 40655, 40670, {f: 2, c: 40668}, 40667,
-    40766, 40779, 21474, 22165, 22190, 22745, 22744, 23352, 24413, 25059,
-    25139, 25844, 25842, 25854, 25862, {f: 2, c: 25850}, 25847, 26039, 26332,
-    26406, 27315, 27308, 27331, 27323, 27320, 27330, {f: 2, c: 27310}, 27487,
-    27512, 27567, 28681, 28683, 28670, 28678, 28666, 28689, 28687,
-    {f: 2, c: 29179}, 29182, 29176, 29559, 29557, 29863, 29887, 29973, 30294,
-    30296, 30290, 30653, 30655, {f: 2, c: 30651}, 30990, 31150,
-    {f: 2, c: 31329}, 31328, {f: 2, c: 31428}, 31787, 31783, 31786, 31774,
-    31779, 31777, 31975, {f: 2, c: 32340}, 32350, 32346, 32353, 32338, 32345,
-    32584, 32761, 32763, 32887, 32886, 33229, 33231, 33290, 34255, 34217,
-    34253, 34256, 34249, 34224, 34234, 34233, 34799, 34796, 34802, 34784,
-    35206, 35250, 35316, 35624, 35641, 35628, 35627, 35920, 36101, 36441,
-    36451, 36454, 36452, 36447, 36437, 36544, 36681, 36685, 36999, 36995,
-    37000, {f: 2, c: 37291}, 37328, 37780, 37770, 37782, 37794, 37811, 37806,
-    37804, 37808, 37784, 37786, 37783, 38356, 38358, 38352, 38357, 38626,
-    38620, 38617, 38619, 38622, 38692, 38819, 38822, 38829, 38905, 38989,
-    38991, 38988, 38990, 38995, 39098, {f: 2, c: 39230}, 39229, 39214, 39333,
-    39438, 39617, 39683, 39686, 39759, 39758, 39757, 39882, 39881, 39933,
-    39880, 39872, 40273, 40285, 40288, 40672, 40725, 40748, 20787, 22181,
-    22184, {f: 2, c: 22750}, 22754, 23541, 40848, 24300, 25074, 25079, 25078,
-    25077, 25856, 25871, 26336, 26333, 27365, 27357, 27354, 27347, 28699,
-    28703, 28712, 28698, 28701, 28693, 28696, 29190, 29197, 29272, 29346,
-    29560, 29562, 29885, 29898, 29923, 30087, 30086, 30303, 30305, 30663,
-    31001, 31153, 31339, 31337, {f: 2, c: 31806}, 31800, 31805, 31799, 31808,
-    32363, 32365, 32377, {f: 2, c: 32361}, 32371, 32645, 32694, 32697, 32696,
-    33240, 34281, 34269, 34282, 34261, {f: 2, c: 34276}, 34295, 34811, 34821,
-    34829, 34809, 34814, 35168, 35167, 35158, 35166, 35649, 35676, 35672,
-    35657, 35674, {f: 2, c: 35662}, 35654, 35673, 36104, 36106, 36476, 36466,
-    36487, 36470, 36460, 36474, 36468, 36692, 36686, 36781, {f: 2, c: 37002},
-    37297, 37294, 37857, 37841, 37855, 37827, 37832, {f: 2, c: 37852}, 37846,
-    37858, 37837, 37848, 37860, 37847, 37864, 38364, 38580, 38627, 38698,
-    38695, 38753, 38876, 38907, 39006, 39000, 39003, 39100, 39237, 39241,
-    39446, 39449, 39693, 39912, 39911, 39894, 39899, 40329, 40289, 40306,
-    40298, 40300, 40594, 40599, 40595, 40628, 21240, 22199, 22198, 22196,
-    22204, 22756, 23360, 23363, 23421, 23542, 24009, 25080, 25082, 25880,
-    25876, 25881, 26342, 26407, 27372, 28734, 28720, 28722, 29200, 29563,
-    29903, 30306, 30309, 31014, 31018, 31020, 31019, 31431, 31478, 31820,
-    31811, 31821, {f: 2, c: 31983}, 36782, 32381, 32380, 32386, 32588, 32768,
-    33242, 33382, 34299, 34297, 34321, 34298, 34310, 34315, 34311, 34314,
-    {f: 2, c: 34836}, 35172, 35258, 35320, 35696, 35692, 35686, 35695, 35679,
-    35691, 36111, 36109, 36489, 36481, 36485, 36482, 37300, 37323, 37912,
-    37891, 37885, 38369, 38704, 39108, 39250, 39249, 39336, 39467, 39472,
-    39479, 39477, 39955, 39949, 40569, 40629, 40680, 40751, 40799, 40803,
-    40801, {f: 2, c: 20791}, 22209, 22208, 22210, 22804, 23660, 24013, 25084,
-    25086, 25885, 25884, 26005, 26345, 27387, 27396, 27386, 27570, 28748,
-    29211, 29351, 29910, 29908, 30313, 30675, 31824, 32399, 32396, 32700,
-    34327, 34349, 34330, 34851, 34850, 34849, 34847, 35178, 35180, 35261,
-    35700, 35703, 35709, 36115, 36490, 36493, 36491, 36703, 36783, 37306,
-    37934, 37939, 37941, 37946, 37944, 37938, 37931, 38370, {f: 2, c: 38712},
-    38706, [38911, 58586], 39015, 39013, 39255, 39493, 39491, 39488, 39486,
-    39631, 39764, 39761, 39981, 39973, 40367, 40372, 40386, 40376, 40605,
-    40687, 40729, 40796, {f: 2, c: 40806}, 20796, 20795, 22216, 22218, 22217,
-    23423, 24020, 24018, 24398, 25087, 25892, 27402, 27489, 28753, 28760,
-    29568, 29924, 30090, 30318, 30316, 31155, 31840, 31839, 32894, 32893,
-    33247, 35186, 35183, 35324, 35712, {f: 2, c: 36118}, 36497, 36499, 36705,
-    37192, 37956, {f: 2, c: 37969}, {f: 2, c: 38717}, 38851, 38849, 39019,
-    39253, 39509, 39501, 39634, 39706, 40009, 39985, 39998, 39995, 40403,
-    40407, 40756, 40812, 40810, 40852, 22220, 24022, 25088, 25891, 25899,
-    25898, 26348, 27408, 29914, 31434, 31844, 31843, 31845, 32403, 32406,
-    32404, 33250, 34360, 34367, 34865, 35722, 37008, 37007, 37987, 37984,
-    37988, 38760, 39023, 39260, {f: 2, c: 39514}, 39511, {f: 2, c: 39635},
-    39633, 40020, 40023, 40022, 40421, 40607, 40692, 22225, 22761, 25900,
-    28766, {f: 2, c: 30321}, [30679, 60226], 32592, 32648, 34870, 34873, 34914,
-    35731, 35730, 35734, 33399, 36123, 37312, 37994, 38722, 38728, 38724,
-    38854, 39024, 39519, 39714, 39768, 40031, {f: 2, c: 40441},
-    {f: 2, c: 40572}, 40711, 40823, 40818, 24307, 27414, 28771, 31852, 31854,
-    34875, 35264, 36513, 37313, 38002, 38000, 39025, 39262, 39638, 39715,
-    40652, 28772, 30682, 35738, 38007, 38857, 39522, 39525, 32412, 35740,
-    36522, 37317, {f: 2, c: 38013}, 38012, {f: 2, c: 40055}, 40695, 35924,
-    38015, 40474, 29224, 39530, 39729, 40475, 40478, 31858, 20034, 20060,
-    [12048, 20981], [12053, 21274], [12058, 21378], 19975, 19980, 20039, 20109,
-    [12062, 22231], [12076, 23662], [12091, 24435], 19983, 20871, 19982, 20014,
-    20115, 20162, 20169, 20168, 20888, 21244, 21356, 21433, 22304, 22787,
-    22828, [23568, 60417], 24063, 26081, [12110, 27571], 27596, [12115, 27668],
-    [12121, 29247], 20017, 20028, 20200, 20188, 20201, 20193, 20189, 20186,
-    21004, 21001, 21276, 21324, {f: 2, c: 22306}, 22807, 22831, 23425, 23428,
-    23570, 23611, 23668, 23667, 24068, 24192, 24194, 24521, 25097, 25168,
-    27669, 27702, 27715, 27711, 27707, 29358, 29360, 29578, [12145, 31160],
-    32906, 38430, 20238, 20248, 20268, 20213, 20244, 20209, 20224, 20215,
-    20232, 20253, 20226, 20229, 20258, 20243, 20228, 20212, 20242, 20913,
-    21011, 21008, 21158, 21282, 21279, 21325, 21386, 21511, 22241, 22239,
-    22318, 22314, 22324, 22844, 22912, 22908, 22917, 22907, 22910, 22903,
-    22911, 23382, 23573, 23589, 23676, {f: 2, c: 23674}, 23678, 24031,
-    [24181, 57646], 24196, 24322, 24346, 24436, 24533, 24532, 24527, 25180,
-    25182, 25188, 25185, 25190, 25186, 25177, 25184, 25178, 25189, 25911,
-    26095, 26094, 26430, 26425, 26424, 26427, 26426, 26431, 26428, 26419,
-    27672, 27718, 27730, 27740, 27727, [27722, 60796], 27732, {f: 2, c: 27723},
-    28785, 29278, {f: 2, c: 29364}, 29582, 29994, 30335, 31349, [12153, 32593],
-    [12171, 33400], 33404, 33408, 33405, 33407, [12172, 34381], [12177, 35198],
-    37017, [37015, 59347], 37016, 37019, 37012, 38434, 38436, 38432, 38435,
-    20310, 20283, 20322, 20297, 20307, 20324, 20286, 20327, 20306, 20319,
-    20289, 20312, 20269, 20275, 20287, 20321, 20879, 20921, 21020, 21022,
-    21025, {f: 2, c: 21165}, 21257, 21347, 21362, {f: 2, c: 21390}, 21552,
-    21559, 21546, 21588, 21573, 21529, 21532, 21541, 21528, 21565, 21583,
-    21569, 21544, 21540, 21575, 22254, 22247, 22245, 22337, 22341, 22348,
-    22345, 22347, 22354, 22790, 22848, 22950, 22936, 22944, 22935, 22926,
-    22946, 22928, 22927, 22951, 22945, 23438, 23442, 23592, 23594, 23693,
-    23695, 23688, 23691, 23689, 23698, 23690, 23686, 23699, 23701, 24032,
-    24074, 24078, 24203, 24201, 24204, 24200, 24205, 24325, 24349, 24440,
-    24438, 24530, 24529, 24528, 24557, 24552, 24558, 24563, 24545, 24548,
-    24547, 24570, 24559, 24567, 24571, 24576, 24564, 25146, 25219, 25228,
-    {f: 2, c: 25230}, 25236, 25223, 25201, 25211, 25210, 25200, 25217, 25224,
-    25207, 25213, 25202, 25204, 26096, 26100, 26099, 26098, 26101, 26437,
-    26439, 26457, 26453, 26444, 26440, 26461, 26445, 26458, 26443, 27600,
-    {f: 2, c: 27673}, 27768, 27751, 27755, 27780, 27787, 27791, 27761, 27759,
-    27753, 27802, 27757, 27783, 27797, [27804, 57900], 27750, 27763, 27749,
-    27771, 27790, 28788, 28794, 29283, 29375, 29373, 29379, 29382, 29377,
-    29370, 29381, 29589, 29591, {f: 2, c: 29587}, 29586, 30010, 30009,
-    {f: 2, c: 30100}, 30337, 31037, 32820, 32917, 32921, 32912, 32914, 32924,
-    33424, 33423, 33413, 33422, 33425, 33427, 33418, {f: 2, c: 33411},
-    [12184, 35960], 36809, 36799, 37023, 37025, 37029, 37022, 37031, 37024,
-    38448, 38440, 38447, 38445, 20019, 20376, 20348, 20357, 20349, 20352,
-    20359, 20342, 20340, 20361, 20356, 20343, 20300, 20375, 20330, 20378,
-    20345, 20353, 20344, 20368, 20380, 20372, 20382, 20370, 20354, 20373,
-    20331, 20334, 20894, 20924, 20926, 21045, {f: 2, c: 21042}, 21062, 21041,
-    21180, {f: 2, c: 21258}, 21308, 21394, 21396, 21639, 21631, 21633, 21649,
-    21634, 21640, 21611, 21626, 21630, 21605, 21612, 21620, 21606, 21645,
-    21615, 21601, 21600, 21656, 21603, 21607, 21604, 22263, 22265, 22383,
-    22386, 22381, 22379, 22385, 22384, 22390, 22400, 22389, 22395,
-    {f: 2, c: 22387}, 22370, 22376, 22397, 22796, 22853, 22965, 22970, 22991,
-    22990, 22962, 22988, 22977, 22966, 22972, 22979, 22998, 22961, 22973,
-    22976, 22984, 22964, 22983, 23394, 23397, 23443, 23445, 23620, 23623,
-    23726, 23716, 23712, 23733, 23727, 23720, 23724, 23711, 23715, 23725,
-    23714, 23722, 23719, 23709, 23717, 23734, 23728, 23718, 24087, 24084,
-    24089, 24360, {f: 3, c: 24354}, 24404, 24450, 24446, 24445, 24542, 24549,
-    24621, 24614, 24601, 24626, 24587, 24628, 24586, 24599, 24627, 24602,
-    24606, 24620, 24610, 24589, 24592, 24622, 24595, 24593, 24588, 24585,
-    24604, 25108, 25149, 25261, 25268, 25297, 25278, 25258, 25270, 25290,
-    25262, 25267, 25263, 25275, 25257, 25264, 25272, 25917, 26024, 26043,
-    26121, 26108, 26116, 26130, 26120, 26107, 26115, 26123, 26125, 26117,
-    26109, 26129, 26128, 26358, 26378, 26501, 26476, 26510, 26514, 26486,
-    26491, 26520, 26502, 26500, 26484, 26509, 26508, 26490, 26527, 26513,
-    26521, 26499, 26493, 26497, {f: 2, c: 26488}, 26516, 27429, 27520, 27518,
-    27614, 27677, 27795, 27884, 27883, 27886, 27865, 27830, 27860, 27821,
-    27879, 27831, 27856, 27842, 27834, 27843, 27846, 27885, 27890, 27858,
-    27869, 27828, 27786, 27805, 27776, 27870, 27840, 27952, 27853, 27847,
-    27824, 27897, 27855, 27881, 27857, 28820, 28824, 28805, 28819, 28806,
-    28804, 28817, 28822, 28802, 28826, 28803, 29290, 29398, 29387, 29400,
-    29385, 29404, 29394, 29396, 29402, 29388, 29393, 29604, 29601, 29613,
-    29606, 29602, 29600, 29612, 29597, 29917, 29928, {f: 2, c: 30015}, 30014,
-    30092, 30104, 30383, 30451, 30449, 30448, 30453, 30712, 30716, 30713,
-    30715, 30714, 30711, 31042, 31039, 31173, 31352, 31355, 31483, 31861,
-    31997, 32821, 32911, 32942, 32931, 32952, 32949, 32941, 33312, 33440,
-    33472, 33451, 33434, 33432, 33435, 33461, 33447, 33454, 33468, 33438,
-    33466, 33460, 33448, 33441, 33449, 33474, 33444, 33475, 33462, 33442,
-    34416, 34415, {f: 2, c: 34413}, 35926, 36818, 36811, 36819, 36813, 36822,
-    36821, 36823, 37042, 37044, 37039, 37043, 37040, 38457, 38461, 38460,
-    38458, 38467, 20429, 20421, 20435, 20402, 20425, 20427, 20417, 20436,
-    20444, 20441, [20411, 60346], 20403, 20443, 20423, 20438, 20410, 20416,
-    20409, 20460, 21060, 21065, 21184, 21186, 21309, 21372, 21399, 21398,
-    21401, 21400, 21690, 21665, 21677, 21669, 21711, 21699, 33549, 21687,
-    21678, 21718, 21686, {f: 2, c: 21701}, 21664, 21616, 21692, 21666, 21694,
-    21618, 21726, 21680, 22453, {f: 2, c: 22430}, 22436, 22412, 22423, 22429,
-    22427, 22420, 22424, 22415, 22425, 22437, 22426, 22421, 22772, 22797,
-    22867, 23009, 23006, 23022, 23040, 23025, 23005, 23034, 23037, 23036,
-    23030, 23012, 23026, 23031, 23003, 23017, 23027, 23029, 23008, 23038,
-    23028, 23021, 23464, 23628, 23760, 23768, 23756, 23767, 23755, 23771,
-    23774, 23770, 23753, 23751, 23754, 23766, {f: 2, c: 23763}, 23759, 23752,
-    23750, 23758, 23775, 23800, 24057, {f: 3, c: 24097}, 24096, 24100, 24240,
-    24228, 24226, 24219, 24227, 24229, 24327, 24366, 24406, 24454, 24631,
-    24633, 24660, 24690, 24670, 24645, 24659, 24647, 24649, 24667, 24652,
-    24640, 24642, 24671, 24612, 24644, 24664, 24678, 24686, {f: 2, c: 25154},
-    25295, 25357, 25355, 25333, 25358, 25347, 25323, 25337, 25359, 25356,
-    25336, 25334, 25344, {f: 2, c: 25363}, 25338, 25365, 25339, 25328, 25921,
-    25923, 26026, 26047, 26166, 26145, 26162, 26165, 26140, 26150, 26146,
-    26163, 26155, 26170, 26141, 26164, 26169, 26158, {f: 2, c: 26383}, 26561,
-    26610, 26568, 26554, 26588, 26555, 26616, 26584, 26560, 26551, 26565,
-    26603, 26596, 26591, 26549, 26573, 26547, 26615, 26614, 26606, 26595,
-    26562, 26553, 26574, 26599, 26608, 26546, 26620, 26566, 26605, 26572,
-    26542, 26598, 26587, 26618, {f: 2, c: 26569}, 26563, 26602, 26571, 27432,
-    27522, 27524, 27574, 27606, 27608, 27616, {f: 2, c: 27680}, 27944, 27956,
-    27949, 27935, 27964, 27967, 27922, 27914, 27866, 27955, 27908, 27929,
-    27962, 27930, 27921, 27904, 27933, 27970, 27905, 27928, 27959, 27907,
-    27919, 27968, 27911, 27936, 27948, 27912, 27938, 27913, 27920, 28855,
-    28831, 28862, 28849, 28848, 28833, {f: 2, c: 28852}, 28841, 29249,
-    {f: 2, c: 29257}, 29292, 29296, 29299, 29294, 29386, 29412, 29416, 29419,
-    29407, 29418, 29414, 29411, 29573, 29644, 29634, 29640, 29637, 29625,
-    29622, 29621, 29620, 29675, 29631, 29639, 29630, 29635, 29638, 29624,
-    29643, 29932, 29934, 29998, {f: 2, c: 30023}, 30119, 30122, 30329, 30404,
-    30472, {f: 3, c: 30467}, 30474, 30455, 30459, 30458, {f: 2, c: 30695},
-    30726, {f: 2, c: 30737}, 30725, 30736, 30735, 30734, [30729, 58095], 30723,
-    30739, 31050, 31052, 31051, 31045, 31044, 31189, 31181, 31183, 31190,
-    31182, 31360, 31358, 31441, {f: 2, c: 31488}, 31866, {f: 2, c: 31864},
-    {f: 3, c: 31871}, 32003, 32008, 32001, 32600, 32657, 32653, 32702, 32775,
-    {f: 2, c: 32782}, 32788, 32823, 32984, 32967, 32992, 32977, 32968, 32962,
-    32976, 32965, 32995, 32985, 32988, 32970, 32981, 32969, 32975, 32983,
-    32998, 32973, 33279, 33313, 33428, 33497, 33534, 33529, 33543, 33512,
-    33536, 33493, 33594, 33515, 33494, 33524, 33516, 33505, 33522, 33525,
-    33548, 33531, 33526, 33520, 33514, 33508, 33504, 33530, 33523, 33517,
-    34423, 34420, 34428, 34419, 34881, 34894, 34919, 34922, 34921, 35283,
-    35332, 35335, 36210, 36835, 36833, 36846, 36832, 37105, 37053, 37055,
-    37077, 37061, 37054, 37063, 37067, 37064, [37332, 60294], 37331, 38484,
-    38479, 38481, 38483, 38474, 38478, 20510, 20485, 20487, 20499, 20514,
-    20528, 20507, 20469, 20468, 20531, 20535, 20524, {f: 2, c: 20470}, 20503,
-    20508, 20512, 20519, 20533, 20527, 20529, 20494, 20826, 20884, 20883,
-    20938, {f: 2, c: 20932}, 20936, 20942, 21089, 21082, 21074,
-    {f: 2, c: 21086}, 21077, 21090, 21197, 21262, 21406, 21798, 21730, 21783,
-    21778, 21735, 21747, 21732, 21786, 21759, 21764, 21768, 21739, 21777,
-    21765, 21745, 21770, 21755, {f: 2, c: 21751}, 21728, 21774, 21763, 21771,
-    {f: 2, c: 22273}, 22476, 22578, 22485, 22482, 22458, 22470, 22461, 22460,
-    22456, 22454, 22463, 22471, 22480, 22457, 22465, 22798, 22858, 23065,
-    23062, {f: 2, c: 23085}, 23061, 23055, 23063, 23050, 23070, 23091, 23404,
-    23463, 23469, 23468, 23555, 23638, 23636, 23788, 23807, 23790, 23793,
-    23799, 23808, 23801, 24105, 24104, 24232, 24238, 24234, 24236, 24371,
-    24368, 24423, 24669, 24666, 24679, 24641, 24738, 24712, 24704, 24722,
-    24705, 24733, 24707, 24725, 24731, 24727, 24711, 24732, 24718, 25113,
-    25158, 25330, 25360, 25430, 25388, {f: 2, c: 25412}, 25398, 25411, 25572,
-    25401, 25419, 25418, 25404, 25385, 25409, 25396, 25432, 25428, 25433,
-    25389, 25415, 25395, 25434, 25425, 25400, 25431, 25408, 25416, 25930,
-    25926, 26054, {f: 2, c: 26051}, 26050, 26186, 26207, 26183, 26193,
-    {f: 2, c: 26386}, 26655, 26650, 26697, {f: 2, c: 26674}, 26683, 26699,
-    26703, 26646, 26673, 26652, 26677, 26667, 26669, 26671, 26702, 26692,
-    26676, 26653, 26642, 26644, 26662, 26664, 26670, 26701, 26682, 26661,
-    26656, 27436, 27439, 27437, 27441, 27444, 27501, 32898, 27528, 27622,
-    27620, 27624, 27619, 27618, 27623, 27685, 28026, {f: 2, c: 28003}, 28022,
-    27917, 28001, 28050, 27992, 28002, 28013, 28015, 28049, 28045, 28143,
-    28031, 28038, 27998, [28007, 59078], 28000, 28055, 28016, 28028, 27999,
-    28034, 28056, 27951, 28008, 28043, 28030, 28032, 28036, 27926, 28035,
-    28027, 28029, 28021, 28048, 28892, 28883, 28881, 28893, 28875, 32569,
-    28898, 28887, 28882, 28894, 28896, 28884, 28877, {f: 3, c: 28869}, 28890,
-    28878, 28897, 29250, 29304, 29303, 29302, 29440, 29434, 29428, 29438,
-    29430, 29427, 29435, 29441, 29651, 29657, 29669, 29654, 29628, 29671,
-    29667, 29673, 29660, 29650, 29659, 29652, 29661, 29658, {f: 2, c: 29655},
-    29672, {f: 2, c: 29918}, {f: 2, c: 29940}, 29985, 30043, 30047, 30128,
-    30145, 30139, 30148, 30144, 30143, 30134, 30138, 30346, 30409, 30493,
-    30491, 30480, 30483, 30482, 30499, 30481, 30485, {f: 2, c: 30489}, 30498,
-    30503, 30755, 30764, 30754, 30773, 30767, 30760, 30766, 30763, 30753,
-    30761, 30771, 30762, 30769, 31060, 31067, 31055, 31068, 31059, 31058,
-    31057, {f: 2, c: 31211}, 31200, 31214, 31213, 31210, 31196, 31198, 31197,
-    31366, 31369, 31365, {f: 2, c: 31371}, 31370, 31367, 31448, 31504, 31492,
-    31507, 31493, 31503, 31496, 31498, 31502, 31497, 31506, 31876, 31889,
-    31882, 31884, 31880, 31885, 31877, 32030, 32029, 32017, 32014, 32024,
-    32022, 32019, 32031, 32018, 32015, 32012, 32604, 32609, 32606, 32608,
-    32605, 32603, 32662, 32658, 32707, 32706, 32704, 32790, 32830, 32825,
-    33018, 33010, 33017, 33013, 33025, 33019, 33024, 33281, 33327, 33317,
-    33587, 33581, 33604, 33561, 33617, 33573, 33622, 33599, 33601, 33574,
-    33564, 33570, 33602, 33614, 33563, 33578, 33544, 33596, 33613, 33558,
-    33572, 33568, 33591, 33583, 33577, 33607, 33605, 33612, 33619, 33566,
-    33580, 33611, 33575, 33608, 34387, 34386, 34466, 34472, 34454, 34445,
-    34449, 34462, 34439, 34455, 34438, 34443, 34458, 34437, 34469, 34457,
-    34465, 34471, 34453, 34456, 34446, 34461, 34448, 34452, {f: 2, c: 34883},
-    34925, {f: 2, c: 34933}, 34930, 34944, 34929, 34943, 34927, 34947, 34942,
-    34932, 34940, 35346, 35911, 35927, 35963, 36004, 36003, 36214, 36216,
-    36277, 36279, 36278, 36561, 36563, 36862, 36853, 36866, 36863, 36859,
-    36868, 36860, 36854, 37078, 37088, {f: 2, c: 37081}, 37091, 37087, 37093,
-    37080, 37083, 37079, 37084, 37092, 37200, {f: 2, c: 37198}, 37333, 37346,
-    37338, 38492, 38495, 38588, 39139, [12221, 39647], [12223, 39727], 20095,
-    20592, 20586, 20577, 20574, 20576, 20563, 20555, 20573, 20594, 20552,
-    20557, 20545, 20571, 20554, 20578, 20501, 20549, 20575, 20585, 20587,
-    {f: 2, c: 20579}, 20550, 20544, 20590, 20595, 20567, 20561, 20944, 21099,
-    21101, 21100, 21102, 21206, 21203, 21293, 21404, {f: 2, c: 21877}, 21820,
-    21837, 21840, 21812, 21802, 21841, 21858, 21814, 21813, 21808, 21842,
-    21829, 21772, 21810, 21861, 21838, 21817, 21832, 21805, 21819, 21824,
-    21835, 22282, 22279, 22523, 22548, 22498, 22518, 22492, 22516, 22528,
-    22509, 22525, 22536, 22520, 22539, 22515, 22479, 22535, 22510, 22499,
-    22514, 22501, 22508, 22497, 22542, 22524, 22544, 22503, 22529, 22540,
-    22513, 22505, 22512, 22541, 22532, 22876, 23136, 23128, 23125,
-    [23143, 60437], 23134, 23096, 23093, 23149, 23120, 23135, 23141, 23148,
-    23123, 23140, 23127, 23107, 23133, 23122, 23108, 23131, 23112, 23182,
-    23102, 23117, 23097, 23116, 23152, 23145, 23111, 23121, 23126, 23106,
-    23132, 23410, 23406, 23489, 23488, 23641, 23838, 23819, 23837, 23834,
-    23840, 23820, 23848, 23821, 23846, 23845, 23823, 23856, 23826, 23843,
-    23839, 23854, 24126, 24116, 24241, 24244, 24249, {f: 2, c: 24242}, 24374,
-    24376, 24475, 24470, 24479, 24714, 24720, 24710, 24766, 24752, 24762,
-    {f: 2, c: 24787}, 24783, 24804, 24793, 24797, 24776, 24753, 24795, 24759,
-    24778, 24767, 24771, 24781, 24768, 25394, 25445, 25482, 25474, 25469,
-    25533, 25502, 25517, 25501, 25495, 25515, 25486, 25455, 25479, 25488,
-    25454, 25519, 25461, 25500, 25453, 25518, 25468, 25508, 25403, 25503,
-    25464, 25477, 25473, 25489, 25485, 25456, 25939, 26061, 26213, 26209,
-    26203, 26201, 26204, 26210, 26392, 26745, 26759, 26768, 26780,
-    {f: 2, c: 26733}, 26798, 26795, 26966, 26735, 26787, 26796, 26793, 26741,
-    26740, 26802, 26767, 26743, 26770, 26748, 26731, 26738, 26794, 26752,
-    26737, 26750, 26779, 26774, 26763, 26784, 26761, 26788, 26744, 26747,
-    26769, 26764, 26762, 26749, 27446, 27443, {f: 2, c: 27447}, 27537, 27535,
-    {f: 2, c: 27533}, 27532, 27690, 28096, 28075, 28084, 28083, 28276, 28076,
-    28137, 28130, 28087, 28150, 28116, 28160, 28104, 28128, 28127, 28118,
-    28094, 28133, {f: 2, c: 28124}, 28123, 28148, 28106, 28093, 28141, 28144,
-    28090, 28117, 28098, 28111, 28105, 28112, 28146, 28115, 28157, 28119,
-    28109, 28131, 28091, 28922, 28941, 28919, 28951, 28916, 28940, 28912,
-    28932, 28915, 28944, 28924, 28927, 28934, 28947, 28928, 28920, 28918,
-    28939, 28930, 28942, 29310, {f: 2, c: 29307}, 29311, 29469, 29463, 29447,
-    29457, 29464, 29450, 29448, 29439, 29455, 29470, 29576, 29686, 29688,
-    29685, 29700, 29697, 29693, 29703, 29696, 29690, 29692, 29695, 29708,
-    29707, 29684, 29704, 30052, 30051, 30158, 30162, 30159, {f: 2, c: 30155},
-    30161, 30160, 30351, 30345, 30419, 30521, 30511, 30509, {f: 2, c: 30513},
-    30516, 30515, 30525, 30501, 30523, 30517, 30792, 30802, 30793, 30797,
-    30794, 30796, 30758, 30789, 30800, 31076, 31079, {f: 2, c: 31081}, 31075,
-    31083, 31073, 31163, 31226, 31224, {f: 2, c: 31222}, 31375, 31380, 31376,
-    31541, 31547, 31540, 31525, 31536, 31522, 31524, 31539, 31512, 31530,
-    31517, 31537, 31531, 31533, 31535, 31538, 31544, 31514, 31523, 31892,
-    31896, 31894, 31907, 32053, 32061, 32056, 32054, 32058, 32069, 32044,
-    32041, 32065, 32071, {f: 2, c: 32062}, 32074, 32059, 32040, 32611, 32661,
-    {f: 2, c: 32668}, 32667, {f: 2, c: 32714}, 32717, {f: 2, c: 32720}, 32711,
-    32719, 32713, 32799, 32798, 32795, 32839, 32835, 32840, 33048, 33061,
-    33049, 33051, 33069, 33055, 33068, 33054, 33057, 33045, 33063, 33053,
-    33058, 33297, 33336, 33331, 33338, 33332, 33330, 33396, 33680, 33699,
-    33704, 33677, 33658, 33651, 33700, 33652, 33679, 33665, 33685, 33689,
-    33653, 33684, 33705, 33661, 33667, 33676, 33693, 33691, 33706, 33675,
-    33662, 33701, 33711, 33672, 33687, 33712, 33663, 33702, 33671, 33710,
-    33654, 34393, 34390, 34495, 34487, 34498, 34497, 34501, 34490, 34480,
-    34504, 34489, 34483, 34488, 34508, 34484, {f: 2, c: 34491}, 34499,
-    {f: 2, c: 34493}, 34898, 34953, 34965, 34984, 34978, 34986, 34970, 34961,
-    34977, 34975, 34968, 34983, 34969, 34971, 34967, 34980, 34988, 34956,
-    34963, 34958, 35202, 35286, 35289, 35285, 35376, 35367, 35372, 35358,
-    35897, 35899, {f: 2, c: 35932}, 35965, 36005, 36221, 36219, 36217, 36284,
-    36290, 36281, 36287, 36289, 36568, 36574, 36573, 36572, 36567,
-    {f: 2, c: 36576}, 36900, 36875, 36881, 36892, 36876, 36897, 37103, 37098,
-    37104, 37108, {f: 2, c: 37106}, 37076, {f: 2, c: 37099}, 37097, 37206,
-    37208, 37210, 37203, 37205, 37356, 37364, 37361, 37363, 37368, 37348,
-    37369, {f: 2, c: 37354}, 37367, 37352, 37358, 38266, 38278, 38280, 38524,
-    38509, 38507, 38513, 38511, 38591, 38762, 38916, 39141, 39319, 20635,
-    20629, 20628, 20638, 20619, 20643, 20611, 20620, 20622, 20637, 20584,
-    20636, 20626, 20610, 20615, 20831, 20948, 21266, 21265, 21412, 21415,
-    21905, 21928, 21925, 21933, 21879, 22085, 21922, 21907, 21896, 21903,
-    21941, 21889, 21923, 21906, 21924, 21885, 21900, 21926, 21887, 21909,
-    21921, 21902, 22284, 22569, 22583, 22553, 22558, 22567, 22563, 22568,
-    22517, 22600, 22565, 22556, 22555, 22579, 22591, 22582, 22574, 22585,
-    22584, 22573, 22572, 22587, 22881, 23215, 23188, 23199, 23162, 23202,
-    23198, 23160, 23206, 23164, 23205, 23212, 23189, 23214, 23095, 23172,
-    23178, 23191, 23171, 23179, 23209, 23163, 23165, 23180, 23196, 23183,
-    23187, 23197, 23530, 23501, 23499, 23508, 23505, 23498, 23502, 23564,
-    23600, 23863, 23875, 23915, 23873, 23883, 23871, 23861, 23889, 23886,
-    23893, 23859, 23866, 23890, 23869, 23857, 23897, 23874, 23865, 23881,
-    23864, 23868, 23858, 23862, 23872, 23877, 24132, 24129, [24408, 57673],
-    24486, 24485, 24491, 24777, 24761, 24780, 24802, 24782, 24772, 24852,
-    24818, 24842, 24854, 24837, 24821, 24851, 24824, 24828, 24830, 24769,
-    24835, 24856, 24861, 24848, 24831, 24836, 24843, 25162, 25492, 25521,
-    25520, 25550, 25573, 25576, 25583, 25539, 25757, 25587, 25546, 25568,
-    25590, 25557, 25586, 25589, 25697, 25567, 25534, 25565, 25564, 25540,
-    25560, 25555, 25538, 25543, 25548, 25547, 25544, 25584, 25559, 25561,
-    25906, 25959, 25962, 25956, 25948, 25960, 25957, 25996, {f: 2, c: 26013},
-    26030, 26064, 26066, 26236, 26220, 26235, 26240, 26225, 26233, 26218,
-    26226, 26369, 26892, 26835, 26884, 26844, 26922, 26860, 26858, 26865,
-    26895, 26838, 26871, 26859, 26852, 26870, 26899, 26896, 26867, 26849,
-    26887, 26828, 26888, 26992, 26804, 26897, 26863, 26822, 26900, 26872,
-    26832, 26877, 26876, 26856, 26891, 26890, 26903, 26830, 26824,
-    {f: 2, c: 26845}, 26854, 26868, 26833, 26886, 26836, 26857, 26901, 26917,
-    26823, 27449, 27451, 27455, 27452, 27540, 27543, 27545, 27541, 27581,
-    27632, {f: 2, c: 27634}, 27696, 28156, {f: 2, c: 28230}, 28191, 28233,
-    28296, {f: 2, c: 28220}, 28229, 28258, 28203, 28223, 28225, 28253, 28275,
-    28188, 28211, 28235, 28224, 28241, 28219, 28163, 28206, 28254, 28264,
-    28252, 28257, 28209, 28200, 28256, 28273, 28267, 28217, 28194, 28208,
-    28243, 28261, 28199, 28280, 28260, 28279, 28245, 28281, 28242, 28262,
-    {f: 2, c: 28213}, 28250, 28960, 28958, 28975, 28923, 28974, 28977, 28963,
-    28965, 28962, 28978, 28959, 28968, 28986, 28955, 29259, 29274,
-    {f: 2, c: 29320}, 29318, 29317, 29323, 29458, 29451, 29488, 29474, 29489,
-    29491, 29479, 29490, 29485, 29478, 29475, 29493, 29452, 29742, 29740,
-    29744, 29739, 29718, 29722, 29729, 29741, 29745, 29732, 29731, 29725,
-    29737, 29728, 29746, 29947, 29999, 30063, 30060, 30183, 30170, 30177,
-    30182, 30173, 30175, 30180, 30167, 30357, 30354, 30426, {f: 2, c: 30534},
-    30532, 30541, 30533, 30538, 30542, {f: 2, c: 30539}, 30686, 30700, 30816,
-    {f: 2, c: 30820}, 30812, 30829, 30833, 30826, 30830, 30832, 30825, 30824,
-    30814, 30818, 31092, 31091, 31090, 31088, 31234, 31242, 31235, 31244,
-    31236, 31385, 31462, 31460, 31562, 31559, 31556, 31560, 31564, 31566,
-    31552, 31576, 31557, 31906, 31902, 31912, 31905, 32088, 32111, 32099,
-    32083, 32086, 32103, 32106, 32079, 32109, 32092, 32107, 32082, 32084,
-    32105, 32081, 32095, 32078, {f: 2, c: 32574}, {f: 2, c: 32613}, 32674,
-    {f: 2, c: 32672}, 32727, 32849, {f: 2, c: 32847}, 33022, 32980, 33091,
-    33098, 33106, 33103, 33095, 33085, 33101, 33082, 33254, 33262,
-    {f: 3, c: 33271}, 33284, {f: 2, c: 33340}, 33343, 33397, 33595,
-    [33743, 60382], 33785, 33827, 33728, 33768, 33810, 33767, 33764, 33788,
-    33782, 33808, 33734, 33736, 33771, 33763, 33727, 33793, 33757, 33765,
-    33752, 33791, 33761, 33739, 33742, 33750, 33781, 33737, 33801,
-    [33807, 58332], 33758, 33809, 33798, 33730, 33779, 33749, 33786, 33735,
-    33745, 33770, 33811, 33690, 33731, 33772, 33774, 33732, 33787, 33751,
-    33762, 33819, 33755, 33790, 34520, 34530, 34534, 34515, 34531, 34522,
-    34538, 34525, 34539, 34524, 34540, 34537, 34519, 34536, 34513, 34888,
-    34902, 34901, 35002, 35031, 35001, 35000, 35008, 35006, 34998, 35004,
-    34999, 35005, 34994, 35073, 35017, 35221, 35224, 35223, 35293,
-    {f: 2, c: 35290}, 35406, 35405, 35385, 35417, 35392, {f: 2, c: 35415},
-    {f: 2, c: 35396}, 35410, 35400, 35409, 35402, 35404, 35407, 35935, 35969,
-    35968, 36026, 36030, 36016, 36025, 36021, 36228, 36224, 36233, 36312,
-    36307, 36301, 36295, 36310, 36316, 36303, 36309, 36313, 36296, 36311,
-    36293, 36591, 36599, 36602, 36601, 36582, 36590, 36581, 36597,
-    {f: 2, c: 36583}, 36598, 36587, 36593, 36588, 36596, 36585, 36909, 36916,
-    36911, 37126, 37164, [37124, 60367], 37119, 37116, 37128, 37113, 37115,
-    37121, 37120, 37127, 37125, 37123, 37217, 37220, 37215, 37218, 37216,
-    37377, 37386, 37413, 37379, 37402, 37414, 37391, 37388, 37376, 37394,
-    37375, 37373, 37382, 37380, 37415, 37378, 37404, 37412, 37401, 37399,
-    37381, 37398, 38267, 38285, 38284, 38288, 38535, 38526, {f: 2, c: 38536},
-    38531, 38528, 38594, 38600, 38595, 38641, 38640, 38764, 38768, 38766,
-    38919, 39081, 39147, 40166, [12235, 40697], {f: 2, c: 20099}, 20150, 20669,
-    20671, 20678, 20654, 20676, 20682, 20660, 20680, 20674, 20656, 20673,
-    20666, 20657, 20683, 20681, 20662, 20664, 20951, 21114, 21112,
-    {f: 2, c: 21115}, 21955, 21979, 21964, 21968, 21963, 21962, 21981,
-    [21952, 64013], 21972, 21956, 21993, 21951, 21970, 21901, 21967, 21973,
-    21986, 21974, 21960, 22002, 21965, 21977, 21954, 22292, 22611, 22632,
-    22628, 22607, 22605, 22601, 22639, 22613, 22606, 22621, 22617, 22629,
-    22619, 22589, 22627, 22641, 22780, 23239, 23236, 23243, 23226, 23224,
-    23217, 23221, 23216, 23231, 23240, 23227, 23238, 23223, 23232, 23242,
-    23220, 23222, 23245, 23225, 23184, 23510, {f: 2, c: 23512}, 23583, 23603,
-    23921, 23907, 23882, 23909, 23922, 23916, 23902, 23912, 23911, 23906,
-    24048, 24143, 24142, 24138, 24141, 24139, 24261, 24268, 24262, 24267,
-    24263, 24384, 24495, 24493, 24823, {f: 2, c: 24905}, 24875, 24901, 24886,
-    24882, 24878, 24902, 24879, 24911, 24873, 24896, 25120, 37224, 25123,
-    25125, 25124, 25541, 25585, 25579, 25616, 25618, 25609, 25632, 25636,
-    25651, 25667, 25631, 25621, 25624, 25657, 25655, {f: 2, c: 25634}, 25612,
-    25638, 25648, 25640, 25665, 25653, 25647, 25610, 25626, 25664, 25637,
-    25639, 25611, 25575, 25627, 25646, 25633, 25614, 25967, 26002, 26067,
-    26246, 26252, 26261, 26256, 26251, 26250, 26265, 26260, 26232, 26400,
-    26982, 26975, 26936, 26958, 26978, 26993, 26943, 26949, 26986, 26937,
-    26946, 26967, 26969, 27002, {f: 2, c: 26952}, 26933, 26988, 26931, 26941,
-    26981, 26864, 27000, 26932, 26985, 26944, 26991, 26948, 26998, 26968,
-    26945, 26996, 26956, 26939, 26955, 26935, 26972, 26959, 26961, 26930,
-    26962, 26927, 27003, 26940, 27462, 27461, 27459, 27458, 27464, 27457,
-    27547, {f: 2, c: 27643}, 27641, {f: 2, c: 27639}, 28315, 28374, 28360,
-    28303, 28352, 28319, {f: 2, c: 28307}, 28320, 28337, 28345, 28358, 28370,
-    28349, 28353, 28318, 28361, 28343, 28336, 28365, 28326, 28367, 28338,
-    28350, 28355, 28380, 28376, 28313, 28306, 28302, 28301, 28324, 28321,
-    28351, 28339, 28368, 28362, 28311, 28334, 28323, 28999, 29012, 29010,
-    29027, 29024, 28993, 29021, [29026, 61080], 29042, 29048, 29034, 29025,
-    28994, 29016, 28995, 29003, 29040, 29023, 29008, 29011, 28996, 29005,
-    29018, 29263, 29325, 29324, 29329, 29328, 29326, 29500, 29506, 29499,
-    29498, 29504, 29514, 29513, 29764, {f: 2, c: 29770}, 29778, 29777, 29783,
-    29760, {f: 2, c: 29775}, 29774, 29762, 29766, 29773, 29780, 29921, 29951,
-    29950, 29949, 29981, 30073, 30071, 27011, 30191, 30223, 30211, 30199,
-    30206, 30204, [30201, 60782], 30200, 30224, 30203, 30198, 30189, 30197,
-    30205, 30361, 30389, 30429, 30549, {f: 2, c: 30559}, 30546, 30550, 30554,
-    30569, 30567, 30548, 30553, 30573, 30688, 30855, 30874, 30868, 30863,
-    30852, 30869, {f: 2, c: 30853}, 30881, 30851, 30841, 30873, 30848, 30870,
-    30843, 31100, 31106, 31101, 31097, 31249, {f: 2, c: 31256}, 31250, 31255,
-    31253, 31266, 31251, 31259, 31248, 31395, 31394, 31390, 31467, 31590,
-    31588, 31597, 31604, 31593, 31602, 31589, 31603, 31601, 31600, 31585,
-    31608, 31606, 31587, 31922, 31924, 31919, 32136, 32134, 32128, 32141,
-    32127, 32133, 32122, 32142, 32123, 32131, 32124, 32140, 32148, 32132,
-    32125, 32146, 32621, 32619, {f: 2, c: 32615}, 32620, 32678, 32677, 32679,
-    {f: 2, c: 32731}, 32801, 33124, 33120, 33143, 33116, 33129, 33115, 33122,
-    33138, 26401, 33118, 33142, 33127, 33135, 33092, 33121, 33309, 33353,
-    33348, 33344, 33346, 33349, 34033, 33855, 33878, 33910, 33913, 33935,
-    33933, 33893, 33873, 33856, 33926, 33895, 33840, 33869, 33917, 33882,
-    33881, 33908, 33907, 33885, 34055, 33886, 33847, 33850, 33844, 33914,
-    33859, 33912, 33842, 33861, 33833, 33753, 33867, 33839, 33858, 33837,
-    33887, 33904, 33849, 33870, 33868, 33874, 33903, 33989, 33934, 33851,
-    33863, 33846, 33843, 33896, 33918, 33860, 33835, 33888, 33876, 33902,
-    33872, 34571, 34564, 34551, 34572, 34554, 34518, 34549, 34637, 34552,
-    34574, 34569, 34561, 34550, 34573, 34565, 35030, 35019, {f: 2, c: 35021},
-    35038, 35035, 35034, 35020, 35024, 35205, 35227, 35295, 35301, 35300,
-    35297, 35296, 35298, 35292, 35302, 35446, 35462, 35455, 35425, 35391,
-    35447, 35458, 35460, 35445, 35459, 35457, 35444, 35450, 35900, 35915,
-    35914, 35941, 35940, 35942, 35974, {f: 2, c: 35972}, 36044,
-    {f: 2, c: 36200}, 36241, 36236, {f: 2, c: 36238}, 36237, {f: 2, c: 36243},
-    36240, 36242, 36336, 36320, 36332, 36337, 36334, 36304, 36329, 36323,
-    36322, 36327, 36338, 36331, 36340, 36614, 36607, 36609, 36608, 36613,
-    {f: 2, c: 36615}, 36610, [36619, 60507], 36946, 36927, 36932, 36937, 36925,
-    37136, 37133, 37135, 37137, 37142, 37140, 37131, 37134, {f: 2, c: 37230},
-    37448, 37458, 37424, 37434, 37478, 37427, 37477, 37470, 37507, 37422,
-    37450, 37446, 37485, 37484, 37455, 37472, 37479, 37487, 37430, 37473,
-    37488, 37425, 37460, 37475, 37456, 37490, 37454, 37459, 37452, 37462,
-    37426, 38303, 38300, 38302, 38299, {f: 2, c: 38546}, 38545, 38551, 38606,
-    38650, 38653, 38648, 38645, 38771, {f: 2, c: 38775}, 38770, 38927,
-    {f: 2, c: 38925}, 39084, 39158, 39161, 39343, 39346, 39344, 39349, 39597,
-    39595, 39771, 40170, 40173, 40167, 40576, [12236, 40701], 20710, 20692,
-    20695, 20712, 20723, 20699, 20714, 20701, 20708, 20691, 20716, 20720,
-    20719, 20707, 20704, 20952, {f: 2, c: 21120}, 21225, 21227, 21296, 21420,
-    22055, 22037, 22028, 22034, 22012, 22031, 22044, 22017, 22035, 22018,
-    22010, 22045, 22020, 22015, 22009, 22665, 22652, 22672, 22680, 22662,
-    22657, 22655, 22644, 22667, 22650, 22663, 22673, 22670, 22646, 22658,
-    22664, 22651, 22676, 22671, 22782, 22891, 23260, 23278, 23269, 23253,
-    23274, 23258, 23277, 23275, 23283, 23266, 23264, 23259, 23276, 23262,
-    23261, 23257, 23272, 23263, 23415, 23520, 23523, 23651, 23938, 23936,
-    23933, 23942, 23930, 23937, 23927, 23946, 23945, 23944, 23934, 23932,
-    23949, 23929, 23935, {f: 2, c: 24152}, 24147, 24280, 24273, 24279, 24270,
-    24284, 24277, 24281, 24274, 24276, 24388, 24387, 24431, 24502, 24876,
-    24872, 24897, 24926, 24945, 24947, {f: 2, c: 24914}, 24946, 24940, 24960,
-    24948, 24916, 24954, 24923, 24933, 24891, 24938, 24929, 24918, 25129,
-    25127, 25131, 25643, 25677, 25691, 25693, 25716, 25718, {f: 2, c: 25714},
-    25725, 25717, 25702, 25766, 25678, 25730, 25694, 25692, 25675, 25683,
-    25696, 25680, 25727, 25663, 25708, 25707, 25689, 25701, 25719, 25971,
-    26016, 26273, 26272, 26271, 26373, 26372, 26402, 27057, 27062, 27081,
-    27040, 27086, 27030, 27056, 27052, 27068, 27025, 27033, 27022, 27047,
-    27021, 27049, 27070, 27055, 27071, 27076, 27069, 27044, 27092, 27065,
-    27082, 27034, 27087, 27059, 27027, 27050, 27041, 27038, 27097, 27031,
-    27024, 27074, 27061, 27045, 27078, 27466, 27469, 27467, {f: 3, c: 27550},
-    {f: 2, c: 27587}, 27646, 28366, 28405, 28401, 28419, 28453, 28408, 28471,
-    28411, 28462, 28425, 28494, {f: 2, c: 28441}, 28455, 28440, 28475, 28434,
-    28397, 28426, 28470, 28531, 28409, 28398, 28461, 28480, 28464, 28476,
-    28469, 28395, 28423, 28430, 28483, 28421, 28413, 28406, 28473, 28444,
-    28412, 28474, 28447, 28429, 28446, 28424, 28449, 29063, 29072, 29065,
-    29056, 29061, 29058, 29071, 29051, 29062, 29057, 29079, 29252, 29267,
-    29335, 29333, 29331, 29507, 29517, 29521, 29516, 29794, 29811, 29809,
-    29813, 29810, 29799, 29806, 29952, {f: 2, c: 29954}, 30077, 30096, 30230,
-    30216, 30220, 30229, 30225, 30218, 30228, 30392, 30593, 30588, 30597,
-    30594, 30574, 30592, 30575, 30590, 30595, 30898, 30890, 30900, 30893,
-    30888, 30846, 30891, 30878, 30885, 30880, 30892, 30882, 30884, 31128,
-    {f: 2, c: 31114}, 31126, 31125, 31124, 31123, 31127, 31112, 31122, 31120,
-    31275, 31306, 31280, 31279, 31272, 31270, 31400, {f: 2, c: 31403}, 31470,
-    31624, 31644, 31626, 31633, 31632, 31638, 31629, 31628, 31643, 31630,
-    31621, 31640, 21124, 31641, 31652, 31618, 31931, 31935, 31932, 31930,
-    32167, 32183, 32194, 32163, 32170, 32193, 32192, 32197, 32157, 32206,
-    32196, 32198, {f: 2, c: 32203}, 32175, 32185, 32150, 32188, 32159, 32166,
-    32174, 32169, 32161, 32201, 32627, {f: 2, c: 32738}, 32741, 32734, 32804,
-    32861, 32860, 33161, 33158, 33155, 33159, 33165, 33164, 33163, 33301,
-    33943, 33956, 33953, 33951, 33978, 33998, 33986, 33964, 33966, 33963,
-    33977, 33972, 33985, 33997, 33962, 33946, 33969, 34000, 33949, 33959,
-    33979, 33954, 33940, 33991, 33996, 33947, 33961, 33967, [33960, 58327],
-    34006, 33944, 33974, 33999, 33952, 34007, 34004, 34002, 34011, 33968,
-    33937, 34401, 34611, 34595, 34600, 34667, 34624, 34606, 34590, 34593,
-    34585, 34587, 34627, 34604, 34625, 34622, 34630, 34592, 34610, 34602,
-    34605, 34620, 34578, 34618, 34609, 34613, 34626, {f: 2, c: 34598}, 34616,
-    34596, 34586, 34608, 34577, 35063, 35047, {f: 2, c: 35057}, 35066, 35070,
-    35054, 35068, 35062, 35067, 35056, 35052, 35051, 35229, 35233, 35231,
-    35230, 35305, 35307, 35304, 35499, 35481, 35467, 35474, 35471, 35478,
-    35901, {f: 2, c: 35944}, 36053, 36047, 36055, 36246, 36361, 36354, 36351,
-    36365, 36349, 36362, 36355, 36359, 36358, 36357, 36350, 36352, 36356,
-    {f: 2, c: 36624}, 36622, 36621, 37155, 37148, 37152, 37154, 37151, 37149,
-    37146, 37156, 37153, 37147, 37242, 37234, 37241, 37235, 37541, 37540,
-    37494, 37531, 37498, 37536, 37524, 37546, 37517, 37542, 37530, 37547,
-    37497, 37527, 37503, 37539, 37614, 37518, 37506, 37525, 37538, 37501,
-    37512, 37537, 37514, 37510, 37516, 37529, 37543, 37502, 37511, 37545,
-    37533, 37515, 37421, 38558, 38561, 38655, 38744, 38781, 38778, 38782,
-    38787, 38784, 38786, 38779, 38788, 38785, 38783, 38862, 38861, 38934,
-    {f: 2, c: 39085}, 39170, 39168, 39175, 39325, 39324, 39363, 39353, 39355,
-    39354, 39362, 39357, 39367, 39601, 39651, 39655, {f: 2, c: 39742},
-    {f: 2, c: 39776}, 39775, {f: 2, c: 40177}, 40181, 40615, 20735, 20739,
-    20784, 20728, {f: 2, c: 20742}, 20726, 20734, {f: 2, c: 20747}, 20733,
-    20746, {f: 2, c: 21131}, 21233, 21231, 22088, 22082, 22092, 22069, 22081,
-    22090, 22089, 22086, 22104, 22106, 22080, 22067, 22077, 22060, 22078,
-    22072, 22058, 22074, 22298, 22699, 22685, 22705, 22688, 22691, 22703,
-    22700, 22693, 22689, 22783, 23295, 23284, 23293, 23287, 23286, 23299,
-    23288, 23298, 23289, 23297, 23303, 23301, 23311, 23655, 23961, 23959,
-    23967, 23954, 23970, 23955, 23957, 23968, 23964, 23969, 23962, 23966,
-    24169, 24157, 24160, 24156, 32243, 24283, 24286, 24289, 24393, 24498,
-    24971, 24963, 24953, 25009, 25008, 24994, 24969, 24987, 24979, 25007,
-    25005, 24991, 24978, 25002, 24993, 24973, 24934, 25011, 25133, 25710,
-    25712, 25750, 25760, 25733, 25751, 25756, 25743, 25739, 25738, 25740,
-    25763, 25759, 25704, 25777, 25752, 25974, 25978, 25977, 25979,
-    {f: 2, c: 26034}, 26293, 26288, 26281, 26290, 26295, 26282, 26287, 27136,
-    27142, 27159, 27109, 27128, 27157, 27121, 27108, 27168, 27135, 27116,
-    27106, 27163, 27165, 27134, 27175, 27122, 27118, 27156, 27127, 27111,
-    27200, 27144, 27110, 27131, 27149, 27132, 27115, 27145, 27140, 27160,
-    27173, 27151, 27126, 27174, 27143, 27124, 27158, 27473, 27557, 27555,
-    27554, 27558, 27649, 27648, 27647, 27650, 28481, 28454, 28542, 28551,
-    28614, 28562, 28557, 28553, 28556, 28514, 28495, 28549, 28506, 28566,
-    28534, 28524, 28546, 28501, 28530, 28498, 28496, 28503, 28564, 28563,
-    28509, 28416, 28513, 28523, 28541, 28519, 28560, 28499, 28555, 28521,
-    28543, 28565, 28515, 28535, 28522, 28539, 29106, 29103, 29083, 29104,
-    29088, 29082, 29097, 29109, 29085, 29093, 29086, 29092, 29089, 29098,
-    29084, 29095, 29107, 29336, 29338, 29528, 29522, {f: 3, c: 29534}, 29533,
-    29531, 29537, 29530, 29529, 29538, 29831, {f: 2, c: 29833}, 29830, 29825,
-    29821, 29829, 29832, 29820, [29817, 58868], 29960, 29959, 30078, 30245,
-    30238, 30233, 30237, 30236, 30243, 30234, 30248, 30235, {f: 3, c: 30364},
-    30363, 30605, 30607, 30601, 30600, 30925, 30907, 30927, 30924, 30929,
-    30926, 30932, 30920, {f: 2, c: 30915}, 30921, 31130, 31137, 31136, 31132,
-    31138, [31131, 59175], 27510, 31289, 31410, 31412, 31411, 31671, 31691,
-    31678, 31660, 31694, 31663, 31673, 31690, 31669, 31941, 31944, 31948,
-    31947, 32247, 32219, 32234, 32231, 32215, 32225, 32259, 32250, 32230,
-    32246, 32241, 32240, 32238, 32223, 32630, 32684, 32688, 32685, 32749,
-    32747, 32746, 32748, 32742, 32744, 32868, 32871, 33187, 33183, 33182,
-    33173, 33186, 33177, 33175, 33302, 33359, 33363, 33362, 33360, 33358,
-    33361, 34084, 34107, 34063, 34048, 34089, 34062, 34057, 34061, 34079,
-    34058, 34087, 34076, 34043, 34091, 34042, 34056, 34060, 34036, 34090,
-    34034, 34069, 34039, 34027, 34035, 34044, 34066, 34026, 34025, 34070,
-    34046, 34088, 34077, 34094, 34050, 34045, 34078, 34038, 34097, 34086,
-    {f: 2, c: 34023}, 34032, 34031, 34041, 34072, 34080, 34096, 34059, 34073,
-    34095, 34402, 34646, {f: 2, c: 34659}, 34679, 34785, 34675, 34648, 34644,
-    34651, 34642, 34657, 34650, 34641, 34654, 34669, 34666, 34640, 34638,
-    34655, 34653, 34671, 34668, 34682, 34670, 34652, 34661, 34639, 34683,
-    34677, 34658, 34663, 34665, 34906, 35077, 35084, 35092, 35083,
-    {f: 3, c: 35095}, 35078, 35094, 35089, 35086, 35081, 35234, 35236, 35235,
-    35309, 35312, 35308, 35535, 35526, 35512, 35539, 35537, {f: 2, c: 35540},
-    35515, 35543, 35518, 35520, 35525, 35544, 35523, 35514, 35517, 35545,
-    35902, 35917, 35983, 36069, 36063, 36057, 36072, 36058, 36061, 36071,
-    36256, 36252, 36257, 36251, 36384, 36387, 36389, 36388, 36398, 36373,
-    36379, 36374, 36369, 36377, {f: 2, c: 36390}, 36372, 36370, 36376, 36371,
-    36380, 36375, 36378, 36652, 36644, 36632, 36634, 36640, 36643,
-    {f: 2, c: 36630}, 36979, 36976, 36975, 36967, 36971, 37167, 37163,
-    {f: 2, c: 37161}, 37170, 37158, 37166, {f: 2, c: 37253}, 37258,
-    {f: 2, c: 37249}, 37252, 37248, 37584, {f: 2, c: 37571}, 37568, 37593,
-    37558, 37583, 37617, 37599, 37592, 37609, 37591, 37597, 37580, 37615,
-    37570, 37608, 37578, 37576, 37582, 37606, 37581, 37589, 37577, 37600,
-    37598, 37607, 37585, 37587, 37557, 37601, 37669, 37574, 37556, 38268,
-    38316, 38315, 38318, 38320, 38564, 38562, 38611, 38661, 38664, 38658,
-    38746, 38794, 38798, 38792, 38864, 38863, 38942, 38941, 38950, 38953,
-    38952, 38944, 38939, 38951, 39090, 39176, 39162, 39185, 39188,
-    {f: 2, c: 39190}, 39189, 39388, 39373, 39375, {f: 2, c: 39379}, 39374,
-    39369, [39382, 60270], 39384, 39371, 39383, 39372, 39603, 39660, 39659,
-    39667, 39666, 39665, 39750, 39747, 39783, 39796, 39793, 39782, 39798,
-    39797, 39792, 39784, 39780, 39788, 40188, 40186, 40189, 40191, 40183,
-    40199, 40192, 40185, 40187, 40200, 40197, 40196, 40579, 40659,
-    {f: 2, c: 40719}, 20764, 20755, 20759, 20762, 20753, 20958, 21300, 21473,
-    22128, 22112, 22126, 22131, 22118, 22115, 22125, 22130, 22110, 22135,
-    22300, 22299, 22728, 22717, 22729, 22719, 22714, 22722, 22716, 22726,
-    23319, 23321, 23323, 23329, 23316, 23315, 23312, 23318, [23336, 59539],
-    23322, 23328, 23326, 23535, 23980, 23985, 23977, 23975, 23989, 23984,
-    23982, 23978, 23976, 23986, 23981, 23983, 23988, {f: 2, c: 24167}, 24166,
-    24175, 24297, 24295, 24294, 24296, 24293, 24395, 24508, 24507, 24989,
-    25000, 24982, 25029, 25012, 25030, 25025, 25036, 25018, 25023, 25016,
-    24972, 25815, 25814, 25808, 25807, 25801, 25789, 25737, 25795, 25819,
-    25843, 25817, 25907, 25983, 25980, 26018, 26312, 26302, 26304,
-    {f: 2, c: 26314}, 26319, 26301, 26299, 26298, 26316, 26403, 27188, 27238,
-    27209, 27239, 27186, 27240, 27198, 27229, 27245, 27254, 27227, 27217,
-    27176, 27226, 27195, 27199, 27201, 27242, 27236, 27216, 27215, 27220,
-    27247, 27241, 27232, 27196, 27230, 27222, 27221, {f: 2, c: 27213}, 27206,
-    27477, 27476, 27478, 27559, {f: 2, c: 27562}, 27592, 27591, 27652, 27651,
-    27654, 28589, 28619, 28579, 28615, 28604, 28622, 28616, 28510, 28612,
-    28605, 28574, 28618, 28584, 28676, 28581, 28590, 28602, 28588, 28586,
-    28623, 28607, 28600, 28578, 28617, 28587, 28621, 28591, 28594, 28592,
-    29125, 29122, 29119, 29112, 29142, {f: 2, c: 29120}, 29131, 29140, 29130,
-    29127, 29135, 29117, 29144, 29116, 29126, {f: 2, c: 29146},
-    {f: 2, c: 29341}, 29545, {f: 2, c: 29542}, 29548, 29541, 29547, 29546,
-    29823, 29850, 29856, 29844, 29842, 29845, 29857, 29963, 30080, 30255,
-    30253, 30257, 30269, 30259, 30268, 30261, 30258, 30256, 30395, 30438,
-    30618, 30621, 30625, 30620, 30619, {f: 2, c: 30626}, 30613, 30617, 30615,
-    30941, 30953, 30949, 30954, 30942, 30947, 30939, {f: 2, c: 30945}, 30957,
-    {f: 2, c: 30943}, 31140, 31300, 31304, 31303, 31414, 31416, 31413, 31409,
-    31415, 31710, 31715, 31719, 31709, 31701, 31717, 31706, 31720, 31737,
-    31700, 31722, 31714, 31708, 31723, 31704, 31711, 31954, 31956, 31959,
-    {f: 2, c: 31952}, 32274, 32289, 32279, 32268, {f: 2, c: 32287}, 32275,
-    32270, 32284, 32277, 32282, 32290, 32267, 32271, 32278, 32269, 32276,
-    32293, 32292, 32579, {f: 2, c: 32635}, 32634, 32689, 32751, 32810, 32809,
-    32876, 33201, 33190, 33198, 33209, 33205, 33195, 33200, 33196, 33204,
-    33202, 33207, 33191, 33266, {f: 3, c: 33365}, 34134, 34117, 34155, 34125,
-    34131, 34145, 34136, 34112, 34118, 34148, 34113, 34146, 34116, 34129,
-    34119, 34147, 34110, 34139, 34161, 34126, 34158, 34165, 34133, 34151,
-    34144, 34188, 34150, 34141, 34132, 34149, 34156, 34403, 34405, 34404,
-    34724, 34715, 34703, 34711, 34707, 34706, 34696, 34689, 34710, 34712,
-    34681, 34695, 34723, 34693, {f: 2, c: 34704}, 34717, 34692, 34708, 34716,
-    34714, 34697, 35102, 35110, 35120, {f: 2, c: 35117}, 35111, 35121, 35106,
-    35113, 35107, 35119, 35116, 35103, 35313, 35552, 35554, 35570,
-    {f: 2, c: 35572}, 35549, 35604, 35556, 35551, 35568, 35528, 35550, 35553,
-    35560, 35583, 35567, 35579, {f: 2, c: 35985}, 35984, 36085, 36078, 36081,
-    36080, 36083, 36204, 36206, 36261, 36263, 36403, 36414, 36408, 36416,
-    36421, 36406, {f: 2, c: 36412}, 36417, 36400, 36415, 36541, [36662, 60329],
-    36654, 36661, 36658, 36665, 36663, 36660, 36982, 36985, 36987, 36998,
-    37114, 37171, {f: 2, c: 37173}, 37267, {f: 2, c: 37264}, 37261, 37263,
-    37671, 37662, 37640, 37663, 37638, 37647, 37754, 37688, 37692, 37659,
-    37667, 37650, 37633, 37702, 37677, 37646, 37645, 37579, 37661, 37626,
-    37651, 37625, 37623, 37684, 37634, 37668, 37631, 37673, 37689, 37685,
-    37674, 37652, 37644, 37643, 37630, 37641, 37632, 37627, 37654, 38332,
-    38349, 38334, {f: 2, c: 38329}, 38326, 38335, 38325, 38333, 38569, 38612,
-    38667, 38674, 38672, 38809, 38807, 38804, 38896, 38904, 38965, 38959,
-    38962, 39204, 39199, 39207, 39209, 39326, 39406, 39404, 39397, 39396,
-    39408, 39395, 39402, 39401, 39399, 39609, 39615, 39604, 39611, 39670,
-    39674, 39673, 39671, 39731, 39808, 39813, 39815, 39804, 39806, 39803,
-    39810, 39827, 39826, 39824, 39802, 39829, 39805, 39816, 40229, 40215,
-    40224, 40222, 40212, 40233, 40221, 40216, 40226, 40208, 40217, 40223,
-    40584, {f: 2, c: 40582}, 40622, 40621, {f: 2, c: 40661}, 40698, 40722,
-    40765, 20774, 20773, 20770, 20772, 20768, 20777, 21236, 22163,
-    {f: 2, c: 22156}, 22150, 22148, 22147, 22142, 22146, 22143, 22145, 22742,
-    22740, 22735, 22738, 23341, 23333, 23346, 23331, 23340, 23335, 23334,
-    23343, 23342, 23419, {f: 2, c: 23537}, 23991, 24172, 24170, 24510, 25027,
-    25013, 25020, 25063, 25056, 25061, 25060, 25064, 25054, 25839, 25833,
-    25827, 25835, 25828, 25832, 25985, 25984, 26038, 26074, 26322, 27277,
-    27286, 27265, 27301, 27273, 27295, 27291, 27297, 27294, 27271, 27283,
-    27278, 27285, 27267, 27304, 27300, 27281, 27263, 27302, 27290, 27269,
-    27276, 27282, 27483, 27565, 27657, 28620, 28585, 28660, 28628, 28643,
-    28636, 28653, 28647, 28646, 28638, 28658, 28637, 28642, 28648, 29153,
-    29169, 29160, 29170, 29156, 29168, 29154, 29555, {f: 2, c: 29550}, 29847,
-    29874, 29867, 29840, 29866, 29869, 29873, 29861, 29871, {f: 3, c: 29968},
-    29967, 30084, 30275, {f: 2, c: 30280}, 30279, 30372, 30441, 30645, 30635,
-    30642, 30647, 30646, 30644, 30641, 30632, 30704, 30963, 30973, 30978,
-    {f: 2, c: 30971}, 30975, 30962, 30981, 30969, 30974, 30980, 31147, 31144,
-    31324, 31323, 31318, 31320, 31316, 31322, 31422, {f: 2, c: 31424}, 31749,
-    31759, 31730, 31744, 31743, 31739, 31758, 31732, 31755, 31731, 31746,
-    31753, 31747, 31745, 31736, 31741, [31750, 58176], {f: 2, c: 31728}, 31760,
-    31754, 31976, 32301, 32316, 32322, 32307, 38984, 32312, 32298, 32329,
-    32320, 32327, 32297, 32332, 32304, 32315, 32310, 32324, 32314, 32581,
-    32639, 32638, 32637, 32756, 32754, 32812, 33211, 33220, 33228, 33226,
-    33221, 33223, 33212, 33257, 33371, 33370, 33372, 34179, 34176, 34191,
-    34215, 34197, 34208, 34187, 34211, 34171, 34212, 34202, 34206, 34167,
-    34172, 34185, 34209, 34170, 34168, 34135, 34190, 34198, 34182, 34189,
-    34201, 34205, 34177, 34210, 34178, 34184, 34181, 34169, 34166, 34200,
-    34192, 34207, 34408, 34750, 34730, 34733, 34757, 34736, 34732, 34745,
-    34741, 34748, 34734, 34761, 34755, 34754, 34764, 34743, 34735, 34756,
-    34762, 34740, 34742, 34751, 34744, 34749, 34782, 34738, 35125, 35123,
-    35132, 35134, 35137, 35154, 35127, 35138, 35245, 35247, 35246,
-    {f: 2, c: 35314}, 35614, 35608, 35606, 35601, 35589, 35595, 35618, 35599,
-    35602, 35605, 35591, 35597, 35592, 35590, 35612, 35603, 35610, 35919,
-    35952, 35954, 35953, 35951, 35989, 35988, 36089, 36207, 36430, 36429,
-    36435, 36432, 36428, 36423, 36675, 36672, 36997, 36990, 37176, 37274,
-    37282, 37275, 37273, 37279, 37281, 37277, 37280, 37793, 37763, 37807,
-    37732, 37718, 37703, 37756, 37720, 37724, 37750, 37705, {f: 2, c: 37712},
-    37728, 37741, 37775, 37708, 37738, 37753, 37719, 37717, 37714, 37711,
-    37745, 37751, 37755, 37729, 37726, 37731, 37735, 37710, 37721, 38343,
-    38336, 38345, 38339, 38341, 38327, 38574, 38576, 38572, 38688, 38687,
-    38680, 38685, 38681, 38810, 38817, 38812, 38814, 38813, 38869, 38868,
-    38897, 38977, 38980, 38986, 38985, 38981, 38979, 39205, {f: 2, c: 39211},
-    39210, 39219, 39218, 39215, 39213, 39217, 39216, 39320, 39331, 39329,
-    39426, 39418, 39412, 39415, 39417, 39416, 39414, 39419, {f: 2, c: 39421},
-    39420, 39427, 39614, 39678, 39677, 39681, 39676, 39752, 39834, 39848,
-    39838, 39835, 39846, 39841, 39845, 39844, 39814, 39842, 39840, 39855,
-    40243, 40257, 40295, 40246, {f: 2, c: 40238}, 40241, 40248, 40240, 40261,
-    {f: 2, c: 40258}, 40254, 40247, 40256, 40253, 32757, 40237, 40586, 40585,
-    40589, 40624, 40648, 40666, 40699, 40703, 40740, 40739, 40738, 40788,
-    [12245, 40864], 20785, {f: 2, c: 20781}, 22168, 22172, 22167, 22170, 22173,
-    22169, 22896, 23356, {f: 2, c: 23657}, 24000, {f: 2, c: 24173}, 25048,
-    25055, {f: 2, c: 25069}, 25073, 25066, 25072, 25067, 25046, 25065, 25855,
-    25860, 25853, 25848, 25857, 25859, 25852, 26004, 26075, {f: 2, c: 26330},
-    26328, 27333, 27321, 27325, 27361, 27334, 27322, {f: 2, c: 27318}, 27335,
-    27316, 27309, 27486, 27593, 27659, 28679, {f: 2, c: 28684}, 28673, 28677,
-    28692, 28686, {f: 2, c: 28671}, 28667, 28710, 28668, 28663, 28682,
-    [29185, 60224], 29183, 29177, 29187, 29181, 29558, 29880, 29888, 29877,
-    29889, 29886, 29878, 29883, 29890, 29972, 29971, 30300, 30308, 30297,
-    30288, 30291, 30295, 30298, 30374, 30397, 30444, 30658, 30650, 30988,
-    {f: 2, c: 30995}, 30985, 30992, 30994, 30993, 31149, 31148, 31327, 31772,
-    31785, 31769, 31776, 31775, 31789, 31773, 31782, 31784, 31778, 31781,
-    31792, 32348, 32336, 32342, 32355, 32344, 32354, 32351, 32337, 32352,
-    32343, 32339, 32693, 32691, {f: 2, c: 32759}, 32885, {f: 2, c: 33233},
-    33232, 33375, 33374, 34228, 34246, 34240, 34243, 34242, 34227, 34229,
-    34237, 34247, 34244, 34239, 34251, 34254, 34248, 34245, 34225, 34230,
-    34258, 34340, 34232, 34231, 34238, 34409, 34791, 34790, 34786, 34779,
-    34795, 34794, 34789, 34783, 34803, 34788, 34772, 34780, 34771, 34797,
-    34776, 34787, 34775, 34777, 34817, 34804, 34792, 34781, 35155, 35147,
-    35151, 35148, 35142, {f: 2, c: 35152}, 35145, 35626, 35623, 35619, 35635,
-    35632, 35637, 35655, 35631, 35644, 35646, 35633, 35621, 35639, 35622,
-    35638, 35630, 35620, 35643, 35645, 35642, 35906, 35957, 35993, 35992,
-    35991, 36094, 36100, 36098, 36096, 36444, 36450, 36448, 36439, 36438,
-    36446, 36453, 36455, 36443, 36442, 36449, 36445, 36457, 36436,
-    {f: 3, c: 36678}, 36683, 37160, {f: 2, c: 37178}, 37182, 37288, 37285,
-    37287, 37295, 37290, 37813, 37772, 37778, 37815, 37787, 37789, 37769,
-    37799, 37774, 37802, 37790, 37798, 37781, 37768, 37785, 37791, 37760,
-    37773, 37809, 37777, 37810, 37796, 37800, 37812, 37795, {f: 2, c: 38354},
-    38353, 38579, 38615, 38618, 24002, 38623, 38616, 38621, 38691, 38690,
-    38693, 38828, 38830, 38824, 38827, 38820, 38826, 38818, 38821, 38871,
-    38873, 38870, 38872, 38906, {f: 3, c: 38992}, 39096, 39233, 39228, 39226,
-    39439, 39435, 39433, 39437, 39428, 39441, 39434, 39429, 39431, 39430,
-    39616, 39644, 39688, {f: 2, c: 39684}, 39721, 39733, 39754, 39756, 39755,
-    39879, 39878, 39875, 39871, 39873, 39861, 39864, 39891, 39862, 39876,
-    39865, 39869, 40284, 40275, 40271, 40266, 40283, 40267, 40281, 40278,
-    40268, 40279, 40274, 40276, 40287, 40280, 40282, 40590, 40588, 40671,
-    40705, 40704, [40726, 58693], 40741, 40747, 40746, 40745, 40744, 40780,
-    40789, {f: 2, c: 20788}, 21142, 21239, 21428, 22187, 22189,
-    {f: 2, c: 22182}, 22186, 22188, 22746, 22749, 22747, 22802,
-    {f: 3, c: 23357}, 24003, 24176, 24511, 25083, 25863, 25872, 25869, 25865,
-    25868, 25870, 25988, 26078, 26077, 26334, 27367, 27360, 27340, 27345,
-    27353, 27339, 27359, 27356, 27344, 27371, 27343, 27341, 27358, 27488,
-    27568, 27660, 28697, 28711, 28704, 28694, 28715, {f: 3, c: 28705}, 28713,
-    28695, 28708, 28700, 29196, 29194, 29191, 29186, 29189, {f: 2, c: 29349},
-    29348, 29347, 29345, 29899, 29893, 29879, 29891, 29974, 30304,
-    {f: 2, c: 30665}, 30660, 30705, 31005, 31003, 31009, 31004, 30999, 31006,
-    31152, {f: 2, c: 31335}, 31795, 31804, 31801, 31788, 31803, 31980, 31978,
-    32374, 32373, 32376, 32368, 32375, 32367, 32378, 32370, 32372, 32360,
-    32587, 32586, 32643, 32646, 32695, {f: 2, c: 32765}, 32888, 33239, 33237,
-    33291, 33380, 33377, 33379, 34283, 34289, 34285, 34265, 34273, 34280,
-    34266, 34263, 34284, 34290, 34296, 34264, 34271, 34275, 34268, 34257,
-    34288, 34278, 34287, 34270, 34274, 34816, 34810, 34819, {f: 2, c: 34806},
-    34825, 34828, 34827, 34822, 34812, 34824, 34815, 34826, 34818, 35170,
-    {f: 2, c: 35162}, 35159, 35169, 35164, 35160, 35165, 35161, 35208, 35255,
-    35254, 35318, 35664, 35656, 35658, 35648, 35667, 35670, 35668, 35659,
-    35669, 35665, 35650, 35666, 35671, 35907, 35959, 35958, 35994,
-    {f: 2, c: 36102}, 36105, 36268, 36266, 36269, 36267, 36461, 36472, 36467,
-    36458, 36463, 36475, 36546, 36690, 36689, {f: 2, c: 36687}, 36691, 36788,
-    37184, 37183, 37296, 37293, 37854, 37831, 37839, 37826, 37850, 37840,
-    37881, 37868, 37836, 37849, 37801, 37862, 37834, 37844, 37870, 37859,
-    37845, 37828, 37838, 37824, 37842, 37797, 37863, 38269, {f: 2, c: 38362},
-    38625, 38697, {f: 2, c: 38699}, 38696, 38694, 38835, 38839, 38838,
-    {f: 3, c: 38877}, 39004, 39001, 39005, 38999, 39103, 39101, 39099, 39102,
-    39240, 39239, 39235, {f: 2, c: 39334}, 39450, 39445, 39461, 39453, 39460,
-    39451, 39458, 39456, 39463, 39459, 39454, 39452, 39444, 39618, 39691,
-    39690, 39694, 39692, 39735, {f: 2, c: 39914}, 39904, 39902, 39908, 39910,
-    39906, 39920, 39892, 39895, 39916, 39900, 39897, 39909, 39893, 39905,
-    39898, 40311, 40321, 40330, 40324, 40328, 40305, 40320, 40312, 40326,
-    {f: 2, c: 40331}, 40317, 40299, {f: 2, c: 40308}, 40304, 40297, 40325,
-    40307, 40315, 40322, 40303, 40313, 40319, 40327, 40296, 40596, 40593,
-    40640, 40700, 40749, {f: 2, c: 40768}, 40781, {f: 3, c: 40790}, 21303,
-    22194, 22197, 22195, 22755, 23365, {f: 2, c: 24006}, {f: 2, c: 24302},
-    {f: 2, c: 24512}, 25081, 25879, 25878, 25877, 25875, 26079, 26344,
-    {f: 2, c: 26339}, 27379, 27376, 27370, 27368, 27385, 27377,
-    {f: 2, c: 27374}, 28732, 28725, 28719, 28727, 28724, 28721, 28738, 28728,
-    28735, 28730, 28729, 28714, 28736, 28731, 28723, 28737, {f: 2, c: 29203},
-    29352, 29565, 29564, 29882, 30379, 30378, 30398, 30445, 30668,
-    {f: 2, c: 30670}, 30669, 30706, 31013, 31011, {f: 2, c: 31015}, 31012,
-    31017, 31154, 31342, {f: 2, c: 31340}, 31479, 31817, 31816, 31818, 31815,
-    31813, 31982, 32379, 32382, 32385, 32384, 32698, 32767, 32889, 33243,
-    33241, {f: 2, c: 33384}, 34338, 34303, 34305, 34302, 34331, 34304, 34294,
-    34308, 34313, 34309, 34316, 34301, 34841, {f: 2, c: 34832}, 34839, 34835,
-    34838, 35171, 35174, 35257, 35319, 35680, 35690, 35677, 35688, 35683,
-    35685, 35687, 35693, 36270, 36486, 36488, 36484, 36697, {f: 2, c: 36694},
-    36693, 36696, 36698, 37005, 37187, 37185, 37303, 37301, {f: 2, c: 37298},
-    37899, 37907, 37883, 37920, 37903, 37908, 37886, 37909, 37904, 37928,
-    37913, 37901, 37877, 37888, 37879, 37895, 37902, 37910, 37906, 37882,
-    37897, 37880, 37948, 37898, 37887, 37884, 37900, 37878, 37905, 37894,
-    38366, 38368, 38367, {f: 2, c: 38702}, 38841, 38843, {f: 2, c: 38909},
-    39008, {f: 2, c: 39010}, 39007, {f: 2, c: 39105}, 39248, 39246, 39257,
-    39244, 39243, 39251, 39474, 39476, 39473, 39468, 39466, 39478, 39465,
-    39470, 39480, 39469, 39623, 39626, 39622, 39696, 39698, 39697, 39947,
-    39944, 39927, 39941, 39954, 39928, 40000, 39943, 39950, 39942, 39959,
-    39956, 39945, 40351, 40345, 40356, 40349, 40338, 40344, 40336, 40347,
-    40352, 40340, 40348, 40362, 40343, 40353, 40346, 40354, 40360, 40350,
-    40355, 40383, 40361, 40342, {f: 2, c: 40358}, 40601, 40603, 40602, 40677,
-    40676, 40679, 40678, 40752, 40750, 40795, 40800, 40798, 40797, 40793,
-    40849, 20794, 20793, 21144, 21143, 22211, {f: 2, c: 22205}, 23368, 23367,
-    24011, 24015, 24305, 25085, 25883, 27394, 27388, 27395, 27384, 27392,
-    {f: 2, c: 28739}, 28746, {f: 2, c: 28744}, {f: 2, c: 28741}, 29213, 29210,
-    29209, 29566, 29975, 30314, 30672, 31021, 31025, 31023, 31828, 31827,
-    31986, 32394, [32391, 60229], 32392, 32395, 32390, 32397, 32589, 32699,
-    32816, 33245, 34328, 34346, 34342, 34335, 34339, 34332, 34329, 34343,
-    34350, 34337, 34336, 34345, 34334, 34341, 34857, 34845, 34843, 34848,
-    34852, 34844, 34859, 34890, 35181, 35177, 35182, 35179, 35322, 35705,
-    35704, 35653, {f: 2, c: 35706}, 36112, 36116, 36271, 36494, 36492, 36702,
-    36699, 36701, 37190, {f: 2, c: 37188}, 37305, 37951, 37947, 37942, 37929,
-    37949, 37936, 37945, 37930, 37943, 37932, 37952, 37937, 38373, 38372,
-    38371, 38709, 38714, 38847, 38881, 39012, 39113, 39110, 39104, 39256,
-    39254, 39481, 39485, 39494, 39492, 39490, 39489, 39482, 39487, 39629,
-    39701, {f: 2, c: 39703}, 39702, 39738, 39762, 39979, 39965, 39964, 39980,
-    39971, {f: 2, c: 39976}, 39972, 39969, 40375, 40374, 40380, 40385, 40391,
-    40394, 40399, 40382, 40389, 40387, 40379, 40373, 40398, {f: 2, c: 40377},
-    40364, 40392, 40369, 40365, 40396, 40371, 40397, 40370, 40570, 40604,
-    40683, 40686, 40685, 40731, 40728, 40730, 40753, 40782, 40805, 40804,
-    40850, 20153, 22214, 22213, 22219, 22897, {f: 2, c: 23371}, 24021, 24017,
-    24306, 25889, 25888, 25894, 25890, 27403, {f: 2, c: 27400}, 27661,
-    {f: 3, c: 28757}, 28754, {f: 2, c: 29214}, 29353, 29567, 29912, 29909,
-    29913, 29911, 30317, 30381, 31029, 31156, {f: 2, c: 31344}, 31831, 31836,
-    31833, 31835, 31834, 31988, 31985, 32401, 32591, 32647, 33246, 33387,
-    {f: 2, c: 34356}, 34355, 34348, 34354, 34358, 34860, 34856, 34854, 34858,
-    34853, 35185, 35263, 35262, 35323, 35710, 35716, 35714, 35718, 35717,
-    35711, 36117, 36501, 36500, 36506, 36498, 36496, {f: 2, c: 36502}, 36704,
-    36706, 37191, 37964, 37968, {f: 2, c: 37962}, 37967, 37959, 37957,
-    {f: 2, c: 37960}, 37958, 38719, 38883, 39018, 39017, 39115, 39252, 39259,
-    39502, {f: 2, c: 39507}, 39500, 39503, 39496, 39498, 39497, 39506, 39504,
-    39632, 39705, 39723, 39739, 39766, 39765, 40006, 40008, 39999, 40004,
-    39993, 39987, 40001, 39996, 39991, 39988, 39986, 39997, 39990, 40411,
-    40402, 40414, 40410, 40395, 40400, 40412, 40401, 40415, 40425, 40409,
-    40408, 40406, 40437, 40405, 40413, 40630, 40688, 40757, 40755, 40754,
-    40770, 40811, 40853, 40866, 20797, 21145, 22760, 22759, 22898, 23373,
-    24024, 34863, 24399, 25089, {f: 2, c: 25091}, 25897, 25893, 26006, 26347,
-    {f: 2, c: 27409}, 27407, 27594, 28763, 28762, 29218, 29570, 29569, 29571,
-    30320, 30676, 31847, 31846, 32405, 33388, 34362, 34368, 34361, 34364,
-    34353, 34363, 34366, 34864, 34866, 34862, 34867, 35190, 35188, 35187,
-    35326, 35724, 35726, 35723, 35720, 35909, 36121, 36504, 36708, 36707,
-    37308, 37986, 37973, 37981, 37975, 37982, {f: 2, c: 38852}, 38912, 39510,
-    39513, {f: 3, c: 39710}, 40018, 40024, 40016, 40010, 40013, 40011, 40021,
-    40025, 40012, 40014, 40443, 40439, 40431, 40419, 40427, 40440, 40420,
-    40438, 40417, 40430, 40422, 40434, [40432, 60370], 40418, 40428, 40436,
-    40435, 40424, 40429, 40642, 40656, {f: 2, c: 40690}, 40710, 40732, 40760,
-    40759, 40758, 40771, 40783, 40817, 40816, {f: 2, c: 40814}, 22227, 22221,
-    23374, 23661, 25901, {f: 2, c: 26349}, 27411, 28767, 28769, 28765, 28768,
-    29219, 29915, 29925, 30677, 31032, 31159, 31158, 31850, 32407, 32649,
-    33389, 34371, 34872, 34871, 34869, 34891, {f: 2, c: 35732},
-    {f: 3, c: 36510}, 36509, 37310, 37309, 37314, 37995, {f: 2, c: 37992},
-    38629, 38726, 38723, 38727, 38855, 38885, 39518, 39637, 39769, 40035,
-    40039, 40038, 40034, 40030, 40032, 40450, 40446, 40455, 40451, 40454,
-    40453, {f: 2, c: 40448}, 40457, 40447, 40445, 40452, 40608, 40734, 40774,
-    {f: 3, c: 40820}, 22228, 25902, 26040, {f: 2, c: 27416}, 27415, 27418,
-    28770, 29222, 29354, {f: 2, c: 30680}, 31033, 31849, 31851, 31990, 32410,
-    32408, 32411, 32409, {f: 2, c: 33248}, {f: 3, c: 34374}, {f: 2, c: 35193},
-    35196, 35195, 35327, {f: 2, c: 35736}, 36517, 36516, 36515, 37998, 37997,
-    37999, 38001, 38003, 38729, 39026, 39263, 40040, 40046, 40045, 40459,
-    40461, 40464, 40463, 40466, 40465, 40609, 40693, 40713, 40775, 40824,
-    40827, 40826, 40825, 22302, 28774, 31855, 34876, 36274, 36518, 37315,
-    38004, 38008, 38006, 38005, 39520, [39726, 60830], 40052, 40051, 40049,
-    40053, 40468, 40467, 40694, 40714, 40868, 28776, 28773, 31991, 34410,
-    34878, 34877, 34879, 35742, 35996, 36521, 36553, 38731, {f: 2, c: 39027},
-    39116, 39265, 39339, 39524, {f: 2, c: 39526}, 39716, 40469, 40471, 40776,
-    25095, 27422, 29223, 34380, 36520, 38018, {f: 2, c: 38016}, 39529, 39528,
-    40473, 34379, 35743, 38019, 40057, 40631, 30325, 39531, 40058, 40477,
-    {f: 2, c: 28777}, 29225, 40612, 40830, 40777, 40856, {s: 97}, 65075, 0,
-    65076, 65103, [168, 776, 63208], [710, 63209, 65342], [12541, 63210],
-    [12542, 63211], [12445, 63212], [12446, 63213], 0, [12293, 63216],
-    [12294, 63217], [12295, 63218], [12540, 63219], [63220, 65339],
-    [63221, 65341], [10045, 63222], [12353, 63223], [12354, 63224],
-    [12355, 63225], [12356, 63226], [12357, 63227], [12358, 63228],
-    [12359, 63229], [12360, 63230], [12361, 63231], [12362, 63232],
-    [12363, 63233], [12364, 63234], [12365, 63235], [12366, 63236],
-    [12367, 63237], [12368, 63238], [12369, 63239], [12370, 63240],
-    [12371, 63241], [12372, 63242], [12373, 63243], [12374, 63244],
-    [12375, 63245], [12376, 63246], [12377, 63247], [12378, 63248],
-    [12379, 63249], [12380, 63250], [12381, 63251], [12382, 63252],
-    [12383, 63253], [12384, 63254], [12385, 63255], [12386, 63256],
-    [12387, 63257], [12388, 63258], [12389, 63259], [12390, 63260],
-    [12391, 63261], [12392, 63262], [12393, 63263], [12394, 63264],
-    [12395, 63265], [12396, 63266], [12397, 63267], [12398, 63268],
-    [12399, 63269], [12400, 63270], [12401, 63271], [12402, 63272],
-    [12403, 63273], [12404, 63274], [12405, 63275], [12406, 63276],
-    [12407, 63277], [12408, 63278], [12409, 63279], [12410, 63280],
-    [12411, 63281], [12412, 63282], [12413, 63283], [12414, 63284],
-    [12415, 63285], [12416, 63286], [12417, 63287], [12418, 63288],
-    [12419, 63289], [12420, 63290], [12421, 63291], [12422, 63292],
-    [12423, 63293], [12424, 63294], [12425, 63295], [12426, 63296],
-    [12427, 63297], [12428, 63298], [12429, 63299], [12430, 63300],
-    [12431, 63301], [12432, 63302], [12433, 63303], [12434, 63304],
-    [12435, 63305], [12449, 63306], [12450, 63307], [12451, 63308],
-    [12452, 63309], [12453, 63310], [12454, 63311], [12455, 63312],
-    [12456, 63313], [12457, 63314], [12458, 63315], [12459, 63316],
-    [12460, 63317], [12461, 63318], [12462, 63319], [12463, 63320],
-    [12464, 63321], [12465, 63322], [12466, 63323], [12467, 63324],
-    [12468, 63325], [12469, 63326], [12470, 63327], [12471, 63328],
-    [12472, 63329], [12473, 63330], [12474, 63331], [12475, 63332],
-    [12476, 63333], [12477, 63334], [12478, 63335], [12479, 63336],
-    [12480, 63337], [12481, 63338], [12482, 63339], [12483, 63340],
-    [12484, 63341], [12485, 63342], [12486, 63343], [12487, 63344],
-    [12488, 63345], [12489, 63346], [12490, 63347], [12491, 63348],
-    [12492, 63349], [12493, 63350], [12494, 63351], [12495, 63352],
-    [12496, 63353], [12497, 63354], [12498, 63355], [12499, 63356],
-    [12500, 63357], [12501, 63358], [12502, 63359], [12503, 63360],
-    [12504, 63361], [12505, 63362], [12506, 63363], [12507, 63364],
-    [12508, 63365], [12509, 63366], [12510, 63367], [12511, 63368],
-    [12512, 63369], [12513, 63370], [12514, 63371], [12515, 63372],
-    [12516, 63373], [12517, 63374], [12518, 63375], [12519, 63376],
-    [12520, 63377], [12521, 63378], [12522, 63379], [12523, 63380],
-    [12524, 63381], [12525, 63382], [12526, 63383], [12527, 63384],
-    [12528, 63385], [12529, 63386], [12530, 63387], [12531, 63388],
-    [12532, 63389], [12533, 63390], [12534, 63391], [1040, 63392],
-    [1041, 63393], [1042, 63394], [1043, 63395], [1044, 63396], [1045, 63397],
-    [1025, 63398], [1046, 63399], [1047, 63400], [1048, 63401], [1049, 63402],
-    [1050, 63403], [1051, 63404], [1052, 63405], [1053, 63406], [1054, 63407],
-    [1055, 63408], [1056, 63409], [1057, 63410], [1058, 63411], [1059, 63412],
-    [1060, 63413], [1061, 63414], [1062, 63415], [1063, 63416], [1064, 63417],
-    [1065, 63418], [1066, 63419], [1067, 63420], [1068, 63421], [1069, 63422],
-    [1070, 63423], [1071, 63424], [1072, 63425], [1073, 63426], [1074, 63427],
-    [1075, 63428], [1076, 63429], [1077, 63430], [1105, 63431], [1078, 63432],
-    [1079, 63433], [1080, 63434], [1081, 63435], [1082, 63436], [1083, 63437],
-    [1084, 63438], [1085, 63439], [1086, 63440], [1087, 63441], [1088, 63442],
-    [1089, 63443], [1090, 63444], [1091, 63445], [1092, 63446], [1093, 63447],
-    [1094, 63448], [1095, 63449], [1096, 63450], [1097, 63451], [1098, 63452],
-    [1099, 63453], [1100, 63454], [1101, 63455], [1102, 63456], [1103, 63457],
-    [8679, 63458], [8632, 63459], [8633, 63460], [20033, 63461],
-    [63462, 131276], [20058, 63463], [63464, 131210], [20994, 63465],
-    [17553, 63466], 63467, [20872, 63468], [13853, 63469], [63470, 161287],
-    {s: 40}, [172, 63511, 65506], [63512, 65508], [63513, 65287],
-    [63514, 65282], [12849, 63515], [8470, 63516], [8481, 63517], 30849,
-    [37561, 58501], 35023, 22715, 24658, 31911, 23290, 9556, 9574, 9559, 9568,
-    9580, 9571, 9562, 9577, 9565, 9554, 9572, 9557, {s: 3}, 9560, 9575, 9563,
-    9555, 9573, 9558, 9567, 9579, 9570, 9561, 9576, 9564, 9553, {s: 5}, 9619,
-    {s: 26}, [58129, 147159], [22462, 58130], [58131, 159443], [28990, 58132],
-    [58133, 153568], [27042, 58135], [58136, 166889], [23412, 58137],
-    [31305, 58138], [58139, 153825], [58140, 169177], [31333, 58141],
-    [31357, 58142], [58143, 154028], [31419, 58144], [31408, 58145],
-    [31426, 58146], [31427, 58147], [29137, 58148], [58149, 156813],
-    [16842, 58150], [31450, 58151], [31453, 58152], [31466, 58153],
-    [16879, 58154], [21682, 58155], [58156, 154625], [31499, 58157],
-    [31573, 58158], [31529, 58159], [58160, 152334], [58161, 154878],
-    [31650, 58162], [31599, 58163], [33692, 58164], [58165, 154548],
-    [58166, 158847], [31696, 58167], [33825, 58168], [31634, 58169], 0,
-    [58171, 154912], 0, [33938, 58174], [31738, 58175], 0, [31797, 58177],
-    [58178, 154817], [31812, 58179], [31875, 58180], [58181, 149634],
-    [31910, 58182], [58184, 148856], [31945, 58185], [31943, 58186],
-    [31974, 58187], 0, [31987, 58189], [31989, 58190], [32359, 58192],
-    [17693, 58193], [58194, 159300], [32093, 58195], [58196, 159446],
-    [32137, 58198], [32171, 58199], [28981, 58200], [32179, 58201], 32214,
-    [58203, 147543], [58204, 155689], [32228, 58205], [15635, 58206],
-    [32245, 58207], [58208, 137209], [32229, 58209], [58210, 164717], 0,
-    [58212, 155937], [58213, 155994], [32366, 58214], 0, [17195, 58216],
-    [37996, 58217], [32295, 58218], [32576, 58219], [32577, 58220],
-    [32583, 58221], [31030, 58222], [58223, 156368], [39393, 58224],
-    [32663, 58225], [58226, 156497], [32675, 58227], [58228, 136801],
-    [58229, 131176], [17756, 58230], [58231, 145254], [58233, 164666],
-    [32762, 58234], [58235, 156809], 0, [32776, 58237], [32797, 58238], 0,
-    [32815, 58240], [58241, 172167], [58242, 158915], [32827, 58243],
-    [32828, 58244], [32865, 58245], [58246, 141076], [18825, 58247],
-    [58248, 157222], [58249, 146915], [58250, 157416], [26405, 58251],
-    [32935, 58252], [58253, 166472], [33031, 58254], [33050, 58255],
-    [22704, 58256], [58257, 141046], [27775, 58258], [58259, 156824],
-    [25831, 58261], [58262, 136330], [33304, 58263], [58264, 137310],
-    [27219, 58265], [58266, 150117], [58267, 150165], [17530, 58268],
-    [33321, 58269], [58271, 158290], [58272, 146814], [20473, 58273],
-    [58274, 136445], [34018, 58275], [33634, 58276], 0, [58278, 149927],
-    [58279, 144688], [58280, 137075], [58281, 146936], [33450, 58282],
-    [26907, 58283], [58284, 194964], [16859, 58285], [34123, 58286],
-    [33488, 58287], [33562, 58288], [58289, 134678], [58290, 137140],
-    [14017, 58291], [58292, 143741], [58293, 144730], [33403, 58294],
-    [33506, 58295], [33560, 58296], [58297, 147083], [58298, 159139],
-    [58299, 158469], [58300, 158615], [58301, 144846], [15807, 58302],
-    [33565, 58303], [21996, 58304], [33669, 58305], [17675, 58306],
-    [58307, 159141], [33708, 58308], 0, [33747, 58310], [58312, 159444],
-    [27223, 58313], [34138, 58314], [13462, 58315], [58316, 159298],
-    [33880, 58318], [58319, 154596], [33905, 58320], [15827, 58321],
-    [17636, 58322], [27303, 58323], [33866, 58324], [31064, 58326], 0,
-    [58328, 158614], [58329, 159351], [58330, 159299], [34014, 58331], 0,
-    [33681, 58333], [17568, 58334], [33939, 58335], [34020, 58336],
-    [58337, 154769], [16960, 58338], [58339, 154816], [17731, 58340],
-    [34100, 58341], [23282, 58342], 0, [17703, 58344], [34163, 58345],
-    [17686, 58346], [26559, 58347], [34326, 58348], [58349, 165413],
-    [58350, 165435], [34241, 58351], [58352, 159880], [34306, 58353],
-    [58354, 136578], [58355, 159949], [58356, 194994], [17770, 58357],
-    [34344, 58358], [13896, 58359], [58360, 137378], [21495, 58361],
-    [58362, 160666], [34430, 58363], 0, [58365, 172280], [34798, 58366],
-    [58367, 142375], [34737, 58368], [34778, 58369], [34831, 58370, 60990],
-    [22113, 58371], [34412, 58372], [26710, 58373], [17935, 58374],
-    [34885, 58375], [34886, 58376], [58377, 161248], [58378, 146873],
-    [58379, 161252], [34910, 58380], [34972, 58381], [18011, 58382],
-    [34996, 58383], [34997, 58384], [35013, 58386], [58388, 161551],
-    [35207, 58389], {s: 3}, [35239, 58393], [35260, 58394], [58395, 166437],
-    [35303, 58396], [58397, 162084], [58398, 162493], [35484, 58399],
-    [30611, 58400], [37374, 58401], [35472, 58402], [58403, 162393],
-    [31465, 58404], [58405, 162618], [18195, 58407], [58408, 162616],
-    [29052, 58409], [35596, 58410], [35615, 58411], [58412, 152624],
-    [58413, 152933], [35647, 58414], 0, [35661, 58416], [35497, 58417],
-    [58418, 150138], [35728, 58419], [35739, 58420], [35503, 58421],
-    [58422, 136927], [17941, 58423], [34895, 58424], [35995, 58425],
-    [58426, 163156], [58427, 163215], [58428, 195028], [14117, 58429],
-    [58430, 163155], [36054, 58431], [58432, 163224], [58433, 163261],
-    [36114, 58434], [36099, 58435], [58436, 137488], [36059, 58437],
-    [28764, 58438], [36113, 58439], [16080, 58441], 0, [36265, 58443],
-    [58444, 163842], [58445, 135188], [58446, 149898], [15228, 58447],
-    [58448, 164284], [58449, 160012], [31463, 58450], [36525, 58451],
-    [36534, 58452], [36547, 58453], [37588, 58454], [36633, 58455],
-    [36653, 58456], [58457, 164709], [58458, 164882], [36773, 58459],
-    [37635, 58460], [58461, 172703], [58462, 133712], [36787, 58463], 0,
-    [58465, 166366], [58466, 165181], [58467, 146875], [24312, 58468],
-    [58469, 143970], [36857, 58470], 0, [58474, 140069], [14720, 58475],
-    [58476, 159447], [36919, 58477], [58478, 165180], [58479, 162494],
-    [36961, 58480], [58481, 165228], [58482, 165387], [37032, 58483],
-    [58484, 165651], [37060, 58485], [58486, 165606], [37038, 58487], 0,
-    [37223, 58489], [37289, 58491], [37316, 58492], [31916, 58493],
-    [58494, 166195], [58495, 138889], [37390, 58496], [27807, 58497],
-    [37441, 58498], [37474, 58499], [58500, 153017], [58502, 166598],
-    [58503, 146587], [58504, 166668], [58505, 153051], [58506, 134449],
-    [37676, 58507], [37739, 58508], [58509, 166625], [58510, 166891],
-    [23235, 58512], [58513, 166626], [58514, 166629], [18789, 58515],
-    [37444, 58516], [58517, 166892], [58518, 166969], [58519, 166911],
-    [37747, 58520], [37979, 58521], [36540, 58522], [38277, 58523],
-    [38310, 58524], [37926, 58525], [38304, 58526], [28662, 58527],
-    [17081, 58528], [58530, 165592], [58531, 135804], [58532, 146990],
-    [18911, 58533], [27676, 58534], [38523, 58535], [38550, 58536],
-    [16748, 58537], [38563, 58538], [58539, 159445], [25050, 58540], 58541,
-    [30965, 58542], [58543, 166624], [38589, 58544], [21452, 58545],
-    [18849, 58546], [58547, 158904], [58548, 131700], [58549, 156688],
-    [58550, 168111], [58551, 168165], [58552, 150225], [58553, 137493],
-    [58554, 144138], [38705, 58555], [34370, 58556], [38710, 58557],
-    [18959, 58558], [17725, 58559], [17797, 58560], [58561, 150249],
-    [28789, 58562], [23361, 58563], [38683, 58564], 0, [58566, 168405],
-    [38743, 58567], [23370, 58568], [58569, 168427], [38751, 58570],
-    [37925, 58571], [20688, 58572], [58573, 143543], [58574, 143548],
-    [38793, 58575], [38815, 58576], [38833, 58577], [38846, 58578],
-    [38848, 58579], [38866, 58580], [38880, 58581], [58582, 152684],
-    [38894, 58583], [29724, 58584], [58585, 169011], 0, [38901, 58587],
-    [58588, 168989], [58589, 162170], [19153, 58590], [38964, 58591],
-    [38963, 58592], [38987, 58593], [39014, 58594], [15118, 58595],
-    [58596, 160117], [15697, 58597], [58598, 132656], [58599, 147804],
-    [58600, 153350], [39114, 58601], [39095, 58602], [39112, 58603],
-    [39111, 58604], [19199, 58605], [58606, 159015], [58607, 136915],
-    [21936, 58608], [39137, 58609], [39142, 58610], [39148, 58611],
-    [37752, 58612], [39225, 58613], [58614, 150057], [19314, 58615],
-    [58616, 170071], [58617, 170245], [39413, 58618], [39436, 58619],
-    [39483, 58620], [39440, 58621], [39512, 58622], [58623, 153381],
-    [14020, 58624], [58625, 168113], [58626, 170965], [39648, 58627],
-    [39650, 58628], [58629, 170757], [39668, 58630], [19470, 58631],
-    [39700, 58632], [39725, 58633], [58634, 165376], [20532, 58635],
-    [39732, 58636], [14531, 58638], [58639, 143485], [39760, 58640],
-    [39744, 58641], [58642, 171326], [23109, 58643], [58644, 137315],
-    [39822, 58645], [39938, 58647], [39935, 58648], [39948, 58649],
-    [58650, 171624], [40404, 58651], [58652, 171959], [58653, 172434],
-    [58654, 172459], [58655, 172257], [58656, 172323], [58657, 172511],
-    [40318, 58658], [40323, 58659], [58660, 172340], [40462, 58661],
-    [40388, 58663], [58665, 172435], [58666, 172576], [58667, 137531],
-    [58668, 172595], [40249, 58669], [58670, 172217], [58671, 172724],
-    [40592, 58672], [40597, 58673], [40606, 58674], [40610, 58675],
-    [19764, 58676], [40618, 58677], [40623, 58678], [58679, 148324],
-    [40641, 58680], [15200, 58681], [14821, 58682], [15645, 58683],
-    [20274, 58684], [14270, 58685], [58686, 166955], [40706, 58687],
-    [40712, 58688], [19350, 58689], [37924, 58690], [58691, 159138],
-    [40727, 58692, 60836], 0, [40761, 58694], [22175, 58695], [22154, 58696],
-    [40773, 58697], [39352, 58698], [58699, 168075], [38898, 58700],
-    [33919, 58701], 0, [40809, 58703], [31452, 58704], [40846, 58705],
-    [29206, 58706], [19390, 58707], [58708, 149877], [58709, 149947],
-    [29047, 58710], [58711, 150008], [58712, 148296], [58713, 150097],
-    [29598, 58714], [58715, 166874], [58716, 137466], [31135, 58717],
-    [58718, 166270], [58719, 167478], [37737, 58720], [37875, 58721],
-    [58722, 166468], [37612, 58723], [37761, 58724], [37835, 58725],
-    [58726, 166252], [58727, 148665], [29207, 58728], [16107, 58729],
-    [30578, 58730], [31299, 58731], [28880, 58732], [58733, 148595],
-    [58734, 148472], [29054, 58735], [58736, 137199], [28835, 58737],
-    [58738, 137406], [58739, 144793], [16071, 58740], [58741, 137349],
-    [58742, 152623], [58743, 137208], [14114, 58744], [58745, 136955],
-    [58746, 137273], [14049, 58747], [58748, 137076], [58749, 137425],
-    [58750, 155467], [14115, 58751], [58752, 136896], [22363, 58753],
-    [58754, 150053], [58755, 136190], [58756, 135848], [58757, 136134],
-    [58758, 136374], [34051, 58759, 58761], [58760, 145062], 0, [33877, 58762],
-    [58763, 149908], [58764, 160101], [58765, 146993], [58766, 152924],
-    [58767, 147195], [58768, 159826], [17652, 58769], [58770, 145134],
-    [58771, 170397], [58772, 159526], [26617, 58773], [14131, 58774],
-    [15381, 58775], [15847, 58776], [22636, 58777], [58778, 137506],
-    [26640, 58779], [16471, 58780], [58781, 145215], [58782, 147681],
-    [58783, 147595], [58784, 147727], [58785, 158753], [21707, 58786],
-    [22174, 58787], [58788, 157361], [22162, 58789], [58790, 135135],
-    [58791, 134056], [58792, 134669], 0, [58794, 166675], [37788, 58795],
-    [20216, 58796], [20779, 58797], [14361, 58798], [58799, 148534],
-    [20156, 58800], [58801, 132197], 0, [20299, 58803], [20362, 58804],
-    [58805, 153169], [23144, 58806], [58807, 131499], [58808, 132043],
-    [14745, 58809], [58810, 131850], [58811, 132116], [13365, 58812],
-    [20265, 58813], [58814, 131776], [58815, 167603], [58816, 131701],
-    [35546, 58817], [58818, 131596], [20120, 58819], [20685, 58820],
-    [20749, 58821], [20386, 58822], [20227, 58823], [58824, 150030],
-    [58825, 147082], [20290, 58826], [20526, 58827], [20588, 58828],
-    [20609, 58829], [20428, 58830], [20453, 58831], [20568, 58832],
-    [20732, 58833], [28278, 58838], [58839, 144789], [58840, 147001],
-    [58841, 147135], [28018, 58842], [58843, 137348], [58844, 147081],
-    [20904, 58845], [20931, 58846], [58847, 132576], [17629, 58848],
-    [58849, 132259], [58850, 132242], [58851, 132241], [36218, 58852],
-    [58853, 166556], [58854, 132878], [21081, 58855], [21156, 58856],
-    [58857, 133235], [21217, 58858], 0, [18042, 58860], [29068, 58861],
-    [58862, 148364], [58863, 134176], [58864, 149932], [58865, 135396],
-    [27089, 58866], [58867, 134685], 0, [16094, 58869], [29849, 58870],
-    [29716, 58871], [29782, 58872], [29592, 58873], [19342, 58874],
-    [58875, 150204], [58876, 147597], [21456, 58877], [13700, 58878],
-    [29199, 58879], [58880, 147657], [21940, 58881], [58882, 131909],
-    [21709, 58883], [58884, 134086], [22301, 58885], [37469, 58886],
-    [38644, 58887], [22493, 58889], [22413, 58890], [22399, 58891],
-    [13886, 58892], [22731, 58893], [23193, 58894], [58895, 166470],
-    [58896, 136954], [58897, 137071], [58898, 136976], [23084, 58899],
-    [22968, 58900], [23166, 58902], [23247, 58903], [23058, 58904],
-    [58905, 153926], [58906, 137715], [58907, 137313], [58908, 148117],
-    [14069, 58909], [27909, 58910], [29763, 58911], [23073, 58912],
-    [58913, 155267], [23169, 58914], [58915, 166871], [58916, 132115],
-    [37856, 58917], [29836, 58918], [58919, 135939], [28933, 58920],
-    [18802, 58921], [37896, 58922], [58923, 166395], [37821, 58924],
-    [14240, 58925], [23582, 58926], [23710, 58927], [24158, 58928],
-    [24136, 58929], [58930, 137622], [58931, 137596], [58932, 146158],
-    [24269, 58933], [23375, 58934], [58935, 137475], [58936, 137476],
-    [14081, 58937], [58938, 137376], [14045, 58939], [58940, 136958],
-    [14035, 58941], [33066, 58942], [58943, 166471], [58944, 138682],
-    [58945, 144498], [58946, 166312], [24332, 58947, 60916], [24334, 58948],
-    [58949, 137511], [58950, 137131], [23147, 58951], [58952, 137019],
-    [23364, 58953], [58955, 161277], [34912, 58956], [24702, 58957],
-    [58958, 141408], [58959, 140843], [24539, 58960], [16056, 58961],
-    [58962, 140719], [58963, 140734], [58964, 168072], [58965, 159603],
-    [25024, 58966], [58967, 131134], [58968, 131142], [58969, 140827],
-    [24985, 58970], [24984, 58971], [24693, 58972], [58973, 142491],
-    [58974, 142599], [58975, 149204], [58976, 168269], [25713, 58977],
-    [58978, 149093], [58979, 142186], [14889, 58980], [58981, 142114],
-    [58982, 144464], [58983, 170218], [58984, 142968], [25399, 58985],
-    [25782, 58987], [25393, 58988], [25553, 58989], [58990, 149987],
-    [58991, 142695], [25252, 58992], [58993, 142497], [25659, 58994],
-    [25963, 58995], [26994, 58996], [15348, 58997], [58998, 143502],
-    [58999, 144045], [59000, 149897], [59001, 144043], [21773, 59002],
-    [59003, 144096], [59004, 137433], [59005, 169023], [26318, 59006],
-    [59007, 144009], [59008, 143795], [15072, 59009], [59011, 152964],
-    [59012, 166690], [59013, 152975], [59014, 136956], [59015, 152923],
-    [59016, 152613], [30958, 59017], [59018, 143619], [59019, 137258],
-    [59020, 143924], [13412, 59021], [59022, 143887], [59023, 143746],
-    [59024, 148169], [26254, 59025], [59026, 159012], [26219, 59027],
-    [19347, 59028], [26160, 59029], [59030, 161904], [59031, 138731],
-    [26211, 59032], [59033, 144082], [59034, 144097], [26142, 59035],
-    [59036, 153714], [14545, 59037], [59038, 145466], [59039, 145340],
-    [15257, 59040], [59041, 145314], [59042, 144382], [29904, 59043],
-    [15254, 59044], [59046, 149034], [26806, 59047], 0, [15300, 59049],
-    [27326, 59050], [59052, 145365], [59053, 148615], [27187, 59054],
-    [27218, 59055], [27337, 59056], [27397, 59057], [59058, 137490],
-    [25873, 59059], [26776, 59060], [27212, 59061], [15319, 59062],
-    [27258, 59063], [27479, 59064], [59065, 147392], [59066, 146586],
-    [37792, 59067], [37618, 59068], [59069, 166890], [59070, 166603],
-    [37513, 59071], [59072, 163870], [59073, 166364], [37991, 59074],
-    [28069, 59075], [28427, 59076], 0, [59079, 147327], [15759, 59080],
-    [28164, 59081], [59082, 147516], [23101, 59083], [28170, 59084],
-    [22599, 59085], [27940, 59086], [30786, 59087], [28987, 59088],
-    [59089, 148250], [59090, 148086], [28913, 59091], [29264, 59092, 61085],
-    [29319, 59093], [29332, 59094], [59095, 149391], [59096, 149285],
-    [20857, 59097], [59098, 150180], [59099, 132587], [29818, 59100],
-    [59101, 147192], [59102, 144991], [59103, 150090], [59104, 149783],
-    [59105, 155617], [16134, 59106], [16049, 59107], [59108, 150239],
-    [59109, 166947], [59110, 147253], [24743, 59111], [16115, 59112],
-    [29900, 59113], [29756, 59114], [37767, 59115], [29751, 59116],
-    [17567, 59117], [59118, 159210], [17745, 59119], [30083, 59120],
-    [16227, 59121], [59122, 150745], [59123, 150790], [16216, 59124],
-    [30037, 59125], [30323, 59126], [59127, 173510], 0, [29800, 59129, 61070],
-    [59130, 166604], [59131, 149931], [59132, 149902], [15099, 59133],
-    [15821, 59134], [59135, 150094], [16127, 59136], [59137, 149957],
-    [59138, 149747], [37370, 59139], [22322, 59140], [37698, 59141],
-    [59142, 166627], [59143, 137316], [20703, 59144], [59145, 152097],
-    [59146, 152039], [30584, 59147], [59148, 143922], [30478, 59149],
-    [30479, 59150], [30587, 59151], [59152, 149143], [59153, 145281],
-    [14942, 59154], [59155, 149744], [29752, 59156], [29851, 59157],
-    [16063, 59158], [59159, 150202], [59160, 150215], [16584, 59161],
-    [59162, 150166], [59163, 156078], [37639, 59164], [59165, 152961],
-    [30750, 59166], [30861, 59167], [30856, 59168], [30930, 59169],
-    [29648, 59170], [31065, 59171], [59172, 161601], [59173, 153315],
-    [16654, 59174], 0, 0, [31141, 59177], [27181, 59178], [59179, 147194],
-    [31290, 59180], [31220, 59181], [16750, 59182], [59183, 136934],
-    [16690, 59184], [37429, 59185], [31217, 59186], [59187, 134476],
-    [59188, 149900], [59189, 131737], [59190, 146874], [59191, 137070],
-    [13719, 59192], [21867, 59193], [13680, 59194], [13994, 59195],
-    [59196, 131540], [59197, 134157], [31458, 59198], [23129, 59199],
-    [59200, 141045], [59201, 154287], [59202, 154268], [23053, 59203],
-    [59204, 131675], [30960, 59205], [23082, 59206], [59207, 154566],
-    [31486, 59208], [16889, 59209], [31837, 59210], [31853, 59211],
-    [16913, 59212], [59213, 154547], [59214, 155324], [59215, 155302],
-    [31949, 59216], [59217, 150009], [59218, 137136], [31886, 59219],
-    [31868, 59220], [31918, 59221], [27314, 59222], [32220, 59223],
-    [32263, 59224], [32211, 59225], [32590, 59226], [59227, 156257],
-    [59228, 155996], [59229, 162632], [32151, 59230], [59231, 155266],
-    [17002, 59232], [59233, 158581], [59234, 133398], [26582, 59235],
-    [59236, 131150], [59237, 144847], [22468, 59238], [59239, 156690],
-    [59240, 156664], [32733, 59242], [31527, 59243], [59244, 133164],
-    [59245, 154345], [59246, 154947], [31500, 59247], [59248, 155150],
-    [39398, 59249], [34373, 59250], [39523, 59251], [27164, 59252],
-    [59253, 144447], [59255, 150007], [59256, 157101], [39455, 59257],
-    [59258, 157088], 0, [59260, 160039], [59261, 158929], [17642, 59262],
-    [33079, 59263], [17410, 59264], [32966, 59265], [33033, 59266],
-    [33090, 59267], [59268, 157620], [39107, 59269], [59270, 158274],
-    [33378, 59271], [33381, 59272], [59273, 158289], [33875, 59274],
-    [59275, 159143], [34320, 59276], [59277, 160283], [23174, 59278],
-    [16767, 59279], [59280, 137280], [23339, 59281], [59282, 137377],
-    [23268, 59283], [59284, 137432], [34464, 59285], [59286, 195004],
-    [59287, 146831], [34861, 59288], [59289, 160802], [23042, 59290],
-    [34926, 59291], [20293, 59292], [34951, 59293], [35007, 59294],
-    [35046, 59295], [35173, 59296], [35149, 59297], [59298, 153219],
-    [35156, 59299], [59300, 161669], [59301, 161668], [59302, 166901],
-    [59303, 166873], [59304, 166812], [59305, 166393], [16045, 59306],
-    [33955, 59307], [18165, 59308], [18127, 59309], [14322, 59310],
-    [35389, 59311], [35356, 59312], [59313, 169032], [24397, 59314],
-    [37419, 59315], [59316, 148100], [26068, 59317], [28969, 59318],
-    [28868, 59319], [59320, 137285], [40301, 59321], [35999, 59322],
-    [36073, 59323], [59324, 163292], [22938, 59325], [30659, 59326],
-    [23024, 59327], [14036, 59329], [36394, 59330], [36519, 59331],
-    [59332, 150537], [36656, 59333], [36682, 59334], [17140, 59335],
-    [27736, 59336], [28603, 59337], [59338, 140065], [18587, 59339],
-    [28537, 59340], [28299, 59341], [59342, 137178], [39913, 59343],
-    [14005, 59344], [59345, 149807], [37051, 59346], 0, [21873, 59348],
-    [18694, 59349], [37307, 59350], [37892, 59351], [59352, 166475],
-    [16482, 59353], [59354, 166652], [37927, 59355], [59356, 166941],
-    [59357, 166971], [34021, 59358], [35371, 59359], [38297, 59360],
-    [38311, 59361], [38295, 59362], [38294, 59363], [59364, 167220],
-    [29765, 59365], [16066, 59366], [59367, 149759], [59368, 150082],
-    [59369, 148458], [16103, 59370], [59371, 143909], [38543, 59372],
-    [59373, 167655], [59374, 167526], [59375, 167525], [16076, 59376],
-    [59377, 149997], [59378, 150136], [59379, 147438], [29714, 59380],
-    [29803, 59381], [16124, 59382], [38721, 59383], [59384, 168112],
-    [26695, 59385], [18973, 59386], [59387, 168083], [59388, 153567], 0,
-    [37736, 59390], [59391, 166281], [59392, 166950], [59393, 166703],
-    [59394, 156606], [37562, 59395], [23313, 59396], [35689, 59397],
-    [18748, 59398], [29689, 59399], [59400, 147995], [38811, 59401], 0,
-    [39224, 59403], [59404, 134950], [24001, 59405], [59406, 166853],
-    [59407, 150194], [38943, 59408], [59409, 169178], [37622, 59410],
-    [59411, 169431], [37349, 59412], [17600, 59413], [59414, 166736],
-    [59415, 150119], [59416, 166756], [39132, 59417], [59418, 166469],
-    [16128, 59419], [37418, 59420], [18725, 59421], [33812, 59422],
-    [39227, 59423], [39245, 59424], [59425, 162566], [15869, 59426], 0,
-    [19311, 59428], [39338, 59429], [39516, 59430], [59431, 166757],
-    [59432, 153800], [27279, 59433], [39457, 59434], [23294, 59435],
-    [39471, 59436], [59437, 170225], [19344, 59438], [59439, 170312],
-    [39356, 59440], [19389, 59441], [19351, 59442], [37757, 59443],
-    [22642, 59444], [59445, 135938], [22562, 59446], [59447, 149944],
-    [59448, 136424], [30788, 59449], [59450, 141087], [59451, 146872],
-    [26821, 59452], [15741, 59453], [37976, 59454], [14631, 59455],
-    [24912, 59456], [59457, 141185], [59458, 141675], [24839, 59459],
-    [40015, 59460], [40019, 59461], [40059, 59462], [39989, 59463],
-    [39952, 59464], [39807, 59465], [39887, 59466], [59467, 171565],
-    [39839, 59468], [59469, 172533], [59470, 172286], [40225, 59471],
-    [19630, 59472], [59473, 147716], [40472, 59474], [19632, 59475],
-    [40204, 59476], [59477, 172468], [59478, 172269], [59479, 172275],
-    [59480, 170287], [40357, 59481], [33981, 59482], [59483, 159250],
-    [59484, 159711], [59485, 158594], [34300, 59486], [17715, 59487],
-    [59488, 159140], [59489, 159364], [59490, 159216], [33824, 59491],
-    [34286, 59492], [59493, 159232], [59494, 145367], [59495, 155748],
-    [31202, 59496], [59497, 144796], [59498, 144960], [59500, 149982],
-    [15714, 59501], [37851, 59502], [37566, 59503], [37704, 59504],
-    [59505, 131775], [30905, 59506], [37495, 59507], [37965, 59508],
-    [20452, 59509], [13376, 59510], [36964, 59511], [59512, 152925],
-    [30781, 59513], [30804, 59514], [30902, 59515], [30795, 59516],
-    [59517, 137047], [59518, 143817], [59519, 149825], [13978, 59520],
-    [20338, 59521], [28634, 59522], [28633, 59523], 0, [28702, 59524, 59525],
-    [21524, 59526], [59527, 147893], [22459, 59528], [22771, 59529],
-    [22410, 59530], [40214, 59531], [22487, 59532], [28980, 59533],
-    [13487, 59534], [59535, 147884], [29163, 59536], [59537, 158784],
-    [59538, 151447], 0, [59540, 137141], [59541, 166473], [24844, 59542],
-    [23246, 59543], [23051, 59544], [17084, 59545], [59546, 148616],
-    [14124, 59547], [19323, 59548], [59549, 166396], [37819, 59550],
-    [37816, 59551], [59552, 137430], [59553, 134941], [33906, 59554],
-    [59555, 158912], [59556, 136211], [59557, 148218], [59558, 142374],
-    [59559, 148417], [22932, 59560], [59561, 146871], [59562, 157505],
-    [32168, 59563], [59564, 155995], [59565, 155812], [59566, 149945],
-    [59567, 149899], [59568, 166394], [37605, 59569], [29666, 59570],
-    [16105, 59571], [29876, 59572], [59573, 166755], [59574, 137375],
-    [16097, 59575], [59576, 150195], [27352, 59577], [29683, 59578],
-    [29691, 59579], [16086, 59580], [59581, 150078], [59582, 150164],
-    [59583, 137177], [59584, 150118], [59585, 132007], [59586, 136228],
-    [59587, 149989], [29768, 59588], [59589, 149782], [28837, 59590],
-    [59591, 149878], [37508, 59592], [29670, 59593], [37727, 59594],
-    [59595, 132350], [37681, 59596], [59597, 166606], [59598, 166422],
-    [37766, 59599], [59600, 166887], [59601, 153045], [18741, 59602],
-    [59603, 166530], [29035, 59604], [59605, 149827], [59606, 134399],
-    [22180, 59607], [59608, 132634], [59609, 134123], [59610, 134328],
-    [21762, 59611], [31172, 59612], [59613, 137210], [32254, 59614],
-    [59615, 136898], [59616, 150096], [59617, 137298], [17710, 59618],
-    [37889, 59619], [14090, 59620], [59621, 166592], [59622, 149933],
-    [22960, 59623], [59624, 137407], [59625, 137347], [59626, 160900],
-    [23201, 59627], [14050, 59628], [59629, 146779], [14000, 59630],
-    [37471, 59631], [23161, 59632], [59633, 166529], [59634, 137314],
-    [37748, 59635], [15565, 59636], [59637, 133812], [19094, 59638],
-    [14730, 59639], [20724, 59640], [15721, 59641], [15692, 59642],
-    [59643, 136092], [29045, 59644], [17147, 59645], [59646, 164376],
-    [28175, 59647], [59648, 168164], [17643, 59649], [27991, 59650],
-    [59651, 163407], [28775, 59652], [27823, 59653], [15574, 59654],
-    [59655, 147437], [59656, 146989], [28162, 59657], [28428, 59658],
-    [15727, 59659], [59660, 132085], [30033, 59661], [14012, 59662],
-    [13512, 59663], [18048, 59664], [16090, 59665], [18545, 59666],
-    [22980, 59667], [37486, 59668], [18750, 59669], [36673, 59670],
-    [59671, 166940], [59672, 158656], [22546, 59673], [22472, 59674],
-    [14038, 59675], [59676, 136274], [28926, 59677], [59678, 148322],
-    [59679, 150129], [59680, 143331], [59681, 135856], [59682, 140221],
-    [26809, 59683], [26983, 59684], [59685, 136088], [59686, 144613],
-    [59687, 162804], [59688, 145119], [59689, 166531], [59690, 145366],
-    [59691, 144378], [59692, 150687], [27162, 59693], [59694, 145069],
-    [59695, 158903], [33854, 59696], [17631, 59697], [17614, 59698],
-    [59699, 159014], [59700, 159057], [59701, 158850], [59702, 159710], 0, 0,
-    [33597, 59705], [59706, 137018], [33773, 59707], [59708, 158848],
-    [59709, 159827], [59710, 137179], [22921, 59711], [23170, 59712],
-    [59713, 137139], [23137, 59714], [23153, 59715], [59716, 137477],
-    [59717, 147964], [14125, 59718], [23023, 59719], [59720, 137020],
-    [14023, 59721], [29070, 59722], [37776, 59723], [26266, 59724],
-    [59725, 148133], [23150, 59726], [23083, 59727], [59728, 148115],
-    [27179, 59729], [59730, 147193], [59731, 161590], [59732, 148571],
-    [59733, 148170], [28957, 59734], [59735, 148057], [59736, 166369],
-    [20400, 59737], [59738, 159016], [23746, 59739], [59740, 148686],
-    [59741, 163405], [59742, 148413], [27148, 59743], [59744, 148054],
-    [59745, 135940], 0, [28979, 59747], [59748, 148457], [15781, 59749],
-    [27871, 59750], [59751, 194597], [23019, 59754], [24412, 59757],
-    [59764, 144128], [31955, 59776], [59783, 162548], [59786, 153334],
-    [59790, 162584], [36972, 59791], [33270, 59795], [30476, 59797],
-    [27810, 59799], [22269, 59800], [22633, 59828], [26465, 59832],
-    [23646, 59838], [22770, 59841], [28857, 59843], [26627, 59853],
-    [36795, 59859], [36796, 59861], [20001, 59871], [31545, 59898],
-    [15820, 59902], [29482, 57990, 59909], [30048, 59912], [22586, 59920],
-    [33446, 59932], [27018, 59940], [24803, 59944], [20206, 59984],
-    [39364, 60002], [40639, 60023], [21249, 60025], [26528, 60038],
-    [24808, 60046], [20916, 60053], [31363, 60064], [39994, 60075],
-    [31432, 60093], [26906, 60098], [22956, 60100], [22592, 60102],
-    [21610, 60114], [24807, 60123], [22138, 60125], [26965, 60132],
-    [39983, 60133], [34725, 60134], [23584, 60141], [24075, 60143],
-    [26398, 60147], [33965, 60157], [35713, 60161], [20088, 60166],
-    [25283, 60176], [26709, 60180], 0, [33533, 60190], [35237, 60194],
-    [36768, 60196], [38840, 60198], [38983, 60200], [39613, 60201],
-    [24497, 60218], [26184, 60219], [26303, 60220], [60221, 162425], 0,
-    [60225, 149946], 0, 0, [60230, 131910], [26382, 60232], [26904, 60233],
-    [60235, 161367], [60236, 155618], [60239, 161278], [60240, 139418],
-    [18640, 60241], [19128, 60242], [60244, 166554], [60247, 147515],
-    [60250, 150085], [60251, 132554], [20946, 60252], [60253, 132625],
-    [22943, 60254], [60255, 138920], [15294, 60256], [60257, 146687],
-    [14747, 60262], [60264, 165352], [60265, 170441], [14178, 60266],
-    [60267, 139715], [35678, 60268], [60269, 166734], 0, [29193, 60274],
-    [60276, 134264], [60280, 132985], [36570, 60281], [21135, 60283],
-    [29041, 60285], [60288, 147274], [60289, 150183], [21948, 60290],
-    [60293, 158546], [13427, 60295], [60297, 161330], [18200, 60299],
-    [60303, 149823], [20582, 60305], [13563, 60306], [60307, 144332], 0,
-    [18300, 60310], [60311, 166216], [60315, 138640], 0, [60320, 162834],
-    [36950, 60321], [60323, 151450], [35682, 60324], [23899, 60327],
-    [60328, 158711], 0, [60331, 137500], [35562, 60332], [60333, 150006],
-    [60335, 147439], [19392, 60337], [60340, 141083], [37989, 60341],
-    [60342, 153569], [24981, 60343], [23079, 60344], [60345, 194765], 0,
-    [60348, 148769], [20074, 60350], [60351, 149812], [38486, 60352],
-    [28047, 60353], [60354, 158909], [35191, 60356], [60359, 156689], 0,
-    [31554, 60363], [60364, 168128], [60365, 133649], 0, [31301, 60369],
-    [39462, 60372], [13919, 60374], [60375, 156777], [60376, 131105],
-    [31107, 60377], [23852, 60380], [60381, 144665], 0, [18128, 60384],
-    [30011, 60386], [34917, 60387], [22710, 60389], [14108, 60390],
-    [60391, 140685], [15444, 60394], [37505, 60397], [60398, 139642],
-    [37680, 60400], [60402, 149968], [27705, 60403], [60406, 134904],
-    [34855, 60407], [35061, 60408], [60409, 141606], [60410, 164979],
-    [60411, 137137], [28344, 60412], [60413, 150058], [60414, 137248],
-    [14756, 60415], 0, 0, [17727, 60419], [26294, 60420], [60421, 171181],
-    [60422, 170148], [35139, 60423], [16607, 60427], [60428, 136714],
-    [14753, 60429], [60430, 145199], [60431, 164072], [60432, 136133],
-    [29101, 60433], [33638, 60434], [60436, 168360], 0, [19639, 60438],
-    [60439, 159919], [60440, 166315], [60445, 147834], [31555, 60446],
-    [31102, 60447], [28597, 60449], [60450, 172767], [27139, 60451],
-    [60452, 164632], [21410, 60453], [60454, 159239], [37823, 60455],
-    [26678, 60456], [38749, 59389, 60457], [60458, 164207], [60460, 158133],
-    [60461, 136173], [60462, 143919], [23941, 60464], [60465, 166960],
-    [22293, 60467], [38947, 60468], [60469, 166217], [23979, 60470],
-    [60471, 149896], [26046, 60472], [27093, 60473], [21458, 60474],
-    [60475, 150181], [60476, 147329], [15377, 60477], [26422, 60478],
-    [60482, 139169], [13770, 60490], [18682, 60493], 0, [30728, 60496],
-    [37461, 60497], [17394, 60499], [17375, 60501], [23032, 60505], 0,
-    [22155, 60518], [60520, 169449], [36882, 60541], [21953, 60546],
-    [17673, 60551], [32383, 60552], [28502, 60553], [27313, 60554],
-    [13540, 60556], [60558, 161949], [14138, 60559], 0, [60562, 163876],
-    [60565, 162366], [15851, 60567], [60569, 146615], [60574, 156248],
-    [22207, 60575], [36366, 60577], [23405, 60578], [25566, 60581], 0,
-    [25904, 60585], [22061, 60586], [21530, 60588], [60591, 171416],
-    [19581, 60592], [22050, 60593], [22046, 60594], [32585, 60595],
-    [22901, 60597], [60598, 146752], [34672, 60599], [33047, 60604],
-    [40286, 60605], [36120, 60606], [30267, 60607], [40005, 60608],
-    [30286, 60609], [30649, 60610], [37701, 60611], [21554, 60612],
-    [33096, 60613], [33527, 60614], [22053, 60615], [33074, 60616],
-    [33816, 60617], [32957, 60618], [21994, 60619], [31074, 60620],
-    [22083, 60621], [21526, 60622], [60623, 134813], [13774, 60624],
-    [22021, 57509, 60625], [22001, 60626], [26353, 60627], [60628, 164578],
-    [13869, 60629], [30004, 60630], [22000, 60631], [21946, 60632],
-    [21655, 60633], [21874, 60634], [60635, 134209], [60636, 134294],
-    [24272, 57652, 60637], [60639, 134774], [60640, 142434], [60641, 134818],
-    [40619, 60642], [32090, 60643], 0, [60645, 135285], [25245, 60646],
-    [38765, 60647], [21652, 60648], [36045, 60649], [29174, 60650],
-    [37238, 60651], [25596, 60652], [25529, 60653], [25598, 60654],
-    [21865, 60655], [60656, 142147], [40050, 60657], [60658, 143027],
-    [20890, 60659], [13535, 60660], [60661, 134567], [20903, 60662],
-    [21581, 60663], [21790, 60664], [21779, 60665], [30310, 60666],
-    [36397, 60667], [60668, 157834], [30129, 60669], [32950, 60670],
-    [34820, 60671], 0, [35015, 60673], [33206, 60674], [33820, 60675],
-    [17644, 60677], [29444, 60678], [33547, 60681], [22139, 60683],
-    [37232, 60690], [37384, 60692], [60696, 134905], [29286, 60697],
-    [18254, 60699], [60701, 163833], [16634, 60703], [40029, 60704],
-    [25887, 60705], [18675, 60707], [60708, 149472], [60709, 171388], 0,
-    [60713, 161187], 60715, [60716, 155720], [29091, 60718], [32398, 60719],
-    [40272, 60720], [13687, 60723], [27826, 60725], [21351, 60726],
-    [14812, 60728], [60731, 149016], [33325, 60734], [21579, 60735], 60739,
-    [14930, 60740], [29556, 60742], [60743, 171692], [19721, 60744],
-    [39917, 60745], 0, [19547, 60748], [60751, 171998], [33884, 60752],
-    [60754, 160434], [25390, 60757], [32037, 60758], [14890, 60761],
-    [36872, 60762], [21196, 60763], [15988, 60764], [13946, 60765],
-    [17897, 60766], [60767, 132238], [30272, 60768], [23280, 60769],
-    [60770, 134838], [30842, 60771], [18358, 60772], [22695, 60773],
-    [16575, 60774], [22140, 60775], [39819, 60776], [23924, 60777],
-    [30292, 60778], [60779, 173108], [40581, 60780], [19681, 60781], 0,
-    [14331, 60783], [24857, 60784], [60786, 148466], 60787, [22109, 60788],
-    [60792, 171526], [21044, 60793], [13741, 60795], 0, [40316, 60797],
-    [31830, 60798], [39737, 60799], [22494, 60800], [23635, 60802],
-    [25811, 60803], [60804, 169168], [60805, 156469], [34477, 60807],
-    [60808, 134440], [60811, 134513], 60812, [20990, 60813], [60814, 139023],
-    [23950, 60815], [38659, 60816], [60817, 138705], [40577, 60818],
-    [36940, 60819], [31519, 60820], [39682, 60821], [23761, 60822],
-    [31651, 60823], [25192, 60824], [25397, 60825], [39679, 60826],
-    [31695, 60827], [39722, 60828], [31870, 60829], 0, [31810, 60831],
-    [31878, 60832], [39957, 60833], [31740, 60834], [39689, 60835], 0, 39982,
-    [40794, 60839], [21875, 60840], [23491, 60841], [20477, 60842],
-    [40600, 60843], [20466, 60844], [21088, 60845], [21201, 60847],
-    [22375, 60848], [20566, 60849], [22967, 60850], [24082, 60851],
-    [38856, 60852], [40363, 60853], [36700, 60854], [21609, 60855],
-    [38836, 60856], [39232, 60857], [38842, 60858], [21292, 60859],
-    [24880, 60860], [26924, 60861], [21466, 60862], [39946, 60863],
-    [40194, 60864], [19515, 60865], [38465, 60866], [27008, 60867],
-    [20646, 60868], [30022, 60869], [60870, 137069], [39386, 60871],
-    [21107, 60872], 60873, [37209, 60874], [38529, 60875], [37212, 60876],
-    60877, [37201, 60878], [60879, 167575], [25471, 60880], [27338, 60882],
-    [22033, 60883], [37262, 60884], [30074, 60885], [25221, 60886],
-    [29519, 60888], [31856, 60889], [60890, 154657], 60892, [30422, 60894],
-    [39837, 60895], [20010, 60896], [60897, 134356], [33726, 60898],
-    [34882, 60899], 60900, [23626, 60901], [27072, 60902], 0, 0,
-    [21023, 60905], [24053, 60906], [20174, 60907], [27697, 60908],
-    [60909, 131570], [20281, 60910], [21660, 60911], 0, [21146, 60913],
-    [36226, 60914], [13822, 60915], 0, [13811, 60917], 60918, [27474, 60919],
-    [37244, 60920], [40869, 60921], [39831, 60922], [38958, 60923],
-    [39092, 60924], [39610, 60925], [40616, 60926], [40580, 60927],
-    [31508, 60929], 60930, [27642, 60931], [34840, 60932], [32632, 60933],
-    60934, [22048, 60935], [60936, 173642], [36471, 60937], [40787, 60938],
-    60939, [36308, 60940], [36431, 60941], [40476, 60942], [36353, 60943],
-    [25218, 60944], [60945, 164733], [36392, 60946], [36469, 60947],
-    [31443, 60948], [31294, 60950], [30936, 60951], [27882, 60952],
-    [35431, 60953], [30215, 60954], [40742, 60956], [27854, 60957],
-    [34774, 60958], [30147, 60959], [60960, 172722], [30803, 60961],
-    [36108, 60963], [29410, 60964], [29553, 60965], [35629, 60966],
-    [29442, 60967], [29937, 60968], [36075, 60969], [60970, 150203],
-    [34351, 60971], [24506, 60972], [34976, 60973], [17591, 60974], 60975,
-    [60977, 159237], 60978, [35454, 60979], [60980, 140571], 60981,
-    [24829, 60982], [30311, 60983], [39639, 60984], [40260, 60985],
-    [37742, 58859, 60986], [39823, 60987], [34805, 60988], 60989, 0,
-    [36087, 60991], [29484, 60992], [38689, 60993], [39856, 60994],
-    [13782, 60995], [29362, 60996], [19463, 60997], [31825, 60998],
-    [39242, 60999], [24921, 61001], [19460, 61002], [40598, 61003],
-    [24957, 61004], 61005, [22367, 61006], [24943, 61007], [25254, 61008],
-    [25145, 61009], 0, [14940, 61011], [25058, 61012], [21418, 61013],
-    [25444, 61015], [26626, 61016], [13778, 61017], [23895, 61018],
-    [36826, 61020], [61021, 167481], 61022, [20697, 61023], [30982, 61025],
-    [21298, 61026], [38456, 61027], [61028, 134971], [16485, 61029], 61030,
-    [30718, 61031], 61032, [31938, 61033], [61034, 155418], [31962, 61035],
-    [31277, 61036], [32870, 61037], [32867, 61038], [32077, 61039],
-    [29957, 61040], [29938, 61041], [35220, 61042], [33306, 61043],
-    [26380, 61044], [32866, 61045], [61046, 160902], [32859, 61047],
-    [29936, 61048], [33027, 61049], [30500, 61050], [35209, 61051],
-    [61052, 157644], [30035, 61053], [34729, 61055], [34766, 61056],
-    [33224, 61057], [34700, 61058], [35401, 61059], [36013, 61060],
-    [35651, 61061], [30507, 61062], [29944, 61063], [34010, 61064],
-    [27058, 61066], [36262, 61067], 61068, [35241, 58392, 61069], 0,
-    [28089, 61071], [34753, 61072], [61073, 147473], [29927, 61074],
-    [15835, 61075], [29046, 61076], [24740, 57702, 61077], [24988, 61078],
-    [15569, 61079], 0, [24695, 61081], 61082, [32625, 61083], 0,
-    [24809, 61086], [19326, 61087], [57344, 132423], [37595, 57345],
-    [57346, 132575], [57347, 147397], [34124, 57348], [17077, 57349],
-    [29679, 57350], [20917, 57351], [13897, 57352], [57353, 149826],
-    [57354, 166372], [37700, 57355], [57356, 137691], [33518, 57357],
-    [57358, 146632], [30780, 57359], [26436, 57360], [25311, 57361],
-    [57362, 149811], [57363, 166314], [57364, 131744], [57365, 158643],
-    [57366, 135941], [20395, 57367], [57368, 140525], [20488, 57369],
-    [57370, 159017], [57371, 162436], [57372, 144896], [57373, 150193],
-    [57374, 140563], 0, [57376, 131966], [24484, 57377], [57378, 131968],
-    [57379, 131911], [28379, 57380], [57381, 132127], 20702, [20737, 57383],
-    [13434, 57384], [20750, 57385], [39020, 57386], [14147, 57387],
-    [33814, 57388], [57389, 149924], [57390, 132231], [20832, 57391],
-    [57392, 144308], [20842, 57393], [57394, 134143], [57395, 139516],
-    [57396, 131813], [57397, 140592], [57398, 132494], [57399, 143923],
-    [57400, 137603], [23426, 57401], [34685, 57402], [57403, 132531],
-    [57404, 146585], [20914, 57405], [20920, 57406], [40244, 57407],
-    [20937, 57408], [20943, 57409], [20945, 57410], [15580, 57411],
-    [20947, 57412], [57413, 150182], [20915, 57414], 0, 0, [20973, 57417],
-    [33741, 57418], [26942, 57419], [57420, 145197], [24443, 57421],
-    [21003, 57422], [21030, 57423], [21052, 57424], [21173, 57425],
-    [21079, 57426], [21140, 57427], [21177, 57428], [21189, 57429],
-    [31765, 57430], [34114, 57431], [21216, 57432], [34317, 57433],
-    [57434, 158483], 0, [57436, 166622], [21833, 57437], [28377, 57438],
-    [57439, 147328], [57440, 133460], [57441, 147436], [21299, 57442], 0,
-    [57444, 134114], [27851, 57445], [57446, 136998], [26651, 57447],
-    [29653, 57448], [24650, 57449], [16042, 57450], [14540, 57451],
-    [57452, 136936], [29149, 57453], [17570, 57454], [21357, 57455],
-    [21364, 57456], [57457, 165547], [21374, 57458], 0, [57460, 136598],
-    [57461, 136723], [30694, 57462], [21395, 57463], [57464, 166555],
-    [21408, 57465], [21419, 57466], [21422, 57467], [29607, 57468],
-    [57469, 153458], [16217, 57470], [29596, 57471], [21441, 57472],
-    [21445, 57473], [27721, 57474], [20041, 57475], [22526, 57476],
-    [21465, 57477], [15019, 57478], [57479, 134031], [21472, 57480],
-    [57481, 147435], [57482, 142755], [21494, 57483], [57484, 134263],
-    [21523, 57485], [28793, 57486], [21803, 57487], [26199, 57488],
-    [27995, 57489], [21613, 57490], [57491, 158547], [57492, 134516],
-    [21853, 57493], [21647, 57494], [21668, 57495], [18342, 57496],
-    [57497, 136973], [57498, 134877], [15796, 57499], [57500, 134477],
-    [57501, 166332], [57502, 140952], [21831, 57503], [19693, 57504],
-    [21551, 57505], [29719, 57506], [21894, 57507], [21929, 57508], 0,
-    [57510, 137431], [57511, 147514], [17746, 57512], [57513, 148533],
-    [26291, 57514], [57515, 135348], [22071, 57516], [26317, 57517],
-    [57518, 144010], [26276, 57519], 0, [22093, 57521], [22095, 57522],
-    [30961, 57523], [22257, 57524], [38791, 57525], [21502, 57526],
-    [22272, 57527], [22255, 57528], [22253, 57529], [57530, 166758],
-    [13859, 57531], [57532, 135759], [22342, 57533], [57534, 147877],
-    [27758, 57535], [28811, 57536], [22338, 57537], [14001, 57538],
-    [57539, 158846], [22502, 57540], [57541, 136214], [22531, 57542],
-    [57543, 136276], [57544, 148323], [22566, 57545], [57546, 150517], 0,
-    [22698, 57548], [13665, 57549], [22752, 57550], [22748, 57551],
-    [57552, 135740], [22779, 57553], [23551, 57554], [22339, 57555],
-    [57556, 172368], [57557, 148088], [37843, 57558], [13729, 57559],
-    [22815, 57560], [26790, 57561], [14019, 57562], [28249, 57563],
-    [57564, 136766], [23076, 57565], 0, [57567, 136850], [34053, 57568],
-    [22985, 57569], [57570, 134478], [57571, 158849], [57572, 159018],
-    [57573, 137180], [23001, 57574], [57575, 137211], [57576, 137138],
-    [57577, 159142], [28017, 57578], [57579, 137256], [57580, 136917],
-    [23033, 57581], [57582, 159301], [23211, 57583], [23139, 57584],
-    [14054, 57585], [57586, 149929], 0, [14088, 57588], [23190, 57589],
-    [29797, 57590], [23251, 57591], [57592, 159649], [57593, 140628],
-    [57595, 137489], [14130, 57596], [57597, 136888], [24195, 57598],
-    [21200, 57599], [23414, 57600], [25992, 57601], [23420, 57602],
-    [57603, 162318], [16388, 57604], [18525, 57605], [57606, 131588],
-    [23509, 57607], [57609, 137780], [57610, 154060], [57611, 132517],
-    [23539, 57612], [23453, 57613], [19728, 57614], [23557, 57615],
-    [57616, 138052], [23571, 57617], [29646, 57618], [23572, 57619],
-    [57620, 138405], [57621, 158504], [23625, 57622], [18653, 57623],
-    [23685, 57624], [23785, 57625], [23791, 57626], [23947, 57627],
-    [57628, 138745], [57629, 138807], [23824, 57630], [23832, 57631],
-    [23878, 57632], [57633, 138916], [23738, 57634], [24023, 57635],
-    [33532, 57636], [14381, 57637], [57638, 149761], [57639, 139337],
-    [57640, 139635], [33415, 57641], [14390, 57642], [15298, 57643],
-    [24110, 57644], [27274, 57645], 0, 57647, [57648, 148668], [57649, 134355],
-    [21414, 57650], [20151, 57651], 0, [21416, 57653], [57654, 137073],
-    [24073, 57655], 57656, [57657, 164994], [24313, 57658], [24315, 57659],
-    [14496, 57660], [24316, 57661], [26686, 57662], [37915, 57663],
-    [24333, 57664], [57665, 131521], [57666, 194708], [15070, 57667],
-    [57669, 135994], [24378, 57670], [57671, 157832], [57672, 140240],
-    [57674, 140401], [24419, 57675], [57677, 159342], [24434, 57678],
-    [37696, 57679], [57680, 166454], [24487, 57681], [23990, 57682],
-    [15711, 57683], [57684, 152144], [57685, 139114], [57686, 159992],
-    [57687, 140904], [37334, 57688], [57689, 131742], [57690, 166441],
-    [24625, 57691], [26245, 57692], [14691, 57694], [15815, 57695],
-    [13881, 57696], [22416, 57697], [57698, 141236], [31089, 57699],
-    [15936, 57700], [24734, 57701], 0, 0, [57704, 149890], [57705, 149903],
-    [57706, 162387], [29860, 57707], [20705, 57708], [23200, 57709],
-    [24932, 57710], [24898, 57712], [57713, 194726], [57714, 159442],
-    [24961, 57715], [20980, 57716], [57717, 132694], [24967, 57718],
-    [23466, 57719], [57720, 147383], [57721, 141407], [25043, 57722],
-    [57723, 166813], [57724, 170333], [25040, 57725], [14642, 57726],
-    [57727, 141696], [57728, 141505], [24611, 57729], [24924, 57730],
-    [25886, 57731], [25483, 57732], [57733, 131352], [25285, 57734],
-    [57735, 137072], [25301, 57736], [57737, 142861], [25452, 57738],
-    [57739, 149983], [14871, 57740], [25656, 57741], [25592, 57742],
-    [57743, 136078], [57744, 137212], [28554, 57746], [57747, 142902], 0,
-    [57750, 153373], [25825, 57751], [25829, 57752], [38011, 57753],
-    [14950, 57754], [25658, 57755], [14935, 57756], [25933, 57757],
-    [28438, 57758], [57759, 150056], [57760, 150051], [25989, 57761],
-    [25965, 57762], [25951, 57763], 0, [26037, 57765], [57766, 149824],
-    [19255, 57767], [26065, 57768], [16600, 57769], [57770, 137257], 57771,
-    [26083, 57772], [24543, 57773], [57774, 144384], [26136, 57775],
-    [57776, 143863], [57777, 143864], [26180, 57778], [57779, 143780],
-    [57780, 143781], [26187, 57781], [57782, 134773], [26215, 57783],
-    [57784, 152038], [26227, 57785], 0, [57788, 143921], [57789, 165364],
-    [57790, 143816], [57791, 152339], [30661, 57792], [57793, 141559],
-    [39332, 57794], [26370, 57795], [57796, 148380], [57797, 150049],
-    [27130, 57799], [57800, 145346], 0, [26471, 57802], [26466, 57803],
-    [57804, 147917], [57805, 168173], [26583, 57806], [17641, 57807],
-    [26658, 57808], [28240, 57809], [37436, 57810], [26625, 57811],
-    [57812, 144358], [57813, 159136], [26717, 57814], [57815, 144495],
-    [27105, 57816], [27147, 57817], [57818, 166623], [26995, 57819],
-    [26819, 57820], [57821, 144845], [26881, 57822], [26880, 57823],
-    [14849, 57825], [57826, 144956], [15232, 57827], [26540, 57828],
-    [26977, 57829], [57830, 166474], [17148, 57831], [26934, 57832],
-    [27032, 57833], [15265, 57834], [57835, 132041], [33635, 57836],
-    [20624, 57837], [27129, 57838], [57839, 144985], [57840, 139562],
-    [27205, 57841], [57842, 145155], [27293, 57843], [15347, 57844],
-    [26545, 57845], [27336, 57846], [57847, 168348], [15373, 57848],
-    [27421, 57849], [57850, 133411], [24798, 57851, 60308], [27445, 57852],
-    [27508, 57853], [57854, 141261], [28341, 57855], [57856, 146139], 0,
-    [57858, 137560], [14144, 57859], [21537, 57860], [57861, 146266],
-    [27617, 57862], [57863, 147196], [27612, 57864], [27703, 57865],
-    [57866, 140427], [57867, 149745], [57868, 158545], [27738, 57869],
-    [33318, 57870], [27769, 57871], [57872, 146876], [17605, 57873],
-    [57874, 146877], [57875, 147876], [57876, 149772], [57877, 149760],
-    [57878, 146633], [14053, 57879], [15595, 57880], [57881, 134450],
-    [39811, 57882], [57883, 143865], [57884, 140433], [32655, 57885],
-    [26679, 57886], [57887, 159013], [57888, 159137], [57889, 159211],
-    [28054, 57890], [27996, 57891], [28284, 57892], [28420, 57893],
-    [57894, 149887], [57895, 147589], [57896, 159346], [34099, 57897],
-    [57898, 159604], [20935, 57899], 0, 0, [33838, 57902], [57903, 166689], 0,
-    [57905, 146991], [29779, 57906], [57907, 147330], [31180, 57908],
-    [28239, 57909], [23185, 57910], [57911, 143435], [28664, 57912],
-    [14093, 57913], [28573, 57914], [57915, 146992], [28410, 57916],
-    [57917, 136343], [57918, 147517], [17749, 57919], [37872, 57920],
-    [28484, 57921], [28508, 57922], [15694, 57923], [28532, 57924],
-    [57925, 168304], [15675, 57926], [28575, 57927], [57928, 147780],
-    [28627, 57929], [57930, 147601], [57931, 147797], [57932, 147513],
-    [57933, 147440], [57934, 147380], [57935, 147775], [20959, 57936],
-    [57937, 147798], [57938, 147799], [57939, 147776], [57940, 156125],
-    [28747, 57941], [28798, 57942], [28839, 57943], 0, [28876, 57945],
-    [28885, 57946], [28886, 57947], [28895, 57948], [16644, 57949],
-    [15848, 57950], [29108, 57951], [29078, 57952], [57953, 148087],
-    [28971, 57954], [28997, 57955], [23176, 57956], [29002, 57957], 0,
-    [57960, 148325], [29007, 57961], [37730, 57962], [57963, 148161],
-    [28972, 57964], [57965, 148570], [57966, 150055], [57967, 150050],
-    [29114, 57968], [57969, 166888], [28861, 57970], [29198, 57971],
-    [37954, 57972], [29205, 57973], [22801, 57974], [37955, 57975],
-    [29220, 57976], [37697, 57977], [57978, 153093], [29230, 57979],
-    [29248, 57980], [57981, 149876], [26813, 57982], [29269, 57983],
-    [29271, 57984], [15957, 57985], [57986, 143428], [26637, 57987],
-    [28477, 57988], [29314, 57989], 0, [29483, 57991], [57992, 149539],
-    [57993, 165931], [18669, 57994], [57995, 165892], [29480, 57996],
-    [29486, 57997], [29647, 57998], [29610, 57999], [58000, 134202],
-    [58001, 158254], [29641, 58002], [29769, 58003], [58004, 147938],
-    [58005, 136935], [58006, 150052], [26147, 58007], [14021, 58008],
-    [58009, 149943], [58010, 149901], [58011, 150011], [29687, 58012],
-    [29717, 58013], [26883, 58014], [58015, 150054], [29753, 58016],
-    [16087, 58018], 0, [58020, 141485], [29792, 58021], [58022, 167602],
-    [29767, 58023], [29668, 58024], [29814, 58025], [33721, 58026],
-    [29804, 58027], [29812, 58029], [37873, 58030], [27180, 58031],
-    [29826, 58032], [18771, 58033], [58034, 150156], [58035, 147807],
-    [58036, 150137], [58037, 166799], [23366, 58038], [58039, 166915],
-    [58040, 137374], [29896, 58041], [58042, 137608], [29966, 58043],
-    [29982, 58045], [58046, 167641], [58047, 137803], [23511, 58048],
-    [58049, 167596], [37765, 58050], [30029, 58051], [30026, 58052],
-    [30055, 58053], [30062, 58054], [58055, 151426], [16132, 58056],
-    [58057, 150803], [30094, 58058], [29789, 58059], [30110, 58060],
-    [30132, 58061], [30210, 58062], [30252, 58063], [30289, 58064],
-    [30287, 58065], [30319, 58066], 58067, [58068, 156661], [30352, 58069],
-    [33263, 58070], [14328, 58071], [58072, 157969], [58073, 157966],
-    [30369, 58074], [30373, 58075], [30391, 58076], [30412, 58077],
-    [58078, 159647], [33890, 58079], [58080, 151709], [58081, 151933],
-    [58082, 138780], [30494, 58083], [30502, 58084], [30528, 58085],
-    [25775, 58086], [58087, 152096], [30552, 58088], [58089, 144044],
-    [30639, 58090], [58091, 166244], [58092, 166248], [58093, 136897],
-    [30708, 58094], 0, [26826, 58098], [30895, 58099], [30919, 58100],
-    [30931, 58101], [38565, 58102], [31022, 58103], [58104, 153056],
-    [30935, 58105], [31028, 58106], [30897, 58107], [58108, 161292],
-    [36792, 58109], [34948, 58110], [58113, 140828], [31110, 58114],
-    [35072, 58115], [26882, 58116], [31104, 58117], [58118, 153687],
-    [31133, 58119], [58120, 162617], [31036, 58121], [31145, 58122],
-    [28202, 58123], [58124, 160038], [16040, 58125], [31174, 58126],
-    [58127, 168205], [31188, 58128], 0, [21797, 62526], 0, [62528, 134210],
-    [62529, 134421], [62530, 151851], [21904, 62531], [62532, 142534],
-    [14828, 62533], [62534, 131905], [36422, 62535], [62536, 150968],
-    [62537, 169189], 0, [62539, 164030], [30586, 62540], [62541, 142392],
-    [14900, 62542], [18389, 62543], [62544, 164189], [62545, 158194],
-    [62546, 151018], [25821, 62547], [62548, 134524], [62549, 135092],
-    [62550, 134357], 0, [25741, 62552], [36478, 62553], [62554, 134806], 0,
-    [62556, 135012], [62557, 142505], [62558, 164438], [62559, 148691], 0,
-    [62561, 134470], [62562, 170573], [62563, 164073], [18420, 62564],
-    [62565, 151207], [62566, 142530], [39602, 62567], [14951, 62568],
-    [62569, 169460], [16365, 62570], [13574, 62571], [62572, 152263],
-    [62573, 169940], 0, [62575, 142660], [40302, 62576], [38933, 62577], 0,
-    [17369, 62579], 0, [25780, 62581], [21731, 62582], 0, [62584, 142282], 0,
-    [14843, 62586], 0, [62588, 157402], [62589, 157462], [62590, 162208],
-    [25834, 62591], [62592, 151634], [62593, 134211], [36456, 62594], 0,
-    [62596, 166732], [62597, 132913], 0, [18443, 62599], [62600, 131497],
-    [16378, 62601], [22643, 62602], [62603, 142733], 0, [62605, 148936],
-    [62606, 132348], [62607, 155799], [62608, 134988], 0, [21881, 62610], 0,
-    [17338, 62612], 0, [19124, 62614], [62615, 141926], [62616, 135325],
-    [33194, 62617], [39157, 62618], [62619, 134556], [25465, 62620],
-    [14846, 62621], [62622, 141173], [36288, 62623], [22177, 62624],
-    [25724, 62625], [15939, 62626], 0, [62628, 173569], [62629, 134665],
-    [62630, 142031], 0, 0, [62633, 135368], [62634, 145858], [14738, 62635],
-    [14854, 62636], [62637, 164507], [13688, 62638], [62639, 155209],
-    [62640, 139463], 0, 0, [62643, 142514], [62644, 169760], [13500, 62645],
-    [27709, 62646], [62647, 151099], 0, 0, [62650, 161140], [62651, 142987],
-    [62652, 139784], [62653, 173659], [62654, 167117], [62655, 134778],
-    [62656, 134196], [62683, 161337], [62684, 142286], [62687, 142417],
-    [14872, 62689], [62691, 135367], [62693, 173618], [62695, 167122],
-    [62696, 167321], [62697, 167114], [38314, 62698], 0, [62706, 161630],
-    [28992, 62708], 0, [20822, 62385], 0, [20616, 62487], 0, [13459, 62489],
-    [20870, 62491], [24130, 63037], [20997, 62495], [21031, 62436],
-    [21113, 62497], 0, [13651, 62504], [21442, 62505], [21343, 62715], 0,
-    [21823, 62520], 0, [21976, 59986], [13789, 62722], [22049, 63067], 0,
-    [22100, 60044], [60148, 135291], 0, [60153, 135379], 0, [61095, 135934], 0,
-    0, [14265, 60104], [23745, 61099], [23829, 63066], [23894, 63030],
-    [14392, 63036], [20097, 62477], [24253, 63038], [14612, 63042],
-    [25017, 63050], [25232, 63054], [25368, 63056], [25690, 63063],
-    [25745, 62381], [33133, 62709], [33156, 59922], [33171, 59924],
-    [26624, 63080], [15292, 63093], [29327, 60517], [29389, 59781], 0,
-    [29497, 59785], [30018, 59811], [30172, 59817], [16320, 59818],
-    [60278, 151205], [16343, 59820], 0, 30336, [30348, 59824, 151388],
-    [16552, 59845], [30777, 59846], [16643, 59855], [31377, 59863],
-    [31771, 59876], [31981, 59884], [32659, 62658], [32686, 59892], 0,
-    [33535, 59936], [22623, 59981], [34482, 59960], 0, [34699, 59963],
-    [35143, 59969], 0, [35369, 59972], 0, [36465, 59988], [60484, 164233],
-    [36528, 59990], 0, [37214, 62443], [37260, 62441], [39182, 60051],
-    [39196, 60054], 0, 0, [39809, 60066], [40384, 60080], [40339, 60078],
-    [40620, 60085], [19857, 60540], 0, 37818, [40571, 60084], [28809, 63148],
-    [29512, 59788], 0, [31129, 59858], [36791, 59997], 0, [39234, 60056],
-    {s: 193}, 8364, {s: 4}, [12443, 63518], [12444, 63519], [11904, 63520],
-    {f: 5, c: 62211}, [62216, 131340], 62217, [62218, 131281], [62219, 131277],
-    {f: 2, c: 62220}, [62222, 131275], [62223, 139240], 62224, [62225, 131274],
-    {f: 4, c: 62226}, [62230, 131342], {f: 2, c: 62231}, {f: 2, c: 62776},
-    [62778, 138177], [62779, 194680], [12205, 38737, 62780], [62781, 131206],
-    [20059, 62782], [20155, 62783], [13630, 62784], [23587, 62785],
-    [24401, 62786], [24516, 62787], [14586, 62788], [25164, 62789],
-    [25909, 62790], [27514, 62791], [27701, 62792], [27706, 62793],
-    [28780, 62794], [29227, 62795], [20012, 62796], [29357, 62797],
-    [62798, 149737], [32594, 62799], [31035, 62800], [31993, 62801],
-    [32595, 62802], [62803, 156266], [13505, 62804], [62806, 156491],
-    [32770, 62807], [32896, 62808], [62809, 157202], [62810, 158033],
-    [21341, 62811], [34916, 62812], [35265, 62813], [62814, 161970],
-    [35744, 62815], [36125, 62816], [38021, 62817], [38264, 62818],
-    [38271, 62819], [38376, 62820], [62821, 167439], [38886, 62822],
-    [39029, 62823], [39118, 62824], [39134, 62825], [39267, 62826],
-    [62827, 170000], [40060, 62828], [40479, 62829], [40644, 62830],
-    [27503, 62831], [62832, 63751], [20023, 62833], [62834, 131207],
-    [38429, 62835], [25143, 62836], [38050, 62837], [11908, 63521],
-    [11910, 63522], [11911, 63523], [11912, 63524], [11914, 63525],
-    [11916, 63526], [11917, 63527], [11925, 63528], [11932, 63529],
-    [11941, 63531], [11943, 63532], [11946, 63533], [11948, 63534],
-    [11950, 63535], [11958, 63536], [11964, 63537], [11966, 63538],
-    [11978, 63540], [11980, 63541], [11981, 63542], [11983, 63543],
-    [11990, 63544], [11991, 63545], [11998, 63546], [62368, 172969],
-    [62369, 135493], [25866, 62371], [20029, 62374], [28381, 62375],
-    [40270, 62376], [37343, 62377], [62380, 161589], [20250, 62382],
-    [20264, 62383], [20392, 62384], [20852, 62386], [20892, 62387],
-    [20964, 62388], [21153, 62389], [21160, 62390], [21307, 62391],
-    [21326, 62392], [21457, 62393], [21464, 62394], [22242, 62395],
-    [22768, 62396], [22788, 62397], [22791, 62398], [22834, 62399],
-    [22836, 62400], [23398, 62401], [23454, 62402], [23455, 62403],
-    [23706, 62404], [24198, 62405], [24635, 62406], [25993, 62407],
-    [26622, 62408], [26628, 62409], [26725, 62410], [27982, 62411],
-    [28860, 62412], [30005, 62413], [32420, 62414], [32428, 62415],
-    [32442, 62416], [32455, 62417], [32463, 62418], [32479, 62419],
-    [32518, 62420], [32567, 62421], [33402, 62422], [33487, 62423],
-    [33647, 62424], [35270, 62425], [35774, 62426], [35810, 62427],
-    [36710, 62428], [36711, 62429], [36718, 62430], [29713, 62431],
-    [31996, 62432], [32205, 62433], [26950, 62434], [31433, 62435],
-    [30904, 62442], [32956, 62444], [36107, 62446], [33014, 62447],
-    [62448, 133607], [32927, 62451], [40647, 62452], [19661, 62453],
-    [40393, 62454], [40460, 62455], [19518, 62456], [62457, 171510],
-    [62458, 159758], [40458, 62459], [62460, 172339], [13761, 62461],
-    [28314, 62463], [33342, 62464], [29977, 62465], [18705, 62467],
-    [39532, 62468], [39567, 62469], [40857, 62470], [31111, 62471],
-    [62472, 164972], [62473, 138698], [62474, 132560], [62475, 142054],
-    [20004, 62476], [20096, 62478], [20103, 62479], [20159, 62480],
-    [20203, 62481], [20279, 62482], [13388, 62483], [20413, 62484],
-    [15944, 62485], [20483, 62486], [13437, 62488], [13477, 62490],
-    [22789, 62492], [20955, 62493], [20988, 62494], [20105, 62496],
-    [21136, 62498], [21287, 62499], [13767, 62500], [21417, 62501],
-    [13649, 62502], [21424, 62503], [21539, 62506], [13677, 62507],
-    [13682, 62508], [13953, 62509], [21651, 62510], [21667, 62511],
-    [21684, 62512], [21689, 62513], [21712, 62514], [21743, 62515],
-    [21784, 62516], [21795, 62517], [21800, 62518], [13720, 62519],
-    [13733, 62521], [13759, 62522], [21975, 62523], [13765, 62524],
-    [62525, 163204], [16467, 62538], [62551, 135412], [62555, 134155],
-    [62574, 161992], [62580, 155813], [62583, 142668], [62585, 135287],
-    [62587, 135279], [62595, 139681], [62609, 134550], [16571, 62611],
-    [62631, 142537], [22098, 62641], [62642, 134961], [62657, 157724],
-    [62659, 135375], [62660, 141315], [62661, 141625], [13819, 62662],
-    [62663, 152035], [62664, 134796], [62665, 135053], [62666, 134826],
-    [16275, 62667], [62668, 134960], [62669, 134471], [62670, 135503],
-    [62671, 134732], [62673, 134827], [62674, 134057], [62675, 134472],
-    [62676, 135360], [62677, 135485], [16377, 62678], [62679, 140950],
-    [25650, 62680], [62681, 135085], [62682, 144372], [62685, 134526],
-    [62686, 134527], [62688, 142421], [62690, 134808], [62692, 134958],
-    [62694, 158544], [21708, 62699], [33476, 62700], [21945, 62701],
-    [62703, 171715], [39974, 62704], [39606, 62705], [62707, 142830],
-    [33004, 62710], [23580, 62711], [62712, 157042], [33076, 62713],
-    [14231, 62714], [62716, 164029], [37302, 62717], [62718, 134906],
-    [62719, 134671], [62720, 134775], [62721, 134907], [62723, 151019],
-    [13833, 62724], [62725, 134358], [22191, 62726], [62727, 141237],
-    [62728, 135369], [62729, 134672], [62730, 134776], [62731, 135288],
-    [62732, 135496], [62733, 164359], [62734, 136277], [62735, 134777],
-    [62736, 151120], [62737, 142756], [23124, 62738], [62739, 135197],
-    [62740, 135198], [62741, 135413], [62742, 135414], [22428, 62743],
-    [62744, 134673], [62745, 161428], [62746, 164557], [62747, 135093],
-    [62748, 134779], [62749, 151934], [14083, 62750], [62751, 135094],
-    [62752, 135552], [62753, 152280], [62754, 172733], [62755, 149978],
-    [62756, 137274], [62757, 147831], [62758, 164476], [22681, 62759],
-    [21096, 62760], [13850, 62761], [62762, 153405], [31666, 62763],
-    [23400, 62764], [18432, 62765], [19244, 62766], [40743, 62767],
-    [18919, 62768], [39967, 62769], [39821, 62770], [62771, 154484],
-    [62772, 143677], [22011, 62773], [13810, 62774], [22153, 62775],
-    [23870, 63028], [23880, 63029], [15868, 63031], [14351, 63032],
-    [23972, 63033], [23993, 63034], [14368, 63035], [24357, 63039],
-    [24451, 63040], [14600, 63041], [14655, 63043], [14669, 63044],
-    [24791, 63045], [24893, 63046], [23781, 63047], [14729, 63048],
-    [25015, 63049], [25039, 63051], [14776, 63052], [25132, 63053],
-    [25317, 63055], [14840, 63057], [22193, 63058], [14851, 63059],
-    [25570, 63060], [25595, 63061], [25607, 63062], [14923, 63064],
-    [25792, 63065], [40863, 63068], [14999, 63069], [25990, 63070],
-    [15037, 63071], [26111, 63072], [26195, 63073], [15090, 63074],
-    [26258, 63075], [15138, 63076], [26390, 63077], [15170, 63078],
-    [26532, 63079], [15192, 63081], [26698, 63082], [26756, 63083],
-    [15218, 63084], [15217, 63085], [15227, 63086], [26889, 63087],
-    [26947, 63088], [29276, 63089], [26980, 63090], [27039, 63091],
-    [27013, 63092], [27094, 63094], [15325, 63095], [27237, 63096],
-    [27252, 63097], [27249, 63098], [27266, 63099], [15340, 63100],
-    [27289, 63101], [15346, 63102], [27307, 63103], [27317, 63104],
-    [27348, 63105], [27382, 63106], [27521, 63107], [27585, 63108],
-    [27626, 63109], [27765, 63110], [27818, 63111], [15563, 63112],
-    [27906, 63113], [27910, 63114], [27942, 63115], [28033, 63116],
-    [15599, 63117], [28068, 63118], [28081, 63119], [28181, 63120],
-    [28184, 63121], [28201, 63122], [28294, 63123], [63124, 166336],
-    [28347, 63125], [28386, 63126], [28378, 63127], [40831, 63128],
-    [28392, 63129], [28393, 63130], [28452, 63131], [28468, 63132],
-    [15686, 63133], [63134, 147265], [28545, 63135], [28606, 63136],
-    [15722, 63137], [15733, 63138], [29111, 63139], [23705, 63140],
-    [15754, 63141], [28716, 63142], [15761, 63143], [28752, 63144],
-    [28756, 63145], [28783, 63146], [28799, 63147], [63149, 131877],
-    [17345, 63150], [13809, 63151], [63152, 134872], [13902, 58134],
-    [15789, 58172], [58173, 154725], [26237, 58183], [31860, 58188],
-    [29837, 58197], [32402, 58215], [17667, 58232], [58260, 151480],
-    [58270, 133901], [58277, 158474], [13438, 58311], [58317, 143087],
-    [58325, 146613], [58343, 159385], [34673, 58364], [25537, 58385],
-    [30583, 58387], [35210, 58390], [58406, 147343], [35660, 58415],
-    [58440, 150729], [18730, 58464], [58471, 172052], [58472, 165564],
-    [58473, 165121], [15088, 58490], [28815, 58511], [58529, 140922],
-    [58637, 158120], [58646, 148043], [26760, 58662], [58664, 139611],
-    [40802, 58702], [37830, 58793], [58802, 131967], [37734, 58888],
-    [37519, 58901], [34324, 58954], [58986, 173147], [16784, 59010],
-    [26511, 59045], [26654, 59048], [14435, 59051], [59077, 149996],
-    [15129, 59128], [33942, 59176], [59241, 149858], [14818, 59254],
-    [33920, 59259], [17262, 59328], [38769, 59402], [39323, 59427],
-    [18733, 59499], [28439, 59703], [59704, 160009], [28838, 59746],
-    [59752, 150095], [32357, 59753], [23855, 59755], [15859, 59756],
-    [59758, 150109], [59759, 137183], [32164, 59760], [33830, 59761],
-    [21637, 59762], [59763, 146170], [59765, 131604], [22398, 59766],
-    [59767, 133333], [59768, 132633], [16357, 59769], [59770, 139166],
-    [59771, 172726], [28675, 59772], [59773, 168283], [23920, 59774],
-    [29583, 59775], [59777, 166489], [59778, 168992], [20424, 59779],
-    [32743, 59780], [29456, 59782], [29496, 59784], [29505, 59787],
-    [16041, 59789], [29173, 59792], [59793, 149746], [29665, 59794],
-    [16074, 59796], [16081, 59798], [29721, 59801], [29726, 59802],
-    [29727, 59803], [16098, 59804], [16112, 59805], [16116, 59806],
-    [16122, 59807], [29907, 59808], [16142, 59809], [16211, 59810],
-    [30061, 59812], [30066, 59813], [30093, 59814], [16252, 59815],
-    [30152, 59816], [30285, 59819], [30324, 59821], [16348, 59822],
-    [30330, 59823], [29064, 59825], [22051, 59826], [35200, 59827],
-    [16413, 59829], [30531, 59830], [16441, 59831], [16453, 59833],
-    [13787, 59834], [30616, 59835], [16490, 59836], [16495, 59837],
-    [30654, 59839], [30667, 59840], [30744, 59842], [30748, 59844],
-    [30791, 59847], [30801, 59848], [30822, 59849], [33864, 59850],
-    [59851, 152885], [31027, 59852], [31026, 59854], [16649, 59856],
-    [31121, 59857], [31238, 59860], [16743, 59862], [16818, 59864],
-    [31420, 59865], [33401, 59866], [16836, 59867], [31439, 59868],
-    [31451, 59869], [16847, 59870], [31586, 59872], [31596, 59873],
-    [31611, 59874], [31762, 59875], [16992, 59877], [17018, 59878],
-    [31867, 59879], [31900, 59880], [17036, 59881], [31928, 59882],
-    [17044, 59883], [36755, 59885], [28864, 59886], [59887, 134351],
-    [32207, 59888], [32212, 59889], [32208, 59890], [32253, 59891],
-    [32692, 59893], [29343, 59894], [17303, 59895], [32800, 59896],
-    [32805, 59897], [32814, 59899], [32817, 59900], [32852, 59901],
-    [22452, 59903], [28832, 59904], [32951, 59905], [33001, 59906],
-    [17389, 59907], [33036, 59908], [33038, 59910], [33042, 59911],
-    [33044, 59913], [17409, 59914], [15161, 59915], [33110, 59916],
-    [33113, 59917], [33114, 59918], [17427, 59919], [33148, 59921],
-    [17445, 59923], [17453, 59925], [33189, 59926], [22511, 59927],
-    [33217, 59928], [33252, 59929], [33364, 59930], [17551, 59931],
-    [33398, 59933], [33482, 59934], [33496, 59935], [17584, 59937],
-    [33623, 59938], [38505, 59939], [33797, 59941], [28917, 59942],
-    [33892, 59943], [33928, 59945], [17668, 59946], [33982, 59947],
-    [34017, 59948], [34040, 59949], [34064, 59950], [34104, 59951],
-    [34130, 59952], [17723, 59953], [34159, 59954], [34160, 59955],
-    [34272, 59956], [17783, 59957], [34418, 59958], [34450, 59959],
-    [34543, 59961], [38469, 59962], [17926, 59964], [17943, 59965],
-    [34990, 59966], [35071, 59967], [35108, 59968], [35217, 59970],
-    [59971, 162151], [35384, 59973], [35476, 59974], [35508, 59975],
-    [35921, 59976], [36052, 59977], [36082, 59978], [36124, 59979],
-    [18328, 59980], [36291, 59982], [18413, 59983], [36410, 59985],
-    [22356, 59987], [22005, 59989], [18487, 59991], [36558, 59992],
-    [36578, 59993], [36580, 59994], [36589, 59995], [36594, 59996],
-    [36801, 59998], [36810, 59999], [36812, 60000], [36915, 60001],
-    [18605, 60003], [39136, 60004], [37395, 60005], [18718, 60006],
-    [37416, 60007], [37464, 60008], [37483, 60009], [37553, 60010],
-    [37550, 60011], [37567, 60012], [37603, 60013], [37611, 60014],
-    [37619, 60015], [37620, 60016], [37629, 60017], [37699, 60018],
-    [37764, 60019], [37805, 60020], [18757, 60021], [18769, 60022],
-    [37911, 60024], [37917, 60026], [37933, 60027], [37950, 60028],
-    [18794, 60029], [37972, 60030], [38009, 60031], [38189, 60032],
-    [38306, 60033], [18855, 60034], [38388, 60035], [38451, 60036],
-    [18917, 60037], [18980, 60039], [38720, 60040], [18997, 60041],
-    [38834, 60042], [38850, 60043], [19172, 60045], [39097, 60047],
-    [19225, 60048], [39153, 60049], [22596, 60050], [39193, 60052],
-    [39223, 60055], [39261, 60057], [39266, 60058], [19312, 60059],
-    [39365, 60060], [19357, 60061], [39484, 60062], [39695, 60063],
-    [39785, 60065], [39901, 60067], [39921, 60068], [39924, 60069],
-    [19565, 60070], [39968, 60071], [14191, 60072], [60073, 138178],
-    [40265, 60074], [40702, 60076], [22096, 60077], [40381, 60079],
-    [40444, 60081], [38134, 60082], [36790, 60083], [40625, 60086],
-    [40637, 60087], [40646, 60088], [38108, 60089], [40674, 60090],
-    [40689, 60091], [40696, 60092], [40772, 60094], [60095, 131220],
-    [60096, 131767], [60097, 132000], [38083, 60099], [60101, 132311],
-    [38081, 60103], [60105, 132565], [60106, 132629], [60107, 132726],
-    [60108, 136890], [22359, 60109], [29043, 60110], [60111, 133826],
-    [60112, 133837], [60113, 134079], [60115, 194619], [60116, 134091],
-    [21662, 60117], [60118, 134139], [60119, 134203], [60120, 134227],
-    [60121, 134245], [60122, 134268], [60124, 134285], [60126, 134325],
-    [60127, 134365], [60128, 134381], [60129, 134511], [60130, 134578],
-    [60131, 134600], [60135, 134660], [60136, 134670], [60137, 134871],
-    [60138, 135056], [60139, 134957], [60140, 134771], [60142, 135100],
-    [60144, 135260], [60145, 135247], [60146, 135286], [60149, 135304],
-    [60150, 135318], [13895, 60151], [60152, 135359], [60154, 135471],
-    [60155, 135483], [21348, 60156], [60158, 135907], [60159, 136053],
-    [60160, 135990], [60162, 136567], [60163, 136729], [60164, 137155],
-    [60165, 137159], [28859, 60167], [60168, 137261], [60169, 137578],
-    [60170, 137773], [60171, 137797], [60172, 138282], [60173, 138352],
-    [60174, 138412], [60175, 138952], [60177, 138965], [60178, 139029],
-    [29080, 60179], [60181, 139333], [27113, 60182], [14024, 60183],
-    [60184, 139900], [60185, 140247], [60186, 140282], [60187, 141098],
-    [60188, 141425], [60189, 141647], [60191, 141671], [60192, 141715],
-    [60193, 142037], [60195, 142056], [60197, 142094], [60199, 142143],
-    [60202, 142412], [60204, 142472], [60205, 142519], [60206, 154600],
-    [60207, 142600], [60208, 142610], [60209, 142775], [60210, 142741],
-    [60211, 142914], [60212, 143220], [60213, 143308], [60214, 143411],
-    [60215, 143462], [60216, 144159], [60217, 144350], [60222, 144743],
-    [60223, 144883], [60227, 144922], [60228, 145174], [22709, 60231],
-    [60234, 146087], [60237, 146961], [60238, 147129], [60243, 147737],
-    [60245, 148206], [60246, 148237], [60248, 148276], [60249, 148374],
-    [60258, 148484], [60259, 148694], [22408, 60260], [60261, 149108],
-    [60263, 149295], [60271, 149522], [60272, 149755], [60273, 150037],
-    [60275, 150208], [22885, 60277], [60279, 151430], [60282, 151596],
-    [22335, 60284], [60286, 152217], [60287, 152601], [60291, 152646],
-    [60292, 152686], [60296, 152895], [60298, 152926], [60300, 152930],
-    [60301, 152934], [60302, 153543], [60304, 153693], [60309, 153859],
-    [60312, 154286], [60313, 154505], [60314, 154630], [22433, 60316],
-    [29009, 60317], [60319, 155906], [60322, 156082], [60325, 156674],
-    [60326, 156746], [60330, 156804], [60334, 156808], [60336, 156946],
-    [60338, 157119], [60339, 157365], [22201, 60347], [60349, 157436],
-    [13848, 60355], [60357, 157593], [60358, 157806], [60360, 157790],
-    [60362, 157895], [60366, 157990], [60368, 158009], [60371, 158202],
-    [60373, 158253], [60378, 158260], [60379, 158555], [60383, 158621],
-    [60385, 158884], [60388, 159150], [60392, 159819], [60393, 160205],
-    [60395, 160384], [60396, 160389], [60399, 160395], [60401, 160486],
-    [38047, 60404], [60405, 160848], [14009, 60416], [60424, 161740],
-    [60425, 161880], [22230, 60426], [60435, 162269], [60441, 162301],
-    [60442, 162314], [60443, 162571], [60444, 163174], [60448, 163849],
-    [60459, 163875], [60463, 163912], [60466, 163971], [60479, 163984],
-    [60480, 164084], [60481, 164142], [60483, 164175], [60485, 164271],
-    [60486, 164378], [60487, 164614], [60488, 164655], [60489, 164746],
-    [60491, 164968], [60492, 165546], [25574, 60494], [60495, 166230],
-    [60498, 166328], [60500, 166375], [60502, 166376], [60503, 166726],
-    [60504, 166868], [60506, 166921], [60508, 167877], [60509, 168172],
-    [60511, 168208], [60512, 168252], [15863, 60513], [60514, 168286],
-    [60515, 150218], [36816, 60516], [60519, 169191], [60521, 169392],
-    [60522, 169400], [60523, 169778], [60524, 170193], [60525, 170313],
-    [60526, 170346], [60527, 170435], [60528, 170536], [60529, 170766],
-    [60530, 171354], [60531, 171419], [32415, 60532], [60533, 171768],
-    [60534, 171811], [19620, 60535], [38215, 60536], [60537, 172691],
-    [29090, 60538], [60539, 172799], [60542, 173515], [19868, 60543],
-    [60544, 134300], [36798, 60545], [36794, 60547], [60548, 140464],
-    [36793, 60549], [60550, 150163], [20202, 60555], [60557, 166700],
-    [36480, 60560], [60561, 137205], [60563, 166764], [60564, 166809],
-    [60566, 157359], [60568, 161365], [60570, 153141], [60571, 153942],
-    [20122, 60572], [60573, 155265], [60576, 134765], [60579, 147080],
-    [60580, 150686], [60583, 137206], [60584, 137339], [60587, 154698],
-    [60589, 152337], [15814, 60590], [60596, 155352], [19996, 60600],
-    [60601, 135146], [60602, 134473], [60603, 145082], [60638, 151880],
-    [21982, 60644], [34694, 60672], [60676, 135361], [60679, 149254],
-    [23440, 60680], [60682, 157843], [60684, 141044], [60685, 163119],
-    [60686, 147875], [60687, 163187], [60688, 159440], [60689, 160438],
-    [60691, 135641], [60693, 146684], [60694, 173737], [60695, 134828],
-    [60698, 138402], [60700, 151490], [60702, 135147], [60706, 142752],
-    [60710, 135148], [60711, 134666], [60714, 135149], [60717, 135559],
-    [19994, 60721], [19972, 60722], [23309, 60724], [13996, 60727],
-    [21373, 60729], [13989, 60730], [22682, 60732], [60733, 150382],
-    [22442, 60736], [60737, 154261], [60738, 133497], [60741, 140389],
-    [60746, 146686], [60747, 171824], [60749, 151465], [60750, 169374],
-    [60753, 146870], [60755, 157619], [60756, 145184], [60759, 147191],
-    [60760, 146988], [60785, 143578], [60789, 135849], [22439, 60790],
-    [60791, 149859], [60794, 159918], [60801, 137068], [60806, 160100],
-    [60809, 159010], [60810, 150242], [39963, 60837], [60838, 149822],
-    [15878, 60846], [60881, 159011], [60887, 132092], [60891, 146685],
-    [60893, 149785], [22394, 60904], [21722, 60912], [29050, 60928],
-    [60949, 150135], [60955, 166490], [60962, 194624], [60976, 137275],
-    [61000, 155993], [61014, 144373], [61019, 166850], [61024, 138566],
-    [61054, 159441], [13877, 61065], [61084, 166701], [21024, 61088],
-    [15384, 61089], [61090, 146631], [61091, 155351], [61092, 161366],
-    [61093, 152881], [61094, 137540], [61096, 170243], [61097, 159196],
-    [61098, 159917], [61100, 156077], [61101, 166415], [61102, 145015],
-    [61103, 131310], [61104, 157766], [61105, 151310], [17762, 61106],
-    [23327, 61107], [61108, 156492], [40784, 61109], [40614, 61110],
-    [61111, 156267], [20962, 57415], [21314, 57416], [26285, 57520],
-    [22620, 57547], [21843, 57566], [15749, 57594], [24928, 57608],
-    [18606, 57668], [38845, 57676], [57693, 137335], [24755, 57703],
-    [33828, 57711], [38932, 57748], [57749, 147596], [57764, 143486],
-    [57787, 138813], [15147, 57798], [15666, 57824], [57857, 132021],
-    [28801, 57944], [23708, 57959], [58017, 132547], [14128, 58028],
-    [58096, 136054], [58097, 150034], [58111, 166699], [58112, 155779],
-    [256, 62233], [193, 62234], [461, 62235], [192, 62236], [274, 62237],
-    [201, 62238], [282, 62239], [200, 62240], [332, 62241], [211, 62242],
-    [465, 62243], [210, 62244], 62245, [7870, 62246], 62247, [7872, 62248],
-    [202, 62249], [257, 62250], [225, 62251], [462, 62252], [224, 62253],
-    [593, 62254], [275, 62255], [233, 62256], [283, 62257], [232, 62258],
-    [299, 62259], [237, 62260], [464, 62261], [236, 62262], [333, 62263],
-    [243, 62264], [466, 62265], [242, 62266], [363, 62267], [250, 62268],
-    [468, 62269], [249, 62270], [470, 62271], [472, 62272], [474, 62273],
-    [476, 62274], [252, 62275], 62276, [7871, 62277], 62278, [7873, 62279],
-    [234, 62280], [609, 62281], [643, 63551], [592, 63552], [603, 63553],
-    [596, 63554], [629, 63555], [339, 63556], [248, 63557], [331, 63558],
-    [650, 63559], [618, 63560], {f: 2, c: 62282}, [11933, 63530],
-    [11974, 63539], [12003, 63547], 20539, 28158, [62841, 171123], 62842,
-    [15817, 62843], 34959, [62845, 147790], 28791, 23797, [19232, 62848],
-    [62849, 152013], [13657, 62850], [62851, 154928], 24866, [62853, 166450],
-    36775, 37366, 29073, 26393, 29626, [62859, 144001], [62860, 172295],
-    [15499, 62861], [62862, 137600], [19216, 62863], 30948, 29698, 20910,
-    [62867, 165647], [16393, 62868], 27235, [62870, 172730], [16931, 62871],
-    34319, 31274, [62875, 170311], [62876, 166634], 38741, 28749, 21284,
-    [62880, 139390], 37876, 30425, [62883, 166371], 62884, 30685, 20131, 20464,
-    20668, 20015, 20247, 62891, 21556, 32139, 22674, 22736, [62896, 138678],
-    24210, 24217, 24514, [62900, 141074], 25995, [62902, 144377], 26905, 27203,
-    [62905, 146531], 27903, 29184, [62909, 148741], 29580, [16091, 62911],
-    [62912, 150035], 23317, 29881, 35715, [62916, 154788], [62917, 153237],
-    31379, 31724, 31939, 32364, 33528, 34199, 62924, 34960, 62926, 36537,
-    62928, 36815, 34143, 39392, 37409, 62933, [62934, 167353], [62935, 136255],
-    [16497, 62936], [17058, 62937], 23066, 39016, 26475, [17014, 62944], 22333,
-    34262, [62948, 149883], 33471, [62950, 160013], [19585, 62951],
-    [62952, 159092], 23931, [62954, 158485], [62955, 159678], {f: 2, c: 62956},
-    23446, 62959, 32347],
-  'Adobe-GB1': [{f: 95, c: 32}, {f: 3, c: 12288}, [183, 12539], 713, 711, 168,
-    12291, 12293, 8212, 65374, 8214, [8230, 8943], {f: 2, c: 8216},
-    {f: 2, c: 8220}, {f: 2, c: 12308}, {f: 8, c: 12296}, {f: 2, c: 12310},
-    {f: 2, c: 12304}, 177, 215, 247, 8758, {f: 2, c: 8743}, 8721, 8719, 8746,
-    8745, 8712, 8759, 8730, 8869, 8741, 8736, 8978, 8857, 8747, 8750, 8801,
-    8780, 8776, 8765, 8733, 8800, {f: 2, c: 8814}, {f: 2, c: 8804}, 8734, 8757,
-    8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65284, 164, {f: 2, c: 65504},
-    8240, 167, 8470, 9734, 9733, 9675, 9679, 9678, 9671, 9670, 9633, 9632,
-    9651, 9650, 8251, 8594, {f: 2, c: 8592}, 8595, 12307, {f: 20, c: 9352},
-    {f: 20, c: 9332}, {f: 10, c: 9312}, {f: 10, c: 12832}, {f: 12, c: 8544},
-    {f: 3, c: 65281}, 65509, {f: 89, c: 65285}, 65507, {f: 83, c: 12353},
-    {f: 86, c: 12449}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
-    {f: 7, c: 963}, {f: 7, c: 59277}, {f: 2, c: 65077}, {f: 2, c: 65081},
-    {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089}, {f: 2, c: 59284},
-    {f: 2, c: 65083}, {f: 2, c: 65079}, 65073, 59286, {f: 2, c: 65075},
-    {f: 6, c: 1040}, 1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 257, 225,
-    462, 224, 275, 233, 283, 232, 299, 237, 464, 236, 333, 243, 466, 242, 363,
-    250, 468, 249, 470, 472, 474, 476, 252, 234, 593, 7743, 324, 328, 505, 609,
-    {f: 37, c: 12549}, 0, {f: 76, c: 9472}, {s: 126}, 21834, 38463, 22467,
-    25384, 21710, 21769, 21696, 30353, 30284, 34108, 30702, 33406, 30861,
-    29233, 38552, 38797, 27688, 23433, 20474, 25353, 26263, 23736, 33018,
-    26696, 32942, 26114, 30414, 20985, 25942, 29100, 32753, 34948, 20658,
-    22885, 25034, 28595, 33453, 25420, 25170, 21485, 21543, 31494,
-    [12043, 20843], 30116, 24052, 25300, 36299, 38774, 25226, 32793, 22365,
-    38712, 32610, 29240, [12137, 30333], 26575, 30334, 25670, 20336, 36133,
-    25308, 31255, 26001, 29677, 25644, 25203, 33324, 39041, 26495, 29256,
-    25198, 25292, 20276, 29923, 21322, 21150, 32458, 37030, 24110, 26758,
-    27036, 33152, 32465, 26834, 30917, 34444, 38225, 20621, 35876, 33502,
-    32990, 21253, 35090, 21093, 34180, 38649, 20445, 22561, 39281, 23453,
-    25265, 25253, 26292, 35961, 40077, 29190, 26479, 30865, 24754, 21329,
-    21271, 36744, 32972, 36125, 38049, 20493, 29384, 22791, 24811, 28953,
-    34987, 22868, 33519, 26412, 31528, 23849, 32503, 29997, 27893, 36454,
-    36856, 36924, [12240, 40763], [12112, 27604], 37145, 31508, 24444, 30887,
-    34006, 34109, 27605, 27609, 27606, 24065, 24199, 30201, 38381, 25949,
-    24330, 24517, 36767, 22721, 33218, 36991, 38491, 38829, 36793, 32534,
-    36140, 25153, 20415, 21464, 21342, {f: 2, c: 36776}, 36779, 36941, 26631,
-    24426, 33176, 34920, 40150, 24971, 21035, 30250, 24428, 25996, 28626,
-    28392, 23486, 25672, 20853, 20912, 26564, 19993, 31177, 39292, 28851,
-    30149, 24182, 29627, 33760, 25773, 25320, 38069, 27874, 21338, 21187,
-    25615, 38082, 31636, 20271, 24091, 33334, 33046, 33162, 28196, 27850,
-    39539, 25429, [12056, 21340], 21754, 34917, 22496, 19981, 24067, 27493,
-    31807, 37096, 24598, 25830, 29468, 35009, 26448, 25165, 36130, 30572,
-    36393, 37319, 24425, 33756, 34081, 39184, 21442, 34453, 27531, 24813,
-    24808, 28799, 33485, 33329, 20179, 27815, 34255, 25805, 31961, 27133,
-    26361, 33609, 21397, 31574, 20391, 20876, 27979, 23618, 36461, 25554,
-    21449, 33580, 33590, 26597, 30900, 25661, 23519, 23700, 24046, 35815,
-    25286, 26612, 35962, 25600, 25530, 34633, 39307, 35863, 32544, 38130,
-    20135, 38416, 39076, 26124, 29462, 22330, 23581, 24120, 38271, 20607,
-    32928, [12058, 21378], 25950, 30021, 21809, 20513, 36229, 25220, 38046,
-    26397, 22066, 28526, 24034, 21557, 28818, 36710, 25199, 25764, 25507,
-    24443, 28552, 37108, [12162, 33251], [12192, 36784], 23576, 26216, 24561,
-    27785, 38472, 36225, 34924, 25745, 31216, 22478, 27225, 25104, 21576,
-    20056, 31243, 24809, 28548, 35802, 25215, 36894, 39563, 31204, 21507,
-    30196, 25345, 21273, 27744, 36831, 24347, 39536, 32827, 40831, 20360,
-    23610, [12186, 36196], 32709, 26021, 28861, 20805, 20914, [12173, 34411],
-    23815, 23456, 25277, 37228, 30068, 36364, 31264, 24833, 31609, 20167,
-    32504, 30597, 19985, 33261, 21021, 20986, 27249, 21416, 36487, 38148,
-    38607, 28353, 38500, 26970, 30784, 20648, 30679, 25616, 35302, 22788,
-    25571, 24029, 31359, 26941, 20256, 33337, 21912, 20018, 30126, 31383,
-    24162, 24202, 38383, 21019, 21561, 28810, 25462, 38180, 22402, 26149,
-    26943, 37255, 21767, 28147, 32431, 34850, 25139, 32496, 30133, 33576,
-    30913, 38604, 36766, 24904, 29943, 35789, 27492, 21050, 36176, 27425,
-    32874, 33905, 22257, 21254, 20174, 19995, 20945, 31895, 37259, 31751,
-    20419, 36479, 31713, 31388, 25703, 23828, 20652, 33030, 30209, 31929,
-    28140, 32736, 26449, 23384, [12072, 23544], 30923, 25774, 25619, 25514,
-    25387, 38169, 25645, 36798, 31572, 30249, 25171, [12068, 22823], 21574,
-    [12109, 27513], 20643, 25140, 24102, 27526, 20195, 36151, 34955, 24453,
-    36910, 24608, 32829, 25285, 20025, 21333, 37112, 25528, 32966, 26086,
-    27694, 20294, 24814, 28129, 35806, 24377, 34507, 24403, 25377, 20826,
-    33633, 26723, [12049, 20992], 25443, 36424, 20498, 23707, 31095, 23548,
-    21040, 31291, 24764, 36947, 30423, 24503, 24471, 30340, 36460, 28783,
-    30331, 31561, 30634, 20979, 37011, 22564, 20302, 28404, 36842, 25932,
-    31515, 29380, 28068, 32735, 23265, 25269, 24213, 22320, 33922, 31532,
-    24093, 24351, 36882, 32532, 39072, 25474, 28359, 30872, 28857, 20856,
-    38747, 22443, 30005, 20291, 30008, 24215, 24806, 22880, 28096, 27583,
-    30857, 21500, 38613, 20939, 20993, 25481, 21514, 38035, 35843, 36300,
-    29241, 30879, 34678, 36845, 35853, 21472, 19969, 30447, 21486, 38025,
-    39030, [12237, 40718], 38189, 23450, 35746, 20002, 19996, 20908, 33891,
-    25026, 21160, 26635, 20375, 24683, 20923, 27934, 20828, 25238,
-    [12099, 26007], 38497, [12182, 35910], 36887, 30168, 37117, 30563, 27602,
-    29322, 29420, 35835, 22581, 30585, 36172, 26460, 38208, 32922, 24230,
-    28193, 22930, 31471, 30701, 38203, 27573, 26029, 32526, 22534, 20817,
-    38431, 23545, 22697, 21544, 36466, 25958, 39039, 22244, 38045, 30462,
-    36929, 25479, 21702, 22810, 22842, 22427, 36530, 26421, 36346, 33333,
-    21057, 24816, 22549, 34558, 23784, 40517, 20420, 39069, 35769, 23077,
-    24694, 21380, 25212, 36943, 37122, 39295, 24681, [12157, 32780],
-    [12041, 20799], [12159, 32819], 23572, 39285, 27953, [12038, 20108], 36144,
-    21457, 32602, 31567, 20240, 20047, 38400, 27861, 29648, 34281, 24070,
-    30058, 32763, 27146, 30718, 38034, 32321, 20961, 28902, 21453, 36820,
-    33539, 36137, 29359, 39277, 27867, 22346, 33459, [12101, 26041], 32938,
-    25151, 38450, 22952, 20223, 35775, 32442, 25918, 33778, [12206, 38750],
-    21857, 39134, 32933, 21290, 35837, 21536, 32954, 24223, 27832, 36153,
-    33452, 37210, 21545, 27675, 20998, 32439, 22367, 28954, 27774, 31881,
-    22859, 20221, 24575, 24868, 31914, 20016, 23553, 26539, 34562, 23792,
-    38155, 39118, 30127, 28925, 36898, 20911, 32541, 35773, 22857, 20964,
-    20315, 21542, 22827, 25975, 32932, 23413, 25206, 25282, 36752, 24133,
-    27679, 31526, 20239, 20440, 26381, 28014, 28074, 31119, 34993, 24343,
-    29995, 25242, 36741, 20463, 37340, 26023, 33071, 33105, 24220, 33104,
-    36212, 21103, 35206, 36171, 22797, 20613, 20184, [12201, 38428],
-    [12119, 29238], 33145, 36127, 23500, 35747, 38468, 22919, 32538, 21648,
-    22134, 22030, 35813, 25913, 27010, 38041, 30422, 28297, [12082, 24178],
-    [12130, 29976], 26438, 26577, 31487, 32925, 36214, 24863, 31174, 25954,
-    36195, 20872, 21018, 38050, 32568, 32923, 32434, 23703, 28207, 26464,
-    31705, 30347, [12220, 39640], 33167, 32660, 31957, 25630, 38224, 31295,
-    21578, 21733, 27468, 25601, [12093, 25096], 40509, 33011, 30105, 21106,
-    [12208, 38761], 33883, 26684, 34532, 38401, 38548, 38124, 20010, 21508,
-    32473, 26681, 36319, 32789, 26356, 24218, 32697, 22466, 32831, 26775,
-    [12079, 24037], 25915, 21151, 24685, 40858, 20379, 36524, 20844, 23467,
-    [12088, 24339], 24041, 27742, 25329, 36129, 20849, 38057, 21246, 27807,
-    33503, 29399, 22434, 26500, 36141, 22815, 36764, 33735, 21653, 31629,
-    20272, 27837, 23396, 22993, [12238, 40723], 21476, 34506, [12219, 39592],
-    [12181, 35895], 32929, 25925, 39038, 22266, 38599, 21038, [12128, 29916],
-    21072, 23521, 25346, 35074, 20054, 25296, 24618, 26874, 20851, 23448,
-    20896, 35266, 31649, 39302, 32592, 24815, 28748, 36143, 20809,
-    [12084, 24191], 36891, 29808, 35268, 22317, 30789, 24402, 40863, 38394,
-    36712, [12225, 39740], 35809, 30328, 26690, 26588, 36330, 36149, 21053,
-    36746, 28378, 26829, 38149, 37101, 22269, 26524, 35065, 36807, 21704,
-    39608, 23401, 28023, 27686, 20133, 23475, 39559, 37219, 25000, 37039,
-    38889, 21547, 28085, 23506, 20989, 21898, 32597, 32752, 25788, 25421,
-    26097, 25022, 24717, 28938, 27735, 27721, 22831, 26477, 33322, 22741,
-    22158, 35946, 27627, 37085, 22909, 32791, 21495, 28009, 21621, 21917,
-    33655, 33743, 26680, [12146, 31166], 21644, 20309, 21512, 30418, 35977,
-    38402, 27827, 28088, 36203, 35088, 40548, 36154, 22079, [12234, 40657],
-    30165, 24456, 29408, 24680, 21756, 20136, 27178, 34913, 24658, 36720,
-    21700, 28888, 34425, 40511, 27946, 23439, 24344, 32418, 21897, 20399,
-    29492, 21564, 21402, 20505, 21518, 21628, 20046, 24573, 29786, 22774,
-    33899, 32993, 34676, 29392, 31946, 28246, 24359, 34382, 21804, 25252,
-    20114, 27818, 25143, 33457, 21719, 21326, 29502, 28369, 30011, 21010,
-    21270, 35805, 27088, 24458, 24576, 28142, 22351, 27426, 29615, 26707,
-    36824, 32531, 25442, 24739, 21796, 30186, 35938, 28949, 28067, 23462,
-    24187, 33618, 24908, 40644, 30970, 34647, 31783, 30343, 20976, 24822,
-    29004, 26179, 24140, 24653, 35854, 28784, 25381, 36745, 24509, 24674,
-    34516, 22238, 27585, 24724, 24935, 21321, 24800, 26214, 36159, 31229,
-    20250, 28905, 27719, 35763, 35826, 32472, 33636, 26127, 23130, 39746,
-    27985, 28151, 35905, 27963, 20249, [12117, 28779], 33719, 25110, 24785,
-    38669, 36135, 31096, 20987, 22334, 22522, 26426, 30072, 31293, 31215,
-    31637, 32908, 39269, 36857, 28608, 35749, 40481, 23020, 32489, 32521,
-    21513, 26497, 26840, 36753, 31821, 38598, 21450, 24613, 30142, 27762,
-    21363, 23241, 32423, 25380, [12047, 20960], 33034, [12080, 24049], 34015,
-    25216, 20864, 23395, 20238, 31085, 21058, 24760, 27982, 23492, 23490,
-    35745, 35760, 26082, 24524, 38469, 22931, 32487, 32426, 22025, 26551,
-    22841, 20339, 23478, 21152, 33626, 39050, 36158, 30002, 38078, 20551,
-    31292, 20215, 26550, 39550, 23233, 27516, 30417, 22362, 23574, 31546,
-    38388, 29006, 20860, 32937, 33392, 22904, 32516, 33575, 26816, 26604,
-    30897, 30839, 25315, 25441, 31616, 20461, 21098, 20943, 33616, 27099,
-    37492, 36341, 36145, 35265, 38190, 31661, 20214, 20581, 33328, 21073,
-    39279, 28176, 28293, 28071, 24314, 20725, 23004, 23558, 27974, 27743,
-    30086, 33931, 26728, 22870, 35762, 21280, 37233, 38477, 34121, 26898,
-    30977, 28966, 33014, 20132, 37066, 27975, 39556, 23047, 22204, 25605,
-    38128, 30699, 20389, 33050, 29409, [12179, 35282], 39290, 32564, 32478,
-    21119, 25945, 37237, 36735, 36739, 21483, 31382, 25581, 25509, 30342,
-    31224, 34903, 38454, 25130, 21163, 33410, 26708, 26480, 25463, 30571,
-    31469, 27905, 32467, 35299, 22992, 25106, 34249, 33445, 30028, 20511,
-    20171, 30117, 35819, 23626, [12081, 24062], 31563, [12100, 26020],
-    [12198, 37329], 20170, 27941, 35167, 32039, 38182, 20165, 35880, 36827,
-    38771, 26187, 31105, 36817, 28908, 28024, 23613, 21170, 33606, 20834,
-    33550, 30555, 26230, 40120, 20140, 24778, 31934, 31923, 32463, 20117,
-    35686, 26223, 39048, 38745, 22659, 25964, 38236, 24452, 30153, 38742,
-    31455, 31454, 20928, 28847, 31384, 25578, 31350, 32416, 29590,
-    [12210, 38893], 20037, 28792, 20061, 37202, 21417, 25937, 26087,
-    [12165, 33276], 33285, 21646, 23601, 30106, 38816, 25304, 29401, 30141,
-    23621, 39545, 33738, 23616, 21632, 30697, 20030, 27822, 32858, 25298,
-    25454, 24040, 20855, 36317, 36382, 38191, 20465, 21477, 24807, 28844,
-    21095, 25424, 40515, 23071, 20518, 30519, 21367, 32482, 25733, 25899,
-    25225, 25496, 20500, 29237, 35273, 20915, 35776, 32477, 22343, 33740,
-    38055, 20891, 21531, 23803, 20426, 31459, 27994, 37089, 39567, 21888,
-    21654, 21345, 21679, 24320, 25577, 26999, 20975, 24936, 21002, 22570,
-    21208, 22350, 30733, 30475, 24247, 24951, 31968, 25179, 25239, 20130,
-    28821, 32771, 25335, 28900, 38752, 22391, 33499, 26607, 26869, 30933,
-    39063, 31185, 22771, 21683, 21487, 28212, 20811, 21051, 23458, 35838,
-    32943, 21827, 22438, 24691, 22353, 21549, 31354, 24656, 23380, 25511,
-    25248, [12061, 21475], 25187, 23495, 26543, 21741, 31391, 33510, 37239,
-    24211, 35044, 22840, 22446, 25358, 36328, 33007, 22359, 31607, 20393,
-    24555, 23485, 27454, 21281, 31568, 29378, 26694, 30719, 30518, 26103,
-    20917, 20111, 30420, 23743, 31397, 33909, 22862, 39745, 20608, 39304,
-    24871, 28291, 22372, 26118, 25414, 22256, 25324, 25193, 24275, 38420,
-    22403, 25289, 21895, 34593, 33098, 36771, 21862, 33713, 26469, 36182,
-    34013, 23146, 26639, 25318, 31726, 38417, 20848, 28572, 35888, 25597,
-    35272, 25042, 32518, 28866, 28389, 29701, 27028, 29436, 24266, 37070,
-    26391, 28010, 25438, 21171, 29282, [12156, 32769], 20332, 23013, 37226,
-    28889, 28061, 21202, 20048, 38647, 38253, 34174, 30922, 32047, 20769,
-    22418, 25794, 32907, 31867, 27882, 26865, 26974, 20919, 21400, 26792,
-    29313, 40654, 31729, 29432, 31163, 28435, 29702, 26446, [12197, 37324],
-    40100, 31036, 33673, 33620, 21519, 26647, 20029, 21385, 21169, 30782,
-    21382, 21033, 20616, 20363, 20432, 30178, [12148, 31435], 31890, 27813,
-    [12202, 38582], [12050, 21147], 29827, 21737, 20457, 32852, 33714, 36830,
-    38256, 24265, 24604, 28063, 24088, 25947, 33080, 38142, 24651, 28860,
-    32451, 31918, 20937, 26753, 31921, 33391, 20004, 36742, 37327, 26238,
-    20142, 35845, 25769, 32842, 20698, 30103, 29134, 23525, 36797, 28518,
-    20102, 25730, 38243, 24278, 26009, 21015, 35010, 28872, 21155, 29454,
-    29747, 26519, 30967, 38678, 20020, 37051, 40158, 28107, 20955, 36161,
-    21533, 25294, 29618, 33777, 38646, 40836, 38083, 20278, 32666, 20940,
-    28789, 38517, 23725, 39046, 21478, 20196, 28316, 29705, 27060, 30827,
-    39311, 30041, 21016, 30244, 27969, 26611, 20845, 40857, 32843, 21657,
-    31548, 31423, 38534, 22404, 25314, 38471, 27004, 23044, 25602, 31699,
-    28431, 38475, 33446, 21346, 39045, 24208, 28809, 25523, 21348, 34383,
-    40065, 40595, 30860, 38706, 36335, 36162, [12229, 40575], 28510, 31108,
-    24405, 38470, 25134, 39540, 21525, 38109, 20387, 26053, 23653, 23649,
-    32533, 34385, 27695, 24459, 29575, 28388, 32511, 23782, 25371, 23402,
-    28390, 21365, 20081, 25504, 30053, 25249, 36718, 20262, 20177, 27814,
-    32438, 35770, 33821, 34746, 32599, 36923, 38179, 31657, 39585, 35064,
-    33853, 27931, 39558, 32476, 22920, [12231, 40635], 29595, 30721, 34434,
-    39532, 39554, 22043, 21527, 22475, 20080, 40614, 21334, 36808, 33033,
-    30610, 39314, 34542, 28385, 34067, 26364, 24930, 28459, 35881, 33426,
-    33579, 30450, 27667, 24537, 33725, 29483, 33541, 38170, [12113, 27611],
-    [12141, 30683], 38086, 21359, 33538, 20882, 24125, 35980, 36152, 20040,
-    29611, 26522, 26757, 37238, 38665, 29028, 27809, 30473, 23186, 38209,
-    27599, 32654, 26151, 23504, 22969, 23194, 38376, 38391, 20204, 33804,
-    33945, 27308, 30431, 38192, 29467, 26790, 23391, 30511, 37274, 38753,
-    31964, 36855, 35868, 24357, [12150, 31859], 31192, 35269, 27852, 34588,
-    23494, 24130, 26825, 30496, 32501, 20885, 20813, 21193, 23081, 32517,
-    [12207, 38754], 33495, 25551, 30596, 34256, 31186, 28218, 24217, 22937,
-    34065, 28781, 27665, 25279, [12139, 30399], 25935, 24751, 38397, 26126,
-    34719, 40483, 38125, 21517, 21629, 35884, {f: 2, c: 25720}, 34321, 27169,
-    33180, 30952, 25705, 39764, 25273, 26411, 33707, 22696, 40664, 27819,
-    28448, 23518, 38476, 35851, 29279, 26576, 25287, 29281, 20137, 22982,
-    27597, 22675, 26286, 24149, 21215, 24917, [12106, 26408], [12140, 30446],
-    30566, 29287, 31302, 25343, 21738, 21584, 38048, 37027, 23068, 32435,
-    27670, 20035, 22902, 32784, 22856, 21335, 30007, 38590, 22218, 25376,
-    33041, 24700, 38393, 28118, 21602, 39297, 20869, 23273, 33021, 22958,
-    38675, 20522, 27877, 23612, 25311, 20320, 21311, 33147, 36870, 28346,
-    34091, 25288, 24180, 30910, 25781, 25467, 24565, 23064, 37247, 40479,
-    23615, 25423, 32834, 23421, 21870, 38218, 38221, 28037, 24744, 26592,
-    29406, 20957, 23425, 25319, 27870, [12124, 29275], 25197, 38062, 32445,
-    33043, 27987, 20892, 24324, 22900, 21162, 24594, [12069, 22899], 26262,
-    34384, 30111, 25386, 25062, 31983, 35834, 21734, 27431, 40485, 27572,
-    34261, 21589, 20598, 27812, 21866, 36276, 29228, 24085, 24597, 29750,
-    25293, 25490, 29260, 24472, 28227, 27966, 25856, 28504, 30424, 30928,
-    30460, 30036, 21028, 21467, 20051, 24222, 26049, 32810, 32982, 25243,
-    21638, 21032, 28846, 34957, 36305, 27873, 21624, 32986, 22521, 35060,
-    36180, 38506, 37197, 20329, 27803, 21943, 30406, 30768, 25256, 28921,
-    28558, 24429, 34028, 26842, 30844, 31735, 33192, 26379, 40527, 25447,
-    30896, 22383, 30738, 38713, 25209, 25259, 21128, 29749, 27607, 21860,
-    33086, 30130, [12138, 30382], 21305, 30174, 20731, 23617, 35692, 31687,
-    20559, [12122, 29255], 39575, 39128, 28418, 29922, 31080, 25735, 30629,
-    25340, 39057, 36139, 21697, 32856, 20050, 22378, 33529, 33805, 24179,
-    20973, 29942, 35780, 23631, 22369, 27900, 39047, 23110, 30772, 39748,
-    36843, 31893, 21078, 25169, 38138, 20166, 33670, 33889, 33769, 33970,
-    22484, 26420, 22275, 26222, 28006, 35889, 26333, 28689, 26399, 27450,
-    26646, 25114, 22971, 19971, 20932, 28422, 26578, 27791, 20854, 26827,
-    22855, 27495, 30054, 23822, 33040, 40784, 26071, 31048, 31041, 39569,
-    36215, 23682, 20062, 20225, 21551, 22865, 30732, 22120, [12115, 27668],
-    36804, 24323, 27773, 27875, 35755, 25488, 24688, 27965, 29301, 25190,
-    38030, 38085, 21315, 36801, 31614, 20191, 35878, 20094, 40660, 38065,
-    38067, 21069, 28508, 36963, 27973, 35892, 22545, 23884, [12107, 27424],
-    27465, 26538, 21595, 33108, 32652, 22681, 34103, 24378, 25250, 27207,
-    38201, 25970, 24708, 26725, 30631, 20052, 20392, 24039, 38808, 25772,
-    32728, 23789, 20431, 31373, 20999, 33540, 19988, 24623, 31363, 38054,
-    20405, 20146, 31206, 29748, 21220, 33465, 25810, 31165, 23517, 27777,
-    38738, 36731, 27682, 20542, 21375, 28165, 25806, 26228, 27696, 24773,
-    39031, 35831, 24198, 29756, 31351, 31179, 19992, 37041, 29699, 27714,
-    22234, 37195, 27845, 36235, 21306, 34502, 26354, 36527, 23624, 39537,
-    28192, 21462, 23094, 40843, 36259, 21435, 22280, 39079, 26435, 37275,
-    27849, 20840, 30154, 25331, [12125, 29356], 21048, 21149, 32570, 28820,
-    30264, 21364, 40522, 27063, 30830, 38592, 35033, 32676, 28982, 29123,
-    20873, 26579, 29924, 22756, 25880, 22199, 35753, 39286, 25200, 32469,
-    24825, 28909, 22764, 20161, [12040, 20154], 24525, 38887, 20219, 35748,
-    20995, 22922, 32427, 25172, 20173, [12103, 26085], 25102, 33592, 33993,
-    33635, 34701, 29076, 28342, 23481, 32466, 20887, 25545, 26580,
-    [12161, 32905], 33593, 34837, 20754, 23418, 22914, 36785, 20083, 27741,
-    [12042, 20837], 35109, 36719, 38446, 34122, 29790, 38160, 38384, 28070,
-    33509, 24369, 25746, 27922, 33832, 33134, 40131, 22622, 36187, 19977,
-    21441, 20254, 25955, 26705, 21971, 20007, 25620, 39578, 25195, 23234,
-    29791, [12170, 33394], 28073, 26862, 20711, 33678, 30722, 26432, 21049,
-    27801, 32433, 20667, 21861, 29022, 31579, 26194, 29642, 33515, 26441,
-    [12077, 23665], 21024, 29053, 34923, 38378, 38485, 25797, 36193, 33203,
-    21892, 27733, 25159, 32558, 22674, 20260, 21830, 36175, 26188, 19978,
-    23578, 35059, 26786, 25422, 31245, 28903, 33421, 21242, 38902, 23569,
-    21736, 37045, 32461, 22882, 36170, 34503, [12166, 33292], 33293, 36198,
-    25668, 23556, 24913, 28041, 31038, 35774, 30775, 30003, 21627, 20280,
-    [12189, 36523], 28145, 23072, 32453, 31070, 27784, 23457, 23158, 29978,
-    32958, 24910, 28183, 22768, [12131, 29983], 29989, 29298, 21319, 32499,
-    30465, 30427, 21097, 32988, 22307, 24072, 22833, 29422, 26045, 28287,
-    35799, [12075, 23608], 34417, [12055, 21313], [12143, 30707], 25342, 26102,
-    20160, [12215, 39135], 34432, 23454, 35782, 21490, [12142, 30690], 20351,
-    23630, 39542, 22987, 24335, [12144, 31034], [12064, 22763], 19990, 26623,
-    20107, 25325, 35475, 36893, 21183, 26159, 21980, 22124, 36866, 20181,
-    20365, 37322, 39280, [12114, 27663], 24066, 24643, 23460, 35270, 35797,
-    25910, [12095, 25163], [12216, 39318], 23432, 23551, 25480, 21806, 21463,
-    30246, 20861, 34092, 26530, 26803, 27530, 25234, 36755, 21460, 33298,
-    28113, 30095, 20070, 36174, 23408, 29087, 34223, 26257, 26329, 32626,
-    34560, [12233, 40653], [12239, 40736], 23646, 26415, 36848, 26641, 26463,
-    25101, 31446, 22661, 24246, 25968, 28465, 24661, 21047, 32781, 25684,
-    34928, 29993, 24069, 26643, 25332, 38684, 21452, 29245, 35841,
-    [12116, 27700], 30561, 31246, 21550, 30636, 39034, 33308, 35828, 30805,
-    26388, 28865, 26031, 25749, 22070, 24605, 31169, 21496, 19997, 27515,
-    32902, 23546, 21987, 22235, 20282, 20284, 39282, 24051, 26494, 32824,
-    24578, 39042, 36865, 23435, 35772, 35829, 25628, 33368, 25822, 22013,
-    33487, 37221, 20439, 32032, 36895, 31903, 20723, 22609, 28335, 23487,
-    35785, 32899, 37240, 33948, 31639, 34429, 38539, 38543, 32485, 39635,
-    30862, 23681, 31319, 36930, 38567, 31071, 23385, 25439, 31499, 34001,
-    26797, 21766, 32553, 29712, 32034, 38145, 25152, 22604, 20182, 23427,
-    22905, 22612, 29549, 25374, 36427, 36367, 32974, 33492, 25260, 21488,
-    27888, 37214, 22826, 24577, 27760, 22349, 25674, 36138, 30251, 28393,
-    22363, 27264, 30192, 28525, 35885, 35848, 22374, 27631, 34962, 30899,
-    25506, 21497, 28845, 27748, 22616, 25642, 22530, 26848, 33179, 21776,
-    31958, 20504, 36538, 28108, 36255, 28907, 25487, 28059, 28372, 32486,
-    33796, 26691, 36867, 28120, 38518, 35752, 22871, 29305, 34276, 33150,
-    30140, 35466, 26799, 21076, 36386, 38161, 25552, 39064, 36420, 21884,
-    20307, 26367, 22159, 24789, 28053, 21059, 23625, 22825, 28155, 22635,
-    [12133, 30000], 29980, 24684, 33300, 33094, 25361, 26465, 36834, 30522,
-    36339, 36148, 38081, 24086, 21381, 21548, 28867, 27712, 24311, 20572,
-    20141, 24237, 25402, 33351, 36890, 26704, 37230, 30643, 21516, 38108,
-    24420, 31461, 26742, 25413, 31570, 32479, 30171, 20599, 25237, 22836,
-    36879, 20984, 31171, 31361, 22270, 24466, 36884, 28034, 23648,
-    [12063, 22303], 21520, 20820, 28237, 22242, 25512, 39059, 33151, 34581,
-    35114, 36864, 21534, 23663, 33216, 25302, 25176, 33073, 40501, 38464,
-    39534, 39548, 26925, 22949, 25299, 21822, 25366, 21703, 34521, 27964,
-    23043, [12129, 29926], 34972, 27498, 22806, 35916, 24367, 28286, 29609,
-    39037, 20024, 28919, 23436, 30871, 25405, 26202, 30358, 24779, 23451,
-    23113, 19975, 33109, 27754, 29579, 20129, 26505, [12153, 32593], 24448,
-    26106, 26395, 24536, 22916, 23041, 24013, 24494, 21361, 38886, 36829,
-    26693, 22260, 21807, 24799, 20026, 28493, 32500, 33479, 33806, 22996,
-    20255, 20266, 23614, 32428, 26410, 34074, 21619, 30031, 32963, 21890,
-    39759, 20301, 28205, 35859, 23561, 24944, 21355, 30239, 28201, 34442,
-    [12098, 25991], 38395, 32441, 21563, 31283, 32010, 38382, 21985, 32705,
-    29934, 25373, 34583, 28065, 31389, 25105, 26017, 21351, 25569, 27779,
-    24043, 21596, 38056, 20044, 27745, 35820, 23627, [12102, 26080], 33436,
-    26791, 21566, 21556, [12111, 27595], 27494, 20116, 25410, 21320, 33310,
-    20237, 20398, 22366, 25098, 38654, 26212, 29289, 21247, 21153, 24735,
-    35823, 26132, 29081, 26512, 35199, 30802, 30717, 26224, 22075, 21560,
-    38177, 29306, 31232, 24687, 24076, 24713, 33181, [12067, 22805], 24796,
-    29060, 28911, 28330, 27728, 29312, 27268, 34989, 24109, 20064, 23219,
-    21916, 38115, 27927, 31995, 38553, 25103, 32454, 30606, 34430, 21283,
-    38686, 36758, 26247, 23777, 20384, 29421, 19979, 21414, 22799, 21523,
-    25472, 38184, 20808, 20185, 40092, 32420, 21688, 36132, 34900, 33335,
-    38386, 28046, 24358, 23244, 26174, 38505, 29616, 29486, 21439, 33146,
-    39301, 32673, 23466, 38519, 38480, 32447, 30456, 21410, 38262,
-    [12217, 39321], 31665, 35140, 28248, 20065, 32724, 31077, 35814, 24819,
-    21709, 20139, 39033, 24055, 27233, 20687, 21521, 35937, 33831, 30813,
-    38660, 21066, 21742, 22179, 38144, 28040, 23477, 28102, 26195,
-    [12073, 23567], 23389, 26657, 32918, 21880, 31505, 25928, 26964, 20123,
-    27463, 34638, 38795, 21327, 25375, 25658, 37034, 26012, 32961, 35856,
-    20889, 26800, 21368, 34809, 25032, 27844, 27899, 35874, 23633, 34218,
-    33455, 38156, 27427, [12191, 36763], 26032, 24571, [12092, 24515], 20449,
-    34885, 26143, 33125, 29481, 24826, 20852, 21009, 22411, 24418, 37026,
-    [12175, 34892], 37266, 24184, 26447, 24615, 22995, 20804, 20982, 33016,
-    21256, 27769, 38596, 29066, 20241, 20462, 32670, 26429, 21957, 38152,
-    31168, 34966, 32483, 22687, 25100, 38656, 34394, 22040, 39035, 24464,
-    35768, 33988, 37207, 21465, 26093, 24207, 30044, 24676, 32110, 23167,
-    32490, 32493, 36713, 21927, 23459, 24748, 26059, [12126, 29572], 36873,
-    30307, 30505, 32474, 38772, 34203, 23398, [12147, 31348], 38634,
-    [12174, 34880], 21195, 29071, 24490, 26092, 35810, 23547, 39535, 24033,
-    27529, 27739, 35757, 35759, 36874, 36805, 21387, 25276, 40486, 40493,
-    21568, 20011, 33469, [12123, 29273], 34460, 23830, 34905, 28079, 38597,
-    21713, 20122, 35766, 28937, 21693, 38409, 28895, 28153, 30416, 20005,
-    30740, 34578, 23721, 24310, [12180, 35328], 39068, 38414, 28814, 27839,
-    22852, 25513, 30524, 34893, 28436, 33395, 22576, 29141, 21388, 30746,
-    38593, 21761, 24422, 28976, 23476, 35866, 39564, 27523, 22830, 40495,
-    31207, 26472, 25196, 20335, 30113, [12154, 32650], 27915, 38451, 27687,
-    20208, 30162, 20859, 26679, 28478, 36992, 33136, 22934, 29814, 25671,
-    23591, 36965, 31377, 35875, 23002, 21676, 33280, 33647, 35201, 32768,
-    26928, 22094, 32822, 29239, 37326, 20918, 20063, 39029, 25494, 19994,
-    21494, 26355, 33099, 22812, 28082, [12032, 19968], 22777, 21307, 25558,
-    38129, 20381, 20234, [12176, 34915], 39056, 22839, 36951, 31227, 20202,
-    33008, 30097, 27778, 23452, 23016, 24413, 26885, 34433, 20506, 24050,
-    [12036, 20057], 30691, 20197, 33402, 25233, 26131, [12194, 37009], 23673,
-    20159, 24441, 33222, 36920, 32900, 30123, 20134, 35028, 24847, 27589,
-    24518, 20041, 30410, 28322, 35811, 35758, 35850, 35793, 24322, 32764,
-    32716, 32462, 33589, 33643, 22240, 27575, [12211, 38899], 38452, 23035,
-    21535, 38134, 28139, 23493, 39278, 23609, 24341, 38544, 21360, 33521,
-    27185, 23156, 40560, 24212, 32552, 33721, {f: 2, c: 33828}, 33639, 34631,
-    36814, 36194, 30408, 24433, 39062, 30828, 26144, 21727, 25317, 20323,
-    33219, 30152, 24248, 38605, 36362, 34553, 21647, 27891, 28044, 27704,
-    24703, 21191, [12132, 29992], 24189, 20248, 24736, 24551, 23588, 30001,
-    37038, 38080, 29369, 27833, 28216, [12195, 37193], 26377, 21451, 21491,
-    20305, 37321, 35825, [12060, 21448], 24188, 36802, 28132, 20110, 30402,
-    27014, 34398, 24858, 33286, 20313, 20446, 36926, 40060, 24841, 28189,
-    28180, 38533, 20104, 23089, [12204, 38632], 19982, 23679, 31161, 23431,
-    35821, [12155, 32701], [12127, 29577], 22495, 33419, 37057, 21505, 36935,
-    21947, 23786, 24481, 24840, 27442, 29425, 32946, 35465, 28020, 23507,
-    35029, 39044, 35947, 39533, 40499, 28170, 20900, 20803, 22435, 34945,
-    21407, 25588, 36757, 22253, 21592, 22278, 29503, 28304, 32536, 36828,
-    33489, 24895, 24616, 38498, [12104, 26352], 32422, 36234, 36291, 38053,
-    23731, 31908, [12105, 26376], 24742, 38405, 32792, 20113, 37095, 21248,
-    38504, 20801, 36816, 34164, 37213, 26197, 38901, 23381, 21277, 30776,
-    26434, 26685, 21705, 28798, 23472, 36733, 20877, 22312, 21681, 25874,
-    26242, 36190, 36163, 33039, 33900, 36973, 31967, 20991, 34299, 26531,
-    26089, 28577, 34468, 36481, 22122, 36896, 30338, 28790, 29157, 36131,
-    25321, 21017, 27901, 36156, 24590, 22686, 24974, 26366, 36192, 25166,
-    21939, 28195, 26413, 36711, 38113, 38392, 30504, 26629, 27048, 21643,
-    20045, 28856, 35784, 25688, 25995, 23429, 31364, 20538, 23528, 30651,
-    27617, 35449, 31896, 27838, 30415, 26025, 36759, 23853, 23637, 34360,
-    26632, 21344, 25112, 31449, 28251, 32509, 27167, 31456, 24432, 28467,
-    24352, 25484, 28072, 26454, 19976, 24080, 36134, 20183, 32960, 30260,
-    38556, 25307, 26157, 25214, 27836, 36213, 29031, 32617, 20806, 32903,
-    21484, 36974, 25240, 21746, 34544, 36761, 32773, 38167, 34071, 36825,
-    27993, 29645, 26015, 30495, 29956, 30759, 33275, 36126, 38024, 20390,
-    26517, 30137, 35786, 38663, 25391, 38215, 38453, 33976, 25379, 30529,
-    24449, 29424, 20105, 24596, 25972, 25327, 27491, 25919, 24103, 30151,
-    37073, 35777, 33437, 26525, [12096, 25903], 21553, 34584, 30693, 32930,
-    33026, 27713, 20043, 32455, 32844, 30452, 26893, 27542, 25191, 20540,
-    20356, 22336, 25351, [12108, 27490], 36286, 21482, 26088, 32440, 24535,
-    25370, 25527, [12164, 33267], 33268, 32622, 24092, 23769, 21046, 26234,
-    31209, 31258, 36136, 28825, 30164, 28382, 27835, 31378, 20013, 30405,
-    24544, 38047, 34935, 32456, 31181, 32959, 37325, 20210, 20247,
-    [12168, 33311], 21608, 24030, 27954, 35788, 31909, 36724, 32920, 24090,
-    21650, 30385, 23449, 26172, 39588, 29664, 26666, 34523, 26417, 29482,
-    35832, 35803, 36880, [12149, 31481], 28891, 29038, 25284, 30633, 22065,
-    20027, 33879, 26609, 21161, 34496, 36142, 38136, 31569, 20303, 27880,
-    31069, 39547, 25235, [12118, 29226], 25341, 19987, 30742, 36716, 25776,
-    36186, 31686, 26729, 24196, 35013, 22918, 25758, 22766, 29366, 26894,
-    38181, 36861, 36184, 22368, 32512, 35846, 20934, 25417, 25305, 21331,
-    26700, 29730, 33537, 37196, 21828, 30528, 28796, 27978, 20857, 21672,
-    36164, 23039, 28363, 28100, 23388, 32043, 20180, 31869, 28371,
-    [12070, 23376], [12163, 33258], 28173, 23383, 39683, 26837, 36394, 23447,
-    32508, 24635, 32437, 37049, [12187, 36208], 22863, 25549, 31199,
-    [12188, 36275], 21330, 26063, 31062, 35781, 38459, 32452, 38075, 32386,
-    22068, 37257, 26368, 32618, 23562, 36981, 26152, 24038, 20304, 26590,
-    20570, 20316, 22352, 24231, 20109, 19980, 20800, 19984, 24319, 21317,
-    19989, 20120, 19998, [12224, 39730], 23404, 22121, [12033, 20008], 31162,
-    [12035, 20031], [12052, 21269], 20039, 22829, [12120, 29243], 21358, 27664,
-    22239, 32996, 39319, 27603, 30590, 40727, [12034, 20022], 20127, 40720,
-    20060, 20073, 20115, 33416, 23387, 21868, 22031, 20164, 21389, 21405,
-    21411, 21413, 21422, 38757, 36189, [12053, 21274], 21493, 21286, 21294,
-    21310, 36188, 21350, 21347, 20994, 21000, 21006, 21037, 21043,
-    {f: 2, c: 21055}, 21068, 21086, 21089, 21084, 33967, 21117, 21122, 21121,
-    21136, 21139, [12044, 20866], 32596, 20155, 20163, 20169, 20162, 20200,
-    20193, 20203, 20190, 20251, 20211, 20258, 20324, 20213, 20261, 20263,
-    20233, 20267, 20318, 20327, 25912, 20314, 20317, 20319, 20311, 20274,
-    20285, 20342, 20340, 20369, 20361, 20355, 20367, 20350, 20347, 20394,
-    20348, 20396, 20372, 20454, 20456, 20458, 20421, 20442, 20451, 20444,
-    20433, 20447, 20472, 20521, 20556, 20467, 20524, 20495, 20526, 20525,
-    20478, 20508, 20492, 20517, 20520, 20606, 20547, 20565, 20552, 20558,
-    20588, 20603, 20645, 20647, 20649, 20666, 20694, 20742, 20717, 20716,
-    20710, 20718, 20743, 20747, 20189, 27709, 20312, 20325, 20430,
-    [12245, 40864], 27718, 31860, 20846, 24061, 40649, 39320, 20865, 22804,
-    [12051, 21241], 21261, 35335, 21264, 20971, 22809, 20821, [12039, 20128],
-    20822, 20147, 34926, 34980, 20149, 33044, 35026, 31104, 23348, 34819,
-    32696, [12046, 20907], 20913, 20925, 20924, 20935, [12045, 20886], 20898,
-    20901, 35744, {f: 2, c: 35750}, 35754, {f: 2, c: 35764}, 35767,
-    {f: 2, c: 35778}, 35787, 35791, 35790, {f: 3, c: 35794}, 35798,
-    {f: 2, c: 35800}, 35804, {f: 2, c: 35807}, 35812, {f: 2, c: 35816}, 35822,
-    35824, 35827, 35830, 35833, 35836, {f: 2, c: 35839}, 35842, 35844, 35847,
-    35852, 35855, {f: 2, c: 35857}, {f: 3, c: 35860}, 35865, 35867, 35864,
-    35869, {f: 3, c: 35871}, 35877, 35879, {f: 2, c: 35882}, {f: 2, c: 35886},
-    {f: 2, c: 35890}, {f: 2, c: 35893}, [12057, 21353], 21370, 38429, 38434,
-    38433, 38449, 38442, 38461, 38460, 38466, 38473, 38484, 38495, 38503,
-    38508, 38514, 38516, 38536, 38541, 38551, 38576, 37015, 37019, 37021,
-    37017, 37036, 37025, 37044, 37043, 37046, 37050, 37048, 37040, 37071,
-    37061, 37054, 37072, 37060, 37063, 37075, 37094, 37090, 37084, 37079,
-    37083, 37099, 37103, 37118, 37124, 37154, 37150, 37155, 37169, 37167,
-    37177, 37187, 37190, 21005, 22850, 21154, {f: 2, c: 21164}, 21182, 21759,
-    21200, 21206, 21232, 21471, 29166, 30669, [12085, 24308], [12048, 20981],
-    20988, [12223, 39727], [12059, 21430], 24321, 30042, 24047, 22348, 22441,
-    22433, 22654, 22716, 22725, 22737, 22313, 22316, 22314, 22323, 22329,
-    {f: 2, c: 22318}, 22364, 22331, 22338, 22377, 22405, 22379, 22406, 22396,
-    22395, 22376, 22381, 22390, 22387, 22445, 22436, 22412, 22450, 22479,
-    22439, 22452, 22419, 22432, 22485, 22488, 22490, 22489, 22482, 22456,
-    22516, 22511, 22520, 22500, 22493, 22539, 22541, 22525, 22509, 22528,
-    22558, 22553, 22596, 22560, 22629, 22636, 22657, 22665, 22682, 22656,
-    39336, 40729, 25087, 33401, 33405, 33407, 33423, 33418, 33448, 33412,
-    33422, 33425, 33431, 33433, 33451, 33464, 33470, 33456, 33480, 33482,
-    33507, 33432, 33463, 33454, {f: 2, c: 33483}, 33473, 33449, 33460, 33441,
-    33450, 33439, 33476, 33486, 33444, 33505, 33545, 33527, 33508, 33551,
-    33543, 33500, 33524, 33490, 33496, 33548, 33531, 33491, 33553, 33562,
-    33542, {f: 2, c: 33556}, 33504, 33493, 33564, 33617, {f: 2, c: 33627},
-    33544, 33682, 33596, 33588, 33585, 33691, 33630, 33583, 33615, 33607,
-    33603, 33631, 33600, 33559, 33632, 33581, 33594, 33587, 33638, 33637,
-    33640, 33563, 33641, 33644, 33642, {f: 2, c: 33645}, 33712, 33656,
-    {f: 2, c: 33715}, 33696, 33706, 33683, 33692, 33669, 33660, 33718, 33705,
-    33661, 33720, 33659, 33688, 33694, 33704, 33722, 33724, 33729, 33793,
-    33765, 33752, 22535, 33816, 33803, 33757, 33789, 33750, 33820, 33848,
-    33809, 33798, 33748, 33759, 33807, 33795, {f: 2, c: 33784}, 33770, 33733,
-    33728, 33830, 33776, 33761, 33884, 33873, 33882, 33881, 33907,
-    {f: 2, c: 33927}, 33914, 33929, 33912, 33852, 33862, 33897, 33910, 33932,
-    33934, 33841, 33901, 33985, 33997, 34000, 34022, 33981, 34003, 33994,
-    33983, 33978, 34016, 33953, 33977, 33972, 33943, 34021, 34019, 34060,
-    29965, 34104, 34032, 34105, 34079, 34106, 34134, 34107, 34047, 34044,
-    34137, 34120, 34152, 34148, 34142, 34170, 30626, 34115, 34162, 34171,
-    34212, 34216, 34183, 34191, 34169, 34222, 34204, 34181, 34233, 34231,
-    34224, 34259, 34241, 34268, 34303, 34343, 34309, 34345, 34326, 34364,
-    [12086, 24318], 24328, 22844, 22849, 32823, 22869, 22874, 22872, 21263,
-    [12074, 23586], 23589, 23596, 23604, 25164, 25194, 25247, 25275, 25290,
-    25306, 25303, 25326, 25378, 25334, 25401, 25419, 25411, 25517, 25590,
-    25457, 25466, 25486, 25524, 25453, 25516, 25482, 25449, 25518, 25532,
-    25586, 25592, 25568, 25599, 25540, 25566, 25550, 25682, 25542, 25534,
-    25669, 25665, 25611, 25627, 25632, 25612, 25638, 25633, 25694, 25732,
-    25709, 25750, 25722, {f: 2, c: 25783}, 25753, 25786, 25792, 25808, 25815,
-    25828, 25826, 25865, 25893, 25902, [12087, 24331], 24530, 29977, 24337,
-    21343, 21489, 21501, 21481, 21480, 21499, 21522, 21526, 21510, 21579,
-    {f: 3, c: 21586}, 21590, 21571, 21537, 21591, 21593, 21539, 21554, 21634,
-    21652, 21623, 21617, 21604, {f: 2, c: 21658}, 21636, 21622, 21606, 21661,
-    21712, 21677, 21698, 21684, 21714, 21671, 21670, {f: 2, c: 21715}, 21618,
-    21667, 21717, 21691, 21695, 21708, {f: 2, c: 21721}, 21724,
-    {f: 2, c: 21673}, 21668, 21725, 21711, 21726, 21787, 21735, 21792, 21757,
-    21780, 21747, {f: 2, c: 21794}, 21775, 21777, 21799, 21802, 21863, 21903,
-    21941, 21833, 21869, 21825, 21845, 21823, 21840, 21820, 21815, 21846,
-    {f: 3, c: 21877}, 21811, 21808, 21852, 21899, 21970, 21891, 21937, 21945,
-    21896, 21889, 21919, 21886, 21974, 21905, 21883, 21983, {f: 2, c: 21949},
-    21908, 21913, 21994, 22007, 21961, 22047, 21969, {f: 2, c: 21995}, 21972,
-    21990, 21981, 21956, 21999, 21989, {f: 2, c: 22002}, {f: 2, c: 21964},
-    21992, 22005, 21988, 36756, 22046, 22024, 22028, 22017, 22052, 22051,
-    22014, 22016, 22055, 22061, 22104, 22073, 22103, 22060, 22093, 22114,
-    22105, 22108, 22092, 22100, 22150, 22116, 22129, 22123, {f: 2, c: 22139},
-    22149, 22163, 22191, 22228, [12062, 22231], 22237, 22241, 22261, 22251,
-    22265, 22271, 22276, 22282, 22281, 22300, 24079, 24089, 24084, 24081,
-    24113, {f: 2, c: 24123}, 24119, 24132, 24148, 24155, 24158, 24161, 23692,
-    23674, 23693, 23696, 23702, 23688, {f: 2, c: 23704}, 23697, 23706, 23708,
-    23733, 23714, 23741, 23724, 23723, 23729, 23715, 23745, 23735, 23748,
-    23762, 23780, 23755, 23781, {f: 2, c: 23810}, 23847, 23846, 23854, 23844,
-    23838, 23814, 23835, 23896, 23870, 23860, 23869, 23916, 23899, 23919,
-    23901, 23915, 23883, 23882, 23913, 23924, 23938, 23961, 23965, 35955,
-    23991, 24005, [12091, 24435], 24439, 24450, 24455, 24457, 24460, 24469,
-    24473, 24476, 24488, 24493, 24501, 24508, 34914, [12090, 24417], 29357,
-    29360, 29364, {f: 2, c: 29367}, 29379, 29377, 29390, 29389, 29394, 29416,
-    29423, 29417, 29426, 29428, 29431, 29441, 29427, 29443, {f: 2, c: 29434},
-    29463, 29459, 29473, 29450, 29470, 29469, 29461, 29474, 29497, 29477,
-    29484, 29496, 29489, 29520, 29517, 29527, 29536, 29548, 29551, 29566,
-    [12167, 33307], 22821, 39143, 22820, [12065, 22786], 39267,
-    {f: 6, c: 39271}, 39284, 39287, 39293, 39296, 39300, 39303, 39306, 39309,
-    {f: 2, c: 39312}, {f: 3, c: 39315}, 24192, 24209, 24203, 24214, 24229,
-    24224, 24249, 24245, 24254, 24243, 36179, 24274, 24273, 24283, 24296,
-    24298, 33210, 24516, 24521, 24534, 24527, 24579, 24558, 24580, 24545,
-    24548, 24574, {f: 2, c: 24581}, 24554, 24557, 24568, 24601, 24629, 24614,
-    24603, 24591, 24589, 24617, 24619, 24586, 24639, 24609, {f: 2, c: 24696},
-    24699, 24698, 24642, 24682, 24701, 24726, 24730, 24749, 24733, 24707,
-    24722, 24716, 24731, 24812, 24763, 24753, 24797, 24792, 24774, 24794,
-    24756, 24864, 24870, 24853, 24867, 24820, 24832, 24846, 24875, 24906,
-    24949, 25004, 24980, 24999, 25015, 25044, 25077, 24541, 38579, 38377,
-    38379, 38385, 38387, {f: 2, c: 38389}, 38396, 38398, {f: 2, c: 38403},
-    38406, 38408, {f: 4, c: 38410}, 38415, 38418, {f: 3, c: 38421},
-    {f: 2, c: 38425}, 20012, [12121, 29247], 25109, 27701, 27732, 27740, 27722,
-    27811, 27781, 27792, 27796, 27788, {f: 2, c: 27752}, 27764, 27766, 27782,
-    27817, 27856, 27860, 27821, {f: 2, c: 27895}, 27889, 27863, 27826, 27872,
-    27862, 27898, 27883, 27886, 27825, 27859, 27887, 27902, 27961, 27943,
-    27916, 27971, 27976, 27911, 27908, 27929, 27918, 27947, 27981, 27950,
-    27957, 27930, 27983, 27986, 27988, 27955, 28049, 28015, 28062, 28064,
-    27998, {f: 2, c: 28051}, 27996, 28000, 28028, 28003, 28186, 28103, 28101,
-    28126, 28174, 28095, 28128, 28177, 28134, 28125, 28121, 28182, 28075,
-    28172, 28078, 28203, 28270, 28238, 28267, 28338, 28255, 28294,
-    {f: 2, c: 28243}, 28210, 28197, 28228, 28383, 28337, 28312, 28384, 28461,
-    28386, 28325, 28327, 28349, 28347, 28343, 28375, 28340, 28367, 28303,
-    28354, 28319, 28514, {f: 2, c: 28486}, 28452, 28437, 28409, 28463, 28470,
-    28491, 28532, 28458, 28425, 28457, 28553, 28557, 28556, 28536, 28530,
-    28540, 28538, 28625, 28617, 28583, 28601, 28598, 28610, 28641, 28654,
-    28638, 28640, 28655, 28698, 28707, 28699, 28729, 28725, 28751, 28766,
-    [12071, 23424], 23428, 23445, 23443, 23461, 23480, 29999, 39582, 25652,
-    23524, 23534, 35120, 23536, 36423, 35591, 36790, 36819, 36821, 36837,
-    36846, 36836, 36841, 36838, 36851, 36840, 36869, 36868, 36875, 36902,
-    36881, 36877, 36886, 36897, {f: 2, c: 36917}, 36909, 36911, 36932,
-    {f: 2, c: 36945}, 36944, 36968, 36952, 36962, 36955, 26297, 36980, 36989,
-    36994, 37000, 36995, 37003, [12089, 24400], 24407, 24406, 24408, 23611,
-    21675, 23632, 23641, 23409, 23651, 23654, 32700, 24362, 24361, 24365,
-    33396, 24380, 39739, [12076, 23662], 22913, 22915, 22925, {f: 2, c: 22953},
-    22947, 22935, 22986, 22955, 22942, 22948, 22994, 22962, 22959, 22999,
-    22974, {f: 2, c: 23045}, 23005, 23048, 23011, 23000, 23033, 23052, 23049,
-    23090, 23092, 23057, 23075, 23059, 23104, 23143, 23114, 23125, 23100,
-    23138, 23157, 33004, 23210, 23195, 23159, 23162, 23230, 23275, 23218,
-    23250, 23252, 23224, 23264, 23267, 23281, 23254, 23270, 23256, 23260,
-    23305, 23319, 23318, 23346, 23351, 23360, 23573, 23580, 23386, 23397,
-    23411, 23377, 23379, 23394, 39541, {f: 2, c: 39543}, 39546, 39551, 39549,
-    {f: 2, c: 39552}, 39557, 39560, 39562, 39568, {f: 2, c: 39570}, 39574,
-    39576, {f: 3, c: 39579}, {f: 2, c: 39583}, {f: 2, c: 39586}, 39589, 39591,
-    32415, 32417, 32419, 32421, {f: 2, c: 32424}, 32429, 32432, 32446,
-    {f: 3, c: 32448}, 32457, {f: 2, c: 32459}, 32464, 32468, 32471, 32475,
-    {f: 2, c: 32480}, 32488, 32491, {f: 2, c: 32494}, {f: 2, c: 32497}, 32525,
-    32502, {f: 2, c: 32506}, 32510, {f: 3, c: 32513}, {f: 2, c: 32519},
-    {f: 2, c: 32523}, 32527, {f: 2, c: 32529}, 32535, 32537, 32540, 32539,
-    32543, {f: 7, c: 32545}, {f: 4, c: 32554}, {f: 5, c: 32559}, 32565,
-    [12083, 24186], 30079, [12078, 24027], 30014, 37013, 29582, 29585, 29614,
-    29602, 29599, 29647, 29634, 29649, 29623, 29619, 29632, 29641, 29640,
-    29669, 29657, 39036, 29706, 29673, 29671, 29662, 29626, 29682, 29711,
-    29738, 29787, 29734, 29733, 29736, 29744, 29742, 29740, 29723, 29722,
-    29761, 29788, 29783, 29781, 29785, 29815, 29805, 29822, 29852, 29838,
-    {f: 2, c: 29824}, 29831, 29835, 29854, {f: 2, c: 29864}, 29840, 29863,
-    29906, 29882, {f: 3, c: 38890}, 26444, 26451, 26462, 26440, 26473, 26533,
-    26503, 26474, 26483, 26520, 26535, 26485, 26536, 26526, 26541, 26507,
-    26487, 26492, 26608, 26633, 26584, 26634, 26601, 26544, 26636, 26585,
-    26549, 26586, 26547, 26589, 26624, 26563, 26552, 26594, 26638, 26561,
-    26621, {f: 2, c: 26674}, {f: 2, c: 26720}, 26702, 26722, 26692, 26724,
-    26755, 26653, 26709, 26726, 26689, 26727, 26688, 26686, 26698, 26697,
-    26665, 26805, 26767, 26740, 26743, 26771, 26731, 26818, 26990, 26876,
-    {f: 2, c: 26911}, 26873, 26916, 26864, 26891, 26881, 26967, 26851, 26896,
-    26993, 26937, 26976, 26946, 26973, 27012, 26987, 27008, 27032, 27000,
-    26932, 27084, {f: 2, c: 27015}, 27086, 27017, 26982, 26979, 27001, 27035,
-    27047, 27067, 27051, 27053, 27092, 27057, 27073, 27082, 27103, 27029,
-    27104, 27021, 27135, 27183, 27117, {f: 2, c: 27159}, 27237, 27122, 27204,
-    27198, 27296, 27216, 27227, 27189, 27278, 27257, 27197, 27176, 27224,
-    27260, 27281, 27280, 27305, 27287, 27307, 29495, 29522, {f: 2, c: 27521},
-    27527, 27524, {f: 2, c: 27538}, 27533, {f: 2, c: 27546}, 27553, 27562,
-    36715, 36717, {f: 3, c: 36721}, {f: 2, c: 36725}, 36728, 36727,
-    {f: 2, c: 36729}, 36732, 36734, {f: 2, c: 36737}, 36740, 36743, 36747,
-    {f: 3, c: 36749}, 36760, 36762, 36558, 25099, 25111, 25115, 25119, 25122,
-    25121, 25125, 25124, 25132, 33255, 29935, 29940, 29951, 29967, 29969,
-    29971, [12097, 25908], {f: 3, c: 26094}, 26122, 26137, 26482, 26115, 26133,
-    26112, 28805, 26359, 26141, 26164, 26161, 26166, 26165, 32774, 26207,
-    26196, 26177, 26191, 26198, 26209, 26199, 26231, 26244, 26252, 26279,
-    26269, 26302, {f: 2, c: 26331}, 26342, 26345, {f: 2, c: 36146}, 36150,
-    36155, 36157, 36160, {f: 2, c: 36165}, {f: 2, c: 36168}, 36167, 36173,
-    36181, 36185, 35271, {f: 3, c: 35274}, {f: 4, c: 35278}, 29294, 29343,
-    29277, 29286, 29295, {f: 2, c: 29310}, 29316, 29323, 29325, 29327, 29330,
-    25352, 25394, 25520, 25663, 25816, 32772, 27626, 27635, 27645, 27637,
-    27641, 27653, 27655, 27654, 27661, 27669, {f: 3, c: 27672}, 27681, 27689,
-    27684, 27690, 27698, 25909, 25941, 25963, 29261, 29266, 29270, 29232,
-    34402, 21014, 32927, 32924, 32915, 32956, 26378, 32957, 32945, 32939,
-    32941, 32948, 32951, {f: 4, c: 32999}, 32987, 32962, 32964, 32985, 32973,
-    32983, 26384, 32989, 33003, 33009, 33012, 33005, {f: 2, c: 33037}, 33010,
-    33020, 26389, 33042, 35930, 33078, 33054, 33068, 33048, 33074, 33096,
-    33100, 33107, 33140, {f: 2, c: 33113}, 33137, 33120, 33129,
-    {f: 2, c: 33148}, 33133, 33127, 22605, 23221, 33160, 33154, 33169, 28373,
-    33187, 33194, 33228, 26406, 33226, 33211, 33217, 33190, 27428, 27447,
-    27449, 27459, 27462, 27481, {f: 3, c: 39121}, 39125, {f: 2, c: 39129},
-    [12110, 27571], 24384, 27586, 35315, 26000, 40785, 26003, 26044, 26054,
-    26052, 26051, 26060, 26062, 26066, 26070, 28800, 28828, 28822, 28829,
-    28859, 28864, 28855, 28843, 28849, 28904, 28874, 28944, 28947, 28950,
-    28975, 28977, 29043, 29020, 29032, 28997, 29042, 29002, 29048, 29050,
-    29080, 29107, 29109, 29096, 29088, 29152, 29140, 29159, 29177, 29213,
-    29224, 28780, 28952, 29030, 29113, 25150, 25149, 25155, {f: 2, c: 25160},
-    31035, 31040, 31046, 31049, {f: 2, c: 31067}, 31059, 31066, 31074, 31063,
-    31072, 31087, 31079, 31098, 31109, 31114, 31130, 31143, 31155, 24529,
-    24528, 24636, 24669, 24666, 24679, 24641, 24665, 24675, 24747, 24838,
-    24845, 24925, 25001, 24989, 25035, 25041, 25094, 32896, [12160, 32895],
-    27795, 27894, 28156, 30710, 30712, 30720, 30729, {f: 2, c: 30743}, 30737,
-    26027, 30765, {f: 2, c: 30748}, {f: 3, c: 30777}, 30751, 30780, 30757,
-    30764, 30755, 30761, 30798, 30829, {f: 2, c: 30806}, 30758, 30800, 30791,
-    30796, 30826, 30875, 30867, 30874, 30855, 30876, 30881, 30883, 30898,
-    30905, 30885, 30932, 30937, 30921, 30956, 30962, 30981, 30964, 30995,
-    31012, 31006, 31028, 40859, [12235, 40697], {f: 2, c: 40699}, 30449, 30468,
-    30477, 30457, {f: 2, c: 30471}, 30490, 30498, 30489, 30509, 30502, 30517,
-    30520, {f: 2, c: 30544}, 30535, 30531, 30554, 30568, 30562, 30565, 30591,
-    30605, 30589, 30592, 30604, 30609, {f: 2, c: 30623}, 30640, 30645, 30653,
-    30010, 30016, 30030, 30027, 30024, 30043, 30066, 30073, 30083, 32600,
-    32609, 32607, 35400, 32616, 32628, 32625, 32633, 32641, 32638, 30413,
-    30437, 34866, {f: 3, c: 38021}, 38027, 38026, {f: 2, c: 38028},
-    {f: 2, c: 38031}, 38036, 38039, 38037, {f: 3, c: 38042}, {f: 2, c: 38051},
-    38059, 38058, 38061, 38060, {f: 2, c: 38063}, 38066, 38068,
-    {f: 5, c: 38070}, {f: 2, c: 38076}, 38079, 38084, {f: 7, c: 38088},
-    {f: 3, c: 38096}, {f: 3, c: 38101}, 38105, 38104, 38107, {f: 3, c: 38110},
-    38114, {f: 2, c: 38116}, {f: 2, c: 38119}, 38122, 38121, 38123,
-    {f: 2, c: 38126}, {f: 3, c: 38131}, 38135, 38137, {f: 2, c: 38140}, 38143,
-    38147, 38146, {f: 2, c: 38150}, {f: 2, c: 38153}, {f: 3, c: 38157},
-    {f: 5, c: 38162}, 38168, 38171, {f: 3, c: 38173}, 38178, {f: 2, c: 38186},
-    38185, 38188, {f: 2, c: 38193}, 38196, {f: 3, c: 38198}, 38204,
-    {f: 2, c: 38206}, 38210, 38197, {f: 3, c: 38212}, 38217, 38220,
-    {f: 2, c: 38222}, {f: 3, c: 38226}, {f: 4, c: 38230}, 38235,
-    {f: 2, c: 38238}, 38237, {f: 2, c: 38241}, {f: 9, c: 38244}, 38255,
-    {f: 3, c: 38257}, 38202, 30695, 30700, 38601, 31189, 31213, 31203, 31211,
-    31238, 23879, 31235, 31234, 31262, 31252, 31289, 31287, 31313, 40655,
-    39333, 31344, 30344, 30350, 30355, 30361, 30372, 29918, 29920, 29996,
-    40480, 40482, {f: 5, c: 40488}, 40498, 40497, 40502, 40504, 40503,
-    {f: 2, c: 40505}, 40510, {f: 2, c: 40513}, 40516, {f: 4, c: 40518},
-    {f: 2, c: 40523}, 40526, 40529, 40533, 40535, {f: 3, c: 40538}, 40542,
-    40547, {f: 7, c: 40550}, 40561, 40557, 40563, [12135, 30098], 30100, 30102,
-    30112, 30109, 30124, 30115, {f: 2, c: 30131}, 30136, 30148, 30129, 30128,
-    30147, 30146, 30166, 30157, 30179, 30184, 30182, 30180, 30187, 30183,
-    30211, 30193, 30204, 30207, 30224, 30208, 30213, 30220, 30231, 30218,
-    30245, 30232, 30229, 30233, 30235, 30268, 30242, 30240, 30272, 30253,
-    30256, 30271, 30261, 30275, 30270, 30259, 30285, 30302, 30292, 30300,
-    30294, 30315, 30319, 32714, 31462, {f: 2, c: 31352}, 31360, 31366, 31368,
-    31381, 31398, 31392, 31404, 31400, 31405, 31411, 34916, 34921, 34930,
-    34941, 34943, 34946, 34978, 35014, 34999, 35004, 35017, 35042, 35022,
-    35043, 35045, 35057, 35098, 35068, 35048, 35070, 35056, 35105, 35097,
-    35091, 35099, 35082, 35124, 35115, 35126, 35137, 35174, 35195,
-    [12134, 30091], 32997, 30386, 30388, 30684, [12158, 32786], 32788, 32790,
-    32796, 32800, 32802, {f: 3, c: 32805}, 32809, 32808, 32817, 32779, 32821,
-    32835, 32838, 32845, 32850, 32873, 32881, 35203, 39032, 39040, 39043,
-    39049, {f: 2, c: 39052}, 39055, 39060, {f: 2, c: 39066}, {f: 2, c: 39070},
-    {f: 2, c: 39073}, {f: 2, c: 39077}, [12172, 34381], 34388, 34412, 34414,
-    34431, 34426, 34428, 34427, 34472, 34445, 34443, 34476, 34461, 34471,
-    34467, 34474, 34451, 34473, 34486, 34500, 34485, 34510, 34480, 34490,
-    34481, 34479, 34505, 34511, 34484, 34537, {f: 2, c: 34545}, 34541, 34547,
-    34512, 34579, 34526, 34548, 34527, 34520, 34513, 34563, 34567, 34552,
-    34568, 34570, 34573, 34569, 34595, 34619, 34590, 34597, 34606, 34586,
-    34622, 34632, 34612, 34609, 34601, 34615, 34623, 34690, 34594,
-    {f: 2, c: 34685}, 34683, 34656, 34672, 34636, 34670, 34699, 34643, 34659,
-    34684, 34660, 34649, 34661, 34707, 34735, 34728, 34770, 34758, 34696,
-    34693, 34733, 34711, 34691, 34731, 34789, 34732, 34741, 34739, 34763,
-    34771, 34749, 34769, 34752, 34762, 34779, 34794, 34784, 34798, 34838,
-    34835, 34814, 34826, 34843, 34849, 34873, 34876, [12152, 32566], 32578,
-    {f: 2, c: 32580}, 33296, 31482, 31485, 31496, {f: 2, c: 31491}, 31509,
-    31498, 31531, 31503, 31559, 31544, 31530, 31513, 31534, 31537, 31520,
-    31525, 31524, 31539, 31550, 31518, 31576, 31578, 31557, 31605, 31564,
-    31581, 31584, 31598, 31611, 31586, 31602, 31601, 31632, {f: 2, c: 31654},
-    31672, 31660, 31645, 31656, 31621, 31658, 31644, 31650, 31659, 31668,
-    31697, 31681, 31692, 31709, 31706, {f: 2, c: 31717}, 31722, 31756, 31742,
-    31740, 31759, 31766, 31755, 31775, 31786, 31782, 31800, 31809, 31808,
-    33278, {f: 2, c: 33281}, 33284, 33260, 34884, {f: 3, c: 33313}, 33325,
-    33327, 33320, 33323, 33336, 33339, {f: 2, c: 33331}, 33342, 33348, 33353,
-    33355, 33359, 33370, 33375, 33384, 34942, 34949, 34952, 35032, 35039,
-    35166, 32669, 32671, 32679, {f: 2, c: 32687}, 32690, 31868, 25929, 31889,
-    31901, 31900, 31902, 31906, 31922, {f: 2, c: 31932}, 31937, 31943,
-    {f: 2, c: 31948}, 31944, 31941, 31959, 31976, [12169, 33390], 26280, 32703,
-    32718, 32725, 32741, 32737, 32742, 32745, 32750, 32755, [12151, 31992],
-    32119, 32166, 32174, 32327, 32411, 40632, 40628, 36211, 36228, 36244,
-    36241, 36273, 36199, 36205, 35911, 35913, 37194, 37200, {f: 2, c: 37198},
-    37220, 37218, 37217, 37232, 37225, 37231, {f: 2, c: 37245}, 37234, 37236,
-    37241, 37260, 37253, 37264, 37261, 37265, {f: 2, c: 37282}, 37290,
-    {f: 3, c: 37293}, 37301, 37300, 37306, [12183, 35925], 40574, 36280, 36331,
-    36357, 36441, 36457, 36277, 36287, 36284, 36282, 36292, {f: 2, c: 36310},
-    36314, 36318, {f: 2, c: 36302}, 36315, 36294, 36332, {f: 2, c: 36343},
-    36323, 36345, 36347, 36324, 36361, 36349, 36372, 36381, 36383, 36396,
-    36398, 36387, 36399, 36410, 36416, 36409, 36405, 36413, 36401, 36425,
-    {f: 2, c: 36417}, {f: 2, c: 36433}, 36426, 36464, 36470, 36476, 36463,
-    36468, 36485, 36495, 36500, 36496, 36508, 36510, [12184, 35960], 35970,
-    35978, 35973, 35992, 35988, 26011, 35286, 35294, 35290, 35292, 35301,
-    35307, 35311, 35390, 35622, 38739, 38633, 38643, 38639, 38662, 38657,
-    38664, 38671, 38670, 38698, 38701, 38704, 38718, 40832, 40835,
-    {f: 6, c: 40837}, 40844, 40702, 40715, 40717, [12203, 38585],
-    {f: 2, c: 38588}, 38606, 38610, 30655, 38624, 37518, 37550, 37576, 37694,
-    37738, 37834, 37775, 37950, 37995, 40063, 40066, {f: 4, c: 40069}, 31267,
-    40075, 40078, {f: 3, c: 40080}, {f: 2, c: 40084}, {f: 2, c: 40090},
-    {f: 6, c: 40094}, {f: 5, c: 40101}, 40107, {f: 2, c: 40109},
-    {f: 8, c: 40112}, {f: 4, c: 40122}, {f: 4, c: 40132}, {f: 7, c: 40138},
-    {f: 3, c: 40147}, {f: 3, c: 40151}, {f: 2, c: 40156}, 40159, 40162, 38780,
-    38789, {f: 2, c: 38801}, 38804, 38831, 38827, 38819, 38834, 38836, 39601,
-    39600, 39607, 40536, 39606, 39610, 39612, 39617, 39616, 39621, 39618,
-    {f: 2, c: 39627}, 39633, 39749, 39747, 39751, 39753, 39752, 39757, 39761,
-    39144, 39181, 39214, 39253, 39252, [12221, 39647], 39649, 39654, 39663,
-    39659, 39675, 39661, 39673, 39688, 39695, 39699, 39711, 39715,
-    {f: 2, c: 40637}, 32315, 40578, {f: 2, c: 40583}, 40587, 40594, 37846,
-    40605, 40607, {f: 3, c: 40667}, 40672, 40671, 40674, 40681, 40679, 40677,
-    40682, 40687, 40738, 40748, 40751, 40761, 40759, {f: 2, c: 40765}, 40772,
-    12295, {s: 13}, 30362, 34297, 31001, 24859, 39599, 35158, 22761, 32631,
-    25850, 25943, 38930, 36774, 32070, 24171, 32129, 37770, 35607, 39165,
-    23542, 22577, 39825, 36649, [12185, 35997], 37575, 29437, 20633, 24970,
-    32179, 31558, 30050, 25987, 24163, 38281, 37002, 32232, 36022, 35722,
-    36783, 36782, 27161, 40009, 30303, 28693, 28657, 36051, 25839, 39173,
-    25765, 37474, 37457, 39361, 35036, 36001, 21443, 34870, 27544, 24922,
-    24920, 29158, 33980, 33369, 20489, 28356, 21408, 20596, 28204, 23652,
-    35435, 25881, 25723, 34796, 39262, 35730, 32399, 37855, 29987, 38369,
-    39019, 22580, 22039, [12199, 38263], 20767, 33144, 24288, 26274, 37396,
-    [12190, 36554], 24505, 22645, 38515, 35183, 31281, 25074, 35488, 39425,
-    36978, 39347, [12242, 40786], 29118, 34909, 34802, 23541, 30087, 36490,
-    31820, 32162, 37276, 37604, 38619, 30990, 20786, 35320, 34389, 20659,
-    30241, 38358, 21109, 37656, 32020, 32189, 36781, 35422, 36060, 32880,
-    24478, 21474, 36517, 31428, 37679, 36948, 24118, 36024, 25812, 21934,
-    37170, 25763, 33213, 24986, 35477, 24392, 30070, 25803, 40680, 34153,
-    27284, 25623, 23798, 31153, 23566, 29128, 37159, 25973, 28364, 36958,
-    32224, 39003, 40670, 22666, 38651, 28593, 37347, 35519, 35548, 37336,
-    38914, 37664, 35330, 26481, 21205, 26847, 20941, [12222, 39717], 29346,
-    29544, 35712, 36077, 37709, 37723, 26039, 32222, 38538, 23565, 22136,
-    38931, 37389, 22890, 22702, 40285, 38989, 35355, 24801, 39187, 20818,
-    29246, 39180, 36019, 30332, 32624, 38309, 31020, 37353, 29033, 31684,
-    36009, 39151, 35370, 32033, [12214, 39131], 35513, 24290, 36027, 32027,
-    22707, 22894, 24996, 31966, 35920, 26963, 37586, [12213, 39080], 30219,
-    39342, 32299, 35575, 40179, 33178, 36667, 25771, 36628, 36070, 24489,
-    36000, 35331, 23142, 32283, 35442, 37411, 33995, 24185, 36245, 36123,
-    23713, 21083, 37628, 32177, 23831, 37804, 25841, 40255, 38307, 37499,
-    20491, 32102, 40852, 38799, 36002, 37390, 28317, 27083, 36092, 34865,
-    39015, 21102, 38364, 35264, 39208, 24931, 36011, 24291, 35215, 27512,
-    [12244, 40860], 38312, 36556, 35437, 27331, 36020, 21130, 36645, 37707,
-    22283, 36942, 39405, 38867, 28450, 34399, 38305, 40372, 36032, 36703,
-    40251, 32005, 22778, 35703, 28396, 22057, 33775, 30059, 21123, 35441,
-    25079, 22750, 27489, 29872, 36996, 32233, 35594, 25582, 36637, 36036,
-    31330, 26371, 29172, 21295, 35569, 35496, 32362, 33911, 28222, 29554,
-    36008, 31117, 25802, 27231, 31309, 39249, 35663, 40388, 32318, 32221,
-    26997, 36655, 32026, 25824, 24190, 34186, 21137, 28639, 35336, 35352,
-    38555, 32380, 32000, 22846, 33698, 38960, 36040, 37440, 20729, 39381,
-    27570, 30435, 22533, 31627, 38291, 33393, 32216, 32365, 27298, 40572,
-    25536, 25791, 31777, 20745, 34214, 27323, 37970, 36368, 36068,
-    [12178, 35211], 37749, 33382, 21133, 39198, 28472, 28666, 28567, 23559,
-    28479, 34083, 27123, 22892, 35611, 37292, 33184, 28550, 39509, 23308,
-    25898, 37496, 30703, 20709, 39171, 32371, 32094, 36686, 36611, 38542,
-    31680, 28500, 32080, 35489, 32202, 37670, 20677, 35641, 36914, 29180,
-    30433, 21185, 33686, 39912, 39514, 32147, 38968, 37857, 24465, 30169,
-    31478, 31998, 33290, 39378, 33289, 25818, 37624, 25084, 21127, 40273,
-    32121, 35258, 35363, 32118, 37406, 36557, 39423, 38283, 20977, 38982,
-    27579, 35506, 22718, 25031, 25715, 24235, 35122, 35463, 22602, 20744,
-    23532, 31014, 26336, 34407, 24011, 31418, 39243, 28528, 25844, 38346,
-    34847, 33240, 33802, 20358, 36084, 34253, 27396, 25876, 31811, 38348,
-    34349, 28734, 35733, 25900, 35261, 25078, 32412, 29211, 28651, 25736,
-    21214, 28551, 27138, 37939, 22744, 39006, 31852, 38626, 28757, 35023,
-    39881, 31150, 40599, 21426, 21237, 31019, 27511, 28701, 38584, 20486,
-    32879, 34030, 36899, 37934, 24976, 28451, 31806, 25986, 33225, 37832,
-    25088, 29001, 32244, 31975, 20841, 36635, 35538, 30274, 36988, 37904,
-    29557, 33256, 37168, 40023, 36035, 40801, 37428, 38728, 23994, 38936,
-    39230, 21129, [12243, 40845], 32894, 22184, 31840, 22751, 25871, 38580,
-    27155, 23105, 25695, 31757, 34310, 30439, 39025, 24300, 29200, 25796,
-    28407, 34396, 39791, 36034, 37682, 38520, 39522, 37569, 23650, 32311,
-    24942, 28670, 32209, 24018, 25891, 23423, 28772, 20098, 25476, 36650,
-    20523, 20374, 28138, 32184, 35542, 34367, 32645, 37007, 38012, 31854,
-    39486, 39409, 32097, 23229, 29802, 30908, 34718, [12218, 39340], 39393,
-    21966, 36023, [12230, 40613], 36067, 36993, 30622, 39237, 34875, 28415,
-    35646, 37672, 37466, 36031, 37762, [12200, 38272], 24758, 20497, 37683,
-    22818, 35598, 24396, 35219, 32191, 32236, 24287, 28357, 25003, 38313,
-    40180, 37528, 35628, 35584, 30045, 37385, 32013, 38627, 25747, 33126,
-    24817, 39719, 39186, 25836, 33193, 25862, 37312, [12227, 40165], 32886,
-    22169, 38007, 37811, 27320, 29552, 23527, 25840, 28632, 37397, 32016,
-    33215, 28611, 36786, 30247, 35582, 27472, 40407, 27590, 22036, 28442,
-    30436, 40848, 36064, 22132, 40300, 39449, 39108, 38971, 36007, 34315,
-    24977, 35413, 28497, 38935, 25778, 37610, 20693, 27192, 35676, 33229,
-    [12241, 40778], 39438, 35912, 21843, 27683, 35350, 29309, 37370, 37467,
-    36983, 31805, 35609, 37666, 37463, 28154, 35700, 22649, 27085, 21958,
-    22715, 34196, 25654, 37740, 27211, 21932, 20689, 32761, 31429, 31434,
-    27453, 35242, 23522, 36629, 27691, 20670, 38915, 35531, 24950, 29898,
-    31406, 36264, 21312, 36544, 39493, 40818, 39028, 27402, 21240, 40306,
-    30906, 35731, 39250, 25854, 32350, 29105, 38860, 35469, 32009, 27054,
-    32104, 36575, 37613, 38287, 28516, 28753, 34217, 39955, 36093, 20632,
-    21930, 39479, 25475, 28544, 27578, 32023, 31721, 26348, 38275, 38493,
-    36109, 32341, 20663, 36062, 29138, 32057, 36050, 25448, 25885, 25086,
-    35373, 32051, 23529, 23352, 33102, 28402, 32882, 32361, 21213, 32854,
-    24107, 29509, 28629, 35433, 26178, 34645, 23526, 35672, 39387, 21218,
-    36969, 37323, 39166, 35222, 35430, 22781, 29560, 27166, 36664, 26360,
-    36118, 23660, 34899, 27193, 31466, 25976, 24101, 38617, 35504, 38918,
-    35500, 30889, 29197, 32114, 39164, 39686, 32883, 24939, 38924, 35359,
-    35494, 25851, 34311, 35380, 32901, 38614, 38568, 32143, 27506, 23403,
-    25613, 32302, 29795, 37782, 29562, 25787, 33274, 24907, 25892, 36010,
-    30321, 28760, 22727, 35674, 35527, 22022, 28271, 29145, 28644, 32295,
-    35342, 39472, 35588, 37563, 38988, 39636, 26781, 36028, 37941, 24307,
-    32893, 28916, 37509, 32113, 38957, 22294, 22615, 22296, 38973, 40213,
-    39345, 39389, 27234, 31402, 35178, 24398, 28771, 38929, 33836, 32178,
-    [12209, 38859], 36949, 22285, 29234, 28656, 32173, 33894, 20553, 20702,
-    32239, 35586, 34907, 32862, 32011, 31337, 21839, 25790, 34680, 28198,
-    31401, 21978, 37794, 28879, 35491, 28961, 34154, 22626, 38695, 21209,
-    35492, 37675, 29351, 35186, 32722, 37521, 25138, 32048, 34662, 36676,
-    23805, 20448, 29433, 22151, 37697, 39854, 32406, 36066, 37532, 38289,
-    39023, 38570, 29694, 29563, 32291, 39201, 25010, 32171, 38002, 37129,
-    35443, 38911, 38917, 34157, 22210, 37559, 26313, 22063, 21332, 25406,
-    33029, 35559, 23531, 28681, 35613, 37573, 37313, 33288, 37561, 32137,
-    38920, 35377, 32210, 32396, 36562, 25080, 36984, 30316, 32098, 23416,
-    21211, 35426, 23563, 39348, 35347, 35338, 36956, 22739, 40201, 40232,
-    21854, 20126, 35357, 38329, 40573, 22196, 38996, 38331, 33399, 21421,
-    30831, 35578, 39511, 40230, 26954, 25562, 30221, 38525, 30306, 39178,
-    27171, 22575, 35617, 34277, 29242, [12212, 38913], 26989, 33865, 37291,
-    37541, 38948, 36986, 20736, 34811, 34269, 20740, 25014, 32681, 35427,
-    35696, 35516, 35695, 32377, 34093, 38512, 37504, 39154, 38577, 27387,
-    23344, 40441, 25033, 32403, 29801, 34722, 29151, 29074, 34821, 36111,
-    31310, 21938, 25793, 20653, 30320, 36404, 20778, 24962, 37109, 37438,
-    29494, 35480, 36671, 39192, [12226, 39770], 28417, 33287, 23996, 35486,
-    39729, 29508, 35709, 38928, 39341, 40219, 28149, 36677, 22290, 21729,
-    22291, 32227, 36960, 39000, 32004, 36493, 38000, 38322, 38642, 37142,
-    38549, 36939, 34292, 37270, 26248, 38620, 36617, 25890, 26283, 36106,
-    36124, 33247, 38015, 26839, 31432, 36012, 25799, 21063, 28580, 36042,
-    36104, 36555, 37720, 38296, 35408, 40779, 20661, 27656, 30430, 26028,
-    36670, 23940, 26855, 25136, 32187, 24373, 28466, 24115, 36076, 33081,
-    36249, 34756, 36685, 37754, 36889, 35998, 37341, 20597, 35386, 37806,
-    38499, 24128, 30309, 37165, 35657, 32340, 32887, 22519, 34937, 32025,
-    25711, 25842, 24159, 36074, 28399, 37912, 32066, 31278, 33131, 34886,
-    35589, 36600, 30394, 26205, 39519, 35576, 35461, 29165, 30682, 22225,
-    36015, 37956, 31689, 39376, 23560, 30938, 36681, 36090, 27137, 33674,
-    35037, 22941, 22767, 29376, 37648, 36101, 22684, 32180, 35524, 28310,
-    28609, 36039, 28460, 32156, 32317, 32305, 37138, 35419, 32068, 38013,
-    21959, 21401, 21428, 38760, 36107, 21293, 21297, 36094, 21060, 21132,
-    21108, 20660, 20480, 20630, 20757, 20738, 20756, 20796, 20791, 20712,
-    20674, 20795, 20752, 20794, 20681, 31988, 40652, 22213, 40172, 35131,
-    33248, 35329, 35344, 35340, 35349, 35635, 35406, 35365, 35393, 35382,
-    35398, 35412, 35416, 35410, 35462, 35460, 35455, 35440, 35452, 35445,
-    35436, 35438, 35533, 35554, 35425, 35482, 35493, {f: 2, c: 35473}, 35535,
-    35537, 35529, 35547, 35543, 35522, 35510, 35574, 35563, 35604, 35585,
-    35556, 35565, 35580, 35571, 35558, 35566, 35550, 35624, 35740, 35606,
-    35610, 35600, 35627, 35629, 35670, 35673, 35662, 35742, 35691, 35734,
-    38488, 37178, 37140, 37172, 37087, 37174, 37126, 37192, 33467, 21233,
-    24048, 22538, 22745, 22754, 22752, 22746, 22497, 22607, 22550, 22610,
-    22557, 22628, 34188, 34131, 34294, 33703, 33799, 34031, 33511, 34338,
-    34086, 22603, 29026, 34136, 34045, 34126, 34184, 34234, 29334, 28366,
-    34113, 34254, 34130, 33984, 33874, 33892, 33940, 33845, 34207, 34133,
-    40367, 33939, 32264, 34118, 34146, 34078, 39488, 34362, 37795, 34167,
-    34334, 34298, 34308, 34282, 34330, 22889, 23607, 25451, 25718, 25759,
-    25681, 25692, 25779, 25860, 25878, 25847, 25852, 25883, 22064, 22072,
-    22216, 22182, 21764, 21692, 22144, 22109, 22112, 22069, 22006, 22118,
-    22130, 22156, 22117, 22044, 22062, 21993, 22038, 22208, 22029, 22195,
-    22209, 22127, 36705, 22198, 22165, 22279, 24131, 24172, 24152, 24151,
-    23943, 23796, 23888, 23852, 23975, 23968, 23959, 23821, 23992, 23937,
-    24020, 24480, 29559, 29505, 29546, 29499, 29547, 29568, 29564, 39136,
-    39219, 39145, 39228, {f: 2, c: 39146}, 39149, 39156, 39177, 39185, 39195,
-    39223, 39231, 39235, {f: 3, c: 39240}, 39244, 39266, 24289, 36065, 25082,
-    25006, 24938, 24894, 24757, 24884, 25036, 24927, 25064, 24827, 24887,
-    24818, 24947, 24860, 24978, 38274, 38278, 38344, 38286, 38292, 38284,
-    38373, 38317, 38315, 39726, 38316, 38334, 38326, 39721, 38335, 38333,
-    38332, 38339, 38347, 38356, 38352, 38357, 38366, 28739, 28505, 28711,
-    28696, 28668, 28039, 28025, 28254, 28590, 28687, 28408, 28527, 28150,
-    28543, 28678, 28576, 28683, 28775, 28740, 28677, 28535, 28704, 28703,
-    28722, 28712, 28765, 39467, 36999, 36885, 37008, 23656, 24371, 23285,
-    23255, 23296, 23149, 23304, 23372, 23207, 23291, 23307, 23329, 23338,
-    23321, 39380, 39391, 39385, 39478, 39515, 39377, 39384, 39501, 39498,
-    39394, 39530, 39439, 39437, 39429, 39490, 39469, 39446, 39489, 39470,
-    39480, {f: 2, c: 39491}, 39503, 39525, 39524, 31993, 32006, 32002,
-    {f: 2, c: 32007}, 32394, 32028, 32021, 32019, 32058, 32050, 32049, 32272,
-    32060, 32064, 32063, 32093, 32078, 32115, 32134, 32131, 32136, 32190,
-    32186, 32203, 32212, 32196, 32158, 32172, 32185, 32163, 32176, 32199,
-    32217, 32215, 32249, 32242, 32354, 32230, 32246, 32241, 32267, 32225,
-    32265, 32285, 32287, 32286, 32301, 32266, 32273, 32381, 32313, 32309,
-    32306, 32326, 32325, 32392, 32346, 32338, 32366, 32382, 32368, 32367,
-    32408, 29859, 29771, 29903, 38922, 29885, 29759, 29833, 29862, 29908,
-    29914, 38873, 38878, 38876, 27050, 27370, 26776, 26838, 27141, 26783,
-    27355, 27379, 27368, 27359, 27273, 26895, 27208, 26984, 27071, 27194,
-    27292, 27410, 27422, 27357, 27111, 27407, 27414, 27372, 27354, 27384,
-    27315, 27367, 27299, 27347, 27358, 27556, 27550, 27566, 27563, 27567,
-    36564, 36571, 36594, 36603, 36708, 36601, 36604, 36587, 36580, 36706,
-    36602, 36606, 36618, 36615, 36613, 36626, 36646, {f: 2, c: 36638}, 36636,
-    36659, 36678, 36692, 25108, 25127, 29964, 26311, 26308, 26249, 26326,
-    36033, 36016, 36026, 36029, 36100, 36018, 36037, 36112, 36049, 36058,
-    36053, 36075, 36071, 36091, 35224, 35244, 35233, 35263, 35238, 35247,
-    35250, 35255, 27647, 27660, 27692, 29272, 26407, 33110, 33242, 33051,
-    33214, 33121, 33231, 27487, {f: 2, c: 39086}, 39094, 39100, 39110, 39112,
-    36674, 40783, 26005, 29036, 29010, 29079, 29121, 29148, 29182, 31152,
-    31118, 31146, 25055, 24932, 25059, 25095, 28585, 30959, 30893, 30824,
-    30904, 31018, 31025, 30820, 30973, 30951, 30947, 40853, 30616, 30558,
-    30652, 32646, 32648, {f: 3, c: 37330}, 37337, 37335, 37333, 37367, 37351,
-    37348, 37702, 37365, 37369, 37384, 37414, 37445, 37393, 37392, 37377,
-    37415, 37380, 37413, 37376, 37434, 37478, 37431, 37427, 37461, 37437,
-    37432, 37470, {f: 2, c: 37484}, 37439, 37984, 37424, 37449, 37448, 37453,
-    37422, 37433, 37944, 37548, 37536, 37498, 37546, 37614, 37583, 37891,
-    37603, 37946, 37553, 37542, 37799, 37526, 37580, 37545, 37877, 37523,
-    37503, 37801, 37530, 37658, 37547, 37507, 37899, 37544, 37539, 37906,
-    37688, 37617, 37847, 37605, 37616, 37615, 37608, 37564, 37597, 37622,
-    {f: 2, c: 37926}, 37571, 37599, 37606, 37650, 37638, 37737, 37659, 37696,
-    37633, 37653, 37678, 37699, {f: 2, c: 37639}, 37663, 37657, 37733, 37703,
-    37750, 37716, 37732, 37802, 37744, 37764, 37860, 37848, 37928, 37767,
-    37836, 37784, 37816, 37823, 37798, 37808, 37813, 37964, 37858,
-    {f: 2, c: 37852}, 37837, 37854, 37827, 37831, 37841, 37908, 37917, 37879,
-    37989, 37907, 37997, 37920, 38009, 37881, 37913, 37962, 37938, 37951,
-    37972, 37987, 37758, 31329, 40169, 40182, 40199, 40198, 40227, 40327,
-    40469, 40221, 40223, 40421, 40239, 40409, 40240, 40258, 40478, 40275,
-    40477, 40288, 40274, 40435, 40284, 40289, 40339, 40298, 40303, 40329,
-    40344, 40346, 40384, 40357, 40361, 40386, 40380, 40474, 40403, 40410,
-    40431, 40422, 40434, 40440, 40460, 40442, 40475, 30308, 30296, 30311,
-    30210, {f: 2, c: 30278}, 30281, 30238, 30267, {f: 2, c: 30317}, 30313,
-    30322, 31431, 31414, 35168, 35123, 35165, 35143, 35128, 35172, 30392,
-    32814, 32812, 32889, 32885, 38919, {f: 2, c: 38926}, 38945, 38940, 28481,
-    38950, 38967, 38990, 38995, 39027, 39010, 39001, 39013, 39020, 39024,
-    34787, 34822, 34566, 34851, 34806, 34554, 34799, 34692, 34832, 34760,
-    34833, 34747, 34766, 32588, 31716, 31591, 31849, 31731, 31744, 31691,
-    31836, 31774, 31787, 31779, 31850, 31839, 33380, 33387, 35018, 32677,
-    31986, 31990, 31965, 32310, 40617, 36274, 37317, 37315, 40570, 36489,
-    36428, 36498, 36474, 36437, 36506, 36491, 36499, 36497, 36513, 36451,
-    36522, 36518, 35316, 35318, 38746, 38722, 38717, 38724, 40788, 40799,
-    40793, 40800, 40796, 40806, 40812, 40810, 40823, [12236, 40701], 40703,
-    40713, 35726, 38014, 37864, 39799, 39796, 39809, 39811, 39822, 40056,
-    31308, 39826, 40031, 39824, 39853, 39834, 39850, 39838, 40045, 39851,
-    39837, 40024, 39873, 40058, 39985, 39993, 39971, 39991, 39872, 39882,
-    39879, 39933, 39894, {f: 2, c: 39914}, 39905, 39908, 39911, 39901, 39906,
-    39920, 39899, 39924, 39892, 40029, 39944, 39952, 39949, 39954, 39945,
-    39935, 39968, 39986, 39981, 39976, 39973, 39977, 39987, 39998, 40008,
-    39995, 39989, 40005, 40022, 40020, 40018, 40039, 38851, 38845, 38857,
-    40379, 39631, 39638, 39637, 39768, 39758, 39255, 39260, 39714, 40695,
-    40690, 35180, 38342, 37686, 24390, 34068, 32404, 40803, 22137, 40725,
-    22081, 39662, 35079, 31296, 39091, 38308, 39693, 36852, 24409, 31339,
-    39138, 20642, 34193, 20760, 25458, 21067, 30543, 32397, 26310, 30637,
-    [12228, 40565], 22217, 40692, 28635, 25054, 30663, 28720, 40629, 34890,
-    38370, 38854, 31844, 32308, 38822, 40623, 22220, 39089, 27311, 32590,
-    31984, 20418, 32363, 40569, 22190, 39706, 33903, 31142, 31858, 39634,
-    38587, 32251, 35069, 30787, {f: 10, c: 8560}, {f: 2, c: 714}, 729, 8211,
-    8213, 8229, 8245, 8453, 8457, {f: 4, c: 8598}, 8725, 8735, 8739, 8786,
-    {f: 2, c: 8806}, 8895, {f: 36, c: 9552}, {f: 15, c: 9601}, {f: 3, c: 9619},
-    {f: 2, c: 9660}, {f: 4, c: 9698}, 9737, 8853, 12306, {f: 2, c: 12317},
-    {f: 9, c: 12321}, 12963, {f: 2, c: 13198}, {f: 3, c: 13212}, 13217, 13252,
-    13262, {f: 2, c: 13265}, 13269, 65072, 65506, 65508, 8481, 12849, 8208,
-    12540, {f: 2, c: 12443}, {f: 2, c: 12541}, 12294, {f: 2, c: 12445},
-    {f: 10, c: 65097}, {f: 4, c: 65108}, {f: 14, c: 65113}, {f: 4, c: 65128},
-    12350, {f: 12, c: 12272}, 19970, {f: 3, c: 19972}, 19983, 19986, 19991,
-    {f: 3, c: 19999}, 20003, 20006, 20009, {f: 2, c: 20014}, 20017, 20019,
-    20021, 20023, 20028, {f: 3, c: 20032}, 20036, 20038, 20042, 20049, 20053,
-    20055, {f: 2, c: 20058}, {f: 4, c: 20066}, {f: 2, c: 20071},
-    {f: 6, c: 20074}, 20082, {f: 10, c: 20084}, {f: 3, c: 20095},
-    {f: 2, c: 20099}, [12037, 20101], 20103, 20106, 20112, {f: 2, c: 20118},
-    20121, {f: 2, c: 20124}, 20131, 20138, {f: 3, c: 20143}, 20148,
-    {f: 4, c: 20150}, {f: 3, c: 20156}, 20168, 20172, {f: 2, c: 20175}, 20178,
-    {f: 3, c: 20186}, 20192, 20194, {f: 2, c: 20198}, 20201, {f: 3, c: 20205},
-    20209, 20212, {f: 3, c: 20216}, 20220, 20222, 20224, {f: 7, c: 20226},
-    {f: 2, c: 20235}, {f: 5, c: 20242}, {f: 2, c: 20252}, 20257, 20259,
-    {f: 2, c: 20264}, {f: 3, c: 20268}, 20273, 20275, 20277, 20279, 20281,
-    20283, {f: 5, c: 20286}, {f: 2, c: 20292}, {f: 6, c: 20295}, 20306, 20308,
-    20310, {f: 2, c: 20321}, 20326, 20328, {f: 2, c: 20330}, {f: 2, c: 20333},
-    {f: 2, c: 20337}, 20341, {f: 4, c: 20343}, 20349, {f: 3, c: 20352}, 20357,
-    20359, 20362, 20364, 20366, 20368, {f: 2, c: 20370}, 20373,
-    {f: 3, c: 20376}, 20380, {f: 2, c: 20382}, {f: 2, c: 20385}, 20388, 20395,
-    20397, {f: 5, c: 20400}, {f: 9, c: 20406}, {f: 2, c: 20416},
-    {f: 4, c: 20422}, {f: 3, c: 20427}, {f: 5, c: 20434}, 20441, 20443, 20450,
-    {f: 2, c: 20452}, 20455, {f: 2, c: 20459}, 20464, 20466, {f: 4, c: 20468},
-    20473, {f: 3, c: 20475}, 20479, {f: 5, c: 20481}, {f: 2, c: 20487}, 20490,
-    20494, 20496, 20499, {f: 3, c: 20501}, 20507, {f: 2, c: 20509}, 20512,
-    {f: 3, c: 20514}, 20519, {f: 11, c: 20527}, 20539, 20541, {f: 4, c: 20543},
-    {f: 3, c: 20548}, {f: 2, c: 20554}, 20557, {f: 5, c: 20560},
-    {f: 4, c: 20566}, 20571, {f: 8, c: 20573}, {f: 6, c: 20582},
-    {f: 7, c: 20589}, {f: 3, c: 20600}, {f: 2, c: 20604}, {f: 4, c: 20609},
-    {f: 2, c: 20614}, {f: 4, c: 20617}, {f: 8, c: 20622}, 20631,
-    {f: 8, c: 20634}, 20644, 20646, {f: 2, c: 20650}, {f: 4, c: 20654}, 20662,
-    {f: 2, c: 20664}, {f: 2, c: 20668}, {f: 3, c: 20671}, {f: 2, c: 20675},
-    {f: 3, c: 20678}, {f: 5, c: 20682}, 20688, {f: 3, c: 20690},
-    {f: 3, c: 20695}, {f: 3, c: 20699}, {f: 6, c: 20703}, {f: 3, c: 20713},
-    {f: 4, c: 20719}, 20724, {f: 3, c: 20726}, 20730, {f: 4, c: 20732}, 20737,
-    20739, 20741, 20746, {f: 4, c: 20748}, 20753, 20755, {f: 2, c: 20758},
-    {f: 6, c: 20761}, 20768, {f: 8, c: 20770}, {f: 7, c: 20779},
-    {f: 4, c: 20787}, {f: 2, c: 20792}, {f: 2, c: 20797}, 20802, 20807, 20810,
-    20812, {f: 3, c: 20814}, 20819, {f: 3, c: 20823}, 20827, {f: 5, c: 20829},
-    {f: 2, c: 20835}, {f: 2, c: 20838}, 20842, 20847, 20850, 20858,
-    {f: 2, c: 20862}, {f: 2, c: 20867}, {f: 2, c: 20870}, {f: 2, c: 20874},
-    {f: 4, c: 20878}, {f: 2, c: 20883}, 20888, 20890, {f: 3, c: 20893}, 20897,
-    20899, {f: 5, c: 20902}, {f: 2, c: 20909}, 20916, {f: 3, c: 20920},
-    {f: 2, c: 20926}, {f: 3, c: 20929}, 20933, 20936, 20938, 20942, 20944,
-    {f: 9, c: 20946}, 20956, {f: 2, c: 20958}, {f: 2, c: 20962},
-    {f: 6, c: 20965}, 20972, 20974, 20978, 20980, 20983, 20990,
-    {f: 2, c: 20996}, 21001, {f: 2, c: 21003}, {f: 2, c: 21007},
-    {f: 3, c: 21011}, 21020, {f: 2, c: 21022}, {f: 3, c: 21025},
-    {f: 3, c: 21029}, 21034, 21036, 21039, {f: 2, c: 21041}, {f: 2, c: 21044},
-    21052, 21054, {f: 2, c: 21061}, {f: 2, c: 21064}, {f: 2, c: 21070},
-    {f: 2, c: 21074}, 21077, {f: 4, c: 21079}, 21085, {f: 2, c: 21087},
-    {f: 3, c: 21090}, 21094, 21096, {f: 3, c: 21099}, {f: 2, c: 21104}, 21107,
-    {f: 7, c: 21110}, 21118, 21120, {f: 3, c: 21124}, 21131, {f: 2, c: 21134},
-    21138, {f: 7, c: 21140}, 21148, {f: 4, c: 21156}, {f: 3, c: 21166},
-    {f: 10, c: 21172}, 21184, 21186, {f: 3, c: 21188}, 21192, 21194,
-    {f: 4, c: 21196}, 21201, {f: 2, c: 21203}, 21207, 21210, 21212,
-    {f: 2, c: 21216}, 21219, {f: 11, c: 21221}, {f: 3, c: 21234},
-    {f: 2, c: 21238}, {f: 3, c: 21243}, {f: 4, c: 21249}, 21255,
-    {f: 4, c: 21257}, 21262, {f: 4, c: 21265}, 21272, {f: 2, c: 21275},
-    {f: 2, c: 21278}, 21282, {f: 2, c: 21284}, {f: 3, c: 21287},
-    {f: 2, c: 21291}, 21296, {f: 6, c: 21298}, [12054, 21304],
-    {f: 2, c: 21308}, 21314, 21316, 21318, {f: 3, c: 21323}, 21328,
-    {f: 2, c: 21336}, 21339, 21341, 21349, 21352, 21354, {f: 2, c: 21356},
-    21362, 21366, 21369, {f: 4, c: 21371}, {f: 2, c: 21376}, 21379,
-    {f: 2, c: 21383}, 21386, {f: 7, c: 21390}, {f: 2, c: 21398},
-    {f: 2, c: 21403}, 21406, 21409, 21412, 21415, {f: 3, c: 21418},
-    {f: 3, c: 21423}, 21427, 21429, {f: 4, c: 21431}, {f: 3, c: 21436}, 21440,
-    {f: 4, c: 21444}, {f: 3, c: 21454}, {f: 2, c: 21458}, 21461, 21466,
-    {f: 3, c: 21468}, 21473, 21479, 21492, 21498, {f: 3, c: 21502}, 21506,
-    21509, 21511, 21515, 21524, {f: 3, c: 21528}, 21532, 21538,
-    {f: 2, c: 21540}, 21546, 21552, 21555, {f: 2, c: 21558}, 21562, 21565,
-    21567, {f: 2, c: 21569}, {f: 2, c: 21572}, 21575, 21577, {f: 4, c: 21580},
-    21585, 21594, {f: 5, c: 21597}, 21603, 21605, 21607, {f: 8, c: 21609},
-    21620, {f: 2, c: 21625}, {f: 2, c: 21630}, 21633, 21635, 21637,
-    {f: 4, c: 21639}, 21645, 21649, 21651, {f: 2, c: 21655}, 21660,
-    {f: 5, c: 21662}, 21669, 21678, 21680, 21682, {f: 3, c: 21685},
-    {f: 2, c: 21689}, 21694, 21699, 21701, {f: 2, c: 21706}, 21718, 21720,
-    21723, 21728, {f: 3, c: 21730}, {f: 2, c: 21739}, {f: 3, c: 21743},
-    {f: 6, c: 21748}, 21755, 21758, 21760, {f: 2, c: 21762}, 21765, 21768,
-    {f: 5, c: 21770}, {f: 2, c: 21778}, {f: 6, c: 21781}, {f: 4, c: 21788},
-    21793, {f: 2, c: 21797}, {f: 2, c: 21800}, 21803, 21805, 21810,
-    {f: 3, c: 21812}, {f: 4, c: 21816}, 21821, 21824, 21826, 21829,
-    {f: 2, c: 21831}, {f: 4, c: 21835}, {f: 2, c: 21841}, 21844,
-    {f: 5, c: 21847}, 21853, {f: 2, c: 21855}, {f: 2, c: 21858},
-    {f: 2, c: 21864}, 21867, {f: 6, c: 21871}, {f: 2, c: 21881}, 21885, 21887,
-    {f: 2, c: 21893}, {f: 3, c: 21900}, 21904, {f: 2, c: 21906},
-    {f: 3, c: 21909}, {f: 2, c: 21914}, 21918, {f: 7, c: 21920},
-    {f: 2, c: 21928}, 21931, 21933, {f: 2, c: 21935}, 21940, 21942, 21944,
-    21946, 21948, {f: 5, c: 21951}, 21960, {f: 2, c: 21962}, {f: 2, c: 21967},
-    21973, {f: 3, c: 21975}, 21979, 21982, 21984, 21986, 21991,
-    {f: 2, c: 21997}, {f: 2, c: 22000}, 22004, {f: 5, c: 22008}, 22015,
-    {f: 4, c: 22018}, 22023, {f: 2, c: 22026}, {f: 4, c: 22032}, 22037,
-    {f: 2, c: 22041}, 22045, {f: 3, c: 22048}, {f: 2, c: 22053}, 22056,
-    {f: 2, c: 22058}, 22067, 22071, 22074, {f: 3, c: 22076}, 22080,
-    {f: 10, c: 22082}, {f: 5, c: 22095}, {f: 2, c: 22101}, {f: 2, c: 22106},
-    {f: 2, c: 22110}, 22113, 22115, 22119, {f: 2, c: 22125}, 22128, 22131,
-    22133, 22135, 22138, {f: 3, c: 22141}, {f: 4, c: 22145}, {f: 4, c: 22152},
-    22157, {f: 3, c: 22160}, 22164, {f: 3, c: 22166}, {f: 9, c: 22170},
-    {f: 2, c: 22180}, 22183, {f: 5, c: 22185}, {f: 3, c: 22192}, 22197,
-    {f: 4, c: 22200}, {f: 3, c: 22205}, {f: 2, c: 22211}, {f: 2, c: 22214},
-    22219, {f: 4, c: 22221}, {f: 2, c: 22226}, {f: 2, c: 22229},
-    {f: 2, c: 22232}, 22236, 22243, {f: 6, c: 22245}, 22252, {f: 2, c: 22254},
-    {f: 2, c: 22258}, {f: 3, c: 22262}, {f: 2, c: 22267}, {f: 3, c: 22272},
-    22277, 22284, {f: 4, c: 22286}, {f: 2, c: 22292}, 22295, {f: 3, c: 22297},
-    {f: 2, c: 22301}, {f: 3, c: 22304}, {f: 4, c: 22308}, 22315,
-    {f: 2, c: 22321}, {f: 5, c: 22324}, {f: 2, c: 22332}, 22335, 22337,
-    {f: 4, c: 22339}, {f: 2, c: 22344}, 22347, {f: 5, c: 22354},
-    {f: 2, c: 22360}, {f: 2, c: 22370}, 22373, 22375, 22380, 22382,
-    {f: 3, c: 22384}, {f: 2, c: 22388}, {f: 3, c: 22392}, {f: 5, c: 22397},
-    {f: 4, c: 22407}, {f: 5, c: 22413}, {f: 7, c: 22420}, {f: 4, c: 22428},
-    22437, 22440, 22442, 22444, {f: 3, c: 22447}, 22451, {f: 3, c: 22453},
-    {f: 9, c: 22457}, {f: 7, c: 22468}, {f: 2, c: 22476}, {f: 2, c: 22480},
-    22483, {f: 2, c: 22486}, {f: 2, c: 22491}, 22494, {f: 2, c: 22498},
-    {f: 8, c: 22501}, 22510, {f: 4, c: 22512}, {f: 2, c: 22517},
-    {f: 2, c: 22523}, {f: 2, c: 22526}, 22529, {f: 2, c: 22531},
-    {f: 2, c: 22536}, 22540, {f: 3, c: 22542}, {f: 3, c: 22546},
-    {f: 2, c: 22551}, {f: 3, c: 22554}, 22559, {f: 2, c: 22562},
-    {f: 5, c: 22565}, {f: 4, c: 22571}, {f: 2, c: 22578}, {f: 14, c: 22582},
-    {f: 5, c: 22597}, 22606, 22608, 22611, {f: 2, c: 22613}, {f: 5, c: 22617},
-    {f: 3, c: 22623}, 22627, {f: 5, c: 22630}, {f: 8, c: 22637},
-    {f: 3, c: 22646}, {f: 4, c: 22650}, 22655, 22658, 22660, {f: 3, c: 22662},
-    {f: 7, c: 22667}, {f: 5, c: 22676}, 22683, 22685, {f: 8, c: 22688},
-    {f: 4, c: 22698}, {f: 4, c: 22703}, {f: 7, c: 22708}, 22717,
-    {f: 2, c: 22719}, {f: 3, c: 22722}, 22726, {f: 9, c: 22728}, 22738, 22740,
-    {f: 2, c: 22742}, {f: 3, c: 22747}, 22753, 22755, {f: 4, c: 22757}, 22762,
-    22765, {f: 2, c: 22769}, {f: 2, c: 22772}, {f: 2, c: 22775},
-    {f: 2, c: 22779}, {f: 4, c: 22782}, 22787, {f: 2, c: 22789},
-    {f: 2, c: 22792}, [12066, 22794], {f: 2, c: 22795}, 22798,
-    {f: 4, c: 22800}, {f: 2, c: 22807}, 22811, {f: 2, c: 22813},
-    {f: 2, c: 22816}, 22819, 22822, 22824, 22828, 22832, {f: 2, c: 22834},
-    {f: 2, c: 22837}, 22843, 22845, {f: 2, c: 22847}, 22851, {f: 2, c: 22853},
-    22858, {f: 2, c: 22860}, 22864, {f: 2, c: 22866}, 22873, {f: 5, c: 22875},
-    22881, {f: 2, c: 22883}, {f: 3, c: 22886}, 22891, 22893, {f: 4, c: 22895},
-    22901, 22903, {f: 3, c: 22906}, {f: 3, c: 22910}, 22917, 22921,
-    {f: 2, c: 22923}, {f: 4, c: 22926}, {f: 2, c: 22932}, 22936,
-    {f: 3, c: 22938}, {f: 4, c: 22943}, {f: 2, c: 22950}, {f: 2, c: 22956},
-    {f: 2, c: 22960}, {f: 6, c: 22963}, 22970, {f: 2, c: 22972},
-    {f: 7, c: 22975}, {f: 3, c: 22983}, {f: 4, c: 22988}, {f: 2, c: 22997},
-    23001, 23003, {f: 5, c: 23006}, 23012, {f: 2, c: 23014}, {f: 3, c: 23017},
-    {f: 12, c: 23021}, 23034, {f: 3, c: 23036}, 23040, 23042, {f: 2, c: 23050},
-    {f: 4, c: 23053}, 23058, {f: 4, c: 23060}, {f: 3, c: 23065},
-    {f: 2, c: 23069}, {f: 2, c: 23073}, 23076, {f: 3, c: 23078},
-    {f: 7, c: 23082}, 23091, 23093, {f: 5, c: 23095}, {f: 3, c: 23101},
-    {f: 4, c: 23106}, {f: 2, c: 23111}, {f: 10, c: 23115}, {f: 4, c: 23126},
-    {f: 7, c: 23131}, {f: 3, c: 23139}, {f: 2, c: 23144}, {f: 2, c: 23147},
-    {f: 6, c: 23150}, {f: 2, c: 23160}, {f: 4, c: 23163}, {f: 18, c: 23168},
-    {f: 7, c: 23187}, {f: 11, c: 23196}, {f: 2, c: 23208}, {f: 7, c: 23211},
-    23220, {f: 2, c: 23222}, {f: 4, c: 23225}, {f: 2, c: 23231},
-    {f: 6, c: 23235}, {f: 2, c: 23242}, {f: 5, c: 23245}, 23251, 23253,
-    {f: 3, c: 23257}, {f: 3, c: 23261}, 23266, {f: 2, c: 23268},
-    {f: 2, c: 23271}, 23274, {f: 5, c: 23276}, {f: 3, c: 23282},
-    {f: 5, c: 23286}, {f: 4, c: 23292}, {f: 7, c: 23297}, 23306,
-    {f: 9, c: 23309}, 23320, {f: 7, c: 23322}, {f: 8, c: 23330},
-    {f: 5, c: 23339}, 23345, 23347, {f: 2, c: 23349}, {f: 7, c: 23353},
-    {f: 11, c: 23361}, {f: 3, c: 23373}, 23378, 23382, 23390, {f: 2, c: 23392},
-    {f: 2, c: 23399}, {f: 3, c: 23405}, 23410, 23412, {f: 2, c: 23414}, 23417,
-    {f: 2, c: 23419}, 23422, 23426, 23430, 23434, {f: 2, c: 23437},
-    {f: 3, c: 23440}, 23444, 23446, 23455, {f: 3, c: 23463}, {f: 4, c: 23468},
-    {f: 2, c: 23473}, 23479, {f: 3, c: 23482}, {f: 2, c: 23488}, 23491,
-    {f: 4, c: 23496}, {f: 3, c: 23501}, 23505, {f: 9, c: 23508}, 23520, 23523,
-    23530, 23533, 23535, {f: 4, c: 23537}, 23543, {f: 2, c: 23549}, 23552,
-    {f: 2, c: 23554}, 23557, 23564, 23568, {f: 2, c: 23570}, 23575, 23577,
-    23579, {f: 4, c: 23582}, 23587, 23590, {f: 4, c: 23592}, {f: 4, c: 23597},
-    {f: 2, c: 23602}, {f: 2, c: 23605}, {f: 2, c: 23619}, {f: 2, c: 23622},
-    {f: 2, c: 23628}, {f: 3, c: 23634}, {f: 3, c: 23638}, {f: 4, c: 23642},
-    23647, 23655, {f: 3, c: 23657}, 23661, 23664, {f: 7, c: 23666},
-    {f: 4, c: 23675}, 23680, {f: 5, c: 23683}, {f: 3, c: 23689},
-    {f: 2, c: 23694}, {f: 2, c: 23698}, 23701, {f: 4, c: 23709},
-    {f: 5, c: 23716}, 23722, {f: 3, c: 23726}, 23730, 23732, 23734,
-    {f: 4, c: 23737}, 23742, 23744, {f: 2, c: 23746}, {f: 6, c: 23749},
-    {f: 6, c: 23756}, {f: 6, c: 23763}, {f: 7, c: 23770}, {f: 2, c: 23778},
-    23783, 23785, {f: 2, c: 23787}, {f: 2, c: 23790}, {f: 3, c: 23793}, 23797,
-    {f: 4, c: 23799}, 23804, {f: 4, c: 23806}, {f: 2, c: 23812},
-    {f: 5, c: 23816}, {f: 5, c: 23823}, 23829, {f: 3, c: 23832},
-    {f: 2, c: 23836}, {f: 5, c: 23839}, 23845, 23848, {f: 2, c: 23850},
-    {f: 5, c: 23855}, {f: 8, c: 23861}, {f: 8, c: 23871}, {f: 2, c: 23880},
-    {f: 3, c: 23885}, {f: 7, c: 23889}, {f: 2, c: 23897}, 23900,
-    {f: 11, c: 23902}, 23914, {f: 2, c: 23917}, {f: 4, c: 23920},
-    {f: 12, c: 23925}, 23939, {f: 2, c: 23941}, {f: 15, c: 23944}, 23960,
-    {f: 3, c: 23962}, {f: 2, c: 23966}, {f: 6, c: 23969}, {f: 15, c: 23976},
-    23993, 23995, {f: 8, c: 23997}, {f: 5, c: 24006}, 24012, {f: 4, c: 24014},
-    24019, {f: 6, c: 24021}, 24028, {f: 2, c: 24031}, {f: 2, c: 24035}, 24042,
-    {f: 2, c: 24044}, {f: 2, c: 24053}, {f: 5, c: 24056}, {f: 2, c: 24063},
-    24068, 24071, {f: 3, c: 24073}, {f: 2, c: 24077}, {f: 2, c: 24082}, 24087,
-    {f: 7, c: 24094}, {f: 3, c: 24104}, 24108, {f: 2, c: 24111}, 24114,
-    {f: 2, c: 24116}, {f: 2, c: 24121}, {f: 2, c: 24126}, 24129,
-    {f: 6, c: 24134}, {f: 7, c: 24141}, 24150, {f: 2, c: 24153},
-    {f: 2, c: 24156}, 24160, {f: 7, c: 24164}, {f: 5, c: 24173}, 24181, 24183,
-    {f: 3, c: 24193}, 24197, {f: 2, c: 24200}, {f: 3, c: 24204}, 24210, 24216,
-    24219, 24221, {f: 4, c: 24225}, {f: 3, c: 24232}, 24236, {f: 5, c: 24238},
-    24244, {f: 4, c: 24250}, {f: 10, c: 24255}, {f: 6, c: 24267},
-    {f: 2, c: 24276}, {f: 4, c: 24279}, {f: 3, c: 24284}, {f: 4, c: 24292},
-    24297, 24299, {f: 6, c: 24301}, 24309, {f: 2, c: 24312}, {f: 3, c: 24315},
-    {f: 3, c: 24325}, 24329, {f: 3, c: 24332}, 24336, 24338, 24340, 24342,
-    {f: 2, c: 24345}, {f: 3, c: 24348}, {f: 4, c: 24353}, 24360,
-    {f: 2, c: 24363}, 24366, 24368, 24370, 24372, {f: 3, c: 24374}, 24379,
-    {f: 3, c: 24381}, {f: 5, c: 24385}, 24391, {f: 3, c: 24393}, 24397, 24399,
-    24401, 24404, {f: 3, c: 24410}, {f: 3, c: 24414}, 24419, 24421,
-    {f: 2, c: 24423}, 24427, {f: 2, c: 24430}, 24434, {f: 3, c: 24436}, 24440,
-    24442, {f: 3, c: 24445}, 24451, 24454, {f: 3, c: 24461}, {f: 2, c: 24467},
-    24470, {f: 2, c: 24474}, 24477, 24479, {f: 6, c: 24482}, {f: 2, c: 24491},
-    {f: 6, c: 24495}, 24502, 24504, {f: 2, c: 24506}, {f: 5, c: 24510},
-    {f: 2, c: 24519}, {f: 2, c: 24522}, 24526, {f: 3, c: 24531},
-    {f: 3, c: 24538}, {f: 2, c: 24542}, {f: 2, c: 24546}, {f: 2, c: 24549},
-    {f: 2, c: 24552}, 24556, {f: 2, c: 24559}, {f: 3, c: 24562},
-    {f: 2, c: 24566}, {f: 2, c: 24569}, 24572, {f: 3, c: 24583},
-    {f: 2, c: 24587}, {f: 2, c: 24592}, 24595, {f: 2, c: 24599}, 24602,
-    {f: 2, c: 24606}, {f: 3, c: 24610}, {f: 3, c: 24620}, {f: 5, c: 24624},
-    {f: 5, c: 24630}, {f: 2, c: 24637}, 24640, {f: 7, c: 24644}, 24652,
-    {f: 2, c: 24654}, 24657, {f: 2, c: 24659}, {f: 3, c: 24662},
-    {f: 2, c: 24667}, {f: 4, c: 24670}, {f: 2, c: 24677}, 24686,
-    {f: 2, c: 24689}, {f: 2, c: 24692}, 24695, 24702, {f: 3, c: 24704},
-    {f: 4, c: 24709}, {f: 2, c: 24714}, {f: 4, c: 24718}, 24723, 24725,
-    {f: 3, c: 24727}, 24732, 24734, {f: 2, c: 24737}, {f: 2, c: 24740}, 24743,
-    {f: 2, c: 24745}, 24750, 24752, 24755, 24759, {f: 2, c: 24761},
-    {f: 8, c: 24765}, {f: 3, c: 24775}, {f: 5, c: 24780}, {f: 3, c: 24786},
-    {f: 2, c: 24790}, 24793, 24795, 24798, {f: 4, c: 24802}, 24810, 24821,
-    {f: 2, c: 24823}, {f: 4, c: 24828}, {f: 4, c: 24834}, 24839,
-    {f: 3, c: 24842}, {f: 5, c: 24848}, {f: 4, c: 24854}, {f: 2, c: 24861},
-    {f: 2, c: 24865}, 24869, {f: 3, c: 24872}, {f: 8, c: 24876},
-    {f: 2, c: 24885}, {f: 6, c: 24888}, {f: 8, c: 24896}, 24905, 24909,
-    {f: 2, c: 24911}, {f: 3, c: 24914}, {f: 2, c: 24918}, 24921,
-    {f: 2, c: 24923}, 24926, {f: 2, c: 24928}, {f: 2, c: 24933}, 24937,
-    {f: 2, c: 24940}, 24943, {f: 2, c: 24945}, 24948, {f: 10, c: 24952},
-    {f: 7, c: 24963}, {f: 2, c: 24972}, 24975, 24979, {f: 5, c: 24981},
-    {f: 2, c: 24987}, {f: 6, c: 24990}, {f: 2, c: 24997}, 25002, 25005,
-    {f: 3, c: 25007}, {f: 3, c: 25011}, {f: 6, c: 25016}, {f: 3, c: 25023},
-    {f: 4, c: 25027}, {f: 4, c: 25037}, 25043, {f: 9, c: 25045},
-    {f: 3, c: 25056}, {f: 2, c: 25060}, 25063, {f: 9, c: 25065},
-    {f: 2, c: 25075}, 25081, 25083, 25085, {f: 5, c: 25089}, 25097, 25107,
-    25113, {f: 3, c: 25116}, 25120, 25123, 25126, {f: 2, c: 25128}, 25131,
-    25133, 25135, 25137, 25141, [12094, 25142], {f: 5, c: 25144}, 25154,
-    {f: 3, c: 25156}, 25162, {f: 2, c: 25167}, {f: 3, c: 25173},
-    {f: 2, c: 25177}, {f: 7, c: 25180}, {f: 2, c: 25188}, 25192,
-    {f: 2, c: 25201}, {f: 2, c: 25204}, {f: 2, c: 25207}, {f: 2, c: 25210},
-    25213, {f: 3, c: 25217}, {f: 4, c: 25221}, {f: 6, c: 25227}, 25236, 25241,
-    {f: 3, c: 25244}, 25251, {f: 2, c: 25254}, {f: 2, c: 25257},
-    {f: 4, c: 25261}, {f: 3, c: 25266}, {f: 3, c: 25270}, 25274, 25278,
-    {f: 2, c: 25280}, 25283, 25291, 25295, 25297, 25301, {f: 2, c: 25309},
-    {f: 2, c: 25312}, 25316, {f: 2, c: 25322}, 25328, 25330, 25333,
-    {f: 4, c: 25336}, 25344, {f: 4, c: 25347}, {f: 4, c: 25354},
-    {f: 2, c: 25359}, {f: 4, c: 25362}, {f: 3, c: 25367}, 25372,
-    {f: 2, c: 25382}, 25385, {f: 3, c: 25388}, {f: 2, c: 25392},
-    {f: 6, c: 25395}, {f: 2, c: 25403}, {f: 3, c: 25407}, 25412,
-    {f: 2, c: 25415}, 25418, {f: 4, c: 25425}, {f: 8, c: 25430}, 25440,
-    {f: 3, c: 25444}, 25450, 25452, {f: 2, c: 25455}, {f: 3, c: 25459},
-    {f: 2, c: 25464}, {f: 4, c: 25468}, 25473, {f: 2, c: 25477}, 25483, 25485,
-    25489, {f: 3, c: 25491}, 25495, {f: 7, c: 25497}, 25505, 25508, 25510,
-    25515, 25519, {f: 2, c: 25521}, {f: 2, c: 25525}, 25529, 25531, 25533,
-    25535, {f: 3, c: 25537}, 25541, {f: 2, c: 25543}, {f: 3, c: 25546}, 25553,
-    {f: 3, c: 25555}, {f: 3, c: 25559}, {f: 3, c: 25563}, 25567, 25570,
-    {f: 5, c: 25572}, {f: 2, c: 25579}, {f: 3, c: 25583}, 25587, 25589, 25591,
-    {f: 4, c: 25593}, 25598, {f: 2, c: 25603}, {f: 5, c: 25606}, 25614,
-    {f: 2, c: 25617}, {f: 2, c: 25621}, {f: 3, c: 25624}, 25629, 25631,
-    {f: 4, c: 25634}, {f: 3, c: 25639}, 25643, {f: 6, c: 25646}, 25653,
-    {f: 3, c: 25655}, {f: 2, c: 25659}, 25662, 25664, {f: 2, c: 25666}, 25673,
-    {f: 6, c: 25675}, 25683, {f: 3, c: 25685}, {f: 3, c: 25689}, 25693,
-    {f: 7, c: 25696}, 25704, {f: 3, c: 25706}, 25710, {f: 3, c: 25712},
-    {f: 2, c: 25716}, 25719, {f: 6, c: 25724}, 25731, 25734, {f: 8, c: 25737},
-    25748, {f: 2, c: 25751}, {f: 4, c: 25754}, {f: 3, c: 25760},
-    {f: 3, c: 25766}, 25770, 25775, 25777, 25780, 25782, 25785, 25789, 25795,
-    25798, {f: 2, c: 25800}, 25804, 25807, 25809, 25811, {f: 2, c: 25813},
-    25817, {f: 3, c: 25819}, 25823, 25825, 25827, 25829, {f: 5, c: 25831},
-    {f: 2, c: 25837}, 25843, {f: 2, c: 25845}, {f: 2, c: 25848}, 25853, 25855,
-    {f: 3, c: 25857}, 25861, {f: 2, c: 25863}, {f: 5, c: 25866},
-    {f: 2, c: 25872}, 25875, 25877, 25879, 25882, 25884, {f: 4, c: 25886},
-    {f: 4, c: 25894}, 25901, {f: 4, c: 25904}, 25911, 25914, {f: 2, c: 25916},
-    {f: 5, c: 25920}, {f: 2, c: 25926}, {f: 2, c: 25930}, {f: 2, c: 25933},
-    25936, {f: 3, c: 25938}, 25944, 25946, 25948, {f: 3, c: 25951},
-    {f: 2, c: 25956}, {f: 4, c: 25959}, {f: 3, c: 25965}, 25969, 25971, 25974,
-    {f: 9, c: 25977}, {f: 3, c: 25988}, {f: 3, c: 25992}, {f: 3, c: 25997},
-    26002, 26004, 26006, 26008, 26010, {f: 2, c: 26013}, 26016,
-    {f: 2, c: 26018}, 26022, 26024, 26026, 26030, {f: 6, c: 26033}, 26040,
-    {f: 2, c: 26042}, {f: 3, c: 26046}, 26050, {f: 4, c: 26055}, 26061,
-    {f: 2, c: 26064}, {f: 3, c: 26067}, {f: 8, c: 26072}, 26081,
-    {f: 2, c: 26083}, {f: 2, c: 26090}, {f: 4, c: 26098}, {f: 2, c: 26104},
-    {f: 5, c: 26107}, 26113, {f: 2, c: 26116}, {f: 3, c: 26119}, 26123, 26125,
-    {f: 3, c: 26128}, {f: 3, c: 26134}, {f: 3, c: 26138}, 26142,
-    {f: 4, c: 26145}, 26150, {f: 4, c: 26153}, 26158, 26160, {f: 2, c: 26162},
-    {f: 5, c: 26167}, 26173, {f: 2, c: 26175}, {f: 7, c: 26180},
-    {f: 2, c: 26189}, {f: 2, c: 26192}, {f: 2, c: 26200}, {f: 2, c: 26203},
-    26206, 26208, {f: 2, c: 26210}, 26213, 26215, {f: 5, c: 26217},
-    {f: 3, c: 26225}, 26229, {f: 2, c: 26232}, {f: 3, c: 26235},
-    {f: 3, c: 26239}, 26243, {f: 2, c: 26245}, {f: 2, c: 26250},
-    {f: 4, c: 26253}, {f: 4, c: 26258}, {f: 5, c: 26264}, {f: 4, c: 26270},
-    {f: 4, c: 26275}, {f: 2, c: 26281}, {f: 2, c: 26284}, {f: 5, c: 26287},
-    {f: 4, c: 26293}, {f: 4, c: 26298}, {f: 5, c: 26303}, 26309, 26312,
-    {f: 12, c: 26314}, {f: 2, c: 26327}, 26330, {f: 2, c: 26334},
-    {f: 5, c: 26337}, {f: 2, c: 26343}, {f: 2, c: 26346}, {f: 3, c: 26349},
-    26353, {f: 2, c: 26357}, {f: 2, c: 26362}, 26365, {f: 2, c: 26369},
-    {f: 4, c: 26372}, 26380, {f: 2, c: 26382}, {f: 3, c: 26385}, 26390,
-    {f: 3, c: 26392}, 26396, 26398, {f: 6, c: 26400}, 26409, 26414, 26416,
-    {f: 2, c: 26418}, {f: 4, c: 26422}, {f: 2, c: 26427}, {f: 2, c: 26430},
-    26433, {f: 2, c: 26436}, 26439, {f: 2, c: 26442}, 26445, 26450,
-    {f: 2, c: 26452}, {f: 5, c: 26455}, 26461, {f: 3, c: 26466},
-    {f: 2, c: 26470}, {f: 2, c: 26475}, 26478, 26484, 26486, {f: 4, c: 26488},
-    26493, 26496, {f: 2, c: 26498}, {f: 2, c: 26501}, 26504, 26506,
-    {f: 4, c: 26508}, {f: 4, c: 26513}, 26518, 26521, 26523, {f: 3, c: 26527},
-    26532, 26534, 26537, 26540, 26542, {f: 2, c: 26545}, 26548,
-    {f: 8, c: 26553}, 26562, {f: 10, c: 26565}, {f: 3, c: 26581}, 26587, 26591,
-    26593, {f: 2, c: 26595}, {f: 3, c: 26598}, {f: 2, c: 26602},
-    {f: 2, c: 26605}, 26610, {f: 8, c: 26613}, 26622, {f: 4, c: 26625}, 26630,
-    26637, 26640, 26642, {f: 2, c: 26644}, {f: 5, c: 26648}, {f: 3, c: 26654},
-    {f: 7, c: 26658}, {f: 7, c: 26667}, {f: 3, c: 26676}, {f: 2, c: 26682},
-    26687, 26695, 26699, 26701, 26703, 26706, {f: 10, c: 26710}, 26730,
-    {f: 8, c: 26732}, 26741, {f: 9, c: 26744}, 26754, 26756, {f: 8, c: 26759},
-    {f: 3, c: 26768}, {f: 3, c: 26772}, {f: 4, c: 26777}, 26782,
-    {f: 2, c: 26784}, {f: 3, c: 26787}, {f: 4, c: 26793}, 26798,
-    {f: 2, c: 26801}, 26804, {f: 10, c: 26806}, 26817, {f: 6, c: 26819}, 26826,
-    26828, {f: 4, c: 26830}, {f: 2, c: 26835}, 26841, {f: 4, c: 26843},
-    {f: 2, c: 26849}, {f: 3, c: 26852}, {f: 6, c: 26856}, 26863,
-    {f: 3, c: 26866}, {f: 3, c: 26870}, 26875, {f: 4, c: 26877},
-    {f: 3, c: 26882}, {f: 5, c: 26886}, 26892, 26897, {f: 12, c: 26899},
-    {f: 3, c: 26913}, {f: 8, c: 26917}, {f: 2, c: 26926}, {f: 3, c: 26929},
-    {f: 4, c: 26933}, {f: 3, c: 26938}, 26942, {f: 2, c: 26944},
-    {f: 7, c: 26947}, {f: 8, c: 26955}, {f: 2, c: 26965}, {f: 2, c: 26968},
-    {f: 2, c: 26971}, 26975, {f: 2, c: 26977}, {f: 2, c: 26980}, 26983,
-    {f: 2, c: 26985}, 26988, {f: 2, c: 26991}, {f: 3, c: 26994}, 26998,
-    {f: 2, c: 27002}, {f: 3, c: 27005}, 27009, 27011, 27013, {f: 3, c: 27018},
-    {f: 6, c: 27022}, {f: 2, c: 27030}, {f: 2, c: 27033}, {f: 10, c: 27037},
-    27049, 27052, {f: 2, c: 27055}, {f: 2, c: 27058}, {f: 2, c: 27061},
-    {f: 3, c: 27064}, {f: 3, c: 27068}, 27072, {f: 8, c: 27074}, 27087,
-    {f: 3, c: 27089}, {f: 6, c: 27093}, {f: 3, c: 27100}, {f: 6, c: 27105},
-    {f: 5, c: 27112}, {f: 4, c: 27118}, {f: 9, c: 27124}, 27134, 27136,
-    {f: 2, c: 27139}, {f: 4, c: 27142}, {f: 8, c: 27147}, {f: 3, c: 27156},
-    {f: 4, c: 27162}, 27168, 27170, {f: 4, c: 27172}, 27177, {f: 4, c: 27179},
-    27184, {f: 3, c: 27186}, {f: 2, c: 27190}, {f: 2, c: 27195},
-    {f: 5, c: 27199}, {f: 2, c: 27205}, {f: 2, c: 27209}, {f: 4, c: 27212},
-    {f: 7, c: 27217}, 27226, {f: 3, c: 27228}, 27232, {f: 2, c: 27235},
-    {f: 11, c: 27238}, {f: 7, c: 27250}, {f: 2, c: 27258}, {f: 3, c: 27261},
-    {f: 3, c: 27265}, {f: 4, c: 27269}, {f: 4, c: 27274}, 27279,
-    {f: 2, c: 27282}, {f: 2, c: 27285}, {f: 4, c: 27288}, {f: 3, c: 27293},
-    27297, {f: 5, c: 27300}, 27306, {f: 2, c: 27309}, {f: 3, c: 27312},
-    {f: 4, c: 27316}, {f: 2, c: 27321}, {f: 7, c: 27324}, {f: 15, c: 27332},
-    {f: 6, c: 27348}, 27356, {f: 7, c: 27360}, 27369, 27371, {f: 6, c: 27373},
-    {f: 4, c: 27380}, {f: 2, c: 27385}, {f: 8, c: 27388}, {f: 5, c: 27397},
-    {f: 4, c: 27403}, {f: 2, c: 27408}, {f: 3, c: 27411}, {f: 7, c: 27415},
-    27423, {f: 2, c: 27429}, {f: 10, c: 27432}, {f: 4, c: 27443}, 27448,
-    {f: 2, c: 27451}, {f: 4, c: 27455}, {f: 2, c: 27460}, 27464,
-    {f: 2, c: 27466}, {f: 3, c: 27469}, {f: 8, c: 27473}, {f: 5, c: 27482},
-    27488, {f: 2, c: 27496}, {f: 7, c: 27499}, {f: 4, c: 27507}, 27514,
-    {f: 4, c: 27517}, 27525, 27528, 27532, {f: 4, c: 27534}, {f: 2, c: 27540},
-    27543, 27545, {f: 2, c: 27548}, {f: 2, c: 27551}, {f: 2, c: 27554},
-    {f: 5, c: 27557}, {f: 2, c: 27564}, {f: 2, c: 27568}, 27574,
-    {f: 2, c: 27576}, {f: 3, c: 27580}, 27584, {f: 2, c: 27587},
-    {f: 4, c: 27591}, 27596, 27598, {f: 2, c: 27600}, 27608, 27610,
-    {f: 5, c: 27612}, {f: 8, c: 27618}, {f: 3, c: 27628}, {f: 3, c: 27632},
-    27636, {f: 3, c: 27638}, {f: 3, c: 27642}, 27646, {f: 5, c: 27648},
-    {f: 3, c: 27657}, 27662, 27666, 27671, {f: 3, c: 27676}, 27680, 27685,
-    27693, 27697, 27699, {f: 2, c: 27702}, {f: 4, c: 27705}, {f: 2, c: 27710},
-    {f: 3, c: 27715}, 27720, {f: 5, c: 27723}, {f: 3, c: 27729}, 27734,
-    {f: 3, c: 27736}, {f: 2, c: 27746}, {f: 3, c: 27749}, {f: 5, c: 27755},
-    27761, 27763, 27765, {f: 2, c: 27767}, {f: 3, c: 27770}, {f: 2, c: 27775},
-    27780, 27783, {f: 2, c: 27786}, {f: 2, c: 27789}, {f: 2, c: 27793},
-    {f: 4, c: 27797}, 27802, {f: 3, c: 27804}, 27808, 27810, 27816, 27820,
-    {f: 2, c: 27823}, {f: 4, c: 27828}, 27834, {f: 4, c: 27840},
-    {f: 3, c: 27846}, 27851, {f: 3, c: 27853}, {f: 2, c: 27857},
-    {f: 3, c: 27864}, {f: 2, c: 27868}, 27871, 27876, {f: 2, c: 27878}, 27881,
-    {f: 2, c: 27884}, 27890, 27892, 27897, {f: 2, c: 27903}, {f: 2, c: 27906},
-    {f: 2, c: 27909}, {f: 3, c: 27912}, 27917, {f: 3, c: 27919},
-    {f: 4, c: 27923}, 27928, {f: 2, c: 27932}, {f: 6, c: 27935}, 27942,
-    {f: 2, c: 27944}, {f: 2, c: 27948}, {f: 2, c: 27951}, 27956,
-    {f: 3, c: 27958}, 27962, {f: 2, c: 27967}, 27970, 27972, 27977, 27980,
-    27984, {f: 4, c: 27989}, 27995, 27997, 27999, {f: 2, c: 28001},
-    {f: 2, c: 28004}, {f: 2, c: 28007}, {f: 3, c: 28011}, {f: 4, c: 28016},
-    {f: 2, c: 28021}, {f: 2, c: 28026}, {f: 5, c: 28029}, {f: 2, c: 28035},
-    28038, {f: 2, c: 28042}, 28045, {f: 2, c: 28047}, 28050, {f: 5, c: 28054},
-    28060, 28066, 28069, {f: 2, c: 28076}, {f: 2, c: 28080}, {f: 2, c: 28083},
-    {f: 2, c: 28086}, {f: 6, c: 28089}, {f: 3, c: 28097}, {f: 3, c: 28104},
-    {f: 4, c: 28109}, {f: 4, c: 28114}, 28119, {f: 3, c: 28122}, 28127,
-    {f: 2, c: 28130}, 28133, {f: 3, c: 28135}, 28141, {f: 2, c: 28143}, 28146,
-    28148, 28152, {f: 8, c: 28157}, {f: 4, c: 28166}, 28171, 28175,
-    {f: 2, c: 28178}, 28181, {f: 2, c: 28184}, {f: 2, c: 28187},
-    {f: 2, c: 28190}, 28194, {f: 2, c: 28199}, 28202, 28206, {f: 2, c: 28208},
-    28211, {f: 3, c: 28213}, 28217, {f: 3, c: 28219}, {f: 4, c: 28223},
-    {f: 8, c: 28229}, {f: 4, c: 28239}, 28245, 28247, {f: 2, c: 28249},
-    {f: 2, c: 28252}, {f: 11, c: 28256}, {f: 2, c: 28268}, {f: 14, c: 28272},
-    {f: 3, c: 28288}, 28292, {f: 2, c: 28295}, {f: 5, c: 28298},
-    {f: 5, c: 28305}, 28311, {f: 3, c: 28313}, 28318, {f: 2, c: 28320},
-    {f: 2, c: 28323}, 28326, {f: 2, c: 28328}, {f: 4, c: 28331}, 28336, 28339,
-    28341, {f: 2, c: 28344}, 28348, {f: 3, c: 28350}, 28355, 28358,
-    {f: 3, c: 28360}, 28365, 28368, 28370, 28374, {f: 2, c: 28376},
-    {f: 3, c: 28379}, 28387, 28391, {f: 2, c: 28394}, {f: 2, c: 28397},
-    {f: 2, c: 28400}, 28403, {f: 2, c: 28405}, {f: 5, c: 28410}, 28416,
-    {f: 3, c: 28419}, {f: 2, c: 28423}, {f: 5, c: 28426}, {f: 3, c: 28432},
-    {f: 4, c: 28438}, {f: 5, c: 28443}, 28449, {f: 4, c: 28453}, 28462, 28464,
-    {f: 2, c: 28468}, 28471, {f: 5, c: 28473}, 28480, {f: 4, c: 28482},
-    {f: 3, c: 28488}, 28492, {f: 3, c: 28494}, {f: 2, c: 28498},
-    {f: 3, c: 28501}, {f: 2, c: 28506}, 28509, {f: 3, c: 28511}, 28515, 28517,
-    {f: 6, c: 28519}, 28529, 28531, {f: 2, c: 28533}, 28537, 28539,
-    {f: 2, c: 28541}, {f: 3, c: 28545}, 28549, {f: 2, c: 28554},
-    {f: 8, c: 28559}, {f: 4, c: 28568}, {f: 3, c: 28573}, {f: 2, c: 28578},
-    {f: 2, c: 28581}, 28584, {f: 4, c: 28586}, {f: 2, c: 28591}, 28594,
-    {f: 2, c: 28596}, {f: 2, c: 28599}, {f: 6, c: 28602}, {f: 5, c: 28612},
-    {f: 7, c: 28618}, {f: 2, c: 28627}, {f: 2, c: 28630}, {f: 2, c: 28633},
-    {f: 2, c: 28636}, {f: 2, c: 28642}, {f: 6, c: 28645}, {f: 2, c: 28652},
-    {f: 8, c: 28658}, 28667, 28669, {f: 6, c: 28671}, {f: 2, c: 28679}, 28682,
-    {f: 3, c: 28684}, 28688, {f: 3, c: 28690}, {f: 2, c: 28694}, 28697, 28700,
-    28702, {f: 2, c: 28705}, {f: 3, c: 28708}, {f: 7, c: 28713}, 28721,
-    {f: 2, c: 28723}, {f: 3, c: 28726}, {f: 4, c: 28730}, {f: 4, c: 28735},
-    {f: 7, c: 28741}, {f: 2, c: 28749}, 28752, {f: 3, c: 28754},
-    {f: 2, c: 28758}, {f: 4, c: 28761}, {f: 4, c: 28767}, {f: 2, c: 28773},
-    {f: 3, c: 28776}, 28782, {f: 4, c: 28785}, 28791, {f: 3, c: 28793}, 28797,
-    {f: 4, c: 28801}, {f: 3, c: 28806}, {f: 3, c: 28811}, {f: 3, c: 28815},
-    28819, {f: 2, c: 28823}, {f: 2, c: 28826}, {f: 13, c: 28830}, 28848, 28850,
-    {f: 3, c: 28852}, 28858, {f: 2, c: 28862}, {f: 4, c: 28868}, 28873,
-    {f: 4, c: 28875}, {f: 8, c: 28880}, 28890, {f: 3, c: 28892},
-    {f: 4, c: 28896}, 28901, 28906, 28910, {f: 4, c: 28912}, {f: 2, c: 28917},
-    28920, {f: 3, c: 28922}, {f: 11, c: 28926}, {f: 5, c: 28939},
-    {f: 2, c: 28945}, 28948, 28951, {f: 6, c: 28955}, {f: 4, c: 28962},
-    {f: 8, c: 28967}, {f: 4, c: 28978}, {f: 14, c: 28983}, {f: 3, c: 28998},
-    29003, 29005, {f: 3, c: 29007}, {f: 9, c: 29011}, 29021, {f: 3, c: 29023},
-    29027, 29029, {f: 2, c: 29034}, 29037, {f: 3, c: 29039}, {f: 4, c: 29044},
-    29049, {f: 2, c: 29051}, {f: 6, c: 29054}, {f: 5, c: 29061},
-    {f: 4, c: 29067}, {f: 2, c: 29072}, 29075, {f: 2, c: 29077},
-    {f: 5, c: 29082}, {f: 7, c: 29089}, {f: 3, c: 29097}, {f: 4, c: 29101},
-    29106, 29108, {f: 3, c: 29110}, {f: 4, c: 29114}, {f: 2, c: 29119}, 29122,
-    {f: 4, c: 29124}, {f: 5, c: 29129}, {f: 3, c: 29135}, 29139,
-    {f: 3, c: 29142}, {f: 2, c: 29146}, {f: 2, c: 29149}, {f: 4, c: 29153},
-    {f: 5, c: 29160}, {f: 5, c: 29167}, {f: 4, c: 29173}, {f: 2, c: 29178},
-    29181, {f: 7, c: 29183}, {f: 6, c: 29191}, {f: 2, c: 29198},
-    {f: 10, c: 29201}, 29212, {f: 10, c: 29214}, 29225, 29227,
-    {f: 3, c: 29229}, {f: 2, c: 29235}, 29244, {f: 7, c: 29248},
-    {f: 3, c: 29257}, {f: 4, c: 29262}, {f: 3, c: 29267}, 29271, 29274, 29276,
-    29278, 29280, {f: 3, c: 29283}, 29288, {f: 4, c: 29290}, {f: 2, c: 29296},
-    {f: 2, c: 29299}, {f: 3, c: 29302}, {f: 2, c: 29307}, {f: 2, c: 29314},
-    {f: 5, c: 29317}, 29324, 29326, {f: 2, c: 29328}, {f: 3, c: 29331},
-    {f: 8, c: 29335}, {f: 2, c: 29344}, {f: 4, c: 29347}, {f: 4, c: 29352},
-    29358, {f: 3, c: 29361}, 29365, {f: 6, c: 29370}, {f: 3, c: 29381},
-    {f: 4, c: 29385}, 29391, 29393, {f: 4, c: 29395}, 29400, {f: 4, c: 29402},
-    29407, {f: 6, c: 29410}, {f: 2, c: 29418}, {f: 2, c: 29429},
-    {f: 3, c: 29438}, 29442, {f: 6, c: 29444}, {f: 3, c: 29451},
-    {f: 4, c: 29455}, 29460, {f: 3, c: 29464}, {f: 2, c: 29471},
-    {f: 2, c: 29475}, {f: 3, c: 29478}, 29485, {f: 2, c: 29487},
-    {f: 2, c: 29490}, 29493, 29498, {f: 2, c: 29500}, 29504, {f: 2, c: 29506},
-    {f: 7, c: 29510}, {f: 2, c: 29518}, 29521, {f: 4, c: 29523},
-    {f: 8, c: 29528}, {f: 7, c: 29537}, 29545, 29550, 29553, {f: 2, c: 29555},
-    29558, 29561, 29565, 29567, {f: 3, c: 29569}, {f: 2, c: 29573}, 29576,
-    29578, {f: 2, c: 29580}, {f: 2, c: 29583}, {f: 4, c: 29586},
-    {f: 4, c: 29591}, {f: 3, c: 29596}, {f: 2, c: 29600}, {f: 6, c: 29603},
-    29610, {f: 2, c: 29612}, 29617, {f: 3, c: 29620}, {f: 2, c: 29624},
-    {f: 4, c: 29628}, 29633, {f: 5, c: 29635}, {f: 2, c: 29643}, 29646,
-    {f: 7, c: 29650}, {f: 4, c: 29658}, 29663, {f: 4, c: 29665}, 29670, 29672,
-    {f: 3, c: 29674}, {f: 4, c: 29678}, {f: 11, c: 29683}, {f: 4, c: 29695},
-    29700, {f: 2, c: 29703}, {f: 4, c: 29707}, {f: 9, c: 29713},
-    {f: 6, c: 29724}, {f: 2, c: 29731}, 29735, 29737, 29739, 29741, 29743,
-    {f: 2, c: 29745}, {f: 5, c: 29751}, {f: 2, c: 29757}, 29760,
-    {f: 9, c: 29762}, {f: 9, c: 29772}, 29782, 29784, 29789, {f: 3, c: 29792},
-    {f: 5, c: 29796}, {f: 2, c: 29803}, {f: 2, c: 29806}, {f: 5, c: 29809},
-    {f: 6, c: 29816}, 29823, 29826, {f: 3, c: 29828}, 29832, 29834,
-    {f: 2, c: 29836}, 29839, {f: 11, c: 29841}, 29853, {f: 4, c: 29855},
-    {f: 2, c: 29860}, {f: 6, c: 29866}, {f: 9, c: 29873}, {f: 2, c: 29883},
-    {f: 12, c: 29886}, {f: 4, c: 29899}, {f: 2, c: 29904}, 29907,
-    {f: 5, c: 29909}, 29915, 29917, 29919, 29921, 29925, {f: 7, c: 29927},
-    {f: 4, c: 29936}, 29941, {f: 7, c: 29944}, {f: 4, c: 29952},
-    {f: 7, c: 29957}, 29966, 29968, 29970, {f: 4, c: 29972}, 29979,
-    {f: 2, c: 29981}, {f: 3, c: 29984}, 29988, {f: 2, c: 29990}, 29994, 29998,
-    30004, 30006, 30009, {f: 2, c: 30012}, 30015, {f: 4, c: 30017},
-    {f: 2, c: 30022}, {f: 2, c: 30025}, 30029, {f: 4, c: 30032},
-    {f: 4, c: 30037}, {f: 4, c: 30046}, {f: 2, c: 30051}, {f: 3, c: 30055},
-    {f: 6, c: 30060}, 30067, 30069, 30071, {f: 5, c: 30074}, {f: 3, c: 30080},
-    {f: 2, c: 30084}, {f: 3, c: 30088}, {f: 3, c: 30092}, 30096, 30099, 30101,
-    30104, {f: 2, c: 30107}, 30110, 30114, {f: 5, c: 30118}, 30125,
-    {f: 2, c: 30134}, {f: 2, c: 30138}, {f: 3, c: 30143}, 30150,
-    {f: 2, c: 30155}, {f: 4, c: 30158}, 30163, 30167, 30170, {f: 2, c: 30172},
-    {f: 3, c: 30175}, 30181, 30185, {f: 4, c: 30188}, {f: 2, c: 30194},
-    {f: 4, c: 30197}, {f: 2, c: 30202}, {f: 2, c: 30205}, 30212,
-    {f: 4, c: 30214}, {f: 2, c: 30222}, {f: 4, c: 30225}, 30230, 30234,
-    {f: 2, c: 30236}, 30243, 30248, 30252, {f: 2, c: 30254}, {f: 2, c: 30257},
-    {f: 2, c: 30262}, {f: 2, c: 30265}, 30269, 30273, {f: 2, c: 30276}, 30280,
-    {f: 2, c: 30282}, {f: 6, c: 30286}, 30293, 30295, {f: 3, c: 30297}, 30301,
-    {f: 2, c: 30304}, 30310, 30312, 30314, {f: 3, c: 30323}, [12136, 30326],
-    30327, {f: 2, c: 30329}, {f: 3, c: 30335}, 30339, 30341, {f: 2, c: 30345},
-    {f: 2, c: 30348}, {f: 2, c: 30351}, 30354, {f: 2, c: 30356},
-    {f: 2, c: 30359}, {f: 9, c: 30363}, {f: 9, c: 30373}, {f: 2, c: 30383},
-    30387, {f: 3, c: 30389}, 30393, {f: 4, c: 30395}, {f: 2, c: 30400},
-    {f: 2, c: 30403}, 30407, 30409, {f: 2, c: 30411}, 30419, 30421,
-    {f: 2, c: 30425}, {f: 2, c: 30428}, 30432, 30434, 30438, {f: 6, c: 30440},
-    30448, 30451, {f: 3, c: 30453}, {f: 2, c: 30458}, 30461, {f: 2, c: 30463},
-    {f: 2, c: 30466}, {f: 2, c: 30469}, 30474, 30476, {f: 11, c: 30478},
-    {f: 4, c: 30491}, 30497, {f: 3, c: 30499}, 30503, {f: 3, c: 30506}, 30510,
-    {f: 5, c: 30512}, 30521, 30523, {f: 3, c: 30525}, 30530, {f: 3, c: 30532},
-    {f: 7, c: 30536}, {f: 8, c: 30546}, {f: 2, c: 30556}, {f: 2, c: 30559},
-    30564, 30567, {f: 2, c: 30569}, {f: 12, c: 30573}, {f: 3, c: 30586},
-    {f: 3, c: 30593}, {f: 6, c: 30598}, {f: 2, c: 30607}, {f: 5, c: 30611},
-    {f: 5, c: 30617}, 30625, {f: 2, c: 30627}, 30630, 30632, 30635,
-    {f: 2, c: 30638}, {f: 2, c: 30641}, 30644, {f: 5, c: 30646}, 30654,
-    {f: 7, c: 30656}, {f: 5, c: 30664}, {f: 9, c: 30670}, {f: 2, c: 30680},
-    {f: 5, c: 30685}, 30692, 30694, 30696, 30698, {f: 3, c: 30704},
-    {f: 2, c: 30708}, 30711, {f: 4, c: 30713}, {f: 6, c: 30723},
-    {f: 2, c: 30730}, {f: 3, c: 30734}, 30739, 30741, 30745, 30747, 30750,
-    {f: 3, c: 30752}, 30756, 30760, {f: 2, c: 30762}, {f: 2, c: 30766},
-    {f: 3, c: 30769}, {f: 2, c: 30773}, 30781, 30783, {f: 2, c: 30785}, 30788,
-    30790, {f: 4, c: 30792}, 30797, 30799, 30801, {f: 2, c: 30803},
-    {f: 5, c: 30808}, {f: 6, c: 30814}, {f: 3, c: 30821}, 30825,
-    {f: 7, c: 30832}, {f: 4, c: 30840}, {f: 10, c: 30845}, 30856,
-    {f: 2, c: 30858}, {f: 2, c: 30863}, 30866, {f: 3, c: 30868}, 30873,
-    {f: 2, c: 30877}, 30880, 30882, 30884, 30886, 30888, {f: 3, c: 30890},
-    {f: 2, c: 30894}, {f: 3, c: 30901}, 30907, 30909, {f: 2, c: 30911},
-    {f: 3, c: 30914}, {f: 3, c: 30918}, {f: 4, c: 30924}, {f: 3, c: 30929},
-    {f: 3, c: 30934}, {f: 8, c: 30939}, {f: 3, c: 30948}, {f: 3, c: 30953},
-    {f: 2, c: 30957}, {f: 2, c: 30960}, 30963, {f: 2, c: 30965},
-    {f: 2, c: 30968}, {f: 2, c: 30971}, {f: 3, c: 30974}, {f: 3, c: 30978},
-    {f: 8, c: 30982}, {f: 4, c: 30991}, {f: 5, c: 30996}, {f: 4, c: 31002},
-    {f: 5, c: 31007}, 31013, {f: 3, c: 31015}, {f: 4, c: 31021},
-    {f: 2, c: 31026}, {f: 5, c: 31029}, 31037, 31039, {f: 4, c: 31042}, 31047,
-    {f: 9, c: 31050}, {f: 2, c: 31060}, {f: 2, c: 31064}, 31073,
-    {f: 2, c: 31075}, 31078, {f: 4, c: 31081}, 31086, {f: 7, c: 31088}, 31097,
-    {f: 5, c: 31099}, {f: 2, c: 31106}, {f: 4, c: 31110}, {f: 2, c: 31115},
-    {f: 10, c: 31120}, {f: 11, c: 31131}, {f: 2, c: 31144}, {f: 3, c: 31147},
-    31151, 31154, {f: 4, c: 31156}, [12145, 31160], 31164, 31167, 31170,
-    {f: 2, c: 31172}, {f: 2, c: 31175}, 31178, 31180, {f: 3, c: 31182},
-    {f: 2, c: 31187}, {f: 2, c: 31190}, {f: 6, c: 31193}, {f: 3, c: 31200},
-    31205, 31208, 31210, 31212, 31214, {f: 7, c: 31217}, {f: 2, c: 31225},
-    31228, {f: 2, c: 31230}, 31233, {f: 2, c: 31236}, {f: 4, c: 31239}, 31244,
-    {f: 5, c: 31247}, {f: 2, c: 31253}, {f: 2, c: 31256}, {f: 3, c: 31259},
-    31263, {f: 2, c: 31265}, {f: 10, c: 31268}, {f: 2, c: 31279}, 31282,
-    {f: 3, c: 31284}, 31288, 31290, 31294, {f: 5, c: 31297}, {f: 5, c: 31303},
-    {f: 2, c: 31311}, {f: 5, c: 31314}, {f: 9, c: 31320}, {f: 6, c: 31331},
-    31338, {f: 4, c: 31340}, {f: 3, c: 31345}, 31349, {f: 4, c: 31355}, 31362,
-    31365, 31367, {f: 4, c: 31369}, {f: 3, c: 31374}, {f: 2, c: 31379},
-    {f: 3, c: 31385}, 31390, {f: 4, c: 31393}, 31399, 31403, {f: 4, c: 31407},
-    {f: 2, c: 31412}, {f: 3, c: 31415}, {f: 4, c: 31419}, {f: 4, c: 31424},
-    31430, 31433, {f: 10, c: 31436}, {f: 2, c: 31447}, {f: 4, c: 31450},
-    {f: 2, c: 31457}, 31460, {f: 3, c: 31463}, {f: 2, c: 31467}, 31470,
-    {f: 6, c: 31472}, {f: 2, c: 31479}, {f: 2, c: 31483}, 31486,
-    {f: 3, c: 31488}, 31493, 31495, 31497, {f: 3, c: 31500}, 31504,
-    {f: 2, c: 31506}, {f: 3, c: 31510}, 31514, {f: 2, c: 31516}, 31519,
-    {f: 3, c: 31521}, 31527, 31529, 31533, {f: 2, c: 31535}, 31538,
-    {f: 4, c: 31540}, 31545, 31547, 31549, {f: 6, c: 31551}, 31560, 31562,
-    {f: 2, c: 31565}, 31571, 31573, 31575, 31577, 31580, {f: 2, c: 31582},
-    31585, {f: 4, c: 31587}, {f: 6, c: 31592}, {f: 2, c: 31599},
-    {f: 2, c: 31603}, 31606, 31608, 31610, {f: 2, c: 31612}, 31615,
-    {f: 4, c: 31617}, {f: 5, c: 31622}, 31628, {f: 2, c: 31630},
-    {f: 3, c: 31633}, 31638, {f: 4, c: 31640}, {f: 3, c: 31646},
-    {f: 3, c: 31651}, {f: 3, c: 31662}, {f: 2, c: 31666}, {f: 3, c: 31669},
-    {f: 7, c: 31673}, {f: 2, c: 31682}, 31685, 31688, 31690, {f: 4, c: 31693},
-    31698, {f: 5, c: 31700}, {f: 2, c: 31707}, {f: 3, c: 31710},
-    {f: 2, c: 31714}, {f: 2, c: 31719}, {f: 3, c: 31723}, {f: 2, c: 31727},
-    31730, {f: 3, c: 31732}, {f: 4, c: 31736}, 31741, 31743, {f: 6, c: 31745},
-    {f: 3, c: 31752}, 31758, {f: 6, c: 31760}, {f: 7, c: 31767}, 31776, 31778,
-    {f: 2, c: 31780}, {f: 2, c: 31784}, {f: 12, c: 31788}, {f: 4, c: 31801},
-    31810, {f: 8, c: 31812}, {f: 14, c: 31822}, {f: 2, c: 31837},
-    {f: 3, c: 31841}, {f: 4, c: 31845}, 31851, 31853, {f: 3, c: 31855},
-    {f: 6, c: 31861}, {f: 11, c: 31870}, {f: 7, c: 31882}, {f: 2, c: 31891},
-    31894, {f: 3, c: 31897}, {f: 2, c: 31904}, 31907, {f: 4, c: 31910},
-    {f: 3, c: 31915}, {f: 2, c: 31919}, {f: 5, c: 31924}, {f: 2, c: 31930},
-    {f: 2, c: 31935}, {f: 3, c: 31938}, 31942, 31945, 31947, {f: 7, c: 31950},
-    31960, {f: 2, c: 31962}, {f: 6, c: 31969}, {f: 6, c: 31977}, 31985, 31987,
-    31989, 31991, 31994, {f: 2, c: 31996}, 31999, 32001, 32003, 32012,
-    {f: 2, c: 32014}, {f: 2, c: 32017}, 32022, 32024, {f: 3, c: 32029},
-    {f: 4, c: 32035}, {f: 3, c: 32040}, {f: 3, c: 32044}, {f: 5, c: 32052},
-    32059, {f: 2, c: 32061}, 32065, 32067, 32069, {f: 7, c: 32071}, 32079,
-    {f: 12, c: 32081}, {f: 2, c: 32095}, {f: 3, c: 32099}, 32103,
-    {f: 5, c: 32105}, {f: 2, c: 32111}, {f: 2, c: 32116}, 32120,
-    {f: 7, c: 32122}, 32130, {f: 2, c: 32132}, 32135, {f: 5, c: 32138},
-    {f: 3, c: 32144}, {f: 8, c: 32148}, 32157, {f: 3, c: 32159},
-    {f: 2, c: 32164}, {f: 4, c: 32167}, 32175, {f: 3, c: 32181}, 32188,
-    {f: 4, c: 32192}, {f: 2, c: 32197}, {f: 2, c: 32200}, {f: 5, c: 32204},
-    32211, {f: 2, c: 32213}, {f: 3, c: 32218}, 32223, 32226, {f: 2, c: 32228},
-    32231, {f: 2, c: 32234}, {f: 2, c: 32237}, 32240, 32243, 32245,
-    {f: 2, c: 32247}, 32250, {f: 12, c: 32252}, {f: 4, c: 32268},
-    {f: 9, c: 32274}, 32284, {f: 3, c: 32288}, {f: 3, c: 32292},
-    {f: 3, c: 32296}, 32300, {f: 2, c: 32303}, 32307, 32312, 32314, 32316,
-    {f: 2, c: 32319}, {f: 3, c: 32322}, {f: 10, c: 32328}, 32339,
-    {f: 4, c: 32342}, {f: 3, c: 32347}, {f: 3, c: 32351}, {f: 6, c: 32355},
-    32364, {f: 2, c: 32369}, {f: 5, c: 32372}, {f: 2, c: 32378},
-    {f: 3, c: 32383}, {f: 5, c: 32387}, 32393, 32395, 32398, {f: 3, c: 32400},
-    32405, 32407, {f: 2, c: 32409}, {f: 2, c: 32413}, 32430, 32436,
-    {f: 2, c: 32443}, 32470, 32484, 32492, 32505, 32522, 32528, 32542, 32567,
-    32569, {f: 7, c: 32571}, 32579, {f: 6, c: 32582}, 32589, 32591,
-    {f: 2, c: 32594}, 32598, 32601, {f: 4, c: 32603}, 32608, {f: 5, c: 32611},
-    {f: 3, c: 32619}, 32623, 32627, {f: 2, c: 32629}, 32632, {f: 4, c: 32634},
-    {f: 2, c: 32639}, {f: 3, c: 32642}, 32647, 32649, 32651, 32653,
-    {f: 5, c: 32655}, {f: 5, c: 32661}, {f: 2, c: 32667}, 32672,
-    {f: 2, c: 32674}, 32678, 32680, {f: 5, c: 32682}, 32689, {f: 5, c: 32691},
-    {f: 2, c: 32698}, 32702, 32704, {f: 3, c: 32706}, {f: 4, c: 32710}, 32715,
-    32717, {f: 3, c: 32719}, 32723, {f: 2, c: 32726}, {f: 6, c: 32729},
-    {f: 3, c: 32738}, {f: 2, c: 32743}, {f: 4, c: 32746}, 32751, 32754,
-    {f: 5, c: 32756}, 32762, {f: 3, c: 32765}, 32770, {f: 4, c: 32775},
-    {f: 2, c: 32782}, 32785, 32787, {f: 2, c: 32794}, {f: 3, c: 32797}, 32801,
-    {f: 2, c: 32803}, 32811, 32813, {f: 2, c: 32815}, 32818, 32820,
-    {f: 2, c: 32825}, 32828, 32830, {f: 2, c: 32832}, {f: 2, c: 32836},
-    {f: 3, c: 32839}, {f: 4, c: 32846}, 32851, 32853, 32855, 32857,
-    {f: 3, c: 32859}, {f: 10, c: 32863}, {f: 4, c: 32875}, 32884, 32888,
-    {f: 3, c: 32890}, {f: 2, c: 32897}, 32904, 32906, {f: 6, c: 32909},
-    {f: 2, c: 32916}, 32919, 32921, 32926, 32931, {f: 3, c: 32934}, 32940,
-    32944, 32947, {f: 2, c: 32949}, {f: 2, c: 32952}, 32955, 32965,
-    {f: 5, c: 32967}, {f: 7, c: 32975}, 32984, {f: 2, c: 32991},
-    {f: 2, c: 32994}, 32998, 33006, 33013, 33015, 33017, 33019,
-    {f: 4, c: 33022}, {f: 2, c: 33027}, {f: 2, c: 33031}, {f: 2, c: 33035},
-    33045, 33047, 33049, {f: 2, c: 33052}, {f: 13, c: 33055}, {f: 2, c: 33069},
-    33072, {f: 3, c: 33075}, 33079, {f: 4, c: 33082}, {f: 7, c: 33087}, 33095,
-    33097, 33101, 33103, 33106, {f: 2, c: 33111}, {f: 5, c: 33115},
-    {f: 3, c: 33122}, 33128, 33130, 33132, 33135, {f: 2, c: 33138},
-    {f: 3, c: 33141}, 33153, {f: 5, c: 33155}, 33161, {f: 4, c: 33163}, 33168,
-    {f: 6, c: 33170}, 33177, {f: 2, c: 33182}, {f: 2, c: 33185},
-    {f: 2, c: 33188}, 33191, {f: 8, c: 33195}, {f: 6, c: 33204}, 33212,
-    {f: 2, c: 33220}, {f: 2, c: 33223}, 33227, 33230, {f: 8, c: 33232}, 33241,
-    {f: 4, c: 33243}, {f: 2, c: 33249}, {f: 3, c: 33252}, 33257, 33259,
-    {f: 5, c: 33262}, {f: 5, c: 33269}, 33277, 33279, 33283, 33291,
-    {f: 2, c: 33294}, 33297, 33299, {f: 6, c: 33301}, 33309, 33312,
-    {f: 4, c: 33316}, 33321, 33326, 33330, 33338, {f: 2, c: 33340},
-    {f: 5, c: 33343}, {f: 2, c: 33349}, 33352, 33354, {f: 3, c: 33356},
-    {f: 8, c: 33360}, {f: 4, c: 33371}, {f: 4, c: 33376}, 33381, 33383,
-    {f: 2, c: 33385}, {f: 2, c: 33388}, {f: 2, c: 33397}, [12171, 33400],
-    {f: 2, c: 33403}, {f: 2, c: 33408}, 33411, {f: 3, c: 33413}, 33417, 33420,
-    33424, {f: 4, c: 33427}, {f: 2, c: 33434}, 33438, 33440, {f: 2, c: 33442},
-    33447, 33458, {f: 2, c: 33461}, 33466, 33468, {f: 2, c: 33471},
-    {f: 2, c: 33474}, {f: 2, c: 33477}, 33481, 33488, 33494, {f: 2, c: 33497},
-    33501, 33506, {f: 3, c: 33512}, {f: 3, c: 33516}, 33520, {f: 2, c: 33522},
-    {f: 2, c: 33525}, 33528, 33530, {f: 5, c: 33532}, {f: 2, c: 33546}, 33549,
-    33552, {f: 2, c: 33554}, 33558, {f: 2, c: 33560}, {f: 10, c: 33565},
-    {f: 2, c: 33577}, 33582, 33584, 33586, 33591, 33595, {f: 3, c: 33597},
-    {f: 2, c: 33601}, {f: 2, c: 33604}, 33608, {f: 5, c: 33610}, 33619,
-    {f: 5, c: 33621}, 33629, 33634, {f: 7, c: 33648}, {f: 2, c: 33657},
-    {f: 7, c: 33662}, {f: 2, c: 33671}, {f: 3, c: 33675}, {f: 3, c: 33679},
-    {f: 2, c: 33684}, 33687, {f: 2, c: 33689}, 33693, 33695, 33697,
-    {f: 4, c: 33699}, {f: 4, c: 33708}, 33717, 33723, {f: 2, c: 33726},
-    {f: 3, c: 33730}, 33734, {f: 2, c: 33736}, 33739, {f: 2, c: 33741},
-    {f: 4, c: 33744}, 33749, 33751, {f: 3, c: 33753}, 33758, {f: 3, c: 33762},
-    {f: 3, c: 33766}, {f: 4, c: 33771}, {f: 5, c: 33779}, {f: 3, c: 33786},
-    {f: 3, c: 33790}, 33794, 33797, {f: 2, c: 33800}, 33808, {f: 6, c: 33810},
-    {f: 3, c: 33817}, {f: 6, c: 33822}, {f: 3, c: 33833}, {f: 4, c: 33837},
-    {f: 3, c: 33842}, {f: 2, c: 33846}, {f: 3, c: 33849}, {f: 8, c: 33854},
-    {f: 2, c: 33863}, {f: 7, c: 33866}, {f: 4, c: 33875}, 33880,
-    {f: 4, c: 33885}, 33890, 33893, {f: 2, c: 33895}, 33898, 33902, 33904,
-    33906, 33908, 33913, {f: 7, c: 33915}, {f: 4, c: 33923}, 33930, 33933,
-    {f: 4, c: 33935}, {f: 2, c: 33941}, 33944, {f: 2, c: 33946},
-    {f: 4, c: 33949}, {f: 13, c: 33954}, {f: 2, c: 33968}, 33971,
-    {f: 3, c: 33973}, 33979, 33982, {f: 2, c: 33986}, {f: 4, c: 33989}, 33996,
-    {f: 2, c: 33998}, 34002, {f: 2, c: 34004}, {f: 6, c: 34007}, 34014,
-    {f: 2, c: 34017}, 34020, {f: 5, c: 34023}, 34029, {f: 11, c: 34033}, 34046,
-    {f: 12, c: 34048}, {f: 4, c: 34061}, 34066, {f: 2, c: 34069},
-    {f: 2, c: 34072}, {f: 3, c: 34075}, 34080, 34082, {f: 2, c: 34084},
-    {f: 4, c: 34087}, {f: 9, c: 34094}, {f: 3, c: 34110}, 34114,
-    {f: 2, c: 34116}, 34119, {f: 3, c: 34123}, {f: 3, c: 34127}, 34132, 34135,
-    {f: 4, c: 34138}, {f: 3, c: 34143}, 34147, {f: 3, c: 34149},
-    {f: 2, c: 34155}, {f: 4, c: 34158}, 34163, {f: 2, c: 34165}, 34168,
-    {f: 2, c: 34172}, {f: 5, c: 34175}, 34182, 34185, 34187, {f: 2, c: 34189},
-    34192, {f: 2, c: 34194}, {f: 6, c: 34197}, {f: 2, c: 34205},
-    {f: 4, c: 34208}, 34213, 34215, {f: 3, c: 34219}, {f: 6, c: 34225}, 34232,
-    {f: 6, c: 34235}, {f: 7, c: 34242}, {f: 3, c: 34250}, {f: 2, c: 34257},
-    34260, {f: 6, c: 34262}, {f: 6, c: 34270}, {f: 3, c: 34278},
-    {f: 9, c: 34283}, 34293, {f: 2, c: 34295}, {f: 3, c: 34300},
-    {f: 4, c: 34304}, {f: 3, c: 34312}, {f: 5, c: 34316}, {f: 4, c: 34322},
-    {f: 3, c: 34327}, {f: 3, c: 34331}, {f: 3, c: 34335}, {f: 4, c: 34339},
-    34344, {f: 3, c: 34346}, {f: 10, c: 34350}, 34361, 34363, {f: 2, c: 34365},
-    {f: 13, c: 34368}, {f: 2, c: 34386}, {f: 4, c: 34390}, 34395, 34397,
-    {f: 2, c: 34400}, {f: 4, c: 34403}, {f: 3, c: 34408}, 34413,
-    {f: 2, c: 34415}, {f: 7, c: 34418}, {f: 7, c: 34435}, {f: 5, c: 34446},
-    34452, {f: 6, c: 34454}, {f: 5, c: 34462}, {f: 2, c: 34469}, 34475,
-    {f: 2, c: 34477}, {f: 2, c: 34482}, {f: 3, c: 34487}, {f: 5, c: 34491},
-    {f: 3, c: 34497}, 34501, 34504, {f: 2, c: 34508}, {f: 2, c: 34514},
-    {f: 3, c: 34517}, 34522, {f: 2, c: 34524}, {f: 4, c: 34528},
-    {f: 4, c: 34533}, {f: 3, c: 34538}, 34543, {f: 3, c: 34549},
-    {f: 3, c: 34555}, 34559, 34561, {f: 2, c: 34564}, {f: 2, c: 34571},
-    {f: 4, c: 34574}, 34580, 34582, 34585, 34587, 34589, {f: 2, c: 34591},
-    34596, {f: 3, c: 34598}, {f: 4, c: 34602}, {f: 2, c: 34607},
-    {f: 2, c: 34610}, {f: 2, c: 34613}, {f: 3, c: 34616}, {f: 2, c: 34620},
-    {f: 7, c: 34624}, {f: 2, c: 34634}, 34637, {f: 4, c: 34639}, 34644, 34646,
-    34648, {f: 6, c: 34650}, {f: 2, c: 34657}, {f: 7, c: 34663}, 34671,
-    {f: 3, c: 34673}, 34677, 34679, {f: 2, c: 34681}, {f: 3, c: 34687},
-    {f: 2, c: 34694}, {f: 2, c: 34697}, 34700, {f: 5, c: 34702},
-    {f: 3, c: 34708}, {f: 6, c: 34712}, {f: 2, c: 34720}, {f: 5, c: 34723},
-    {f: 2, c: 34729}, 34734, {f: 3, c: 34736}, 34740, {f: 4, c: 34742}, 34748,
-    {f: 2, c: 34750}, {f: 3, c: 34753}, 34757, 34759, 34761, {f: 2, c: 34764},
-    {f: 2, c: 34767}, {f: 7, c: 34772}, {f: 4, c: 34780}, {f: 2, c: 34785},
-    34788, {f: 4, c: 34790}, 34795, 34797, {f: 2, c: 34800}, {f: 3, c: 34803},
-    {f: 2, c: 34807}, 34810, {f: 2, c: 34812}, {f: 4, c: 34815}, 34820,
-    {f: 3, c: 34823}, {f: 5, c: 34827}, 34834, 34836, {f: 4, c: 34839},
-    {f: 3, c: 34844}, 34848, {f: 13, c: 34852}, {f: 3, c: 34867},
-    {f: 2, c: 34871}, 34874, {f: 3, c: 34877}, {f: 3, c: 34881},
-    {f: 3, c: 34887}, 34891, {f: 5, c: 34894}, {f: 2, c: 34901}, 34904, 34906,
-    34908, {f: 3, c: 34910}, {f: 2, c: 34918}, 34922, 34925, 34927, 34929,
-    {f: 4, c: 34931}, 34936, {f: 3, c: 34938}, 34944, 34947, {f: 2, c: 34950},
-    {f: 2, c: 34953}, 34956, {f: 4, c: 34958}, {f: 3, c: 34963},
-    {f: 5, c: 34967}, {f: 5, c: 34973}, 34979, {f: 6, c: 34981}, 34988,
-    {f: 3, c: 34990}, {f: 5, c: 34994}, {f: 4, c: 35000}, {f: 4, c: 35005},
-    {f: 2, c: 35011}, {f: 2, c: 35015}, {f: 3, c: 35019}, {f: 2, c: 35024},
-    35027, {f: 2, c: 35030}, {f: 2, c: 35034}, 35038, {f: 2, c: 35040},
-    {f: 2, c: 35046}, {f: 7, c: 35049}, 35058, {f: 3, c: 35061},
-    {f: 2, c: 35066}, {f: 3, c: 35071}, {f: 4, c: 35075}, {f: 2, c: 35080},
-    {f: 5, c: 35083}, 35089, {f: 5, c: 35092}, {f: 5, c: 35100},
-    {f: 3, c: 35106}, {f: 4, c: 35110}, {f: 4, c: 35116}, 35121, 35125, 35127,
-    {f: 2, c: 35129}, {f: 5, c: 35132}, {f: 2, c: 35138}, {f: 2, c: 35141},
-    {f: 14, c: 35144}, {f: 6, c: 35159}, {f: 3, c: 35169}, 35173,
-    {f: 3, c: 35175}, 35179, {f: 2, c: 35181}, {f: 2, c: 35184},
-    {f: 8, c: 35187}, {f: 2, c: 35196}, [12177, 35198], 35200, 35202,
-    {f: 2, c: 35204}, {f: 4, c: 35207}, {f: 3, c: 35212}, {f: 3, c: 35216},
-    {f: 2, c: 35220}, 35223, {f: 8, c: 35225}, {f: 4, c: 35234},
-    {f: 3, c: 35239}, 35243, {f: 2, c: 35245}, {f: 2, c: 35248},
-    {f: 4, c: 35251}, {f: 2, c: 35256}, {f: 2, c: 35259}, 35262, 35267, 35277,
-    {f: 3, c: 35283}, {f: 3, c: 35287}, 35291, 35293, {f: 4, c: 35295}, 35300,
-    {f: 4, c: 35303}, {f: 3, c: 35308}, {f: 3, c: 35312}, 35317, 35319,
-    {f: 7, c: 35321}, {f: 3, c: 35332}, 35337, 35339, 35341, 35343,
-    {f: 2, c: 35345}, 35348, 35351, {f: 2, c: 35353}, 35356, 35358,
-    {f: 3, c: 35360}, 35364, {f: 4, c: 35366}, {f: 2, c: 35371},
-    {f: 3, c: 35374}, {f: 2, c: 35378}, 35381, {f: 3, c: 35383},
-    {f: 3, c: 35387}, {f: 2, c: 35391}, {f: 4, c: 35394}, 35399,
-    {f: 5, c: 35401}, 35407, 35409, 35411, {f: 2, c: 35414}, {f: 2, c: 35417},
-    {f: 2, c: 35420}, {f: 2, c: 35423}, {f: 2, c: 35428}, {f: 2, c: 35431},
-    35434, 35439, 35444, {f: 3, c: 35446}, {f: 2, c: 35450}, {f: 2, c: 35453},
-    {f: 4, c: 35456}, 35464, {f: 2, c: 35467}, {f: 3, c: 35470}, 35476,
-    {f: 2, c: 35478}, 35481, {f: 3, c: 35483}, 35487, 35490, 35495,
-    {f: 3, c: 35497}, {f: 3, c: 35501}, 35505, {f: 3, c: 35507},
-    {f: 2, c: 35511}, {f: 2, c: 35514}, {f: 2, c: 35517}, {f: 2, c: 35520},
-    35523, {f: 2, c: 35525}, 35528, 35530, 35532, 35534, 35536,
-    {f: 3, c: 35539}, {f: 3, c: 35544}, 35549, {f: 3, c: 35551}, 35555, 35557,
-    {f: 3, c: 35560}, 35564, {f: 2, c: 35567}, 35570, {f: 2, c: 35572}, 35577,
-    35579, 35581, 35583, 35587, 35590, {f: 2, c: 35592}, {f: 3, c: 35595},
-    35599, {f: 3, c: 35601}, 35605, 35608, 35612, {f: 3, c: 35614},
-    {f: 4, c: 35618}, 35623, {f: 2, c: 35625}, {f: 5, c: 35630},
-    {f: 5, c: 35636}, {f: 4, c: 35642}, {f: 10, c: 35647}, {f: 4, c: 35658},
-    {f: 6, c: 35664}, 35671, 35675, {f: 9, c: 35677}, {f: 4, c: 35687},
-    {f: 2, c: 35693}, {f: 3, c: 35697}, {f: 2, c: 35701}, {f: 5, c: 35704},
-    {f: 2, c: 35710}, {f: 9, c: 35713}, {f: 3, c: 35723}, {f: 3, c: 35727},
-    35732, {f: 5, c: 35735}, 35741, 35743, 35756, 35761, 35771, 35783, 35792,
-    35818, 35849, 35870, {f: 9, c: 35896}, {f: 4, c: 35906}, {f: 2, c: 35914},
-    {f: 3, c: 35917}, {f: 4, c: 35921}, {f: 4, c: 35926}, {f: 6, c: 35931},
-    {f: 7, c: 35939}, {f: 7, c: 35948}, {f: 4, c: 35956}, {f: 7, c: 35963},
-    {f: 2, c: 35971}, {f: 3, c: 35974}, 35979, {f: 7, c: 35981},
-    {f: 3, c: 35989}, {f: 4, c: 35993}, 35999, {f: 4, c: 36003},
-    {f: 2, c: 36013}, 36017, 36021, 36025, 36030, 36038, 36041,
-    {f: 6, c: 36043}, 36052, {f: 4, c: 36054}, 36059, 36061, 36063, 36069,
-    {f: 2, c: 36072}, {f: 6, c: 36078}, {f: 5, c: 36085}, {f: 5, c: 36095},
-    {f: 2, c: 36102}, 36105, 36108, 36110, {f: 5, c: 36113}, {f: 4, c: 36119},
-    36128, {f: 2, c: 36177}, 36183, 36191, 36197, {f: 3, c: 36200}, 36204,
-    {f: 2, c: 36206}, {f: 2, c: 36209}, {f: 9, c: 36216}, {f: 2, c: 36226},
-    {f: 4, c: 36230}, {f: 5, c: 36236}, {f: 2, c: 36242}, {f: 3, c: 36246},
-    {f: 5, c: 36250}, {f: 3, c: 36256}, {f: 4, c: 36260}, {f: 8, c: 36265},
-    {f: 2, c: 36278}, 36281, 36283, 36285, {f: 3, c: 36288}, 36293,
-    {f: 4, c: 36295}, 36301, 36304, {f: 4, c: 36306}, {f: 2, c: 36312}, 36316,
-    {f: 3, c: 36320}, {f: 3, c: 36325}, 36329, {f: 2, c: 36333},
-    {f: 3, c: 36336}, 36340, 36342, 36348, {f: 7, c: 36350}, {f: 3, c: 36358},
-    36363, {f: 2, c: 36365}, {f: 3, c: 36369}, {f: 8, c: 36373},
-    {f: 2, c: 36384}, {f: 5, c: 36388}, 36395, 36397, 36400, {f: 2, c: 36402},
-    {f: 3, c: 36406}, {f: 2, c: 36411}, {f: 2, c: 36414}, 36419,
-    {f: 2, c: 36421}, {f: 4, c: 36429}, {f: 2, c: 36435}, {f: 3, c: 36438},
-    {f: 9, c: 36442}, {f: 2, c: 36452}, {f: 2, c: 36455}, {f: 2, c: 36458},
-    36462, 36465, 36467, 36469, {f: 3, c: 36471}, 36475, {f: 2, c: 36477},
-    36480, {f: 3, c: 36482}, 36486, 36488, 36492, 36494, {f: 5, c: 36501},
-    36507, 36509, {f: 2, c: 36511}, {f: 3, c: 36514}, {f: 3, c: 36519},
-    {f: 2, c: 36525}, {f: 2, c: 36528}, {f: 7, c: 36531}, {f: 5, c: 36539},
-    {f: 9, c: 36545}, {f: 3, c: 36559}, 36563, {f: 6, c: 36565},
-    {f: 3, c: 36572}, {f: 4, c: 36576}, {f: 6, c: 36581}, {f: 6, c: 36588},
-    {f: 5, c: 36595}, 36605, {f: 4, c: 36607}, 36612, 36614, 36616,
-    {f: 7, c: 36619}, 36627, {f: 5, c: 36630}, {f: 5, c: 36640},
-    {f: 2, c: 36647}, {f: 4, c: 36651}, {f: 3, c: 36656}, {f: 4, c: 36660},
-    {f: 2, c: 36665}, {f: 2, c: 36668}, {f: 2, c: 36672}, 36675,
-    {f: 2, c: 36679}, {f: 3, c: 36682}, {f: 5, c: 36687}, {f: 10, c: 36693},
-    36704, 36707, 36709, 36714, 36736, 36748, 36754, 36765, {f: 3, c: 36768},
-    {f: 2, c: 36772}, 36775, 36778, 36780, {f: 2, c: 36787}, [12193, 36789],
-    {f: 2, c: 36791}, {f: 3, c: 36794}, {f: 2, c: 36799}, 36803, 36806,
-    {f: 5, c: 36809}, 36815, 36818, {f: 2, c: 36822}, 36826, {f: 2, c: 36832},
-    36835, 36839, 36844, 36847, {f: 2, c: 36849}, {f: 2, c: 36853},
-    {f: 3, c: 36858}, {f: 2, c: 36862}, {f: 2, c: 36871}, 36876, 36878, 36883,
-    36888, 36892, {f: 2, c: 36900}, {f: 6, c: 36903}, {f: 2, c: 36912},
-    {f: 2, c: 36915}, 36919, {f: 2, c: 36921}, 36925, {f: 2, c: 36927}, 36931,
-    {f: 2, c: 36933}, {f: 3, c: 36936}, 36940, 36950, {f: 2, c: 36953}, 36957,
-    36959, 36961, 36964, {f: 2, c: 36966}, {f: 3, c: 36970}, {f: 3, c: 36975},
-    36979, 36982, 36985, 36987, 36990, {f: 2, c: 36997}, 37001,
-    {f: 3, c: 37004}, 37010, 37012, 37014, 37016, 37018, 37020,
-    {f: 3, c: 37022}, {f: 2, c: 37028}, {f: 3, c: 37031}, 37035, 37037, 37042,
-    37047, {f: 2, c: 37052}, {f: 2, c: 37055}, {f: 2, c: 37058}, 37062,
-    {f: 2, c: 37064}, {f: 3, c: 37067}, 37074, {f: 3, c: 37076},
-    {f: 3, c: 37080}, 37086, 37088, {f: 3, c: 37091}, {f: 2, c: 37097}, 37100,
-    37102, {f: 4, c: 37104}, {f: 2, c: 37110}, {f: 4, c: 37113},
-    {f: 3, c: 37119}, 37123, 37125, {f: 2, c: 37127}, {f: 8, c: 37130}, 37139,
-    37141, {f: 2, c: 37143}, {f: 4, c: 37146}, {f: 3, c: 37151},
-    {f: 3, c: 37156}, {f: 5, c: 37160}, 37166, 37171, 37173, {f: 2, c: 37175},
-    {f: 8, c: 37179}, {f: 2, c: 37188}, 37191, 37201, {f: 4, c: 37203},
-    {f: 2, c: 37208}, {f: 2, c: 37211}, {f: 2, c: 37215}, {f: 3, c: 37222},
-    37227, 37229, 37235, {f: 3, c: 37242}, {f: 5, c: 37248}, 37254, 37256,
-    37258, {f: 2, c: 37262}, {f: 3, c: 37267}, {f: 3, c: 37271},
-    {f: 5, c: 37277}, {f: 6, c: 37284}, {f: 4, c: 37296}, {f: 4, c: 37302},
-    {f: 5, c: 37307}, 37314, 37316, [12196, 37318], 37320, 37328, 37334,
-    {f: 2, c: 37338}, {f: 5, c: 37342}, {f: 2, c: 37349}, 37352,
-    {f: 11, c: 37354}, 37366, 37368, {f: 5, c: 37371}, {f: 2, c: 37378},
-    {f: 3, c: 37381}, {f: 3, c: 37386}, 37391, {f: 2, c: 37394},
-    {f: 8, c: 37398}, {f: 4, c: 37407}, 37412, {f: 6, c: 37416}, 37423,
-    {f: 2, c: 37425}, {f: 2, c: 37429}, {f: 2, c: 37435}, {f: 4, c: 37441},
-    {f: 2, c: 37446}, {f: 3, c: 37450}, {f: 3, c: 37454}, {f: 3, c: 37458},
-    37462, {f: 2, c: 37464}, {f: 2, c: 37468}, {f: 3, c: 37471},
-    {f: 3, c: 37475}, {f: 5, c: 37479}, {f: 6, c: 37486}, {f: 3, c: 37493},
-    37497, {f: 3, c: 37500}, {f: 2, c: 37505}, 37508, {f: 8, c: 37510},
-    {f: 2, c: 37519}, 37522, {f: 2, c: 37524}, 37527, 37529, 37531,
-    {f: 3, c: 37533}, {f: 2, c: 37537}, 37540, 37543, 37549, {f: 2, c: 37551},
-    {f: 5, c: 37554}, 37560, 37562, {f: 4, c: 37565}, 37570, 37572, 37574,
-    {f: 3, c: 37577}, {f: 2, c: 37581}, {f: 2, c: 37584}, {f: 10, c: 37587},
-    37598, {f: 3, c: 37600}, 37607, 37609, {f: 2, c: 37611}, {f: 4, c: 37618},
-    37623, {f: 3, c: 37625}, {f: 4, c: 37629}, {f: 4, c: 37634},
-    {f: 7, c: 37641}, 37649, {f: 2, c: 37651}, {f: 2, c: 37654},
-    {f: 3, c: 37660}, 37665, {f: 3, c: 37667}, 37671, {f: 2, c: 37673},
-    {f: 2, c: 37676}, {f: 2, c: 37680}, {f: 2, c: 37684}, 37687,
-    {f: 5, c: 37689}, 37695, 37698, {f: 2, c: 37700}, {f: 3, c: 37704}, 37708,
-    {f: 6, c: 37710}, {f: 3, c: 37717}, {f: 2, c: 37721}, {f: 8, c: 37724},
-    {f: 3, c: 37734}, 37739, {f: 3, c: 37741}, {f: 4, c: 37745},
-    {f: 3, c: 37751}, {f: 3, c: 37755}, {f: 3, c: 37759}, 37763,
-    {f: 2, c: 37765}, {f: 2, c: 37768}, {f: 4, c: 37771}, {f: 6, c: 37776},
-    37783, {f: 9, c: 37785}, {f: 2, c: 37796}, 37800, 37803, 37805, 37807,
-    {f: 2, c: 37809}, 37812, {f: 2, c: 37814}, {f: 6, c: 37817},
-    {f: 3, c: 37824}, {f: 3, c: 37828}, 37833, 37835, {f: 3, c: 37838},
-    {f: 4, c: 37842}, {f: 3, c: 37849}, 37856, 37859, {f: 3, c: 37861},
-    {f: 12, c: 37865}, 37878, 37880, {f: 9, c: 37882}, {f: 7, c: 37892},
-    {f: 4, c: 37900}, 37905, {f: 3, c: 37909}, {f: 3, c: 37914},
-    {f: 2, c: 37918}, {f: 5, c: 37921}, {f: 5, c: 37929}, {f: 3, c: 37935},
-    37940, {f: 2, c: 37942}, 37945, {f: 3, c: 37947}, {f: 4, c: 37952},
-    {f: 5, c: 37957}, 37963, {f: 5, c: 37965}, 37971, {f: 11, c: 37973},
-    {f: 2, c: 37985}, 37988, {f: 5, c: 37990}, 37996, {f: 2, c: 37998}, 38001,
-    {f: 4, c: 38003}, 38008, {f: 2, c: 38010}, {f: 5, c: 38016}, 38033, 38038,
-    38040, 38087, 38095, {f: 2, c: 38099}, 38106, 38118, 38139, 38172, 38176,
-    38183, 38195, 38205, 38211, 38216, 38219, 38229, 38234, 38240, 38254,
-    {f: 2, c: 38260}, {f: 7, c: 38264}, 38273, {f: 2, c: 38276},
-    {f: 2, c: 38279}, 38282, 38285, 38288, 38290, {f: 3, c: 38293},
-    {f: 8, c: 38297}, 38306, {f: 2, c: 38310}, 38314, {f: 4, c: 38318},
-    {f: 3, c: 38323}, {f: 2, c: 38327}, 38330, {f: 3, c: 38336},
-    {f: 2, c: 38340}, 38343, 38345, {f: 3, c: 38349}, {f: 3, c: 38353},
-    {f: 5, c: 38359}, 38365, {f: 2, c: 38367}, {f: 2, c: 38371},
-    {f: 2, c: 38374}, 38380, 38399, 38407, 38419, 38424, 38427, 38430, 38432,
-    {f: 7, c: 38435}, {f: 3, c: 38443}, {f: 2, c: 38447}, {f: 4, c: 38455},
-    38462, 38465, 38467, 38474, {f: 2, c: 38478}, {f: 3, c: 38481},
-    {f: 2, c: 38486}, {f: 2, c: 38489}, 38492, 38494, 38496, {f: 2, c: 38501},
-    38507, {f: 3, c: 38509}, 38513, {f: 4, c: 38521}, {f: 7, c: 38526}, 38535,
-    38537, 38540, {f: 3, c: 38545}, 38550, 38554, {f: 10, c: 38557}, 38569,
-    {f: 5, c: 38571}, 38578, 38581, 38583, 38586, 38591, {f: 2, c: 38594},
-    38600, {f: 2, c: 38602}, {f: 2, c: 38608}, {f: 2, c: 38611},
-    {f: 2, c: 38615}, 38618, {f: 3, c: 38621}, 38625, {f: 4, c: 38628},
-    {f: 4, c: 38635}, {f: 2, c: 38640}, {f: 2, c: 38644}, 38648, 38650,
-    {f: 2, c: 38652}, 38655, {f: 2, c: 38658}, 38661, {f: 3, c: 38666},
-    {f: 3, c: 38672}, {f: 2, c: 38676}, {f: 5, c: 38679}, 38685,
-    {f: 8, c: 38687}, {f: 2, c: 38696}, {f: 2, c: 38699}, {f: 2, c: 38702},
-    38705, {f: 5, c: 38707}, {f: 3, c: 38714}, {f: 3, c: 38719}, 38723,
-    {f: 3, c: 38725}, {f: 8, c: 38729}, [12205, 38737], {f: 2, c: 38740},
-    {f: 2, c: 38743}, {f: 2, c: 38748}, 38751, {f: 2, c: 38755},
-    {f: 2, c: 38758}, {f: 9, c: 38762}, 38773, {f: 5, c: 38775},
-    {f: 8, c: 38781}, {f: 5, c: 38790}, 38796, 38798, 38800, 38803,
-    {f: 3, c: 38805}, {f: 7, c: 38809}, {f: 2, c: 38817}, {f: 2, c: 38820},
-    {f: 4, c: 38823}, 38828, 38830, {f: 2, c: 38832}, 38835, {f: 8, c: 38837},
-    {f: 5, c: 38846}, {f: 2, c: 38852}, {f: 2, c: 38855}, 38858,
-    {f: 6, c: 38861}, {f: 5, c: 38868}, {f: 2, c: 38874}, 38877,
-    {f: 7, c: 38879}, 38888, {f: 5, c: 38894}, 38900, {f: 8, c: 38903}, 38912,
-    38916, 38921, 38923, 38925, {f: 3, c: 38932}, {f: 3, c: 38937},
-    {f: 4, c: 38941}, {f: 2, c: 38946}, 38949, {f: 6, c: 38951},
-    {f: 2, c: 38958}, {f: 6, c: 38961}, {f: 2, c: 38969}, 38972,
-    {f: 8, c: 38974}, {f: 5, c: 38983}, {f: 4, c: 38991}, {f: 3, c: 38997},
-    39002, {f: 2, c: 39004}, {f: 3, c: 39007}, {f: 2, c: 39011}, 39014,
-    {f: 3, c: 39016}, {f: 2, c: 39021}, 39026, 39051, 39054, 39058, 39061,
-    39065, 39075, {f: 5, c: 39081}, 39088, 39090, {f: 2, c: 39092},
-    {f: 5, c: 39095}, {f: 7, c: 39101}, 39109, 39111, {f: 5, c: 39113},
-    {f: 2, c: 39119}, 39124, {f: 2, c: 39126}, {f: 2, c: 39132}, 39137,
-    {f: 4, c: 39139}, 39148, 39150, {f: 2, c: 39152}, 39155, {f: 7, c: 39157},
-    {f: 4, c: 39167}, 39172, {f: 3, c: 39174}, 39179, {f: 2, c: 39182},
-    {f: 4, c: 39188}, {f: 2, c: 39193}, {f: 2, c: 39196}, {f: 2, c: 39199},
-    {f: 6, c: 39202}, {f: 5, c: 39209}, {f: 4, c: 39215}, {f: 3, c: 39220},
-    {f: 4, c: 39224}, 39229, {f: 3, c: 39232}, 39236, {f: 2, c: 39238},
-    {f: 4, c: 39245}, 39251, 39254, {f: 4, c: 39256}, 39261, {f: 3, c: 39263},
-    39268, 39270, 39283, {f: 2, c: 39288}, 39291, 39294, {f: 2, c: 39298},
-    39305, 39308, 39310, {f: 11, c: 39322}, {f: 2, c: 39334}, {f: 3, c: 39337},
-    {f: 2, c: 39343}, 39346, {f: 12, c: 39349}, {f: 14, c: 39362}, 39379,
-    {f: 2, c: 39382}, 39386, 39388, 39390, 39392, {f: 10, c: 39395},
-    {f: 3, c: 39406}, {f: 13, c: 39410}, 39424, {f: 3, c: 39426},
-    {f: 7, c: 39430}, {f: 6, c: 39440}, {f: 2, c: 39447}, {f: 17, c: 39450},
-    39468, 39471, {f: 5, c: 39473}, {f: 5, c: 39481}, 39487, {f: 4, c: 39494},
-    {f: 2, c: 39499}, 39502, {f: 5, c: 39504}, 39510, {f: 2, c: 39512},
-    {f: 3, c: 39516}, {f: 2, c: 39520}, 39523, {f: 4, c: 39526}, 39531, 39538,
-    39555, 39561, {f: 2, c: 39565}, {f: 2, c: 39572}, 39577, 39590,
-    {f: 6, c: 39593}, {f: 4, c: 39602}, 39609, 39611, {f: 3, c: 39613},
-    {f: 2, c: 39619}, {f: 5, c: 39622}, {f: 2, c: 39629}, 39632, 39639,
-    {f: 6, c: 39641}, 39648, {f: 4, c: 39650}, {f: 4, c: 39655}, 39660,
-    {f: 9, c: 39664}, 39674, {f: 7, c: 39676}, {f: 2, c: 39684}, 39687,
-    {f: 4, c: 39689}, 39694, {f: 3, c: 39696}, {f: 6, c: 39700},
-    {f: 4, c: 39707}, {f: 2, c: 39712}, 39716, 39718, 39720, {f: 4, c: 39722},
-    39728, {f: 8, c: 39731}, {f: 4, c: 39741}, 39750, {f: 3, c: 39754}, 39760,
-    {f: 2, c: 39762}, {f: 3, c: 39765}, 39769, {f: 20, c: 39771},
-    {f: 4, c: 39792}, {f: 2, c: 39797}, {f: 9, c: 39800}, 39810,
-    {f: 10, c: 39812}, 39823, {f: 7, c: 39827}, {f: 2, c: 39835},
-    {f: 11, c: 39839}, 39852, {f: 17, c: 39855}, {f: 5, c: 39874}, 39880,
-    {f: 9, c: 39883}, 39893, {f: 4, c: 39895}, 39900, {f: 3, c: 39902}, 39907,
-    {f: 2, c: 39909}, 39913, {f: 4, c: 39916}, {f: 3, c: 39921},
-    {f: 8, c: 39925}, 39934, {f: 8, c: 39936}, {f: 3, c: 39946},
-    {f: 2, c: 39950}, 39953, {f: 12, c: 39956}, {f: 2, c: 39969}, 39972,
-    {f: 2, c: 39974}, {f: 3, c: 39978}, {f: 3, c: 39982}, 39988, 39990, 39992,
-    39994, {f: 2, c: 39996}, {f: 6, c: 39999}, {f: 2, c: 40006},
-    {f: 8, c: 40010}, 40019, 40021, {f: 4, c: 40025}, 40030, {f: 7, c: 40032},
-    {f: 5, c: 40040}, {f: 10, c: 40046}, 40057, 40059, {f: 2, c: 40061}, 40064,
-    {f: 2, c: 40067}, {f: 2, c: 40073}, 40076, 40079, 40083, {f: 4, c: 40086},
-    40093, 40106, 40108, 40111, 40121, {f: 5, c: 40126}, {f: 2, c: 40136},
-    {f: 2, c: 40145}, {f: 2, c: 40154}, {f: 2, c: 40160}, {f: 2, c: 40163},
-    {f: 3, c: 40166}, {f: 2, c: 40170}, {f: 6, c: 40173}, 40181,
-    {f: 15, c: 40183}, 40200, {f: 11, c: 40202}, {f: 5, c: 40214}, 40220,
-    40222, {f: 3, c: 40224}, {f: 2, c: 40228}, 40231, {f: 6, c: 40233},
-    {f: 10, c: 40241}, {f: 3, c: 40252}, {f: 2, c: 40256}, {f: 14, c: 40259},
-    {f: 8, c: 40276}, {f: 2, c: 40286}, {f: 8, c: 40290}, 40299,
-    {f: 2, c: 40301}, {f: 2, c: 40304}, {f: 20, c: 40307}, 40328,
-    {f: 9, c: 40330}, {f: 4, c: 40340}, 40345, {f: 10, c: 40347},
-    {f: 3, c: 40358}, {f: 5, c: 40362}, {f: 4, c: 40368}, {f: 6, c: 40373},
-    {f: 3, c: 40381}, 40385, 40387, {f: 14, c: 40389}, {f: 3, c: 40404}, 40408,
-    {f: 10, c: 40411}, {f: 8, c: 40423}, {f: 2, c: 40432}, {f: 4, c: 40436},
-    {f: 17, c: 40443}, {f: 8, c: 40461}, {f: 4, c: 40470}, 40476, 40484, 40487,
-    40494, 40496, 40500, {f: 2, c: 40507}, 40512, 40525, 40528,
-    {f: 3, c: 40530}, 40534, 40537, 40541, {f: 4, c: 40543}, 40549,
-    {f: 2, c: 40558}, 40562, 40564, {f: 3, c: 40566}, 40571, {f: 2, c: 40576},
-    {f: 4, c: 40579}, {f: 2, c: 40585}, {f: 6, c: 40588}, {f: 3, c: 40596},
-    {f: 5, c: 40600}, 40606, {f: 5, c: 40608}, {f: 2, c: 40615},
-    {f: 5, c: 40618}, {f: 4, c: 40624}, {f: 2, c: 40630}, {f: 2, c: 40633},
-    40636, {f: 4, c: 40639}, [12232, 40643], {f: 4, c: 40645},
-    {f: 2, c: 40650}, 40656, {f: 2, c: 40658}, {f: 3, c: 40661},
-    {f: 2, c: 40665}, 40673, {f: 2, c: 40675}, 40678, {f: 4, c: 40683},
-    {f: 2, c: 40688}, 40691, {f: 2, c: 40693}, 40696, 40698, {f: 9, c: 40704},
-    40714, 40716, 40719, {f: 2, c: 40721}, 40724, 40726, 40728,
-    {f: 6, c: 40730}, 40737, {f: 9, c: 40739}, {f: 2, c: 40749},
-    {f: 7, c: 40752}, 40760, 40762, 40764, {f: 5, c: 40767}, {f: 5, c: 40773},
-    {f: 3, c: 40780}, 40787, {f: 4, c: 40789}, {f: 2, c: 40794},
-    {f: 2, c: 40797}, 40802, {f: 2, c: 40804}, {f: 3, c: 40807}, 40811,
-    {f: 5, c: 40813}, {f: 4, c: 40819}, {f: 7, c: 40824}, {f: 2, c: 40833},
-    {f: 2, c: 40846}, {f: 3, c: 40849}, {f: 3, c: 40854}, {f: 2, c: 40861},
-    {f: 5, c: 40865}, 63788, {f: 3, c: 64013}, 64017, {f: 2, c: 64019}, 64024,
-    {f: 3, c: 64031}, {f: 2, c: 64035}, {f: 3, c: 64039}, 11905,
-    [59414, 131207], [59415, 131209], [59416, 131276], 11908, 13427, 13383,
-    11912, 11915, 59422, 13726, 13850, 13838, 11916, 11927, 14702, 14616,
-    59430, 14799, 14815, 14963, 14800, {f: 2, c: 59435}, 15182, 15470, 15584,
-    11943, [59441, 136663], 59442, 11946, 16470, 16735, 11950, 17207, 11955,
-    {f: 2, c: 11958}, [59451, 141711], 17329, 17324, 11963, 17373, 17622,
-    18017, 17996, [59459, 132361], 18211, 18217, 18300, 18317, 11978, 18759,
-    18810, 18813, {f: 2, c: 18818}, {f: 2, c: 18821}, 18847, 18843, 18871,
-    18870, [59476, 133533], [59477, 147966], 19619, {f: 3, c: 19615}, 19575,
-    19618, {f: 7, c: 19731}, 19886, 59492, {s: 226}, 8364, 165, 0, 0, 12351,
-    {s: 17}, 12436, {s: 14}, 12535, 12537, 12536, 12538, 0, {f: 3, c: 12339},
-    {f: 3, c: 12344}, {f: 3, c: 12586}, {f: 24, c: 12704}, 11904,
-    {f: 2, c: 11906}, {f: 3, c: 11909}, {f: 2, c: 11913}, {f: 10, c: 11917},
-    {f: 2, c: 11928}, {f: 12, c: 11931}, {f: 2, c: 11944}, {f: 3, c: 11947},
-    {f: 4, c: 11951}, {f: 2, c: 11956}, {f: 3, c: 11960}, {f: 14, c: 11964},
-    {f: 41, c: 11979}, {f: 71, c: 13312}, {f: 43, c: 13384},
-    {f: 298, c: 13428}, {f: 111, c: 13727}, {f: 11, c: 13839},
-    {f: 765, c: 13851}, {f: 85, c: 14617}, {f: 96, c: 14703},
-    {f: 14, c: 14801}, {f: 147, c: 14816}, {f: 218, c: 14964},
-    {f: 287, c: 15183}, {f: 113, c: 15471}, {f: 885, c: 15585},
-    {f: 264, c: 16471}, {f: 471, c: 16736}, {f: 116, c: 17208},
-    {f: 4, c: 17325}, {f: 43, c: 17330}, {f: 248, c: 17374},
-    {f: 373, c: 17623}, {f: 20, c: 17997}, {f: 193, c: 18018},
-    {f: 5, c: 18212}, {f: 82, c: 18218}, {f: 16, c: 18301}, {f: 441, c: 18318},
-    {f: 50, c: 18760}, {f: 2, c: 18811}, {f: 4, c: 18814}, 18820,
-    {f: 20, c: 18823}, {f: 3, c: 18844}, {f: 22, c: 18848}, {f: 703, c: 18872},
-    {f: 39, c: 19576}, {f: 111, c: 19620}, {f: 148, c: 19738},
-    {f: 7, c: 19887}]
-};
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var ColorSpace = (function ColorSpaceClosure() {
-  // Constructor should define this.numComps, this.defaultColor, this.name
-  function ColorSpace() {
-    error('should not call ColorSpace constructor');
-  }
-
-  ColorSpace.prototype = {
-    // Input: array of size numComps representing color component values
-    // Output: array of rgb values, each value ranging from [0.1]
-    getRgb: function ColorSpace_getRgb(color) {
-      error('Should not call ColorSpace.getRgb: ' + color);
-    },
-    // Input: Uint8Array of component values, each value scaled to [0,255]
-    // Output: Uint8Array of rgb values, each value scaled to [0,255]
-    getRgbBuffer: function ColorSpace_getRgbBuffer(input) {
-      error('Should not call ColorSpace.getRgbBuffer: ' + input);
-    }
-  };
-
-  ColorSpace.parse = function ColorSpace_parse(cs, xref, res) {
-    var IR = ColorSpace.parseToIR(cs, xref, res);
-    if (IR instanceof AlternateCS)
-      return IR;
-
-    return ColorSpace.fromIR(IR);
-  };
-
-  ColorSpace.fromIR = function ColorSpace_fromIR(IR) {
-    var name = isArray(IR) ? IR[0] : IR;
-
-    switch (name) {
-      case 'DeviceGrayCS':
-        return new DeviceGrayCS();
-      case 'DeviceRgbCS':
-        return new DeviceRgbCS();
-      case 'DeviceCmykCS':
-        return new DeviceCmykCS();
-      case 'PatternCS':
-        var basePatternCS = IR[1];
-        if (basePatternCS)
-          basePatternCS = ColorSpace.fromIR(basePatternCS);
-        return new PatternCS(basePatternCS);
-      case 'IndexedCS':
-        var baseIndexedCS = IR[1];
-        var hiVal = IR[2];
-        var lookup = IR[3];
-        return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup);
-      case 'AlternateCS':
-        var numComps = IR[1];
-        var alt = IR[2];
-        var tintFnIR = IR[3];
-
-        return new AlternateCS(numComps, ColorSpace.fromIR(alt),
-                                PDFFunction.fromIR(tintFnIR));
-      case 'LabCS':
-        var whitePoint = IR[1].WhitePoint;
-        var blackPoint = IR[1].BlackPoint;
-        var range = IR[1].Range;
-        return new LabCS(whitePoint, blackPoint, range);
-      default:
-        error('Unkown name ' + name);
-    }
-    return null;
-  };
-
-  ColorSpace.parseToIR = function ColorSpace_parseToIR(cs, xref, res) {
-    if (isName(cs)) {
-      var colorSpaces = res.get('ColorSpace');
-      if (isDict(colorSpaces)) {
-        var refcs = colorSpaces.get(cs.name);
-        if (refcs)
-          cs = refcs;
-      }
-    }
-
-    cs = xref.fetchIfRef(cs);
-    var mode;
-
-    if (isName(cs)) {
-      mode = cs.name;
-      this.mode = mode;
-
-      switch (mode) {
-        case 'DeviceGray':
-        case 'G':
-          return 'DeviceGrayCS';
-        case 'DeviceRGB':
-        case 'RGB':
-          return 'DeviceRgbCS';
-        case 'DeviceCMYK':
-        case 'CMYK':
-          return 'DeviceCmykCS';
-        case 'Pattern':
-          return ['PatternCS', null];
-        default:
-          error('unrecognized colorspace ' + mode);
-      }
-    } else if (isArray(cs)) {
-      mode = cs[0].name;
-      this.mode = mode;
-
-      switch (mode) {
-        case 'DeviceGray':
-        case 'G':
-          return 'DeviceGrayCS';
-        case 'DeviceRGB':
-        case 'RGB':
-          return 'DeviceRgbCS';
-        case 'DeviceCMYK':
-        case 'CMYK':
-          return 'DeviceCmykCS';
-        case 'CalGray':
-          return 'DeviceGrayCS';
-        case 'CalRGB':
-          return 'DeviceRgbCS';
-        case 'ICCBased':
-          var stream = xref.fetchIfRef(cs[1]);
-          var dict = stream.dict;
-          var numComps = dict.get('N');
-          if (numComps == 1)
-            return 'DeviceGrayCS';
-          if (numComps == 3)
-            return 'DeviceRgbCS';
-          if (numComps == 4)
-            return 'DeviceCmykCS';
-          break;
-        case 'Pattern':
-          var basePatternCS = cs[1];
-          if (basePatternCS)
-            basePatternCS = ColorSpace.parseToIR(basePatternCS, xref, res);
-          return ['PatternCS', basePatternCS];
-        case 'Indexed':
-        case 'I':
-          var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
-          var hiVal = cs[2] + 1;
-          var lookup = xref.fetchIfRef(cs[3]);
-          return ['IndexedCS', baseIndexedCS, hiVal, lookup];
-        case 'Separation':
-        case 'DeviceN':
-          var name = cs[1];
-          var numComps = 1;
-          if (isName(name))
-            numComps = 1;
-          else if (isArray(name))
-            numComps = name.length;
-          var alt = ColorSpace.parseToIR(cs[2], xref, res);
-          var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3]));
-          return ['AlternateCS', numComps, alt, tintFnIR];
-        case 'Lab':
-          var params = cs[1].getAll();
-          return ['LabCS', params];
-        default:
-          error('unimplemented color space object "' + mode + '"');
-      }
-    } else {
-      error('unrecognized color space object: "' + cs + '"');
-    }
-    return null;
-  };
-  /**
-   * Checks if a decode map matches the default decode map for a color space.
-   * This handles the general decode maps where there are two values per
-   * component. e.g. [0, 1, 0, 1, 0, 1] for a RGB color.
-   * This does not handle Lab, Indexed, or Pattern decode maps since they are
-   * slightly different.
-   * @param {Array} decode Decode map (usually from an image).
-   * @param {Number} n Number of components the color space has.
-   */
-  ColorSpace.isDefaultDecode = function ColorSpace_isDefaultDecode(decode, n) {
-    if (!decode)
-      return true;
-
-    if (n * 2 !== decode.length) {
-      warning('The decode map is not the correct length');
-      return true;
-    }
-    for (var i = 0, ii = decode.length; i < ii; i += 2) {
-      if (decode[i] != 0 || decode[i + 1] != 1)
-        return false;
-    }
-    return true;
-  };
-
-  return ColorSpace;
-})();
-
-/**
- * Alternate color space handles both Separation and DeviceN color spaces.  A
- * Separation color space is actually just a DeviceN with one color component.
- * Both color spaces use a tinting function to convert colors to a base color
- * space.
- */
-var AlternateCS = (function AlternateCSClosure() {
-  function AlternateCS(numComps, base, tintFn) {
-    this.name = 'Alternate';
-    this.numComps = numComps;
-    this.defaultColor = [];
-    for (var i = 0; i < numComps; ++i)
-      this.defaultColor.push(1);
-    this.base = base;
-    this.tintFn = tintFn;
-  }
-
-  AlternateCS.prototype = {
-    getRgb: function AlternateCS_getRgb(color) {
-      var tinted = this.tintFn(color);
-      return this.base.getRgb(tinted);
-    },
-    getRgbBuffer: function AlternateCS_getRgbBuffer(input, bits) {
-      var tintFn = this.tintFn;
-      var base = this.base;
-      var scale = 1 / ((1 << bits) - 1);
-      var length = input.length;
-      var pos = 0;
-      var baseNumComps = base.numComps;
-      var baseBuf = new Uint8Array(baseNumComps * length);
-      var numComps = this.numComps;
-      var scaled = [];
-
-      for (var i = 0; i < length; i += numComps) {
-        for (var z = 0; z < numComps; ++z)
-          scaled[z] = input[i + z] * scale;
-
-        var tinted = tintFn(scaled);
-        for (var j = 0; j < baseNumComps; ++j)
-          baseBuf[pos++] = 255 * tinted[j];
-      }
-      return base.getRgbBuffer(baseBuf, 8);
-    },
-    isDefaultDecode: function AlternateCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-
-  return AlternateCS;
-})();
-
-var PatternCS = (function PatternCSClosure() {
-  function PatternCS(baseCS) {
-    this.name = 'Pattern';
-    this.base = baseCS;
-  }
-  PatternCS.prototype = {};
-
-  return PatternCS;
-})();
-
-var IndexedCS = (function IndexedCSClosure() {
-  function IndexedCS(base, highVal, lookup) {
-    this.name = 'Indexed';
-    this.numComps = 1;
-    this.defaultColor = [0];
-    this.base = base;
-    this.highVal = highVal;
-
-    var baseNumComps = base.numComps;
-    var length = baseNumComps * highVal;
-    var lookupArray = new Uint8Array(length);
-
-    if (isStream(lookup)) {
-      var bytes = lookup.getBytes(length);
-      lookupArray.set(bytes);
-    } else if (isString(lookup)) {
-      for (var i = 0; i < length; ++i)
-        lookupArray[i] = lookup.charCodeAt(i);
-    } else {
-      error('Unrecognized lookup table: ' + lookup);
-    }
-    this.lookup = lookupArray;
-  }
-
-  IndexedCS.prototype = {
-    getRgb: function IndexedCS_getRgb(color) {
-      var numComps = this.base.numComps;
-      var start = color[0] * numComps;
-      var c = [];
-
-      for (var i = start, ii = start + numComps; i < ii; ++i)
-        c.push(this.lookup[i]);
-
-      return this.base.getRgb(c);
-    },
-    getRgbBuffer: function IndexedCS_getRgbBuffer(input) {
-      var base = this.base;
-      var numComps = base.numComps;
-      var lookup = this.lookup;
-      var length = input.length;
-      var baseBuf = new Uint8Array(length * numComps);
-      var baseBufPos = 0;
-
-      for (var i = 0; i < length; ++i) {
-        var lookupPos = input[i] * numComps;
-        for (var j = 0; j < numComps; ++j) {
-          baseBuf[baseBufPos++] = lookup[lookupPos + j];
-        }
-      }
-
-      return base.getRgbBuffer(baseBuf, 8);
-    },
-    isDefaultDecode: function IndexedCS_isDefaultDecode(decodeMap) {
-      // indexed color maps shouldn't be changed
-      return true;
-    }
-  };
-  return IndexedCS;
-})();
-
-var DeviceGrayCS = (function DeviceGrayCSClosure() {
-  function DeviceGrayCS() {
-    this.name = 'DeviceGray';
-    this.numComps = 1;
-    this.defaultColor = [0];
-  }
-
-  DeviceGrayCS.prototype = {
-    getRgb: function DeviceGrayCS_getRgb(color) {
-      var c = color[0];
-      return [c, c, c];
-    },
-    getRgbBuffer: function DeviceGrayCS_getRgbBuffer(input, bits) {
-      var scale = 255 / ((1 << bits) - 1);
-      var length = input.length;
-      var rgbBuf = new Uint8Array(length * 3);
-      for (var i = 0, j = 0; i < length; ++i) {
-        var c = (scale * input[i]) | 0;
-        rgbBuf[j++] = c;
-        rgbBuf[j++] = c;
-        rgbBuf[j++] = c;
-      }
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceGrayCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-  return DeviceGrayCS;
-})();
-
-var DeviceRgbCS = (function DeviceRgbCSClosure() {
-  function DeviceRgbCS() {
-    this.name = 'DeviceRGB';
-    this.numComps = 3;
-    this.defaultColor = [0, 0, 0];
-  }
-  DeviceRgbCS.prototype = {
-    getRgb: function DeviceRgbCS_getRgb(color) {
-      return color;
-    },
-    getRgbBuffer: function DeviceRgbCS_getRgbBuffer(input, bits) {
-      if (bits == 8)
-        return input;
-      var scale = 255 / ((1 << bits) - 1);
-      var i, length = input.length;
-      var rgbBuf = new Uint8Array(length);
-      for (i = 0; i < length; ++i)
-        rgbBuf[i] = (scale * input[i]) | 0;
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceRgbCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-  return DeviceRgbCS;
-})();
-
-var DeviceCmykCS = (function DeviceCmykCSClosure() {
-  function DeviceCmykCS() {
-    this.name = 'DeviceCMYK';
-    this.numComps = 4;
-    this.defaultColor = [0, 0, 0, 1];
-  }
-  DeviceCmykCS.prototype = {
-    getRgb: function DeviceCmykCS_getRgb(color) {
-      var c = color[0], m = color[1], y = color[2], k = color[3];
-
-      // CMYK -> CMY: http://www.easyrgb.com/index.php?X=MATH&H=14#text14
-      c = (c * (1 - k) + k);
-      m = (m * (1 - k) + k);
-      y = (y * (1 - k) + k);
-
-      // CMY -> RGB: http://www.easyrgb.com/index.php?X=MATH&H=12#text12
-      var r = (1 - c);
-      var g = (1 - m);
-      var b = (1 - y);
-
-      return [r, g, b];
-    },
-    getRgbBuffer: function DeviceCmykCS_getRgbBuffer(colorBuf, bits) {
-      var scale = 1 / ((1 << bits) - 1);
-      var length = colorBuf.length / 4;
-      var rgbBuf = new Uint8Array(length * 3);
-      var rgbBufPos = 0;
-      var colorBufPos = 0;
-
-      for (var i = 0; i < length; i++) {
-        var cmyk = [];
-        for (var j = 0; j < 4; ++j)
-          cmyk.push(scale * colorBuf[colorBufPos++]);
-
-        var rgb = this.getRgb(cmyk);
-        for (var j = 0; j < 3; ++j)
-          rgbBuf[rgbBufPos++] = Math.round(rgb[j] * 255);
-      }
-
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceCmykCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-
-  return DeviceCmykCS;
-})();
-
-//
-// LabCS: Based on "PDF Reference, Sixth Ed", p.250
-//
-var LabCS = (function LabCSClosure() {
-  function LabCS(whitePoint, blackPoint, range) {
-    this.name = 'Lab';
-    this.numComps = 3;
-    this.defaultColor = [0, 0, 0];
-
-    if (!whitePoint)
-      error('WhitePoint missing - required for color space Lab');
-    blackPoint = blackPoint || [0, 0, 0];
-    range = range || [-100, 100, -100, 100];
-
-    // Translate args to spec variables
-    this.XW = whitePoint[0];
-    this.YW = whitePoint[1];
-    this.ZW = whitePoint[2];
-    this.amin = range[0];
-    this.amax = range[1];
-    this.bmin = range[2];
-    this.bmax = range[3];
-
-    // These are here just for completeness - the spec doesn't offer any
-    // formulas that use BlackPoint in Lab
-    this.XB = blackPoint[0];
-    this.YB = blackPoint[1];
-    this.ZB = blackPoint[2];
-
-    // Validate vars as per spec
-    if (this.XW < 0 || this.ZW < 0 || this.YW !== 1)
-      error('Invalid WhitePoint components, no fallback available');
-
-    if (this.XB < 0 || this.YB < 0 || this.ZB < 0) {
-      warn('Invalid BlackPoint, falling back to default');
-      this.XB = this.YB = this.ZB = 0;
-    }
-
-    if (this.amin > this.amax || this.bmin > this.bmax) {
-      warn('Invalid Range, falling back to defaults');
-      this.amin = -100;
-      this.amax = 100;
-      this.bmin = -100;
-      this.bmax = 100;
-    }
-  };
-
-  // Function g(x) from spec
-  function g(x) {
-    if (x >= 6 / 29)
-      return x * x * x;
-    else
-      return (108 / 841) * (x - 4 / 29);
-  }
-
-  LabCS.prototype = {
-    getRgb: function LabCS_getRgb(color) {
-      // Ls,as,bs <---> L*,a*,b* in the spec
-      var Ls = color[0], as = color[1], bs = color[2];
-
-      // Adjust limits of 'as' and 'bs'
-      as = as > this.amax ? this.amax : as;
-      as = as < this.amin ? this.amin : as;
-      bs = bs > this.bmax ? this.bmax : bs;
-      bs = bs < this.bmin ? this.bmin : bs;
-
-      // Computes intermediate variables X,Y,Z as per spec
-      var M = (Ls + 16) / 116;
-      var L = M + (as / 500);
-      var N = M - (bs / 200);
-      var X = this.XW * g(L);
-      var Y = this.YW * g(M);
-      var Z = this.ZW * g(N);
-
-      // XYZ to RGB 3x3 matrix, from:
-      // http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html#RTFToC18
-      var XYZtoRGB = [3.240479, -1.537150, -0.498535,
-                      -0.969256, 1.875992, 0.041556,
-                      0.055648, -0.204043, 1.057311];
-
-      return Util.apply3dTransform(XYZtoRGB, [X, Y, Z]);
-    },
-    getRgbBuffer: function LabCS_getRgbBuffer(input, bits) {
-      if (bits == 8)
-        return input;
-      var scale = 255 / ((1 << bits) - 1);
-      var i, length = input.length / 3;
-      var rgbBuf = new Uint8Array(length);
-
-      var j = 0;
-      for (i = 0; i < length; ++i) {
-        // Convert L*, a*, s* into RGB
-        var rgb = this.getRgb([input[i], input[i + 1], input[i + 2]]);
-        rgbBuf[j++] = rgb[0];
-        rgbBuf[j++] = rgb[1];
-        rgbBuf[j++] = rgb[2];
-      }
-
-      return rgbBuf;
-    },
-    isDefaultDecode: function LabCS_isDefaultDecode(decodeMap) {
-      // From Table 90 in Adobe's:
-      // "Document management - Portable document format", 1st ed, 2008
-      if (decodeMap[0] === 0 && decodeMap[1] === 100 &&
-          decodeMap[2] === this.amin && decodeMap[3] === this.amax &&
-          decodeMap[4] === this.bmin && decodeMap[5] === this.bmax)
-        return true;
-      else
-        return false;
-    }
-  };
-  return LabCS;
-})();
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var ARCFourCipher = (function ARCFourCipherClosure() {
-  function ARCFourCipher(key) {
-    this.a = 0;
-    this.b = 0;
-    var s = new Uint8Array(256);
-    var i, j = 0, tmp, keyLength = key.length;
-    for (i = 0; i < 256; ++i)
-      s[i] = i;
-    for (i = 0; i < 256; ++i) {
-      tmp = s[i];
-      j = (j + tmp + key[i % keyLength]) & 0xFF;
-      s[i] = s[j];
-      s[j] = tmp;
-    }
-    this.s = s;
-  }
-
-  ARCFourCipher.prototype = {
-    encryptBlock: function ARCFourCipher_encryptBlock(data) {
-      var i, n = data.length, tmp, tmp2;
-      var a = this.a, b = this.b, s = this.s;
-      var output = new Uint8Array(n);
-      for (i = 0; i < n; ++i) {
-        a = (a + 1) & 0xFF;
-        tmp = s[a];
-        b = (b + tmp) & 0xFF;
-        tmp2 = s[b];
-        s[a] = tmp2;
-        s[b] = tmp;
-        output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF];
-      }
-      this.a = a;
-      this.b = b;
-      return output;
-    }
-  };
-  ARCFourCipher.prototype.decryptBlock = ARCFourCipher.prototype.encryptBlock;
-
-  return ARCFourCipher;
-})();
-
-var calculateMD5 = (function calculateMD5Closure() {
-  var r = new Uint8Array([
-    7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
-    5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
-    4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
-    6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
-
-  var k = new Int32Array([
-    -680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
-    -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
-    1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
-    643717713, -373897302, -701558691, 38016083, -660478335, -405537848,
-    568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784,
-    1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556,
-    -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222,
-    -722521979, 76029189, -640364487, -421815835, 530742520, -995338651,
-    -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606,
-    -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649,
-    -145523070, -1120210379, 718787259, -343485551]);
-
-  function hash(data, offset, length) {
-    var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878;
-    // pre-processing
-    var paddedLength = (length + 72) & ~63; // data + 9 extra bytes
-    var padded = new Uint8Array(paddedLength);
-    var i, j, n;
-    for (i = 0; i < length; ++i)
-      padded[i] = data[offset++];
-    padded[i++] = 0x80;
-    n = paddedLength - 8;
-    while (i < n)
-      padded[i++] = 0;
-    padded[i++] = (length << 3) & 0xFF;
-    padded[i++] = (length >> 5) & 0xFF;
-    padded[i++] = (length >> 13) & 0xFF;
-    padded[i++] = (length >> 21) & 0xFF;
-    padded[i++] = (length >>> 29) & 0xFF;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    // chunking
-    // TODO ArrayBuffer ?
-    var w = new Int32Array(16);
-    for (i = 0; i < paddedLength;) {
-      for (j = 0; j < 16; ++j, i += 4) {
-        w[j] = (padded[i] | (padded[i + 1] << 8) |
-                (padded[i + 2] << 16) | (padded[i + 3] << 24));
-      }
-      var a = h0, b = h1, c = h2, d = h3, f, g;
-      for (j = 0; j < 64; ++j) {
-        if (j < 16) {
-          f = (b & c) | ((~b) & d);
-          g = j;
-        } else if (j < 32) {
-          f = (d & b) | ((~d) & c);
-          g = (5 * j + 1) & 15;
-        } else if (j < 48) {
-          f = b ^ c ^ d;
-          g = (3 * j + 5) & 15;
-        } else {
-          f = c ^ (b | (~d));
-          g = (7 * j) & 15;
-        }
-        var tmp = d, rotateArg = (a + f + k[j] + w[g]) | 0, rotate = r[j];
-        d = c;
-        c = b;
-        b = (b + ((rotateArg << rotate) | (rotateArg >>> (32 - rotate)))) | 0;
-        a = tmp;
-      }
-      h0 = (h0 + a) | 0;
-      h1 = (h1 + b) | 0;
-      h2 = (h2 + c) | 0;
-      h3 = (h3 + d) | 0;
-    }
-    return new Uint8Array([
-        h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >>> 24) & 0xFF,
-        h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >>> 24) & 0xFF,
-        h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >>> 24) & 0xFF,
-        h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >>> 24) & 0xFF
-    ]);
-  }
-  return hash;
-})();
-
-var NullCipher = (function NullCipherClosure() {
-  function NullCipher() {
-  }
-
-  NullCipher.prototype = {
-    decryptBlock: function NullCipher_decryptBlock(data) {
-      return data;
-    }
-  };
-
-  return NullCipher;
-})();
-
-var AES128Cipher = (function AES128CipherClosure() {
-  var rcon = new Uint8Array([
-    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
-    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
-    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
-    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
-    0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-    0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,
-    0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72,
-    0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc,
-    0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
-    0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e,
-    0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
-    0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
-    0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
-    0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
-    0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
-    0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
-    0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb,
-    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
-    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
-    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
-    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
-    0x74, 0xe8, 0xcb, 0x8d]);
-
-  var s = new Uint8Array([
-    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
-    0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
-    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
-    0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
-    0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
-    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
-    0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
-    0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
-    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
-    0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
-    0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
-    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
-    0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
-    0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
-    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
-    0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
-    0xb0, 0x54, 0xbb, 0x16]);
-
-  var inv_s = new Uint8Array([
-    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
-    0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
-    0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
-    0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
-    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
-    0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
-    0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
-    0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
-    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
-    0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
-    0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
-    0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
-    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
-    0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
-    0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
-    0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
-    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
-    0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
-    0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
-    0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
-    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
-    0x55, 0x21, 0x0c, 0x7d]);
-
-  var mix = new Uint32Array([
-    0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927,
-    0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45,
-    0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb,
-    0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381,
-    0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf,
-    0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66,
-    0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28,
-    0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012,
-    0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec,
-    0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e,
-    0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd,
-    0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7,
-    0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89,
-    0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b,
-    0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815,
-    0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f,
-    0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa,
-    0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8,
-    0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36,
-    0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c,
-    0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742,
-    0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea,
-    0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4,
-    0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e,
-    0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360,
-    0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502,
-    0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87,
-    0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd,
-    0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3,
-    0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621,
-    0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f,
-    0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55,
-    0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26,
-    0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844,
-    0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba,
-    0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480,
-    0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce,
-    0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67,
-    0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929,
-    0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713,
-    0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed,
-    0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f,
-    0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
-
-  function expandKey128(cipherKey) {
-    var b = 176, result = new Uint8Array(b);
-    result.set(cipherKey);
-    for (var j = 16, i = 1; j < b; ++i) {
-      // RotWord
-      var t1 = result[j - 3], t2 = result[j - 2],
-          t3 = result[j - 1], t4 = result[j - 4];
-      // SubWord
-      t1 = s[t1]; t2 = s[t2]; t3 = s[t3]; t4 = s[t4];
-      // Rcon
-      t1 = t1 ^ rcon[i];
-      for (var n = 0; n < 4; ++n) {
-        result[j] = (t1 ^= result[j - 16]); j++;
-        result[j] = (t2 ^= result[j - 16]); j++;
-        result[j] = (t3 ^= result[j - 16]); j++;
-        result[j] = (t4 ^= result[j - 16]); j++;
-      }
-    }
-    return result;
-  }
-
-  function decrypt128(input, key) {
-    var state = new Uint8Array(16);
-    state.set(input);
-    var i, j, k;
-    var t, u, v;
-    // AddRoundKey
-    for (j = 0, k = 160; j < 16; ++j, ++k)
-      state[j] ^= key[k];
-    for (i = 9; i >= 1; --i) {
-      // InvShiftRows
-      t = state[13]; state[13] = state[9]; state[9] = state[5];
-      state[5] = state[1]; state[1] = t;
-      t = state[14]; u = state[10]; state[14] = state[6];
-      state[10] = state[2]; state[6] = t; state[2] = u;
-      t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
-      state[11] = t; state[7] = u; state[3] = v;
-      // InvSubBytes
-      for (j = 0; j < 16; ++j)
-        state[j] = inv_s[state[j]];
-      // AddRoundKey
-      for (j = 0, k = i * 16; j < 16; ++j, ++k)
-        state[j] ^= key[k];
-      // InvMixColumns
-      for (j = 0; j < 16; j += 4) {
-        var s0 = mix[state[j]], s1 = mix[state[j + 1]],
-            s2 = mix[state[j + 2]], s3 = mix[state[j + 3]];
-        t = (s0 ^ (s1 >>> 8) ^ (s1 << 24) ^ (s2 >>> 16) ^ (s2 << 16) ^
-            (s3 >>> 24) ^ (s3 << 8));
-        state[j] = (t >>> 24) & 0xFF;
-        state[j + 1] = (t >> 16) & 0xFF;
-        state[j + 2] = (t >> 8) & 0xFF;
-        state[j + 3] = t & 0xFF;
-      }
-    }
-    // InvShiftRows
-    t = state[13]; state[13] = state[9]; state[9] = state[5];
-    state[5] = state[1]; state[1] = t;
-    t = state[14]; u = state[10]; state[14] = state[6];
-    state[10] = state[2]; state[6] = t; state[2] = u;
-    t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
-    state[11] = t; state[7] = u; state[3] = v;
-    for (j = 0; j < 16; ++j) {
-      // InvSubBytes
-      state[j] = inv_s[state[j]];
-      // AddRoundKey
-      state[j] ^= key[j];
-    }
-    return state;
-  }
-
-  function AES128Cipher(key) {
-    this.key = expandKey128(key);
-    this.buffer = new Uint8Array(16);
-    this.bufferPosition = 0;
-  }
-
-  function decryptBlock2(data) {
-    var i, j, ii, sourceLength = data.length,
-        buffer = this.buffer, bufferLength = this.bufferPosition,
-        result = [], iv = this.iv;
-    for (i = 0; i < sourceLength; ++i) {
-      buffer[bufferLength] = data[i];
-      ++bufferLength;
-      if (bufferLength < 16)
-        continue;
-      // buffer is full, decrypting
-      var plain = decrypt128(buffer, this.key);
-      // xor-ing the IV vector to get plain text
-      for (j = 0; j < 16; ++j)
-        plain[j] ^= iv[j];
-      iv = buffer;
-      result.push(plain);
-      buffer = new Uint8Array(16);
-      bufferLength = 0;
-    }
-    // saving incomplete buffer
-    this.buffer = buffer;
-    this.bufferLength = bufferLength;
-    this.iv = iv;
-    if (result.length == 0)
-      return new Uint8Array([]);
-    if (result.length == 1)
-      return result[0];
-    // combining plain text blocks into one
-    var output = new Uint8Array(16 * result.length);
-    for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16)
-      output.set(result[i], j);
-    return output;
-  }
-
-  AES128Cipher.prototype = {
-    decryptBlock: function AES128Cipher_decryptBlock(data) {
-      var i, sourceLength = data.length;
-      var buffer = this.buffer, bufferLength = this.bufferPosition;
-      // waiting for IV values -- they are at the start of the stream
-      for (i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength)
-        buffer[bufferLength] = data[i];
-      if (bufferLength < 16) {
-        // need more data
-        this.bufferLength = bufferLength;
-        return new Uint8Array([]);
-      }
-      this.iv = buffer;
-      this.buffer = new Uint8Array(16);
-      this.bufferLength = 0;
-      // starting decryption
-      this.decryptBlock = decryptBlock2;
-      return this.decryptBlock(data.subarray(16));
-    }
-  };
-
-  return AES128Cipher;
-})();
-
-var CipherTransform = (function CipherTransformClosure() {
-  function CipherTransform(stringCipherConstructor, streamCipherConstructor) {
-    this.stringCipherConstructor = stringCipherConstructor;
-    this.streamCipherConstructor = streamCipherConstructor;
-  }
-  CipherTransform.prototype = {
-    createStream: function CipherTransform_createStream(stream) {
-      var cipher = new this.streamCipherConstructor();
-      return new DecryptStream(stream,
-        function cipherTransformDecryptStream(data) {
-          return cipher.decryptBlock(data);
-        }
-      );
-    },
-    decryptString: function CipherTransform_decryptString(s) {
-      var cipher = new this.stringCipherConstructor();
-      var data = stringToBytes(s);
-      data = cipher.decryptBlock(data);
-      return bytesToString(data);
-    }
-  };
-  return CipherTransform;
-})();
-
-var CipherTransformFactory = (function CipherTransformFactoryClosure() {
-  function prepareKeyData(fileId, password, ownerPassword, userPassword,
-                          flags, revision, keyLength, encryptMetadata) {
-    var defaultPasswordBytes = new Uint8Array([
-      0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
-      0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
-      0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
-      0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
-    var hashData = new Uint8Array(100), i = 0, j, n;
-    if (password) {
-      n = Math.min(32, password.length);
-      for (; i < n; ++i)
-        hashData[i] = password[i];
-    }
-    j = 0;
-    while (i < 32) {
-      hashData[i++] = defaultPasswordBytes[j++];
-    }
-    // as now the padded password in the hashData[0..i]
-    for (j = 0, n = ownerPassword.length; j < n; ++j)
-      hashData[i++] = ownerPassword[j];
-    hashData[i++] = flags & 0xFF;
-    hashData[i++] = (flags >> 8) & 0xFF;
-    hashData[i++] = (flags >> 16) & 0xFF;
-    hashData[i++] = (flags >>> 24) & 0xFF;
-    for (j = 0, n = fileId.length; j < n; ++j)
-      hashData[i++] = fileId[j];
-    if (revision >= 4 && !encryptMetadata) {
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-    }
-    var hash = calculateMD5(hashData, 0, i);
-    var keyLengthInBytes = keyLength >> 3;
-    if (revision >= 3) {
-      for (j = 0; j < 50; ++j) {
-         hash = calculateMD5(hash, 0, keyLengthInBytes);
-      }
-    }
-    var encryptionKey = hash.subarray(0, keyLengthInBytes);
-    var cipher, checkData;
-
-    if (revision >= 3) {
-      // padded password in hashData, we can use this array for user
-      // password check
-      i = 32;
-      for (j = 0, n = fileId.length; j < n; ++j)
-        hashData[i++] = fileId[j];
-      cipher = new ARCFourCipher(encryptionKey);
-      var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
-      n = encryptionKey.length;
-      var derivedKey = new Uint8Array(n), k;
-      for (j = 1; j <= 19; ++j) {
-        for (k = 0; k < n; ++k)
-          derivedKey[k] = encryptionKey[k] ^ j;
-        cipher = new ARCFourCipher(derivedKey);
-        checkData = cipher.encryptBlock(checkData);
-      }
-    } else {
-      cipher = new ARCFourCipher(encryptionKey);
-      checkData = cipher.encryptBlock(hashData.subarray(0, 32));
-    }
-    for (j = 0, n = checkData.length; j < n; ++j) {
-      if (userPassword[j] != checkData[j])
-        error('incorrect password');
-    }
-    return encryptionKey;
-  }
-
-  var identityName = new Name('Identity');
-
-  function CipherTransformFactory(dict, fileId, password) {
-    var filter = dict.get('Filter');
-    if (!isName(filter) || filter.name != 'Standard')
-      error('unknown encryption method');
-    this.dict = dict;
-    var algorithm = dict.get('V');
-    if (!isInt(algorithm) ||
-      (algorithm != 1 && algorithm != 2 && algorithm != 4))
-      error('unsupported encryption algorithm');
-    this.algorithm = algorithm;
-    var keyLength = dict.get('Length') || 40;
-    if (!isInt(keyLength) ||
-      keyLength < 40 || (keyLength % 8) != 0)
-      error('invalid key length');
-    // prepare keys
-    var ownerPassword = stringToBytes(dict.get('O'));
-    var userPassword = stringToBytes(dict.get('U'));
-    var flags = dict.get('P');
-    var revision = dict.get('R');
-    var encryptMetadata =
-      dict.get('EncryptMetadata') !== false; // makes true as default value
-    var fileIdBytes = stringToBytes(fileId);
-    var passwordBytes;
-    if (password)
-      passwordBytes = stringToBytes(password);
-
-    this.encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
-                                        ownerPassword, userPassword,
-                                        flags, revision,
-                                        keyLength, encryptMetadata);
-    if (algorithm == 4) {
-      this.cf = dict.get('CF');
-      this.stmf = dict.get('StmF') || identityName;
-      this.strf = dict.get('StrF') || identityName;
-      this.eff = dict.get('EFF') || this.strf;
-    }
-  }
-
-  function buildObjectKey(num, gen, encryptionKey, isAes) {
-    var key = new Uint8Array(encryptionKey.length + 9), i, n;
-    for (i = 0, n = encryptionKey.length; i < n; ++i)
-      key[i] = encryptionKey[i];
-    key[i++] = num & 0xFF;
-    key[i++] = (num >> 8) & 0xFF;
-    key[i++] = (num >> 16) & 0xFF;
-    key[i++] = gen & 0xFF;
-    key[i++] = (gen >> 8) & 0xFF;
-    if (isAes) {
-      key[i++] = 0x73;
-      key[i++] = 0x41;
-      key[i++] = 0x6C;
-      key[i++] = 0x54;
-    }
-    var hash = calculateMD5(key, 0, i);
-    return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
-  }
-
-  function buildCipherConstructor(cf, name, num, gen, key) {
-    var cryptFilter = cf.get(name.name);
-    var cfm;
-    if (cryptFilter != null)
-      cfm = cryptFilter.get('CFM');
-    if (!cfm || cfm.name == 'None') {
-      return function cipherTransformFactoryBuildCipherConstructorNone() {
-        return new NullCipher();
-      };
-    }
-    if ('V2' == cfm.name) {
-      return function cipherTransformFactoryBuildCipherConstructorV2() {
-        return new ARCFourCipher(
-          buildObjectKey(num, gen, key, false));
-      };
-    }
-    if ('AESV2' == cfm.name) {
-      return function cipherTransformFactoryBuildCipherConstructorAESV2() {
-        return new AES128Cipher(
-          buildObjectKey(num, gen, key, true));
-      };
-    }
-    error('Unknown crypto method');
-  }
-
-  CipherTransformFactory.prototype = {
-    createCipherTransform:
-      function CipherTransformFactory_createCipherTransform(num, gen) {
-      if (this.algorithm == 4) {
-        return new CipherTransform(
-          buildCipherConstructor(this.cf, this.stmf,
-            num, gen, this.encryptionKey),
-          buildCipherConstructor(this.cf, this.strf,
-            num, gen, this.encryptionKey));
-      }
-      // algorithms 1 and 2
-      var key = buildObjectKey(num, gen, this.encryptionKey, false);
-      var cipherConstructor = function buildCipherCipherConstructor() {
-        return new ARCFourCipher(key);
-      };
-      return new CipherTransform(cipherConstructor, cipherConstructor);
-    }
-  };
-
-  return CipherTransformFactory;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PartialEvaluator = (function PartialEvaluatorClosure() {
-  function PartialEvaluator(xref, handler, uniquePrefix) {
-    this.state = new EvalState();
-    this.stateStack = [];
-
-    this.xref = xref;
-    this.handler = handler;
-    this.uniquePrefix = uniquePrefix;
-    this.objIdCounter = 0;
-  }
-
-  var OP_MAP = {
-    // Graphics state
-    w: 'setLineWidth',
-    J: 'setLineCap',
-    j: 'setLineJoin',
-    M: 'setMiterLimit',
-    d: 'setDash',
-    ri: 'setRenderingIntent',
-    i: 'setFlatness',
-    gs: 'setGState',
-    q: 'save',
-    Q: 'restore',
-    cm: 'transform',
-
-    // Path
-    m: 'moveTo',
-    l: 'lineTo',
-    c: 'curveTo',
-    v: 'curveTo2',
-    y: 'curveTo3',
-    h: 'closePath',
-    re: 'rectangle',
-    S: 'stroke',
-    s: 'closeStroke',
-    f: 'fill',
-    F: 'fill',
-    'f*': 'eoFill',
-    B: 'fillStroke',
-    'B*': 'eoFillStroke',
-    b: 'closeFillStroke',
-    'b*': 'closeEOFillStroke',
-    n: 'endPath',
-
-    // Clipping
-    W: 'clip',
-    'W*': 'eoClip',
-
-    // Text
-    BT: 'beginText',
-    ET: 'endText',
-    Tc: 'setCharSpacing',
-    Tw: 'setWordSpacing',
-    Tz: 'setHScale',
-    TL: 'setLeading',
-    Tf: 'setFont',
-    Tr: 'setTextRenderingMode',
-    Ts: 'setTextRise',
-    Td: 'moveText',
-    TD: 'setLeadingMoveText',
-    Tm: 'setTextMatrix',
-    'T*': 'nextLine',
-    Tj: 'showText',
-    TJ: 'showSpacedText',
-    "'": 'nextLineShowText',
-    '"': 'nextLineSetSpacingShowText',
-
-    // Type3 fonts
-    d0: 'setCharWidth',
-    d1: 'setCharWidthAndBounds',
-
-    // Color
-    CS: 'setStrokeColorSpace',
-    cs: 'setFillColorSpace',
-    SC: 'setStrokeColor',
-    SCN: 'setStrokeColorN',
-    sc: 'setFillColor',
-    scn: 'setFillColorN',
-    G: 'setStrokeGray',
-    g: 'setFillGray',
-    RG: 'setStrokeRGBColor',
-    rg: 'setFillRGBColor',
-    K: 'setStrokeCMYKColor',
-    k: 'setFillCMYKColor',
-
-    // Shading
-    sh: 'shadingFill',
-
-    // Images
-    BI: 'beginInlineImage',
-    ID: 'beginImageData',
-    EI: 'endInlineImage',
-
-    // XObjects
-    Do: 'paintXObject',
-
-    // Marked content
-    MP: 'markPoint',
-    DP: 'markPointProps',
-    BMC: 'beginMarkedContent',
-    BDC: 'beginMarkedContentProps',
-    EMC: 'endMarkedContent',
-
-    // Compatibility
-    BX: 'beginCompat',
-    EX: 'endCompat'
-  };
-
-  function splitCombinedOperations(operations) {
-    // Two operations can be combined together, trying to find which two
-    // operations were concatenated.
-    for (var i = operations.length - 1; i > 0; i--) {
-      var op1 = operations.substring(0, i), op2 = operations.substring(i);
-      if (op1 in OP_MAP && op2 in OP_MAP)
-        return [op1, op2]; // operations found
-    }
-    return null;
-  }
-
-  PartialEvaluator.prototype = {
-    getOperatorList: function PartialEvaluator_getOperatorList(stream,
-                                                               resources,
-                                                               dependency,
-                                                               queue) {
-
-      var self = this;
-      var xref = this.xref;
-      var handler = this.handler;
-      var uniquePrefix = this.uniquePrefix || '';
-
-      function insertDependency(depList) {
-        fnArray.push('dependency');
-        argsArray.push(depList);
-        for (var i = 0, ii = depList.length; i < ii; i++) {
-          var dep = depList[i];
-          if (dependency.indexOf(dep) == -1) {
-            dependency.push(depList[i]);
-          }
-        }
-      }
-
-      function handleSetFont(fontName, font) {
-        var loadedName = null;
-
-        var fontRes = resources.get('Font');
-
-        assert(fontRes, 'fontRes not available');
-
-        font = xref.fetchIfRef(font) || fontRes.get(fontName);
-        assertWellFormed(isDict(font));
-        if (!font.translated) {
-          font.translated = self.translateFont(font, xref, resources,
-                                               dependency);
-          if (font.translated) {
-            // keep track of each font we translated so the caller can
-            // load them asynchronously before calling display on a page
-            loadedName = 'font_' + uniquePrefix + (++self.objIdCounter);
-            font.translated.properties.loadedName = loadedName;
-            font.loadedName = loadedName;
-
-            var translated = font.translated;
-            // Convert the file to an ArrayBuffer which will be turned back into
-            // a Stream in the main thread.
-            if (translated.file)
-              translated.file = translated.file.getBytes();
-            if (translated.properties.file) {
-              translated.properties.file =
-                  translated.properties.file.getBytes();
-            }
-
-            handler.send('obj', [
-                loadedName,
-                'Font',
-                translated.name,
-                translated.file,
-                translated.properties
-            ]);
-          }
-        }
-        loadedName = loadedName || font.loadedName;
-
-        // Ensure the font is ready before the font is set
-        // and later on used for drawing.
-        // OPTIMIZE: This should get insert to the operatorList only once per
-        // page.
-        insertDependency([loadedName]);
-        return loadedName;
-      }
-
-      function buildPaintImageXObject(image, inline) {
-        var dict = image.dict;
-        var w = dict.get('Width', 'W');
-        var h = dict.get('Height', 'H');
-
-        var imageMask = dict.get('ImageMask', 'IM') || false;
-        if (imageMask) {
-          // This depends on a tmpCanvas beeing filled with the
-          // current fillStyle, such that processing the pixel
-          // data can't be done here. Instead of creating a
-          // complete PDFImage, only read the information needed
-          // for later.
-
-          var width = dict.get('Width', 'W');
-          var height = dict.get('Height', 'H');
-          var bitStrideLength = (width + 7) >> 3;
-          var imgArray = image.getBytes(bitStrideLength * height);
-          var decode = dict.get('Decode', 'D');
-          var inverseDecode = !!decode && decode[0] > 0;
-
-          fn = 'paintImageMaskXObject';
-          args = [imgArray, inverseDecode, width, height];
-          return;
-        }
-
-        // If there is no imageMask, create the PDFImage and a lot
-        // of image processing can be done here.
-        var objId = 'img_' + uniquePrefix + (++self.objIdCounter);
-        insertDependency([objId]);
-        args = [objId, w, h];
-
-        var softMask = dict.get('SMask', 'IM') || false;
-        if (!softMask && image instanceof JpegStream &&
-            image.isNativelySupported(xref, resources)) {
-          // These JPEGs don't need any more processing so we can just send it.
-          fn = 'paintJpegXObject';
-          handler.send('obj', [objId, 'JpegStream', image.getIR()]);
-          return;
-        }
-
-        fn = 'paintImageXObject';
-
-        PDFImage.buildImage(function(imageObj) {
-            var drawWidth = imageObj.drawWidth;
-            var drawHeight = imageObj.drawHeight;
-            var imgData = {
-              width: drawWidth,
-              height: drawHeight,
-              data: new Uint8Array(drawWidth * drawHeight * 4)
-            };
-            var pixels = imgData.data;
-            imageObj.fillRgbaBuffer(pixels, drawWidth, drawHeight);
-            handler.send('obj', [objId, 'Image', imgData]);
-          }, handler, xref, resources, image, inline);
-      }
-
-      if (!queue)
-        queue = {};
-
-      if (!queue.argsArray) {
-        queue.argsArray = [];
-      }
-      if (!queue.fnArray) {
-        queue.fnArray = [];
-      }
-
-      var fnArray = queue.fnArray, argsArray = queue.argsArray;
-      var dependencyArray = dependency || [];
-
-      resources = resources || new Dict();
-      var xobjs = resources.get('XObject') || new Dict();
-      var patterns = resources.get('Pattern') || new Dict();
-      var parser = new Parser(new Lexer(stream), false, xref);
-      var res = resources;
-      var hasNextObj = false, nextObj;
-      var args = [], obj;
-      var TILING_PATTERN = 1, SHADING_PATTERN = 2;
-
-      while (true) {
-        if (hasNextObj) {
-          obj = nextObj;
-          hasNextObj = false;
-        } else {
-          obj = parser.getObj();
-          if (isEOF(obj))
-            break;
-        }
-
-        if (isCmd(obj)) {
-          var cmd = obj.cmd;
-          var fn = OP_MAP[cmd];
-          if (!fn) {
-            // invalid content command, trying to recover
-            var cmds = splitCombinedOperations(cmd);
-            if (cmds) {
-              cmd = cmds[0];
-              fn = OP_MAP[cmd];
-              // feeding other command on the next interation
-              hasNextObj = true;
-              nextObj = Cmd.get(cmds[1]);
-            }
-          }
-          assertWellFormed(fn, 'Unknown command "' + cmd + '"');
-          // TODO figure out how to type-check vararg functions
-
-          if ((cmd == 'SCN' || cmd == 'scn') && !args[args.length - 1].code) {
-            // compile tiling patterns
-            var patternName = args[args.length - 1];
-            // SCN/scn applies patterns along with normal colors
-            if (isName(patternName)) {
-              var pattern = patterns.get(patternName.name);
-              if (pattern) {
-                var dict = isStream(pattern) ? pattern.dict : pattern;
-                var typeNum = dict.get('PatternType');
-
-                if (typeNum == TILING_PATTERN) {
-                  // Create an IR of the pattern code.
-                  var depIdx = dependencyArray.length;
-                  var operatorList = this.getOperatorList(pattern,
-                      dict.get('Resources') || resources, dependencyArray);
-
-                  // Add the dependencies that are required to execute the
-                  // operatorList.
-                  insertDependency(dependencyArray.slice(depIdx));
-
-                  args = TilingPattern.getIR(operatorList, dict, args);
-                }
-                else if (typeNum == SHADING_PATTERN) {
-                  var shading = dict.get('Shading');
-                  var matrix = dict.get('Matrix');
-                  var pattern = Pattern.parseShading(shading, matrix, xref,
-                                                     res);
-                  args = pattern.getIR();
-                } else {
-                  error('Unkown PatternType ' + typeNum);
-                }
-              }
-            }
-          } else if (cmd == 'Do' && !args[0].code) {
-            // eagerly compile XForm objects
-            var name = args[0].name;
-            var xobj = xobjs.get(name);
-            if (xobj) {
-              assertWellFormed(isStream(xobj), 'XObject should be a stream');
-
-              var type = xobj.dict.get('Subtype');
-              assertWellFormed(
-                isName(type),
-                'XObject should have a Name subtype'
-              );
-
-              if ('Form' == type.name) {
-                var matrix = xobj.dict.get('Matrix');
-                var bbox = xobj.dict.get('BBox');
-
-                fnArray.push('paintFormXObjectBegin');
-                argsArray.push([matrix, bbox]);
-
-                // This adds the operatorList of the xObj to the current queue.
-                var depIdx = dependencyArray.length;
-
-                // Pass in the current `queue` object. That means the `fnArray`
-                // and the `argsArray` in this scope is reused and new commands
-                // are added to them.
-                this.getOperatorList(xobj,
-                    xobj.dict.get('Resources') || resources,
-                    dependencyArray, queue);
-
-               // Add the dependencies that are required to execute the
-               // operatorList.
-               insertDependency(dependencyArray.slice(depIdx));
-
-                fn = 'paintFormXObjectEnd';
-                args = [];
-              } else if ('Image' == type.name) {
-                buildPaintImageXObject(xobj, false);
-              } else {
-                error('Unhandled XObject subtype ' + type.name);
-              }
-            }
-          } else if (cmd == 'Tf') { // eagerly collect all fonts
-            args[0] = handleSetFont(args[0].name);
-          } else if (cmd == 'EI') {
-            buildPaintImageXObject(args[0], true);
-          }
-
-          switch (fn) {
-            // Parse the ColorSpace data to a raw format.
-            case 'setFillColorSpace':
-            case 'setStrokeColorSpace':
-              args = [ColorSpace.parseToIR(args[0], xref, resources)];
-              break;
-            case 'shadingFill':
-              var shadingRes = res.get('Shading');
-              if (!shadingRes)
-                error('No shading resource found');
-
-              var shading = shadingRes.get(args[0].name);
-              if (!shading)
-                error('No shading object found');
-
-              var shadingFill = Pattern.parseShading(shading, null, xref, res);
-              var patternIR = shadingFill.getIR();
-              args = [patternIR];
-              fn = 'shadingFill';
-              break;
-            case 'setGState':
-              var dictName = args[0];
-              var extGState = resources.get('ExtGState');
-
-              if (!isDict(extGState) || !extGState.has(dictName.name))
-                break;
-
-              var gsState = extGState.get(dictName.name);
-
-              // This array holds the converted/processed state data.
-              var gsStateObj = [];
-
-              gsState.forEach(
-                function canvasGraphicsSetGStateForEach(key, value) {
-                  switch (key) {
-                    case 'Type':
-                      break;
-                    case 'LW':
-                    case 'LC':
-                    case 'LJ':
-                    case 'ML':
-                    case 'D':
-                    case 'RI':
-                    case 'FL':
-                    case 'CA':
-                    case 'ca':
-                      gsStateObj.push([key, value]);
-                      break;
-                    case 'Font':
-                      gsStateObj.push([
-                        'Font',
-                        handleSetFont(null, value[0]),
-                        value[1]
-                      ]);
-                      break;
-                    case 'OP':
-                    case 'op':
-                    case 'OPM':
-                    case 'BG':
-                    case 'BG2':
-                    case 'UCR':
-                    case 'UCR2':
-                    case 'TR':
-                    case 'TR2':
-                    case 'HT':
-                    case 'SM':
-                    case 'SA':
-                    case 'BM':
-                    case 'SMask':
-                    case 'AIS':
-                    case 'TK':
-                      TODO('graphic state operator ' + key);
-                      break;
-                    default:
-                      warn('Unknown graphic state operator ' + key);
-                      break;
-                  }
-                }
-              );
-              args = [gsStateObj];
-              break;
-          } // switch
-
-          fnArray.push(fn);
-          argsArray.push(args);
-          args = [];
-        } else if (obj != null) {
-          assertWellFormed(args.length <= 33, 'Too many arguments');
-          args.push(obj);
-        }
-      }
-
-      return queue;
-    },
-
-    extractDataStructures: function
-      partialEvaluatorExtractDataStructures(dict, baseDict,
-                                            xref, properties) {
-      // 9.10.2
-      var toUnicode = dict.get('ToUnicode') ||
-        baseDict.get('ToUnicode');
-      if (toUnicode)
-        properties.toUnicode = this.readToUnicode(toUnicode, xref);
-
-      if (properties.composite) {
-        // CIDSystemInfo helps to match CID to 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 (isStream(cidToGidMap))
-          properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
-      }
-
-      var flags = properties.flags;
-      var differences = [];
-      var baseEncoding = !!(flags & FontFlags.Symbolic) ?
-                         Encodings.symbolsEncoding : Encodings.StandardEncoding;
-      var hasEncoding = dict.has('Encoding');
-      if (hasEncoding) {
-        var encoding = dict.get('Encoding');
-        if (isDict(encoding)) {
-          var baseName = encoding.get('BaseEncoding');
-          if (baseName)
-            baseEncoding = Encodings[baseName.name];
-          else
-            hasEncoding = false; // base encoding was not provided
-
-          // Load the differences between the base and original
-          if (encoding.has('Differences')) {
-            var diffEncoding = encoding.get('Differences');
-            var index = 0;
-            for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
-              var data = diffEncoding[j];
-              if (isNum(data))
-                index = data;
-              else
-                differences[index++] = data.name;
-            }
-          }
-        } else if (isName(encoding)) {
-          baseEncoding = Encodings[encoding.name];
-        } else {
-          error('Encoding is not a Name nor a Dict');
-        }
-      }
-
-      properties.differences = differences;
-      properties.baseEncoding = baseEncoding;
-      properties.hasEncoding = hasEncoding;
-    },
-
-    readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref) {
-      var cmapObj = toUnicode;
-      var charToUnicode = [];
-      if (isName(cmapObj)) {
-        var isIdentityMap = cmapObj.name.substr(0, 9) == 'Identity-';
-        if (!isIdentityMap)
-          error('ToUnicode file cmap translation not implemented');
-      } else if (isStream(cmapObj)) {
-        var tokens = [];
-        var token = '';
-        var beginArrayToken = {};
-
-        var cmap = cmapObj.getBytes(cmapObj.length);
-        for (var i = 0, ii = cmap.length; i < ii; i++) {
-          var octet = cmap[i];
-          if (octet == 0x20 || octet == 0x0D || octet == 0x0A ||
-              octet == 0x3C || octet == 0x5B || octet == 0x5D) {
-            switch (token) {
-              case 'usecmap':
-                error('usecmap is not implemented');
-                break;
-
-              case 'beginbfchar':
-              case 'beginbfrange':
-              case 'begincidchar':
-              case 'begincidrange':
-                token = '';
-                tokens = [];
-                break;
-
-              case 'endcidrange':
-              case 'endbfrange':
-                for (var j = 0, jj = tokens.length; j < jj; j += 3) {
-                  var startRange = tokens[j];
-                  var endRange = tokens[j + 1];
-                  var code = tokens[j + 2];
-                  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;
-
-              case 'endcidchar':
-              case 'endbfchar':
-                for (var j = 0, jj = tokens.length; j < jj; j += 2) {
-                  var index = tokens[j];
-                  var code = tokens[j + 1];
-                  charToUnicode[index] = code;
-                }
-                break;
-
-              case '':
-                break;
-
-              default:
-                if (token[0] >= '0' && token[0] <= '9')
-                  token = parseInt(token, 10); // a number
-                tokens.push(token);
-                token = '';
-            }
-            switch (octet) {
-              case 0x5B:
-                // begin list parsing
-                tokens.push(beginArrayToken);
-                break;
-              case 0x5D:
-                // collect array items
-                var items = [], item;
-                while (tokens.length &&
-                       (item = tokens.pop()) != beginArrayToken)
-                  items.unshift(item);
-                tokens.push(items);
-                break;
-            }
-          } else if (octet == 0x3E) {
-            if (token.length) {
-              if (token.length <= 4) {
-                // parsing hex number
-                tokens.push(parseInt(token, 16));
-                token = '';
-              } else {
-                // parsing hex UTF-16BE numbers
-                var str = [];
-                for (var k = 0, kk = token.length; k < kk; k += 4) {
-                  var b = parseInt(token.substr(k, 4), 16);
-                  if (b <= 0x10) {
-                    k += 4;
-                    b = (b << 16) | parseInt(token.substr(k, 4), 16);
-                    b -= 0x10000;
-                    str.push(0xD800 | (b >> 10));
-                    str.push(0xDC00 | (b & 0x3FF));
-                    break;
-                  }
-                  str.push(b);
-                }
-                tokens.push(String.fromCharCode.apply(String, str));
-                token = '';
-              }
-            }
-          } else {
-            token += String.fromCharCode(octet);
-          }
-        }
-      }
-      return charToUnicode;
-    },
-    readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
-      // Extract the encoding from the CIDToGIDMap
-      var glyphsData = cidToGidStream.getBytes();
-
-      // Set encoding 0 to later verify the font has an encoding
-      var result = [];
-      for (var j = 0, jj = glyphsData.length; j < jj; j++) {
-        var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
-        if (glyphID == 0)
-          continue;
-
-        var code = j >> 1;
-        result[code] = glyphID;
-      }
-      return result;
-    },
-
-    extractWidths: function PartialEvaluator_extractWidths(dict,
-                                                   xref,
-                                                   descriptor,
-                                                   properties) {
-      var glyphsWidths = [];
-      var defaultWidth = 0;
-      if (properties.composite) {
-        defaultWidth = dict.get('DW') || 1000;
-
-        var widths = dict.get('W');
-        if (widths) {
-          var start = 0, end = 0;
-          for (var i = 0, ii = widths.length; i < ii; i++) {
-            var code = widths[i];
-            if (isArray(code)) {
-              for (var j = 0, jj = code.length; j < jj; j++)
-                glyphsWidths[start++] = code[j];
-              start = 0;
-            } else if (start) {
-              var width = widths[++i];
-              for (var j = start; j <= code; j++)
-                glyphsWidths[j] = width;
-              start = 0;
-            } else {
-              start = code;
-            }
-          }
-        }
-      } else {
-        var firstChar = properties.firstChar;
-        var widths = dict.get('Widths');
-        if (widths) {
-          var j = firstChar;
-          for (var i = 0, ii = widths.length; i < ii; i++)
-            glyphsWidths[j++] = widths[i];
-          defaultWidth = parseFloat(descriptor.get('MissingWidth')) || 0;
-        } else {
-          // Trying get the BaseFont metrics (see comment above).
-          var baseFontName = dict.get('BaseFont');
-          if (isName(baseFontName)) {
-            var metrics = this.getBaseFontMetrics(baseFontName.name);
-
-            glyphsWidths = metrics.widths;
-            defaultWidth = metrics.defaultWidth;
-          }
-        }
-      }
-
-      properties.defaultWidth = defaultWidth;
-      properties.widths = glyphsWidths;
-    },
-
-    getBaseFontMetrics: function PartialEvaluator_getBaseFontMetrics(name) {
-      var defaultWidth = 0, widths = [];
-      var glyphWidths = Metrics[stdFontMap[name] || name];
-      if (isNum(glyphWidths)) {
-        defaultWidth = glyphWidths;
-      } else {
-        widths = glyphWidths;
-      }
-
-      return {
-        defaultWidth: defaultWidth,
-        widths: widths
-      };
-    },
-
-    translateFont: function PartialEvaluator_translateFont(dict,
-                                                           xref,
-                                                           resources,
-                                                           dependency) {
-      var baseDict = dict;
-      var type = dict.get('Subtype');
-      assertWellFormed(isName(type), 'invalid font Subtype');
-
-      var composite = false;
-      if (type.name == 'Type0') {
-        // If font is a composite
-        //  - get the descendant font
-        //  - set the type according to the descendant font
-        //  - get the FontDescriptor from the descendant font
-        var df = dict.get('DescendantFonts');
-        if (!df)
-          return null;
-
-        dict = isArray(df) ? xref.fetchIfRef(df[0]) : df;
-
-        type = dict.get('Subtype');
-        assertWellFormed(isName(type), 'invalid font Subtype');
-        composite = true;
-      }
-      var maxCharIndex = composite ? 0xFFFF : 0xFF;
-
-      var descriptor = 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 baseFontName = dict.get('BaseFont');
-          if (!isName(baseFontName))
-            return null;
-
-          // Using base font name as a font name.
-          baseFontName = baseFontName.name.replace(/[,_]/g, '-');
-          var metrics = this.getBaseFontMetrics(baseFontName);
-
-          // Simulating descriptor flags attribute
-          var fontNameWoStyle = baseFontName.split('-')[0];
-          var flags = (serifFonts[fontNameWoStyle] ||
-            (fontNameWoStyle.search(/serif/gi) != -1) ? FontFlags.Serif : 0) |
-            (symbolsFonts[fontNameWoStyle] ? FontFlags.Symbolic :
-            FontFlags.Nonsymbolic);
-
-          var properties = {
-            type: type.name,
-            widths: metrics.widths,
-            defaultWidth: metrics.defaultWidth,
-            flags: flags,
-            firstChar: 0,
-            lastChar: maxCharIndex
-          };
-          this.extractDataStructures(dict, dict, xref, properties);
-
-          return {
-            name: baseFontName,
-            dict: baseDict,
-            properties: properties
-          };
-        }
-      }
-
-      // According to the spec if 'FontDescriptor' is declared, 'FirstChar',
-      // 'LastChar' and 'Widths' should exist too, but some PDF encoders seem
-      // to ignore this rule when a variant of a standart font is used.
-      // TODO Fill the width array depending on which of the base font this is
-      // a variant.
-      var firstChar = dict.get('FirstChar') || 0;
-      var lastChar = dict.get('LastChar') || maxCharIndex;
-      var fontName = descriptor.get('FontName');
-      // Some bad pdf's have a string as the font name.
-      if (isString(fontName))
-        fontName = new Name(fontName);
-      assertWellFormed(isName(fontName), 'invalid font name');
-
-      var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
-      if (fontFile) {
-        if (fontFile.dict) {
-          var subtype = fontFile.dict.get('Subtype');
-          if (subtype)
-            subtype = subtype.name;
-
-          var length1 = fontFile.dict.get('Length1');
-
-          var length2 = fontFile.dict.get('Length2');
-        }
-      }
-
-      var properties = {
-        type: type.name,
-        subtype: subtype,
-        file: fontFile,
-        length1: length1,
-        length2: length2,
-        composite: composite,
-        fixedPitch: false,
-        fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
-        firstChar: firstChar || 0,
-        lastChar: lastChar || maxCharIndex,
-        bbox: descriptor.get('FontBBox'),
-        ascent: descriptor.get('Ascent'),
-        descent: descriptor.get('Descent'),
-        xHeight: descriptor.get('XHeight'),
-        capHeight: descriptor.get('CapHeight'),
-        flags: descriptor.get('Flags'),
-        italicAngle: descriptor.get('ItalicAngle'),
-        coded: false
-      };
-      this.extractWidths(dict, xref, descriptor, properties);
-      this.extractDataStructures(dict, baseDict, xref, properties);
-
-      if (type.name === 'Type3') {
-        properties.coded = true;
-        var charProcs = dict.get('CharProcs').getAll();
-        var fontResources = dict.get('Resources') || resources;
-        properties.resources = fontResources;
-        properties.charProcOperatorList = {};
-        for (var key in charProcs) {
-          var glyphStream = charProcs[key];
-          properties.charProcOperatorList[key] =
-            this.getOperatorList(glyphStream, fontResources, dependency);
-        }
-      }
-
-      return {
-        name: fontName.name,
-        dict: baseDict,
-        file: fontFile,
-        properties: properties
-      };
-    }
-  };
-
-  return PartialEvaluator;
-})();
-
-var EvalState = (function EvalStateClosure() {
-  function EvalState() {
-    // Are soft masks and alpha values shapes or opacities?
-    this.alphaIsShape = false;
-    this.fontSize = 0;
-    this.textMatrix = IDENTITY_MATRIX;
-    this.leading = 0;
-    // Start of text line (in text coordinates)
-    this.lineX = 0;
-    this.lineY = 0;
-    // Character and word spacing
-    this.charSpacing = 0;
-    this.wordSpacing = 0;
-    this.textHScale = 1;
-    // Color spaces
-    this.fillColorSpace = null;
-    this.strokeColorSpace = null;
-  }
-  EvalState.prototype = {
-  };
-  return EvalState;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-/**
- * Maximum time to wait for a font to be loaded by font-face rules.
- */
-var kMaxWaitForFontFace = 1000;
-
-// Unicode Private Use Area
-var kCmapGlyphOffset = 0xE000;
-var kSizeOfGlyphArea = 0x1900;
-var kSymbolicFontGlyphOffset = 0xF000;
-
-// PDF Glyph Space Units are one Thousandth of a TextSpace Unit
-// except for Type 3 fonts
-var kPDFGlyphSpaceUnits = 1000;
-
-// Until hinting is fully supported this constant can be used
-var kHintingEnabled = false;
-
-var FontFlags = {
-  FixedPitch: 1,
-  Serif: 2,
-  Symbolic: 4,
-  Script: 8,
-  Nonsymbolic: 32,
-  Italic: 64,
-  AllCap: 65536,
-  SmallCap: 131072,
-  ForceBold: 262144
-};
-
-var Encodings = {
-  ExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclamsmall', 'Hungarumlautsmall', '', 'dollaroldstyle',
-    'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
-    'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
-    'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
-    'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
-    'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon',
-    'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior',
-    'questionsmall', '', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior',
-    'esuperior', '', '', 'isuperior', '', '', 'lsuperior', 'msuperior',
-    'nsuperior', 'osuperior', '', '', 'rsuperior', 'ssuperior', 'tsuperior',
-    '', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '',
-    'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
-    'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
-    'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
-    'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
-    'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
-    'onefitted', 'rupiah', 'Tildesmall', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
-    '', '', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall',
-    'Caronsmall', '', 'Dotaccentsmall', '', '', 'Macronsmall', '', '',
-    'figuredash', 'hypheninferior', '', '', 'Ogoneksmall', 'Ringsmall',
-    'Cedillasmall', '', '', '', 'onequarter', 'onehalf', 'threequarters',
-    'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
-    'seveneighths', 'onethird', 'twothirds', '', '', 'zerosuperior',
-    'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
-    'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
-    'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
-    'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
-    'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
-    'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall',
-    'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall',
-    'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
-    'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
-    'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
-    'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
-    'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
-    'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
-    'Ydieresissmall'],
-  MacExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclamsmall', 'Hungarumlautsmall', 'centoldstyle',
-    'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall',
-    'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
-    'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle',
-    'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle',
-    'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle',
-    'nineoldstyle', 'colon', 'semicolon', '', 'threequartersemdash', '',
-    'questionsmall', '', '', '', '', 'Ethsmall', '', '', 'onequarter',
-    'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
-    'seveneighths', 'onethird', 'twothirds', '', '', '', '', '', '', 'ff',
-    'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior',
-    'Circumflexsmall', 'hypheninferior', 'Gravesmall', 'Asmall', 'Bsmall',
-    'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
-    'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
-    'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
-    'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
-    'Tildesmall', '', '', 'asuperior', 'centsuperior', '', '', '', '',
-    'Aacutesmall', 'Agravesmall', 'Acircumflexsmall', 'Adieresissmall',
-    'Atildesmall', 'Aringsmall', 'Ccedillasmall', 'Eacutesmall', 'Egravesmall',
-    'Ecircumflexsmall', 'Edieresissmall', 'Iacutesmall', 'Igravesmall',
-    'Icircumflexsmall', 'Idieresissmall', 'Ntildesmall', 'Oacutesmall',
-    'Ogravesmall', 'Ocircumflexsmall', 'Odieresissmall', 'Otildesmall',
-    'Uacutesmall', 'Ugravesmall', 'Ucircumflexsmall', 'Udieresissmall', '',
-    'eightsuperior', 'fourinferior', 'threeinferior', 'sixinferior',
-    'eightinferior', 'seveninferior', 'Scaronsmall', '', 'centinferior',
-    'twoinferior', '', 'Dieresissmall', '', 'Caronsmall', 'osuperior',
-    'fiveinferior', '', 'commainferior', 'periodinferior', 'Yacutesmall', '',
-    'dollarinferior', '', 'Thornsmall', '', 'nineinferior', 'zeroinferior',
-    'Zcaronsmall', 'AEsmall', 'Oslashsmall', 'questiondownsmall',
-    'oneinferior', 'Lslashsmall', '', '', '', '', '', '', 'Cedillasmall', '',
-    '', '', '', '', 'OEsmall', 'figuredash', 'hyphensuperior', '', '', '', '',
-    'exclamdownsmall', '', 'Ydieresissmall', '', 'onesuperior', 'twosuperior',
-    'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
-    'sevensuperior', 'ninesuperior', 'zerosuperior', '', 'esuperior',
-    'rsuperior', 'tsuperior', '', '', 'isuperior', 'ssuperior', 'dsuperior',
-    '', '', '', '', '', 'lsuperior', 'Ogoneksmall', 'Brevesmall',
-    'Macronsmall', 'bsuperior', 'nsuperior', 'msuperior', 'commasuperior',
-    'periodsuperior', 'Dotaccentsmall', 'Ringsmall'],
-  MacRomanEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', '',
-    'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis',
-    'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis', 'atilde',
-    'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
-    'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute',
-    'ograve', 'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave',
-    'ucircumflex', 'udieresis', 'dagger', 'degree', 'cent', 'sterling',
-    'section', 'bullet', 'paragraph', 'germandbls', 'registered', 'copyright',
-    'trademark', 'acute', 'dieresis', 'notequal', 'AE', 'Oslash', 'infinity',
-    'plusminus', 'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff',
-    'summation', 'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine',
-    'Omega', 'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot',
-    'radical', 'florin', 'approxequal', 'Delta', 'guillemotleft',
-    'guillemotright', 'ellipsis', '', 'Agrave', 'Atilde', 'Otilde', 'OE',
-    'oe', 'endash', 'emdash', 'quotedblleft', 'quotedblright', 'quoteleft',
-    'quoteright', 'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction',
-    'currency', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl',
-    'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand',
-    'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute',
-    'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple',
-    'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex',
-    'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut',
-    'ogonek', 'caron'],
-  StandardEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u',
-    'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'exclamdown',
-    'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-    'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-    'guilsinglright', 'fi', 'fl', '', 'endash', 'dagger', 'daggerdbl',
-    'periodcentered', '', 'paragraph', 'bullet', 'quotesinglbase',
-    'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
-    'perthousand', '', 'questiondown', '', 'grave', 'acute', 'circumflex',
-    'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', '', 'ring', 'cedilla',
-    '', 'hungarumlaut', 'ogonek', 'caron', 'emdash', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', 'AE', '', 'ordfeminine', '', '',
-    '', '', 'Lslash', 'Oslash', 'OE', 'ordmasculine', '', '', '', '', '', 'ae',
-    '', '', '', 'dotlessi', '', '', 'lslash', 'oslash', 'oe', 'germandbls'],
-  WinAnsiEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
-    'bullet', 'Euro', 'bullet', 'quotesinglbase', 'florin', 'quotedblbase',
-    'ellipsis', 'dagger', 'daggerdbl', 'circumflex', 'perthousand', 'Scaron',
-    'guilsinglleft', 'OE', 'bullet', 'Zcaron', 'bullet', 'bullet', 'quoteleft',
-    'quoteright', 'quotedblleft', 'quotedblright', 'bullet', 'endash',
-    'emdash', 'tilde', 'trademark', 'scaron', 'guilsinglright', 'oe', 'bullet',
-    'zcaron', 'Ydieresis', '', 'exclamdown', 'cent', 'sterling',
-    'currency', 'yen', 'brokenbar', 'section', 'dieresis', 'copyright',
-    'ordfeminine', 'guillemotleft', 'logicalnot', 'hyphen', 'registered',
-    'macron', 'degree', 'plusminus', 'twosuperior', 'threesuperior', 'acute',
-    'mu', 'paragraph', 'periodcentered', 'cedilla', 'onesuperior',
-    'ordmasculine', 'guillemotright', 'onequarter', 'onehalf', 'threequarters',
-    'questiondown', 'Agrave', 'Aacute', 'Acircumflex', 'Atilde', 'Adieresis',
-    'Aring', 'AE', 'Ccedilla', 'Egrave', 'Eacute', 'Ecircumflex', 'Edieresis',
-    'Igrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Eth', 'Ntilde', 'Ograve',
-    'Oacute', 'Ocircumflex', 'Otilde', 'Odieresis', 'multiply', 'Oslash',
-    'Ugrave', 'Uacute', 'Ucircumflex', 'Udieresis', 'Yacute', 'Thorn',
-    'germandbls', 'agrave', 'aacute', 'acircumflex', 'atilde', 'adieresis',
-    'aring', 'ae', 'ccedilla', 'egrave', 'eacute', 'ecircumflex', 'edieresis',
-    'igrave', 'iacute', 'icircumflex', 'idieresis', 'eth', 'ntilde', 'ograve',
-    'oacute', 'ocircumflex', 'otilde', 'odieresis', 'divide', 'oslash',
-    'ugrave', 'uacute', 'ucircumflex', 'udieresis', 'yacute', 'thorn',
-    'ydieresis'],
-  symbolsEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'universal', 'numbersign', 'existential', 'percent',
-    'ampersand', 'suchthat', 'parenleft', 'parenright', 'asteriskmath', 'plus',
-    'comma', 'minus', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
-    'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
-    'equal', 'greater', 'question', 'congruent', 'Alpha', 'Beta', 'Chi',
-    'Delta', 'Epsilon', 'Phi', 'Gamma', 'Eta', 'Iota', 'theta1', 'Kappa',
-    'Lambda', 'Mu', 'Nu', 'Omicron', 'Pi', 'Theta', 'Rho', 'Sigma', 'Tau',
-    'Upsilon', 'sigma1', 'Omega', 'Xi', 'Psi', 'Zeta', 'bracketleft',
-    'therefore', 'bracketright', 'perpendicular', 'underscore', 'radicalex',
-    'alpha', 'beta', 'chi', 'delta', 'epsilon', 'phi', 'gamma', 'eta', 'iota',
-    'phi1', 'kappa', 'lambda', 'mu', 'nu', 'omicron', 'pi', 'theta', 'rho',
-    'sigma', 'tau', 'upsilon', 'omega1', 'omega', 'xi', 'psi', 'zeta',
-    'braceleft', 'bar', 'braceright', 'similar', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', 'Euro', 'Upsilon1', 'minute', 'lessequal',
-    'fraction', 'infinity', 'florin', 'club', 'diamond', 'heart', 'spade',
-    'arrowboth', 'arrowleft', 'arrowup', 'arrowright', 'arrowdown', 'degree',
-    'plusminus', 'second', 'greaterequal', 'multiply', 'proportional',
-    'partialdiff', 'bullet', 'divide', 'notequal', 'equivalence',
-    'approxequal', 'ellipsis', 'arrowvertex', 'arrowhorizex', 'carriagereturn',
-    'aleph', 'Ifraktur', 'Rfraktur', 'weierstrass', 'circlemultiply',
-    'circleplus', 'emptyset', 'intersection', 'union', 'propersuperset',
-    'reflexsuperset', 'notsubset', 'propersubset', 'reflexsubset', 'element',
-    'notelement', 'angle', 'gradient', 'registerserif', 'copyrightserif',
-    'trademarkserif', 'product', 'radical', 'dotmath', 'logicalnot',
-    'logicaland', 'logicalor', 'arrowdblboth', 'arrowdblleft', 'arrowdblup',
-    'arrowdblright', 'arrowdbldown', 'lozenge', 'angleleft', 'registersans',
-    'copyrightsans', 'trademarksans', 'summation', 'parenlefttp',
-    'parenleftex', 'parenleftbt', 'bracketlefttp', 'bracketleftex',
-    'bracketleftbt', 'bracelefttp', 'braceleftmid', 'braceleftbt', 'braceex',
-    '', 'angleright', 'integral', 'integraltp', 'integralex', 'integralbt',
-    'parenrighttp', 'parenrightex', 'parenrightbt', 'bracketrighttp',
-    'bracketrightex', 'bracketrightbt', 'bracerighttp', 'bracerightmid',
-    'bracerightbt'],
-  zapfDingbatsEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'a1', 'a2', 'a202', 'a3', 'a4', 'a5', 'a119', 'a118', 'a117',
-    'a11', 'a12', 'a13', 'a14', 'a15', 'a16', 'a105', 'a17', 'a18', 'a19',
-    'a20', 'a21', 'a22', 'a23', 'a24', 'a25', 'a26', 'a27', 'a28', 'a6', 'a7',
-    'a8', 'a9', 'a10', 'a29', 'a30', 'a31', 'a32', 'a33', 'a34', 'a35', 'a36',
-    'a37', 'a38', 'a39', 'a40', 'a41', 'a42', 'a43', 'a44', 'a45', 'a46',
-    'a47', 'a48', 'a49', 'a50', 'a51', 'a52', 'a53', 'a54', 'a55', 'a56',
-    'a57', 'a58', 'a59', 'a60', 'a61', 'a62', 'a63', 'a64', 'a65', 'a66',
-    'a67', 'a68', 'a69', 'a70', 'a71', 'a72', 'a73', 'a74', 'a203', 'a75',
-    'a204', 'a76', 'a77', 'a78', 'a79', 'a81', 'a82', 'a83', 'a84', 'a97',
-    'a98', 'a99', 'a100', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', 'a101', 'a102', 'a103', 'a104', 'a106', 'a107', 'a108', 'a112',
-    'a111', 'a110', 'a109', 'a120', 'a121', 'a122', 'a123', 'a124', 'a125',
-    'a126', 'a127', 'a128', 'a129', 'a130', 'a131', 'a132', 'a133', 'a134',
-    'a135', 'a136', 'a137', 'a138', 'a139', 'a140', 'a141', 'a142', 'a143',
-    'a144', 'a145', 'a146', 'a147', 'a148', 'a149', 'a150', 'a151', 'a152',
-    'a153', 'a154', 'a155', 'a156', 'a157', 'a158', 'a159', 'a160', 'a161',
-    'a163', 'a164', 'a196', 'a165', 'a192', 'a166', 'a167', 'a168', 'a169',
-    'a170', 'a171', 'a172', 'a173', 'a162', 'a174', 'a175', 'a176', 'a177',
-    'a178', 'a179', 'a193', 'a180', 'a199', 'a181', 'a200', 'a182', '', 'a201',
-    'a183', 'a184', 'a197', 'a185', 'a194', 'a198', 'a186', 'a195', 'a187',
-    'a188', 'a189', 'a190', 'a191']
-};
-
-/**
- * Hold a map of decoded fonts and of the standard fourteen Type1
- * fonts and their acronyms.
- */
-var stdFontMap = {
-  'ArialNarrow': 'Helvetica',
-  'ArialNarrow-Bold': 'Helvetica-Bold',
-  'ArialNarrow-BoldItalic': 'Helvetica-BoldOblique',
-  'ArialNarrow-Italic': 'Helvetica-Oblique',
-  'ArialBlack': 'Helvetica',
-  'ArialBlack-Bold': 'Helvetica-Bold',
-  'ArialBlack-BoldItalic': 'Helvetica-BoldOblique',
-  'ArialBlack-Italic': 'Helvetica-Oblique',
-  'Arial': 'Helvetica',
-  'Arial-Bold': 'Helvetica-Bold',
-  'Arial-BoldItalic': 'Helvetica-BoldOblique',
-  'Arial-Italic': 'Helvetica-Oblique',
-  'Arial-BoldItalicMT': 'Helvetica-BoldOblique',
-  'Arial-BoldMT': 'Helvetica-Bold',
-  'Arial-ItalicMT': 'Helvetica-Oblique',
-  'ArialMT': 'Helvetica',
-  'Courier-Bold': 'Courier-Bold',
-  'Courier-BoldItalic': 'Courier-BoldOblique',
-  'Courier-Italic': 'Courier-Oblique',
-  'CourierNew': 'Courier',
-  'CourierNew-Bold': 'Courier-Bold',
-  'CourierNew-BoldItalic': 'Courier-BoldOblique',
-  'CourierNew-Italic': 'Courier-Oblique',
-  'CourierNewPS-BoldItalicMT': 'Courier-BoldOblique',
-  'CourierNewPS-BoldMT': 'Courier-Bold',
-  'CourierNewPS-ItalicMT': 'Courier-Oblique',
-  'CourierNewPSMT': 'Courier',
-  'Helvetica-Bold': 'Helvetica-Bold',
-  'Helvetica-BoldItalic': 'Helvetica-BoldOblique',
-  'Helvetica-Italic': 'Helvetica-Oblique',
-  'Symbol-Bold': 'Symbol',
-  'Symbol-BoldItalic': 'Symbol',
-  'Symbol-Italic': 'Symbol',
-  'TimesNewRoman': 'Times-Roman',
-  'TimesNewRoman-Bold': 'Times-Bold',
-  'TimesNewRoman-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRoman-Italic': 'Times-Italic',
-  'TimesNewRomanPS': 'Times-Roman',
-  'TimesNewRomanPS-Bold': 'Times-Bold',
-  'TimesNewRomanPS-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRomanPS-BoldItalicMT': 'Times-BoldItalic',
-  'TimesNewRomanPS-BoldMT': 'Times-Bold',
-  'TimesNewRomanPS-Italic': 'Times-Italic',
-  'TimesNewRomanPS-ItalicMT': 'Times-Italic',
-  'TimesNewRomanPSMT': 'Times-Roman',
-  'TimesNewRomanPSMT-Bold': 'Times-Bold',
-  'TimesNewRomanPSMT-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRomanPSMT-Italic': 'Times-Italic'
-};
-
-/**
- * Holds the map of the non-standard fonts that might be included as a standard
- * fonts without glyph data.
- */
-var nonStdFontMap = {
-  'ComicSansMS': 'Comic Sans MS',
-  'ComicSansMS-Bold': 'Comic Sans MS-Bold',
-  'ComicSansMS-BoldItalic': 'Comic Sans MS-BoldItalic',
-  'ComicSansMS-Italic': 'Comic Sans MS-Italic',
-  'LucidaConsole': 'Courier',
-  'LucidaConsole-Bold': 'Courier-Bold',
-  'LucidaConsole-BoldItalic': 'Courier-BoldOblique',
-  'LucidaConsole-Italic': 'Courier-Oblique'
-};
-
-var serifFonts = {
-  'Adobe Jenson': true, 'Adobe Text': true, 'Albertus': true,
-  'Aldus': true, 'Alexandria': true, 'Algerian': true,
-  'American Typewriter': true, 'Antiqua': true, 'Apex': true,
-  'Arno': true, 'Aster': true, 'Aurora': true,
-  'Baskerville': true, 'Bell': true, 'Bembo': true,
-  'Bembo Schoolbook': true, 'Benguiat': true, 'Berkeley Old Style': true,
-  'Bernhard Modern': true, 'Berthold City': true, 'Bodoni': true,
-  'Bauer Bodoni': true, 'Book Antiqua': true, 'Bookman': true,
-  'Bordeaux Roman': true, 'Californian FB': true, 'Calisto': true,
-  'Calvert': true, 'Capitals': true, 'Cambria': true,
-  'Cartier': true, 'Caslon': true, 'Catull': true,
-  'Centaur': true, 'Century Old Style': true, 'Century Schoolbook': true,
-  'Chaparral': true, 'Charis SIL': true, 'Cheltenham': true,
-  'Cholla Slab': true, 'Clarendon': true, 'Clearface': true,
-  'Cochin': true, 'Colonna': true, 'Computer Modern': true,
-  'Concrete Roman': true, 'Constantia': true, 'Cooper Black': true,
-  'Corona': true, 'Ecotype': true, 'Egyptienne': true,
-  'Elephant': true, 'Excelsior': true, 'Fairfield': true,
-  'FF Scala': true, 'Folkard': true, 'Footlight': true,
-  'FreeSerif': true, 'Friz Quadrata': true, 'Garamond': true,
-  'Gentium': true, 'Georgia': true, 'Gloucester': true,
-  'Goudy Old Style': true, 'Goudy Schoolbook': true, 'Goudy Pro Font': true,
-  'Granjon': true, 'Guardian Egyptian': true, 'Heather': true,
-  'Hercules': true, 'High Tower Text': true, 'Hiroshige': true,
-  'Hoefler Text': true, 'Humana Serif': true, 'Imprint': true,
-  'Ionic No. 5': true, 'Janson': true, 'Joanna': true,
-  'Korinna': true, 'Lexicon': true, 'Liberation Serif': true,
-  'Linux Libertine': true, 'Literaturnaya': true, 'Lucida': true,
-  'Lucida Bright': true, 'Melior': true, 'Memphis': true,
-  'Miller': true, 'Minion': true, 'Modern': true,
-  'Mona Lisa': true, 'Mrs Eaves': true, 'MS Serif': true,
-  'Museo Slab': true, 'New York': true, 'Nimbus Roman': true,
-  'NPS Rawlinson Roadway': true, 'Palatino': true, 'Perpetua': true,
-  'Plantin': true, 'Plantin Schoolbook': true, 'Playbill': true,
-  'Poor Richard': true, 'Rawlinson Roadway': true, 'Renault': true,
-  'Requiem': true, 'Rockwell': true, 'Roman': true,
-  'Rotis Serif': true, 'Sabon': true, 'Scala': true,
-  'Seagull': true, 'Sistina': true, 'Souvenir': true,
-  'STIX': true, 'Stone Informal': true, 'Stone Serif': true,
-  'Sylfaen': true, 'Times': true, 'Trajan': true,
-  'Trinité': true, 'Trump Mediaeval': true, 'Utopia': true,
-  'Vale Type': true, 'Bitstream Vera': true, 'Vera Serif': true,
-  'Versailles': true, 'Wanted': true, 'Weiss': true,
-  'Wide Latin': true, 'Windsor': true, 'XITS': true
-};
-
-var symbolsFonts = {
-  'Dingbats': true, 'Symbol': true, 'ZapfDingbats': true
-};
-
-// Some characters, e.g. copyrightserif, mapped to the private use area and
-// might not be displayed using standard fonts. Mapping/hacking well-known chars
-// to the similar equivalents in the normal characters range.
-function mapPrivateUseChars(code) {
-  switch (code) {
-    case 0xF8E9: // copyrightsans
-    case 0xF6D9: // copyrightserif
-      return 0x00A9; // copyright
-    default:
-      return code;
-  }
-}
-
-var FontLoader = {
-  listeningForFontLoad: false,
-
-  bind: function fontLoaderBind(fonts, callback) {
-    function checkFontsLoaded() {
-      for (var i = 0, ii = fonts.length; i < ii; i++) {
-        var fontObj = fonts[i];
-        if (fontObj.loading) {
-          return false;
-        }
-      }
-
-      document.documentElement.removeEventListener(
-        'pdfjsFontLoad', checkFontsLoaded, false);
-
-      callback();
-      return true;
-    }
-
-    var rules = [], names = [], fontsToLoad = [];
-    var fontCreateTimer = 0;
-
-    for (var i = 0, ii = fonts.length; i < ii; i++) {
-      var font = fonts[i];
-
-      // Add the font to the DOM only once or skip if the font
-      // is already loaded.
-      if (font.attached || font.loading == false) {
-        continue;
-      }
-      font.attached = true;
-
-      fontsToLoad.push(font);
-
-      var str = '';
-      var data = font.data;
-      if (data) {
-        var length = data.length;
-        for (var j = 0; j < length; j++)
-          str += String.fromCharCode(data[j]);
-
-        var rule = font.bindDOM(str);
-        if (rule) {
-          rules.push(rule);
-          names.push(font.loadedName);
-        }
-      }
-    }
-
-    this.listeningForFontLoad = false;
-    if (!isWorker && rules.length) {
-      FontLoader.prepareFontLoadEvent(rules, names, fontsToLoad);
-    }
-
-    if (!checkFontsLoaded()) {
-      document.documentElement.addEventListener(
-        'pdfjsFontLoad', checkFontsLoaded, false);
-    }
-  },
-  // Set things up so that at least one pdfjsFontLoad event is
-  // dispatched when all the @font-face |rules| for |names| have been
-  // loaded in a subdocument.  It's expected that the load of |rules|
-  // has already started in this (outer) document, so that they should
-  // be ordered before the load in the subdocument.
-  prepareFontLoadEvent: function fontLoaderPrepareFontLoadEvent(rules, names,
-                                                                fonts) {
-      /** Hack begin */
-      // There's no event when a font has finished downloading so the
-      // following code is a dirty hack to 'guess' when a font is
-      // ready.  This code will be obsoleted by Mozilla bug 471915.
-      //
-      // The only reliable way to know if a font is loaded in Gecko
-      // (at the moment) is document.onload in a document with
-      // a @font-face rule defined in a "static" stylesheet.  We use a
-      // subdocument in an <iframe>, set up properly, to know when
-      // our @font-face rule was loaded.  However, the subdocument and
-      // outer document can't share CSS rules, so the inner document
-      // is only part of the puzzle.  The second piece is an invisible
-      // div created in order to force loading of the @font-face in
-      // the *outer* document.  (The font still needs to be loaded for
-      // its metrics, for reflow).  We create the div first for the
-      // outer document, then create the iframe.  Unless something
-      // goes really wonkily, we expect the @font-face for the outer
-      // document to be processed before the inner.  That's still
-      // fragile, but seems to work in practice.
-      //
-      // The postMessage() hackery was added to work around chrome bug
-      // 82402.
-
-      // Validate the names parameter -- the values can used to construct HTML.
-      if (!/^\w+$/.test(names.join(''))) {
-        error('Invalid font name(s): ' + names.join());
-
-        // Normally the error-function throws. But if a malicious code
-        // intercepts the function call then the return is needed.
-        return;
-      }
-
-      var div = document.createElement('div');
-      div.setAttribute('style',
-                       'visibility: hidden;' +
-                       'width: 10px; height: 10px;' +
-                       'position: absolute; top: 0px; left: 0px;');
-      var html = '';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        html += '<span style="font-family:' + names[i] + '">Hi</span>';
-      }
-      div.innerHTML = html;
-      document.body.appendChild(div);
-
-      if (!this.listeningForFontLoad) {
-        window.addEventListener(
-          'message',
-          function fontLoaderMessage(e) {
-            var fontNames = JSON.parse(e.data);
-            for (var i = 0, ii = fonts.length; i < ii; ++i) {
-              var font = fonts[i];
-              font.loading = false;
-            }
-            var evt = document.createEvent('Events');
-            evt.initEvent('pdfjsFontLoad', true, false);
-            document.documentElement.dispatchEvent(evt);
-          },
-          false);
-        this.listeningForFontLoad = true;
-      }
-
-      // XXX we should have a time-out here too, and maybe fire
-      // pdfjsFontLoadFailed?
-      var src = '<!DOCTYPE HTML><html><head>';
-      src += '<style type="text/css">';
-      for (var i = 0, ii = rules.length; i < ii; ++i) {
-        src += rules[i];
-      }
-      src += '</style>';
-      src += '<script type="application/javascript">';
-      var fontNamesArray = '';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        fontNamesArray += '"' + names[i] + '", ';
-      }
-      src += '  var fontNames=[' + fontNamesArray + '];\n';
-      src += '  window.onload = function fontLoaderOnload() {\n';
-      src += '    parent.postMessage(JSON.stringify(fontNames), "*");\n';
-      src += '  }';
-      // Hack so the end script tag isn't counted if this is inline JS.
-      src += '</scr' + 'ipt></head><body>';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        src += '<p style="font-family:\'' + names[i] + '\'">Hi</p>';
-      }
-      src += '</body></html>';
-      var frame = document.createElement('iframe');
-      frame.src = 'data:text/html,' + src;
-      frame.setAttribute('style',
-                         'visibility: hidden;' +
-                         'width: 10px; height: 10px;' +
-                         'position: absolute; top: 0px; left: 0px;');
-      document.body.appendChild(frame);
-      /** Hack end */
-  }
-};
-
-var UnicodeRanges = [
-  { 'begin': 0x0000, 'end': 0x007F }, // Basic Latin
-  { 'begin': 0x0080, 'end': 0x00FF }, // Latin-1 Supplement
-  { 'begin': 0x0100, 'end': 0x017F }, // Latin Extended-A
-  { 'begin': 0x0180, 'end': 0x024F }, // Latin Extended-B
-  { 'begin': 0x0250, 'end': 0x02AF }, // IPA Extensions
-  { 'begin': 0x02B0, 'end': 0x02FF }, // Spacing Modifier Letters
-  { 'begin': 0x0300, 'end': 0x036F }, // Combining Diacritical Marks
-  { 'begin': 0x0370, 'end': 0x03FF }, // Greek and Coptic
-  { 'begin': 0x2C80, 'end': 0x2CFF }, // Coptic
-  { 'begin': 0x0400, 'end': 0x04FF }, // Cyrillic
-  { 'begin': 0x0530, 'end': 0x058F }, // Armenian
-  { 'begin': 0x0590, 'end': 0x05FF }, // Hebrew
-  { 'begin': 0xA500, 'end': 0xA63F }, // Vai
-  { 'begin': 0x0600, 'end': 0x06FF }, // Arabic
-  { 'begin': 0x07C0, 'end': 0x07FF }, // NKo
-  { 'begin': 0x0900, 'end': 0x097F }, // Devanagari
-  { 'begin': 0x0980, 'end': 0x09FF }, // Bengali
-  { 'begin': 0x0A00, 'end': 0x0A7F }, // Gurmukhi
-  { 'begin': 0x0A80, 'end': 0x0AFF }, // Gujarati
-  { 'begin': 0x0B00, 'end': 0x0B7F }, // Oriya
-  { 'begin': 0x0B80, 'end': 0x0BFF }, // Tamil
-  { 'begin': 0x0C00, 'end': 0x0C7F }, // Telugu
-  { 'begin': 0x0C80, 'end': 0x0CFF }, // Kannada
-  { 'begin': 0x0D00, 'end': 0x0D7F }, // Malayalam
-  { 'begin': 0x0E00, 'end': 0x0E7F }, // Thai
-  { 'begin': 0x0E80, 'end': 0x0EFF }, // Lao
-  { 'begin': 0x10A0, 'end': 0x10FF }, // Georgian
-  { 'begin': 0x1B00, 'end': 0x1B7F }, // Balinese
-  { 'begin': 0x1100, 'end': 0x11FF }, // Hangul Jamo
-  { 'begin': 0x1E00, 'end': 0x1EFF }, // Latin Extended Additional
-  { 'begin': 0x1F00, 'end': 0x1FFF }, // Greek Extended
-  { 'begin': 0x2000, 'end': 0x206F }, // General Punctuation
-  { 'begin': 0x2070, 'end': 0x209F }, // Superscripts And Subscripts
-  { 'begin': 0x20A0, 'end': 0x20CF }, // Currency Symbol
-  { 'begin': 0x20D0, 'end': 0x20FF }, // Combining Diacritical Marks For Symbols
-  { 'begin': 0x2100, 'end': 0x214F }, // Letterlike Symbols
-  { 'begin': 0x2150, 'end': 0x218F }, // Number Forms
-  { 'begin': 0x2190, 'end': 0x21FF }, // Arrows
-  { 'begin': 0x2200, 'end': 0x22FF }, // Mathematical Operators
-  { 'begin': 0x2300, 'end': 0x23FF }, // Miscellaneous Technical
-  { 'begin': 0x2400, 'end': 0x243F }, // Control Pictures
-  { 'begin': 0x2440, 'end': 0x245F }, // Optical Character Recognition
-  { 'begin': 0x2460, 'end': 0x24FF }, // Enclosed Alphanumerics
-  { 'begin': 0x2500, 'end': 0x257F }, // Box Drawing
-  { 'begin': 0x2580, 'end': 0x259F }, // Block Elements
-  { 'begin': 0x25A0, 'end': 0x25FF }, // Geometric Shapes
-  { 'begin': 0x2600, 'end': 0x26FF }, // Miscellaneous Symbols
-  { 'begin': 0x2700, 'end': 0x27BF }, // Dingbats
-  { 'begin': 0x3000, 'end': 0x303F }, // CJK Symbols And Punctuation
-  { 'begin': 0x3040, 'end': 0x309F }, // Hiragana
-  { 'begin': 0x30A0, 'end': 0x30FF }, // Katakana
-  { 'begin': 0x3100, 'end': 0x312F }, // Bopomofo
-  { 'begin': 0x3130, 'end': 0x318F }, // Hangul Compatibility Jamo
-  { 'begin': 0xA840, 'end': 0xA87F }, // Phags-pa
-  { 'begin': 0x3200, 'end': 0x32FF }, // Enclosed CJK Letters And Months
-  { 'begin': 0x3300, 'end': 0x33FF }, // CJK Compatibility
-  { 'begin': 0xAC00, 'end': 0xD7AF }, // Hangul Syllables
-  { 'begin': 0xD800, 'end': 0xDFFF }, // Non-Plane 0 *
-  { 'begin': 0x10900, 'end': 0x1091F }, // Phoenicia
-  { 'begin': 0x4E00, 'end': 0x9FFF }, // CJK Unified Ideographs
-  { 'begin': 0xE000, 'end': 0xF8FF }, // Private Use Area (plane 0)
-  { 'begin': 0x31C0, 'end': 0x31EF }, // CJK Strokes
-  { 'begin': 0xFB00, 'end': 0xFB4F }, // Alphabetic Presentation Forms
-  { 'begin': 0xFB50, 'end': 0xFDFF }, // Arabic Presentation Forms-A
-  { 'begin': 0xFE20, 'end': 0xFE2F }, // Combining Half Marks
-  { 'begin': 0xFE10, 'end': 0xFE1F }, // Vertical Forms
-  { 'begin': 0xFE50, 'end': 0xFE6F }, // Small Form Variants
-  { 'begin': 0xFE70, 'end': 0xFEFF }, // Arabic Presentation Forms-B
-  { 'begin': 0xFF00, 'end': 0xFFEF }, // Halfwidth And Fullwidth Forms
-  { 'begin': 0xFFF0, 'end': 0xFFFF }, // Specials
-  { 'begin': 0x0F00, 'end': 0x0FFF }, // Tibetan
-  { 'begin': 0x0700, 'end': 0x074F }, // Syriac
-  { 'begin': 0x0780, 'end': 0x07BF }, // Thaana
-  { 'begin': 0x0D80, 'end': 0x0DFF }, // Sinhala
-  { 'begin': 0x1000, 'end': 0x109F }, // Myanmar
-  { 'begin': 0x1200, 'end': 0x137F }, // Ethiopic
-  { 'begin': 0x13A0, 'end': 0x13FF }, // Cherokee
-  { 'begin': 0x1400, 'end': 0x167F }, // Unified Canadian Aboriginal Syllabics
-  { 'begin': 0x1680, 'end': 0x169F }, // Ogham
-  { 'begin': 0x16A0, 'end': 0x16FF }, // Runic
-  { 'begin': 0x1780, 'end': 0x17FF }, // Khmer
-  { 'begin': 0x1800, 'end': 0x18AF }, // Mongolian
-  { 'begin': 0x2800, 'end': 0x28FF }, // Braille Patterns
-  { 'begin': 0xA000, 'end': 0xA48F }, // Yi Syllables
-  { 'begin': 0x1700, 'end': 0x171F }, // Tagalog
-  { 'begin': 0x10300, 'end': 0x1032F }, // Old Italic
-  { 'begin': 0x10330, 'end': 0x1034F }, // Gothic
-  { 'begin': 0x10400, 'end': 0x1044F }, // Deseret
-  { 'begin': 0x1D000, 'end': 0x1D0FF }, // Byzantine Musical Symbols
-  { 'begin': 0x1D400, 'end': 0x1D7FF }, // Mathematical Alphanumeric Symbols
-  { 'begin': 0xFF000, 'end': 0xFFFFD }, // Private Use (plane 15)
-  { 'begin': 0xFE00, 'end': 0xFE0F }, // Variation Selectors
-  { 'begin': 0xE0000, 'end': 0xE007F }, // Tags
-  { 'begin': 0x1900, 'end': 0x194F }, // Limbu
-  { 'begin': 0x1950, 'end': 0x197F }, // Tai Le
-  { 'begin': 0x1980, 'end': 0x19DF }, // New Tai Lue
-  { 'begin': 0x1A00, 'end': 0x1A1F }, // Buginese
-  { 'begin': 0x2C00, 'end': 0x2C5F }, // Glagolitic
-  { 'begin': 0x2D30, 'end': 0x2D7F }, // Tifinagh
-  { 'begin': 0x4DC0, 'end': 0x4DFF }, // Yijing Hexagram Symbols
-  { 'begin': 0xA800, 'end': 0xA82F }, // Syloti Nagri
-  { 'begin': 0x10000, 'end': 0x1007F }, // Linear B Syllabary
-  { 'begin': 0x10140, 'end': 0x1018F }, // Ancient Greek Numbers
-  { 'begin': 0x10380, 'end': 0x1039F }, // Ugaritic
-  { 'begin': 0x103A0, 'end': 0x103DF }, // Old Persian
-  { 'begin': 0x10450, 'end': 0x1047F }, // Shavian
-  { 'begin': 0x10480, 'end': 0x104AF }, // Osmanya
-  { 'begin': 0x10800, 'end': 0x1083F }, // Cypriot Syllabary
-  { 'begin': 0x10A00, 'end': 0x10A5F }, // Kharoshthi
-  { 'begin': 0x1D300, 'end': 0x1D35F }, // Tai Xuan Jing Symbols
-  { 'begin': 0x12000, 'end': 0x123FF }, // Cuneiform
-  { 'begin': 0x1D360, 'end': 0x1D37F }, // Counting Rod Numerals
-  { 'begin': 0x1B80, 'end': 0x1BBF }, // Sundanese
-  { 'begin': 0x1C00, 'end': 0x1C4F }, // Lepcha
-  { 'begin': 0x1C50, 'end': 0x1C7F }, // Ol Chiki
-  { 'begin': 0xA880, 'end': 0xA8DF }, // Saurashtra
-  { 'begin': 0xA900, 'end': 0xA92F }, // Kayah Li
-  { 'begin': 0xA930, 'end': 0xA95F }, // Rejang
-  { 'begin': 0xAA00, 'end': 0xAA5F }, // Cham
-  { 'begin': 0x10190, 'end': 0x101CF }, // Ancient Symbols
-  { 'begin': 0x101D0, 'end': 0x101FF }, // Phaistos Disc
-  { 'begin': 0x102A0, 'end': 0x102DF }, // Carian
-  { 'begin': 0x1F030, 'end': 0x1F09F }  // Domino Tiles
-];
-
-var MacStandardGlyphOrdering = [
-  '.notdef', '.null', 'nonmarkingreturn', 'space', 'exclam', 'quotedbl',
-  'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
-  'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
-  'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
-  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at',
-  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-  'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft',
-  'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b',
-  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
-  'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright',
-  'asciitilde', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde',
-  'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis',
-  'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
-  'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve',
-  'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex',
-  'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet',
-  'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute',
-  'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal',
-  'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi',
-  'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash',
-  'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin',
-  'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis',
-  'nonbreakingspace', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
-  'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
-  'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
-  'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered',
-  'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex',
-  'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex',
-  'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute',
-  'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron',
-  'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron',
-  'Lslash', 'lslash', 'Scaron', 'scaron', 'Zcaron', 'zcaron', 'brokenbar',
-  'Eth', 'eth', 'Yacute', 'yacute', 'Thorn', 'thorn', 'minus', 'multiply',
-  'onesuperior', 'twosuperior', 'threesuperior', 'onehalf', 'onequarter',
-  'threequarters', 'franc', 'Gbreve', 'gbreve', 'Idotaccent', 'Scedilla',
-  'scedilla', 'Cacute', 'cacute', 'Ccaron', 'ccaron', 'dcroat'];
-
-function getUnicodeRangeFor(value) {
-  for (var i = 0, ii = UnicodeRanges.length; i < ii; i++) {
-    var range = UnicodeRanges[i];
-    if (value >= range.begin && value < range.end)
-      return i;
-  }
-  return -1;
-}
-
-function isRTLRangeFor(value) {
-  var range = UnicodeRanges[13];
-  if (value >= range.begin && value < range.end)
-    return true;
-  range = UnicodeRanges[11];
-  if (value >= range.begin && value < range.end)
-    return true;
-  return false;
-}
-
-function isSpecialUnicode(unicode) {
-  return (unicode <= 0x1F || (unicode >= 127 && unicode < kSizeOfGlyphArea)) ||
-    (unicode >= kCmapGlyphOffset &&
-    unicode < kCmapGlyphOffset + kSizeOfGlyphArea);
-}
-
-/**
- * 'Font' is the class the outside world should use, it encapsulate all the font
- * decoding logics whatever type it is (assuming the font type is supported).
- *
- * For example to read a Type1 font and to attach it to the document:
- *   var type1Font = new Font("MyFontName", binaryFile, propertiesObject);
- *   type1Font.bind();
- */
-var Font = (function FontClosure() {
-  function Font(name, file, properties) {
-    this.name = name;
-    this.coded = properties.coded;
-    this.charProcOperatorList = properties.charProcOperatorList;
-    this.resources = properties.resources;
-    this.sizes = [];
-
-    var names = name.split('+');
-    names = names.length > 1 ? names[1] : names[0];
-    names = names.split(/[-,_]/g)[0];
-    this.isSerifFont = !!(properties.flags & FontFlags.Serif);
-    this.isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
-
-    var type = properties.type;
-    this.type = type;
-
-    // If the font is to be ignored, register it like an already loaded font
-    // to avoid the cost of waiting for it be be loaded by the platform.
-    if (properties.ignore) {
-      this.loadedName = this.isSerifFont ? 'serif' : 'sans-serif';
-      this.loading = false;
-      return;
-    }
-
-    this.differences = properties.differences;
-    this.widths = properties.widths;
-    this.defaultWidth = properties.defaultWidth;
-    this.composite = properties.composite;
-    this.hasEncoding = properties.hasEncoding;
-
-    this.fontMatrix = properties.fontMatrix;
-    this.widthMultiplier = 1.0;
-    if (properties.type == 'Type3') {
-      this.encoding = properties.baseEncoding;
-      return;
-    }
-
-    // Trying to fix encoding using glyph CIDSystemInfo.
-    this.loadCidToUnicode(properties);
-
-    if (properties.toUnicode)
-      this.toUnicode = properties.toUnicode;
-    else
-      this.rebuildToUnicode(properties);
-
-    this.toFontChar = this.buildToFontChar(this.toUnicode);
-
-    if (!file) {
-      // The file data is not specified. Trying to fix the font name
-      // to be used with the canvas.font.
-      var fontName = name.replace(/[,_]/g, '-');
-      fontName = stdFontMap[fontName] || nonStdFontMap[fontName] || fontName;
-
-      this.bold = (fontName.search(/bold/gi) != -1);
-      this.italic = (fontName.search(/oblique/gi) != -1) ||
-                    (fontName.search(/italic/gi) != -1);
-
-      // Use 'name' instead of 'fontName' here because the original
-      // name ArialBlack for example will be replaced by Helvetica.
-      this.black = (name.search(/Black/g) != -1);
-
-      this.encoding = properties.baseEncoding;
-      this.noUnicodeAdaptation = true;
-      this.loadedName = fontName.split('-')[0];
-      this.loading = false;
-      return;
-    }
-
-    var data;
-    switch (type) {
-      case 'Type1':
-      case 'CIDFontType0':
-        this.mimetype = 'font/opentype';
-
-        var subtype = properties.subtype;
-        var cff = (subtype == 'Type1C' || subtype == 'CIDFontType0C') ?
-          new CFFFont(file, properties) : new Type1Font(name, file, properties);
-
-        // Wrap the CFF data inside an OTF font file
-        data = this.convert(name, cff, properties);
-        break;
-
-      case 'TrueType':
-      case 'CIDFontType2':
-        this.mimetype = 'font/opentype';
-
-        // Repair the TrueType file. It is can be damaged in the point of
-        // view of the sanitizer
-        data = this.checkAndRepair(name, file, properties);
-        break;
-
-      default:
-        warn('Font ' + properties.type + ' is not supported');
-        break;
-    }
-
-    this.data = data;
-    this.fontMatrix = properties.fontMatrix;
-    this.widthMultiplier = !properties.fontMatrix ? 1.0 :
-      1.0 / properties.fontMatrix[0];
-    this.encoding = properties.baseEncoding;
-    this.loadedName = properties.loadedName;
-    this.loading = true;
-  };
-
-  var numFonts = 0;
-  function getUniqueName() {
-    return 'pdfFont' + numFonts++;
-  }
-
-  function stringToArray(str) {
-    var array = [];
-    for (var i = 0, ii = str.length; i < ii; ++i)
-      array[i] = str.charCodeAt(i);
-
-    return array;
-  };
-
-  function arrayToString(arr) {
-    var str = '';
-    for (var i = 0, ii = arr.length; i < ii; ++i)
-      str += String.fromCharCode(arr[i]);
-
-    return str;
-  };
-
-  function int16(bytes) {
-    return (bytes[0] << 8) + (bytes[1] & 0xff);
-  };
-
-  function int32(bytes) {
-    return (bytes[0] << 24) + (bytes[1] << 16) +
-           (bytes[2] << 8) + (bytes[3] & 0xff);
-  };
-
-  function getMaxPower2(number) {
-    var maxPower = 0;
-    var value = number;
-    while (value >= 2) {
-      value /= 2;
-      maxPower++;
-    }
-
-    value = 2;
-    for (var i = 1; i < maxPower; i++)
-      value *= 2;
-    return value;
-  };
-
-  function string16(value) {
-    return String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function safeString16(value) {
-    // clamp value to the 16-bit int range
-    value = value > 0x7FFF ? 0x7FFF : value < -0x8000 ? -0x8000 : value;
-    return String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function string32(value) {
-    return String.fromCharCode((value >> 24) & 0xff) +
-           String.fromCharCode((value >> 16) & 0xff) +
-           String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function createOpenTypeHeader(sfnt, file, numTables) {
-    // Windows hates the Mac TrueType sfnt version number
-    if (sfnt == 'true')
-      sfnt = string32(0x00010000);
-
-    // sfnt version (4 bytes)
-    var header = sfnt;
-
-    // numTables (2 bytes)
-    header += string16(numTables);
-
-    // searchRange (2 bytes)
-    var tablesMaxPower2 = getMaxPower2(numTables);
-    var searchRange = tablesMaxPower2 * 16;
-    header += string16(searchRange);
-
-    // entrySelector (2 bytes)
-    header += string16(Math.log(tablesMaxPower2) / Math.log(2));
-
-    // rangeShift (2 bytes)
-    header += string16(numTables * 16 - searchRange);
-
-    file.file += header;
-    file.virtualOffset += header.length;
-  };
-
-  function createTableEntry(file, tag, data) {
-    // offset
-    var offset = file.virtualOffset;
-
-    // length
-    var length = data.length;
-
-    // Per spec tables must be 4-bytes align so add padding as needed
-    while (data.length & 3)
-      data.push(0x00);
-
-    while (file.virtualOffset & 3)
-      file.virtualOffset++;
-
-    // checksum
-    var checksum = 0, n = data.length;
-    for (var i = 0; i < n; i += 4)
-      checksum = (checksum + int32([data[i], data[i + 1], data[i + 2],
-                                    data[i + 3]])) | 0;
-
-    var tableEntry = (tag + string32(checksum) +
-                      string32(offset) + string32(length));
-    file.file += tableEntry;
-    file.virtualOffset += data.length;
-  };
-
-  function getRanges(glyphs) {
-    // Array.sort() sorts by characters, not numerically, so convert to an
-    // array of characters.
-    var codes = [];
-    var length = glyphs.length;
-    for (var n = 0; n < length; ++n)
-      codes.push({ unicode: glyphs[n].unicode, code: n });
-    codes.sort(function fontGetRangesSort(a, b) {
-      return a.unicode - b.unicode;
-    });
-
-    // Split the sorted codes into ranges.
-    var ranges = [];
-    for (var n = 0; n < length; ) {
-      var start = codes[n].unicode;
-      var codeIndices = [codes[n].code];
-      ++n;
-      var end = start;
-      while (n < length && end + 1 == codes[n].unicode) {
-        codeIndices.push(codes[n].code);
-        ++end;
-        ++n;
-      }
-      ranges.push([start, end, codeIndices]);
-    }
-
-    return ranges;
-  };
-
-  function createCMapTable(glyphs, deltas) {
-    var ranges = getRanges(glyphs);
-
-    var numTables = 1;
-    var cmap = '\x00\x00' + // version
-               string16(numTables) +  // numTables
-               '\x00\x03' + // platformID
-               '\x00\x01' + // encodingID
-               string32(4 + numTables * 8); // start of the table record
-
-    var segCount = ranges.length + 1;
-    var segCount2 = segCount * 2;
-    var searchRange = getMaxPower2(segCount) * 2;
-    var searchEntry = Math.log(segCount) / Math.log(2);
-    var rangeShift = 2 * segCount - searchRange;
-
-    // Fill up the 4 parallel arrays describing the segments.
-    var startCount = '';
-    var endCount = '';
-    var idDeltas = '';
-    var idRangeOffsets = '';
-    var glyphsIds = '';
-    var bias = 0;
-
-    if (deltas) {
-      for (var i = 0; i < segCount - 1; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
-        var offset = (segCount - i) * 2 + bias * 2;
-        bias += (end - start + 1);
-
-        startCount += string16(start);
-        endCount += string16(end);
-        idDeltas += string16(0);
-        idRangeOffsets += string16(offset);
-
-        var codes = range[2];
-        for (var j = 0, jj = codes.length; j < jj; ++j)
-          glyphsIds += string16(deltas[codes[j]]);
-      }
-    } else {
-      for (var i = 0; i < segCount - 1; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
-        var startCode = range[2][0];
-
-        startCount += string16(start);
-        endCount += string16(end);
-        idDeltas += string16((startCode - start + 1) & 0xFFFF);
-        idRangeOffsets += string16(0);
-      }
-    }
-
-    endCount += '\xFF\xFF';
-    startCount += '\xFF\xFF';
-    idDeltas += '\x00\x01';
-    idRangeOffsets += '\x00\x00';
-
-    var format314 = '\x00\x00' + // language
-                    string16(segCount2) +
-                    string16(searchRange) +
-                    string16(searchEntry) +
-                    string16(rangeShift) +
-                    endCount + '\x00\x00' + startCount +
-                    idDeltas + idRangeOffsets + glyphsIds;
-
-    return stringToArray(cmap +
-                         '\x00\x04' + // format
-                         string16(format314.length + 4) + // length
-                         format314);
-  };
-
-  function createOS2Table(properties, charstrings, override) {
-    override = override || {
-      unitsPerEm: 0,
-      yMax: 0,
-      yMin: 0,
-      ascent: 0,
-      descent: 0
-    };
-
-    var ulUnicodeRange1 = 0;
-    var ulUnicodeRange2 = 0;
-    var ulUnicodeRange3 = 0;
-    var ulUnicodeRange4 = 0;
-
-    var firstCharIndex = null;
-    var lastCharIndex = 0;
-
-    if (charstrings) {
-      for (var i = 0; i < charstrings.length; ++i) {
-        var code = charstrings[i].unicode;
-        if (firstCharIndex > code || !firstCharIndex)
-          firstCharIndex = code;
-        if (lastCharIndex < code)
-          lastCharIndex = code;
-
-        var position = getUnicodeRangeFor(code);
-        if (position < 32) {
-          ulUnicodeRange1 |= 1 << position;
-        } else if (position < 64) {
-          ulUnicodeRange2 |= 1 << position - 32;
-        } else if (position < 96) {
-          ulUnicodeRange3 |= 1 << position - 64;
-        } else if (position < 123) {
-          ulUnicodeRange4 |= 1 << position - 96;
-        } else {
-          error('Unicode ranges Bits > 123 are reserved for internal usage');
-        }
-      }
-    } else {
-      // TODO
-      firstCharIndex = 0;
-      lastCharIndex = 255;
-    }
-
-    var unitsPerEm = override.unitsPerEm || kPDFGlyphSpaceUnits;
-    var typoAscent = override.ascent || properties.ascent;
-    var typoDescent = override.descent || properties.descent;
-    var winAscent = override.yMax || typoAscent;
-    var winDescent = -override.yMin || -typoDescent;
-
-    // if there is a units per em value but no other override
-    // then scale the calculated ascent
-    if (unitsPerEm != kPDFGlyphSpaceUnits &&
-        'undefined' == typeof(override.ascent)) {
-      // if the font units differ to the PDF glyph space units
-      // then scale up the values
-      typoAscent = Math.round(typoAscent * unitsPerEm / kPDFGlyphSpaceUnits);
-      typoDescent = Math.round(typoDescent * unitsPerEm / kPDFGlyphSpaceUnits);
-      winAscent = typoAscent;
-      winDescent = -typoDescent;
-    }
-
-    return '\x00\x03' + // version
-           '\x02\x24' + // xAvgCharWidth
-           '\x01\xF4' + // usWeightClass
-           '\x00\x05' + // usWidthClass
-           '\x00\x00' + // fstype (0 to let the font loads via font-face on IE)
-           '\x02\x8A' + // ySubscriptXSize
-           '\x02\xBB' + // ySubscriptYSize
-           '\x00\x00' + // ySubscriptXOffset
-           '\x00\x8C' + // ySubscriptYOffset
-           '\x02\x8A' + // ySuperScriptXSize
-           '\x02\xBB' + // ySuperScriptYSize
-           '\x00\x00' + // ySuperScriptXOffset
-           '\x01\xDF' + // ySuperScriptYOffset
-           '\x00\x31' + // yStrikeOutSize
-           '\x01\x02' + // yStrikeOutPosition
-           '\x00\x00' + // sFamilyClass
-           '\x00\x00\x06' +
-           String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) +
-           '\x00\x00\x00\x00\x00\x00' + // Panose
-           string32(ulUnicodeRange1) + // ulUnicodeRange1 (Bits 0-31)
-           string32(ulUnicodeRange2) + // ulUnicodeRange2 (Bits 32-63)
-           string32(ulUnicodeRange3) + // ulUnicodeRange3 (Bits 64-95)
-           string32(ulUnicodeRange4) + // ulUnicodeRange4 (Bits 96-127)
-           '\x2A\x32\x31\x2A' + // achVendID
-           string16(properties.italicAngle ? 1 : 0) + // fsSelection
-           string16(firstCharIndex ||
-                    properties.firstChar) + // usFirstCharIndex
-           string16(lastCharIndex || properties.lastChar) +  // usLastCharIndex
-           string16(typoAscent) + // sTypoAscender
-           string16(typoDescent) + // sTypoDescender
-           '\x00\x64' + // sTypoLineGap (7%-10% of the unitsPerEM value)
-           string16(winAscent) + // usWinAscent
-           string16(winDescent) + // usWinDescent
-           '\x00\x00\x00\x00' + // ulCodePageRange1 (Bits 0-31)
-           '\x00\x00\x00\x00' + // ulCodePageRange2 (Bits 32-63)
-           string16(properties.xHeight) + // sxHeight
-           string16(properties.capHeight) + // sCapHeight
-           string16(0) + // usDefaultChar
-           string16(firstCharIndex || properties.firstChar) + // usBreakChar
-           '\x00\x03';  // usMaxContext
-  };
-
-  function createPostTable(properties) {
-    var angle = Math.floor(properties.italicAngle * (Math.pow(2, 16)));
-    return '\x00\x03\x00\x00' + // Version number
-           string32(angle) + // italicAngle
-           '\x00\x00' + // underlinePosition
-           '\x00\x00' + // underlineThickness
-           string32(properties.fixedPitch) + // isFixedPitch
-           '\x00\x00\x00\x00' + // minMemType42
-           '\x00\x00\x00\x00' + // maxMemType42
-           '\x00\x00\x00\x00' + // minMemType1
-           '\x00\x00\x00\x00';  // maxMemType1
-  };
-
-  function createNameTable(name) {
-    var strings = [
-      'Original licence',  // 0.Copyright
-      name,                // 1.Font family
-      'Unknown',           // 2.Font subfamily (font weight)
-      'uniqueID',          // 3.Unique ID
-      name,                // 4.Full font name
-      'Version 0.11',      // 5.Version
-      '',                  // 6.Postscript name
-      'Unknown',           // 7.Trademark
-      'Unknown',           // 8.Manufacturer
-      'Unknown'            // 9.Designer
-    ];
-
-    // Mac want 1-byte per character strings while Windows want
-    // 2-bytes per character, so duplicate the names table
-    var stringsUnicode = [];
-    for (var i = 0, ii = strings.length; i < ii; i++) {
-      var str = strings[i];
-
-      var strUnicode = '';
-      for (var j = 0, jj = str.length; j < jj; j++)
-        strUnicode += string16(str.charCodeAt(j));
-      stringsUnicode.push(strUnicode);
-    }
-
-    var names = [strings, stringsUnicode];
-    var platforms = ['\x00\x01', '\x00\x03'];
-    var encodings = ['\x00\x00', '\x00\x01'];
-    var languages = ['\x00\x00', '\x04\x09'];
-
-    var namesRecordCount = strings.length * platforms.length;
-    var nameTable =
-      '\x00\x00' +                           // format
-      string16(namesRecordCount) +           // Number of names Record
-      string16(namesRecordCount * 12 + 6);   // Storage
-
-    // Build the name records field
-    var strOffset = 0;
-    for (var i = 0, ii = platforms.length; i < ii; i++) {
-      var strs = names[i];
-      for (var j = 0, jj = strs.length; j < jj; j++) {
-        var str = strs[j];
-        var nameRecord =
-          platforms[i] + // platform ID
-          encodings[i] + // encoding ID
-          languages[i] + // language ID
-          string16(j) + // name ID
-          string16(str.length) +
-          string16(strOffset);
-        nameTable += nameRecord;
-        strOffset += str.length;
-      }
-    }
-
-    nameTable += strings.join('') + stringsUnicode.join('');
-    return nameTable;
-  }
-
-  Font.prototype = {
-    name: null,
-    font: null,
-    mimetype: null,
-    encoding: null,
-
-    checkAndRepair: function Font_checkAndRepair(name, font, properties) {
-      function readTableEntry(file) {
-        var tag = file.getBytes(4);
-        tag = String.fromCharCode(tag[0]) +
-              String.fromCharCode(tag[1]) +
-              String.fromCharCode(tag[2]) +
-              String.fromCharCode(tag[3]);
-
-        var checksum = int32(file.getBytes(4));
-        var offset = int32(file.getBytes(4));
-        var length = int32(file.getBytes(4));
-
-        // Read the table associated data
-        var previousPosition = file.pos;
-        file.pos = file.start ? file.start : 0;
-        file.skip(offset);
-        var data = file.getBytes(length);
-        file.pos = previousPosition;
-
-        if (tag == 'head') {
-          // clearing checksum adjustment
-          data[8] = data[9] = data[10] = data[11] = 0;
-          data[17] |= 0x20; //Set font optimized for cleartype flag
-        }
-
-        return {
-          tag: tag,
-          checksum: checksum,
-          length: length,
-          offset: offset,
-          data: data
-        };
-      };
-
-      function readOpenTypeHeader(ttf) {
-        return {
-          version: arrayToString(ttf.getBytes(4)),
-          numTables: int16(ttf.getBytes(2)),
-          searchRange: int16(ttf.getBytes(2)),
-          entrySelector: int16(ttf.getBytes(2)),
-          rangeShift: int16(ttf.getBytes(2))
-        };
-      };
-
-      function createGlyphNameMap(glyphs, ids, properties) {
-        var glyphNames = properties.glyphNames;
-        if (!glyphNames) {
-          properties.glyphNameMap = {};
-          return;
-        }
-        var glyphsLength = glyphs.length;
-        var glyphNameMap = {};
-        var encoding = [];
-        for (var i = 0; i < glyphsLength; ++i) {
-          var glyphName = glyphNames[ids[i]];
-          if (!glyphName)
-            continue;
-          var unicode = glyphs[i].unicode;
-          glyphNameMap[glyphName] = unicode;
-          var code = glyphs[i].code;
-          encoding[code] = glyphName;
-        }
-        properties.glyphNameMap = glyphNameMap;
-        if (!properties.hasEncoding)
-          properties.baseEncoding = encoding;
-      }
-
-      function readCMapTable(cmap, font) {
-        var start = (font.start ? font.start : 0) + cmap.offset;
-        font.pos = start;
-
-        var version = int16(font.getBytes(2));
-        var numRecords = int16(font.getBytes(2));
-
-        var records = [];
-        for (var i = 0; i < numRecords; i++) {
-          records.push({
-            platformID: int16(font.getBytes(2)),
-            encodingID: int16(font.getBytes(2)),
-            offset: int32(font.getBytes(4))
-          });
-        }
-
-        // Check that table are sorted by platformID then encodingID,
-        records.sort(function fontReadCMapTableSort(a, b) {
-          return ((a.platformID << 16) + a.encodingID) -
-                 ((b.platformID << 16) + b.encodingID);
-        });
-
-        var tables = [records[0]];
-        for (var i = 1; i < numRecords; i++) {
-          // The sanitizer will drop the font if 2 tables have the same
-          // platformID and the same encodingID, this will be correct for
-          // most cases but if the font has been made for Mac it could
-          // exist a few platformID: 1, encodingID: 0 but with a different
-          // language field and that's correct. But the sanitizer does not
-          // seem to support this case.
-          var current = records[i];
-          var previous = records[i - 1];
-          if (((current.platformID << 16) + current.encodingID) <=
-             ((previous.platformID << 16) + previous.encodingID))
-                continue;
-          tables.push(current);
-        }
-
-        var missing = numRecords - tables.length;
-        if (missing) {
-          numRecords = tables.length;
-          var data = string16(version) + string16(numRecords);
-
-          for (var i = 0; i < numRecords; i++) {
-            var table = tables[i];
-            data += string16(table.platformID) +
-                    string16(table.encodingID) +
-                    string32(table.offset);
-          }
-
-          for (var i = 0, ii = data.length; i < ii; i++)
-            cmap.data[i] = data.charCodeAt(i);
-        }
-
-        for (var i = 0; i < numRecords; i++) {
-          var table = tables[i];
-          font.pos = start + table.offset;
-
-          var format = int16(font.getBytes(2));
-          var length = int16(font.getBytes(2));
-          var language = int16(font.getBytes(2));
-
-          if (format == 0) {
-            // Characters below 0x20 are controls characters that are hardcoded
-            // into the platform so if some characters in the font are assigned
-            // under this limit they will not be displayed so let's rewrite the
-            // CMap.
-            var glyphs = [];
-            var ids = [];
-            for (var j = 0; j < 256; j++) {
-              var index = font.getByte();
-              if (index) {
-                glyphs.push({ unicode: j, code: j });
-                ids.push(index);
-              }
-            }
-            return {
-              glyphs: glyphs,
-              ids: ids,
-              hasShortCmap: true
-            };
-          } else if (format == 4) {
-            // re-creating the table in format 4 since the encoding
-            // might be changed
-            var segCount = (int16(font.getBytes(2)) >> 1);
-            font.getBytes(6); // skipping range fields
-            var segIndex, segments = [];
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments.push({ end: int16(font.getBytes(2)) });
-            }
-            font.getBytes(2);
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments[segIndex].start = int16(font.getBytes(2));
-            }
-
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments[segIndex].delta = int16(font.getBytes(2));
-            }
-
-            var offsetsCount = 0;
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              var segment = segments[segIndex];
-              var rangeOffset = int16(font.getBytes(2));
-              if (!rangeOffset) {
-                segment.offsetIndex = -1;
-                continue;
-              }
-
-              var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
-              segment.offsetIndex = offsetIndex;
-              offsetsCount = Math.max(offsetsCount, offsetIndex +
-                segment.end - segment.start + 1);
-            }
-
-            var offsets = [];
-            for (var j = 0; j < offsetsCount; j++)
-              offsets.push(int16(font.getBytes(2)));
-
-            var glyphs = [], ids = [];
-
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              var segment = segments[segIndex];
-              var start = segment.start, end = segment.end;
-              var delta = segment.delta, offsetIndex = segment.offsetIndex;
-
-              for (var j = start; j <= end; j++) {
-                if (j == 0xFFFF)
-                  continue;
-
-                var glyphCode = offsetIndex < 0 ? j :
-                  offsets[offsetIndex + j - start];
-                glyphCode = (glyphCode + delta) & 0xFFFF;
-                if (glyphCode == 0)
-                  continue;
-
-                glyphs.push({ unicode: j, code: j });
-                ids.push(glyphCode);
-              }
-            }
-
-            return {
-              glyphs: glyphs,
-              ids: ids
-            };
-          } else if (format == 6) {
-            // Format 6 is a 2-bytes dense mapping, which means the font data
-            // lives glue together even if they are pretty far in the unicode
-            // table. (This looks weird, so I can have missed something), this
-            // works on Linux but seems to fails on Mac so let's rewrite the
-            // cmap table to a 3-1-4 style
-            var firstCode = int16(font.getBytes(2));
-            var entryCount = int16(font.getBytes(2));
-
-            var glyphs = [];
-            var ids = [];
-            for (var j = 0; j < entryCount; j++) {
-              var glyphCode = int16(font.getBytes(2));
-              var code = firstCode + j;
-
-              glyphs.push({ unicode: code, code: code });
-              ids.push(glyphCode);
-            }
-
-            return {
-              glyphs: glyphs,
-              ids: ids
-            };
-          }
-        }
-        error('Unsupported cmap table format');
-      };
-
-      function sanitizeMetrics(font, header, metrics, numGlyphs) {
-        if (!header && !metrics)
-          return;
-
-        // The vhea/vmtx tables are not required, so it happens that
-        // some fonts embed a vmtx table without a vhea table. In this
-        // situation the sanitizer assume numOfLongVerMetrics = 1. As
-        // a result it tries to read numGlyphs - 1 SHORT from the vmtx
-        // table, and if it is not possible, the font is rejected.
-        // So remove the vmtx table if there is no vhea table.
-        if (!header && metrics) {
-          metrics.data = null;
-          return;
-        }
-
-        font.pos = (font.start ? font.start : 0) + header.offset;
-        font.pos += header.length - 2;
-        var numOfMetrics = int16(font.getBytes(2));
-
-        var numOfSidebearings = numGlyphs - numOfMetrics;
-        var numMissing = numOfSidebearings -
-          ((hmtx.length - numOfMetrics * 4) >> 1);
-        if (numMissing > 0) {
-          font.pos = (font.start ? font.start : 0) + metrics.offset;
-          var entries = '';
-          for (var i = 0, ii = hmtx.length; i < ii; i++)
-            entries += String.fromCharCode(font.getByte());
-          for (var i = 0; i < numMissing; i++)
-            entries += '\x00\x00';
-          metrics.data = stringToArray(entries);
-        }
-      };
-
-      function sanitizeGlyph(source, sourceStart, sourceEnd, dest, destStart) {
-        if (sourceEnd - sourceStart <= 12) {
-          // glyph with data less than 12 is invalid one
-          return 0;
-        }
-        var glyf = source.subarray(sourceStart, sourceEnd);
-        var contoursCount = (glyf[0] << 8) | glyf[1];
-        if (contoursCount & 0x8000) {
-          // complex glyph, writing as is
-          dest.set(glyf, destStart);
-          return glyf.length;
-        }
-
-        var j = 10, flagsCount = 0;
-        for (var i = 0; i < contoursCount; i++) {
-          var endPoint = (glyf[j] << 8) | glyf[j + 1];
-          flagsCount = endPoint + 1;
-          j += 2;
-        }
-        // skipping instructions
-        var instructionsLength = (glyf[j] << 8) | glyf[j + 1];
-        j += 2 + instructionsLength;
-        // validating flags
-        var coordinatesLength = 0;
-        for (var i = 0; i < flagsCount; i++) {
-          var flag = glyf[j++];
-          if (flag & 0xC0) {
-            // reserved flags must be zero, rejecting
-            return 0;
-          }
-          var xyLength = ((flag & 2) ? 1 : (flag & 16) ? 0 : 2) +
-                         ((flag & 4) ? 1 : (flag & 32) ? 0 : 2);
-          coordinatesLength += xyLength;
-          if (flag & 8) {
-            var repeat = glyf[j++];
-            i += repeat;
-            coordinatesLength += repeat * xyLength;
-          }
-        }
-        var glyphDataLength = j + coordinatesLength;
-        if (glyphDataLength > glyf.length) {
-          // not enough data for coordinates
-          return 0;
-        }
-        if (glyf.length - glyphDataLength > 3) {
-          // truncating and aligning to 4 bytes the long glyph data
-          glyphDataLength = (glyphDataLength + 3) & ~3;
-          dest.set(glyf.subarray(0, glyphDataLength), destStart);
-          return glyphDataLength;
-        }
-        // glyph data is fine
-        dest.set(glyf, destStart);
-        return glyf.length;
-      }
-
-      function sanitizeGlyphLocations(loca, glyf, numGlyphs,
-                                      isGlyphLocationsLong) {
-        var itemSize, itemDecode, itemEncode;
-        if (isGlyphLocationsLong) {
-          itemSize = 4;
-          itemDecode = function fontItemDecodeLong(data, offset) {
-            return (data[offset] << 24) | (data[offset + 1] << 16) |
-                   (data[offset + 2] << 8) | data[offset + 3];
-          };
-          itemEncode = function fontItemEncodeLong(data, offset, value) {
-            data[offset] = (value >>> 24) & 0xFF;
-            data[offset + 1] = (value >> 16) & 0xFF;
-            data[offset + 2] = (value >> 8) & 0xFF;
-            data[offset + 3] = value & 0xFF;
-          };
-        } else {
-          itemSize = 2;
-          itemDecode = function fontItemDecode(data, offset) {
-            return (data[offset] << 9) | (data[offset + 1] << 1);
-          };
-          itemEncode = function fontItemEncode(data, offset, value) {
-            data[offset] = (value >> 9) & 0xFF;
-            data[offset + 1] = (value >> 1) & 0xFF;
-          };
-        }
-        var locaData = loca.data;
-        // removing the invalid glyphs
-        var oldGlyfData = glyf.data;
-        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;
-          itemEncode(locaData, j, writeOffset);
-          startOffset = endOffset;
-        }
-
-        if (writeOffset == 0) {
-          // glyf table cannot be empty -- redoing the glyf and loca tables
-          // to have single glyph with one point
-          var simpleGlyph = new Uint8Array(
-            [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0]);
-          for (var i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize)
-            itemEncode(locaData, j, simpleGlyph.length);
-          glyf.data = simpleGlyph;
-          return;
-        }
-
-        glyf.data = newGlyfData.subarray(0, writeOffset);
-      }
-
-      function findEmptyGlyphs(locaTable, isGlyphLocationsLong, emptyGlyphIds) {
-        var itemSize, itemDecode;
-        if (isGlyphLocationsLong) {
-          itemSize = 4;
-          itemDecode = function fontItemDecodeLong(data, offset) {
-            return (data[offset] << 24) | (data[offset + 1] << 16) |
-                   (data[offset + 2] << 8) | data[offset + 3];
-          };
-        } else {
-          itemSize = 2;
-          itemDecode = function fontItemDecode(data, offset) {
-            return (data[offset] << 9) | (data[offset + 1] << 1);
-          };
-        }
-        var data = locaTable.data, length = data.length;
-        var lastOffset = itemDecode(data, 0);
-        for (var i = itemSize, j = 0; i < length; i += itemSize, j++) {
-          var offset = itemDecode(data, i);
-          if (offset == lastOffset)
-            emptyGlyphIds[j] = true;
-          lastOffset = offset;
-        }
-      }
-
-      function readGlyphNameMap(post, properties) {
-        var start = (font.start ? font.start : 0) + post.offset;
-        font.pos = start;
-
-        var length = post.length, end = start + length;
-        var version = int32(font.getBytes(4));
-        // skip rest to the tables
-        font.getBytes(28);
-
-        var glyphNames;
-        switch (version) {
-          case 0x00010000:
-            glyphNames = MacStandardGlyphOrdering;
-            break;
-          case 0x00020000:
-            var numGlyphs = int16(font.getBytes(2));
-            var glyphNameIndexes = [];
-            for (var i = 0; i < numGlyphs; ++i)
-              glyphNameIndexes.push(int16(font.getBytes(2)));
-            var customNames = [];
-            while (font.pos < end) {
-              var stringLength = font.getByte();
-              var string = '';
-              for (var i = 0; i < stringLength; ++i)
-                string += font.getChar();
-              customNames.push(string);
-            }
-            glyphNames = [];
-            for (var i = 0; i < numGlyphs; ++i) {
-              var j = glyphNameIndexes[i];
-              if (j < 258) {
-                glyphNames.push(MacStandardGlyphOrdering[j]);
-                continue;
-              }
-              glyphNames.push(customNames[j - 258]);
-            }
-            break;
-          case 0x00030000:
-            break;
-          default:
-            warn('Unknown/unsupported post table version ' + version);
-            break;
-        }
-        properties.glyphNames = glyphNames;
-      }
-
-      // Check that required tables are present
-      var requiredTables = ['OS/2', 'cmap', 'head', 'hhea',
-                             'hmtx', 'maxp', 'name', 'post'];
-
-      var header = readOpenTypeHeader(font);
-      var numTables = header.numTables;
-
-      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf;
-      var tables = [];
-      for (var i = 0; i < numTables; i++) {
-        var table = readTableEntry(font);
-        var index = requiredTables.indexOf(table.tag);
-        if (index != -1) {
-          if (table.tag == 'cmap')
-            cmap = table;
-          else if (table.tag == 'post')
-            post = table;
-          else if (table.tag == 'maxp')
-            maxp = table;
-          else if (table.tag == 'hhea')
-            hhea = table;
-          else if (table.tag == 'hmtx')
-            hmtx = table;
-          else if (table.tag == 'head')
-            head = table;
-
-          requiredTables.splice(index, 1);
-        } else {
-          if (table.tag == 'vmtx')
-            vmtx = table;
-          else if (table.tag == 'vhea')
-            vhea = table;
-          else if (table.tag == 'loca')
-            loca = table;
-          else if (table.tag == 'glyf')
-            glyf = table;
-        }
-        tables.push(table);
-      }
-
-      var numTables = header.numTables + requiredTables.length;
-
-      // header and new offsets. Table entry information is appended to the
-      // end of file. The virtualOffset represents where to put the actual
-      // data of a particular table;
-      var ttf = {
-        file: '',
-        virtualOffset: numTables * (4 * 4)
-      };
-
-      // The new numbers of tables will be the last one plus the num
-      // of missing tables
-      createOpenTypeHeader(header.version, ttf, numTables);
-
-      if (requiredTables.indexOf('OS/2') != -1) {
-        // extract some more font properties from the OpenType head and
-        // hhea tables; yMin and descent value are always negative
-        var override = {
-          unitsPerEm: int16([head.data[18], head.data[19]]),
-          yMax: int16([head.data[42], head.data[43]]),
-          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
-          ascent: int16([hhea.data[4], hhea.data[5]]),
-          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
-        };
-
-        tables.push({
-          tag: 'OS/2',
-          data: stringToArray(createOS2Table(properties, null, override))
-        });
-      }
-
-      // Ensure the [h/v]mtx tables contains the advance width and
-      // sidebearings information for numGlyphs in the maxp table
-      font.pos = (font.start || 0) + maxp.offset;
-      var version = int16(font.getBytes(4));
-      var numGlyphs = int16(font.getBytes(2));
-
-      sanitizeMetrics(font, hhea, hmtx, numGlyphs);
-      sanitizeMetrics(font, vhea, vmtx, numGlyphs);
-
-      var isGlyphLocationsLong = int16([head.data[50], head.data[51]]);
-      if (head && loca && glyf) {
-        sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong);
-      }
-
-      var emptyGlyphIds = [];
-      if (glyf)
-        findEmptyGlyphs(loca, isGlyphLocationsLong, emptyGlyphIds);
-
-      // Sanitizer reduces the glyph advanceWidth to the maxAdvanceWidth
-      // Sometimes it's 0. That needs to be fixed
-      if (hhea.data[10] == 0 && hhea.data[11] == 0) {
-        hhea.data[10] = 0xFF;
-        hhea.data[11] = 0xFF;
-      }
-
-      // The 'post' table has glyphs names.
-      if (post) {
-        readGlyphNameMap(post, properties);
-      }
-
-      var glyphs, ids;
-      if (properties.type == 'CIDFontType2') {
-        // Replace the old CMAP table with a shiny new one
-        // Type2 composite fonts map characters directly to glyphs so the cmap
-        // table must be replaced.
-        // canvas fillText will reencode some characters even if the font has a
-        // glyph at that position - e.g. newline is converted to a space and
-        // U+00AD (soft hyphen) is not drawn.
-        // So, offset all the glyphs by 0xFF to avoid these cases and use
-        // the encoding to map incoming characters to the new glyph positions
-        if (!cmap) {
-          cmap = {
-            tag: 'cmap',
-            data: null
-          };
-          tables.push(cmap);
-        }
-
-        var cidToGidMap = properties.cidToGidMap || [];
-        var gidToCidMap = [0];
-        if (cidToGidMap.length > 0) {
-          for (var j = cidToGidMap.length - 1; j >= 0; j--) {
-            var gid = cidToGidMap[j];
-            if (gid)
-              gidToCidMap[gid] = j;
-          }
-          // filling the gaps using CID above the CIDs currently used in font
-          var nextCid = cidToGidMap.length;
-          for (var i = 1; i < numGlyphs; i++) {
-            if (!gidToCidMap[i])
-              gidToCidMap[i] = nextCid++;
-          }
-        }
-
-        glyphs = [];
-        ids = [];
-
-        var usedUnicodes = [];
-        var unassignedUnicodeItems = [];
-        for (var i = 1; i < numGlyphs; i++) {
-          var cid = gidToCidMap[i] || i;
-          var unicode = this.toFontChar[cid];
-          if (!unicode || typeof unicode !== 'number' ||
-              isSpecialUnicode(unicode) || unicode in usedUnicodes) {
-            unassignedUnicodeItems.push(i);
-            continue;
-          }
-          usedUnicodes[unicode] = true;
-          glyphs.push({ unicode: unicode, code: cid });
-          ids.push(i);
-        }
-        // trying to fit as many unassigned symbols as we can
-        // in the range allocated for the user defined symbols
-        var unusedUnicode = kCmapGlyphOffset;
-        for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
-          var i = unassignedUnicodeItems[j];
-          var cid = gidToCidMap[i] || i;
-          while (unusedUnicode in usedUnicodes)
-            unusedUnicode++;
-          if (unusedUnicode >= kCmapGlyphOffset + kSizeOfGlyphArea)
-            break;
-          var unicode = unusedUnicode++;
-          this.toFontChar[cid] = unicode;
-          usedUnicodes[unicode] = true;
-          glyphs.push({ unicode: unicode, code: cid });
-          ids.push(i);
-        }
-      } else {
-        var cmapTable = readCMapTable(cmap, font);
-
-        glyphs = cmapTable.glyphs;
-        ids = cmapTable.ids;
-
-        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;
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            if (glyphs[i].unicode != i + 1) {
-              isIdentity = false;
-              break;
-            }
-          }
-          // if it is, replacing with meaningful toUnicode values
-          if (isIdentity && !this.isSymbolicFont) {
-            var usedUnicodes = [], unassignedUnicodeItems = [];
-            for (var i = 0, ii = glyphs.length; i < ii; i++) {
-              var unicode = toFontChar[i + 1];
-              if (!unicode || typeof unicode !== 'number' ||
-                  unicode in usedUnicodes) {
-                unassignedUnicodeItems.push(i);
-                continue;
-              }
-              glyphs[i].unicode = unicode;
-              usedUnicodes[unicode] = true;
-            }
-            for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
-              var i = unassignedUnicodeItems[j];
-              while (unusedUnicode in usedUnicodes)
-                unusedUnicode++;
-              var cid = i + 1;
-              // override only if unicode mapping is not specified
-              if (!(cid in toFontChar))
-                toFontChar[cid] = unusedUnicode;
-              glyphs[i].unicode = unusedUnicode++;
-            }
-            this.useToFontChar = true;
-          }
-        }
-
-        // remove glyph references outside range of avaialable glyphs or empty
-        var glyphsRemoved = 0;
-        for (var i = ids.length - 1; i >= 0; i--) {
-          if (ids[i] < numGlyphs &&
-              (!emptyGlyphIds[ids[i]] || this.isSymbolicFont))
-            continue;
-          ids.splice(i, 1);
-          glyphs.splice(i, 1);
-          glyphsRemoved++;
-        }
-
-        // checking if it's a "true" symbolic font
-        if (this.isSymbolicFont) {
-          var minUnicode = 0xFFFF, maxUnicode = 0;
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var unicode = glyphs[i].unicode;
-            minUnicode = Math.min(minUnicode, unicode);
-            maxUnicode = Math.max(maxUnicode, unicode);
-          }
-          // high byte must be the same for min and max unicodes
-          if ((maxUnicode & 0xFF00) != (minUnicode & 0xFF00))
-            this.isSymbolicFont = false;
-        }
-
-        // heuristics: if removed more than 2 glyphs encoding WinAnsiEncoding
-        // does not set properly
-        if (glyphsRemoved > 2) {
-          warn('Switching TrueType encoding to MacRomanEncoding for ' +
-               this.name + ' font');
-          encoding = Encodings.MacRomanEncoding;
-        }
-
-        if (hasShortCmap && this.hasEncoding && !this.isSymbolicFont) {
-          // Re-encode short map encoding to unicode -- that simplifies the
-          // resolution of MacRoman encoded glyphs logic for TrueType fonts:
-          // copying all characters to private use area, all mapping all known
-          // glyphs to the unicodes. The glyphs and ids arrays will grow.
-          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 = glyphNames[gid] || encoding[code];
-            if (glyphName in GlyphsUnicode) {
-              var unicode = GlyphsUnicode[glyphName];
-              if (unicode in usedUnicodes)
-                continue;
-
-              usedUnicodes[unicode] = true;
-              glyphs.push({
-                unicode: unicode,
-                code: glyphs[i].code
-              });
-              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;
-
-          var newGlyphUnicodes = [];
-          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 || reverseMap[unicode] === i)
-                continue; // unknown glyph name or in its own place
-
-              newGlyphUnicodes[i] = unicode;
-              if (changeCode)
-                toFontChar[code] = unicode;
-              delete reverseMap[code];
-            }
-          }
-          for (var index in newGlyphUnicodes) {
-            var unicode = newGlyphUnicodes[index];
-            if (reverseMap[unicode]) {
-              // avoiding assigning to the same unicode
-              glyphs[index].unicode = unusedUnicode++;
-              continue;
-            }
-            glyphs[index].unicode = unicode;
-            reverseMap[unicode] = index;
-          }
-          this.useToFontChar = true;
-        }
-
-        // Moving all symbolic font glyphs into 0xF000 - 0xF0FF range.
-        if (this.isSymbolicFont) {
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var code = glyphs[i].unicode & 0xFF;
-            var fontCharCode = kSymbolicFontGlyphOffset | code;
-            glyphs[i].unicode = toFontChar[code] = fontCharCode;
-          }
-          this.useToFontChar = true;
-        }
-
-        createGlyphNameMap(glyphs, ids, properties);
-        this.glyphNameMap = properties.glyphNameMap;
-      }
-
-      // Converting glyphs and ids into font's cmap table
-      cmap.data = createCMapTable(glyphs, ids);
-      var unicodeIsEnabled = [];
-      for (var i = 0, ii = glyphs.length; i < ii; i++) {
-        unicodeIsEnabled[glyphs[i].unicode] = true;
-      }
-      this.unicodeIsEnabled = unicodeIsEnabled;
-
-      // Rewrite the 'post' table if needed
-      if (requiredTables.indexOf('post') != -1) {
-        tables.push({
-          tag: 'post',
-          data: stringToArray(createPostTable(properties))
-        });
-      }
-
-      // Rewrite the 'name' table if needed
-      if (requiredTables.indexOf('name') != -1) {
-        tables.push({
-          tag: 'name',
-          data: stringToArray(createNameTable(this.name))
-        });
-      }
-
-      // Tables needs to be written by ascendant alphabetic order
-      tables.sort(function tables_sort(a, b) {
-        return (a.tag > b.tag) - (a.tag < b.tag);
-      });
-
-      // rewrite the tables but tweak offsets
-      for (var i = 0, ii = tables.length; i < ii; i++) {
-        var table = tables[i];
-        var data = [];
-
-        var tableData = table.data;
-        for (var j = 0, jj = tableData.length; j < jj; j++)
-          data.push(tableData[j]);
-        createTableEntry(ttf, table.tag, data);
-      }
-
-      // Add the table datas
-      for (var i = 0, ii = tables.length; i < ii; i++) {
-        var table = tables[i];
-        var tableData = table.data;
-        ttf.file += arrayToString(tableData);
-
-        // 4-byte aligned data
-        while (ttf.file.length & 3)
-          ttf.file += String.fromCharCode(0);
-      }
-
-      return stringToArray(ttf.file);
-    },
-
-    convert: function Font_convert(fontName, font, properties) {
-      function isFixedPitch(glyphs) {
-        for (var i = 0, ii = glyphs.length - 1; i < ii; i++) {
-          if (glyphs[i] != glyphs[i + 1])
-            return false;
-        }
-        return true;
-      }
-
-      // The offsets object holds at the same time a representation of where
-      // to write the table entry information about a table and another offset
-      // representing the offset where to draw the actual data of a particular
-      // table
-      var kRequiredTablesCount = 9;
-
-      var otf = {
-        file: '',
-        virtualOffset: 9 * (4 * 4)
-      };
-
-      createOpenTypeHeader('\x4F\x54\x54\x4F', otf, 9);
-
-      var charstrings = font.charstrings;
-      properties.fixedPitch = isFixedPitch(charstrings);
-
-      var glyphNameMap = {};
-      for (var i = 0; i < charstrings.length; ++i) {
-        var charstring = charstrings[i];
-        glyphNameMap[charstring.glyph] = charstring.unicode;
-      }
-      this.glyphNameMap = glyphNameMap;
-
-      if (!properties.hasEncoding && (properties.subtype == 'Type1C' ||
-          properties.subtype == 'CIDFontType0C')) {
-        var encoding = [];
-        for (var i = 0; i < charstrings.length; ++i) {
-          var charstring = charstrings[i];
-          encoding[charstring.code] = charstring.glyph;
-        }
-        properties.baseEncoding = encoding;
-      }
-      if (properties.subtype == 'CIDFontType0C') {
-        var toFontChar = [];
-        for (var i = 0; i < charstrings.length; ++i) {
-          var charstring = charstrings[i];
-          toFontChar[charstring.code] = charstring.unicode;
-        }
-        this.toFontChar = toFontChar;
-      }
-
-      var fields = {
-        // PostScript Font Program
-        'CFF ': font.data,
-
-        // OS/2 and Windows Specific metrics
-        'OS/2': stringToArray(createOS2Table(properties, charstrings)),
-
-        // Character to glyphs mapping
-        'cmap': createCMapTable(charstrings.slice(),
-                                ('glyphIds' in font) ? font.glyphIds : null),
-
-        // Font header
-        'head': (function fontFieldsHead() {
-          return stringToArray(
-              '\x00\x01\x00\x00' + // Version number
-              '\x00\x00\x10\x00' + // fontRevision
-              '\x00\x00\x00\x00' + // checksumAdjustement
-              '\x5F\x0F\x3C\xF5' + // magicNumber
-              '\x00\x00' + // Flags
-              '\x03\xE8' + // unitsPerEM (defaulting to 1000)
-              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // creation date
-              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // modifification date
-              '\x00\x00' + // xMin
-              safeString16(properties.descent) + // yMin
-              '\x0F\xFF' + // xMax
-              safeString16(properties.ascent) + // yMax
-              string16(properties.italicAngle ? 2 : 0) + // macStyle
-              '\x00\x11' + // lowestRecPPEM
-              '\x00\x00' + // fontDirectionHint
-              '\x00\x00' + // indexToLocFormat
-              '\x00\x00');  // glyphDataFormat
-        })(),
-
-        // Horizontal header
-        'hhea': (function fontFieldsHhea() {
-          return stringToArray(
-              '\x00\x01\x00\x00' + // Version number
-              safeString16(properties.ascent) + // Typographic Ascent
-              safeString16(properties.descent) + // Typographic Descent
-              '\x00\x00' + // Line Gap
-              '\xFF\xFF' + // advanceWidthMax
-              '\x00\x00' + // minLeftSidebearing
-              '\x00\x00' + // minRightSidebearing
-              '\x00\x00' + // xMaxExtent
-              safeString16(properties.capHeight) + // caretSlopeRise
-              safeString16(Math.tan(properties.italicAngle) *
-                       properties.xHeight) + // caretSlopeRun
-              '\x00\x00' + // caretOffset
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // metricDataFormat
-              string16(charstrings.length + 1)); // Number of HMetrics
-        })(),
-
-        // Horizontal metrics
-        'hmtx': (function fontFieldsHmtx() {
-          var hmtx = '\x00\x00\x00\x00'; // Fake .notdef
-          for (var i = 0, ii = charstrings.length; i < ii; i++) {
-            var charstring = charstrings[i];
-            var width = 'width' in charstring ? charstring.width : 0;
-            hmtx += string16(width) + string16(0);
-          }
-          return stringToArray(hmtx);
-        })(),
-
-        // Maximum profile
-        'maxp': (function fontFieldsMaxp() {
-          return stringToArray(
-              '\x00\x00\x50\x00' + // Version number
-             string16(charstrings.length + 1)); // Num of glyphs
-        })(),
-
-        // Naming tables
-        'name': stringToArray(createNameTable(fontName)),
-
-        // PostScript informations
-        'post': stringToArray(createPostTable(properties))
-      };
-
-      for (var field in fields)
-        createTableEntry(otf, field, fields[field]);
-
-      for (var field in fields) {
-        var table = fields[field];
-        otf.file += arrayToString(table);
-      }
-
-      return stringToArray(otf.file);
-    },
-
-    buildToFontChar: function Font_buildToFontChar(toUnicode) {
-      var result = [];
-      var unusedUnicode = kCmapGlyphOffset;
-      for (var i = 0, ii = toUnicode.length; i < ii; i++) {
-        var unicode = toUnicode[i];
-        var fontCharCode = typeof unicode === 'object' ? unusedUnicode++ :
-          unicode;
-        if (typeof unicode !== 'undefined')
-          result[i] = fontCharCode;
-      }
-      return result;
-    },
-
-    rebuildToUnicode: function Font_rebuildToUnicode(properties) {
-      var firstChar = properties.firstChar, lastChar = properties.lastChar;
-      var map = [];
-      if (properties.composite) {
-        var isIdentityMap = this.cidToUnicode.length == 0;
-        for (var i = firstChar, ii = lastChar; i <= ii; i++) {
-          // TODO missing map the character according font's CMap
-          var cid = i;
-          map[i] = isIdentityMap ? cid : this.cidToUnicode[cid];
-        }
-      } else {
-        for (var i = firstChar, ii = lastChar; i <= ii; i++) {
-          var glyph = properties.differences[i];
-          if (!glyph)
-            glyph = properties.baseEncoding[i];
-          if (!!glyph && (glyph in GlyphsUnicode))
-            map[i] = GlyphsUnicode[glyph];
-        }
-      }
-      this.toUnicode = map;
-    },
-
-    loadCidToUnicode: function Font_loadCidToUnicode(properties) {
-      if (!properties.cidSystemInfo)
-        return;
-
-      var cidToUnicodeMap = [], unicodeToCIDMap = [];
-      this.cidToUnicode = cidToUnicodeMap;
-      this.unicodeToCID = unicodeToCIDMap;
-
-      var cidSystemInfo = properties.cidSystemInfo;
-      var cidToUnicode;
-      if (cidSystemInfo) {
-        cidToUnicode = CIDToUnicodeMaps[
-          cidSystemInfo.registry + '-' + cidSystemInfo.ordering];
-      }
-
-      if (!cidToUnicode)
-        return; // identity encoding
-
-      var cid = 1, i, j, k, ii;
-      for (i = 0, ii = cidToUnicode.length; i < ii; ++i) {
-        var unicode = cidToUnicode[i];
-        if (isArray(unicode)) {
-          var length = unicode.length;
-          for (j = 0; j < length; j++) {
-            cidToUnicodeMap[cid] = unicode[j];
-            unicodeToCIDMap[unicode[j]] = cid;
-          }
-          cid++;
-        } else if (typeof unicode === 'object') {
-          var fillLength = unicode.f;
-          if (fillLength) {
-            k = unicode.c;
-            for (j = 0; j < fillLength; ++j) {
-              cidToUnicodeMap[cid] = k;
-              unicodeToCIDMap[k] = cid;
-              cid++;
-              k++;
-            }
-          } else
-            cid += unicode.s;
-        } else if (unicode) {
-          cidToUnicodeMap[cid] = unicode;
-          unicodeToCIDMap[unicode] = cid;
-          cid++;
-        } else
-          cid++;
-      }
-    },
-
-    bindDOM: function Font_bindDOM(data) {
-      var fontName = this.loadedName;
-
-      // Add the font-face rule to the document
-      var url = ('url(data:' + this.mimetype + ';base64,' +
-                 window.btoa(data) + ');');
-      var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}';
-
-      var styleElement = document.createElement('style');
-      document.documentElement.getElementsByTagName('head')[0].appendChild(
-        styleElement);
-
-      var styleSheet = styleElement.sheet;
-      styleSheet.insertRule(rule, styleSheet.cssRules.length);
-
-      if (PDFJS.pdfBug && FontInspector.enabled)
-        FontInspector.fontAdded(this, url);
-
-      return rule;
-    },
-
-    get spaceWidth() {
-      // trying to estimate space character width
-      var possibleSpaceReplacements = ['space', 'minus', 'one', 'i'];
-      var width;
-      for (var i = 0, ii = possibleSpaceReplacements.length; i < ii; i++) {
-        var glyphName = possibleSpaceReplacements[i];
-        // if possible, getting width by glyph name
-        if (glyphName in this.widths) {
-          width = this.widths[glyphName];
-          break;
-        }
-        var glyphUnicode = GlyphsUnicode[glyphName];
-        // finding the charcode via unicodeToCID map
-        var charcode = 0;
-        if (this.composite)
-          charcode = this.unicodeToCID[glyphUnicode];
-        // ... via toUnicode map
-        if (!charcode && 'toUnicode' in this)
-          charcode = this.toUnicode.indexOf(glyphUnicode);
-        // setting it to unicode if negative or undefined
-        if (!(charcode > 0))
-          charcode = glyphUnicode;
-        // trying to get width via charcode
-        width = this.widths[charcode];
-        if (width)
-          break; // the non-zero width found
-      }
-      width = (width || this.defaultWidth) * this.widthMultiplier;
-      return shadow(this, 'spaceWidth', width);
-    },
-
-    charToGlyph: function Font_charToGlyph(charcode) {
-      var fontCharCode, width, operatorList, disabled;
-
-      var width = this.widths[charcode];
-
-      switch (this.type) {
-        case 'CIDFontType0':
-          if (this.noUnicodeAdaptation) {
-            width = this.widths[this.unicodeToCID[charcode] || charcode];
-            fontCharCode = mapPrivateUseChars(charcode);
-            break;
-          }
-          fontCharCode = this.toFontChar[charcode] || charcode;
-          break;
-        case 'CIDFontType2':
-          if (this.noUnicodeAdaptation) {
-            width = this.widths[this.unicodeToCID[charcode] || charcode];
-            fontCharCode = mapPrivateUseChars(charcode);
-            break;
-          }
-          fontCharCode = this.toFontChar[charcode] || charcode;
-          break;
-        case 'Type1':
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          if (!isNum(width))
-            width = this.widths[glyphName];
-          if (this.noUnicodeAdaptation) {
-            fontCharCode = mapPrivateUseChars(GlyphsUnicode[glyphName] ||
-              charcode);
-            break;
-          }
-          fontCharCode = this.glyphNameMap[glyphName] ||
-            GlyphsUnicode[glyphName] || charcode;
-          break;
-        case 'Type3':
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          operatorList = this.charProcOperatorList[glyphName];
-          fontCharCode = charcode;
-          break;
-        case 'TrueType':
-          if (this.useToFontChar) {
-            fontCharCode = this.toFontChar[charcode] || charcode;
-            break;
-          }
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          if (!glyphName)
-            glyphName = Encodings.StandardEncoding[charcode];
-          if (!isNum(width))
-            width = this.widths[glyphName];
-          if (this.noUnicodeAdaptation) {
-            fontCharCode = GlyphsUnicode[glyphName] || charcode;
-            break;
-          }
-          if (!this.hasEncoding || this.isSymbolicFont) {
-            fontCharCode = this.useToFontChar ? this.toFontChar[charcode] :
-              charcode;
-            break;
-          }
-
-          // MacRoman encoding address by re-encoding the cmap table
-          fontCharCode = glyphName in this.glyphNameMap ?
-            this.glyphNameMap[glyphName] : GlyphsUnicode[glyphName];
-          break;
-        default:
-          warn('Unsupported font type: ' + this.type);
-          break;
-      }
-
-      var unicodeChars = !('toUnicode' in this) ? charcode :
-        this.toUnicode[charcode] || charcode;
-      if (typeof unicodeChars === 'number')
-        unicodeChars = String.fromCharCode(unicodeChars);
-
-      width = (isNum(width) ? width : this.defaultWidth) * this.widthMultiplier;
-      disabled = this.unicodeIsEnabled ?
-        !this.unicodeIsEnabled[fontCharCode] : false;
-
-      return {
-        fontChar: String.fromCharCode(fontCharCode),
-        unicode: unicodeChars,
-        width: width,
-        disabled: disabled,
-        operatorList: operatorList
-      };
-    },
-
-    charsToGlyphs: function Font_charsToGlyphs(chars) {
-      var charsCache = this.charsCache;
-      var glyphs;
-
-      // if we translated this string before, just grab it from the cache
-      if (charsCache) {
-        glyphs = charsCache[chars];
-        if (glyphs)
-          return glyphs;
-      }
-
-      // lazily create the translation cache
-      if (!charsCache)
-        charsCache = this.charsCache = Object.create(null);
-
-      glyphs = [];
-
-      if (this.composite) {
-        // composite fonts have multi-byte strings convert the string from
-        // single-byte to multi-byte
-        // XXX assuming CIDFonts are two-byte - later need to extract the
-        // correct byte encoding according to the PDF spec
-        var length = chars.length - 1; // looping over two bytes at a time so
-                                       // loop should never end on the last byte
-        for (var i = 0; i < length; i++) {
-          var charcode = int16([chars.charCodeAt(i++), chars.charCodeAt(i)]);
-          var glyph = this.charToGlyph(charcode);
-          glyphs.push(glyph);
-          // placing null after each word break charcode (ASCII SPACE)
-          if (charcode == 0x20)
-            glyphs.push(null);
-        }
-      }
-      else {
-        for (var i = 0, ii = chars.length; i < ii; ++i) {
-          var charcode = chars.charCodeAt(i);
-          var glyph = this.charToGlyph(charcode);
-          glyphs.push(glyph);
-          if (charcode == 0x20)
-            glyphs.push(null);
-        }
-      }
-
-      // Enter the translated string into the cache
-      return (charsCache[chars] = glyphs);
-    }
-  };
-
-  return Font;
-})();
-
-/*
- * Type1Parser encapsulate the needed code for parsing a Type1 font
- * program. Some of its logic depends on the Type2 charstrings
- * structure.
- */
-var Type1Parser = function type1Parser() {
-  /*
-   * Decrypt a Sequence of Ciphertext Bytes to Produce the Original Sequence
-   * of Plaintext Bytes. The function took a key as a parameter which can be
-   * for decrypting the eexec block of for decoding charStrings.
-   */
-  var kEexecEncryptionKey = 55665;
-  var kCharStringsEncryptionKey = 4330;
-
-  function decrypt(stream, key, discardNumber) {
-    var r = key, c1 = 52845, c2 = 22719;
-    var decryptedString = [];
-
-    var value = '';
-    var count = stream.length;
-    for (var i = 0; i < count; i++) {
-      value = stream[i];
-      decryptedString[i] = value ^ (r >> 8);
-      r = ((value + r) * c1 + c2) & ((1 << 16) - 1);
-    }
-    return decryptedString.slice(discardNumber);
-  }
-
-  /*
-   * CharStrings are encoded following the the CharString Encoding sequence
-   * describe in Chapter 6 of the "Adobe Type1 Font Format" specification.
-   * The value in a byte indicates a command, a number, or subsequent bytes
-   * that are to be interpreted in a special way.
-   *
-   * CharString Number Encoding:
-   *  A CharString byte containing the values from 32 through 255 inclusive
-   *  indicate an integer. These values are decoded in four ranges.
-   *
-   * 1. A CharString byte containing a value, v, between 32 and 246 inclusive,
-   * indicate the integer v - 139. Thus, the integer values from -107 through
-   * 107 inclusive may be encoded in single byte.
-   *
-   * 2. A CharString byte containing a value, v, between 247 and 250 inclusive,
-   * indicates an integer involving the next byte, w, according to the formula:
-   * [(v - 247) x 256] + w + 108
-   *
-   * 3. A CharString byte containing a value, v, between 251 and 254 inclusive,
-   * indicates an integer involving the next byte, w, according to the formula:
-   * -[(v - 251) * 256] - w - 108
-   *
-   * 4. A CharString containing the value 255 indicates that the next 4 bytes
-   * are a two complement signed integer. The first of these bytes contains the
-   * highest order bits, the second byte contains the next higher order bits
-   * and the fourth byte contain the lowest order bits.
-   *
-   *
-   * CharString Command Encoding:
-   *  CharStrings commands are encoded in 1 or 2 bytes.
-   *
-   *  Single byte commands are encoded in 1 byte that contains a value between
-   *  0 and 31 inclusive.
-   *  If a command byte contains the value 12, then the value in the next byte
-   *  indicates a command. This "escape" mechanism allows many extra commands
-   * to be encoded and this encoding technique helps to minimize the length of
-   * the charStrings.
-   */
-  var charStringDictionary = {
-    '1': 'hstem',
-    '3': 'vstem',
-    '4': 'vmoveto',
-    '5': 'rlineto',
-    '6': 'hlineto',
-    '7': 'vlineto',
-    '8': 'rrcurveto',
-
-    // closepath is a Type1 command that do not take argument and is useless
-    // in Type2 and it can simply be ignored.
-    '9': null, // closepath
-
-    '10': 'callsubr',
-
-    // return is normally used inside sub-routines to tells to the execution
-    // flow that it can be back to normal.
-    // During the translation process Type1 charstrings will be flattened and
-    // sub-routines will be embedded directly into the charstring directly, so
-    // this can be ignored safely.
-    '11': 'return',
-
-    '12': {
-      // dotsection is a Type1 command to specify some hinting feature for dots
-      // that do not take a parameter and it can safely be ignored for Type2.
-      '0': null, // dotsection
-
-      // [vh]stem3 are Type1 only and Type2 supports [vh]stem with multiple
-      // parameters, so instead of returning [vh]stem3 take a shortcut and
-      // return [vhstem] instead.
-      '1': 'vstem',
-      '2': 'hstem',
-
-      // Type1 only command with command not (yet) built-in ,throw an error
-      '6': -1, // seac
-      '7': -1, // sbw
-
-      '11': 'sub',
-      '12': 'div',
-
-      // callothersubr is a mechanism to make calls on the postscript
-      // interpreter, this is not supported by Type2 charstring but hopefully
-      // most of the default commands can be ignored safely.
-      '16': 'callothersubr',
-
-      '17': 'pop',
-
-      // setcurrentpoint sets the current point to x, y without performing a
-      // moveto (this is a one shot positionning command). This is used only
-      // with the return of an OtherSubrs call.
-      // TODO Implement the OtherSubrs charstring embedding and replace this
-      // call by a no-op, like 2 'pop' commands for example.
-      '33': null // setcurrentpoint
-    },
-    '13': 'hsbw',
-    '14': 'endchar',
-    '21': 'rmoveto',
-    '22': 'hmoveto',
-    '30': 'vhcurveto',
-    '31': 'hvcurveto'
-  };
-
-  var kEscapeCommand = 12;
-
-  function decodeCharString(array) {
-    var charstring = [];
-    var lsb = 0;
-    var width = 0;
-    var flexState = 0;
-
-    var value = '';
-    var count = array.length;
-    for (var i = 0; i < count; i++) {
-      value = array[i];
-
-      if (value < 32) {
-        var command = null;
-        if (value == kEscapeCommand) {
-          var escape = array[++i];
-
-          // TODO Clean this code
-          if (escape == 16) {
-            var index = charstring.pop();
-            var argc = charstring.pop();
-            for (var j = 0; j < argc; j++)
-              charstring.push('drop');
-
-            // If the flex mechanism is not used in a font program, Adobe
-            // states that entries 0, 1 and 2 can simply be replaced by
-            // {}, which means that we can simply ignore them.
-            if (index < 3) {
-              continue;
-            }
-
-            // This is the same things about hint replacement, if it is not used
-            // entry 3 can be replaced by {3}
-            // TODO support hint replacment
-            if (index == 3) {
-              charstring.push(3);
-              i++;
-              continue;
-            }
-          } else if (escape == 17 || escape == 33) {
-            // pop or setcurrentpoint commands can be ignored
-            // since we are not doing callothersubr
-            continue;
-          } else if (!kHintingEnabled && (escape == 1 || escape == 2)) {
-            charstring.push('drop', 'drop', 'drop', 'drop', 'drop', 'drop');
-            continue;
-          }
-
-          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.push(lsb, 'hmoveto');
-            continue;
-          } else if (value == 10) { // callsubr
-            if (charstring[charstring.length - 1] < 3) { // subr #0..2
-              var subrNumber = charstring.pop();
-              switch (subrNumber) {
-                case 1:
-                  flexState = 1; // prepare for flex coordinates
-                  break;
-                case 2:
-                  flexState = 2; // flex in progress
-                  break;
-                case 0:
-                  // type2 flex command does not need final coords
-                  charstring.push('exch', 'drop', 'exch', 'drop');
-                  charstring.push('flex');
-                  flexState = 0;
-                  break;
-              }
-              continue;
-            }
-          } else if (value == 21 && flexState > 0) {
-            if (flexState > 1)
-              continue; // ignoring rmoveto
-            value = 5; // first segment replacing with rlineto
-          } else if (!kHintingEnabled && (value == 1 || value == 3)) {
-            charstring.push('drop', 'drop');
-            continue;
-          }
-          command = charStringDictionary[value];
-        }
-
-        // Some charstring commands are meaningless in Type2 and will return
-        // a null, let's just ignored them
-        if (!command && i < count) {
-          continue;
-        } else if (!command) {
-          break;
-        } else if (command == -1) {
-          warn('Support for Type1 command ' + value +
-                ' (' + escape + ') is not implemented in charstring: ' +
-                charstring);
-          if (value == 12) {
-            // we know how to ignore only some the Type1 commands
-            switch (escape) {
-              case 7:
-                charstring.push('drop', 'drop', 'drop', 'drop');
-                continue;
-              case 8:
-                charstring.push('drop');
-                continue;
-            }
-          }
-        }
-
-        value = command;
-      } else if (value <= 246) {
-        value = value - 139;
-      } else if (value <= 250) {
-        value = ((value - 247) * 256) + array[++i] + 108;
-      } else if (value <= 254) {
-        value = -((value - 251) * 256) - array[++i] - 108;
-      } else {
-        value = (array[++i] & 0xff) << 24 | (array[++i] & 0xff) << 16 |
-                (array[++i] & 0xff) << 8 | (array[++i] & 0xff) << 0;
-      }
-
-      charstring.push(value);
-    }
-
-    return { charstring: charstring, width: width, lsb: lsb };
-  }
-
-  /*
-   * Returns an object containing a Subrs array and a CharStrings
-   * array extracted from and eexec encrypted block of data
-   */
-  function readNumberArray(str, index) {
-    var start = index;
-    while (str[index++] != '[')
-      start++;
-    start++;
-
-    var count = 0;
-    while (str[index++] != ']')
-      count++;
-
-    str = str.substr(start, count);
-
-    str = str.trim();
-    // Remove adjacent spaces
-    str = str.replace(/\s+/g, ' ');
-
-    var array = str.split(' ');
-    for (var i = 0, ii = array.length; i < ii; i++)
-      array[i] = parseFloat(array[i] || 0);
-    return array;
-  }
-
-  function readNumber(str, index) {
-    while (str[index] == ' ')
-      index++;
-
-    var start = index;
-
-    var count = 0;
-    while (str[index++] != ' ')
-      count++;
-
-    return parseFloat(str.substr(start, count) || 0);
-  }
-
-  function isSeparator(c) {
-    return c == ' ' || c == '\n' || c == '\x0d';
-  }
-
-  this.extractFontProgram = function Type1Parser_extractFontProgram(stream) {
-    var eexec = decrypt(stream, kEexecEncryptionKey, 4);
-    var eexecStr = '';
-    for (var i = 0, ii = eexec.length; i < ii; i++)
-      eexecStr += String.fromCharCode(eexec[i]);
-
-    var glyphsSection = false, subrsSection = false;
-    var program = {
-      subrs: [],
-      charstrings: [],
-      properties: {
-        'privateData': {
-          'lenIV': 4
-        }
-      }
-    };
-
-    var glyph = '';
-    var token = '';
-    var length = 0;
-
-    var c = '';
-    var count = eexecStr.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        while (i < count && isSeparator(eexecStr[i]))
-          ++i;
-
-        var token = '';
-        while (i < count && !isSeparator(eexecStr[i]))
-          token += eexecStr[i++];
-
-        return token;
-      };
-      var c = eexecStr[i];
-
-      if ((glyphsSection || subrsSection) &&
-          (token == 'RD' || token == '-|')) {
-        i++;
-        var data = eexec.slice(i, i + length);
-        var lenIV = program.properties.privateData['lenIV'];
-        var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
-        var str = decodeCharString(encoded);
-
-        if (glyphsSection) {
-          program.charstrings.push({
-            glyph: glyph,
-            data: str.charstring,
-            lsb: str.lsb,
-            width: str.width
-          });
-        } else {
-          program.subrs.push(str.charstring);
-        }
-        i += length;
-        token = '';
-      } else if (isSeparator(c)) {
-        length = parseInt(token, 10);
-        token = '';
-      } else {
-        token += c;
-        if (!glyphsSection) {
-          switch (token) {
-            case '/CharString':
-              glyphsSection = true;
-              break;
-            case '/Subrs':
-              ++i;
-              var num = parseInt(getToken(), 10);
-              getToken(); // read in 'array'
-              for (var j = 0; j < num; ++j) {
-                var t = getToken(); // read in 'dup'
-                if (t == 'ND' || t == '|-' || t == 'noaccess')
-                  break;
-                var index = parseInt(getToken(), 10);
-                if (index > j)
-                  j = index;
-                var length = parseInt(getToken(), 10);
-                getToken(); // read in 'RD'
-                var data = eexec.slice(i + 1, i + 1 + length);
-                var lenIV = program.properties.privateData['lenIV'];
-                var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
-                var str = decodeCharString(encoded);
-                i = i + 1 + length;
-                t = getToken(); // read in 'NP'
-                if (t == 'noaccess')
-                  getToken(); // read in 'put'
-                program.subrs[index] = str.charstring;
-              }
-              break;
-            case '/BlueValues':
-            case '/OtherBlues':
-            case '/FamilyBlues':
-            case '/FamilyOtherBlues':
-            case '/StemSnapH':
-            case '/StemSnapV':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 1);
-              break;
-            case '/StdHW':
-            case '/StdVW':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 2)[0];
-              break;
-            case '/BlueShift':
-            case '/lenIV':
-            case '/BlueFuzz':
-            case '/BlueScale':
-            case '/LanguageGroup':
-            case '/ExpansionFactor':
-              program.properties.privateData[token.substring(1)] =
-                readNumber(eexecStr, i + 1);
-              break;
-          }
-        } else if (c == '/') {
-          token = glyph = '';
-          while ((c = eexecStr[++i]) != ' ')
-            glyph += c;
-        }
-      }
-    }
-
-    return program;
-  };
-
-  this.extractFontHeader = function Type1Parser_extractFontHeader(stream,
-                                                                  properties) {
-    var headerString = '';
-    for (var i = 0, ii = stream.length; i < ii; i++)
-      headerString += String.fromCharCode(stream[i]);
-
-    var token = '';
-    var count = headerString.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        var character = headerString[i];
-        while (i < count && (isSeparator(character) || character == '/'))
-          character = headerString[++i];
-
-        var token = '';
-        while (i < count && !(isSeparator(character) || character == '/')) {
-          token += character;
-          character = headerString[++i];
-        }
-
-        return token;
-      };
-
-      var c = headerString[i];
-      if (isSeparator(c)) {
-        switch (token) {
-          case '/FontMatrix':
-            var matrix = readNumberArray(headerString, i + 1);
-
-            // The FontMatrix is in unitPerEm, so make it pixels
-            for (var j = 0, jj = matrix.length; j < jj; j++)
-              matrix[j] *= 1000;
-
-            // Make the angle into the right direction
-            matrix[2] *= -1;
-
-            properties.fontMatrix = matrix;
-            break;
-          case '/Encoding':
-            var encodingArg = getToken();
-            var encoding;
-            if (!/^\d+$/.test(encodingArg)) {
-              // encoding name is specified
-              encoding = Encodings[encodingArg];
-            } else {
-              encoding = [];
-              var size = parseInt(encodingArg, 10);
-              getToken(); // read in 'array'
-
-              for (var j = 0; j < size; j++) {
-                var token = getToken();
-                if (token == 'dup') {
-                  var index = parseInt(getToken(), 10);
-                  var glyph = getToken();
-                  encoding[index] = glyph;
-                  getToken(); // read the in 'put'
-                }
-              }
-            }
-            if (!properties.hasEncoding && encoding) {
-              properties.baseEncoding = encoding;
-              break;
-            }
-            break;
-        }
-        token = '';
-      } else {
-        token += c;
-      }
-    }
-  };
-};
-
-/**
- * The CFF class takes a Type1 file and wrap it into a
- * 'Compact Font Format' which itself embed Type2 charstrings.
- */
-var CFFStandardStrings = [
-  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-  'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
-  'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
-  'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
-  'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-  'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum',
-  'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
-  'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
-  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
-  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase',
-  'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown',
-  'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent',
-  'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash',
-  'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae',
-  'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior',
-  'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn',
-  'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters',
-  'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior',
-  'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring',
-  'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave',
-  'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute',
-  'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute',
-  'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron',
-  'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde',
-  'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute',
-  'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex',
-  'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex',
-  'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall',
-  'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
-  'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', '266 ff',
-  'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
-  'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
-  'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior',
-  'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior',
-  'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior',
-  'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior',
-  'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
-  'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
-  'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
-  'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
-  'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
-  'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
-  'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall',
-  'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior',
-  'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth',
-  'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds',
-  'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
-  'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior',
-  'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior',
-  'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior',
-  'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior',
-  'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall',
-  'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall',
-  'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall',
-  'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall',
-  'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall',
-  'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall',
-  'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall',
-  'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003',
-  'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'
-];
-
-var type1Parser = new Type1Parser();
-
-// Type1Font is also a CIDFontType0.
-var Type1Font = function Type1Font(name, file, properties) {
-  // Get the data block containing glyphs and subrs informations
-  var headerBlock = file.getBytes(properties.length1);
-  type1Parser.extractFontHeader(headerBlock, properties);
-
-  // Decrypt the data blocks and retrieve it's content
-  var eexecBlock = file.getBytes(properties.length2);
-  var data = type1Parser.extractFontProgram(eexecBlock);
-  for (var info in data.properties)
-    properties[info] = data.properties[info];
-
-  var charstrings = this.getOrderedCharStrings(data.charstrings, properties);
-  var type2Charstrings = this.getType2Charstrings(charstrings);
-  var subrs = this.getType2Subrs(data.subrs);
-
-  this.charstrings = charstrings;
-  this.data = this.wrap(name, type2Charstrings, this.charstrings,
-                        subrs, properties);
-};
-
-Type1Font.prototype = {
-  createCFFIndexHeader: function Type1Font_createCFFIndexHeader(objects,
-                                                                isByte) {
-    // First 2 bytes contains the number of objects contained into this index
-    var count = objects.length;
-
-    // If there is no object, just create an array saying that with another
-    // offset byte.
-    if (count == 0)
-      return '\x00\x00\x00';
-
-    var data = String.fromCharCode((count >> 8) & 0xFF, count & 0xff);
-
-    // Next byte contains the offset size use to reference object in the file
-    // Actually we're using 0x04 to be sure to be able to store everything
-    // without thinking of it while coding.
-    data += '\x04';
-
-    // Add another offset after this one because we need a new offset
-    var relativeOffset = 1;
-    for (var i = 0; i < count + 1; i++) {
-      data += String.fromCharCode((relativeOffset >>> 24) & 0xFF,
-                                  (relativeOffset >> 16) & 0xFF,
-                                  (relativeOffset >> 8) & 0xFF,
-                                  relativeOffset & 0xFF);
-
-      if (objects[i])
-        relativeOffset += objects[i].length;
-    }
-
-    for (var i = 0; i < count; i++) {
-      for (var j = 0, jj = objects[i].length; j < jj; j++)
-        data += isByte ? String.fromCharCode(objects[i][j] & 0xFF) :
-                objects[i][j];
-    }
-    return data;
-  },
-
-  encodeNumber: function Type1Font_encodeNumber(value) {
-    // some of the fonts has ouf-of-range values
-    // they are just arithmetic overflows
-    // make sanitizer happy
-    value |= 0;
-    if (value >= -32768 && value <= 32767) {
-      return '\x1c' +
-             String.fromCharCode((value >> 8) & 0xFF) +
-             String.fromCharCode(value & 0xFF);
-    } else {
-      return '\x1d' +
-             String.fromCharCode((value >> 24) & 0xFF) +
-             String.fromCharCode((value >> 16) & 0xFF) +
-             String.fromCharCode((value >> 8) & 0xFF) +
-             String.fromCharCode(value & 0xFF);
-    }
-  },
-
-  getOrderedCharStrings: function Type1Font_getOrderedCharStrings(glyphs,
-                                                            properties) {
-    var charstrings = [];
-    var i, length, glyphName;
-    var unusedUnicode = kCmapGlyphOffset;
-    for (i = 0, length = glyphs.length; i < length; i++) {
-      var item = glyphs[i];
-      var glyphName = item.glyph;
-      var unicode = glyphName in GlyphsUnicode ?
-        GlyphsUnicode[glyphName] : unusedUnicode++;
-      charstrings.push({
-        glyph: glyphName,
-        unicode: unicode,
-        gid: i,
-        charstring: item.data,
-        width: item.width,
-        lsb: item.lsb
-      });
-    }
-
-    charstrings.sort(function charstrings_sort(a, b) {
-      return a.unicode - b.unicode;
-    });
-    return charstrings;
-  },
-
-  getType2Charstrings: function Type1Font_getType2Charstrings(
-                                  type1Charstrings) {
-    var type2Charstrings = [];
-    var count = type1Charstrings.length;
-    for (var i = 0; i < count; i++) {
-      var charstring = type1Charstrings[i].charstring;
-      type2Charstrings.push(this.flattenCharstring(charstring.slice(),
-                                                   this.commandsMap));
-    }
-    return type2Charstrings;
-  },
-
-  getType2Subrs: function Type1Font_getType2Subrs(type1Subrs) {
-    var bias = 0;
-    var count = type1Subrs.length;
-    if (count < 1240)
-      bias = 107;
-    else if (count < 33900)
-      bias = 1131;
-    else
-      bias = 32768;
-
-    // Add a bunch of empty subrs to deal with the Type2 bias
-    var type2Subrs = [];
-    for (var i = 0; i < bias; i++)
-      type2Subrs.push([0x0B]);
-
-    for (var i = 0; i < count; i++) {
-      var subr = type1Subrs[i];
-      if (!subr)
-        subr = [0x0B];
-
-      type2Subrs.push(this.flattenCharstring(subr, this.commandsMap));
-    }
-
-    return type2Subrs;
-  },
-
-  /*
-   * Flatten the commands by interpreting the postscript code and replacing
-   * every 'callsubr', 'callothersubr' by the real commands.
-   */
-  commandsMap: {
-    'hstem': 1,
-    'vstem': 3,
-    'vmoveto': 4,
-    'rlineto': 5,
-    'hlineto': 6,
-    'vlineto': 7,
-    'rrcurveto': 8,
-    'callsubr': 10,
-    'return': 11,
-    'sub': [12, 11],
-    'div': [12, 12],
-    'exch': [12, 28],
-    'flex': [12, 35],
-    'drop' : [12, 18],
-    'endchar': 14,
-    'rmoveto': 21,
-    'hmoveto': 22,
-    'vhcurveto': 30,
-    'hvcurveto': 31
-  },
-
-  flattenCharstring: function Type1Font_flattenCharstring(charstring, map) {
-    // charstring changes size - can't cache .length in loop
-    for (var i = 0; i < charstring.length; i++) {
-      var command = charstring[i];
-      if (command.charAt) {
-        var cmd = map[command];
-        assert(cmd, 'Unknow command: ' + command);
-
-        if (isArray(cmd))
-          charstring.splice(i++, 1, cmd[0], cmd[1]);
-        else
-          charstring[i] = cmd;
-      } else {
-        // Type1 charstring use a division for number above 32000
-        if (command > 32000) {
-          var divisor = charstring[i + 1];
-          command /= divisor;
-          charstring.splice(i, 3, 28, command >> 8, command & 0xff);
-        } else {
-          charstring.splice(i, 1, 28, command >> 8, command & 0xff);
-        }
-        i += 2;
-      }
-    }
-    return charstring;
-  },
-
-  wrap: function Type1Font_wrap(name, glyphs, charstrings, subrs, properties) {
-    var fields = {
-      // major version, minor version, header size, offset size
-      'header': '\x01\x00\x04\x04',
-
-      'names': this.createCFFIndexHeader([name]),
-
-      'topDict': (function topDict(self) {
-        return function cffWrapTopDict() {
-          var header = '\x00\x01\x01\x01';
-          var dict =
-              '\xf8\x1b\x00' + // version
-              '\xf8\x1c\x01' + // Notice
-              '\xf8\x1d\x02' + // FullName
-              '\xf8\x1e\x03' + // FamilyName
-              '\xf8\x1f\x04' +  // Weight
-              '\x1c\x00\x00\x10'; // Encoding
-
-          var boundingBox = properties.bbox;
-          for (var i = 0, ii = boundingBox.length; i < ii; i++)
-            dict += self.encodeNumber(boundingBox[i]);
-          dict += '\x05'; // FontBBox;
-
-          var offset = fields.header.length +
-                       fields.names.length +
-                       (header.length + 1) +
-                       (dict.length + (4 + 4)) +
-                       fields.strings.length +
-                       fields.globalSubrs.length;
-
-          // If the offset if over 32767, encodeNumber is going to return
-          // 5 bytes to encode the position instead of 3.
-          if ((offset + fields.charstrings.length) > 32767) {
-            offset += 9;
-          } else {
-            offset += 7;
-          }
-
-          dict += self.encodeNumber(offset) + '\x0f'; // Charset
-
-          offset = offset + (glyphs.length * 2) + 1;
-          dict += self.encodeNumber(offset) + '\x11'; // Charstrings
-
-          offset = offset + fields.charstrings.length;
-          dict += self.encodeNumber(fields.privateData.length);
-          dict += self.encodeNumber(offset) + '\x12'; // Private
-
-          return header + String.fromCharCode(dict.length + 1) + dict;
-        };
-      })(this),
-
-      'strings': (function strings(self) {
-        var strings = [
-          'Version 0.11',         // Version
-          'See original notice',  // Notice
-          name,                   // FullName
-          name,                   // FamilyName
-          'Medium'                // Weight
-        ];
-        return self.createCFFIndexHeader(strings);
-      })(this),
-
-      'globalSubrs': this.createCFFIndexHeader([]),
-
-      'charset': (function charset(self) {
-        var charsetString = '\x00'; // Encoding
-
-        var count = glyphs.length;
-        for (var i = 0; i < count; i++) {
-          var index = CFFStandardStrings.indexOf(charstrings[i].glyph);
-          // Some characters like asterikmath && circlecopyrt are
-          // missing from the original strings, for the moment let's
-          // map them to .notdef and see later if it cause any
-          // problems
-          if (index == -1)
-            index = 0;
-
-          charsetString += String.fromCharCode(index >> 8, index & 0xff);
-        }
-        return charsetString;
-      })(this),
-
-      'charstrings': this.createCFFIndexHeader([[0x8B, 0x0E]].concat(glyphs),
-                                               true),
-
-      'privateData': (function cffWrapPrivate(self) {
-        var data =
-            '\x8b\x14' + // defaultWidth
-            '\x8b\x15';  // nominalWidth
-        var fieldMap = {
-          BlueValues: '\x06',
-          OtherBlues: '\x07',
-          FamilyBlues: '\x08',
-          FamilyOtherBlues: '\x09',
-          StemSnapH: '\x0c\x0c',
-          StemSnapV: '\x0c\x0d',
-          BlueShift: '\x0c\x0a',
-          BlueFuzz: '\x0c\x0b',
-          BlueScale: '\x0c\x09',
-          LanguageGroup: '\x0c\x11',
-          ExpansionFactor: '\x0c\x18'
-        };
-        for (var field in fieldMap) {
-          if (!properties.privateData.hasOwnProperty(field))
-            continue;
-          var value = properties.privateData[field];
-
-          if (isArray(value)) {
-            data += self.encodeNumber(value[0]);
-            for (var i = 1, ii = value.length; i < ii; i++)
-              data += self.encodeNumber(value[i] - value[i - 1]);
-          } else {
-            data += self.encodeNumber(value);
-          }
-          data += fieldMap[field];
-        }
-
-        data += self.encodeNumber(data.length + 4) + '\x13'; // Subrs offset
-
-        return data;
-      })(this),
-
-      'localSubrs': this.createCFFIndexHeader(subrs, true)
-    };
-    fields.topDict = fields.topDict();
-
-
-    var cff = [];
-    for (var index in fields) {
-      var field = fields[index];
-      for (var i = 0, ii = field.length; i < ii; i++)
-        cff.push(field.charCodeAt(i));
-    }
-
-    return cff;
-  }
-};
-
-var CFFFont = (function CFFFontClosure() {
-  function CFFFont(file, properties) {
-    this.properties = properties;
-
-    var parser = new CFFParser(file, properties);
-    var cff = parser.parse();
-    var compiler = new CFFCompiler(cff);
-    this.readExtra(cff);
-    try {
-      this.data = compiler.compile();
-    } catch (e) {
-      warn('Failed to compile font ' + properties.loadedName);
-      // There may have just been an issue with the compiler, set the data
-      // anyway and hope the font loaded.
-      this.data = file;
-    }
-  }
-
-  CFFFont.prototype = {
-    readExtra: function CFFFont_readExtra(cff) {
-      // charstrings contains info about glyphs (one element per glyph
-      // containing mappings for {unicode, width})
-      var charset = cff.charset.charset;
-      var encoding = cff.encoding ? cff.encoding.encoding : null;
-      var charstrings = this.getCharStrings(charset, encoding);
-
-      // create the mapping between charstring and glyph id
-      var glyphIds = [];
-      for (var i = 0, ii = charstrings.length; i < ii; i++)
-        glyphIds.push(charstrings[i].gid);
-
-      this.charstrings = charstrings;
-      this.glyphIds = glyphIds;
-    },
-    getCharStrings: function CFFFont_getCharStrings(charsets, encoding) {
-      var charstrings = [];
-      var unicodeUsed = [];
-      var unassignedUnicodeItems = [];
-      var inverseEncoding = [];
-      // CID fonts don't have an encoding.
-      if (encoding !== null)
-        for (var charcode in encoding)
-          inverseEncoding[encoding[charcode]] = charcode | 0;
-      else
-        inverseEncoding = charsets;
-      for (var i = 0, ii = charsets.length; i < ii; i++) {
-        var glyph = charsets[i];
-        if (glyph == '.notdef')
-          continue;
-
-        var code = inverseEncoding[i];
-        if (!code || isSpecialUnicode(code)) {
-          unassignedUnicodeItems.push(i);
-          continue;
-        }
-        charstrings.push({
-          unicode: code,
-          code: code,
-          gid: i,
-          glyph: glyph
-        });
-        unicodeUsed[code] = true;
-      }
-
-      var nextUnusedUnicode = kCmapGlyphOffset;
-      for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; ++j) {
-        var i = unassignedUnicodeItems[j];
-        // giving unicode value anyway
-        while (nextUnusedUnicode in unicodeUsed)
-          nextUnusedUnicode++;
-        var unicode = nextUnusedUnicode++;
-        charstrings.push({
-          unicode: unicode,
-          code: inverseEncoding[i] || 0,
-          gid: i,
-          glyph: charsets[i]
-        });
-      }
-
-      // sort the array by the unicode value (again)
-      charstrings.sort(function getCharStringsSort(a, b) {
-        return a.unicode - b.unicode;
-      });
-      return charstrings;
-    }
-  };
-
-  return CFFFont;
-})();
-
-var CFFParser = (function CFFParserClosure() {
-  function CFFParser(file, properties) {
-    this.bytes = file.getBytes();
-    this.properties = properties;
-  }
-  CFFParser.prototype = {
-    parse: function CFFParser_parse() {
-      var properties = this.properties;
-      var cff = new CFF();
-      this.cff = cff;
-
-      // The first five sections must be in order, all the others are reached
-      // via offsets contained in one of the below.
-      var header = this.parseHeader();
-      var nameIndex = this.parseIndex(header.endPos);
-      var topDictIndex = this.parseIndex(nameIndex.endPos);
-      var stringIndex = this.parseIndex(topDictIndex.endPos);
-      var globalSubrIndex = this.parseIndex(stringIndex.endPos);
-
-      var topDictParsed = this.parseDict(topDictIndex.obj.get(0));
-      var topDict = this.createDict(CFFTopDict, topDictParsed, cff.strings);
-
-      cff.header = header.obj;
-      cff.names = this.parseNameIndex(nameIndex.obj);
-      cff.strings = this.parseStringIndex(stringIndex.obj);
-      cff.topDict = topDict;
-      cff.globalSubrIndex = globalSubrIndex.obj;
-
-      this.parsePrivateDict(cff.topDict);
-
-      cff.isCIDFont = topDict.hasName('ROS');
-
-      var charStringOffset = topDict.getByName('CharStrings');
-      cff.charStrings = this.parseCharStrings(charStringOffset);
-
-      var charset, encoding;
-      if (cff.isCIDFont) {
-        var fdArrayIndex = this.parseIndex(topDict.getByName('FDArray')).obj;
-        for (var i = 0, ii = fdArrayIndex.count; i < ii; ++i) {
-          var dictRaw = fdArrayIndex.get(i);
-          var fontDict = this.createDict(CFFTopDict, this.parseDict(dictRaw),
-                                         cff.strings);
-          this.parsePrivateDict(fontDict);
-          cff.fdArray.push(fontDict);
-        }
-        // cid fonts don't have an encoding
-        encoding = null;
-        charset = this.parseCharsets(topDict.getByName('charset'),
-                                     cff.charStrings.count, cff.strings, true);
-        cff.fdSelect = this.parseFDSelect(topDict.getByName('FDSelect'),
-                                             cff.charStrings.count);
-      } else {
-        charset = this.parseCharsets(topDict.getByName('charset'),
-                                     cff.charStrings.count, cff.strings, false);
-        encoding = this.parseEncoding(topDict.getByName('Encoding'),
-                                      properties,
-                                      cff.strings, charset.charset);
-      }
-      cff.charset = charset;
-      cff.encoding = encoding;
-
-      return cff;
-    },
-    parseHeader: function CFFParser_parseHeader() {
-      var bytes = this.bytes;
-      var offset = 0;
-
-      while (bytes[offset] != 1)
-        ++offset;
-
-      if (offset != 0) {
-        warn('cff data is shifted');
-        bytes = bytes.subarray(offset);
-        this.bytes = bytes;
-      }
-      var major = bytes[0];
-      var minor = bytes[1];
-      var hdrSize = bytes[2];
-      var offSize = bytes[3];
-      var header = new CFFHeader(major, minor, hdrSize, offSize);
-      return {obj: header, endPos: hdrSize};
-    },
-    parseDict: function CFFParser_parseDict(dict) {
-      var pos = 0;
-
-      function parseOperand() {
-        var value = dict[pos++];
-        if (value === 30) {
-          return parseFloatOperand(pos);
-        } else if (value === 28) {
-          value = dict[pos++];
-          value = (value << 8) | dict[pos++];
-          return value;
-        } else if (value === 29) {
-          value = dict[pos++];
-          value = (value << 8) | dict[pos++];
-          value = (value << 8) | dict[pos++];
-          value = (value << 8) | dict[pos++];
-          return value;
-        } else if (value >= 32 && value <= 246) {
-          return value - 139;
-        } else if (value >= 247 && value <= 250) {
-          return ((value - 247) * 256) + dict[pos++] + 108;
-        } else if (value >= 251 && value <= 254) {
-          return -((value - 251) * 256) - dict[pos++] - 108;
-        } else {
-          error('255 is not a valid DICT command');
-        }
-        return -1;
-      }
-
-      function parseFloatOperand() {
-        var str = '';
-        var eof = 15;
-        var lookup = ['0', '1', '2', '3', '4', '5', '6', '7', '8',
-            '9', '.', 'E', 'E-', null, '-'];
-        var length = dict.length;
-        while (pos < length) {
-          var b = dict[pos++];
-          var b1 = b >> 4;
-          var b2 = b & 15;
-
-          if (b1 == eof)
-            break;
-          str += lookup[b1];
-
-          if (b2 == eof)
-            break;
-          str += lookup[b2];
-        }
-        return parseFloat(str);
-      }
-
-      var operands = [];
-      var entries = [];
-
-      var pos = 0;
-      var end = dict.length;
-      while (pos < end) {
-        var b = dict[pos];
-        if (b <= 21) {
-          if (b === 12)
-            b = (b << 8) | dict[++pos];
-          entries.push([b, operands]);
-          operands = [];
-          ++pos;
-        } else {
-          operands.push(parseOperand());
-        }
-      }
-      return entries;
-    },
-    parseIndex: function CFFParser_parseIndex(pos) {
-      var cffIndex = new CFFIndex();
-      var bytes = this.bytes;
-      var count = (bytes[pos++] << 8) | bytes[pos++];
-      var offsets = [];
-      var start = pos;
-      var end = pos;
-
-      if (count != 0) {
-        var offsetSize = bytes[pos++];
-        // add 1 for offset to determine size of last object
-        var startPos = pos + ((count + 1) * offsetSize) - 1;
-
-        for (var i = 0, ii = count + 1; i < ii; ++i) {
-          var offset = 0;
-          for (var j = 0; j < offsetSize; ++j) {
-            offset <<= 8;
-            offset += bytes[pos++];
-          }
-          offsets.push(startPos + offset);
-        }
-        end = offsets[count];
-      }
-      for (var i = 0, ii = offsets.length - 1; i < ii; ++i) {
-        var offsetStart = offsets[i];
-        var offsetEnd = offsets[i + 1];
-        cffIndex.add(bytes.subarray(offsetStart, offsetEnd));
-      }
-      return {obj: cffIndex, endPos: end};
-    },
-    parseNameIndex: function CFFParser_parseNameIndex(index) {
-      var names = [];
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var name = index.get(i);
-        // OTS doesn't allow names to be over 127 characters.
-        var length = Math.min(name.length, 127);
-        var data = [];
-        // OTS also only permits certain characters in the name.
-        for (var j = 0; j < length; ++j) {
-          var c = name[j];
-          if (j === 0 && c === 0) {
-            data[j] = c;
-            continue;
-          }
-          if ((c < 33 || c > 126) || c === 91 /* [ */ || c === 93 /* ] */ ||
-              c === 40 /* ( */ || c === 41 /* ) */ || c === 123 /* { */ ||
-              c === 125 /* } */ || c === 60 /* < */ || c === 62 /* > */ ||
-              c === 47 /* / */ || c === 37 /* % */) {
-            data[j] = 95;
-            continue;
-          }
-          data[j] = c;
-        }
-        names.push(String.fromCharCode.apply(null, data));
-      }
-      return names;
-    },
-    parseStringIndex: function CFFParser_parseStringIndex(index) {
-      var strings = new CFFStrings();
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var data = index.get(i);
-        strings.add(String.fromCharCode.apply(null, data));
-      }
-      return strings;
-    },
-    createDict: function CFFParser_createDict(type, dict, strings) {
-      var cffDict = new type(strings);
-      var types = cffDict.types;
-
-      for (var i = 0, ii = dict.length; i < ii; ++i) {
-        var pair = dict[i];
-        var key = pair[0];
-        var value = pair[1];
-        cffDict.setByKey(key, value);
-      }
-      return cffDict;
-    },
-    parseCharStrings: function CFFParser_parseCharStrings(charStringOffset) {
-      var charStrings = this.parseIndex(charStringOffset).obj;
-      // The CFF specification state that the 'dotsection' command
-      // (12, 0) is deprecated and treated as a no-op, but all Type2
-      // charstrings processors should support them. Unfortunately
-      // the font sanitizer don't. As a workaround the sequence (12, 0)
-      // is replaced by a useless (0, hmoveto).
-      var count = charStrings.count;
-      for (var i = 0; i < count; i++) {
-        var charstring = charStrings.get(i);
-
-        var data = charstring;
-        var length = data.length;
-        for (var j = 0; j <= length; j) {
-          var value = data[j++];
-          if (value == 12 && data[j++] == 0) {
-              data[j - 2] = 139;
-              data[j - 1] = 22;
-          } else if (value === 28) {
-            j += 2;
-          } else if (value >= 247 && value <= 254) {
-            j++;
-          } else if (value == 255) {
-            j += 4;
-          }
-        }
-      }
-      return charStrings;
-    },
-    parsePrivateDict: function CFFParser_parsePrivateDict(parentDict) {
-      // no private dict, do nothing
-      if (!parentDict.hasName('Private'))
-        return;
-      var privateOffset = parentDict.getByName('Private');
-      // make sure the params are formatted correctly
-      if (!isArray(privateOffset) || privateOffset.length !== 2) {
-        parentDict.removeByName('Private');
-        return;
-      }
-      var size = privateOffset[0];
-      var offset = privateOffset[1];
-      // remove empty dicts or ones that refer to invalid location
-      if (size === 0 || offset >= this.bytes.length) {
-        parentDict.removeByName('Private');
-        return;
-      }
-
-      var privateDictEnd = offset + size;
-      var dictData = this.bytes.subarray(offset, privateDictEnd);
-      var dict = this.parseDict(dictData);
-      var privateDict = this.createDict(CFFPrivateDict, dict,
-                                        parentDict.strings);
-      parentDict.privateDict = privateDict;
-
-      // Parse the Subrs index also since it's relative to the private dict.
-      if (!privateDict.getByName('Subrs'))
-        return;
-      var subrsOffset = privateDict.getByName('Subrs');
-      var relativeOffset = offset + subrsOffset;
-      // Validate the offset.
-      if (subrsOffset === 0 || relativeOffset >= this.bytes.length) {
-        privateDict.removeByName('Subrs');
-        return;
-      }
-      var subrsIndex = this.parseIndex(relativeOffset);
-      privateDict.subrsIndex = subrsIndex.obj;
-    },
-    parseCharsets: function CFFParser_parseCharsets(pos, length, strings, cid) {
-      if (pos == 0) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.ISO_ADOBE,
-                              ISOAdobeCharset);
-      } else if (pos == 1) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT,
-                              ExpertCharset);
-      } else if (pos == 2) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT_SUBSET,
-                              ExpertSubsetCharset);
-      }
-
-      var bytes = this.bytes;
-      var start = pos;
-      var format = bytes[pos++];
-      var charset = ['.notdef'];
-
-      // subtract 1 for the .notdef glyph
-      length -= 1;
-
-      switch (format) {
-        case 0:
-          for (var i = 0; i < length; i++) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            charset.push(cid ? id : strings.get(id));
-          }
-          break;
-        case 1:
-          while (charset.length <= length) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            var count = bytes[pos++];
-            for (var i = 0; i <= count; i++)
-              charset.push(cid ? id++ : strings.get(id++));
-          }
-          break;
-        case 2:
-          while (charset.length <= length) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            var count = (bytes[pos++] << 8) | bytes[pos++];
-            for (var i = 0; i <= count; i++)
-              charset.push(cid ? id++ : strings.get(id++));
-          }
-          break;
-        default:
-          error('Unknown charset format');
-      }
-      // Raw won't be needed if we actually compile the charset.
-      var end = pos;
-      var raw = bytes.subarray(start, end);
-
-      return new CFFCharset(false, format, charset, raw);
-    },
-    parseEncoding: function CFFParser_parseEncoding(pos,
-                                                    properties,
-                                                    strings,
-                                                    charset) {
-      var encoding = {};
-      var bytes = this.bytes;
-      var predefined = false;
-      var hasSupplement = false;
-      var format;
-      var raw = null;
-
-      function readSupplement() {
-        var supplementsCount = bytes[pos++];
-        for (var i = 0; i < supplementsCount; i++) {
-          var code = bytes[pos++];
-          var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
-          encoding[code] = properties.differences.indexOf(strings.get(sid));
-        }
-      }
-
-      if (pos == 0 || pos == 1) {
-        predefined = true;
-        format = pos;
-        var gid = 1;
-        var baseEncoding = pos ? Encodings.ExpertEncoding :
-                                 Encodings.StandardEncoding;
-        for (var i = 0, ii = charset.length; i < ii; i++) {
-          var index = baseEncoding.indexOf(charset[i]);
-          if (index != -1)
-            encoding[index] = gid++;
-        }
-      } else {
-        var dataStart = pos;
-        var format = bytes[pos++];
-        switch (format & 0x7f) {
-          case 0:
-            var glyphsCount = bytes[pos++];
-            for (var i = 1; i <= glyphsCount; i++)
-              encoding[bytes[pos++]] = i;
-            break;
-
-          case 1:
-            var rangesCount = bytes[pos++];
-            var gid = 1;
-            for (var i = 0; i < rangesCount; i++) {
-              var start = bytes[pos++];
-              var left = bytes[pos++];
-              for (var j = start; j <= start + left; j++)
-                encoding[j] = gid++;
-            }
-            break;
-
-          default:
-            error('Unknow encoding format: ' + format + ' in CFF');
-            break;
-        }
-        var dataEnd = pos;
-        if (format & 0x80) {
-          // The font sanitizer does not support CFF encoding with a
-          // supplement, since the encoding is not really used to map
-          // between gid to glyph, let's overwrite what is declared in
-          // the top dictionary to let the sanitizer think the font use
-          // StandardEncoding, that's a lie but that's ok.
-          bytes[dataStart] &= 0x7f;
-          readSupplement();
-          hasSupplement = true;
-        }
-        raw = bytes.subarray(dataStart, dataEnd);
-      }
-      format = format & 0x7f;
-      return new CFFEncoding(predefined, format, encoding, raw);
-    },
-    parseFDSelect: function CFFParser_parseFDSelect(pos, length) {
-      var start = pos;
-      var bytes = this.bytes;
-      var format = bytes[pos++];
-      var fdSelect = [];
-      switch (format) {
-        case 0:
-          for (var i = 0; i < length; ++i) {
-            var id = bytes[pos++];
-            fdSelect.push(id);
-          }
-          break;
-        case 3:
-          var rangesCount = (bytes[pos++] << 8) | bytes[pos++];
-          for (var i = 0; i < rangesCount; ++i) {
-            var first = (bytes[pos++] << 8) | bytes[pos++];
-            var fdIndex = bytes[pos++];
-            var next = (bytes[pos] << 8) | bytes[pos + 1];
-            for (var j = first; j < next; ++j)
-              fdSelect.push(fdIndex);
-          }
-          // Advance past the sentinel(next).
-          pos += 2;
-          break;
-        default:
-          error('Unknown fdselect format ' + format);
-          break;
-      }
-      var end = pos;
-      return new CFFFDSelect(fdSelect, bytes.subarray(start, end));
-    }
-  };
-  return CFFParser;
-})();
-
-// Compact Font Format
-var CFF = (function CFFClosure() {
-  function CFF() {
-    this.header = null;
-    this.names = [];
-    this.topDict = null;
-    this.strings = new CFFStrings();
-    this.globalSubrIndex = null;
-
-    // The following could really be per font, but since we only have one font
-    // store them here.
-    this.encoding = null;
-    this.charset = null;
-    this.charStrings = null;
-    this.fdArray = [];
-    this.fdSelect = null;
-
-    this.isCIDFont = false;
-  }
-  return CFF;
-})();
-
-var CFFHeader = (function CFFHeaderClosure() {
-  function CFFHeader(major, minor, hdrSize, offSize) {
-    this.major = major;
-    this.minor = minor;
-    this.hdrSize = hdrSize;
-    this.offSize = offSize;
-  }
-  return CFFHeader;
-})();
-
-var CFFStrings = (function CFFStringsClosure() {
-  function CFFStrings() {
-    this.strings = [];
-  }
-  CFFStrings.prototype = {
-    get: function CFFStrings_get(index) {
-      if (index >= 0 && index <= 390)
-        return CFFStandardStrings[index];
-      if (index - 391 <= this.strings.length)
-        return this.strings[index - 391];
-      return CFFStandardStrings[0];
-    },
-    add: function CFFStrings_add(value) {
-      this.strings.push(value);
-    },
-    get count() {
-      return this.strings.length;
-    }
-  };
-  return CFFStrings;
-})();
-
-var CFFIndex = (function CFFIndexClosure() {
-  function CFFIndex() {
-    this.objects = [];
-    this.length = 0;
-  }
-  CFFIndex.prototype = {
-    add: function CFFIndex_add(data) {
-      this.length += data.length;
-      this.objects.push(data);
-    },
-    get: function CFFIndex_get(index) {
-      return this.objects[index];
-    },
-    get count() {
-      return this.objects.length;
-    }
-  };
-  return CFFIndex;
-})();
-
-var CFFDict = (function CFFDictClosure() {
-  function CFFDict(tables, strings) {
-    this.keyToNameMap = tables.keyToNameMap;
-    this.nameToKeyMap = tables.nameToKeyMap;
-    this.defaults = tables.defaults;
-    this.types = tables.types;
-    this.opcodes = tables.opcodes;
-    this.order = tables.order;
-    this.strings = strings;
-    this.values = {};
-  }
-  CFFDict.prototype = {
-    // value should always be an array
-    setByKey: function CFFDict_setByKey(key, value) {
-      if (!(key in this.keyToNameMap))
-        return false;
-      // ignore empty values
-      if (value.length === 0)
-        return true;
-      var type = this.types[key];
-      // remove the array wrapping these types of values
-      if (type === 'num' || type === 'sid' || type === 'offset')
-        value = value[0];
-      this.values[key] = value;
-      return true;
-    },
-    hasName: function CFFDict_hasName(name) {
-      return this.nameToKeyMap[name] in this.values;
-    },
-    getByName: function CFFDict_getByName(name) {
-      if (!(name in this.nameToKeyMap))
-        error('Invalid dictionary name "' + name + '"');
-      var key = this.nameToKeyMap[name];
-      if (!(key in this.values))
-        return this.defaults[key];
-      return this.values[key];
-    },
-    removeByName: function CFFDict_removeByName(name) {
-      delete this.values[this.nameToKeyMap[name]];
-    }
-  };
-  CFFDict.createTables = function CFFDict_createTables(layout) {
-    var tables = {
-      keyToNameMap: {},
-      nameToKeyMap: {},
-      defaults: {},
-      types: {},
-      opcodes: {},
-      order: []
-    };
-    for (var i = 0, ii = layout.length; i < ii; ++i) {
-      var entry = layout[i];
-      var key = isArray(entry[0]) ? (entry[0][0] << 8) + entry[0][1] : entry[0];
-      tables.keyToNameMap[key] = entry[1];
-      tables.nameToKeyMap[entry[1]] = key;
-      tables.types[key] = entry[2];
-      tables.defaults[key] = entry[3];
-      tables.opcodes[key] = isArray(entry[0]) ? entry[0] : [entry[0]];
-      tables.order.push(key);
-    }
-    return tables;
-  };
-  return CFFDict;
-})();
-
-var CFFTopDict = (function CFFTopDictClosure() {
-  var layout = [
-    [[12, 30], 'ROS', ['sid', 'sid', 'num'], null],
-    [[12, 20], 'SyntheticBase', 'num', null],
-    [0, 'version', 'sid', null],
-    [1, 'Notice', 'sid', null],
-    [[12, 0], 'Copyright', 'sid', null],
-    [2, 'FullName', 'sid', null],
-    [3, 'FamilyName', 'sid', null],
-    [4, 'Weight', 'sid', null],
-    [[12, 1], 'isFixedPitch', 'num', 0],
-    [[12, 2], 'ItalicAngle', 'num', 0],
-    [[12, 3], 'UnderlinePosition', 'num', -100],
-    [[12, 4], 'UnderlineThickness', 'num', 50],
-    [[12, 5], 'PaintType', 'num', 0],
-    [[12, 6], 'CharstringType', 'num', 2],
-    [[12, 7], 'FontMatrix', ['num', 'num', 'num', 'num', 'num', 'num'],
-                            [.001, 0, 0, .001, 0, 0]],
-    [13, 'UniqueID', 'num', null],
-    [5, 'FontBBox', ['num', 'num', 'num', 'num'], [0, 0, 0, 0]],
-    [[12, 8], 'StrokeWidth', 'num', 0],
-    [14, 'XUID', 'array', null],
-    [15, 'charset', 'offset', 0],
-    [16, 'Encoding', 'offset', 0],
-    [17, 'CharStrings', 'offset', 0],
-    [18, 'Private', ['offset', 'offset'], null],
-    [[12, 21], 'PostScript', 'sid', null],
-    [[12, 22], 'BaseFontName', 'sid', null],
-    [[12, 23], 'BaseFontBlend', 'delta', null],
-    [[12, 31], 'CIDFontVersion', 'num', 0],
-    [[12, 32], 'CIDFontRevision', 'num', 0],
-    [[12, 33], 'CIDFontType', 'num', 0],
-    [[12, 34], 'CIDCount', 'num', 8720],
-    [[12, 35], 'UIDBase', 'num', null],
-    [[12, 36], 'FDArray', 'offset', null],
-    [[12, 37], 'FDSelect', 'offset', null],
-    [[12, 38], 'FontName', 'sid', null]];
-  var tables = null;
-  function CFFTopDict(strings) {
-    if (tables === null)
-      tables = CFFDict.createTables(layout);
-    CFFDict.call(this, tables, strings);
-    this.privateDict = null;
-  }
-  CFFTopDict.prototype = Object.create(CFFDict.prototype);
-  return CFFTopDict;
-})();
-
-var CFFPrivateDict = (function CFFPrivateDictClosure() {
-  var layout = [
-    [6, 'BlueValues', 'delta', null],
-    [7, 'OtherBlues', 'delta', null],
-    [8, 'FamilyBlues', 'delta', null],
-    [9, 'FamilyOtherBlues', 'delta', null],
-    [[12, 9], 'BlueScale', 'num', 0.039625],
-    [[12, 10], 'BlueShift', 'num', 7],
-    [[12, 11], 'BlueFuzz', 'num', 1],
-    [10, 'StdHW', 'num', null],
-    [11, 'StdVW', 'num', null],
-    [[12, 12], 'StemSnapH', 'delta', null],
-    [[12, 13], 'StemSnapV', 'delta', null],
-    [[12, 14], 'ForceBold', 'num', 0],
-    [[12, 17], 'LanguageGroup', 'num', 0],
-    [[12, 18], 'ExpansionFactor', 'num', 0.06],
-    [[12, 19], 'initialRandomSeed', 'num', 0],
-    [19, 'Subrs', 'offset', null],
-    [20, 'defaultWidthX', 'num', 0],
-    [21, 'nominalWidthX', 'num', 0]
-  ];
-  var tables = null;
-  function CFFPrivateDict(strings) {
-    if (tables === null)
-      tables = CFFDict.createTables(layout);
-    CFFDict.call(this, tables, strings);
-    this.subrsIndex = null;
-  }
-  CFFPrivateDict.prototype = Object.create(CFFDict.prototype);
-  return CFFPrivateDict;
-})();
-
-var CFFCharsetPredefinedTypes = {
-  ISO_ADOBE: 0,
-  EXPERT: 1,
-  EXPERT_SUBSET: 2
-};
-var CFFCharsetEmbeddedTypes = {
-  FORMAT0: 0,
-  FORMAT1: 1,
-  FORMAT2: 2
-};
-var CFFCharset = (function CFFCharsetClosure() {
-  function CFFCharset(predefined, format, charset, raw) {
-    this.predefined = predefined;
-    this.format = format;
-    this.charset = charset;
-    this.raw = raw;
-  }
-  return CFFCharset;
-})();
-
-var CFFEncodingPredefinedTypes = {
-  STANDARD: 0,
-  EXPERT: 1
-};
-var CFFCharsetEmbeddedTypes = {
-  FORMAT0: 0,
-  FORMAT1: 1
-};
-var CFFEncoding = (function CFFEncodingClosure() {
-  function CFFEncoding(predefined, format, encoding, raw) {
-    this.predefined = predefined;
-    this.format = format;
-    this.encoding = encoding;
-    this.raw = raw;
-  }
-  return CFFEncoding;
-})();
-
-var CFFFDSelect = (function CFFFDSelectClosure() {
-  function CFFFDSelect(fdSelect, raw) {
-    this.fdSelect = fdSelect;
-    this.raw = raw;
-  }
-  return CFFFDSelect;
-})();
-
-// Helper class to keep track of where an offset is within the data and helps
-// filling in that offset once it's known.
-var CFFOffsetTracker = (function CFFOffsetTrackerClosure() {
-  function CFFOffsetTracker() {
-    this.offsets = {};
-  }
-  CFFOffsetTracker.prototype = {
-    isTracking: function CFFOffsetTracker_isTracking(key) {
-      return key in this.offsets;
-    },
-    track: function CFFOffsetTracker_track(key, location) {
-      if (key in this.offsets)
-        error('Already tracking location of ' + key);
-      this.offsets[key] = location;
-    },
-    offset: function CFFOffsetTracker_offset(value) {
-      for (var key in this.offsets) {
-        this.offsets[key] += value;
-      }
-    },
-    setEntryLocation: function CFFOffsetTracker_setEntryLocation(key,
-                                                                 values,
-                                                                 output) {
-      if (!(key in this.offsets))
-        error('Not tracking location of ' + key);
-      var data = output.data;
-      var dataOffset = this.offsets[key];
-      var size = 5;
-      for (var i = 0, ii = values.length; i < ii; ++i) {
-        var offset0 = i * size + dataOffset;
-        var offset1 = offset0 + 1;
-        var offset2 = offset0 + 2;
-        var offset3 = offset0 + 3;
-        var offset4 = offset0 + 4;
-        // It's easy to screw up offsets so perform this sanity check.
-        if (data[offset0] !== 0x1d || data[offset1] !== 0 ||
-            data[offset2] !== 0 || data[offset3] !== 0 || data[offset4] !== 0)
-          error('writing to an offset that is not empty');
-        var value = values[i];
-        data[offset0] = 0x1d;
-        data[offset1] = (value >> 24) & 0xFF;
-        data[offset2] = (value >> 16) & 0xFF;
-        data[offset3] = (value >> 8) & 0xFF;
-        data[offset4] = value & 0xFF;
-      }
-    }
-  };
-  return CFFOffsetTracker;
-})();
-
-// Takes a CFF and converts it to the binary representation.
-var CFFCompiler = (function CFFCompilerClosure() {
-  function stringToArray(str) {
-    var array = [];
-    for (var i = 0, ii = str.length; i < ii; ++i)
-      array[i] = str.charCodeAt(i);
-
-    return array;
-  };
-  function CFFCompiler(cff) {
-    this.cff = cff;
-  }
-  CFFCompiler.prototype = {
-    compile: function CFFCompiler_compile() {
-      var cff = this.cff;
-      var output = {
-        data: [],
-        length: 0,
-        add: function CFFCompiler_add(data) {
-          this.data = this.data.concat(data);
-          this.length = this.data.length;
-        }
-      };
-
-      // Compile the five entries that must be in order.
-      var header = this.compileHeader(cff.header);
-      output.add(header);
-
-      var nameIndex = this.compileNameIndex(cff.names);
-      output.add(nameIndex);
-
-      var compiled = this.compileTopDicts([cff.topDict], output.length);
-      output.add(compiled.output);
-      var topDictTracker = compiled.trackers[0];
-
-      var stringIndex = this.compileStringIndex(cff.strings.strings);
-      output.add(stringIndex);
-
-      var globalSubrIndex = this.compileIndex(cff.globalSubrIndex);
-      output.add(globalSubrIndex);
-
-      // Now start on the other entries that have no specfic order.
-      if (cff.encoding && cff.topDict.hasName('Encoding')) {
-        if (cff.encoding.predefined) {
-          topDictTracker.setEntryLocation('Encoding', [cff.encoding.format],
-                                          output);
-        } else {
-          var encoding = this.compileEncoding(cff.encoding);
-          topDictTracker.setEntryLocation('Encoding', [output.length], output);
-          output.add(encoding);
-        }
-      }
-
-      if (cff.charset && cff.topDict.hasName('charset')) {
-        if (cff.charset.predefined) {
-          topDictTracker.setEntryLocation('charset', [cff.charset.format],
-                                          output);
-        } else {
-          var charset = this.compileCharset(cff.charset);
-          topDictTracker.setEntryLocation('charset', [output.length], output);
-          output.add(charset);
-        }
-      }
-
-      var charStrings = this.compileCharStrings(cff.charStrings);
-      topDictTracker.setEntryLocation('CharStrings', [output.length], output);
-      output.add(charStrings);
-
-      if (cff.isCIDFont) {
-        // For some reason FDSelect must be in front of FDArray on windows. OSX
-        // and linux don't seem to care.
-        topDictTracker.setEntryLocation('FDSelect', [output.length], output);
-        var fdSelect = this.compileFDSelect(cff.fdSelect.raw);
-        output.add(fdSelect);
-
-        var compiled = this.compileTopDicts(cff.fdArray, output.length);
-        topDictTracker.setEntryLocation('FDArray', [output.length], output);
-        output.add(compiled.output);
-        var fontDictTrackers = compiled.trackers;
-
-        this.compilePrivateDicts(cff.fdArray, fontDictTrackers, output);
-      }
-
-      this.compilePrivateDicts([cff.topDict], [topDictTracker], output);
-
-      return output.data;
-    },
-    encodeNumber: function CFFCompiler_encodeNumber(value) {
-      if (parseFloat(value) == parseInt(value) && !isNaN(value)) // isInt
-        return this.encodeInteger(value);
-      else
-        return this.encodeFloat(value);
-    },
-    encodeFloat: function CFFCompiler_encodeFloat(value) {
-      value = value.toString();
-      // Strip off the any leading zeros.
-      if (value.substr(0, 2) === '0.')
-        value = value.substr(1);
-      else if (value.substr(0, 3) === '-0.')
-        value = '-' + value.substr(2);
-      var nibbles = [];
-      for (var i = 0, ii = value.length; i < ii; ++i) {
-        var a = value.charAt(i), b = value.charAt(i + 1);
-        var nibble;
-        if (a === 'e' && b === '-') {
-          nibble = 0xc;
-          ++i;
-        } else if (a === '.') {
-          nibble = 0xa;
-        } else if (a === 'E') {
-          nibble = 0xb;
-        } else if (a === '-') {
-          nibble = 0xe;
-        } else {
-          nibble = a;
-        }
-        nibbles.push(nibble);
-      }
-      nibbles.push(0xf);
-      if (nibbles.length % 2)
-        nibbles.push(0xf);
-      var out = [30];
-      for (var i = 0, ii = nibbles.length; i < ii; i += 2)
-        out.push(nibbles[i] << 4 | nibbles[i + 1]);
-      return out;
-    },
-    encodeInteger: function CFFCompiler_encodeInteger(value) {
-      var code;
-      if (value >= -107 && value <= 107) {
-        code = [value + 139];
-      } else if (value >= 108 && value <= 1131) {
-        value = [value - 108];
-        code = [(value >> 8) + 247, value & 0xFF];
-      } else if (value >= -1131 && value <= -108) {
-        value = -value - 108;
-        code = [(value >> 8) + 251, value & 0xFF];
-      } else if (value >= -32768 && value <= 32767) {
-        code = [0x1c, (value >> 8) & 0xFF, value & 0xFF];
-      } else {
-        code = [0x1d,
-                (value >> 24) & 0xFF,
-                (value >> 16) & 0xFF,
-                (value >> 8) & 0xFF,
-                 value & 0xFF];
-      }
-      return code;
-    },
-    compileHeader: function CFFCompiler_compileHeader(header) {
-      return [
-        header.major,
-        header.minor,
-        header.hdrSize,
-        header.offSize
-      ];
-    },
-    compileNameIndex: function CFFCompiler_compileNameIndex(names) {
-      var nameIndex = new CFFIndex();
-      for (var i = 0, ii = names.length; i < ii; ++i)
-        nameIndex.add(stringToArray(names[i]));
-      return this.compileIndex(nameIndex);
-    },
-    compileTopDicts: function CFFCompiler_compileTopDicts(dicts, length) {
-      var fontDictTrackers = [];
-      var fdArrayIndex = new CFFIndex();
-      for (var i = 0, ii = dicts.length; i < ii; ++i) {
-        var fontDict = dicts[i];
-        var fontDictTracker = new CFFOffsetTracker();
-        var fontDictData = this.compileDict(fontDict, fontDictTracker);
-        fontDictTrackers.push(fontDictTracker);
-        fdArrayIndex.add(fontDictData);
-        fontDictTracker.offset(length);
-      }
-      fdArrayIndex = this.compileIndex(fdArrayIndex, fontDictTrackers);
-      return {
-        trackers: fontDictTrackers,
-        output: fdArrayIndex
-      };
-    },
-    compilePrivateDicts: function CFFCompiler_compilePrivateDicts(dicts,
-                                                                  trackers,
-                                                                  output) {
-      for (var i = 0, ii = dicts.length; i < ii; ++i) {
-        var fontDict = dicts[i];
-        if (!fontDict.privateDict || !fontDict.hasName('Private'))
-          continue;
-        var privateDict = fontDict.privateDict;
-        var privateDictTracker = new CFFOffsetTracker();
-        var privateDictData = this.compileDict(privateDict, privateDictTracker);
-
-        privateDictTracker.offset(output.length);
-        trackers[i].setEntryLocation('Private',
-                                     [privateDictData.length, output.length],
-                                     output);
-        output.add(privateDictData);
-
-        if (privateDict.subrsIndex && privateDict.hasName('Subrs')) {
-          var subrs = this.compileIndex(privateDict.subrsIndex);
-          privateDictTracker.setEntryLocation('Subrs', [privateDictData.length],
-                                              output);
-          output.add(subrs);
-        }
-      }
-    },
-    compileDict: function CFFCompiler_compileDict(dict, offsetTracker) {
-      var out = [];
-      // The dictionary keys must be in a certain order.
-      var order = dict.order;
-      for (var i = 0; i < order.length; ++i) {
-        var key = order[i];
-        if (!(key in dict.values))
-          continue;
-        var values = dict.values[key];
-        var types = dict.types[key];
-        if (!isArray(types)) types = [types];
-        if (!isArray(values)) values = [values];
-
-        // Remove any empty dict values.
-        if (values.length === 0)
-          continue;
-
-        for (var j = 0, jj = types.length; j < jj; ++j) {
-          var type = types[j];
-          var value = values[j];
-          switch (type) {
-            case 'num':
-            case 'sid':
-              out = out.concat(this.encodeNumber(value));
-              break;
-            case 'offset':
-              // For offsets we just insert a 32bit integer so we don't have to
-              // deal with figuring out the length of the offset when it gets
-              // replaced later on by the compiler.
-              var name = dict.keyToNameMap[key];
-              // Some offsets have the offset and the length, so just record the
-              // position of the first one.
-              if (!offsetTracker.isTracking(name))
-                offsetTracker.track(name, out.length);
-              out = out.concat([0x1d, 0, 0, 0, 0]);
-              break;
-            case 'array':
-            case 'delta':
-              out = out.concat(this.encodeNumber(value));
-              for (var k = 1, kk = values.length; k < kk; ++k)
-                out = out.concat(this.encodeNumber(values[k]));
-              break;
-            default:
-              error('Unknown data type of ' + type);
-              break;
-          }
-        }
-        out = out.concat(dict.opcodes[key]);
-      }
-      return out;
-    },
-    compileStringIndex: function CFFCompiler_compileStringIndex(strings) {
-      var stringIndex = new CFFIndex();
-      for (var i = 0, ii = strings.length; i < ii; ++i)
-        stringIndex.add(stringToArray(strings[i]));
-      return this.compileIndex(stringIndex);
-    },
-    compileGlobalSubrIndex: function CFFCompiler_compileGlobalSubrIndex() {
-      var globalSubrIndex = this.cff.globalSubrIndex;
-      this.out.writeByteArray(this.compileIndex(globalSubrIndex));
-    },
-    compileCharStrings: function CFFCompiler_compileCharStrings(charStrings) {
-      return this.compileIndex(charStrings);
-    },
-    compileCharset: function CFFCompiler_compileCharset(charset) {
-      return this.compileTypedArray(charset.raw);
-    },
-    compileEncoding: function CFFCompiler_compileEncoding(encoding) {
-      return this.compileTypedArray(encoding.raw);
-    },
-    compileFDSelect: function CFFCompiler_compileFDSelect(fdSelect) {
-      return this.compileTypedArray(fdSelect);
-    },
-    compileTypedArray: function CFFCompiler_compileTypedArray(data) {
-      var out = [];
-      for (var i = 0, ii = data.length; i < ii; ++i)
-        out[i] = data[i];
-      return out;
-    },
-    compileIndex: function CFFCompiler_compileIndex(index, trackers) {
-      trackers = trackers || [];
-      var objects = index.objects;
-      // First 2 bytes contains the number of objects contained into this index
-      var count = objects.length;
-
-      // If there is no object, just create an index. This technically
-      // should just be [0, 0] but OTS has an issue with that.
-      if (count == 0)
-        return [0, 0, 0];
-
-      var data = [(count >> 8) & 0xFF, count & 0xff];
-
-      var lastOffset = 1;
-      for (var i = 0; i < count; ++i)
-        lastOffset += objects[i].length;
-
-      var offsetSize;
-      if (lastOffset < 0x100)
-        offsetSize = 1;
-      else if (lastOffset < 0x10000)
-        offsetSize = 2;
-      else if (lastOffset < 0x1000000)
-        offsetSize = 3;
-      else
-        offsetSize = 4;
-
-      // Next byte contains the offset size use to reference object in the file
-      data.push(offsetSize);
-
-      // Add another offset after this one because we need a new offset
-      var relativeOffset = 1;
-      for (var i = 0; i < count + 1; i++) {
-        if (offsetSize === 1) {
-          data.push(relativeOffset & 0xFF);
-        } else if (offsetSize === 2) {
-          data.push((relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        } else if (offsetSize === 3) {
-          data.push((relativeOffset >> 16) & 0xFF,
-                    (relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        } else {
-          data.push((relativeOffset >>> 24) & 0xFF,
-                    (relativeOffset >> 16) & 0xFF,
-                    (relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        }
-
-        if (objects[i])
-          relativeOffset += objects[i].length;
-      }
-      var offset = data.length;
-
-      for (var i = 0; i < count; i++) {
-        // Notify the tracker where the object will be offset in the data.
-        if (trackers[i])
-          trackers[i].offset(data.length);
-        for (var j = 0, jj = objects[i].length; j < jj; j++)
-          data.push(objects[i][j]);
-      }
-      return data;
-    }
-  };
-  return CFFCompiler;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var GlyphsUnicode = {
-  A: 0x0041,
-  AE: 0x00C6,
-  AEacute: 0x01FC,
-  AEmacron: 0x01E2,
-  AEsmall: 0xF7E6,
-  Aacute: 0x00C1,
-  Aacutesmall: 0xF7E1,
-  Abreve: 0x0102,
-  Abreveacute: 0x1EAE,
-  Abrevecyrillic: 0x04D0,
-  Abrevedotbelow: 0x1EB6,
-  Abrevegrave: 0x1EB0,
-  Abrevehookabove: 0x1EB2,
-  Abrevetilde: 0x1EB4,
-  Acaron: 0x01CD,
-  Acircle: 0x24B6,
-  Acircumflex: 0x00C2,
-  Acircumflexacute: 0x1EA4,
-  Acircumflexdotbelow: 0x1EAC,
-  Acircumflexgrave: 0x1EA6,
-  Acircumflexhookabove: 0x1EA8,
-  Acircumflexsmall: 0xF7E2,
-  Acircumflextilde: 0x1EAA,
-  Acute: 0xF6C9,
-  Acutesmall: 0xF7B4,
-  Acyrillic: 0x0410,
-  Adblgrave: 0x0200,
-  Adieresis: 0x00C4,
-  Adieresiscyrillic: 0x04D2,
-  Adieresismacron: 0x01DE,
-  Adieresissmall: 0xF7E4,
-  Adotbelow: 0x1EA0,
-  Adotmacron: 0x01E0,
-  Agrave: 0x00C0,
-  Agravesmall: 0xF7E0,
-  Ahookabove: 0x1EA2,
-  Aiecyrillic: 0x04D4,
-  Ainvertedbreve: 0x0202,
-  Alpha: 0x0391,
-  Alphatonos: 0x0386,
-  Amacron: 0x0100,
-  Amonospace: 0xFF21,
-  Aogonek: 0x0104,
-  Aring: 0x00C5,
-  Aringacute: 0x01FA,
-  Aringbelow: 0x1E00,
-  Aringsmall: 0xF7E5,
-  Asmall: 0xF761,
-  Atilde: 0x00C3,
-  Atildesmall: 0xF7E3,
-  Aybarmenian: 0x0531,
-  B: 0x0042,
-  Bcircle: 0x24B7,
-  Bdotaccent: 0x1E02,
-  Bdotbelow: 0x1E04,
-  Becyrillic: 0x0411,
-  Benarmenian: 0x0532,
-  Beta: 0x0392,
-  Bhook: 0x0181,
-  Blinebelow: 0x1E06,
-  Bmonospace: 0xFF22,
-  Brevesmall: 0xF6F4,
-  Bsmall: 0xF762,
-  Btopbar: 0x0182,
-  C: 0x0043,
-  Caarmenian: 0x053E,
-  Cacute: 0x0106,
-  Caron: 0xF6CA,
-  Caronsmall: 0xF6F5,
-  Ccaron: 0x010C,
-  Ccedilla: 0x00C7,
-  Ccedillaacute: 0x1E08,
-  Ccedillasmall: 0xF7E7,
-  Ccircle: 0x24B8,
-  Ccircumflex: 0x0108,
-  Cdot: 0x010A,
-  Cdotaccent: 0x010A,
-  Cedillasmall: 0xF7B8,
-  Chaarmenian: 0x0549,
-  Cheabkhasiancyrillic: 0x04BC,
-  Checyrillic: 0x0427,
-  Chedescenderabkhasiancyrillic: 0x04BE,
-  Chedescendercyrillic: 0x04B6,
-  Chedieresiscyrillic: 0x04F4,
-  Cheharmenian: 0x0543,
-  Chekhakassiancyrillic: 0x04CB,
-  Cheverticalstrokecyrillic: 0x04B8,
-  Chi: 0x03A7,
-  Chook: 0x0187,
-  Circumflexsmall: 0xF6F6,
-  Cmonospace: 0xFF23,
-  Coarmenian: 0x0551,
-  Csmall: 0xF763,
-  D: 0x0044,
-  DZ: 0x01F1,
-  DZcaron: 0x01C4,
-  Daarmenian: 0x0534,
-  Dafrican: 0x0189,
-  Dcaron: 0x010E,
-  Dcedilla: 0x1E10,
-  Dcircle: 0x24B9,
-  Dcircumflexbelow: 0x1E12,
-  Dcroat: 0x0110,
-  Ddotaccent: 0x1E0A,
-  Ddotbelow: 0x1E0C,
-  Decyrillic: 0x0414,
-  Deicoptic: 0x03EE,
-  Delta: 0x2206,
-  Deltagreek: 0x0394,
-  Dhook: 0x018A,
-  Dieresis: 0xF6CB,
-  DieresisAcute: 0xF6CC,
-  DieresisGrave: 0xF6CD,
-  Dieresissmall: 0xF7A8,
-  Digammagreek: 0x03DC,
-  Djecyrillic: 0x0402,
-  Dlinebelow: 0x1E0E,
-  Dmonospace: 0xFF24,
-  Dotaccentsmall: 0xF6F7,
-  Dslash: 0x0110,
-  Dsmall: 0xF764,
-  Dtopbar: 0x018B,
-  Dz: 0x01F2,
-  Dzcaron: 0x01C5,
-  Dzeabkhasiancyrillic: 0x04E0,
-  Dzecyrillic: 0x0405,
-  Dzhecyrillic: 0x040F,
-  E: 0x0045,
-  Eacute: 0x00C9,
-  Eacutesmall: 0xF7E9,
-  Ebreve: 0x0114,
-  Ecaron: 0x011A,
-  Ecedillabreve: 0x1E1C,
-  Echarmenian: 0x0535,
-  Ecircle: 0x24BA,
-  Ecircumflex: 0x00CA,
-  Ecircumflexacute: 0x1EBE,
-  Ecircumflexbelow: 0x1E18,
-  Ecircumflexdotbelow: 0x1EC6,
-  Ecircumflexgrave: 0x1EC0,
-  Ecircumflexhookabove: 0x1EC2,
-  Ecircumflexsmall: 0xF7EA,
-  Ecircumflextilde: 0x1EC4,
-  Ecyrillic: 0x0404,
-  Edblgrave: 0x0204,
-  Edieresis: 0x00CB,
-  Edieresissmall: 0xF7EB,
-  Edot: 0x0116,
-  Edotaccent: 0x0116,
-  Edotbelow: 0x1EB8,
-  Efcyrillic: 0x0424,
-  Egrave: 0x00C8,
-  Egravesmall: 0xF7E8,
-  Eharmenian: 0x0537,
-  Ehookabove: 0x1EBA,
-  Eightroman: 0x2167,
-  Einvertedbreve: 0x0206,
-  Eiotifiedcyrillic: 0x0464,
-  Elcyrillic: 0x041B,
-  Elevenroman: 0x216A,
-  Emacron: 0x0112,
-  Emacronacute: 0x1E16,
-  Emacrongrave: 0x1E14,
-  Emcyrillic: 0x041C,
-  Emonospace: 0xFF25,
-  Encyrillic: 0x041D,
-  Endescendercyrillic: 0x04A2,
-  Eng: 0x014A,
-  Enghecyrillic: 0x04A4,
-  Enhookcyrillic: 0x04C7,
-  Eogonek: 0x0118,
-  Eopen: 0x0190,
-  Epsilon: 0x0395,
-  Epsilontonos: 0x0388,
-  Ercyrillic: 0x0420,
-  Ereversed: 0x018E,
-  Ereversedcyrillic: 0x042D,
-  Escyrillic: 0x0421,
-  Esdescendercyrillic: 0x04AA,
-  Esh: 0x01A9,
-  Esmall: 0xF765,
-  Eta: 0x0397,
-  Etarmenian: 0x0538,
-  Etatonos: 0x0389,
-  Eth: 0x00D0,
-  Ethsmall: 0xF7F0,
-  Etilde: 0x1EBC,
-  Etildebelow: 0x1E1A,
-  Euro: 0x20AC,
-  Ezh: 0x01B7,
-  Ezhcaron: 0x01EE,
-  Ezhreversed: 0x01B8,
-  F: 0x0046,
-  Fcircle: 0x24BB,
-  Fdotaccent: 0x1E1E,
-  Feharmenian: 0x0556,
-  Feicoptic: 0x03E4,
-  Fhook: 0x0191,
-  Fitacyrillic: 0x0472,
-  Fiveroman: 0x2164,
-  Fmonospace: 0xFF26,
-  Fourroman: 0x2163,
-  Fsmall: 0xF766,
-  G: 0x0047,
-  GBsquare: 0x3387,
-  Gacute: 0x01F4,
-  Gamma: 0x0393,
-  Gammaafrican: 0x0194,
-  Gangiacoptic: 0x03EA,
-  Gbreve: 0x011E,
-  Gcaron: 0x01E6,
-  Gcedilla: 0x0122,
-  Gcircle: 0x24BC,
-  Gcircumflex: 0x011C,
-  Gcommaaccent: 0x0122,
-  Gdot: 0x0120,
-  Gdotaccent: 0x0120,
-  Gecyrillic: 0x0413,
-  Ghadarmenian: 0x0542,
-  Ghemiddlehookcyrillic: 0x0494,
-  Ghestrokecyrillic: 0x0492,
-  Gheupturncyrillic: 0x0490,
-  Ghook: 0x0193,
-  Gimarmenian: 0x0533,
-  Gjecyrillic: 0x0403,
-  Gmacron: 0x1E20,
-  Gmonospace: 0xFF27,
-  Grave: 0xF6CE,
-  Gravesmall: 0xF760,
-  Gsmall: 0xF767,
-  Gsmallhook: 0x029B,
-  Gstroke: 0x01E4,
-  H: 0x0048,
-  H18533: 0x25CF,
-  H18543: 0x25AA,
-  H18551: 0x25AB,
-  H22073: 0x25A1,
-  HPsquare: 0x33CB,
-  Haabkhasiancyrillic: 0x04A8,
-  Hadescendercyrillic: 0x04B2,
-  Hardsigncyrillic: 0x042A,
-  Hbar: 0x0126,
-  Hbrevebelow: 0x1E2A,
-  Hcedilla: 0x1E28,
-  Hcircle: 0x24BD,
-  Hcircumflex: 0x0124,
-  Hdieresis: 0x1E26,
-  Hdotaccent: 0x1E22,
-  Hdotbelow: 0x1E24,
-  Hmonospace: 0xFF28,
-  Hoarmenian: 0x0540,
-  Horicoptic: 0x03E8,
-  Hsmall: 0xF768,
-  Hungarumlaut: 0xF6CF,
-  Hungarumlautsmall: 0xF6F8,
-  Hzsquare: 0x3390,
-  I: 0x0049,
-  IAcyrillic: 0x042F,
-  IJ: 0x0132,
-  IUcyrillic: 0x042E,
-  Iacute: 0x00CD,
-  Iacutesmall: 0xF7ED,
-  Ibreve: 0x012C,
-  Icaron: 0x01CF,
-  Icircle: 0x24BE,
-  Icircumflex: 0x00CE,
-  Icircumflexsmall: 0xF7EE,
-  Icyrillic: 0x0406,
-  Idblgrave: 0x0208,
-  Idieresis: 0x00CF,
-  Idieresisacute: 0x1E2E,
-  Idieresiscyrillic: 0x04E4,
-  Idieresissmall: 0xF7EF,
-  Idot: 0x0130,
-  Idotaccent: 0x0130,
-  Idotbelow: 0x1ECA,
-  Iebrevecyrillic: 0x04D6,
-  Iecyrillic: 0x0415,
-  Ifraktur: 0x2111,
-  Igrave: 0x00CC,
-  Igravesmall: 0xF7EC,
-  Ihookabove: 0x1EC8,
-  Iicyrillic: 0x0418,
-  Iinvertedbreve: 0x020A,
-  Iishortcyrillic: 0x0419,
-  Imacron: 0x012A,
-  Imacroncyrillic: 0x04E2,
-  Imonospace: 0xFF29,
-  Iniarmenian: 0x053B,
-  Iocyrillic: 0x0401,
-  Iogonek: 0x012E,
-  Iota: 0x0399,
-  Iotaafrican: 0x0196,
-  Iotadieresis: 0x03AA,
-  Iotatonos: 0x038A,
-  Ismall: 0xF769,
-  Istroke: 0x0197,
-  Itilde: 0x0128,
-  Itildebelow: 0x1E2C,
-  Izhitsacyrillic: 0x0474,
-  Izhitsadblgravecyrillic: 0x0476,
-  J: 0x004A,
-  Jaarmenian: 0x0541,
-  Jcircle: 0x24BF,
-  Jcircumflex: 0x0134,
-  Jecyrillic: 0x0408,
-  Jheharmenian: 0x054B,
-  Jmonospace: 0xFF2A,
-  Jsmall: 0xF76A,
-  K: 0x004B,
-  KBsquare: 0x3385,
-  KKsquare: 0x33CD,
-  Kabashkircyrillic: 0x04A0,
-  Kacute: 0x1E30,
-  Kacyrillic: 0x041A,
-  Kadescendercyrillic: 0x049A,
-  Kahookcyrillic: 0x04C3,
-  Kappa: 0x039A,
-  Kastrokecyrillic: 0x049E,
-  Kaverticalstrokecyrillic: 0x049C,
-  Kcaron: 0x01E8,
-  Kcedilla: 0x0136,
-  Kcircle: 0x24C0,
-  Kcommaaccent: 0x0136,
-  Kdotbelow: 0x1E32,
-  Keharmenian: 0x0554,
-  Kenarmenian: 0x053F,
-  Khacyrillic: 0x0425,
-  Kheicoptic: 0x03E6,
-  Khook: 0x0198,
-  Kjecyrillic: 0x040C,
-  Klinebelow: 0x1E34,
-  Kmonospace: 0xFF2B,
-  Koppacyrillic: 0x0480,
-  Koppagreek: 0x03DE,
-  Ksicyrillic: 0x046E,
-  Ksmall: 0xF76B,
-  L: 0x004C,
-  LJ: 0x01C7,
-  LL: 0xF6BF,
-  Lacute: 0x0139,
-  Lambda: 0x039B,
-  Lcaron: 0x013D,
-  Lcedilla: 0x013B,
-  Lcircle: 0x24C1,
-  Lcircumflexbelow: 0x1E3C,
-  Lcommaaccent: 0x013B,
-  Ldot: 0x013F,
-  Ldotaccent: 0x013F,
-  Ldotbelow: 0x1E36,
-  Ldotbelowmacron: 0x1E38,
-  Liwnarmenian: 0x053C,
-  Lj: 0x01C8,
-  Ljecyrillic: 0x0409,
-  Llinebelow: 0x1E3A,
-  Lmonospace: 0xFF2C,
-  Lslash: 0x0141,
-  Lslashsmall: 0xF6F9,
-  Lsmall: 0xF76C,
-  M: 0x004D,
-  MBsquare: 0x3386,
-  Macron: 0xF6D0,
-  Macronsmall: 0xF7AF,
-  Macute: 0x1E3E,
-  Mcircle: 0x24C2,
-  Mdotaccent: 0x1E40,
-  Mdotbelow: 0x1E42,
-  Menarmenian: 0x0544,
-  Mmonospace: 0xFF2D,
-  Msmall: 0xF76D,
-  Mturned: 0x019C,
-  Mu: 0x039C,
-  N: 0x004E,
-  NJ: 0x01CA,
-  Nacute: 0x0143,
-  Ncaron: 0x0147,
-  Ncedilla: 0x0145,
-  Ncircle: 0x24C3,
-  Ncircumflexbelow: 0x1E4A,
-  Ncommaaccent: 0x0145,
-  Ndotaccent: 0x1E44,
-  Ndotbelow: 0x1E46,
-  Nhookleft: 0x019D,
-  Nineroman: 0x2168,
-  Nj: 0x01CB,
-  Njecyrillic: 0x040A,
-  Nlinebelow: 0x1E48,
-  Nmonospace: 0xFF2E,
-  Nowarmenian: 0x0546,
-  Nsmall: 0xF76E,
-  Ntilde: 0x00D1,
-  Ntildesmall: 0xF7F1,
-  Nu: 0x039D,
-  O: 0x004F,
-  OE: 0x0152,
-  OEsmall: 0xF6FA,
-  Oacute: 0x00D3,
-  Oacutesmall: 0xF7F3,
-  Obarredcyrillic: 0x04E8,
-  Obarreddieresiscyrillic: 0x04EA,
-  Obreve: 0x014E,
-  Ocaron: 0x01D1,
-  Ocenteredtilde: 0x019F,
-  Ocircle: 0x24C4,
-  Ocircumflex: 0x00D4,
-  Ocircumflexacute: 0x1ED0,
-  Ocircumflexdotbelow: 0x1ED8,
-  Ocircumflexgrave: 0x1ED2,
-  Ocircumflexhookabove: 0x1ED4,
-  Ocircumflexsmall: 0xF7F4,
-  Ocircumflextilde: 0x1ED6,
-  Ocyrillic: 0x041E,
-  Odblacute: 0x0150,
-  Odblgrave: 0x020C,
-  Odieresis: 0x00D6,
-  Odieresiscyrillic: 0x04E6,
-  Odieresissmall: 0xF7F6,
-  Odotbelow: 0x1ECC,
-  Ogoneksmall: 0xF6FB,
-  Ograve: 0x00D2,
-  Ogravesmall: 0xF7F2,
-  Oharmenian: 0x0555,
-  Ohm: 0x2126,
-  Ohookabove: 0x1ECE,
-  Ohorn: 0x01A0,
-  Ohornacute: 0x1EDA,
-  Ohorndotbelow: 0x1EE2,
-  Ohorngrave: 0x1EDC,
-  Ohornhookabove: 0x1EDE,
-  Ohorntilde: 0x1EE0,
-  Ohungarumlaut: 0x0150,
-  Oi: 0x01A2,
-  Oinvertedbreve: 0x020E,
-  Omacron: 0x014C,
-  Omacronacute: 0x1E52,
-  Omacrongrave: 0x1E50,
-  Omega: 0x2126,
-  Omegacyrillic: 0x0460,
-  Omegagreek: 0x03A9,
-  Omegaroundcyrillic: 0x047A,
-  Omegatitlocyrillic: 0x047C,
-  Omegatonos: 0x038F,
-  Omicron: 0x039F,
-  Omicrontonos: 0x038C,
-  Omonospace: 0xFF2F,
-  Oneroman: 0x2160,
-  Oogonek: 0x01EA,
-  Oogonekmacron: 0x01EC,
-  Oopen: 0x0186,
-  Oslash: 0x00D8,
-  Oslashacute: 0x01FE,
-  Oslashsmall: 0xF7F8,
-  Osmall: 0xF76F,
-  Ostrokeacute: 0x01FE,
-  Otcyrillic: 0x047E,
-  Otilde: 0x00D5,
-  Otildeacute: 0x1E4C,
-  Otildedieresis: 0x1E4E,
-  Otildesmall: 0xF7F5,
-  P: 0x0050,
-  Pacute: 0x1E54,
-  Pcircle: 0x24C5,
-  Pdotaccent: 0x1E56,
-  Pecyrillic: 0x041F,
-  Peharmenian: 0x054A,
-  Pemiddlehookcyrillic: 0x04A6,
-  Phi: 0x03A6,
-  Phook: 0x01A4,
-  Pi: 0x03A0,
-  Piwrarmenian: 0x0553,
-  Pmonospace: 0xFF30,
-  Psi: 0x03A8,
-  Psicyrillic: 0x0470,
-  Psmall: 0xF770,
-  Q: 0x0051,
-  Qcircle: 0x24C6,
-  Qmonospace: 0xFF31,
-  Qsmall: 0xF771,
-  R: 0x0052,
-  Raarmenian: 0x054C,
-  Racute: 0x0154,
-  Rcaron: 0x0158,
-  Rcedilla: 0x0156,
-  Rcircle: 0x24C7,
-  Rcommaaccent: 0x0156,
-  Rdblgrave: 0x0210,
-  Rdotaccent: 0x1E58,
-  Rdotbelow: 0x1E5A,
-  Rdotbelowmacron: 0x1E5C,
-  Reharmenian: 0x0550,
-  Rfraktur: 0x211C,
-  Rho: 0x03A1,
-  Ringsmall: 0xF6FC,
-  Rinvertedbreve: 0x0212,
-  Rlinebelow: 0x1E5E,
-  Rmonospace: 0xFF32,
-  Rsmall: 0xF772,
-  Rsmallinverted: 0x0281,
-  Rsmallinvertedsuperior: 0x02B6,
-  S: 0x0053,
-  SF010000: 0x250C,
-  SF020000: 0x2514,
-  SF030000: 0x2510,
-  SF040000: 0x2518,
-  SF050000: 0x253C,
-  SF060000: 0x252C,
-  SF070000: 0x2534,
-  SF080000: 0x251C,
-  SF090000: 0x2524,
-  SF100000: 0x2500,
-  SF110000: 0x2502,
-  SF190000: 0x2561,
-  SF200000: 0x2562,
-  SF210000: 0x2556,
-  SF220000: 0x2555,
-  SF230000: 0x2563,
-  SF240000: 0x2551,
-  SF250000: 0x2557,
-  SF260000: 0x255D,
-  SF270000: 0x255C,
-  SF280000: 0x255B,
-  SF360000: 0x255E,
-  SF370000: 0x255F,
-  SF380000: 0x255A,
-  SF390000: 0x2554,
-  SF400000: 0x2569,
-  SF410000: 0x2566,
-  SF420000: 0x2560,
-  SF430000: 0x2550,
-  SF440000: 0x256C,
-  SF450000: 0x2567,
-  SF460000: 0x2568,
-  SF470000: 0x2564,
-  SF480000: 0x2565,
-  SF490000: 0x2559,
-  SF500000: 0x2558,
-  SF510000: 0x2552,
-  SF520000: 0x2553,
-  SF530000: 0x256B,
-  SF540000: 0x256A,
-  Sacute: 0x015A,
-  Sacutedotaccent: 0x1E64,
-  Sampigreek: 0x03E0,
-  Scaron: 0x0160,
-  Scarondotaccent: 0x1E66,
-  Scaronsmall: 0xF6FD,
-  Scedilla: 0x015E,
-  Schwa: 0x018F,
-  Schwacyrillic: 0x04D8,
-  Schwadieresiscyrillic: 0x04DA,
-  Scircle: 0x24C8,
-  Scircumflex: 0x015C,
-  Scommaaccent: 0x0218,
-  Sdotaccent: 0x1E60,
-  Sdotbelow: 0x1E62,
-  Sdotbelowdotaccent: 0x1E68,
-  Seharmenian: 0x054D,
-  Sevenroman: 0x2166,
-  Shaarmenian: 0x0547,
-  Shacyrillic: 0x0428,
-  Shchacyrillic: 0x0429,
-  Sheicoptic: 0x03E2,
-  Shhacyrillic: 0x04BA,
-  Shimacoptic: 0x03EC,
-  Sigma: 0x03A3,
-  Sixroman: 0x2165,
-  Smonospace: 0xFF33,
-  Softsigncyrillic: 0x042C,
-  Ssmall: 0xF773,
-  Stigmagreek: 0x03DA,
-  T: 0x0054,
-  Tau: 0x03A4,
-  Tbar: 0x0166,
-  Tcaron: 0x0164,
-  Tcedilla: 0x0162,
-  Tcircle: 0x24C9,
-  Tcircumflexbelow: 0x1E70,
-  Tcommaaccent: 0x0162,
-  Tdotaccent: 0x1E6A,
-  Tdotbelow: 0x1E6C,
-  Tecyrillic: 0x0422,
-  Tedescendercyrillic: 0x04AC,
-  Tenroman: 0x2169,
-  Tetsecyrillic: 0x04B4,
-  Theta: 0x0398,
-  Thook: 0x01AC,
-  Thorn: 0x00DE,
-  Thornsmall: 0xF7FE,
-  Threeroman: 0x2162,
-  Tildesmall: 0xF6FE,
-  Tiwnarmenian: 0x054F,
-  Tlinebelow: 0x1E6E,
-  Tmonospace: 0xFF34,
-  Toarmenian: 0x0539,
-  Tonefive: 0x01BC,
-  Tonesix: 0x0184,
-  Tonetwo: 0x01A7,
-  Tretroflexhook: 0x01AE,
-  Tsecyrillic: 0x0426,
-  Tshecyrillic: 0x040B,
-  Tsmall: 0xF774,
-  Twelveroman: 0x216B,
-  Tworoman: 0x2161,
-  U: 0x0055,
-  Uacute: 0x00DA,
-  Uacutesmall: 0xF7FA,
-  Ubreve: 0x016C,
-  Ucaron: 0x01D3,
-  Ucircle: 0x24CA,
-  Ucircumflex: 0x00DB,
-  Ucircumflexbelow: 0x1E76,
-  Ucircumflexsmall: 0xF7FB,
-  Ucyrillic: 0x0423,
-  Udblacute: 0x0170,
-  Udblgrave: 0x0214,
-  Udieresis: 0x00DC,
-  Udieresisacute: 0x01D7,
-  Udieresisbelow: 0x1E72,
-  Udieresiscaron: 0x01D9,
-  Udieresiscyrillic: 0x04F0,
-  Udieresisgrave: 0x01DB,
-  Udieresismacron: 0x01D5,
-  Udieresissmall: 0xF7FC,
-  Udotbelow: 0x1EE4,
-  Ugrave: 0x00D9,
-  Ugravesmall: 0xF7F9,
-  Uhookabove: 0x1EE6,
-  Uhorn: 0x01AF,
-  Uhornacute: 0x1EE8,
-  Uhorndotbelow: 0x1EF0,
-  Uhorngrave: 0x1EEA,
-  Uhornhookabove: 0x1EEC,
-  Uhorntilde: 0x1EEE,
-  Uhungarumlaut: 0x0170,
-  Uhungarumlautcyrillic: 0x04F2,
-  Uinvertedbreve: 0x0216,
-  Ukcyrillic: 0x0478,
-  Umacron: 0x016A,
-  Umacroncyrillic: 0x04EE,
-  Umacrondieresis: 0x1E7A,
-  Umonospace: 0xFF35,
-  Uogonek: 0x0172,
-  Upsilon: 0x03A5,
-  Upsilon1: 0x03D2,
-  Upsilonacutehooksymbolgreek: 0x03D3,
-  Upsilonafrican: 0x01B1,
-  Upsilondieresis: 0x03AB,
-  Upsilondieresishooksymbolgreek: 0x03D4,
-  Upsilonhooksymbol: 0x03D2,
-  Upsilontonos: 0x038E,
-  Uring: 0x016E,
-  Ushortcyrillic: 0x040E,
-  Usmall: 0xF775,
-  Ustraightcyrillic: 0x04AE,
-  Ustraightstrokecyrillic: 0x04B0,
-  Utilde: 0x0168,
-  Utildeacute: 0x1E78,
-  Utildebelow: 0x1E74,
-  V: 0x0056,
-  Vcircle: 0x24CB,
-  Vdotbelow: 0x1E7E,
-  Vecyrillic: 0x0412,
-  Vewarmenian: 0x054E,
-  Vhook: 0x01B2,
-  Vmonospace: 0xFF36,
-  Voarmenian: 0x0548,
-  Vsmall: 0xF776,
-  Vtilde: 0x1E7C,
-  W: 0x0057,
-  Wacute: 0x1E82,
-  Wcircle: 0x24CC,
-  Wcircumflex: 0x0174,
-  Wdieresis: 0x1E84,
-  Wdotaccent: 0x1E86,
-  Wdotbelow: 0x1E88,
-  Wgrave: 0x1E80,
-  Wmonospace: 0xFF37,
-  Wsmall: 0xF777,
-  X: 0x0058,
-  Xcircle: 0x24CD,
-  Xdieresis: 0x1E8C,
-  Xdotaccent: 0x1E8A,
-  Xeharmenian: 0x053D,
-  Xi: 0x039E,
-  Xmonospace: 0xFF38,
-  Xsmall: 0xF778,
-  Y: 0x0059,
-  Yacute: 0x00DD,
-  Yacutesmall: 0xF7FD,
-  Yatcyrillic: 0x0462,
-  Ycircle: 0x24CE,
-  Ycircumflex: 0x0176,
-  Ydieresis: 0x0178,
-  Ydieresissmall: 0xF7FF,
-  Ydotaccent: 0x1E8E,
-  Ydotbelow: 0x1EF4,
-  Yericyrillic: 0x042B,
-  Yerudieresiscyrillic: 0x04F8,
-  Ygrave: 0x1EF2,
-  Yhook: 0x01B3,
-  Yhookabove: 0x1EF6,
-  Yiarmenian: 0x0545,
-  Yicyrillic: 0x0407,
-  Yiwnarmenian: 0x0552,
-  Ymonospace: 0xFF39,
-  Ysmall: 0xF779,
-  Ytilde: 0x1EF8,
-  Yusbigcyrillic: 0x046A,
-  Yusbigiotifiedcyrillic: 0x046C,
-  Yuslittlecyrillic: 0x0466,
-  Yuslittleiotifiedcyrillic: 0x0468,
-  Z: 0x005A,
-  Zaarmenian: 0x0536,
-  Zacute: 0x0179,
-  Zcaron: 0x017D,
-  Zcaronsmall: 0xF6FF,
-  Zcircle: 0x24CF,
-  Zcircumflex: 0x1E90,
-  Zdot: 0x017B,
-  Zdotaccent: 0x017B,
-  Zdotbelow: 0x1E92,
-  Zecyrillic: 0x0417,
-  Zedescendercyrillic: 0x0498,
-  Zedieresiscyrillic: 0x04DE,
-  Zeta: 0x0396,
-  Zhearmenian: 0x053A,
-  Zhebrevecyrillic: 0x04C1,
-  Zhecyrillic: 0x0416,
-  Zhedescendercyrillic: 0x0496,
-  Zhedieresiscyrillic: 0x04DC,
-  Zlinebelow: 0x1E94,
-  Zmonospace: 0xFF3A,
-  Zsmall: 0xF77A,
-  Zstroke: 0x01B5,
-  a: 0x0061,
-  aabengali: 0x0986,
-  aacute: 0x00E1,
-  aadeva: 0x0906,
-  aagujarati: 0x0A86,
-  aagurmukhi: 0x0A06,
-  aamatragurmukhi: 0x0A3E,
-  aarusquare: 0x3303,
-  aavowelsignbengali: 0x09BE,
-  aavowelsigndeva: 0x093E,
-  aavowelsigngujarati: 0x0ABE,
-  abbreviationmarkarmenian: 0x055F,
-  abbreviationsigndeva: 0x0970,
-  abengali: 0x0985,
-  abopomofo: 0x311A,
-  abreve: 0x0103,
-  abreveacute: 0x1EAF,
-  abrevecyrillic: 0x04D1,
-  abrevedotbelow: 0x1EB7,
-  abrevegrave: 0x1EB1,
-  abrevehookabove: 0x1EB3,
-  abrevetilde: 0x1EB5,
-  acaron: 0x01CE,
-  acircle: 0x24D0,
-  acircumflex: 0x00E2,
-  acircumflexacute: 0x1EA5,
-  acircumflexdotbelow: 0x1EAD,
-  acircumflexgrave: 0x1EA7,
-  acircumflexhookabove: 0x1EA9,
-  acircumflextilde: 0x1EAB,
-  acute: 0x00B4,
-  acutebelowcmb: 0x0317,
-  acutecmb: 0x0301,
-  acutecomb: 0x0301,
-  acutedeva: 0x0954,
-  acutelowmod: 0x02CF,
-  acutetonecmb: 0x0341,
-  acyrillic: 0x0430,
-  adblgrave: 0x0201,
-  addakgurmukhi: 0x0A71,
-  adeva: 0x0905,
-  adieresis: 0x00E4,
-  adieresiscyrillic: 0x04D3,
-  adieresismacron: 0x01DF,
-  adotbelow: 0x1EA1,
-  adotmacron: 0x01E1,
-  ae: 0x00E6,
-  aeacute: 0x01FD,
-  aekorean: 0x3150,
-  aemacron: 0x01E3,
-  afii00208: 0x2015,
-  afii08941: 0x20A4,
-  afii10017: 0x0410,
-  afii10018: 0x0411,
-  afii10019: 0x0412,
-  afii10020: 0x0413,
-  afii10021: 0x0414,
-  afii10022: 0x0415,
-  afii10023: 0x0401,
-  afii10024: 0x0416,
-  afii10025: 0x0417,
-  afii10026: 0x0418,
-  afii10027: 0x0419,
-  afii10028: 0x041A,
-  afii10029: 0x041B,
-  afii10030: 0x041C,
-  afii10031: 0x041D,
-  afii10032: 0x041E,
-  afii10033: 0x041F,
-  afii10034: 0x0420,
-  afii10035: 0x0421,
-  afii10036: 0x0422,
-  afii10037: 0x0423,
-  afii10038: 0x0424,
-  afii10039: 0x0425,
-  afii10040: 0x0426,
-  afii10041: 0x0427,
-  afii10042: 0x0428,
-  afii10043: 0x0429,
-  afii10044: 0x042A,
-  afii10045: 0x042B,
-  afii10046: 0x042C,
-  afii10047: 0x042D,
-  afii10048: 0x042E,
-  afii10049: 0x042F,
-  afii10050: 0x0490,
-  afii10051: 0x0402,
-  afii10052: 0x0403,
-  afii10053: 0x0404,
-  afii10054: 0x0405,
-  afii10055: 0x0406,
-  afii10056: 0x0407,
-  afii10057: 0x0408,
-  afii10058: 0x0409,
-  afii10059: 0x040A,
-  afii10060: 0x040B,
-  afii10061: 0x040C,
-  afii10062: 0x040E,
-  afii10063: 0xF6C4,
-  afii10064: 0xF6C5,
-  afii10065: 0x0430,
-  afii10066: 0x0431,
-  afii10067: 0x0432,
-  afii10068: 0x0433,
-  afii10069: 0x0434,
-  afii10070: 0x0435,
-  afii10071: 0x0451,
-  afii10072: 0x0436,
-  afii10073: 0x0437,
-  afii10074: 0x0438,
-  afii10075: 0x0439,
-  afii10076: 0x043A,
-  afii10077: 0x043B,
-  afii10078: 0x043C,
-  afii10079: 0x043D,
-  afii10080: 0x043E,
-  afii10081: 0x043F,
-  afii10082: 0x0440,
-  afii10083: 0x0441,
-  afii10084: 0x0442,
-  afii10085: 0x0443,
-  afii10086: 0x0444,
-  afii10087: 0x0445,
-  afii10088: 0x0446,
-  afii10089: 0x0447,
-  afii10090: 0x0448,
-  afii10091: 0x0449,
-  afii10092: 0x044A,
-  afii10093: 0x044B,
-  afii10094: 0x044C,
-  afii10095: 0x044D,
-  afii10096: 0x044E,
-  afii10097: 0x044F,
-  afii10098: 0x0491,
-  afii10099: 0x0452,
-  afii10100: 0x0453,
-  afii10101: 0x0454,
-  afii10102: 0x0455,
-  afii10103: 0x0456,
-  afii10104: 0x0457,
-  afii10105: 0x0458,
-  afii10106: 0x0459,
-  afii10107: 0x045A,
-  afii10108: 0x045B,
-  afii10109: 0x045C,
-  afii10110: 0x045E,
-  afii10145: 0x040F,
-  afii10146: 0x0462,
-  afii10147: 0x0472,
-  afii10148: 0x0474,
-  afii10192: 0xF6C6,
-  afii10193: 0x045F,
-  afii10194: 0x0463,
-  afii10195: 0x0473,
-  afii10196: 0x0475,
-  afii10831: 0xF6C7,
-  afii10832: 0xF6C8,
-  afii10846: 0x04D9,
-  afii299: 0x200E,
-  afii300: 0x200F,
-  afii301: 0x200D,
-  afii57381: 0x066A,
-  afii57388: 0x060C,
-  afii57392: 0x0660,
-  afii57393: 0x0661,
-  afii57394: 0x0662,
-  afii57395: 0x0663,
-  afii57396: 0x0664,
-  afii57397: 0x0665,
-  afii57398: 0x0666,
-  afii57399: 0x0667,
-  afii57400: 0x0668,
-  afii57401: 0x0669,
-  afii57403: 0x061B,
-  afii57407: 0x061F,
-  afii57409: 0x0621,
-  afii57410: 0x0622,
-  afii57411: 0x0623,
-  afii57412: 0x0624,
-  afii57413: 0x0625,
-  afii57414: 0x0626,
-  afii57415: 0x0627,
-  afii57416: 0x0628,
-  afii57417: 0x0629,
-  afii57418: 0x062A,
-  afii57419: 0x062B,
-  afii57420: 0x062C,
-  afii57421: 0x062D,
-  afii57422: 0x062E,
-  afii57423: 0x062F,
-  afii57424: 0x0630,
-  afii57425: 0x0631,
-  afii57426: 0x0632,
-  afii57427: 0x0633,
-  afii57428: 0x0634,
-  afii57429: 0x0635,
-  afii57430: 0x0636,
-  afii57431: 0x0637,
-  afii57432: 0x0638,
-  afii57433: 0x0639,
-  afii57434: 0x063A,
-  afii57440: 0x0640,
-  afii57441: 0x0641,
-  afii57442: 0x0642,
-  afii57443: 0x0643,
-  afii57444: 0x0644,
-  afii57445: 0x0645,
-  afii57446: 0x0646,
-  afii57448: 0x0648,
-  afii57449: 0x0649,
-  afii57450: 0x064A,
-  afii57451: 0x064B,
-  afii57452: 0x064C,
-  afii57453: 0x064D,
-  afii57454: 0x064E,
-  afii57455: 0x064F,
-  afii57456: 0x0650,
-  afii57457: 0x0651,
-  afii57458: 0x0652,
-  afii57470: 0x0647,
-  afii57505: 0x06A4,
-  afii57506: 0x067E,
-  afii57507: 0x0686,
-  afii57508: 0x0698,
-  afii57509: 0x06AF,
-  afii57511: 0x0679,
-  afii57512: 0x0688,
-  afii57513: 0x0691,
-  afii57514: 0x06BA,
-  afii57519: 0x06D2,
-  afii57534: 0x06D5,
-  afii57636: 0x20AA,
-  afii57645: 0x05BE,
-  afii57658: 0x05C3,
-  afii57664: 0x05D0,
-  afii57665: 0x05D1,
-  afii57666: 0x05D2,
-  afii57667: 0x05D3,
-  afii57668: 0x05D4,
-  afii57669: 0x05D5,
-  afii57670: 0x05D6,
-  afii57671: 0x05D7,
-  afii57672: 0x05D8,
-  afii57673: 0x05D9,
-  afii57674: 0x05DA,
-  afii57675: 0x05DB,
-  afii57676: 0x05DC,
-  afii57677: 0x05DD,
-  afii57678: 0x05DE,
-  afii57679: 0x05DF,
-  afii57680: 0x05E0,
-  afii57681: 0x05E1,
-  afii57682: 0x05E2,
-  afii57683: 0x05E3,
-  afii57684: 0x05E4,
-  afii57685: 0x05E5,
-  afii57686: 0x05E6,
-  afii57687: 0x05E7,
-  afii57688: 0x05E8,
-  afii57689: 0x05E9,
-  afii57690: 0x05EA,
-  afii57694: 0xFB2A,
-  afii57695: 0xFB2B,
-  afii57700: 0xFB4B,
-  afii57705: 0xFB1F,
-  afii57716: 0x05F0,
-  afii57717: 0x05F1,
-  afii57718: 0x05F2,
-  afii57723: 0xFB35,
-  afii57793: 0x05B4,
-  afii57794: 0x05B5,
-  afii57795: 0x05B6,
-  afii57796: 0x05BB,
-  afii57797: 0x05B8,
-  afii57798: 0x05B7,
-  afii57799: 0x05B0,
-  afii57800: 0x05B2,
-  afii57801: 0x05B1,
-  afii57802: 0x05B3,
-  afii57803: 0x05C2,
-  afii57804: 0x05C1,
-  afii57806: 0x05B9,
-  afii57807: 0x05BC,
-  afii57839: 0x05BD,
-  afii57841: 0x05BF,
-  afii57842: 0x05C0,
-  afii57929: 0x02BC,
-  afii61248: 0x2105,
-  afii61289: 0x2113,
-  afii61352: 0x2116,
-  afii61573: 0x202C,
-  afii61574: 0x202D,
-  afii61575: 0x202E,
-  afii61664: 0x200C,
-  afii63167: 0x066D,
-  afii64937: 0x02BD,
-  agrave: 0x00E0,
-  agujarati: 0x0A85,
-  agurmukhi: 0x0A05,
-  ahiragana: 0x3042,
-  ahookabove: 0x1EA3,
-  aibengali: 0x0990,
-  aibopomofo: 0x311E,
-  aideva: 0x0910,
-  aiecyrillic: 0x04D5,
-  aigujarati: 0x0A90,
-  aigurmukhi: 0x0A10,
-  aimatragurmukhi: 0x0A48,
-  ainarabic: 0x0639,
-  ainfinalarabic: 0xFECA,
-  aininitialarabic: 0xFECB,
-  ainmedialarabic: 0xFECC,
-  ainvertedbreve: 0x0203,
-  aivowelsignbengali: 0x09C8,
-  aivowelsigndeva: 0x0948,
-  aivowelsigngujarati: 0x0AC8,
-  akatakana: 0x30A2,
-  akatakanahalfwidth: 0xFF71,
-  akorean: 0x314F,
-  alef: 0x05D0,
-  alefarabic: 0x0627,
-  alefdageshhebrew: 0xFB30,
-  aleffinalarabic: 0xFE8E,
-  alefhamzaabovearabic: 0x0623,
-  alefhamzaabovefinalarabic: 0xFE84,
-  alefhamzabelowarabic: 0x0625,
-  alefhamzabelowfinalarabic: 0xFE88,
-  alefhebrew: 0x05D0,
-  aleflamedhebrew: 0xFB4F,
-  alefmaddaabovearabic: 0x0622,
-  alefmaddaabovefinalarabic: 0xFE82,
-  alefmaksuraarabic: 0x0649,
-  alefmaksurafinalarabic: 0xFEF0,
-  alefmaksurainitialarabic: 0xFEF3,
-  alefmaksuramedialarabic: 0xFEF4,
-  alefpatahhebrew: 0xFB2E,
-  alefqamatshebrew: 0xFB2F,
-  aleph: 0x2135,
-  allequal: 0x224C,
-  alpha: 0x03B1,
-  alphatonos: 0x03AC,
-  amacron: 0x0101,
-  amonospace: 0xFF41,
-  ampersand: 0x0026,
-  ampersandmonospace: 0xFF06,
-  ampersandsmall: 0xF726,
-  amsquare: 0x33C2,
-  anbopomofo: 0x3122,
-  angbopomofo: 0x3124,
-  angbracketleft: 0x3008, // This glyph is missing from Adobe's original list.
-  angbracketright: 0x3009, // This glyph is missing from Adobe's original list.
-  angkhankhuthai: 0x0E5A,
-  angle: 0x2220,
-  anglebracketleft: 0x3008,
-  anglebracketleftvertical: 0xFE3F,
-  anglebracketright: 0x3009,
-  anglebracketrightvertical: 0xFE40,
-  angleleft: 0x2329,
-  angleright: 0x232A,
-  angstrom: 0x212B,
-  anoteleia: 0x0387,
-  anudattadeva: 0x0952,
-  anusvarabengali: 0x0982,
-  anusvaradeva: 0x0902,
-  anusvaragujarati: 0x0A82,
-  aogonek: 0x0105,
-  apaatosquare: 0x3300,
-  aparen: 0x249C,
-  apostrophearmenian: 0x055A,
-  apostrophemod: 0x02BC,
-  apple: 0xF8FF,
-  approaches: 0x2250,
-  approxequal: 0x2248,
-  approxequalorimage: 0x2252,
-  approximatelyequal: 0x2245,
-  araeaekorean: 0x318E,
-  araeakorean: 0x318D,
-  arc: 0x2312,
-  arighthalfring: 0x1E9A,
-  aring: 0x00E5,
-  aringacute: 0x01FB,
-  aringbelow: 0x1E01,
-  arrowboth: 0x2194,
-  arrowdashdown: 0x21E3,
-  arrowdashleft: 0x21E0,
-  arrowdashright: 0x21E2,
-  arrowdashup: 0x21E1,
-  arrowdblboth: 0x21D4,
-  arrowdbldown: 0x21D3,
-  arrowdblleft: 0x21D0,
-  arrowdblright: 0x21D2,
-  arrowdblup: 0x21D1,
-  arrowdown: 0x2193,
-  arrowdownleft: 0x2199,
-  arrowdownright: 0x2198,
-  arrowdownwhite: 0x21E9,
-  arrowheaddownmod: 0x02C5,
-  arrowheadleftmod: 0x02C2,
-  arrowheadrightmod: 0x02C3,
-  arrowheadupmod: 0x02C4,
-  arrowhorizex: 0xF8E7,
-  arrowleft: 0x2190,
-  arrowleftdbl: 0x21D0,
-  arrowleftdblstroke: 0x21CD,
-  arrowleftoverright: 0x21C6,
-  arrowleftwhite: 0x21E6,
-  arrowright: 0x2192,
-  arrowrightdblstroke: 0x21CF,
-  arrowrightheavy: 0x279E,
-  arrowrightoverleft: 0x21C4,
-  arrowrightwhite: 0x21E8,
-  arrowtableft: 0x21E4,
-  arrowtabright: 0x21E5,
-  arrowup: 0x2191,
-  arrowupdn: 0x2195,
-  arrowupdnbse: 0x21A8,
-  arrowupdownbase: 0x21A8,
-  arrowupleft: 0x2196,
-  arrowupleftofdown: 0x21C5,
-  arrowupright: 0x2197,
-  arrowupwhite: 0x21E7,
-  arrowvertex: 0xF8E6,
-  asciicircum: 0x005E,
-  asciicircummonospace: 0xFF3E,
-  asciitilde: 0x007E,
-  asciitildemonospace: 0xFF5E,
-  ascript: 0x0251,
-  ascriptturned: 0x0252,
-  asmallhiragana: 0x3041,
-  asmallkatakana: 0x30A1,
-  asmallkatakanahalfwidth: 0xFF67,
-  asterisk: 0x002A,
-  asteriskaltonearabic: 0x066D,
-  asteriskarabic: 0x066D,
-  asteriskmath: 0x2217,
-  asteriskmonospace: 0xFF0A,
-  asterisksmall: 0xFE61,
-  asterism: 0x2042,
-  asuperior: 0xF6E9,
-  asymptoticallyequal: 0x2243,
-  at: 0x0040,
-  atilde: 0x00E3,
-  atmonospace: 0xFF20,
-  atsmall: 0xFE6B,
-  aturned: 0x0250,
-  aubengali: 0x0994,
-  aubopomofo: 0x3120,
-  audeva: 0x0914,
-  augujarati: 0x0A94,
-  augurmukhi: 0x0A14,
-  aulengthmarkbengali: 0x09D7,
-  aumatragurmukhi: 0x0A4C,
-  auvowelsignbengali: 0x09CC,
-  auvowelsigndeva: 0x094C,
-  auvowelsigngujarati: 0x0ACC,
-  avagrahadeva: 0x093D,
-  aybarmenian: 0x0561,
-  ayin: 0x05E2,
-  ayinaltonehebrew: 0xFB20,
-  ayinhebrew: 0x05E2,
-  b: 0x0062,
-  babengali: 0x09AC,
-  backslash: 0x005C,
-  backslashmonospace: 0xFF3C,
-  badeva: 0x092C,
-  bagujarati: 0x0AAC,
-  bagurmukhi: 0x0A2C,
-  bahiragana: 0x3070,
-  bahtthai: 0x0E3F,
-  bakatakana: 0x30D0,
-  bar: 0x007C,
-  barmonospace: 0xFF5C,
-  bbopomofo: 0x3105,
-  bcircle: 0x24D1,
-  bdotaccent: 0x1E03,
-  bdotbelow: 0x1E05,
-  beamedsixteenthnotes: 0x266C,
-  because: 0x2235,
-  becyrillic: 0x0431,
-  beharabic: 0x0628,
-  behfinalarabic: 0xFE90,
-  behinitialarabic: 0xFE91,
-  behiragana: 0x3079,
-  behmedialarabic: 0xFE92,
-  behmeeminitialarabic: 0xFC9F,
-  behmeemisolatedarabic: 0xFC08,
-  behnoonfinalarabic: 0xFC6D,
-  bekatakana: 0x30D9,
-  benarmenian: 0x0562,
-  bet: 0x05D1,
-  beta: 0x03B2,
-  betasymbolgreek: 0x03D0,
-  betdagesh: 0xFB31,
-  betdageshhebrew: 0xFB31,
-  bethebrew: 0x05D1,
-  betrafehebrew: 0xFB4C,
-  bhabengali: 0x09AD,
-  bhadeva: 0x092D,
-  bhagujarati: 0x0AAD,
-  bhagurmukhi: 0x0A2D,
-  bhook: 0x0253,
-  bihiragana: 0x3073,
-  bikatakana: 0x30D3,
-  bilabialclick: 0x0298,
-  bindigurmukhi: 0x0A02,
-  birusquare: 0x3331,
-  blackcircle: 0x25CF,
-  blackdiamond: 0x25C6,
-  blackdownpointingtriangle: 0x25BC,
-  blackleftpointingpointer: 0x25C4,
-  blackleftpointingtriangle: 0x25C0,
-  blacklenticularbracketleft: 0x3010,
-  blacklenticularbracketleftvertical: 0xFE3B,
-  blacklenticularbracketright: 0x3011,
-  blacklenticularbracketrightvertical: 0xFE3C,
-  blacklowerlefttriangle: 0x25E3,
-  blacklowerrighttriangle: 0x25E2,
-  blackrectangle: 0x25AC,
-  blackrightpointingpointer: 0x25BA,
-  blackrightpointingtriangle: 0x25B6,
-  blacksmallsquare: 0x25AA,
-  blacksmilingface: 0x263B,
-  blacksquare: 0x25A0,
-  blackstar: 0x2605,
-  blackupperlefttriangle: 0x25E4,
-  blackupperrighttriangle: 0x25E5,
-  blackuppointingsmalltriangle: 0x25B4,
-  blackuppointingtriangle: 0x25B2,
-  blank: 0x2423,
-  blinebelow: 0x1E07,
-  block: 0x2588,
-  bmonospace: 0xFF42,
-  bobaimaithai: 0x0E1A,
-  bohiragana: 0x307C,
-  bokatakana: 0x30DC,
-  bparen: 0x249D,
-  bqsquare: 0x33C3,
-  braceex: 0xF8F4,
-  braceleft: 0x007B,
-  braceleftbt: 0xF8F3,
-  braceleftmid: 0xF8F2,
-  braceleftmonospace: 0xFF5B,
-  braceleftsmall: 0xFE5B,
-  bracelefttp: 0xF8F1,
-  braceleftvertical: 0xFE37,
-  braceright: 0x007D,
-  bracerightbt: 0xF8FE,
-  bracerightmid: 0xF8FD,
-  bracerightmonospace: 0xFF5D,
-  bracerightsmall: 0xFE5C,
-  bracerighttp: 0xF8FC,
-  bracerightvertical: 0xFE38,
-  bracketleft: 0x005B,
-  bracketleftbt: 0xF8F0,
-  bracketleftex: 0xF8EF,
-  bracketleftmonospace: 0xFF3B,
-  bracketlefttp: 0xF8EE,
-  bracketright: 0x005D,
-  bracketrightbt: 0xF8FB,
-  bracketrightex: 0xF8FA,
-  bracketrightmonospace: 0xFF3D,
-  bracketrighttp: 0xF8F9,
-  breve: 0x02D8,
-  brevebelowcmb: 0x032E,
-  brevecmb: 0x0306,
-  breveinvertedbelowcmb: 0x032F,
-  breveinvertedcmb: 0x0311,
-  breveinverteddoublecmb: 0x0361,
-  bridgebelowcmb: 0x032A,
-  bridgeinvertedbelowcmb: 0x033A,
-  brokenbar: 0x00A6,
-  bstroke: 0x0180,
-  bsuperior: 0xF6EA,
-  btopbar: 0x0183,
-  buhiragana: 0x3076,
-  bukatakana: 0x30D6,
-  bullet: 0x2022,
-  bulletinverse: 0x25D8,
-  bulletoperator: 0x2219,
-  bullseye: 0x25CE,
-  c: 0x0063,
-  caarmenian: 0x056E,
-  cabengali: 0x099A,
-  cacute: 0x0107,
-  cadeva: 0x091A,
-  cagujarati: 0x0A9A,
-  cagurmukhi: 0x0A1A,
-  calsquare: 0x3388,
-  candrabindubengali: 0x0981,
-  candrabinducmb: 0x0310,
-  candrabindudeva: 0x0901,
-  candrabindugujarati: 0x0A81,
-  capslock: 0x21EA,
-  careof: 0x2105,
-  caron: 0x02C7,
-  caronbelowcmb: 0x032C,
-  caroncmb: 0x030C,
-  carriagereturn: 0x21B5,
-  cbopomofo: 0x3118,
-  ccaron: 0x010D,
-  ccedilla: 0x00E7,
-  ccedillaacute: 0x1E09,
-  ccircle: 0x24D2,
-  ccircumflex: 0x0109,
-  ccurl: 0x0255,
-  cdot: 0x010B,
-  cdotaccent: 0x010B,
-  cdsquare: 0x33C5,
-  cedilla: 0x00B8,
-  cedillacmb: 0x0327,
-  cent: 0x00A2,
-  centigrade: 0x2103,
-  centinferior: 0xF6DF,
-  centmonospace: 0xFFE0,
-  centoldstyle: 0xF7A2,
-  centsuperior: 0xF6E0,
-  chaarmenian: 0x0579,
-  chabengali: 0x099B,
-  chadeva: 0x091B,
-  chagujarati: 0x0A9B,
-  chagurmukhi: 0x0A1B,
-  chbopomofo: 0x3114,
-  cheabkhasiancyrillic: 0x04BD,
-  checkmark: 0x2713,
-  checyrillic: 0x0447,
-  chedescenderabkhasiancyrillic: 0x04BF,
-  chedescendercyrillic: 0x04B7,
-  chedieresiscyrillic: 0x04F5,
-  cheharmenian: 0x0573,
-  chekhakassiancyrillic: 0x04CC,
-  cheverticalstrokecyrillic: 0x04B9,
-  chi: 0x03C7,
-  chieuchacirclekorean: 0x3277,
-  chieuchaparenkorean: 0x3217,
-  chieuchcirclekorean: 0x3269,
-  chieuchkorean: 0x314A,
-  chieuchparenkorean: 0x3209,
-  chochangthai: 0x0E0A,
-  chochanthai: 0x0E08,
-  chochingthai: 0x0E09,
-  chochoethai: 0x0E0C,
-  chook: 0x0188,
-  cieucacirclekorean: 0x3276,
-  cieucaparenkorean: 0x3216,
-  cieuccirclekorean: 0x3268,
-  cieuckorean: 0x3148,
-  cieucparenkorean: 0x3208,
-  cieucuparenkorean: 0x321C,
-  circle: 0x25CB,
-  circlecopyrt: 0x00A9, // This glyph is missing from Adobe's original list.
-  circlemultiply: 0x2297,
-  circleot: 0x2299,
-  circleplus: 0x2295,
-  circlepostalmark: 0x3036,
-  circlewithlefthalfblack: 0x25D0,
-  circlewithrighthalfblack: 0x25D1,
-  circumflex: 0x02C6,
-  circumflexbelowcmb: 0x032D,
-  circumflexcmb: 0x0302,
-  clear: 0x2327,
-  clickalveolar: 0x01C2,
-  clickdental: 0x01C0,
-  clicklateral: 0x01C1,
-  clickretroflex: 0x01C3,
-  club: 0x2663,
-  clubsuitblack: 0x2663,
-  clubsuitwhite: 0x2667,
-  cmcubedsquare: 0x33A4,
-  cmonospace: 0xFF43,
-  cmsquaredsquare: 0x33A0,
-  coarmenian: 0x0581,
-  colon: 0x003A,
-  colonmonetary: 0x20A1,
-  colonmonospace: 0xFF1A,
-  colonsign: 0x20A1,
-  colonsmall: 0xFE55,
-  colontriangularhalfmod: 0x02D1,
-  colontriangularmod: 0x02D0,
-  comma: 0x002C,
-  commaabovecmb: 0x0313,
-  commaaboverightcmb: 0x0315,
-  commaaccent: 0xF6C3,
-  commaarabic: 0x060C,
-  commaarmenian: 0x055D,
-  commainferior: 0xF6E1,
-  commamonospace: 0xFF0C,
-  commareversedabovecmb: 0x0314,
-  commareversedmod: 0x02BD,
-  commasmall: 0xFE50,
-  commasuperior: 0xF6E2,
-  commaturnedabovecmb: 0x0312,
-  commaturnedmod: 0x02BB,
-  compass: 0x263C,
-  congruent: 0x2245,
-  contourintegral: 0x222E,
-  control: 0x2303,
-  controlACK: 0x0006,
-  controlBEL: 0x0007,
-  controlBS: 0x0008,
-  controlCAN: 0x0018,
-  controlCR: 0x000D,
-  controlDC1: 0x0011,
-  controlDC2: 0x0012,
-  controlDC3: 0x0013,
-  controlDC4: 0x0014,
-  controlDEL: 0x007F,
-  controlDLE: 0x0010,
-  controlEM: 0x0019,
-  controlENQ: 0x0005,
-  controlEOT: 0x0004,
-  controlESC: 0x001B,
-  controlETB: 0x0017,
-  controlETX: 0x0003,
-  controlFF: 0x000C,
-  controlFS: 0x001C,
-  controlGS: 0x001D,
-  controlHT: 0x0009,
-  controlLF: 0x000A,
-  controlNAK: 0x0015,
-  controlRS: 0x001E,
-  controlSI: 0x000F,
-  controlSO: 0x000E,
-  controlSOT: 0x0002,
-  controlSTX: 0x0001,
-  controlSUB: 0x001A,
-  controlSYN: 0x0016,
-  controlUS: 0x001F,
-  controlVT: 0x000B,
-  copyright: 0x00A9,
-  copyrightsans: 0xF8E9,
-  copyrightserif: 0xF6D9,
-  cornerbracketleft: 0x300C,
-  cornerbracketlefthalfwidth: 0xFF62,
-  cornerbracketleftvertical: 0xFE41,
-  cornerbracketright: 0x300D,
-  cornerbracketrighthalfwidth: 0xFF63,
-  cornerbracketrightvertical: 0xFE42,
-  corporationsquare: 0x337F,
-  cosquare: 0x33C7,
-  coverkgsquare: 0x33C6,
-  cparen: 0x249E,
-  cruzeiro: 0x20A2,
-  cstretched: 0x0297,
-  curlyand: 0x22CF,
-  curlyor: 0x22CE,
-  currency: 0x00A4,
-  cyrBreve: 0xF6D1,
-  cyrFlex: 0xF6D2,
-  cyrbreve: 0xF6D4,
-  cyrflex: 0xF6D5,
-  d: 0x0064,
-  daarmenian: 0x0564,
-  dabengali: 0x09A6,
-  dadarabic: 0x0636,
-  dadeva: 0x0926,
-  dadfinalarabic: 0xFEBE,
-  dadinitialarabic: 0xFEBF,
-  dadmedialarabic: 0xFEC0,
-  dagesh: 0x05BC,
-  dageshhebrew: 0x05BC,
-  dagger: 0x2020,
-  daggerdbl: 0x2021,
-  dagujarati: 0x0AA6,
-  dagurmukhi: 0x0A26,
-  dahiragana: 0x3060,
-  dakatakana: 0x30C0,
-  dalarabic: 0x062F,
-  dalet: 0x05D3,
-  daletdagesh: 0xFB33,
-  daletdageshhebrew: 0xFB33,
-  dalethebrew: 0x05D3,
-  dalfinalarabic: 0xFEAA,
-  dammaarabic: 0x064F,
-  dammalowarabic: 0x064F,
-  dammatanaltonearabic: 0x064C,
-  dammatanarabic: 0x064C,
-  danda: 0x0964,
-  dargahebrew: 0x05A7,
-  dargalefthebrew: 0x05A7,
-  dasiapneumatacyrilliccmb: 0x0485,
-  dblGrave: 0xF6D3,
-  dblanglebracketleft: 0x300A,
-  dblanglebracketleftvertical: 0xFE3D,
-  dblanglebracketright: 0x300B,
-  dblanglebracketrightvertical: 0xFE3E,
-  dblarchinvertedbelowcmb: 0x032B,
-  dblarrowleft: 0x21D4,
-  dblarrowright: 0x21D2,
-  dbldanda: 0x0965,
-  dblgrave: 0xF6D6,
-  dblgravecmb: 0x030F,
-  dblintegral: 0x222C,
-  dbllowline: 0x2017,
-  dbllowlinecmb: 0x0333,
-  dbloverlinecmb: 0x033F,
-  dblprimemod: 0x02BA,
-  dblverticalbar: 0x2016,
-  dblverticallineabovecmb: 0x030E,
-  dbopomofo: 0x3109,
-  dbsquare: 0x33C8,
-  dcaron: 0x010F,
-  dcedilla: 0x1E11,
-  dcircle: 0x24D3,
-  dcircumflexbelow: 0x1E13,
-  dcroat: 0x0111,
-  ddabengali: 0x09A1,
-  ddadeva: 0x0921,
-  ddagujarati: 0x0AA1,
-  ddagurmukhi: 0x0A21,
-  ddalarabic: 0x0688,
-  ddalfinalarabic: 0xFB89,
-  dddhadeva: 0x095C,
-  ddhabengali: 0x09A2,
-  ddhadeva: 0x0922,
-  ddhagujarati: 0x0AA2,
-  ddhagurmukhi: 0x0A22,
-  ddotaccent: 0x1E0B,
-  ddotbelow: 0x1E0D,
-  decimalseparatorarabic: 0x066B,
-  decimalseparatorpersian: 0x066B,
-  decyrillic: 0x0434,
-  degree: 0x00B0,
-  dehihebrew: 0x05AD,
-  dehiragana: 0x3067,
-  deicoptic: 0x03EF,
-  dekatakana: 0x30C7,
-  deleteleft: 0x232B,
-  deleteright: 0x2326,
-  delta: 0x03B4,
-  deltaturned: 0x018D,
-  denominatorminusonenumeratorbengali: 0x09F8,
-  dezh: 0x02A4,
-  dhabengali: 0x09A7,
-  dhadeva: 0x0927,
-  dhagujarati: 0x0AA7,
-  dhagurmukhi: 0x0A27,
-  dhook: 0x0257,
-  dialytikatonos: 0x0385,
-  dialytikatonoscmb: 0x0344,
-  diamond: 0x2666,
-  diamondsuitwhite: 0x2662,
-  dieresis: 0x00A8,
-  dieresisacute: 0xF6D7,
-  dieresisbelowcmb: 0x0324,
-  dieresiscmb: 0x0308,
-  dieresisgrave: 0xF6D8,
-  dieresistonos: 0x0385,
-  dihiragana: 0x3062,
-  dikatakana: 0x30C2,
-  dittomark: 0x3003,
-  divide: 0x00F7,
-  divides: 0x2223,
-  divisionslash: 0x2215,
-  djecyrillic: 0x0452,
-  dkshade: 0x2593,
-  dlinebelow: 0x1E0F,
-  dlsquare: 0x3397,
-  dmacron: 0x0111,
-  dmonospace: 0xFF44,
-  dnblock: 0x2584,
-  dochadathai: 0x0E0E,
-  dodekthai: 0x0E14,
-  dohiragana: 0x3069,
-  dokatakana: 0x30C9,
-  dollar: 0x0024,
-  dollarinferior: 0xF6E3,
-  dollarmonospace: 0xFF04,
-  dollaroldstyle: 0xF724,
-  dollarsmall: 0xFE69,
-  dollarsuperior: 0xF6E4,
-  dong: 0x20AB,
-  dorusquare: 0x3326,
-  dotaccent: 0x02D9,
-  dotaccentcmb: 0x0307,
-  dotbelowcmb: 0x0323,
-  dotbelowcomb: 0x0323,
-  dotkatakana: 0x30FB,
-  dotlessi: 0x0131,
-  dotlessj: 0xF6BE,
-  dotlessjstrokehook: 0x0284,
-  dotmath: 0x22C5,
-  dottedcircle: 0x25CC,
-  doubleyodpatah: 0xFB1F,
-  doubleyodpatahhebrew: 0xFB1F,
-  downtackbelowcmb: 0x031E,
-  downtackmod: 0x02D5,
-  dparen: 0x249F,
-  dsuperior: 0xF6EB,
-  dtail: 0x0256,
-  dtopbar: 0x018C,
-  duhiragana: 0x3065,
-  dukatakana: 0x30C5,
-  dz: 0x01F3,
-  dzaltone: 0x02A3,
-  dzcaron: 0x01C6,
-  dzcurl: 0x02A5,
-  dzeabkhasiancyrillic: 0x04E1,
-  dzecyrillic: 0x0455,
-  dzhecyrillic: 0x045F,
-  e: 0x0065,
-  eacute: 0x00E9,
-  earth: 0x2641,
-  ebengali: 0x098F,
-  ebopomofo: 0x311C,
-  ebreve: 0x0115,
-  ecandradeva: 0x090D,
-  ecandragujarati: 0x0A8D,
-  ecandravowelsigndeva: 0x0945,
-  ecandravowelsigngujarati: 0x0AC5,
-  ecaron: 0x011B,
-  ecedillabreve: 0x1E1D,
-  echarmenian: 0x0565,
-  echyiwnarmenian: 0x0587,
-  ecircle: 0x24D4,
-  ecircumflex: 0x00EA,
-  ecircumflexacute: 0x1EBF,
-  ecircumflexbelow: 0x1E19,
-  ecircumflexdotbelow: 0x1EC7,
-  ecircumflexgrave: 0x1EC1,
-  ecircumflexhookabove: 0x1EC3,
-  ecircumflextilde: 0x1EC5,
-  ecyrillic: 0x0454,
-  edblgrave: 0x0205,
-  edeva: 0x090F,
-  edieresis: 0x00EB,
-  edot: 0x0117,
-  edotaccent: 0x0117,
-  edotbelow: 0x1EB9,
-  eegurmukhi: 0x0A0F,
-  eematragurmukhi: 0x0A47,
-  efcyrillic: 0x0444,
-  egrave: 0x00E8,
-  egujarati: 0x0A8F,
-  eharmenian: 0x0567,
-  ehbopomofo: 0x311D,
-  ehiragana: 0x3048,
-  ehookabove: 0x1EBB,
-  eibopomofo: 0x311F,
-  eight: 0x0038,
-  eightarabic: 0x0668,
-  eightbengali: 0x09EE,
-  eightcircle: 0x2467,
-  eightcircleinversesansserif: 0x2791,
-  eightdeva: 0x096E,
-  eighteencircle: 0x2471,
-  eighteenparen: 0x2485,
-  eighteenperiod: 0x2499,
-  eightgujarati: 0x0AEE,
-  eightgurmukhi: 0x0A6E,
-  eighthackarabic: 0x0668,
-  eighthangzhou: 0x3028,
-  eighthnotebeamed: 0x266B,
-  eightideographicparen: 0x3227,
-  eightinferior: 0x2088,
-  eightmonospace: 0xFF18,
-  eightoldstyle: 0xF738,
-  eightparen: 0x247B,
-  eightperiod: 0x248F,
-  eightpersian: 0x06F8,
-  eightroman: 0x2177,
-  eightsuperior: 0x2078,
-  eightthai: 0x0E58,
-  einvertedbreve: 0x0207,
-  eiotifiedcyrillic: 0x0465,
-  ekatakana: 0x30A8,
-  ekatakanahalfwidth: 0xFF74,
-  ekonkargurmukhi: 0x0A74,
-  ekorean: 0x3154,
-  elcyrillic: 0x043B,
-  element: 0x2208,
-  elevencircle: 0x246A,
-  elevenparen: 0x247E,
-  elevenperiod: 0x2492,
-  elevenroman: 0x217A,
-  ellipsis: 0x2026,
-  ellipsisvertical: 0x22EE,
-  emacron: 0x0113,
-  emacronacute: 0x1E17,
-  emacrongrave: 0x1E15,
-  emcyrillic: 0x043C,
-  emdash: 0x2014,
-  emdashvertical: 0xFE31,
-  emonospace: 0xFF45,
-  emphasismarkarmenian: 0x055B,
-  emptyset: 0x2205,
-  enbopomofo: 0x3123,
-  encyrillic: 0x043D,
-  endash: 0x2013,
-  endashvertical: 0xFE32,
-  endescendercyrillic: 0x04A3,
-  eng: 0x014B,
-  engbopomofo: 0x3125,
-  enghecyrillic: 0x04A5,
-  enhookcyrillic: 0x04C8,
-  enspace: 0x2002,
-  eogonek: 0x0119,
-  eokorean: 0x3153,
-  eopen: 0x025B,
-  eopenclosed: 0x029A,
-  eopenreversed: 0x025C,
-  eopenreversedclosed: 0x025E,
-  eopenreversedhook: 0x025D,
-  eparen: 0x24A0,
-  epsilon: 0x03B5,
-  epsilontonos: 0x03AD,
-  equal: 0x003D,
-  equalmonospace: 0xFF1D,
-  equalsmall: 0xFE66,
-  equalsuperior: 0x207C,
-  equivalence: 0x2261,
-  erbopomofo: 0x3126,
-  ercyrillic: 0x0440,
-  ereversed: 0x0258,
-  ereversedcyrillic: 0x044D,
-  escyrillic: 0x0441,
-  esdescendercyrillic: 0x04AB,
-  esh: 0x0283,
-  eshcurl: 0x0286,
-  eshortdeva: 0x090E,
-  eshortvowelsigndeva: 0x0946,
-  eshreversedloop: 0x01AA,
-  eshsquatreversed: 0x0285,
-  esmallhiragana: 0x3047,
-  esmallkatakana: 0x30A7,
-  esmallkatakanahalfwidth: 0xFF6A,
-  estimated: 0x212E,
-  esuperior: 0xF6EC,
-  eta: 0x03B7,
-  etarmenian: 0x0568,
-  etatonos: 0x03AE,
-  eth: 0x00F0,
-  etilde: 0x1EBD,
-  etildebelow: 0x1E1B,
-  etnahtafoukhhebrew: 0x0591,
-  etnahtafoukhlefthebrew: 0x0591,
-  etnahtahebrew: 0x0591,
-  etnahtalefthebrew: 0x0591,
-  eturned: 0x01DD,
-  eukorean: 0x3161,
-  euro: 0x20AC,
-  evowelsignbengali: 0x09C7,
-  evowelsigndeva: 0x0947,
-  evowelsigngujarati: 0x0AC7,
-  exclam: 0x0021,
-  exclamarmenian: 0x055C,
-  exclamdbl: 0x203C,
-  exclamdown: 0x00A1,
-  exclamdownsmall: 0xF7A1,
-  exclammonospace: 0xFF01,
-  exclamsmall: 0xF721,
-  existential: 0x2203,
-  ezh: 0x0292,
-  ezhcaron: 0x01EF,
-  ezhcurl: 0x0293,
-  ezhreversed: 0x01B9,
-  ezhtail: 0x01BA,
-  f: 0x0066,
-  fadeva: 0x095E,
-  fagurmukhi: 0x0A5E,
-  fahrenheit: 0x2109,
-  fathaarabic: 0x064E,
-  fathalowarabic: 0x064E,
-  fathatanarabic: 0x064B,
-  fbopomofo: 0x3108,
-  fcircle: 0x24D5,
-  fdotaccent: 0x1E1F,
-  feharabic: 0x0641,
-  feharmenian: 0x0586,
-  fehfinalarabic: 0xFED2,
-  fehinitialarabic: 0xFED3,
-  fehmedialarabic: 0xFED4,
-  feicoptic: 0x03E5,
-  female: 0x2640,
-  ff: 0xFB00,
-  ffi: 0xFB03,
-  ffl: 0xFB04,
-  fi: 0xFB01,
-  fifteencircle: 0x246E,
-  fifteenparen: 0x2482,
-  fifteenperiod: 0x2496,
-  figuredash: 0x2012,
-  filledbox: 0x25A0,
-  filledrect: 0x25AC,
-  finalkaf: 0x05DA,
-  finalkafdagesh: 0xFB3A,
-  finalkafdageshhebrew: 0xFB3A,
-  finalkafhebrew: 0x05DA,
-  finalmem: 0x05DD,
-  finalmemhebrew: 0x05DD,
-  finalnun: 0x05DF,
-  finalnunhebrew: 0x05DF,
-  finalpe: 0x05E3,
-  finalpehebrew: 0x05E3,
-  finaltsadi: 0x05E5,
-  finaltsadihebrew: 0x05E5,
-  firsttonechinese: 0x02C9,
-  fisheye: 0x25C9,
-  fitacyrillic: 0x0473,
-  five: 0x0035,
-  fivearabic: 0x0665,
-  fivebengali: 0x09EB,
-  fivecircle: 0x2464,
-  fivecircleinversesansserif: 0x278E,
-  fivedeva: 0x096B,
-  fiveeighths: 0x215D,
-  fivegujarati: 0x0AEB,
-  fivegurmukhi: 0x0A6B,
-  fivehackarabic: 0x0665,
-  fivehangzhou: 0x3025,
-  fiveideographicparen: 0x3224,
-  fiveinferior: 0x2085,
-  fivemonospace: 0xFF15,
-  fiveoldstyle: 0xF735,
-  fiveparen: 0x2478,
-  fiveperiod: 0x248C,
-  fivepersian: 0x06F5,
-  fiveroman: 0x2174,
-  fivesuperior: 0x2075,
-  fivethai: 0x0E55,
-  fl: 0xFB02,
-  florin: 0x0192,
-  fmonospace: 0xFF46,
-  fmsquare: 0x3399,
-  fofanthai: 0x0E1F,
-  fofathai: 0x0E1D,
-  fongmanthai: 0x0E4F,
-  forall: 0x2200,
-  four: 0x0034,
-  fourarabic: 0x0664,
-  fourbengali: 0x09EA,
-  fourcircle: 0x2463,
-  fourcircleinversesansserif: 0x278D,
-  fourdeva: 0x096A,
-  fourgujarati: 0x0AEA,
-  fourgurmukhi: 0x0A6A,
-  fourhackarabic: 0x0664,
-  fourhangzhou: 0x3024,
-  fourideographicparen: 0x3223,
-  fourinferior: 0x2084,
-  fourmonospace: 0xFF14,
-  fournumeratorbengali: 0x09F7,
-  fouroldstyle: 0xF734,
-  fourparen: 0x2477,
-  fourperiod: 0x248B,
-  fourpersian: 0x06F4,
-  fourroman: 0x2173,
-  foursuperior: 0x2074,
-  fourteencircle: 0x246D,
-  fourteenparen: 0x2481,
-  fourteenperiod: 0x2495,
-  fourthai: 0x0E54,
-  fourthtonechinese: 0x02CB,
-  fparen: 0x24A1,
-  fraction: 0x2044,
-  franc: 0x20A3,
-  g: 0x0067,
-  gabengali: 0x0997,
-  gacute: 0x01F5,
-  gadeva: 0x0917,
-  gafarabic: 0x06AF,
-  gaffinalarabic: 0xFB93,
-  gafinitialarabic: 0xFB94,
-  gafmedialarabic: 0xFB95,
-  gagujarati: 0x0A97,
-  gagurmukhi: 0x0A17,
-  gahiragana: 0x304C,
-  gakatakana: 0x30AC,
-  gamma: 0x03B3,
-  gammalatinsmall: 0x0263,
-  gammasuperior: 0x02E0,
-  gangiacoptic: 0x03EB,
-  gbopomofo: 0x310D,
-  gbreve: 0x011F,
-  gcaron: 0x01E7,
-  gcedilla: 0x0123,
-  gcircle: 0x24D6,
-  gcircumflex: 0x011D,
-  gcommaaccent: 0x0123,
-  gdot: 0x0121,
-  gdotaccent: 0x0121,
-  gecyrillic: 0x0433,
-  gehiragana: 0x3052,
-  gekatakana: 0x30B2,
-  geometricallyequal: 0x2251,
-  gereshaccenthebrew: 0x059C,
-  gereshhebrew: 0x05F3,
-  gereshmuqdamhebrew: 0x059D,
-  germandbls: 0x00DF,
-  gershayimaccenthebrew: 0x059E,
-  gershayimhebrew: 0x05F4,
-  getamark: 0x3013,
-  ghabengali: 0x0998,
-  ghadarmenian: 0x0572,
-  ghadeva: 0x0918,
-  ghagujarati: 0x0A98,
-  ghagurmukhi: 0x0A18,
-  ghainarabic: 0x063A,
-  ghainfinalarabic: 0xFECE,
-  ghaininitialarabic: 0xFECF,
-  ghainmedialarabic: 0xFED0,
-  ghemiddlehookcyrillic: 0x0495,
-  ghestrokecyrillic: 0x0493,
-  gheupturncyrillic: 0x0491,
-  ghhadeva: 0x095A,
-  ghhagurmukhi: 0x0A5A,
-  ghook: 0x0260,
-  ghzsquare: 0x3393,
-  gihiragana: 0x304E,
-  gikatakana: 0x30AE,
-  gimarmenian: 0x0563,
-  gimel: 0x05D2,
-  gimeldagesh: 0xFB32,
-  gimeldageshhebrew: 0xFB32,
-  gimelhebrew: 0x05D2,
-  gjecyrillic: 0x0453,
-  glottalinvertedstroke: 0x01BE,
-  glottalstop: 0x0294,
-  glottalstopinverted: 0x0296,
-  glottalstopmod: 0x02C0,
-  glottalstopreversed: 0x0295,
-  glottalstopreversedmod: 0x02C1,
-  glottalstopreversedsuperior: 0x02E4,
-  glottalstopstroke: 0x02A1,
-  glottalstopstrokereversed: 0x02A2,
-  gmacron: 0x1E21,
-  gmonospace: 0xFF47,
-  gohiragana: 0x3054,
-  gokatakana: 0x30B4,
-  gparen: 0x24A2,
-  gpasquare: 0x33AC,
-  gradient: 0x2207,
-  grave: 0x0060,
-  gravebelowcmb: 0x0316,
-  gravecmb: 0x0300,
-  gravecomb: 0x0300,
-  gravedeva: 0x0953,
-  gravelowmod: 0x02CE,
-  gravemonospace: 0xFF40,
-  gravetonecmb: 0x0340,
-  greater: 0x003E,
-  greaterequal: 0x2265,
-  greaterequalorless: 0x22DB,
-  greatermonospace: 0xFF1E,
-  greaterorequivalent: 0x2273,
-  greaterorless: 0x2277,
-  greateroverequal: 0x2267,
-  greatersmall: 0xFE65,
-  gscript: 0x0261,
-  gstroke: 0x01E5,
-  guhiragana: 0x3050,
-  guillemotleft: 0x00AB,
-  guillemotright: 0x00BB,
-  guilsinglleft: 0x2039,
-  guilsinglright: 0x203A,
-  gukatakana: 0x30B0,
-  guramusquare: 0x3318,
-  gysquare: 0x33C9,
-  h: 0x0068,
-  haabkhasiancyrillic: 0x04A9,
-  haaltonearabic: 0x06C1,
-  habengali: 0x09B9,
-  hadescendercyrillic: 0x04B3,
-  hadeva: 0x0939,
-  hagujarati: 0x0AB9,
-  hagurmukhi: 0x0A39,
-  haharabic: 0x062D,
-  hahfinalarabic: 0xFEA2,
-  hahinitialarabic: 0xFEA3,
-  hahiragana: 0x306F,
-  hahmedialarabic: 0xFEA4,
-  haitusquare: 0x332A,
-  hakatakana: 0x30CF,
-  hakatakanahalfwidth: 0xFF8A,
-  halantgurmukhi: 0x0A4D,
-  hamzaarabic: 0x0621,
-  hamzalowarabic: 0x0621,
-  hangulfiller: 0x3164,
-  hardsigncyrillic: 0x044A,
-  harpoonleftbarbup: 0x21BC,
-  harpoonrightbarbup: 0x21C0,
-  hasquare: 0x33CA,
-  hatafpatah: 0x05B2,
-  hatafpatah16: 0x05B2,
-  hatafpatah23: 0x05B2,
-  hatafpatah2f: 0x05B2,
-  hatafpatahhebrew: 0x05B2,
-  hatafpatahnarrowhebrew: 0x05B2,
-  hatafpatahquarterhebrew: 0x05B2,
-  hatafpatahwidehebrew: 0x05B2,
-  hatafqamats: 0x05B3,
-  hatafqamats1b: 0x05B3,
-  hatafqamats28: 0x05B3,
-  hatafqamats34: 0x05B3,
-  hatafqamatshebrew: 0x05B3,
-  hatafqamatsnarrowhebrew: 0x05B3,
-  hatafqamatsquarterhebrew: 0x05B3,
-  hatafqamatswidehebrew: 0x05B3,
-  hatafsegol: 0x05B1,
-  hatafsegol17: 0x05B1,
-  hatafsegol24: 0x05B1,
-  hatafsegol30: 0x05B1,
-  hatafsegolhebrew: 0x05B1,
-  hatafsegolnarrowhebrew: 0x05B1,
-  hatafsegolquarterhebrew: 0x05B1,
-  hatafsegolwidehebrew: 0x05B1,
-  hbar: 0x0127,
-  hbopomofo: 0x310F,
-  hbrevebelow: 0x1E2B,
-  hcedilla: 0x1E29,
-  hcircle: 0x24D7,
-  hcircumflex: 0x0125,
-  hdieresis: 0x1E27,
-  hdotaccent: 0x1E23,
-  hdotbelow: 0x1E25,
-  he: 0x05D4,
-  heart: 0x2665,
-  heartsuitblack: 0x2665,
-  heartsuitwhite: 0x2661,
-  hedagesh: 0xFB34,
-  hedageshhebrew: 0xFB34,
-  hehaltonearabic: 0x06C1,
-  heharabic: 0x0647,
-  hehebrew: 0x05D4,
-  hehfinalaltonearabic: 0xFBA7,
-  hehfinalalttwoarabic: 0xFEEA,
-  hehfinalarabic: 0xFEEA,
-  hehhamzaabovefinalarabic: 0xFBA5,
-  hehhamzaaboveisolatedarabic: 0xFBA4,
-  hehinitialaltonearabic: 0xFBA8,
-  hehinitialarabic: 0xFEEB,
-  hehiragana: 0x3078,
-  hehmedialaltonearabic: 0xFBA9,
-  hehmedialarabic: 0xFEEC,
-  heiseierasquare: 0x337B,
-  hekatakana: 0x30D8,
-  hekatakanahalfwidth: 0xFF8D,
-  hekutaarusquare: 0x3336,
-  henghook: 0x0267,
-  herutusquare: 0x3339,
-  het: 0x05D7,
-  hethebrew: 0x05D7,
-  hhook: 0x0266,
-  hhooksuperior: 0x02B1,
-  hieuhacirclekorean: 0x327B,
-  hieuhaparenkorean: 0x321B,
-  hieuhcirclekorean: 0x326D,
-  hieuhkorean: 0x314E,
-  hieuhparenkorean: 0x320D,
-  hihiragana: 0x3072,
-  hikatakana: 0x30D2,
-  hikatakanahalfwidth: 0xFF8B,
-  hiriq: 0x05B4,
-  hiriq14: 0x05B4,
-  hiriq21: 0x05B4,
-  hiriq2d: 0x05B4,
-  hiriqhebrew: 0x05B4,
-  hiriqnarrowhebrew: 0x05B4,
-  hiriqquarterhebrew: 0x05B4,
-  hiriqwidehebrew: 0x05B4,
-  hlinebelow: 0x1E96,
-  hmonospace: 0xFF48,
-  hoarmenian: 0x0570,
-  hohipthai: 0x0E2B,
-  hohiragana: 0x307B,
-  hokatakana: 0x30DB,
-  hokatakanahalfwidth: 0xFF8E,
-  holam: 0x05B9,
-  holam19: 0x05B9,
-  holam26: 0x05B9,
-  holam32: 0x05B9,
-  holamhebrew: 0x05B9,
-  holamnarrowhebrew: 0x05B9,
-  holamquarterhebrew: 0x05B9,
-  holamwidehebrew: 0x05B9,
-  honokhukthai: 0x0E2E,
-  hookabovecomb: 0x0309,
-  hookcmb: 0x0309,
-  hookpalatalizedbelowcmb: 0x0321,
-  hookretroflexbelowcmb: 0x0322,
-  hoonsquare: 0x3342,
-  horicoptic: 0x03E9,
-  horizontalbar: 0x2015,
-  horncmb: 0x031B,
-  hotsprings: 0x2668,
-  house: 0x2302,
-  hparen: 0x24A3,
-  hsuperior: 0x02B0,
-  hturned: 0x0265,
-  huhiragana: 0x3075,
-  huiitosquare: 0x3333,
-  hukatakana: 0x30D5,
-  hukatakanahalfwidth: 0xFF8C,
-  hungarumlaut: 0x02DD,
-  hungarumlautcmb: 0x030B,
-  hv: 0x0195,
-  hyphen: 0x002D,
-  hypheninferior: 0xF6E5,
-  hyphenmonospace: 0xFF0D,
-  hyphensmall: 0xFE63,
-  hyphensuperior: 0xF6E6,
-  hyphentwo: 0x2010,
-  i: 0x0069,
-  iacute: 0x00ED,
-  iacyrillic: 0x044F,
-  ibengali: 0x0987,
-  ibopomofo: 0x3127,
-  ibreve: 0x012D,
-  icaron: 0x01D0,
-  icircle: 0x24D8,
-  icircumflex: 0x00EE,
-  icyrillic: 0x0456,
-  idblgrave: 0x0209,
-  ideographearthcircle: 0x328F,
-  ideographfirecircle: 0x328B,
-  ideographicallianceparen: 0x323F,
-  ideographiccallparen: 0x323A,
-  ideographiccentrecircle: 0x32A5,
-  ideographicclose: 0x3006,
-  ideographiccomma: 0x3001,
-  ideographiccommaleft: 0xFF64,
-  ideographiccongratulationparen: 0x3237,
-  ideographiccorrectcircle: 0x32A3,
-  ideographicearthparen: 0x322F,
-  ideographicenterpriseparen: 0x323D,
-  ideographicexcellentcircle: 0x329D,
-  ideographicfestivalparen: 0x3240,
-  ideographicfinancialcircle: 0x3296,
-  ideographicfinancialparen: 0x3236,
-  ideographicfireparen: 0x322B,
-  ideographichaveparen: 0x3232,
-  ideographichighcircle: 0x32A4,
-  ideographiciterationmark: 0x3005,
-  ideographiclaborcircle: 0x3298,
-  ideographiclaborparen: 0x3238,
-  ideographicleftcircle: 0x32A7,
-  ideographiclowcircle: 0x32A6,
-  ideographicmedicinecircle: 0x32A9,
-  ideographicmetalparen: 0x322E,
-  ideographicmoonparen: 0x322A,
-  ideographicnameparen: 0x3234,
-  ideographicperiod: 0x3002,
-  ideographicprintcircle: 0x329E,
-  ideographicreachparen: 0x3243,
-  ideographicrepresentparen: 0x3239,
-  ideographicresourceparen: 0x323E,
-  ideographicrightcircle: 0x32A8,
-  ideographicsecretcircle: 0x3299,
-  ideographicselfparen: 0x3242,
-  ideographicsocietyparen: 0x3233,
-  ideographicspace: 0x3000,
-  ideographicspecialparen: 0x3235,
-  ideographicstockparen: 0x3231,
-  ideographicstudyparen: 0x323B,
-  ideographicsunparen: 0x3230,
-  ideographicsuperviseparen: 0x323C,
-  ideographicwaterparen: 0x322C,
-  ideographicwoodparen: 0x322D,
-  ideographiczero: 0x3007,
-  ideographmetalcircle: 0x328E,
-  ideographmooncircle: 0x328A,
-  ideographnamecircle: 0x3294,
-  ideographsuncircle: 0x3290,
-  ideographwatercircle: 0x328C,
-  ideographwoodcircle: 0x328D,
-  ideva: 0x0907,
-  idieresis: 0x00EF,
-  idieresisacute: 0x1E2F,
-  idieresiscyrillic: 0x04E5,
-  idotbelow: 0x1ECB,
-  iebrevecyrillic: 0x04D7,
-  iecyrillic: 0x0435,
-  ieungacirclekorean: 0x3275,
-  ieungaparenkorean: 0x3215,
-  ieungcirclekorean: 0x3267,
-  ieungkorean: 0x3147,
-  ieungparenkorean: 0x3207,
-  igrave: 0x00EC,
-  igujarati: 0x0A87,
-  igurmukhi: 0x0A07,
-  ihiragana: 0x3044,
-  ihookabove: 0x1EC9,
-  iibengali: 0x0988,
-  iicyrillic: 0x0438,
-  iideva: 0x0908,
-  iigujarati: 0x0A88,
-  iigurmukhi: 0x0A08,
-  iimatragurmukhi: 0x0A40,
-  iinvertedbreve: 0x020B,
-  iishortcyrillic: 0x0439,
-  iivowelsignbengali: 0x09C0,
-  iivowelsigndeva: 0x0940,
-  iivowelsigngujarati: 0x0AC0,
-  ij: 0x0133,
-  ikatakana: 0x30A4,
-  ikatakanahalfwidth: 0xFF72,
-  ikorean: 0x3163,
-  ilde: 0x02DC,
-  iluyhebrew: 0x05AC,
-  imacron: 0x012B,
-  imacroncyrillic: 0x04E3,
-  imageorapproximatelyequal: 0x2253,
-  imatragurmukhi: 0x0A3F,
-  imonospace: 0xFF49,
-  increment: 0x2206,
-  infinity: 0x221E,
-  iniarmenian: 0x056B,
-  integral: 0x222B,
-  integralbottom: 0x2321,
-  integralbt: 0x2321,
-  integralex: 0xF8F5,
-  integraltop: 0x2320,
-  integraltp: 0x2320,
-  intersection: 0x2229,
-  intisquare: 0x3305,
-  invbullet: 0x25D8,
-  invcircle: 0x25D9,
-  invsmileface: 0x263B,
-  iocyrillic: 0x0451,
-  iogonek: 0x012F,
-  iota: 0x03B9,
-  iotadieresis: 0x03CA,
-  iotadieresistonos: 0x0390,
-  iotalatin: 0x0269,
-  iotatonos: 0x03AF,
-  iparen: 0x24A4,
-  irigurmukhi: 0x0A72,
-  ismallhiragana: 0x3043,
-  ismallkatakana: 0x30A3,
-  ismallkatakanahalfwidth: 0xFF68,
-  issharbengali: 0x09FA,
-  istroke: 0x0268,
-  isuperior: 0xF6ED,
-  iterationhiragana: 0x309D,
-  iterationkatakana: 0x30FD,
-  itilde: 0x0129,
-  itildebelow: 0x1E2D,
-  iubopomofo: 0x3129,
-  iucyrillic: 0x044E,
-  ivowelsignbengali: 0x09BF,
-  ivowelsigndeva: 0x093F,
-  ivowelsigngujarati: 0x0ABF,
-  izhitsacyrillic: 0x0475,
-  izhitsadblgravecyrillic: 0x0477,
-  j: 0x006A,
-  jaarmenian: 0x0571,
-  jabengali: 0x099C,
-  jadeva: 0x091C,
-  jagujarati: 0x0A9C,
-  jagurmukhi: 0x0A1C,
-  jbopomofo: 0x3110,
-  jcaron: 0x01F0,
-  jcircle: 0x24D9,
-  jcircumflex: 0x0135,
-  jcrossedtail: 0x029D,
-  jdotlessstroke: 0x025F,
-  jecyrillic: 0x0458,
-  jeemarabic: 0x062C,
-  jeemfinalarabic: 0xFE9E,
-  jeeminitialarabic: 0xFE9F,
-  jeemmedialarabic: 0xFEA0,
-  jeharabic: 0x0698,
-  jehfinalarabic: 0xFB8B,
-  jhabengali: 0x099D,
-  jhadeva: 0x091D,
-  jhagujarati: 0x0A9D,
-  jhagurmukhi: 0x0A1D,
-  jheharmenian: 0x057B,
-  jis: 0x3004,
-  jmonospace: 0xFF4A,
-  jparen: 0x24A5,
-  jsuperior: 0x02B2,
-  k: 0x006B,
-  kabashkircyrillic: 0x04A1,
-  kabengali: 0x0995,
-  kacute: 0x1E31,
-  kacyrillic: 0x043A,
-  kadescendercyrillic: 0x049B,
-  kadeva: 0x0915,
-  kaf: 0x05DB,
-  kafarabic: 0x0643,
-  kafdagesh: 0xFB3B,
-  kafdageshhebrew: 0xFB3B,
-  kaffinalarabic: 0xFEDA,
-  kafhebrew: 0x05DB,
-  kafinitialarabic: 0xFEDB,
-  kafmedialarabic: 0xFEDC,
-  kafrafehebrew: 0xFB4D,
-  kagujarati: 0x0A95,
-  kagurmukhi: 0x0A15,
-  kahiragana: 0x304B,
-  kahookcyrillic: 0x04C4,
-  kakatakana: 0x30AB,
-  kakatakanahalfwidth: 0xFF76,
-  kappa: 0x03BA,
-  kappasymbolgreek: 0x03F0,
-  kapyeounmieumkorean: 0x3171,
-  kapyeounphieuphkorean: 0x3184,
-  kapyeounpieupkorean: 0x3178,
-  kapyeounssangpieupkorean: 0x3179,
-  karoriisquare: 0x330D,
-  kashidaautoarabic: 0x0640,
-  kashidaautonosidebearingarabic: 0x0640,
-  kasmallkatakana: 0x30F5,
-  kasquare: 0x3384,
-  kasraarabic: 0x0650,
-  kasratanarabic: 0x064D,
-  kastrokecyrillic: 0x049F,
-  katahiraprolongmarkhalfwidth: 0xFF70,
-  kaverticalstrokecyrillic: 0x049D,
-  kbopomofo: 0x310E,
-  kcalsquare: 0x3389,
-  kcaron: 0x01E9,
-  kcedilla: 0x0137,
-  kcircle: 0x24DA,
-  kcommaaccent: 0x0137,
-  kdotbelow: 0x1E33,
-  keharmenian: 0x0584,
-  kehiragana: 0x3051,
-  kekatakana: 0x30B1,
-  kekatakanahalfwidth: 0xFF79,
-  kenarmenian: 0x056F,
-  kesmallkatakana: 0x30F6,
-  kgreenlandic: 0x0138,
-  khabengali: 0x0996,
-  khacyrillic: 0x0445,
-  khadeva: 0x0916,
-  khagujarati: 0x0A96,
-  khagurmukhi: 0x0A16,
-  khaharabic: 0x062E,
-  khahfinalarabic: 0xFEA6,
-  khahinitialarabic: 0xFEA7,
-  khahmedialarabic: 0xFEA8,
-  kheicoptic: 0x03E7,
-  khhadeva: 0x0959,
-  khhagurmukhi: 0x0A59,
-  khieukhacirclekorean: 0x3278,
-  khieukhaparenkorean: 0x3218,
-  khieukhcirclekorean: 0x326A,
-  khieukhkorean: 0x314B,
-  khieukhparenkorean: 0x320A,
-  khokhaithai: 0x0E02,
-  khokhonthai: 0x0E05,
-  khokhuatthai: 0x0E03,
-  khokhwaithai: 0x0E04,
-  khomutthai: 0x0E5B,
-  khook: 0x0199,
-  khorakhangthai: 0x0E06,
-  khzsquare: 0x3391,
-  kihiragana: 0x304D,
-  kikatakana: 0x30AD,
-  kikatakanahalfwidth: 0xFF77,
-  kiroguramusquare: 0x3315,
-  kiromeetorusquare: 0x3316,
-  kirosquare: 0x3314,
-  kiyeokacirclekorean: 0x326E,
-  kiyeokaparenkorean: 0x320E,
-  kiyeokcirclekorean: 0x3260,
-  kiyeokkorean: 0x3131,
-  kiyeokparenkorean: 0x3200,
-  kiyeoksioskorean: 0x3133,
-  kjecyrillic: 0x045C,
-  klinebelow: 0x1E35,
-  klsquare: 0x3398,
-  kmcubedsquare: 0x33A6,
-  kmonospace: 0xFF4B,
-  kmsquaredsquare: 0x33A2,
-  kohiragana: 0x3053,
-  kohmsquare: 0x33C0,
-  kokaithai: 0x0E01,
-  kokatakana: 0x30B3,
-  kokatakanahalfwidth: 0xFF7A,
-  kooposquare: 0x331E,
-  koppacyrillic: 0x0481,
-  koreanstandardsymbol: 0x327F,
-  koroniscmb: 0x0343,
-  kparen: 0x24A6,
-  kpasquare: 0x33AA,
-  ksicyrillic: 0x046F,
-  ktsquare: 0x33CF,
-  kturned: 0x029E,
-  kuhiragana: 0x304F,
-  kukatakana: 0x30AF,
-  kukatakanahalfwidth: 0xFF78,
-  kvsquare: 0x33B8,
-  kwsquare: 0x33BE,
-  l: 0x006C,
-  labengali: 0x09B2,
-  lacute: 0x013A,
-  ladeva: 0x0932,
-  lagujarati: 0x0AB2,
-  lagurmukhi: 0x0A32,
-  lakkhangyaothai: 0x0E45,
-  lamaleffinalarabic: 0xFEFC,
-  lamalefhamzaabovefinalarabic: 0xFEF8,
-  lamalefhamzaaboveisolatedarabic: 0xFEF7,
-  lamalefhamzabelowfinalarabic: 0xFEFA,
-  lamalefhamzabelowisolatedarabic: 0xFEF9,
-  lamalefisolatedarabic: 0xFEFB,
-  lamalefmaddaabovefinalarabic: 0xFEF6,
-  lamalefmaddaaboveisolatedarabic: 0xFEF5,
-  lamarabic: 0x0644,
-  lambda: 0x03BB,
-  lambdastroke: 0x019B,
-  lamed: 0x05DC,
-  lameddagesh: 0xFB3C,
-  lameddageshhebrew: 0xFB3C,
-  lamedhebrew: 0x05DC,
-  lamfinalarabic: 0xFEDE,
-  lamhahinitialarabic: 0xFCCA,
-  laminitialarabic: 0xFEDF,
-  lamjeeminitialarabic: 0xFCC9,
-  lamkhahinitialarabic: 0xFCCB,
-  lamlamhehisolatedarabic: 0xFDF2,
-  lammedialarabic: 0xFEE0,
-  lammeemhahinitialarabic: 0xFD88,
-  lammeeminitialarabic: 0xFCCC,
-  largecircle: 0x25EF,
-  lbar: 0x019A,
-  lbelt: 0x026C,
-  lbopomofo: 0x310C,
-  lcaron: 0x013E,
-  lcedilla: 0x013C,
-  lcircle: 0x24DB,
-  lcircumflexbelow: 0x1E3D,
-  lcommaaccent: 0x013C,
-  ldot: 0x0140,
-  ldotaccent: 0x0140,
-  ldotbelow: 0x1E37,
-  ldotbelowmacron: 0x1E39,
-  leftangleabovecmb: 0x031A,
-  lefttackbelowcmb: 0x0318,
-  less: 0x003C,
-  lessequal: 0x2264,
-  lessequalorgreater: 0x22DA,
-  lessmonospace: 0xFF1C,
-  lessorequivalent: 0x2272,
-  lessorgreater: 0x2276,
-  lessoverequal: 0x2266,
-  lesssmall: 0xFE64,
-  lezh: 0x026E,
-  lfblock: 0x258C,
-  lhookretroflex: 0x026D,
-  lira: 0x20A4,
-  liwnarmenian: 0x056C,
-  lj: 0x01C9,
-  ljecyrillic: 0x0459,
-  ll: 0xF6C0,
-  lladeva: 0x0933,
-  llagujarati: 0x0AB3,
-  llinebelow: 0x1E3B,
-  llladeva: 0x0934,
-  llvocalicbengali: 0x09E1,
-  llvocalicdeva: 0x0961,
-  llvocalicvowelsignbengali: 0x09E3,
-  llvocalicvowelsigndeva: 0x0963,
-  lmiddletilde: 0x026B,
-  lmonospace: 0xFF4C,
-  lmsquare: 0x33D0,
-  lochulathai: 0x0E2C,
-  logicaland: 0x2227,
-  logicalnot: 0x00AC,
-  logicalnotreversed: 0x2310,
-  logicalor: 0x2228,
-  lolingthai: 0x0E25,
-  longs: 0x017F,
-  lowlinecenterline: 0xFE4E,
-  lowlinecmb: 0x0332,
-  lowlinedashed: 0xFE4D,
-  lozenge: 0x25CA,
-  lparen: 0x24A7,
-  lslash: 0x0142,
-  lsquare: 0x2113,
-  lsuperior: 0xF6EE,
-  ltshade: 0x2591,
-  luthai: 0x0E26,
-  lvocalicbengali: 0x098C,
-  lvocalicdeva: 0x090C,
-  lvocalicvowelsignbengali: 0x09E2,
-  lvocalicvowelsigndeva: 0x0962,
-  lxsquare: 0x33D3,
-  m: 0x006D,
-  mabengali: 0x09AE,
-  macron: 0x00AF,
-  macronbelowcmb: 0x0331,
-  macroncmb: 0x0304,
-  macronlowmod: 0x02CD,
-  macronmonospace: 0xFFE3,
-  macute: 0x1E3F,
-  madeva: 0x092E,
-  magujarati: 0x0AAE,
-  magurmukhi: 0x0A2E,
-  mahapakhhebrew: 0x05A4,
-  mahapakhlefthebrew: 0x05A4,
-  mahiragana: 0x307E,
-  maichattawalowleftthai: 0xF895,
-  maichattawalowrightthai: 0xF894,
-  maichattawathai: 0x0E4B,
-  maichattawaupperleftthai: 0xF893,
-  maieklowleftthai: 0xF88C,
-  maieklowrightthai: 0xF88B,
-  maiekthai: 0x0E48,
-  maiekupperleftthai: 0xF88A,
-  maihanakatleftthai: 0xF884,
-  maihanakatthai: 0x0E31,
-  maitaikhuleftthai: 0xF889,
-  maitaikhuthai: 0x0E47,
-  maitholowleftthai: 0xF88F,
-  maitholowrightthai: 0xF88E,
-  maithothai: 0x0E49,
-  maithoupperleftthai: 0xF88D,
-  maitrilowleftthai: 0xF892,
-  maitrilowrightthai: 0xF891,
-  maitrithai: 0x0E4A,
-  maitriupperleftthai: 0xF890,
-  maiyamokthai: 0x0E46,
-  makatakana: 0x30DE,
-  makatakanahalfwidth: 0xFF8F,
-  male: 0x2642,
-  mansyonsquare: 0x3347,
-  maqafhebrew: 0x05BE,
-  mars: 0x2642,
-  masoracirclehebrew: 0x05AF,
-  masquare: 0x3383,
-  mbopomofo: 0x3107,
-  mbsquare: 0x33D4,
-  mcircle: 0x24DC,
-  mcubedsquare: 0x33A5,
-  mdotaccent: 0x1E41,
-  mdotbelow: 0x1E43,
-  meemarabic: 0x0645,
-  meemfinalarabic: 0xFEE2,
-  meeminitialarabic: 0xFEE3,
-  meemmedialarabic: 0xFEE4,
-  meemmeeminitialarabic: 0xFCD1,
-  meemmeemisolatedarabic: 0xFC48,
-  meetorusquare: 0x334D,
-  mehiragana: 0x3081,
-  meizierasquare: 0x337E,
-  mekatakana: 0x30E1,
-  mekatakanahalfwidth: 0xFF92,
-  mem: 0x05DE,
-  memdagesh: 0xFB3E,
-  memdageshhebrew: 0xFB3E,
-  memhebrew: 0x05DE,
-  menarmenian: 0x0574,
-  merkhahebrew: 0x05A5,
-  merkhakefulahebrew: 0x05A6,
-  merkhakefulalefthebrew: 0x05A6,
-  merkhalefthebrew: 0x05A5,
-  mhook: 0x0271,
-  mhzsquare: 0x3392,
-  middledotkatakanahalfwidth: 0xFF65,
-  middot: 0x00B7,
-  mieumacirclekorean: 0x3272,
-  mieumaparenkorean: 0x3212,
-  mieumcirclekorean: 0x3264,
-  mieumkorean: 0x3141,
-  mieumpansioskorean: 0x3170,
-  mieumparenkorean: 0x3204,
-  mieumpieupkorean: 0x316E,
-  mieumsioskorean: 0x316F,
-  mihiragana: 0x307F,
-  mikatakana: 0x30DF,
-  mikatakanahalfwidth: 0xFF90,
-  minus: 0x2212,
-  minusbelowcmb: 0x0320,
-  minuscircle: 0x2296,
-  minusmod: 0x02D7,
-  minusplus: 0x2213,
-  minute: 0x2032,
-  miribaarusquare: 0x334A,
-  mirisquare: 0x3349,
-  mlonglegturned: 0x0270,
-  mlsquare: 0x3396,
-  mmcubedsquare: 0x33A3,
-  mmonospace: 0xFF4D,
-  mmsquaredsquare: 0x339F,
-  mohiragana: 0x3082,
-  mohmsquare: 0x33C1,
-  mokatakana: 0x30E2,
-  mokatakanahalfwidth: 0xFF93,
-  molsquare: 0x33D6,
-  momathai: 0x0E21,
-  moverssquare: 0x33A7,
-  moverssquaredsquare: 0x33A8,
-  mparen: 0x24A8,
-  mpasquare: 0x33AB,
-  mssquare: 0x33B3,
-  msuperior: 0xF6EF,
-  mturned: 0x026F,
-  mu: 0x00B5,
-  mu1: 0x00B5,
-  muasquare: 0x3382,
-  muchgreater: 0x226B,
-  muchless: 0x226A,
-  mufsquare: 0x338C,
-  mugreek: 0x03BC,
-  mugsquare: 0x338D,
-  muhiragana: 0x3080,
-  mukatakana: 0x30E0,
-  mukatakanahalfwidth: 0xFF91,
-  mulsquare: 0x3395,
-  multiply: 0x00D7,
-  mumsquare: 0x339B,
-  munahhebrew: 0x05A3,
-  munahlefthebrew: 0x05A3,
-  musicalnote: 0x266A,
-  musicalnotedbl: 0x266B,
-  musicflatsign: 0x266D,
-  musicsharpsign: 0x266F,
-  mussquare: 0x33B2,
-  muvsquare: 0x33B6,
-  muwsquare: 0x33BC,
-  mvmegasquare: 0x33B9,
-  mvsquare: 0x33B7,
-  mwmegasquare: 0x33BF,
-  mwsquare: 0x33BD,
-  n: 0x006E,
-  nabengali: 0x09A8,
-  nabla: 0x2207,
-  nacute: 0x0144,
-  nadeva: 0x0928,
-  nagujarati: 0x0AA8,
-  nagurmukhi: 0x0A28,
-  nahiragana: 0x306A,
-  nakatakana: 0x30CA,
-  nakatakanahalfwidth: 0xFF85,
-  napostrophe: 0x0149,
-  nasquare: 0x3381,
-  nbopomofo: 0x310B,
-  nbspace: 0x00A0,
-  ncaron: 0x0148,
-  ncedilla: 0x0146,
-  ncircle: 0x24DD,
-  ncircumflexbelow: 0x1E4B,
-  ncommaaccent: 0x0146,
-  ndotaccent: 0x1E45,
-  ndotbelow: 0x1E47,
-  nehiragana: 0x306D,
-  nekatakana: 0x30CD,
-  nekatakanahalfwidth: 0xFF88,
-  newsheqelsign: 0x20AA,
-  nfsquare: 0x338B,
-  ngabengali: 0x0999,
-  ngadeva: 0x0919,
-  ngagujarati: 0x0A99,
-  ngagurmukhi: 0x0A19,
-  ngonguthai: 0x0E07,
-  nhiragana: 0x3093,
-  nhookleft: 0x0272,
-  nhookretroflex: 0x0273,
-  nieunacirclekorean: 0x326F,
-  nieunaparenkorean: 0x320F,
-  nieuncieuckorean: 0x3135,
-  nieuncirclekorean: 0x3261,
-  nieunhieuhkorean: 0x3136,
-  nieunkorean: 0x3134,
-  nieunpansioskorean: 0x3168,
-  nieunparenkorean: 0x3201,
-  nieunsioskorean: 0x3167,
-  nieuntikeutkorean: 0x3166,
-  nihiragana: 0x306B,
-  nikatakana: 0x30CB,
-  nikatakanahalfwidth: 0xFF86,
-  nikhahitleftthai: 0xF899,
-  nikhahitthai: 0x0E4D,
-  nine: 0x0039,
-  ninearabic: 0x0669,
-  ninebengali: 0x09EF,
-  ninecircle: 0x2468,
-  ninecircleinversesansserif: 0x2792,
-  ninedeva: 0x096F,
-  ninegujarati: 0x0AEF,
-  ninegurmukhi: 0x0A6F,
-  ninehackarabic: 0x0669,
-  ninehangzhou: 0x3029,
-  nineideographicparen: 0x3228,
-  nineinferior: 0x2089,
-  ninemonospace: 0xFF19,
-  nineoldstyle: 0xF739,
-  nineparen: 0x247C,
-  nineperiod: 0x2490,
-  ninepersian: 0x06F9,
-  nineroman: 0x2178,
-  ninesuperior: 0x2079,
-  nineteencircle: 0x2472,
-  nineteenparen: 0x2486,
-  nineteenperiod: 0x249A,
-  ninethai: 0x0E59,
-  nj: 0x01CC,
-  njecyrillic: 0x045A,
-  nkatakana: 0x30F3,
-  nkatakanahalfwidth: 0xFF9D,
-  nlegrightlong: 0x019E,
-  nlinebelow: 0x1E49,
-  nmonospace: 0xFF4E,
-  nmsquare: 0x339A,
-  nnabengali: 0x09A3,
-  nnadeva: 0x0923,
-  nnagujarati: 0x0AA3,
-  nnagurmukhi: 0x0A23,
-  nnnadeva: 0x0929,
-  nohiragana: 0x306E,
-  nokatakana: 0x30CE,
-  nokatakanahalfwidth: 0xFF89,
-  nonbreakingspace: 0x00A0,
-  nonenthai: 0x0E13,
-  nonuthai: 0x0E19,
-  noonarabic: 0x0646,
-  noonfinalarabic: 0xFEE6,
-  noonghunnaarabic: 0x06BA,
-  noonghunnafinalarabic: 0xFB9F,
-  nooninitialarabic: 0xFEE7,
-  noonjeeminitialarabic: 0xFCD2,
-  noonjeemisolatedarabic: 0xFC4B,
-  noonmedialarabic: 0xFEE8,
-  noonmeeminitialarabic: 0xFCD5,
-  noonmeemisolatedarabic: 0xFC4E,
-  noonnoonfinalarabic: 0xFC8D,
-  notcontains: 0x220C,
-  notelement: 0x2209,
-  notelementof: 0x2209,
-  notequal: 0x2260,
-  notgreater: 0x226F,
-  notgreaternorequal: 0x2271,
-  notgreaternorless: 0x2279,
-  notidentical: 0x2262,
-  notless: 0x226E,
-  notlessnorequal: 0x2270,
-  notparallel: 0x2226,
-  notprecedes: 0x2280,
-  notsubset: 0x2284,
-  notsucceeds: 0x2281,
-  notsuperset: 0x2285,
-  nowarmenian: 0x0576,
-  nparen: 0x24A9,
-  nssquare: 0x33B1,
-  nsuperior: 0x207F,
-  ntilde: 0x00F1,
-  nu: 0x03BD,
-  nuhiragana: 0x306C,
-  nukatakana: 0x30CC,
-  nukatakanahalfwidth: 0xFF87,
-  nuktabengali: 0x09BC,
-  nuktadeva: 0x093C,
-  nuktagujarati: 0x0ABC,
-  nuktagurmukhi: 0x0A3C,
-  numbersign: 0x0023,
-  numbersignmonospace: 0xFF03,
-  numbersignsmall: 0xFE5F,
-  numeralsigngreek: 0x0374,
-  numeralsignlowergreek: 0x0375,
-  numero: 0x2116,
-  nun: 0x05E0,
-  nundagesh: 0xFB40,
-  nundageshhebrew: 0xFB40,
-  nunhebrew: 0x05E0,
-  nvsquare: 0x33B5,
-  nwsquare: 0x33BB,
-  nyabengali: 0x099E,
-  nyadeva: 0x091E,
-  nyagujarati: 0x0A9E,
-  nyagurmukhi: 0x0A1E,
-  o: 0x006F,
-  oacute: 0x00F3,
-  oangthai: 0x0E2D,
-  obarred: 0x0275,
-  obarredcyrillic: 0x04E9,
-  obarreddieresiscyrillic: 0x04EB,
-  obengali: 0x0993,
-  obopomofo: 0x311B,
-  obreve: 0x014F,
-  ocandradeva: 0x0911,
-  ocandragujarati: 0x0A91,
-  ocandravowelsigndeva: 0x0949,
-  ocandravowelsigngujarati: 0x0AC9,
-  ocaron: 0x01D2,
-  ocircle: 0x24DE,
-  ocircumflex: 0x00F4,
-  ocircumflexacute: 0x1ED1,
-  ocircumflexdotbelow: 0x1ED9,
-  ocircumflexgrave: 0x1ED3,
-  ocircumflexhookabove: 0x1ED5,
-  ocircumflextilde: 0x1ED7,
-  ocyrillic: 0x043E,
-  odblacute: 0x0151,
-  odblgrave: 0x020D,
-  odeva: 0x0913,
-  odieresis: 0x00F6,
-  odieresiscyrillic: 0x04E7,
-  odotbelow: 0x1ECD,
-  oe: 0x0153,
-  oekorean: 0x315A,
-  ogonek: 0x02DB,
-  ogonekcmb: 0x0328,
-  ograve: 0x00F2,
-  ogujarati: 0x0A93,
-  oharmenian: 0x0585,
-  ohiragana: 0x304A,
-  ohookabove: 0x1ECF,
-  ohorn: 0x01A1,
-  ohornacute: 0x1EDB,
-  ohorndotbelow: 0x1EE3,
-  ohorngrave: 0x1EDD,
-  ohornhookabove: 0x1EDF,
-  ohorntilde: 0x1EE1,
-  ohungarumlaut: 0x0151,
-  oi: 0x01A3,
-  oinvertedbreve: 0x020F,
-  okatakana: 0x30AA,
-  okatakanahalfwidth: 0xFF75,
-  okorean: 0x3157,
-  olehebrew: 0x05AB,
-  omacron: 0x014D,
-  omacronacute: 0x1E53,
-  omacrongrave: 0x1E51,
-  omdeva: 0x0950,
-  omega: 0x03C9,
-  omega1: 0x03D6,
-  omegacyrillic: 0x0461,
-  omegalatinclosed: 0x0277,
-  omegaroundcyrillic: 0x047B,
-  omegatitlocyrillic: 0x047D,
-  omegatonos: 0x03CE,
-  omgujarati: 0x0AD0,
-  omicron: 0x03BF,
-  omicrontonos: 0x03CC,
-  omonospace: 0xFF4F,
-  one: 0x0031,
-  onearabic: 0x0661,
-  onebengali: 0x09E7,
-  onecircle: 0x2460,
-  onecircleinversesansserif: 0x278A,
-  onedeva: 0x0967,
-  onedotenleader: 0x2024,
-  oneeighth: 0x215B,
-  onefitted: 0xF6DC,
-  onegujarati: 0x0AE7,
-  onegurmukhi: 0x0A67,
-  onehackarabic: 0x0661,
-  onehalf: 0x00BD,
-  onehangzhou: 0x3021,
-  oneideographicparen: 0x3220,
-  oneinferior: 0x2081,
-  onemonospace: 0xFF11,
-  onenumeratorbengali: 0x09F4,
-  oneoldstyle: 0xF731,
-  oneparen: 0x2474,
-  oneperiod: 0x2488,
-  onepersian: 0x06F1,
-  onequarter: 0x00BC,
-  oneroman: 0x2170,
-  onesuperior: 0x00B9,
-  onethai: 0x0E51,
-  onethird: 0x2153,
-  oogonek: 0x01EB,
-  oogonekmacron: 0x01ED,
-  oogurmukhi: 0x0A13,
-  oomatragurmukhi: 0x0A4B,
-  oopen: 0x0254,
-  oparen: 0x24AA,
-  openbullet: 0x25E6,
-  option: 0x2325,
-  ordfeminine: 0x00AA,
-  ordmasculine: 0x00BA,
-  orthogonal: 0x221F,
-  oshortdeva: 0x0912,
-  oshortvowelsigndeva: 0x094A,
-  oslash: 0x00F8,
-  oslashacute: 0x01FF,
-  osmallhiragana: 0x3049,
-  osmallkatakana: 0x30A9,
-  osmallkatakanahalfwidth: 0xFF6B,
-  ostrokeacute: 0x01FF,
-  osuperior: 0xF6F0,
-  otcyrillic: 0x047F,
-  otilde: 0x00F5,
-  otildeacute: 0x1E4D,
-  otildedieresis: 0x1E4F,
-  oubopomofo: 0x3121,
-  overline: 0x203E,
-  overlinecenterline: 0xFE4A,
-  overlinecmb: 0x0305,
-  overlinedashed: 0xFE49,
-  overlinedblwavy: 0xFE4C,
-  overlinewavy: 0xFE4B,
-  overscore: 0x00AF,
-  ovowelsignbengali: 0x09CB,
-  ovowelsigndeva: 0x094B,
-  ovowelsigngujarati: 0x0ACB,
-  p: 0x0070,
-  paampssquare: 0x3380,
-  paasentosquare: 0x332B,
-  pabengali: 0x09AA,
-  pacute: 0x1E55,
-  padeva: 0x092A,
-  pagedown: 0x21DF,
-  pageup: 0x21DE,
-  pagujarati: 0x0AAA,
-  pagurmukhi: 0x0A2A,
-  pahiragana: 0x3071,
-  paiyannoithai: 0x0E2F,
-  pakatakana: 0x30D1,
-  palatalizationcyrilliccmb: 0x0484,
-  palochkacyrillic: 0x04C0,
-  pansioskorean: 0x317F,
-  paragraph: 0x00B6,
-  parallel: 0x2225,
-  parenleft: 0x0028,
-  parenleftaltonearabic: 0xFD3E,
-  parenleftbt: 0xF8ED,
-  parenleftex: 0xF8EC,
-  parenleftinferior: 0x208D,
-  parenleftmonospace: 0xFF08,
-  parenleftsmall: 0xFE59,
-  parenleftsuperior: 0x207D,
-  parenlefttp: 0xF8EB,
-  parenleftvertical: 0xFE35,
-  parenright: 0x0029,
-  parenrightaltonearabic: 0xFD3F,
-  parenrightbt: 0xF8F8,
-  parenrightex: 0xF8F7,
-  parenrightinferior: 0x208E,
-  parenrightmonospace: 0xFF09,
-  parenrightsmall: 0xFE5A,
-  parenrightsuperior: 0x207E,
-  parenrighttp: 0xF8F6,
-  parenrightvertical: 0xFE36,
-  partialdiff: 0x2202,
-  paseqhebrew: 0x05C0,
-  pashtahebrew: 0x0599,
-  pasquare: 0x33A9,
-  patah: 0x05B7,
-  patah11: 0x05B7,
-  patah1d: 0x05B7,
-  patah2a: 0x05B7,
-  patahhebrew: 0x05B7,
-  patahnarrowhebrew: 0x05B7,
-  patahquarterhebrew: 0x05B7,
-  patahwidehebrew: 0x05B7,
-  pazerhebrew: 0x05A1,
-  pbopomofo: 0x3106,
-  pcircle: 0x24DF,
-  pdotaccent: 0x1E57,
-  pe: 0x05E4,
-  pecyrillic: 0x043F,
-  pedagesh: 0xFB44,
-  pedageshhebrew: 0xFB44,
-  peezisquare: 0x333B,
-  pefinaldageshhebrew: 0xFB43,
-  peharabic: 0x067E,
-  peharmenian: 0x057A,
-  pehebrew: 0x05E4,
-  pehfinalarabic: 0xFB57,
-  pehinitialarabic: 0xFB58,
-  pehiragana: 0x307A,
-  pehmedialarabic: 0xFB59,
-  pekatakana: 0x30DA,
-  pemiddlehookcyrillic: 0x04A7,
-  perafehebrew: 0xFB4E,
-  percent: 0x0025,
-  percentarabic: 0x066A,
-  percentmonospace: 0xFF05,
-  percentsmall: 0xFE6A,
-  period: 0x002E,
-  periodarmenian: 0x0589,
-  periodcentered: 0x00B7,
-  periodhalfwidth: 0xFF61,
-  periodinferior: 0xF6E7,
-  periodmonospace: 0xFF0E,
-  periodsmall: 0xFE52,
-  periodsuperior: 0xF6E8,
-  perispomenigreekcmb: 0x0342,
-  perpendicular: 0x22A5,
-  perthousand: 0x2030,
-  peseta: 0x20A7,
-  pfsquare: 0x338A,
-  phabengali: 0x09AB,
-  phadeva: 0x092B,
-  phagujarati: 0x0AAB,
-  phagurmukhi: 0x0A2B,
-  phi: 0x03C6,
-  phi1: 0x03D5,
-  phieuphacirclekorean: 0x327A,
-  phieuphaparenkorean: 0x321A,
-  phieuphcirclekorean: 0x326C,
-  phieuphkorean: 0x314D,
-  phieuphparenkorean: 0x320C,
-  philatin: 0x0278,
-  phinthuthai: 0x0E3A,
-  phisymbolgreek: 0x03D5,
-  phook: 0x01A5,
-  phophanthai: 0x0E1E,
-  phophungthai: 0x0E1C,
-  phosamphaothai: 0x0E20,
-  pi: 0x03C0,
-  pieupacirclekorean: 0x3273,
-  pieupaparenkorean: 0x3213,
-  pieupcieuckorean: 0x3176,
-  pieupcirclekorean: 0x3265,
-  pieupkiyeokkorean: 0x3172,
-  pieupkorean: 0x3142,
-  pieupparenkorean: 0x3205,
-  pieupsioskiyeokkorean: 0x3174,
-  pieupsioskorean: 0x3144,
-  pieupsiostikeutkorean: 0x3175,
-  pieupthieuthkorean: 0x3177,
-  pieuptikeutkorean: 0x3173,
-  pihiragana: 0x3074,
-  pikatakana: 0x30D4,
-  pisymbolgreek: 0x03D6,
-  piwrarmenian: 0x0583,
-  plus: 0x002B,
-  plusbelowcmb: 0x031F,
-  pluscircle: 0x2295,
-  plusminus: 0x00B1,
-  plusmod: 0x02D6,
-  plusmonospace: 0xFF0B,
-  plussmall: 0xFE62,
-  plussuperior: 0x207A,
-  pmonospace: 0xFF50,
-  pmsquare: 0x33D8,
-  pohiragana: 0x307D,
-  pointingindexdownwhite: 0x261F,
-  pointingindexleftwhite: 0x261C,
-  pointingindexrightwhite: 0x261E,
-  pointingindexupwhite: 0x261D,
-  pokatakana: 0x30DD,
-  poplathai: 0x0E1B,
-  postalmark: 0x3012,
-  postalmarkface: 0x3020,
-  pparen: 0x24AB,
-  precedes: 0x227A,
-  prescription: 0x211E,
-  primemod: 0x02B9,
-  primereversed: 0x2035,
-  product: 0x220F,
-  projective: 0x2305,
-  prolongedkana: 0x30FC,
-  propellor: 0x2318,
-  propersubset: 0x2282,
-  propersuperset: 0x2283,
-  proportion: 0x2237,
-  proportional: 0x221D,
-  psi: 0x03C8,
-  psicyrillic: 0x0471,
-  psilipneumatacyrilliccmb: 0x0486,
-  pssquare: 0x33B0,
-  puhiragana: 0x3077,
-  pukatakana: 0x30D7,
-  pvsquare: 0x33B4,
-  pwsquare: 0x33BA,
-  q: 0x0071,
-  qadeva: 0x0958,
-  qadmahebrew: 0x05A8,
-  qafarabic: 0x0642,
-  qaffinalarabic: 0xFED6,
-  qafinitialarabic: 0xFED7,
-  qafmedialarabic: 0xFED8,
-  qamats: 0x05B8,
-  qamats10: 0x05B8,
-  qamats1a: 0x05B8,
-  qamats1c: 0x05B8,
-  qamats27: 0x05B8,
-  qamats29: 0x05B8,
-  qamats33: 0x05B8,
-  qamatsde: 0x05B8,
-  qamatshebrew: 0x05B8,
-  qamatsnarrowhebrew: 0x05B8,
-  qamatsqatanhebrew: 0x05B8,
-  qamatsqatannarrowhebrew: 0x05B8,
-  qamatsqatanquarterhebrew: 0x05B8,
-  qamatsqatanwidehebrew: 0x05B8,
-  qamatsquarterhebrew: 0x05B8,
-  qamatswidehebrew: 0x05B8,
-  qarneyparahebrew: 0x059F,
-  qbopomofo: 0x3111,
-  qcircle: 0x24E0,
-  qhook: 0x02A0,
-  qmonospace: 0xFF51,
-  qof: 0x05E7,
-  qofdagesh: 0xFB47,
-  qofdageshhebrew: 0xFB47,
-  qofhebrew: 0x05E7,
-  qparen: 0x24AC,
-  quarternote: 0x2669,
-  qubuts: 0x05BB,
-  qubuts18: 0x05BB,
-  qubuts25: 0x05BB,
-  qubuts31: 0x05BB,
-  qubutshebrew: 0x05BB,
-  qubutsnarrowhebrew: 0x05BB,
-  qubutsquarterhebrew: 0x05BB,
-  qubutswidehebrew: 0x05BB,
-  question: 0x003F,
-  questionarabic: 0x061F,
-  questionarmenian: 0x055E,
-  questiondown: 0x00BF,
-  questiondownsmall: 0xF7BF,
-  questiongreek: 0x037E,
-  questionmonospace: 0xFF1F,
-  questionsmall: 0xF73F,
-  quotedbl: 0x0022,
-  quotedblbase: 0x201E,
-  quotedblleft: 0x201C,
-  quotedblmonospace: 0xFF02,
-  quotedblprime: 0x301E,
-  quotedblprimereversed: 0x301D,
-  quotedblright: 0x201D,
-  quoteleft: 0x2018,
-  quoteleftreversed: 0x201B,
-  quotereversed: 0x201B,
-  quoteright: 0x2019,
-  quoterightn: 0x0149,
-  quotesinglbase: 0x201A,
-  quotesingle: 0x0027,
-  quotesinglemonospace: 0xFF07,
-  r: 0x0072,
-  raarmenian: 0x057C,
-  rabengali: 0x09B0,
-  racute: 0x0155,
-  radeva: 0x0930,
-  radical: 0x221A,
-  radicalex: 0xF8E5,
-  radoverssquare: 0x33AE,
-  radoverssquaredsquare: 0x33AF,
-  radsquare: 0x33AD,
-  rafe: 0x05BF,
-  rafehebrew: 0x05BF,
-  ragujarati: 0x0AB0,
-  ragurmukhi: 0x0A30,
-  rahiragana: 0x3089,
-  rakatakana: 0x30E9,
-  rakatakanahalfwidth: 0xFF97,
-  ralowerdiagonalbengali: 0x09F1,
-  ramiddlediagonalbengali: 0x09F0,
-  ramshorn: 0x0264,
-  ratio: 0x2236,
-  rbopomofo: 0x3116,
-  rcaron: 0x0159,
-  rcedilla: 0x0157,
-  rcircle: 0x24E1,
-  rcommaaccent: 0x0157,
-  rdblgrave: 0x0211,
-  rdotaccent: 0x1E59,
-  rdotbelow: 0x1E5B,
-  rdotbelowmacron: 0x1E5D,
-  referencemark: 0x203B,
-  reflexsubset: 0x2286,
-  reflexsuperset: 0x2287,
-  registered: 0x00AE,
-  registersans: 0xF8E8,
-  registerserif: 0xF6DA,
-  reharabic: 0x0631,
-  reharmenian: 0x0580,
-  rehfinalarabic: 0xFEAE,
-  rehiragana: 0x308C,
-  rekatakana: 0x30EC,
-  rekatakanahalfwidth: 0xFF9A,
-  resh: 0x05E8,
-  reshdageshhebrew: 0xFB48,
-  reshhebrew: 0x05E8,
-  reversedtilde: 0x223D,
-  reviahebrew: 0x0597,
-  reviamugrashhebrew: 0x0597,
-  revlogicalnot: 0x2310,
-  rfishhook: 0x027E,
-  rfishhookreversed: 0x027F,
-  rhabengali: 0x09DD,
-  rhadeva: 0x095D,
-  rho: 0x03C1,
-  rhook: 0x027D,
-  rhookturned: 0x027B,
-  rhookturnedsuperior: 0x02B5,
-  rhosymbolgreek: 0x03F1,
-  rhotichookmod: 0x02DE,
-  rieulacirclekorean: 0x3271,
-  rieulaparenkorean: 0x3211,
-  rieulcirclekorean: 0x3263,
-  rieulhieuhkorean: 0x3140,
-  rieulkiyeokkorean: 0x313A,
-  rieulkiyeoksioskorean: 0x3169,
-  rieulkorean: 0x3139,
-  rieulmieumkorean: 0x313B,
-  rieulpansioskorean: 0x316C,
-  rieulparenkorean: 0x3203,
-  rieulphieuphkorean: 0x313F,
-  rieulpieupkorean: 0x313C,
-  rieulpieupsioskorean: 0x316B,
-  rieulsioskorean: 0x313D,
-  rieulthieuthkorean: 0x313E,
-  rieultikeutkorean: 0x316A,
-  rieulyeorinhieuhkorean: 0x316D,
-  rightangle: 0x221F,
-  righttackbelowcmb: 0x0319,
-  righttriangle: 0x22BF,
-  rihiragana: 0x308A,
-  rikatakana: 0x30EA,
-  rikatakanahalfwidth: 0xFF98,
-  ring: 0x02DA,
-  ringbelowcmb: 0x0325,
-  ringcmb: 0x030A,
-  ringhalfleft: 0x02BF,
-  ringhalfleftarmenian: 0x0559,
-  ringhalfleftbelowcmb: 0x031C,
-  ringhalfleftcentered: 0x02D3,
-  ringhalfright: 0x02BE,
-  ringhalfrightbelowcmb: 0x0339,
-  ringhalfrightcentered: 0x02D2,
-  rinvertedbreve: 0x0213,
-  rittorusquare: 0x3351,
-  rlinebelow: 0x1E5F,
-  rlongleg: 0x027C,
-  rlonglegturned: 0x027A,
-  rmonospace: 0xFF52,
-  rohiragana: 0x308D,
-  rokatakana: 0x30ED,
-  rokatakanahalfwidth: 0xFF9B,
-  roruathai: 0x0E23,
-  rparen: 0x24AD,
-  rrabengali: 0x09DC,
-  rradeva: 0x0931,
-  rragurmukhi: 0x0A5C,
-  rreharabic: 0x0691,
-  rrehfinalarabic: 0xFB8D,
-  rrvocalicbengali: 0x09E0,
-  rrvocalicdeva: 0x0960,
-  rrvocalicgujarati: 0x0AE0,
-  rrvocalicvowelsignbengali: 0x09C4,
-  rrvocalicvowelsigndeva: 0x0944,
-  rrvocalicvowelsigngujarati: 0x0AC4,
-  rsuperior: 0xF6F1,
-  rtblock: 0x2590,
-  rturned: 0x0279,
-  rturnedsuperior: 0x02B4,
-  ruhiragana: 0x308B,
-  rukatakana: 0x30EB,
-  rukatakanahalfwidth: 0xFF99,
-  rupeemarkbengali: 0x09F2,
-  rupeesignbengali: 0x09F3,
-  rupiah: 0xF6DD,
-  ruthai: 0x0E24,
-  rvocalicbengali: 0x098B,
-  rvocalicdeva: 0x090B,
-  rvocalicgujarati: 0x0A8B,
-  rvocalicvowelsignbengali: 0x09C3,
-  rvocalicvowelsigndeva: 0x0943,
-  rvocalicvowelsigngujarati: 0x0AC3,
-  s: 0x0073,
-  sabengali: 0x09B8,
-  sacute: 0x015B,
-  sacutedotaccent: 0x1E65,
-  sadarabic: 0x0635,
-  sadeva: 0x0938,
-  sadfinalarabic: 0xFEBA,
-  sadinitialarabic: 0xFEBB,
-  sadmedialarabic: 0xFEBC,
-  sagujarati: 0x0AB8,
-  sagurmukhi: 0x0A38,
-  sahiragana: 0x3055,
-  sakatakana: 0x30B5,
-  sakatakanahalfwidth: 0xFF7B,
-  sallallahoualayhewasallamarabic: 0xFDFA,
-  samekh: 0x05E1,
-  samekhdagesh: 0xFB41,
-  samekhdageshhebrew: 0xFB41,
-  samekhhebrew: 0x05E1,
-  saraaathai: 0x0E32,
-  saraaethai: 0x0E41,
-  saraaimaimalaithai: 0x0E44,
-  saraaimaimuanthai: 0x0E43,
-  saraamthai: 0x0E33,
-  saraathai: 0x0E30,
-  saraethai: 0x0E40,
-  saraiileftthai: 0xF886,
-  saraiithai: 0x0E35,
-  saraileftthai: 0xF885,
-  saraithai: 0x0E34,
-  saraothai: 0x0E42,
-  saraueeleftthai: 0xF888,
-  saraueethai: 0x0E37,
-  saraueleftthai: 0xF887,
-  sarauethai: 0x0E36,
-  sarauthai: 0x0E38,
-  sarauuthai: 0x0E39,
-  sbopomofo: 0x3119,
-  scaron: 0x0161,
-  scarondotaccent: 0x1E67,
-  scedilla: 0x015F,
-  schwa: 0x0259,
-  schwacyrillic: 0x04D9,
-  schwadieresiscyrillic: 0x04DB,
-  schwahook: 0x025A,
-  scircle: 0x24E2,
-  scircumflex: 0x015D,
-  scommaaccent: 0x0219,
-  sdotaccent: 0x1E61,
-  sdotbelow: 0x1E63,
-  sdotbelowdotaccent: 0x1E69,
-  seagullbelowcmb: 0x033C,
-  second: 0x2033,
-  secondtonechinese: 0x02CA,
-  section: 0x00A7,
-  seenarabic: 0x0633,
-  seenfinalarabic: 0xFEB2,
-  seeninitialarabic: 0xFEB3,
-  seenmedialarabic: 0xFEB4,
-  segol: 0x05B6,
-  segol13: 0x05B6,
-  segol1f: 0x05B6,
-  segol2c: 0x05B6,
-  segolhebrew: 0x05B6,
-  segolnarrowhebrew: 0x05B6,
-  segolquarterhebrew: 0x05B6,
-  segoltahebrew: 0x0592,
-  segolwidehebrew: 0x05B6,
-  seharmenian: 0x057D,
-  sehiragana: 0x305B,
-  sekatakana: 0x30BB,
-  sekatakanahalfwidth: 0xFF7E,
-  semicolon: 0x003B,
-  semicolonarabic: 0x061B,
-  semicolonmonospace: 0xFF1B,
-  semicolonsmall: 0xFE54,
-  semivoicedmarkkana: 0x309C,
-  semivoicedmarkkanahalfwidth: 0xFF9F,
-  sentisquare: 0x3322,
-  sentosquare: 0x3323,
-  seven: 0x0037,
-  sevenarabic: 0x0667,
-  sevenbengali: 0x09ED,
-  sevencircle: 0x2466,
-  sevencircleinversesansserif: 0x2790,
-  sevendeva: 0x096D,
-  seveneighths: 0x215E,
-  sevengujarati: 0x0AED,
-  sevengurmukhi: 0x0A6D,
-  sevenhackarabic: 0x0667,
-  sevenhangzhou: 0x3027,
-  sevenideographicparen: 0x3226,
-  seveninferior: 0x2087,
-  sevenmonospace: 0xFF17,
-  sevenoldstyle: 0xF737,
-  sevenparen: 0x247A,
-  sevenperiod: 0x248E,
-  sevenpersian: 0x06F7,
-  sevenroman: 0x2176,
-  sevensuperior: 0x2077,
-  seventeencircle: 0x2470,
-  seventeenparen: 0x2484,
-  seventeenperiod: 0x2498,
-  seventhai: 0x0E57,
-  sfthyphen: 0x00AD,
-  shaarmenian: 0x0577,
-  shabengali: 0x09B6,
-  shacyrillic: 0x0448,
-  shaddaarabic: 0x0651,
-  shaddadammaarabic: 0xFC61,
-  shaddadammatanarabic: 0xFC5E,
-  shaddafathaarabic: 0xFC60,
-  shaddakasraarabic: 0xFC62,
-  shaddakasratanarabic: 0xFC5F,
-  shade: 0x2592,
-  shadedark: 0x2593,
-  shadelight: 0x2591,
-  shademedium: 0x2592,
-  shadeva: 0x0936,
-  shagujarati: 0x0AB6,
-  shagurmukhi: 0x0A36,
-  shalshelethebrew: 0x0593,
-  shbopomofo: 0x3115,
-  shchacyrillic: 0x0449,
-  sheenarabic: 0x0634,
-  sheenfinalarabic: 0xFEB6,
-  sheeninitialarabic: 0xFEB7,
-  sheenmedialarabic: 0xFEB8,
-  sheicoptic: 0x03E3,
-  sheqel: 0x20AA,
-  sheqelhebrew: 0x20AA,
-  sheva: 0x05B0,
-  sheva115: 0x05B0,
-  sheva15: 0x05B0,
-  sheva22: 0x05B0,
-  sheva2e: 0x05B0,
-  shevahebrew: 0x05B0,
-  shevanarrowhebrew: 0x05B0,
-  shevaquarterhebrew: 0x05B0,
-  shevawidehebrew: 0x05B0,
-  shhacyrillic: 0x04BB,
-  shimacoptic: 0x03ED,
-  shin: 0x05E9,
-  shindagesh: 0xFB49,
-  shindageshhebrew: 0xFB49,
-  shindageshshindot: 0xFB2C,
-  shindageshshindothebrew: 0xFB2C,
-  shindageshsindot: 0xFB2D,
-  shindageshsindothebrew: 0xFB2D,
-  shindothebrew: 0x05C1,
-  shinhebrew: 0x05E9,
-  shinshindot: 0xFB2A,
-  shinshindothebrew: 0xFB2A,
-  shinsindot: 0xFB2B,
-  shinsindothebrew: 0xFB2B,
-  shook: 0x0282,
-  sigma: 0x03C3,
-  sigma1: 0x03C2,
-  sigmafinal: 0x03C2,
-  sigmalunatesymbolgreek: 0x03F2,
-  sihiragana: 0x3057,
-  sikatakana: 0x30B7,
-  sikatakanahalfwidth: 0xFF7C,
-  siluqhebrew: 0x05BD,
-  siluqlefthebrew: 0x05BD,
-  similar: 0x223C,
-  sindothebrew: 0x05C2,
-  siosacirclekorean: 0x3274,
-  siosaparenkorean: 0x3214,
-  sioscieuckorean: 0x317E,
-  sioscirclekorean: 0x3266,
-  sioskiyeokkorean: 0x317A,
-  sioskorean: 0x3145,
-  siosnieunkorean: 0x317B,
-  siosparenkorean: 0x3206,
-  siospieupkorean: 0x317D,
-  siostikeutkorean: 0x317C,
-  six: 0x0036,
-  sixarabic: 0x0666,
-  sixbengali: 0x09EC,
-  sixcircle: 0x2465,
-  sixcircleinversesansserif: 0x278F,
-  sixdeva: 0x096C,
-  sixgujarati: 0x0AEC,
-  sixgurmukhi: 0x0A6C,
-  sixhackarabic: 0x0666,
-  sixhangzhou: 0x3026,
-  sixideographicparen: 0x3225,
-  sixinferior: 0x2086,
-  sixmonospace: 0xFF16,
-  sixoldstyle: 0xF736,
-  sixparen: 0x2479,
-  sixperiod: 0x248D,
-  sixpersian: 0x06F6,
-  sixroman: 0x2175,
-  sixsuperior: 0x2076,
-  sixteencircle: 0x246F,
-  sixteencurrencydenominatorbengali: 0x09F9,
-  sixteenparen: 0x2483,
-  sixteenperiod: 0x2497,
-  sixthai: 0x0E56,
-  slash: 0x002F,
-  slashmonospace: 0xFF0F,
-  slong: 0x017F,
-  slongdotaccent: 0x1E9B,
-  smileface: 0x263A,
-  smonospace: 0xFF53,
-  sofpasuqhebrew: 0x05C3,
-  softhyphen: 0x00AD,
-  softsigncyrillic: 0x044C,
-  sohiragana: 0x305D,
-  sokatakana: 0x30BD,
-  sokatakanahalfwidth: 0xFF7F,
-  soliduslongoverlaycmb: 0x0338,
-  solidusshortoverlaycmb: 0x0337,
-  sorusithai: 0x0E29,
-  sosalathai: 0x0E28,
-  sosothai: 0x0E0B,
-  sosuathai: 0x0E2A,
-  space: 0x0020,
-  spacehackarabic: 0x0020,
-  spade: 0x2660,
-  spadesuitblack: 0x2660,
-  spadesuitwhite: 0x2664,
-  sparen: 0x24AE,
-  squarebelowcmb: 0x033B,
-  squarecc: 0x33C4,
-  squarecm: 0x339D,
-  squarediagonalcrosshatchfill: 0x25A9,
-  squarehorizontalfill: 0x25A4,
-  squarekg: 0x338F,
-  squarekm: 0x339E,
-  squarekmcapital: 0x33CE,
-  squareln: 0x33D1,
-  squarelog: 0x33D2,
-  squaremg: 0x338E,
-  squaremil: 0x33D5,
-  squaremm: 0x339C,
-  squaremsquared: 0x33A1,
-  squareorthogonalcrosshatchfill: 0x25A6,
-  squareupperlefttolowerrightfill: 0x25A7,
-  squareupperrighttolowerleftfill: 0x25A8,
-  squareverticalfill: 0x25A5,
-  squarewhitewithsmallblack: 0x25A3,
-  srsquare: 0x33DB,
-  ssabengali: 0x09B7,
-  ssadeva: 0x0937,
-  ssagujarati: 0x0AB7,
-  ssangcieuckorean: 0x3149,
-  ssanghieuhkorean: 0x3185,
-  ssangieungkorean: 0x3180,
-  ssangkiyeokkorean: 0x3132,
-  ssangnieunkorean: 0x3165,
-  ssangpieupkorean: 0x3143,
-  ssangsioskorean: 0x3146,
-  ssangtikeutkorean: 0x3138,
-  ssuperior: 0xF6F2,
-  sterling: 0x00A3,
-  sterlingmonospace: 0xFFE1,
-  strokelongoverlaycmb: 0x0336,
-  strokeshortoverlaycmb: 0x0335,
-  subset: 0x2282,
-  subsetnotequal: 0x228A,
-  subsetorequal: 0x2286,
-  succeeds: 0x227B,
-  suchthat: 0x220B,
-  suhiragana: 0x3059,
-  sukatakana: 0x30B9,
-  sukatakanahalfwidth: 0xFF7D,
-  sukunarabic: 0x0652,
-  summation: 0x2211,
-  sun: 0x263C,
-  superset: 0x2283,
-  supersetnotequal: 0x228B,
-  supersetorequal: 0x2287,
-  svsquare: 0x33DC,
-  syouwaerasquare: 0x337C,
-  t: 0x0074,
-  tabengali: 0x09A4,
-  tackdown: 0x22A4,
-  tackleft: 0x22A3,
-  tadeva: 0x0924,
-  tagujarati: 0x0AA4,
-  tagurmukhi: 0x0A24,
-  taharabic: 0x0637,
-  tahfinalarabic: 0xFEC2,
-  tahinitialarabic: 0xFEC3,
-  tahiragana: 0x305F,
-  tahmedialarabic: 0xFEC4,
-  taisyouerasquare: 0x337D,
-  takatakana: 0x30BF,
-  takatakanahalfwidth: 0xFF80,
-  tatweelarabic: 0x0640,
-  tau: 0x03C4,
-  tav: 0x05EA,
-  tavdages: 0xFB4A,
-  tavdagesh: 0xFB4A,
-  tavdageshhebrew: 0xFB4A,
-  tavhebrew: 0x05EA,
-  tbar: 0x0167,
-  tbopomofo: 0x310A,
-  tcaron: 0x0165,
-  tccurl: 0x02A8,
-  tcedilla: 0x0163,
-  tcheharabic: 0x0686,
-  tchehfinalarabic: 0xFB7B,
-  tchehinitialarabic: 0xFB7C,
-  tchehmedialarabic: 0xFB7D,
-  tcircle: 0x24E3,
-  tcircumflexbelow: 0x1E71,
-  tcommaaccent: 0x0163,
-  tdieresis: 0x1E97,
-  tdotaccent: 0x1E6B,
-  tdotbelow: 0x1E6D,
-  tecyrillic: 0x0442,
-  tedescendercyrillic: 0x04AD,
-  teharabic: 0x062A,
-  tehfinalarabic: 0xFE96,
-  tehhahinitialarabic: 0xFCA2,
-  tehhahisolatedarabic: 0xFC0C,
-  tehinitialarabic: 0xFE97,
-  tehiragana: 0x3066,
-  tehjeeminitialarabic: 0xFCA1,
-  tehjeemisolatedarabic: 0xFC0B,
-  tehmarbutaarabic: 0x0629,
-  tehmarbutafinalarabic: 0xFE94,
-  tehmedialarabic: 0xFE98,
-  tehmeeminitialarabic: 0xFCA4,
-  tehmeemisolatedarabic: 0xFC0E,
-  tehnoonfinalarabic: 0xFC73,
-  tekatakana: 0x30C6,
-  tekatakanahalfwidth: 0xFF83,
-  telephone: 0x2121,
-  telephoneblack: 0x260E,
-  telishagedolahebrew: 0x05A0,
-  telishaqetanahebrew: 0x05A9,
-  tencircle: 0x2469,
-  tenideographicparen: 0x3229,
-  tenparen: 0x247D,
-  tenperiod: 0x2491,
-  tenroman: 0x2179,
-  tesh: 0x02A7,
-  tet: 0x05D8,
-  tetdagesh: 0xFB38,
-  tetdageshhebrew: 0xFB38,
-  tethebrew: 0x05D8,
-  tetsecyrillic: 0x04B5,
-  tevirhebrew: 0x059B,
-  tevirlefthebrew: 0x059B,
-  thabengali: 0x09A5,
-  thadeva: 0x0925,
-  thagujarati: 0x0AA5,
-  thagurmukhi: 0x0A25,
-  thalarabic: 0x0630,
-  thalfinalarabic: 0xFEAC,
-  thanthakhatlowleftthai: 0xF898,
-  thanthakhatlowrightthai: 0xF897,
-  thanthakhatthai: 0x0E4C,
-  thanthakhatupperleftthai: 0xF896,
-  theharabic: 0x062B,
-  thehfinalarabic: 0xFE9A,
-  thehinitialarabic: 0xFE9B,
-  thehmedialarabic: 0xFE9C,
-  thereexists: 0x2203,
-  therefore: 0x2234,
-  theta: 0x03B8,
-  theta1: 0x03D1,
-  thetasymbolgreek: 0x03D1,
-  thieuthacirclekorean: 0x3279,
-  thieuthaparenkorean: 0x3219,
-  thieuthcirclekorean: 0x326B,
-  thieuthkorean: 0x314C,
-  thieuthparenkorean: 0x320B,
-  thirteencircle: 0x246C,
-  thirteenparen: 0x2480,
-  thirteenperiod: 0x2494,
-  thonangmonthothai: 0x0E11,
-  thook: 0x01AD,
-  thophuthaothai: 0x0E12,
-  thorn: 0x00FE,
-  thothahanthai: 0x0E17,
-  thothanthai: 0x0E10,
-  thothongthai: 0x0E18,
-  thothungthai: 0x0E16,
-  thousandcyrillic: 0x0482,
-  thousandsseparatorarabic: 0x066C,
-  thousandsseparatorpersian: 0x066C,
-  three: 0x0033,
-  threearabic: 0x0663,
-  threebengali: 0x09E9,
-  threecircle: 0x2462,
-  threecircleinversesansserif: 0x278C,
-  threedeva: 0x0969,
-  threeeighths: 0x215C,
-  threegujarati: 0x0AE9,
-  threegurmukhi: 0x0A69,
-  threehackarabic: 0x0663,
-  threehangzhou: 0x3023,
-  threeideographicparen: 0x3222,
-  threeinferior: 0x2083,
-  threemonospace: 0xFF13,
-  threenumeratorbengali: 0x09F6,
-  threeoldstyle: 0xF733,
-  threeparen: 0x2476,
-  threeperiod: 0x248A,
-  threepersian: 0x06F3,
-  threequarters: 0x00BE,
-  threequartersemdash: 0xF6DE,
-  threeroman: 0x2172,
-  threesuperior: 0x00B3,
-  threethai: 0x0E53,
-  thzsquare: 0x3394,
-  tihiragana: 0x3061,
-  tikatakana: 0x30C1,
-  tikatakanahalfwidth: 0xFF81,
-  tikeutacirclekorean: 0x3270,
-  tikeutaparenkorean: 0x3210,
-  tikeutcirclekorean: 0x3262,
-  tikeutkorean: 0x3137,
-  tikeutparenkorean: 0x3202,
-  tilde: 0x02DC,
-  tildebelowcmb: 0x0330,
-  tildecmb: 0x0303,
-  tildecomb: 0x0303,
-  tildedoublecmb: 0x0360,
-  tildeoperator: 0x223C,
-  tildeoverlaycmb: 0x0334,
-  tildeverticalcmb: 0x033E,
-  timescircle: 0x2297,
-  tipehahebrew: 0x0596,
-  tipehalefthebrew: 0x0596,
-  tippigurmukhi: 0x0A70,
-  titlocyrilliccmb: 0x0483,
-  tiwnarmenian: 0x057F,
-  tlinebelow: 0x1E6F,
-  tmonospace: 0xFF54,
-  toarmenian: 0x0569,
-  tohiragana: 0x3068,
-  tokatakana: 0x30C8,
-  tokatakanahalfwidth: 0xFF84,
-  tonebarextrahighmod: 0x02E5,
-  tonebarextralowmod: 0x02E9,
-  tonebarhighmod: 0x02E6,
-  tonebarlowmod: 0x02E8,
-  tonebarmidmod: 0x02E7,
-  tonefive: 0x01BD,
-  tonesix: 0x0185,
-  tonetwo: 0x01A8,
-  tonos: 0x0384,
-  tonsquare: 0x3327,
-  topatakthai: 0x0E0F,
-  tortoiseshellbracketleft: 0x3014,
-  tortoiseshellbracketleftsmall: 0xFE5D,
-  tortoiseshellbracketleftvertical: 0xFE39,
-  tortoiseshellbracketright: 0x3015,
-  tortoiseshellbracketrightsmall: 0xFE5E,
-  tortoiseshellbracketrightvertical: 0xFE3A,
-  totaothai: 0x0E15,
-  tpalatalhook: 0x01AB,
-  tparen: 0x24AF,
-  trademark: 0x2122,
-  trademarksans: 0xF8EA,
-  trademarkserif: 0xF6DB,
-  tretroflexhook: 0x0288,
-  triagdn: 0x25BC,
-  triaglf: 0x25C4,
-  triagrt: 0x25BA,
-  triagup: 0x25B2,
-  ts: 0x02A6,
-  tsadi: 0x05E6,
-  tsadidagesh: 0xFB46,
-  tsadidageshhebrew: 0xFB46,
-  tsadihebrew: 0x05E6,
-  tsecyrillic: 0x0446,
-  tsere: 0x05B5,
-  tsere12: 0x05B5,
-  tsere1e: 0x05B5,
-  tsere2b: 0x05B5,
-  tserehebrew: 0x05B5,
-  tserenarrowhebrew: 0x05B5,
-  tserequarterhebrew: 0x05B5,
-  tserewidehebrew: 0x05B5,
-  tshecyrillic: 0x045B,
-  tsuperior: 0xF6F3,
-  ttabengali: 0x099F,
-  ttadeva: 0x091F,
-  ttagujarati: 0x0A9F,
-  ttagurmukhi: 0x0A1F,
-  tteharabic: 0x0679,
-  ttehfinalarabic: 0xFB67,
-  ttehinitialarabic: 0xFB68,
-  ttehmedialarabic: 0xFB69,
-  tthabengali: 0x09A0,
-  tthadeva: 0x0920,
-  tthagujarati: 0x0AA0,
-  tthagurmukhi: 0x0A20,
-  tturned: 0x0287,
-  tuhiragana: 0x3064,
-  tukatakana: 0x30C4,
-  tukatakanahalfwidth: 0xFF82,
-  tusmallhiragana: 0x3063,
-  tusmallkatakana: 0x30C3,
-  tusmallkatakanahalfwidth: 0xFF6F,
-  twelvecircle: 0x246B,
-  twelveparen: 0x247F,
-  twelveperiod: 0x2493,
-  twelveroman: 0x217B,
-  twentycircle: 0x2473,
-  twentyhangzhou: 0x5344,
-  twentyparen: 0x2487,
-  twentyperiod: 0x249B,
-  two: 0x0032,
-  twoarabic: 0x0662,
-  twobengali: 0x09E8,
-  twocircle: 0x2461,
-  twocircleinversesansserif: 0x278B,
-  twodeva: 0x0968,
-  twodotenleader: 0x2025,
-  twodotleader: 0x2025,
-  twodotleadervertical: 0xFE30,
-  twogujarati: 0x0AE8,
-  twogurmukhi: 0x0A68,
-  twohackarabic: 0x0662,
-  twohangzhou: 0x3022,
-  twoideographicparen: 0x3221,
-  twoinferior: 0x2082,
-  twomonospace: 0xFF12,
-  twonumeratorbengali: 0x09F5,
-  twooldstyle: 0xF732,
-  twoparen: 0x2475,
-  twoperiod: 0x2489,
-  twopersian: 0x06F2,
-  tworoman: 0x2171,
-  twostroke: 0x01BB,
-  twosuperior: 0x00B2,
-  twothai: 0x0E52,
-  twothirds: 0x2154,
-  u: 0x0075,
-  uacute: 0x00FA,
-  ubar: 0x0289,
-  ubengali: 0x0989,
-  ubopomofo: 0x3128,
-  ubreve: 0x016D,
-  ucaron: 0x01D4,
-  ucircle: 0x24E4,
-  ucircumflex: 0x00FB,
-  ucircumflexbelow: 0x1E77,
-  ucyrillic: 0x0443,
-  udattadeva: 0x0951,
-  udblacute: 0x0171,
-  udblgrave: 0x0215,
-  udeva: 0x0909,
-  udieresis: 0x00FC,
-  udieresisacute: 0x01D8,
-  udieresisbelow: 0x1E73,
-  udieresiscaron: 0x01DA,
-  udieresiscyrillic: 0x04F1,
-  udieresisgrave: 0x01DC,
-  udieresismacron: 0x01D6,
-  udotbelow: 0x1EE5,
-  ugrave: 0x00F9,
-  ugujarati: 0x0A89,
-  ugurmukhi: 0x0A09,
-  uhiragana: 0x3046,
-  uhookabove: 0x1EE7,
-  uhorn: 0x01B0,
-  uhornacute: 0x1EE9,
-  uhorndotbelow: 0x1EF1,
-  uhorngrave: 0x1EEB,
-  uhornhookabove: 0x1EED,
-  uhorntilde: 0x1EEF,
-  uhungarumlaut: 0x0171,
-  uhungarumlautcyrillic: 0x04F3,
-  uinvertedbreve: 0x0217,
-  ukatakana: 0x30A6,
-  ukatakanahalfwidth: 0xFF73,
-  ukcyrillic: 0x0479,
-  ukorean: 0x315C,
-  umacron: 0x016B,
-  umacroncyrillic: 0x04EF,
-  umacrondieresis: 0x1E7B,
-  umatragurmukhi: 0x0A41,
-  umonospace: 0xFF55,
-  underscore: 0x005F,
-  underscoredbl: 0x2017,
-  underscoremonospace: 0xFF3F,
-  underscorevertical: 0xFE33,
-  underscorewavy: 0xFE4F,
-  union: 0x222A,
-  universal: 0x2200,
-  uogonek: 0x0173,
-  uparen: 0x24B0,
-  upblock: 0x2580,
-  upperdothebrew: 0x05C4,
-  upsilon: 0x03C5,
-  upsilondieresis: 0x03CB,
-  upsilondieresistonos: 0x03B0,
-  upsilonlatin: 0x028A,
-  upsilontonos: 0x03CD,
-  uptackbelowcmb: 0x031D,
-  uptackmod: 0x02D4,
-  uragurmukhi: 0x0A73,
-  uring: 0x016F,
-  ushortcyrillic: 0x045E,
-  usmallhiragana: 0x3045,
-  usmallkatakana: 0x30A5,
-  usmallkatakanahalfwidth: 0xFF69,
-  ustraightcyrillic: 0x04AF,
-  ustraightstrokecyrillic: 0x04B1,
-  utilde: 0x0169,
-  utildeacute: 0x1E79,
-  utildebelow: 0x1E75,
-  uubengali: 0x098A,
-  uudeva: 0x090A,
-  uugujarati: 0x0A8A,
-  uugurmukhi: 0x0A0A,
-  uumatragurmukhi: 0x0A42,
-  uuvowelsignbengali: 0x09C2,
-  uuvowelsigndeva: 0x0942,
-  uuvowelsigngujarati: 0x0AC2,
-  uvowelsignbengali: 0x09C1,
-  uvowelsigndeva: 0x0941,
-  uvowelsigngujarati: 0x0AC1,
-  v: 0x0076,
-  vadeva: 0x0935,
-  vagujarati: 0x0AB5,
-  vagurmukhi: 0x0A35,
-  vakatakana: 0x30F7,
-  vav: 0x05D5,
-  vavdagesh: 0xFB35,
-  vavdagesh65: 0xFB35,
-  vavdageshhebrew: 0xFB35,
-  vavhebrew: 0x05D5,
-  vavholam: 0xFB4B,
-  vavholamhebrew: 0xFB4B,
-  vavvavhebrew: 0x05F0,
-  vavyodhebrew: 0x05F1,
-  vcircle: 0x24E5,
-  vdotbelow: 0x1E7F,
-  vecyrillic: 0x0432,
-  veharabic: 0x06A4,
-  vehfinalarabic: 0xFB6B,
-  vehinitialarabic: 0xFB6C,
-  vehmedialarabic: 0xFB6D,
-  vekatakana: 0x30F9,
-  venus: 0x2640,
-  verticalbar: 0x007C,
-  verticallineabovecmb: 0x030D,
-  verticallinebelowcmb: 0x0329,
-  verticallinelowmod: 0x02CC,
-  verticallinemod: 0x02C8,
-  vewarmenian: 0x057E,
-  vhook: 0x028B,
-  vikatakana: 0x30F8,
-  viramabengali: 0x09CD,
-  viramadeva: 0x094D,
-  viramagujarati: 0x0ACD,
-  visargabengali: 0x0983,
-  visargadeva: 0x0903,
-  visargagujarati: 0x0A83,
-  vmonospace: 0xFF56,
-  voarmenian: 0x0578,
-  voicediterationhiragana: 0x309E,
-  voicediterationkatakana: 0x30FE,
-  voicedmarkkana: 0x309B,
-  voicedmarkkanahalfwidth: 0xFF9E,
-  vokatakana: 0x30FA,
-  vparen: 0x24B1,
-  vtilde: 0x1E7D,
-  vturned: 0x028C,
-  vuhiragana: 0x3094,
-  vukatakana: 0x30F4,
-  w: 0x0077,
-  wacute: 0x1E83,
-  waekorean: 0x3159,
-  wahiragana: 0x308F,
-  wakatakana: 0x30EF,
-  wakatakanahalfwidth: 0xFF9C,
-  wakorean: 0x3158,
-  wasmallhiragana: 0x308E,
-  wasmallkatakana: 0x30EE,
-  wattosquare: 0x3357,
-  wavedash: 0x301C,
-  wavyunderscorevertical: 0xFE34,
-  wawarabic: 0x0648,
-  wawfinalarabic: 0xFEEE,
-  wawhamzaabovearabic: 0x0624,
-  wawhamzaabovefinalarabic: 0xFE86,
-  wbsquare: 0x33DD,
-  wcircle: 0x24E6,
-  wcircumflex: 0x0175,
-  wdieresis: 0x1E85,
-  wdotaccent: 0x1E87,
-  wdotbelow: 0x1E89,
-  wehiragana: 0x3091,
-  weierstrass: 0x2118,
-  wekatakana: 0x30F1,
-  wekorean: 0x315E,
-  weokorean: 0x315D,
-  wgrave: 0x1E81,
-  whitebullet: 0x25E6,
-  whitecircle: 0x25CB,
-  whitecircleinverse: 0x25D9,
-  whitecornerbracketleft: 0x300E,
-  whitecornerbracketleftvertical: 0xFE43,
-  whitecornerbracketright: 0x300F,
-  whitecornerbracketrightvertical: 0xFE44,
-  whitediamond: 0x25C7,
-  whitediamondcontainingblacksmalldiamond: 0x25C8,
-  whitedownpointingsmalltriangle: 0x25BF,
-  whitedownpointingtriangle: 0x25BD,
-  whiteleftpointingsmalltriangle: 0x25C3,
-  whiteleftpointingtriangle: 0x25C1,
-  whitelenticularbracketleft: 0x3016,
-  whitelenticularbracketright: 0x3017,
-  whiterightpointingsmalltriangle: 0x25B9,
-  whiterightpointingtriangle: 0x25B7,
-  whitesmallsquare: 0x25AB,
-  whitesmilingface: 0x263A,
-  whitesquare: 0x25A1,
-  whitestar: 0x2606,
-  whitetelephone: 0x260F,
-  whitetortoiseshellbracketleft: 0x3018,
-  whitetortoiseshellbracketright: 0x3019,
-  whiteuppointingsmalltriangle: 0x25B5,
-  whiteuppointingtriangle: 0x25B3,
-  wihiragana: 0x3090,
-  wikatakana: 0x30F0,
-  wikorean: 0x315F,
-  wmonospace: 0xFF57,
-  wohiragana: 0x3092,
-  wokatakana: 0x30F2,
-  wokatakanahalfwidth: 0xFF66,
-  won: 0x20A9,
-  wonmonospace: 0xFFE6,
-  wowaenthai: 0x0E27,
-  wparen: 0x24B2,
-  wring: 0x1E98,
-  wsuperior: 0x02B7,
-  wturned: 0x028D,
-  wynn: 0x01BF,
-  x: 0x0078,
-  xabovecmb: 0x033D,
-  xbopomofo: 0x3112,
-  xcircle: 0x24E7,
-  xdieresis: 0x1E8D,
-  xdotaccent: 0x1E8B,
-  xeharmenian: 0x056D,
-  xi: 0x03BE,
-  xmonospace: 0xFF58,
-  xparen: 0x24B3,
-  xsuperior: 0x02E3,
-  y: 0x0079,
-  yaadosquare: 0x334E,
-  yabengali: 0x09AF,
-  yacute: 0x00FD,
-  yadeva: 0x092F,
-  yaekorean: 0x3152,
-  yagujarati: 0x0AAF,
-  yagurmukhi: 0x0A2F,
-  yahiragana: 0x3084,
-  yakatakana: 0x30E4,
-  yakatakanahalfwidth: 0xFF94,
-  yakorean: 0x3151,
-  yamakkanthai: 0x0E4E,
-  yasmallhiragana: 0x3083,
-  yasmallkatakana: 0x30E3,
-  yasmallkatakanahalfwidth: 0xFF6C,
-  yatcyrillic: 0x0463,
-  ycircle: 0x24E8,
-  ycircumflex: 0x0177,
-  ydieresis: 0x00FF,
-  ydotaccent: 0x1E8F,
-  ydotbelow: 0x1EF5,
-  yeharabic: 0x064A,
-  yehbarreearabic: 0x06D2,
-  yehbarreefinalarabic: 0xFBAF,
-  yehfinalarabic: 0xFEF2,
-  yehhamzaabovearabic: 0x0626,
-  yehhamzaabovefinalarabic: 0xFE8A,
-  yehhamzaaboveinitialarabic: 0xFE8B,
-  yehhamzaabovemedialarabic: 0xFE8C,
-  yehinitialarabic: 0xFEF3,
-  yehmedialarabic: 0xFEF4,
-  yehmeeminitialarabic: 0xFCDD,
-  yehmeemisolatedarabic: 0xFC58,
-  yehnoonfinalarabic: 0xFC94,
-  yehthreedotsbelowarabic: 0x06D1,
-  yekorean: 0x3156,
-  yen: 0x00A5,
-  yenmonospace: 0xFFE5,
-  yeokorean: 0x3155,
-  yeorinhieuhkorean: 0x3186,
-  yerahbenyomohebrew: 0x05AA,
-  yerahbenyomolefthebrew: 0x05AA,
-  yericyrillic: 0x044B,
-  yerudieresiscyrillic: 0x04F9,
-  yesieungkorean: 0x3181,
-  yesieungpansioskorean: 0x3183,
-  yesieungsioskorean: 0x3182,
-  yetivhebrew: 0x059A,
-  ygrave: 0x1EF3,
-  yhook: 0x01B4,
-  yhookabove: 0x1EF7,
-  yiarmenian: 0x0575,
-  yicyrillic: 0x0457,
-  yikorean: 0x3162,
-  yinyang: 0x262F,
-  yiwnarmenian: 0x0582,
-  ymonospace: 0xFF59,
-  yod: 0x05D9,
-  yoddagesh: 0xFB39,
-  yoddageshhebrew: 0xFB39,
-  yodhebrew: 0x05D9,
-  yodyodhebrew: 0x05F2,
-  yodyodpatahhebrew: 0xFB1F,
-  yohiragana: 0x3088,
-  yoikorean: 0x3189,
-  yokatakana: 0x30E8,
-  yokatakanahalfwidth: 0xFF96,
-  yokorean: 0x315B,
-  yosmallhiragana: 0x3087,
-  yosmallkatakana: 0x30E7,
-  yosmallkatakanahalfwidth: 0xFF6E,
-  yotgreek: 0x03F3,
-  yoyaekorean: 0x3188,
-  yoyakorean: 0x3187,
-  yoyakthai: 0x0E22,
-  yoyingthai: 0x0E0D,
-  yparen: 0x24B4,
-  ypogegrammeni: 0x037A,
-  ypogegrammenigreekcmb: 0x0345,
-  yr: 0x01A6,
-  yring: 0x1E99,
-  ysuperior: 0x02B8,
-  ytilde: 0x1EF9,
-  yturned: 0x028E,
-  yuhiragana: 0x3086,
-  yuikorean: 0x318C,
-  yukatakana: 0x30E6,
-  yukatakanahalfwidth: 0xFF95,
-  yukorean: 0x3160,
-  yusbigcyrillic: 0x046B,
-  yusbigiotifiedcyrillic: 0x046D,
-  yuslittlecyrillic: 0x0467,
-  yuslittleiotifiedcyrillic: 0x0469,
-  yusmallhiragana: 0x3085,
-  yusmallkatakana: 0x30E5,
-  yusmallkatakanahalfwidth: 0xFF6D,
-  yuyekorean: 0x318B,
-  yuyeokorean: 0x318A,
-  yyabengali: 0x09DF,
-  yyadeva: 0x095F,
-  z: 0x007A,
-  zaarmenian: 0x0566,
-  zacute: 0x017A,
-  zadeva: 0x095B,
-  zagurmukhi: 0x0A5B,
-  zaharabic: 0x0638,
-  zahfinalarabic: 0xFEC6,
-  zahinitialarabic: 0xFEC7,
-  zahiragana: 0x3056,
-  zahmedialarabic: 0xFEC8,
-  zainarabic: 0x0632,
-  zainfinalarabic: 0xFEB0,
-  zakatakana: 0x30B6,
-  zaqefgadolhebrew: 0x0595,
-  zaqefqatanhebrew: 0x0594,
-  zarqahebrew: 0x0598,
-  zayin: 0x05D6,
-  zayindagesh: 0xFB36,
-  zayindageshhebrew: 0xFB36,
-  zayinhebrew: 0x05D6,
-  zbopomofo: 0x3117,
-  zcaron: 0x017E,
-  zcircle: 0x24E9,
-  zcircumflex: 0x1E91,
-  zcurl: 0x0291,
-  zdot: 0x017C,
-  zdotaccent: 0x017C,
-  zdotbelow: 0x1E93,
-  zecyrillic: 0x0437,
-  zedescendercyrillic: 0x0499,
-  zedieresiscyrillic: 0x04DF,
-  zehiragana: 0x305C,
-  zekatakana: 0x30BC,
-  zero: 0x0030,
-  zeroarabic: 0x0660,
-  zerobengali: 0x09E6,
-  zerodeva: 0x0966,
-  zerogujarati: 0x0AE6,
-  zerogurmukhi: 0x0A66,
-  zerohackarabic: 0x0660,
-  zeroinferior: 0x2080,
-  zeromonospace: 0xFF10,
-  zerooldstyle: 0xF730,
-  zeropersian: 0x06F0,
-  zerosuperior: 0x2070,
-  zerothai: 0x0E50,
-  zerowidthjoiner: 0xFEFF,
-  zerowidthnonjoiner: 0x200C,
-  zerowidthspace: 0x200B,
-  zeta: 0x03B6,
-  zhbopomofo: 0x3113,
-  zhearmenian: 0x056A,
-  zhebrevecyrillic: 0x04C2,
-  zhecyrillic: 0x0436,
-  zhedescendercyrillic: 0x0497,
-  zhedieresiscyrillic: 0x04DD,
-  zihiragana: 0x3058,
-  zikatakana: 0x30B8,
-  zinorhebrew: 0x05AE,
-  zlinebelow: 0x1E95,
-  zmonospace: 0xFF5A,
-  zohiragana: 0x305E,
-  zokatakana: 0x30BE,
-  zparen: 0x24B5,
-  zretroflexhook: 0x0290,
-  zstroke: 0x01B6,
-  zuhiragana: 0x305A,
-  zukatakana: 0x30BA,
-  '.notdef': 0x0000
-};
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PDFImage = (function PDFImageClosure() {
-  /**
-   * Decode the image in the main thread if it supported. Resovles the promise
-   * when the image data is ready.
-   */
-  function handleImageData(handler, xref, res, image, promise) {
-    if (image instanceof JpegStream && image.isNativelyDecodable(xref, res)) {
-      // For natively supported jpegs send them to the main thread for decoding.
-      var dict = image.dict;
-      var colorSpace = dict.get('ColorSpace', 'CS');
-      colorSpace = ColorSpace.parse(colorSpace, xref, res);
-      var numComps = colorSpace.numComps;
-      handler.send('jpeg_decode', [image.getIR(), numComps], function(message) {
-        var data = message.data;
-        var stream = new Stream(data, 0, data.length, image.dict);
-        promise.resolve(stream);
-      });
-    } else {
-      promise.resolve(image);
-    }
-  }
-  /**
-   * Decode and clamp a value. The formula is different from the spec because we
-   * don't decode to float range [0,1], we decode it in the [0,max] range.
-   */
-  function decodeAndClamp(value, addend, coefficient, max) {
-    value = addend + value * coefficient;
-    // Clamp the value to the range
-    return value < 0 ? 0 : value > max ? max : value;
-  }
-  function PDFImage(xref, res, image, inline, smask) {
-    this.image = image;
-    if (image.getParams) {
-      // JPX/JPEG2000 streams directly contain bits per component
-      // and color space mode information.
-      TODO('get params from actual stream');
-      // var bits = ...
-      // var colorspace = ...
-    }
-    // TODO cache rendered images?
-
-    var dict = image.dict;
-    this.width = dict.get('Width', 'W');
-    this.height = dict.get('Height', 'H');
-
-    if (this.width < 1 || this.height < 1)
-      error('Invalid image width: ' + this.width + ' or height: ' +
-            this.height);
-
-    this.interpolate = dict.get('Interpolate', 'I') || false;
-    this.imageMask = dict.get('ImageMask', 'IM') || false;
-
-    var bitsPerComponent = image.bitsPerComponent;
-    if (!bitsPerComponent) {
-      bitsPerComponent = dict.get('BitsPerComponent', 'BPC');
-      if (!bitsPerComponent) {
-        if (this.imageMask)
-          bitsPerComponent = 1;
-        else
-          error('Bits per component missing in image: ' + this.imageMask);
-      }
-    }
-    this.bpc = bitsPerComponent;
-
-    if (!this.imageMask) {
-      var colorSpace = dict.get('ColorSpace', 'CS');
-      if (!colorSpace) {
-        TODO('JPX images (which don"t require color spaces');
-        colorSpace = new Name('DeviceRGB');
-      }
-      this.colorSpace = ColorSpace.parse(colorSpace, xref, res);
-      this.numComps = this.colorSpace.numComps;
-    }
-
-    this.decode = dict.get('Decode', 'D');
-    this.needsDecode = false;
-    if (this.decode && this.colorSpace &&
-        !this.colorSpace.isDefaultDecode(this.decode)) {
-      this.needsDecode = true;
-      // Do some preprocessing to avoid more math.
-      var max = (1 << bitsPerComponent) - 1;
-      this.decodeCoefficients = [];
-      this.decodeAddends = [];
-      for (var i = 0, j = 0; i < this.decode.length; i += 2, ++j) {
-        var dmin = this.decode[i];
-        var dmax = this.decode[i + 1];
-        this.decodeCoefficients[j] = dmax - dmin;
-        this.decodeAddends[j] = max * dmin;
-      }
-    }
-
-    var mask = dict.get('Mask');
-
-    if (mask) {
-      TODO('masked images');
-    } else if (smask) {
-      this.smask = new PDFImage(xref, res, smask, false);
-    }
-  }
-  /**
-   * Handles processing of image data and calls the callback with an argument
-   * of a PDFImage when the image is ready to be used.
-   */
-  PDFImage.buildImage = function PDFImage_buildImage(callback, handler, xref,
-                                                     res, image, inline) {
-    var imageDataPromise = new Promise();
-    var smaskPromise = new Promise();
-    // The image data and smask data may not be ready yet, wait till both are
-    // resolved.
-    Promise.all([imageDataPromise, smaskPromise]).then(function(results) {
-      var imageData = results[0], smaskData = results[1];
-      var image = new PDFImage(xref, res, imageData, inline, smaskData);
-      callback(image);
-    });
-
-    handleImageData(handler, xref, res, image, imageDataPromise);
-
-    var smask = image.dict.get('SMask');
-    if (smask)
-      handleImageData(handler, xref, res, smask, smaskPromise);
-    else
-      smaskPromise.resolve(null);
-  };
-
-  /**
-   * Resize an image using the nearest neighbor algorithm.  Currently only
-   * supports one and three component images.
-   * @param {TypedArray} pixels The original image with one component.
-   * @param {Number} bpc Number of bits per component.
-   * @param {Number} components Number of color components, 1 or 3 is supported.
-   * @param {Number} w1 Original width.
-   * @param {Number} h1 Original height.
-   * @param {Number} w2 New width.
-   * @param {Number} h2 New height.
-   * @return {TypedArray} Resized image data.
-   */
-  PDFImage.resize = function PDFImage_resize(pixels, bpc, components,
-                                             w1, h1, w2, h2) {
-    var length = w2 * h2 * components;
-    var temp = bpc <= 8 ? new Uint8Array(length) :
-        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
-    var xRatio = w1 / w2;
-    var yRatio = h1 / h2;
-    var px, py, newIndex, oldIndex;
-    for (var i = 0; i < h2; i++) {
-      for (var j = 0; j < w2; j++) {
-        px = Math.floor(j * xRatio);
-        py = Math.floor(i * yRatio);
-        newIndex = (i * w2) + j;
-        oldIndex = ((py * w1) + px);
-        if (components === 1) {
-          temp[newIndex] = pixels[oldIndex];
-        } else if (components === 3) {
-          newIndex *= 3;
-          oldIndex *= 3;
-          temp[newIndex] = pixels[oldIndex];
-          temp[newIndex + 1] = pixels[oldIndex + 1];
-          temp[newIndex + 2] = pixels[oldIndex + 2];
-        }
-      }
-    }
-    return temp;
-  };
-
-  PDFImage.prototype = {
-    get drawWidth() {
-      if (!this.smask)
-        return this.width;
-      return Math.max(this.width, this.smask.width);
-    },
-    get drawHeight() {
-      if (!this.smask)
-        return this.height;
-      return Math.max(this.height, this.smask.height);
-    },
-    getComponents: function PDFImage_getComponents(buffer) {
-      var bpc = this.bpc;
-      var needsDecode = this.needsDecode;
-      var decodeMap = this.decode;
-
-      // This image doesn't require any extra work.
-      if (bpc == 8 && !needsDecode)
-        return buffer;
-
-      var bufferLength = buffer.length;
-      var width = this.width;
-      var height = this.height;
-      var numComps = this.numComps;
-
-      var length = width * height * numComps;
-      var bufferPos = 0;
-      var output = bpc <= 8 ? new Uint8Array(length) :
-        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
-      var rowComps = width * numComps;
-      var decodeAddends, decodeCoefficients;
-      if (needsDecode) {
-        decodeAddends = this.decodeAddends;
-        decodeCoefficients = this.decodeCoefficients;
-      }
-      var max = (1 << bpc) - 1;
-
-      if (bpc == 8) {
-        // Optimization for reading 8 bpc images that have a decode.
-        for (var i = 0, ii = length; i < ii; ++i) {
-          var compIndex = i % numComps;
-          var value = buffer[i];
-          value = decodeAndClamp(value, decodeAddends[compIndex],
-                          decodeCoefficients[compIndex], max);
-          output[i] = value;
-        }
-      } else if (bpc == 1) {
-        // Optimization for reading 1 bpc images.
-        var valueZero = 0, valueOne = 1;
-        if (decodeMap) {
-          valueZero = decodeMap[0] ? 1 : 0;
-          valueOne = decodeMap[1] ? 1 : 0;
-        }
-        var mask = 0;
-        var buf = 0;
-
-        for (var i = 0, ii = length; i < ii; ++i) {
-          if (i % rowComps == 0) {
-            mask = 0;
-            buf = 0;
-          } else {
-            mask >>= 1;
-          }
-
-          if (mask <= 0) {
-            buf = buffer[bufferPos++];
-            mask = 128;
-          }
-
-          output[i] = !(buf & mask) ? valueZero : valueOne;
-        }
-      } else {
-        // The general case that handles all other bpc values.
-        var bits = 0, buf = 0;
-        for (var i = 0, ii = length; i < ii; ++i) {
-          if (i % rowComps == 0) {
-            buf = 0;
-            bits = 0;
-          }
-
-          while (bits < bpc) {
-            buf = (buf << 8) | buffer[bufferPos++];
-            bits += 8;
-          }
-
-          var remainingBits = bits - bpc;
-          var value = buf >> remainingBits;
-          if (needsDecode) {
-            var compIndex = i % numComps;
-            value = decodeAndClamp(value, decodeAddends[compIndex],
-                            decodeCoefficients[compIndex], max);
-          }
-          output[i] = value;
-          buf = buf & ((1 << remainingBits) - 1);
-          bits = remainingBits;
-        }
-      }
-      return output;
-    },
-    getOpacity: function PDFImage_getOpacity(width, height) {
-      var smask = this.smask;
-      var originalWidth = this.width;
-      var originalHeight = this.height;
-      var buf;
-
-      if (smask) {
-        var sw = smask.width;
-        var sh = smask.height;
-        buf = new Uint8Array(sw * sh);
-        smask.fillGrayBuffer(buf);
-        if (sw != width || sh != height)
-          buf = PDFImage.resize(buf, smask.bps, 1, sw, sh, width, height);
-      } else {
-        buf = new Uint8Array(width * height);
-        for (var i = 0, ii = width * height; i < ii; ++i)
-          buf[i] = 255;
-      }
-      return buf;
-    },
-    applyStencilMask: function PDFImage_applyStencilMask(buffer,
-                                                         inverseDecode) {
-      var width = this.width, height = this.height;
-      var bitStrideLength = (width + 7) >> 3;
-      var imgArray = this.getImageBytes(bitStrideLength * height);
-      var imgArrayPos = 0;
-      var i, j, mask, buf;
-      // removing making non-masked pixels transparent
-      var bufferPos = 3; // alpha component offset
-      for (i = 0; i < height; i++) {
-        mask = 0;
-        for (j = 0; j < width; j++) {
-          if (!mask) {
-            buf = imgArray[imgArrayPos++];
-            mask = 128;
-          }
-          if (!(buf & mask) == inverseDecode) {
-            buffer[bufferPos] = 0;
-          }
-          bufferPos += 4;
-          mask >>= 1;
-        }
-      }
-    },
-    fillRgbaBuffer: function PDFImage_fillRgbaBuffer(buffer, width, height) {
-      var numComps = this.numComps;
-      var originalWidth = this.width;
-      var originalHeight = this.height;
-      var bpc = this.bpc;
-
-      // rows start at byte boundary;
-      var rowBytes = (originalWidth * numComps * bpc + 7) >> 3;
-      var imgArray = this.getImageBytes(originalHeight * rowBytes);
-
-      var comps = this.colorSpace.getRgbBuffer(
-        this.getComponents(imgArray), bpc);
-      if (originalWidth != width || originalHeight != height)
-        comps = PDFImage.resize(comps, this.bpc, 3, originalWidth,
-                                originalHeight, width, height);
-      var compsPos = 0;
-      var opacity = this.getOpacity(width, height);
-      var opacityPos = 0;
-      var length = width * height * 4;
-
-      for (var i = 0; i < length; i += 4) {
-        buffer[i] = comps[compsPos++];
-        buffer[i + 1] = comps[compsPos++];
-        buffer[i + 2] = comps[compsPos++];
-        buffer[i + 3] = opacity[opacityPos++];
-      }
-    },
-    fillGrayBuffer: function PDFImage_fillGrayBuffer(buffer) {
-      var numComps = this.numComps;
-      if (numComps != 1)
-        error('Reading gray scale from a color image: ' + numComps);
-
-      var width = this.width;
-      var height = this.height;
-      var bpc = this.bpc;
-
-      // rows start at byte boundary;
-      var rowBytes = (width * numComps * bpc + 7) >> 3;
-      var imgArray = this.getImageBytes(height * rowBytes);
-
-      var comps = this.getComponents(imgArray);
-      var length = width * height;
-      // we aren't using a colorspace so we need to scale the value
-      var scale = 255 / ((1 << bpc) - 1);
-      for (var i = 0; i < length; ++i)
-        buffer[i] = (scale * comps[i]) | 0;
-    },
-    getImageBytes: function PDFImage_getImageBytes(length) {
-      this.image.reset();
-      return this.image.getBytes(length);
-    }
-  };
-  return PDFImage;
-})();
-
-function loadJpegStream(id, imageData, objs) {
-  var img = new Image();
-  img.onload = (function loadJpegStream_onloadClosure() {
-    objs.resolve(id, img);
-  });
-  img.src = 'data:image/jpeg;base64,' + window.btoa(imageData);
-}
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-// The Metrics object contains glyph widths (in glyph space units).
-// As per PDF spec, for most fonts (Type 3 being an exception) a glyph
-// space unit corresponds to 1/1000th of text space unit.
-var Metrics = {
-  'Courier': 600,
-  'Courier-Bold': 600,
-  'Courier-BoldOblique': 600,
-  'Courier-Oblique': 600,
-  'Helvetica' : {
-    'space': 278,
-    'exclam': 278,
-    'quotedbl': 355,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 667,
-    'quoteright': 222,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 556,
-    'at': 1015,
-    'A': 667,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 500,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 278,
-    'backslash': 278,
-    'bracketright': 278,
-    'asciicircum': 469,
-    'underscore': 556,
-    'quoteleft': 222,
-    'a': 556,
-    'b': 556,
-    'c': 500,
-    'd': 556,
-    'e': 556,
-    'f': 278,
-    'g': 556,
-    'h': 556,
-    'i': 222,
-    'j': 222,
-    'k': 500,
-    'l': 222,
-    'm': 833,
-    'n': 556,
-    'o': 556,
-    'p': 556,
-    'q': 556,
-    'r': 333,
-    's': 500,
-    't': 278,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 500,
-    'braceleft': 334,
-    'bar': 260,
-    'braceright': 334,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 191,
-    'quotedblleft': 333,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 537,
-    'bullet': 350,
-    'quotesinglbase': 222,
-    'quotedblbase': 333,
-    'quotedblright': 333,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 556,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 222,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 556,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 667,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 500,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 500,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 222,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 500,
-    'scedilla': 500,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 556,
-    'Amacron': 667,
-    'rcaron': 333,
-    'ccedilla': 500,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 643,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 584,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 500,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 260,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 333,
-    'omacron': 556,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 222,
-    'tcaron': 317,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 222,
-    'Oacute': 778,
-    'oacute': 556,
-    'amacron': 556,
-    'sacute': 500,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 556,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 299,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 556,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 556,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 556,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 556,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 556,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 556,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 500,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 584,
-    'odieresis': 556,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 556,
-    'eth': 556,
-    'zcaron': 500,
-    'ncommaaccent': 556,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-Bold': {
-    'space': 278,
-    'exclam': 333,
-    'quotedbl': 474,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 722,
-    'quoteright': 278,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 611,
-    'at': 975,
-    'A': 722,
-    'B': 722,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 556,
-    'K': 722,
-    'L': 611,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 584,
-    'underscore': 556,
-    'quoteleft': 278,
-    'a': 556,
-    'b': 611,
-    'c': 556,
-    'd': 611,
-    'e': 556,
-    'f': 333,
-    'g': 611,
-    'h': 611,
-    'i': 278,
-    'j': 278,
-    'k': 556,
-    'l': 278,
-    'm': 889,
-    'n': 611,
-    'o': 611,
-    'p': 611,
-    'q': 611,
-    'r': 389,
-    's': 556,
-    't': 333,
-    'u': 611,
-    'v': 556,
-    'w': 778,
-    'x': 556,
-    'y': 556,
-    'z': 500,
-    'braceleft': 389,
-    'bar': 280,
-    'braceright': 389,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 238,
-    'quotedblleft': 500,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 611,
-    'fl': 611,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 556,
-    'bullet': 350,
-    'quotesinglbase': 278,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 611,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 611,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 722,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 556,
-    'scommaaccent': 556,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 611,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 556,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 556,
-    'scedilla': 556,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 611,
-    'acircumflex': 556,
-    'Amacron': 722,
-    'rcaron': 389,
-    'ccedilla': 556,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 743,
-    'Umacron': 722,
-    'uring': 611,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 584,
-    'uacute': 611,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 556,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 556,
-    'nacute': 611,
-    'umacron': 611,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 280,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 611,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 389,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 611,
-    'amacron': 556,
-    'sacute': 556,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 611,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 611,
-    'igrave': 278,
-    'ohungarumlaut': 611,
-    'Eogonek': 667,
-    'dcroat': 611,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 400,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 611,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 611,
-    'ntilde': 611,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 611,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 611,
-    'Ccaron': 722,
-    'ugrave': 611,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 611,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 556,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 611,
-    'tcommaaccent': 333,
-    'logicalnot': 584,
-    'odieresis': 611,
-    'udieresis': 611,
-    'notequal': 549,
-    'gcommaaccent': 611,
-    'eth': 611,
-    'zcaron': 500,
-    'ncommaaccent': 611,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-BoldOblique': {
-    'space': 278,
-    'exclam': 333,
-    'quotedbl': 474,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 722,
-    'quoteright': 278,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 611,
-    'at': 975,
-    'A': 722,
-    'B': 722,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 556,
-    'K': 722,
-    'L': 611,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 584,
-    'underscore': 556,
-    'quoteleft': 278,
-    'a': 556,
-    'b': 611,
-    'c': 556,
-    'd': 611,
-    'e': 556,
-    'f': 333,
-    'g': 611,
-    'h': 611,
-    'i': 278,
-    'j': 278,
-    'k': 556,
-    'l': 278,
-    'm': 889,
-    'n': 611,
-    'o': 611,
-    'p': 611,
-    'q': 611,
-    'r': 389,
-    's': 556,
-    't': 333,
-    'u': 611,
-    'v': 556,
-    'w': 778,
-    'x': 556,
-    'y': 556,
-    'z': 500,
-    'braceleft': 389,
-    'bar': 280,
-    'braceright': 389,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 238,
-    'quotedblleft': 500,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 611,
-    'fl': 611,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 556,
-    'bullet': 350,
-    'quotesinglbase': 278,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 611,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 611,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 722,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 556,
-    'scommaaccent': 556,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 611,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 556,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 556,
-    'scedilla': 556,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 611,
-    'acircumflex': 556,
-    'Amacron': 722,
-    'rcaron': 389,
-    'ccedilla': 556,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 743,
-    'Umacron': 722,
-    'uring': 611,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 584,
-    'uacute': 611,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 556,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 556,
-    'nacute': 611,
-    'umacron': 611,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 280,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 611,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 389,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 611,
-    'amacron': 556,
-    'sacute': 556,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 611,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 611,
-    'igrave': 278,
-    'ohungarumlaut': 611,
-    'Eogonek': 667,
-    'dcroat': 611,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 400,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 611,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 611,
-    'ntilde': 611,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 611,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 611,
-    'Ccaron': 722,
-    'ugrave': 611,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 611,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 556,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 611,
-    'tcommaaccent': 333,
-    'logicalnot': 584,
-    'odieresis': 611,
-    'udieresis': 611,
-    'notequal': 549,
-    'gcommaaccent': 611,
-    'eth': 611,
-    'zcaron': 500,
-    'ncommaaccent': 611,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-Oblique' : {
-    'space': 278,
-    'exclam': 278,
-    'quotedbl': 355,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 667,
-    'quoteright': 222,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 556,
-    'at': 1015,
-    'A': 667,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 500,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 278,
-    'backslash': 278,
-    'bracketright': 278,
-    'asciicircum': 469,
-    'underscore': 556,
-    'quoteleft': 222,
-    'a': 556,
-    'b': 556,
-    'c': 500,
-    'd': 556,
-    'e': 556,
-    'f': 278,
-    'g': 556,
-    'h': 556,
-    'i': 222,
-    'j': 222,
-    'k': 500,
-    'l': 222,
-    'm': 833,
-    'n': 556,
-    'o': 556,
-    'p': 556,
-    'q': 556,
-    'r': 333,
-    's': 500,
-    't': 278,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 500,
-    'braceleft': 334,
-    'bar': 260,
-    'braceright': 334,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 191,
-    'quotedblleft': 333,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 537,
-    'bullet': 350,
-    'quotesinglbase': 222,
-    'quotedblbase': 333,
-    'quotedblright': 333,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 556,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 222,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 556,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 667,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 500,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 500,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 222,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 500,
-    'scedilla': 500,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 556,
-    'Amacron': 667,
-    'rcaron': 333,
-    'ccedilla': 500,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 643,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 584,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 500,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 260,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 333,
-    'omacron': 556,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 222,
-    'tcaron': 317,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 222,
-    'Oacute': 778,
-    'oacute': 556,
-    'amacron': 556,
-    'sacute': 500,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 556,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 299,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 556,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 556,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 556,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 556,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 556,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 556,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 500,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 584,
-    'odieresis': 556,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 556,
-    'eth': 556,
-    'zcaron': 500,
-    'ncommaaccent': 556,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Symbol': {
-    'space': 250,
-    'exclam': 333,
-    'universal': 713,
-    'numbersign': 500,
-    'existential': 549,
-    'percent': 833,
-    'ampersand': 778,
-    'suchthat': 439,
-    'parenleft': 333,
-    'parenright': 333,
-    'asteriskmath': 500,
-    'plus': 549,
-    'comma': 250,
-    'minus': 549,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 549,
-    'equal': 549,
-    'greater': 549,
-    'question': 444,
-    'congruent': 549,
-    'Alpha': 722,
-    'Beta': 667,
-    'Chi': 722,
-    'Delta': 612,
-    'Epsilon': 611,
-    'Phi': 763,
-    'Gamma': 603,
-    'Eta': 722,
-    'Iota': 333,
-    'theta1': 631,
-    'Kappa': 722,
-    'Lambda': 686,
-    'Mu': 889,
-    'Nu': 722,
-    'Omicron': 722,
-    'Pi': 768,
-    'Theta': 741,
-    'Rho': 556,
-    'Sigma': 592,
-    'Tau': 611,
-    'Upsilon': 690,
-    'sigma1': 439,
-    'Omega': 768,
-    'Xi': 645,
-    'Psi': 795,
-    'Zeta': 611,
-    'bracketleft': 333,
-    'therefore': 863,
-    'bracketright': 333,
-    'perpendicular': 658,
-    'underscore': 500,
-    'radicalex': 500,
-    'alpha': 631,
-    'beta': 549,
-    'chi': 549,
-    'delta': 494,
-    'epsilon': 439,
-    'phi': 521,
-    'gamma': 411,
-    'eta': 603,
-    'iota': 329,
-    'phi1': 603,
-    'kappa': 549,
-    'lambda': 549,
-    'mu': 576,
-    'nu': 521,
-    'omicron': 549,
-    'pi': 549,
-    'theta': 521,
-    'rho': 549,
-    'sigma': 603,
-    'tau': 439,
-    'upsilon': 576,
-    'omega1': 713,
-    'omega': 686,
-    'xi': 493,
-    'psi': 686,
-    'zeta': 494,
-    'braceleft': 480,
-    'bar': 200,
-    'braceright': 480,
-    'similar': 549,
-    'Euro': 750,
-    'Upsilon1': 620,
-    'minute': 247,
-    'lessequal': 549,
-    'fraction': 167,
-    'infinity': 713,
-    'florin': 500,
-    'club': 753,
-    'diamond': 753,
-    'heart': 753,
-    'spade': 753,
-    'arrowboth': 1042,
-    'arrowleft': 987,
-    'arrowup': 603,
-    'arrowright': 987,
-    'arrowdown': 603,
-    'degree': 400,
-    'plusminus': 549,
-    'second': 411,
-    'greaterequal': 549,
-    'multiply': 549,
-    'proportional': 713,
-    'partialdiff': 494,
-    'bullet': 460,
-    'divide': 549,
-    'notequal': 549,
-    'equivalence': 549,
-    'approxequal': 549,
-    'ellipsis': 1000,
-    'arrowvertex': 603,
-    'arrowhorizex': 1000,
-    'carriagereturn': 658,
-    'aleph': 823,
-    'Ifraktur': 686,
-    'Rfraktur': 795,
-    'weierstrass': 987,
-    'circlemultiply': 768,
-    'circleplus': 768,
-    'emptyset': 823,
-    'intersection': 768,
-    'union': 768,
-    'propersuperset': 713,
-    'reflexsuperset': 713,
-    'notsubset': 713,
-    'propersubset': 713,
-    'reflexsubset': 713,
-    'element': 713,
-    'notelement': 713,
-    'angle': 768,
-    'gradient': 713,
-    'registerserif': 790,
-    'copyrightserif': 790,
-    'trademarkserif': 890,
-    'product': 823,
-    'radical': 549,
-    'dotmath': 250,
-    'logicalnot': 713,
-    'logicaland': 603,
-    'logicalor': 603,
-    'arrowdblboth': 1042,
-    'arrowdblleft': 987,
-    'arrowdblup': 603,
-    'arrowdblright': 987,
-    'arrowdbldown': 603,
-    'lozenge': 494,
-    'angleleft': 329,
-    'registersans': 790,
-    'copyrightsans': 790,
-    'trademarksans': 786,
-    'summation': 713,
-    'parenlefttp': 384,
-    'parenleftex': 384,
-    'parenleftbt': 384,
-    'bracketlefttp': 384,
-    'bracketleftex': 384,
-    'bracketleftbt': 384,
-    'bracelefttp': 494,
-    'braceleftmid': 494,
-    'braceleftbt': 494,
-    'braceex': 494,
-    'angleright': 329,
-    'integral': 274,
-    'integraltp': 686,
-    'integralex': 686,
-    'integralbt': 686,
-    'parenrighttp': 384,
-    'parenrightex': 384,
-    'parenrightbt': 384,
-    'bracketrighttp': 384,
-    'bracketrightex': 384,
-    'bracketrightbt': 384,
-    'bracerighttp': 494,
-    'bracerightmid': 494,
-    'bracerightbt': 494,
-    'apple': 790
-  },
-  'Times-Roman': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 408,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 564,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 564,
-    'equal': 564,
-    'greater': 564,
-    'question': 444,
-    'at': 921,
-    'A': 722,
-    'B': 667,
-    'C': 667,
-    'D': 722,
-    'E': 611,
-    'F': 556,
-    'G': 722,
-    'H': 722,
-    'I': 333,
-    'J': 389,
-    'K': 722,
-    'L': 611,
-    'M': 889,
-    'N': 722,
-    'O': 722,
-    'P': 556,
-    'Q': 722,
-    'R': 667,
-    'S': 556,
-    'T': 611,
-    'U': 722,
-    'V': 722,
-    'W': 944,
-    'X': 722,
-    'Y': 722,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 469,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 444,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 500,
-    'i': 278,
-    'j': 278,
-    'k': 500,
-    'l': 278,
-    'm': 778,
-    'n': 500,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 333,
-    's': 389,
-    't': 278,
-    'u': 500,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 444,
-    'braceleft': 480,
-    'bar': 200,
-    'braceright': 480,
-    'asciitilde': 541,
-    'exclamdown': 333,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 180,
-    'quotedblleft': 444,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 453,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 444,
-    'quotedblright': 444,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 444,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 889,
-    'ordfeminine': 276,
-    'Lslash': 611,
-    'Oslash': 722,
-    'OE': 889,
-    'ordmasculine': 310,
-    'ae': 667,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 500,
-    'Idieresis': 333,
-    'eacute': 444,
-    'abreve': 444,
-    'uhungarumlaut': 500,
-    'ecaron': 444,
-    'Ydieresis': 722,
-    'divide': 564,
-    'Yacute': 722,
-    'Acircumflex': 722,
-    'aacute': 444,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 444,
-    'Uacute': 722,
-    'uogonek': 500,
-    'Edieresis': 611,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 760,
-    'Emacron': 611,
-    'ccaron': 444,
-    'aring': 444,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 444,
-    'Tcommaaccent': 611,
-    'Cacute': 667,
-    'atilde': 444,
-    'Edotaccent': 611,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 667,
-    'Gcommaaccent': 722,
-    'ucircumflex': 500,
-    'acircumflex': 444,
-    'Amacron': 722,
-    'rcaron': 333,
-    'ccedilla': 444,
-    'Zdotaccent': 611,
-    'Thorn': 556,
-    'Omacron': 722,
-    'Racute': 667,
-    'Sacute': 556,
-    'dcaron': 588,
-    'Umacron': 722,
-    'uring': 500,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 564,
-    'uacute': 500,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 611,
-    'adieresis': 444,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 500,
-    'umacron': 500,
-    'Ncaron': 722,
-    'Iacute': 333,
-    'plusminus': 564,
-    'brokenbar': 200,
-    'registered': 760,
-    'Gbreve': 722,
-    'Idotaccent': 333,
-    'summation': 600,
-    'Egrave': 611,
-    'racute': 333,
-    'omacron': 500,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 326,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 444,
-    'zacute': 444,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 444,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 500,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 611,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 344,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 980,
-    'edotaccent': 444,
-    'Igrave': 333,
-    'Imacron': 333,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 500,
-    'Uhungarumlaut': 722,
-    'Eacute': 611,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 500,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 667,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 722,
-    'zdotaccent': 444,
-    'Ecaron': 611,
-    'Iogonek': 333,
-    'kcommaaccent': 500,
-    'minus': 564,
-    'Icircumflex': 333,
-    'ncaron': 500,
-    'tcommaaccent': 278,
-    'logicalnot': 564,
-    'odieresis': 500,
-    'udieresis': 500,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 444,
-    'ncommaaccent': 500,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-Bold': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 555,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 1000,
-    'ampersand': 833,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 570,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 570,
-    'equal': 570,
-    'greater': 570,
-    'question': 500,
-    'at': 930,
-    'A': 722,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 778,
-    'I': 389,
-    'J': 500,
-    'K': 778,
-    'L': 667,
-    'M': 944,
-    'N': 722,
-    'O': 778,
-    'P': 611,
-    'Q': 778,
-    'R': 722,
-    'S': 556,
-    'T': 667,
-    'U': 722,
-    'V': 722,
-    'W': 1000,
-    'X': 722,
-    'Y': 722,
-    'Z': 667,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 581,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 556,
-    'c': 444,
-    'd': 556,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 556,
-    'i': 278,
-    'j': 333,
-    'k': 556,
-    'l': 278,
-    'm': 833,
-    'n': 556,
-    'o': 500,
-    'p': 556,
-    'q': 556,
-    'r': 444,
-    's': 389,
-    't': 333,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 444,
-    'braceleft': 394,
-    'bar': 220,
-    'braceright': 394,
-    'asciitilde': 520,
-    'exclamdown': 333,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 278,
-    'quotedblleft': 500,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 540,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 300,
-    'Lslash': 667,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 330,
-    'ae': 722,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 556,
-    'Idieresis': 389,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 556,
-    'ecaron': 444,
-    'Ydieresis': 722,
-    'divide': 570,
-    'Yacute': 722,
-    'Acircumflex': 722,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 747,
-    'Emacron': 667,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 667,
-    'Cacute': 722,
-    'atilde': 500,
-    'Edotaccent': 667,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 500,
-    'Amacron': 722,
-    'rcaron': 444,
-    'ccedilla': 444,
-    'Zdotaccent': 667,
-    'Thorn': 611,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 556,
-    'dcaron': 672,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 300,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 570,
-    'uacute': 556,
-    'Tcaron': 667,
-    'partialdiff': 494,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 389,
-    'plusminus': 570,
-    'brokenbar': 220,
-    'registered': 747,
-    'Gbreve': 778,
-    'Idotaccent': 389,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 444,
-    'omacron': 500,
-    'Zacute': 667,
-    'Zcaron': 667,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 416,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 444,
-    'zacute': 444,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 300,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 394,
-    'Kcommaaccent': 778,
-    'Lacute': 667,
-    'trademark': 1000,
-    'edotaccent': 444,
-    'Igrave': 389,
-    'Imacron': 389,
-    'Lcaron': 667,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 444,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 667,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 444,
-    'Ecaron': 667,
-    'Iogonek': 389,
-    'kcommaaccent': 556,
-    'minus': 570,
-    'Icircumflex': 389,
-    'ncaron': 556,
-    'tcommaaccent': 333,
-    'logicalnot': 570,
-    'odieresis': 500,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 444,
-    'ncommaaccent': 556,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-BoldItalic': {
-    'space': 250,
-    'exclam': 389,
-    'quotedbl': 555,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 570,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 570,
-    'equal': 570,
-    'greater': 570,
-    'question': 500,
-    'at': 832,
-    'A': 667,
-    'B': 667,
-    'C': 667,
-    'D': 722,
-    'E': 667,
-    'F': 667,
-    'G': 722,
-    'H': 778,
-    'I': 389,
-    'J': 500,
-    'K': 667,
-    'L': 611,
-    'M': 889,
-    'N': 722,
-    'O': 722,
-    'P': 611,
-    'Q': 722,
-    'R': 667,
-    'S': 556,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 889,
-    'X': 667,
-    'Y': 611,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 570,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 556,
-    'i': 278,
-    'j': 278,
-    'k': 500,
-    'l': 278,
-    'm': 778,
-    'n': 556,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 389,
-    's': 389,
-    't': 278,
-    'u': 556,
-    'v': 444,
-    'w': 667,
-    'x': 500,
-    'y': 444,
-    'z': 389,
-    'braceleft': 348,
-    'bar': 220,
-    'braceright': 348,
-    'asciitilde': 570,
-    'exclamdown': 389,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 278,
-    'quotedblleft': 500,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 500,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 944,
-    'ordfeminine': 266,
-    'Lslash': 611,
-    'Oslash': 722,
-    'OE': 944,
-    'ordmasculine': 300,
-    'ae': 722,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 500,
-    'Idieresis': 389,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 556,
-    'ecaron': 444,
-    'Ydieresis': 611,
-    'divide': 570,
-    'Yacute': 611,
-    'Acircumflex': 667,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 444,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 747,
-    'Emacron': 667,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 611,
-    'Cacute': 667,
-    'atilde': 500,
-    'Edotaccent': 667,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 667,
-    'Gcommaaccent': 722,
-    'ucircumflex': 556,
-    'acircumflex': 500,
-    'Amacron': 667,
-    'rcaron': 389,
-    'ccedilla': 444,
-    'Zdotaccent': 611,
-    'Thorn': 611,
-    'Omacron': 722,
-    'Racute': 667,
-    'Sacute': 556,
-    'dcaron': 608,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 570,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 444,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 389,
-    'plusminus': 570,
-    'brokenbar': 220,
-    'registered': 747,
-    'Gbreve': 722,
-    'Idotaccent': 389,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 500,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 366,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 444,
-    'zacute': 389,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 576,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 667,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 382,
-    'Kcommaaccent': 667,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 444,
-    'Igrave': 389,
-    'Imacron': 389,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 556,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 667,
-    'Lcommaaccent': 611,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 722,
-    'zdotaccent': 389,
-    'Ecaron': 667,
-    'Iogonek': 389,
-    'kcommaaccent': 500,
-    'minus': 606,
-    'Icircumflex': 389,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 606,
-    'odieresis': 500,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 389,
-    'ncommaaccent': 556,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-Italic': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 420,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 675,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 675,
-    'equal': 675,
-    'greater': 675,
-    'question': 500,
-    'at': 920,
-    'A': 611,
-    'B': 611,
-    'C': 667,
-    'D': 722,
-    'E': 611,
-    'F': 611,
-    'G': 722,
-    'H': 722,
-    'I': 333,
-    'J': 444,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 667,
-    'O': 722,
-    'P': 611,
-    'Q': 722,
-    'R': 611,
-    'S': 500,
-    'T': 556,
-    'U': 722,
-    'V': 611,
-    'W': 833,
-    'X': 611,
-    'Y': 556,
-    'Z': 556,
-    'bracketleft': 389,
-    'backslash': 278,
-    'bracketright': 389,
-    'asciicircum': 422,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 278,
-    'g': 500,
-    'h': 500,
-    'i': 278,
-    'j': 278,
-    'k': 444,
-    'l': 278,
-    'm': 722,
-    'n': 500,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 389,
-    's': 389,
-    't': 278,
-    'u': 500,
-    'v': 444,
-    'w': 667,
-    'x': 444,
-    'y': 444,
-    'z': 389,
-    'braceleft': 400,
-    'bar': 275,
-    'braceright': 400,
-    'asciitilde': 541,
-    'exclamdown': 389,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 214,
-    'quotedblleft': 556,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 523,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 556,
-    'quotedblright': 556,
-    'guillemotright': 500,
-    'ellipsis': 889,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 889,
-    'AE': 889,
-    'ordfeminine': 276,
-    'Lslash': 556,
-    'Oslash': 722,
-    'OE': 944,
-    'ordmasculine': 310,
-    'ae': 667,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 667,
-    'germandbls': 500,
-    'Idieresis': 333,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 500,
-    'ecaron': 444,
-    'Ydieresis': 556,
-    'divide': 675,
-    'Yacute': 556,
-    'Acircumflex': 611,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 444,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 500,
-    'Edieresis': 611,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 760,
-    'Emacron': 611,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 667,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 556,
-    'Cacute': 667,
-    'atilde': 500,
-    'Edotaccent': 611,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 611,
-    'Gcommaaccent': 722,
-    'ucircumflex': 500,
-    'acircumflex': 500,
-    'Amacron': 611,
-    'rcaron': 389,
-    'ccedilla': 444,
-    'Zdotaccent': 556,
-    'Thorn': 611,
-    'Omacron': 722,
-    'Racute': 611,
-    'Sacute': 500,
-    'dcaron': 544,
-    'Umacron': 722,
-    'uring': 500,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 611,
-    'Abreve': 611,
-    'multiply': 675,
-    'uacute': 500,
-    'Tcaron': 556,
-    'partialdiff': 476,
-    'ydieresis': 444,
-    'Nacute': 667,
-    'icircumflex': 278,
-    'Ecircumflex': 611,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 500,
-    'umacron': 500,
-    'Ncaron': 667,
-    'Iacute': 333,
-    'plusminus': 675,
-    'brokenbar': 275,
-    'registered': 760,
-    'Gbreve': 722,
-    'Idotaccent': 333,
-    'summation': 600,
-    'Egrave': 611,
-    'racute': 389,
-    'omacron': 500,
-    'Zacute': 556,
-    'Zcaron': 556,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 300,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 611,
-    'Adieresis': 611,
-    'egrave': 444,
-    'zacute': 389,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 500,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 611,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 500,
-    'lcaron': 300,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 980,
-    'edotaccent': 444,
-    'Igrave': 333,
-    'Imacron': 333,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 500,
-    'Uhungarumlaut': 722,
-    'Eacute': 611,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 500,
-    'Scommaaccent': 500,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 500,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 667,
-    'otilde': 500,
-    'Rcommaaccent': 611,
-    'Lcommaaccent': 556,
-    'Atilde': 611,
-    'Aogonek': 611,
-    'Aring': 611,
-    'Otilde': 722,
-    'zdotaccent': 389,
-    'Ecaron': 611,
-    'Iogonek': 333,
-    'kcommaaccent': 444,
-    'minus': 675,
-    'Icircumflex': 333,
-    'ncaron': 500,
-    'tcommaaccent': 278,
-    'logicalnot': 675,
-    'odieresis': 500,
-    'udieresis': 500,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 389,
-    'ncommaaccent': 500,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'ZapfDingbats': {
-    'space': 278,
-    'a1': 974,
-    'a2': 961,
-    'a202': 974,
-    'a3': 980,
-    'a4': 719,
-    'a5': 789,
-    'a119': 790,
-    'a118': 791,
-    'a117': 690,
-    'a11': 960,
-    'a12': 939,
-    'a13': 549,
-    'a14': 855,
-    'a15': 911,
-    'a16': 933,
-    'a105': 911,
-    'a17': 945,
-    'a18': 974,
-    'a19': 755,
-    'a20': 846,
-    'a21': 762,
-    'a22': 761,
-    'a23': 571,
-    'a24': 677,
-    'a25': 763,
-    'a26': 760,
-    'a27': 759,
-    'a28': 754,
-    'a6': 494,
-    'a7': 552,
-    'a8': 537,
-    'a9': 577,
-    'a10': 692,
-    'a29': 786,
-    'a30': 788,
-    'a31': 788,
-    'a32': 790,
-    'a33': 793,
-    'a34': 794,
-    'a35': 816,
-    'a36': 823,
-    'a37': 789,
-    'a38': 841,
-    'a39': 823,
-    'a40': 833,
-    'a41': 816,
-    'a42': 831,
-    'a43': 923,
-    'a44': 744,
-    'a45': 723,
-    'a46': 749,
-    'a47': 790,
-    'a48': 792,
-    'a49': 695,
-    'a50': 776,
-    'a51': 768,
-    'a52': 792,
-    'a53': 759,
-    'a54': 707,
-    'a55': 708,
-    'a56': 682,
-    'a57': 701,
-    'a58': 826,
-    'a59': 815,
-    'a60': 789,
-    'a61': 789,
-    'a62': 707,
-    'a63': 687,
-    'a64': 696,
-    'a65': 689,
-    'a66': 786,
-    'a67': 787,
-    'a68': 713,
-    'a69': 791,
-    'a70': 785,
-    'a71': 791,
-    'a72': 873,
-    'a73': 761,
-    'a74': 762,
-    'a203': 762,
-    'a75': 759,
-    'a204': 759,
-    'a76': 892,
-    'a77': 892,
-    'a78': 788,
-    'a79': 784,
-    'a81': 438,
-    'a82': 138,
-    'a83': 277,
-    'a84': 415,
-    'a97': 392,
-    'a98': 392,
-    'a99': 668,
-    'a100': 668,
-    'a89': 390,
-    'a90': 390,
-    'a93': 317,
-    'a94': 317,
-    'a91': 276,
-    'a92': 276,
-    'a205': 509,
-    'a85': 509,
-    'a206': 410,
-    'a86': 410,
-    'a87': 234,
-    'a88': 234,
-    'a95': 334,
-    'a96': 334,
-    'a101': 732,
-    'a102': 544,
-    'a103': 544,
-    'a104': 910,
-    'a106': 667,
-    'a107': 760,
-    'a108': 760,
-    'a112': 776,
-    'a111': 595,
-    'a110': 694,
-    'a109': 626,
-    'a120': 788,
-    'a121': 788,
-    'a122': 788,
-    'a123': 788,
-    'a124': 788,
-    'a125': 788,
-    'a126': 788,
-    'a127': 788,
-    'a128': 788,
-    'a129': 788,
-    'a130': 788,
-    'a131': 788,
-    'a132': 788,
-    'a133': 788,
-    'a134': 788,
-    'a135': 788,
-    'a136': 788,
-    'a137': 788,
-    'a138': 788,
-    'a139': 788,
-    'a140': 788,
-    'a141': 788,
-    'a142': 788,
-    'a143': 788,
-    'a144': 788,
-    'a145': 788,
-    'a146': 788,
-    'a147': 788,
-    'a148': 788,
-    'a149': 788,
-    'a150': 788,
-    'a151': 788,
-    'a152': 788,
-    'a153': 788,
-    'a154': 788,
-    'a155': 788,
-    'a156': 788,
-    'a157': 788,
-    'a158': 788,
-    'a159': 788,
-    'a160': 894,
-    'a161': 838,
-    'a163': 1016,
-    'a164': 458,
-    'a196': 748,
-    'a165': 924,
-    'a192': 748,
-    'a166': 918,
-    'a167': 927,
-    'a168': 928,
-    'a169': 928,
-    'a170': 834,
-    'a171': 873,
-    'a172': 828,
-    'a173': 924,
-    'a162': 924,
-    'a174': 917,
-    'a175': 930,
-    'a176': 931,
-    'a177': 463,
-    'a178': 883,
-    'a179': 836,
-    'a193': 836,
-    'a180': 867,
-    'a199': 867,
-    'a181': 696,
-    'a200': 696,
-    'a182': 874,
-    'a201': 874,
-    'a183': 760,
-    'a184': 946,
-    'a197': 771,
-    'a185': 865,
-    'a194': 771,
-    'a198': 888,
-    'a186': 967,
-    'a195': 888,
-    'a187': 831,
-    'a188': 873,
-    'a189': 927,
-    'a190': 970,
-    'a191': 918
-  }
-};
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var EOF = {};
-
-function isEOF(v) {
-  return v == EOF;
-}
-
-var Parser = (function ParserClosure() {
-  function Parser(lexer, allowStreams, xref) {
-    this.lexer = lexer;
-    this.allowStreams = allowStreams;
-    this.xref = xref;
-    this.inlineImg = 0;
-    this.refill();
-  }
-
-  Parser.prototype = {
-    refill: function Parser_refill() {
-      this.buf1 = this.lexer.getObj();
-      this.buf2 = this.lexer.getObj();
-    },
-    shift: function Parser_shift() {
-      if (isCmd(this.buf2, 'ID')) {
-        this.buf1 = this.buf2;
-        this.buf2 = null;
-        // skip byte after ID
-        this.lexer.skip();
-      } else {
-        this.buf1 = this.buf2;
-        this.buf2 = this.lexer.getObj();
-      }
-    },
-    getObj: function Parser_getObj(cipherTransform) {
-      if (isCmd(this.buf1, 'BI')) { // inline image
-        this.shift();
-        return this.makeInlineImage(cipherTransform);
-      }
-      if (isCmd(this.buf1, '[')) { // array
-        this.shift();
-        var array = [];
-        while (!isCmd(this.buf1, ']') && !isEOF(this.buf1))
-          array.push(this.getObj());
-        if (isEOF(this.buf1))
-          error('End of file inside array');
-        this.shift();
-        return array;
-      }
-      if (isCmd(this.buf1, '<<')) { // dictionary or stream
-        this.shift();
-        var dict = new Dict(this.xref);
-        while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
-          if (!isName(this.buf1))
-            error('Dictionary key must be a name object');
-
-          var key = this.buf1.name;
-          this.shift();
-          if (isEOF(this.buf1))
-            break;
-          dict.set(key, this.getObj(cipherTransform));
-        }
-        if (isEOF(this.buf1))
-          error('End of file inside dictionary');
-
-        // stream objects are not allowed inside content streams or
-        // object streams
-        if (isCmd(this.buf2, 'stream')) {
-          return this.allowStreams ?
-            this.makeStream(dict, cipherTransform) : dict;
-        }
-        this.shift();
-        return dict;
-      }
-      if (isInt(this.buf1)) { // indirect reference or integer
-        var num = this.buf1;
-        this.shift();
-        if (isInt(this.buf1) && isCmd(this.buf2, 'R')) {
-          var ref = new Ref(num, this.buf1);
-          this.shift();
-          this.shift();
-          return ref;
-        }
-        return num;
-      }
-      if (isString(this.buf1)) { // string
-        var str = this.buf1;
-        this.shift();
-        if (cipherTransform)
-          str = cipherTransform.decryptString(str);
-        return str;
-      }
-
-      // simple object
-      var obj = this.buf1;
-      this.shift();
-      return obj;
-    },
-    makeInlineImage: function Parser_makeInlineImage(cipherTransform) {
-      var lexer = this.lexer;
-      var stream = lexer.stream;
-
-      // parse dictionary
-      var dict = new Dict();
-      while (!isCmd(this.buf1, 'ID') && !isEOF(this.buf1)) {
-        if (!isName(this.buf1))
-          error('Dictionary key must be a name object');
-
-        var key = this.buf1.name;
-        this.shift();
-        if (isEOF(this.buf1))
-          break;
-        dict.set(key, this.getObj(cipherTransform));
-      }
-
-      // parse image stream
-      var startPos = stream.pos;
-
-      // searching for the /EI\s/
-      var state = 0, ch;
-      while (state != 4 && (ch = stream.getByte()) != null) {
-        switch (ch) {
-          case 0x20:
-          case 0x0D:
-          case 0x0A:
-            state = state === 3 ? 4 : 0;
-            break;
-          case 0x45:
-            state = 2;
-            break;
-          case 0x49:
-            state = state === 2 ? 3 : 0;
-            break;
-          default:
-            state = 0;
-            break;
-        }
-      }
-
-      // TODO improve the small images performance to remove the limit
-      var inlineImgLimit = 500;
-      if (++this.inlineImg >= inlineImgLimit) {
-        if (this.inlineImg === inlineImgLimit)
-          warn('Too many inline images');
-        this.shift();
-        return null;
-      }
-
-      var length = (stream.pos - 4) - startPos;
-      var imageStream = stream.makeSubStream(startPos, length, dict);
-      if (cipherTransform)
-        imageStream = cipherTransform.createStream(imageStream);
-      imageStream = this.filter(imageStream, dict, length);
-      imageStream.parameters = dict;
-
-      this.buf2 = Cmd.get('EI');
-      this.shift();
-
-      return imageStream;
-    },
-    fetchIfRef: function Parser_fetchIfRef(obj) {
-      // not relying on the xref.fetchIfRef -- xref might not be set
-      return isRef(obj) ? this.xref.fetch(obj) : obj;
-    },
-    makeStream: function Parser_makeStream(dict, cipherTransform) {
-      var lexer = this.lexer;
-      var stream = lexer.stream;
-
-      // get stream start position
-      lexer.skipToNextLine();
-      var pos = stream.pos;
-
-      // get length
-      var length = this.fetchIfRef(dict.get('Length'));
-      if (!isInt(length))
-        error('Bad ' + length + ' attribute in stream');
-
-      // skip over the stream data
-      stream.pos = pos + length;
-      this.shift(); // '>>'
-      this.shift(); // 'stream'
-      if (!isCmd(this.buf1, 'endstream'))
-        error('Missing endstream');
-      this.shift();
-
-      stream = stream.makeSubStream(pos, length, dict);
-      if (cipherTransform)
-        stream = cipherTransform.createStream(stream);
-      stream = this.filter(stream, dict, length);
-      stream.parameters = dict;
-      return stream;
-    },
-    filter: function Parser_filter(stream, dict, length) {
-      var filter = this.fetchIfRef(dict.get('Filter', 'F'));
-      var params = this.fetchIfRef(dict.get('DecodeParms', 'DP'));
-      if (isName(filter))
-        return this.makeFilter(stream, filter.name, length, params);
-      if (isArray(filter)) {
-        var filterArray = filter;
-        var paramsArray = params;
-        for (var i = 0, ii = filterArray.length; i < ii; ++i) {
-          filter = filterArray[i];
-          if (!isName(filter))
-            error('Bad filter name: ' + filter);
-
-          params = null;
-          if (isArray(paramsArray) && (i in paramsArray))
-            params = paramsArray[i];
-          stream = this.makeFilter(stream, filter.name, length, params);
-          // after the first stream the length variable is invalid
-          length = null;
-        }
-      }
-      return stream;
-    },
-    makeFilter: function Parser_makeFilter(stream, name, length, params) {
-      if (name == 'FlateDecode' || name == 'Fl') {
-        if (params) {
-          return new PredictorStream(new FlateStream(stream), params);
-        }
-        return new FlateStream(stream);
-      }
-      if (name == 'LZWDecode' || name == 'LZW') {
-        var earlyChange = 1;
-        if (params) {
-          if (params.has('EarlyChange'))
-            earlyChange = params.get('EarlyChange');
-          return new PredictorStream(
-            new LZWStream(stream, earlyChange), params);
-        }
-        return new LZWStream(stream, earlyChange);
-      }
-      if (name == 'DCTDecode' || name == 'DCT') {
-        var bytes = stream.getBytes(length);
-        return new JpegStream(bytes, stream.dict, this.xref);
-      }
-      if (name == 'JPXDecode' || name == 'JPX') {
-        var bytes = stream.getBytes(length);
-        return new JpxStream(bytes, stream.dict);
-      }
-      if (name == 'ASCII85Decode' || name == 'A85') {
-        return new Ascii85Stream(stream);
-      }
-      if (name == 'ASCIIHexDecode' || name == 'AHx') {
-        return new AsciiHexStream(stream);
-      }
-      if (name == 'CCITTFaxDecode' || name == 'CCF') {
-        return new CCITTFaxStream(stream, params);
-      }
-      if (name == 'RunLengthDecode') {
-        return new RunLengthStream(stream);
-      }
-      warn('filter "' + name + '" not supported yet');
-      return stream;
-    }
-  };
-
-  return Parser;
-})();
-
-var Lexer = (function LexerClosure() {
-  function Lexer(stream) {
-    this.stream = stream;
-  }
-
-  Lexer.isSpace = function Lexer_isSpace(ch) {
-    return ch == ' ' || ch == '\t' || ch == '\x0d' || ch == '\x0a';
-  };
-
-  // A '1' in this array means the character is white space.  A '1' or
-  // '2' means the character ends a name or command.
-  var specialChars = [
-    1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
-    1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2,   // 2x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,   // 3x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 4x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 5x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 6x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ax
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // bx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // cx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // dx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ex
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0    // fx
-  ];
-
-  function toHexDigit(ch) {
-    if (ch >= '0' && ch <= '9')
-      return ch.charCodeAt(0) - 48;
-    ch = ch.toUpperCase();
-    if (ch >= 'A' && ch <= 'F')
-      return ch.charCodeAt(0) - 55;
-    return -1;
-  }
-
-  Lexer.prototype = {
-    getNumber: function Lexer_getNumber(ch) {
-      var floating = false;
-      var str = ch;
-      var stream = this.stream;
-      for (;;) {
-        ch = stream.lookChar();
-        if (ch == '.' && !floating) {
-          str += ch;
-          floating = true;
-        } else if (ch == '-') {
-          // ignore minus signs in the middle of numbers to match
-          // Adobe's behavior
-          warn('Badly formated number');
-        } else if (ch >= '0' && ch <= '9') {
-          str += ch;
-        } else if (ch == 'e' || ch == 'E') {
-          floating = true;
-        } else {
-          // the last character doesn't belong to us
-          break;
-        }
-        stream.skip();
-      }
-      var value = parseFloat(str);
-      if (isNaN(value))
-        error('Invalid floating point number: ' + value);
-      return value;
-    },
-    getString: function Lexer_getString() {
-      var numParen = 1;
-      var done = false;
-      var str = '';
-      var stream = this.stream;
-      var ch;
-      do {
-        ch = stream.getChar();
-        switch (ch) {
-          case undefined:
-            warn('Unterminated string');
-            done = true;
-            break;
-          case '(':
-            ++numParen;
-            str += ch;
-            break;
-          case ')':
-            if (--numParen == 0) {
-              done = true;
-            } else {
-              str += ch;
-            }
-            break;
-          case '\\':
-            ch = stream.getChar();
-            switch (ch) {
-              case undefined:
-                warn('Unterminated string');
-                done = true;
-                break;
-              case 'n':
-                str += '\n';
-                break;
-              case 'r':
-                str += '\r';
-                break;
-              case 't':
-                str += '\t';
-                break;
-              case 'b':
-                str += '\b';
-                break;
-              case 'f':
-                str += '\f';
-                break;
-              case '\\':
-              case '(':
-              case ')':
-                str += ch;
-                break;
-              case '0': case '1': case '2': case '3':
-              case '4': case '5': case '6': case '7':
-                var x = ch - '0';
-                ch = stream.lookChar();
-                if (ch >= '0' && ch <= '7') {
-                  stream.skip();
-                  x = (x << 3) + (ch - '0');
-                  ch = stream.lookChar();
-                  if (ch >= '0' && ch <= '7') {
-                    stream.skip();
-                    x = (x << 3) + (ch - '0');
-                  }
-                }
-
-                str += String.fromCharCode(x);
-                break;
-              case '\r':
-                ch = stream.lookChar();
-                if (ch == '\n')
-                  stream.skip();
-                break;
-              case '\n':
-                break;
-              default:
-                str += ch;
-            }
-            break;
-          default:
-            str += ch;
-        }
-      } while (!done);
-      return str;
-    },
-    getName: function Lexer_getName(ch) {
-      var str = '';
-      var stream = this.stream;
-      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
-        stream.skip();
-        if (ch == '#') {
-          ch = stream.lookChar();
-          var x = toHexDigit(ch);
-          if (x != -1) {
-            stream.skip();
-            var x2 = toHexDigit(stream.getChar());
-            if (x2 == -1)
-              error('Illegal digit in hex char in name: ' + x2);
-            str += String.fromCharCode((x << 4) | x2);
-          } else {
-            str += '#';
-            str += ch;
-          }
-        } else {
-          str += ch;
-        }
-      }
-      if (str.length > 128)
-        error('Warning: name token is longer than allowed by the spec: ' +
-              str.length);
-      return new Name(str);
-    },
-    getHexString: function Lexer_getHexString(ch) {
-      var str = '';
-      var stream = this.stream;
-      for (;;) {
-        ch = stream.getChar();
-        if (ch == '>') {
-          break;
-        }
-        if (!ch) {
-          warn('Unterminated hex string');
-          break;
-        }
-        if (specialChars[ch.charCodeAt(0)] != 1) {
-          var x, x2;
-          if ((x = toHexDigit(ch)) == -1)
-            error('Illegal character in hex string: ' + ch);
-
-          ch = stream.getChar();
-          while (specialChars[ch.charCodeAt(0)] == 1)
-            ch = stream.getChar();
-
-          if ((x2 = toHexDigit(ch)) == -1)
-            error('Illegal character in hex string: ' + ch);
-
-          str += String.fromCharCode((x << 4) | x2);
-        }
-      }
-      return str;
-    },
-    getObj: function Lexer_getObj() {
-      // skip whitespace and comments
-      var comment = false;
-      var stream = this.stream;
-      var ch;
-      while (true) {
-        if (!(ch = stream.getChar()))
-          return EOF;
-        if (comment) {
-          if (ch == '\r' || ch == '\n')
-            comment = false;
-        } else if (ch == '%') {
-          comment = true;
-        } else if (specialChars[ch.charCodeAt(0)] != 1) {
-          break;
-        }
-      }
-
-      // start reading token
-      switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case '+': case '-': case '.':
-          return this.getNumber(ch);
-        case '(':
-          return this.getString();
-        case '/':
-          return this.getName(ch);
-        // array punctuation
-        case '[':
-        case ']':
-          return Cmd.get(ch);
-        // hex string or dict punctuation
-        case '<':
-          ch = stream.lookChar();
-          if (ch == '<') {
-            // dict punctuation
-            stream.skip();
-            return Cmd.get('<<');
-          }
-          return this.getHexString(ch);
-        // dict punctuation
-        case '>':
-          ch = stream.lookChar();
-          if (ch == '>') {
-            stream.skip();
-            return Cmd.get('>>');
-          }
-        case '{':
-        case '}':
-          return Cmd.get(ch);
-        // fall through
-        case ')':
-          error('Illegal character: ' + ch);
-      }
-
-      // command
-      var str = ch;
-      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
-        stream.skip();
-        if (str.length == 128)
-          error('Command token too long: ' + str.length);
-
-        str += ch;
-      }
-      if (str == 'true')
-        return true;
-      if (str == 'false')
-        return false;
-      if (str == 'null')
-        return null;
-      return Cmd.get(str);
-    },
-    skipToNextLine: function Lexer_skipToNextLine() {
-      var stream = this.stream;
-      while (true) {
-        var ch = stream.getChar();
-        if (!ch || ch == '\n')
-          return;
-        if (ch == '\r') {
-          if ((ch = stream.lookChar()) == '\n')
-            stream.skip();
-          return;
-        }
-      }
-    },
-    skip: function Lexer_skip() {
-      this.stream.skip();
-    }
-  };
-
-  return Lexer;
-})();
-
-var Linearization = (function LinearizationClosure() {
-  function Linearization(stream) {
-    this.parser = new Parser(new Lexer(stream), false, null);
-    var obj1 = this.parser.getObj();
-    var obj2 = this.parser.getObj();
-    var obj3 = this.parser.getObj();
-    this.linDict = this.parser.getObj();
-    if (isInt(obj1) && isInt(obj2) && isCmd(obj3, 'obj') &&
-        isDict(this.linDict)) {
-      var obj = this.linDict.get('Linearized');
-      if (!(isNum(obj) && obj > 0))
-        this.linDict = null;
-    }
-  }
-
-  Linearization.prototype = {
-    getInt: function Linearization_getInt(name) {
-      var linDict = this.linDict;
-      var obj;
-      if (isDict(linDict) &&
-          isInt(obj = linDict.get(name)) &&
-          obj > 0) {
-        return obj;
-      }
-      error('"' + name + '" field in linearization table is invalid');
-    },
-    getHint: function Linearization_getHint(index) {
-      var linDict = this.linDict;
-      var obj1, obj2;
-      if (isDict(linDict) &&
-          isArray(obj1 = linDict.get('H')) &&
-          obj1.length >= 2 &&
-          isInt(obj2 = obj1[index]) &&
-          obj2 > 0) {
-        return obj2;
-      }
-      error('Hints table in linearization table is invalid: ' + index);
-    },
-    get length() {
-      if (!isDict(this.linDict))
-        return 0;
-      return this.getInt('L');
-    },
-    get hintsOffset() {
-      return this.getHint(0);
-    },
-    get hintsLength() {
-      return this.getHint(1);
-    },
-    get hintsOffset2() {
-      return this.getHint(2);
-    },
-    get hintsLenth2() {
-      return this.getHint(3);
-    },
-    get objectNumberFirst() {
-      return this.getInt('O');
-    },
-    get endFirst() {
-      return this.getInt('E');
-    },
-    get numPages() {
-      return this.getInt('N');
-    },
-    get mainXRefEntriesOffset() {
-      return this.getInt('T');
-    },
-    get pageFirst() {
-      return this.getInt('P');
-    }
-  };
-
-  return Linearization;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var PatternType = {
-  AXIAL: 2,
-  RADIAL: 3
-};
-
-var Pattern = (function PatternClosure() {
-  // Constructor should define this.getPattern
-  function Pattern() {
-    error('should not call Pattern constructor');
-  }
-
-  Pattern.prototype = {
-    // Input: current Canvas context
-    // Output: the appropriate fillStyle or strokeStyle
-    getPattern: function Pattern_getPattern(ctx) {
-      error('Should not call Pattern.getStyle: ' + ctx);
-    }
-  };
-
-  Pattern.shadingFromIR = function Pattern_shadingFromIR(raw) {
-    return Shadings[raw[0]].fromIR(raw);
-  };
-
-  Pattern.parseShading = function Pattern_parseShading(shading, matrix, xref,
-                                                       res) {
-
-    var dict = isStream(shading) ? shading.dict : shading;
-    var type = dict.get('ShadingType');
-
-    switch (type) {
-      case PatternType.AXIAL:
-      case PatternType.RADIAL:
-        // Both radial and axial shadings are handled by RadialAxial shading.
-        return new Shadings.RadialAxial(dict, matrix, xref, res);
-      default:
-        return new Shadings.Dummy();
-    }
-  };
-  return Pattern;
-})();
-
-var Shadings = {};
-
-// Radial and axial shading have very similar implementations
-// If needed, the implementations can be broken into two classes
-Shadings.RadialAxial = (function RadialAxialClosure() {
-  function RadialAxial(dict, matrix, xref, res, ctx) {
-    this.matrix = matrix;
-    this.coordsArr = dict.get('Coords');
-    this.shadingType = dict.get('ShadingType');
-    this.type = 'Pattern';
-
-    this.ctx = ctx;
-    var cs = dict.get('ColorSpace', 'CS');
-    cs = ColorSpace.parse(cs, xref, res);
-    this.cs = cs;
-
-    var t0 = 0.0, t1 = 1.0;
-    if (dict.has('Domain')) {
-      var domainArr = dict.get('Domain');
-      t0 = domainArr[0];
-      t1 = domainArr[1];
-    }
-
-    var extendStart = false, extendEnd = false;
-    if (dict.has('Extend')) {
-      var extendArr = dict.get('Extend');
-      extendStart = extendArr[0];
-      extendEnd = extendArr[1];
-      TODO('Support extend');
-    }
-
-    this.extendStart = extendStart;
-    this.extendEnd = extendEnd;
-
-    var fnObj = dict.get('Function');
-    if (isArray(fnObj))
-      error('No support for array of functions');
-    if (!isPDFFunction(fnObj))
-      error('Invalid function');
-    var fn = PDFFunction.parse(xref, fnObj);
-
-    // 10 samples seems good enough for now, but probably won't work
-    // if there are sharp color changes. Ideally, we would implement
-    // the spec faithfully and add lossless optimizations.
-    var step = (t1 - t0) / 10;
-    var diff = t1 - t0;
-
-    var colorStops = [];
-    for (var i = t0; i <= t1; i += step) {
-      var rgbColor = cs.getRgb(fn([i]));
-      var cssColor = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      colorStops.push([(i - t0) / diff, cssColor]);
-    }
-
-    this.colorStops = colorStops;
-  }
-
-  RadialAxial.fromIR = function RadialAxial_fromIR(raw) {
-    var type = raw[1];
-    var colorStops = raw[2];
-    var p0 = raw[3];
-    var p1 = raw[4];
-    var r0 = raw[5];
-    var r1 = raw[6];
-    return {
-      type: 'Pattern',
-      getPattern: function(ctx) {
-        var curMatrix = ctx.mozCurrentTransform;
-        if (curMatrix) {
-          var userMatrix = ctx.mozCurrentTransformInverse;
-
-          p0 = Util.applyTransform(p0, curMatrix);
-          p0 = Util.applyTransform(p0, userMatrix);
-
-          p1 = Util.applyTransform(p1, curMatrix);
-          p1 = Util.applyTransform(p1, userMatrix);
-        }
-
-        var grad;
-        if (type == PatternType.AXIAL)
-          grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
-        else if (type == PatternType.RADIAL)
-          grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
-
-        for (var i = 0, ii = colorStops.length; i < ii; ++i) {
-          var c = colorStops[i];
-          grad.addColorStop(c[0], c[1]);
-        }
-        return grad;
-      }
-    };
-  };
-
-  RadialAxial.prototype = {
-    getIR: function RadialAxial_getIR() {
-      var coordsArr = this.coordsArr;
-      var type = this.shadingType;
-      if (type == PatternType.AXIAL) {
-        var p0 = [coordsArr[0], coordsArr[1]];
-        var p1 = [coordsArr[2], coordsArr[3]];
-        var r0 = null;
-        var r1 = null;
-      } else if (type == PatternType.RADIAL) {
-        var p0 = [coordsArr[0], coordsArr[1]];
-        var p1 = [coordsArr[3], coordsArr[4]];
-        var r0 = coordsArr[2];
-        var r1 = coordsArr[5];
-      } else {
-        error('getPattern type unknown: ' + type);
-      }
-
-      var matrix = this.matrix;
-      if (matrix) {
-        p0 = Util.applyTransform(p0, matrix);
-        p1 = Util.applyTransform(p1, matrix);
-      }
-
-      return ['RadialAxial', type, this.colorStops, p0, p1, r0, r1];
-    }
-  };
-
-  return RadialAxial;
-})();
-
-Shadings.Dummy = (function DummyClosure() {
-  function Dummy() {
-    this.type = 'Pattern';
-  }
-
-  Dummy.fromIR = function Dummy_fromIR() {
-    return 'hotpink';
-  };
-
-  Dummy.prototype = {
-    getIR: function Dummy_getIR() {
-      return ['Dummy'];
-    }
-  };
-  return Dummy;
-})();
-
-var TilingPattern = (function TilingPatternClosure() {
-  var PaintType = {
-    COLORED: 1,
-    UNCOLORED: 2
-  };
-  var MAX_PATTERN_SIZE = 512;
-
-  function TilingPattern(IR, color, ctx, objs) {
-    var operatorList = IR[2];
-    this.matrix = IR[3];
-    var bbox = IR[4];
-    var xstep = IR[5];
-    var ystep = IR[6];
-    var paintType = IR[7];
-
-    TODO('TilingType');
-
-    this.curMatrix = ctx.mozCurrentTransform;
-    this.invMatrix = ctx.mozCurrentTransformInverse;
-    this.ctx = ctx;
-    this.type = 'Pattern';
-
-    var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3];
-
-    var topLeft = [x0, y0];
-    // we want the canvas to be as large as the step size
-    var botRight = [x0 + xstep, y0 + ystep];
-
-    var width = botRight[0] - topLeft[0];
-    var height = botRight[1] - topLeft[1];
-
-    // TODO: hack to avoid OOM, we would ideally compute the tiling
-    // pattern to be only as large as the acual size in device space
-    // This could be computed with .mozCurrentTransform, but still
-    // needs to be implemented
-    while (Math.abs(width) > MAX_PATTERN_SIZE ||
-           Math.abs(height) > MAX_PATTERN_SIZE) {
-      width = height = MAX_PATTERN_SIZE;
-    }
-
-    var tmpCanvas = createScratchCanvas(width, height);
-
-    // set the new canvas element context as the graphics context
-    var tmpCtx = tmpCanvas.getContext('2d');
-    var graphics = new CanvasGraphics(tmpCtx, objs);
-
-    switch (paintType) {
-      case PaintType.COLORED:
-        tmpCtx.fillStyle = ctx.fillStyle;
-        tmpCtx.strokeStyle = ctx.strokeStyle;
-        break;
-      case PaintType.UNCOLORED:
-        var cssColor = Util.makeCssRgb(this, color[0], color[1], color[2]);
-        tmpCtx.fillStyle = cssColor;
-        tmpCtx.strokeStyle = cssColor;
-        break;
-      default:
-        error('Unsupported paint type: ' + paintType);
-    }
-
-    var scale = [width / xstep, height / ystep];
-    this.scale = scale;
-
-    // transform coordinates to pattern space
-    var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
-    var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
-    graphics.transform.apply(graphics, tmpScale);
-    graphics.transform.apply(graphics, tmpTranslate);
-
-    if (bbox && isArray(bbox) && 4 == bbox.length) {
-      var bboxWidth = x1 - x0;
-      var bboxHeight = y1 - y0;
-      graphics.rectangle(x0, y0, bboxWidth, bboxHeight);
-      graphics.clip();
-      graphics.endPath();
-    }
-
-    graphics.executeOperatorList(operatorList);
-
-    this.canvas = tmpCanvas;
-  }
-
-  TilingPattern.getIR = function TilingPattern_getIR(operatorList, dict, args) {
-    var matrix = dict.get('Matrix');
-    var bbox = dict.get('BBox');
-    var xstep = dict.get('XStep');
-    var ystep = dict.get('YStep');
-    var paintType = dict.get('PaintType');
-
-    return [
-      'TilingPattern', args, operatorList, matrix, bbox, xstep, ystep, paintType
-    ];
-  };
-
-  TilingPattern.prototype = {
-    getPattern: function TilingPattern_getPattern() {
-      var matrix = this.matrix;
-      var curMatrix = this.curMatrix;
-      var ctx = this.ctx;
-
-      if (curMatrix)
-        ctx.setTransform.apply(ctx, curMatrix);
-
-      if (matrix)
-        ctx.transform.apply(ctx, matrix);
-
-      var scale = this.scale;
-      ctx.scale(1 / scale[0], 1 / scale[1]);
-
-      return ctx.createPattern(this.canvas, 'repeat');
-    }
-  };
-
-  return TilingPattern;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var Stream = (function StreamClosure() {
-  function Stream(arrayBuffer, start, length, dict) {
-    this.bytes = new Uint8Array(arrayBuffer);
-    this.start = start || 0;
-    this.pos = this.start;
-    this.end = (start + length) || this.bytes.length;
-    this.dict = dict;
-  }
-
-  // required methods for a stream. if a particular stream does not
-  // implement these, an error should be thrown
-  Stream.prototype = {
-    get length() {
-      return this.end - this.start;
-    },
-    getByte: function Stream_getByte() {
-      if (this.pos >= this.end)
-        return null;
-      return this.bytes[this.pos++];
-    },
-    // returns subarray of original buffer
-    // should only be read
-    getBytes: function Stream_getBytes(length) {
-      var bytes = this.bytes;
-      var pos = this.pos;
-      var strEnd = this.end;
-
-      if (!length)
-        return bytes.subarray(pos, strEnd);
-
-      var end = pos + length;
-      if (end > strEnd)
-        end = strEnd;
-
-      this.pos = end;
-      return bytes.subarray(pos, end);
-    },
-    lookChar: function Stream_lookChar() {
-      if (this.pos >= this.end)
-        return null;
-      return String.fromCharCode(this.bytes[this.pos]);
-    },
-    getChar: function Stream_getChar() {
-      if (this.pos >= this.end)
-        return null;
-      return String.fromCharCode(this.bytes[this.pos++]);
-    },
-    skip: function Stream_skip(n) {
-      if (!n)
-        n = 1;
-      this.pos += n;
-    },
-    reset: function Stream_reset() {
-      this.pos = this.start;
-    },
-    moveStart: function Stream_moveStart() {
-      this.start = this.pos;
-    },
-    makeSubStream: function Stream_makeSubStream(start, length, dict) {
-      return new Stream(this.bytes.buffer, start, length, dict);
-    },
-    isStream: true
-  };
-
-  return Stream;
-})();
-
-var StringStream = (function StringStreamClosure() {
-  function StringStream(str) {
-    var length = str.length;
-    var bytes = new Uint8Array(length);
-    for (var n = 0; n < length; ++n)
-      bytes[n] = str.charCodeAt(n);
-    Stream.call(this, bytes);
-  }
-
-  StringStream.prototype = Stream.prototype;
-
-  return StringStream;
-})();
-
-// super class for the decoding streams
-var DecodeStream = (function DecodeStreamClosure() {
-  function DecodeStream() {
-    this.pos = 0;
-    this.bufferLength = 0;
-    this.eof = false;
-    this.buffer = null;
-  }
-
-  DecodeStream.prototype = {
-    ensureBuffer: function DecodeStream_ensureBuffer(requested) {
-      var buffer = this.buffer;
-      var current = buffer ? buffer.byteLength : 0;
-      if (requested < current)
-        return buffer;
-      var size = 512;
-      while (size < requested)
-        size <<= 1;
-      var buffer2 = new Uint8Array(size);
-      for (var i = 0; i < current; ++i)
-        buffer2[i] = buffer[i];
-      return (this.buffer = buffer2);
-    },
-    getByte: function DecodeStream_getByte() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return this.buffer[this.pos++];
-    },
-    getBytes: function DecodeStream_getBytes(length) {
-      var end, pos = this.pos;
-
-      if (length) {
-        this.ensureBuffer(pos + length);
-        end = pos + length;
-
-        while (!this.eof && this.bufferLength < end)
-          this.readBlock();
-
-        var bufEnd = this.bufferLength;
-        if (end > bufEnd)
-          end = bufEnd;
-      } else {
-        while (!this.eof)
-          this.readBlock();
-
-        end = this.bufferLength;
-
-        // checking if bufferLength is still 0 then
-        // the buffer has to be initialized
-        if (!end)
-          this.buffer = new Uint8Array(0);
-      }
-
-      this.pos = end;
-      return this.buffer.subarray(pos, end);
-    },
-    lookChar: function DecodeStream_lookChar() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return String.fromCharCode(this.buffer[this.pos]);
-    },
-    getChar: function DecodeStream_getChar() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return String.fromCharCode(this.buffer[this.pos++]);
-    },
-    makeSubStream: function DecodeStream_makeSubStream(start, length, dict) {
-      var end = start + length;
-      while (this.bufferLength <= end && !this.eof)
-        this.readBlock();
-      return new Stream(this.buffer, start, length, dict);
-    },
-    skip: function DecodeStream_skip(n) {
-      if (!n)
-        n = 1;
-      this.pos += n;
-    },
-    reset: function DecodeStream_reset() {
-      this.pos = 0;
-    }
-  };
-
-  return DecodeStream;
-})();
-
-var FakeStream = (function FakeStreamClosure() {
-  function FakeStream(stream) {
-    this.dict = stream.dict;
-    DecodeStream.call(this);
-  }
-
-  FakeStream.prototype = Object.create(DecodeStream.prototype);
-  FakeStream.prototype.readBlock = function FakeStream_readBlock() {
-    var bufferLength = this.bufferLength;
-    bufferLength += 1024;
-    var buffer = this.ensureBuffer(bufferLength);
-    this.bufferLength = bufferLength;
-  };
-
-  FakeStream.prototype.getBytes = function FakeStream_getBytes(length) {
-    var end, pos = this.pos;
-
-    if (length) {
-      this.ensureBuffer(pos + length);
-      end = pos + length;
-
-      while (!this.eof && this.bufferLength < end)
-        this.readBlock();
-
-      var bufEnd = this.bufferLength;
-      if (end > bufEnd)
-        end = bufEnd;
-    } else {
-      this.eof = true;
-      end = this.bufferLength;
-    }
-
-    this.pos = end;
-    return this.buffer.subarray(pos, end);
-  };
-
-  return FakeStream;
-})();
-
-var StreamsSequenceStream = (function StreamsSequenceStreamClosure() {
-  function StreamsSequenceStream(streams) {
-    this.streams = streams;
-    DecodeStream.call(this);
-  }
-
-  StreamsSequenceStream.prototype = Object.create(DecodeStream.prototype);
-
-  StreamsSequenceStream.prototype.readBlock =
-    function streamSequenceStreamReadBlock() {
-
-    var streams = this.streams;
-    if (streams.length == 0) {
-      this.eof = true;
-      return;
-    }
-    var stream = streams.shift();
-    var chunk = stream.getBytes();
-    var bufferLength = this.bufferLength;
-    var newLength = bufferLength + chunk.length;
-    var buffer = this.ensureBuffer(newLength);
-    buffer.set(chunk, bufferLength);
-    this.bufferLength = newLength;
-  };
-
-  return StreamsSequenceStream;
-})();
-
-var FlateStream = (function FlateStreamClosure() {
-  var codeLenCodeMap = new Uint32Array([
-    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-  ]);
-
-  var lengthDecode = new Uint32Array([
-    0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a,
-    0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f,
-    0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073,
-    0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102
-  ]);
-
-  var distDecode = new Uint32Array([
-    0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d,
-    0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1,
-    0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01,
-    0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001
-  ]);
-
-  var fixedLitCodeTab = [new Uint32Array([
-    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0,
-    0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0,
-    0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0,
-    0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0,
-    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8,
-    0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8,
-    0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8,
-    0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8,
-    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4,
-    0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4,
-    0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4,
-    0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4,
-    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc,
-    0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec,
-    0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc,
-    0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc,
-    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2,
-    0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2,
-    0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2,
-    0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2,
-    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca,
-    0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea,
-    0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da,
-    0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa,
-    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6,
-    0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6,
-    0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6,
-    0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6,
-    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce,
-    0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee,
-    0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de,
-    0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe,
-    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1,
-    0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1,
-    0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1,
-    0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1,
-    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9,
-    0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9,
-    0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9,
-    0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9,
-    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5,
-    0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5,
-    0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5,
-    0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5,
-    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd,
-    0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed,
-    0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd,
-    0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd,
-    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3,
-    0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3,
-    0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3,
-    0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3,
-    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb,
-    0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb,
-    0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db,
-    0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb,
-    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7,
-    0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7,
-    0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7,
-    0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7,
-    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf,
-    0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef,
-    0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df,
-    0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff
-  ]), 9];
-
-  var fixedDistCodeTab = [new Uint32Array([
-    0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c,
-    0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000,
-    0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d,
-    0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000
-  ]), 5];
-
-  function FlateStream(stream) {
-    var bytes = stream.getBytes();
-    var bytesPos = 0;
-
-    this.dict = stream.dict;
-    var cmf = bytes[bytesPos++];
-    var flg = bytes[bytesPos++];
-    if (cmf == -1 || flg == -1)
-      error('Invalid header in flate stream: ' + cmf + ', ' + flg);
-    if ((cmf & 0x0f) != 0x08)
-      error('Unknown compression method in flate stream: ' + cmf + ', ' + flg);
-    if ((((cmf << 8) + flg) % 31) != 0)
-      error('Bad FCHECK in flate stream: ' + cmf + ', ' + flg);
-    if (flg & 0x20)
-      error('FDICT bit set in flate stream: ' + cmf + ', ' + flg);
-
-    this.bytes = bytes;
-    this.bytesPos = bytesPos;
-
-    this.codeSize = 0;
-    this.codeBuf = 0;
-
-    DecodeStream.call(this);
-  }
-
-  FlateStream.prototype = Object.create(DecodeStream.prototype);
-
-  FlateStream.prototype.getBits = function FlateStream_getBits(bits) {
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var bytes = this.bytes;
-    var bytesPos = this.bytesPos;
-
-    var b;
-    while (codeSize < bits) {
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad encoding in flate stream');
-      codeBuf |= b << codeSize;
-      codeSize += 8;
-    }
-    b = codeBuf & ((1 << bits) - 1);
-    this.codeBuf = codeBuf >> bits;
-    this.codeSize = codeSize -= bits;
-    this.bytesPos = bytesPos;
-    return b;
-  };
-
-  FlateStream.prototype.getCode = function FlateStream_getCode(table) {
-    var codes = table[0];
-    var maxLen = table[1];
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var bytes = this.bytes;
-    var bytesPos = this.bytesPos;
-
-    while (codeSize < maxLen) {
-      var b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad encoding in flate stream');
-      codeBuf |= (b << codeSize);
-      codeSize += 8;
-    }
-    var code = codes[codeBuf & ((1 << maxLen) - 1)];
-    var codeLen = code >> 16;
-    var codeVal = code & 0xffff;
-    if (codeSize == 0 || codeSize < codeLen || codeLen == 0)
-      error('Bad encoding in flate stream');
-    this.codeBuf = (codeBuf >> codeLen);
-    this.codeSize = (codeSize - codeLen);
-    this.bytesPos = bytesPos;
-    return codeVal;
-  };
-
-  FlateStream.prototype.generateHuffmanTable =
-    function flateStreamGenerateHuffmanTable(lengths) {
-    var n = lengths.length;
-
-    // find max code length
-    var maxLen = 0;
-    for (var i = 0; i < n; ++i) {
-      if (lengths[i] > maxLen)
-        maxLen = lengths[i];
-    }
-
-    // build the table
-    var size = 1 << maxLen;
-    var codes = new Uint32Array(size);
-    for (var len = 1, code = 0, skip = 2;
-         len <= maxLen;
-         ++len, code <<= 1, skip <<= 1) {
-      for (var val = 0; val < n; ++val) {
-        if (lengths[val] == len) {
-          // bit-reverse the code
-          var code2 = 0;
-          var t = code;
-          for (var i = 0; i < len; ++i) {
-            code2 = (code2 << 1) | (t & 1);
-            t >>= 1;
-          }
-
-          // fill the table entries
-          for (var i = code2; i < size; i += skip)
-            codes[i] = (len << 16) | val;
-
-          ++code;
-        }
-      }
-    }
-
-    return [codes, maxLen];
-  };
-
-  FlateStream.prototype.readBlock = function FlateStream_readBlock() {
-    // read block header
-    var hdr = this.getBits(3);
-    if (hdr & 1)
-      this.eof = true;
-    hdr >>= 1;
-
-    if (hdr == 0) { // uncompressed block
-      var bytes = this.bytes;
-      var bytesPos = this.bytesPos;
-      var b;
-
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      var blockLen = b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      blockLen |= (b << 8);
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      var check = b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      check |= (b << 8);
-      if (check != (~blockLen & 0xffff))
-        error('Bad uncompressed block length in flate stream');
-
-      this.codeBuf = 0;
-      this.codeSize = 0;
-
-      var bufferLength = this.bufferLength;
-      var buffer = this.ensureBuffer(bufferLength + blockLen);
-      var end = bufferLength + blockLen;
-      this.bufferLength = end;
-      for (var n = bufferLength; n < end; ++n) {
-        if (typeof (b = bytes[bytesPos++]) == 'undefined') {
-          this.eof = true;
-          break;
-        }
-        buffer[n] = b;
-      }
-      this.bytesPos = bytesPos;
-      return;
-    }
-
-    var litCodeTable;
-    var distCodeTable;
-    if (hdr == 1) { // compressed block, fixed codes
-      litCodeTable = fixedLitCodeTab;
-      distCodeTable = fixedDistCodeTab;
-    } else if (hdr == 2) { // compressed block, dynamic codes
-      var numLitCodes = this.getBits(5) + 257;
-      var numDistCodes = this.getBits(5) + 1;
-      var numCodeLenCodes = this.getBits(4) + 4;
-
-      // build the code lengths code table
-      var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
-
-      for (var i = 0; i < numCodeLenCodes; ++i)
-        codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
-      var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
-
-      // build the literal and distance code tables
-      var len = 0;
-      var i = 0;
-      var codes = numLitCodes + numDistCodes;
-      var codeLengths = new Uint8Array(codes);
-      while (i < codes) {
-        var code = this.getCode(codeLenCodeTab);
-        if (code == 16) {
-          var bitsLength = 2, bitsOffset = 3, what = len;
-        } else if (code == 17) {
-          var bitsLength = 3, bitsOffset = 3, what = (len = 0);
-        } else if (code == 18) {
-          var bitsLength = 7, bitsOffset = 11, what = (len = 0);
-        } else {
-          codeLengths[i++] = len = code;
-          continue;
-        }
-
-        var repeatLength = this.getBits(bitsLength) + bitsOffset;
-        while (repeatLength-- > 0)
-          codeLengths[i++] = what;
-      }
-
-      litCodeTable =
-        this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
-      distCodeTable =
-        this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
-    } else {
-      error('Unknown block type in flate stream');
-    }
-
-    var buffer = this.buffer;
-    var limit = buffer ? buffer.length : 0;
-    var pos = this.bufferLength;
-    while (true) {
-      var code1 = this.getCode(litCodeTable);
-      if (code1 < 256) {
-        if (pos + 1 >= limit) {
-          buffer = this.ensureBuffer(pos + 1);
-          limit = buffer.length;
-        }
-        buffer[pos++] = code1;
-        continue;
-      }
-      if (code1 == 256) {
-        this.bufferLength = pos;
-        return;
-      }
-      code1 -= 257;
-      code1 = lengthDecode[code1];
-      var code2 = code1 >> 16;
-      if (code2 > 0)
-        code2 = this.getBits(code2);
-      var len = (code1 & 0xffff) + code2;
-      code1 = this.getCode(distCodeTable);
-      code1 = distDecode[code1];
-      code2 = code1 >> 16;
-      if (code2 > 0)
-        code2 = this.getBits(code2);
-      var dist = (code1 & 0xffff) + code2;
-      if (pos + len >= limit) {
-        buffer = this.ensureBuffer(pos + len);
-        limit = buffer.length;
-      }
-      for (var k = 0; k < len; ++k, ++pos)
-        buffer[pos] = buffer[pos - dist];
-    }
-  };
-
-  return FlateStream;
-})();
-
-var PredictorStream = (function PredictorStreamClosure() {
-  function PredictorStream(stream, params) {
-    var predictor = this.predictor = params.get('Predictor') || 1;
-
-    if (predictor <= 1)
-      return stream; // no prediction
-    if (predictor !== 2 && (predictor < 10 || predictor > 15))
-      error('Unsupported predictor: ' + predictor);
-
-    if (predictor === 2)
-      this.readBlock = this.readBlockTiff;
-    else
-      this.readBlock = this.readBlockPng;
-
-    this.stream = stream;
-    this.dict = stream.dict;
-
-    var colors = this.colors = params.get('Colors') || 1;
-    var bits = this.bits = params.get('BitsPerComponent') || 8;
-    var columns = this.columns = params.get('Columns') || 1;
-
-    this.pixBytes = (colors * bits + 7) >> 3;
-    this.rowBytes = (columns * colors * bits + 7) >> 3;
-
-    DecodeStream.call(this);
-    return this;
-  }
-
-  PredictorStream.prototype = Object.create(DecodeStream.prototype);
-
-  PredictorStream.prototype.readBlockTiff =
-    function predictorStreamReadBlockTiff() {
-    var rowBytes = this.rowBytes;
-
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-
-    var bits = this.bits;
-    var colors = this.colors;
-
-    var rawBytes = this.stream.getBytes(rowBytes);
-
-    var inbuf = 0, outbuf = 0;
-    var inbits = 0, outbits = 0;
-    var pos = bufferLength;
-
-    if (bits === 1) {
-      for (var i = 0; i < rowBytes; ++i) {
-        var c = rawBytes[i];
-        inbuf = (inbuf << 8) | c;
-        // bitwise addition is exclusive or
-        // first shift inbuf and then add
-        buffer[pos++] = (c ^ (inbuf >> colors)) & 0xFF;
-        // truncate inbuf (assumes colors < 16)
-        inbuf &= 0xFFFF;
-      }
-    } else if (bits === 8) {
-      for (var i = 0; i < colors; ++i)
-        buffer[pos++] = rawBytes[i];
-      for (; i < rowBytes; ++i) {
-        buffer[pos] = buffer[pos - colors] + rawBytes[i];
-        pos++;
-      }
-    } else {
-      var compArray = new Uint8Array(colors + 1);
-      var bitMask = (1 << bits) - 1;
-      var j = 0, k = bufferLength;
-      var columns = this.columns;
-      for (var i = 0; i < columns; ++i) {
-        for (var kk = 0; kk < colors; ++kk) {
-          if (inbits < bits) {
-            inbuf = (inbuf << 8) | (rawBytes[j++] & 0xFF);
-            inbits += 8;
-          }
-          compArray[kk] = (compArray[kk] +
-                           (inbuf >> (inbits - bits))) & bitMask;
-          inbits -= bits;
-          outbuf = (outbuf << bits) | compArray[kk];
-          outbits += bits;
-          if (outbits >= 8) {
-            buffer[k++] = (outbuf >> (outbits - 8)) & 0xFF;
-            outbits -= 8;
-          }
-        }
-      }
-      if (outbits > 0) {
-        buffer[k++] = (outbuf << (8 - outbits)) +
-        (inbuf & ((1 << (8 - outbits)) - 1));
-      }
-    }
-    this.bufferLength += rowBytes;
-  };
-
-  PredictorStream.prototype.readBlockPng =
-    function predictorStreamReadBlockPng() {
-
-    var rowBytes = this.rowBytes;
-    var pixBytes = this.pixBytes;
-
-    var predictor = this.stream.getByte();
-    var rawBytes = this.stream.getBytes(rowBytes);
-
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-
-    var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
-    if (prevRow.length == 0)
-      prevRow = new Uint8Array(rowBytes);
-
-    var j = bufferLength;
-    switch (predictor) {
-      case 0:
-        for (var i = 0; i < rowBytes; ++i)
-          buffer[j++] = rawBytes[i];
-        break;
-      case 1:
-        for (var i = 0; i < pixBytes; ++i)
-          buffer[j++] = rawBytes[i];
-        for (; i < rowBytes; ++i) {
-          buffer[j] = (buffer[j - pixBytes] + rawBytes[i]) & 0xFF;
-          j++;
-        }
-        break;
-      case 2:
-        for (var i = 0; i < rowBytes; ++i)
-          buffer[j++] = (prevRow[i] + rawBytes[i]) & 0xFF;
-        break;
-      case 3:
-        for (var i = 0; i < pixBytes; ++i)
-          buffer[j++] = (prevRow[i] >> 1) + rawBytes[i];
-        for (; i < rowBytes; ++i) {
-          buffer[j] = (((prevRow[i] + buffer[j - pixBytes]) >> 1) +
-                           rawBytes[i]) & 0xFF;
-          j++;
-        }
-        break;
-      case 4:
-        // we need to save the up left pixels values. the simplest way
-        // is to create a new buffer
-        for (var i = 0; i < pixBytes; ++i) {
-          var up = prevRow[i];
-          var c = rawBytes[i];
-          buffer[j++] = up + c;
-        }
-        for (; i < rowBytes; ++i) {
-          var up = prevRow[i];
-          var upLeft = prevRow[i - pixBytes];
-          var left = buffer[j - pixBytes];
-          var p = left + up - upLeft;
-
-          var pa = p - left;
-          if (pa < 0)
-            pa = -pa;
-          var pb = p - up;
-          if (pb < 0)
-            pb = -pb;
-          var pc = p - upLeft;
-          if (pc < 0)
-            pc = -pc;
-
-          var c = rawBytes[i];
-          if (pa <= pb && pa <= pc)
-            buffer[j++] = left + c;
-          else if (pb <= pc)
-            buffer[j++] = up + c;
-          else
-            buffer[j++] = upLeft + c;
-        }
-        break;
-      default:
-        error('Unsupported predictor: ' + predictor);
-    }
-    this.bufferLength += rowBytes;
-  };
-
-  return PredictorStream;
-})();
-
-/**
- * Depending on the type of JPEG a JpegStream is handled in different ways. For
- * JPEG's that are supported natively such as DeviceGray and DeviceRGB the image
- * data is stored and then loaded by the browser.  For unsupported JPEG's we use
- * a library to decode these images and the stream behaves like all the other
- * DecodeStreams.
- */
-var JpegStream = (function JpegStreamClosure() {
-  function isAdobeImage(bytes) {
-    var maxBytesScanned = Math.max(bytes.length - 16, 1024);
-    // Looking for APP14, 'Adobe'
-    for (var i = 0; i < maxBytesScanned; ++i) {
-      if (bytes[i] == 0xFF && bytes[i + 1] == 0xEE &&
-          bytes[i + 2] == 0x00 && bytes[i + 3] == 0x0E &&
-          bytes[i + 4] == 0x41 && bytes[i + 5] == 0x64 &&
-          bytes[i + 6] == 0x6F && bytes[i + 7] == 0x62 &&
-          bytes[i + 8] == 0x65 && bytes[i + 9] == 0x00)
-          return true;
-      // scanning until frame tag
-      if (bytes[i] == 0xFF && bytes[i + 1] == 0xC0)
-        break;
-    }
-    return false;
-  }
-
-  function fixAdobeImage(bytes) {
-    // Inserting 'EMBED' marker after JPEG signature
-    var embedMarker = new Uint8Array([0xFF, 0xEC, 0, 8, 0x45, 0x4D, 0x42, 0x45,
-                                      0x44, 0]);
-    var newBytes = new Uint8Array(bytes.length + embedMarker.length);
-    newBytes.set(bytes, embedMarker.length);
-    // copy JPEG header
-    newBytes[0] = bytes[0];
-    newBytes[1] = bytes[1];
-    newBytes.set(embedMarker, 2);
-    return newBytes;
-  }
-
-  function JpegStream(bytes, dict, xref) {
-    // TODO: per poppler, some images may have 'junk' before that
-    // need to be removed
-    this.dict = dict;
-
-    this.isAdobeImage = false;
-    this.colorTransform = dict.get('ColorTransform') || -1;
-
-    if (isAdobeImage(bytes)) {
-      this.isAdobeImage = true;
-      bytes = fixAdobeImage(bytes);
-    }
-
-    this.bytes = bytes;
-
-    DecodeStream.call(this);
-  }
-
-  JpegStream.prototype = Object.create(DecodeStream.prototype);
-
-  JpegStream.prototype.ensureBuffer = function JpegStream_ensureBuffer(req) {
-    if (this.bufferLength)
-      return;
-    try {
-      var jpegImage = new JpegImage();
-      if (this.colorTransform != -1)
-        jpegImage.colorTransform = this.colorTransform;
-      jpegImage.parse(this.bytes);
-      var width = jpegImage.width;
-      var height = jpegImage.height;
-      var data = jpegImage.getData(width, height);
-      this.buffer = data;
-      this.bufferLength = data.length;
-    } catch (e) {
-      error('JPEG error: ' + e);
-    }
-  };
-  JpegStream.prototype.getIR = function JpegStream_getIR() {
-    return bytesToString(this.bytes);
-  };
-  JpegStream.prototype.getChar = function JpegStream_getChar() {
-    error('internal error: getChar is not valid on JpegStream');
-  };
-  /**
-   * Checks if the image can be decoded and displayed by the browser without any
-   * further processing such as color space conversions.
-   */
-  JpegStream.prototype.isNativelySupported =
-    function JpegStream_isNativelySupported(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), 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')
-      return true;
-    if (cs.name === 'DeviceCMYK' && !this.isAdobeImage &&
-        this.colorTransform < 1)
-      return true;
-    return false;
-  };
-  /**
-   * Checks if the image can be decoded by the browser.
-   */
-  JpegStream.prototype.isNativelyDecodable =
-    function JpegStream_isNativelyDecodable(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), xref, res);
-    var numComps = cs.numComps;
-    if (numComps == 1 || numComps == 3)
-      return true;
-
-    return false;
-  };
-
-  return JpegStream;
-})();
-
-/**
- * For JPEG 2000's we use a library to decode these images and
- * the stream behaves like all the other DecodeStreams.
- */
-var JpxStream = (function JpxStreamClosure() {
-  function JpxStream(bytes, dict) {
-    this.dict = dict;
-    this.bytes = bytes;
-
-    DecodeStream.call(this);
-  }
-
-  JpxStream.prototype = Object.create(DecodeStream.prototype);
-
-  JpxStream.prototype.ensureBuffer = function JpxStream_ensureBuffer(req) {
-    if (this.bufferLength)
-      return;
-
-    var jpxImage = new JpxImage();
-    jpxImage.parse(this.bytes);
-
-    var width = jpxImage.width;
-    var height = jpxImage.height;
-    var componentsCount = jpxImage.componentsCount;
-    if (componentsCount != 1 && componentsCount != 3 && componentsCount != 4)
-      error('JPX with ' + componentsCount + ' components is not supported');
-
-    var data = new Uint8Array(width * height * componentsCount);
-
-    for (var k = 0, kk = jpxImage.tiles.length; k < kk; k++) {
-      var tileCompoments = jpxImage.tiles[k];
-      var tileWidth = tileCompoments[0].width;
-      var tileHeight = tileCompoments[0].height;
-      var tileLeft = tileCompoments[0].left;
-      var tileTop = tileCompoments[0].top;
-
-      var dataPosition, sourcePosition, data0, data1, data2, data3, rowFeed;
-      switch (componentsCount) {
-        case 1:
-          data0 = tileCompoments[0].items;
-
-          dataPosition = width * tileTop + tileLeft;
-          rowFeed = width - tileWidth;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++)
-              data[dataPosition++] = data0[sourcePosition++];
-            dataPosition += rowFeed;
-          }
-          break;
-        case 3:
-          data0 = tileCompoments[0].items;
-          data1 = tileCompoments[1].items;
-          data2 = tileCompoments[2].items;
-
-          dataPosition = (width * tileTop + tileLeft) * 3;
-          rowFeed = (width - tileWidth) * 3;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++) {
-              data[dataPosition++] = data0[sourcePosition];
-              data[dataPosition++] = data1[sourcePosition];
-              data[dataPosition++] = data2[sourcePosition];
-              sourcePosition++;
-            }
-            dataPosition += rowFeed;
-          }
-          break;
-        case 4:
-          data0 = tileCompoments[0].items;
-          data1 = tileCompoments[1].items;
-          data2 = tileCompoments[2].items;
-          data3 = tileCompoments[3].items;
-
-          dataPosition = (width * tileTop + tileLeft) * 4;
-          rowFeed = (width - tileWidth) * 4;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++) {
-              data[dataPosition++] = data0[sourcePosition];
-              data[dataPosition++] = data1[sourcePosition];
-              data[dataPosition++] = data2[sourcePosition];
-              data[dataPosition++] = data3[sourcePosition];
-              sourcePosition++;
-            }
-            dataPosition += rowFeed;
-          }
-          break;
-      }
-    }
-
-    this.buffer = data;
-    this.bufferLength = data.length;
-  };
-  JpxStream.prototype.getChar = function JpxStream_getChar() {
-    error('internal error: getChar is not valid on JpxStream');
-  };
-
-  return JpxStream;
-})();
-
-var DecryptStream = (function DecryptStreamClosure() {
-  function DecryptStream(str, decrypt) {
-    this.str = str;
-    this.dict = str.dict;
-    this.decrypt = decrypt;
-
-    DecodeStream.call(this);
-  }
-
-  var chunkSize = 512;
-
-  DecryptStream.prototype = Object.create(DecodeStream.prototype);
-
-  DecryptStream.prototype.readBlock = function DecryptStream_readBlock() {
-    var chunk = this.str.getBytes(chunkSize);
-    if (!chunk || chunk.length == 0) {
-      this.eof = true;
-      return;
-    }
-    var decrypt = this.decrypt;
-    chunk = decrypt(chunk);
-
-    var bufferLength = this.bufferLength;
-    var i, n = chunk.length;
-    var buffer = this.ensureBuffer(bufferLength + n);
-    for (i = 0; i < n; i++)
-      buffer[bufferLength++] = chunk[i];
-    this.bufferLength = bufferLength;
-  };
-
-  return DecryptStream;
-})();
-
-var Ascii85Stream = (function Ascii85StreamClosure() {
-  function Ascii85Stream(str) {
-    this.str = str;
-    this.dict = str.dict;
-    this.input = new Uint8Array(5);
-
-    DecodeStream.call(this);
-  }
-
-  Ascii85Stream.prototype = Object.create(DecodeStream.prototype);
-
-  Ascii85Stream.prototype.readBlock = function Ascii85Stream_readBlock() {
-    var tildaCode = '~'.charCodeAt(0);
-    var zCode = 'z'.charCodeAt(0);
-    var str = this.str;
-
-    var c = str.getByte();
-    while (Lexer.isSpace(String.fromCharCode(c)))
-      c = str.getByte();
-
-    if (!c || c === tildaCode) {
-      this.eof = true;
-      return;
-    }
-
-    var bufferLength = this.bufferLength, buffer;
-
-    // special code for z
-    if (c == zCode) {
-      buffer = this.ensureBuffer(bufferLength + 4);
-      for (var i = 0; i < 4; ++i)
-        buffer[bufferLength + i] = 0;
-      this.bufferLength += 4;
-    } else {
-      var input = this.input;
-      input[0] = c;
-      for (var i = 1; i < 5; ++i) {
-        c = str.getByte();
-        while (Lexer.isSpace(String.fromCharCode(c)))
-          c = str.getByte();
-
-        input[i] = c;
-
-        if (!c || c == tildaCode)
-          break;
-      }
-      buffer = this.ensureBuffer(bufferLength + i - 1);
-      this.bufferLength += i - 1;
-
-      // partial ending;
-      if (i < 5) {
-        for (; i < 5; ++i)
-          input[i] = 0x21 + 84;
-        this.eof = true;
-      }
-      var t = 0;
-      for (var i = 0; i < 5; ++i)
-        t = t * 85 + (input[i] - 0x21);
-
-      for (var i = 3; i >= 0; --i) {
-        buffer[bufferLength + i] = t & 0xFF;
-        t >>= 8;
-      }
-    }
-  };
-
-  return Ascii85Stream;
-})();
-
-var AsciiHexStream = (function AsciiHexStreamClosure() {
-  function AsciiHexStream(str) {
-    this.str = str;
-    this.dict = str.dict;
-
-    DecodeStream.call(this);
-  }
-
-  var hexvalueMap = {
-      9: -1, // \t
-      32: -1, // space
-      48: 0,
-      49: 1,
-      50: 2,
-      51: 3,
-      52: 4,
-      53: 5,
-      54: 6,
-      55: 7,
-      56: 8,
-      57: 9,
-      65: 10,
-      66: 11,
-      67: 12,
-      68: 13,
-      69: 14,
-      70: 15,
-      97: 10,
-      98: 11,
-      99: 12,
-      100: 13,
-      101: 14,
-      102: 15
-  };
-
-  AsciiHexStream.prototype = Object.create(DecodeStream.prototype);
-
-  AsciiHexStream.prototype.readBlock = function AsciiHexStream_readBlock() {
-    var gtCode = '>'.charCodeAt(0), bytes = this.str.getBytes(), c, n,
-        decodeLength, buffer, bufferLength, i, length;
-
-    decodeLength = (bytes.length + 1) >> 1;
-    buffer = this.ensureBuffer(this.bufferLength + decodeLength);
-    bufferLength = this.bufferLength;
-
-    for (i = 0, length = bytes.length; i < length; i++) {
-      c = hexvalueMap[bytes[i]];
-      while (c == -1 && (i + 1) < length) {
-        c = hexvalueMap[bytes[++i]];
-      }
-
-      if ((i + 1) < length && (bytes[i + 1] !== gtCode)) {
-        n = hexvalueMap[bytes[++i]];
-        buffer[bufferLength++] = c * 16 + n;
-      } else {
-        // EOD marker at an odd number, behave as if a 0 followed the last
-        // digit.
-        if (bytes[i] !== gtCode) {
-          buffer[bufferLength++] = c * 16;
-        }
-      }
-    }
-
-    this.bufferLength = bufferLength;
-    this.eof = true;
-  };
-
-  return AsciiHexStream;
-})();
-
-var RunLengthStream = (function RunLengthStreamClosure() {
-  function RunLengthStream(str) {
-    this.str = str;
-    this.dict = str.dict;
-
-    DecodeStream.call(this);
-  }
-
-  RunLengthStream.prototype = Object.create(DecodeStream.prototype);
-
-  RunLengthStream.prototype.readBlock = function RunLengthStream_readBlock() {
-    // The repeatHeader has following format. The first byte defines type of run
-    // and amount of bytes to repeat/copy: n = 0 through 127 - copy next n bytes
-    // (in addition to the second byte from the header), n = 129 through 255 -
-    // duplicate the second byte from the header (257 - n) times, n = 128 - end.
-    var repeatHeader = this.str.getBytes(2);
-    if (!repeatHeader || repeatHeader.length < 2 || repeatHeader[0] == 128) {
-      this.eof = true;
-      return;
-    }
-
-    var bufferLength = this.bufferLength;
-    var n = repeatHeader[0];
-    if (n < 128) {
-      // copy n bytes
-      var buffer = this.ensureBuffer(bufferLength + n + 1);
-      buffer[bufferLength++] = repeatHeader[1];
-      if (n > 0) {
-        var source = this.str.getBytes(n);
-        buffer.set(source, bufferLength);
-        bufferLength += n;
-      }
-    } else {
-      n = 257 - n;
-      var b = repeatHeader[1];
-      var buffer = this.ensureBuffer(bufferLength + n + 1);
-      for (var i = 0; i < n; i++)
-        buffer[bufferLength++] = b;
-    }
-    this.bufferLength = bufferLength;
-  };
-
-  return RunLengthStream;
-})();
-
-var CCITTFaxStream = (function CCITTFaxStreamClosure() {
-
-  var ccittEOL = -2;
-  var twoDimPass = 0;
-  var twoDimHoriz = 1;
-  var twoDimVert0 = 2;
-  var twoDimVertR1 = 3;
-  var twoDimVertL1 = 4;
-  var twoDimVertR2 = 5;
-  var twoDimVertL2 = 6;
-  var twoDimVertR3 = 7;
-  var twoDimVertL3 = 8;
-
-  var twoDimTable = [
-    [-1, -1], [-1, -1],                   // 000000x
-    [7, twoDimVertL3],                    // 0000010
-    [7, twoDimVertR3],                    // 0000011
-    [6, twoDimVertL2], [6, twoDimVertL2], // 000010x
-    [6, twoDimVertR2], [6, twoDimVertR2], // 000011x
-    [4, twoDimPass], [4, twoDimPass],     // 0001xxx
-    [4, twoDimPass], [4, twoDimPass],
-    [4, twoDimPass], [4, twoDimPass],
-    [4, twoDimPass], [4, twoDimPass],
-    [3, twoDimHoriz], [3, twoDimHoriz],   // 001xxxx
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimVertL1], [3, twoDimVertL1], // 010xxxx
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertR1], [3, twoDimVertR1], // 011xxxx
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [1, twoDimVert0], [1, twoDimVert0],   // 1xxxxxx
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0]
-  ];
-
-  var whiteTable1 = [
-    [-1, -1],                               // 00000
-    [12, ccittEOL],                         // 00001
-    [-1, -1], [-1, -1],                     // 0001x
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 001xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 010xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 011xx
-    [11, 1792], [11, 1792],                 // 1000x
-    [12, 1984],                             // 10010
-    [12, 2048],                             // 10011
-    [12, 2112],                             // 10100
-    [12, 2176],                             // 10101
-    [12, 2240],                             // 10110
-    [12, 2304],                             // 10111
-    [11, 1856], [11, 1856],                 // 1100x
-    [11, 1920], [11, 1920],                 // 1101x
-    [12, 2368],                             // 11100
-    [12, 2432],                             // 11101
-    [12, 2496],                             // 11110
-    [12, 2560]                              // 11111
-  ];
-
-  var whiteTable2 = [
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],     // 0000000xx
-    [8, 29], [8, 29],                           // 00000010x
-    [8, 30], [8, 30],                           // 00000011x
-    [8, 45], [8, 45],                           // 00000100x
-    [8, 46], [8, 46],                           // 00000101x
-    [7, 22], [7, 22], [7, 22], [7, 22],         // 0000011xx
-    [7, 23], [7, 23], [7, 23], [7, 23],         // 0000100xx
-    [8, 47], [8, 47],                           // 00001010x
-    [8, 48], [8, 48],                           // 00001011x
-    [6, 13], [6, 13], [6, 13], [6, 13],         // 000011xxx
-    [6, 13], [6, 13], [6, 13], [6, 13],
-    [7, 20], [7, 20], [7, 20], [7, 20],         // 0001000xx
-    [8, 33], [8, 33],                           // 00010010x
-    [8, 34], [8, 34],                           // 00010011x
-    [8, 35], [8, 35],                           // 00010100x
-    [8, 36], [8, 36],                           // 00010101x
-    [8, 37], [8, 37],                           // 00010110x
-    [8, 38], [8, 38],                           // 00010111x
-    [7, 19], [7, 19], [7, 19], [7, 19],         // 0001100xx
-    [8, 31], [8, 31],                           // 00011010x
-    [8, 32], [8, 32],                           // 00011011x
-    [6, 1], [6, 1], [6, 1], [6, 1],             // 000111xxx
-    [6, 1], [6, 1], [6, 1], [6, 1],
-    [6, 12], [6, 12], [6, 12], [6, 12],         // 001000xxx
-    [6, 12], [6, 12], [6, 12], [6, 12],
-    [8, 53], [8, 53],                           // 00100100x
-    [8, 54], [8, 54],                           // 00100101x
-    [7, 26], [7, 26], [7, 26], [7, 26],         // 0010011xx
-    [8, 39], [8, 39],                           // 00101000x
-    [8, 40], [8, 40],                           // 00101001x
-    [8, 41], [8, 41],                           // 00101010x
-    [8, 42], [8, 42],                           // 00101011x
-    [8, 43], [8, 43],                           // 00101100x
-    [8, 44], [8, 44],                           // 00101101x
-    [7, 21], [7, 21], [7, 21], [7, 21],         // 0010111xx
-    [7, 28], [7, 28], [7, 28], [7, 28],         // 0011000xx
-    [8, 61], [8, 61],                           // 00110010x
-    [8, 62], [8, 62],                           // 00110011x
-    [8, 63], [8, 63],                           // 00110100x
-    [8, 0], [8, 0],                             // 00110101x
-    [8, 320], [8, 320],                         // 00110110x
-    [8, 384], [8, 384],                         // 00110111x
-    [5, 10], [5, 10], [5, 10], [5, 10],         // 00111xxxx
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 11], [5, 11], [5, 11], [5, 11],         // 01000xxxx
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [7, 27], [7, 27], [7, 27], [7, 27],         // 0100100xx
-    [8, 59], [8, 59],                           // 01001010x
-    [8, 60], [8, 60],                           // 01001011x
-    [9, 1472],                                  // 010011000
-    [9, 1536],                                  // 010011001
-    [9, 1600],                                  // 010011010
-    [9, 1728],                                  // 010011011
-    [7, 18], [7, 18], [7, 18], [7, 18],         // 0100111xx
-    [7, 24], [7, 24], [7, 24], [7, 24],         // 0101000xx
-    [8, 49], [8, 49],                           // 01010010x
-    [8, 50], [8, 50],                           // 01010011x
-    [8, 51], [8, 51],                           // 01010100x
-    [8, 52], [8, 52],                           // 01010101x
-    [7, 25], [7, 25], [7, 25], [7, 25],         // 0101011xx
-    [8, 55], [8, 55],                           // 01011000x
-    [8, 56], [8, 56],                           // 01011001x
-    [8, 57], [8, 57],                           // 01011010x
-    [8, 58], [8, 58],                           // 01011011x
-    [6, 192], [6, 192], [6, 192], [6, 192],     // 010111xxx
-    [6, 192], [6, 192], [6, 192], [6, 192],
-    [6, 1664], [6, 1664], [6, 1664], [6, 1664], // 011000xxx
-    [6, 1664], [6, 1664], [6, 1664], [6, 1664],
-    [8, 448], [8, 448],                         // 01100100x
-    [8, 512], [8, 512],                         // 01100101x
-    [9, 704],                                   // 011001100
-    [9, 768],                                   // 011001101
-    [8, 640], [8, 640],                         // 01100111x
-    [8, 576], [8, 576],                         // 01101000x
-    [9, 832],                                   // 011010010
-    [9, 896],                                   // 011010011
-    [9, 960],                                   // 011010100
-    [9, 1024],                                  // 011010101
-    [9, 1088],                                  // 011010110
-    [9, 1152],                                  // 011010111
-    [9, 1216],                                  // 011011000
-    [9, 1280],                                  // 011011001
-    [9, 1344],                                  // 011011010
-    [9, 1408],                                  // 011011011
-    [7, 256], [7, 256], [7, 256], [7, 256],     // 0110111xx
-    [4, 2], [4, 2], [4, 2], [4, 2],             // 0111xxxxx
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 3], [4, 3], [4, 3], [4, 3],             // 1000xxxxx
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [5, 128], [5, 128], [5, 128], [5, 128],     // 10010xxxx
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 8], [5, 8], [5, 8], [5, 8],             // 10011xxxx
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 9], [5, 9], [5, 9], [5, 9],             // 10100xxxx
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [6, 16], [6, 16], [6, 16], [6, 16],         // 101010xxx
-    [6, 16], [6, 16], [6, 16], [6, 16],
-    [6, 17], [6, 17], [6, 17], [6, 17],         // 101011xxx
-    [6, 17], [6, 17], [6, 17], [6, 17],
-    [4, 4], [4, 4], [4, 4], [4, 4],             // 1011xxxxx
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 5], [4, 5], [4, 5], [4, 5],             // 1100xxxxx
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [6, 14], [6, 14], [6, 14], [6, 14],         // 110100xxx
-    [6, 14], [6, 14], [6, 14], [6, 14],
-    [6, 15], [6, 15], [6, 15], [6, 15],         // 110101xxx
-    [6, 15], [6, 15], [6, 15], [6, 15],
-    [5, 64], [5, 64], [5, 64], [5, 64],         // 11011xxxx
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [4, 6], [4, 6], [4, 6], [4, 6],             // 1110xxxxx
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 7], [4, 7], [4, 7], [4, 7],             // 1111xxxxx
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7]
-  ];
-
-  var blackTable1 = [
-    [-1, -1], [-1, -1],                             // 000000000000x
-    [12, ccittEOL], [12, ccittEOL],                 // 000000000001x
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000001xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000010xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000011xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000100xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000101xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000110xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000111xx
-    [11, 1792], [11, 1792], [11, 1792], [11, 1792], // 00000001000xx
-    [12, 1984], [12, 1984],                         // 000000010010x
-    [12, 2048], [12, 2048],                         // 000000010011x
-    [12, 2112], [12, 2112],                         // 000000010100x
-    [12, 2176], [12, 2176],                         // 000000010101x
-    [12, 2240], [12, 2240],                         // 000000010110x
-    [12, 2304], [12, 2304],                         // 000000010111x
-    [11, 1856], [11, 1856], [11, 1856], [11, 1856], // 00000001100xx
-    [11, 1920], [11, 1920], [11, 1920], [11, 1920], // 00000001101xx
-    [12, 2368], [12, 2368],                         // 000000011100x
-    [12, 2432], [12, 2432],                         // 000000011101x
-    [12, 2496], [12, 2496],                         // 000000011110x
-    [12, 2560], [12, 2560],                         // 000000011111x
-    [10, 18], [10, 18], [10, 18], [10, 18],         // 0000001000xxx
-    [10, 18], [10, 18], [10, 18], [10, 18],
-    [12, 52], [12, 52],                             // 000000100100x
-    [13, 640],                                      // 0000001001010
-    [13, 704],                                      // 0000001001011
-    [13, 768],                                      // 0000001001100
-    [13, 832],                                      // 0000001001101
-    [12, 55], [12, 55],                             // 000000100111x
-    [12, 56], [12, 56],                             // 000000101000x
-    [13, 1280],                                     // 0000001010010
-    [13, 1344],                                     // 0000001010011
-    [13, 1408],                                     // 0000001010100
-    [13, 1472],                                     // 0000001010101
-    [12, 59], [12, 59],                             // 000000101011x
-    [12, 60], [12, 60],                             // 000000101100x
-    [13, 1536],                                     // 0000001011010
-    [13, 1600],                                     // 0000001011011
-    [11, 24], [11, 24], [11, 24], [11, 24],         // 00000010111xx
-    [11, 25], [11, 25], [11, 25], [11, 25],         // 00000011000xx
-    [13, 1664],                                     // 0000001100100
-    [13, 1728],                                     // 0000001100101
-    [12, 320], [12, 320],                           // 000000110011x
-    [12, 384], [12, 384],                           // 000000110100x
-    [12, 448], [12, 448],                           // 000000110101x
-    [13, 512],                                      // 0000001101100
-    [13, 576],                                      // 0000001101101
-    [12, 53], [12, 53],                             // 000000110111x
-    [12, 54], [12, 54],                             // 000000111000x
-    [13, 896],                                      // 0000001110010
-    [13, 960],                                      // 0000001110011
-    [13, 1024],                                     // 0000001110100
-    [13, 1088],                                     // 0000001110101
-    [13, 1152],                                     // 0000001110110
-    [13, 1216],                                     // 0000001110111
-    [10, 64], [10, 64], [10, 64], [10, 64],         // 0000001111xxx
-    [10, 64], [10, 64], [10, 64], [10, 64]
-  ];
-
-  var blackTable2 = [
-    [8, 13], [8, 13], [8, 13], [8, 13],     // 00000100xxxx
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [11, 23], [11, 23],                     // 00000101000x
-    [12, 50],                               // 000001010010
-    [12, 51],                               // 000001010011
-    [12, 44],                               // 000001010100
-    [12, 45],                               // 000001010101
-    [12, 46],                               // 000001010110
-    [12, 47],                               // 000001010111
-    [12, 57],                               // 000001011000
-    [12, 58],                               // 000001011001
-    [12, 61],                               // 000001011010
-    [12, 256],                              // 000001011011
-    [10, 16], [10, 16], [10, 16], [10, 16], // 0000010111xx
-    [10, 17], [10, 17], [10, 17], [10, 17], // 0000011000xx
-    [12, 48],                               // 000001100100
-    [12, 49],                               // 000001100101
-    [12, 62],                               // 000001100110
-    [12, 63],                               // 000001100111
-    [12, 30],                               // 000001101000
-    [12, 31],                               // 000001101001
-    [12, 32],                               // 000001101010
-    [12, 33],                               // 000001101011
-    [12, 40],                               // 000001101100
-    [12, 41],                               // 000001101101
-    [11, 22], [11, 22],                     // 00000110111x
-    [8, 14], [8, 14], [8, 14], [8, 14],     // 00000111xxxx
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [7, 10], [7, 10], [7, 10], [7, 10],     // 0000100xxxxx
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 11], [7, 11], [7, 11], [7, 11],     // 0000101xxxxx
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [9, 15], [9, 15], [9, 15], [9, 15],     // 000011000xxx
-    [9, 15], [9, 15], [9, 15], [9, 15],
-    [12, 128],                              // 000011001000
-    [12, 192],                              // 000011001001
-    [12, 26],                               // 000011001010
-    [12, 27],                               // 000011001011
-    [12, 28],                               // 000011001100
-    [12, 29],                               // 000011001101
-    [11, 19], [11, 19],                     // 00001100111x
-    [11, 20], [11, 20],                     // 00001101000x
-    [12, 34],                               // 000011010010
-    [12, 35],                               // 000011010011
-    [12, 36],                               // 000011010100
-    [12, 37],                               // 000011010101
-    [12, 38],                               // 000011010110
-    [12, 39],                               // 000011010111
-    [11, 21], [11, 21],                     // 00001101100x
-    [12, 42],                               // 000011011010
-    [12, 43],                               // 000011011011
-    [10, 0], [10, 0], [10, 0], [10, 0],     // 0000110111xx
-    [7, 12], [7, 12], [7, 12], [7, 12],     // 0000111xxxxx
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12]
-  ];
-
-  var blackTable3 = [
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 0000xx
-    [6, 9],                                 // 000100
-    [6, 8],                                 // 000101
-    [5, 7], [5, 7],                         // 00011x
-    [4, 6], [4, 6], [4, 6], [4, 6],         // 0010xx
-    [4, 5], [4, 5], [4, 5], [4, 5],         // 0011xx
-    [3, 1], [3, 1], [3, 1], [3, 1],         // 010xxx
-    [3, 1], [3, 1], [3, 1], [3, 1],
-    [3, 4], [3, 4], [3, 4], [3, 4],         // 011xxx
-    [3, 4], [3, 4], [3, 4], [3, 4],
-    [2, 3], [2, 3], [2, 3], [2, 3],         // 10xxxx
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 2], [2, 2], [2, 2], [2, 2],         // 11xxxx
-    [2, 2], [2, 2], [2, 2], [2, 2],
-    [2, 2], [2, 2], [2, 2], [2, 2],
-    [2, 2], [2, 2], [2, 2], [2, 2]
-  ];
-
-  function CCITTFaxStream(str, params) {
-    this.str = str;
-    this.dict = str.dict;
-
-    params = params || new Dict();
-
-    this.encoding = params.get('K') || 0;
-    this.eoline = params.get('EndOfLine') || false;
-    this.byteAlign = params.get('EncodedByteAlign') || false;
-    this.columns = params.get('Columns') || 1728;
-    this.rows = params.get('Rows') || 0;
-    var eoblock = params.get('EndOfBlock');
-    if (eoblock == null)
-      eoblock = true;
-    this.eoblock = eoblock;
-    this.black = params.get('BlackIs1') || false;
-
-    this.codingLine = new Uint32Array(this.columns + 1);
-    this.refLine = new Uint32Array(this.columns + 2);
-
-    this.codingLine[0] = this.columns;
-    this.codingPos = 0;
-
-    this.row = 0;
-    this.nextLine2D = this.encoding < 0;
-    this.inputBits = 0;
-    this.inputBuf = 0;
-    this.outputBits = 0;
-    this.buf = EOF;
-
-    var code1;
-    while ((code1 = this.lookBits(12)) == 0) {
-      this.eatBits(1);
-    }
-    if (code1 == 1) {
-      this.eatBits(12);
-    }
-    if (this.encoding > 0) {
-      this.nextLine2D = !this.lookBits(1);
-      this.eatBits(1);
-    }
-
-    DecodeStream.call(this);
-  }
-
-  CCITTFaxStream.prototype = Object.create(DecodeStream.prototype);
-
-  CCITTFaxStream.prototype.readBlock = function CCITTFaxStream_readBlock() {
-    while (!this.eof) {
-      var c = this.lookChar();
-      this.buf = EOF;
-      this.ensureBuffer(this.bufferLength + 1);
-      this.buffer[this.bufferLength++] = c;
-    }
-  };
-
-  CCITTFaxStream.prototype.addPixels =
-    function ccittFaxStreamAddPixels(a1, blackPixels) {
-    var codingLine = this.codingLine;
-    var codingPos = this.codingPos;
-
-    if (a1 > codingLine[codingPos]) {
-      if (a1 > this.columns) {
-        warn('row is wrong length');
-        this.err = true;
-        a1 = this.columns;
-      }
-      if ((codingPos & 1) ^ blackPixels) {
-        ++codingPos;
-      }
-
-      codingLine[codingPos] = a1;
-    }
-    this.codingPos = codingPos;
-  };
-
-  CCITTFaxStream.prototype.addPixelsNeg =
-    function ccittFaxStreamAddPixelsNeg(a1, blackPixels) {
-    var codingLine = this.codingLine;
-    var codingPos = this.codingPos;
-
-    if (a1 > codingLine[codingPos]) {
-      if (a1 > this.columns) {
-        warn('row is wrong length');
-        this.err = true;
-        a1 = this.columns;
-      }
-      if ((codingPos & 1) ^ blackPixels)
-        ++codingPos;
-
-      codingLine[codingPos] = a1;
-    } else if (a1 < codingLine[codingPos]) {
-      if (a1 < 0) {
-        warn('invalid code');
-        this.err = true;
-        a1 = 0;
-      }
-      while (codingPos > 0 && a1 < codingLine[codingPos - 1])
-        --codingPos;
-      codingLine[codingPos] = a1;
-    }
-
-    this.codingPos = codingPos;
-  };
-
-  CCITTFaxStream.prototype.lookChar = function CCITTFaxStream_lookChar() {
-    if (this.buf != EOF)
-      return this.buf;
-
-    var refLine = this.refLine;
-    var codingLine = this.codingLine;
-    var columns = this.columns;
-
-    var refPos, blackPixels, bits;
-
-    if (this.outputBits == 0) {
-      if (this.eof)
-        return null;
-
-      this.err = false;
-
-      var code1, code2, code3;
-      if (this.nextLine2D) {
-        for (var i = 0; codingLine[i] < columns; ++i)
-          refLine[i] = codingLine[i];
-
-        refLine[i++] = columns;
-        refLine[i] = columns;
-        codingLine[0] = 0;
-        this.codingPos = 0;
-        refPos = 0;
-        blackPixels = 0;
-
-        while (codingLine[this.codingPos] < columns) {
-          code1 = this.getTwoDimCode();
-          switch (code1) {
-            case twoDimPass:
-              this.addPixels(refLine[refPos + 1], blackPixels);
-              if (refLine[refPos + 1] < columns)
-                refPos += 2;
-              break;
-            case twoDimHoriz:
-              code1 = code2 = 0;
-              if (blackPixels) {
-                do {
-                  code1 += (code3 = this.getBlackCode());
-                } while (code3 >= 64);
-                do {
-                  code2 += (code3 = this.getWhiteCode());
-                } while (code3 >= 64);
-              } else {
-                do {
-                  code1 += (code3 = this.getWhiteCode());
-                } while (code3 >= 64);
-                do {
-                  code2 += (code3 = this.getBlackCode());
-                } while (code3 >= 64);
-              }
-              this.addPixels(codingLine[this.codingPos] +
-                             code1, blackPixels);
-              if (codingLine[this.codingPos] < columns) {
-                this.addPixels(codingLine[this.codingPos] + code2,
-                               blackPixels ^ 1);
-              }
-              while (refLine[refPos] <= codingLine[this.codingPos] &&
-                     refLine[refPos] < columns) {
-                refPos += 2;
-              }
-              break;
-            case twoDimVertR3:
-              this.addPixels(refLine[refPos] + 3, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertR2:
-              this.addPixels(refLine[refPos] + 2, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns) {
-                  refPos += 2;
-                }
-              }
-              break;
-            case twoDimVertR1:
-              this.addPixels(refLine[refPos] + 1, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVert0:
-              this.addPixels(refLine[refPos], blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL3:
-              this.addPixelsNeg(refLine[refPos] - 3, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL2:
-              this.addPixelsNeg(refLine[refPos] - 2, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL1:
-              this.addPixelsNeg(refLine[refPos] - 1, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case EOF:
-              this.addPixels(columns, 0);
-              this.eof = true;
-              break;
-            default:
-              warn('bad 2d code');
-              this.addPixels(columns, 0);
-              this.err = true;
-          }
-        }
-      } else {
-        codingLine[0] = 0;
-        this.codingPos = 0;
-        blackPixels = 0;
-        while (codingLine[this.codingPos] < columns) {
-          code1 = 0;
-          if (blackPixels) {
-            do {
-              code1 += (code3 = this.getBlackCode());
-            } while (code3 >= 64);
-          } else {
-            do {
-              code1 += (code3 = this.getWhiteCode());
-            } while (code3 >= 64);
-          }
-          this.addPixels(codingLine[this.codingPos] + code1, blackPixels);
-          blackPixels ^= 1;
-        }
-      }
-
-      if (this.byteAlign)
-        this.inputBits &= ~7;
-
-      var gotEOL = false;
-
-      if (!this.eoblock && this.row == this.rows - 1) {
-        this.eof = true;
-      } else {
-        code1 = this.lookBits(12);
-        while (code1 == 0) {
-          this.eatBits(1);
-          code1 = this.lookBits(12);
-        }
-        if (code1 == 1) {
-          this.eatBits(12);
-          gotEOL = true;
-        } else if (code1 == EOF) {
-          this.eof = true;
-        }
-      }
-
-      if (!this.eof && this.encoding > 0) {
-        this.nextLine2D = !this.lookBits(1);
-        this.eatBits(1);
-      }
-
-      if (this.eoblock && gotEOL) {
-        code1 = this.lookBits(12);
-        if (code1 == 1) {
-          this.eatBits(12);
-          if (this.encoding > 0) {
-            this.lookBits(1);
-            this.eatBits(1);
-          }
-          if (this.encoding >= 0) {
-            for (var i = 0; i < 4; ++i) {
-              code1 = this.lookBits(12);
-              if (code1 != 1)
-                warn('bad rtc code: ' + code1);
-              this.eatBits(12);
-              if (this.encoding > 0) {
-                this.lookBits(1);
-                this.eatBits(1);
-              }
-            }
-          }
-          this.eof = true;
-        }
-      } else if (this.err && this.eoline) {
-        while (true) {
-          code1 = this.lookBits(13);
-          if (code1 == EOF) {
-            this.eof = true;
-            return null;
-          }
-          if ((code1 >> 1) == 1) {
-            break;
-          }
-          this.eatBits(1);
-        }
-        this.eatBits(12);
-        if (this.encoding > 0) {
-          this.eatBits(1);
-          this.nextLine2D = !(code1 & 1);
-        }
-      }
-
-      if (codingLine[0] > 0)
-        this.outputBits = codingLine[this.codingPos = 0];
-      else
-        this.outputBits = codingLine[this.codingPos = 1];
-      this.row++;
-    }
-
-    if (this.outputBits >= 8) {
-      this.buf = (this.codingPos & 1) ? 0 : 0xFF;
-      this.outputBits -= 8;
-      if (this.outputBits == 0 && codingLine[this.codingPos] < columns) {
-        this.codingPos++;
-        this.outputBits = (codingLine[this.codingPos] -
-                           codingLine[this.codingPos - 1]);
-      }
-    } else {
-      var bits = 8;
-      this.buf = 0;
-      do {
-        if (this.outputBits > bits) {
-          this.buf <<= bits;
-          if (!(this.codingPos & 1)) {
-            this.buf |= 0xFF >> (8 - bits);
-          }
-          this.outputBits -= bits;
-          bits = 0;
-        } else {
-          this.buf <<= this.outputBits;
-          if (!(this.codingPos & 1)) {
-            this.buf |= 0xFF >> (8 - this.outputBits);
-          }
-          bits -= this.outputBits;
-          this.outputBits = 0;
-          if (codingLine[this.codingPos] < columns) {
-            this.codingPos++;
-            this.outputBits = (codingLine[this.codingPos] -
-                               codingLine[this.codingPos - 1]);
-          } else if (bits > 0) {
-            this.buf <<= bits;
-            bits = 0;
-          }
-        }
-      } while (bits);
-    }
-    if (this.black) {
-      this.buf ^= 0xFF;
-    }
-    return this.buf;
-  };
-
-  // This functions returns the code found from the table.
-  // The start and end parameters set the boundaries for searching the table.
-  // The limit parameter is optional. Function returns an array with three
-  // values. The first array element indicates whether a valid code is being
-  // returned. The second array element is the actual code. The third array
-  // element indicates whether EOF was reached.
-  CCITTFaxStream.prototype.findTableCode =
-    function ccittFaxStreamFindTableCode(start, end, table, limit) {
-
-    var limitValue = limit || 0;
-    for (var i = start; i <= end; ++i) {
-      var code = this.lookBits(i);
-      if (code == EOF)
-        return [true, 1, false];
-      if (i < end)
-        code <<= end - i;
-      if (!limitValue || code >= limitValue) {
-        var p = table[code - limitValue];
-        if (p[0] == i) {
-          this.eatBits(i);
-          return [true, p[1], true];
-        }
-      }
-    }
-    return [false, 0, false];
-  };
-
-  CCITTFaxStream.prototype.getTwoDimCode =
-    function ccittFaxStreamGetTwoDimCode() {
-
-    var code = 0;
-    var p;
-    if (this.eoblock) {
-      code = this.lookBits(7);
-      p = twoDimTable[code];
-      if (p && p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(1, 7, twoDimTable);
-      if (result[0] && result[2])
-        return result[1];
-    }
-    warn('Bad two dim code');
-    return EOF;
-  };
-
-  CCITTFaxStream.prototype.getWhiteCode =
-    function ccittFaxStreamGetWhiteCode() {
-
-    var code = 0;
-    var p;
-    var n;
-    if (this.eoblock) {
-      code = this.lookBits(12);
-      if (code == EOF)
-        return 1;
-
-      if ((code >> 5) == 0)
-        p = whiteTable1[code];
-      else
-        p = whiteTable2[code >> 3];
-
-      if (p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(1, 9, whiteTable2);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(11, 12, whiteTable1);
-      if (result[0])
-        return result[1];
-    }
-    warn('bad white code');
-    this.eatBits(1);
-    return 1;
-  };
-
-  CCITTFaxStream.prototype.getBlackCode =
-    function ccittFaxStreamGetBlackCode() {
-
-    var code, p;
-    if (this.eoblock) {
-      code = this.lookBits(13);
-      if (code == EOF)
-        return 1;
-      if ((code >> 7) == 0)
-        p = blackTable1[code];
-      else if ((code >> 9) == 0 && (code >> 7) != 0)
-        p = blackTable2[(code >> 1) - 64];
-      else
-        p = blackTable3[code >> 7];
-
-      if (p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(2, 6, blackTable3);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(7, 12, blackTable2, 64);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(10, 13, blackTable1);
-      if (result[0])
-        return result[1];
-    }
-    warn('bad black code');
-    this.eatBits(1);
-    return 1;
-  };
-
-  CCITTFaxStream.prototype.lookBits = function CCITTFaxStream_lookBits(n) {
-    var c;
-    while (this.inputBits < n) {
-      if ((c = this.str.getByte()) == null) {
-        if (this.inputBits == 0)
-          return EOF;
-        return ((this.inputBuf << (n - this.inputBits)) &
-                (0xFFFF >> (16 - n)));
-      }
-      this.inputBuf = (this.inputBuf << 8) + c;
-      this.inputBits += 8;
-    }
-    return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
-  };
-
-  CCITTFaxStream.prototype.eatBits = function CCITTFaxStream_eatBits(n) {
-    if ((this.inputBits -= n) < 0)
-      this.inputBits = 0;
-  };
-
-  return CCITTFaxStream;
-})();
-
-var LZWStream = (function LZWStreamClosure() {
-  function LZWStream(str, earlyChange) {
-    this.str = str;
-    this.dict = str.dict;
-    this.cachedData = 0;
-    this.bitsCached = 0;
-
-    var maxLzwDictionarySize = 4096;
-    var lzwState = {
-      earlyChange: earlyChange,
-      codeLength: 9,
-      nextCode: 258,
-      dictionaryValues: new Uint8Array(maxLzwDictionarySize),
-      dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
-      dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
-      currentSequence: new Uint8Array(maxLzwDictionarySize),
-      currentSequenceLength: 0
-    };
-    for (var i = 0; i < 256; ++i) {
-      lzwState.dictionaryValues[i] = i;
-      lzwState.dictionaryLengths[i] = 1;
-    }
-    this.lzwState = lzwState;
-
-    DecodeStream.call(this);
-  }
-
-  LZWStream.prototype = Object.create(DecodeStream.prototype);
-
-  LZWStream.prototype.readBits = function LZWStream_readBits(n) {
-    var bitsCached = this.bitsCached;
-    var cachedData = this.cachedData;
-    while (bitsCached < n) {
-      var c = this.str.getByte();
-      if (c == null) {
-        this.eof = true;
-        return null;
-      }
-      cachedData = (cachedData << 8) | c;
-      bitsCached += 8;
-    }
-    this.bitsCached = (bitsCached -= n);
-    this.cachedData = cachedData;
-    this.lastCode = null;
-    return (cachedData >>> bitsCached) & ((1 << n) - 1);
-  };
-
-  LZWStream.prototype.readBlock = function LZWStream_readBlock() {
-    var blockSize = 512;
-    var estimatedDecodedSize = blockSize * 2, decodedSizeDelta = blockSize;
-    var i, j, q;
-
-    var lzwState = this.lzwState;
-    if (!lzwState)
-      return; // eof was found
-
-    var earlyChange = lzwState.earlyChange;
-    var nextCode = lzwState.nextCode;
-    var dictionaryValues = lzwState.dictionaryValues;
-    var dictionaryLengths = lzwState.dictionaryLengths;
-    var dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
-    var codeLength = lzwState.codeLength;
-    var prevCode = lzwState.prevCode;
-    var currentSequence = lzwState.currentSequence;
-    var currentSequenceLength = lzwState.currentSequenceLength;
-
-    var decodedLength = 0;
-    var currentBufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
-
-    for (i = 0; i < blockSize; i++) {
-      var code = this.readBits(codeLength);
-      var hasPrev = currentSequenceLength > 0;
-      if (code < 256) {
-        currentSequence[0] = code;
-        currentSequenceLength = 1;
-      } else if (code >= 258) {
-        if (code < nextCode) {
-          currentSequenceLength = dictionaryLengths[code];
-          for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
-            currentSequence[j] = dictionaryValues[q];
-            q = dictionaryPrevCodes[q];
-          }
-        } else {
-          currentSequence[currentSequenceLength++] = currentSequence[0];
-        }
-      } else if (code == 256) {
-        codeLength = 9;
-        nextCode = 258;
-        currentSequenceLength = 0;
-        continue;
-      } else {
-        this.eof = true;
-        delete this.lzwState;
-        break;
-      }
-
-      if (hasPrev) {
-        dictionaryPrevCodes[nextCode] = prevCode;
-        dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
-        dictionaryValues[nextCode] = currentSequence[0];
-        nextCode++;
-        codeLength = (nextCode + earlyChange) & (nextCode + earlyChange - 1) ?
-          codeLength : Math.min(Math.log(nextCode + earlyChange) /
-          0.6931471805599453 + 1, 12) | 0;
-      }
-      prevCode = code;
-
-      decodedLength += currentSequenceLength;
-      if (estimatedDecodedSize < decodedLength) {
-        do {
-          estimatedDecodedSize += decodedSizeDelta;
-        } while (estimatedDecodedSize < decodedLength);
-        buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
-      }
-      for (j = 0; j < currentSequenceLength; j++)
-        buffer[currentBufferLength++] = currentSequence[j];
-    }
-    lzwState.nextCode = nextCode;
-    lzwState.codeLength = codeLength;
-    lzwState.prevCode = prevCode;
-    lzwState.currentSequenceLength = currentSequenceLength;
-
-    this.bufferLength = currentBufferLength;
-  };
-
-  return LZWStream;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-function MessageHandler(name, comObj) {
-  this.name = name;
-  this.comObj = comObj;
-  this.callbackIndex = 1;
-  var callbacks = this.callbacks = {};
-  var ah = this.actionHandler = {};
-
-  ah['console_log'] = [function ahConsoleLog(data) {
-      console.log.apply(console, data);
-  }];
-  ah['console_error'] = [function ahConsoleError(data) {
-      console.error.apply(console, data);
-  }];
-
-  comObj.onmessage = function messageHandlerComObjOnMessage(event) {
-    var data = event.data;
-    if (data.isReply) {
-      var callbackId = data.callbackId;
-      if (data.callbackId in callbacks) {
-        var callback = callbacks[callbackId];
-        delete callbacks[callbackId];
-        callback(data.data);
-      } else {
-        error('Cannot resolve callback ' + callbackId);
-      }
-    } else if (data.action in ah) {
-      var action = ah[data.action];
-      if (data.callbackId) {
-        var promise = new Promise();
-        promise.then(function(resolvedData) {
-          comObj.postMessage({
-            isReply: true,
-            callbackId: data.callbackId,
-            data: resolvedData
-          });
-        });
-        action[0].call(action[1], data.data, promise);
-      } else {
-        action[0].call(action[1], data.data);
-      }
-    } else {
-      error('Unkown action from worker: ' + data.action);
-    }
-  };
-}
-
-MessageHandler.prototype = {
-  on: function messageHandlerOn(actionName, handler, scope) {
-    var ah = this.actionHandler;
-    if (ah[actionName]) {
-      error('There is already an actionName called "' + actionName + '"');
-    }
-    ah[actionName] = [handler, scope];
-  },
-  /**
-   * Sends a message to the comObj to invoke the action with the supplied data.
-   * @param {String} actionName Action to call.
-   * @param {JSON} data JSON data to send.
-   * @param {function} [callback] Optional callback that will handle a reply.
-   */
-  send: function messageHandlerSend(actionName, data, callback) {
-    var message = {
-      action: actionName,
-      data: data
-    };
-    if (callback) {
-      var callbackId = this.callbackIndex++;
-      this.callbacks[callbackId] = callback;
-      message.callbackId = callbackId;
-    }
-    this.comObj.postMessage(message);
-  }
-};
-
-var WorkerMessageHandler = {
-  setup: function wphSetup(handler) {
-    var pdfModel = null;
-
-    handler.on('test', function wphSetupTest(data) {
-      handler.send('test', data instanceof Uint8Array);
-    });
-
-    handler.on('doc', function wphSetupDoc(data) {
-      // Create only the model of the PDFDoc, which is enough for
-      // processing the content of the pdf.
-      pdfModel = new PDFDocModel(new Stream(data));
-    });
-
-    handler.on('page_request', function wphSetupPageRequest(pageNum) {
-      pageNum = parseInt(pageNum);
-
-
-      // The following code does quite the same as
-      // Page.prototype.startRendering, but stops at one point and sends the
-      // result back to the main thread.
-      var gfx = new CanvasGraphics(null);
-
-      var start = Date.now();
-
-      var dependency = [];
-      var operatorList = null;
-      try {
-        var page = pdfModel.getPage(pageNum);
-        // Pre compile the pdf page and fetch the fonts/images.
-        operatorList = page.getOperatorList(handler, dependency);
-      } catch (e) {
-        var minimumStackMessage =
-            'worker.js: while trying to getPage() and getOperatorList()';
-
-        // Turn the error into an obj that can be serialized
-        if (typeof e === 'string') {
-          e = {
-            message: e,
-            stack: minimumStackMessage
-          };
-        } else if (typeof e === 'object') {
-          e = {
-            message: e.message || e.toString(),
-            stack: e.stack || minimumStackMessage
-          };
-        } else {
-          e = {
-            message: 'Unknown exception type: ' + (typeof e),
-            stack: minimumStackMessage
-          };
-        }
-
-        handler.send('page_error', {
-          pageNum: pageNum,
-          error: e
-        });
-        return;
-      }
-
-      console.log('page=%d - getOperatorList: time=%dms, len=%d', pageNum,
-                              Date.now() - start, operatorList.fnArray.length);
-
-      // Filter the dependecies for fonts.
-      var fonts = {};
-      for (var i = 0, ii = dependency.length; i < ii; i++) {
-        var dep = dependency[i];
-        if (dep.indexOf('font_') == 0) {
-          fonts[dep] = true;
-        }
-      }
-
-      handler.send('page', {
-        pageNum: pageNum,
-        operatorList: operatorList,
-        depFonts: Object.keys(fonts)
-      });
-    }, this);
-  }
-};
-
-var consoleTimer = {};
-
-var workerConsole = {
-  log: function log() {
-    var args = Array.prototype.slice.call(arguments);
-    postMessage({
-      action: 'console_log',
-      data: args
-    });
-  },
-
-  error: function error() {
-    var args = Array.prototype.slice.call(arguments);
-    postMessage({
-      action: 'console_error',
-      data: args
-    });
-    throw 'pdf.js execution error';
-  },
-
-  time: function time(name) {
-    consoleTimer[name] = Date.now();
-  },
-
-  timeEnd: function timeEnd(name) {
-    var time = consoleTimer[name];
-    if (time == null) {
-      error('Unkown timer name ' + name);
-    }
-    this.log('Timer:', name, Date.now() - time);
-  }
-};
-
-// Worker thread?
-if (typeof window === 'undefined') {
-  globalScope.console = workerConsole;
-
-  var handler = new MessageHandler('worker_processor', this);
-  WorkerMessageHandler.setup(handler);
-}
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-// - The JPEG specification can be found in the ITU CCITT Recommendation T.81
-//   (www.w3.org/Graphics/JPEG/itu-t81.pdf)
-// - The JFIF specification can be found in the JPEG File Interchange Format
-//   (www.w3.org/Graphics/JPEG/jfif3.pdf)
-// - The Adobe Application-Specific JPEG markers in the Supporting the DCT Filters
-//   in PostScript Level 2, Technical Note #5116
-//   (partners.adobe.com/public/developer/en/ps/sdk/5116.DCT_Filter.pdf)
-
-var JpegImage = (function jpegImage() {
-  "use strict";
-  var dctZigZag = new Int32Array([
-     0,
-     1,  8,
-    16,  9,  2,
-     3, 10, 17, 24,
-    32, 25, 18, 11, 4,
-     5, 12, 19, 26, 33, 40,
-    48, 41, 34, 27, 20, 13,  6,
-     7, 14, 21, 28, 35, 42, 49, 56,
-    57, 50, 43, 36, 29, 22, 15,
-    23, 30, 37, 44, 51, 58,
-    59, 52, 45, 38, 31,
-    39, 46, 53, 60,
-    61, 54, 47,
-    55, 62,
-    63
-  ]);
-
-  var dctCos1  =  4017   // cos(pi/16)
-  var dctSin1  =   799   // sin(pi/16)
-  var dctCos3  =  3406   // cos(3*pi/16)
-  var dctSin3  =  2276   // sin(3*pi/16)
-  var dctCos6  =  1567   // cos(6*pi/16)
-  var dctSin6  =  3784   // sin(6*pi/16)
-  var dctSqrt2 =  5793   // sqrt(2)
-  var dctSqrt1d2 = 2896  // sqrt(2) / 2
-
-  function constructor() {
-  }
-
-  function buildHuffmanTable(codeLengths, values) {
-    var k = 0, code = [], i, j, length = 16;
-    while (length > 0 && !codeLengths[length - 1])
-      length--;
-    code.push({children: [], index: 0});
-    var p = code[0], q;
-    for (i = 0; i < length; i++) {
-      for (j = 0; j < codeLengths[i]; j++) {
-        p = code.pop();
-        p.children[p.index] = values[k];
-        while (p.index > 0) {
-          p = code.pop();
-        }
-        p.index++;
-        code.push(p);
-        while (code.length <= i) {
-          code.push(q = {children: [], index: 0});
-          p.children[p.index] = q.children;
-          p = q;
-        }
-        k++;
-      }
-      if (i + 1 < length) {
-        // p here points to last code
-        code.push(q = {children: [], index: 0});
-        p.children[p.index] = q.children;
-        p = q;
-      }
-    }
-    return code[0].children;
-  }
-
-  function decodeScan(data, offset,
-                      frame, components, resetInterval,
-                      spectralStart, spectralEnd,
-                      successivePrev, successive) {
-    var precision = frame.precision;
-    var samplesPerLine = frame.samplesPerLine;
-    var scanLines = frame.scanLines;
-    var mcusPerLine = frame.mcusPerLine;
-    var progressive = frame.progressive;
-    var maxH = frame.maxH, maxV = frame.maxV;
-
-    var startOffset = offset, bitsData = 0, bitsCount = 0;
-    function readBit() {
-      if (bitsCount > 0) {
-        bitsCount--;
-        return (bitsData >> bitsCount) & 1;
-      }
-      bitsData = data[offset++];
-      if (bitsData == 0xFF) {
-        var nextByte = data[offset++];
-        if (nextByte) {
-          throw "unexpected marker: " + ((bitsData << 8) | nextByte).toString(16);
-        }
-        // unstuff 0
-      }
-      bitsCount = 7;
-      return bitsData >>> 7;
-    }
-    function decodeHuffman(tree) {
-      var node = tree, bit;
-      while ((bit = readBit()) !== null) {
-        node = node[bit];
-        if (typeof node === 'number')
-          return node;
-        if (typeof node !== 'object')
-          throw "invalid huffman sequence";
-      }
-      return null;
-    }
-    function receive(length) {
-      var n = 0;
-      while (length > 0) {
-        var bit = readBit();
-        if (bit === null) return;
-        n = (n << 1) | bit;
-        length--;
-      }
-      return n;
-    }
-    function receiveAndExtend(length) {
-      var n = receive(length);
-      if (n >= 1 << (length - 1))
-        return n;
-      return n + (-1 << length) + 1;
-    }
-    function decodeBaseline(component, zz) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : receiveAndExtend(t);
-      zz[0]= (component.pred += diff);
-      var k = 1;
-      while (k < 64) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15, r = rs >> 4;
-        if (s === 0) {
-          if (r < 15)
-            break;
-          k += 16;
-          continue;
-        }
-        k += r;
-        var z = dctZigZag[k];
-        zz[z] = receiveAndExtend(s);
-        k++;
-      }
-    }
-    function decodeDCFirst(component, zz) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : (receiveAndExtend(t) << successive);
-      zz[0] = (component.pred += diff);
-    }
-    function decodeDCSuccessive(component, zz) {
-      zz[0] |= readBit() << successive;
-    }
-    var eobrun = 0;
-    function decodeACFirst(component, zz) {
-      if (eobrun > 0) {
-        eobrun--;
-        return;
-      }
-      var k = spectralStart, e = spectralEnd;
-      while (k <= e) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15, r = rs >> 4;
-        if (s === 0) {
-          if (r < 15) {
-            eobrun = receive(r) + (1 << r) - 1;
-            break;
-          }
-          k += 16;
-          continue;
-        }
-        k += r;
-        var z = dctZigZag[k];
-        zz[z] = receiveAndExtend(s) * (1 << successive);
-        k++;
-      }
-    }
-    var successiveACState = 0, successiveACNextValue;
-    function decodeACSuccessive(component, zz) {
-      var k = spectralStart, e = spectralEnd, r = 0;
-      while (k <= e) {
-        var z = dctZigZag[k];
-        switch (successiveACState) {
-        case 0: // initial state
-          var rs = decodeHuffman(component.huffmanTableAC);
-          var s = rs & 15, r = rs >> 4;
-          if (s === 0) {
-            if (r < 15) {
-              eobrun = receive(r) + (1 << r);
-              successiveACState = 4;
-            } else {
-              r = 16;
-              successiveACState = 1;
-            }
-          } else {
-            if (s !== 1)
-              throw "invalid ACn encoding";
-            successiveACNextValue = receiveAndExtend(s);
-            successiveACState = r ? 2 : 3;
-          }
-          continue;
-        case 1: // skipping r zero items
-        case 2:
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          else {
-            r--;
-            if (r === 0)
-              successiveACState = successiveACState == 2 ? 3 : 0;
-          }
-          break;
-        case 3: // set value for a zero item
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          else {
-            zz[z] = successiveACNextValue << successive;
-            successiveACState = 0;
-          }
-          break;
-        case 4: // eob
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          break;
-        }
-        k++;
-      }
-      if (successiveACState === 4) {
-        eobrun--;
-        if (eobrun === 0)
-          successiveACState = 0;
-      }
-    }
-    function decodeMcu(component, decode, mcu, row, col) {
-      var mcuRow = (mcu / mcusPerLine) | 0;
-      var mcuCol = mcu % mcusPerLine;
-      var blockRow = mcuRow * component.v + row;
-      var blockCol = mcuCol * component.h + col;
-      decode(component, component.blocks[blockRow][blockCol]);
-    }
-    function decodeBlock(component, decode, mcu) {
-      var blockRow = (mcu / component.blocksPerLine) | 0;
-      var blockCol = mcu % component.blocksPerLine;
-      decode(component, component.blocks[blockRow][blockCol]);
-    }
-
-    var componentsLength = components.length;
-    var component, i, j, k, n;
-    var decodeFn;
-    if (progressive) {
-      if (spectralStart === 0)
-        decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
-      else
-        decodeFn = successivePrev === 0 ? decodeACFirst : decodeACSuccessive;
-    } else {
-      decodeFn = decodeBaseline;
-    }
-
-    var mcu = 0, marker;
-    var mcuExpected;
-    if (componentsLength == 1) {
-      mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
-    } else {
-      mcuExpected = mcusPerLine * frame.mcusPerColumn;
-    }
-    if (!resetInterval) resetInterval = mcuExpected;
-
-    var h, v;
-    while (mcu < mcuExpected) {
-      // reset interval stuff
-      for (i = 0; i < componentsLength; i++)
-        components[i].pred = 0;
-      eobrun = 0;
-
-      if (componentsLength == 1) {
-        component = components[0];
-        for (n = 0; n < resetInterval; n++) {
-          decodeBlock(component, decodeFn, mcu);
-          mcu++;
-        }
-      } else {
-        for (n = 0; n < resetInterval; n++) {
-          for (i = 0; i < componentsLength; i++) {
-            component = components[i];
-            h = component.h;
-            v = component.v;
-            for (j = 0; j < v; j++) {
-              for (k = 0; k < h; k++) {
-                decodeMcu(component, decodeFn, mcu, j, k);
-              }
-            }
-          }
-          mcu++;
-        }
-      }
-
-      // find marker
-      bitsCount = 0;
-      marker = (data[offset] << 8) | data[offset + 1];
-      if (marker <= 0xFF00) {
-        throw "marker was not found";
-      }
-
-      if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx
-        offset += 2;
-      }
-      else
-        break;
-    }
-
-    return offset - startOffset;
-  }
-
-  function buildComponentData(frame, component) {
-    var lines = [];
-    var blocksPerLine = component.blocksPerLine;
-    var blocksPerColumn = component.blocksPerColumn;
-    var samplesPerLine = blocksPerLine << 3;
-    var R = new Int32Array(64), r = new Uint8Array(64);
-
-    // A port of poppler's IDCT method which in turn is taken from:
-    //   Christoph Loeffler, Adriaan Ligtenberg, George S. Moschytz,
-    //   "Practical Fast 1-D DCT Algorithms with 11 Multiplications",
-    //   IEEE Intl. Conf. on Acoustics, Speech & Signal Processing, 1989,
-    //   988-991.
-    function quantizeAndInverse(zz, dataOut, dataIn) {
-      var qt = component.quantizationTable;
-      var v0, v1, v2, v3, v4, v5, v6, v7, t;
-      var p = dataIn;
-      var i;
-
-      // dequant
-      for (i = 0; i < 64; i++)
-        p[i] = zz[i] * qt[i];
-
-      // inverse DCT on rows
-      for (i = 0; i < 8; ++i) {
-        var row = 8 * i;
-
-        // check for all-zero AC coefficients
-        if (p[1 + row] == 0 && p[2 + row] == 0 && p[3 + row] == 0 &&
-            p[4 + row] == 0 && p[5 + row] == 0 && p[6 + row] == 0 &&
-            p[7 + row] == 0) {
-          t = (dctSqrt2 * p[0 + row] + 512) >> 10;
-          p[0 + row] = t;
-          p[1 + row] = t;
-          p[2 + row] = t;
-          p[3 + row] = t;
-          p[4 + row] = t;
-          p[5 + row] = t;
-          p[6 + row] = t;
-          p[7 + row] = t;
-          continue;
-        }
-
-        // stage 4
-        v0 = (dctSqrt2 * p[0 + row] + 128) >> 8;
-        v1 = (dctSqrt2 * p[4 + row] + 128) >> 8;
-        v2 = p[2 + row];
-        v3 = p[6 + row];
-        v4 = (dctSqrt1d2 * (p[1 + row] - p[7 + row]) + 128) >> 8;
-        v7 = (dctSqrt1d2 * (p[1 + row] + p[7 + row]) + 128) >> 8;
-        v5 = p[3 + row] << 4;
-        v6 = p[5 + row] << 4;
-
-        // stage 3
-        t = (v0 - v1+ 1) >> 1;
-        v0 = (v0 + v1 + 1) >> 1;
-        v1 = t;
-        t = (v2 * dctSin6 + v3 * dctCos6 + 128) >> 8;
-        v2 = (v2 * dctCos6 - v3 * dctSin6 + 128) >> 8;
-        v3 = t;
-        t = (v4 - v6 + 1) >> 1;
-        v4 = (v4 + v6 + 1) >> 1;
-        v6 = t;
-        t = (v7 + v5 + 1) >> 1;
-        v5 = (v7 - v5 + 1) >> 1;
-        v7 = t;
-
-        // stage 2
-        t = (v0 - v3 + 1) >> 1;
-        v0 = (v0 + v3 + 1) >> 1;
-        v3 = t;
-        t = (v1 - v2 + 1) >> 1;
-        v1 = (v1 + v2 + 1) >> 1;
-        v2 = t;
-        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
-        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
-        v7 = t;
-        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
-        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
-        v6 = t;
-
-        // stage 1
-        p[0 + row] = v0 + v7;
-        p[7 + row] = v0 - v7;
-        p[1 + row] = v1 + v6;
-        p[6 + row] = v1 - v6;
-        p[2 + row] = v2 + v5;
-        p[5 + row] = v2 - v5;
-        p[3 + row] = v3 + v4;
-        p[4 + row] = v3 - v4;
-      }
-
-      // inverse DCT on columns
-      for (i = 0; i < 8; ++i) {
-        var col = i;
-
-        // check for all-zero AC coefficients
-        if (p[1*8 + col] == 0 && p[2*8 + col] == 0 && p[3*8 + col] == 0 &&
-            p[4*8 + col] == 0 && p[5*8 + col] == 0 && p[6*8 + col] == 0 &&
-            p[7*8 + col] == 0) {
-          t = (dctSqrt2 * dataIn[i+0] + 8192) >> 14;
-          p[0*8 + col] = t;
-          p[1*8 + col] = t;
-          p[2*8 + col] = t;
-          p[3*8 + col] = t;
-          p[4*8 + col] = t;
-          p[5*8 + col] = t;
-          p[6*8 + col] = t;
-          p[7*8 + col] = t;
-          continue;
-        }
-
-        // stage 4
-        v0 = (dctSqrt2 * p[0*8 + col] + 2048) >> 12;
-        v1 = (dctSqrt2 * p[4*8 + col] + 2048) >> 12;
-        v2 = p[2*8 + col];
-        v3 = p[6*8 + col];
-        v4 = (dctSqrt1d2 * (p[1*8 + col] - p[7*8 + col]) + 2048) >> 12;
-        v7 = (dctSqrt1d2 * (p[1*8 + col] + p[7*8 + col]) + 2048) >> 12;
-        v5 = p[3*8 + col];
-        v6 = p[5*8 + col];
-
-        // stage 3
-        t = (v0 - v1 + 1) >> 1;
-        v0 = (v0 + v1 + 1) >> 1;
-        v1 = t;
-        t = (v2 * dctSin6 + v3 * dctCos6 + 2048) >> 12;
-        v2 = (v2 * dctCos6 - v3 * dctSin6 + 2048) >> 12;
-        v3 = t;
-        t = (v4 - v6 + 1) >> 1;
-        v4 = (v4 + v6 + 1) >> 1;
-        v6 = t;
-        t = (v7 + v5 + 1) >> 1;
-        v5 = (v7 - v5 + 1) >> 1;
-        v7 = t;
-
-        // stage 2
-        t = (v0 - v3 + 1) >> 1;
-        v0 = (v0 + v3 + 1) >> 1;
-        v3 = t;
-        t = (v1 - v2 + 1) >> 1;
-        v1 = (v1 + v2 + 1) >> 1;
-        v2 = t;
-        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
-        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
-        v7 = t;
-        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
-        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
-        v6 = t;
-
-        // stage 1
-        p[0*8 + col] = v0 + v7;
-        p[7*8 + col] = v0 - v7;
-        p[1*8 + col] = v1 + v6;
-        p[6*8 + col] = v1 - v6;
-        p[2*8 + col] = v2 + v5;
-        p[5*8 + col] = v2 - v5;
-        p[3*8 + col] = v3 + v4;
-        p[4*8 + col] = v3 - v4;
-      }
-
-      // convert to 8-bit integers
-      for (i = 0; i < 64; ++i) {
-        var sample = 128 + ((p[i] + 8) >> 4);
-        dataOut[i] = sample < 0 ? 0 : sample > 0xFF ? 0xFF : sample;
-      }
-    }
-
-    var i, j;
-    for (var blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
-      var scanLine = blockRow << 3;
-      for (i = 0; i < 8; i++)
-        lines.push(new Uint8Array(samplesPerLine));
-      for (var blockCol = 0; blockCol < blocksPerLine; blockCol++) {
-        quantizeAndInverse(component.blocks[blockRow][blockCol], r, R);
-
-        var offset = 0, sample = blockCol << 3;
-        for (j = 0; j < 8; j++) {
-          var line = lines[scanLine + j];
-          for (i = 0; i < 8; i++)
-            line[sample + i] = r[offset++];
-        }
-      }
-    }
-    return lines;
-  }
-
-  constructor.prototype = {
-    load: function load(path) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", path, true);
-      xhr.responseType = "arraybuffer";
-      xhr.onload = (function() {
-        // TODO catch parse error
-        var data = new Uint8Array(xhr.response || xhr.mozResponseArrayBuffer);
-        this.parse(data);
-        if (this.onload)
-          this.onload();
-      }).bind(this);
-      xhr.send(null);
-    },
-    parse: function parse(data) {
-      var offset = 0, length = data.length;
-      function readUint16() {
-        var value = (data[offset] << 8) | data[offset + 1];
-        offset += 2;
-        return value;
-      }
-      function readDataBlock() {
-        var length = readUint16();
-        var array = data.subarray(offset, offset + length - 2);
-        offset += array.length;
-        return array;
-      }
-      function prepareComponents(frame) {
-        var maxH = 0, maxV = 0;
-        var component, componentId;
-        for (componentId in frame.components) {
-          if (frame.components.hasOwnProperty(componentId)) {
-            component = frame.components[componentId];
-            if (maxH < component.h) maxH = component.h;
-            if (maxV < component.v) maxV = component.v;
-          }
-        }
-        var mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / maxH);
-        var mcusPerColumn = Math.ceil(frame.scanLines / 8 / maxV);
-        for (componentId in frame.components) {
-          if (frame.components.hasOwnProperty(componentId)) {
-            component = frame.components[componentId];
-            var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / maxH);
-            var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines  / 8) * component.v / maxV);
-            var blocksPerLineForMcu = mcusPerLine * component.h;
-            var blocksPerColumnForMcu = mcusPerColumn * component.v;
-            var blocks = [];
-            for (var i = 0; i < blocksPerColumnForMcu; i++) {
-              var row = [];
-              for (var j = 0; j < blocksPerLineForMcu; j++)
-                row.push(new Int32Array(64));
-              blocks.push(row);
-            }
-            component.blocksPerLine = blocksPerLine;
-            component.blocksPerColumn = blocksPerColumn;
-            component.blocks = blocks;
-          }
-        }
-        frame.maxH = maxH;
-        frame.maxV = maxV;
-        frame.mcusPerLine = mcusPerLine;
-        frame.mcusPerColumn = mcusPerColumn;
-      }
-      var jfif = null;
-      var adobe = null;
-      var pixels = null;
-      var frame, resetInterval;
-      var quantizationTables = [], frames = [];
-      var huffmanTablesAC = [], huffmanTablesDC = [];
-      var fileMarker = readUint16();
-      if (fileMarker != 0xFFD8) { // SOI (Start of Image)
-        throw "SOI not found";
-      }
-
-      fileMarker = readUint16();
-      while (fileMarker != 0xFFD9) { // EOI (End of image)
-        var i, j, l;
-        switch(fileMarker) {
-          case 0xFFE0: // APP0 (Application Specific)
-          case 0xFFE1: // APP1
-          case 0xFFE2: // APP2
-          case 0xFFE3: // APP3
-          case 0xFFE4: // APP4
-          case 0xFFE5: // APP5
-          case 0xFFE6: // APP6
-          case 0xFFE7: // APP7
-          case 0xFFE8: // APP8
-          case 0xFFE9: // APP9
-          case 0xFFEA: // APP10
-          case 0xFFEB: // APP11
-          case 0xFFEC: // APP12
-          case 0xFFED: // APP13
-          case 0xFFEE: // APP14
-          case 0xFFEF: // APP15
-          case 0xFFFE: // COM (Comment)
-            var appData = readDataBlock();
-
-            if (fileMarker === 0xFFE0) {
-              if (appData[0] === 0x4A && appData[1] === 0x46 && appData[2] === 0x49 &&
-                appData[3] === 0x46 && appData[4] === 0) { // 'JFIF\x00'
-                jfif = {
-                  version: { major: appData[5], minor: appData[6] },
-                  densityUnits: appData[7],
-                  xDensity: (appData[8] << 8) | appData[9],
-                  yDensity: (appData[10] << 8) | appData[11],
-                  thumbWidth: appData[12],
-                  thumbHeight: appData[13],
-                  thumbData: appData.subarray(14, 14 + 3 * appData[12] * appData[13])
-                };
-              }
-            }
-            // TODO APP1 - Exif
-            if (fileMarker === 0xFFEE) {
-              if (appData[0] === 0x41 && appData[1] === 0x64 && appData[2] === 0x6F &&
-                appData[3] === 0x62 && appData[4] === 0x65 && appData[5] === 0) { // 'Adobe\x00'
-                adobe = {
-                  version: appData[6],
-                  flags0: (appData[7] << 8) | appData[8],
-                  flags1: (appData[9] << 8) | appData[10],
-                  transformCode: appData[11]
-                };
-              }
-            }
-            break;
-
-          case 0xFFDB: // DQT (Define Quantization Tables)
-            var quantizationTableCount = Math.floor((readUint16() - 2) / 65);
-            for (i = 0; i < quantizationTableCount; i++) {
-              var quantizationTableSpec = data[offset++];
-              var tableData = new Int32Array(64);
-              if ((quantizationTableSpec >> 4) === 0) { // 8 bit values
-                for (j = 0; j < 64; j++) {
-                  var z = dctZigZag[j];
-                  tableData[z] = data[offset++];
-                }
-              } else if ((quantizationTableSpec >> 4) === 1) { //16 bit
-                  tableData[j] = readUint16();
-              } else
-                throw "DQT: invalid table spec";
-              quantizationTables[quantizationTableSpec & 15] = tableData;
-            }
-            break;
-
-          case 0xFFC0: // SOF0 (Start of Frame, Baseline DCT)
-          case 0xFFC2: // SOF2 (Start of Frame, Progressive DCT)
-            readUint16(); // skip data length
-            frame = {};
-            frame.progressive = (fileMarker === 0xFFC2);
-            frame.precision = data[offset++];
-            frame.scanLines = readUint16();
-            frame.samplesPerLine = readUint16();
-            frame.components = [];
-            var componentsCount = data[offset++], componentId;
-            var maxH = 0, maxV = 0;
-            for (i = 0; i < componentsCount; i++) {
-              componentId = data[offset];
-              var h = data[offset + 1] >> 4;
-              var v = data[offset + 1] & 15;
-              var qId = data[offset + 2];
-              frame.components[componentId] = {
-                h: h,
-                v: v,
-                quantizationTable: quantizationTables[qId]
-              };
-              offset += 3;
-            }
-            prepareComponents(frame);
-            frames.push(frame);
-            break;
-
-          case 0xFFC4: // DHT (Define Huffman Tables)
-            var huffmanLength = readUint16();
-            for (i = 2; i < huffmanLength;) {
-              var huffmanTableSpec = data[offset++];
-              var codeLengths = new Uint8Array(16);
-              var codeLengthSum = 0;
-              for (j = 0; j < 16; j++, offset++)
-                codeLengthSum += (codeLengths[j] = data[offset]);
-              var huffmanValues = new Uint8Array(codeLengthSum);
-              for (j = 0; j < codeLengthSum; j++, offset++)
-                huffmanValues[j] = data[offset];
-              i += 17 + codeLengthSum;
-
-              ((huffmanTableSpec >> 4) === 0 ? 
-                huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] =
-                buildHuffmanTable(codeLengths, huffmanValues);
-            }
-            break;
-
-          case 0xFFDD: // DRI (Define Restart Interval)
-            readUint16(); // skip data length
-            resetInterval = readUint16();
-            break;
-
-          case 0xFFDA: // SOS (Start of Scan)
-            var scanLength = readUint16();
-            var selectorsCount = data[offset++];
-            var components = [], component;
-            for (i = 0; i < selectorsCount; i++) {
-              component = frame.components[data[offset++]];
-              var tableSpec = data[offset++];
-              component.huffmanTableDC = huffmanTablesDC[tableSpec >> 4];
-              component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
-              components.push(component);
-            }
-            var spectralStart = data[offset++];
-            var spectralEnd = data[offset++];
-            var successiveApproximation = data[offset++];
-            var processed = decodeScan(data, offset,
-              frame, components, resetInterval,
-              spectralStart, spectralEnd,
-              successiveApproximation >> 4, successiveApproximation & 15);
-            offset += processed;
-            break;
-          default:
-            throw "unknown JPEG marker " + fileMarker.toString(16);
-        }
-        fileMarker = readUint16();
-      }
-      if (frames.length != 1)
-        throw "only single frame JPEGs supported";
-
-      this.width = frame.samplesPerLine;
-      this.height = frame.scanLines;
-      this.jfif = jfif;
-      this.adobe = adobe;
-      this.components = [];
-      for (var id in frame.components) {
-        if (frame.components.hasOwnProperty(id)) {
-          this.components.push({
-            lines: buildComponentData(frame, frame.components[id]),
-            scaleX: frame.components[id].h / frame.maxH,
-            scaleY: frame.components[id].v / frame.maxV
-          });
-        }
-      }
-    },
-    getData: function getData(width, height) {
-      function clampTo8bit(a) {
-        return a < 0 ? 0 : a > 255 ? 255 : a;
-      }
-      var scaleX = this.width / width, scaleY = this.height / height;
-
-      var component1, component2, component3, component4;
-      var component1Line, component2Line, component3Line, component4Line;
-      var x, y;
-      var offset = 0;
-      var Y, Cb, Cr, K, C, M, Ye, R, G, B;
-      var colorTransform;
-      var dataLength = width * height * this.components.length;
-      var data = new Uint8Array(dataLength);
-      switch (this.components.length) {
-        case 1:
-          component1 = this.components[0];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-
-              data[offset++] = Y;
-            }
-          }
-          break;
-        case 3:
-          // The default transform for three components is true
-          colorTransform = true;
-          // The adobe transform marker overrides any previous setting
-          if (this.adobe && this.adobe.transformCode)
-            colorTransform = true;
-          else if (typeof this.colorTransform !== 'undefined')
-            colorTransform = !!this.colorTransform;
-
-          component1 = this.components[0];
-          component2 = this.components[1];
-          component3 = this.components[2];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
-            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              if (!colorTransform) {
-                R = component1Line[0 | (x * component1.scaleX * scaleX)];
-                G = component2Line[0 | (x * component2.scaleX * scaleX)];
-                B = component3Line[0 | (x * component3.scaleX * scaleX)];
-              } else {
-                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
-
-                R = clampTo8bit(Y + 1.402 * (Cr - 128));
-                G = clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
-                B = clampTo8bit(Y + 1.772 * (Cb - 128));
-              }
-
-              data[offset++] = R;
-              data[offset++] = G;
-              data[offset++] = B;
-            }
-          }
-          break;
-        case 4:
-          if (!this.adobe)
-            throw 'Unsupported color mode (4 components)';
-          // The default transform for four components is false
-          colorTransform = false;
-          // The adobe transform marker overrides any previous setting
-          if (this.adobe && this.adobe.transformCode)
-            colorTransform = true;
-          else if (typeof this.colorTransform !== 'undefined')
-            colorTransform = !!this.colorTransform;
-
-          component1 = this.components[0];
-          component2 = this.components[1];
-          component3 = this.components[2];
-          component4 = this.components[3];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
-            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
-            component4Line = component4.lines[0 | (y * component4.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              if (!colorTransform) {
-                C = component1Line[0 | (x * component1.scaleX * scaleX)];
-                M = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Ye = component3Line[0 | (x * component3.scaleX * scaleX)];
-                K = component4Line[0 | (x * component4.scaleX * scaleX)];
-              } else {
-                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
-                K = component4Line[0 | (x * component4.scaleX * scaleX)];
-
-                C = 255 - clampTo8bit(Y + 1.402 * (Cr - 128));
-                M = 255 - clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
-                Ye = 255 - clampTo8bit(Y + 1.772 * (Cb - 128));
-              }
-              data[offset++] = C;
-              data[offset++] = M;
-              data[offset++] = Ye;
-              data[offset++] = K;
-            }
-          }
-          break;
-        default:
-          throw 'Unsupported color mode';
-      }
-      return data;
-    },
-    copyToImageData: function copyToImageData(imageData) {
-      var width = imageData.width, height = imageData.height;
-      var imageDataArray = imageData.data;
-      var data = this.getData(width, height);
-      var i = 0, j = 0, x, y;
-      var Y, K, C, M, R, G, B;
-      switch (this.components.length) {
-        case 1:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              Y = data[i++];
-
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        case 3:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              R = data[i++];
-              G = data[i++];
-              B = data[i++];
-
-              imageDataArray[j++] = R;
-              imageDataArray[j++] = G;
-              imageDataArray[j++] = B;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        case 4:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              C = data[i++];
-              M = data[i++];
-              Y = data[i++];
-              K = data[i++];
-
-              R = 255 - clampTo8bit(C * (1 - K / 255) + K);
-              G = 255 - clampTo8bit(M * (1 - K / 255) + K);
-              B = 255 - clampTo8bit(Y * (1 - K / 255) + K);
-
-              imageDataArray[j++] = R;
-              imageDataArray[j++] = G;
-              imageDataArray[j++] = B;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        default:
-          throw 'Unsupported color mode';
-      }
-    }
-  };
-
-  return constructor;
-})();/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var JpxImage = (function JpxImageClosure() {
-  // Table E.1
-  var SubbandsGainLog2 = {
-    'LL': 0,
-    'LH': 1,
-    'HL': 1,
-    'HH': 2
-  };
-  function JpxImage() {
-    this.failOnCorruptedImage = false;
-  }
-  JpxImage.prototype = {
-    load: function JpxImage_load(url) {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', url, true);
-      xhr.responseType = 'arraybuffer';
-      xhr.onload = (function() {
-        // TODO catch parse error
-        var data = new Uint8Array(xhr.response || xhr.mozResponseArrayBuffer);
-        this.parse(data);
-        if (this.onload)
-          this.onload();
-      }).bind(this);
-      xhr.send(null);
-    },
-    parse: function JpxImage_parse(data) {
-      function ReadUint(data, offset, bytes) {
-        var n = 0;
-        for (var i = 0; i < bytes; i++)
-          n = n * 256 + (data[offset + i] & 0xFF);
-        return n;
-      }
-      var position = 0, length = data.length;
-      while (position < length) {
-        var headerSize = 8;
-        var lbox = ReadUint(data, position, 4);
-        var tbox = ReadUint(data, position + 4, 4);
-        position += headerSize;
-        if (lbox == 1) {
-          lbox = ReadUint(data, position, 8);
-          position += 8;
-          headerSize += 8;
-        }
-        if (lbox == 0)
-          lbox = length - position + headerSize;
-        if (lbox < headerSize)
-          error('JPX error: Invalid box field size');
-        var dataLength = lbox - headerSize;
-        var jumpDataLength = true;
-        switch (tbox) {
-          case 0x6A501A1A: // 'jP\032\032'
-            // TODO
-            break;
-          case 0x6A703268: // 'jp2h'
-            jumpDataLength = false; // parsing child boxes
-            break;
-          case 0x636F6C72: // 'colr'
-            // TODO
-            break;
-          case 0x6A703263: // 'jp2c'
-            this.parseCodestream(data, position, position + dataLength);
-            break;
-        }
-        if (jumpDataLength)
-          position += dataLength;
-      }
-    },
-    parseCodestream: function JpxImage_parseCodestream(data, start, end) {
-      var context = {};
-      try {
-        var position = start;
-        while (position < end) {
-          var code = readUint16(data, position);
-          position += 2;
-
-          var length = 0, j;
-          switch (code) {
-            case 0xFF4F: // Start of codestream (SOC)
-              context.mainHeader = true;
-              break;
-            case 0xFFD9: // End of codestream (EOC)
-              break;
-            case 0xFF51: // Image and tile size (SIZ)
-              length = readUint16(data, position);
-              var siz = {};
-              siz.Xsiz = readUint32(data, position + 4);
-              siz.Ysiz = readUint32(data, position + 8);
-              siz.XOsiz = readUint32(data, position + 12);
-              siz.YOsiz = readUint32(data, position + 16);
-              siz.XTsiz = readUint32(data, position + 20);
-              siz.YTsiz = readUint32(data, position + 24);
-              siz.XTOsiz = readUint32(data, position + 28);
-              siz.YTOsiz = readUint32(data, position + 32);
-              var componentsCount = readUint16(data, position + 36);
-              siz.Csiz = componentsCount;
-              var components = [];
-              j = position + 38;
-              for (var i = 0; i < componentsCount; i++) {
-                var component = {
-                  precision: (data[j] & 0x7F) + 1,
-                  isSigned: !!(data[j] & 0x80),
-                  XRsiz: data[j + 1],
-                  YRsiz: data[j + 1]
-                };
-                calculateComponentDimensions(component, siz);
-                components.push(component);
-              }
-              context.SIZ = siz;
-              context.components = components;
-              calculateTileGrids(context, components);
-              context.QCC = [];
-              context.COC = [];
-              break;
-            case 0xFF5C: // Quantization default (QCD)
-              length = readUint16(data, position);
-              var qcd = {};
-              j = position + 2;
-              var sqcd = data[j++];
-              var spqcdSize, scalarExpounded;
-              switch (sqcd & 0x1F) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-                default:
-                  throw 'Invalid SQcd value ' + sqcd;
-              }
-              qcd.noQuantization = spqcdSize == 8;
-              qcd.scalarExpounded = scalarExpounded;
-              qcd.guardBits = sqcd >> 5;
-              var spqcds = [];
-              while (j < length + position) {
-                var spqcd = {};
-                if (spqcdSize == 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
-                  j += 2;
-                }
-                spqcds.push(spqcd);
-              }
-              qcd.SPqcds = spqcds;
-              if (context.mainHeader)
-                context.QCD = qcd;
-              else {
-                context.currentTile.QCD = qcd;
-                context.currentTile.QCC = [];
-              }
-              break;
-            case 0xFF5D: // Quantization component (QCC)
-              length = readUint16(data, position);
-              var qcc = {};
-              j = position + 2;
-              var cqcc;
-              if (context.SIZ.Csiz < 257)
-                cqcc = data[j++];
-              else {
-                cqcc = readUint16(data, j);
-                j += 2;
-              }
-              var sqcd = data[j++];
-              var spqcdSize, scalarExpounded;
-              switch (sqcd & 0x1F) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-                default:
-                  throw 'Invalid SQcd value ' + sqcd;
-              }
-              qcc.noQuantization = spqcdSize == 8;
-              qcc.scalarExpounded = scalarExpounded;
-              qcc.guardBits = sqcd >> 5;
-              var spqcds = [];
-              while (j < length + position) {
-                var spqcd = {};
-                if (spqcdSize == 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
-                  j += 2;
-                }
-                spqcds.push(spqcd);
-              }
-              qcc.SPqcds = spqcds;
-              if (context.mainHeader)
-                context.QCC[cqcc] = qcc;
-              else
-                context.currentTile.QCC[cqcc] = qcc;
-              break;
-            case 0xFF52: // Coding style default (COD)
-              length = readUint16(data, position);
-              var cod = {};
-              j = position + 2;
-              var scod = data[j++];
-              cod.entropyCoderWithCustomPrecincts = !!(scod & 1);
-              cod.sopMarkerUsed = !!(scod & 2);
-              cod.ephMarkerUsed = !!(scod & 4);
-              var codingStyle = {};
-              cod.progressionOrder = data[j++];
-              cod.layersCount = readUint16(data, j);
-              j += 2;
-              cod.multipleComponentTransform = data[j++];
-
-              cod.decompositionLevelsCount = data[j++];
-              cod.xcb = (data[j++] & 0xF) + 2;
-              cod.ycb = (data[j++] & 0xF) + 2;
-              var blockStyle = data[j++];
-              cod.selectiveArithmeticCodingBypass = !!(blockStyle & 1);
-              cod.resetContextProbabilities = !!(blockStyle & 2);
-              cod.terminationOnEachCodingPass = !!(blockStyle & 4);
-              cod.verticalyStripe = !!(blockStyle & 8);
-              cod.predictableTermination = !!(blockStyle & 16);
-              cod.segmentationSymbolUsed = !!(blockStyle & 32);
-              cod.transformation = data[j++];
-              if (cod.entropyCoderWithCustomPrecincts) {
-                var precinctsSizes = {};
-                while (j < length + position) {
-                  var precinctsSize = data[j];
-                  precinctsSizes.push({
-                    PPx: precinctsSize & 0xF,
-                    PPy: precinctsSize >> 4
-                  });
-                }
-                cod.precinctsSizes = precinctsSizes;
-              }
-
-              if (cod.sopMarkerUsed || cod.ephMarkerUsed ||
-                  cod.selectiveArithmeticCodingBypass ||
-                  cod.resetContextProbabilities ||
-                  cod.terminationOnEachCodingPass ||
-                  cod.verticalyStripe || cod.predictableTermination ||
-                  cod.segmentationSymbolUsed)
-                throw 'Unsupported COD options: ' + uneval(cod);
-
-              if (context.mainHeader)
-                context.COD = cod;
-              else {
-                context.currentTile.COD = cod;
-                context.currentTile.COC = [];
-              }
-              break;
-            case 0xFF90: // Start of tile-part (SOT)
-              length = readUint16(data, position);
-              var tile = {};
-              tile.index = readUint16(data, position + 2);
-              tile.length = readUint32(data, position + 4);
-              tile.dataEnd = tile.length + position - 2;
-              tile.partIndex = data[position + 8];
-              tile.partsCount = data[position + 9];
-
-              context.mainHeader = false;
-              if (tile.partIndex == 0) {
-                // reset component specific settings
-                tile.COD = context.COD;
-                tile.COC = context.COC.slice(0); // clone of the global COC
-                tile.QCD = context.QCD;
-                tile.QCC = context.QCC.slice(0); // clone of the global COC
-              }
-              context.currentTile = tile;
-              break;
-            case 0xFF93: // Start of data (SOD)
-              var tile = context.currentTile;
-              if (tile.partIndex == 0) {
-                initializeTile(context, tile.index);
-                buildPackets(context);
-              }
-
-              // moving to the end of the data
-              length = tile.dataEnd - position;
-
-              parseTilePackets(context, data, position, length);
-              break;
-            case 0xFF64: // Comment (COM)
-              length = readUint16(data, position);
-              // skipping content
-              break;
-            default:
-              throw 'Unknown codestream code: ' + code.toString(16);
-          }
-          position += length;
-        }
-      } catch (e) {
-        if (this.failOnCorruptedImage)
-          error('JPX error: ' + e);
-        else
-          warn('JPX error: ' + e + '. Trying to recover');
-      }
-      this.tiles = transformComponents(context);
-      this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
-      this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;
-      this.componentsCount = context.SIZ.Csiz;
-    }
-  };
-  function readUint32(data, offset) {
-    return (data[offset] << 24) | (data[offset + 1] << 16) |
-      (data[offset + 2] << 8) | data[offset + 3];
-  }
-  function readUint16(data, offset) {
-    return (data[offset] << 8) | data[offset + 1];
-  }
-  function log2(x) {
-    var n = 1, i = 0;
-    while (x > n) {
-      n <<= 1;
-      i++;
-    }
-    return i;
-  }
-  function calculateComponentDimensions(component, siz) {
-    // Section B.2 Component mapping
-    component.x0 = Math.ceil(siz.XOsiz / component.XRsiz);
-    component.x1 = Math.ceil(siz.Xsiz / component.XRsiz);
-    component.y0 = Math.ceil(siz.YOsiz / component.YRsiz);
-    component.y1 = Math.ceil(siz.Ysiz / component.YRsiz);
-    component.width = component.x1 - component.x0;
-    component.height = component.y1 - component.y0;
-  }
-  function calculateTileGrids(context, components) {
-    var siz = context.SIZ;
-    // Section B.3 Division into tile and tile-components
-    var tiles = [];
-    var numXtiles = Math.ceil((siz.Xsiz - siz.XTOsiz) / siz.XTsiz);
-    var numYtiles = Math.ceil((siz.Ysiz - siz.YTOsiz) / siz.YTsiz);
-    for (var q = 0; q < numYtiles; q++) {
-      for (var p = 0; p < numXtiles; p++) {
-        var tile = {};
-        tile.tx0 = Math.max(siz.XTOsiz + p * siz.XTsiz, siz.XOsiz);
-        tile.ty0 = Math.max(siz.YTOsiz + q * siz.YTsiz, siz.YOsiz);
-        tile.tx1 = Math.min(siz.XTOsiz + (p + 1) * siz.XTsiz, siz.Xsiz);
-        tile.ty1 = Math.min(siz.YTOsiz + (q + 1) * siz.YTsiz, siz.Ysiz);
-        tile.width = tile.tx1 - tile.tx0;
-        tile.height = tile.ty1 - tile.ty0;
-        tile.components = [];
-        tiles.push(tile);
-      }
-    }
-    context.tiles = tiles;
-
-    var componentsCount = siz.Csiz;
-    for (var i = 0, ii = componentsCount; i < ii; i++) {
-      var component = components[i];
-      var tileComponents = [];
-      for (var j = 0, jj = tiles.length; j < jj; j++) {
-        var tileComponent = {}, tile = tiles[j];
-        tileComponent.tcx0 = Math.ceil(tile.tx0 / component.XRsiz);
-        tileComponent.tcy0 = Math.ceil(tile.ty0 / component.YRsiz);
-        tileComponent.tcx1 = Math.ceil(tile.tx1 / component.XRsiz);
-        tileComponent.tcy1 = Math.ceil(tile.ty1 / component.YRsiz);
-        tileComponent.width = tileComponent.tcx1 - tileComponent.tcx0;
-        tileComponent.height = tileComponent.tcy1 - tileComponent.tcy0;
-        tile.components[i] = tileComponent;
-      }
-    }
-  }
-  function getBlocksDimensions(context, component, r) {
-    var codOrCoc = component.codingStyleParameters;
-    var result = {};
-    if (!codOrCoc.entropyCoderWithCustomPrecincts) {
-      result.PPx = 15;
-      result.PPy = 15;
-    } else {
-      result.PPx = codOrCoc.precinctsSizes[r].PPx;
-      result.PPy = codOrCoc.precinctsSizes[r].PPy;
-    }
-    // calculate codeblock size as described in section B.7
-    result.xcb_ = r > 0 ? Math.min(codOrCoc.xcb, result.PPx - 1) :
-      Math.min(codOrCoc.xcb, result.PPx);
-    result.ycb_ = r > 0 ? Math.min(codOrCoc.ycb, result.PPy - 1) :
-      Math.min(codOrCoc.ycb, result.PPy);
-    return result;
-  }
-  function buildPrecincts(context, resolution, dimensions) {
-    // Section B.6 Division resolution to precincts
-    var precinctWidth = 1 << dimensions.PPx;
-    var precinctHeight = 1 << dimensions.PPy;
-    var numprecinctswide = resolution.trx1 > resolution.trx0 ?
-      Math.ceil(resolution.trx1 / precinctWidth) -
-      Math.floor(resolution.trx0 / precinctWidth) : 0;
-    var numprecinctshigh = resolution.try1 > resolution.try0 ?
-      Math.ceil(resolution.try1 / precinctHeight) -
-      Math.floor(resolution.try0 / precinctHeight) : 0;
-    var numprecincts = numprecinctswide * numprecinctshigh;
-    var precinctXOffset = Math.floor(resolution.trx0 / precinctWidth) *
-      precinctWidth;
-    var precinctYOffset = Math.floor(resolution.try0 / precinctHeight) *
-      precinctHeight;
-    resolution.precinctParameters = {
-      precinctXOffset: precinctXOffset,
-      precinctYOffset: precinctYOffset,
-      precinctWidth: precinctWidth,
-      precinctHeight: precinctHeight,
-      numprecinctswide: numprecinctswide,
-      numprecinctshigh: numprecinctshigh,
-      numprecincts: numprecincts
-    };
-  }
-  function buildCodeblocks(context, subband, dimensions) {
-    // Section B.7 Division sub-band into code-blocks
-    var xcb_ = dimensions.xcb_;
-    var ycb_ = dimensions.ycb_;
-    var codeblockWidth = 1 << xcb_;
-    var codeblockHeight = 1 << ycb_;
-    var cbx0 = Math.floor(subband.tbx0 / codeblockWidth);
-    var cby0 = Math.floor(subband.tby0 / codeblockHeight);
-    var cbx1 = Math.ceil(subband.tbx1 / codeblockWidth);
-    var cby1 = Math.ceil(subband.tby1 / codeblockHeight);
-    var precinctParameters = subband.resolution.precinctParameters;
-    var codeblocks = [];
-    var precincts = [];
-    for (var j = cby0; j < cby1; j++) {
-      for (var i = cbx0; i < cbx1; i++) {
-        var codeblock = {
-          cbx: i,
-          cby: j,
-          tbx0: codeblockWidth * i,
-          tby0: codeblockHeight * j,
-          tbx1: codeblockWidth * (i + 1),
-          tby1: codeblockHeight * (j + 1)
-        };
-        // calculate precinct number
-        var pi = Math.floor((codeblock.tbx0 -
-          precinctParameters.precinctXOffset) /
-          precinctParameters.precinctWidth);
-        var pj = Math.floor((codeblock.tby0 -
-          precinctParameters.precinctYOffset) /
-          precinctParameters.precinctHeight);
-        var precinctNumber = pj +
-          pi * precinctParameters.numprecinctswide;
-        codeblock.tbx0_ = Math.max(subband.tbx0, codeblock.tbx0);
-        codeblock.tby0_ = Math.max(subband.tby0, codeblock.tby0);
-        codeblock.tbx1_ = Math.min(subband.tbx1, codeblock.tbx1);
-        codeblock.tby1_ = Math.min(subband.tby1, codeblock.tby1);
-        codeblock.precinctNumber = precinctNumber;
-        codeblock.subbandType = subband.type;
-        var coefficientsLength = (codeblock.tbx1_ - codeblock.tbx0_) *
-          (codeblock.tby1_ - codeblock.tby0_);
-        codeblock.Lblock = 3;
-        codeblocks.push(codeblock);
-        // building precinct for the sub-band
-        var precinct;
-        if (precinctNumber in precincts) {
-          precinct = precincts[precinctNumber];
-          precinct.cbxMin = Math.min(precinct.cbxMin, i);
-          precinct.cbyMin = Math.min(precinct.cbyMin, j);
-          precinct.cbxMax = Math.max(precinct.cbxMax, i);
-          precinct.cbyMax = Math.max(precinct.cbyMax, j);
-        } else {
-          precincts[precinctNumber] = precinct = {
-            cbxMin: i,
-            cbyMin: j,
-            cbxMax: i,
-            cbyMax: j
-          };
-        }
-        codeblock.precinct = precinct;
-      }
-    }
-    subband.codeblockParameters = {
-      codeblockWidth: xcb_,
-      codeblockHeight: ycb_,
-      numcodeblockwide: cbx1 - cbx0 + 1,
-      numcodeblockhigh: cby1 - cby1 + 1
-    };
-    subband.codeblocks = codeblocks;
-    for (var i = 0, ii = codeblocks.length; i < ii; i++) {
-      var codeblock = codeblocks[i];
-      var precinctNumber = codeblock.precinctNumber;
-    }
-    subband.precincts = precincts;
-  }
-  function createPacket(resolution, precinctNumber, layerNumber) {
-    var precinctCodeblocks = [];
-    // Section B.10.8 Order of info in packet
-    var subbands = resolution.subbands;
-    // sub-bands already ordered in 'LL', 'HL', 'LH', and 'HH' sequence
-    for (var i = 0, ii = subbands.length; i < ii; i++) {
-      var subband = subbands[i];
-      var codeblocks = subband.codeblocks;
-      for (var j = 0, jj = codeblocks.length; j < jj; j++) {
-        var codeblock = codeblocks[j];
-        if (codeblock.precinctNumber != precinctNumber)
-          continue;
-        precinctCodeblocks.push(codeblock);
-      }
-    }
-    return {
-      layerNumber: layerNumber,
-      codeblocks: precinctCodeblocks
-    };
-  }
-  function LayerResolutionComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
-        tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var l = 0, r = 0, i = 0, k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      // Section B.12.1.1 Layer-resolution-component-position
-      for (; l < layersCount; l++) {
-        for (; r <= maxDecompositionLevelsCount; r++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-            if (r > component.codingStyleParameters.decompositionLevelsCount)
-              continue;
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-            k = 0;
-          }
-          i = 0;
-        }
-        r = 0;
-      }
-      throw 'Out of packets';
-    };
-  }
-  function ResolutionLayerComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
-        tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var r = 0, l = 0, i = 0, k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      // Section B.12.1.2 Resolution-layer-component-position
-      for (; r <= maxDecompositionLevelsCount; r++) {
-        for (; l < layersCount; l++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-            if (r > component.codingStyleParameters.decompositionLevelsCount)
-              continue;
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-            k = 0;
-          }
-          i = 0;
-        }
-        l = 0;
-      }
-      throw 'Out of packets';
-    };
-  }
-  function buildPackets(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var componentsCount = siz.Csiz;
-    // Creating resolutions and sub-bands for each component
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var decompositionLevelsCount =
-        component.codingStyleParameters.decompositionLevelsCount;
-      // Section B.5 Resolution levels and sub-bands
-      var resolutions = [];
-      var subbands = [];
-      for (var r = 0; r <= decompositionLevelsCount; r++) {
-        var blocksDimensions = getBlocksDimensions(context, component, r);
-        var resolution = {};
-        var scale = 1 << (decompositionLevelsCount - r);
-        resolution.trx0 = Math.ceil(component.tcx0 / scale);
-        resolution.try0 = Math.ceil(component.tcy0 / scale);
-        resolution.trx1 = Math.ceil(component.tcx1 / scale);
-        resolution.try1 = Math.ceil(component.tcy1 / scale);
-        buildPrecincts(context, resolution, blocksDimensions);
-        resolutions.push(resolution);
-
-        var subband;
-        if (r == 0) {
-          // one sub-band (LL) with last decomposition
-          subband = {};
-          subband.type = 'LL';
-          subband.tbx0 = Math.ceil(component.tcx0 / scale);
-          subband.tby0 = Math.ceil(component.tcy0 / scale);
-          subband.tbx1 = Math.ceil(component.tcx1 / scale);
-          subband.tby1 = Math.ceil(component.tcy1 / scale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolution.subbands = [subband];
-        } else {
-          var bscale = 1 << (decompositionLevelsCount - r + 1);
-          var resolutionSubbands = [];
-          // three sub-bands (HL, LH and HH) with rest of decompositions
-          subband = {};
-          subband.type = 'HL';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          subband = {};
-          subband.type = 'LH';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          subband = {};
-          subband.type = 'HH';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          resolution.subbands = resolutionSubbands;
-        }
-      }
-      component.resolutions = resolutions;
-      component.subbands = subbands;
-    }
-    // Generate the packets sequence
-    var progressionOrder = tile.codingStyleDefaultParameters.progressionOrder;
-    var packetsIterator;
-    switch (progressionOrder) {
-      case 0:
-        tile.packetsIterator =
-          new LayerResolutionComponentPositionIterator(context);
-        break;
-      case 1:
-        tile.packetsIterator =
-          new ResolutionLayerComponentPositionIterator(context);
-        break;
-      default:
-        throw 'Unsupported progression order ' + progressionOrder;
-    }
-  }
-  function parseTilePackets(context, data, offset, dataLength) {
-    var position = 0;
-    var buffer, bufferSize = 0, skipNextBit = false;
-    function readBits(count) {
-      while (bufferSize < count) {
-        var b = data[offset + position];
-        position++;
-        if (skipNextBit) {
-          buffer = (buffer << 7) | b;
-          bufferSize += 7;
-          skipNextBit = false;
-        } else {
-          buffer = (buffer << 8) | b;
-          bufferSize += 8;
-        }
-        if (b == 0xFF) {
-          skipNextBit = true;
-        }
-      }
-      bufferSize -= count;
-      return (buffer >>> bufferSize) & ((1 << count) - 1);
-    }
-    function alignToByte() {
-      bufferSize = 0;
-      if (skipNextBit) {
-        position++;
-        skipNextBit = false;
-      }
-    }
-    function readCodingpasses() {
-      var value = readBits(1);
-      if (value == 0)
-        return 1;
-      value = (value << 1) | readBits(1);
-      if (value == 0x02)
-        return 2;
-      value = (value << 2) | readBits(2);
-      if (value <= 0x0E)
-        return (value & 0x03) + 3;
-      value = (value << 5) | readBits(5);
-      if (value <= 0x1FE)
-        return (value & 0x1F) + 6;
-      value = (value << 7) | readBits(7);
-      return (value & 0x7F) + 37;
-    }
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var packetsIterator = tile.packetsIterator;
-    while (position < dataLength) {
-      var packet = packetsIterator.nextPacket();
-      if (!readBits(1)) {
-        alignToByte();
-        continue;
-      }
-      var layerNumber = packet.layerNumber;
-      var queue = [];
-      for (var i = 0, ii = packet.codeblocks.length; i < ii; i++) {
-        var codeblock = packet.codeblocks[i];
-        var precinct = codeblock.precinct;
-        var codeblockColumn = codeblock.cbx - precinct.cbxMin;
-        var codeblockRow = codeblock.cby - precinct.cbyMin;
-        var codeblockIncluded = false;
-        var firstTimeInclusion = false;
-        if ('included' in codeblock) {
-          codeblockIncluded = !!readBits(1);
-        } else {
-          // reading inclusion tree
-          var precinct = codeblock.precinct;
-          var inclusionTree, zeroBitPlanesTree;
-          if ('inclusionTree' in precinct) {
-            inclusionTree = precinct.inclusionTree;
-          } else {
-            // building inclusion and zero bit-planes trees
-            var width = precinct.cbxMax - precinct.cbxMin + 1;
-            var height = precinct.cbyMax - precinct.cbyMin + 1;
-            inclusionTree = new InclusionTree(width, height, layerNumber);
-            zeroBitPlanesTree = new TagTree(width, height);
-            precinct.inclusionTree = inclusionTree;
-            precinct.zeroBitPlanesTree = zeroBitPlanesTree;
-          }
-
-          if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
-            while (true) {
-              if (readBits(1)) {
-                var valueReady = !inclusionTree.nextLevel();
-                if (valueReady) {
-                  codeblock.included = true;
-                  codeblockIncluded = firstTimeInclusion = true;
-                  break;
-                }
-              } else {
-                inclusionTree.incrementValue(layerNumber);
-                break;
-              }
-            }
-          }
-        }
-        if (!codeblockIncluded)
-          continue;
-        if (firstTimeInclusion) {
-          zeroBitPlanesTree = precinct.zeroBitPlanesTree;
-          zeroBitPlanesTree.reset(codeblockColumn, codeblockRow);
-          while (true) {
-            if (readBits(1)) {
-              var valueReady = !zeroBitPlanesTree.nextLevel();
-              if (valueReady)
-                break;
-            } else
-              zeroBitPlanesTree.incrementValue();
-          }
-          codeblock.zeroBitPlanes = zeroBitPlanesTree.value;
-        }
-        var codingpasses = readCodingpasses();
-        while (readBits(1))
-          codeblock.Lblock++;
-        var codingpassesLog2 = log2(codingpasses);
-        // rounding down log2
-        var bits = ((codingpasses < (1 << codingpassesLog2)) ?
-          codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
-        var codedDataLength = readBits(bits);
-        queue.push({
-          codeblock: codeblock,
-          codingpasses: codingpasses,
-          dataLength: codedDataLength
-        });
-      }
-      alignToByte();
-      while (queue.length > 0) {
-        var packetItem = queue.shift();
-        var codeblock = packetItem.codeblock;
-        if (!('data' in codeblock))
-          codeblock.data = [];
-        codeblock.data.push({
-          data: data,
-          start: offset + position,
-          end: offset + position + packetItem.dataLength,
-          codingpasses: packetItem.codingpasses
-        });
-        position += packetItem.dataLength;
-      }
-    }
-    return position;
-  }
-  function copyCoefficients(coefficients, x0, y0, width, height,
-                            delta, mb, codeblocks, transformation) {
-    var r = 0.5; // formula (E-6)
-    for (var i = 0, ii = codeblocks.length; i < ii; ++i) {
-      var codeblock = codeblocks[i];
-      var blockWidth = codeblock.tbx1_ - codeblock.tbx0_;
-      var blockHeight = codeblock.tby1_ - codeblock.tby0_;
-      if (blockWidth == 0 || blockHeight == 0)
-        continue;
-      if (!('data' in codeblock))
-        continue;
-
-      var bitModel, currentCodingpassType;
-      bitModel = new BitModel(blockWidth, blockHeight, codeblock.subbandType,
-        codeblock.zeroBitPlanes);
-      currentCodingpassType = 2; // first bit plane starts from cleanup
-
-      // collect data
-      var data = codeblock.data, totalLength = 0, codingpasses = 0;
-      for (var q = 0, qq = data.length; q < qq; q++) {
-        var dataItem = data[q];
-        totalLength += dataItem.end - dataItem.start;
-        codingpasses += dataItem.codingpasses;
-      }
-      var encodedData = new Uint8Array(totalLength), k = 0;
-      for (var q = 0, qq = data.length; q < qq; q++) {
-        var dataItem = data[q];
-        var chunk = dataItem.data.subarray(dataItem.start, dataItem.end);
-        encodedData.set(chunk, k);
-        k += chunk.length;
-      }
-      // decoding the item
-      var decoder = new ArithmeticDecoder(encodedData, 0, totalLength);
-      bitModel.setDecoder(decoder);
-
-      for (var q = 0; q < codingpasses; q++) {
-        switch (currentCodingpassType) {
-          case 0:
-            bitModel.runSignificancePropogationPass();
-            break;
-          case 1:
-            bitModel.runMagnitudeRefinementPass();
-            break;
-          case 2:
-            bitModel.runCleanupPass();
-            break;
-        }
-        currentCodingpassType = (currentCodingpassType + 1) % 3;
-      }
-
-      var offset = (codeblock.tbx0_ - x0) + (codeblock.tby0_ - y0) * width;
-      var position = 0;
-      for (var j = 0; j < blockHeight; j++) {
-        for (var k = 0; k < blockWidth; k++) {
-          var n = (bitModel.coefficentsSign[position] ? -1 : 1) *
-            bitModel.coefficentsMagnitude[position];
-          var nb = bitModel.bitsDecoded[position], correction;
-          if (transformation == 0 || mb > nb) {
-            // use r only if transformation is irreversible or
-            // not all bitplanes were decoded for reversible transformation
-            n += n < 0 ? n - r : n > 0 ? n + r : 0;
-            correction = 1 << (mb - nb);
-          } else
-            correction = 1;
-          coefficients[offset++] = n * correction * delta;
-          position++;
-        }
-        offset += width - blockWidth;
-      }
-    }
-  }
-  function transformTile(context, tile, c) {
-    var component = tile.components[c];
-    var codingStyleParameters = component.codingStyleParameters;
-    var quantizationParameters = component.quantizationParameters;
-    var decompositionLevelsCount =
-      codingStyleParameters.decompositionLevelsCount;
-    var spqcds = quantizationParameters.SPqcds;
-    var scalarExpounded = quantizationParameters.scalarExpounded;
-    var guardBits = quantizationParameters.guardBits;
-    var transformation = codingStyleParameters.transformation;
-    var precision = context.components[c].precision;
-
-    var subbandCoefficients = [];
-    var k = 0, b = 0;
-    for (var i = 0; i <= decompositionLevelsCount; i++) {
-      var resolution = component.resolutions[i];
-
-      for (var j = 0, jj = resolution.subbands.length; j < jj; j++) {
-        var mu, epsilon;
-        if (!scalarExpounded) {
-          // formula E-5
-          mu = spqcds[0].mu;
-          epsilon = spqcds[0].epsilon + (i > 0 ? 1 - i : 0);
-        } else {
-          mu = spqcds[b].mu;
-          epsilon = spqcds[b].epsilon;
-        }
-
-        var subband = resolution.subbands[j];
-        var width = subband.tbx1 - subband.tbx0;
-        var height = subband.tby1 - subband.tby0;
-        var gainLog2 = SubbandsGainLog2[subband.type];
-
-        // calulate quantization coefficient (Section E.1.1.1)
-        var delta = Math.pow(2, (precision + gainLog2) - epsilon) *
-          (1 + mu / 2048);
-        var mb = (guardBits + epsilon - 1);
-
-        var coefficients = new Float32Array(width * height);
-        copyCoefficients(coefficients, subband.tbx0, subband.tby0,
-          width, height, delta, mb, subband.codeblocks, transformation);
-
-        subbandCoefficients.push({
-          width: width,
-          height: height,
-          items: coefficients
-        });
-
-        b++;
-      }
-    }
-
-    var transformation = codingStyleParameters.transformation;
-    var transform = transformation == 0 ? new IrreversibleTransform() :
-      new ReversibleTransform();
-    var result = transform.calculate(subbandCoefficients,
-      component.tcx0, component.tcy0);
-    return {
-      left: component.tcx0,
-      top: component.tcy0,
-      width: result.width,
-      height: result.height,
-      items: result.items
-    };
-  }
-  function transformComponents(context) {
-    var siz = context.SIZ;
-    var components = context.components;
-    var componentsCount = siz.Csiz;
-    var resultImages = [];
-    for (var i = 0, ii = context.tiles.length; i < ii; i++) {
-      var tile = context.tiles[i];
-      var result = [];
-      for (var c = 0; c < componentsCount; c++) {
-        var image = transformTile(context, tile, c);
-        result.push(image);
-      }
-
-      // Section G.2.2 Inverse multi component transform
-      if (tile.codingStyleDefaultParameters.multipleComponentTransform) {
-        var y0items = result[0].items;
-        var y1items = result[1].items;
-        var y2items = result[2].items;
-        for (var j = 0, jj = y0items.length; j < jj; j++) {
-          var y0 = y0items[j], y1 = y1items[j], y2 = y2items[j];
-          var i1 = y0 - ((y2 + y1) >> 2);
-          y1items[j] = i1;
-          y0items[j] = y2 + i1;
-          y2items[j] = y1 + i1;
-        }
-      }
-
-      // Section G.1 DC level shifting to unsigned component values
-      for (var c = 0; c < componentsCount; c++) {
-        var component = components[c];
-        if (component.isSigned)
-          continue;
-
-        var offset = 1 << (component.precision - 1);
-        var tileImage = result[c];
-        var items = tileImage.items;
-        for (var j = 0, jj = items.length; j < jj; j++)
-          items[j] += offset;
-      }
-
-      // To simplify things: shift and clamp output to 8 bit unsigned
-      for (var c = 0; c < componentsCount; c++) {
-        var component = components[c];
-        var offset = component.isSigned ? 128 : 0;
-        var shift = component.precision - 8;
-        var tileImage = result[c];
-        var items = tileImage.items;
-        var data = new Uint8Array(items.length);
-        for (var j = 0, jj = items.length; j < jj; j++) {
-          var value = (items[j] >> shift) + offset;
-          data[j] = value < 0 ? 0 : value > 255 ? 255 : value;
-        }
-        result[c].items = data;
-      }
-
-      resultImages.push(result);
-    }
-    return resultImages;
-  }
-  function initializeTile(context, tileIndex) {
-    var siz = context.SIZ;
-    var componentsCount = siz.Csiz;
-    var tile = context.tiles[tileIndex];
-    var resultTiles = [];
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var qcdOrQcc = c in context.currentTile.QCC ?
-        context.currentTile.QCC[c] : context.currentTile.QCD;
-      component.quantizationParameters = qcdOrQcc;
-      var codOrCoc = c in context.currentTile.COC ?
-        context.currentTile.COC[c] : context.currentTile.COD;
-      component.codingStyleParameters = codOrCoc;
-    }
-    tile.codingStyleDefaultParameters = context.currentTile.COD;
-  }
-
-  // Section B.10.2 Tag trees
-  var TagTree = (function TagTreeClosure() {
-    function TagTree(width, height) {
-      var levelsLength = log2(Math.max(width, height)) + 1;
-      this.levels = [];
-      for (var i = 0; i < levelsLength; i++) {
-        var level = {
-          width: width,
-          height: height,
-          items: []
-        };
-        this.levels.push(level);
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-    TagTree.prototype = {
-      reset: function TagTree_reset(i, j) {
-        var currentLevel = 0, value = 0;
-        while (currentLevel < this.levels.length) {
-          var level = this.levels[currentLevel];
-          var index = i + j * level.width;
-          if (index in level.items) {
-            value = level.items[index];
-            break;
-          }
-          level.index = index;
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-        currentLevel--;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        this.currentLevel = currentLevel;
-        delete this.value;
-      },
-      incrementValue: function TagTree_incrementValue() {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index]++;
-      },
-      nextLevel: function TagTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        currentLevel--;
-        if (currentLevel < 0) {
-          this.value = value;
-          return false;
-        }
-
-        this.currentLevel = currentLevel;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return TagTree;
-  })();
-
-  var InclusionTree = (function InclusionTreeClosure() {
-    function InclusionTree(width, height,  defaultValue) {
-      var levelsLength = log2(Math.max(width, height)) + 1;
-      this.levels = [];
-      for (var i = 0; i < levelsLength; i++) {
-        var items = new Uint8Array(width * height);
-        for (var j = 0, jj = items.length; j < jj; j++)
-          items[j] = defaultValue;
-
-        var level = {
-          width: width,
-          height: height,
-          items: items
-        };
-        this.levels.push(level);
-
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-    InclusionTree.prototype = {
-      reset: function InclusionTree_reset(i, j, stopValue) {
-        var currentLevel = 0;
-        while (currentLevel < this.levels.length) {
-          var level = this.levels[currentLevel];
-          var index = i + j * level.width;
-          level.index = index;
-          var value = level.items[index];
-
-          if (value == 0xFF)
-            break;
-
-          if (value > stopValue) {
-            this.currentLevel = currentLevel;
-            // already know about this one, propagating the value to top levels
-            this.propagateValues();
-            return false;
-          }
-
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-        this.currentLevel = currentLevel - 1;
-        return true;
-      },
-      incrementValue: function InclusionTree_incrementValue(stopValue) {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index] = stopValue + 1;
-        this.propagateValues();
-      },
-      propagateValues: function InclusionTree_propagateValues() {
-        var levelIndex = this.currentLevel;
-        var level = this.levels[levelIndex];
-        var currentValue = level.items[level.index];
-        while (--levelIndex >= 0) {
-          var level = this.levels[levelIndex];
-          level.items[level.index] = currentValue;
-        }
-      },
-      nextLevel: function InclusionTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        level.items[level.index] = 0xFF;
-        currentLevel--;
-        if (currentLevel < 0)
-          return false;
-
-        this.currentLevel = currentLevel;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return InclusionTree;
-  })();
-
-  // Implements C.3. Arithmetic decoding procedures
-  var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
-    var QeTable = [
-      {qe: 0x5601, nmps: 1, nlps: 1, switchFlag: 1},
-      {qe: 0x3401, nmps: 2, nlps: 6, switchFlag: 0},
-      {qe: 0x1801, nmps: 3, nlps: 9, switchFlag: 0},
-      {qe: 0x0AC1, nmps: 4, nlps: 12, switchFlag: 0},
-      {qe: 0x0521, nmps: 5, nlps: 29, switchFlag: 0},
-      {qe: 0x0221, nmps: 38, nlps: 33, switchFlag: 0},
-      {qe: 0x5601, nmps: 7, nlps: 6, switchFlag: 1},
-      {qe: 0x5401, nmps: 8, nlps: 14, switchFlag: 0},
-      {qe: 0x4801, nmps: 9, nlps: 14, switchFlag: 0},
-      {qe: 0x3801, nmps: 10, nlps: 14, switchFlag: 0},
-      {qe: 0x3001, nmps: 11, nlps: 17, switchFlag: 0},
-      {qe: 0x2401, nmps: 12, nlps: 18, switchFlag: 0},
-      {qe: 0x1C01, nmps: 13, nlps: 20, switchFlag: 0},
-      {qe: 0x1601, nmps: 29, nlps: 21, switchFlag: 0},
-      {qe: 0x5601, nmps: 15, nlps: 14, switchFlag: 1},
-      {qe: 0x5401, nmps: 16, nlps: 14, switchFlag: 0},
-      {qe: 0x5101, nmps: 17, nlps: 15, switchFlag: 0},
-      {qe: 0x4801, nmps: 18, nlps: 16, switchFlag: 0},
-      {qe: 0x3801, nmps: 19, nlps: 17, switchFlag: 0},
-      {qe: 0x3401, nmps: 20, nlps: 18, switchFlag: 0},
-      {qe: 0x3001, nmps: 21, nlps: 19, switchFlag: 0},
-      {qe: 0x2801, nmps: 22, nlps: 19, switchFlag: 0},
-      {qe: 0x2401, nmps: 23, nlps: 20, switchFlag: 0},
-      {qe: 0x2201, nmps: 24, nlps: 21, switchFlag: 0},
-      {qe: 0x1C01, nmps: 25, nlps: 22, switchFlag: 0},
-      {qe: 0x1801, nmps: 26, nlps: 23, switchFlag: 0},
-      {qe: 0x1601, nmps: 27, nlps: 24, switchFlag: 0},
-      {qe: 0x1401, nmps: 28, nlps: 25, switchFlag: 0},
-      {qe: 0x1201, nmps: 29, nlps: 26, switchFlag: 0},
-      {qe: 0x1101, nmps: 30, nlps: 27, switchFlag: 0},
-      {qe: 0x0AC1, nmps: 31, nlps: 28, switchFlag: 0},
-      {qe: 0x09C1, nmps: 32, nlps: 29, switchFlag: 0},
-      {qe: 0x08A1, nmps: 33, nlps: 30, switchFlag: 0},
-      {qe: 0x0521, nmps: 34, nlps: 31, switchFlag: 0},
-      {qe: 0x0441, nmps: 35, nlps: 32, switchFlag: 0},
-      {qe: 0x02A1, nmps: 36, nlps: 33, switchFlag: 0},
-      {qe: 0x0221, nmps: 37, nlps: 34, switchFlag: 0},
-      {qe: 0x0141, nmps: 38, nlps: 35, switchFlag: 0},
-      {qe: 0x0111, nmps: 39, nlps: 36, switchFlag: 0},
-      {qe: 0x0085, nmps: 40, nlps: 37, switchFlag: 0},
-      {qe: 0x0049, nmps: 41, nlps: 38, switchFlag: 0},
-      {qe: 0x0025, nmps: 42, nlps: 39, switchFlag: 0},
-      {qe: 0x0015, nmps: 43, nlps: 40, switchFlag: 0},
-      {qe: 0x0009, nmps: 44, nlps: 41, switchFlag: 0},
-      {qe: 0x0005, nmps: 45, nlps: 42, switchFlag: 0},
-      {qe: 0x0001, nmps: 45, nlps: 43, switchFlag: 0},
-      {qe: 0x5601, nmps: 46, nlps: 46, switchFlag: 0}
-    ];
-
-    function ArithmeticDecoder(data, start, end) {
-      this.data = data;
-      this.bp = start;
-      this.dataEnd = end;
-
-      this.chigh = data[start];
-      this.clow = 0;
-
-      this.byteIn();
-
-      this.chigh = ((this.chigh << 7) & 0xFFFF) | ((this.clow >> 9) & 0x7F);
-      this.clow = (this.clow << 7) & 0xFFFF;
-      this.ct -= 7;
-      this.a = 0x8000;
-    }
-
-    ArithmeticDecoder.prototype = {
-      byteIn: function ArithmeticDecoder_byteIn() {
-        var data = this.data;
-        var bp = this.bp;
-        if (data[bp] == 0xFF) {
-          var b1 = data[bp + 1];
-          if (b1 > 0x8F) {
-            this.clow += 0xFF00;
-            this.ct = 8;
-          } else {
-            bp++;
-            this.clow += (data[bp] << 9);
-            this.ct = 7;
-            this.bp = bp;
-          }
-        } else {
-          bp++;
-          this.clow += bp < this.dataEnd ? (data[bp] << 8) : 0xFF00;
-          this.ct = 8;
-          this.bp = bp;
-        }
-        if (this.clow > 0xFFFF) {
-          this.chigh += (this.clow >> 16);
-          this.clow &= 0xFFFF;
-        }
-      },
-      readBit: function ArithmeticDecoder_readBit(cx) {
-        var qeIcx = QeTable[cx.index].qe;
-        this.a -= qeIcx;
-
-        if (this.chigh < qeIcx) {
-          var d = this.exchangeLps(cx);
-          this.renormD();
-          return d;
-        } else {
-          this.chigh -= qeIcx;
-          if ((this.a & 0x8000) == 0) {
-            var d = this.exchangeMps(cx);
-            this.renormD();
-            return d;
-          } else {
-            return cx.mps;
-          }
-        }
-      },
-      renormD: function ArithmeticDecoder_renormD() {
-        do {
-          if (this.ct == 0)
-            this.byteIn();
-
-          this.a <<= 1;
-          this.chigh = ((this.chigh << 1) & 0xFFFF) | ((this.clow >> 15) & 1);
-          this.clow = (this.clow << 1) & 0xFFFF;
-          this.ct--;
-        } while ((this.a & 0x8000) == 0);
-      },
-      exchangeMps: function ArithmeticDecoder_exchangeMps(cx) {
-        var d;
-        var qeTableIcx = QeTable[cx.index];
-        if (this.a < qeTableIcx.qe) {
-          d = 1 - cx.mps;
-
-          if (qeTableIcx.switchFlag == 1) {
-            cx.mps = 1 - cx.mps;
-          }
-          cx.index = qeTableIcx.nlps;
-        } else {
-          d = cx.mps;
-          cx.index = qeTableIcx.nmps;
-        }
-        return d;
-      },
-      exchangeLps: function ArithmeticDecoder_exchangeLps(cx) {
-        var d;
-        var qeTableIcx = QeTable[cx.index];
-        if (this.a < qeTableIcx.qe) {
-          this.a = qeTableIcx.qe;
-          d = cx.mps;
-          cx.index = qeTableIcx.nmps;
-        } else {
-          this.a = qeTableIcx.qe;
-          d = 1 - cx.mps;
-
-          if (qeTableIcx.switchFlag == 1) {
-            cx.mps = 1 - cx.mps;
-          }
-          cx.index = qeTableIcx.nlps;
-        }
-        return d;
-      }
-    };
-
-    return ArithmeticDecoder;
-  })();
-
-  // Section D. Coefficient bit modeling
-  var BitModel = (function BitModelClosure() {
-    // Table D-1
-    // The index is binary presentation: 0dddvvhh, ddd - sum of Di (0..4),
-    // vv - sum of Vi (0..2), and hh - sum of Hi (0..2)
-    var LLAndLHContextsLabel = new Uint8Array([
-      0, 5, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 1, 6, 8, 0, 3, 7, 8, 0, 4,
-      7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6,
-      8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8
-    ]);
-    var HLContextLabel = new Uint8Array([
-      0, 3, 4, 0, 5, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 1, 3, 4, 0, 6, 7, 7, 0, 8,
-      8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3,
-      4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8
-    ]);
-    var HHContextLabel = new Uint8Array([
-      0, 1, 2, 0, 1, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 3, 4, 5, 0, 4, 5, 5, 0, 5,
-      5, 5, 0, 0, 0, 0, 0, 6, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 0, 8, 8,
-      8, 0, 8, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8
-    ]);
-
-    // Table D-2
-    function calcSignContribution(significance0, sign0, significance1, sign1) {
-      if (significance1) {
-        if (!sign1)
-          return significance0 ? (!sign0 ? 1 : 0) : 1;
-        else
-          return significance0 ? (!sign0 ? 0 : -1) : -1;
-      } else
-        return significance0 ? (!sign0 ? 1 : -1) : 0;
-    }
-    // Table D-3
-    var SignContextLabels = [
-      {contextLabel: 13, xorBit: 0},
-      {contextLabel: 12, xorBit: 0},
-      {contextLabel: 11, xorBit: 0},
-      {contextLabel: 10, xorBit: 0},
-      {contextLabel: 9, xorBit: 0},
-      {contextLabel: 10, xorBit: 1},
-      {contextLabel: 11, xorBit: 1},
-      {contextLabel: 12, xorBit: 1},
-      {contextLabel: 13, xorBit: 1}
-    ];
-
-    function BitModel(width, height, subband, zeroBitPlanes) {
-      this.width = width;
-      this.height = height;
-
-      this.contextLabelTable = subband == 'HH' ? HHContextLabel :
-        subband == 'HL' ? HLContextLabel : LLAndLHContextsLabel;
-
-      var coefficientCount = width * height;
-
-      // coefficients outside the encoding region treated as insignificant
-      // add border state cells for significanceState
-      this.neighborsSignificance = new Uint8Array(coefficientCount);
-      this.coefficentsSign = new Uint8Array(coefficientCount);
-      this.coefficentsMagnitude = new Uint32Array(coefficientCount);
-      this.processingFlags = new Uint8Array(coefficientCount);
-
-      var bitsDecoded = new Uint8Array(this.width * this.height);
-      for (var i = 0, ii = bitsDecoded.length; i < ii; i++)
-        bitsDecoded[i] = zeroBitPlanes;
-      this.bitsDecoded = bitsDecoded;
-
-      this.reset();
-    }
-
-    BitModel.prototype = {
-      setDecoder: function BitModel_setDecoder(decoder) {
-        this.decoder = decoder;
-      },
-      reset: function BitModel_reset() {
-        this.uniformContext = {index: 46, mps: 0};
-        this.runLengthContext = {index: 3, mps: 0};
-        this.contexts = [];
-        this.contexts.push({index: 4, mps: 0});
-        for (var i = 1; i <= 16; i++)
-          this.contexts.push({index: 0, mps: 0});
-      },
-      setNeighborsSignificance:
-        function BitModel_setNeighborsSignificance(row, column) {
-        var neighborsSignificance = this.neighborsSignificance;
-        var width = this.width, height = this.height;
-        var index = row * width + column;
-        if (row > 0) {
-          if (column > 0)
-            neighborsSignificance[index - width - 1] += 0x10;
-          if (column + 1 < width)
-            neighborsSignificance[index - width + 1] += 0x10;
-          neighborsSignificance[index - width] += 0x04;
-        }
-        if (row + 1 < height) {
-          if (column > 0)
-            neighborsSignificance[index + width - 1] += 0x10;
-          if (column + 1 < width)
-            neighborsSignificance[index + width + 1] += 0x10;
-          neighborsSignificance[index + width] += 0x04;
-        }
-        if (column > 0)
-          neighborsSignificance[index - 1] += 0x01;
-        if (column + 1 < width)
-          neighborsSignificance[index + 1] += 0x01;
-        neighborsSignificance[index] |= 0x80;
-      },
-      runSignificancePropogationPass:
-        function BitModel_runSignificancePropogationPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contextLabels = this.contextLabels;
-        var neighborsSignificance = this.neighborsSignificance;
-        var processingFlags = this.processingFlags;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        // clear processed flag
-        var processedInverseMask = ~1;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        for (var q = 0, qq = width * height; q < qq; q++)
-          processingFlags[q] &= processedInverseMask;
-
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            var index = i0 * width + j;
-            for (var i1 = 0; i1 < 4; i1++, index += width) {
-              var i = i0 + i1;
-              if (i >= height)
-                break;
-
-              if (coefficentsMagnitude[index] || !neighborsSignificance[index])
-                continue;
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              var cx = contexts[contextLabel];
-              var decision = decoder.readBit(cx);
-              if (decision) {
-                var sign = this.decodeSignBit(i, j);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      decodeSignBit: function BitModel_decodeSignBit(row, column) {
-        var width = this.width, height = this.height;
-        var index = row * width + column;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var horizontalContribution = calcSignContribution(
-          column > 0 && coefficentsMagnitude[index - 1],
-          coefficentsSign[index - 1],
-          column + 1 < width && coefficentsMagnitude[index + 1],
-          coefficentsSign[index + 1]);
-        var verticalContribution = calcSignContribution(
-          row > 0 && coefficentsMagnitude[index - width],
-          coefficentsSign[index - width],
-          row + 1 < height && coefficentsMagnitude[index + width],
-          coefficentsSign[index + width]);
-
-        var contextLabelAndXor = SignContextLabels[
-          3 * (1 - horizontalContribution) + (1 - verticalContribution)];
-        var contextLabel = contextLabelAndXor.contextLabel;
-        var cx = this.contexts[contextLabel];
-        var decoded = this.decoder.readBit(cx);
-        return decoded ^ contextLabelAndXor.xorBit;
-      },
-      runMagnitudeRefinementPass:
-        function BitModel_runMagnitudeRefinementPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var neighborsSignificance = this.neighborsSignificance;
-        var contexts = this.contexts;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            for (var i1 = 0; i1 < 4; i1++) {
-              var i = i0 + i1;
-              if (i >= height)
-                break;
-              var index = i * width + j;
-
-              // significant but not those that have just become
-              if (!coefficentsMagnitude[index] ||
-                (processingFlags[index] & processedMask) != 0)
-                continue;
-
-              var contextLabel = 16;
-              if ((processingFlags[index] &
-                firstMagnitudeBitMask) != 0) {
-                processingFlags[i * width + j] ^= firstMagnitudeBitMask;
-                // first refinement
-                var significance = neighborsSignificance[index];
-                var sumOfSignificance = (significance & 3) +
-                  ((significance >> 2) & 3) + ((significance >> 4) & 7);
-                contextLabel = sumOfSignificance >= 1 ? 15 : 14;
-              }
-
-              var cx = contexts[contextLabel];
-              var bit = decoder.readBit(cx);
-              coefficentsMagnitude[index] =
-                (coefficentsMagnitude[index] << 1) | bit;
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      runCleanupPass: function BitModel_runCleanupPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var neighborsSignificance = this.neighborsSignificance;
-        var significanceState = this.significanceState;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        var oneRowDown = width;
-        var twoRowsDown = width * 2;
-        var threeRowsDown = width * 3;
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            var index0 = i0 * width + j;
-            // using the property: labels[neighborsSignificance[index]] == 0
-            // when neighborsSignificance[index] == 0
-            var allEmpty = i0 + 3 < height &&
-              processingFlags[index0] == 0 &&
-              processingFlags[index0 + oneRowDown] == 0 &&
-              processingFlags[index0 + twoRowsDown] == 0 &&
-              processingFlags[index0 + threeRowsDown] == 0 &&
-              neighborsSignificance[index0] == 0 &&
-              neighborsSignificance[index0 + oneRowDown] == 0 &&
-              neighborsSignificance[index0 + twoRowsDown] == 0 &&
-              neighborsSignificance[index0 + threeRowsDown] == 0;
-            var i1 = 0, index = index0;
-            var cx, i;
-            if (allEmpty) {
-              cx = this.runLengthContext;
-              var hasSignificantCoefficent = decoder.readBit(cx);
-              if (!hasSignificantCoefficent) {
-                bitsDecoded[index0]++;
-                bitsDecoded[index0 + oneRowDown]++;
-                bitsDecoded[index0 + twoRowsDown]++;
-                bitsDecoded[index0 + threeRowsDown]++;
-                continue; // next column
-              }
-              cx = this.uniformContext;
-              i1 = (decoder.readBit(cx) << 1) | decoder.readBit(cx);
-              i = i0 + i1;
-              index += i1 * width;
-
-              var sign = this.decodeSignBit(i, j);
-              coefficentsSign[index] = sign;
-              coefficentsMagnitude[index] = 1;
-              this.setNeighborsSignificance(i, j);
-              processingFlags[index] |= firstMagnitudeBitMask;
-
-              index = index0;
-              for (var i2 = i0; i2 <= i; i2++, index += width)
-                bitsDecoded[index]++;
-
-              i1++;
-            }
-            for (; i1 < 4; i1++, index += width) {
-              i = i0 + i1;
-              if (i >= height)
-                break;
-
-              if (coefficentsMagnitude[index] ||
-                (processingFlags[index] & processedMask) != 0)
-                continue;
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              cx = contexts[contextLabel];
-              var decision = decoder.readBit(cx);
-              if (decision == 1) {
-                var sign = this.decodeSignBit(i, j);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-              bitsDecoded[index]++;
-            }
-          }
-        }
-      }
-    };
-
-    return BitModel;
-  })();
-
-  // Section F, Discrete wavelet transofrmation
-  var Transform = (function TransformClosure() {
-    function Transform() {
-    }
-    Transform.prototype.calculate =
-      function transformCalculate(subbands, u0, v0) {
-      var ll = subbands[0];
-      for (var i = 1, ii = subbands.length, j = 1; i < ii; i += 3, j++) {
-        ll = this.iterate(ll, subbands[i], subbands[i + 1],
-                          subbands[i + 2], u0, v0);
-      }
-      return ll;
-    };
-    Transform.prototype.iterate = function Transform_iterate(ll, hl, lh, hh,
-                                                            u0, v0) {
-      var llWidth = ll.width, llHeight = ll.height, llItems = ll.items;
-      var hlWidth = hl.width, hlHeight = hl.height, hlItems = hl.items;
-      var lhWidth = lh.width, lhHeight = lh.height, lhItems = lh.items;
-      var hhWidth = hh.width, hhHeight = hh.height, hhItems = hh.items;
-
-      // Section F.3.3 interleave
-      var width = llWidth + hlWidth;
-      var height = llHeight + lhHeight;
-      var items = new Float32Array(width * height);
-      for (var i = 0, ii = llHeight; i < ii; i++) {
-        var k = i * llWidth, l = i * 2 * width;
-        for (var j = 0, jj = llWidth; j < jj; j++, k++, l += 2)
-          items[l] = llItems[k];
-      }
-      for (var i = 0, ii = hlHeight; i < ii; i++) {
-        var k = i * hlWidth, l = i * 2 * width + 1;
-        for (var j = 0, jj = hlWidth; j < jj; j++, k++, l += 2)
-          items[l] = hlItems[k];
-      }
-      for (var i = 0, ii = lhHeight; i < ii; i++) {
-        var k = i * lhWidth, l = (i * 2 + 1) * width;
-        for (var j = 0, jj = lhWidth; j < jj; j++, k++, l += 2)
-          items[l] = lhItems[k];
-      }
-      for (var i = 0, ii = hhHeight; i < ii; i++) {
-        var k = i * hhWidth, l = (i * 2 + 1) * width + 1;
-        for (var j = 0, jj = hhWidth; j < jj; j++, k++, l += 2)
-          items[l] = hhItems[k];
-      }
-
-      var bufferPadding = 4;
-      var bufferLength = new Float32Array(Math.max(width, height) +
-        2 * bufferPadding);
-      var buffer = new Float32Array(bufferLength);
-      var bufferOut = new Float32Array(bufferLength);
-
-      // Section F.3.4 HOR_SR
-      for (var v = 0; v < height; v++) {
-        if (width == 1) {
-          // if width = 1, when u0 even keep items as is, when odd divide by 2
-          if ((u0 % 1) != 0) {
-            items[v * width] /= 2;
-          }
-          continue;
-        }
-
-        var k = v * width;
-        var l = bufferPadding;
-        for (var u = 0; u < width; u++, k++, l++)
-          buffer[l] = items[k];
-
-        // Section F.3.7 extending... using max extension of 4
-        var i1 = bufferPadding - 1, j1 = bufferPadding + 1;
-        var i2 = bufferPadding + width - 2, j2 = bufferPadding + width;
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-
-        this.filter(buffer, bufferPadding, width, u0, bufferOut);
-
-        k = v * width;
-        l = bufferPadding;
-        for (var u = 0; u < width; u++, k++, l++)
-          items[k] = bufferOut[l];
-      }
-
-      // Section F.3.5 VER_SR
-      for (var u = 0; u < width; u++) {
-        if (height == 1) {
-          // if height = 1, when v0 even keep items as is, when odd divide by 2
-          if ((v0 % 1) != 0) {
-            items[u] /= 2;
-          }
-          continue;
-        }
-
-        var k = u;
-        var l = bufferPadding;
-        for (var v = 0; v < height; v++, k += width, l++)
-          buffer[l] = items[k];
-
-        // Section F.3.7 extending... using max extension of 4
-        var i1 = bufferPadding - 1, j1 = bufferPadding + 1;
-        var i2 = bufferPadding + height - 2, j2 = bufferPadding + height;
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-
-        this.filter(buffer, bufferPadding, height, v0, bufferOut);
-
-        k = u;
-        l = bufferPadding;
-        for (var v = 0; v < height; v++, k += width, l++)
-          items[k] = bufferOut[l];
-      }
-      return {
-        width: width,
-        height: height,
-        items: items
-      };
-    };
-    return Transform;
-  })();
-
-  // Section 3.8.2 Irreversible 9-7 filter
-  var IrreversibleTransform = (function IrreversibleTransformClosure() {
-    function IrreversibleTransform() {
-      Transform.call(this);
-    }
-
-    IrreversibleTransform.prototype = Object.create(Transform.prototype);
-    IrreversibleTransform.prototype.filter =
-      function irreversibleTransformFilter(y, offset, length, i0, x) {
-      var i0_ = Math.floor(i0 / 2);
-      var i1_ = Math.floor((i0 + length) / 2);
-      var offset_ = offset - (i0 % 1);
-
-      var alpha = -1.586134342059924;
-      var beta = -0.052980118572961;
-      var gamma = 0.882911075530934;
-      var delta = 0.443506852043971;
-      var K = 1.230174104914001;
-      var K_ = 1 / K;
-
-      // step 1
-      var j = offset_ - 2;
-      for (var n = i0_ - 1, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] = K * y[j];
-
-      // step 2
-      var j = offset_ - 3;
-      for (var n = i0_ - 2, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] = K_ * y[j];
-
-      // step 3
-      var j = offset_ - 2;
-      for (var n = i0_ - 1, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] -= delta * (x[j - 1] + x[j + 1]);
-
-      // step 4
-      var j = offset_ - 1;
-      for (var n = i0_ - 1, nn = i1_ + 1; n < nn; n++, j += 2)
-        x[j] -= gamma * (x[j - 1] + x[j + 1]);
-
-      // step 5
-      var j = offset_;
-      for (var n = i0_, nn = i1_ + 1; n < nn; n++, j += 2)
-        x[j] -= beta * (x[j - 1] + x[j + 1]);
-
-      // step 6
-      var j = offset_ + 1;
-      for (var n = i0_, nn = i1_; n < nn; n++, j += 2)
-        x[j] -= alpha * (x[j - 1] + x[j + 1]);
-    };
-
-    return IrreversibleTransform;
-  })();
-
-  // Section 3.8.1 Reversible 5-3 filter
-  var ReversibleTransform = (function ReversibleTransformClosure() {
-    function ReversibleTransform() {
-      Transform.call(this);
-    }
-
-    ReversibleTransform.prototype = Object.create(Transform.prototype);
-    ReversibleTransform.prototype.filter =
-      function reversibleTransformFilter(y, offset, length, i0, x) {
-      var i0_ = Math.floor(i0 / 2);
-      var i1_ = Math.floor((i0 + length) / 2);
-      var offset_ = offset - (i0 % 1);
-
-      for (var n = i0_, nn = i1_ + 1, j = offset_; n < nn; n++, j += 2)
-        x[j] = y[j] - Math.floor((y[j - 1] + y[j + 1] + 2) / 4);
-
-      for (var n = i0_, nn = i1_, j = offset_ + 1; n < nn; n++, j += 2)
-        x[j] = y[j] + Math.floor((x[j - 1] + x[j + 1]) / 2);
-    };
-
-    return ReversibleTransform;
-  })();
-
-  return JpxImage;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-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',
-    'B', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'BN', 'B', 'B', 'B', 'S', 'WS', 'ON', 'ON', 'ET', 'ET', 'ET', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'ON', 'CS', 'ON', 'CS', 'ON', 'EN', 'EN', 'EN',
-    'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'ON', 'ON', 'ON', 'ON', 'ON',
-    'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'ON', 'ON', 'ON', 'ON', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'B', 'BN',
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'CS', 'ON', 'ET', 'ET', 'ET', 'ET', 'ON', 'ON', 'ON', 'ON', 'L', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'ET', 'ET', 'EN', 'EN', 'ON', 'L', 'ON', 'ON', 'ON',
-    'EN', 'L', 'ON', 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L'
-  ];
-
-  // Character types for symbols from 0600 to 06FF
-  var arabicTypes = [
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'CS', 'AL', 'ON', 'ON', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
-    'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN',
-    'AN', 'ET', 'AN', 'AN', 'AL', 'AL', 'AL', 'NSM', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
-    'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'ON', 'NSM',
-    'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL'
-  ];
-
-  function isOdd(i) {
-    return (i & 1) != 0;
-  }
-
-  function isEven(i) {
-    return (i & 1) == 0;
-  }
-
-  function findUnequal(arr, start, value) {
-    var j;
-    for (var j = start, jj = arr.length; j < jj; ++j) {
-      if (arr[j] != value)
-        return j;
-    }
-    return j;
-  }
-
-  function setValues(arr, start, end, value) {
-    for (var j = start; j < end; ++j) {
-      arr[j] = value;
-    }
-  }
-
-  function reverseValues(arr, start, end) {
-    for (var i = start, j = end - 1; i < j; ++i, --j) {
-      var temp = arr[i];
-      arr[i] = arr[j];
-      arr[j] = temp;
-    }
-  }
-
-  function mirrorGlyphs(c) {
-    /*
-     # BidiMirroring-1.txt
-     0028; 0029 # LEFT PARENTHESIS
-     0029; 0028 # RIGHT PARENTHESIS
-     003C; 003E # LESS-THAN SIGN
-     003E; 003C # GREATER-THAN SIGN
-     005B; 005D # LEFT SQUARE BRACKET
-     005D; 005B # RIGHT SQUARE BRACKET
-     007B; 007D # LEFT CURLY BRACKET
-     007D; 007B # RIGHT CURLY BRACKET
-     00AB; 00BB # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-     00BB; 00AB # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-     */
-    switch (c) {
-      case '(':
-        return ')';
-      case ')':
-        return '(';
-      case '<':
-        return '>';
-      case '>':
-        return '<';
-      case ']':
-        return '[';
-      case '[':
-        return ']';
-      case '}':
-        return '{';
-      case '{':
-        return '}';
-      case '\u00AB':
-        return '\u00BB';
-      case '\u00BB':
-        return '\u00AB';
-      default:
-        return c;
-    }
-  }
-
-  function bidi(text, startLevel) {
-    var str = text.str;
-    var strLength = str.length;
-    if (strLength == 0)
-      return str;
-
-    // get types, fill arrays
-
-    var chars = [];
-    var types = [];
-    var oldtypes = [];
-    var numBidi = 0;
-
-    for (var i = 0; i < strLength; ++i) {
-      chars[i] = str.charAt(i);
-
-      var charCode = str.charCodeAt(i);
-      var charType = 'L';
-      if (charCode <= 0x00ff)
-        charType = baseTypes[charCode];
-      else if (0x0590 <= charCode && charCode <= 0x05f4)
-        charType = 'R';
-      else if (0x0600 <= charCode && charCode <= 0x06ff)
-        charType = arabicTypes[charCode & 0xff];
-      else if (0x0700 <= charCode && charCode <= 0x08AC)
-        charType = 'AL';
-
-      if (charType == 'R' || charType == 'AL' || charType == 'AN')
-        numBidi++;
-
-      oldtypes[i] = types[i] = charType;
-    }
-
-    // detect the bidi method
-    //  if there are no rtl characters then no bidi needed
-    //  if less than 30% chars are rtl then string is primarily ltr
-    //  if more than 30% chars are rtl then string is primarily rtl
-    if (numBidi == 0) {
-      text.direction = 'ltr';
-      return str;
-    }
-
-    if (startLevel == -1) {
-      if ((strLength / numBidi) < 0.3) {
-        text.direction = 'ltr';
-        startLevel = 0;
-      } else {
-        text.direction = 'rtl';
-        startLevel = 1;
-      }
-    }
-
-    var levels = [];
-
-    for (var i = 0; i < strLength; ++i) {
-      levels[i] = startLevel;
-    }
-
-    /*
-     X1-X10: skip most of this, since we are NOT doing the embeddings.
-     */
-
-    var e = isOdd(startLevel) ? 'R' : 'L';
-    var sor = e;
-    var eor = sor;
-
-    /*
-     W1. Examine each non-spacing mark (NSM) in the level run, and change the
-     type of the NSM to the type of the previous character. If the NSM is at the
-     start of the level run, it will get the type of sor.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'NSM')
-        types[i] = lastType;
-      else
-        lastType = types[i];
-    }
-
-    /*
-     W2. Search backwards from each instance of a European number until the
-     first strong type (R, L, AL, or sor) is found.  If an AL is found, change
-     the type of the European number to Arabic number.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'EN')
-        types[i] = (lastType == 'AL') ? 'AN' : 'EN';
-      else if (t == 'R' || t == 'L' || t == 'AL')
-        lastType = t;
-    }
-
-    /*
-     W3. Change all ALs to R.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'AL')
-        types[i] = 'R';
-    }
-
-    /*
-     W4. A single European separator between two European numbers changes to a
-     European number. A single common separator between two numbers of the same
-     type changes to that type:
-     */
-
-    for (var i = 1; i < strLength - 1; ++i) {
-      if (types[i] == 'ES' && types[i - 1] == 'EN' && types[i + 1] == 'EN')
-        types[i] = 'EN';
-      if (types[i] == 'CS' && (types[i - 1] == 'EN' || types[i - 1] == 'AN') &&
-          types[i + 1] == types[i - 1])
-        types[i] = types[i - 1];
-    }
-
-    /*
-     W5. A sequence of European terminators adjacent to European numbers changes
-     to all European numbers:
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'EN') {
-        // do before
-        for (var j = i - 1; j >= 0; --j) {
-          if (types[j] != 'ET')
-            break;
-          types[j] = 'EN';
-        }
-        // do after
-        for (var j = i + 1; j < strLength; --j) {
-          if (types[j] != 'ET')
-            break;
-          types[j] = 'EN';
-        }
-      }
-    }
-
-    /*
-     W6. Otherwise, separators and terminators change to Other Neutral:
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'WS' || t == 'ES' || t == 'ET' || t == 'CS')
-        types[i] = 'ON';
-    }
-
-    /*
-     W7. Search backwards from each instance of a European number until the
-     first strong type (R, L, or sor) is found. If an L is found,  then change
-     the type of the European number to L.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'EN')
-        types[i] = (lastType == 'L') ? 'L' : 'EN';
-      else if (t == 'R' || t == 'L')
-        lastType = t;
-    }
-
-    /*
-     N1. A sequence of neutrals takes the direction of the surrounding strong
-     text if the text on both sides has the same direction. European and Arabic
-     numbers are treated as though they were R. Start-of-level-run (sor) and
-     end-of-level-run (eor) are used at level run boundaries.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'ON') {
-        var end = findUnequal(types, i + 1, 'ON');
-        var before = sor;
-        if (i > 0)
-          before = types[i - 1];
-        var after = eor;
-        if (end + 1 < strLength)
-          after = types[end + 1];
-        if (before != 'L')
-          before = 'R';
-        if (after != 'L')
-          after = 'R';
-        if (before == after)
-          setValues(types, i, end, before);
-        i = end - 1; // reset to end (-1 so next iteration is ok)
-      }
-    }
-
-    /*
-     N2. Any remaining neutrals take the embedding direction.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'ON')
-        types[i] = e;
-    }
-
-    /*
-     I1. For all characters with an even (left-to-right) embedding direction,
-     those of type R go up one level and those of type AN or EN go up two
-     levels.
-     I2. For all characters with an odd (right-to-left) embedding direction,
-     those of type L, EN or AN go up one level.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (isEven(levels[i])) {
-        if (t == 'R') {
-          levels[i] += 1;
-        } else if (t == 'AN' || t == 'EN') {
-          levels[i] += 2;
-        }
-      } else { // isOdd, so
-        if (t == 'L' || t == 'AN' || t == 'EN') {
-          levels[i] += 1;
-        }
-      }
-    }
-
-    /*
-     L1. On each line, reset the embedding level of the following characters to
-     the paragraph embedding level:
-
-     segment separators,
-     paragraph separators,
-     any sequence of whitespace characters preceding a segment separator or
-     paragraph separator, and any sequence of white space characters at the end
-     of the line.
-     */
-
-    // don't bother as text is only single line
-
-    /*
-     L2. From the highest level found in the text to the lowest odd level on
-     each line, reverse any contiguous sequence of characters that are at that
-     level or higher.
-     */
-
-    // find highest level & lowest odd level
-
-    var highestLevel = -1;
-    var lowestOddLevel = 99;
-    for (var i = 0, ii = levels.length; i < ii; ++i) {
-      var level = levels[i];
-      if (highestLevel < level)
-        highestLevel = level;
-      if (lowestOddLevel > level && isOdd(level))
-        lowestOddLevel = level;
-    }
-
-    // now reverse between those limits
-
-    for (var level = highestLevel; level >= lowestOddLevel; --level) {
-      // find segments to reverse
-      var start = -1;
-      for (var i = 0, ii = levels.length; i < ii; ++i) {
-        if (levels[i] < level) {
-          if (start >= 0) {
-            reverseValues(chars, start, i);
-            start = -1;
-          }
-        } else if (start < 0) {
-          start = i;
-        }
-      }
-      if (start >= 0) {
-        reverseValues(chars, start, levels.length);
-      }
-    }
-
-    /*
-     L3. Combining marks applied to a right-to-left base character will at this
-     point precede their base character. If the rendering engine expects them to
-     follow the base characters in the final display process, then the ordering
-     of the marks and the base character must be reversed.
-     */
-
-    // don't bother for now
-
-    /*
-     L4. A character that possesses the mirrored property as specified by
-     Section 4.7, Mirrored, must be depicted by a mirrored glyph if the resolved
-     directionality of that character is R.
-     */
-
-    // don't mirror as characters are already mirrored in the pdf
-
-    // Finally, return string
-
-    var result = '';
-    for (var i = 0, ii = chars.length; i < ii; ++i) {
-      var ch = chars[i];
-      if (ch != '<' && ch != '>')
-        result += ch;
-    }
-    return result;
-  }
-
-  return bidi;
-})();
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-var Metadata = PDFJS.Metadata = (function MetadataClosure() {
-  function Metadata(meta) {
-    if (typeof meta === 'string') {
-      var parser = new DOMParser();
-      meta = parser.parseFromString(meta, 'application/xml');
-    } else if (!(meta instanceof Document)) {
-      error('Metadata: Invalid metadata object');
-    }
-
-    this.metaDocument = meta;
-    this.metadata = {};
-    this.parse();
-  }
-
-  Metadata.prototype = {
-    parse: function Metadata_parse() {
-      var doc = this.metaDocument;
-      var rdf = doc.documentElement;
-
-      if (rdf.nodeName.toLowerCase() !== 'rdf:rdf') { // Wrapped in <xmpmeta>
-        rdf = rdf.firstChild;
-        while (rdf && rdf.nodeName.toLowerCase() !== 'rdf:rdf')
-          rdf = rdf.nextSibling;
-      }
-
-      var nodeName = (rdf) ? rdf.nodeName.toLowerCase() : null;
-      if (!rdf || nodeName !== 'rdf:rdf' || !rdf.hasChildNodes())
-        return;
-
-      var childNodes = rdf.childNodes, desc, namespace, entries, entry;
-
-      for (var i = 0, length = childNodes.length; i < length; i++) {
-        desc = childNodes[i];
-        if (desc.nodeName.toLowerCase() !== 'rdf:description')
-          continue;
-
-        entries = [];
-        for (var ii = 0, iLength = desc.childNodes.length; ii < iLength; ii++) {
-          if (desc.childNodes[ii].nodeName.toLowerCase() !== '#text')
-            entries.push(desc.childNodes[ii]);
-        }
-
-        for (ii = 0, iLength = entries.length; ii < iLength; ii++) {
-          var entry = entries[ii];
-          var name = entry.nodeName.toLowerCase();
-          this.metadata[name] = entry.textContent.trim();
-        }
-      }
-    },
-
-    get: function Metadata_get(name) {
-      return this.metadata[name] || null;
-    },
-
-    has: function Metadata_has(name) {
-      return typeof this.metadata[name] !== 'undefined';
-    }
-  };
-
-  return Metadata;
-})();
-
-}).call((typeof window === 'undefined') ? this : window);
--->
-</script>
-<script type="text/javascript">
-  // This specifies the location of the pdf.js file.
-  PDFJS.isFirefoxExtension = true;
-  PDFJS.workerSrc = 'none';
-</script>
diff --git a/browser/extensions/pdfjs/content/web/viewer.css b/browser/extensions/pdfjs/content/web/viewer.css
index b5e1d8d73bb9..d0a7be9a0203 100644
--- a/browser/extensions/pdfjs/content/web/viewer.css
+++ b/browser/extensions/pdfjs/content/web/viewer.css
@@ -1,179 +1,671 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-body {
-  background-color: #929292;
-  font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
-  margin: 0px;
-  padding: 0px;
+* {
+  padding: 0;
+  margin: 0;
 }
 
+html {
+  height: 100%;
+}
+
+body {
+  height: 100%;
+  background-color: #404040;
+  background-image: url(images/texture.png);
+  font-family: Segoe UI, Verdana, sans-serif;
+}
+
+.hidden {
+  display: none;
+}
 [hidden] {
   display: none !important;
 }
 
-/* === Toolbar === */
-#controls {
-  background-color: #eee;
-  background: -o-linear-gradient(bottom,#eee 0%,#fff 100%);
-  background: -moz-linear-gradient(center bottom, #eee 0%, #fff 100%);
-  background: -webkit-gradient(linear, left bottom, left top, color-stop(0.0, #ddd), color-stop(1.0, #fff));
-  border-bottom: 1px solid #666;
-  padding: 3px;
-  position: fixed;
-  left: 0px;
-  top: 0px;
-  height: 24px;
+/* outer/inner center provides horizontal center */
+html[dir='ltr'] .outerCenter {
+  float: right;
+  position: relative;
+  right: 50%;
+}
+html[dir='rtl'] .outerCenter {
+  float: left;
+  position: relative;
+  left: 50%;
+}
+html[dir='ltr'] .innerCenter {
+  float: right;
+  position: relative;
+  right: -50%;
+}
+html[dir='rtl'] .innerCenter {
+  float: left;
+  position: relative;
+  left: -50%;
+}
+
+#outerContainer {
   width: 100%;
-  z-index: 1;
-  white-space:nowrap;
-  overflow: hidden;
-}
-
-.separator {
-  display: inline;
-  border-left: 1px solid #d3d3d3;
-  border-right: 1px solid #fff;
-  height: 16px;
-  width:0px;
-  margin: 4px;
-}
-
-#controls > a > img {
-    margin: 4px;
-    height: 16px;
-}
-
-#controls > button {
-  line-height: 16px;
-}
-
-#controls > button > img {
-  width: 16px;
-  height: 16px;
-}
-
-#controls > button[disabled] > img {
-  opacity: 0.5;
-}
-
-#pageNumber {
-  text-align: right;
-}
-
-#fileInput {
-  line-height: 16px;
-}
-
-/* === Sidebar === */
-#sidebar {
-  position: fixed;
-  width: 350px;
-  top: 62px;
-  bottom: 18px;
-  left: -290px;
-  transition: left 0.25s ease-in-out 1s;
-  -o-transition: left 0.25s ease-in-out 1s;
-  -moz-transition: left 0.25s ease-in-out 1s;
-  -webkit-transition: left 0.25s ease-in-out 1s;
-  z-index: 1;
-}
-
-#sidebar:hover,
-#sidebar.pinned {
-  left: 0px;
-  transition: left 0.25s ease-in-out 0s;
-  -o-transition: left 0.25s ease-in-out 0s;
-  -moz-transition: left 0.25s ease-in-out 0s;
-  -webkit-transition: left 0.25s ease-in-out 0s;
-}
-
-#pinIcon {
-  position: absolute;
-  top: 4px;
-  right: 55px;
-  width: 15px;
-  height: 15px;
-  background: center no-repeat;
-  background-image: url('images/pin-up.svg');
-  background-size: 15px 15px;
-}
-
-#pinIcon:hover {
-  background-color: rgba(255,255,255,0.35);
-}
-
-#sidebar.pinned #pinIcon {
-  background-image: url('images/pin-down.svg');
-  background-size: 15px 15px;
-}
-
-#sidebarBox {
-  background-color: rgba(0, 0, 0, 0.7);
-  width: 300px;
   height: 100%;
-  border-top-right-radius: 8px;
-  border-bottom-right-radius: 8px;
-  -moz-border-radius-topright: 8px;
-  -moz-border-radius-bottomright: 8px;
-  -webkit-border-top-right-radius: 8px;
-  -webkit-border-bottom-right-radius: 8px;
-  box-shadow: 0px 2px 8px #000;
-  -moz-box-shadow: 0px 2px 8px #000;
-  -webkit-box-shadow: 0px 2px 8px #000;
 }
 
-#sidebarScrollView {
+#sidebarContainer {
   position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 200px;
+  visibility: hidden;
+  -moz-transition-duration: 200ms;
+  -moz-transition-timing-function: ease;
+  -webkit-transition-duration: 200ms;
+  -webkit-transition-timing-function: ease;
+}
+html[dir='ltr'] #sidebarContainer {
+  -moz-transition-property: left;
+  -webkit-transition-property: left;
+  left: -200px;
+}
+html[dir='rtl'] #sidebarContainer {
+  -moz-transition-property: right;
+  -webkit-transition-property: right;
+  right: -200px;
+}
+
+#outerContainer.sidebarMoving > #sidebarContainer,
+#outerContainer.sidebarOpen > #sidebarContainer {
+  visibility: visible;
+}
+html[dir='ltr'] #outerContainer.sidebarOpen > #sidebarContainer {
+  left: 0px;
+}
+html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer {
+  right: 0px;
+}
+
+#mainContainer {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  -moz-transition-duration: 200ms;
+  -moz-transition-timing-function: ease;
+  -webkit-transition-duration: 200ms;
+  -webkit-transition-timing-function: ease;
+}
+html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
+  -moz-transition-property: left;
+  -webkit-transition-property: left;
+  left: 200px;
+}
+html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
+  -moz-transition-property: right;
+  -webkit-transition-property: right;
+  right: 200px;
+}
+
+#sidebarContent {
+  top: 32px;
+  bottom: 0;
+  overflow: auto;
+  position: absolute;
+  width: 200px;
+
+  background-color: hsla(0,0%,0%,.1);
+  box-shadow: inset -1px 0 0 hsla(0,0%,0%,.25);
+}
+html[dir='ltr'] #sidebarContent {
+  left: 0;
+}
+html[dir='rtl'] #sidebarContent {
+  right: 0;
+}
+
+#viewerContainer {
+  overflow: auto;
+  box-shadow: inset 1px 0 0 hsla(0,0%,100%,.05);
+  padding-top: 30px;
+  position: absolute;
+  top: 32px;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.toolbar {
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 32px;
+  z-index: 9999;
+  cursor: default;
+}
+
+#toolbarContainer {
+  width: 100%;
+}
+
+#toolbarSidebar {
+  width: 200px;
+  height: 32px;
+  background-image: url(images/texture.png),
+                    -moz-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+  background-image: url(images/texture.png),
+                    -webkit-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
+  box-shadow: inset -2px 0 0 hsla(0,0%,100%,.08),
+              inset 0 1px 1px hsla(0,0%,0%,.15),
+              inset 0 -1px 0 hsla(0,0%,100%,.05),
+              0 1px 0 hsla(0,0%,0%,.15),
+              0 1px 1px hsla(0,0%,0%,.1);
+}
+
+#toolbarViewer {
+  position: relative;
+  height: 32px;
+  background-image: url(images/texture.png),
+                    -moz-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  background-image: url(images/texture.png),
+                    -webkit-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
+  border-left: 1px solid hsla(0,0%,0%,.5);
+  box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
+              inset 0 1px 1px hsla(0,0%,0%,.15),
+              inset 0 -1px 0 hsla(0,0%,100%,.05),
+              0 1px 0 hsla(0,0%,0%,.15),
+              0 1px 1px hsla(0,0%,0%,.1);
+}
+html[dir='ltr'] #toolbarViewerLeft {
+  margin-left: -1px;
+}
+html[dir='rtl'] #toolbarViewerRight {
+  margin-left: -1px;
+}
+
+
+html[dir='ltr'] #toolbarViewerLeft,
+html[dir='rtl'] #toolbarViewerRight {
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+html[dir='ltr'] #toolbarViewerRight,
+html[dir='rtl'] #toolbarViewerLeft {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+html[dir='ltr'] #toolbarViewerLeft > *,
+html[dir='ltr'] #toolbarViewerMiddle > *,
+html[dir='ltr'] #toolbarViewerRight > * {
+  float: left;
+}
+html[dir='rtl'] #toolbarViewerLeft > *,
+html[dir='rtl'] #toolbarViewerMiddle > *,
+html[dir='rtl'] #toolbarViewerRight > * {
+  float: right;
+}
+
+html[dir='ltr'] .splitToolbarButton {
+  margin: 3px 2px 4px 0;
+  display: inline-block;
+}
+html[dir='rtl'] .splitToolbarButton {
+  margin: 3px 0 4px 2px;
+  display: inline-block;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton {
+  border-radius: 0;
+  float: left;
+}
+html[dir='rtl'] .splitToolbarButton > .toolbarButton {
+  border-radius: 0;
+  float: right;
+}
+
+.toolbarButton {
+  border: 0 none;
+  background-color: rgba(0, 0, 0, 0);
+  width: 32px;
+  height: 25px;
+}
+
+.toolbarButton > span {
+  display: inline-block;
+  width: 0;
+  height: 0;
   overflow: hidden;
-  overflow-y: auto;
-  top: 20px;
-  bottom: 10px;
-  left: 10px;
-  width: 280px;
+}
+
+.toolbarButton[disabled] {
+  opacity: .5;
+}
+
+.splitToolbarButton:hover > .toolbarButton,
+.splitToolbarButton:focus > .toolbarButton,
+.splitToolbarButton.toggled > .toolbarButton {
+  background-color: hsla(0,0%,0%,.12);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 150ms;
+  -webkit-transition-timing-function: ease;
+}
+.splitToolbarButton > .toolbarButton:hover,
+.splitToolbarButton > .toolbarButton:focus,
+.dropdownToolbarButton:hover {
+  background-color: hsla(0,0%,0%,.2);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 0 1px hsla(0,0%,0%,.05);
+  z-index: 199;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton:first-child,
+html[dir='rtl'] .splitToolbarButton > .toolbarButton:last-child {
+  position: relative;
+  margin: 0;
+  margin-right: -1px;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+  border-right-color: transparent;
+}
+html[dir='ltr'] .splitToolbarButton > .toolbarButton:last-child,
+html[dir='rtl'] .splitToolbarButton > .toolbarButton:first-child {
+  position: relative;
+  margin: 0;
+  margin-left: -1px;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-left-color: transparent;
+}
+.splitToolbarButtonSeparator {
+  padding: 8px 0;
+  width: 1px;
+  background-color: hsla(0,0%,00%,.5);
+  z-index: 99;
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+  display: inline-block;
+  margin: 5px 0;
+}
+html[dir='ltr'] .splitToolbarButtonSeparator {
+  float:left;
+}
+html[dir='rtl'] .splitToolbarButtonSeparator {
+  float:right;
+}
+.splitToolbarButton:hover > .splitToolbarButtonSeparator,
+.splitToolbarButton.toggled > .splitToolbarButtonSeparator {
+  padding: 12px 0;
+  margin: 0;
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.03);
+  -moz-transition-property: padding;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: ease;
+  -webkit-transition-property: padding;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: ease;
+}
+
+.toolbarButton,
+.dropdownToolbarButton {
+  min-width: 16px;
+  padding: 2px 6px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  color: hsl(0,0%,95%);
+  font-size: 12px;
+  line-height: 14px;
+  -moz-user-select:none;
+  -webkit-user-select:none;
+  cursor: default;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 150ms;
+  -webkit-transition-timing-function: ease;
+}
+
+html[dir='ltr'] .toolbarButton,
+html[dir='ltr'] .dropdownToolbarButton {
+  margin: 3px 2px 4px 0;
+}
+html[dir='rtl'] .toolbarButton,
+html[dir='rtl'] .dropdownToolbarButton {
+  margin: 3px 0 4px 2px;
+}
+
+.toolbarButton:hover,
+.toolbarButton:focus,
+.dropdownToolbarButton {
+  background-color: hsla(0,0%,0%,.12);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.15) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.toolbarButton:hover:active,
+.dropdownToolbarButton:hover:active {
+  background-color: hsla(0,0%,0%,.2);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: linear;
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: linear;
+}
+
+.toolbarButton.toggled,
+.splitToolbarButton.toggled > .toolbarButton.toggled {
+  background-color: hsla(0,0%,0%,.3);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 10ms;
+  -moz-transition-timing-function: linear;
+  -webkit-transition-property: background-color, border-color, box-shadow;
+  -webkit-transition-duration: 10ms;
+  -webkit-transition-timing-function: linear;
+}
+
+.toolbarButton.toggled:hover:active,
+.splitToolbarButton.toggled > .toolbarButton.toggled:hover:active {
+  background-color: hsla(0,0%,0%,.4);
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.5) hsla(0,0%,0%,.55);
+  box-shadow: 0 1px 1px hsla(0,0%,0%,.2) inset,
+              0 0 1px hsla(0,0%,0%,.3) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+}
+
+.dropdownToolbarButton {
+  min-width: 120px;
+  max-width: 120px;
+  padding: 3px 2px 2px;
+  overflow: hidden;
+  background: url(images/toolbarButton-menuArrows.png) no-repeat;
+}
+html[dir='ltr'] .dropdownToolbarButton {
+  background-position: 95%;
+}
+html[dir='rtl'] .dropdownToolbarButton {
+  background-position: 5%;
+}
+
+.dropdownToolbarButton > select {
+  -moz-appearance: none; /* in the future this might matter, see bugzilla bug #649849 */
+  -webkit-appearance: none;
+  min-width: 140px;
+  font-size: 12px;
+  color: hsl(0,0%,95%);
+  margin:0;
+  padding:0;
+  border:none;
+  background: transparent;
+}
+
+.dropdownToolbarButton > select > option {
+  background: hsl(0,0%,24%);
+}
+
+#customScaleOption {
+  display: none;
+}
+
+#pageWidthOption {
+  border-bottom: 1px rgba(255, 255, 255, .5) solid;
+}
+
+html[dir='ltr'] .splitToolbarButton:first-child,
+html[dir='ltr'] .toolbarButton:first-child,
+html[dir='rtl'] .splitToolbarButton:last-child,
+html[dir='rtl'] .toolbarButton:last-child {
+  margin-left: 4px;
+}
+html[dir='ltr'] .splitToolbarButton:last-child,
+html[dir='ltr'] .toolbarButton:last-child,
+html[dir='rtl'] .splitToolbarButton:first-child,
+html[dir='rtl'] .toolbarButton:first-child {
+  margin-right: 4px;
+}
+
+.toolbarButtonSpacer {
+  width: 30px;
+  display: inline-block;
+  height: 1px;
+}
+
+.toolbarButtonFlexibleSpacer {
+  -moz-box-flex: 1;
+  -webkit-box-flex: 1;
+  min-width: 30px;
+}
+
+.toolbarButton#sidebarToggle::before {
+  display: inline-block;
+  content: url(images/toolbarButton-sidebarToggle.png);
+}
+    
+html[dir='ltr'] .toolbarButton.pageUp::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageUp.png);
+}
+
+html[dir='rtl'] .toolbarButton.pageUp::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageUp-rtl.png);
+}
+    
+html[dir='ltr'] .toolbarButton.pageDown::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageDown.png);
+}
+
+html[dir='rtl'] .toolbarButton.pageDown::before {
+  display: inline-block;
+  content: url(images/toolbarButton-pageDown-rtl.png);
+}
+
+.toolbarButton.zoomOut::before {
+  display: inline-block;
+  content: url(images/toolbarButton-zoomOut.png);
+}
+    
+.toolbarButton.zoomIn::before {
+  display: inline-block;
+  content: url(images/toolbarButton-zoomIn.png);
+}
+
+.toolbarButton.print::before {
+  display: inline-block;
+  content: url(images/toolbarButton-print.png);
+}
+
+.toolbarButton.openFile::before {
+  display: inline-block;
+  content: url(images/toolbarButton-openFile.png);
+}
+
+.toolbarButton.download::before {
+  display: inline-block;
+  content: url(images/toolbarButton-download.png);
+}
+
+.toolbarButton.bookmark {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  margin-top: 3px;
+  padding-top: 4px;
+}
+
+.toolbarButton.bookmark::before {
+  content: url(images/toolbarButton-bookmark.png);
+}
+    
+#viewThumbnail.toolbarButton::before {
+  display: inline-block;
+  content: url(images/toolbarButton-viewThumbnail.png);
+}
+    
+#viewOutline.toolbarButton::before {
+  display: inline-block;
+  content: url(images/toolbarButton-viewOutline.png);
+}
+
+.toolbarField {
+  min-width: 16px;
+  width: 32px;
+  padding: 3px 6px;
+  margin: 4px 0 4px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  background-color: hsla(0,0%,100%,.09);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  border: 1px solid hsla(0,0%,0%,.35);
+  border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
+  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset,
+              0 1px 0 hsla(0,0%,100%,.05);
+  color: hsl(0,0%,95%);
+  font-size: 12px;
+  line-height: 14px;
+  text-align: right;
+  outline-style: none;
+  -moz-transition-property: background-color, border-color, box-shadow;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: ease;
+}
+
+.toolbarField.pageNumber {
+  width: 40px;
+}
+
+.toolbarField.pageNumber::-webkit-inner-spin-button,
+.toolbarField.pageNumber::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+
+.toolbarField:hover {
+  background-color: hsla(0,0%,100%,.11);
+  border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.43) hsla(0,0%,0%,.45);
+}
+
+.toolbarField:focus {
+  background-color: hsla(0,0%,100%,.15);
+  border-color: hsla(204,100%,65%,.8) hsla(204,100%,65%,.85) hsla(204,100%,65%,.9);
+}
+
+.toolbarLabel {
+  min-width: 16px;
+  padding: 3px 6px 3px 2px;
+  margin: 4px 2px 4px 0;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  color: hsl(0,0%,85%);
+  font-size: 12px;
+  line-height: 14px;
+  text-align: left;
+  -moz-user-select:none;
+  -webkit-user-select:none;
+  cursor: default;
+}
+
+#thumbnailView {
+  position: fixed;
+  width: 120px;
+  top: 33px;
+  bottom: 0;
+  padding: 10px 40px 0;
+  overflow: auto;
 }
 
 .thumbnail {
-  width: 134px;
-  height: 134px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left:auto;
-  margin-right:auto;
-  line-height: 134px;
-  text-align: center;
-  overflow: hidden;
+  margin-bottom: 15px;
+  float: left;
+  width: 114px;
+  height: 142px;
 }
 
 .thumbnail:not([data-loaded]) {
-  background-color: gray;
+  border: 1px dashed rgba(255, 255, 255, 0.5);
 }
 
-.thumbnail > canvas {
-  vertical-align: middle;
-  display: inline-block;
+.thumbnailImage {
+  -moz-transition-duration: 150ms;
+  border: 1px solid transparent;
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.5), 0 2px 8px rgba(0, 0, 0, 0.3);
+  opacity: 0.8;
+  z-index: 99;
 }
 
-#outlineScrollView {
-  position: absolute;
-  background-color: #fff;
-  overflow: auto;
-  top: 20px;
-  bottom: 10px;
-  left: 10px;
-  width: 280px;
+.thumbnailSelectionRing {
+  border-radius: 2px;
+  padding: 7px;
+  -moz-transition-duration: 150ms;
+}
+    
+a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage,
+.thumbnail:hover > .thumbnailSelectionRing > .thumbnailImage {
+  opacity: .9;
+}
+
+a:focus > .thumbnail > .thumbnailSelectionRing,
+.thumbnail:hover > .thumbnailSelectionRing {
+  background-color: hsla(0,0%,100%,.15);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.2) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,.9);
+}
+
+.thumbnail.selected > .thumbnailSelectionRing > .thumbnailImage {
+  box-shadow: 0 0 0 1px hsla(0,0%,0%,.5);
+  opacity: 1;
+}
+
+.thumbnail.selected > .thumbnailSelectionRing {
+  background-color: hsla(0,0%,100%,.3);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,1);
 }
 
 #outlineView {
-  padding-top: 4px;
-  padding-bottom: 100px;
-  padding-left: 6px;
-  padding-right: 6px;
-  font-size: smaller;
+  position: fixed;
+  width: 192px;
+  top: 33px;
+  bottom: 0;
+  padding: 4px 4px 0;
+  overflow: auto;
+  -moz-user-select:none;
+  -webkit-user-select:none;
 }
 
 .outlineItem > .outlineItems {
@@ -182,50 +674,54 @@ body {
 
 .outlineItem > a {
   text-decoration: none;
-  color: black;
+  display: block;
+  height: 20px;
+  padding: 2px 0 0 10px;
+  margin-bottom: 1px;
+  border-radius: 2px;
+  color: hsla(0,0%,100%,.8);
+  font-size: 13px;
+  line-height: 15px;
+  -moz-user-select:none;
+  cursor: default;
+  white-space: nowrap;
 }
 
 .outlineItem > a:hover {
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
+  background-color: hsla(0,0%,100%,.02);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.2) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,.9);
 }
 
-#sidebarControls {
-  position:absolute;
-  width: 120px;
-  height: 32px;
-  left: 15px;
-  bottom: 35px;
+.outlineItem.selected {
+  background-color: hsla(0,0%,100%,.08);
+  background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+  background-clip: padding-box;
+  box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset,
+              0 0 1px hsla(0,0%,100%,.1) inset,
+              0 0 1px hsla(0,0%,0%,.2);
+  color: hsla(0,0%,100%,1);
 }
 
-#sidebarControls > button {
-  box-shadow: 0px 4px 10px #000;
-  -moz-box-shadow: 0px 4px 10px #000;
-  -webkit-box-shadow: 0px 4px 10px #000;
+.noOutline {
+  font-size: 12px;
+  color: hsla(0,0%,100%,.8);
+  font-style: italic;
 }
 
-#sidebarControls > button > img {
-  width: 32px;
-  height: 32px;
-}
 
-#sidebarControls > button[disabled] > img {
-  opacity: 0.5;
-}
 
-#sidebarControls > button[data-selected] {
-  box-shadow: 0px 4px 10px #ff0;
-  -moz-box-shadow: 0px 4px 10px #ff0;
-  -webkit-box-shadow: 0px 4px 10px #ff0;
-}
-
-/* === Content view === */
 canvas {
   margin: auto;
   display: block;
 }
 
 .page {
+  direction: ltr;
   width: 816px;
   height: 1056px;
   margin: 10px auto;
@@ -260,6 +756,50 @@ canvas {
   background: url('images/loading-icon.gif') center no-repeat;
 }
 
+#loadingBox {
+  margin: 100px 0;
+  text-align: center;
+  color: #ddd;
+  font-size: 14px;
+}
+
+#loadingBar {
+  background-color: #333;
+  display: inline-block;
+  border: 1px solid black;
+  clear: both;
+  margin: 0px;
+  margin-top: 5px;
+  line-height: 0;
+  border-radius: 4px;
+  width: 200px;
+  height: 25px;
+}
+
+#loadingBar .progress {
+  display: inline-block;
+  float: left;
+
+  background: #666;
+  background: -moz-linear-gradient(top, #999 0%, #666 50%, #999 100%);
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#999), color-stop(50%,#666), color-stop(100%,#999));
+  background: -webkit-linear-gradient(top, #999 0%,#666 50%,#999 100%);
+  background: -o-linear-gradient(top, #999 0%,#666 50%,#999 100%);
+  background: -ms-linear-gradient(top, #999 0%,#666 50%,#999 100%);
+  background: linear-gradient(top, #999 0%,#666 50%,#999 100%);    
+
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
+
+  width: 0%;
+  height: 100%;
+}
+
+#loadingBar .progress.full {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
 .textLayer {
   position: absolute;
   left: 0;
@@ -276,6 +816,12 @@ canvas {
   line-height:1.3;
 }
 
+/* TODO: file FF bug to support ::-moz-selection:window-inactive
+   so we can override the opaque grey background when the window is inactive;
+   see https://bugzilla.mozilla.org/show_bug.cgi?id=706209 */
+::selection { background:rgba(0,0,255,0.3); }
+::-moz-selection { background:rgba(0,0,255,0.3); }
+
 .annotComment > div {
   position: absolute;
 }
@@ -305,39 +851,13 @@ canvas {
   margin: 0px;
 }
 
-/* TODO: file FF bug to support ::-moz-selection:window-inactive
-   so we can override the opaque grey background when the window is inactive;
-   see https://bugzilla.mozilla.org/show_bug.cgi?id=706209 */
-::selection { background:rgba(0,0,255,0.3); }
-::-moz-selection { background:rgba(0,0,255,0.3); }
-
-#viewer {
-  margin: 44px 0px 0px;
-  padding: 8px 0px;
-}
-
-#sidebarView canvas:hover {
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
-  -moz-box-shadow: 0px 2px 10px #ff0;
-  -webkit-box-shadow: 0px 2px 10px #ff0;
-}
-
-#pageWidthOption {
-  border-top: 1px solid black;
-}
-
-#customScaleOption {
-  display: none;
-}
-
 #errorWrapper {
   background: none repeat scroll 0 0 #FF5555;
   color: white;
   left: 0;
-  position: fixed;
+  position: absolute;
   right: 0;
-  top: 30px;
+  top: 32px;
   z-index: 1000;
   padding: 3px;
   font-size: 0.8em;
@@ -363,116 +883,105 @@ canvas {
   clear: both;
 }
 
-/* === Printed media overrides === */
-@media print {
-  #sidebar {
-    display: none;
-  }
-
-  #controls {
-    display: none;
-  }
-
-  #viewer {
-    margin: 0;
-    padding: 0;
-  }
-
-  .page {
-    display: none;
-    margin: 0;
-  }
-
-  .page canvas {
-    box-shadow: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-  }
-
-  .page[data-loaded] {
-    display: block;
-    page-break-after: always;
-  }
-}
-
-#loadingBox {
-  margin: 100px 0;
-  text-align: center;
-}
-
-#loadingBar {
-  background-color: #333;
-  display: inline-block;
-  border: 1px solid black;
-  clear: both;
-  margin:0px;
-  line-height: 0;
-  border-radius: 4px;
-  width: 15em;
-  height: 1.5em;
-}
-
-#loadingBar .progress {
-  background-color: green;
-  display: inline-block;
-  float: left;
-
-  background: #b4e391;
-  background: -moz-linear-gradient(top, #b4e391 0%, #61c419 50%, #b4e391 100%);
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b4e391), color-stop(50%,#61c419), color-stop(100%,#b4e391));
-  background: -webkit-linear-gradient(top, #b4e391 0%,#61c419 50%,#b4e391 100%);
-  background: -o-linear-gradient(top, #b4e391 0%,#61c419 50%,#b4e391 100%);
-  background: -ms-linear-gradient(top, #b4e391 0%,#61c419 50%,#b4e391 100%);
-  background: linear-gradient(top, #b4e391 0%,#61c419 50%,#b4e391 100%);    
-
-  border-top-left-radius: 3px;
-  border-bottom-left-radius: 3px;
-
-  width: 0%;
-  height: 100%;
+.fileInput {
+  background: white;
+  color: black;
+  margin-top: 5px;
 }
 
 #PDFBug {
-  font-size: 10px;
+  background: none repeat scroll 0 0 white;
+  border: 1px solid #666666;
   position: fixed;
-  top: 35px;
-  bottom: 5px;
-  right: 2px;
-  width: 300px;
-  background: white;
-  border: 1px solid #666;
-  padding: 0;
-}
-#PDFBug .controls {
-  border-bottom: 1px solid #666;
-  padding: 3px;
-  background: -moz-linear-gradient(center bottom, #eee 0%, #fff 100%);
-}
-#PDFBug .panels {
-  overflow: auto;
-  position: absolute;
-  top: 27px;
-  left: 0;
+  top: 32px;
   right: 0;
   bottom: 0;
+  font-size: 10px;
+  padding: 0;
+  width: 300px;
+}
+#PDFBug .controls {
+    background:#EEEEEE;
+    border-bottom: 1px solid #666666;
+    padding: 3px;
+}
+#PDFBug .panels {
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  position: absolute;
+  right: 0;
+  top: 27px;
 }
 #PDFBug button.active {
   font-weight: bold;
 }
 .debuggerShowText {
-  background: yellow;
+  background: none repeat scroll 0 0 yellow;
   color: blue;
   opacity: 0.3;
 }
 .debuggerHideText:hover {
-  background: yellow;
+  background: none repeat scroll 0 0 yellow;
   opacity: 0.3;
 }
 #PDFBug .stats {
+  font-family: courier;
   font-size: 10px;
   white-space: pre;
-  font-family: courier;
 }
 #PDFBug .stats .title {
-  font-weight: bold;
+    font-weight: bold;
+}
+#PDFBug table {
+  font-size: 10px;
+}
+
+@media all and (max-width: 950px) {
+  html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
+  html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter {
+    float: left;
+    left: 180px;
+  }
+  html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
+  html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter {
+    float: right;
+    right: 180px;
+  }
+}
+
+@media all and (max-width: 770px) {
+  #sidebarContainer {
+    top: 33px;
+    z-index: 100;
+  }
+  #sidebarContent {
+    top: 32px;
+    background-color: hsla(0,0%,0%,.7);
+  }
+  #thumbnailView, #outlineView {
+    top: 66px;
+  }
+
+  html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
+    left: 0px;
+  }
+  html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
+    right: 0px;
+  }
+
+  html[dir='ltr'] .outerCenter {
+    float: left;
+    left: 180px;
+  }
+  html[dir='rtl'] .outerCenter {
+    float: right;
+    right: 180px;
+  }
+}
+
+@media all and (max-width: 600px) {
+  #toolbarViewerRight {
+    display: none;
+  }
 }
diff --git a/browser/extensions/pdfjs/content/web/viewer.html b/browser/extensions/pdfjs/content/web/viewer.html
index bf66ca4f1d8a..dddf01f49268 100644
--- a/browser/extensions/pdfjs/content/web/viewer.html
+++ b/browser/extensions/pdfjs/content/web/viewer.html
@@ -1,15 +1,18 @@
 <!DOCTYPE html>
-<html>
-    <head>
-        <title>Simple pdf.js page viewer</title>
-        <!-- PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION -->
+<html dir="ltr">
+  <head>
+    <meta charset="utf-8">
+    <title>PDF.js viewer</title>
 <!-- This snippet is used in firefox extension, see Makefile -->
 <base href="resource://pdf.js/web/" />
+<script type="application/l10n">
+<!-- PDFJSSCRIPT_LOCALE_DATA -->
+</script>
+<script type="text/javascript" src="l10n.js"></script>
 <script type="text/javascript" id="PDFJS_SCRIPT_TAG">
 <!--
 // pdf.js is inlined here because resource:// urls won't work
 // for loading workers.
-/* PDFJSSCRIPT_INCLUDE_BUNDLE */
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -19,10 +22,9 @@ var PDFJS = {};
   // Use strict in our context only - users might not want it
   'use strict';
 
-  PDFJS.build = '2e92c0e';
+  PDFJS.build = '5ac7513';
 
   // Files are inserted below - see Makefile
-  /* PDFJSSCRIPT_INCLUDE_ALL */
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -56,7 +58,19 @@ function getPdf(arg, callback) {
     params = { url: arg };
 
   var xhr = new XMLHttpRequest();
+
   xhr.open('GET', params.url);
+
+  var headers = params.headers;
+  if (headers) {
+    for (var property in headers) {
+      if (typeof headers[property] === 'undefined')
+        continue;
+
+      xhr.setRequestHeader(property, params.headers[property]);
+    }
+  }
+
   xhr.mozResponseType = xhr.responseType = 'arraybuffer';
   var protocol = params.url.indexOf(':') < 0 ? window.location.protocol :
     params.url.substring(0, params.url.indexOf(':') + 1);
@@ -88,8 +102,6 @@ var Page = (function PageClosure() {
   function Page(xref, pageNumber, pageDict, ref) {
     this.pageNumber = pageNumber;
     this.pageDict = pageDict;
-    this.stats = new StatTimer();
-    this.stats.enabled = !!globalScope.PDFJS.enableStats;
     this.xref = xref;
     this.ref = ref;
 
@@ -125,18 +137,10 @@ var Page = (function PageClosure() {
       return shadow(this, 'mediaBox', obj);
     },
     get view() {
-      var cropBox = this.inheritPageProp('CropBox');
-      var view = {
-        x: 0,
-        y: 0,
-        width: this.width,
-        height: this.height
-      };
-      if (!isArray(cropBox) || cropBox.length !== 4)
-        return shadow(this, 'view', view);
-
       var mediaBox = this.mediaBox;
-      var offsetX = mediaBox[0], offsetY = mediaBox[1];
+      var cropBox = this.inheritPageProp('CropBox');
+      if (!isArray(cropBox) || cropBox.length !== 4)
+        return shadow(this, 'view', mediaBox);
 
       // From the spec, 6th ed., p.963:
       // "The crop, bleed, trim, and art boxes should not ordinarily
@@ -144,42 +148,13 @@ var Page = (function PageClosure() {
       // effectively reduced to their intersection with the media box."
       cropBox = Util.intersect(cropBox, mediaBox);
       if (!cropBox)
-        return shadow(this, 'view', view);
+        return shadow(this, 'view', mediaBox);
 
-      var tl = this.rotatePoint(cropBox[0] - offsetX, cropBox[1] - offsetY);
-      var br = this.rotatePoint(cropBox[2] - offsetX, cropBox[3] - offsetY);
-      view.x = Math.min(tl.x, br.x);
-      view.y = Math.min(tl.y, br.y);
-      view.width = Math.abs(tl.x - br.x);
-      view.height = Math.abs(tl.y - br.y);
-
-      return shadow(this, 'view', view);
+      return shadow(this, 'view', cropBox);
     },
     get annotations() {
       return shadow(this, 'annotations', this.inheritPageProp('Annots'));
     },
-    get width() {
-      var mediaBox = this.mediaBox;
-      var rotate = this.rotate;
-      var width;
-      if (rotate == 0 || rotate == 180) {
-        width = (mediaBox[2] - mediaBox[0]);
-      } else {
-        width = (mediaBox[3] - mediaBox[1]);
-      }
-      return shadow(this, 'width', width);
-    },
-    get height() {
-      var mediaBox = this.mediaBox;
-      var rotate = this.rotate;
-      var height;
-      if (rotate == 0 || rotate == 180) {
-        height = (mediaBox[3] - mediaBox[1]);
-      } else {
-        height = (mediaBox[2] - mediaBox[0]);
-      }
-      return shadow(this, 'height', height);
-    },
     get rotate() {
       var rotate = this.inheritPageProp('Rotate') || 0;
       // Normalize rotation so it's a multiple of 90 and between 0 and 270
@@ -195,43 +170,19 @@ var Page = (function PageClosure() {
       return shadow(this, 'rotate', rotate);
     },
 
-    startRenderingFromOperatorList:
-      function Page_startRenderingFromOperatorList(operatorList, fonts) {
-      var self = this;
-      this.operatorList = operatorList;
-
-      var displayContinuation = function pageDisplayContinuation() {
-        // Always defer call to display() to work around bug in
-        // Firefox error reporting from XHR callbacks.
-        setTimeout(function pageSetTimeout() {
-          self.displayReadyPromise.resolve();
-        });
-      };
-
-      this.ensureFonts(fonts,
-        function pageStartRenderingFromOperatorListEnsureFonts() {
-          displayContinuation();
-        }
-      );
-    },
-
     getOperatorList: function Page_getOperatorList(handler, dependency) {
-      if (this.operatorList) {
-        // content was compiled
-        return this.operatorList;
-      }
-
-      this.stats.time('Build IR Queue');
-
       var xref = this.xref;
       var content = this.content;
       var resources = this.resources;
       if (isArray(content)) {
         // fetching items
+        var streams = [];
         var i, n = content.length;
         for (i = 0; i < n; ++i)
-          content[i] = xref.fetchIfRef(content[i]);
-        content = new StreamsSequenceStream(content);
+          streams.push(xref.fetchIfRef(content[i]));
+        content = new StreamsSequenceStream(streams);
+      } else if (isStream(content)) {
+        content.reset();
       } else if (!content) {
         // replacing non-existent page content with empty one
         content = new Stream(new Uint8Array(0));
@@ -240,82 +191,9 @@ var Page = (function PageClosure() {
       var pe = this.pe = new PartialEvaluator(
                                 xref, handler, 'p' + this.pageNumber + '_');
 
-      this.operatorList = pe.getOperatorList(content, resources, dependency);
-      this.stats.timeEnd('Build IR Queue');
-      return this.operatorList;
+      return pe.getOperatorList(content, resources, dependency);
     },
 
-    ensureFonts: function Page_ensureFonts(fonts, callback) {
-      this.stats.time('Font Loading');
-      // Convert the font names to the corresponding font obj.
-      for (var i = 0, ii = fonts.length; i < ii; i++) {
-        fonts[i] = this.objs.objs[fonts[i]].data;
-      }
-
-      // Load all the fonts
-      FontLoader.bind(
-        fonts,
-        function pageEnsureFontsFontObjs(fontObjs) {
-          this.stats.timeEnd('Font Loading');
-
-          callback.call(this);
-        }.bind(this)
-      );
-    },
-
-    display: function Page_display(gfx, callback) {
-      var stats = this.stats;
-      stats.time('Rendering');
-      var xref = this.xref;
-      var resources = this.resources;
-      var mediaBox = this.mediaBox;
-      assertWellFormed(isDict(resources), 'invalid page resources');
-
-      gfx.xref = xref;
-      gfx.res = resources;
-      gfx.beginDrawing({ x: mediaBox[0], y: mediaBox[1],
-            width: this.width,
-            height: this.height,
-            rotate: this.rotate });
-
-      var startIdx = 0;
-      var length = this.operatorList.fnArray.length;
-      var operatorList = this.operatorList;
-      var stepper = null;
-      if (PDFJS.pdfBug && StepperManager.enabled) {
-        stepper = StepperManager.create(this.pageNumber);
-        stepper.init(operatorList);
-        stepper.nextBreakPoint = stepper.getNextBreakPoint();
-      }
-
-      var self = this;
-      function next() {
-        startIdx =
-          gfx.executeOperatorList(operatorList, startIdx, next, stepper);
-        if (startIdx == length) {
-          gfx.endDrawing();
-          stats.timeEnd('Rendering');
-          stats.timeEnd('Overall');
-          if (callback) callback();
-        }
-      }
-      next();
-    },
-    rotatePoint: function Page_rotatePoint(x, y, reverse) {
-      var rotate = reverse ? (360 - this.rotate) : this.rotate;
-      switch (rotate) {
-        case 180:
-          return {x: this.width - x, y: y};
-        case 90:
-          return {x: this.width - y, y: this.height - x};
-        case 270:
-          return {x: y, y: x};
-        case 360:
-        case 0:
-        default:
-          return {x: x, y: this.height - y};
-      }
-    },
     getLinks: function Page_getLinks() {
       var links = [];
       var annotations = pageGetAnnotations();
@@ -349,6 +227,7 @@ var Page = (function PageClosure() {
           case 'http':
           case 'https':
           case 'ftp':
+          case 'mailto':
             return true;
           default:
             return false;
@@ -367,15 +246,10 @@ var Page = (function PageClosure() {
         if (!isName(subtype))
           continue;
         var rect = annotation.get('Rect');
-        var topLeftCorner = this.rotatePoint(rect[0], rect[1]);
-        var bottomRightCorner = this.rotatePoint(rect[2], rect[3]);
 
         var item = {};
         item.type = subtype.name;
-        item.x = Math.min(topLeftCorner.x, bottomRightCorner.x);
-        item.y = Math.min(topLeftCorner.y, bottomRightCorner.y);
-        item.width = Math.abs(topLeftCorner.x - bottomRightCorner.x);
-        item.height = Math.abs(topLeftCorner.y - bottomRightCorner.y);
+        item.rect = rect;
         switch (subtype.name) {
           case 'Link':
             var a = annotation.get('A');
@@ -449,7 +323,8 @@ var Page = (function PageClosure() {
             var title = annotation.get('T');
             item.content = stringToPDFString(content || '');
             item.title = stringToPDFString(title || '');
-            item.name = annotation.get('Name').name;
+            item.name = !annotation.has('Name') ? 'Note' :
+              annotation.get('Name').name;
             break;
           default:
             TODO('unimplemented annotation type: ' + subtype.name);
@@ -458,37 +333,6 @@ var Page = (function PageClosure() {
         items.push(item);
       }
       return items;
-    },
-    startRendering: function Page_startRendering(ctx, callback, textLayer)  {
-      var stats = this.stats;
-      stats.time('Overall');
-      // If there is no displayReadyPromise yet, then the operatorList was never
-      // requested before. Make the request and create the promise.
-      if (!this.displayReadyPromise) {
-        this.pdf.startRendering(this);
-        this.displayReadyPromise = new Promise();
-      }
-
-      // Once the operatorList and fonts are loaded, do the actual rendering.
-      this.displayReadyPromise.then(
-        function pageDisplayReadyPromise() {
-          var gfx = new CanvasGraphics(ctx, this.objs, textLayer);
-          try {
-            this.display(gfx, callback);
-          } catch (e) {
-            if (callback)
-              callback(e);
-            else
-              error(e);
-          }
-        }.bind(this),
-        function pageDisplayReadPromiseError(reason) {
-          if (callback)
-            callback(reason);
-          else
-            error(reason);
-        }
-      );
     }
   };
 
@@ -496,26 +340,26 @@ var Page = (function PageClosure() {
 })();
 
 /**
- * The `PDFDocModel` holds all the data of the PDF file. Compared to the
+ * The `PDFDocument` holds all the data of the PDF file. Compared to the
  * `PDFDoc`, this one doesn't have any job management code.
- * Right now there exists one PDFDocModel on the main thread + one object
+ * Right now there exists one PDFDocument on the main thread + one object
  * for each worker. If there is no worker support enabled, there are two
- * `PDFDocModel` objects on the main thread created.
+ * `PDFDocument` objects on the main thread created.
  */
-var PDFDocModel = (function PDFDocModelClosure() {
-  function PDFDocModel(arg, callback) {
+var PDFDocument = (function PDFDocumentClosure() {
+  function PDFDocument(arg, password) {
     if (isStream(arg))
-      init.call(this, arg);
+      init.call(this, arg, password);
     else if (isArrayBuffer(arg))
-      init.call(this, new Stream(arg));
+      init.call(this, new Stream(arg), password);
     else
-      error('PDFDocModel: Unknown argument type');
+      error('PDFDocument: Unknown argument type');
   }
 
-  function init(stream) {
+  function init(stream, password) {
     assertWellFormed(stream.length > 0, 'stream must have data');
     this.stream = stream;
-    this.setup();
+    this.setup(password);
     this.acroForm = this.catalog.catDict.get('AcroForm');
   }
 
@@ -535,7 +379,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
     return true; /* found */
   }
 
-  PDFDocModel.prototype = {
+  PDFDocument.prototype = {
     get linearization() {
       var length = this.stream.length;
       var linearization = false;
@@ -596,7 +440,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
     },
     // Find the header, remove leading garbage and setup the stream
     // starting from the header.
-    checkHeader: function PDFDocModel_checkHeader() {
+    checkHeader: function PDFDocument_checkHeader() {
       var stream = this.stream;
       stream.reset();
       if (find(stream, '%PDF-', 1024)) {
@@ -606,11 +450,12 @@ var PDFDocModel = (function PDFDocModelClosure() {
       }
       // May not be a PDF file, continue anyway.
     },
-    setup: function PDFDocModel_setup(ownerPassword, userPassword) {
+    setup: function PDFDocument_setup(password) {
       this.checkHeader();
       var xref = new XRef(this.stream,
                           this.startXRef,
-                          this.mainXRefEntriesOffset);
+                          this.mainXRefEntriesOffset,
+                          password);
       this.xref = xref;
       this.catalog = new Catalog(xref);
     },
@@ -620,7 +465,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
       // shadow the prototype getter
       return shadow(this, 'numPages', num);
     },
-    getDocumentInfo: function PDFDocModel_getDocumentInfo() {
+    getDocumentInfo: function PDFDocument_getDocumentInfo() {
       var info;
       if (this.xref.trailer.has('Info')) {
         var infoDict = this.xref.trailer.get('Info');
@@ -634,7 +479,7 @@ var PDFDocModel = (function PDFDocModelClosure() {
 
       return shadow(this, 'getDocumentInfo', info);
     },
-    getFingerprint: function PDFDocModel_getFingerprint() {
+    getFingerprint: function PDFDocument_getFingerprint() {
       var xref = this.xref, fileID;
       if (xref.trailer.has('ID')) {
         fileID = '';
@@ -655,254 +500,14 @@ var PDFDocModel = (function PDFDocModelClosure() {
 
       return shadow(this, 'getFingerprint', fileID);
     },
-    getPage: function PDFDocModel_getPage(n) {
+    getPage: function PDFDocument_getPage(n) {
       return this.catalog.getPage(n);
     }
   };
 
-  return PDFDocModel;
+  return PDFDocument;
 })();
 
-var PDFDoc = (function PDFDocClosure() {
-  function PDFDoc(arg, callback) {
-    var stream = null;
-    var data = null;
-
-    if (isStream(arg)) {
-      stream = arg;
-      data = arg.bytes;
-    } else if (isArrayBuffer(arg)) {
-      stream = new Stream(arg);
-      data = arg;
-    } else {
-      error('PDFDoc: Unknown argument type');
-    }
-
-    this.data = data;
-    this.stream = stream;
-    this.pdfModel = new PDFDocModel(stream);
-    this.fingerprint = this.pdfModel.getFingerprint();
-    this.info = this.pdfModel.getDocumentInfo();
-    this.catalog = this.pdfModel.catalog;
-    this.objs = new PDFObjects();
-
-    this.pageCache = [];
-    this.fontsLoading = {};
-    this.workerReadyPromise = new Promise('workerReady');
-
-    // If worker support isn't disabled explicit and the browser has worker
-    // support, create a new web worker and test if it/the browser fullfills
-    // all requirements to run parts of pdf.js in a web worker.
-    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
-    // as it arrives on the worker. Chrome added this with version 15.
-    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
-      var workerSrc = PDFJS.workerSrc;
-      if (typeof workerSrc === 'undefined') {
-        error('No PDFJS.workerSrc specified');
-      }
-
-      try {
-        var worker;
-        if (PDFJS.isFirefoxExtension) {
-          // The firefox extension can't load the worker from the resource://
-          // url so we have to inline the script and then use the blob loader.
-          var bb = new MozBlobBuilder();
-          bb.append(document.querySelector('#PDFJS_SCRIPT_TAG').textContent);
-          var blobUrl = window.URL.createObjectURL(bb.getBlob());
-          worker = new Worker(blobUrl);
-        } else {
-          // Some versions of FF can't create a worker on localhost, see:
-          // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
-          worker = new Worker(workerSrc);
-        }
-
-        var messageHandler = new MessageHandler('main', worker);
-
-        messageHandler.on('test', function pdfDocTest(supportTypedArray) {
-          if (supportTypedArray) {
-            this.worker = worker;
-            this.setupMessageHandler(messageHandler);
-          } else {
-            globalScope.PDFJS.disableWorker = true;
-            this.setupFakeWorker();
-          }
-        }.bind(this));
-
-        var testObj = new Uint8Array(1);
-        // Some versions of Opera throw a DATA_CLONE_ERR on
-        // serializing the typed array.
-        messageHandler.send('test', testObj);
-        return;
-      } catch (e) {
-        warn('The worker has been disabled.');
-      }
-    }
-    // Either workers are disabled, not supported or have thrown an exception.
-    // Thus, we fallback to a faked worker.
-    globalScope.PDFJS.disableWorker = true;
-    this.setupFakeWorker();
-  }
-
-  PDFDoc.prototype = {
-    setupFakeWorker: function PDFDoc_setupFakeWorker() {
-      // If we don't use a worker, just post/sendMessage to the main thread.
-      var fakeWorker = {
-        postMessage: function PDFDoc_postMessage(obj) {
-          fakeWorker.onmessage({data: obj});
-        },
-        terminate: function PDFDoc_terminate() {}
-      };
-
-      var messageHandler = new MessageHandler('main', fakeWorker);
-      this.setupMessageHandler(messageHandler);
-
-      // If the main thread is our worker, setup the handling for the messages
-      // the main thread sends to it self.
-      WorkerMessageHandler.setup(messageHandler);
-    },
-
-
-    setupMessageHandler: function PDFDoc_setupMessageHandler(messageHandler) {
-      this.messageHandler = messageHandler;
-
-      messageHandler.on('page', function pdfDocPage(data) {
-        var pageNum = data.pageNum;
-        var page = this.pageCache[pageNum];
-        var depFonts = data.depFonts;
-
-        page.stats.timeEnd('Page Request');
-        page.startRenderingFromOperatorList(data.operatorList, depFonts);
-      }, this);
-
-      messageHandler.on('obj', function pdfDocObj(data) {
-        var id = data[0];
-        var type = data[1];
-
-        switch (type) {
-          case 'JpegStream':
-            var imageData = data[2];
-            loadJpegStream(id, imageData, this.objs);
-            break;
-          case 'Image':
-            var imageData = data[2];
-            this.objs.resolve(id, imageData);
-            break;
-          case 'Font':
-            var name = data[2];
-            var file = data[3];
-            var properties = data[4];
-
-            if (file) {
-              // Rewrap the ArrayBuffer in a stream.
-              var fontFileDict = new Dict();
-              file = new Stream(file, 0, file.length, fontFileDict);
-            }
-
-            // At this point, only the font object is created but the font is
-            // not yet attached to the DOM. This is done in `FontLoader.bind`.
-            var font = new Font(name, file, properties);
-            this.objs.resolve(id, font);
-            break;
-          default:
-            error('Got unkown object type ' + type);
-        }
-      }, this);
-
-      messageHandler.on('page_error', function pdfDocError(data) {
-        var page = this.pageCache[data.pageNum];
-        if (page.displayReadyPromise)
-          page.displayReadyPromise.reject(data.error);
-        else
-          error(data.error);
-      }, this);
-
-      messageHandler.on('jpeg_decode', function(data, promise) {
-        var imageData = data[0];
-        var components = data[1];
-        if (components != 3 && components != 1)
-          error('Only 3 component or 1 component can be returned');
-
-        var img = new Image();
-        img.onload = (function messageHandler_onloadClosure() {
-          var width = img.width;
-          var height = img.height;
-          var size = width * height;
-          var rgbaLength = size * 4;
-          var buf = new Uint8Array(size * components);
-          var tmpCanvas = createScratchCanvas(width, height);
-          var tmpCtx = tmpCanvas.getContext('2d');
-          tmpCtx.drawImage(img, 0, 0);
-          var data = tmpCtx.getImageData(0, 0, width, height).data;
-
-          if (components == 3) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
-              buf[j] = data[i];
-              buf[j + 1] = data[i + 1];
-              buf[j + 2] = data[i + 2];
-            }
-          } else if (components == 1) {
-            for (var i = 0, j = 0; i < rgbaLength; i += 4, j++) {
-              buf[j] = data[i];
-            }
-          }
-          promise.resolve({ data: buf, width: width, height: height});
-        }).bind(this);
-        var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
-        img.src = src;
-      });
-
-      setTimeout(function pdfDocFontReadySetTimeout() {
-        messageHandler.send('doc', this.data);
-        this.workerReadyPromise.resolve(true);
-      }.bind(this));
-    },
-
-    get numPages() {
-      return this.pdfModel.numPages;
-    },
-
-    startRendering: function PDFDoc_startRendering(page) {
-      // The worker might not be ready to receive the page request yet.
-      this.workerReadyPromise.then(function pdfDocStartRenderingThen() {
-        page.stats.time('Page Request');
-        this.messageHandler.send('page_request', page.pageNumber + 1);
-      }.bind(this));
-    },
-
-    getPage: function PDFDoc_getPage(n) {
-      if (this.pageCache[n])
-        return this.pageCache[n];
-
-      var page = this.pdfModel.getPage(n);
-      // Add a reference to the objects such that Page can forward the reference
-      // to the CanvasGraphics and so on.
-      page.objs = this.objs;
-      page.pdf = this;
-      return (this.pageCache[n] = page);
-    },
-
-    destroy: function PDFDoc_destroy() {
-      if (this.worker)
-        this.worker.terminate();
-
-      if (this.fontWorker)
-        this.fontWorker.terminate();
-
-      for (var n in this.pageCache)
-        delete this.pageCache[n];
-
-      delete this.data;
-      delete this.stream;
-      delete this.pdf;
-      delete this.catalog;
-    }
-  };
-
-  return PDFDoc;
-})();
-
-globalScope.PDFJS.PDFDoc = PDFDoc;
-
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -963,6 +568,19 @@ function shadow(obj, prop, value) {
   return value;
 }
 
+var PasswordException = (function PasswordExceptionClosure() {
+  function PasswordException(msg, code) {
+    this.name = 'PasswordException';
+    this.message = msg;
+    this.code = code;
+  }
+
+  PasswordException.prototype = new Error();
+  PasswordException.constructor = PasswordException;
+
+  return PasswordException;
+})();
+
 function bytesToString(bytes) {
   var str = '';
   var length = bytes.length;
@@ -981,7 +599,7 @@ function stringToBytes(str) {
 
 var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
 
-var Util = (function UtilClosure() {
+var Util = PDFJS.Util = (function UtilClosure() {
   function Util() {}
 
   Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
@@ -1002,6 +620,19 @@ var Util = (function UtilClosure() {
     return [xt, yt];
   };
 
+  Util.applyInverseTransform = function Util_applyInverseTransform(p, m) {
+    var d = m[0] * m[3] - m[1] * m[2];
+    var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d;
+    var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d;
+    return [xt, yt];
+  };
+
+  Util.inverseTransform = function Util_inverseTransform(m) {
+    var d = m[0] * m[3] - m[1] * m[2];
+    return [m[3] / d, -m[1] / d, -m[2] / d, m[0] / d,
+      (m[2] * m[5] - m[4] * m[3]) / d, (m[4] * m[1] - m[5] * m[0]) / d];
+  };
+
   // Apply a generic 3d matrix M on a 3-vector v:
   //   | a b c |   | X |
   //   | d e f | x | Y |
@@ -1070,7 +701,7 @@ var Util = (function UtilClosure() {
     }
 
     return result;
-  }
+  };
 
   Util.sign = function Util_sign(num) {
     return num < 0 ? -1 : 1;
@@ -1079,6 +710,80 @@ var Util = (function UtilClosure() {
   return Util;
 })();
 
+var PageViewport = PDFJS.PageViewport = (function PageViewportClosure() {
+  function PageViewport(viewBox, scale, rotate, offsetX, offsetY) {
+    // creating transform to convert pdf coordinate system to the normal
+    // canvas like coordinates taking in account scale and rotation
+    var centerX = (viewBox[2] + viewBox[0]) / 2;
+    var centerY = (viewBox[3] + viewBox[1]) / 2;
+    var rotateA, rotateB, rotateC, rotateD;
+    switch (rotate) {
+      case -180:
+      case 180:
+        rotateA = -1; rotateB = 0; rotateC = 0; rotateD = 1;
+        break;
+      case -270:
+      case 90:
+        rotateA = 0; rotateB = 1; rotateC = 1; rotateD = 0;
+        break;
+      case -90:
+      case 270:
+        rotateA = 0; rotateB = -1; rotateC = -1; rotateD = 0;
+        break;
+      case 360:
+      case 0:
+      default:
+        rotateA = 1; rotateB = 0; rotateC = 0; rotateD = -1;
+        break;
+    }
+    var offsetCanvasX, offsetCanvasY;
+    var width, height;
+    if (rotateA == 0) {
+      offsetCanvasX = Math.abs(centerY - viewBox[1]) * scale + offsetX;
+      offsetCanvasY = Math.abs(centerX - viewBox[0]) * scale + offsetY;
+      width = Math.abs(viewBox[3] - viewBox[1]) * scale;
+      height = Math.abs(viewBox[2] - viewBox[0]) * scale;
+    } else {
+      offsetCanvasX = Math.abs(centerX - viewBox[0]) * scale + offsetX;
+      offsetCanvasY = Math.abs(centerY - viewBox[1]) * scale + offsetY;
+      width = Math.abs(viewBox[2] - viewBox[0]) * scale;
+      height = Math.abs(viewBox[3] - viewBox[1]) * scale;
+    }
+    // creating transform for the following operations:
+    // translate(-centerX, -centerY), rotate and flip vertically,
+    // scale, and translate(offsetCanvasX, offsetCanvasY)
+    this.transform = [
+      rotateA * scale,
+      rotateB * scale,
+      rotateC * scale,
+      rotateD * scale,
+      offsetCanvasX - rotateA * scale * centerX - rotateC * scale * centerY,
+      offsetCanvasY - rotateB * scale * centerX - rotateD * scale * centerY
+    ];
+
+    this.offsetX = offsetX;
+    this.offsetY = offsetY;
+    this.width = width;
+    this.height = height;
+    this.fontScale = scale;
+  }
+  PageViewport.prototype = {
+    convertToViewportPoint: function PageViewport_convertToViewportPoint(x, y) {
+      return Util.applyTransform([x, y], this.transform);
+    },
+    convertToViewportRectangle:
+      function PageViewport_convertToViewportRectangle(rect) {
+      var tl = Util.applyTransform([rect[0], rect[1]], this.transform);
+      var br = Util.applyTransform([rect[2], rect[3]], this.transform);
+      return [tl[0], tl[1], br[0], br[1]];
+    },
+    convertToPdfPoint: function PageViewport_convertToPdfPoint(x, y) {
+      return Util.applyInverseTransform([x, y], this.transform);
+    }
+  };
+  return PageViewport;
+})();
+
 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,
@@ -1180,7 +885,7 @@ function isPDFFunction(v) {
  * can be set. If any of these happens twice or the data is required before
  * it was set, an exception is throw.
  */
-var Promise = (function PromiseClosure() {
+var Promise = PDFJS.Promise = (function PromiseClosure() {
   var EMPTY_PROMISE = {};
 
   /**
@@ -1202,6 +907,7 @@ var Promise = (function PromiseClosure() {
     }
     this.callbacks = [];
     this.errbacks = [];
+    this.progressbacks = [];
   };
   /**
    * Builds a promise that is resolved when all the passed in promises are
@@ -1217,7 +923,7 @@ var Promise = (function PromiseClosure() {
       deferred.resolve(results);
       return deferred;
     }
-    for (var i = 0; i < unresolved; ++i) {
+    for (var i = 0, ii = promises.length; i < ii; ++i) {
       var promise = promises[i];
       promise.then((function(i) {
         return function(value) {
@@ -1273,7 +979,7 @@ var Promise = (function PromiseClosure() {
       }
 
       this.isResolved = true;
-      this.data = data || null;
+      this.data = (typeof data !== 'undefined') ? data : null;
       var callbacks = this.callbacks;
 
       for (var i = 0, ii = callbacks.length; i < ii; i++) {
@@ -1281,7 +987,14 @@ var Promise = (function PromiseClosure() {
       }
     },
 
-    reject: function Promise_reject(reason) {
+    progress: function Promise_progress(data) {
+      var callbacks = this.progressbacks;
+      for (var i = 0, ii = callbacks.length; i < ii; i++) {
+        callbacks[i].call(null, data);
+      }
+    },
+
+    reject: function Promise_reject(reason, exception) {
       if (this.isRejected) {
         error('A Promise can be rejected only once ' + this.name);
       }
@@ -1294,11 +1007,11 @@ var Promise = (function PromiseClosure() {
       var errbacks = this.errbacks;
 
       for (var i = 0, ii = errbacks.length; i < ii; i++) {
-        errbacks[i].call(null, reason);
+        errbacks[i].call(null, reason, exception);
       }
     },
 
-    then: function Promise_then(callback, errback) {
+    then: function Promise_then(callback, errback, progressback) {
       if (!callback) {
         error('Requiring callback' + this.name);
       }
@@ -1315,6 +1028,9 @@ var Promise = (function PromiseClosure() {
         if (errback)
           this.errbacks.push(errback);
       }
+
+      if (progressback)
+        this.progressbacks.push(progressback);
     }
   };
 
@@ -1373,6 +1089,638 @@ var StatTimer = (function StatTimerClosure() {
   };
   return StatTimer;
 })();
+
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+
+/**
+ * This is the main entry point for loading a PDF and interacting with it.
+ * NOTE: If a URL is used to fetch the PDF data a standard XMLHttpRequest(XHR)
+ * is used, which means it must follow the same origin rules that any XHR does
+ * e.g. No cross domain requests without CORS.
+ *
+ * @param {string|TypedAray|object} source Can be an url to where a PDF is
+ * located, a typed array (Uint8Array) already populated with data or
+ * and parameter object with the following possible fields:
+ *  - url   - The URL of the PDF.
+ *  - data  - A typed array with PDF data.
+ *  - httpHeaders - Basic authentication headers.
+ *  - password - For decrypting password-protected PDFs.
+ *
+ * @return {Promise} A promise that is resolved with {PDFDocumentProxy} object.
+ */
+PDFJS.getDocument = function getDocument(source) {
+  var url, data, headers, password, parameters = {};
+  if (typeof source === 'string') {
+    url = source;
+  } else if (isArrayBuffer(source)) {
+    data = source;
+  } else if (typeof source === 'object') {
+    url = source.url;
+    data = source.data;
+    headers = source.httpHeaders;
+    password = source.password;
+    parameters.password = password || null;
+
+    if (!url && !data)
+      error('Invalid parameter array, need either .data or .url');
+  } else {
+    error('Invalid parameter in getDocument, need either Uint8Array, ' +
+          'string or a parameter object');
+  }
+
+  var promise = new PDFJS.Promise();
+  var transport = new WorkerTransport(promise);
+  if (data) {
+    // assuming the data is array, instantiating directly from it
+    transport.sendData(data, parameters);
+  } else if (url) {
+    // fetch url
+    PDFJS.getPdf(
+      {
+        url: url,
+        progress: function getPDFProgress(evt) {
+          if (evt.lengthComputable)
+            promise.progress({
+              loaded: evt.loaded,
+              total: evt.total
+            });
+        },
+        error: function getPDFError(e) {
+          promise.reject('Unexpected server response of ' +
+            e.target.status + '.');
+        },
+        headers: headers
+      },
+      function getPDFLoad(data) {
+        transport.sendData(data, parameters);
+      });
+  }
+
+  return promise;
+};
+
+/**
+ * Proxy to a PDFDocument in the worker thread. Also, contains commonly used
+ * properties that can be read synchronously.
+ */
+var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
+  function PDFDocumentProxy(pdfInfo, transport) {
+    this.pdfInfo = pdfInfo;
+    this.transport = transport;
+  }
+  PDFDocumentProxy.prototype = {
+    /**
+     * @return {number} Total number of pages the PDF contains.
+     */
+    get numPages() {
+      return this.pdfInfo.numPages;
+    },
+    /**
+     * @return {string} A unique ID to identify a PDF. Not guaranteed to be
+     * unique.
+     */
+    get fingerprint() {
+      return this.pdfInfo.fingerprint;
+    },
+    /**
+     * @param {number} The page number to get. The first page is 1.
+     * @return {Promise} A promise that is resolved with a {PDFPageProxy}
+     * object.
+     */
+    getPage: function PDFDocumentProxy_getPage(number) {
+      return this.transport.getPage(number);
+    },
+    /**
+     * @return {Promise} A promise that is resolved with a lookup table for
+     * mapping named destinations to reference numbers.
+     */
+    getDestinations: function PDFDocumentProxy_getDestinations() {
+      var promise = new PDFJS.Promise();
+      var destinations = this.pdfInfo.destinations;
+      promise.resolve(destinations);
+      return promise;
+    },
+    /**
+     * @return {Promise} A promise that is resolved with an {array} that is a
+     * tree outline (if it has one) of the PDF. The tree is in the format of:
+     * [
+     *  {
+     *   title: string,
+     *   bold: boolean,
+     *   italic: boolean,
+     *   color: rgb array,
+     *   dest: dest obj,
+     *   items: array of more items like this
+     *  },
+     *  ...
+     * ].
+     */
+    getOutline: function PDFDocumentProxy_getOutline() {
+      var promise = new PDFJS.Promise();
+      var outline = this.pdfInfo.outline;
+      promise.resolve(outline);
+      return promise;
+    },
+    /**
+     * @return {Promise} A promise that is resolved with an {object} that has
+     * info and metadata properties.  Info is an {object} filled with anything
+     * available in the information dictionary and similarly metadata is a
+     * {Metadata} object with information from the metadata section of the PDF.
+     */
+    getMetadata: function PDFDocumentProxy_getMetadata() {
+      var promise = new PDFJS.Promise();
+      var info = this.pdfInfo.info;
+      var metadata = this.pdfInfo.metadata;
+      promise.resolve({
+        info: info,
+        metadata: metadata ? new PDFJS.Metadata(metadata) : null
+      });
+      return promise;
+    },
+    isEncrypted: function PDFDocumentProxy_isEncrypted() {
+      var promise = new PDFJS.Promise();
+      promise.resolve(this.pdfInfo.encrypted);
+      return promise;
+    },
+    destroy: function PDFDocumentProxy_destroy() {
+      this.transport.destroy();
+    }
+  };
+  return PDFDocumentProxy;
+})();
+
+var PDFPageProxy = (function PDFPageProxyClosure() {
+  function PDFPageProxy(pageInfo, transport) {
+    this.pageInfo = pageInfo;
+    this.transport = transport;
+    this.stats = new StatTimer();
+    this.stats.enabled = !!globalScope.PDFJS.enableStats;
+    this.objs = transport.objs;
+    this.renderInProgress = false;
+  }
+  PDFPageProxy.prototype = {
+    /**
+     * @return {number} Page number of the page. First page is 1.
+     */
+    get pageNumber() {
+      return this.pageInfo.pageIndex + 1;
+    },
+    /**
+     * @return {number} The number of degrees the page is rotated clockwise.
+     */
+    get rotate() {
+      return this.pageInfo.rotate;
+    },
+    /**
+     * @return {object} The reference that points to this page. It has 'num' and
+     * 'gen' properties.
+     */
+    get ref() {
+      return this.pageInfo.ref;
+    },
+    /**
+     * @return {array} An array of the visible portion of the PDF page in the
+     * user space units - [x1, y1, x2, y2].
+     */
+    get view() {
+      return this.pageInfo.view;
+    },
+    /**
+     * @param {number} scale The desired scale of the viewport.
+     * @param {number} rotate Degrees to rotate the viewport. If omitted this
+     * defaults to the page rotation.
+     * @return {PageViewport} Contains 'width' and 'height' properties along
+     * with transforms required for rendering.
+     */
+    getViewport: function PDFPageProxy_getViewport(scale, rotate) {
+      if (arguments.length < 2)
+        rotate = this.rotate;
+      return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
+    },
+    /**
+     * @return {Promise} A promise that is resolved with an {array} of the
+     * annotation objects.
+     */
+    getAnnotations: function PDFPageProxy_getAnnotations() {
+      if (this.annotationsPromise)
+        return this.annotationsPromise;
+
+      var promise = new PDFJS.Promise();
+      this.annotationsPromise = promise;
+      this.transport.getAnnotations(this.pageInfo.pageIndex);
+      return promise;
+    },
+    /**
+     * Begins the process of rendering a page to the desired context.
+     * @param {object} params A parameter object that supports:
+     * {
+     *   canvasContext(required): A 2D context of a DOM Canvas object.,
+     *   textLayer(optional): An object that has beginLayout, endLayout, and
+     *                        appendText functions.
+     * }.
+     * @return {Promise} A promise that is resolved when the page finishes
+     * rendering.
+     */
+    render: function PDFPageProxy_render(params) {
+      this.renderInProgress = true;
+
+      var promise = new Promise();
+      var stats = this.stats;
+      stats.time('Overall');
+      // If there is no displayReadyPromise yet, then the operatorList was never
+      // requested before. Make the request and create the promise.
+      if (!this.displayReadyPromise) {
+        this.displayReadyPromise = new Promise();
+        this.destroyed = false;
+
+        this.stats.time('Page Request');
+        this.transport.messageHandler.send('RenderPageRequest', {
+          pageIndex: this.pageNumber - 1
+        });
+      }
+
+      var self = this;
+      function complete(error) {
+        self.renderInProgress = false;
+        if (self.destroyed) {
+          delete self.operatorList;
+          delete self.displayReadyPromise;
+        }
+
+        if (error)
+          promise.reject(error);
+        else
+          promise.resolve();
+      };
+
+      // Once the operatorList and fonts are loaded, do the actual rendering.
+      this.displayReadyPromise.then(
+        function pageDisplayReadyPromise() {
+          if (self.destroyed) {
+            complete();
+            return;
+          }
+
+          var gfx = new CanvasGraphics(params.canvasContext,
+            this.objs, params.textLayer);
+          try {
+            this.display(gfx, params.viewport, complete);
+          } catch (e) {
+            complete(e);
+          }
+        }.bind(this),
+        function pageDisplayReadPromiseError(reason) {
+          complete(reason);
+        }
+      );
+
+      return promise;
+    },
+    /**
+     * For internal use only.
+     */
+    startRenderingFromOperatorList:
+      function PDFPageProxy_startRenderingFromOperatorList(operatorList,
+                                                           fonts) {
+      var self = this;
+      this.operatorList = operatorList;
+
+      var displayContinuation = function pageDisplayContinuation() {
+        // Always defer call to display() to work around bug in
+        // Firefox error reporting from XHR callbacks.
+        setTimeout(function pageSetTimeout() {
+          self.displayReadyPromise.resolve();
+        });
+      };
+
+      this.ensureFonts(fonts,
+        function pageStartRenderingFromOperatorListEnsureFonts() {
+          displayContinuation();
+        }
+      );
+    },
+    /**
+     * For internal use only.
+     */
+    ensureFonts: function PDFPageProxy_ensureFonts(fonts, callback) {
+      this.stats.time('Font Loading');
+      // Convert the font names to the corresponding font obj.
+      for (var i = 0, ii = fonts.length; i < ii; i++) {
+        fonts[i] = this.objs.objs[fonts[i]].data;
+      }
+
+      // Load all the fonts
+      FontLoader.bind(
+        fonts,
+        function pageEnsureFontsFontObjs(fontObjs) {
+          this.stats.timeEnd('Font Loading');
+
+          callback.call(this);
+        }.bind(this)
+      );
+    },
+    /**
+     * For internal use only.
+     */
+    display: function PDFPageProxy_display(gfx, viewport, callback) {
+      var stats = this.stats;
+      stats.time('Rendering');
+
+      gfx.beginDrawing(viewport);
+
+      var startIdx = 0;
+      var length = this.operatorList.fnArray.length;
+      var operatorList = this.operatorList;
+      var stepper = null;
+      if (PDFJS.pdfBug && StepperManager.enabled) {
+        stepper = StepperManager.create(this.pageNumber - 1);
+        stepper.init(operatorList);
+        stepper.nextBreakPoint = stepper.getNextBreakPoint();
+      }
+
+      var self = this;
+      function next() {
+        startIdx =
+          gfx.executeOperatorList(operatorList, startIdx, next, stepper);
+        if (startIdx == length) {
+          gfx.endDrawing();
+          stats.timeEnd('Rendering');
+          stats.timeEnd('Overall');
+          if (callback) callback();
+        }
+      }
+      next();
+    },
+    /**
+     * Stub for future feature.
+     */
+    getTextContent: function PDFPageProxy_getTextContent() {
+      var promise = new PDFJS.Promise();
+      var textContent = 'page text'; // not implemented
+      promise.resolve(textContent);
+      return promise;
+    },
+    /**
+     * Stub for future feature.
+     */
+    getOperationList: function PDFPageProxy_getOperationList() {
+      var promise = new PDFJS.Promise();
+      var operationList = { // not implemented
+        dependencyFontsID: null,
+        operatorList: null
+      };
+      promise.resolve(operationList);
+      return promise;
+    },
+    /**
+     * Destroys resources allocated by the page.
+     */
+    destroy: function PDFPageProxy_destroy() {
+      this.destroyed = true;
+
+      if (!this.renderInProgress) {
+        delete this.operatorList;
+        delete this.displayReadyPromise;
+      }
+    }
+  };
+  return PDFPageProxy;
+})();
+/**
+ * For internal use only.
+ */
+var WorkerTransport = (function WorkerTransportClosure() {
+  function WorkerTransport(promise) {
+    this.workerReadyPromise = promise;
+    this.objs = new PDFObjects();
+
+    this.pageCache = [];
+    this.pagePromises = [];
+    this.fontsLoading = {};
+
+    // If worker support isn't disabled explicit and the browser has worker
+    // support, create a new web worker and test if it/the browser fullfills
+    // all requirements to run parts of pdf.js in a web worker.
+    // Right now, the requirement is, that an Uint8Array is still an Uint8Array
+    // as it arrives on the worker. Chrome added this with version 15.
+    if (!globalScope.PDFJS.disableWorker && typeof Worker !== 'undefined') {
+      var workerSrc = PDFJS.workerSrc;
+      if (typeof workerSrc === 'undefined') {
+        error('No PDFJS.workerSrc specified');
+      }
+
+      try {
+        var worker;
+        if (PDFJS.isFirefoxExtension) {
+          // The firefox extension can't load the worker from the resource://
+          // url so we have to inline the script and then use the blob loader.
+          var bb = new MozBlobBuilder();
+          bb.append(document.querySelector('#PDFJS_SCRIPT_TAG').textContent);
+          var blobUrl = window.URL.createObjectURL(bb.getBlob());
+          worker = new Worker(blobUrl);
+        } else {
+          // Some versions of FF can't create a worker on localhost, see:
+          // https://bugzilla.mozilla.org/show_bug.cgi?id=683280
+          worker = new Worker(workerSrc);
+        }
+
+        var messageHandler = new MessageHandler('main', worker);
+        this.messageHandler = messageHandler;
+
+        messageHandler.on('test', function transportTest(supportTypedArray) {
+          if (supportTypedArray) {
+            this.worker = worker;
+            this.setupMessageHandler(messageHandler);
+          } else {
+            globalScope.PDFJS.disableWorker = true;
+            this.setupFakeWorker();
+          }
+        }.bind(this));
+
+        var testObj = new Uint8Array(1);
+        // Some versions of Opera throw a DATA_CLONE_ERR on
+        // serializing the typed array.
+        messageHandler.send('test', testObj);
+        return;
+      } catch (e) {
+        warn('The worker has been disabled.');
+      }
+    }
+    // Either workers are disabled, not supported or have thrown an exception.
+    // Thus, we fallback to a faked worker.
+    globalScope.PDFJS.disableWorker = true;
+    this.setupFakeWorker();
+  }
+  WorkerTransport.prototype = {
+    destroy: function WorkerTransport_destroy() {
+      if (this.worker)
+        this.worker.terminate();
+
+      this.pageCache = [];
+      this.pagePromises = [];
+    },
+    setupFakeWorker: function WorkerTransport_setupFakeWorker() {
+      // If we don't use a worker, just post/sendMessage to the main thread.
+      var fakeWorker = {
+        postMessage: function WorkerTransport_postMessage(obj) {
+          fakeWorker.onmessage({data: obj});
+        },
+        terminate: function WorkerTransport_terminate() {}
+      };
+
+      var messageHandler = new MessageHandler('main', fakeWorker);
+      this.setupMessageHandler(messageHandler);
+
+      // If the main thread is our worker, setup the handling for the messages
+      // the main thread sends to it self.
+      WorkerMessageHandler.setup(messageHandler);
+    },
+
+    setupMessageHandler:
+      function WorkerTransport_setupMessageHandler(messageHandler) {
+      this.messageHandler = messageHandler;
+
+      messageHandler.on('GetDoc', function transportDoc(data) {
+        var pdfInfo = data.pdfInfo;
+        var pdfDocument = new PDFDocumentProxy(pdfInfo, this);
+        this.pdfDocument = pdfDocument;
+        this.workerReadyPromise.resolve(pdfDocument);
+      }, this);
+
+      messageHandler.on('NeedPassword', function transportPassword(data) {
+        this.workerReadyPromise.reject(data.exception.message, data.exception);
+      }, this);
+
+      messageHandler.on('IncorrectPassword', function transportBadPass(data) {
+        this.workerReadyPromise.reject(data.exception.message, data.exception);
+      }, this);
+
+      messageHandler.on('GetPage', function transportPage(data) {
+        var pageInfo = data.pageInfo;
+        var page = new PDFPageProxy(pageInfo, this);
+        this.pageCache[pageInfo.pageIndex] = page;
+        var promise = this.pagePromises[pageInfo.pageIndex];
+        promise.resolve(page);
+      }, this);
+
+      messageHandler.on('GetAnnotations', function transportAnnotations(data) {
+        var annotations = data.annotations;
+        var promise = this.pageCache[data.pageIndex].annotationsPromise;
+        promise.resolve(annotations);
+      }, this);
+
+      messageHandler.on('RenderPage', function transportRender(data) {
+        var page = this.pageCache[data.pageIndex];
+        var depFonts = data.depFonts;
+
+        page.stats.timeEnd('Page Request');
+        page.startRenderingFromOperatorList(data.operatorList, depFonts);
+      }, this);
+
+      messageHandler.on('obj', function transportObj(data) {
+        var id = data[0];
+        var type = data[1];
+        if (this.objs.hasData(id))
+          return;
+
+        switch (type) {
+          case 'JpegStream':
+            var imageData = data[2];
+            loadJpegStream(id, imageData, this.objs);
+            break;
+          case 'Image':
+            var imageData = data[2];
+            this.objs.resolve(id, imageData);
+            break;
+          case 'Font':
+            var name = data[2];
+            var file = data[3];
+            var properties = data[4];
+
+            if (file) {
+              // Rewrap the ArrayBuffer in a stream.
+              var fontFileDict = new Dict();
+              file = new Stream(file, 0, file.length, fontFileDict);
+            }
+
+            // At this point, only the font object is created but the font is
+            // not yet attached to the DOM. This is done in `FontLoader.bind`.
+            var font = new Font(name, file, properties);
+            this.objs.resolve(id, font);
+            break;
+          default:
+            error('Got unkown object type ' + type);
+        }
+      }, this);
+
+      messageHandler.on('PageError', function transportError(data) {
+        var page = this.pageCache[data.pageNum - 1];
+        if (page.displayReadyPromise)
+          page.displayReadyPromise.reject(data.error);
+        else
+          error(data.error);
+      }, this);
+
+      messageHandler.on('JpegDecode', function(data, promise) {
+        var imageData = data[0];
+        var components = data[1];
+        if (components != 3 && components != 1)
+          error('Only 3 component or 1 component can be returned');
+
+        var img = new Image();
+        img.onload = (function messageHandler_onloadClosure() {
+          var width = img.width;
+          var height = img.height;
+          var size = width * height;
+          var rgbaLength = size * 4;
+          var buf = new Uint8Array(size * components);
+          var tmpCanvas = createScratchCanvas(width, height);
+          var tmpCtx = tmpCanvas.getContext('2d');
+          tmpCtx.drawImage(img, 0, 0);
+          var data = tmpCtx.getImageData(0, 0, width, height).data;
+
+          if (components == 3) {
+            for (var i = 0, j = 0; i < rgbaLength; i += 4, j += 3) {
+              buf[j] = data[i];
+              buf[j + 1] = data[i + 1];
+              buf[j + 2] = data[i + 2];
+            }
+          } else if (components == 1) {
+            for (var i = 0, j = 0; i < rgbaLength; i += 4, j++) {
+              buf[j] = data[i];
+            }
+          }
+          promise.resolve({ data: buf, width: width, height: height});
+        }).bind(this);
+        var src = 'data:image/jpeg;base64,' + window.btoa(imageData);
+        img.src = src;
+      });
+    },
+
+    sendData: function WorkerTransport_sendData(data, params) {
+      this.messageHandler.send('GetDocRequest', {data: data, params: params});
+    },
+
+    getPage: function WorkerTransport_getPage(pageNumber, promise) {
+      var pageIndex = pageNumber - 1;
+      if (pageIndex in this.pagePromises)
+        return this.pagePromises[pageIndex];
+      var promise = new PDFJS.Promise('Page ' + pageNumber);
+      this.pagePromises[pageIndex] = promise;
+      this.messageHandler.send('GetPageRequest', { pageIndex: pageIndex });
+      return promise;
+    },
+
+    getAnnotations: function WorkerTransport_getAnnotations(pageIndex) {
+      this.messageHandler.send('GetAnnotationsRequest',
+        { pageIndex: pageIndex });
+    }
+  };
+  return WorkerTransport;
+
+})();
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -1616,27 +1964,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       'shadingFill': true
     },
 
-    beginDrawing: function CanvasGraphics_beginDrawing(mediaBox) {
-      var cw = this.ctx.canvas.width, ch = this.ctx.canvas.height;
+    beginDrawing: function CanvasGraphics_beginDrawing(viewport) {
+      var transform = viewport.transform;
       this.ctx.save();
-      switch (mediaBox.rotate) {
-        case 0:
-          this.ctx.transform(1, 0, 0, -1, 0, ch);
-          break;
-        case 90:
-          this.ctx.transform(0, 1, 1, 0, 0, 0);
-          break;
-        case 180:
-          this.ctx.transform(-1, 0, 0, 1, cw, 0);
-          break;
-        case 270:
-          this.ctx.transform(0, -1, -1, 0, cw, ch);
-          break;
-      }
-      // Scale so that canvas units are the same as PDF user space units
-      this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
-      // Move the media left-top corner to the (0,0) canvas position
-      this.ctx.translate(-mediaBox.x, -mediaBox.y);
+      this.ctx.transform.apply(this.ctx, transform);
 
       if (this.textLayer)
         this.textLayer.beginLayout();
@@ -2636,6 +2967,7 @@ if (!isWorker) {
       };
   }
 }
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -2675,51 +3007,55 @@ var Dict = (function DictClosure() {
   // xref is optional
   function Dict(xref) {
     // Map should only be used internally, use functions below to access.
-    this.map = Object.create(null);
-    this.xref = xref;
-  }
+    var map = Object.create(null);
+
+    this.assignXref = function Dict_assignXref(newXref) {
+      xref = newXref;
+    };
 
-  Dict.prototype = {
     // automatically dereferences Ref objects
-    get: function Dict_get(key1, key2, key3) {
+    this.get = function Dict_get(key1, key2, key3) {
       var value;
-      var xref = this.xref;
-      if (typeof (value = this.map[key1]) != 'undefined' || key1 in this.map ||
+      if (typeof (value = map[key1]) != 'undefined' || key1 in map ||
           typeof key2 == 'undefined') {
-        return xref ? this.xref.fetchIfRef(value) : value;
+        return xref ? xref.fetchIfRef(value) : value;
       }
-      if (typeof (value = this.map[key2]) != 'undefined' || key2 in this.map ||
+      if (typeof (value = map[key2]) != 'undefined' || key2 in map ||
           typeof key3 == 'undefined') {
-        return xref ? this.xref.fetchIfRef(value) : value;
+        return xref ? xref.fetchIfRef(value) : value;
       }
-      value = this.map[key3] || null;
-      return xref ? this.xref.fetchIfRef(value) : value;
-    },
+      value = map[key3] || null;
+      return xref ? xref.fetchIfRef(value) : value;
+    };
+
     // no dereferencing
-    getRaw: function Dict_getRaw(key) {
-      return this.map[key];
-    },
+    this.getRaw = function Dict_getRaw(key) {
+      return map[key];
+    };
+
     // creates new map and dereferences all Refs
-    getAll: function Dict_getAll() {
+    this.getAll = function Dict_getAll() {
       var all = {};
-      for (var key in this.map)
-        all[key] = this.get(key);
+      for (var key in map) {
+        var obj = this.get(key);
+        all[key] = obj instanceof Dict ? obj.getAll() : obj;
+      }
       return all;
-    },
+    };
 
-    set: function Dict_set(key, value) {
-      this.map[key] = value;
-    },
+    this.set = function Dict_set(key, value) {
+      map[key] = value;
+    };
 
-    has: function Dict_has(key) {
-      return key in this.map;
-    },
+    this.has = function Dict_has(key) {
+      return key in map;
+    };
 
-    forEach: function Dict_forEach(callback) {
-      for (var key in this.map) {
+    this.forEach = function Dict_forEach(callback) {
+      for (var key in map) {
         callback(key, this.get(key));
       }
-    }
+    };
   };
 
   return Dict;
@@ -2932,12 +3268,12 @@ var Catalog = (function CatalogClosure() {
 })();
 
 var XRef = (function XRefClosure() {
-  function XRef(stream, startXRef, mainXRefEntriesOffset) {
+  function XRef(stream, startXRef, mainXRefEntriesOffset, password) {
     this.stream = stream;
     this.entries = [];
     this.xrefstms = {};
     var trailerDict = this.readXRef(startXRef);
-    trailerDict.xref = this;
+    trailerDict.assignXref(this);
     this.trailer = trailerDict;
     // prepare the XRef cache
     this.cache = [];
@@ -2945,8 +3281,7 @@ var XRef = (function XRefClosure() {
     var encrypt = trailerDict.get('Encrypt');
     if (encrypt) {
       var fileId = trailerDict.get('ID');
-      this.encrypt = new CipherTransformFactory(encrypt,
-                                                fileId[0] /*, password */);
+      this.encrypt = new CipherTransformFactory(encrypt, fileId[0], password);
     }
 
     // get the root dictionary (catalog) object
@@ -2998,9 +3333,8 @@ var XRef = (function XRefClosure() {
         }
       }
 
-      // Sanity check: as per spec, first object must have these properties
-      if (this.entries[0] &&
-          !(this.entries[0].gen === 65535 && this.entries[0].free))
+      // Sanity check: as per spec, first object must be free
+      if (this.entries[0] && !this.entries[0].free)
         error('Invalid XRef table: unexpected first object');
 
       // Sanity check
@@ -3159,7 +3493,7 @@ var XRef = (function XRefClosure() {
       }
       // reading XRef streams
       for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
-          this.readXRef(xrefStms[i]);
+          this.readXRef(xrefStms[i], true);
       }
       // finding main trailer
       var dict;
@@ -3182,7 +3516,7 @@ var XRef = (function XRefClosure() {
       // nothing helps
       error('Invalid PDF structure');
     },
-    readXRef: function XRef_readXRef(startXRef) {
+    readXRef: function XRef_readXRef(startXRef, recoveryMode) {
       var stream = this.stream;
       stream.pos = startXRef;
 
@@ -3215,16 +3549,18 @@ var XRef = (function XRefClosure() {
             error('Invalid XRef stream');
           }
           dict = this.readXRefStream(obj);
+          if (!dict)
+            error('Failed to read XRef stream');
         }
 
         // Recursively get previous dictionary, if any
         obj = dict.get('Prev');
         if (isInt(obj))
-          this.readXRef(obj);
+          this.readXRef(obj, recoveryMode);
         else if (isRef(obj)) {
           // The spec says Prev must not be a reference, i.e. "/Prev NNN"
           // This is a fallback for non-compliant PDFs, i.e. "/Prev NNN 0 R"
-          this.readXRef(obj.num);
+          this.readXRef(obj.num, recoveryMode);
         }
 
         return dict;
@@ -3232,6 +3568,9 @@ var XRef = (function XRefClosure() {
         log('(while reading XRef): ' + e);
       }
 
+      if (recoveryMode)
+        return;
+
       warn('Indexing all PDF objects');
       return this.indexObjects();
     },
@@ -3444,6 +3783,7 @@ var PDFObjects = (function PDFObjectsClosure() {
   return PDFObjects;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -4282,7 +4622,10 @@ var PostScriptLexer = (function PostScriptLexerClosure() {
       // operator
       var str = ch.toLowerCase();
       while (true) {
-        ch = stream.lookChar().toLowerCase();
+        ch = stream.lookChar();
+        if (ch === null)
+          break;
+        ch = ch.toLowerCase();
         if (ch >= 'a' && ch <= 'z')
           str += ch;
         else
@@ -4318,6 +4661,7 @@ var PostScriptLexer = (function PostScriptLexerClosure() {
   return PostScriptLexer;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -4423,6 +4767,7 @@ var ExpertSubsetCharset = [
   'periodinferior', 'commainferior'
 ];
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -11356,6 +11701,7 @@ var CIDToUnicodeMaps = {
     {f: 7, c: 19887}]
 };
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -11888,6 +12234,7 @@ var LabCS = (function LabCSClosure() {
   };
   return LabCS;
 })();
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -12309,13 +12656,14 @@ var CipherTransform = (function CipherTransformClosure() {
 })();
 
 var CipherTransformFactory = (function CipherTransformFactoryClosure() {
+  var defaultPasswordBytes = new Uint8Array([
+    0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
+    0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
+    0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
+    0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
+
   function prepareKeyData(fileId, password, ownerPassword, userPassword,
                           flags, revision, keyLength, encryptMetadata) {
-    var defaultPasswordBytes = new Uint8Array([
-      0x28, 0xBF, 0x4E, 0x5E, 0x4E, 0x75, 0x8A, 0x41,
-      0x64, 0x00, 0x4E, 0x56, 0xFF, 0xFA, 0x01, 0x08,
-      0x2E, 0x2E, 0x00, 0xB6, 0xD0, 0x68, 0x3E, 0x80,
-      0x2F, 0x0C, 0xA9, 0xFE, 0x64, 0x53, 0x69, 0x7A]);
     var hashData = new Uint8Array(100), i = 0, j, n;
     if (password) {
       n = Math.min(32, password.length);
@@ -12352,9 +12700,8 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
     var cipher, checkData;
 
     if (revision >= 3) {
-      // padded password in hashData, we can use this array for user
-      // password check
-      i = 32;
+      for (i = 0; i < 32; ++i)
+        hashData[i] = defaultPasswordBytes[i];
       for (j = 0, n = fileId.length; j < n; ++j)
         hashData[i++] = fileId[j];
       cipher = new ARCFourCipher(encryptionKey);
@@ -12367,16 +12714,53 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
         cipher = new ARCFourCipher(derivedKey);
         checkData = cipher.encryptBlock(checkData);
       }
+      for (j = 0, n = checkData.length; j < n; ++j) {
+        if (userPassword[j] != checkData[j])
+          return null;
+      }
     } else {
       cipher = new ARCFourCipher(encryptionKey);
-      checkData = cipher.encryptBlock(hashData.subarray(0, 32));
-    }
-    for (j = 0, n = checkData.length; j < n; ++j) {
-      if (userPassword[j] != checkData[j])
-        error('incorrect password');
+      checkData = cipher.encryptBlock(defaultPasswordBytes);
+      for (j = 0, n = checkData.length; j < n; ++j) {
+        if (userPassword[j] != checkData[j])
+          return null;
+      }
     }
     return encryptionKey;
   }
+  function decodeUserPassword(password, ownerPassword, revision, keyLength) {
+    var hashData = new Uint8Array(32), i = 0, j, n;
+    n = Math.min(32, password.length);
+    for (; i < n; ++i)
+      hashData[i] = password[i];
+    j = 0;
+    while (i < 32) {
+      hashData[i++] = defaultPasswordBytes[j++];
+    }
+    var hash = calculateMD5(hashData, 0, i);
+    var keyLengthInBytes = keyLength >> 3;
+    if (revision >= 3) {
+      for (j = 0; j < 50; ++j) {
+         hash = calculateMD5(hash, 0, hash.length);
+      }
+    }
+
+    var cipher, userPassword;
+    if (revision >= 3) {
+      userPassword = ownerPassword;
+      var derivedKey = new Uint8Array(keyLengthInBytes), k;
+      for (j = 19; j >= 0; j--) {
+        for (k = 0; k < keyLengthInBytes; ++k)
+          derivedKey[k] = hash[k] ^ j;
+        cipher = new ARCFourCipher(derivedKey);
+        userPassword = cipher.encryptBlock(userPassword);
+      }
+    } else {
+      cipher = new ARCFourCipher(hash.subarray(0, keyLengthInBytes));
+      userPassword = cipher.encryptBlock(ownerPassword);
+    }
+    return userPassword;
+  }
 
   var identityName = new Name('Identity');
 
@@ -12406,10 +12790,25 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
     if (password)
       passwordBytes = stringToBytes(password);
 
-    this.encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
-                                        ownerPassword, userPassword,
-                                        flags, revision,
-                                        keyLength, encryptMetadata);
+    var encryptionKey = prepareKeyData(fileIdBytes, passwordBytes,
+                                       ownerPassword, userPassword, flags,
+                                       revision, keyLength, encryptMetadata);
+    if (!encryptionKey && !password) {
+      throw new PasswordException('No password given', 'needpassword');
+    } else if (!encryptionKey && password) {
+      // Attempting use the password as an owner password
+      var decodedPassword = decodeUserPassword(passwordBytes, ownerPassword,
+                                               revision, keyLength);
+      encryptionKey = prepareKeyData(fileIdBytes, decodedPassword,
+                                     ownerPassword, userPassword, flags,
+                                     revision, keyLength, encryptMetadata);
+    }
+
+    if (!encryptionKey)
+      throw new PasswordException('Incorrect Password', 'incorrectpassword');
+
+    this.encryptionKey = encryptionKey;
+
     if (algorithm == 4) {
       this.cf = dict.get('CF');
       this.stmf = dict.get('StmF') || identityName;
@@ -12484,6 +12883,7 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
   return CipherTransformFactory;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -12594,19 +12994,20 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
 
     // Compatibility
     BX: 'beginCompat',
-    EX: 'endCompat'
-  };
+    EX: 'endCompat',
 
-  function splitCombinedOperations(operations) {
-    // Two operations can be combined together, trying to find which two
-    // operations were concatenated.
-    for (var i = operations.length - 1; i > 0; i--) {
-      var op1 = operations.substring(0, i), op2 = operations.substring(i);
-      if (op1 in OP_MAP && op2 in OP_MAP)
-        return [op1, op2]; // operations found
-    }
-    return null;
-  }
+    // (reserved partial commands for the lexer)
+    BM: null,
+    BD: null,
+    'true': null,
+    fa: null,
+    fal: null,
+    fals: null,
+    'false': null,
+    nu: null,
+    nul: null,
+    'null': null
+  };
 
   PartialEvaluator.prototype = {
     getOperatorList: function PartialEvaluator_getOperatorList(stream,
@@ -12639,13 +13040,14 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
 
         font = xref.fetchIfRef(font) || fontRes.get(fontName);
         assertWellFormed(isDict(font));
+        ++self.objIdCounter;
         if (!font.translated) {
           font.translated = self.translateFont(font, xref, resources,
                                                dependency);
           if (font.translated) {
             // keep track of each font we translated so the caller can
             // load them asynchronously before calling display on a page
-            loadedName = 'font_' + uniquePrefix + (++self.objIdCounter);
+            loadedName = 'font_' + uniquePrefix + self.objIdCounter;
             font.translated.properties.loadedName = loadedName;
             font.loadedName = loadedName;
 
@@ -12750,36 +13152,19 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       resources = resources || new Dict();
       var xobjs = resources.get('XObject') || new Dict();
       var patterns = resources.get('Pattern') || new Dict();
-      var parser = new Parser(new Lexer(stream), false, xref);
+      var parser = new Parser(new Lexer(stream, OP_MAP), false, xref);
       var res = resources;
-      var hasNextObj = false, nextObj;
       var args = [], obj;
       var TILING_PATTERN = 1, SHADING_PATTERN = 2;
 
       while (true) {
-        if (hasNextObj) {
-          obj = nextObj;
-          hasNextObj = false;
-        } else {
-          obj = parser.getObj();
-          if (isEOF(obj))
-            break;
-        }
+        obj = parser.getObj();
+        if (isEOF(obj))
+          break;
 
         if (isCmd(obj)) {
           var cmd = obj.cmd;
           var fn = OP_MAP[cmd];
-          if (!fn) {
-            // invalid content command, trying to recover
-            var cmds = splitCombinedOperations(cmd);
-            if (cmds) {
-              cmd = cmds[0];
-              fn = OP_MAP[cmd];
-              // feeding other command on the next interation
-              hasNextObj = true;
-              nextObj = Cmd.get(cmds[1]);
-            }
-          }
           assertWellFormed(fn, 'Unknown command "' + cmd + '"');
           // TODO figure out how to type-check vararg functions
 
@@ -12952,7 +13337,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
           args = [];
         } else if (obj != null) {
           assertWellFormed(args.length <= 33, 'Too many arguments');
-          args.push(obj);
+          args.push(obj instanceof Dict ? obj.getAll() : obj);
         }
       }
 
@@ -12966,7 +13351,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       var toUnicode = dict.get('ToUnicode') ||
         baseDict.get('ToUnicode');
       if (toUnicode)
-        properties.toUnicode = this.readToUnicode(toUnicode, xref);
+        properties.toUnicode = this.readToUnicode(toUnicode, xref, properties);
 
       if (properties.composite) {
         // CIDSystemInfo helps to match CID to glyphs
@@ -13022,7 +13407,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
       properties.hasEncoding = hasEncoding;
     },
 
-    readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref) {
+    readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref,
+                                                           properties) {
       var cmapObj = toUnicode;
       var charToUnicode = [];
       if (isName(cmapObj)) {
@@ -13111,6 +13497,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
             }
           } else if (octet == 0x3E) {
             if (token.length) {
+              // XXX guessing chars size by checking number size in the CMap
+              if (token.length <= 2 && properties.composite)
+                properties.wideChars = false;
+
               if (token.length <= 4) {
                 // parsing hex number
                 tokens.push(parseInt(token, 16));
@@ -13328,6 +13718,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
         length1: length1,
         length2: length2,
         composite: composite,
+        wideChars: composite,
         fixedPitch: false,
         fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
         firstChar: firstChar || 0,
@@ -13348,7 +13739,6 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
         properties.coded = true;
         var charProcs = dict.get('CharProcs').getAll();
         var fontResources = dict.get('Resources') || resources;
-        properties.resources = fontResources;
         properties.charProcOperatorList = {};
         for (var key in charProcs) {
           var glyphStream = charProcs[key];
@@ -13392,6 +13782,7 @@ var EvalState = (function EvalStateClosure() {
   return EvalState;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -14160,7 +14551,6 @@ var Font = (function FontClosure() {
     this.name = name;
     this.coded = properties.coded;
     this.charProcOperatorList = properties.charProcOperatorList;
-    this.resources = properties.resources;
     this.sizes = [];
 
     var names = name.split('+');
@@ -14184,6 +14574,7 @@ var Font = (function FontClosure() {
     this.widths = properties.widths;
     this.defaultWidth = properties.defaultWidth;
     this.composite = properties.composite;
+    this.wideChars = properties.wideChars;
     this.hasEncoding = properties.hasEncoding;
 
     this.fontMatrix = properties.fontMatrix;
@@ -15121,6 +15512,16 @@ var Font = (function FontClosure() {
         properties.glyphNames = glyphNames;
       }
 
+      function isOS2Valid(os2Table) {
+        var data = os2Table.data;
+        // usWinAscent == 0 makes font unreadable by windows
+        var usWinAscent = (data[74] << 8) | data[75];
+        if (usWinAscent == 0)
+          return false;
+
+        return true;
+      }
+
       // Check that required tables are present
       var requiredTables = ['OS/2', 'cmap', 'head', 'hhea',
                              'hmtx', 'maxp', 'name', 'post'];
@@ -15128,7 +15529,7 @@ var Font = (function FontClosure() {
       var header = readOpenTypeHeader(font);
       var numTables = header.numTables;
 
-      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf;
+      var cmap, post, maxp, hhea, hmtx, vhea, vmtx, head, loca, glyf, os2;
       var tables = [];
       for (var i = 0; i < numTables; i++) {
         var table = readTableEntry(font);
@@ -15146,6 +15547,8 @@ var Font = (function FontClosure() {
             hmtx = table;
           else if (table.tag == 'head')
             head = table;
+          else if (table.tag == 'OS/2')
+            os2 = table;
 
           requiredTables.splice(index, 1);
         } else {
@@ -15161,7 +15564,7 @@ var Font = (function FontClosure() {
         tables.push(table);
       }
 
-      var numTables = header.numTables + requiredTables.length;
+      var numTables = tables.length + requiredTables.length;
 
       // header and new offsets. Table entry information is appended to the
       // end of file. The virtualOffset represents where to put the actual
@@ -15175,21 +15578,10 @@ var Font = (function FontClosure() {
       // of missing tables
       createOpenTypeHeader(header.version, ttf, numTables);
 
-      if (requiredTables.indexOf('OS/2') != -1) {
-        // extract some more font properties from the OpenType head and
-        // hhea tables; yMin and descent value are always negative
-        var override = {
-          unitsPerEm: int16([head.data[18], head.data[19]]),
-          yMax: int16([head.data[42], head.data[43]]),
-          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
-          ascent: int16([hhea.data[4], hhea.data[5]]),
-          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
-        };
-
-        tables.push({
-          tag: 'OS/2',
-          data: stringToArray(createOS2Table(properties, null, override))
-        });
+      // Invalid OS/2 can break the font for the Windows
+      if (os2 && !isOS2Valid(os2)) {
+        tables.splice(tables.indexOf(os2), 1);
+        os2 = null;
       }
 
       // Ensure the [h/v]mtx tables contains the advance width and
@@ -15470,6 +15862,23 @@ var Font = (function FontClosure() {
       }
       this.unicodeIsEnabled = unicodeIsEnabled;
 
+      if (!os2) {
+        // extract some more font properties from the OpenType head and
+        // hhea tables; yMin and descent value are always negative
+        var override = {
+          unitsPerEm: int16([head.data[18], head.data[19]]),
+          yMax: int16([head.data[42], head.data[43]]),
+          yMin: int16([head.data[38], head.data[39]]) - 0x10000,
+          ascent: int16([hhea.data[4], hhea.data[5]]),
+          descent: int16([hhea.data[6], hhea.data[7]]) - 0x10000
+        };
+
+        tables.push({
+          tag: 'OS/2',
+          data: stringToArray(createOS2Table(properties, glyphs, override))
+        });
+      }
+
       // Rewrite the 'post' table if needed
       if (requiredTables.indexOf('post') != -1) {
         tables.push({
@@ -15897,7 +16306,7 @@ var Font = (function FontClosure() {
 
       glyphs = [];
 
-      if (this.composite) {
+      if (this.wideChars) {
         // composite fonts have multi-byte strings convert the string from
         // single-byte to multi-byte
         // XXX assuming CIDFonts are two-byte - later need to extract the
@@ -16853,7 +17262,7 @@ var CFFFont = (function CFFFontClosure() {
     this.properties = properties;
 
     var parser = new CFFParser(file, properties);
-    var cff = parser.parse();
+    var cff = parser.parse(true);
     var compiler = new CFFCompiler(cff);
     this.readExtra(cff);
     try {
@@ -16944,7 +17353,7 @@ var CFFParser = (function CFFParserClosure() {
     this.properties = properties;
   }
   CFFParser.prototype = {
-    parse: function CFFParser_parse() {
+    parse: function CFFParser_parse(normalizeCIDData) {
       var properties = this.properties;
       var cff = new CFF();
       this.cff = cff;
@@ -16999,6 +17408,21 @@ var CFFParser = (function CFFParserClosure() {
       cff.charset = charset;
       cff.encoding = encoding;
 
+      if (!cff.isCIDFont || !normalizeCIDData)
+        return cff;
+
+      // DirectWrite does not like CID fonts data. Trying to convert/flatten
+      // the font data and remove CID properties.
+      if (cff.fdArray.length !== 1)
+        error('Unable to normalize CID font in CFF data');
+
+      var fontDict = cff.fdArray[0];
+      fontDict.setByKey(17, topDict.getByName('CharStrings'));
+      cff.topDict = fontDict;
+      cff.isCIDFont = false;
+      delete cff.fdArray;
+      delete cff.fdSelect;
+
       return cff;
     },
     parseHeader: function CFFParser_parseHeader() {
@@ -17597,9 +18021,9 @@ var CFFPrivateDict = (function CFFPrivateDictClosure() {
     [[12, 17], 'LanguageGroup', 'num', 0],
     [[12, 18], 'ExpansionFactor', 'num', 0.06],
     [[12, 19], 'initialRandomSeed', 'num', 0],
-    [19, 'Subrs', 'offset', null],
     [20, 'defaultWidthX', 'num', 0],
-    [21, 'nominalWidthX', 'num', 0]
+    [21, 'nominalWidthX', 'num', 0],
+    [19, 'Subrs', 'offset', null]
   ];
   var tables = null;
   function CFFPrivateDict(strings) {
@@ -18057,6 +18481,7 @@ var CFFCompiler = (function CFFCompilerClosure() {
   return CFFCompiler;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -22269,6 +22694,7 @@ var GlyphsUnicode = {
   '.notdef': 0x0000
 };
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -22286,7 +22712,7 @@ var PDFImage = (function PDFImageClosure() {
       var colorSpace = dict.get('ColorSpace', 'CS');
       colorSpace = ColorSpace.parse(colorSpace, xref, res);
       var numComps = colorSpace.numComps;
-      handler.send('jpeg_decode', [image.getIR(), numComps], function(message) {
+      handler.send('JpegDecode', [image.getIR(), numComps], function(message) {
         var data = message.data;
         var stream = new Stream(data, 0, data.length, image.dict);
         promise.resolve(stream);
@@ -22644,6 +23070,7 @@ function loadJpegStream(id, imageData, objs) {
   img.src = 'data:image/jpeg;base64,' + window.btoa(imageData);
 }
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -25591,6 +26018,7 @@ var Metrics = {
   }
 };
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -25842,9 +26270,12 @@ var Parser = (function ParserClosure() {
       if (name == 'CCITTFaxDecode' || name == 'CCF') {
         return new CCITTFaxStream(stream, params);
       }
-      if (name == 'RunLengthDecode') {
+      if (name == 'RunLengthDecode' || name == 'RL') {
         return new RunLengthStream(stream);
       }
+      if (name == 'JBIG2Decode') {
+        error('JBIG2 image format is not currently supprted.');
+      }
       warn('filter "' + name + '" not supported yet');
       return stream;
     }
@@ -25854,8 +26285,16 @@ var Parser = (function ParserClosure() {
 })();
 
 var Lexer = (function LexerClosure() {
-  function Lexer(stream) {
+  function Lexer(stream, knownCommands) {
     this.stream = stream;
+    // The PDFs might have "glued" commands with other commands, operands or
+    // literals, e.g. "q1". The knownCommands is a dictionary of the valid
+    // commands and their prefixes. The prefixes are built the following way:
+    // if there a command that is a prefix of the other valid command or
+    // literal (e.g. 'f' and 'false') the following prefixes must be included,
+    // 'fa', 'fal', 'fals'. The prefixes are not needed, if the command has no
+    // other commands or literals as a prefix. The knowCommands is optional.
+    this.knownCommands = knownCommands;
   }
 
   Lexer.isSpace = function Lexer_isSpace(ch) {
@@ -26119,12 +26558,18 @@ var Lexer = (function LexerClosure() {
 
       // command
       var str = ch;
+      var knownCommands = this.knownCommands;
+      var knownCommandFound = knownCommands && (str in knownCommands);
       while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
+        // stop if known command is found and next character does not make
+        // the str a command
+        if (knownCommandFound && !((str + ch) in knownCommands))
+          break;
         stream.skip();
         if (str.length == 128)
           error('Command token too long: ' + str.length);
-
         str += ch;
+        knownCommandFound = knownCommands && (str in knownCommands);
       }
       if (str == 'true')
         return true;
@@ -26230,6 +26675,7 @@ var Linearization = (function LinearizationClosure() {
   return Linearization;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -26342,7 +26788,7 @@ Shadings.RadialAxial = (function RadialAxialClosure() {
     var r1 = raw[6];
     return {
       type: 'Pattern',
-      getPattern: function(ctx) {
+      getPattern: function RadialAxial_getPattern(ctx) {
         var curMatrix = ctx.mozCurrentTransform;
         if (curMatrix) {
           var userMatrix = ctx.mozCurrentTransformInverse;
@@ -26533,6 +26979,7 @@ var TilingPattern = (function TilingPatternClosure() {
   return TilingPattern;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -28827,6 +29274,7 @@ var LZWStream = (function LZWStreamClosure() {
   return LZWStream;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -28914,14 +29362,64 @@ var WorkerMessageHandler = {
       handler.send('test', data instanceof Uint8Array);
     });
 
-    handler.on('doc', function wphSetupDoc(data) {
+    handler.on('GetDocRequest', function wphSetupDoc(data) {
       // Create only the model of the PDFDoc, which is enough for
       // processing the content of the pdf.
-      pdfModel = new PDFDocModel(new Stream(data));
+      var pdfData = data.data;
+      var pdfPassword = data.params.password;
+      try {
+        pdfModel = new PDFDocument(new Stream(pdfData), pdfPassword);
+      } catch (e) {
+        if (e instanceof PasswordException) {
+          if (e.code === 'needpassword') {
+            handler.send('NeedPassword', {
+              exception: e
+            });
+          } else if (e.code === 'incorrectpassword') {
+            handler.send('IncorrectPassword', {
+              exception: e
+            });
+          }
+
+          return;
+        } else {
+          throw e;
+        }
+      }
+      var doc = {
+        numPages: pdfModel.numPages,
+        fingerprint: pdfModel.getFingerprint(),
+        destinations: pdfModel.catalog.destinations,
+        outline: pdfModel.catalog.documentOutline,
+        info: pdfModel.getDocumentInfo(),
+        metadata: pdfModel.catalog.metadata,
+        encrypted: !!pdfModel.xref.encrypt
+      };
+      handler.send('GetDoc', {pdfInfo: doc});
     });
 
-    handler.on('page_request', function wphSetupPageRequest(pageNum) {
-      pageNum = parseInt(pageNum);
+    handler.on('GetPageRequest', function wphSetupGetPage(data) {
+      var pageNumber = data.pageIndex + 1;
+      var pdfPage = pdfModel.getPage(pageNumber);
+      var page = {
+        pageIndex: data.pageIndex,
+        rotate: pdfPage.rotate,
+        ref: pdfPage.ref,
+        view: pdfPage.view
+      };
+      handler.send('GetPage', {pageInfo: page});
+    });
+
+    handler.on('GetAnnotationsRequest', function wphSetupGetAnnotations(data) {
+      var pdfPage = pdfModel.getPage(data.pageIndex + 1);
+      handler.send('GetAnnotations', {
+        pageIndex: data.pageIndex,
+        annotations: pdfPage.getAnnotations()
+      });
+    });
+
+    handler.on('RenderPageRequest', function wphSetupRenderPage(data) {
+      var pageNum = data.pageIndex + 1;
 
 
       // The following code does quite the same as
@@ -28959,7 +29457,7 @@ var WorkerMessageHandler = {
           };
         }
 
-        handler.send('page_error', {
+        handler.send('PageError', {
           pageNum: pageNum,
           error: e
         });
@@ -28977,9 +29475,8 @@ var WorkerMessageHandler = {
           fonts[dep] = true;
         }
       }
-
-      handler.send('page', {
-        pageNum: pageNum,
+      handler.send('RenderPage', {
+        pageIndex: data.pageIndex,
         operatorList: operatorList,
         depFonts: Object.keys(fonts)
       });
@@ -29028,6 +29525,7 @@ if (typeof window === 'undefined') {
   WorkerMessageHandler.setup(handler);
 }
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- /
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -29667,7 +30165,10 @@ var JpegImage = (function jpegImage() {
                   tableData[z] = data[offset++];
                 }
               } else if ((quantizationTableSpec >> 4) === 1) { //16 bit
-                  tableData[j] = readUint16();
+                for (j = 0; j < 64; j++) {
+                  var z = dctZigZag[j];
+                  tableData[z] = readUint16();
+                }
               } else
                 throw "DQT: invalid table spec";
               quantizationTables[quantizationTableSpec & 15] = tableData;
@@ -29682,7 +30183,8 @@ var JpegImage = (function jpegImage() {
             frame.precision = data[offset++];
             frame.scanLines = readUint16();
             frame.samplesPerLine = readUint16();
-            frame.components = [];
+            frame.components = {};
+            frame.componentsOrder = [];
             var componentsCount = data[offset++], componentId;
             var maxH = 0, maxV = 0;
             for (i = 0; i < componentsCount; i++) {
@@ -29690,6 +30192,7 @@ var JpegImage = (function jpegImage() {
               var h = data[offset + 1] >> 4;
               var v = data[offset + 1] & 15;
               var qId = data[offset + 2];
+              frame.componentsOrder.push(componentId);
               frame.components[componentId] = {
                 h: h,
                 v: v,
@@ -29758,14 +30261,13 @@ var JpegImage = (function jpegImage() {
       this.jfif = jfif;
       this.adobe = adobe;
       this.components = [];
-      for (var id in frame.components) {
-        if (frame.components.hasOwnProperty(id)) {
-          this.components.push({
-            lines: buildComponentData(frame, frame.components[id]),
-            scaleX: frame.components[id].h / frame.maxH,
-            scaleY: frame.components[id].v / frame.maxV
-          });
-        }
+      for (var i = 0; i < frame.componentsOrder.length; i++) {
+        var component = frame.components[frame.componentsOrder[i]];
+        this.components.push({
+          lines: buildComponentData(frame, component),
+          scaleX: component.h / frame.maxH,
+          scaleY: component.v / frame.maxV
+        });
       }
     },
     getData: function getData(width, height) {
@@ -29938,7 +30440,8 @@ var JpegImage = (function jpegImage() {
   };
 
   return constructor;
-})();/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+})();
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
@@ -31800,6 +32303,7 @@ var JpxImage = (function JpxImageClosure() {
   return JpxImage;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
@@ -32232,14 +32736,35 @@ var bidi = PDFJS.bidi = (function bidiClosure() {
   return bidi;
 })();
 
+
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
 
 var Metadata = PDFJS.Metadata = (function MetadataClosure() {
+  function fixMetadata(meta) {
+    return meta.replace(/>\\376\\377([^<]+)/g, function(all, codes) {
+      var bytes = codes.replace(/\\([0-3])([0-7])([0-7])/g,
+                                function(code, d1, d2, d3) {
+        return String.fromCharCode(d1 * 64 + d2 * 8 + d3 * 1);
+      });
+      var chars = '';
+      for (var i = 0; i < bytes.length; i += 2) {
+        var code = bytes.charCodeAt(i) * 256 + bytes.charCodeAt(i + 1);
+        chars += code >= 32 && code < 127 && code != 60 && code != 62 &&
+          code != 38 && false ? String.fromCharCode(code) :
+          '&#x' + (0x10000 + code).toString(16).substring(1) + ';';
+      }
+      return '>' + chars;
+    });
+  }
+
   function Metadata(meta) {
     if (typeof meta === 'string') {
+      // Ghostscript produces invalid metadata
+      meta = fixMetadata(meta);
+
       var parser = new DOMParser();
       meta = parser.parseFromString(meta, 'application/xml');
     } else if (!(meta instanceof Document)) {
@@ -32308,125 +32833,139 @@ var Metadata = PDFJS.Metadata = (function MetadataClosure() {
   PDFJS.workerSrc = 'none';
 </script>
 
-        <link rel="stylesheet" href="viewer.css"/>
+    <link rel="stylesheet" href="viewer.css"/>
 
 
-        <!-- PDFJSSCRIPT_INCLUDE_BUILD -->
-        <script type="text/javascript" src="debugger.js"></script>
-        <script type="text/javascript" src="viewer.js"></script>
-
-
-    </head>
+    <!-- PDFJSSCRIPT_INCLUDE_BUILD -->
+    <script type="text/javascript" src="debugger.js"></script>
+    <script type="text/javascript" src="viewer.js"></script>
+  </head>
 
   <body>
-    <div id="controls">
-      <button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;">
-        <img src="images/go-up.svg" align="top" height="16"/>
-        Previous
-      </button>
+    <div id="outerContainer">
 
-      <button id="next" onclick="PDFView.page++;" oncontextmenu="return false;">
-        <img src="images/go-down.svg" align="top" height="16"/>
-        Next
-      </button>
-
-      <div class="separator"></div>
-
-      <input type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" />
-
-      <span>/</span>
-      <span id="numPages">--</span>
-
-      <div class="separator"></div>
-
-      <button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;">
-        <img src="images/zoom-out.svg" align="top" height="16"/>
-      </button>
-      <button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;">
-        <img src="images/zoom-in.svg" align="top" height="16"/>
-      </button>
-
-      <div class="separator"></div>
-
-      <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;">
-        <option id="customScaleOption" value="custom"></option>
-        <option value="0.5">50%</option>
-        <option value="0.75">75%</option>
-        <option value="1">100%</option>
-        <option value="1.25">125%</option>
-        <option value="1.5">150%</option>
-        <option value="2">200%</option>
-        <option id="pageWidthOption" value="page-width">Page Width</option>
-        <option id="pageFitOption" value="page-fit">Page Fit</option>
-        <option id="pageAutoOption" value="auto" selected="selected">Auto</option>
-      </select>
-
-      <div class="separator"></div>
-
-      <button id="print" onclick="window.print();" oncontextmenu="return false;">
-        <img src="images/document-print.svg" align="top" height="16"/>
-        Print
-      </button>
-
-      <button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">
-        <img src="images/download.svg" align="top" height="16"/>
-        Download
-      </button>
-
-      <div class="separator"></div>
-
-      <input id="fileInput" type="file" oncontextmenu="return false;"/>
-
-      <div id="fileInputSeperator" class="separator"></div>
-
-      <a href="#" id="viewBookmark" title="Bookmark (or copy) current location">
-        <img src="images/bookmark.svg" alt="Bookmark" align="top" height="16"/>
-      </a>
-
-    </div>
-    <div id="errorWrapper" hidden='true'>
-      <div id="errorMessageLeft">
-        <span id="errorMessage"></span>
-        <button id="errorShowMore" onclick="" oncontextmenu="return false;">
-          More Information
-        </button>
-        <button id="errorShowLess" onclick="" oncontextmenu="return false;" hidden='true'>
-          Less Information
-        </button>
-      </div>
-      <div id="errorMessageRight">
-        <button id="errorClose" oncontextmenu="return false;">
-          Close
-        </button>
-      </div>
-      <div class="clearBoth"></div>
-      <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
-    </div>
-
-    <div id="sidebar">
-      <div id="sidebarBox">
-        <div id="pinIcon" onClick="PDFView.pinSidebar()"></div>
-        <div id="sidebarScrollView">
-          <div id="sidebarView"></div>
+      <div id="sidebarContainer">
+        <div id="toolbarSidebar">
+          <div class="splitToolbarButton toggled">
+            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" onclick="PDFView.switchSidebarView('thumbs')" tabindex="1" data-l10n-id="thumbs">
+               <span data-l10n-id="thumbs_label">Thumbnails</span>
+            </button>
+            <button id="viewOutline" class="toolbarButton" title="Show Document Outline" onclick="PDFView.switchSidebarView('outline')" tabindex="2" data-l10n-id="outline">
+               <span data-l10n-id="outline_label">Document Outline</span>
+            </button>
+          </div>
         </div>
-        <div id="outlineScrollView" hidden='true'>
-          <div id="outlineView"></div>
+        <div id="sidebarContent">
+          <div id="thumbnailView">
+          </div>
+          <div id="outlineView" class="hidden">
+          </div>
         </div>
-        <div id="sidebarControls">
-          <button id="thumbsSwitch" title="Show Thumbnails" onclick="PDFView.switchSidebarView('thumbs')" data-selected>
-            <img src="images/nav-thumbs.svg" align="top" height="16" alt="Thumbs" />
-          </button>
-          <button id="outlineSwitch" title="Show Document Outline" onclick="PDFView.switchSidebarView('outline')" disabled>
-            <img src="images/nav-outline.svg" align="top" height="16" alt="Document Outline" />
-          </button>
-        </div>
-      </div>
-    </div>
+      </div>  <!-- sidebarContainer -->
 
-    <div id="loadingBox">
-        <div id="loading">Loading... 0%</div>
-        <div id="loadingBar"><div class="progress"></div></div>
-    </div>
-    <div id="viewer"></div>
+      <div id="mainContainer">
+        <div class="toolbar">
+          <div id="toolbarContainer">
+
+            <div id="toolbarViewer">
+              <div id="toolbarViewerLeft">
+                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3" data-l10n-id="toggle_slider">
+                  <span data-l10n-id="toggle_slider_label">Toggle Sidebar</span>
+                </button>
+                <div class="toolbarButtonSpacer"></div>
+                <div class="splitToolbarButton">
+                  <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="4" data-l10n-id="previous">
+                    <span data-l10n-id="previous_label">Previous</span>
+                  </button>
+                  <div class="splitToolbarButtonSeparator"></div>
+                  <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="5" data-l10n-id="next">
+                    <span data-l10n-id="next_label">Next</span>
+                  </button>
+                </div>
+                <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
+                <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" tabindex="6">
+                </input>
+                <span id="numPages" class="toolbarLabel"></span>
+              </div>
+              <div id="toolbarViewerRight">
+                <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" style="visibility: hidden; position: fixed; right: 0; top: 0" />
+                <button id="openFile" class="toolbarButton openFile" title="Open File" tabindex="10" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
+                   <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>
+                </button>
+                <!-- <div class="toolbarButtonSpacer"></div> -->
+                <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Current view (copy or open in new window)" tabindex="13" data-l10n-id="bookmark"><span data-l10n-id="bookmark_label">Current View</span></a>
+              </div>
+              <div class="outerCenter">
+                <div class="innerCenter" id="toolbarViewerMiddle">
+                  <div class="splitToolbarButton">
+                    <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="7" data-l10n-id="zoom_out">
+                      <span data-l10n-id="zoom_out_label">Zoom Out</span>
+                    </button>
+                    <div class="splitToolbarButtonSeparator"></div>
+                    <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="8" data-l10n-id="zoom_in">
+                      <span data-l10n-id="zoom_in_label">Zoom In</span>
+                     </button>
+                  </div>
+                  <span id="scaleSelectContainer" class="dropdownToolbarButton">
+                     <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" title="Zoom" oncontextmenu="return false;" tabindex="9" data-l10n-id="zoom">
+                      <option id="pageAutoOption" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
+                      <option id="pageActualOption" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
+                      <option id="pageFitOption" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>
+                      <option id="pageWidthOption" value="page-width" data-l10n-id="page_scale_width">Full Width</option>
+                      <option id="customScaleOption" value="custom"></option>
+                      <option value="0.5">50%</option>
+                      <option value="0.75">75%</option>
+                      <option value="1">100%</option>
+                      <option value="1.25">125%</option>
+                      <option value="1.5">150%</option>
+                      <option value="2">200%</option>
+                    </select>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div id="viewerContainer">
+          <div id="viewer"></div>
+        </div>
+
+        <div id="loadingBox">
+            <div id="loading" data-l10n-id="loading" data-l10n-args='{"percent": 0}'>Loading... 0%</div>
+            <div id="loadingBar"><div class="progress"></div></div>
+        </div>
+
+        <div id="errorWrapper" hidden='true'>
+          <div id="errorMessageLeft">
+            <span id="errorMessage"></span>
+            <button id="errorShowMore" onclick="" oncontextmenu="return false;" data-l10n-id="error_more_info">
+              More Information
+            </button>
+            <button id="errorShowLess" onclick="" oncontextmenu="return false;" data-l10n-id="error_less_info" hidden='true'>
+              Less Information
+            </button>
+          </div>
+          <div id="errorMessageRight">
+            <button id="errorClose" oncontextmenu="return false;" data-l10n-id="error_close">
+              Close
+            </button>
+          </div>
+          <div class="clearBoth"></div>
+          <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
+        </div>
+      </div> <!-- mainContainer -->
+
+    </div> <!-- outerContainer -->
   </body>
 </html>
diff --git a/browser/extensions/pdfjs/content/web/viewer.js b/browser/extensions/pdfjs/content/web/viewer.js
index 122c178e5188..f616b02c9c26 100644
--- a/browser/extensions/pdfjs/content/web/viewer.js
+++ b/browser/extensions/pdfjs/content/web/viewer.js
@@ -1,8 +1,4 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 
 'use strict';
@@ -19,6 +15,8 @@ var kMaxScale = 4.0;
 var kImageDirectory = './images/';
 var kSettingsMemory = 20;
 
+var mozL10n = document.mozL10n || document.webL10n;
+
 function getFileName(url) {
   var anchor = url.indexOf('#');
   var query = url.indexOf('?');
@@ -36,7 +34,7 @@ var Cache = function cacheCache(size) {
       data.splice(i);
     data.push(view);
     if (data.length > size)
-      data.shift().update();
+      data.shift().destroy();
   };
 };
 
@@ -66,6 +64,9 @@ var ProgressBar = (function ProgressBarClosure() {
     updateBar: function ProgressBar_updateBar() {
       var progressSize = this.width * this._percent / 100;
 
+      if (this._percent > 95)
+        this.div.classList.add('full');
+
       this.div.style.width = progressSize + this.units;
     },
 
@@ -218,6 +219,13 @@ var PDFView = {
   currentScale: kUnknownScale,
   currentScaleValue: null,
   initialBookmark: document.location.hash.substring(1),
+  container: null,
+  initialized: false,
+  // called once when the document is loaded
+  initialize: function pdfViewInitialize() {
+    this.container = document.getElementById('viewerContainer');
+    this.initialized = true;
+  },
 
   setScale: function pdfViewSetScale(val, resetAutoSettings) {
     if (val == this.currentScale)
@@ -249,32 +257,43 @@ var PDFView = {
       return;
     }
 
+    var container = this.container;
     var currentPage = this.pages[this.page - 1];
-    var pageWidthScale = (window.innerWidth - kScrollbarPadding) /
-                          currentPage.width / kCssUnits;
-    var pageHeightScale = (window.innerHeight - kScrollbarPadding) /
-                           currentPage.height / kCssUnits;
-    if ('page-width' == value)
-      this.setScale(pageWidthScale, resetAutoSettings);
-    if ('page-height' == value)
-      this.setScale(pageHeightScale, resetAutoSettings);
-    if ('page-fit' == value) {
-      this.setScale(
-        Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
+    var pageWidthScale = (container.clientWidth - kScrollbarPadding) /
+                          currentPage.width * currentPage.scale / kCssUnits;
+    var pageHeightScale = (container.clientHeight - kScrollbarPadding) /
+                           currentPage.height * currentPage.scale / kCssUnits;
+    switch (value) {
+      case 'page-actual':
+        this.setScale(1, resetAutoSettings);
+        break;
+      case 'page-width':
+        this.setScale(pageWidthScale, resetAutoSettings);
+        break;
+      case 'page-height':
+        this.setScale(pageHeightScale, resetAutoSettings);
+        break;
+      case 'page-fit':
+        this.setScale(
+            Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
+        break;
+      case 'auto':
+        this.setScale(Math.min(1.0, pageWidthScale), resetAutoSettings);
+        break;
     }
-    if ('auto' == value)
-      this.setScale(Math.min(1.0, pageWidthScale), resetAutoSettings);
 
     selectScaleOption(value);
   },
 
   zoomIn: function pdfViewZoomIn() {
-    var newScale = Math.min(kMaxScale, this.currentScale * kDefaultScaleDelta);
+    var newScale = (this.currentScale * kDefaultScaleDelta).toFixed(2);
+    newScale = Math.min(kMaxScale, newScale);
     this.parseScale(newScale, true);
   },
 
   zoomOut: function pdfViewZoomOut() {
-    var newScale = Math.max(kMinScale, this.currentScale / kDefaultScaleDelta);
+    var newScale = (this.currentScale / kDefaultScaleDelta).toFixed(2);
+    newScale = Math.max(kMinScale, newScale);
     this.parseScale(newScale, true);
   },
 
@@ -312,37 +331,53 @@ var PDFView = {
     return currentPageNumber;
   },
 
-  open: function pdfViewOpen(url, scale) {
-    this.url = url;
-
-    document.title = decodeURIComponent(getFileName(url)) || url;
+  open: function pdfViewOpen(url, scale, password) {
+    var parameters = {password: password};
+    if (typeof url === 'string') { // URL
+      this.url = url;
+      document.title = decodeURIComponent(getFileName(url)) || url;
+      parameters.url = url;
+    } else if (url && 'byteLength' in url) { // ArrayBuffer
+      parameters.data = url;
+    }
 
     if (!PDFView.loadingBar) {
       PDFView.loadingBar = new ProgressBar('#loadingBar', {});
     }
 
     var self = this;
-    PDFJS.getPdf(
-      {
-        url: url,
-        progress: function getPdfProgress(evt) {
-          if (evt.lengthComputable)
-            self.progress(evt.loaded / evt.total);
-        },
-        error: function getPdfError(e) {
-          var loadingIndicator = document.getElementById('loading');
-          loadingIndicator.textContent = 'Error';
-          var moreInfo = {
-            message: 'Unexpected server response of ' + e.target.status + '.'
-          };
-          self.error('An error occurred while loading the PDF.', moreInfo);
-        }
-      },
-      function getPdfLoad(data) {
-        self.loading = true;
-        self.load(data, scale);
+    self.loading = true;
+    PDFJS.getDocument(parameters).then(
+      function getDocumentCallback(pdfDocument) {
+        self.load(pdfDocument, scale);
         self.loading = false;
-      });
+      },
+      function getDocumentError(message, exception) {
+        if (exception.name === 'PasswordException') {
+          if (exception.code === 'needpassword') {
+            var promptString = mozL10n.get('request_password', null,
+                                      'PDF is protected by a password:');
+            password = prompt(promptString);
+            if (password && password.length > 0) {
+              return PDFView.open(url, scale, password);
+            }
+          }
+        }
+
+        var loadingIndicator = document.getElementById('loading');
+        loadingIndicator.textContent = mozL10n.get('loading_error_indicator',
+          null, 'Error');
+        var moreInfo = {
+          message: message
+        };
+        self.error(mozL10n.get('loading_error', null,
+          'An error occurred while loading the PDF.'), moreInfo);
+        self.loading = false;
+      },
+      function getDocumentProgress(progressData) {
+        self.progress(progressData.loaded / progressData.total);
+      }
+    );
   },
 
   download: function pdfViewDownload() {
@@ -364,6 +399,8 @@ var PDFView = {
     var destRef = dest[0];
     var pageNumber = destRef instanceof Object ?
       this.pagesRefMap[destRef.num + ' ' + destRef.gen + ' R'] : (destRef + 1);
+    if (pageNumber > this.pages.length)
+      pageNumber = this.pages.length;
     if (pageNumber) {
       this.page = pageNumber;
       var currentPage = this.pages[pageNumber - 1];
@@ -441,17 +478,29 @@ var PDFView = {
     };
     moreInfoButton.removeAttribute('hidden');
     lessInfoButton.setAttribute('hidden', 'true');
-    errorMoreInfo.value = 'PDF.JS Build: ' + PDFJS.build + '\n';
+    errorMoreInfo.value =
+      mozL10n.get('error_build', {build: PDFJS.build},
+      'PDF.JS Build: {{build}}') + '\n';
 
     if (moreInfo) {
-      errorMoreInfo.value += 'Message: ' + moreInfo.message;
+      errorMoreInfo.value +=
+        mozL10n.get('error_message', {message: moreInfo.message},
+        'Message: {{message}}');
       if (moreInfo.stack) {
-        errorMoreInfo.value += '\n' + 'Stack: ' + moreInfo.stack;
+        errorMoreInfo.value += '\n' +
+          mozL10n.get('error_stack', {stack: moreInfo.stack},
+          'Stack: {{stack}}');
       } else {
-        if (moreInfo.filename)
-          errorMoreInfo.value += '\n' + 'File: ' + moreInfo.filename;
-        if (moreInfo.lineNumber)
-          errorMoreInfo.value += '\n' + 'Line: ' + moreInfo.lineNumber;
+        if (moreInfo.filename) {
+          errorMoreInfo.value += '\n' +
+            mozL10n.get('error_file', {file: moreInfo.filename},
+            'File: {{file}}');
+        }
+        if (moreInfo.lineNumber) {
+          errorMoreInfo.value += '\n' +
+            mozL10n.get('error_line', {line: moreInfo.lineNumber},
+            'Line: {{line}}');
+        }
       }
     }
     errorMoreInfo.rows = errorMoreInfo.value.split('\n').length - 1;
@@ -460,12 +509,13 @@ var PDFView = {
   progress: function pdfViewProgress(level) {
     var percent = Math.round(level * 100);
     var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.textContent = 'Loading... ' + percent + '%';
+    loadingIndicator.textContent = mozL10n.get('loading', {percent: percent},
+      'Loading... {{percent}}%');
 
     PDFView.loadingBar.percent = percent;
   },
 
-  load: function pdfViewLoad(data, scale) {
+  load: function pdfViewLoad(pdfDocument, scale) {
     function bindOnAfterDraw(pageView, thumbnailView) {
       // when page is painted, using the image as thumbnail base
       pageView.onAfterDraw = function pdfViewLoadOnAfterDraw() {
@@ -480,29 +530,24 @@ var PDFView = {
     var loadingBox = document.getElementById('loadingBox');
     loadingBox.setAttribute('hidden', 'true');
 
-    var sidebar = document.getElementById('sidebarView');
-    sidebar.parentNode.scrollTop = 0;
+    var thumbsView = document.getElementById('thumbnailView');
+    thumbsView.parentNode.scrollTop = 0;
 
-    while (sidebar.hasChildNodes())
-      sidebar.removeChild(sidebar.lastChild);
+    while (thumbsView.hasChildNodes())
+      thumbsView.removeChild(thumbsView.lastChild);
 
-    if ('_loadingInterval' in sidebar)
-      clearInterval(sidebar._loadingInterval);
+    if ('_loadingInterval' in thumbsView)
+      clearInterval(thumbsView._loadingInterval);
 
     var container = document.getElementById('viewer');
     while (container.hasChildNodes())
       container.removeChild(container.lastChild);
 
-    var pdf;
-    try {
-      pdf = new PDFJS.PDFDoc(data);
-    } catch (e) {
-      this.error('An error occurred while reading the PDF.', e);
-    }
-    var pagesCount = pdf.numPages;
-    var id = pdf.fingerprint;
+    var pagesCount = pdfDocument.numPages;
+    var id = pdfDocument.fingerprint;
     var storedHash = null;
-    document.getElementById('numPages').textContent = pagesCount;
+    document.getElementById('numPages').textContent =
+      mozL10n.get('page_of', {pageCount: pagesCount}, 'of {{pageCount}}');
     document.getElementById('pageNumber').max = pagesCount;
     PDFView.documentFingerprint = id;
     var store = PDFView.store = new Settings(id);
@@ -518,30 +563,62 @@ var PDFView = {
     var pages = this.pages = [];
     var pagesRefMap = {};
     var thumbnails = this.thumbnails = [];
-    for (var i = 1; i <= pagesCount; i++) {
-      var page = pdf.getPage(i);
-      var pageView = new PageView(container, page, i, page.width, page.height,
-                                  page.stats, this.navigateTo.bind(this));
-      var thumbnailView = new ThumbnailView(sidebar, page, i,
-                                            page.width / page.height);
-      bindOnAfterDraw(pageView, thumbnailView);
+    var pagePromises = [];
+    for (var i = 1; i <= pagesCount; i++)
+      pagePromises.push(pdfDocument.getPage(i));
+    var self = this;
+    var pagesPromise = PDFJS.Promise.all(pagePromises);
+    pagesPromise.then(function(promisedPages) {
+      for (var i = 1; i <= pagesCount; i++) {
+        var page = promisedPages[i - 1];
+        var pageView = new PageView(container, page, i, scale,
+                                    page.stats, self.navigateTo.bind(self));
+        var thumbnailView = new ThumbnailView(thumbsView, page, i);
+        bindOnAfterDraw(pageView, thumbnailView);
 
-      pages.push(pageView);
-      thumbnails.push(thumbnailView);
-      var pageRef = page.ref;
-      pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
-    }
+        pages.push(pageView);
+        thumbnails.push(thumbnailView);
+        var pageRef = page.ref;
+        pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
+      }
 
-    this.pagesRefMap = pagesRefMap;
-    this.destinations = pdf.catalog.destinations;
+      self.pagesRefMap = pagesRefMap;
+    });
 
-    if (pdf.catalog.documentOutline) {
-      this.outline = new DocumentOutlineView(pdf.catalog.documentOutline);
-      var outlineSwitchButton = document.getElementById('outlineSwitch');
-      outlineSwitchButton.removeAttribute('disabled');
-      this.switchSidebarView('outline');
-    }
+    var destinationsPromise = pdfDocument.getDestinations();
+    destinationsPromise.then(function(destinations) {
+      self.destinations = destinations;
+    });
 
+    // outline and initial view depends on destinations and pagesRefMap
+    PDFJS.Promise.all([pagesPromise, destinationsPromise]).then(function() {
+      pdfDocument.getOutline().then(function(outline) {
+        self.outline = new DocumentOutlineView(outline);
+      });
+
+      self.setInitialView(storedHash, scale);
+    });
+
+    pdfDocument.getMetadata().then(function(data) {
+      var info = data.info, metadata = data.metadata;
+      self.documentInfo = info;
+      self.metadata = metadata;
+
+      var pdfTitle;
+      if (metadata) {
+        if (metadata.has('dc:title'))
+          pdfTitle = metadata.get('dc:title');
+      }
+
+      if (!pdfTitle && info && info['Title'])
+        pdfTitle = info['Title'];
+
+      if (pdfTitle)
+        document.title = pdfTitle + ' - ' + document.title;
+    });
+  },
+
+  setInitialView: function pdfViewSetInitialView(storedHash, scale) {
     // Reset the current scale, as otherwise the page's scale might not get
     // updated if the zoom level stayed the same.
     this.currentScale = 0;
@@ -562,24 +639,6 @@ var PDFView = {
       // Setting the default one.
       this.parseScale(kDefaultScale, true);
     }
-
-    this.metadata = null;
-    var metadata = pdf.catalog.metadata;
-    var info = this.documentInfo = pdf.info;
-    var pdfTitle;
-
-    if (metadata) {
-      this.metadata = metadata = new PDFJS.Metadata(metadata);
-
-      if (metadata.has('dc:title'))
-        pdfTitle = metadata.get('dc:title');
-    }
-
-    if (!pdfTitle && info && info['Title'])
-      pdfTitle = info['Title'];
-
-    if (pdfTitle)
-      document.title = pdfTitle;
   },
 
   setHash: function pdfViewSetHash(hash) {
@@ -622,64 +681,67 @@ var PDFView = {
   },
 
   switchSidebarView: function pdfViewSwitchSidebarView(view) {
-    var thumbsScrollView = document.getElementById('sidebarScrollView');
-    var outlineScrollView = document.getElementById('outlineScrollView');
-    var thumbsSwitchButton = document.getElementById('thumbsSwitch');
-    var outlineSwitchButton = document.getElementById('outlineSwitch');
+    var thumbsView = document.getElementById('thumbnailView');
+    var outlineView = document.getElementById('outlineView');
+    var thumbsSwitchButton = document.getElementById('viewThumbnail');
+    var outlineSwitchButton = document.getElementById('viewOutline');
+
+    if (outlineSwitchButton.getAttribute('disabled'))
+      return;
+
+    thumbsView.classList.toggle('hidden');
+    outlineView.classList.toggle('hidden');
+    document.getElementById('viewThumbnail').classList.toggle('toggled');
+    document.getElementById('viewOutline').classList.toggle('toggled');
+
     switch (view) {
       case 'thumbs':
-        thumbsScrollView.removeAttribute('hidden');
-        outlineScrollView.setAttribute('hidden', 'true');
-        thumbsSwitchButton.setAttribute('data-selected', true);
-        outlineSwitchButton.removeAttribute('data-selected');
         updateThumbViewArea();
         break;
       case 'outline':
-        thumbsScrollView.setAttribute('hidden', 'true');
-        outlineScrollView.removeAttribute('hidden');
-        thumbsSwitchButton.removeAttribute('data-selected');
-        outlineSwitchButton.setAttribute('data-selected', true);
         break;
     }
   },
 
-  pinSidebar: function pdfViewPinSidebar() {
-    document.getElementById('sidebar').classList.toggle('pinned');
-  },
-
   getVisiblePages: function pdfViewGetVisiblePages() {
     var pages = this.pages;
     var kBottomMargin = 10;
+    var kTopPadding = 30;
     var visiblePages = [];
 
-    var currentHeight = kBottomMargin;
-    var windowTop = window.pageYOffset;
+    var currentHeight = kTopPadding + kBottomMargin;
+    var container = this.container;
+    // Add 1px to the scrolltop to give a little wiggle room if the math is off,
+    // this won't be needed if we calc current page number based off the middle
+    // of the screen instead of the top.
+    var containerTop = container.scrollTop + 1;
     for (var i = 1; i <= pages.length; ++i) {
       var page = pages[i - 1];
-      var pageHeight = page.height * page.scale + kBottomMargin;
-      if (currentHeight + pageHeight > windowTop)
+      var pageHeight = page.height + kBottomMargin;
+      if (currentHeight + pageHeight > containerTop)
         break;
 
       currentHeight += pageHeight;
     }
 
-    var windowBottom = window.pageYOffset + window.innerHeight;
-    for (; i <= pages.length && currentHeight < windowBottom; ++i) {
+    var containerBottom = containerTop + container.clientHeight;
+    for (; i <= pages.length && currentHeight < containerBottom; ++i) {
       var singlePage = pages[i - 1];
       visiblePages.push({ id: singlePage.id, y: currentHeight,
                           view: singlePage });
-      currentHeight += singlePage.height * singlePage.scale + kBottomMargin;
+      currentHeight += page.height + kBottomMargin;
     }
     return visiblePages;
   },
 
   getVisibleThumbs: function pdfViewGetVisibleThumbs() {
     var thumbs = this.thumbnails;
-    var kBottomMargin = 5;
+    var kBottomMargin = 15;
     var visibleThumbs = [];
 
-    var view = document.getElementById('sidebarScrollView');
+    var view = document.getElementById('thumbnailView');
     var currentHeight = kBottomMargin;
+
     var top = view.scrollTop;
     for (var i = 1; i <= thumbs.length; ++i) {
       var thumb = thumbs[i - 1];
@@ -715,16 +777,13 @@ var PDFView = {
   }
 };
 
-var PageView = function pageView(container, content, id, pageWidth, pageHeight,
+var PageView = function pageView(container, pdfPage, id, scale,
                                  stats, navigateTo) {
   this.id = id;
-  this.content = content;
+  this.pdfPage = pdfPage;
 
-  var view = this.content.view;
-  this.x = view.x;
-  this.y = view.y;
-  this.width = view.width;
-  this.height = view.height;
+  this.scale = scale || 1.0;
+  this.viewport = this.pdfPage.getViewport(this.scale);
 
   var anchor = document.createElement('a');
   anchor.name = '' + this.id;
@@ -736,10 +795,18 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
   container.appendChild(anchor);
   container.appendChild(div);
 
+  this.destroy = function pageViewDestroy() {
+    this.update();
+    this.pdfPage.destroy();
+  };
+
   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';
+    var viewport = this.pdfPage.getViewport(this.scale);
+
+    this.viewport = viewport;
+    div.style.width = viewport.width + 'px';
+    div.style.height = viewport.height + 'px';
 
     while (div.hasChildNodes())
       div.removeChild(div.lastChild);
@@ -752,7 +819,21 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
     div.appendChild(this.loadingIconDiv);
   };
 
-  function setupAnnotations(content, scale) {
+  Object.defineProperty(this, 'width', {
+    get: function PageView_getWidth() {
+      return this.viewport.width;
+    },
+    enumerable: true
+  });
+
+  Object.defineProperty(this, 'height', {
+    get: function PageView_getHeight() {
+      return this.viewport.height;
+    },
+    enumerable: true
+  });
+
+  function setupAnnotations(pdfPage, viewport) {
     function bindLink(link, dest) {
       link.href = PDFView.getDestinationHash(dest);
       link.onclick = function pageViewSetupLinksOnclick() {
@@ -762,11 +843,13 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
       };
     }
     function createElementWithStyle(tagName, item) {
+      var rect = viewport.convertToViewportRectangle(item.rect);
+      rect = PDFJS.Util.normalizeRect(rect);
       var element = document.createElement(tagName);
-      element.style.left = (Math.floor(item.x - view.x) * scale) + 'px';
-      element.style.top = (Math.floor(item.y - view.y) * scale) + 'px';
-      element.style.width = Math.ceil(item.width * scale) + 'px';
-      element.style.height = Math.ceil(item.height * scale) + 'px';
+      element.style.left = Math.floor(rect[0]) + 'px';
+      element.style.top = Math.floor(rect[1]) + 'px';
+      element.style.width = Math.ceil(rect[2] - rect[0]) + 'px';
+      element.style.height = Math.ceil(rect[3] - rect[1]) + 'px';
       return element;
     }
     function createCommentAnnotation(type, item) {
@@ -774,17 +857,21 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
       container.className = 'annotComment';
 
       var image = createElementWithStyle('img', item);
-      image.src = kImageDirectory + type.toLowerCase() + '.svg';
+      var type = item.type;
+      var rect = viewport.convertToViewportRectangle(item.rect);
+      rect = PDFJS.Util.normalizeRect(rect);
+      image.src = kImageDirectory + 'annotation-' + type.toLowerCase() + '.svg';
+      image.alt = mozL10n.get('text_annotation_type', {type: type},
+        '[{{type}} Annotation]');
       var content = document.createElement('div');
       content.setAttribute('hidden', true);
       var title = document.createElement('h1');
       var text = document.createElement('p');
-      var offsetPos = Math.floor(item.x - view.x + item.width);
-      content.style.left = (offsetPos * scale) + 'px';
-      content.style.top = (Math.floor(item.y - view.y) * scale) + 'px';
+      content.style.left = Math.floor(rect[2]) + 'px';
+      content.style.top = Math.floor(rect[1]) + 'px';
       title.textContent = item.title;
 
-      if (!item.content) {
+      if (!item.content && !item.title) {
         content.setAttribute('hidden', true);
       } else {
         var e = document.createElement('span');
@@ -797,11 +884,11 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
         }
         text.appendChild(e);
         image.addEventListener('mouseover', function annotationImageOver() {
-           this.nextSibling.removeAttribute('hidden');
+           content.removeAttribute('hidden');
         }, false);
 
         image.addEventListener('mouseout', function annotationImageOut() {
-           this.nextSibling.setAttribute('hidden', true);
+           content.setAttribute('hidden', true);
         }, false);
       }
 
@@ -813,29 +900,29 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
       return container;
     }
 
-    var items = content.getAnnotations();
-    for (var i = 0; i < items.length; i++) {
-      var item = items[i];
-      switch (item.type) {
-        case 'Link':
-          var link = createElementWithStyle('a', item);
-          link.href = item.url || '';
-          if (!item.url)
-            bindLink(link, ('dest' in item) ? item.dest : null);
-          div.appendChild(link);
-          break;
-        case 'Text':
-          var comment = createCommentAnnotation(item.name, item);
-          if (comment)
-            div.appendChild(comment);
-          break;
+    pdfPage.getAnnotations().then(function(items) {
+      for (var i = 0; i < items.length; i++) {
+        var item = items[i];
+        switch (item.type) {
+          case 'Link':
+            var link = createElementWithStyle('a', item);
+            link.href = item.url || '';
+            if (!item.url)
+              bindLink(link, ('dest' in item) ? item.dest : null);
+            div.appendChild(link);
+            break;
+          case 'Text':
+            var comment = createCommentAnnotation(item.name, item);
+            if (comment)
+              div.appendChild(comment);
+            break;
+        }
       }
-    }
+    });
   }
 
   this.getPagePoint = function pageViewGetPagePoint(x, y) {
-    var scale = PDFView.currentScale;
-    return this.content.rotatePoint(x / scale, y / scale);
+    return this.viewport.convertToPdfPoint(x, y);
   };
 
   this.scrollIntoView = function pageViewScrollIntoView(dest) {
@@ -872,9 +959,9 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
           y = dest[3];
           width = dest[4] - x;
           height = dest[5] - y;
-          widthScale = (window.innerWidth - kScrollbarPadding) /
+          widthScale = (this.container.clientWidth - kScrollbarPadding) /
             width / kCssUnits;
-          heightScale = (window.innerHeight - kScrollbarPadding) /
+          heightScale = (this.container.clientHeight - kScrollbarPadding) /
             height / kCssUnits;
           scale = Math.min(widthScale, heightScale);
           break;
@@ -882,31 +969,30 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
           return;
       }
 
-      var boundingRect = [
-        this.content.rotatePoint(x, y),
-        this.content.rotatePoint(x + width, y + height)
-      ];
-
       if (scale && scale !== PDFView.currentScale)
         PDFView.parseScale(scale, true);
       else if (PDFView.currentScale === kUnknownScale)
         PDFView.parseScale(kDefaultScale, true);
 
+      var boundingRect = [
+        this.viewport.convertToViewportPoint(x, y),
+        this.viewport.convertToViewportPoint(x + width, y + height)
+      ];
       setTimeout(function pageViewScrollIntoViewRelayout() {
         // letting page to re-layout before scrolling
         var scale = PDFView.currentScale;
-        var x = Math.min(boundingRect[0].x, boundingRect[1].x);
-        var y = Math.min(boundingRect[0].y, boundingRect[1].y);
-        var width = Math.abs(boundingRect[0].x - boundingRect[1].x);
-        var height = Math.abs(boundingRect[0].y - boundingRect[1].y);
+        var x = Math.min(boundingRect[0][0], boundingRect[1][0]);
+        var y = Math.min(boundingRect[0][1], boundingRect[1][1]);
+        var width = Math.abs(boundingRect[0][0] - boundingRect[1][0]);
+        var height = Math.abs(boundingRect[0][1] - boundingRect[1][1]);
 
         // using temporary div to scroll it into view
         var tempDiv = document.createElement('div');
         tempDiv.style.position = 'absolute';
-        tempDiv.style.left = Math.floor(x * scale) + 'px';
-        tempDiv.style.top = Math.floor(y * scale) + 'px';
-        tempDiv.style.width = Math.ceil(width * scale) + 'px';
-        tempDiv.style.height = Math.ceil(height * scale) + 'px';
+        tempDiv.style.left = Math.floor(x) + 'px';
+        tempDiv.style.top = Math.floor(y) + 'px';
+        tempDiv.style.width = Math.ceil(width) + 'px';
+        tempDiv.style.height = Math.ceil(height) + 'px';
         div.appendChild(tempDiv);
         tempDiv.scrollIntoView(true);
         div.removeChild(tempDiv);
@@ -938,39 +1024,54 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
     }
     var textLayer = textLayerDiv ? new TextLayerBuilder(textLayerDiv) : null;
 
-    var scale = this.scale;
-    canvas.width = pageWidth * scale;
-    canvas.height = pageHeight * scale;
+    var scale = this.scale, viewport = this.viewport;
+    canvas.width = viewport.width;
+    canvas.height = viewport.height;
 
     var ctx = canvas.getContext('2d');
     ctx.save();
     ctx.fillStyle = 'rgb(255, 255, 255)';
     ctx.fillRect(0, 0, canvas.width, canvas.height);
     ctx.restore();
-    ctx.translate(-this.x * scale, -this.y * scale);
 
     // Rendering area
 
     var self = this;
-    this.content.startRendering(ctx, function pageViewDrawCallback(error) {
+    function pageViewDrawCallback(error) {
       if (self.loadingIconDiv) {
         div.removeChild(self.loadingIconDiv);
         delete self.loadingIconDiv;
       }
 
-      if (error)
-        PDFView.error('An error occurred while rendering the page.', error);
+      if (error) {
+        PDFView.error(mozL10n.get('rendering_error', null,
+          'An error occurred while rendering the page.'), error);
+      }
 
-      self.stats = content.stats;
+      self.stats = pdfPage.stats;
       self.updateStats();
       if (self.onAfterDraw)
         self.onAfterDraw();
 
       cache.push(self);
       callback();
-    }, textLayer);
+    }
 
-    setupAnnotations(this.content, this.scale);
+    var renderContext = {
+      canvasContext: ctx,
+      viewport: this.viewport,
+      textLayer: textLayer
+    };
+    this.pdfPage.render(renderContext).then(
+      function pdfPageRenderCallback() {
+        pageViewDrawCallback(null);
+      },
+      function pdfPageRenderError(error) {
+        pageViewDrawCallback(error);
+      }
+    );
+
+    setupAnnotations(this.pdfPage, this.viewport);
     div.setAttribute('data-loaded', true);
   };
 
@@ -982,26 +1083,25 @@ var PageView = function pageView(container, content, id, pageWidth, pageHeight,
   };
 };
 
-var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
+var ThumbnailView = function thumbnailView(container, pdfPage, id) {
   var anchor = document.createElement('a');
   anchor.href = PDFView.getAnchorUrl('#page=' + id);
-  anchor.onclick = function stopNivigation() {
+  anchor.title = mozL10n.get('thumb_page_title', {page: id}, 'Page {{page}}');
+  anchor.onclick = function stopNavigation() {
     PDFView.page = id;
     return false;
   };
 
-  var view = page.view;
-  this.width = view.width;
-  this.height = view.height;
+  var viewport = pdfPage.getViewport(1);
+  var pageWidth = this.width = viewport.width;
+  var pageHeight = this.height = viewport.height;
+  var pageRatio = pageWidth / pageHeight;
   this.id = id;
 
-  var maxThumbSize = 134;
-  var canvasWidth = pageRatio >= 1 ? maxThumbSize :
-    maxThumbSize * pageRatio;
-  var canvasHeight = pageRatio <= 1 ? maxThumbSize :
-    maxThumbSize / pageRatio;
-  var scaleX = this.scaleX = (canvasWidth / this.width);
-  var scaleY = this.scaleY = (canvasHeight / this.height);
+  var canvasWidth = 98;
+  var canvasHeight = canvasWidth / this.width * this.height;
+  var scaleX = this.scaleX = (canvasWidth / pageWidth);
+  var scaleY = this.scaleY = (canvasHeight / pageHeight);
 
   var div = document.createElement('div');
   div.id = 'thumbnailContainer' + id;
@@ -1019,22 +1119,22 @@ var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
 
     canvas.width = canvasWidth;
     canvas.height = canvasHeight;
+    canvas.className = 'thumbnailImage';
+    canvas.setAttribute('aria-label', mozL10n.get('thumb_page_canvas',
+      {page: id}, 'Thumbnail of Page {{page}}'));
 
     div.setAttribute('data-loaded', true);
-    div.appendChild(canvas);
+
+    var ring = document.createElement('div');
+    ring.className = 'thumbnailSelectionRing';
+    ring.appendChild(canvas);
+    div.appendChild(ring);
 
     var ctx = canvas.getContext('2d');
     ctx.save();
     ctx.fillStyle = 'rgb(255, 255, 255)';
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    ctx.fillRect(0, 0, canvasWidth, canvasHeight);
     ctx.restore();
-
-    var view = page.view;
-    ctx.translate(-view.x * scaleX, -view.y * scaleY);
-    div.style.width = (view.width * scaleX) + 'px';
-    div.style.height = (view.height * scaleY) + 'px';
-    div.style.lineHeight = (view.height * scaleY) + 'px';
-
     return ctx;
   }
 
@@ -1049,10 +1149,19 @@ var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
     }
 
     var ctx = getPageDrawContext();
-    page.startRendering(ctx, function thumbnailViewDrawStartRendering() {
-      callback();
-    });
-
+    var drawViewport = pdfPage.getViewport(scaleX);
+    var renderContext = {
+      canvasContext: ctx,
+      viewport: drawViewport
+    };
+    pdfPage.render(renderContext).then(
+      function pdfPageRenderCallback() {
+        callback();
+      },
+      function pdfPageRenderError(error) {
+        callback();
+      }
+    );
     this.hasImage = true;
   };
 
@@ -1070,6 +1179,8 @@ var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
 
 var DocumentOutlineView = function documentOutlineView(outline) {
   var outlineView = document.getElementById('outlineView');
+  while (outlineView.firstChild)
+    outlineView.removeChild(outlineView.firstChild);
 
   function bindItemLink(domObj, item) {
     domObj.href = PDFView.getDestinationHash(item.dest);
@@ -1079,6 +1190,15 @@ var DocumentOutlineView = function documentOutlineView(outline) {
     };
   }
 
+  if (!outline) {
+    var noOutline = document.createElement('div');
+    noOutline.classList.add('noOutline');
+    noOutline.textContent = mozL10n.get('no_outline', null,
+      'No Outline Available');
+    outlineView.appendChild(noOutline);
+    return;
+  }
+
   var queue = [{parent: outlineView, items: outline}];
   while (queue.length > 0) {
     var levelData = queue.shift();
@@ -1238,17 +1358,15 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
 };
 
 window.addEventListener('load', function webViewerLoad(evt) {
+  PDFView.initialize();
   var params = PDFView.parseQueryString(document.location.search.substring(1));
 
   var file = PDFJS.isFirefoxExtension ?
               window.location.toString() : params.file || kDefaultURL;
-  PDFView.open(file, 0);
 
   if (PDFJS.isFirefoxExtension || !window.File || !window.FileReader ||
       !window.FileList || !window.Blob) {
-    document.getElementById('fileInput').setAttribute('hidden', 'true');
-    document.getElementById('fileInputSeperator')
-                              .setAttribute('hidden', 'true');
+    document.getElementById('openFile').setAttribute('hidden', 'true');
   } else {
     document.getElementById('fileInput').value = null;
   }
@@ -1260,6 +1378,13 @@ window.addEventListener('load', function webViewerLoad(evt) {
   if ('disableWorker' in hashParams)
     PDFJS.disableWorker = (hashParams['disableWorker'] === 'true');
 
+  if (!PDFJS.isFirefoxExtension) {
+    var locale = navigator.language;
+    if ('locale' in hashParams)
+      locale = hashParams['locale'];
+    mozL10n.language.code = locale;
+  }
+
   if ('disableTextLayer' in hashParams)
     PDFJS.disableTextLayer = (hashParams['disableTextLayer'] === 'true');
 
@@ -1272,8 +1397,29 @@ window.addEventListener('load', function webViewerLoad(evt) {
     PDFBug.init();
   }
 
-  var sidebarScrollView = document.getElementById('sidebarScrollView');
-  sidebarScrollView.addEventListener('scroll', updateThumbViewArea, true);
+  var thumbsView = document.getElementById('thumbnailView');
+  thumbsView.addEventListener('scroll', updateThumbViewArea, true);
+
+  var mainContainer = document.getElementById('mainContainer');
+  var outerContainer = document.getElementById('outerContainer');
+  mainContainer.addEventListener('transitionend', function(e) {
+    if (e.target == mainContainer) {
+      var event = document.createEvent('UIEvents');
+      event.initUIEvent('resize', false, false, window, 0);
+      window.dispatchEvent(event);
+      outerContainer.classList.remove('sidebarMoving');
+    }
+  }, true);
+
+  document.getElementById('sidebarToggle').addEventListener('click',
+    function() {
+      this.classList.toggle('toggled');
+      outerContainer.classList.add('sidebarMoving');
+      outerContainer.classList.toggle('sidebarOpen');
+      updateThumbViewArea();
+    });
+
+  PDFView.open(file, 0);
 }, true);
 
 /**
@@ -1300,6 +1446,8 @@ function preDraw() {
 }
 
 function updateViewarea() {
+  if (!PDFView.initialized)
+    return;
   var visiblePages = PDFView.getVisiblePages();
   var pageToDraw;
   for (var i = 0; i < visiblePages.length; i++) {
@@ -1330,21 +1478,20 @@ function updateViewarea() {
   var normalizedScaleValue = currentScaleValue == currentScale ?
     currentScale * 100 : currentScaleValue;
 
-  var kViewerTopMargin = 52;
   var pageNumber = firstPage.id;
   var pdfOpenParams = '#page=' + pageNumber;
   pdfOpenParams += '&zoom=' + normalizedScaleValue;
   var currentPage = PDFView.pages[pageNumber - 1];
-  var topLeft = currentPage.getPagePoint(window.pageXOffset,
-    window.pageYOffset - firstPage.y - kViewerTopMargin);
-  pdfOpenParams += ',' + Math.round(topLeft.x) + ',' + Math.round(topLeft.y);
+  var topLeft = currentPage.getPagePoint(PDFView.container.scrollLeft,
+    (PDFView.container.scrollTop - firstPage.y));
+  pdfOpenParams += ',' + Math.round(topLeft[0]) + ',' + Math.round(topLeft[1]);
 
   var store = PDFView.store;
   store.set('exists', true);
   store.set('page', pageNumber);
   store.set('zoom', normalizedScaleValue);
-  store.set('scrollLeft', Math.round(topLeft.x));
-  store.set('scrollTop', Math.round(topLeft.y));
+  store.set('scrollLeft', Math.round(topLeft[0]));
+  store.set('scrollTop', Math.round(topLeft[1]));
   var href = PDFView.getAnchorUrl(pdfOpenParams);
   document.getElementById('viewBookmark').href = href;
 }
@@ -1372,13 +1519,11 @@ function updateThumbViewArea() {
   }, delay);
 }
 
-window.addEventListener('transitionend', updateThumbViewArea, true);
-window.addEventListener('webkitTransitionEnd', updateThumbViewArea, true);
-
 window.addEventListener('resize', function webViewerResize(evt) {
-  if (document.getElementById('pageWidthOption').selected ||
+  if (PDFView.initialized &&
+      (document.getElementById('pageWidthOption').selected ||
       document.getElementById('pageFitOption').selected ||
-      document.getElementById('pageAutoOption').selected)
+      document.getElementById('pageAutoOption').selected))
       PDFView.parseScale(document.getElementById('scaleSelect').value);
   updateViewarea();
 });
@@ -1401,7 +1546,8 @@ window.addEventListener('change', function webViewerChange(evt) {
 
     for (var i = 0; i < data.length; i++)
       uint8Array[i] = data.charCodeAt(i);
-    PDFView.load(uint8Array);
+
+    PDFView.open(uint8Array, 0);
   };
 
   // Read as a binary string since "readAsArrayBuffer" is not yet
@@ -1430,6 +1576,10 @@ function selectScaleOption(value) {
   return predefinedValueFound;
 }
 
+window.addEventListener('localized', function localized(evt) {
+  document.getElementsByTagName('html')[0].dir = mozL10n.language.direction;
+}, true);
+
 window.addEventListener('scalechange', function scalechange(evt) {
   var customScaleOption = document.getElementById('customScaleOption');
   customScaleOption.selected = false;
@@ -1453,15 +1603,66 @@ window.addEventListener('scalechange', function scalechange(evt) {
 
 window.addEventListener('pagechange', function pagechange(evt) {
   var page = evt.pageNumber;
-  if (document.getElementById('pageNumber').value != page)
+  if (document.getElementById('pageNumber').value != page) {
     document.getElementById('pageNumber').value = page;
+    var selected = document.querySelector('.thumbnail.selected');
+    if (selected)
+      selected.classList.remove('selected');
+    var thumbnail = document.getElementById('thumbnailContainer' + page);
+    thumbnail.classList.add('selected');
+    var visibleThumbs = PDFView.getVisibleThumbs();
+    var numVisibleThumbs = visibleThumbs.length;
+    // If the thumbnail isn't currently visible scroll it into view.
+    if (numVisibleThumbs > 0) {
+      var first = visibleThumbs[0].id;
+      // Account for only one thumbnail being visible.
+      var last = numVisibleThumbs > 1 ?
+                  visibleThumbs[numVisibleThumbs - 1].id : first;
+      if (page <= first || page >= last)
+        thumbnail.scrollIntoView();
+    }
+
+  }
   document.getElementById('previous').disabled = (page <= 1);
   document.getElementById('next').disabled = (page >= PDFView.pages.length);
 }, true);
 
 window.addEventListener('keydown', function keydown(evt) {
-  if (evt.ctrlKey || evt.altKey || evt.shiftKey || evt.metaKey)
+  var handled = false;
+  var cmd = (evt.ctrlKey ? 1 : 0) |
+            (evt.altKey ? 2 : 0) |
+            (evt.shiftKey ? 4 : 0) |
+            (evt.metaKey ? 8 : 0);
+
+  // First, handle the key bindings that are independent whether an input
+  // control is selected or not.
+  if (cmd == 1 || cmd == 8) { // either CTRL or META key.
+    switch (evt.keyCode) {
+      case 61: // FF/Mac '='
+      case 107: // FF '+' and '='
+      case 187: // Chrome '+'
+        PDFView.zoomIn();
+        handled = true;
+        break;
+      case 109: // FF '-'
+      case 189: // Chrome '-'
+        PDFView.zoomOut();
+        handled = true;
+        break;
+      case 48: // '0'
+        PDFView.parseScale(kDefaultScale, true);
+        handled = true;
+        break;
+    }
+  }
+
+  if (handled) {
+    evt.preventDefault();
     return;
+  }
+
+  // Some shortcuts should not get handled if a control/input element
+  // is selected.
   var curElement = document.activeElement;
   if (curElement && curElement.tagName == 'INPUT')
     return;
@@ -1471,35 +1672,22 @@ window.addEventListener('keydown', function keydown(evt) {
       return; // ignoring if the 'controls' element is focused
     curElement = curElement.parentNode;
   }
-  var handled = false;
-  switch (evt.keyCode) {
-    case 61: // FF/Mac '='
-    case 107: // FF '+' and '='
-    case 187: // Chrome '+'
-      PDFView.zoomIn();
-      handled = true;
-      break;
-    case 109: // FF '-'
-    case 189: // Chrome '-'
-      PDFView.zoomOut();
-      handled = true;
-      break;
-    case 48: // '0'
-      PDFView.parseScale(kDefaultScale, true);
-      handled = true;
-      break;
-    case 37: // left arrow
-    case 75: // 'k'
-    case 80: // 'p'
-      PDFView.page--;
-      handled = true;
-      break;
-    case 39: // right arrow
-    case 74: // 'j'
-    case 78: // 'n'
-      PDFView.page++;
-      handled = true;
-      break;
+
+  if (cmd == 0) { // no control key pressed at all.
+    switch (evt.keyCode) {
+      case 37: // left arrow
+      case 75: // 'k'
+      case 80: // 'p'
+        PDFView.page--;
+        handled = true;
+        break;
+      case 39: // right arrow
+      case 74: // 'j'
+      case 78: // 'n'
+        PDFView.page++;
+        handled = true;
+        break;
+    }
   }
 
   if (handled) {
diff --git a/browser/extensions/pdfjs/extension-files b/browser/extensions/pdfjs/extension-files
index 7a2f77618b98..08d7326d5f78 100644
--- a/browser/extensions/pdfjs/extension-files
+++ b/browser/extensions/pdfjs/extension-files
@@ -1,23 +1,29 @@
 bootstrap.js
 icon.png
 icon64.png
+chrome.manifest
 components/PdfStreamConverter.js
 content/web/debugger.js
-content/web/images/bookmark.svg
-content/web/images/check.svg
-content/web/images/comment.svg
-content/web/images/document-print.svg
-content/web/images/download.svg
-content/web/images/go-down.svg
-content/web/images/go-up.svg
+content/web/images/annotation-check.svg
+content/web/images/annotation-comment.svg
+content/web/images/annotation-text.svg
 content/web/images/loading-icon.gif
-content/web/images/nav-outline.svg
-content/web/images/nav-thumbs.svg
-content/web/images/pin-down.svg
-content/web/images/pin-up.svg
-content/web/images/zoom-in.svg
-content/web/images/zoom-out.svg
-content/web/viewer-snippet-firefox-extension.html
+content/web/images/texture.png
+content/web/images/toolbarButton-bookmark.png
+content/web/images/toolbarButton-download.png
+content/web/images/toolbarButton-menuArrows.png
+content/web/images/toolbarButton-openFile.png
+content/web/images/toolbarButton-pageDown-rtl.png
+content/web/images/toolbarButton-pageDown.png
+content/web/images/toolbarButton-pageUp-rtl.png
+content/web/images/toolbarButton-pageUp.png
+content/web/images/toolbarButton-print.png
+content/web/images/toolbarButton-sidebarToggle.png
+content/web/images/toolbarButton-viewOutline.png
+content/web/images/toolbarButton-viewThumbnail.png
+content/web/images/toolbarButton-zoomIn.png
+content/web/images/toolbarButton-zoomOut.png
+content/web/l10n.js
 content/web/viewer.css
 content/web/viewer.html
 content/web/viewer.js
diff --git a/browser/extensions/pdfjs/install.rdf.in b/browser/extensions/pdfjs/install.rdf.in
index f29877851deb..7281402a8030 100644
--- a/browser/extensions/pdfjs/install.rdf.in
+++ b/browser/extensions/pdfjs/install.rdf.in
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 
 #filter substitution
 
@@ -11,8 +7,9 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>uriloader@pdf.js</em:id>
+    <!-- PDFJS_LOCALIZED_METADATA -->
     <em:name>PDF Viewer</em:name>
-    <em:version>0.2.536</em:version>
+    <em:version>0.3.266</em:version>
     <em:targetApplication>
       <Description>
        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
diff --git a/browser/extensions/pdfjs/test/Makefile.in b/browser/extensions/pdfjs/test/Makefile.in
index 56c0149b7da6..77b7a838d941 100644
--- a/browser/extensions/pdfjs/test/Makefile.in
+++ b/browser/extensions/pdfjs/test/Makefile.in
@@ -6,7 +6,7 @@ DEPTH     = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/features/pdfjs/test
+relativesrcdir  = browser/extensions/pdfjs/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/extensions/pdfjs/test/browser_pdfjs_main.js b/browser/extensions/pdfjs/test/browser_pdfjs_main.js
index d37fd7acd28d..884650892d2c 100644
--- a/browser/extensions/pdfjs/test/browser_pdfjs_main.js
+++ b/browser/extensions/pdfjs/test/browser_pdfjs_main.js
@@ -2,27 +2,70 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-const RELATIVE_DIR = "browser/features/pdfjs/test/";
+const RELATIVE_DIR = "browser/extensions/pdfjs/test/";
 const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR;
 
 function test() {
+  var tab;
+
   waitForExplicitFinish();
-
-  var tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf");
-  var newTabBrowser = gBrowser.getBrowserForTab(tab);
-  newTabBrowser.addEventListener("load", function onLoad() {
-    newTabBrowser.removeEventListener("load", onLoad, true);
-
-    var hasViewer = newTabBrowser.contentDocument.querySelector('div#viewer');
-    var hasPDFJS = 'PDFJS' in newTabBrowser.contentWindow.wrappedJSObject;
-
-    ok(hasViewer, "document content has viewer UI");
-    ok(hasPDFJS, "window content has PDFJS object");
-
-    finish();
-  }, true, true);
-
   registerCleanupFunction(function() {
     gBrowser.removeTab(tab);
   });
+
+  tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf");
+  var newTabBrowser = gBrowser.getBrowserForTab(tab);
+  newTabBrowser.addEventListener("load", function eventHandler() {
+    newTabBrowser.removeEventListener("load", eventHandler, true);
+
+    var document = newTabBrowser.contentDocument,
+        window = newTabBrowser.contentWindow;
+
+    // Runs tests after all 'load' event handlers have fired off
+    setTimeout(function() {
+      runTests(document, window);
+    }, 0);
+  }, true);
+}
+
+
+function runTests(document, window) {
+  //
+  // Overall sanity tests
+  //
+  ok(document.querySelector('div#viewer'), "document content has viewer UI");
+  ok('PDFJS' in window.wrappedJSObject, "window content has PDFJS object");
+
+  //
+  // Sidebar: open
+  //
+  var sidebar = document.querySelector('button#sidebarToggle'),
+      outerContainer = document.querySelector('div#outerContainer');
+
+  sidebar.click();
+  ok(outerContainer.classList.contains('sidebarOpen'), 'sidebar opens on click');
+
+  //
+  // Sidebar: close
+  //
+  sidebar.click();
+  ok(!outerContainer.classList.contains('sidebarOpen'), 'sidebar closes on click');
+
+  //
+  // Page change from prev/next buttons
+  //
+  var prevPage = document.querySelector('button#previous'),
+      nextPage = document.querySelector('button#next');
+
+  var pageNumber = document.querySelector('input#pageNumber');
+  is(parseInt(pageNumber.value), 1, 'initial page is 1');
+
+  //
+  // Bookmark button
+  //
+  var viewBookmark = document.querySelector('a#viewBookmark');
+  viewBookmark.click();
+  ok(viewBookmark.href.length > 0, 'viewBookmark button has href');
+
+  finish();
 }
diff --git a/browser/extensions/pdfjs/test/file_pdfjs_test.pdf b/browser/extensions/pdfjs/test/file_pdfjs_test.pdf
index 68d77cc5b6a8..ea5ebe39538c 100644
Binary files a/browser/extensions/pdfjs/test/file_pdfjs_test.pdf and b/browser/extensions/pdfjs/test/file_pdfjs_test.pdf differ
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 0ebfbea35e05..2629b6ccb9e0 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -647,6 +647,7 @@ bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
 @BINPATH@/webapprt/chrome/webapprt@JAREXT@
 @BINPATH@/webapprt/chrome/webapprt.manifest
 @BINPATH@/webapprt/components/CommandLineHandler.js
+@BINPATH@/webapprt/components/ContentPermission.js
 @BINPATH@/webapprt/components/ContentPolicy.js
 @BINPATH@/webapprt/components/DirectoryProvider.js
 @BINPATH@/webapprt/components/components.manifest
diff --git a/browser/locales/en-US/pdfviewer/viewer.properties b/browser/locales/en-US/pdfviewer/viewer.properties
new file mode 100644
index 000000000000..0922062a6cda
--- /dev/null
+++ b/browser/locales/en-US/pdfviewer/viewer.properties
@@ -0,0 +1,46 @@
+bookmark.title=Current view (copy or open in new window)
+previous.title=Previous Page
+next.title=Next Page
+print.title=Print
+download.title=Download
+zoom_out.title=Zoom Out
+zoom_in.title=Zoom In
+error_more_info=More Information
+error_less_info=Less Information
+error_close=Close
+error_build=PDF.JS Build: {{build}}
+error_message=Message: {{message}}
+error_stack=Stack: {{stack}}
+error_file=File: {{file}}
+error_line=Line: {{line}}
+page_scale_width=Page Width
+page_scale_fit=Page Fit
+page_scale_auto=Automatic Zoom
+page_scale_actual=Actual Size
+toggle_slider.title=Toggle Slider
+thumbs.title=Show Thumbnails
+outline.title=Show Document Outline
+loading=Loading... {{percent}}%
+loading_error_indicator=Error
+loading_error=An error occurred while loading the PDF.
+rendering_error=An error occurred while rendering the page.
+page_label=Page:
+page_of=of {{pageCount}}
+no_outline=No Outline Available
+open_file.title=Open File
+text_annotation_type=[{{type}} Annotation]
+toggle_slider_label=Toggle Slider
+thumbs_label=Thumbnails
+outline_label=Document Outline
+bookmark_label=Current View
+previous_label=Previous
+next_label=Next
+print_label=Print
+download_label=Download
+zoom_out_label=Zoom Out
+zoom_in_label=Zoom In
+zoom.title=Zoom
+thumb_page_title=Page {{page}}
+thumb_page_canvas=Thumbnail of Page {{page}}
+request_password=PDF is protected by a password:
+open_file_label=Open
diff --git a/browser/locales/en-US/webapprt/webapp.properties b/browser/locales/en-US/webapprt/webapp.properties
index 674c0c18c5b3..8cfc5c440523 100644
--- a/browser/locales/en-US/webapprt/webapp.properties
+++ b/browser/locales/en-US/webapprt/webapp.properties
@@ -15,3 +15,11 @@ quitApplicationCmdMac.label=Quit %S
 # LOCALIZATION NOTE (hideApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 hideApplicationCmdMac.label=Hide %S
+
+# LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
+# the webapp.
+geolocation.title=%S - Share Location
+geolocation.description=Do you want to share your location?
+geolocation.sharelocation=Share Location
+geolocation.dontshare=Don't Share
+geolocation.remember=Remember my choice
diff --git a/browser/themes/gnomestripe/tabbrowser/connecting.png b/browser/themes/gnomestripe/tabbrowser/connecting.png
index 3c8e71f5db65..e564fb5708f3 100644
Binary files a/browser/themes/gnomestripe/tabbrowser/connecting.png and b/browser/themes/gnomestripe/tabbrowser/connecting.png differ
diff --git a/browser/themes/gnomestripe/tabbrowser/loading.png b/browser/themes/gnomestripe/tabbrowser/loading.png
index 87d0badd10f6..a2f9b797098e 100644
Binary files a/browser/themes/gnomestripe/tabbrowser/loading.png and b/browser/themes/gnomestripe/tabbrowser/loading.png differ
diff --git a/browser/themes/pinstripe/tabbrowser/connecting.png b/browser/themes/pinstripe/tabbrowser/connecting.png
index 3c8e71f5db65..e564fb5708f3 100644
Binary files a/browser/themes/pinstripe/tabbrowser/connecting.png and b/browser/themes/pinstripe/tabbrowser/connecting.png differ
diff --git a/browser/themes/pinstripe/tabbrowser/loading.png b/browser/themes/pinstripe/tabbrowser/loading.png
index b861e0ba5d89..b886c73eff92 100644
Binary files a/browser/themes/pinstripe/tabbrowser/loading.png and b/browser/themes/pinstripe/tabbrowser/loading.png differ
diff --git a/browser/themes/winstripe/tabbrowser/connecting.png b/browser/themes/winstripe/tabbrowser/connecting.png
index 3c8e71f5db65..e564fb5708f3 100644
Binary files a/browser/themes/winstripe/tabbrowser/connecting.png and b/browser/themes/winstripe/tabbrowser/connecting.png differ
diff --git a/browser/themes/winstripe/tabbrowser/loading.png b/browser/themes/winstripe/tabbrowser/loading.png
index 201d014c1fcd..ba54836e9834 100644
Binary files a/browser/themes/winstripe/tabbrowser/loading.png and b/browser/themes/winstripe/tabbrowser/loading.png differ
diff --git a/build/mobile/devicemanagerSUT.py b/build/mobile/devicemanagerSUT.py
index aabd2626e691..992ccb13e734 100644
--- a/build/mobile/devicemanagerSUT.py
+++ b/build/mobile/devicemanagerSUT.py
@@ -923,6 +923,7 @@ class DeviceManagerSUT(DeviceManager):
   # uptime - uptime of the device
   # systime - system time of the device
   # screen - screen resolution
+  # rotation - rotation of the device (in degrees)
   # memory - memory stats
   # process - list of running processes (same as ps)
   # disk - total, free, available bytes on disk
@@ -936,7 +937,7 @@ class DeviceManagerSUT(DeviceManager):
     result = {}
     collapseSpaces = re.compile('  +')
 
-    directives = ['os', 'id','uptime','systime','screen','memory','process',
+    directives = ['os','id','uptime','systime','screen','rotation','memory','process',
                   'disk','power']
     if (directive in directives):
       directives = [directive]
diff --git a/build/mobile/sutagent/android/DoCommand.java b/build/mobile/sutagent/android/DoCommand.java
index 4014448de726..a5e9a7dade1d 100755
--- a/build/mobile/sutagent/android/DoCommand.java
+++ b/build/mobile/sutagent/android/DoCommand.java
@@ -85,6 +85,7 @@ import android.os.StatFs;
 import android.os.SystemClock;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.Surface;
 import android.view.WindowManager;
 
 public class DoCommand {
@@ -121,6 +122,7 @@ public class DoCommand {
         SETTIME ("settime"),
         SYSTIME ("systime"),
         SCREEN ("screen"),
+        ROTATION ("rotation"),
         MEMORY ("memory"),
         POWER ("power"),
         PROCESS ("process"),
@@ -413,6 +415,8 @@ public class DoCommand {
                     strReturn += "\n";
                     strReturn += GetScreenInfo();
                     strReturn += "\n";
+                    strReturn += GetRotationInfo();
+                    strReturn += "\n";
                     strReturn += GetMemoryInfo();
                     strReturn += "\n";
                     strReturn += GetPowerInfo();
@@ -432,6 +436,10 @@ public class DoCommand {
                             strReturn = GetScreenInfo();
                             break;
 
+                        case ROTATION:
+                            strReturn = GetRotationInfo();
+                            break;
+
                         case PROCESS:
                             strReturn = GetProcessInfo();
                             break;
@@ -2294,6 +2302,25 @@ private void CancelNotification()
             return(nRetXY);
         }
 
+    public String GetRotationInfo()
+        {
+            WindowManager wMgr = (WindowManager) contextWrapper.getSystemService(Context.WINDOW_SERVICE);
+            int nRotationDegrees = 0; // default
+            switch(wMgr.getDefaultDisplay().getRotation())
+                {
+                case Surface.ROTATION_90:
+                    nRotationDegrees = 90;
+                    break;
+                case Surface.ROTATION_180:
+                    nRotationDegrees = 180;
+                    break;
+                case Surface.ROTATION_270:
+                    nRotationDegrees = 270;
+                    break;
+                }
+            return "ROTATION:" + nRotationDegrees;
+        }
+
     public String SetADB(String sWhat) {
         String sRet = "";
         String sTmp = "";
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 18fd4b3357a0..f9a0881e7a87 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -141,6 +141,8 @@ MOZ_TREMOR = @MOZ_TREMOR@
 MOZ_NO_THEORA_ASM = @MOZ_NO_THEORA_ASM@
 MOZ_OPUS = @MOZ_OPUS@
 MOZ_WEBM = @MOZ_WEBM@
+MOZ_MEDIA_PLUGINS = @MOZ_MEDIA_PLUGINS@
+MOZ_OMX_PLUGIN = @MOZ_OMX_PLUGIN@
 MOZ_GSTREAMER = @MOZ_GSTREAMER@
 MOZ_VP8_ERROR_CONCEALMENT = @MOZ_VP8_ERROR_CONCEALMENT@
 MOZ_VP8_ENCODER = @MOZ_VP8_ENCODER@
diff --git a/config/makefiles/autotargets.mk b/config/makefiles/autotargets.mk
index 2db24a9c1192..595729e65586 100644
--- a/config/makefiles/autotargets.mk
+++ b/config/makefiles/autotargets.mk
@@ -18,6 +18,10 @@ ifndef INCLUDED_AUTOTARGETS_MK #{
 MKDIR ?= mkdir -p
 TOUCH ?= touch
 
+# Deps will be considered intermediate when used as a pre-requisite for
+# wildcard targets.  Inhibit their removal, mkdir -p is a standalone op.
+.PRECIOUS: %/.mkdir.done
+
 ###########################################################################
 # Threadsafe directory creation
 # GENERATED_DIRS - Automated creation of these directories.
diff --git a/configure.in b/configure.in
index fdcbb4e789ea..0a82f0f2188a 100644
--- a/configure.in
+++ b/configure.in
@@ -420,6 +420,7 @@ fi
 
 AC_SUBST(ANDROID_NDK)
 AC_SUBST(ANDROID_TOOLCHAIN)
+AC_SUBST(ANDROID_SOURCE)
 AC_SUBST(ANDROID_PLATFORM)
 AC_SUBST(ANDROID_SDK)
 AC_SUBST(ANDROID_PLATFORM_TOOLS)
@@ -4535,6 +4536,8 @@ MOZ_WAVE=1
 MOZ_MEDIA=
 MOZ_OPUS=1
 MOZ_WEBM=1
+MOZ_MEDIA_PLUGINS=
+MOZ_OMX_PLUGIN=
 MOZ_VP8_ERROR_CONCEALMENT=
 MOZ_VP8_ENCODER=
 VPX_AS=
@@ -5612,6 +5615,36 @@ MOZ_ARG_DISABLE_BOOL(webm,
     MOZ_WEBM=,
     MOZ_WEBM=1)
 
+dnl ========================================================
+dnl = Disable media plugin support
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(media-plugins,
+[  --enable-media-plugins  Enable support for media plugins],
+    MOZ_MEDIA_PLUGINS=1,
+    MOZ_MEDIA_PLUGINS=)
+
+if test -n "$MOZ_MEDIA_PLUGINS"; then
+  AC_DEFINE(MOZ_MEDIA_PLUGINS)
+fi
+
+dnl ========================================================
+dnl = Enable building OMX media plugin (B2G)
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(omx-plugin,
+[  --enable-omx-plugin      Enable building OMX plugin (B2G)],
+    MOZ_OMX_PLUGIN=1,
+    MOZ_OMX_PLUGIN=)
+
+if test -n "$MOZ_OMX_PLUGIN"; then
+    if test "$OS_TARGET" = "Android" -a -n "$gonkdir"; then
+        dnl Only allow building OMX plugin on Gonk (B2G)
+        AC_DEFINE(MOZ_OMX_PLUGIN)
+    else
+       dnl fail if we're not building on Gonk
+       AC_MSG_ERROR([OMX media plugin can only be built on B2G])
+    fi
+fi
+
 dnl system libvpx Support
 dnl ========================================================
 MOZ_ARG_WITH_BOOL(system-libvpx,
@@ -8739,6 +8772,8 @@ AC_SUBST(MOZ_VORBIS)
 AC_SUBST(MOZ_TREMOR)
 AC_SUBST(MOZ_OPUS)
 AC_SUBST(MOZ_WEBM)
+AC_SUBST(MOZ_MEDIA_PLUGINS)
+AC_SUBST(MOZ_OMX_PLUGIN)
 AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT)
 AC_SUBST(MOZ_VP8_ENCODER)
 AC_SUBST(MOZ_OGG)
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 9c1f95b3a86a..b85a2e2847fb 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -1600,7 +1600,7 @@ public:
     eDeprecatedOperationCount
   };
 #undef DEPRECATED_OPERATION
-  void WarnOnceAbout(DeprecatedOperations aOperation);
+  void WarnOnceAbout(DeprecatedOperations aOperation, bool asError = false);
 
   virtual void PostVisibilityUpdateEvent() = 0;
   
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index ab48ddf1894f..67982156931c 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -8211,14 +8211,17 @@ static const char* kWarnings[] = {
 #undef DEPRECATED_OPERATION
 
 void
-nsIDocument::WarnOnceAbout(DeprecatedOperations aOperation)
+nsIDocument::WarnOnceAbout(DeprecatedOperations aOperation,
+                           bool asError /* = false */)
 {
   PR_STATIC_ASSERT(eDeprecatedOperationCount <= 64);
   if (mWarnedAbout & (1ull << aOperation)) {
     return;
   }
   mWarnedAbout |= (1ull << aOperation);
-  nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
+  uint32_t flags = asError ? nsIScriptError::errorFlag
+                           : nsIScriptError::warningFlag;
+  nsContentUtils::ReportToConsole(flags,
                                   "DOM Core", this,
                                   nsContentUtils::eDOM_PROPERTIES,
                                   kWarnings[aOperation]);
diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h
index adddb2297f35..8d73d075e489 100644
--- a/content/html/content/public/nsHTMLMediaElement.h
+++ b/content/html/content/public/nsHTMLMediaElement.h
@@ -301,6 +301,11 @@ public:
   static char const *const gH264Codecs[6];
 #endif
 
+#ifdef MOZ_MEDIA_PLUGINS
+  static bool IsMediaPluginsEnabled();
+  static bool IsMediaPluginsType(const nsACString& aType);
+#endif
+
   /**
    * Called when a child source element is added to this media element. This
    * may queue a task to run the select resource algorithm if appropriate.
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 5f371a408932..b52dbc0a3061 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -1350,7 +1350,7 @@ nsHTMLInputElement::SetValueInternal(const nsAString& aValue,
         SetValueChanged(true);
       }
 
-      mInputData.mState->SetValue(value, aUserInput);
+      mInputData.mState->SetValue(value, aUserInput, aSetValueChanged);
 
       // This call might be useless in some situations because if the element is
       // a single line text control, nsTextEditorState::SetValue will call
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index f5521e03712c..ae36dba18b22 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -84,6 +84,10 @@
 #ifdef MOZ_GSTREAMER
 #include "nsGStreamerDecoder.h"
 #endif
+#ifdef MOZ_MEDIA_PLUGINS
+#include "nsMediaPluginHost.h"
+#include "nsMediaPluginDecoder.h"
+#endif
 
 #ifdef PR_LOGGING
 static PRLogModuleInfo* gMediaElementLog;
@@ -2111,6 +2115,14 @@ nsHTMLMediaElement::IsH264Type(const nsACString& aType)
 }
 #endif
 
+#ifdef MOZ_MEDIA_PLUGINS
+bool
+nsHTMLMediaElement::IsMediaPluginsEnabled()
+{
+  return Preferences::GetBool("media.plugins.enabled");
+}
+#endif
+
 /* static */
 nsHTMLMediaElement::CanPlayStatus 
 nsHTMLMediaElement::CanHandleMediaType(const char* aMIMEType,
@@ -2146,6 +2158,10 @@ nsHTMLMediaElement::CanHandleMediaType(const char* aMIMEType,
     *aCodecList = gH264Codecs;
     return CANPLAY_YES;
   }
+#endif
+#ifdef MOZ_MEDIA_PLUGINS
+  if (GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), aCodecList))
+    return CANPLAY_MAYBE;
 #endif
   return CANPLAY_NO;
 }
@@ -2168,6 +2184,10 @@ bool nsHTMLMediaElement::ShouldHandleMediaType(const char* aMIMEType)
 #ifdef MOZ_GSTREAMER
   if (IsH264Type(nsDependentCString(aMIMEType)))
     return true;
+#endif
+#ifdef MOZ_MEDIA_PLUGINS
+  if (GetMediaPluginHost()->FindDecoder(nsDependentCString(aMIMEType), NULL))
+    return true;
 #endif
   // We should not return true for Wave types, since there are some
   // Wave codecs actually in use in the wild that we don't support, and
@@ -2281,6 +2301,14 @@ nsHTMLMediaElement::CreateDecoder(const nsACString& aType)
     }
   }
 #endif
+#ifdef MOZ_MEDIA_PLUGINS
+  if (GetMediaPluginHost()->FindDecoder(aType, NULL)) {
+    nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType);
+    if (decoder->Init(this)) {
+      return decoder.forget();
+    }
+  }
+#endif
 #ifdef MOZ_WEBM
   if (IsWebMType(aType)) {
 #ifdef MOZ_GSTREAMER 
diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index ef78a685f783..ebd9d1bb16e0 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -539,7 +539,7 @@ nsHTMLTextAreaElement::SetValueInternal(const nsAString& aValue,
   // nsTextControlFrame::UpdateValueDisplay retrieves the correct value
   // if needed.
   SetValueChanged(true);
-  mState.SetValue(aValue, aUserInput);
+  mState.SetValue(aValue, aUserInput, true);
 
   return NS_OK;
 }
diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp
index 875a2c3097e9..0ff88d66d837 100644
--- a/content/html/content/src/nsTextEditorState.cpp
+++ b/content/html/content/src/nsTextEditorState.cpp
@@ -630,6 +630,7 @@ public:
   void SetFrame(nsTextControlFrame *aFrame){mFrame = aFrame;}
 
   void SettingValue(bool aValue) { mSettingValue = aValue; }
+  void SetValueChanged(bool aSetValueChanged) { mSetValueChanged = aSetValueChanged; }
 
   NS_DECL_ISUPPORTS
 
@@ -667,6 +668,11 @@ protected:
    * refrain from calling OnValueChanged.
    */
   bool mSettingValue;
+  /**
+   * Whether we are in the process of a SetValue call that doesn't want
+   * |SetValueChanged| to be called.
+   */
+  bool mSetValueChanged;
 };
 
 
@@ -681,6 +687,7 @@ nsTextInputListener::nsTextInputListener(nsITextControlElement* aTxtCtrlElement)
 , mHadUndoItems(false)
 , mHadRedoItems(false)
 , mSettingValue(false)
+, mSetValueChanged(true)
 {
 }
 
@@ -857,7 +864,9 @@ nsTextInputListener::EditAction()
 
   // Make sure we know we were changed (do NOT set this to false if there are
   // no undo items; JS could change the value and we'd still need to save it)
-  frame->SetValueChanged(true);
+  if (mSetValueChanged) {
+    frame->SetValueChanged(true);
+  }
 
   if (!mSettingValue) {
     mTxtCtrlElement->OnValueChanged(true);
@@ -1316,7 +1325,7 @@ nsTextEditorState::PrepareEditor(const nsAString *aValue)
     rv = newEditor->EnableUndo(false);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    SetValue(defaultValue, false);
+    SetValue(defaultValue, false, false);
 
     rv = newEditor->EnableUndo(true);
     NS_ASSERTION(NS_SUCCEEDED(rv),"Transaction Manager must have failed");
@@ -1500,7 +1509,7 @@ nsTextEditorState::UnbindFromFrame(nsTextControlFrame* aFrame)
   // Now that we don't have a frame any more, store the value in the text buffer.
   // The only case where we don't do this is if a value transfer is in progress.
   if (!mValueTransferInProgress) {
-    SetValue(value, false);
+    SetValue(value, false, false);
   }
 
   if (mRootNode && mMutationObserver) {
@@ -1719,7 +1728,8 @@ nsTextEditorState::GetValue(nsAString& aValue, bool aIgnoreWrap) const
 }
 
 void
-nsTextEditorState::SetValue(const nsAString& aValue, bool aUserInput)
+nsTextEditorState::SetValue(const nsAString& aValue, bool aUserInput,
+                            bool aSetValueChanged)
 {
   if (mEditor && mBoundFrame) {
     // The InsertText call below might flush pending notifications, which
@@ -1824,6 +1834,7 @@ nsTextEditorState::SetValue(const nsAString& aValue, bool aUserInput)
         mEditor->SetFlags(flags);
 
         mTextListener->SettingValue(true);
+        mTextListener->SetValueChanged(aSetValueChanged);
 
         // Also don't enforce max-length here
         PRInt32 savedMaxLength;
@@ -1836,6 +1847,7 @@ nsTextEditorState::SetValue(const nsAString& aValue, bool aUserInput)
           plaintextEditor->InsertText(insertValue);
         }
 
+        mTextListener->SetValueChanged(true);
         mTextListener->SettingValue(false);
 
         if (!weakFrame.IsAlive()) {
@@ -1845,7 +1857,7 @@ nsTextEditorState::SetValue(const nsAString& aValue, bool aUserInput)
           // the existing selection -- see bug 574558), in which case we don't
           // need to reset the value here.
           if (!mBoundFrame) {
-            SetValue(newValue, false);
+            SetValue(newValue, false, aSetValueChanged);
           }
           valueSetter.Cancel();
           return;
diff --git a/content/html/content/src/nsTextEditorState.h b/content/html/content/src/nsTextEditorState.h
index d21a4c6af158..6d700262ee4f 100644
--- a/content/html/content/src/nsTextEditorState.h
+++ b/content/html/content/src/nsTextEditorState.h
@@ -133,7 +133,8 @@ public:
   nsresult PrepareEditor(const nsAString *aValue = nsnull);
   void InitializeKeyboardEventListeners();
 
-  void SetValue(const nsAString& aValue, bool aUserInput);
+  void SetValue(const nsAString& aValue, bool aUserInput,
+                bool aSetValueAsChanged);
   void GetValue(nsAString& aValue, bool aIgnoreWrap) const;
   void EmptyValue() { if (mValue) mValue->Truncate(); }
   bool IsEmpty() const { return mValue ? mValue->IsEmpty() : true; }
diff --git a/content/html/content/test/forms/test_required_attribute.html b/content/html/content/test/forms/test_required_attribute.html
index b14b0554b846..136dbe5228cd 100644
--- a/content/html/content/test/forms/test_required_attribute.html
+++ b/content/html/content/test/forms/test_required_attribute.html
@@ -7,11 +7,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=345822
   <title>Test for Bug 345822</title>
   <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <style>
-    input, textarea { background-color: rgb(0,0,0) !important; }
-    :valid   { background-color: rgb(0,255,0) !important; }
-    :invalid { background-color: rgb(255,0,0) !important; }
-  </style>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=345822">Mozilla Bug 345822</a>
@@ -34,14 +29,20 @@ function checkNotSufferingFromBeingMissing(element, doNotApply)
   is(element.validationMessage, "",
     "Validation message should be the empty string");
 
-  if (element.type != 'radio' && element.type != 'checkbox') {
-    is(window.getComputedStyle(element, null).getPropertyValue('background-color'),
-       doNotApply ? "rgb(0, 0, 0)" : "rgb(0, 255, 0)",
-       "The pseudo-class is not correctly applied to " + element.localName);
+  if (doNotApply) {
+    ok(!element.mozMatchesSelector(':valid'), ":valid should not apply");
+    ok(!element.mozMatchesSelector(':invalid'), ":invalid should not apply");
+    ok(!element.mozMatchesSelector(':-moz-ui-valid'), ":-moz-ui-valid should not apply");
+    ok(!element.mozMatchesSelector(':-moz-ui-invalid'), ":-moz-ui-invalid should not apply");
+  } else {
+    ok(element.mozMatchesSelector(':valid'), ":valid should apply");
+    ok(!element.mozMatchesSelector(':invalid'), ":invalid should not apply");
+    ok(element.mozMatchesSelector(':-moz-ui-valid'), ":-moz-ui-valid should apply");
+    ok(!element.mozMatchesSelector(':-moz-ui-invalid'), ":-moz-ui-invalid should not apply");
   }
 }
 
-function checkSufferingFromBeingMissing(element)
+function checkSufferingFromBeingMissing(element, hasMozUIInvalid)
 {
   ok(element.validity.valueMissing, "Element should suffer from value missing");
   ok(!element.validity.valid, "Element should not be valid");
@@ -72,10 +73,10 @@ function checkSufferingFromBeingMissing(element)
       "Validation message is wrong");
   }
 
-  if (element.type != 'radio' && element.type != 'checkbox') {
-    is(window.getComputedStyle(element, null).getPropertyValue('background-color'),
-       "rgb(255, 0, 0)", ":invalid pseudo-class should apply");
-  }
+  ok(!element.mozMatchesSelector(':valid'), ":valid should apply");
+  ok(element.mozMatchesSelector(':invalid'), ":invalid should not apply");
+  ok(!element.mozMatchesSelector(':-moz-ui-valid'), ":-moz-ui-valid should not apply");
+  is(element.mozMatchesSelector(':-moz-ui-invalid'), hasMozUIInvalid, ":-moz-ui-invalid expected state is " + hasMozUIInvalid);
 }
 
 function checkTextareaRequiredValidity()
@@ -88,24 +89,35 @@ function checkTextareaRequiredValidity()
   checkNotSufferingFromBeingMissing(element);
 
   element.required = true;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.readOnly = true;
   checkNotSufferingFromBeingMissing(element, true);
 
   element.readOnly = false;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.value = 'foo';
   checkNotSufferingFromBeingMissing(element);
 
   element.value = '';
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.required = false;
   checkNotSufferingFromBeingMissing(element);
 
+  element.focus();
+  element.required = true;
+  element.value = 'foobar';
+  element.blur();
+  element.form.reset();
+  checkSufferingFromBeingMissing(element, false);
+
+  // TODO: for the moment, a textarea outside of a document is mutable.
+  element.value = ''; // To make -moz-ui-valid apply.
+  element.required = false;
   document.forms[0].removeChild(element);
+  checkNotSufferingFromBeingMissing(element);
 }
 
 function checkInputRequiredNotApply(type, isBarred)
@@ -124,6 +136,7 @@ function checkInputRequiredNotApply(type, isBarred)
   element.required = false;
 
   document.forms[0].removeChild(element);
+  checkNotSufferingFromBeingMissing(element, isBarred);
 }
 
 function checkInputRequiredValidity(type)
@@ -137,13 +150,13 @@ function checkInputRequiredValidity(type)
   checkNotSufferingFromBeingMissing(element);
 
   element.required = true;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.readOnly = true;
   checkNotSufferingFromBeingMissing(element, true);
 
   element.readOnly = false;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   if (element.type == 'email') {
     element.value = 'foo@bar.com';
@@ -155,8 +168,17 @@ function checkInputRequiredValidity(type)
   checkNotSufferingFromBeingMissing(element);
 
   element.value = '';
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
+  element.focus();
+  element.required = true;
+  element.value = 'foobar';
+  element.blur();
+  element.form.reset();
+  checkSufferingFromBeingMissing(element, false);
+
+  element.required = true;
+  element.value = ''; // To make :-moz-ui-valid apply.
   document.forms[0].removeChild(element);
   checkNotSufferingFromBeingMissing(element);
 }
@@ -172,18 +194,28 @@ function checkInputRequiredValidityForCheckbox()
   checkNotSufferingFromBeingMissing(element);
 
   element.required = true;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.checked = true;
   checkNotSufferingFromBeingMissing(element);
 
   element.checked = false;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.required = false;
   checkNotSufferingFromBeingMissing(element);
 
+  element.focus();
+  element.required = true;
+  element.checked = true;
+  element.blur();
+  element.form.reset();
+  checkSufferingFromBeingMissing(element, false);
+
+  element.required = true;
+  element.checked = false;
   document.forms[0].removeChild(element);
+  checkNotSufferingFromBeingMissing(element);
 }
 
 function checkInputRequiredValidityForRadio()
@@ -198,13 +230,13 @@ function checkInputRequiredValidityForRadio()
   checkNotSufferingFromBeingMissing(element);
 
   element.required = true;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.checked = true;
   checkNotSufferingFromBeingMissing(element);
 
   element.checked = false;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   // A required radio button should not suffer from value missing if another
   // radio button from the same group is checked.
@@ -222,7 +254,7 @@ function checkInputRequiredValidityForRadio()
 
   element.checked = false;
   element2.checked = false;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   // The other radio button should not be disabled.
   // A disabled checked radio button in the radio group
@@ -238,17 +270,28 @@ function checkInputRequiredValidityForRadio()
   element2.checked = false;
   element.required = false;
   element2.required = true;
-  checkSufferingFromBeingMissing(element);
-  checkSufferingFromBeingMissing(element2);
+  checkSufferingFromBeingMissing(element, true);
+  checkSufferingFromBeingMissing(element2, true);
 
   element.checked = true;
   checkNotSufferingFromBeingMissing(element2);
 
   // The checked radio is not in the group anymore, element2 should be invalid.
-  document.forms[0].removeChild(element);
-  checkSufferingFromBeingMissing(element2);
+  element.form.removeChild(element);
+  checkNotSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element2, true);
 
+  element2.focus();
+  element2.required = true;
+  element2.checked = true;
+  element2.blur();
+  element2.form.reset();
+  checkSufferingFromBeingMissing(element2, false);
+
+  element2.required = true;
+  element2.checked = false;
   document.forms[0].removeChild(element2);
+  checkNotSufferingFromBeingMissing(element2);
 }
 
 function checkInputRequiredValidityForFile()
@@ -283,19 +326,29 @@ function checkInputRequiredValidityForFile()
   checkNotSufferingFromBeingMissing(element);
 
   element.required = true;
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.value = file.path;
   checkNotSufferingFromBeingMissing(element);
 
   element.value = "";
-  checkSufferingFromBeingMissing(element);
+  checkSufferingFromBeingMissing(element, true);
 
   element.required = false;
   checkNotSufferingFromBeingMissing(element);
 
+  element.focus();
+  element.value = file.path;
+  element.required = true;
+  element.blur();
+  element.form.reset();
+  checkSufferingFromBeingMissing(element, false);
+
+  element.required = true;
+  element.value = '';
   file.remove(false);
   document.forms[0].removeChild(element);
+  checkNotSufferingFromBeingMissing(element);
 }
 
 checkTextareaRequiredValidity();
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
index 81570b06eb47..097132aa4f99 100644
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -85,6 +85,10 @@ ifdef MOZ_GSTREAMER
 PARALLEL_DIRS += gstreamer
 endif
 
+ifdef MOZ_MEDIA_PLUGINS
+PARALLEL_DIRS += plugins
+endif
+
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
diff --git a/content/media/nsBuiltinDecoderReader.cpp b/content/media/nsBuiltinDecoderReader.cpp
index d1af2d243b90..431107ba968a 100644
--- a/content/media/nsBuiltinDecoderReader.cpp
+++ b/content/media/nsBuiltinDecoderReader.cpp
@@ -158,19 +158,26 @@ VideoData* VideoData::Create(nsVideoInfo& aInfo,
   PlanarYCbCrImage* videoImage = static_cast<PlanarYCbCrImage*>(v->mImage.get());
 
   PlanarYCbCrImage::Data data;
-  data.mYChannel = aBuffer.mPlanes[0].mData;
-  data.mYSize = gfxIntSize(aBuffer.mPlanes[0].mWidth, aBuffer.mPlanes[0].mHeight);
-  data.mYStride = aBuffer.mPlanes[0].mStride;
-  data.mCbChannel = aBuffer.mPlanes[1].mData;
-  data.mCrChannel = aBuffer.mPlanes[2].mData;
-  data.mCbCrSize = gfxIntSize(aBuffer.mPlanes[1].mWidth, aBuffer.mPlanes[1].mHeight);
-  data.mCbCrStride = aBuffer.mPlanes[1].mStride;
+  const YCbCrBuffer::Plane &Y = aBuffer.mPlanes[0];
+  const YCbCrBuffer::Plane &Cb = aBuffer.mPlanes[1];
+  const YCbCrBuffer::Plane &Cr = aBuffer.mPlanes[2];
+
+  data.mYChannel = Y.mData;
+  data.mYSize = gfxIntSize(Y.mWidth, Y.mHeight);
+  data.mYStride = Y.mStride;
+  data.mCbChannel = Cb.mData;
+  data.mCrChannel = Cr.mData;
+  data.mCbCrSize = gfxIntSize(Cb.mWidth, Cb.mHeight);
+  data.mCbCrStride = Cb.mStride;
   data.mPicX = aPicture.x;
   data.mPicY = aPicture.y;
   data.mPicSize = gfxIntSize(aPicture.width, aPicture.height);
   data.mStereoMode = aInfo.mStereoMode;
 
-  videoImage->SetData(data); // Copies buffer
+  videoImage->CopyData(data,
+                       Y.mOffset, Y.mSkip,
+                       Cb.mOffset, Cb.mSkip,
+                       Cr.mOffset, Cr.mSkip);
   return v.forget();
 }
 
diff --git a/content/media/nsBuiltinDecoderReader.h b/content/media/nsBuiltinDecoderReader.h
index 2d922bf15631..efaca600f64c 100644
--- a/content/media/nsBuiltinDecoderReader.h
+++ b/content/media/nsBuiltinDecoderReader.h
@@ -141,6 +141,8 @@ public:
       PRUint32 mWidth;
       PRUint32 mHeight;
       PRUint32 mStride;
+      PRUint32 mOffset;
+      PRUint32 mSkip;
     };
 
     Plane mPlanes[3];
@@ -267,17 +269,17 @@ template <class T> class MediaQueue : private nsDeque {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     return nsDeque::GetSize();
   }
-  
+
   inline void Push(T* aItem) {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     nsDeque::Push(aItem);
   }
-  
+
   inline void PushFront(T* aItem) {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     nsDeque::PushFront(aItem);
   }
-  
+
   inline T* Pop() {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     return static_cast<T*>(nsDeque::Pop());
diff --git a/content/media/ogg/nsOggCodecState.cpp b/content/media/ogg/nsOggCodecState.cpp
index 9a297ac57188..0022af707fbb 100644
--- a/content/media/ogg/nsOggCodecState.cpp
+++ b/content/media/ogg/nsOggCodecState.cpp
@@ -46,6 +46,12 @@ static PRUint16 LEUint16(const unsigned char* p)
   return p[0] + (p[1] << 8);
 }
 
+// Reads a little-endian encoded signed 16bit integer at p.
+static PRInt16 LEInt16(const unsigned char* p)
+{
+  return static_cast<PRInt16>(LEUint16(p));
+}
+
 /** Decoder base class for Ogg-encapsulated streams. */
 nsOggCodecState*
 nsOggCodecState::Create(ogg_page* aPage)
@@ -260,6 +266,7 @@ bool nsTheoraState::Init() {
 bool
 nsTheoraState::DecodeHeader(ogg_packet* aPacket)
 {
+  nsAutoRef<ogg_packet> autoRelease(aPacket);
   mPacketCount++;
   int ret = th_decode_headerin(&mInfo,
                                &mComment,
@@ -283,14 +290,14 @@ nsTheoraState::DecodeHeader(ogg_packet* aPacket)
   bool isSetupHeader = aPacket->bytes > 0 && aPacket->packet[0] == 0x82;
   if (ret < 0 || mPacketCount > 3) {
     // We've received an error, or the first three packets weren't valid
-    // header packets, assume bad input, and don't activate the bitstream.
-    mDoneReadingHeaders = true;
+    // header packets. Assume bad input.
+    // Our caller will deactivate the bitstream.
+    return false;
   } else if (ret > 0 && isSetupHeader && mPacketCount == 3) {
     // Successfully read the three header packets.
     mDoneReadingHeaders = true;
-    mActive = true;
   }
-  return mDoneReadingHeaders;
+  return true;
 }
 
 PRInt64
@@ -521,6 +528,7 @@ nsVorbisState::~nsVorbisState() {
 }
 
 bool nsVorbisState::DecodeHeader(ogg_packet* aPacket) {
+  nsAutoRef<ogg_packet> autoRelease(aPacket);
   mPacketCount++;
   int ret = vorbis_synthesis_headerin(&mInfo,
                                       &mComment,
@@ -545,15 +553,15 @@ bool nsVorbisState::DecodeHeader(ogg_packet* aPacket) {
 
   if (ret < 0 || mPacketCount > 3) {
     // We've received an error, or the first three packets weren't valid
-    // header packets, assume bad input, and deactivate the bitstream.
-    mDoneReadingHeaders = true;
-    mActive = false;
+    // header packets. Assume bad input. Our caller will deactivate the
+    // bitstream.
+    return false;
   } else if (ret == 0 && isSetupHeader && mPacketCount == 3) {
     // Successfully read the three header packets.
     // The bitstream remains active.
     mDoneReadingHeaders = true;
   }
-  return mDoneReadingHeaders;
+  return true;
 }
 
 bool nsVorbisState::Init()
@@ -755,11 +763,17 @@ nsOpusState::nsOpusState(ogg_page* aBosPage) :
   mNominalRate(0),
   mChannels(0),
   mPreSkip(0),
-  mGain(0.0),
+#ifdef MOZ_SAMPLE_TYPE_FLOAT32
+  mGain(1.0f),
+#else
+  mGain_Q16(65536),
+#endif
   mChannelMapping(0),
   mStreams(0),
   mDecoder(NULL),
-  mSkip(0)
+  mSkip(0),
+  mPrevPacketGranulepos(0),
+  mPrevPageGranulepos(0)
 {
   MOZ_COUNT_CTOR(nsOpusState);
 }
@@ -775,13 +789,23 @@ nsOpusState::~nsOpusState() {
 }
 
 nsresult nsOpusState::Reset()
+{
+  return Reset(false);
+}
+
+nsresult nsOpusState::Reset(bool aStart)
 {
   nsresult res = NS_OK;
 
   if (mActive && mDecoder) {
     // Reset the decoder.
     opus_decoder_ctl(mDecoder, OPUS_RESET_STATE);
-    mSkip = 0; // Let the seek logic handle this.
+    // Let the seek logic handle pre-roll if we're not seeking to the start.
+    mSkip = aStart ? mPreSkip : 0;
+    // This lets us distinguish the first page being the last page vs. just
+    // not having processed the previous page when we encounter the last page.
+    mPrevPageGranulepos = aStart ? 0 : -1;
+    mPrevPacketGranulepos = aStart ? 0 : -1;
   }
 
   // Clear queued data.
@@ -796,6 +820,9 @@ nsresult nsOpusState::Reset()
 
 bool nsOpusState::Init(void)
 {
+  if (!mActive)
+    return false;
+
   int error;
 
   NS_ASSERTION(mDecoder == NULL, "leaking OpusDecoder");
@@ -810,77 +837,135 @@ bool nsOpusState::Init(void)
 
 bool nsOpusState::DecodeHeader(ogg_packet* aPacket)
 {
-  // Minimum length of any header is 16 bytes.
-  if (aPacket->bytes < 16) {
-    LOG(PR_LOG_DEBUG, ("Invalid Opus file: header too short"));
-    mActive = false;
-    return true;
-  }
+  nsAutoRef<ogg_packet> autoRelease(aPacket);
+  switch(mPacketCount++) {
+    // Parse the id header.
+    case 0: {
+      if (aPacket->bytes < 19 || memcmp(aPacket->packet, "OpusHead", 8)) {
+        LOG(PR_LOG_DEBUG, ("Invalid Opus file: unrecognized header"));
+        return false;
+      }
 
-  // Try parsing as the metadata header.
-  if (!memcmp(aPacket->packet, "OpusTags", 8)) {
-    mDoneReadingHeaders = true; // This is the last Opus header.
-    mActive = true;
-    return true;
-  }
+      mRate = 48000; // The Opus decoder runs at 48 kHz regardless.
 
-  // Otherwise, parse as the id header.
-  if (aPacket->bytes < 19 || memcmp(aPacket->packet, "OpusHead", 8)) {
-    LOG(PR_LOG_DEBUG, ("Invalid Opus file: unrecognized header"));
-    mActive = false;
-    return true;
-  }
+      int version = aPacket->packet[8];
+      // Accept file format versions 0.x.
+      if ((version & 0xf0) != 0) {
+        LOG(PR_LOG_DEBUG, ("Rejecting unknown Opus file version %d", version));
+        return false;
+      }
 
-  mRate = 48000; // The Opus decoder runs at 48 kHz regardless.
+      mChannels= aPacket->packet[9];
+      mPreSkip = LEUint16(aPacket->packet + 10);
+      mNominalRate = LEUint32(aPacket->packet + 12);
+      double gain_dB = LEInt16(aPacket->packet + 16) / 256.0;
+#ifdef MOZ_SAMPLE_TYPE_FLOAT32
+      mGain = static_cast<float>(pow(10,0.05*gain_dB));
+#else
+      mGain_Q16 = static_cast<PRInt32>(NS_MIN(65536*pow(10,0.05*gain_dB)+0.5,
+                                              static_cast<double>(PR_INT32_MAX)));
+#endif
+      mChannelMapping = aPacket->packet[18];
 
-  int version = aPacket->packet[8];
-  // Accept file format versions 0.x.
-  if ((version & 0xf0) != 0) {
-    LOG(PR_LOG_DEBUG, ("Rejecting unknown Opus file version %d", version));
-    mActive = false;
-    return true;
-  }
-
-  mChannels= aPacket->packet[9];
-  mPreSkip = LEUint16(aPacket->packet + 10);
-  mNominalRate = LEUint32(aPacket->packet + 12);
-  mGain = (float)LEUint16(aPacket->packet + 16) / 256.0;
-  mChannelMapping = aPacket->packet[18];
-
-  if (mChannelMapping == 0) {
-    mStreams = 1;
-  } else if (aPacket->bytes > 19) {
-    mStreams = aPacket->packet[19];
-  } else {
-    LOG(PR_LOG_DEBUG, ("Invalid Opus file: channel mapping %d,"
-                       " but no channel mapping table", mChannelMapping));
-    mActive = false;
-    return true;
-  }
+      if (mChannelMapping == 0) {
+        mStreams = 1;
+      } else if (aPacket->bytes > 19) {
+        mStreams = aPacket->packet[19];
+      } else {
+        LOG(PR_LOG_DEBUG, ("Invalid Opus file: channel mapping %d,"
+                           " but no channel mapping table", mChannelMapping));
+        return false;
+      }
 
 #ifdef DEBUG
-  LOG(PR_LOG_DEBUG, ("Opus stream header:"));
-  LOG(PR_LOG_DEBUG, (" channels: %d", mChannels));
-  LOG(PR_LOG_DEBUG, ("  preskip: %d", mPreSkip));
-  LOG(PR_LOG_DEBUG, (" original: %d Hz", mNominalRate));
-  LOG(PR_LOG_DEBUG, ("     gain: %.2f dB", mGain));
-  LOG(PR_LOG_DEBUG, ("Channel Mapping:"));
-  LOG(PR_LOG_DEBUG, ("   family: %d", mChannelMapping));
-  LOG(PR_LOG_DEBUG, ("  streams: %d", mStreams));
+      LOG(PR_LOG_DEBUG, ("Opus stream header:"));
+      LOG(PR_LOG_DEBUG, (" channels: %d", mChannels));
+      LOG(PR_LOG_DEBUG, ("  preskip: %d", mPreSkip));
+      LOG(PR_LOG_DEBUG, (" original: %d Hz", mNominalRate));
+      LOG(PR_LOG_DEBUG, ("     gain: %.2f dB", gain_dB));
+      LOG(PR_LOG_DEBUG, ("Channel Mapping:"));
+      LOG(PR_LOG_DEBUG, ("   family: %d", mChannelMapping));
+      LOG(PR_LOG_DEBUG, ("  streams: %d", mStreams));
 #endif
+    }
+    break;
 
+    // Parse the metadata header.
+    case 1: {
+      if (aPacket->bytes < 16 || memcmp(aPacket->packet, "OpusTags", 8))
+        return false;
+
+      // We don't actually need any of the data here, but validating the
+      // contents helps reduce the propagation of broken files.
+      // This only checks for actual malicious content: too little data, too
+      // many comments, or comments that are too long.
+      // It does not ensure they are valid UTF-8, nor does it validate the
+      // required ASCII_TAG=value format of the user comments.
+      const unsigned char *buf = aPacket->packet + 8;
+      PRUint32 bytes = aPacket->bytes - 8;
+      PRUint32 len;
+      // Skip the vendor string.
+      len = LEUint32(buf);
+      buf += 4;
+      bytes -= 4;
+      if (len > bytes)
+        return false;
+      buf += len;
+      bytes -= len;
+      // Skip the user comments.
+      if (bytes < 4)
+        return false;
+      PRUint32 ncomments = LEUint32(buf);
+      buf += 4;
+      bytes -= 4;
+      // If there are so many comments even their length fields won't fit in
+      // the packet, stop reading now.
+      if (ncomments > (bytes>>2))
+        return false;
+      PRUint32 i;
+      for (i = 0; i < ncomments; i++) {
+        if (bytes < 4)
+          return false;
+        len = LEUint32(buf);
+        buf += 4;
+        bytes -= 4;
+        if (len > bytes)
+          return false;
+        buf += len;
+        bytes -= len;
+      }
+    }
+    break;
+
+    // We made it to the first data packet (which includes reconstructing
+    // timestamps for it in PageIn). Success!
+    default: {
+      mDoneReadingHeaders = true;
+      // Put it back on the queue so we can decode it.
+      mPackets.PushFront(autoRelease.disown());
+    }
+    break;
+  }
   return true;
 }
 
 /* Return the timestamp (in microseconds) equivalent to a granulepos. */
-PRInt64 nsOpusState::Time(PRInt64 granulepos)
+PRInt64 nsOpusState::Time(PRInt64 aGranulepos)
 {
-  if (!mActive || granulepos < 0)
+  if (!mActive)
+    return -1;
+
+  return Time(mPreSkip, aGranulepos);
+}
+
+PRInt64 nsOpusState::Time(int aPreSkip, PRInt64 aGranulepos)
+{
+  if (aGranulepos < 0)
     return -1;
 
   // Ogg Opus always runs at a granule rate of 48 kHz.
-  CheckedInt64 t = CheckedInt64(granulepos - mPreSkip) * USECS_PER_S;
-  return t.isValid() ? t.value() / mRate : -1;
+  CheckedInt64 t = CheckedInt64(aGranulepos - aPreSkip) * USECS_PER_S;
+  return t.isValid() ? t.value() / 48000 : -1;
 }
 
 bool nsOpusState::IsHeader(ogg_packet* aPacket)
@@ -901,9 +986,10 @@ nsresult nsOpusState::PageIn(ogg_page* aPage)
 
   bool haveGranulepos;
   nsresult rv = PacketOutUntilGranulepos(haveGranulepos);
-  if (NS_FAILED(rv) || !haveGranulepos || !mDoneReadingHeaders)
+  if (NS_FAILED(rv) || !haveGranulepos || mPacketCount < 2)
     return rv;
-  ReconstructGranulepos();
+  if(!ReconstructOpusGranulepos())
+    return NS_ERROR_FAILURE;
   for (PRUint32 i = 0; i < mUnstamped.Length(); i++) {
     ogg_packet* packet = mUnstamped[i];
     NS_ASSERTION(!IsHeader(packet), "Don't try to play a header packet");
@@ -914,30 +1000,108 @@ nsresult nsOpusState::PageIn(ogg_page* aPage)
   return NS_OK;
 }
 
-void nsOpusState::ReconstructGranulepos(void)
+// Helper method to return the change in granule position due to an Opus packet
+// (as distinct from the number of samples in the packet, which depends on the
+// decoder rate). It should work with a multistream Opus file, and continue to
+// work should we ever allow the decoder to decode at a rate other than 48 kHz.
+// It even works before we've created the actual Opus decoder.
+static int GetOpusDeltaGP(ogg_packet* packet)
+{
+  int nframes;
+  nframes = opus_packet_get_nb_frames(packet->packet, packet->bytes);
+  if (nframes > 0) {
+    return nframes*opus_packet_get_samples_per_frame(packet->packet, 48000);
+  }
+  NS_WARNING("Invalid Opus packet.");
+  return nframes;
+}
+
+bool nsOpusState::ReconstructOpusGranulepos(void)
 {
   NS_ASSERTION(mUnstamped.Length() > 0, "Must have unstamped packets");
-  DebugOnly<ogg_packet*> last = mUnstamped[mUnstamped.Length()-1];
+  ogg_packet* last = mUnstamped[mUnstamped.Length()-1];
   NS_ASSERTION(last->e_o_s || last->granulepos > 0,
       "Must know last granulepos!");
+  PRInt64 gp;
+  // If this is the last page, and we've seen at least one previous page (or
+  // this is the first page)...
+  if (last->e_o_s) {
+    if (mPrevPageGranulepos != -1) {
+      // If this file only has one page and the final granule position is
+      // smaller than the pre-skip amount, we MUST reject the stream.
+      if (!mDoneReadingHeaders && last->granulepos < mPreSkip)
+        return false;
+      PRInt64 last_gp = last->granulepos;
+      gp = mPrevPageGranulepos;
+      // Loop through the packets forwards, adding the current packet's
+      // duration to the previous granulepos to get the value for the
+      // current packet.
+      for (PRUint32 i = 0; i < mUnstamped.Length() - 1; ++i) {
+        ogg_packet* packet = mUnstamped[i];
+        int offset = GetOpusDeltaGP(packet);
+        // Check for error (negative offset) and overflow.
+        if (offset >= 0 && gp <= PR_INT64_MAX - offset) {
+          gp += offset;
+          if (gp >= last_gp) {
+            NS_WARNING("Opus end trimming removed more than a full packet.");
+            // We were asked to remove a full packet's worth of data or more.
+            // Encoders SHOULD NOT produce streams like this, but we'll handle
+            // it for them anyway.
+            gp = last_gp;
+            for (PRUint32 j = i+1; j < mUnstamped.Length(); ++j) {
+              nsOggCodecState::ReleasePacket(mUnstamped[j]);
+            }
+            mUnstamped.RemoveElementsAt(i+1, mUnstamped.Length() - (i+1));
+            last = packet;
+            last->e_o_s = 1;
+          }
+        }
+        packet->granulepos = gp;
+      }
+      mPrevPageGranulepos = last_gp;
+      return true;
+    } else {
+      NS_WARNING("No previous granule position to use for Opus end trimming.");
+      // If we don't have a previous granule position, fall through.
+      // We simply won't trim any samples from the end.
+      // TODO: Are we guaranteed to have seen a previous page if there is one?
+    }
+  }
 
+  gp = last->granulepos;
   // Loop through the packets backwards, subtracting the next
   // packet's duration from its granulepos to get the value
   // for the current packet.
   for (PRUint32 i = mUnstamped.Length() - 1; i > 0; i--) {
-    ogg_packet* next = mUnstamped[i];
-    int offset = opus_decoder_get_nb_samples(mDecoder,
-                                             next->packet,
-                                             next->bytes);
+    int offset = GetOpusDeltaGP(mUnstamped[i]);
     // Check for error (negative offset) and overflow.
-    if (offset >= 0 && offset <= next->granulepos) {
-      mUnstamped[i - 1]->granulepos = next->granulepos - offset;
-    } else {
-      if (offset > next->granulepos)
+    if (offset >= 0) {
+      if (offset <= gp) {
+        gp -= offset;
+      } else {
+        // If the granule position of the first data page is smaller than the
+        // number of decodable audio samples on that page, then we MUST reject
+        // the stream.
+        if (!mDoneReadingHeaders)
+          return false;
+        // It's too late to reject the stream.
+        // If we get here, this almost certainly means the file has screwed-up
+        // timestamps somewhere after the first page.
         NS_WARNING("Clamping negative Opus granulepos to zero.");
-      mUnstamped[i - 1]->granulepos = 0;
+        gp = 0;
+      }
     }
+    mUnstamped[i - 1]->granulepos = gp;
   }
+
+  // Check to make sure the first granule position is at least as large as the
+  // total number of samples decodable from the first page with completed
+  // packets. This requires looking at the duration of the first packet, too.
+  // We MUST reject such streams.
+  if (!mDoneReadingHeaders && GetOpusDeltaGP(mUnstamped[0]) > gp)
+    return false;
+  mPrevPageGranulepos = last->granulepos;
+  return true;
 }
 #endif /* MOZ_OPUS */
 
@@ -1230,6 +1394,7 @@ nsresult nsSkeletonState::GetDuration(const nsTArray<PRUint32>& aTracks,
 
 bool nsSkeletonState::DecodeHeader(ogg_packet* aPacket)
 {
+  nsAutoRef<ogg_packet> autoRelease(aPacket);
   if (IsSkeletonBOS(aPacket)) {
     PRUint16 verMajor = LEUint16(aPacket->packet + SKELETON_VERSION_MAJOR_OFFSET);
     PRUint16 verMinor = LEUint16(aPacket->packet + SKELETON_VERSION_MINOR_OFFSET);
@@ -1241,32 +1406,25 @@ bool nsSkeletonState::DecodeHeader(ogg_packet* aPacket)
     mPresentationTime = d == 0 ? 0 : (static_cast<float>(n) / static_cast<float>(d)) * USECS_PER_S;
 
     mVersion = SKELETON_VERSION(verMajor, verMinor);
+    // We can only care to parse Skeleton version 4.0+.
     if (mVersion < SKELETON_VERSION(4,0) ||
         mVersion >= SKELETON_VERSION(5,0) ||
         aPacket->bytes < SKELETON_4_0_MIN_HEADER_LEN)
-    {
-      // We can only care to parse Skeleton version 4.0+.
-      mActive = false;
-      return mDoneReadingHeaders = true;
-    }
+      return false;
 
     // Extract the segment length.
     mLength = LEInt64(aPacket->packet + SKELETON_FILE_LENGTH_OFFSET);
 
     LOG(PR_LOG_DEBUG, ("Skeleton segment length: %lld", mLength));
 
-    // Initialize the serianlno-to-index map.
+    // Initialize the serialno-to-index map.
     mIndex.Init();
-    mActive = true;
+    return true;
   } else if (IsSkeletonIndex(aPacket) && mVersion >= SKELETON_VERSION(4,0)) {
-    if (!DecodeIndex(aPacket)) {
-      // Failed to parse index, or invalid/hostile index. DecodeIndex() will
-      // have deactivated the track.
-      return mDoneReadingHeaders = true;
-    }
-
+    return DecodeIndex(aPacket);
   } else if (aPacket->e_o_s) {
     mDoneReadingHeaders = true;
+    return true;
   }
-  return mDoneReadingHeaders;
+  return false;
 }
diff --git a/content/media/ogg/nsOggCodecState.h b/content/media/ogg/nsOggCodecState.h
index 2f58feb21c31..ffcf4af295c2 100644
--- a/content/media/ogg/nsOggCodecState.h
+++ b/content/media/ogg/nsOggCodecState.h
@@ -15,7 +15,11 @@
 #endif
 #ifdef MOZ_OPUS
 #include <opus/opus.h>
+// For MOZ_SAMPLE_TYPE_*
+#include "nsBuiltinDecoderStateMachine.h"
+#include "nsBuiltinDecoderReader.h"
 #endif
+#include <nsAutoRef.h>
 #include <nsDeque.h>
 #include <nsTArray.h>
 #include <nsClassHashtable.h>
@@ -83,8 +87,10 @@ public:
   static nsOggCodecState* Create(ogg_page* aPage);
   
   virtual CodecType GetType() { return TYPE_UNKNOWN; }
-  
+
   // Reads a header packet. Returns true when last header has been read.
+  // This function takes ownership of the packet and is responsible for
+  // releasing it or queuing it for later processing.
   virtual bool DecodeHeader(ogg_packet* aPacket) {
     return (mDoneReadingHeaders = true);
   }
@@ -298,23 +304,34 @@ public:
 
   CodecType GetType() { return TYPE_OPUS; }
   bool DecodeHeader(ogg_packet* aPacket);
-  PRInt64 Time(PRInt64 granulepos);
+  PRInt64 Time(PRInt64 aGranulepos);
   bool Init();
   nsresult Reset();
+  nsresult Reset(bool aStart);
   bool IsHeader(ogg_packet* aPacket);
   nsresult PageIn(ogg_page* aPage);
 
+  // Returns the end time that a granulepos represents.
+  static PRInt64 Time(int aPreSkip, PRInt64 aGranulepos);
+
   // Various fields from the Ogg Opus header.
   int mRate;        // Sample rate the decoder uses (always 48 kHz).
-  int mNominalRate; // Original sample rate of the data (informational).
+  PRUint32 mNominalRate; // Original sample rate of the data (informational).
   int mChannels;    // Number of channels the stream encodes.
-  int mPreSkip;     // Number of samples to strip after decoder reset.
-  float mGain;      // Gain (dB) to apply to decoder output.
+  PRUint16 mPreSkip; // Number of samples to strip after decoder reset.
+#ifdef MOZ_SAMPLE_TYPE_FLOAT32
+  float mGain;      // Gain to apply to decoder output.
+#else
+  PRInt32 mGain_Q16; // Gain to apply to the decoder output.
+#endif
   int mChannelMapping; // Channel mapping family.
   int mStreams;     // Number of packed streams in each packet.
 
   OpusDecoder *mDecoder;
   int mSkip;        // Number of samples left to trim before playback.
+  // Granule position (end sample) of the last decoded Opus packet. This is
+  // used to calculate the amount we should trim from the last packet.
+  PRInt64 mPrevPacketGranulepos;
 
 private:
 
@@ -323,7 +340,13 @@ private:
   // the stream, with the last packet having a known granulepos. Using this
   // known granulepos, and the known frame numbers, we recover the granulepos
   // of all frames in the array. This enables us to determine their timestamps.
-  void ReconstructGranulepos();
+  bool ReconstructOpusGranulepos();
+
+  // Granule position (end sample) of the last decoded Opus page. This is
+  // used to calculate the Opus per-packet granule positions on the last page,
+  // where we may need to trim some samples from the end.
+  PRInt64 mPrevPageGranulepos;
+
 #endif /* MOZ_OPUS */
 };
 
@@ -461,4 +484,15 @@ private:
   nsClassHashtable<nsUint32HashKey, nsKeyFrameIndex> mIndex;
 };
 
+// This allows the use of nsAutoRefs for an ogg_packet that properly free the
+// contents of the packet.
+template <>
+class nsAutoRefTraits<ogg_packet> : public nsPointerRefTraits<ogg_packet>
+{
+public:
+  static void Release(ogg_packet* aPacket) {
+    nsOggCodecState::ReleasePacket(aPacket);
+  }
+};
+
 #endif
diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/ogg/nsOggReader.cpp
index d24dcda0442c..0068f680bd44 100644
--- a/content/media/ogg/nsOggReader.cpp
+++ b/content/media/ogg/nsOggReader.cpp
@@ -41,6 +41,10 @@ extern PRLogModuleInfo* gBuiltinDecoderLog;
 // small range, which would open a new HTTP connetion.
 static const PRUint32 SEEK_FUZZ_USECS = 500000;
 
+// The number of microseconds of "pre-roll" we use for Opus streams.
+// The specification recommends 80 ms.
+static const PRInt64 SEEK_OPUS_PREROLL = 80 * USECS_PER_MS;
+
 enum PageSyncResult {
   PAGE_SYNC_ERROR = 1,
   PAGE_SYNC_END_OF_RANGE= 2,
@@ -61,16 +65,6 @@ PageSync(MediaResource* aResource,
 // is about 4300 bytes, so we read the file in chunks larger than that.
 static const int PAGE_STEP = 8192;
 
-class nsAutoReleasePacket {
-public:
-  nsAutoReleasePacket(ogg_packet* aPacket) : mPacket(aPacket) { }
-  ~nsAutoReleasePacket() {
-    nsOggCodecState::ReleasePacket(mPacket);
-  }
-private:
-  ogg_packet* mPacket;
-};
-
 nsOggReader::nsOggReader(nsBuiltinDecoder* aDecoder)
   : nsBuiltinDecoderReader(aDecoder),
     mTheoraState(nsnull),
@@ -79,7 +73,9 @@ nsOggReader::nsOggReader(nsBuiltinDecoder* aDecoder)
     mOpusEnabled(nsHTMLMediaElement::IsOpusEnabled()),
     mSkeletonState(nsnull),
     mVorbisSerial(0),
+    mOpusSerial(0),
     mTheoraSerial(0),
+    mOpusPreSkip(0),
     mPageOffset(0)
 {
   MOZ_COUNT_CTOR(nsOggReader);
@@ -118,17 +114,8 @@ nsresult nsOggReader::ResetDecode(bool start)
   if (mVorbisState && NS_FAILED(mVorbisState->Reset())) {
     res = NS_ERROR_FAILURE;
   }
-  if (mOpusState) {
-    if (NS_FAILED(mOpusState->Reset())) {
-      res = NS_ERROR_FAILURE;
-    }
-    else if (start) {
-      // Reset the skip frame counter as if
-      // we're starting playback fresh.
-      mOpusState->mSkip = mOpusState->mPreSkip;
-      LOG(PR_LOG_DEBUG, ("Seek to start: asking opus decoder to skip %d",
-                         mOpusState->mSkip));
-    }
+  if (mOpusState && NS_FAILED(mOpusState->Reset(start))) {
+    res = NS_ERROR_FAILURE;
   }
   if (mTheoraState && NS_FAILED(mTheoraState->Reset())) {
     res = NS_ERROR_FAILURE;
@@ -141,16 +128,29 @@ bool nsOggReader::ReadHeaders(nsOggCodecState* aState)
 {
   while (!aState->DoneReadingHeaders()) {
     ogg_packet* packet = NextOggPacket(aState);
-    nsAutoReleasePacket autoRelease(packet);
-    if (!packet || !aState->IsHeader(packet)) {
+    // DecodeHeader is responsible for releasing packet.
+    if (!packet || !aState->DecodeHeader(packet)) {
       aState->Deactivate();
-    } else {
-      aState->DecodeHeader(packet);
+      return false;
     }
   }
   return aState->Init();
 }
 
+void nsOggReader::BuildSerialList(nsTArray<PRUint32>& aTracks)
+{
+  if (HasVideo()) {
+    aTracks.AppendElement(mTheoraState->mSerial);
+  }
+  if (HasAudio()) {
+    if (mVorbisState) {
+      aTracks.AppendElement(mVorbisState->mSerial);
+    } else if(mOpusState) {
+      aTracks.AppendElement(mOpusState->mSerial);
+    }
+  }
+}
+
 nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
 {
   NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
@@ -291,6 +291,8 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
     mInfo.mHasAudio = true;
     mInfo.mAudioRate = mOpusState->mRate;
     mInfo.mAudioChannels = mOpusState->mChannels;
+    mOpusSerial = mOpusState->mSerial;
+    mOpusPreSkip = mOpusState->mPreSkip;
   }
 #endif
   if (mSkeletonState) {
@@ -302,12 +304,7 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
       // Extract the duration info out of the index, so we don't need to seek to
       // the end of resource to get it.
       nsAutoTArray<PRUint32, 2> tracks;
-      if (HasVideo()) {
-        tracks.AppendElement(mTheoraState->mSerial);
-      }
-      if (HasAudio()) {
-        tracks.AppendElement(mVorbisState->mSerial);
-      }
+      BuildSerialList(tracks);
       PRInt64 duration = 0;
       if (NS_SUCCEEDED(mSkeletonState->GetDuration(tracks, duration))) {
         ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
@@ -416,9 +413,16 @@ nsresult nsOggReader::DecodeOpus(ogg_packet* aPacket) {
   NS_ASSERTION(ret == frames, "Opus decoded too few audio samples");
 
   PRInt64 endFrame = aPacket->granulepos;
-  PRInt64 endTime = mOpusState->Time(endFrame);
-  PRInt64 startTime = mOpusState->Time(endFrame - frames);
-  PRInt64 duration = endTime - startTime;
+  PRInt64 startFrame;
+  // If this is the last packet, perform end trimming.
+  if (aPacket->e_o_s && mOpusState->mPrevPacketGranulepos != -1) {
+    startFrame = mOpusState->mPrevPacketGranulepos;
+    frames = static_cast<PRInt32>(NS_MAX(static_cast<PRInt64>(0),
+                                         NS_MIN(endFrame - startFrame,
+                                                static_cast<PRInt64>(frames))));
+  } else {
+    startFrame = endFrame - frames;
+  }
 
   // Trim the initial frames while the decoder is settling.
   if (mOpusState->mSkip > 0) {
@@ -436,19 +440,43 @@ nsresult nsOggReader::DecodeOpus(ogg_packet* aPacket) {
     for (int i = 0; i < samples; i++)
       trimBuffer[i] = buffer[skipFrames*channels + i];
 
-    startTime = mOpusState->Time(endFrame - keepFrames);
-    duration = endTime - startTime;
+    startFrame = endFrame - keepFrames;
     frames = keepFrames;
     buffer = trimBuffer;
 
     mOpusState->mSkip -= skipFrames;
     LOG(PR_LOG_DEBUG, ("Opus decoder skipping %d frames", skipFrames));
   }
+  // Save this packet's granule position in case we need to perform end
+  // trimming on the next packet.
+  mOpusState->mPrevPacketGranulepos = endFrame;
+
+  // Apply the header gain if one was specified.
+#ifdef MOZ_SAMPLE_TYPE_FLOAT32
+  if (mOpusState->mGain != 1.0f) {
+    float gain = mOpusState->mGain;
+    int samples = frames * channels;
+    for (int i = 0; i < samples; i++) {
+      buffer[i] *= gain;
+    }
+  }
+#else
+  if (mOpusState->mGain_Q16 != 65536) {
+    PRInt64 gain_Q16 = mOpusState->mGain_Q16;
+    int samples = frames * channels;
+    for (int i = 0; i < samples; i++) {
+      PRInt32 val = static_cast<PRInt32>((gain_Q16*buffer[i] + 32768)>>16);
+      buffer[i] = static_cast<AudioDataValue>(MOZ_CLIP_TO_15(val));
+    }
+  }
+#endif
 
   LOG(PR_LOG_DEBUG, ("Opus decoder pushing %d frames", frames));
+  PRInt64 startTime = mOpusState->Time(startFrame);
+  PRInt64 endTime = mOpusState->Time(endFrame);
   mAudioQueue.Push(new AudioData(mPageOffset,
                                  startTime,
-                                 duration,
+                                 endTime - startTime,
                                  frames,
                                  buffer.forget(),
                                  channels));
@@ -483,7 +511,7 @@ bool nsOggReader::DecodeAudioData()
 
   NS_ASSERTION(packet && packet->granulepos != -1,
     "Must have packet with known granulepos");
-  nsAutoReleasePacket autoRelease(packet);
+  nsAutoRef<ogg_packet> autoRelease(packet);
   if (mVorbisState) {
     DecodeVorbis(packet);
 #ifdef MOZ_OPUS
@@ -546,6 +574,7 @@ nsresult nsOggReader::DecodeTheora(ogg_packet* aPacket, PRInt64 aTimeThreshold)
       b.mPlanes[i].mHeight = buffer[i].height;
       b.mPlanes[i].mWidth = buffer[i].width;
       b.mPlanes[i].mStride = buffer[i].stride;
+      b.mPlanes[i].mOffset = b.mPlanes[i].mSkip = 0;
     }
 
     VideoData *v = VideoData::Create(mInfo,
@@ -590,7 +619,7 @@ bool nsOggReader::DecodeVideoFrame(bool &aKeyframeSkip,
     mVideoQueue.Finish();
     return false;
   }
-  nsAutoReleasePacket autoRelease(packet);
+  nsAutoRef<ogg_packet> autoRelease(packet);
 
   parsed++;
   NS_ASSERTION(packet && packet->granulepos != -1,
@@ -939,12 +968,7 @@ nsOggReader::IndexedSeekResult nsOggReader::SeekToKeyframeUsingIndex(PRInt64 aTa
   }
   // We have an index from the Skeleton track, try to use it to seek.
   nsAutoTArray<PRUint32, 2> tracks;
-  if (HasVideo()) {
-    tracks.AppendElement(mTheoraState->mSerial);
-  }
-  if (HasAudio()) {
-    tracks.AppendElement(mVorbisState->mSerial);
-  }
+  BuildSerialList(tracks);
   nsSkeletonState::nsSeekTarget keyframe;
   if (NS_FAILED(mSkeletonState->IndexedSeekTarget(aTarget,
                                                   tracks,
@@ -1013,51 +1037,57 @@ nsOggReader::IndexedSeekResult nsOggReader::SeekToKeyframeUsingIndex(PRInt64 aTa
 }
 
 nsresult nsOggReader::SeekInBufferedRange(PRInt64 aTarget,
+                                          PRInt64 aAdjustedTarget,
                                           PRInt64 aStartTime,
                                           PRInt64 aEndTime,
                                           const nsTArray<SeekRange>& aRanges,
                                           const SeekRange& aRange)
 {
   LOG(PR_LOG_DEBUG, ("%p Seeking in buffered data to %lld using bisection search", mDecoder, aTarget));
-
-  // We know the exact byte range in which the target must lie. It must
-  // be buffered in the media cache. Seek there.
-  nsresult res = SeekBisection(aTarget, aRange, 0);
-  if (NS_FAILED(res) || !HasVideo()) {
-    return res;
-  }
-
-  // We have an active Theora bitstream. Decode the next Theora frame, and
-  // extract its keyframe's time.
-  bool eof;
-  do {
-    bool skip = false;
-    eof = !DecodeVideoFrame(skip, 0);
-    {
-      ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
-      if (mDecoder->GetDecodeState() == nsBuiltinDecoderStateMachine::DECODER_STATE_SHUTDOWN) {
-        return NS_ERROR_FAILURE;
-      }
+  nsresult res = NS_OK;
+  if (HasVideo() || aAdjustedTarget >= aTarget) {
+    // We know the exact byte range in which the target must lie. It must
+    // be buffered in the media cache. Seek there.
+    nsresult res = SeekBisection(aTarget, aRange, 0);
+    if (NS_FAILED(res) || !HasVideo()) {
+      return res;
     }
-  } while (!eof &&
-           mVideoQueue.GetSize() == 0);
 
-  VideoData* video = mVideoQueue.PeekFront();
-  if (video && !video->mKeyframe) {
-    // First decoded frame isn't a keyframe, seek back to previous keyframe,
-    // otherwise we'll get visual artifacts.
-    NS_ASSERTION(video->mTimecode != -1, "Must have a granulepos");
-    int shift = mTheoraState->mInfo.keyframe_granule_shift;
-    PRInt64 keyframeGranulepos = (video->mTimecode >> shift) << shift;
-    PRInt64 keyframeTime = mTheoraState->StartTime(keyframeGranulepos);
-    SEEK_LOG(PR_LOG_DEBUG, ("Keyframe for %lld is at %lld, seeking back to it",
-                            video->mTime, keyframeTime));
+    // We have an active Theora bitstream. Decode the next Theora frame, and
+    // extract its keyframe's time.
+    bool eof;
+    do {
+      bool skip = false;
+      eof = !DecodeVideoFrame(skip, 0);
+      {
+        ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+        if (mDecoder->GetDecodeState() == nsBuiltinDecoderStateMachine::DECODER_STATE_SHUTDOWN) {
+          return NS_ERROR_FAILURE;
+        }
+      }
+    } while (!eof &&
+             mVideoQueue.GetSize() == 0);
+
+    VideoData* video = mVideoQueue.PeekFront();
+    if (video && !video->mKeyframe) {
+      // First decoded frame isn't a keyframe, seek back to previous keyframe,
+      // otherwise we'll get visual artifacts.
+      NS_ASSERTION(video->mTimecode != -1, "Must have a granulepos");
+      int shift = mTheoraState->mInfo.keyframe_granule_shift;
+      PRInt64 keyframeGranulepos = (video->mTimecode >> shift) << shift;
+      PRInt64 keyframeTime = mTheoraState->StartTime(keyframeGranulepos);
+      SEEK_LOG(PR_LOG_DEBUG, ("Keyframe for %lld is at %lld, seeking back to it",
+                              video->mTime, keyframeTime));
+      aAdjustedTarget = NS_MIN(aAdjustedTarget, keyframeTime);
+    }
+  }
+  if (aAdjustedTarget < aTarget) {
     SeekRange k = SelectSeekRange(aRanges,
-                                  keyframeTime,
+                                  aAdjustedTarget,
                                   aStartTime,
                                   aEndTime,
                                   false);
-    res = SeekBisection(keyframeTime, k, SEEK_FUZZ_USECS);
+    res = SeekBisection(aAdjustedTarget, k, SEEK_FUZZ_USECS);
   }
   return res;
 }
@@ -1085,6 +1115,10 @@ nsresult nsOggReader::SeekInUnbuffered(PRInt64 aTarget,
   if (HasVideo() && mTheoraState) {
     keyframeOffsetMs = mTheoraState->MaxKeyframeOffset();
   }
+  // Add in the Opus pre-roll if necessary, as well.
+  if (HasAudio() && mOpusState) {
+    keyframeOffsetMs = NS_MAX(keyframeOffsetMs, SEEK_OPUS_PREROLL);
+  }
   PRInt64 seekTarget = NS_MAX(aStartTime, aTarget - keyframeOffsetMs);
   // Minimize the bisection search space using the known timestamps from the
   // buffered ranges.
@@ -1102,8 +1136,12 @@ nsresult nsOggReader::Seek(PRInt64 aTarget,
   nsresult res;
   MediaResource* resource = mDecoder->GetResource();
   NS_ENSURE_TRUE(resource != nsnull, NS_ERROR_FAILURE);
+  PRInt64 adjustedTarget = aTarget;
+  if (HasAudio() && mOpusState){
+    adjustedTarget = NS_MAX(aStartTime, aTarget - SEEK_OPUS_PREROLL);
+  }
 
-  if (aTarget == aStartTime) {
+  if (adjustedTarget == aStartTime) {
     // We've seeked to the media start. Just seek to the offset of the first
     // content page.
     res = resource->Seek(nsISeekableStream::NS_SEEK_SET, 0);
@@ -1119,7 +1157,10 @@ nsresult nsOggReader::Seek(PRInt64 aTarget,
       mDecoder->UpdatePlaybackPosition(aStartTime);
     }
   } else {
-    IndexedSeekResult sres = SeekToKeyframeUsingIndex(aTarget);
+    // TODO: This may seek back unnecessarily far in the video, but we don't
+    // have a way of asking Skeleton to seek to a different target for each
+    // stream yet. Using adjustedTarget here is at least correct, if slow.
+    IndexedSeekResult sres = SeekToKeyframeUsingIndex(adjustedTarget);
     NS_ENSURE_TRUE(sres != SEEK_FATAL_ERROR, NS_ERROR_FAILURE);
     if (sres == SEEK_INDEX_FAIL) {
       // No index or other non-fatal index-related failure. Try to seek
@@ -1135,7 +1176,7 @@ nsresult nsOggReader::Seek(PRInt64 aTarget,
       if (!r.IsNull()) {
         // We know the buffered range in which the seek target lies, do a
         // bisection search in that buffered range.
-        res = SeekInBufferedRange(aTarget, aStartTime, aEndTime, ranges, r);
+        res = SeekInBufferedRange(aTarget, adjustedTarget, aStartTime, aEndTime, ranges, r);
         NS_ENSURE_SUCCESS(res,res);
       } else {
         // The target doesn't lie in a buffered range. Perform a bisection
@@ -1404,8 +1445,8 @@ nsresult nsOggReader::SeekBisection(PRInt64 aTarget,
           break;
         }
         
-      } while ((mVorbisState && audioTime == -1) ||
-               (mTheoraState && videoTime == -1));
+      } while ((HasAudio() && audioTime == -1) ||
+               (HasVideo() && videoTime == -1));
 
       NS_ASSERTION(mPageOffset <= endOffset, "Page read cursor should be inside range");
 
@@ -1553,6 +1594,10 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
         startTime = nsVorbisState::Time(&mVorbisInfo, granulepos);
         NS_ASSERTION(startTime > 0, "Must have positive start time");
       }
+      else if (mOpusState && serial == mOpusSerial) {
+        startTime = nsOpusState::Time(mOpusPreSkip, granulepos);
+        NS_ASSERTION(startTime > 0, "Must have positive start time");
+      }
       else if (mTheoraState && serial == mTheoraSerial) {
         startTime = nsTheoraState::Time(&mTheoraInfo, granulepos);
         NS_ASSERTION(startTime > 0, "Must have positive start time");
diff --git a/content/media/ogg/nsOggReader.h b/content/media/ogg/nsOggReader.h
index 0adc338d244f..c30f0cdaeb4c 100644
--- a/content/media/ogg/nsOggReader.h
+++ b/content/media/ogg/nsOggReader.h
@@ -113,11 +113,13 @@ private:
   };
 
   // Seeks to aTarget usecs in the buffered range aRange using bisection search,
-  // or to the keyframe prior to aTarget if we have video. aStartTime must be
-  // the presentation time at the start of media, and aEndTime the time at
-  // end of media. aRanges must be the time/byte ranges buffered in the media
-  // cache as per GetSeekRanges().
+  // or to the keyframe prior to aTarget if we have video. aAdjustedTarget is
+  // an adjusted version of the target used to account for Opus pre-roll, if
+  // necessary. aStartTime must be the presentation time at the start of media,
+  // and aEndTime the time at end of media. aRanges must be the time/byte ranges
+  // buffered in the media cache as per GetSeekRanges().
   nsresult SeekInBufferedRange(PRInt64 aTarget,
+                               PRInt64 aAdjustedTarget,
                                PRInt64 aStartTime,
                                PRInt64 aEndTime,
                                const nsTArray<SeekRange>& aRanges,
@@ -219,6 +221,10 @@ private:
   // The caller is responsible for deleting the packet and its |packet| field.
   ogg_packet* NextOggPacket(nsOggCodecState* aCodecState);
 
+  // Fills aTracks with the serial numbers of each active stream, for use by
+  // various nsSkeletonState functions.
+  void BuildSerialList(nsTArray<PRUint32>& aTracks);
+
   // Maps Ogg serialnos to nsOggStreams.
   nsClassHashtable<nsUint32HashKey, nsOggCodecState> mCodecStates;
 
@@ -248,15 +254,17 @@ private:
   // Ogg decoding state.
   ogg_sync_state mOggState;
 
-  // Vorbis/Theora data used to compute timestamps. This is written on the
+  // Vorbis/Opus/Theora data used to compute timestamps. This is written on the
   // decoder thread and read on the main thread. All reading on the main
   // thread must be done after metadataloaded. We can't use the existing
   // data in the codec states due to threading issues. You must check the
   // associated mTheoraState or mVorbisState pointer is non-null before
   // using this codec data.
   PRUint32 mVorbisSerial;
+  PRUint32 mOpusSerial;
   PRUint32 mTheoraSerial;
   vorbis_info mVorbisInfo;
+  int mOpusPreSkip;
   th_info mTheoraInfo;
 
   // The offset of the end of the last page we've read, or the start of
diff --git a/content/media/plugins/MPAPI.h b/content/media/plugins/MPAPI.h
new file mode 100644
index 000000000000..87dff2fba4db
--- /dev/null
+++ b/content/media/plugins/MPAPI.h
@@ -0,0 +1,120 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#if !defined(MPAPI_h_)
+#define MPAPI_h_
+
+#include <stdint.h>
+
+namespace MPAPI {
+
+struct VideoPlane {
+  void *mData;
+  int32_t mStride;
+  int32_t mWidth;
+  int32_t mHeight;
+  int32_t mOffset;
+  int32_t mSkip;
+};
+
+struct VideoFrame {
+  int64_t mTimeUs;
+  bool mKeyFrame;
+  void *mData;
+  size_t mSize;
+  int32_t mStride;
+  int32_t mSliceHeight;
+  int32_t mRotation;
+  VideoPlane Y;
+  VideoPlane Cb;
+  VideoPlane Cr;
+
+  void Set(int64_t aTimeUs, bool aKeyFrame,
+           void *aData, size_t aSize, int32_t aStride, int32_t aSliceHeight, int32_t aRotation,
+           void *aYData, int32_t aYStride, int32_t aYWidth, int32_t aYHeight, int32_t aYOffset, int32_t aYSkip,
+           void *aCbData, int32_t aCbStride, int32_t aCbWidth, int32_t aCbHeight, int32_t aCbOffset, int32_t aCbSkip,
+           void *aCrData, int32_t aCrStride, int32_t aCrWidth, int32_t aCrHeight, int32_t aCrOffset, int32_t aCrSkip)
+  {
+    mTimeUs = aTimeUs;
+    mKeyFrame = aKeyFrame;
+    mData = aData;
+    mSize = aSize;
+    mStride = aStride;
+    mSliceHeight = aSliceHeight;
+    mRotation = aRotation;
+    Y.mData = aYData;
+    Y.mStride = aYStride;
+    Y.mWidth = aYWidth;
+    Y.mHeight = aYHeight;
+    Y.mOffset = aYOffset;
+    Y.mSkip = aYSkip;
+    Cb.mData = aCbData;
+    Cb.mStride = aCbStride;
+    Cb.mWidth = aCbWidth;
+    Cb.mHeight = aCbHeight;
+    Cb.mOffset = aCbOffset;
+    Cb.mSkip = aCbSkip;
+    Cr.mData = aCrData;
+    Cr.mStride = aCrStride;
+    Cr.mWidth = aCrWidth;
+    Cr.mHeight = aCrHeight;
+    Cr.mOffset = aCrOffset;
+    Cr.mSkip = aCrSkip;
+  }
+};
+
+struct AudioFrame {
+  int64_t mTimeUs;
+  void *mData; // 16PCM interleaved
+  size_t mSize; // Size of mData in bytes
+  int32_t mAudioChannels;
+  int32_t mAudioSampleRate;
+
+  void Set(int64_t aTimeUs,
+           void *aData, size_t aSize,
+           int32_t aAudioChannels, int32_t aAudioSampleRate)
+  {
+    mTimeUs = aTimeUs;
+    mData = aData;
+    mSize = aSize;
+    mAudioChannels = aAudioChannels;
+    mAudioSampleRate = aAudioSampleRate;
+  }
+};
+
+struct Decoder;
+
+struct PluginHost {
+  bool (*Read)(Decoder *aDecoder, char *aBuffer, int64_t aOffset, uint32_t aCount, uint32_t* aBytes);
+  uint64_t (*GetLength)(Decoder *aDecoder);
+  void (*SetMetaDataReadMode)(Decoder *aDecoder);
+  void (*SetPlaybackReadMode)(Decoder *aDecoder);
+};
+
+struct Decoder {
+  void *mResource;
+  void *mPrivate;
+
+  Decoder();
+
+  void (*GetDuration)(Decoder *aDecoder, int64_t *durationUs);
+  void (*GetVideoParameters)(Decoder *aDecoder, int32_t *aWidth, int32_t *aHeight);
+  void (*GetAudioParameters)(Decoder *aDecoder, int32_t *aNumChannels, int32_t *aSampleRate);
+  bool (*HasVideo)(Decoder *aDecoder);
+  bool (*HasAudio)(Decoder *aDecoder);
+  bool (*ReadVideo)(Decoder *aDecoder, VideoFrame *aFrame, int64_t aSeekTimeUs);
+  bool (*ReadAudio)(Decoder *aDecoder, AudioFrame *aFrame, int64_t aSeekTimeUs);
+  void (*DestroyDecoder)(Decoder *);
+};
+
+struct Manifest {
+  bool (*CanDecode)(const char *aMimeChars, size_t aMimeLen, const char* const**aCodecs);
+  bool (*CreateDecoder)(PluginHost *aPluginHost, Decoder *aDecoder,
+                        const char *aMimeChars, size_t aMimeLen);
+};
+
+}
+
+#endif
diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in
new file mode 100644
index 000000000000..e8420a3eb630
--- /dev/null
+++ b/content/media/plugins/Makefile.in
@@ -0,0 +1,35 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= content
+LIBRARY_NAME	= gkconmediaplugins_s
+LIBXUL_LIBRARY 	= 1
+
+EXPORTS		+= \
+		MPAPI.h \
+		nsMediaPluginHost.h \
+		nsMediaPluginDecoder.h \
+		$(NULL)
+
+CPPSRCS		= \
+		nsMediaPluginHost.cpp \
+		nsMediaPluginDecoder.cpp \
+		nsMediaPluginReader.cpp \
+		$(NULL)
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= \
+		-I$(srcdir)/../../base/src \
+		-I$(srcdir)/../../html/content/src \
+		$(NULL)
diff --git a/content/media/plugins/nsMediaPluginDecoder.cpp b/content/media/plugins/nsMediaPluginDecoder.cpp
new file mode 100644
index 000000000000..a155352528b7
--- /dev/null
+++ b/content/media/plugins/nsMediaPluginDecoder.cpp
@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsBuiltinDecoderStateMachine.h"
+#include "nsMediaPluginDecoder.h"
+#include "nsMediaPluginReader.h"
+
+nsMediaPluginDecoder::nsMediaPluginDecoder(const nsACString& aType) : mType(aType)
+{
+}
+
+nsDecoderStateMachine* nsMediaPluginDecoder::CreateStateMachine()
+{
+  return new nsBuiltinDecoderStateMachine(this, new nsMediaPluginReader(this));
+}
diff --git a/content/media/plugins/nsMediaPluginDecoder.h b/content/media/plugins/nsMediaPluginDecoder.h
new file mode 100644
index 000000000000..3597d21c481c
--- /dev/null
+++ b/content/media/plugins/nsMediaPluginDecoder.h
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#if !defined(nsMediaPluginDecoder_h_)
+#define nsMediaPluginDecoder_h_
+
+#include "nsBuiltinDecoder.h"
+#include "nsMediaPluginDecoder.h"
+
+class nsMediaPluginDecoder : public nsBuiltinDecoder
+{
+  nsCString mType;
+public:
+  nsMediaPluginDecoder(const nsACString& aType);
+
+  const nsresult GetContentType(nsACString& aType) const {
+    aType = mType;
+    return NS_OK;
+  }
+
+  virtual nsMediaDecoder* Clone() { return new nsMediaPluginDecoder(mType); }
+  virtual nsDecoderStateMachine* CreateStateMachine();
+};
+
+#endif
diff --git a/content/media/plugins/nsMediaPluginHost.cpp b/content/media/plugins/nsMediaPluginHost.cpp
new file mode 100644
index 000000000000..67c42ce599fe
--- /dev/null
+++ b/content/media/plugins/nsMediaPluginHost.cpp
@@ -0,0 +1,154 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "mozilla/TimeStamp.h"
+#include "nsTimeRanges.h"
+#include "MediaResource.h"
+#include "nsHTMLMediaElement.h"
+#include "nsMediaPluginHost.h"
+#include "nsXPCOMStrings.h"
+#include "nsISeekableStream.h"
+#include "pratom.h"
+#include "nsMediaPluginReader.h"
+
+#include "MPAPI.h"
+
+using namespace MPAPI;
+using namespace mozilla;
+
+static MediaResource *GetResource(Decoder *aDecoder)
+{
+  return reinterpret_cast<MediaResource *>(aDecoder->mResource);
+}
+
+static bool Read(Decoder *aDecoder, char *aBuffer, int64_t aOffset, uint32_t aCount, uint32_t* aBytes)
+{
+  MediaResource *resource = GetResource(aDecoder);
+  if (aOffset != resource->Tell()) {
+    nsresult rv = resource->Seek(nsISeekableStream::NS_SEEK_SET, aOffset);
+    if (NS_FAILED(rv)) {
+      return false;
+    }
+  }
+  nsresult rv = resource->Read(aBuffer, aCount, aBytes);
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+  return true;
+}
+
+static uint64_t GetLength(Decoder *aDecoder)
+{
+  return GetResource(aDecoder)->GetLength();
+}
+
+static void SetMetaDataReadMode(Decoder *aDecoder)
+{
+  GetResource(aDecoder)->SetReadMode(nsMediaCacheStream::MODE_METADATA);
+}
+
+static void SetPlaybackReadMode(Decoder *aDecoder)
+{
+  GetResource(aDecoder)->SetReadMode(nsMediaCacheStream::MODE_PLAYBACK);
+}
+
+static PluginHost sPluginHost = {
+  Read,
+  GetLength,
+  SetMetaDataReadMode,
+  SetPlaybackReadMode
+};
+
+void nsMediaPluginHost::TryLoad(const char *name)
+{
+  PRLibrary *lib = PR_LoadLibrary(name);
+  if (lib) {
+    Manifest *manifest = static_cast<Manifest *>(PR_FindSymbol(lib, "MPAPI_MANIFEST"));
+    if (manifest)
+      mPlugins.AppendElement(manifest);
+  }
+}
+
+nsMediaPluginHost::nsMediaPluginHost() {
+  MOZ_COUNT_CTOR(nsMediaPluginHost);
+#ifdef ANDROID
+  TryLoad("libomxplugin.so");
+#endif
+}
+
+nsMediaPluginHost::~nsMediaPluginHost() {
+  MOZ_COUNT_DTOR(nsMediaPluginHost);
+}
+
+bool nsMediaPluginHost::FindDecoder(const nsACString& aMimeType, const char* const** aCodecs)
+{
+  const char *chars;
+  size_t len = NS_CStringGetData(aMimeType, &chars, nsnull);
+  for (size_t n = 0; n < mPlugins.Length(); ++n) {
+    Manifest *plugin = mPlugins[n];
+    const char* const *codecs;
+    if (plugin->CanDecode(chars, len, &codecs)) {
+      if (aCodecs)
+        *aCodecs = codecs;
+      return true;
+    }
+  }
+  return false;
+}
+
+Decoder::Decoder() :
+  mResource(NULL), mPrivate(NULL)
+{
+}
+
+MPAPI::Decoder *nsMediaPluginHost::CreateDecoder(MediaResource *aResource, const nsACString& aMimeType)
+{
+  const char *chars;
+  size_t len = NS_CStringGetData(aMimeType, &chars, nsnull);
+
+  Decoder *decoder = new Decoder();
+  if (!decoder) {
+    return nsnull;
+  }
+  decoder->mResource = aResource;
+
+  for (size_t n = 0; n < mPlugins.Length(); ++n) {
+    Manifest *plugin = mPlugins[n];
+    const char* const *codecs;
+    if (!plugin->CanDecode(chars, len, &codecs)) {
+      continue;
+    }
+    if (plugin->CreateDecoder(&sPluginHost, decoder, chars, len)) {
+      return decoder;
+    }
+  }
+
+  return nsnull;
+}
+
+void nsMediaPluginHost::DestroyDecoder(Decoder *aDecoder)
+{
+  aDecoder->DestroyDecoder(aDecoder);
+  delete aDecoder;
+}
+
+nsMediaPluginHost *sMediaPluginHost = nsnull;
+nsMediaPluginHost *GetMediaPluginHost()
+{
+  if (!sMediaPluginHost) {
+    sMediaPluginHost = new nsMediaPluginHost();
+  }
+  return sMediaPluginHost;
+}
+
+void nsMediaPluginHost::Shutdown()
+{
+  if (sMediaPluginHost) {
+    delete sMediaPluginHost;
+    sMediaPluginHost = nsnull;
+  }
+}
+
+
diff --git a/content/media/plugins/nsMediaPluginHost.h b/content/media/plugins/nsMediaPluginHost.h
new file mode 100644
index 000000000000..30565dcfb104
--- /dev/null
+++ b/content/media/plugins/nsMediaPluginHost.h
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#if !defined(nsMediaPluginHost_h_)
+#define nsMediaPluginHost_h_
+
+#include "nsTArray.h"
+#include "MediaResource.h"
+#include "MPAPI.h"
+
+class nsMediaPluginReader;
+
+class nsMediaPluginHost {
+  nsTArray<MPAPI::Manifest *> mPlugins;
+  MPAPI::Manifest *FindPlugin(const nsACString& aMimeType);
+  void TryLoad(const char *name);
+public:
+  nsMediaPluginHost();
+  ~nsMediaPluginHost();
+
+  static void Shutdown();
+
+  bool FindDecoder(const nsACString& aMimeType, const char* const** aCodecs);
+  MPAPI::Decoder *CreateDecoder(mozilla::MediaResource *aResource, const nsACString& aMimeType);
+  void DestroyDecoder(MPAPI::Decoder *aDecoder);
+};
+
+nsMediaPluginHost *GetMediaPluginHost();
+
+#endif
diff --git a/content/media/plugins/nsMediaPluginReader.cpp b/content/media/plugins/nsMediaPluginReader.cpp
new file mode 100644
index 000000000000..8a960c092f49
--- /dev/null
+++ b/content/media/plugins/nsMediaPluginReader.cpp
@@ -0,0 +1,334 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "mozilla/TimeStamp.h"
+#include "nsTimeRanges.h"
+#include "MediaResource.h"
+#include "VideoUtils.h"
+#include "nsMediaPluginReader.h"
+#include "nsMediaPluginDecoder.h"
+#include "nsMediaPluginHost.h"
+
+using namespace mozilla;
+
+nsMediaPluginReader::nsMediaPluginReader(nsBuiltinDecoder *aDecoder) :
+  nsBuiltinDecoderReader(aDecoder),
+  mPlugin(NULL),
+  mVideoSeekTimeUs(-1),
+  mAudioSeekTimeUs(-1),
+  mLastVideoFrame(NULL)
+{
+  reinterpret_cast<nsMediaPluginDecoder *>(aDecoder)->GetContentType(mType);
+}
+
+nsMediaPluginReader::~nsMediaPluginReader()
+{
+  ResetDecode();
+}
+
+nsresult nsMediaPluginReader::Init(nsBuiltinDecoderReader* aCloneDonor)
+{
+  NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
+
+  return NS_OK;
+}
+
+nsresult nsMediaPluginReader::ReadMetadata(nsVideoInfo* aInfo)
+{
+  NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
+
+  if (!mPlugin) {
+    mPlugin = GetMediaPluginHost()->CreateDecoder(mDecoder->GetResource(), mType);
+    if (!mPlugin) {
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  // Set the total duration (the max of the audio and video track).
+  int64_t durationUs;
+  mPlugin->GetDuration(mPlugin, &durationUs);
+  if (durationUs) {
+    ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+    mDecoder->GetStateMachine()->SetDuration(durationUs);
+  }
+
+  if (mPlugin->HasVideo(mPlugin)) {
+    int32_t width, height;
+    mPlugin->GetVideoParameters(mPlugin, &width, &height);
+    nsIntRect pictureRect(0, 0, width, height);
+
+    // Validate the container-reported frame and pictureRect sizes. This ensures
+    // that our video frame creation code doesn't overflow.
+    nsIntSize displaySize(width, height);
+    nsIntSize frameSize(width, height);
+    if (!nsVideoInfo::ValidateVideoRegion(frameSize, pictureRect, displaySize)) {
+      return NS_ERROR_FAILURE;
+    }
+
+    // Video track's frame sizes will not overflow. Activate the video track.
+    mHasVideo = mInfo.mHasVideo = true;
+    mInfo.mDisplay = displaySize;
+    mPicture = pictureRect;
+    mInitialFrame = frameSize;
+    VideoFrameContainer* container = mDecoder->GetVideoFrameContainer();
+    if (container) {
+      container->SetCurrentFrame(gfxIntSize(displaySize.width, displaySize.height),
+                                 nsnull,
+                                 mozilla::TimeStamp::Now());
+    }
+  }
+
+  if (mPlugin->HasAudio(mPlugin)) {
+    int32_t numChannels, sampleRate;
+    mPlugin->GetAudioParameters(mPlugin, &numChannels, &sampleRate);
+    mHasAudio = mInfo.mHasAudio = true;
+    mInfo.mAudioChannels = numChannels;
+    mInfo.mAudioRate = sampleRate;
+  }
+
+ *aInfo = mInfo;
+  return NS_OK;
+}
+
+// Resets all state related to decoding, emptying all buffers etc.
+nsresult nsMediaPluginReader::ResetDecode()
+{
+  if (mLastVideoFrame) {
+    delete mLastVideoFrame;
+    mLastVideoFrame = NULL;
+  }
+  if (mPlugin) {
+    GetMediaPluginHost()->DestroyDecoder(mPlugin);
+    mPlugin = NULL;
+  }
+
+  return NS_OK;
+}
+
+bool nsMediaPluginReader::DecodeVideoFrame(bool &aKeyframeSkip,
+                                           PRInt64 aTimeThreshold)
+{
+  // Record number of frames decoded and parsed. Automatically update the
+  // stats counters using the AutoNotifyDecoded stack-based class.
+  PRUint32 parsed = 0, decoded = 0;
+  nsMediaDecoder::AutoNotifyDecoded autoNotify(mDecoder, parsed, decoded);
+
+  // Throw away the currently buffered frame if we are seeking.
+  if (mLastVideoFrame && mVideoSeekTimeUs != -1) {
+    delete mLastVideoFrame;
+    mLastVideoFrame = NULL;
+  }
+
+  // Read next frame
+  while (true) {
+    MPAPI::VideoFrame frame;
+    if (!mPlugin->ReadVideo(mPlugin, &frame, mVideoSeekTimeUs)) {
+      // We reached the end of the video stream. If we have a buffered
+      // video frame, push it the video queue using the total duration
+      // of the video as the end time.
+      if (mLastVideoFrame) {
+        int64_t durationUs;
+        mPlugin->GetDuration(mPlugin, &durationUs);
+        mLastVideoFrame->mEndTime = (durationUs > mLastVideoFrame->mTime)
+                                  ? durationUs
+                                  : mLastVideoFrame->mTime;
+        mVideoQueue.Push(mLastVideoFrame);
+        mLastVideoFrame = NULL;
+      }
+      mVideoQueue.Finish();
+      return false;
+    }
+    mVideoSeekTimeUs = -1;
+
+    if (aKeyframeSkip) {
+      if (!frame.mKeyFrame) {
+        ++parsed;
+        continue;
+      }
+      aKeyframeSkip = false;
+    }
+
+    VideoData::YCbCrBuffer b;
+    b.mPlanes[0].mData = static_cast<PRUint8 *>(frame.Y.mData);
+    b.mPlanes[0].mStride = frame.Y.mStride;
+    b.mPlanes[0].mHeight = frame.Y.mHeight;
+    b.mPlanes[0].mWidth = frame.Y.mWidth;
+    b.mPlanes[0].mOffset = frame.Y.mOffset;
+    b.mPlanes[0].mSkip = frame.Y.mSkip;
+
+    b.mPlanes[1].mData = static_cast<PRUint8 *>(frame.Cb.mData);
+    b.mPlanes[1].mStride = frame.Cb.mStride;
+    b.mPlanes[1].mHeight = frame.Cb.mHeight;
+    b.mPlanes[1].mWidth = frame.Cb.mWidth;
+    b.mPlanes[1].mOffset = frame.Cb.mOffset;
+    b.mPlanes[1].mSkip = frame.Cb.mSkip;
+
+    b.mPlanes[2].mData = static_cast<PRUint8 *>(frame.Cr.mData);
+    b.mPlanes[2].mStride = frame.Cr.mStride;
+    b.mPlanes[2].mHeight = frame.Cr.mHeight;
+    b.mPlanes[2].mWidth = frame.Cr.mWidth;
+    b.mPlanes[2].mOffset = frame.Cr.mOffset;
+    b.mPlanes[2].mSkip = frame.Cr.mSkip;
+
+    nsIntRect picture = mPicture;
+    if (frame.Y.mWidth != mInitialFrame.width ||
+        frame.Y.mHeight != mInitialFrame.height) {
+
+      // Frame size is different from what the container reports. This is legal,
+      // and we will preserve the ratio of the crop rectangle as it
+      // was reported relative to the picture size reported by the container.
+      picture.x = (mPicture.x * frame.Y.mWidth) / mInitialFrame.width;
+      picture.y = (mPicture.y * frame.Y.mHeight) / mInitialFrame.height;
+      picture.width = (frame.Y.mWidth * mPicture.width) / mInitialFrame.width;
+      picture.height = (frame.Y.mHeight * mPicture.height) / mInitialFrame.height;
+    }
+
+    // This is the approximate byte position in the stream.
+    PRInt64 pos = mDecoder->GetResource()->Tell();
+
+    VideoData *v = VideoData::Create(mInfo,
+                                     mDecoder->GetImageContainer(),
+                                     pos,
+                                     frame.mTimeUs,
+                                     frame.mTimeUs+1, // We don't know the end time.
+                                     b,
+                                     frame.mKeyFrame,
+                                     -1,
+                                     picture);
+
+    if (!v) {
+      return false;
+    }
+    parsed++;
+    decoded++;
+    NS_ASSERTION(decoded <= parsed, "Expect to decode fewer frames than parsed in MediaPlugin...");
+
+    // Since MPAPI doesn't give us the end time of frames, we keep one frame
+    // buffered in nsMediaPluginReader and push it into the queue as soon
+    // we read the following frame so we can use that frame's start time as
+    // the end time of the buffered frame.
+    if (!mLastVideoFrame) {
+      mLastVideoFrame = v;
+      continue;
+    }
+
+    mLastVideoFrame->mEndTime = v->mTime;
+
+    // We have the start time of the next frame, so we can push the previous
+    // frame into the queue, except if the end time is below the threshold,
+    // in which case it wouldn't be displayed anyway.
+    if (mLastVideoFrame->mEndTime < aTimeThreshold) {
+      delete mLastVideoFrame;
+      mLastVideoFrame = NULL;
+      continue;
+    }
+
+    mVideoQueue.Push(mLastVideoFrame);
+
+    // Buffer the current frame we just decoded.
+    mLastVideoFrame = v;
+
+    break;
+  }
+
+  return true;
+}
+
+bool nsMediaPluginReader::DecodeAudioData()
+{
+  NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
+
+  // This is the approximate byte position in the stream.
+  PRInt64 pos = mDecoder->GetResource()->Tell();
+
+  // Read next frame
+  MPAPI::AudioFrame frame;
+  if (!mPlugin->ReadAudio(mPlugin, &frame, mAudioSeekTimeUs)) {
+    mAudioQueue.Finish();
+    return false;
+  }
+  mAudioSeekTimeUs = -1;
+
+  nsAutoArrayPtr<AudioDataValue> buffer(new AudioDataValue[frame.mSize/2] );
+  memcpy(buffer.get(), frame.mData, frame.mSize);
+
+  PRUint32 frames = frame.mSize / (2 * frame.mAudioChannels);
+  CheckedInt64 duration = FramesToUsecs(frames, frame.mAudioSampleRate);
+  if (!duration.isValid()) {
+    return NS_ERROR_FAILURE;
+  }
+
+  mAudioQueue.Push(new AudioData(pos,
+                                 frame.mTimeUs,
+                                 duration.value(),
+                                 frames,
+                                 buffer.forget(),
+                                 frame.mAudioChannels));
+  return true;
+}
+
+nsresult nsMediaPluginReader::Seek(PRInt64 aTarget, PRInt64 aStartTime, PRInt64 aEndTime, PRInt64 aCurrentTime)
+{
+  NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
+
+  mVideoQueue.Erase();
+  mAudioQueue.Erase();
+
+  mAudioSeekTimeUs = mVideoSeekTimeUs = aTarget;
+
+  return DecodeToTarget(aTarget);
+}
+
+static uint64_t BytesToTime(int64_t offset, uint64_t length, uint64_t durationUs) {
+  double perc = double(offset) / double(length);
+  if (perc > 1.0)
+    perc = 1.0;
+  return uint64_t(double(durationUs) * perc);
+}
+
+nsresult nsMediaPluginReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
+{
+  if (!mPlugin)
+    return NS_OK;
+
+  MediaResource* stream = mDecoder->GetResource();
+
+  int64_t durationUs = 0;
+  mPlugin->GetDuration(mPlugin, &durationUs);
+
+  // Nothing to cache if the media takes 0us to play.
+  if (!durationUs)
+    return NS_OK;
+
+  // Special case completely cached files.  This also handles local files.
+  if (stream->IsDataCachedToEndOfResource(0)) {
+    aBuffered->Add(0, durationUs);
+    return NS_OK;
+  }
+
+  int64_t totalBytes = stream->GetLength();
+
+  // If we can't determine the total size, pretend that we have nothing
+  // buffered. This will put us in a state of eternally-low-on-undecoded-data
+  // which is not get, but about the best we can do.
+  if (totalBytes == -1)
+    return NS_OK;
+
+  PRInt64 startOffset = stream->GetNextCachedData(0);
+  while (startOffset >= 0) {
+    PRInt64 endOffset = stream->GetCachedDataEnd(startOffset);
+    // Bytes [startOffset..endOffset] are cached.
+    NS_ASSERTION(startOffset >= 0, "Integer underflow in GetBuffered");
+    NS_ASSERTION(endOffset >= 0, "Integer underflow in GetBuffered");
+
+    uint64_t startUs = BytesToTime(startOffset, totalBytes, durationUs);
+    uint64_t endUs = BytesToTime(endOffset, totalBytes, durationUs);
+    if (startUs != endUs) {
+      aBuffered->Add(startUs, endUs);
+    }
+    startOffset = stream->GetNextCachedData(endOffset);
+  }
+  return NS_OK;
+}
diff --git a/content/media/plugins/nsMediaPluginReader.h b/content/media/plugins/nsMediaPluginReader.h
new file mode 100644
index 000000000000..302a9924c00f
--- /dev/null
+++ b/content/media/plugins/nsMediaPluginReader.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#if !defined(nsMediaPluginReader_h_)
+#define nsMediaPluginReader_h_
+
+#include "MediaResource.h"
+#include "nsBuiltinDecoder.h"
+#include "nsBuiltinDecoderReader.h"
+
+#include "MPAPI.h"
+
+class nsMediaPluginReader : public nsBuiltinDecoderReader
+{
+  nsCString mType;
+  MPAPI::Decoder *mPlugin;
+  PRBool mHasAudio;
+  PRBool mHasVideo;
+  nsIntRect mPicture;
+  nsIntSize mInitialFrame;
+  int64_t mVideoSeekTimeUs;
+  int64_t mAudioSeekTimeUs;
+  VideoData *mLastVideoFrame;
+public:
+  nsMediaPluginReader(nsBuiltinDecoder* aDecoder);
+  ~nsMediaPluginReader();
+
+  virtual nsresult Init(nsBuiltinDecoderReader* aCloneDonor);
+  virtual nsresult ResetDecode();
+
+  virtual bool DecodeAudioData();
+  virtual bool DecodeVideoFrame(bool &aKeyframeSkip,
+                                PRInt64 aTimeThreshold);
+
+  virtual bool HasAudio()
+  {
+    return mHasAudio;
+  }
+
+  virtual bool HasVideo()
+  {
+    return mHasVideo;
+  }
+
+  virtual nsresult ReadMetadata(nsVideoInfo* aInfo);
+  virtual nsresult Seek(PRInt64 aTime, PRInt64 aStartTime, PRInt64 aEndTime, PRInt64 aCurrentTime);
+  virtual nsresult GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime);
+  virtual bool IsSeekableInBufferedRanges() {
+    return true;
+  }
+
+};
+
+#endif
diff --git a/content/media/raw/nsRawReader.cpp b/content/media/raw/nsRawReader.cpp
index 28b47caa2c50..1cf5392c034b 100644
--- a/content/media/raw/nsRawReader.cpp
+++ b/content/media/raw/nsRawReader.cpp
@@ -186,6 +186,7 @@ bool nsRawReader::DecodeVideoFrame(bool &aKeyframeSkip,
   b.mPlanes[0].mStride = mMetadata.frameWidth * mMetadata.lumaChannelBpp / 8.0;
   b.mPlanes[0].mHeight = mMetadata.frameHeight;
   b.mPlanes[0].mWidth = mMetadata.frameWidth;
+  b.mPlanes[0].mOffset = b.mPlanes[0].mSkip = 0;
 
   PRUint32 cbcrStride = mMetadata.frameWidth * mMetadata.chromaChannelBpp / 8.0;
 
@@ -193,11 +194,13 @@ bool nsRawReader::DecodeVideoFrame(bool &aKeyframeSkip,
   b.mPlanes[1].mStride = cbcrStride;
   b.mPlanes[1].mHeight = mMetadata.frameHeight / 2;
   b.mPlanes[1].mWidth = mMetadata.frameWidth / 2;
+  b.mPlanes[1].mOffset = b.mPlanes[1].mSkip = 0;
 
   b.mPlanes[2].mData = b.mPlanes[1].mData + mMetadata.frameHeight * cbcrStride / 2;
   b.mPlanes[2].mStride = cbcrStride;
   b.mPlanes[2].mHeight = mMetadata.frameHeight / 2;
   b.mPlanes[2].mWidth = mMetadata.frameWidth / 2;
+  b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
 
   VideoData *v = VideoData::Create(mInfo,
                                    mDecoder->GetImageContainer(),
diff --git a/content/media/webm/nsWebMReader.cpp b/content/media/webm/nsWebMReader.cpp
index b34cb384dcbf..f74e2334d4dc 100644
--- a/content/media/webm/nsWebMReader.cpp
+++ b/content/media/webm/nsWebMReader.cpp
@@ -657,16 +657,19 @@ bool nsWebMReader::DecodeVideoFrame(bool &aKeyframeSkip,
       b.mPlanes[0].mStride = img->stride[0];
       b.mPlanes[0].mHeight = img->d_h;
       b.mPlanes[0].mWidth = img->d_w;
+      b.mPlanes[0].mOffset = b.mPlanes[0].mSkip = 0;
 
       b.mPlanes[1].mData = img->planes[1];
       b.mPlanes[1].mStride = img->stride[1];
       b.mPlanes[1].mHeight = img->d_h >> img->y_chroma_shift;
       b.mPlanes[1].mWidth = img->d_w >> img->x_chroma_shift;
+      b.mPlanes[1].mOffset = b.mPlanes[1].mSkip = 0;
  
       b.mPlanes[2].mData = img->planes[2];
       b.mPlanes[2].mStride = img->stride[2];
       b.mPlanes[2].mHeight = img->d_h >> img->y_chroma_shift;
       b.mPlanes[2].mWidth = img->d_w >> img->x_chroma_shift;
+      b.mPlanes[2].mOffset = b.mPlanes[2].mSkip = 0;
   
       nsIntRect picture = mPicture;
       if (img->d_w != static_cast<PRUint32>(mInitialFrame.width) ||
diff --git a/content/svg/content/src/SVGFragmentIdentifier.cpp b/content/svg/content/src/SVGFragmentIdentifier.cpp
index 3a320a030cca..277f09bfd547 100644
--- a/content/svg/content/src/SVGFragmentIdentifier.cpp
+++ b/content/svg/content/src/SVGFragmentIdentifier.cpp
@@ -70,8 +70,8 @@ SVGFragmentIdentifier::RestoreOldViewBox(nsSVGSVGElement *root)
 void 
 SVGFragmentIdentifier::SaveOldZoomAndPan(nsSVGSVGElement *root)
 {
-  const PRUint16 *oldZoomAndPanPtr = root->GetZoomAndPanProperty();
-  if (!oldZoomAndPanPtr) {
+  PRUint16 oldZoomAndPan = root->GetZoomAndPanProperty();
+  if (oldZoomAndPan == nsIDOMSVGZoomAndPan::SVG_ZOOMANDPAN_UNKNOWN) {
     root->SetZoomAndPanProperty(root->mEnumAttributes[nsSVGSVGElement::ZOOMANDPAN].GetBaseValue());
   }
 }
@@ -79,9 +79,9 @@ SVGFragmentIdentifier::SaveOldZoomAndPan(nsSVGSVGElement *root)
 void 
 SVGFragmentIdentifier::RestoreOldZoomAndPan(nsSVGSVGElement *root)
 {
-  const PRUint16 *oldZoomAndPanPtr = root->GetZoomAndPanProperty();
-  if (oldZoomAndPanPtr) {
-    root->mEnumAttributes[nsSVGSVGElement::ZOOMANDPAN].SetBaseValue(*oldZoomAndPanPtr, root);
+  PRUint16 oldZoomAndPan = root->GetZoomAndPanProperty();
+  if (oldZoomAndPan != nsIDOMSVGZoomAndPan::SVG_ZOOMANDPAN_UNKNOWN) {
+    root->mEnumAttributes[nsSVGSVGElement::ZOOMANDPAN].SetBaseValue(oldZoomAndPan, root);
     root->ClearZoomAndPanProperty();
   }
 }
@@ -108,7 +108,10 @@ SVGFragmentIdentifier::ProcessSVGViewSpec(const nsAString &aViewSpec,
   CharTokenizer<';'>tokenizer(
     Substring(aViewSpec, bracketPos + 1, aViewSpec.Length() - bracketPos - 2));
 
-  while (tokenizer.hasMoreTokens()) {
+  if (!tokenizer.hasMoreTokens()) {
+    return false;
+  }
+  do {
 
     nsAutoString token(tokenizer.nextToken());
 
@@ -140,7 +143,7 @@ SVGFragmentIdentifier::ProcessSVGViewSpec(const nsAString &aViewSpec,
       // We don't support transform or viewTarget currently
       return false;
     }
-  }
+  } while (tokenizer.hasMoreTokens());
 
   if (viewBoxParams) {
     SaveOldViewBox(root);
@@ -208,10 +211,12 @@ SVGFragmentIdentifier::ProcessFragmentIdentifier(nsIDocument *aDocument,
     } else {
       RestoreOldZoomAndPan(rootElement);
     }
+    rootElement->mUseCurrentView = true;
     return true;
   }
 
-  if (ProcessSVGViewSpec(aAnchorName, rootElement)) {
+  rootElement->mUseCurrentView = ProcessSVGViewSpec(aAnchorName, rootElement);
+  if (rootElement->mUseCurrentView) {
     return true;
   }
   RestoreOldViewBox(rootElement);
diff --git a/content/svg/content/src/nsSVGSVGElement.cpp b/content/svg/content/src/nsSVGSVGElement.cpp
index 598c71f33fe9..734ce2717e44 100644
--- a/content/svg/content/src/nsSVGSVGElement.cpp
+++ b/content/svg/content/src/nsSVGSVGElement.cpp
@@ -3,6 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/StandardInteger.h"
 #include "mozilla/Util.h"
 
 #include "nsGkAtoms.h"
@@ -171,7 +172,8 @@ nsSVGSVGElement::nsSVGSVGElement(already_AddRefed<nsINodeInfo> aNodeInfo,
     mStartAnimationOnBindToTree(!aFromParser),
     mImageNeedsTransformInvalidation(false),
     mIsPaintingSVGImageElement(false),
-    mHasChildrenOnlyTransform(false)
+    mHasChildrenOnlyTransform(false),
+    mUseCurrentView(false)
 {
 }
 
@@ -298,14 +300,8 @@ nsSVGSVGElement::GetScreenPixelToMillimeterY(float *aScreenPixelToMillimeterY)
 NS_IMETHODIMP
 nsSVGSVGElement::GetUseCurrentView(bool *aUseCurrentView)
 {
-  NS_NOTYETIMPLEMENTED("nsSVGSVGElement::GetUseCurrentView");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-NS_IMETHODIMP
-nsSVGSVGElement::SetUseCurrentView(bool aUseCurrentView)
-{
-  NS_NOTYETIMPLEMENTED("nsSVGSVGElement::SetUseCurrentView");
-  return NS_ERROR_NOT_IMPLEMENTED;
+  *aUseCurrentView = mUseCurrentView;
+  return NS_OK;
 }
 
 /* readonly attribute nsIDOMSVGViewSpec currentView; */
@@ -1431,19 +1427,19 @@ nsSVGSVGElement::SetZoomAndPanProperty(PRUint16 aValue)
   return NS_SUCCEEDED(rv);
 }
 
-const PRUint16*
+PRUint16
 nsSVGSVGElement::GetZoomAndPanProperty() const
 {
   void* valPtr = GetProperty(nsGkAtoms::zoomAndPan);
   if (valPtr) {
-    return reinterpret_cast<PRUint16*>(valPtr);
+    return reinterpret_cast<uintptr_t>(valPtr);
   }
-  return nsnull;
+  return nsIDOMSVGZoomAndPan::SVG_ZOOMANDPAN_UNKNOWN;
 }
 
 bool
 nsSVGSVGElement::ClearZoomAndPanProperty()
 {
-  return UnsetProperty(nsGkAtoms::viewBox);
+  return UnsetProperty(nsGkAtoms::zoomAndPan);
 }
 
diff --git a/content/svg/content/src/nsSVGSVGElement.h b/content/svg/content/src/nsSVGSVGElement.h
index a1006c554d1b..e4c26f45d77a 100644
--- a/content/svg/content/src/nsSVGSVGElement.h
+++ b/content/svg/content/src/nsSVGSVGElement.h
@@ -268,7 +268,7 @@ private:
   const nsSVGViewBoxRect* GetViewBoxProperty() const;
   bool ClearViewBoxProperty();
   bool SetZoomAndPanProperty(PRUint16 aValue);
-  const PRUint16* GetZoomAndPanProperty() const;
+  PRUint16 GetZoomAndPanProperty() const;
   bool ClearZoomAndPanProperty();
 
   bool IsRoot() const {
@@ -363,7 +363,6 @@ private:
   float                             mCurrentScale;
   nsSVGTranslatePoint               mPreviousTranslate;
   float                             mPreviousScale;
-  PRInt32                           mRedrawSuspendCount;
 
   // For outermost <svg> elements created from parsing, animation is started by
   // the onload event in accordance with the SVG spec, but for <svg> elements
@@ -373,6 +372,7 @@ private:
   bool                              mImageNeedsTransformInvalidation;
   bool                              mIsPaintingSVGImageElement;
   bool                              mHasChildrenOnlyTransform;
+  bool                              mUseCurrentView;
 };
 
 #endif
diff --git a/content/svg/content/test/Makefile.in b/content/svg/content/test/Makefile.in
index 9d55fbf80867..a366575c8785 100644
--- a/content/svg/content/test/Makefile.in
+++ b/content/svg/content/test/Makefile.in
@@ -36,6 +36,8 @@ _TEST_FILES = \
 		test_dataTypes.html \
 		test_dataTypesModEvents.html \
 		dataTypes-helper.svg \
+		test_fragments.html \
+		fragments-helper.svg \
 		getCTM-helper.svg \
 		test_getCTM.html \
 		test_getElementById.xhtml \
diff --git a/content/svg/content/test/fragments-helper.svg b/content/svg/content/test/fragments-helper.svg
new file mode 100644
index 000000000000..c7fa8fca7a81
--- /dev/null
+++ b/content/svg/content/test/fragments-helper.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <view id="view" viewBox="0 200 100 100" preserveAspectRatio="none"/>
+</svg>
diff --git a/content/svg/content/test/test_fragments.html b/content/svg/content/test/test_fragments.html
new file mode 100644
index 000000000000..45af0f48b3c9
--- /dev/null
+++ b/content/svg/content/test/test_fragments.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=759124
+-->
+<head>
+  <title>Test for Bug 759124</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=759124">Mozilla Bug 759124</a>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+
+<iframe id="svg" src="fragments-helper.svg"></iframe>
+
+<pre id="test">
+<script class="testbody" type="application/javascript">
+SimpleTest.waitForExplicitFinish();
+
+function Test(svgFragmentIdentifier, valid) {
+    this.svgFragmentIdentifier = svgFragmentIdentifier;
+    this.valid = valid;
+}
+
+function runTests()
+{
+  var svg = $("svg");
+  var doc = svg.contentWindow.document;
+  
+  var tests = [
+      new Test("view", true),
+      new Test("unknown", false),
+      new Test("svgView(viewBox(0,0,200,200)))", true),
+      new Test("svgView(preserveAspectRatio(xMaxYMin slice))", true),
+      new Test("svgView(viewBox(1,2,3,4);preserveAspectRatio(xMaxYMin))", true),
+      new Test("svgView(zoomAndPan(disable))", true),
+      new Test("svgView", false),
+      new Test("svgView(", false),
+      new Test("svgView()", false)
+  ];
+
+ var src = svg.getAttribute("src");
+ for (var i = 0; i < tests.length; i++) {
+   var test = tests[i];
+   svg.setAttribute("src", src + "#" + test.svgFragmentIdentifier);
+   is(doc.rootElement.useCurrentView, test.valid,
+      "Expected " + test.svgFragmentIdentifier + " to be " +
+      (test.valid ? "valid" : "invalid"));
+ }
+
+  SimpleTest.finish();
+}
+
+window.addEventListener("load", runTests, false);
+</script>
+</pre>
+</body>
+</html>
diff --git a/dbm/include/Makefile.in b/dbm/include/Makefile.in
index 60bb24cfcf0b..343a08807cd6 100644
--- a/dbm/include/Makefile.in
+++ b/dbm/include/Makefile.in
@@ -1,7 +1,39 @@
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
diff --git a/dbm/include/Makefile.win b/dbm/include/Makefile.win
index 04f9b2395e34..df31e52737db 100644
--- a/dbm/include/Makefile.win
+++ b/dbm/include/Makefile.win
@@ -1,6 +1,38 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 
 #//------------------------------------------------------------------------
diff --git a/dbm/src/Makefile.in b/dbm/src/Makefile.in
index ee5b1f48ba64..2f7476d8c86f 100644
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -1,7 +1,39 @@
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
diff --git a/dbm/src/Makefile.win b/dbm/src/Makefile.win
index 63e0c7c3c97f..91bdf7d2092f 100644
--- a/dbm/src/Makefile.win
+++ b/dbm/src/Makefile.win
@@ -1,6 +1,38 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 
 #//------------------------------------------------------------------------
diff --git a/dbm/tests/Makefile.in b/dbm/tests/Makefile.in
index 32f3383610cf..ffb83f29b3de 100644
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -1,7 +1,39 @@
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
diff --git a/dbm/tests/lots.c b/dbm/tests/lots.c
index 54fd3978e566..ea8bc6ea2345 100644
--- a/dbm/tests/lots.c
+++ b/dbm/tests/lots.c
@@ -1,7 +1,39 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
 
 /* use sequental numbers printed to strings
  * to store lots and lots of entries in the
diff --git a/dom/base/BrowserElementChild.js b/dom/base/BrowserElementChild.js
index f38b74bcb08a..6c6f9429fd12 100644
--- a/dom/base/BrowserElementChild.js
+++ b/dom/base/BrowserElementChild.js
@@ -169,7 +169,7 @@ BrowserElementChild.prototype = {
     if (whitelistedEvents.indexOf(e.keyCode) != -1 && !e.defaultPrevented) {
       sendAsyncMsg('keyevent', {
         type: e.type,
-        code: e.keyCode,
+        keyCode: e.keyCode,
         charCode: e.charCode,
       });
     }
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index fa126efee816..367c0d31ad09 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -5259,10 +5259,6 @@ nsWindowSH::GlobalScopePolluterGetProperty(JSContext *cx, JSHandleObject obj,
     return JS_FALSE;
   }
 
-  // Print a warning on the console so developers have a chance to
-  // catch and fix these mistakes.
-  PrintWarningOnConsole(cx, "GlobalScopeElementReference");
-
   return JS_TRUE;
 }
 
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index f56d26e43f7e..f10172706dca 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -971,8 +971,11 @@ nsDOMWindowUtils::GarbageCollect(nsICycleCollectorListener *aListener,
   }
 #endif
 
+  for (int i = 0; i < 3; i++) {
+    nsJSContext::GarbageCollectNow(js::gcreason::DOM_UTILS, nsGCNormal, true);
+    nsJSContext::CycleCollectNow(aListener, aExtraForgetSkippableCalls);
+  }
   nsJSContext::GarbageCollectNow(js::gcreason::DOM_UTILS, nsGCNormal, true);
-  nsJSContext::CycleCollectNow(aListener, aExtraForgetSkippableCalls);
 
   return NS_OK;
 }
diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 64e9e7748476..341389f92588 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -905,7 +905,7 @@ static const char js_pccounts_chrome_str[]    = JS_OPTIONS_DOT_STR "pccounts.chr
 static const char js_jit_hardening_str[]      = JS_OPTIONS_DOT_STR "jit_hardening";
 static const char js_memlog_option_str[] = JS_OPTIONS_DOT_STR "mem.log";
 static const char js_disable_explicit_compartment_gc[] =
-  JS_OPTIONS_DOT_STR "disable_explicit_compartment_gc";
+  JS_OPTIONS_DOT_STR "mem.disable_explicit_compartment_gc";
 
 int
 nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
diff --git a/dom/interfaces/svg/nsIDOMSVGSVGElement.idl b/dom/interfaces/svg/nsIDOMSVGSVGElement.idl
index 4bef943c1487..f25a440edf35 100644
--- a/dom/interfaces/svg/nsIDOMSVGSVGElement.idl
+++ b/dom/interfaces/svg/nsIDOMSVGSVGElement.idl
@@ -22,7 +22,7 @@ interface nsIDOMSVGTransform;
 #endif
 %}
 
-[scriptable, uuid(EF862DDA-DE4E-4F1C-9A70-4D3BEBDE5E6E)]
+[scriptable, uuid(BEC06C4F-3EF7-486E-A8F5-F375EE5CB5A8)]
 interface nsIDOMSVGSVGElement
   : nsIDOMSVGElement
 /*
@@ -56,8 +56,7 @@ interface nsIDOMSVGSVGElement
   readonly attribute float pixelUnitToMillimeterY;
   readonly attribute float screenPixelToMillimeterX;
   readonly attribute float screenPixelToMillimeterY;
-  attribute boolean useCurrentView;
-      // raises DOMException on setting
+  readonly attribute boolean useCurrentView;
   readonly attribute nsIDOMSVGViewSpec currentView;
   attribute float currentScale;
       // raises DOMException on setting
diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties
index 6fa56aabb60c..6ab13388a311 100644
--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -17,7 +17,6 @@ OnBeforeUnloadMessage=This page is asking you to confirm that you want to leave
 OnBeforeUnloadStayButton=Stay on Page
 OnBeforeUnloadLeaveButton=Leave Page
 DocumentAllUsed=Non-standard document.all property was used. Use W3C standard document.getElementById() instead.
-GlobalScopeElementReference=Element referenced by ID/NAME in the global scope. Use W3C standard document.getElementById() instead.
 UseOfCaptureEventsWarning=Use of captureEvents() is deprecated. To upgrade your code, use the DOM 2 addEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 UseOfReleaseEventsWarning=Use of releaseEvents() is deprecated. To upgrade your code, use the DOM 2 removeEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 UseOfRouteEventWarning=Use of routeEvent() is deprecated. To upgrade your code, use the DOM 2 dispatchEvent() method. For more help http://developer.mozilla.org/en/docs/DOM:element.dispatchEvent
diff --git a/dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html b/dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html
index a63a7feec62f..d04497bf0edd 100644
--- a/dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html
+++ b/dom/tests/mochitest/browser-frame/test_browserFrame_keyEvents.html
@@ -48,7 +48,7 @@ var nbEvents = 15;
 function eventHandler(e) {
   ok(((e.type == 'keydown' || e.type == 'keypress' || e.type == 'keyup') &&
       !e.defaultPrevented &&
-      whitelistedEvents.indexOf(e.keyCode)),
+      (whitelistedEvents.indexOf(e.keyCode) != -1)),
       "[ " + e.type + "] Handled event should be a non prevented key event in the white list.");
 
   nbEvents--;
diff --git a/editor/libeditor/html/crashtests/759748.html b/editor/libeditor/html/crashtests/759748.html
new file mode 100644
index 000000000000..1e85a3877d7a
--- /dev/null
+++ b/editor/libeditor/html/crashtests/759748.html
@@ -0,0 +1,58 @@
+<!doctype html>
+<body>
+<script>
+var cmds = {
+  bold: "",
+  italic: "",
+  underline: "",
+  strikethrough: "",
+  subscript: "",
+  superscript: "",
+  cut: "",
+  copy: "",
+  paste: "",
+  delete: "",
+  forwarddelete: "",
+  selectall: "",
+  undo: "",
+  redo: "",
+  indent: "",
+  outdent: "",
+  backcolor: "#888888",
+  forecolor: "#888888",
+  hilitecolor: "#888888",
+  fontname: "Courier",
+  fontsize: "6",
+  increasefontsize: "",
+  decreasefontsize: "",
+  inserthorizontalrule: "",
+  createlink: "foo",
+  insertimage: "foo",
+  inserthtml: "foo",
+  inserttext: "foo",
+  insertparagraph: "",
+  gethtml: "",
+  justifyleft: "",
+  justifyright: "",
+  justifycenter: "",
+  justifyfull: "",
+  removeformat: "",
+  unlink: "",
+  insertorderedlist: "",
+  insertunorderedlist: "",
+  formatblock: "h1",
+  heading: "h1",
+  stylewithcss: "true",
+  usecss: "true",
+  contentreadonly: "true",
+  readonly: "true",
+  insertbronreturn: "true",
+  enableobjectresizing: "true",
+  enableinlinetableediting: "true",
+};
+for (var k in cmds) {
+  document.body.innerHTML = "<div contenteditable>abc</div>";
+  getSelection().removeAllRanges();
+  try { document.execCommand(k, false, cmds[k]) } catch(e) {}
+}
+</script>
diff --git a/editor/libeditor/html/crashtests/crashtests.list b/editor/libeditor/html/crashtests/crashtests.list
index 8cf1f7aa21a4..7d2fdf307d9d 100644
--- a/editor/libeditor/html/crashtests/crashtests.list
+++ b/editor/libeditor/html/crashtests/crashtests.list
@@ -26,3 +26,4 @@ load 639736-1.xhtml
 load 643786-1.html
 load 682650-1.html
 load 716456-1.html
+load 759748.html
diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
index 5f2d7570adc3..07dd8d734509 100644
--- a/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -521,6 +521,8 @@ nsHTMLEditRules::WillDoAction(nsTypedSelection* aSelection,
                               bool* aHandled)
 {
   MOZ_ASSERT(aInfo && aCancel && aHandled);
+  // Nothing to do if there's no selection to act on
+  NS_ENSURE_TRUE(aSelection->GetRangeCount(), NS_OK);
 
   *aCancel = false;
   *aHandled = false;
diff --git a/editor/libeditor/html/nsHTMLEditorStyle.cpp b/editor/libeditor/html/nsHTMLEditorStyle.cpp
index 73aee4f68ddb..020c81d91379 100644
--- a/editor/libeditor/html/nsHTMLEditorStyle.cpp
+++ b/editor/libeditor/html/nsHTMLEditorStyle.cpp
@@ -1498,7 +1498,8 @@ nsHTMLEditor::RelativeFontChange( PRInt32 aSizeChange)
     // Let's see in what kind of element the selection is
     PRInt32 offset;
     nsCOMPtr<nsIDOMNode> selectedNode;
-    res = GetStartNodeAndOffset(selection, getter_AddRefs(selectedNode), &offset);
+    GetStartNodeAndOffset(selection, getter_AddRefs(selectedNode), &offset);
+    NS_ENSURE_TRUE(selectedNode, NS_OK);
     if (IsTextNode(selectedNode)) {
       nsCOMPtr<nsIDOMNode> parent;
       res = selectedNode->GetParentNode(getter_AddRefs(parent));
diff --git a/gfx/layers/ImageLayers.cpp b/gfx/layers/ImageLayers.cpp
index cbd8c3de7fe7..ab1ed64a100f 100644
--- a/gfx/layers/ImageLayers.cpp
+++ b/gfx/layers/ImageLayers.cpp
@@ -315,14 +315,44 @@ PlanarYCbCrImage::AllocateBuffer(PRUint32 aSize)
   return mRecycleBin->GetBuffer(aSize); 
 }
 
+static void
+CopyPlane(PRUint8 *aDst, PRUint8 *aSrc,
+          const gfxIntSize &aSize, PRInt32 aStride,
+          PRInt32 aOffset, PRInt32 aSkip)
+{
+  if (!aOffset && !aSkip) {
+    // Fast path: planar input.
+    memcpy(aDst, aSrc, aSize.height * aStride);
+  } else {
+    PRInt32 height = aSize.height;
+    PRInt32 width = aSize.width;
+    for (int y = 0; y < height; ++y) {
+      PRUint8 *src = aSrc + aOffset;
+      PRUint8 *dst = aDst;
+      if (!aSkip) {
+        // Fast path: offset only, no per-pixel skip.
+        memcpy(dst, src, width);
+      } else {
+        // Slow path
+        for (int x = 0; x < width; ++x) {
+          *dst++ = *src++;
+          src += aSkip;
+        }
+      }
+      aSrc += aStride;
+      aDst += aStride;
+    }
+  }
+}
+
 void
-PlanarYCbCrImage::CopyData(const Data& aData)
+PlanarYCbCrImage::CopyData(const Data& aData,
+                           PRInt32 aYOffset, PRInt32 aYSkip,
+                           PRInt32 aCbOffset, PRInt32 aCbSkip,
+                           PRInt32 aCrOffset, PRInt32 aCrSkip)
 {
   mData = aData;
 
-  mData.mYStride = mData.mYSize.width;
-  mData.mCbCrStride = mData.mCbCrSize.width;
-
   // update buffer size
   mBufferSize = mData.mCbCrStride * mData.mCbCrSize.height * 2 +
                 mData.mYStride * mData.mYSize.height;
@@ -336,19 +366,15 @@ PlanarYCbCrImage::CopyData(const Data& aData)
   mData.mCbChannel = mData.mYChannel + mData.mYStride * mData.mYSize.height;
   mData.mCrChannel = mData.mCbChannel + mData.mCbCrStride * mData.mCbCrSize.height;
 
-  for (int i = 0; i < mData.mYSize.height; i++) {
-    memcpy(mData.mYChannel + i * mData.mYStride,
-           aData.mYChannel + i * aData.mYStride,
-           mData.mYStride);
-  }
-  for (int i = 0; i < mData.mCbCrSize.height; i++) {
-    memcpy(mData.mCbChannel + i * mData.mCbCrStride,
-           aData.mCbChannel + i * aData.mCbCrStride,
-           mData.mCbCrStride);
-    memcpy(mData.mCrChannel + i * mData.mCbCrStride,
-           aData.mCrChannel + i * aData.mCbCrStride,
-           mData.mCbCrStride);
-  }
+  CopyPlane(mData.mYChannel, aData.mYChannel,
+            mData.mYSize, mData.mYStride,
+            aYOffset, aYSkip);
+  CopyPlane(mData.mCbChannel, aData.mCbChannel,
+            mData.mCbCrSize, mData.mCbCrStride,
+            aCbOffset, aCbSkip);
+  CopyPlane(mData.mCrChannel, aData.mCrChannel,
+            mData.mCbCrSize, mData.mCbCrStride,
+            aCrOffset, aCrSkip);
 
   mSize = aData.mPicSize;
 }
diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h
index b9b4ee0b0cb4..d79f86d3dcd7 100644
--- a/gfx/layers/ImageLayers.h
+++ b/gfx/layers/ImageLayers.h
@@ -725,8 +725,17 @@ public:
    * Make a copy of the YCbCr data into local storage.
    *
    * @param aData           Input image data.
+   * @param aYOffset        Pixels to skip between lines in the Y plane.
+   * @param aYSkip          Pixels to skip between pixels in the Y plane.
+   * @param aCbOffset       Pixels to skip between lines in the Cb plane.
+   * @param aCbSkip         Pixels to skip between pixels in the Cb plane.
+   * @param aCrOffset       Pixels to skip between lines in the Cr plane.
+   * @param aCrSkip         Pixels to skip between pixels in the Cr plane.
    */
-  void CopyData(const Data& aData);
+  void CopyData(const Data& aData,
+                PRInt32 aYOffset = 0, PRInt32 aYSkip = 0,
+                PRInt32 aCbOffset = 0, PRInt32 aCbSkip = 0,
+                PRInt32 aCrOffset = 0, PRInt32 aCrSkip = 0);
 
   /**
    * Return a buffer to store image data in.
diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index f082363122e4..08df4892fa19 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -169,6 +169,11 @@ LayerManagerOGL::Initialize(nsRefPtr<GLContext> aContext, bool force)
   // Do not allow double initialization
   NS_ABORT_IF_FALSE(mGLContext == nsnull, "Don't reinitialize layer managers");
 
+#ifdef MOZ_WIDGET_ANDROID
+  if (!aContext)
+    NS_RUNTIMEABORT("We need a context on Android");
+#endif
+
   if (!aContext)
     return false;
 
diff --git a/js/src/assembler/jit/ExecutableAllocator.cpp b/js/src/assembler/jit/ExecutableAllocator.cpp
index c91f07fd17b0..7b2e0ef4d584 100644
--- a/js/src/assembler/jit/ExecutableAllocator.cpp
+++ b/js/src/assembler/jit/ExecutableAllocator.cpp
@@ -45,11 +45,14 @@ ExecutableAllocator::sizeOfCode(size_t *method, size_t *regexp, size_t *unused)
     *method = 0;
     *regexp = 0;
     *unused = 0;
-    for (ExecPoolHashSet::Range r = m_pools.all(); !r.empty(); r.popFront()) {
-        ExecutablePool* pool = r.front();
-        *method += pool->m_mjitCodeMethod;
-        *regexp += pool->m_mjitCodeRegexp;
-        *unused += pool->m_allocation.size - pool->m_mjitCodeMethod - pool->m_mjitCodeRegexp;
+
+    if (m_pools.initialized()) {
+        for (ExecPoolHashSet::Range r = m_pools.all(); !r.empty(); r.popFront()) {
+            ExecutablePool* pool = r.front();
+            *method += pool->m_mjitCodeMethod;
+            *regexp += pool->m_mjitCodeRegexp;
+            *unused += pool->m_allocation.size - pool->m_mjitCodeMethod - pool->m_mjitCodeRegexp;
+        }
     }
 }
 
diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h
index 52c4b9bb8aaa..c071c33f232c 100644
--- a/js/src/assembler/jit/ExecutableAllocator.h
+++ b/js/src/assembler/jit/ExecutableAllocator.h
@@ -241,6 +241,7 @@ public:
         if (destroyCallback)
             destroyCallback(pool->m_allocation.pages, pool->m_allocation.size);
         systemRelease(pool->m_allocation);
+        JS_ASSERT(m_pools.initialized());
         m_pools.remove(m_pools.lookup(pool));   // this asserts if |pool| is not in m_pools
     }
 
diff --git a/js/src/config/makefiles/autotargets.mk b/js/src/config/makefiles/autotargets.mk
index 2db24a9c1192..595729e65586 100644
--- a/js/src/config/makefiles/autotargets.mk
+++ b/js/src/config/makefiles/autotargets.mk
@@ -18,6 +18,10 @@ ifndef INCLUDED_AUTOTARGETS_MK #{
 MKDIR ?= mkdir -p
 TOUCH ?= touch
 
+# Deps will be considered intermediate when used as a pre-requisite for
+# wildcard targets.  Inhibit their removal, mkdir -p is a standalone op.
+.PRECIOUS: %/.mkdir.done
+
 ###########################################################################
 # Threadsafe directory creation
 # GENERATED_DIRS - Automated creation of these directories.
diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
index 69146800423e..90e744847420 100644
--- a/js/src/frontend/Parser.cpp
+++ b/js/src/frontend/Parser.cpp
@@ -5567,6 +5567,7 @@ Parser::assignExprWithoutYield(unsigned msg)
     GenexpGuard yieldGuard(this);
 #endif
     ParseNode *res = assignExpr();
+    yieldGuard.endBody();
     if (res) {
 #ifdef JS_HAS_GENERATORS
         if (!yieldGuard.checkValidBody(res, msg)) {
diff --git a/js/src/jit-test/tests/arguments/defaults-bug759904.js b/js/src/jit-test/tests/arguments/defaults-bug759904.js
new file mode 100644
index 000000000000..faf0a81f0545
--- /dev/null
+++ b/js/src/jit-test/tests/arguments/defaults-bug759904.js
@@ -0,0 +1,4 @@
+function a(b=3) {
+    yield
+}
+a()
diff --git a/js/src/jit-test/tests/debug/Environment-callee-01.js b/js/src/jit-test/tests/debug/Environment-callee-01.js
new file mode 100644
index 000000000000..3ccf06aa0de8
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Environment-callee-01.js
@@ -0,0 +1,48 @@
+// Debugger.Environment.prototype.callee reveals the callee of environments
+// that have them.
+
+var g = newGlobal('new-compartment');
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+
+function check(code, expectedType, expectedCallee) {
+  print("check(" + uneval(code) + ")");
+  var hits;
+  dbg.onDebuggerStatement = function (frame) {
+    hits++;
+    var env = frame.environment;
+    assertEq(env.type, expectedType);
+    assertEq(env.callee, expectedCallee);
+  };
+  hits = 0;
+  g.eval(code);
+  assertEq(hits, 1);
+}
+
+check('debugger;', 'object', null);
+check('with({}) { debugger; };', 'with', null);
+check('let (x=1) { debugger; };', 'declarative', null);
+
+g.eval('function f() { debugger; }');
+check('f()', 'declarative', gw.makeDebuggeeValue(g.f));
+
+g.eval('function g() { h(); }');
+g.eval('function h() { debugger; }');
+check('g()', 'declarative', gw.makeDebuggeeValue(g.h));
+
+// Strict direct eval gets its own environment.
+check('"use strict"; eval("debugger");', 'declarative', null);
+g.eval('function j() { "use strict"; eval("debugger;"); }');
+check('j()', 'declarative', null);
+
+// Lenient direct eval shares eval's caller's environment,
+// although this is a great evil.
+check('eval("debugger");', 'object', null);
+g.eval('function k() { eval("debugger;"); }');
+check('k()', 'declarative', gw.makeDebuggeeValue(g.k));
+
+g.eval('function m() { debugger; yield true; }');
+check('m().next();', 'declarative', gw.makeDebuggeeValue(g.m));
+
+g.eval('function n() { let (x = 1) { debugger; } }');
+check('n()', 'declarative', null);
diff --git a/js/src/jit-test/tests/debug/Environment-callee-02.js b/js/src/jit-test/tests/debug/Environment-callee-02.js
new file mode 100644
index 000000000000..049f51c65e41
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Environment-callee-02.js
@@ -0,0 +1,25 @@
+// Debugger.Environment.prototype.callee gets the right closure.
+
+var g = newGlobal('new-compartment');
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+
+g.eval('function f(x) { return function (y) { debugger; return x + y; } }');
+g.eval('var g = f(2);');
+g.eval('var h = f(3);');
+
+function check(fun, label) {
+  print("check(" + label + ")");
+  var hits;
+  dbg.onDebuggerStatement = function (frame) {
+    hits++;
+    var env = frame.environment;
+    assertEq(env.callee, gw.makeDebuggeeValue(fun));
+  };
+  hits = 0;
+  fun();
+  assertEq(hits, 1);
+}
+
+check(g.g, 'g.g');
+check(g.h, 'g.h');
diff --git a/js/src/jit-test/tests/debug/Environment-callee-03.js b/js/src/jit-test/tests/debug/Environment-callee-03.js
new file mode 100644
index 000000000000..97ea46ded0ab
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Environment-callee-03.js
@@ -0,0 +1,26 @@
+// Environments of different instances of the same generator have the same
+// callee. I love this job.
+
+var g = newGlobal('new-compartment');
+var dbg = new Debugger;
+var gw = dbg.addDebuggee(g);
+
+g.eval('function f(x) { debugger; yield x; }');
+g.eval('var g = f(2);');
+g.eval('var h = f(3);');
+
+function check(gen, label) {
+  print("check(" + label + ")");
+  var hits;
+  dbg.onDebuggerStatement = function (frame) {
+    hits++;
+    var env = frame.environment;
+    assertEq(env.callee, gw.makeDebuggeeValue(g.f));
+  };
+  hits = 0;
+  gen.next();
+  assertEq(hits, 1);
+}
+
+check(g.g, 'g.g');
+check(g.h, 'g.h');
diff --git a/js/src/jit-test/tests/debug/Frame-eval-13.js b/js/src/jit-test/tests/debug/Frame-eval-13.js
new file mode 100644
index 000000000000..a8388a66e434
--- /dev/null
+++ b/js/src/jit-test/tests/debug/Frame-eval-13.js
@@ -0,0 +1,13 @@
+// The debugger may add new bindings into existing scopes
+
+var g = newGlobal('new-compartment');
+var dbg = new Debugger(g);
+dbg.onDebuggerStatement = function(frame) {
+    assertEq(frame.eval("var x = 3; x").return, 3);
+    hits++;
+}
+var hits = 0;
+g.eval("(function() { debugger; })()");
+assertEq(hits, 1);
+g.eval("(function() { var x = 4; debugger; })()");
+assertEq(hits, 2);
diff --git a/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js b/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js
index 7621a52dd6b0..1d53acf8816f 100644
--- a/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js
+++ b/js/src/jit-test/tests/jaeger/bug563000/eif-call-newvar.js
@@ -2,20 +2,12 @@
 setDebug(true);
 
 function callee() {
-  var caught = false;
-  try {
-    // attempting to add a new binding to an existing scope is a dynamic error
-    evalInFrame(1, "var y = 'success'");
-  } catch (e) {
-    assertEq(String.prototype.indexOf.call(e, "TypeError"), 0);
-    caught = true;
-  }
-  assertEq(caught, true);
+  evalInFrame(1, "var x = 'success'");
 }
 function caller(code) {
   eval(code);
   callee();
   return x;
 }
-assertEq(caller('var x = "success"'), "success");
+assertEq(caller('var y = "ignominy"'), "success");
 assertEq(typeof x, "undefined");
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 9d842d1b1213..acf260ece541 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2042,12 +2042,12 @@ JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj_)
     /* Initialize any classes that have not been initialized yet. */
     for (unsigned i = 0; standard_class_atoms[i].init; i++) {
         const JSStdName &stdnm = standard_class_atoms[i];
-        if (!js::IsStandardClassResolved(obj, stdnm.clasp) &&
+        if (!js::IsStandardClassResolved(obj, stdnm.clasp)
 #if JS_HAS_XML_SUPPORT
-            ((stdnm.init != js_InitXMLClass &&
-              stdnm.init != js_InitNamespaceClass &&
-              stdnm.init != js_InitQNameClass) ||
-             VersionHasAllowXML(cx->findVersion()))
+            && ((stdnm.init != js_InitXMLClass &&
+                 stdnm.init != js_InitNamespaceClass &&
+                 stdnm.init != js_InitQNameClass) ||
+                VersionHasAllowXML(cx->findVersion()))
 #endif
             )
         {
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 1ec12b347460..179bc9689ae3 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -795,11 +795,21 @@ iterator_iterator(JSContext *cx, HandleObject obj, JSBool keysonly)
 static JSBool
 Iterator(JSContext *cx, unsigned argc, Value *vp)
 {
-    Value *argv = JS_ARGV(cx, vp);
-    bool keyonly = argc >= 2 ? js_ValueToBoolean(argv[1]) : false;
+    CallArgs args = CallArgsFromVp(argc, vp);
+    if (args.length() == 0) {
+        js_ReportMissingArg(cx, args.calleev(), 0);
+        return false;
+    }
+
+    bool keyonly = false;
+    if (args.length() >= 2)
+        keyonly = js_ValueToBoolean(args[1]);
     unsigned flags = JSITER_OWNONLY | (keyonly ? 0 : (JSITER_FOREACH | JSITER_KEYVALUE));
-    *vp = argc >= 1 ? argv[0] : UndefinedValue();
-    return ValueToIterator(cx, flags, vp);
+
+    if (!ValueToIterator(cx, flags, &args[0]))
+        return false;
+    args.rval() = args[0];
+    return true;
 }
 
 JSBool
diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp
index ad24625203a6..0bae7a114284 100644
--- a/js/src/jswrapper.cpp
+++ b/js/src/jswrapper.cpp
@@ -219,7 +219,7 @@ Wrapper::construct(JSContext *cx, JSObject *wrapper, unsigned argc, Value *argv,
 {
     vp->setUndefined(); // default result if we refuse to perform this action
     const jsid id = JSID_VOID;
-    GET(IndirectProxyHandler::construct(cx, wrapper, argc, argv, vp));
+    CHECKED(IndirectProxyHandler::construct(cx, wrapper, argc, argv, vp), CALL);
 }
 
 bool
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 525bacc487ae..d66c8d7b2194 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -50,16 +50,6 @@
 
 #include "prmjtime.h"
 
-#ifdef JSDEBUGGER
-#include "jsdebug.h"
-#ifdef JSDEBUGGER_JAVA_UI
-#include "jsdjava.h"
-#endif /* JSDEBUGGER_JAVA_UI */
-#ifdef JSDEBUGGER_C_UI
-#include "jsdb.h"
-#endif /* JSDEBUGGER_C_UI */
-#endif /* JSDEBUGGER */
-
 #include "jsoptparse.h"
 #include "jsworkers.h"
 #include "jsheaptools.h"
@@ -163,7 +153,8 @@ static JSRuntime *gRuntime = NULL;
 #endif
 
 int gExitCode = 0;
-JSBool gQuitting = JS_FALSE;
+bool gQuitting = false;
+bool gGotError = false;
 FILE *gErrFile = NULL;
 FILE *gOutFile = NULL;
 #ifdef JS_THREADSAFE
@@ -171,11 +162,11 @@ JSObject *gWorkers = NULL;
 js::workers::ThreadPool *gWorkerThreadPool = NULL;
 #endif
 
-static JSBool reportWarnings = JS_TRUE;
-static JSBool compileOnly = JS_FALSE;
+static bool reportWarnings = true;
+static bool compileOnly = false;
 
 #ifdef DEBUG
-static JSBool OOM_printAllocationCount = JS_FALSE;
+static bool OOM_printAllocationCount = false;
 #endif
 
 typedef enum JSShellErrNum {
@@ -213,7 +204,7 @@ ReportException(JSContext *cx)
 
 class ToStringHelper {
   public:
-    ToStringHelper(JSContext *aCx, jsval v, JSBool aThrow = JS_FALSE)
+    ToStringHelper(JSContext *aCx, jsval v, bool aThrow = false)
       : cx(aCx), mThrow(aThrow)
     {
         mStr = JS_ValueToString(cx, v);
@@ -224,7 +215,7 @@ class ToStringHelper {
     ~ToStringHelper() {
         JS_RemoveStringRoot(cx, &mStr);
     }
-    JSBool threw() { return !mStr; }
+    bool threw() { return !mStr; }
     jsval getJSVal() { return STRING_TO_JSVAL(mStr); }
     const char *getBytes() {
         if (mStr && (mBytes.ptr() || mBytes.encode(cx, mStr)))
@@ -234,13 +225,13 @@ class ToStringHelper {
   private:
     JSContext *cx;
     JSString *mStr;
-    JSBool mThrow;
+    bool mThrow;
     JSAutoByteString mBytes;
 };
 
 class IdStringifier : public ToStringHelper {
 public:
-    IdStringifier(JSContext *cx, jsid id, JSBool aThrow = JS_FALSE)
+    IdStringifier(JSContext *cx, jsid id, bool aThrow = false)
     : ToStringHelper(cx, IdToJsval(id), aThrow)
     { }
 };
@@ -347,10 +338,10 @@ static JSBool
 ShellOperationCallback(JSContext *cx)
 {
     if (!gCanceled)
-        return JS_TRUE;
+        return true;
 
     JS_ClearPendingException(cx);
-    return JS_FALSE;
+    return false;
 }
 
 static void
@@ -390,7 +381,7 @@ SkipUTF8BOM(FILE* file)
 static void
 Process(JSContext *cx, JSObject *obj_, const char *filename, bool forceTTY)
 {
-    JSBool ok, hitEOF;
+    bool ok, hitEOF;
     JSScript *script;
     jsval result;
     JSString *str;
@@ -438,9 +429,11 @@ Process(JSContext *cx, JSObject *obj_, const char *filename, bool forceTTY)
 
         int64_t t1 = PRMJ_Now();
         oldopts = JS_GetOptions(cx);
+        gGotError = false;
         JS_SetOptions(cx, oldopts | JSOPTION_COMPILE_N_GO | JSOPTION_NO_SCRIPT_RVAL);
         script = JS_CompileUTF8FileHandle(cx, obj, filename, file);
         JS_SetOptions(cx, oldopts);
+        JS_ASSERT_IF(!script, gGotError);
         if (script && !compileOnly) {
             if (!JS_ExecuteScript(cx, obj, script, NULL)) {
                 if (!gQuitting && !gCanceled)
@@ -456,7 +449,7 @@ Process(JSContext *cx, JSObject *obj_, const char *filename, bool forceTTY)
 
     /* It's an interactive filehandle; drop into read-eval-print loop. */
     lineno = 1;
-    hitEOF = JS_FALSE;
+    hitEOF = false;
     buffer = NULL;
     size = 0;           /* assign here to avoid warnings */
     do {
@@ -484,7 +477,7 @@ Process(JSContext *cx, JSObject *obj_, const char *filename, bool forceTTY)
                     free(buffer);
                     goto cleanup;
                 }
-                hitEOF = JS_TRUE;
+                hitEOF = true;
                 break;
             }
             if (!buffer) {
@@ -516,10 +509,10 @@ Process(JSContext *cx, JSObject *obj_, const char *filename, bool forceTTY)
             }
             lineno++;
             if (!ScheduleWatchdog(cx->runtime, gTimeoutInterval)) {
-                hitEOF = JS_TRUE;
+                hitEOF = true;
                 break;
             }
-        } while (!JS_BufferIsCompilableUnit(cx, JS_TRUE, obj, buffer, len));
+        } while (!JS_BufferIsCompilableUnit(cx, true, obj, buffer, len));
 
         if (hitEOF && !buffer)
             break;
@@ -538,12 +531,15 @@ Process(JSContext *cx, JSObject *obj_, const char *filename, bool forceTTY)
 
         /* Even though we're interactive, we have a compile-n-go opportunity. */
         oldopts = JS_GetOptions(cx);
+        gGotError = false;
         if (!compileOnly)
             JS_SetOptions(cx, oldopts | JSOPTION_COMPILE_N_GO);
         script = JS_CompileUCScript(cx, obj, uc_buffer, uc_len, "typein", startline);
         if (!compileOnly)
             JS_SetOptions(cx, oldopts);
 
+        JS_ASSERT_IF(!script, gGotError);
+
         if (script && !compileOnly) {
             ok = JS_ExecuteScript(cx, obj, script, &result);
             if (ok && !JSVAL_IS_VOID(result)) {
@@ -652,7 +648,7 @@ RevertVersion(JSContext *cx, unsigned argc, jsval *vp)
 {
     js_RevertVersion(cx);
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -661,30 +657,30 @@ Options(JSContext *cx, unsigned argc, jsval *vp)
     uint32_t optset, flag;
     JSString *str;
     char *names;
-    JSBool found;
+    bool found;
 
     optset = 0;
     jsval *argv = JS_ARGV(cx, vp);
     for (unsigned i = 0; i < argc; i++) {
         str = JS_ValueToString(cx, argv[i]);
         if (!str)
-            return JS_FALSE;
+            return false;
         argv[i] = STRING_TO_JSVAL(str);
         JSAutoByteString opt(cx, str);
         if (!opt)
-            return JS_FALSE;
+            return false;
         flag = MapContextOptionNameToFlag(cx, opt.ptr());
         if (!flag)
-            return JS_FALSE;
+            return false;
         optset |= flag;
     }
     optset = JS_ToggleOptions(cx, optset);
 
     names = NULL;
-    found = JS_FALSE;
+    found = false;
     for (size_t i = 0; i < ArrayLength(js_options); i++) {
         if (js_options[i].flag & optset) {
-            found = JS_TRUE;
+            found = true;
             names = JS_sprintf_append(names, "%s%s",
                                       names ? "," : "", js_options[i].name);
             if (!names)
@@ -695,14 +691,14 @@ Options(JSContext *cx, unsigned argc, jsval *vp)
         names = strdup("");
     if (!names) {
         JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
+        return false;
     }
     str = JS_NewStringCopyZ(cx, names);
     free(names);
     if (!str)
-        return JS_FALSE;
+        return false;
     *vp = STRING_TO_JSVAL(str);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -710,7 +706,7 @@ Load(JSContext *cx, unsigned argc, jsval *vp)
 {
     RootedObject thisobj(cx, JS_THIS_OBJECT(cx, vp));
     if (!thisobj)
-        return JS_FALSE;
+        return false;
 
     jsval *argv = JS_ARGV(cx, vp);
     for (unsigned i = 0; i < argc; i++) {
@@ -720,7 +716,7 @@ Load(JSContext *cx, unsigned argc, jsval *vp)
         argv[i] = STRING_TO_JSVAL(str);
         JSAutoByteString filename(cx, str);
         if (!filename)
-            return JS_FALSE;
+            return false;
         errno = 0;
         uint32_t oldopts = JS_GetOptions(cx);
         JS_SetOptions(cx, oldopts | JSOPTION_COMPILE_N_GO | JSOPTION_NO_SCRIPT_RVAL);
@@ -1053,7 +1049,7 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
     FILE *from;
     char *buf, *tmp;
     size_t bufsize, buflength, gotlength;
-    JSBool sawNewline;
+    bool sawNewline;
     JSString *str;
 
     from = stdin;
@@ -1061,9 +1057,9 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
     bufsize = BUFSIZE;
     buf = (char *) JS_malloc(cx, bufsize);
     if (!buf)
-        return JS_FALSE;
+        return false;
 
-    sawNewline = JS_FALSE;
+    sawNewline = false;
     while ((gotlength =
             js_fgets(buf + buflength, bufsize - buflength, from)) > 0) {
         buflength += gotlength;
@@ -1071,7 +1067,7 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
         /* Are we done? */
         if (buf[buflength - 1] == '\n') {
             buf[buflength - 1] = '\0';
-            sawNewline = JS_TRUE;
+            sawNewline = true;
             break;
         } else if (buflength < bufsize - 1) {
             break;
@@ -1088,7 +1084,7 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
 
         if (!tmp) {
             JS_free(cx, buf);
-            return JS_FALSE;
+            return false;
         }
 
         buf = tmp;
@@ -1098,14 +1094,14 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
     if (buflength == 0) {
         *vp = feof(from) ? JSVAL_NULL : JS_GetEmptyStringValue(cx);
         JS_free(cx, buf);
-        return JS_TRUE;
+        return true;
     }
 
     /* Shrink the buffer to the real size. */
     tmp = (char *) JS_realloc(cx, buf, buflength);
     if (!tmp) {
         JS_free(cx, buf);
-        return JS_FALSE;
+        return false;
     }
 
     buf = tmp;
@@ -1117,10 +1113,10 @@ ReadLine(JSContext *cx, unsigned argc, jsval *vp)
     str = JS_NewStringCopyN(cx, buf, sawNewline ? buflength - 1 : buflength);
     JS_free(cx, buf);
     if (!str)
-        return JS_FALSE;
+        return false;
 
     *vp = STRING_TO_JSVAL(str);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -1134,17 +1130,17 @@ PutStr(JSContext *cx, unsigned argc, jsval *vp)
         argv = JS_ARGV(cx, vp);
         str = JS_ValueToString(cx, argv[0]);
         if (!str)
-            return JS_FALSE;
+            return false;
         bytes = JS_EncodeString(cx, str);
         if (!bytes)
-            return JS_FALSE;
+            return false;
         fputs(bytes, gOutFile);
         JS_free(cx, bytes);
         fflush(gOutFile);
     }
 
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -1167,10 +1163,10 @@ PrintInternal(JSContext *cx, unsigned argc, jsval *vp, FILE *file)
     for (i = 0; i < argc; i++) {
         str = JS_ValueToString(cx, argv[i]);
         if (!str)
-            return JS_FALSE;
+            return false;
         bytes = JS_EncodeString(cx, str);
         if (!bytes)
-            return JS_FALSE;
+            return false;
         fprintf(file, "%s%s", i ? " " : "", bytes);
         JS_free(cx, bytes);
     }
@@ -1179,7 +1175,7 @@ PrintInternal(JSContext *cx, unsigned argc, jsval *vp, FILE *file)
     fflush(file);
 
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -1202,12 +1198,12 @@ Quit(JSContext *cx, unsigned argc, jsval *vp)
 {
     JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "/ i", &gExitCode);
 
-    gQuitting = JS_TRUE;
+    gQuitting = true;
 #ifdef JS_THREADSAFE
     if (gWorkerThreadPool)
         js::workers::terminateAll(gWorkerThreadPool);
 #endif
-    return JS_FALSE;
+    return false;
 }
 
 static const char *
@@ -1234,13 +1230,13 @@ AssertEq(JSContext *cx, unsigned argc, jsval *vp)
                              ? JSSMSG_INVALID_ARGS
                              : JSSMSG_TOO_MANY_ARGS,
                              "assertEq");
-        return JS_FALSE;
+        return false;
     }
 
     jsval *argv = JS_ARGV(cx, vp);
     JSBool same;
     if (!JS_SameValue(cx, argv[0], argv[1], &same))
-        return JS_FALSE;
+        return false;
     if (!same) {
         JSAutoByteString bytes0, bytes1;
         const char *actual = ToSource(cx, &argv[0], &bytes0);
@@ -1251,14 +1247,14 @@ AssertEq(JSContext *cx, unsigned argc, jsval *vp)
         } else {
             JSAutoByteString bytes2(cx, JSVAL_TO_STRING(argv[2]));
             if (!bytes2)
-                return JS_FALSE;
+                return false;
             JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_ASSERT_EQ_FAILED_MSG,
                                  actual, expected, bytes2.ptr());
         }
-        return JS_FALSE;
+        return false;
     }
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -1273,13 +1269,13 @@ AssertJit(JSContext *cx, unsigned argc, jsval *vp)
          */
         if (!cx->typeInferenceEnabled() && !cx->fp()->jit()) {
             JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_ASSERT_JIT_FAILED);
-            return JS_FALSE;
+            return false;
         }
     }
 #endif
 
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSScript *
@@ -1323,7 +1319,7 @@ SetDebug(JSContext *cx, unsigned argc, jsval *vp)
     if (argc == 0 || !JSVAL_IS_BOOLEAN(argv[0])) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
                              JSSMSG_NOT_ENOUGH_ARGS, "setDebug");
-        return JS_FALSE;
+        return false;
     }
 
     /*
@@ -1333,7 +1329,7 @@ SetDebug(JSContext *cx, unsigned argc, jsval *vp)
      * In the future, this restriction may be lifted.
      */
 
-    JSBool ok = JS_SetDebugMode(cx, JSVAL_TO_BOOLEAN(argv[0]));
+    bool ok = !!JS_SetDebugMode(cx, JSVAL_TO_BOOLEAN(argv[0]));
     if (ok)
         JS_SET_RVAL(cx, vp, JSVAL_TRUE);
     return ok;
@@ -1360,22 +1356,22 @@ GetScriptAndPCArgs(JSContext *cx, unsigned argc, jsval *argv, JSScript **scriptp
             JS_GetClass(JSVAL_TO_OBJECT(v)) == Jsvalify(&FunctionClass)) {
             script = ValueToScript(cx, v);
             if (!script)
-                return JS_FALSE;
+                return false;
             intarg++;
         }
         if (argc > intarg) {
             if (!JS_ValueToInt32(cx, argv[intarg], ip))
-                return JS_FALSE;
+                return false;
             if ((uint32_t)*ip >= script->length) {
                 JS_ReportError(cx, "Invalid PC");
-                return JS_FALSE;
+                return false;
             }
         }
     }
 
     *scriptp = script;
 
-    return JS_TRUE;
+    return true;
 }
 
 static JSTrapStatus
@@ -1416,18 +1412,18 @@ Trap(JSContext *cx, unsigned argc, jsval *vp)
     jsval *argv = JS_ARGV(cx, vp);
     if (argc == 0) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_TRAP_USAGE);
-        return JS_FALSE;
+        return false;
     }
     argc--;
     str = JS_ValueToString(cx, argv[argc]);
     if (!str)
-        return JS_FALSE;
+        return false;
     argv[argc] = STRING_TO_JSVAL(str);
     if (!GetScriptAndPCArgs(cx, argc, argv, &script, &i))
-        return JS_FALSE;
+        return false;
     if (uint32_t(i) >= script->length) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_TRAP_USAGE);
-        return JS_FALSE;
+        return false;
     }
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
     return JS_SetTrap(cx, script, script->code + i, TrapHandler, STRING_TO_JSVAL(str));
@@ -1440,10 +1436,10 @@ Untrap(JSContext *cx, unsigned argc, jsval *vp)
     int32_t i;
 
     if (!GetScriptAndPCArgs(cx, argc, JS_ARGV(cx, vp), &script, &i))
-        return JS_FALSE;
+        return false;
     JS_ClearTrap(cx, script, script->code + i, NULL, NULL);
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSTrapStatus
@@ -1460,16 +1456,16 @@ SetDebuggerHandler(JSContext *cx, unsigned argc, jsval *vp)
     if (argc == 0) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
                              JSSMSG_NOT_ENOUGH_ARGS, "setDebuggerHandler");
-        return JS_FALSE;
+        return false;
     }
 
     str = JS_ValueToString(cx, JS_ARGV(cx, vp)[0]);
     if (!str)
-        return JS_FALSE;
+        return false;
 
     JS_SetDebuggerHandler(cx->runtime, DebuggerAndThrowHandler, str);
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -1479,16 +1475,16 @@ SetThrowHook(JSContext *cx, unsigned argc, jsval *vp)
     if (argc == 0) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
                              JSSMSG_NOT_ENOUGH_ARGS, "setThrowHook");
-        return JS_FALSE;
+        return false;
     }
 
     str = JS_ValueToString(cx, JS_ARGV(cx, vp)[0]);
     if (!str)
-        return JS_FALSE;
+        return false;
 
     JS_SetThrowHook(cx->runtime, DebuggerAndThrowHandler, str);
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -1501,7 +1497,7 @@ LineToPC(JSContext *cx, unsigned argc, jsval *vp)
 
     if (argc == 0) {
         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL, JSSMSG_LINE2PC_USAGE);
-        return JS_FALSE;
+        return false;
     }
     script = GetTopScript(cx);
     jsval v = JS_ARGV(cx, vp)[0];
@@ -1510,16 +1506,16 @@ LineToPC(JSContext *cx, unsigned argc, jsval *vp)
     {
         script = ValueToScript(cx, v);
         if (!script)
-            return JS_FALSE;
+            return false;
         lineArg++;
     }
     if (!JS_ValueToECMAUint32(cx, JS_ARGV(cx, vp)[lineArg], &lineno))
-        return JS_FALSE;
+        return false;
     pc = JS_LineNumberToPC(cx, script, lineno);
     if (!pc)
-        return JS_FALSE;
+        return false;
     *vp = INT_TO_JSVAL(pc - script->code);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -1530,12 +1526,12 @@ PCToLine(JSContext *cx, unsigned argc, jsval *vp)
     unsigned lineno;
 
     if (!GetScriptAndPCArgs(cx, argc, JS_ARGV(cx, vp), &script, &i))
-        return JS_FALSE;
+        return false;
     lineno = JS_PCToLineNumber(cx, script, script->code + i);
     if (!lineno)
-        return JS_FALSE;
+        return false;
     *vp = INT_TO_JSVAL(lineno);
-    return JS_TRUE;
+    return true;
 }
 
 #ifdef DEBUG
@@ -1687,7 +1683,7 @@ Notes(JSContext *cx, unsigned argc, jsval *vp)
 {
     Sprinter sprinter(cx);
     if (!sprinter.init())
-        return JS_FALSE;
+        return false;
 
     jsval *argv = JS_ARGV(cx, vp);
     for (unsigned i = 0; i < argc; i++) {
@@ -1700,9 +1696,9 @@ Notes(JSContext *cx, unsigned argc, jsval *vp)
 
     JSString *str = JS_NewStringCopyZ(cx, sprinter.string());
     if (!str)
-        return JS_FALSE;
+        return false;
     JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(str));
-    return JS_TRUE;
+    return true;
 }
 
 JS_STATIC_ASSERT(JSTRY_CATCH == 0);
@@ -1717,7 +1713,7 @@ TryNotes(JSContext *cx, JSScript *script, Sprinter *sp)
     JSTryNote *tn, *tnlimit;
 
     if (!script->hasTrynotes())
-        return JS_TRUE;
+        return true;
 
     tn = script->trynotes()->vector;
     tnlimit = tn + script->trynotes()->length;
@@ -1728,7 +1724,7 @@ TryNotes(JSContext *cx, JSScript *script, Sprinter *sp)
                TryNoteNames[tn->kind], tn->stackDepth,
                tn->start, tn->start + tn->length);
     } while (++tn != tnlimit);
-    return JS_TRUE;
+    return true;
 }
 
 static bool
@@ -1891,19 +1887,19 @@ DisassFile(JSContext *cx, unsigned argc, jsval *vp)
 
     if (!p.argc) {
         JS_SET_RVAL(cx, vp, JSVAL_VOID);
-        return JS_TRUE;
+        return true;
     }
 
     JSObject *thisobj = JS_THIS_OBJECT(cx, vp);
     if (!thisobj)
-        return JS_FALSE;
+        return false;
 
     JSString *str = JS_ValueToString(cx, p.argv[0]);
     if (!str)
-        return JS_FALSE;
+        return false;
     JSAutoByteString filename(cx, str);
     if (!filename)
-        return JS_FALSE;
+        return false;
 
     uint32_t oldopts = JS_GetOptions(cx);
     JS_SetOptions(cx, oldopts | JSOPTION_COMPILE_N_GO | JSOPTION_NO_SCRIPT_RVAL);
@@ -1934,20 +1930,20 @@ DisassWithSrc(JSContext *cx, unsigned argc, jsval *vp)
     FILE *file;
     char linebuf[LINE_BUF_LEN];
     jsbytecode *pc, *end;
-    JSBool ok;
+    bool ok;
     static char sep[] = ";-------------------------";
 
-    ok = JS_TRUE;
+    ok = true;
     jsval *argv = JS_ARGV(cx, vp);
     for (i = 0; ok && i < argc; i++) {
         script = ValueToScript(cx, argv[i]);
         if (!script)
-           return JS_FALSE;
+           return false;
 
         if (!script->filename) {
             JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
                                  JSSMSG_FILE_SCRIPTS_ONLY);
-            return JS_FALSE;
+            return false;
         }
 
         file = fopen(script->filename, "r");
@@ -1955,7 +1951,7 @@ DisassWithSrc(JSContext *cx, unsigned argc, jsval *vp)
             JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
                                  JSSMSG_CANT_OPEN, script->filename,
                                  strerror(errno));
-            return JS_FALSE;
+            return false;
         }
 
         pc = script->code;
@@ -1963,7 +1959,7 @@ DisassWithSrc(JSContext *cx, unsigned argc, jsval *vp)
 
         Sprinter sprinter(cx);
         if (!sprinter.init()) {
-            ok = JS_FALSE;
+            ok = false;
             goto bail;
         }
 
@@ -1973,7 +1969,7 @@ DisassWithSrc(JSContext *cx, unsigned argc, jsval *vp)
             char *tmp = fgets(linebuf, LINE_BUF_LEN, file);
             if (!tmp) {
                 JS_ReportError(cx, "failed to read %s fully", script->filename);
-                ok = JS_FALSE;
+                ok = false;
                 goto bail;
             }
         }
@@ -1996,7 +1992,7 @@ DisassWithSrc(JSContext *cx, unsigned argc, jsval *vp)
                         JS_ReportErrorNumber(cx, my_GetErrorMessage, NULL,
                                              JSSMSG_UNEXPECTED_EOF,
                                              script->filename);
-                        ok = JS_FALSE;
+                        ok = false;
                         goto bail;
                     }
                     line1++;
@@ -2004,9 +2000,9 @@ DisassWithSrc(JSContext *cx, unsigned argc, jsval *vp)
                 }
             }
 
-            len = js_Disassemble1(cx, script, pc, pc - script->code, JS_TRUE, &sprinter);
+            len = js_Disassemble1(cx, script, pc, pc - script->code, true, &sprinter);
             if (!len) {
-                ok = JS_FALSE;
+                ok = false;
                 goto bail;
             }
             pc += len;
@@ -2031,7 +2027,7 @@ DumpHeap(JSContext *cx, unsigned argc, jsval *vp)
     size_t maxDepth;
     void *thingToIgnore;
     FILE *dumpFile;
-    JSBool ok;
+    bool ok;
 
     const char *fileName = NULL;
     JSAutoByteString fileNameBytes;
@@ -2042,10 +2038,10 @@ DumpHeap(JSContext *cx, unsigned argc, jsval *vp)
 
             str = JS_ValueToString(cx, v);
             if (!str)
-                return JS_FALSE;
+                return false;
             JS_ARGV(cx, vp)[0] = STRING_TO_JSVAL(str);
             if (!fileNameBytes.encode(cx, str))
-                return JS_FALSE;
+                return false;
             fileName = fileNameBytes.ptr();
         }
     }
@@ -2081,7 +2077,7 @@ DumpHeap(JSContext *cx, unsigned argc, jsval *vp)
             uint32_t depth;
 
             if (!JS_ValueToECMAUint32(cx, v, &depth))
-                return JS_FALSE;
+                return false;
             maxDepth = depth;
         }
     }
@@ -2103,7 +2099,7 @@ DumpHeap(JSContext *cx, unsigned argc, jsval *vp)
         dumpFile = fopen(fileName, "w");
         if (!dumpFile) {
             JS_ReportError(cx, "can't open %s: %s", fileName, strerror(errno));
-            return JS_FALSE;
+            return false;
         }
     }
 
@@ -2121,20 +2117,20 @@ DumpHeap(JSContext *cx, unsigned argc, jsval *vp)
   not_traceable_arg:
     JS_ReportError(cx, "argument '%s' is not null or a heap-allocated thing",
                    badTraceArg);
-    return JS_FALSE;
+    return false;
 }
 
-JSBool
+static JSBool
 DumpObject(JSContext *cx, unsigned argc, jsval *vp)
 {
     JSObject *arg0 = NULL;
     if (!JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "o", &arg0))
-        return JS_FALSE;
+        return false;
 
     js_DumpObject(arg0);
 
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 #endif /* DEBUG */
@@ -2143,7 +2139,7 @@ DumpObject(JSContext *cx, unsigned argc, jsval *vp)
  * This shell function is temporary (used by testStackIter.js) and should be
  * removed once JSD2 lands wholly subsumes the functionality here.
  */
-JSBool
+static JSBool
 DumpStack(JSContext *cx, unsigned argc, Value *vp)
 {
     RootedObject arr(cx, JS_NewArrayObject(cx, 0, NULL));
@@ -2229,7 +2225,7 @@ EscapeWideString(jschar *w)
 #include <stdarg.h>
 
 static JSBool
-ZZ_formatter(JSContext *cx, const char *format, JSBool fromJS, jsval **vpp,
+ZZ_formatter(JSContext *cx, const char *format, bool fromJS, jsval **vpp,
              va_list *app)
 {
     jsval *vp;
@@ -2241,29 +2237,29 @@ ZZ_formatter(JSContext *cx, const char *format, JSBool fromJS, jsval **vpp,
     ap = *app;
     if (fromJS) {
         if (!JS_ValueToNumber(cx, vp[0], &re))
-            return JS_FALSE;
+            return false;
         if (!JS_ValueToNumber(cx, vp[1], &im))
-            return JS_FALSE;
+            return false;
         *va_arg(ap, double *) = re;
         *va_arg(ap, double *) = im;
     } else {
         re = va_arg(ap, double);
         im = va_arg(ap, double);
         if (!JS_NewNumberValue(cx, re, &vp[0]))
-            return JS_FALSE;
+            return false;
         if (!JS_NewNumberValue(cx, im, &vp[1]))
-            return JS_FALSE;
+            return false;
     }
     *vpp = vp + 2;
     *app = ap;
     printf("leaving ZZ_formatter");
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
 ConvertArgs(JSContext *cx, unsigned argc, jsval *vp)
 {
-    JSBool b = JS_FALSE;
+    bool b = false;
     jschar c = 0;
     int32_t i = 0, j = 0;
     uint32_t u = 0;
@@ -2273,16 +2269,16 @@ ConvertArgs(JSContext *cx, unsigned argc, jsval *vp)
     JSObject *obj2 = NULL;
     JSFunction *fun = NULL;
     jsval v = JSVAL_VOID;
-    JSBool ok;
+    bool ok;
 
     if (!JS_AddArgumentFormatter(cx, "ZZ", ZZ_formatter))
-        return JS_FALSE;
+        return false;
     ok = JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "b/ciujdISWofvZZ*",
                              &b, &c, &i, &u, &j, &d, &I, &str, &w, &obj2,
                              &fun, &v, &re, &im);
     JS_RemoveArgumentFormatter(cx, "ZZ");
     if (!ok)
-        return JS_FALSE;
+        return false;
     fprintf(gOutFile,
             "b %u, c %x (%c), i %ld, u %lu, j %ld\n",
             b, c, (char)c, i, u, j);
@@ -2303,7 +2299,7 @@ ConvertArgs(JSContext *cx, unsigned argc, jsval *vp)
             fun ? (!!func ? func.ptr() : "error decompiling fun") : "",
             valueString.getBytes(), re, im);
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 #endif
 
@@ -2316,7 +2312,7 @@ BuildDate(JSContext *cx, unsigned argc, jsval *vp)
 #endif
     fprintf(gOutFile, "built on %s at %s%s", __DATE__, __TIME__, version);
     *vp = JSVAL_VOID;
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -2345,7 +2341,7 @@ Clone(JSContext *cx, unsigned argc, jsval *vp)
 
     if (!argc) {
         JS_ReportError(cx, "Invalid arguments to clone");
-        return JS_FALSE;
+        return false;
     }
 
     jsval *argv = JS_ARGV(cx, vp);
@@ -2356,7 +2352,7 @@ Clone(JSContext *cx, unsigned argc, jsval *vp)
         {
             JSObject *obj = UnwrapObject(JSVAL_TO_OBJECT(argv[0]));
             if (!ac.enter(cx, obj))
-                return JS_FALSE;
+                return false;
             argv[0] = OBJECT_TO_JSVAL(obj);
         }
         if (!JSVAL_IS_PRIMITIVE(argv[0]) && JSVAL_TO_OBJECT(argv[0])->isFunction()) {
@@ -2364,7 +2360,7 @@ Clone(JSContext *cx, unsigned argc, jsval *vp)
         } else {
             JSFunction *fun = JS_ValueToFunction(cx, argv[0]);
             if (!fun)
-                return JS_FALSE;
+                return false;
             funobj = JS_GetFunctionObject(fun);
         }
     }
@@ -2373,59 +2369,59 @@ Clone(JSContext *cx, unsigned argc, jsval *vp)
         if (fun->isInterpreted() && fun->script()->compileAndGo) {
             JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_UNEXPECTED_TYPE,
                                  "function", "compile-and-go");
-            return JS_FALSE;
+            return false;
         }
     }
 
     if (argc > 1) {
         if (!JS_ValueToObject(cx, argv[1], &parent))
-            return JS_FALSE;
+            return false;
     } else {
         parent = JS_GetParent(JSVAL_TO_OBJECT(JS_CALLEE(cx, vp)));
     }
 
     clone = JS_CloneFunctionObject(cx, funobj, parent);
     if (!clone)
-        return JS_FALSE;
+        return false;
     *vp = OBJECT_TO_JSVAL(clone);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
 GetPDA(JSContext *cx, unsigned argc, jsval *vp)
 {
     JSObject *vobj, *aobj, *pdobj;
-    JSBool ok;
+    bool ok;
     JSPropertyDescArray pda;
     JSPropertyDesc *pd;
     jsval v;
 
     if (!JS_ValueToObject(cx, argc == 0 ? JSVAL_VOID : vp[2], &vobj))
-        return JS_FALSE;
+        return false;
     if (!vobj) {
         *vp = JSVAL_VOID;
-        return JS_TRUE;
+        return true;
     }
 
     aobj = JS_NewArrayObject(cx, 0, NULL);
     if (!aobj)
-        return JS_FALSE;
+        return false;
     *vp = OBJECT_TO_JSVAL(aobj);
 
-    ok = JS_GetPropertyDescArray(cx, vobj, &pda);
+    ok = !!JS_GetPropertyDescArray(cx, vobj, &pda);
     if (!ok)
-        return JS_FALSE;
+        return false;
     pd = pda.array;
     for (uint32_t i = 0; i < pda.length; i++, pd++) {
         pdobj = JS_NewObject(cx, NULL, NULL, NULL);
         if (!pdobj) {
-            ok = JS_FALSE;
+            ok = false;
             break;
         }
 
         /* Protect pdobj from GC by setting it as an element of aobj now */
         v = OBJECT_TO_JSVAL(pdobj);
-        ok = JS_SetElement(cx, aobj, i, &v);
+        ok = !!JS_SetElement(cx, aobj, i, &v);
         if (!ok)
             break;
 
@@ -2450,9 +2446,9 @@ GetSLX(JSContext *cx, unsigned argc, jsval *vp)
 
     script = ValueToScript(cx, argc == 0 ? JSVAL_VOID : vp[2]);
     if (!script)
-        return JS_FALSE;
+        return false;
     *vp = INT_TO_JSVAL(js_GetScriptLineExtent(script));
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -2461,7 +2457,7 @@ ToInt32(JSContext *cx, unsigned argc, jsval *vp)
     int32_t i;
 
     if (!JS_ValueToInt32(cx, argc == 0 ? JSVAL_VOID : vp[2], &i))
-        return JS_FALSE;
+        return false;
     return JS_NewNumberValue(cx, i, vp);
 }
 
@@ -2469,7 +2465,7 @@ static JSBool
 StringsAreUTF8(JSContext *cx, unsigned argc, jsval *vp)
 {
     *vp = JS_CStringsAreUTF8() ? JSVAL_TRUE : JSVAL_FALSE;
-    return JS_TRUE;
+    return true;
 }
 
 static const char* badUTF8 = "...\xC0...";
@@ -2485,7 +2481,7 @@ TestUTF8(JSContext *cx, unsigned argc, jsval *vp)
     char bytes[20];
     size_t bytesLength = 20;
     if (argc && !JS_ValueToInt32(cx, *JS_ARGV(cx, vp), &mode))
-        return JS_FALSE;
+        return false;
 
     /* The following throw errors if compiled with UTF-8. */
     switch (mode) {
@@ -2507,7 +2503,7 @@ TestUTF8(JSContext *cx, unsigned argc, jsval *vp)
         break;
       default:
         JS_ReportError(cx, "invalid mode parameter");
-        return JS_FALSE;
+        return false;
     }
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
     return !JS_IsExceptionPending (cx);
@@ -2517,15 +2513,15 @@ static JSBool
 ThrowError(JSContext *cx, unsigned argc, jsval *vp)
 {
     JS_ReportError(cx, "This is an error");
-    return JS_FALSE;
+    return false;
 }
 
 #define LAZY_STANDARD_CLASSES
 
 /* A class for easily testing the inner/outer object callbacks. */
 typedef struct ComplexObject {
-    JSBool isInner;
-    JSBool frozen;
+    bool isInner;
+    bool frozen;
     JSObject *inner;
     JSObject *outer;
 } ComplexObject;
@@ -2537,7 +2533,7 @@ sandbox_enumerate(JSContext *cx, HandleObject obj)
     JSBool b;
 
     if (!JS_GetProperty(cx, obj, "lazy", &v))
-        return JS_FALSE;
+        return false;
 
     JS_ValueToBoolean(cx, v, &b);
     return !b || JS_EnumerateStandardClasses(cx, obj);
@@ -2551,19 +2547,19 @@ sandbox_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
     JSBool b, resolved;
 
     if (!JS_GetProperty(cx, obj, "lazy", &v))
-        return JS_FALSE;
+        return false;
 
     JS_ValueToBoolean(cx, v, &b);
     if (b && (flags & JSRESOLVE_ASSIGNING) == 0) {
         if (!JS_ResolveStandardClass(cx, obj, id, &resolved))
-            return JS_FALSE;
+            return false;
         if (resolved) {
             *objp = obj;
-            return JS_TRUE;
+            return true;
         }
     }
     *objp = NULL;
-    return JS_TRUE;
+    return true;
 }
 
 static JSClass sandbox_class = {
@@ -2679,7 +2675,7 @@ EvalInFrame(JSContext *cx, unsigned argc, jsval *vp)
         !JSVAL_IS_INT(argv[0]) ||
         !JSVAL_IS_STRING(argv[1])) {
         JS_ReportError(cx, "Invalid arguments to evalInFrame");
-        return JS_FALSE;
+        return false;
     }
 
     uint32_t upCount = JSVAL_TO_INT(argv[0]);
@@ -2700,19 +2696,19 @@ EvalInFrame(JSContext *cx, unsigned argc, jsval *vp)
     StackFrame *const fp = fi.fp();
     if (!fp->isScriptFrame()) {
         JS_ReportError(cx, "cannot eval in non-script frame");
-        return JS_FALSE;
+        return false;
     }
 
-    JSBool saved = JS_FALSE;;
+    bool saved = false;
     if (saveCurrent)
         saved = JS_SaveFrameChain(cx);
 
     size_t length;
     const jschar *chars = JS_GetStringCharsAndLength(cx, str, &length);
     if (!chars)
-        return JS_FALSE;
+        return false;
 
-    JSBool ok = JS_EvaluateUCInStackFrame(cx, Jsvalify(fp), chars, length,
+    bool ok = !!JS_EvaluateUCInStackFrame(cx, Jsvalify(fp), chars, length,
                                           fp->script()->filename,
                                           JS_PCToLineNumber(cx, fp->script(),
                                                             fi.pc()),
@@ -2730,7 +2726,7 @@ ShapeOf(JSContext *cx, unsigned argc, JS::Value *vp)
     JS::Value v;
     if (argc < 1 || !((v = JS_ARGV(cx, vp)[0]).isObject())) {
         JS_ReportError(cx, "shapeOf: object expected");
-        return JS_FALSE;
+        return false;
     }
     JSObject *obj = &v.toObject();
     return JS_NewNumberValue(cx, (double) ((uintptr_t)obj->lastProperty() >> 3), vp);
@@ -2873,12 +2869,12 @@ Sleep_fn(JSContext *cx, unsigned argc, jsval *vp)
         double t_secs;
 
         if (!JS_ValueToNumber(cx, argc == 0 ? JSVAL_VOID : vp[2], &t_secs))
-            return JS_FALSE;
+            return false;
 
         /* NB: The next condition also filter out NaNs. */
         if (!(t_secs <= MAX_TIMEOUT_INTERVAL)) {
             JS_ReportError(cx, "Excessive sleep interval");
-            return JS_FALSE;
+            return false;
         }
         t_ticks = (t_secs <= 0.0)
                   ? 0
@@ -3109,14 +3105,14 @@ SetTimeoutValue(JSContext *cx, double t)
     /* NB: The next condition also filter out NaNs. */
     if (!(t <= MAX_TIMEOUT_INTERVAL)) {
         JS_ReportError(cx, "Excessive timeout value");
-        return JS_FALSE;
+        return false;
     }
     gTimeoutInterval = t;
     if (!ScheduleWatchdog(cx->runtime, t)) {
         JS_ReportError(cx, "Failed to create the watchdog");
-        return JS_FALSE;
+        return false;
     }
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -3127,12 +3123,12 @@ Timeout(JSContext *cx, unsigned argc, jsval *vp)
 
     if (argc > 1) {
         JS_ReportError(cx, "Wrong number of arguments");
-        return JS_FALSE;
+        return false;
     }
 
     double t;
     if (!JS_ValueToNumber(cx, JS_ARGV(cx, vp)[0], &t))
-        return JS_FALSE;
+        return false;
 
     *vp = JSVAL_VOID;
     return SetTimeoutValue(cx, t);
@@ -3149,7 +3145,7 @@ Elapsed(JSContext *cx, unsigned argc, jsval *vp)
         return JS_NewNumberValue(cx, d, vp);
     }
     JS_ReportError(cx, "Wrong number of arguments");
-    return JS_FALSE;
+    return false;
 }
 
 static JSBool
@@ -3157,13 +3153,13 @@ Parent(JSContext *cx, unsigned argc, jsval *vp)
 {
     if (argc != 1) {
         JS_ReportError(cx, "Wrong number of arguments");
-        return JS_FALSE;
+        return false;
     }
 
     jsval v = JS_ARGV(cx, vp)[0];
     if (JSVAL_IS_PRIMITIVE(v)) {
         JS_ReportError(cx, "Only objects have parents!");
-        return JS_FALSE;
+        return false;
     }
 
     JSObject *parent = JS_GetParent(JSVAL_TO_OBJECT(v));
@@ -3175,7 +3171,7 @@ Parent(JSContext *cx, unsigned argc, jsval *vp)
             *vp = OBJECT_TO_JSVAL(op(cx, RootedObject(cx, parent)));
     }
 
-    return JS_TRUE;
+    return true;
 }
 
 #ifdef XP_UNIX
@@ -3235,13 +3231,13 @@ Compile(JSContext *cx, unsigned argc, jsval *vp)
     if (argc < 1) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
                              "compile", "0", "s");
-        return JS_FALSE;
+        return false;
     }
     jsval arg0 = JS_ARGV(cx, vp)[0];
     if (!JSVAL_IS_STRING(arg0)) {
         const char *typeName = JS_GetTypeName(cx, JS_TypeOfValue(cx, arg0));
         JS_ReportError(cx, "expected string to compile, got %s", typeName);
-        return JS_FALSE;
+        return false;
     }
 
     static JSClass dummy_class = {
@@ -3255,7 +3251,7 @@ Compile(JSContext *cx, unsigned argc, jsval *vp)
 
     JSObject *fakeGlobal = JS_NewGlobalObject(cx, &dummy_class);
     if (!fakeGlobal)
-        return JS_FALSE;
+        return false;
 
     JSString *scriptContents = JSVAL_TO_STRING(arg0);
 
@@ -3275,13 +3271,13 @@ Parse(JSContext *cx, unsigned argc, jsval *vp)
     if (argc < 1) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_MORE_ARGS_NEEDED,
                              "compile", "0", "s");
-        return JS_FALSE;
+        return false;
     }
     jsval arg0 = JS_ARGV(cx, vp)[0];
     if (!JSVAL_IS_STRING(arg0)) {
         const char *typeName = JS_GetTypeName(cx, JS_TypeOfValue(cx, arg0));
         JS_ReportError(cx, "expected string to parse, got %s", typeName);
-        return JS_FALSE;
+        return false;
     }
 
     JSString *scriptContents = JSVAL_TO_STRING(arg0);
@@ -3290,16 +3286,16 @@ Parse(JSContext *cx, unsigned argc, jsval *vp)
                       "<string>", /* lineno = */ 1, cx->findVersion(),
                       /* cfp = */ NULL, /* foldConstants = */ true, /* compileAndGo = */ false);
     if (!parser.init())
-        return JS_FALSE;
+        return false;
 
     ParseNode *pn = parser.parse(NULL);
     if (!pn)
-        return JS_FALSE;
+        return false;
 #ifdef DEBUG
     DumpParseTree(pn);
 #endif
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 struct FreeOnReturn {
@@ -3328,14 +3324,14 @@ Snarf(JSContext *cx, unsigned argc, jsval *vp)
     JSString *str;
 
     if (!argc)
-        return JS_FALSE;
+        return false;
 
     str = JS_ValueToString(cx, JS_ARGV(cx, vp)[0]);
     if (!str)
-        return JS_FALSE;
+        return false;
     JSAutoByteString filename(cx, str);
     if (!filename)
-        return JS_FALSE;
+        return false;
 
     /* Get the currently executing script's name. */
     JSScript *script = GetTopScript(cx);
@@ -3346,7 +3342,7 @@ Snarf(JSContext *cx, unsigned argc, jsval *vp)
     if (pathname[0] != '/') {
         pathname = MakeAbsolutePathname(cx, script->filename, pathname);
         if (!pathname)
-            return JS_FALSE;
+            return false;
         pnGuard.init(pathname);
     }
 #endif
@@ -3354,26 +3350,26 @@ Snarf(JSContext *cx, unsigned argc, jsval *vp)
     if (argc > 1) {
         JSString *opt = JS_ValueToString(cx, JS_ARGV(cx, vp)[1]);
         if (!opt)
-            return JS_FALSE;
+            return false;
         JSBool match;
         if (!JS_StringEqualsAscii(cx, opt, "binary", &match))
-            return JS_FALSE;
+            return false;
         if (match) {
             JSObject *obj;
             if (!(obj = FileAsTypedArray(cx, pathname)))
-                return JS_FALSE;
+                return false;
             *vp = OBJECT_TO_JSVAL(obj);
-            return JS_TRUE;
+            return true;
         }
     }
 
     if (!(str = FileAsString(cx, pathname)))
-        return JS_FALSE;
+        return false;
     *vp = STRING_TO_JSVAL(str);
-    return JS_TRUE;
+    return true;
 }
 
-JSBool
+static JSBool
 Wrap(JSContext *cx, unsigned argc, jsval *vp)
 {
     jsval v = argc > 0 ? JS_ARGV(cx, vp)[0] : JSVAL_VOID;
@@ -3392,7 +3388,7 @@ Wrap(JSContext *cx, unsigned argc, jsval *vp)
     return true;
 }
 
-JSBool
+static JSBool
 Serialize(JSContext *cx, unsigned argc, jsval *vp)
 {
     jsval v = argc > 0 ? JS_ARGV(cx, vp)[0] : JSVAL_VOID;
@@ -3413,7 +3409,7 @@ Serialize(JSContext *cx, unsigned argc, jsval *vp)
     return true;
 }
 
-JSBool
+static JSBool
 Deserialize(JSContext *cx, unsigned argc, jsval *vp)
 {
     Rooted<jsval> v(cx, argc > 0 ? JS_ARGV(cx, vp)[0] : JSVAL_VOID);
@@ -3444,7 +3440,7 @@ enum CompartmentKind { SAME_COMPARTMENT, NEW_COMPARTMENT };
 static JSObject *
 NewGlobalObject(JSContext *cx, CompartmentKind compartment);
 
-JSBool
+static JSBool
 NewGlobal(JSContext *cx, unsigned argc, jsval *vp)
 {
     if (argc != 1 || !JSVAL_IS_STRING(JS_ARGV(cx, vp)[0])) {
@@ -3454,7 +3450,7 @@ NewGlobal(JSContext *cx, unsigned argc, jsval *vp)
 
     JSString *str = JSVAL_TO_STRING(JS_ARGV(cx, vp)[0]);
 
-    JSBool equalSame = JS_FALSE, equalNew = JS_FALSE;
+    JSBool equalSame = false, equalNew = false;
     if (!JS_StringEqualsAscii(cx, str, "same-compartment", &equalSame) ||
         !JS_StringEqualsAscii(cx, str, "new-compartment", &equalNew)) {
         return false;
@@ -3511,7 +3507,7 @@ static JSBool
 GetMaxArgs(JSContext *cx, unsigned arg, jsval *vp)
 {
     JS_SET_RVAL(cx, vp, INT_TO_JSVAL(StackSpace::ARGS_LENGTH_MAX));
-    return JS_TRUE;
+    return true;
 }
 
 static JSFunctionSpecWithHelp shell_functions[] = {
@@ -3942,39 +3938,39 @@ static JSBool
 its_addProperty(JSContext *cx, HandleObject obj, HandleId id, jsval *vp)
 {
     if (!its_noisy)
-        return JS_TRUE;
+        return true;
 
     IdStringifier idString(cx, id);
     fprintf(gOutFile, "adding its property %s,", idString.getBytes());
     ToStringHelper valueString(cx, *vp);
     fprintf(gOutFile, " initial value %s\n", valueString.getBytes());
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
 its_delProperty(JSContext *cx, HandleObject obj, HandleId id, jsval *vp)
 {
     if (!its_noisy)
-        return JS_TRUE;
+        return true;
 
     IdStringifier idString(cx, id);
     fprintf(gOutFile, "deleting its property %s,", idString.getBytes());
     ToStringHelper valueString(cx, *vp);
     fprintf(gOutFile, " initial value %s\n", valueString.getBytes());
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
 its_getProperty(JSContext *cx, HandleObject obj, HandleId id, jsval *vp)
 {
     if (!its_noisy)
-        return JS_TRUE;
+        return true;
 
     IdStringifier idString(cx, id);
     fprintf(gOutFile, "getting its property %s,", idString.getBytes());
     ToStringHelper valueString(cx, *vp);
     fprintf(gOutFile, " initial value %s\n", valueString.getBytes());
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -3988,14 +3984,14 @@ its_setProperty(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, jsv
     }
 
     if (!JSID_IS_ATOM(id))
-        return JS_TRUE;
+        return true;
 
     if (!strcmp(idString.getBytes(), "noisy"))
         JS_ValueToBoolean(cx, *vp, &its_noisy);
     else if (!strcmp(idString.getBytes(), "enum_fail"))
         JS_ValueToBoolean(cx, *vp, &its_enum_fail);
 
-    return JS_TRUE;
+    return true;
 }
 
 /*
@@ -4016,7 +4012,7 @@ its_enumerate(JSContext *cx, HandleObject obj, JSIterateOp enum_op,
 
         iterator = JS_NewPropertyIterator(cx, obj);
         if (!iterator)
-            return JS_FALSE;
+            return false;
 
         *statep = OBJECT_TO_JSVAL(iterator);
         if (idp)
@@ -4026,12 +4022,12 @@ its_enumerate(JSContext *cx, HandleObject obj, JSIterateOp enum_op,
       case JSENUMERATE_NEXT:
         if (its_enum_fail) {
             JS_ReportError(cx, "its enumeration failed");
-            return JS_FALSE;
+            return false;
         }
 
         iterator = (JSObject *) JSVAL_TO_OBJECT(*statep);
         if (!JS_NextProperty(cx, iterator, idp))
-            return JS_FALSE;
+            return false;
 
         if (!JSID_IS_VOID(*idp))
             break;
@@ -4043,7 +4039,7 @@ its_enumerate(JSContext *cx, HandleObject obj, JSIterateOp enum_op,
         break;
     }
 
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -4058,7 +4054,7 @@ its_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
                (flags & JSRESOLVE_ASSIGNING) ? "assigning" : "",
                (flags & JSRESOLVE_DETECTING) ? "detecting" : "");
     }
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -4100,36 +4096,36 @@ its_getter(JSContext *cx, HandleObject obj, HandleId id, jsval *vp)
         *vp = JSVAL_VOID;
     }
 
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
 its_setter(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, jsval *vp)
 {
     if (JS_GetClass(obj) != &its_class)
-        return JS_TRUE;
+        return true;
 
     jsval *val = (jsval *) JS_GetPrivate(obj);
     if (val) {
         *val = *vp;
-        return JS_TRUE;
+        return true;
     }
 
     val = new jsval;
     if (!val) {
         JS_ReportOutOfMemory(cx);
-        return JS_FALSE;
+        return false;
     }
 
     if (!JS_AddValueRoot(cx, val)) {
         delete val;
-        return JS_FALSE;
+        return false;
     }
 
     JS_SetPrivate(obj, (void*)val);
 
     *val = *vp;
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
@@ -4217,6 +4213,8 @@ my_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
     if (JSREPORT_IS_WARNING(report->flags) && !reportWarnings)
         return;
 
+    gGotError = true;
+
     prefix = NULL;
     if (report->filename)
         prefix = JS_smprintf("%s:", report->filename);
@@ -4299,16 +4297,16 @@ Exec(JSContext *cx, unsigned argc, jsval *vp)
 
     fun = JS_ValueToFunction(cx, vp[0]);
     if (!fun)
-        return JS_FALSE;
+        return false;
     if (!fun->atom)
-        return JS_TRUE;
+        return true;
 
     nargc = 1 + argc;
 
     /* nargc + 1 accounts for the terminating NULL. */
     nargv = new (char *)[nargc + 1];
     if (!nargv)
-        return JS_FALSE;
+        return false;
     memset(nargv, 0, sizeof(nargv[0]) * (nargc + 1));
     nargv[0] = name;
     jsval *argv = JS_ARGV(cx, vp);
@@ -4354,7 +4352,7 @@ global_enumerate(JSContext *cx, HandleObject obj)
 #ifdef LAZY_STANDARD_CLASSES
     return JS_EnumerateStandardClasses(cx, obj);
 #else
-    return JS_TRUE;
+    return true;
 #endif
 }
 
@@ -4366,10 +4364,10 @@ global_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
     JSBool resolved;
 
     if (!JS_ResolveStandardClass(cx, obj, id, &resolved))
-        return JS_FALSE;
+        return false;
     if (resolved) {
         *objp = obj;
-        return JS_TRUE;
+        return true;
     }
 #endif
 
@@ -4381,27 +4379,27 @@ global_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
          */
         char *path, *comp, *full;
         const char *name;
-        JSBool ok, found;
+        bool ok, found;
         JSFunction *fun;
 
         if (!JSVAL_IS_STRING(id))
-            return JS_TRUE;
+            return true;
         path = getenv("PATH");
         if (!path)
-            return JS_TRUE;
+            return true;
         path = JS_strdup(cx, path);
         if (!path)
-            return JS_FALSE;
+            return false;
         JSAutoByteString name(cx, JSVAL_TO_STRING(id));
         if (!name)
-            return JS_FALSE;
-        ok = JS_TRUE;
+            return false;
+        ok = true;
         for (comp = strtok(path, ":"); comp; comp = strtok(NULL, ":")) {
             if (*comp != '\0') {
                 full = JS_smprintf("%s/%s", comp, name.ptr());
                 if (!full) {
                     JS_ReportOutOfMemory(cx);
-                    ok = JS_FALSE;
+                    ok = false;
                     break;
                 }
             } else {
@@ -4423,7 +4421,7 @@ global_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
         return ok;
     }
 #else
-    return JS_TRUE;
+    return true;
 #endif
 }
 
@@ -4442,18 +4440,18 @@ env_setProperty(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, jsv
 #if !defined XP_OS2 && !defined SOLARIS
     int rv;
 
-    IdStringifier idstr(cx, id, JS_TRUE);
+    IdStringifier idstr(cx, id, true);
     if (idstr.threw())
-        return JS_FALSE;
-    ToStringHelper valstr(cx, *vp, JS_TRUE);
+        return false;
+    ToStringHelper valstr(cx, *vp, true);
     if (valstr.threw())
-        return JS_FALSE;
+        return false;
 #if defined XP_WIN || defined HPUX || defined OSF1
     {
         char *waste = JS_smprintf("%s=%s", idstr.getBytes(), valstr.getBytes());
         if (!waste) {
             JS_ReportOutOfMemory(cx);
-            return JS_FALSE;
+            return false;
         }
         rv = putenv(waste);
 #ifdef XP_WIN
@@ -4472,23 +4470,23 @@ env_setProperty(JSContext *cx, HandleObject obj, HandleId id, JSBool strict, jsv
 #endif
     if (rv < 0) {
         JS_ReportError(cx, "can't set env variable %s to %s", idstr.getBytes(), valstr.getBytes());
-        return JS_FALSE;
+        return false;
     }
     *vp = valstr.getJSVal();
 #endif /* !defined XP_OS2 && !defined SOLARIS */
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool
 env_enumerate(JSContext *cx, HandleObject obj)
 {
-    static JSBool reflected;
+    static bool reflected;
     char **evp, *name, *value;
     JSString *valstr;
-    JSBool ok;
+    bool ok;
 
     if (reflected)
-        return JS_TRUE;
+        return true;
 
     for (evp = (char **)JS_GetPrivate(obj); (name = *evp) != NULL; evp++) {
         value = strchr(name, '=');
@@ -4496,19 +4494,15 @@ env_enumerate(JSContext *cx, HandleObject obj)
             continue;
         *value++ = '\0';
         valstr = JS_NewStringCopyZ(cx, value);
-        if (!valstr) {
-            ok = JS_FALSE;
-        } else {
-            ok = JS_DefineProperty(cx, obj, name, STRING_TO_JSVAL(valstr),
-                                   NULL, NULL, JSPROP_ENUMERATE);
-        }
+        ok = valstr && JS_DefineProperty(cx, obj, name, STRING_TO_JSVAL(valstr),
+                                         NULL, NULL, JSPROP_ENUMERATE);
         value[-1] = '=';
         if (!ok)
-            return JS_FALSE;
+            return false;
     }
 
-    reflected = JS_TRUE;
-    return JS_TRUE;
+    reflected = true;
+    return true;
 }
 
 static JSBool
@@ -4519,25 +4513,25 @@ env_resolve(JSContext *cx, HandleObject obj, HandleId id, unsigned flags,
     const char *name, *value;
 
     if (flags & JSRESOLVE_ASSIGNING)
-        return JS_TRUE;
+        return true;
 
-    IdStringifier idstr(cx, id, JS_TRUE);
+    IdStringifier idstr(cx, id, true);
     if (idstr.threw())
-        return JS_FALSE;
+        return false;
 
     name = idstr.getBytes();
     value = getenv(name);
     if (value) {
         valstr = JS_NewStringCopyZ(cx, value);
         if (!valstr)
-            return JS_FALSE;
+            return false;
         if (!JS_DefineProperty(cx, obj, name, STRING_TO_JSVAL(valstr),
                                NULL, NULL, JSPROP_ENUMERATE)) {
-            return JS_FALSE;
+            return false;
         }
         *objp = obj;
     }
-    return JS_TRUE;
+    return true;
 }
 
 static JSClass env_class = {
@@ -4793,34 +4787,6 @@ Shell(JSContext *cx, OptionParser *op, char **envp)
         return 1;
     JS_SetPrivate(envobj, envp);
 
-#ifdef JSDEBUGGER
-    /*
-    * XXX A command line option to enable debugging (or not) would be good
-    */
-    jsdc = JSD_DebuggerOnForUser(rt, NULL, NULL);
-    if (!jsdc)
-        return 1;
-    JSD_JSContextInUse(jsdc, cx);
-#ifdef JSD_LOWLEVEL_SOURCE
-    JS_SetSourceHandler(rt, SendSourceToJSDebugger, jsdc);
-#endif /* JSD_LOWLEVEL_SOURCE */
-#ifdef JSDEBUGGER_JAVA_UI
-    jsdjc = JSDJ_CreateContext();
-    if (! jsdjc)
-        return 1;
-    JSDJ_SetJSDContext(jsdjc, jsdc);
-    java_env = JSDJ_CreateJavaVMAndStartDebugger(jsdjc);
-    /*
-    * XXX This would be the place to wait for the debugger to start.
-    * Waiting would be nice in general, but especially when a js file
-    * is passed on the cmd line.
-    */
-#endif /* JSDEBUGGER_JAVA_UI */
-#ifdef JSDEBUGGER_C_UI
-    jsdbc = JSDB_InitDebugger(rt, jsdc, 0);
-#endif /* JSDEBUGGER_C_UI */
-#endif /* JSDEBUGGER */
-
 #ifdef JS_THREADSAFE
     class ShellWorkerHooks : public js::workers::WorkerHooks {
     public:
@@ -4844,16 +4810,6 @@ Shell(JSContext *cx, OptionParser *op, char **envp)
         result = gExitCode;
 #endif
 
-#ifdef JSDEBUGGER
-    if (jsdc) {
-#ifdef JSDEBUGGER_C_UI
-        if (jsdbc)
-            JSDB_TermDebugger(jsdc);
-#endif /* JSDEBUGGER_C_UI */
-        JSD_DebuggerOff(jsdc);
-    }
-#endif  /* JSDEBUGGER */
-
     if (enableDisassemblyDumps)
         JS_DumpCompartmentPCCounts(cx);
 
@@ -4894,16 +4850,6 @@ main(int argc, char **argv, char **envp)
     JSRuntime *rt;
     JSContext *cx;
     int result;
-#ifdef JSDEBUGGER
-    JSDContext *jsdc;
-#ifdef JSDEBUGGER_JAVA_UI
-    JNIEnv *java_env;
-    JSDJContext *jsdjc;
-#endif
-#ifdef JSDEBUGGER_C_UI
-    JSBool jsdbc;
-#endif /* JSDEBUGGER_C_UI */
-#endif /* JSDEBUGGER */
 #ifdef XP_WIN
     {
         const char *crash_option = getenv("XRE_NO_WINDOWS_CRASH_DIALOG");
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index b4cdab1bc112..96b8d8ba6595 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -4278,9 +4278,13 @@ DebuggerEnv_getObject(JSContext *cx, unsigned argc, Value *vp)
         return false;
     }
 
-    JSObject *obj = IsWith(env)
-                    ? &env->asDebugScope().scope().asWith().object()
-                    : env;
+    JSObject *obj;
+    if (IsWith(env)) {
+        obj = &env->asDebugScope().scope().asWith().object();
+    } else {
+        obj = env;
+        JS_ASSERT(!obj->isDebugScope());
+    }
 
     Value rval = ObjectValue(*obj);
     if (!dbg->wrapDebuggeeValue(cx, &rval))
@@ -4289,6 +4293,30 @@ DebuggerEnv_getObject(JSContext *cx, unsigned argc, Value *vp)
     return true;
 }
 
+static JSBool
+DebuggerEnv_getCallee(JSContext *cx, unsigned argc, Value *vp)
+{
+    THIS_DEBUGENV_OWNER(cx, argc, vp, "get callee", args, envobj, env, dbg);
+
+    args.rval().setNull();
+
+    if (!env->isDebugScope())
+        return true;
+
+    JSObject &scope = env->asDebugScope().scope();
+    if (!scope.isCall())
+        return true;
+
+    JSObject *callee = scope.asCall().getCallee();
+    if (!callee)
+        return true;
+
+    args.rval() = ObjectValue(*callee);
+    if (!dbg->wrapDebuggeeValue(cx, &args.rval()))
+        return false;
+    return true;
+}
+
 static JSBool
 DebuggerEnv_names(JSContext *cx, unsigned argc, Value *vp)
 {
@@ -4427,6 +4455,7 @@ static JSPropertySpec DebuggerEnv_properties[] = {
     JS_PSG("type", DebuggerEnv_getType, 0),
     JS_PSG("object", DebuggerEnv_getObject, 0),
     JS_PSG("parent", DebuggerEnv_getParent, 0),
+    JS_PSG("callee", DebuggerEnv_getCallee, 0),
     JS_PS_END
 };
 
diff --git a/js/src/vm/ScopeObject.cpp b/js/src/vm/ScopeObject.cpp
index ddf350e9d155..83bb102f3a6a 100644
--- a/js/src/vm/ScopeObject.cpp
+++ b/js/src/vm/ScopeObject.cpp
@@ -1356,7 +1356,15 @@ class DebugScopeProxy : public BaseProxyHandler
 
     bool defineProperty(JSContext *cx, JSObject *proxy, jsid id, PropertyDescriptor *desc) MOZ_OVERRIDE
     {
-        return Throw(cx, id, JSMSG_CANT_REDEFINE_PROP);
+        bool found;
+        if (!has(cx, proxy, id, &found))
+            return false;
+        if (found)
+            return Throw(cx, id, JSMSG_CANT_REDEFINE_PROP);
+
+        ScopeObject &scope = proxy->asDebugScope().scope();
+        return JS_DefinePropertyById(cx, &scope, id, desc->value, desc->getter, desc->setter,
+                                     desc->attrs);
     }
 
     bool getOwnPropertyNames(JSContext *cx, JSObject *proxy, AutoIdVector &props) MOZ_OVERRIDE
diff --git a/js/xpconnect/src/dombindings.cpp b/js/xpconnect/src/dombindings.cpp
index 0c5c755903a6..f3c6189b4e15 100644
--- a/js/xpconnect/src/dombindings.cpp
+++ b/js/xpconnect/src/dombindings.cpp
@@ -389,7 +389,7 @@ ListBase<LC>::getPrototype(JSContext *cx, JSObject *receiver, bool *enabled)
     XPCWrappedNativeScope *scope =
         XPCWrappedNativeScope::FindInJSObjectScope(cx, receiver);
     if (!scope)
-        return false;
+        return NULL;
 
     return getPrototype(cx, scope, receiver);
 }
diff --git a/js/xpconnect/src/dombindingsgen.py b/js/xpconnect/src/dombindingsgen.py
index 76d1f2b85f39..ca8658fcd4e1 100644
--- a/js/xpconnect/src/dombindingsgen.py
+++ b/js/xpconnect/src/dombindingsgen.py
@@ -470,7 +470,7 @@ prefableClassTemplate = (
 "    XPCWrappedNativeScope *scope =\n"
 "        XPCWrappedNativeScope::FindInJSObjectScope(cx, receiver);\n"
 "    if (!scope)\n"
-"        return false;\n"
+"        return NULL;\n"
 "\n"
 "    if (!scope->NewDOMBindingsEnabled()) {\n"
 "        *enabled = false;\n"
diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in
index 227c95938206..3f2c1405e99b 100644
--- a/js/xpconnect/tests/chrome/Makefile.in
+++ b/js/xpconnect/tests/chrome/Makefile.in
@@ -48,6 +48,7 @@ _CHROME_FILES = \
 		test_weakref.xul \
 		test_bug726949.xul \
 		test_bug758563.xul \
+		test_bug760076.xul \
 		$(NULL)
 
 # Disabled until this test gets updated to test the new proxy based
diff --git a/js/xpconnect/tests/chrome/test_bug760076.xul b/js/xpconnect/tests/chrome/test_bug760076.xul
new file mode 100644
index 000000000000..a0eb4904c9b1
--- /dev/null
+++ b/js/xpconnect/tests/chrome/test_bug760076.xul
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=760076
+-->
+<window title="Mozilla Bug 760076"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <!-- test results are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=760076"
+     target="_blank">Mozilla Bug 760076</a>
+  </body>
+
+  <!-- test code goes here -->
+  <script type="application/javascript">
+  <![CDATA[
+  /** Test for constructing COW-ed functions in content. **/
+
+  // This gets decompiled and run in the sandbox.
+  function sandboxCode() {
+    try {
+      is(chromeFunction(), 42, "Should call successfully");
+    } catch(e) { ok(false, "Shouldn't throw when calling"); }
+
+    try {
+      ok(typeof (new chromeFunction()) !== 'undefined',
+         "Should construct successfully");
+    } catch(e) { ok(false, "Shouldn't throw when constructing"); }
+  }
+
+  // Set up the sandbox.
+  const Cu = Components.utils;
+  var sb = new Cu.Sandbox('http://www.example.com');
+
+  // Import the functions it needs.
+  sb.ok = ok;
+  sb.is = is;
+  sb.chromeFunction = function() { ok(true, "Called chrome function"); return 42; }
+  Cu.evalInSandbox(sandboxCode.toSource(), sb);
+
+  // Do the test.
+  Cu.evalInSandbox("sandboxCode();", sb);
+
+  ]]>
+  </script>
+</window>
diff --git a/js/xpconnect/wrappers/AccessCheck.cpp b/js/xpconnect/wrappers/AccessCheck.cpp
index 7984b387f53d..ce93bdf1ef63 100644
--- a/js/xpconnect/wrappers/AccessCheck.cpp
+++ b/js/xpconnect/wrappers/AccessCheck.cpp
@@ -493,7 +493,8 @@ ExposedPropertiesOnly::check(JSContext *cx, JSObject *wrapper, jsid id, Wrapper:
                 nsCOMPtr<nsIDocument> doc =
                     do_QueryInterface(win->GetExtantDocument());
                 if (doc) {
-                    doc->WarnOnceAbout(nsIDocument::eNoExposedProps);
+                    doc->WarnOnceAbout(nsIDocument::eNoExposedProps,
+                                       /* asError = */ true);
                 }
             }
 
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 9c7724866d00..325b42f738c4 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -4141,12 +4141,12 @@ nsContextBoxBlur::Init(const nsRect& aRect, nscoord aSpreadRadius,
   gfxFloat scaleX = 1;
   gfxFloat scaleY = 1;
 
-  // Do blurs in device space when possible
-  // If the scale is not uniform we fall back to transforming on paint.
+  // Do blurs in device space when possible.
   // Chrome/Skia always does the blurs in device space
   // and will sometimes get incorrect results (e.g. rotated blurs)
   gfxMatrix transform = aDestinationCtx->CurrentMatrix();
-  if (transform.HasNonAxisAlignedTransform()) {
+  // XXX: we could probably handle negative scales but for now it's easier just to fallback
+  if (transform.HasNonAxisAlignedTransform() || transform.xx <= 0.0 || transform.yy <= 0.0) {
     transform = gfxMatrix();
   } else {
     scaleX = transform.xx;
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 78fa9aa263a5..cb3b6ce00beb 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -158,6 +158,12 @@ SHARED_LIBRARY_LIBS 	+= \
 	$(NULL)
 endif
 
+ifdef MOZ_MEDIA_PLUGINS
+SHARED_LIBRARY_LIBS 	+= \
+	$(DEPTH)/content/media/plugins/$(LIB_PREFIX)gkconmediaplugins_s.$(LIB_SUFFIX) \
+	$(NULL)
+endif
+
 ifdef NS_PRINTING
 SHARED_LIBRARY_LIBS += \
 		../printing/$(LIB_PREFIX)gkprinting_s.$(LIB_SUFFIX) \
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index 3ca8d46aaafa..c7b89dbd7b35 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -75,6 +75,10 @@
 #include "nsHTMLMediaElement.h"
 #endif
 
+#ifdef MOZ_MEDIA_PLUGINS
+#include "nsMediaPluginHost.h"
+#endif
+
 #ifdef MOZ_SYDNEYAUDIO
 #include "nsAudioStream.h"
 #endif
@@ -306,6 +310,10 @@ nsLayoutStatics::Shutdown()
   nsXBLService::Shutdown();
   nsAutoCopyListener::Shutdown();
 
+#ifdef MOZ_MEDIA_PLUGINS
+  nsMediaPluginHost::Shutdown();  
+#endif
+
 #ifdef MOZ_SYDNEYAUDIO
   nsAudioStream::ShutdownLibrary();
 #endif
diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in
new file mode 100644
index 000000000000..b690555c0913
--- /dev/null
+++ b/media/omx-plugin/Makefile.in
@@ -0,0 +1,53 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this file,
+# You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DEPTH   = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = omxplugin
+MODULE_NAME = omxplugin
+LIBRARY_NAME = omxplugin
+FORCE_SHARED_LIB = 1
+
+# Don't use STL wrappers; this isn't Gecko code
+STL_FLAGS =
+
+# must link statically with the CRT; this isn't Gecko code
+USE_STATIC_LIBS = 1
+
+# Need to custom install OMX media plugin
+NO_DIST_INSTALL = 1
+NO_INSTALL = 1
+
+CPPSRCS = \
+    OmxPlugin.cpp \
+    $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES        += \
+                -I$(srcdir)/../../content/media/plugins \
+                -I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
+                -I$(ANDROID_SOURCE)/frameworks/base/include/ \
+                -I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
+                -I$(ANDROID_SOURCE)/frameworks/base/include/utils/ \
+                -I$(ANDROID_SOURCE)/frameworks/base/include/media/ \
+                -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright \
+                -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
+                -I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/include \
+                $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+		-lutils -lstagefright -lmedia -lstagefright_omx -lbinder -lui \
+		-lsurfaceflinger_client -lhardware -lcutils \
+		$(NULL)
+
+libs::	$(DLL_PREFIX)$(LIBRARY_NAME)$(DLL_SUFFIX)
+	$(INSTALL) $< $(DEPTH)/dist/bin
+
+libs:: $(PROGRAMS)
diff --git a/media/omx-plugin/OmxPlugin.cpp b/media/omx-plugin/OmxPlugin.cpp
new file mode 100644
index 000000000000..7c9104a9b60d
--- /dev/null
+++ b/media/omx-plugin/OmxPlugin.cpp
@@ -0,0 +1,663 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et cindent: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include <unistd.h>
+#include <fcntl.h>
+
+#include <DataSource.h>
+#include <MediaErrors.h>
+#include <MediaExtractor.h>
+#include <MediaSource.h>
+#include <MetaData.h>
+#include <OMXCodec.h>
+#include <OMX.h>
+#include <HardwareAPI.h>
+#include <ui/GraphicBuffer.h>
+#include <ui/Rect.h>
+#include <ui/Region.h>
+#include <binder/IMemory.h>
+
+#include <OMX_Types.h>
+#include <OMX_Core.h>
+#include <OMX_Index.h>
+#include <OMX_IVCommon.h>
+#include <OMX_Component.h>
+
+#include "mozilla/Types.h"
+#include "MPAPI.h"
+
+#include "android/log.h"
+
+#define LOG(args...)  __android_log_print(ANDROID_LOG_INFO, "OmxPlugin" , ## args)
+
+using namespace MPAPI;
+
+namespace android {
+
+// MediaStreamSource is a DataSource that reads from a MPAPI media stream.
+
+class MediaStreamSource : public DataSource {
+  PluginHost *mPluginHost;
+public:
+  MediaStreamSource(PluginHost *aPluginHost, Decoder *aDecoder);
+
+  virtual status_t initCheck() const;
+  virtual ssize_t readAt(off64_t offset, void *data, size_t size);
+  virtual ssize_t readAt(off_t offset, void *data, size_t size) {
+    return readAt(static_cast<off64_t>(offset), data, size);
+  }
+  virtual status_t getSize(off_t *size) {
+    off64_t size64;
+    status_t status = getSize(&size64);
+    *size = size64;
+    return status;
+  }
+  virtual status_t getSize(off64_t *size);
+  virtual uint32_t flags() {
+    return kWantsPrefetching;
+  }
+
+  virtual ~MediaStreamSource();
+
+private:
+  Decoder *mDecoder;
+
+  MediaStreamSource(const MediaStreamSource &);
+  MediaStreamSource &operator=(const MediaStreamSource &);
+};
+
+MediaStreamSource::MediaStreamSource(PluginHost *aPluginHost, Decoder *aDecoder) :
+  mPluginHost(aPluginHost)
+{
+  mDecoder = aDecoder;
+}
+
+MediaStreamSource::~MediaStreamSource()
+{
+}
+
+status_t MediaStreamSource::initCheck() const
+{
+  return OK;
+}
+
+ssize_t MediaStreamSource::readAt(off64_t offset, void *data, size_t size)
+{
+  char *ptr = reinterpret_cast<char *>(data);
+  size_t todo = size;
+  while (todo > 0) {
+    uint32_t bytesRead;
+    if (!mPluginHost->Read(mDecoder, ptr, offset, todo, &bytesRead)) {
+      return ERROR_IO;
+    }
+    offset += bytesRead;
+    todo -= bytesRead;
+    ptr += bytesRead;
+  }
+  return size;
+}
+
+status_t MediaStreamSource::getSize(off64_t *size)
+{
+  uint64_t length = mPluginHost->GetLength(mDecoder);
+  if (length == static_cast<uint64_t>(-1))
+    return ERROR_UNSUPPORTED;
+
+  *size = length;
+
+  return OK;
+}
+
+}  // namespace android
+
+using namespace android;
+
+class OmxDecoder {
+  PluginHost *mPluginHost;
+  Decoder *mDecoder;
+  sp<MediaSource> mVideoTrack;
+  sp<MediaSource> mVideoSource;
+  sp<MediaSource> mAudioTrack;
+  sp<MediaSource> mAudioSource;
+  int32_t mVideoWidth;
+  int32_t mVideoHeight;
+  int32_t mVideoColorFormat;
+  int32_t mVideoStride;
+  int32_t mVideoSliceHeight;
+  int32_t mVideoRotation;
+  int32_t mAudioChannels;
+  int32_t mAudioSampleRate;
+  int64_t mDurationUs;
+  MediaBuffer *mVideoBuffer;
+  VideoFrame mVideoFrame;
+  MediaBuffer *mAudioBuffer;
+  AudioFrame mAudioFrame;
+
+  void ReleaseVideoBuffer();
+  void ReleaseAudioBuffer();
+
+  void PlanarYUV420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame);
+  void CbYCrYFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame);
+  void SemiPlanarYUV420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame);
+  void SemiPlanarYVU420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame);
+  bool ToVideoFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame);
+  bool ToAudioFrame(AudioFrame *aFrame, int64_t aTimeUs, void *aData, size_t aDataOffset, size_t aSize,
+                    int32_t aAudioChannels, int32_t aAudioSampleRate);
+public:
+  OmxDecoder(PluginHost *aPluginHost, Decoder *aDecoder);
+  ~OmxDecoder();
+
+  bool Init();
+  bool SetVideoFormat();
+  bool SetAudioFormat();
+
+  void GetDuration(int64_t *durationUs) {
+    *durationUs = mDurationUs;
+  }
+
+  void GetVideoParameters(int32_t *width, int32_t *height) {
+    *width = mVideoWidth;
+    *height = mVideoHeight;
+  }
+
+  void GetAudioParameters(int32_t *numChannels, int32_t *sampleRate) {
+    *numChannels = mAudioChannels;
+    *sampleRate = mAudioSampleRate;
+  }
+
+  bool HasVideo() {
+    return mVideoSource != NULL;
+  }
+
+  bool HasAudio() {
+    return mAudioSource != NULL;
+  }
+
+  bool ReadVideo(VideoFrame *aFrame, int64_t aSeekTimeUs);
+  bool ReadAudio(AudioFrame *aFrame, int64_t aSeekTimeUs);
+};
+
+OmxDecoder::OmxDecoder(PluginHost *aPluginHost, Decoder *aDecoder) :
+  mPluginHost(aPluginHost), mDecoder(aDecoder)
+{
+  mVideoWidth = mVideoHeight = mVideoColorFormat = mVideoStride = mVideoSliceHeight = mVideoRotation = 0;
+  mVideoBuffer = NULL;
+  mAudioBuffer = NULL;
+}
+
+OmxDecoder::~OmxDecoder()
+{
+  ReleaseVideoBuffer();
+  ReleaseAudioBuffer();
+}
+
+class AutoStopMediaSource {
+  sp<MediaSource> mMediaSource;
+public:
+  AutoStopMediaSource(sp<MediaSource> aMediaSource) : mMediaSource(aMediaSource) {
+  }
+
+  ~AutoStopMediaSource() {
+    mMediaSource->stop();
+  }
+};
+
+static sp<IOMX> sOMX = NULL;
+static sp<IOMX> GetOMX() {
+  if(sOMX.get() == NULL) {
+    sOMX = new OMX;
+    }
+  return sOMX;
+}
+
+bool OmxDecoder::Init() {
+  //register sniffers, if they are not registered in this process.
+  DataSource::RegisterDefaultSniffers();
+
+  sp<DataSource> dataSource = new MediaStreamSource(mPluginHost, mDecoder);
+  if (dataSource->initCheck()) {
+    return false;
+  }
+
+  mPluginHost->SetMetaDataReadMode(mDecoder);
+
+  sp<MediaExtractor> extractor = MediaExtractor::Create(dataSource);
+  if (extractor == NULL) {
+    return false;
+  }
+
+  sp<MediaSource> videoTrack;
+  sp<MediaSource> audioTrack;
+  const char *audioMime = NULL;
+  bool audioMetaFound = false;
+
+  for (size_t i = 0; i < extractor->countTracks(); ++i) {
+    sp<MetaData> meta = extractor->getTrackMetaData(i);
+
+    int32_t bitRate;
+    if (!meta->findInt32(kKeyBitRate, &bitRate))
+      bitRate = 0;
+
+    const char *mime;
+    if (!meta->findCString(kKeyMIMEType, &mime)) {
+      continue;
+    }
+
+    if (videoTrack == NULL && !strncasecmp(mime, "video/", 6)) {
+      videoTrack = extractor->getTrack(i);
+    } else if (audioTrack == NULL && !strncasecmp(mime, "audio/", 6)) {
+      audioTrack = extractor->getTrack(i);
+      audioMime = mime;
+      if (!meta->findInt32(kKeyChannelCount, &mAudioChannels) ||
+          !meta->findInt32(kKeySampleRate, &mAudioSampleRate)) {
+        return false;
+      }
+      audioMetaFound = true;
+      LOG("channelCount: %d sampleRate: %d",
+           mAudioChannels, mAudioSampleRate);
+    }
+  }
+
+  if (videoTrack == NULL && audioTrack == NULL) {
+    return false;
+  }
+
+  mPluginHost->SetPlaybackReadMode(mDecoder);
+
+  int64_t totalDurationUs = 0;
+
+  sp<MediaSource> videoSource;
+  if (videoTrack != NULL) {
+    videoSource = OMXCodec::Create(GetOMX(),
+                                   videoTrack->getFormat(),
+                                   false, // decoder
+                                   videoTrack,
+                                   NULL,
+                                   0); // flags (prefer hw codecs)
+    if (videoSource == NULL) {
+      return false;
+    }
+
+    if (videoSource->start() != OK) {
+      return false;
+    }
+
+    int64_t durationUs;
+    if (videoTrack->getFormat()->findInt64(kKeyDuration, &durationUs)) {
+      if (durationUs > totalDurationUs)
+        totalDurationUs = durationUs;
+    }
+  }
+
+  sp<MediaSource> audioSource;
+  if (audioTrack != NULL) {
+    if (!strcasecmp(audioMime, "audio/raw")) {
+      audioSource = audioTrack;
+    } else {
+      audioSource = OMXCodec::Create(GetOMX(),
+                                     audioTrack->getFormat(),
+                                     false, // decoder
+                                     audioTrack);
+    }
+    if (audioSource == NULL) {
+      return false;
+    }
+    if (audioSource->start() != OK) {
+      return false;
+    }
+
+    int64_t durationUs;
+    if (audioTrack->getFormat()->findInt64(kKeyDuration, &durationUs)) {
+      if (durationUs > totalDurationUs)
+        totalDurationUs = durationUs;
+    }
+  }
+
+  // set decoder state
+  mVideoTrack = videoTrack;
+  mVideoSource = videoSource;
+  mAudioTrack = audioTrack;
+  mAudioSource = audioSource;
+  mDurationUs = totalDurationUs;
+
+  if (mVideoSource.get() && !SetVideoFormat())
+    return false;
+
+  if (!audioMetaFound && mAudioSource.get() && !SetAudioFormat())
+    return false;
+
+  return true;
+}
+
+bool OmxDecoder::SetVideoFormat() {
+  const char *componentName;
+
+  if (!mVideoSource->getFormat()->findInt32(kKeyWidth, &mVideoWidth) ||
+      !mVideoSource->getFormat()->findInt32(kKeyHeight, &mVideoHeight) ||
+      !mVideoSource->getFormat()->findCString(kKeyDecoderComponent, &componentName) ||
+      !mVideoSource->getFormat()->findInt32(kKeyColorFormat, &mVideoColorFormat) ) {
+    return false;
+  }
+
+  if (!mVideoSource->getFormat()->findInt32(kKeyStride, &mVideoStride)) {
+    mVideoStride = mVideoWidth;
+    LOG("stride not available, assuming width");
+  }
+
+  if (!mVideoSource->getFormat()->findInt32(kKeySliceHeight, &mVideoSliceHeight)) {
+    mVideoSliceHeight = mVideoHeight;
+    LOG("slice height not available, assuming height");
+  }
+
+  if (!mVideoSource->getFormat()->findInt32(kKeyRotation, &mVideoRotation)) {
+    mVideoRotation = 0;
+    LOG("rotation not available, assuming 0");
+  }
+
+  LOG("width: %d height: %d component: %s format: %d stride: %d sliceHeight: %d rotation: %d",
+      mVideoWidth, mVideoHeight, componentName, mVideoColorFormat,
+      mVideoStride, mVideoSliceHeight, mVideoRotation);
+
+  return true;
+}
+
+bool OmxDecoder::SetAudioFormat() {
+  // If the format changed, update our cached info.
+  if (!mAudioSource->getFormat()->findInt32(kKeyChannelCount, &mAudioChannels) ||
+      !mAudioSource->getFormat()->findInt32(kKeySampleRate, &mAudioSampleRate)) {
+    return false;
+  }
+
+  LOG("channelCount: %d sampleRate: %d",
+      mAudioChannels, mAudioSampleRate);
+
+  return true;
+}
+
+void OmxDecoder::ReleaseVideoBuffer() {
+  if (mVideoBuffer) {
+    mVideoBuffer->release();
+    mVideoBuffer = NULL;
+  }
+}
+
+void OmxDecoder::ReleaseAudioBuffer() {
+  if (mAudioBuffer) {
+    mAudioBuffer->release();
+    mAudioBuffer = NULL;
+  }
+}
+
+void OmxDecoder::PlanarYUV420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
+  void *y = aData;
+  void *u = static_cast<uint8_t *>(y) + mVideoStride * mVideoSliceHeight;
+  void *v = static_cast<uint8_t *>(u) + mVideoStride/2 * mVideoSliceHeight/2;
+
+  aFrame->Set(aTimeUs, aKeyFrame,
+              aData, aSize, mVideoStride, mVideoSliceHeight, mVideoRotation,
+              y, mVideoStride, mVideoWidth, mVideoHeight, 0, 0,
+              u, mVideoStride/2, mVideoWidth/2, mVideoHeight/2, 0, 0,
+              v, mVideoStride/2, mVideoWidth/2, mVideoHeight/2, 0, 0);
+}
+
+void OmxDecoder::CbYCrYFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
+  aFrame->Set(aTimeUs, aKeyFrame,
+              aData, aSize, mVideoStride, mVideoSliceHeight, mVideoRotation,
+              aData, mVideoStride, mVideoWidth, mVideoHeight, 1, 1,
+              aData, mVideoStride, mVideoWidth/2, mVideoHeight/2, 0, 3,
+              aData, mVideoStride, mVideoWidth/2, mVideoHeight/2, 2, 3);
+}
+
+void OmxDecoder::SemiPlanarYUV420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
+  void *y = aData;
+  void *uv = static_cast<uint8_t *>(y) + (mVideoStride * mVideoSliceHeight);
+
+  aFrame->Set(aTimeUs, aKeyFrame,
+              aData, aSize, mVideoStride, mVideoSliceHeight, mVideoRotation,
+              y, mVideoStride, mVideoWidth, mVideoHeight, 0, 0,
+              uv, mVideoStride, mVideoWidth/2, mVideoHeight/2, 0, 1,
+              uv, mVideoStride, mVideoWidth/2, mVideoHeight/2, 1, 1);
+}
+
+void OmxDecoder::SemiPlanarYVU420Frame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
+  SemiPlanarYUV420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
+  aFrame->Cb.mOffset = 1;
+  aFrame->Cr.mOffset = 0;
+}
+
+bool OmxDecoder::ToVideoFrame(VideoFrame *aFrame, int64_t aTimeUs, void *aData, size_t aSize, bool aKeyFrame) {
+  const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00;
+
+  switch (mVideoColorFormat) {
+  case OMX_COLOR_FormatYUV420Planar:
+    PlanarYUV420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
+    break;
+  case OMX_COLOR_FormatCbYCrY:
+    CbYCrYFrame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
+    break;
+  case OMX_COLOR_FormatYUV420SemiPlanar:
+    SemiPlanarYUV420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
+    break;
+  case OMX_QCOM_COLOR_FormatYVU420SemiPlanar:
+    SemiPlanarYVU420Frame(aFrame, aTimeUs, aData, aSize, aKeyFrame);
+    break;
+  default:
+    return false;
+  }
+  return true;
+}
+
+bool OmxDecoder::ToAudioFrame(AudioFrame *aFrame, int64_t aTimeUs, void *aData, size_t aDataOffset, size_t aSize, int32_t aAudioChannels, int32_t aAudioSampleRate)
+{
+  aFrame->Set(aTimeUs, reinterpret_cast<char *>(aData) + aDataOffset, aSize, aAudioChannels, aAudioSampleRate);
+  return true;
+}
+
+bool OmxDecoder::ReadVideo(VideoFrame *aFrame, int64_t aSeekTimeUs)
+{
+  if (!mVideoSource.get())
+    return false;
+
+  for (;;) {
+    ReleaseVideoBuffer();
+
+    status_t err;
+
+    if (aSeekTimeUs != -1) {
+      MediaSource::ReadOptions options;
+      options.setSeekTo(aSeekTimeUs);
+      err = mVideoSource->read(&mVideoBuffer, &options);
+    } else {
+      err = mVideoSource->read(&mVideoBuffer);
+    }
+
+    aSeekTimeUs = -1;
+
+    if (err == OK) {
+      if (mVideoBuffer->range_length() == 0) // If we get a spurious empty buffer, keep going
+        continue;
+
+      int64_t timeUs;
+      int32_t unreadable;
+      int32_t keyFrame;
+
+      if (!mVideoBuffer->meta_data()->findInt64(kKeyTime, &timeUs) ) {
+        LOG("no key time");
+        return false;
+      }
+
+      if (!mVideoBuffer->meta_data()->findInt32(kKeyIsSyncFrame, &keyFrame)) {
+        keyFrame = 0;
+      }
+
+      if (!mVideoBuffer->meta_data()->findInt32(kKeyIsUnreadable, &unreadable)) {
+        unreadable = 0;
+      }
+
+      LOG("data: %p size: %u offset: %u length: %u unreadable: %d",
+          mVideoBuffer->data(), 
+          mVideoBuffer->size(),
+          mVideoBuffer->range_offset(),
+          mVideoBuffer->range_length(),
+          unreadable);
+
+      char *data = reinterpret_cast<char *>(mVideoBuffer->data()) + mVideoBuffer->range_offset();
+      size_t length = mVideoBuffer->range_length();
+
+      if (unreadable) {
+        LOG("video frame is unreadable");
+      }
+
+      if (!ToVideoFrame(aFrame, timeUs, data, length, keyFrame)) {
+        return false;
+      }
+
+      return true;
+    }
+
+    if (err == INFO_FORMAT_CHANGED) {
+      // If the format changed, update our cached info.
+      if (!SetVideoFormat()) {
+        return false;
+      }
+
+      // Ok, try to read a buffer again.
+      continue;
+    }
+
+    /* err == ERROR_END_OF_STREAM */
+    break;
+  }
+
+  return false;
+}
+
+bool OmxDecoder::ReadAudio(AudioFrame *aFrame, int64_t aSeekTimeUs)
+{
+  ReleaseAudioBuffer();
+
+  status_t err;
+
+  if (aSeekTimeUs != -1) {
+    MediaSource::ReadOptions options;
+    options.setSeekTo(aSeekTimeUs);
+    err = mAudioSource->read(&mAudioBuffer, &options);
+  } else {
+    err = mAudioSource->read(&mAudioBuffer);
+  }
+
+  aSeekTimeUs = -1;
+
+  if (err == OK && mAudioBuffer->range_length() != 0) {
+    int64_t timeUs;
+    if (!mAudioBuffer->meta_data()->findInt64(kKeyTime, &timeUs))
+      return false;
+
+    return ToAudioFrame(aFrame, timeUs,
+                        mAudioBuffer->data(),
+                        mAudioBuffer->range_offset(),
+                        mAudioBuffer->range_length(),
+                        mAudioChannels, mAudioSampleRate);
+  }
+  else if (err == INFO_FORMAT_CHANGED && !SetAudioFormat()) {
+    // If the format changed, update our cached info.
+    return false;
+  }
+  else if (err == ERROR_END_OF_STREAM)
+    return false;
+
+  return true;
+}
+
+static OmxDecoder *cast(Decoder *decoder) {
+  return reinterpret_cast<OmxDecoder *>(decoder->mPrivate);
+}
+
+static void GetDuration(Decoder *aDecoder, int64_t *durationUs) {
+  cast(aDecoder)->GetDuration(durationUs);
+}
+
+static void GetVideoParameters(Decoder *aDecoder, int32_t *width, int32_t *height) {
+  cast(aDecoder)->GetVideoParameters(width, height);
+}
+
+static void GetAudioParameters(Decoder *aDecoder, int32_t *numChannels, int32_t *sampleRate) {
+  cast(aDecoder)->GetAudioParameters(numChannels, sampleRate);
+}
+
+static bool HasVideo(Decoder *aDecoder) {
+  return cast(aDecoder)->HasVideo();
+}
+
+static bool HasAudio(Decoder *aDecoder) {
+  return cast(aDecoder)->HasAudio();
+}
+
+static bool ReadVideo(Decoder *aDecoder, VideoFrame *aFrame, int64_t aSeekTimeUs)
+{
+  return cast(aDecoder)->ReadVideo(aFrame, aSeekTimeUs);
+}
+
+static bool ReadAudio(Decoder *aDecoder, AudioFrame *aFrame, int64_t aSeekTimeUs)
+{
+  return cast(aDecoder)->ReadAudio(aFrame, aSeekTimeUs);
+}
+
+static void DestroyDecoder(Decoder *aDecoder)
+{
+  if (aDecoder->mPrivate)
+    delete reinterpret_cast<OmxDecoder *>(aDecoder->mPrivate);
+}
+
+static bool Match(const char *aMimeChars, size_t aMimeLen, const char *aNeedle)
+{
+  return !strncmp(aMimeChars, aNeedle, aMimeLen);
+}
+
+static const char* const gCodecs[] = {
+  "avc",
+  "mp3",
+  "mp4v",
+  "mp4a",
+  NULL
+};
+
+static bool CanDecode(const char *aMimeChars, size_t aMimeLen, const char* const**aCodecs)
+{
+  if (!Match(aMimeChars, aMimeLen, "video/mp4") &&
+      !Match(aMimeChars, aMimeLen, "audio/mp4") &&
+      !Match(aMimeChars, aMimeLen, "audio/mpeg") &&
+      !Match(aMimeChars, aMimeLen, "application/octet-stream")) { // file urls
+    return false;
+  }
+  *aCodecs = gCodecs;
+
+  return true;
+}
+
+static bool CreateDecoder(PluginHost *aPluginHost, Decoder *aDecoder, const char *aMimeChars, size_t aMimeLen)
+{
+  OmxDecoder *omx = new OmxDecoder(aPluginHost, aDecoder);
+  if (!omx || !omx->Init())
+    return false;
+
+  aDecoder->mPrivate = omx;
+  aDecoder->GetDuration = GetDuration;
+  aDecoder->GetVideoParameters = GetVideoParameters;
+  aDecoder->GetAudioParameters = GetAudioParameters;
+  aDecoder->HasVideo = HasVideo;
+  aDecoder->HasAudio = HasAudio;
+  aDecoder->ReadVideo = ReadVideo;
+  aDecoder->ReadAudio = ReadAudio;
+  aDecoder->DestroyDecoder = DestroyDecoder;
+
+  return true;
+}
+
+// Export the manifest so MPAPI can find our entry points.
+Manifest MOZ_EXPORT_DATA(MPAPI_MANIFEST) {
+  CanDecode,
+  CreateDecoder
+};
diff --git a/mobile/android/base/AwesomeBar.java b/mobile/android/base/AwesomeBar.java
index f8b6bcc37b4c..2842dba1a296 100644
--- a/mobile/android/base/AwesomeBar.java
+++ b/mobile/android/base/AwesomeBar.java
@@ -11,7 +11,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -102,22 +101,6 @@ public class AwesomeBar extends GeckoActivity implements GeckoEventListener {
             }
         });
 
-        Resources resources = getResources();
-        
-        int padding[] = { mText.getPaddingLeft(),
-                          mText.getPaddingTop(),
-                          mText.getPaddingRight(),
-                          mText.getPaddingBottom() };
-
-        GeckoStateListDrawable states = new GeckoStateListDrawable();
-        states.initializeFilter(GeckoApp.mBrowserToolbar.getHighlightColor());
-        states.addState(new int[] { android.R.attr.state_focused }, resources.getDrawable(R.drawable.address_bar_url_pressed));
-        states.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.address_bar_url_pressed));
-        states.addState(new int[] { }, resources.getDrawable(R.drawable.address_bar_url_default));
-        mText.setBackgroundDrawable(states);
-
-        mText.setPadding(padding[0], padding[1], padding[2], padding[3]);
-
         Intent intent = getIntent();
         String currentUrl = intent.getStringExtra(CURRENT_URL_KEY);
         mType = intent.getStringExtra(TYPE_KEY);
diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java
index a3874a50120e..3f2b407a6bef 100644
--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -777,7 +777,7 @@ public class AwesomeBarTabs extends TabHost {
         View indicatorView = mInflater.inflate(R.layout.awesomebar_tab_indicator, null);
         Drawable background = indicatorView.getBackground();
         try {
-            background.setColorFilter(new LightingColorFilter(Color.WHITE, GeckoApp.mBrowserToolbar.getHighlightColor()));
+            background.setColorFilter(new LightingColorFilter(Color.WHITE, 0xFFFF9500));
         } catch (Exception e) {
             Log.d(LOGTAG, "background.setColorFilter failed " + e);            
         }
diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java
index 621f8f979ed2..2945ce50684d 100644
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -5,33 +5,41 @@
 
 package org.mozilla.gecko;
 
+import java.util.List;
+import java.util.ArrayList;
+
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.animation.TranslateAnimation;
 import android.view.Gravity;
-import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewConfiguration;
+import android.view.Window;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
 import android.widget.TextSwitcher;
 import android.widget.ViewSwitcher;
 
-public class BrowserToolbar implements ViewSwitcher.ViewFactory {
+public class BrowserToolbar implements ViewSwitcher.ViewFactory,
+                                       GeckoMenu.ActionItemBarPresenter {
     private static final String LOGTAG = "GeckoToolbar";
     private LinearLayout mLayout;
     private Button mAwesomeBar;
@@ -44,13 +52,18 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
     private AnimationDrawable mProgressSpinner;
     private TextSwitcher mTabsCount;
     private ImageView mShadow;
-    private LayoutInflater mInflater;
+    private ImageButton mMenu;
+    private LinearLayout mActionItemBar;
+    private MenuPopup mMenuPopup;
 
     final private Context mContext;
+    private LayoutInflater mInflater;
     private Handler mHandler;
-    private int mColor;
     private int[] mPadding;
     private boolean mTitleCanExpand;
+    private boolean mHasSoftMenuButton;
+
+    private static List<View> sActionItems;
 
     private int mDuration;
     private TranslateAnimation mSlideUpIn;
@@ -63,24 +76,14 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
     public BrowserToolbar(Context context) {
         mContext = context;
         mInflater = LayoutInflater.from(context);
+
+        sActionItems = new ArrayList<View>();
     }
 
     public void from(LinearLayout layout) {
         mLayout = layout;
         mTitleCanExpand = true;
 
-        // Get the device's highlight color
-        TypedArray typedArray;
-
-        if (Build.VERSION.SDK_INT >= 11) {            
-            typedArray = mContext.obtainStyledAttributes(new int[] { android.R.attr.textColorHighlight });
-        } else {
-            ContextThemeWrapper wrapper  = new ContextThemeWrapper(mContext, android.R.style.TextAppearance);
-            typedArray = wrapper.getTheme().obtainStyledAttributes(new int[] { android.R.attr.textColorHighlight });
-        }
-
-        mColor = typedArray.getColor(typedArray.getIndex(0), 0);
-        typedArray.recycle();
         mAwesomeBar = (Button) mLayout.findViewById(R.id.awesome_bar);
         mAwesomeBar.setOnClickListener(new Button.OnClickListener() {
             public void onClick(View v) {
@@ -88,21 +91,11 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
             }
         });
 
-        Resources resources = mContext.getResources();
-        
         mPadding = new int[] { mAwesomeBar.getPaddingLeft(),
                                mAwesomeBar.getPaddingTop(),
                                mAwesomeBar.getPaddingRight(),
                                mAwesomeBar.getPaddingBottom() };
 
-        GeckoStateListDrawable states = new GeckoStateListDrawable();
-        states.initializeFilter(mColor);
-        states.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.address_bar_url_pressed));
-        states.addState(new int[] { }, resources.getDrawable(R.drawable.address_bar_url_default));
-        mAwesomeBar.setBackgroundDrawable(states);
-
-        mAwesomeBar.setPadding(mPadding[0], mPadding[1], mPadding[2], mPadding[3]);
-
         mTabs = (ImageButton) mLayout.findViewById(R.id.tabs);
         mTabs.setOnClickListener(new Button.OnClickListener() {
             public void onClick(View v) {
@@ -148,7 +141,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
             }
         });
 
-        mProgressSpinner = (AnimationDrawable) resources.getDrawable(R.drawable.progress_spinner);
+        mProgressSpinner = (AnimationDrawable) mContext.getResources().getDrawable(R.drawable.progress_spinner);
         
         mStop = (ImageButton) mLayout.findViewById(R.id.stop);
         mStop.setOnClickListener(new Button.OnClickListener() {
@@ -172,6 +165,51 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
         mSlideUpOut.setDuration(mDuration);
         mSlideDownIn.setDuration(mDuration);
         mSlideDownOut.setDuration(mDuration);
+
+        mMenu = (ImageButton) mLayout.findViewById(R.id.menu);
+        mActionItemBar = (LinearLayout) mLayout.findViewById(R.id.menu_items);
+        mHasSoftMenuButton = false;
+
+        if (Build.VERSION.SDK_INT >= 11)
+            mHasSoftMenuButton = true;
+
+        if (Build.VERSION.SDK_INT >= 14) {
+            if(!ViewConfiguration.get(GeckoApp.mAppContext).hasPermanentMenuKey())
+               mHasSoftMenuButton = true;
+            else
+               mHasSoftMenuButton = false;
+        }
+
+        if (mHasSoftMenuButton) {
+            mMenu.setVisibility(View.VISIBLE);
+            mMenu.setOnClickListener(new Button.OnClickListener() {
+                public void onClick(View view) {
+                    GeckoApp.mAppContext.openOptionsMenu();
+                }
+            });
+        }
+
+        if (Build.VERSION.SDK_INT >= 11) {
+            View panel = GeckoApp.mAppContext.getMenuPanel();
+
+            // If panel is null, the app is starting up for the first time;
+            //    add this to the popup only if we have a soft menu button.
+            // else, browser-toolbar is initialized on rotation,
+            //    and we need to re-attach action-bar items.
+
+            if (panel == null) {
+                GeckoApp.mAppContext.onCreatePanelMenu(Window.FEATURE_OPTIONS_PANEL, null);
+                panel = GeckoApp.mAppContext.getMenuPanel();
+
+                if (mHasSoftMenuButton) {
+                    mMenuPopup = new MenuPopup(mContext);
+                    mMenuPopup.setPanelView(panel);
+                }
+            } else if (sActionItems.size() > 0) {
+                for (View view : sActionItems)
+                    addActionItem(view);
+            }
+        }
     }
 
     @Override
@@ -192,10 +230,6 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
         GeckoApp.mAppContext.showTabs();
     }
 
-    public int getHighlightColor() {
-        return mColor;
-    }
-
     public void updateTabCountAndAnimate(int count) {
         if (mCount > count) {
             mTabsCount.setInAnimation(mSlideDownIn);
@@ -220,7 +254,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
 
         mHandler.postDelayed(new Runnable() {
             public void run() {
-                ((TextView) mTabsCount.getCurrentView()).setTextColor(mColor);
+                ((TextView) mTabsCount.getCurrentView()).setTextColor(mContext.getResources().getColor(R.color.url_bar_text_highlight));
             }
         }, mDuration);
 
@@ -338,6 +372,31 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
          mForward.setEnabled(enabled);
     }
 
+    public boolean hasSoftMenuButton() {
+        return mHasSoftMenuButton;
+    }
+
+    @Override
+    public void addActionItem(View actionItem) {
+        mActionItemBar.addView(actionItem);
+
+        if (!sActionItems.contains(actionItem))
+            sActionItems.add(actionItem);
+    }
+
+    @Override
+    public void removeActionItem(View actionItem) {
+        mActionItemBar.removeView(actionItem);
+
+        if (sActionItems.contains(actionItem))
+            sActionItems.remove(actionItem);
+    }
+
+    @Override
+    public int getActionItemsCount() {
+        return sActionItems.size();
+    }
+
     public void show() {
         if (Build.VERSION.SDK_INT >= 11)
             GeckoActionBar.show(GeckoApp.mAppContext);
@@ -366,4 +425,75 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory {
             updateForwardButton(tab.canDoForward());
         }
     }
+
+    public void destroy() {
+        // The action-items views are reused on rotation.
+        // Remove them from their parent, so they can be re-attached to new parent.
+        mActionItemBar.removeAllViews();
+    }
+
+    public void openOptionsMenu() {
+        if (mMenuPopup != null && !mMenuPopup.isShowing())
+            mMenuPopup.show(mMenu);
+    }
+
+    public void closeOptionsMenu() {
+        if (mMenuPopup != null && mMenuPopup.isShowing())
+            mMenuPopup.dismiss();
+    }
+
+    // MenuPopup holds the MenuPanel in Honeycomb/ICS devices with no hardware key
+    public class MenuPopup extends PopupWindow {
+        private ImageView mArrow;
+        private RelativeLayout mPanel;
+
+        public MenuPopup(Context context) {
+            super(context);
+            setFocusable(true);
+
+            // Setting a null background makes the popup to not close on touching outside.
+            setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            setWindowLayoutMode(ViewGroup.LayoutParams.WRAP_CONTENT,
+                                ViewGroup.LayoutParams.WRAP_CONTENT);
+
+            LayoutInflater inflater = LayoutInflater.from(context);
+            RelativeLayout layout = (RelativeLayout) inflater.inflate(R.layout.menu_popup, null);
+            setContentView(layout);
+
+            mArrow = (ImageView) layout.findViewById(R.id.menu_arrow);
+            mPanel = (RelativeLayout) layout.findViewById(R.id.menu_panel);
+        }
+
+        public void setPanelView(View view) {
+            mPanel.removeAllViews();
+            mPanel.addView(view);
+        }
+
+        public void show(View anchor) {
+            showAsDropDown(anchor);
+
+            int location[] = new int[2];
+            anchor.getLocationOnScreen(location);
+
+            int menuButtonWidth = anchor.getWidth();
+            int arrowWidth = mArrow.getWidth();
+
+            int rightMostEdge = location[0] + menuButtonWidth;
+
+            DisplayMetrics metrics = new DisplayMetrics();
+            GeckoApp.mAppContext.getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+            int leftMargin = (int)(240 * metrics.density) - (metrics.widthPixels - location[0] - menuButtonWidth/2);
+
+            RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mArrow.getLayoutParams();
+            RelativeLayout.LayoutParams newParams = new RelativeLayout.LayoutParams(params);
+            newParams.setMargins(leftMargin,
+                                 params.topMargin,
+                                 0,
+                                 params.bottomMargin);
+
+            // From the left of popup, the arrow should move half of (menuButtonWidth - arrowWidth)
+            mArrow.setLayoutParams(newParams);
+        }
+    }
 }
diff --git a/mobile/android/base/FindInPageBar.java b/mobile/android/base/FindInPageBar.java
index b34959380742..d3273501e859 100644
--- a/mobile/android/base/FindInPageBar.java
+++ b/mobile/android/base/FindInPageBar.java
@@ -5,7 +5,6 @@
 package org.mozilla.gecko;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
@@ -41,23 +40,6 @@ public class FindInPageBar extends RelativeLayout implements TextWatcher, View.O
         mFindText = (EditText) content.findViewById(R.id.find_text);
         mFindText.addTextChangedListener(this);
 
-        // EditText styling modeled after AwesomeBar styling
-
-        int padding[] = { mFindText.getPaddingLeft(),
-                          mFindText.getPaddingTop(),
-                          mFindText.getPaddingRight(),
-                          mFindText.getPaddingBottom() };
-
-        Resources resources = getContext().getResources();
-        GeckoStateListDrawable states = new GeckoStateListDrawable();
-        states.initializeFilter(GeckoApp.mBrowserToolbar.getHighlightColor());
-        states.addState(new int[] { android.R.attr.state_focused }, resources.getDrawable(R.drawable.address_bar_url_pressed));
-        states.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.address_bar_url_pressed));
-        states.addState(new int[] { }, resources.getDrawable(R.drawable.address_bar_url_default));
-        mFindText.setBackgroundDrawable(states);
-
-        mFindText.setPadding(padding[0], padding[1], padding[2], padding[3]);
-
         mInflated = true;
     }
 
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index 374ce0c572a6..48a7917c7554 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -89,6 +89,7 @@ abstract public class GeckoApp
     public static SurfaceView cameraView;
     public static GeckoApp mAppContext;
     public static boolean mDOMFullScreen = false;
+    private MenuPanel mMenuPanel;
     public static Menu sMenu;
     private static GeckoThread sGeckoThread = null;
     public Handler mMainHandler;
@@ -122,6 +123,7 @@ abstract public class GeckoApp
         public boolean onMenuItemClick(MenuItem item) {
             Log.i(LOGTAG, "menu item clicked");
             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Menu:Clicked", Integer.toString(id)));
+            ((Activity) GeckoApp.mAppContext).closeOptionsMenu();
             return true;
         }
     }
@@ -360,8 +362,13 @@ abstract public class GeckoApp
     public boolean onCreateOptionsMenu(Menu menu)
     {
         sMenu = menu;
+
+        // Inform the menu about the action-items bar. 
+        if (menu instanceof GeckoMenu && isTablet())
+            ((GeckoMenu) menu).setActionItemBarPresenter(mBrowserToolbar);
+
         MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.gecko_menu, menu);
+        inflater.inflate(R.menu.gecko_menu, sMenu);
         return true;
     }
 
@@ -450,6 +457,120 @@ abstract public class GeckoApp
         return true;
     }
 
+    @Override
+    public void openOptionsMenu() {
+        if (mBrowserToolbar.hasSoftMenuButton()) {
+            onPreparePanel(Window.FEATURE_OPTIONS_PANEL, mMenuPanel, sMenu);
+            mBrowserToolbar.openOptionsMenu();
+        } else {
+            super.openOptionsMenu();
+        }
+    }
+
+    @Override
+    public void closeOptionsMenu() {
+        if (mBrowserToolbar.hasSoftMenuButton())
+            mBrowserToolbar.closeOptionsMenu();
+        else
+            super.closeOptionsMenu();
+    }
+
+    @Override
+    public MenuInflater getMenuInflater() {
+        if (Build.VERSION.SDK_INT >= 11)
+            return new GeckoMenuInflater(mAppContext);
+        else
+            return super.getMenuInflater();
+    }
+
+    public View getMenuPanel() {
+        return mMenuPanel;
+    }
+
+    // MenuPanel holds the scrollable Menu
+    public static class MenuPanel extends ScrollView {
+        public MenuPanel(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+                                                       ViewGroup.LayoutParams.WRAP_CONTENT));
+        }
+
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            if (getChildCount() == 0) {
+                super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+                return;
+            }
+
+            int restrictedHeightSpec;
+            int childHeight = getChildAt(0).getHeight();
+
+            DisplayMetrics metrics = new DisplayMetrics();
+            ((Activity) GeckoApp.mAppContext).getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+            // heightPixels changes during rotation.
+            int preferredHeight = (int) (0.75 * metrics.heightPixels);
+            restrictedHeightSpec = MeasureSpec.makeMeasureSpec(childHeight <= preferredHeight ? childHeight : preferredHeight, MeasureSpec.EXACTLY);
+
+            super.onMeasure(widthMeasureSpec, restrictedHeightSpec);
+        }
+    }
+
+    @Override
+    public View onCreatePanelView(int featureId) {
+        if (Build.VERSION.SDK_INT >= 11 && featureId == Window.FEATURE_OPTIONS_PANEL) {
+            if (mMenuPanel == null) {
+                mMenuPanel = new MenuPanel(mAppContext, null);
+            } else {
+                // Prepare the panel everytime before showing the menu.
+                onPreparePanel(featureId, mMenuPanel, sMenu);
+            }
+
+            return mMenuPanel; 
+        }
+  
+        return super.onCreatePanelView(featureId);
+    }
+
+    @Override
+    public boolean onCreatePanelMenu(int featureId, Menu menu) {
+        if (Build.VERSION.SDK_INT >= 11 && featureId == Window.FEATURE_OPTIONS_PANEL) {
+            if (mMenuPanel == null) {
+                mMenuPanel = (MenuPanel) onCreatePanelView(featureId);
+            }
+
+            GeckoMenu gMenu = new GeckoMenu(mAppContext, null);
+            menu = gMenu;
+            mMenuPanel.addView(gMenu);
+
+            return onCreateOptionsMenu(menu);
+        }
+
+        return super.onCreatePanelMenu(featureId, menu);
+    }
+
+    @Override
+    public boolean onPreparePanel(int featureId, View view, Menu menu) {
+        if (Build.VERSION.SDK_INT >= 11 && featureId == Window.FEATURE_OPTIONS_PANEL)
+            return onPrepareOptionsMenu(menu);
+
+        return super.onPreparePanel(featureId, view, menu);
+    }
+
+    @Override
+    public boolean onMenuOpened(int featureId, Menu menu) {
+        if (Build.VERSION.SDK_INT >= 11 && featureId == Window.FEATURE_OPTIONS_PANEL) {
+            if (sMenu == null) {
+                onCreatePanelMenu(featureId, menu);
+                onPreparePanel(featureId, mMenuPanel, sMenu);
+            }
+
+            return true;
+        }
+
+        return super.onMenuOpened(featureId, menu);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         Tab tab = null;
@@ -1595,24 +1716,10 @@ abstract public class GeckoApp
     public void refreshActionBar() {
         if (Build.VERSION.SDK_INT >= 11) {
             LinearLayout actionBar = (LinearLayout) getLayoutInflater().inflate(R.layout.browser_toolbar, null);
+            mBrowserToolbar.destroy();
             mBrowserToolbar.from(actionBar);
             mBrowserToolbar.refresh();
             invalidateOptionsMenu();
-
-            Drawable background;
-
-            // Version 11 and 12 doesn't support tiling of bitmap in action bar.
-            if (Build.VERSION.SDK_INT == 11 || Build.VERSION.SDK_INT == 12) {
-                BitmapDrawable bitmap = new BitmapDrawable(BitmapFactory.decodeResource(getResources(), R.drawable.address_bar_texture_tablet));
-                bitmap.setTileModeX(android.graphics.Shader.TileMode.REPEAT);
-                background = bitmap;
-            } else if (isTablet()) {
-                background = getResources().getDrawable(R.drawable.address_bar_bg);
-            } else {
-                background = getResources().getDrawable(R.drawable.gecko_actionbar_bg);
-            }
-
-            GeckoActionBar.setBackgroundDrawable(this, background);
             GeckoActionBar.setCustomView(this, actionBar);
         }
     }
@@ -1675,11 +1782,6 @@ abstract public class GeckoApp
     private void initialize() {
         mInitialized = true;
 
-        // Version 11 & 12 doesn't support tiling of bitmaps in action bar.
-        // Refresh it to avoid corruption.
-        if (Build.VERSION.SDK_INT == 11 || Build.VERSION.SDK_INT == 12)
-            refreshActionBar();
-
         mBrowserToolbar.updateBackButton(false);
         mBrowserToolbar.updateForwardButton(false);
         invalidateOptionsMenu();
diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java
index 08c075268e01..2a9a0d1ebdb4 100644
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -148,6 +148,7 @@ public class GeckoAppShell
     public static native void loadSQLiteLibsNative(String apkName, boolean shouldExtract);
     public static native void loadNSSLibsNative(String apkName, boolean shouldExtract);
     public static native void onChangeNetworkLinkStatus(String status);
+    public static native Message getNextMessageFromQueue(MessageQueue queue);
 
     public static void registerGlobalExceptionHandler() {
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@@ -2105,25 +2106,15 @@ public class GeckoAppShell
     }
 
     public static void pumpMessageLoop() {
-        // We're going to run the Looper below, but we need a way to break out, so
-        // we post this Runnable that throws an AssertionError. This causes the loop
-        // to exit without marking the Looper as dead. The Runnable is added to the
-        // end of the queue, so it will be executed after anything
-        // else that has been added prior.
-        //
-        // A more civilized method would obviously be preferred. Looper.quit(),
-        // however, marks the Looper as dead and it cannot be prepared or run
-        // again. And since you can only have a single Looper per thread,
-        // here we are.
-        sGeckoHandler.post(new Runnable() {
-            public void run() {
-                throw new AssertionError();
-            }
-        });
-        
-        try {
-            Looper.loop();
-        } catch(Throwable ex) {}
+        MessageQueue mq = Looper.myQueue();
+        Message msg = getNextMessageFromQueue(mq); 
+        if (msg == null)
+            return;
+        if (msg.getTarget() == null)
+            Looper.myLooper().quit();
+        else
+            msg.getTarget().dispatchMessage(msg);
+        msg.recycle();
     }
 
     static class AsyncResultHandler extends GeckoApp.FilePickerResultHandler {
diff --git a/mobile/android/base/GeckoMenu.java b/mobile/android/base/GeckoMenu.java
new file mode 100644
index 000000000000..535c4ee6c057
--- /dev/null
+++ b/mobile/android/base/GeckoMenu.java
@@ -0,0 +1,253 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import android.content.Context;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+
+public class GeckoMenu extends LinearLayout 
+                       implements Menu, GeckoMenuItem.OnShowAsActionChangedListener {
+    private static final String LOGTAG = "GeckoMenu";
+
+    private Context mContext;
+
+    public static interface ActionItemBarPresenter {
+        public void addActionItem(View actionItem);
+        public void removeActionItem(View actionItem);
+        public int getActionItemsCount();
+    }
+
+    private static final int NO_ID = 0;
+
+    // Default list of items.
+    private List<GeckoMenuItem> mItems;
+
+    // List of indices of items in action-bar.
+    private List<Integer> mActionItems;
+
+    // Reference to action-items bar in action-bar.
+    private ActionItemBarPresenter mActionItemBarPresenter;
+
+    public GeckoMenu(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mContext = context;
+
+        setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT,
+                                         LayoutParams.WRAP_CONTENT));
+        setOrientation(VERTICAL);
+
+        mItems = new ArrayList<GeckoMenuItem>();
+        mActionItems = new ArrayList<Integer>();
+    }
+
+    @Override
+    public MenuItem add(CharSequence title) {
+        GeckoMenuItem menuItem = new GeckoMenuItem(mContext, NO_ID);
+        menuItem.setTitle(title);
+        addItem(menuItem);
+        return menuItem;
+    }
+
+    @Override
+    public MenuItem add(int groupId, int itemId, int order, int titleRes) {
+        GeckoMenuItem menuItem = new GeckoMenuItem(mContext, itemId, order);
+        menuItem.setTitle(titleRes);
+        addItem(menuItem);
+        return menuItem;
+    }
+
+    @Override
+    public MenuItem add(int titleRes) {
+        GeckoMenuItem menuItem = new GeckoMenuItem(mContext, NO_ID);
+        menuItem.setTitle(titleRes);
+        addItem(menuItem);
+        return menuItem;
+    }
+
+    @Override
+    public MenuItem add(int groupId, int itemId, int order, CharSequence title) {
+        GeckoMenuItem menuItem = new GeckoMenuItem(mContext, itemId, order);
+        menuItem.setTitle(title);
+        addItem(menuItem);
+        return menuItem;
+    }
+
+    private void addItem(GeckoMenuItem menuItem) {
+        menuItem.setOnShowAsActionChangedListener(this);
+
+        // Insert it in proper order.
+        int index = 0;
+        for (GeckoMenuItem item : mItems) {
+            if (item.getOrder() > menuItem.getOrder()) {
+                mItems.add(index, menuItem);
+
+                // Account for the items in the action-bar.
+                if (mActionItemBarPresenter != null)
+                    addView(menuItem.getLayout(), index - mActionItemBarPresenter.getActionItemsCount());
+                else
+                    addView(menuItem.getLayout(), index);
+
+                return;
+            } else {
+              index++;
+            }
+        }
+
+        // Add the menuItem at the end.
+        mItems.add(menuItem);
+        addView(menuItem.getLayout());
+    }
+
+    private void addActionButtonItem(GeckoMenuItem menuItem) {
+        // Add the menuItem at the end.
+        mActionItems.add(mItems.size());
+        mItems.add(menuItem);
+        mActionItemBarPresenter.addActionItem(menuItem.getLayout());
+    }
+
+    @Override
+    public int addIntentOptions(int groupId, int itemId, int order, ComponentName caller, Intent[] specifics, Intent intent, int flags, MenuItem[] outSpecificItems) {
+        return 0;
+    }
+
+    @Override
+    public SubMenu addSubMenu(int groupId, int itemId, int order, CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public SubMenu addSubMenu(int groupId, int itemId, int order, int titleRes) {
+        return null;
+    }
+
+    @Override
+    public SubMenu addSubMenu(CharSequence title) {
+        return null;
+    }
+
+    @Override
+    public SubMenu addSubMenu(int titleRes) {
+       return null;
+    }
+
+    @Override
+    public void clear() {
+    }
+
+    @Override
+    public void close() {
+    }
+
+    @Override
+    public MenuItem findItem(int id) {
+        for (GeckoMenuItem menuItem : mItems) {
+            if (menuItem.getItemId() == id)
+                return menuItem;
+        }
+        return null;
+    }
+
+    @Override
+    public MenuItem getItem(int index) {
+        if (index < mItems.size())
+            return mItems.get(index);
+
+        return null;
+    }
+
+    @Override
+    public boolean hasVisibleItems() {
+        for (GeckoMenuItem menuItem : mItems) {
+            if (menuItem.isVisible())
+                return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean isShortcutKey(int keyCode, KeyEvent event) {
+        return true;
+    }
+
+    @Override
+    public boolean performIdentifierAction(int id, int flags) {
+        return false;
+    }
+
+    @Override
+    public boolean performShortcut(int keyCode, KeyEvent event, int flags) {
+        return false;
+    }
+
+    @Override
+    public void removeGroup(int groupId) {
+    }
+
+    @Override
+    public void removeItem(int id) {
+        for (GeckoMenuItem menuItem : mItems) {
+            if (menuItem.getItemId() == id) {
+                removeView(findViewById(id));
+
+                if (mActionItemBarPresenter != null)
+                    mActionItemBarPresenter.removeActionItem(findViewById(id));
+
+                mItems.remove(menuItem);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
+    }
+
+    @Override
+    public void setGroupEnabled(int group, boolean enabled) {
+    }
+
+    @Override
+    public void setGroupVisible(int group, boolean visible) {
+    }
+
+    @Override
+    public void setQwertyMode(boolean isQwerty) {
+    }
+
+    @Override
+    public int size() {
+        return mItems.size();
+    }
+
+    @Override
+    public void onShowAsActionChanged(GeckoMenuItem item) {
+         addItemAsActionButton(item);
+    }
+
+    public void addItemAsActionButton(MenuItem item) {
+        removeItem(item.getItemId());
+        addActionButtonItem((GeckoMenuItem) item);
+    }
+
+    public void setActionItemBarPresenter(ActionItemBarPresenter presenter) {
+        mActionItemBarPresenter = presenter;
+    }
+}
diff --git a/mobile/android/base/GeckoMenuInflater.java b/mobile/android/base/GeckoMenuInflater.java
new file mode 100644
index 000000000000..fcb8f6d36b37
--- /dev/null
+++ b/mobile/android/base/GeckoMenuInflater.java
@@ -0,0 +1,137 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import java.io.IOException;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+import android.view.InflateException;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+
+public class GeckoMenuInflater extends MenuInflater 
+                               implements MenuItem.OnMenuItemClickListener {
+    private static final String LOGTAG = "GeckoMenuInflater";
+
+    private static final String TAG_ITEM = "item";
+    private static final int NO_ID = 0;
+
+    private Context mContext;
+
+    // Private class to hold the parsed menu item. 
+    private class ParsedItem {
+        public int id;
+        public int order;
+        public CharSequence title;
+        public int iconRes;
+        public boolean checkable;
+        public boolean checked;
+        public boolean visible;
+        public boolean enabled;
+        public boolean showAsAction;
+    }
+
+    public GeckoMenuInflater(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    public void inflate(int menuRes, Menu menu) {
+
+        // This is a very minimal parser for the custom menu.
+        // This assumes that there is only one menu tag in the resource file.
+        // This does not support sub-menus.
+
+        XmlResourceParser parser = null;
+        try {
+            parser = mContext.getResources().getXml(menuRes);
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+
+            ParsedItem item = null;
+   
+            String tag;
+            int eventType = parser.getEventType();
+
+            do {
+                tag = parser.getName();
+    
+                switch (eventType) {
+                    case XmlPullParser.START_TAG:
+                        if (tag.equals(TAG_ITEM)) {
+                            // Parse the menu item.
+                            item = new ParsedItem();
+                            parseItem(item, attrs);
+                         }
+                        break;
+                        
+                    case XmlPullParser.END_TAG:
+                        if (parser.getName().equals(TAG_ITEM)) {
+                            // Add the item.
+                            MenuItem menuItem = menu.add(NO_ID, item.id, item.order, item.title);
+                            setValues(item, menuItem);
+                            menuItem.setOnMenuItemClickListener(this);
+                        }
+                        break;
+                }
+
+                eventType = parser.next();
+
+            } while (eventType != XmlPullParser.END_DOCUMENT);
+
+        } catch (XmlPullParserException e) {
+            throw new InflateException("Error inflating menu XML", e);
+        } catch (IOException e) {
+            throw new InflateException("Error inflating menu XML", e);
+        } finally {
+            if (parser != null)
+                parser.close();
+        }
+    }
+
+    @Override
+    public boolean onMenuItemClick(MenuItem item) {
+        Activity activity = (Activity) mContext;
+        boolean result = activity.onOptionsItemSelected(item);
+        activity.closeOptionsMenu();
+        return result;
+    }
+        
+    public void parseItem(ParsedItem item, AttributeSet attrs) {
+        TypedArray a = mContext.obtainStyledAttributes(attrs, R.styleable.MenuItem);
+
+        item.id = a.getResourceId(R.styleable.MenuItem_id, NO_ID);
+        item.order = a.getInt(R.styleable.MenuItem_orderInCategory, 0);
+        item.title = a.getText(R.styleable.MenuItem_title);
+        item.iconRes = a.getResourceId(R.styleable.MenuItem_icon, 0);
+        item.checkable = a.getBoolean(R.styleable.MenuItem_checkable, false);
+        item.checked = a.getBoolean(R.styleable.MenuItem_checked, false);
+        item.visible = a.getBoolean(R.styleable.MenuItem_visible, true);
+        item.enabled = a.getBoolean(R.styleable.MenuItem_enabled, true);
+        item.showAsAction = a.getBoolean(R.styleable.MenuItem_showAsAction, false);
+
+        a.recycle();
+    }
+        
+    public void setValues(ParsedItem item, MenuItem menuItem) {
+        menuItem.setChecked(item.checked)
+                .setVisible(item.visible)
+                .setEnabled(item.enabled)
+                .setCheckable(item.checkable)
+                .setIcon(item.iconRes)
+                .setShowAsAction(item.showAsAction ? 1 : 0);
+    }
+}
diff --git a/mobile/android/base/GeckoMenuItem.java b/mobile/android/base/GeckoMenuItem.java
new file mode 100644
index 000000000000..c18947ec416b
--- /dev/null
+++ b/mobile/android/base/GeckoMenuItem.java
@@ -0,0 +1,330 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ActionProvider;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+
+public class GeckoMenuItem implements MenuItem, View.OnClickListener {
+    private static final String LOGTAG = "GeckoMenuItem";
+
+    public static interface Layout {
+        public void setId(int id);
+        public void setIcon(Drawable icon);
+        public void setIcon(int iconRes);
+        public void setTitle(CharSequence title);
+        public void setEnabled(boolean enabled);
+        public void setCheckable(boolean checkable);
+        public void setChecked(boolean checked);
+        public void setOnClickListener(View.OnClickListener listener);
+        public void setVisibility(int visible);
+        public View getLayout();
+    }
+
+    public static interface OnShowAsActionChangedListener {
+        public void onShowAsActionChanged(GeckoMenuItem item);
+    }
+
+    private Context mContext;
+    private int mId;
+    private int mOrder;
+    private GeckoMenuItem.Layout mLayout;
+    private CharSequence mTitle;
+    private CharSequence mTitleCondensed;
+    private boolean mCheckable;
+    private boolean mChecked;
+    private boolean mVisible;
+    private boolean mEnabled;
+    private Drawable mIcon;
+    private int mIconRes;
+    private MenuItem.OnMenuItemClickListener mMenuItemClickListener;
+    private OnShowAsActionChangedListener mShowAsActionChangedListener;
+
+    public GeckoMenuItem(Context context, int id) {
+        mContext = context;
+        mLayout = new MenuItemDefault(context, null);
+        mLayout.setId(id);
+
+        mId = id;
+        mOrder = 0;
+        mVisible = true;
+        mEnabled = true;
+        mCheckable = true;
+        mChecked = false;
+        mMenuItemClickListener = null;
+
+        mLayout.setOnClickListener(this);
+    }
+
+    public GeckoMenuItem(Context context, int id, int order) {
+        this(context, id);
+        mOrder = order;
+    }
+
+    @Override
+    public boolean collapseActionView() {
+        return false;
+    }
+
+    @Override
+    public boolean expandActionView() {
+        return false;
+    }
+
+    @Override
+    public ActionProvider getActionProvider() {
+        return null;
+    }
+
+    @Override
+    public View getActionView() {
+        return null;
+    }
+
+    @Override
+    public char getAlphabeticShortcut() {
+        return 0;
+    }
+
+    @Override
+    public int getGroupId() {
+        return 0;
+    }
+
+    @Override
+    public Drawable getIcon() {
+        return null;
+    }
+
+    @Override
+    public Intent getIntent() {
+        return null;
+    }
+
+    @Override
+    public int getItemId() {
+        return mId;
+    }
+
+    public View getLayout() {
+        return mLayout.getLayout();
+    }
+
+    @Override
+    public ContextMenu.ContextMenuInfo getMenuInfo() {
+        return null;
+    }
+
+    @Override
+    public char getNumericShortcut() {
+        return 0;
+    }
+
+    @Override
+    public int getOrder() {
+        return mOrder;
+    }
+
+    @Override
+    public SubMenu getSubMenu() {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return mTitle;
+    }
+
+    @Override
+    public CharSequence getTitleCondensed() {
+        return mTitleCondensed;
+    }
+
+    @Override
+    public boolean hasSubMenu() {
+        return false;
+    }
+
+    @Override
+    public boolean isActionViewExpanded() {
+        return false;
+    }
+
+    @Override
+    public boolean isCheckable() {
+        return mCheckable;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mChecked;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return mEnabled;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return mVisible;
+    }
+
+    @Override
+    public MenuItem setActionProvider(ActionProvider actionProvider) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setActionView(int resId) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setActionView(View view) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setAlphabeticShortcut(char alphaChar) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setCheckable(boolean checkable) {
+        mCheckable = checkable;
+        mLayout.setCheckable(checkable);
+        return this;
+    }
+
+    @Override
+    public MenuItem setChecked(boolean checked) {
+        mChecked = checked;
+        mLayout.setChecked(checked);
+        return this;
+    }
+
+    @Override
+    public MenuItem setEnabled(boolean enabled) {
+        mEnabled = enabled;
+        mLayout.setEnabled(enabled);
+        return this;
+    }
+
+    @Override
+    public MenuItem setIcon(Drawable icon) {
+        mIcon = icon;
+        mLayout.setIcon(icon);
+        return this;
+    }
+
+    @Override
+    public MenuItem setIcon(int iconRes) {
+        mIconRes = iconRes;
+        mLayout.setIcon(iconRes);
+        return this;
+    }
+
+    @Override
+    public MenuItem setIntent(Intent intent) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setNumericShortcut(char numericChar) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setOnActionExpandListener(MenuItem.OnActionExpandListener listener) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setOnMenuItemClickListener(MenuItem.OnMenuItemClickListener menuItemClickListener) {
+        mMenuItemClickListener = menuItemClickListener;
+        return this;
+    }
+
+    @Override
+    public MenuItem setShortcut(char numericChar, char alphaChar) {
+        return this;
+    }
+
+    @Override
+    public void setShowAsAction(int actionEnum) {
+        if (actionEnum == 1) {
+            // Change the type to just an icon
+            mLayout = new MenuItemActionBar(mContext, null);
+            mLayout.setId(mId);
+            
+            setVisible(mVisible);
+            setEnabled(mEnabled);
+            setCheckable(mCheckable);
+            setChecked(mChecked);
+
+            if (mIcon == null)
+                setIcon(mIconRes);
+            else
+                setIcon(mIcon);
+            
+            mLayout.setOnClickListener(this);
+
+            if (mShowAsActionChangedListener != null)
+                mShowAsActionChangedListener.onShowAsActionChanged(this);
+        }
+    }
+
+    @Override
+    public MenuItem setShowAsActionFlags(int actionEnum) {
+        return this;
+    }
+
+    @Override
+    public MenuItem setTitle(CharSequence title) {
+        mTitle = title;
+        mLayout.setTitle(mTitle);
+        return this;
+    }
+
+    @Override
+    public MenuItem setTitle(int title) {
+        mTitle = mContext.getResources().getString(title);
+        mLayout.setTitle(mTitle);
+        return this;
+    }
+
+    @Override
+    public MenuItem setTitleCondensed(CharSequence title) {
+        mTitleCondensed = title;
+        return this;
+    }
+
+    @Override
+    public MenuItem setVisible(boolean visible) {
+        mVisible = visible;
+        mLayout.setVisibility(visible ? View.VISIBLE : View.GONE);
+        return this;
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (mMenuItemClickListener != null)
+            mMenuItemClickListener.onMenuItemClick(this);
+    }
+
+    public void setOnShowAsActionChangedListener(OnShowAsActionChangedListener listener) {
+        mShowAsActionChangedListener = listener;
+    } 
+}
diff --git a/mobile/android/base/GeckoStateListDrawable.java b/mobile/android/base/GeckoStateListDrawable.java
deleted file mode 100644
index 4835df460563..000000000000
--- a/mobile/android/base/GeckoStateListDrawable.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.gecko;
-
-import android.graphics.Color;
-import android.graphics.drawable.LayerDrawable;
-import android.graphics.drawable.StateListDrawable;
-import android.graphics.LightingColorFilter;
-
-public class GeckoStateListDrawable extends StateListDrawable {
-    private LightingColorFilter mFilter;
-
-    public void initializeFilter(int color) {
-        mFilter = new LightingColorFilter(Color.WHITE, color);
-    }
-
-    @Override
-    protected boolean onStateChange(int[] stateSet) {
-        for (int state: stateSet) {
-            if (state == android.R.attr.state_pressed || state == android.R.attr.state_focused) {
-                super.onStateChange(stateSet);
-                ((LayerDrawable) getCurrent()).getDrawable(0).setColorFilter(mFilter);
-                return true;
-            }
-        }
-
-        return super.onStateChange(stateSet);
-    }
-}
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 55e774c8e730..f21b3b72b861 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -74,16 +74,20 @@ FENNEC_JAVA_FILES = \
   GeckoHalDefines.java \
   GeckoInputConnection.java \
   GeckoJarReader.java \
-	GeckoMessageReceiver.java \
+  GeckoMenu.java \
+  GeckoMenuInflater.java \
+  GeckoMenuItem.java \
+  GeckoMessageReceiver.java \
   GeckoPreferences.java \
   GeckoProfile.java \
-  GeckoStateListDrawable.java \
   GeckoThread.java \
   GlobalHistory.java \
   GeckoViewsFactory.java \
   LinkPreference.java \
   LinkTextView.java \
-	NSSBridge.java \
+  MenuItemActionBar.java \
+  MenuItemDefault.java \
+  NSSBridge.java \
   ProfileMigrator.java \
   PromptService.java \
   sqlite/ByteBufferInputStream.java \
@@ -165,6 +169,7 @@ FENNEC_PP_JAVA_FILES = \
 FENNEC_PP_XML_FILES = \
   res/layout/abouthome_content.xml \
   res/menu/gecko_menu.xml \
+  res/menu-v11/gecko_menu.xml \
   res/menu-xlarge/gecko_menu.xml \
   res/menu-sw600dp/gecko_menu.xml \
   $(NULL)
@@ -259,6 +264,8 @@ RES_LAYOUT = \
   res/layout/gecko_app.xml \
   res/layout/launch_app_list.xml \
   res/layout/launch_app_listitem.xml \
+  res/layout/menu_item.xml \
+  res/layout/menu_popup.xml \
   res/layout/notification_icon_text.xml \
   res/layout/notification_progress.xml \
   res/layout/notification_progress_text.xml \
@@ -313,16 +320,6 @@ RES_VALUES_V11 = \
   res/values-v11/themes.xml \
   $(NULL)
 
-RES_VALUES_XLARGE = \
-  res/values-xlarge/styles.xml \
-  res/values-xlarge/themes.xml \
-  $(NULL)
-
-RES_VALUES_SW600DP = \
-  res/values-sw600dp/styles.xml \
-  res/values-sw600dp/themes.xml \
-  $(NULL)
-
 RES_VALUES_LAND_V14 = \
   res/values-land-v14/dimens.xml \
   $(NULL)
@@ -390,8 +387,9 @@ RES_DRAWABLE_BASE = \
   res/drawable/address_bar_back_button_pressed_bg.xml \
   res/drawable/address_bar_texture_port.png \
   res/drawable/address_bar_pressed_texture_port.png \
-  res/drawable/address_bar_url_bg.9.png \
-  res/drawable/address_bar_url_outline.9.png \
+  res/drawable/address_bar_url.xml \
+  res/drawable/address_bar_url_default.9.png \
+  res/drawable/address_bar_url_pressed.9.png \
   res/drawable/doorhanger_arrow.png \
   res/drawable/doorhanger_bg.9.png \
   res/drawable/doorhanger_shadow_bg.9.png \
@@ -399,9 +397,12 @@ RES_DRAWABLE_BASE = \
   res/drawable/find_close.png \
   res/drawable/find_next.png \
   res/drawable/find_prev.png \
-  res/drawable/larry_green.png \
   res/drawable/larry_blue.png \
   res/drawable/larry_green.png \
+  res/drawable/menu.xml \
+  res/drawable/menu_item_bg.xml \
+  res/drawable/menu_item_default.xml \
+  res/drawable/menu_item_pressed.xml \
   res/drawable/site_security_identified.png \
   res/drawable/site_security_verified.png \
   res/drawable/urlbar_stop.png \
@@ -457,8 +458,8 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/tabs_plus.png \
   res/drawable-hdpi/address_bar_texture_port.png \
   res/drawable-hdpi/address_bar_pressed_texture_port.png \
-  res/drawable-hdpi/address_bar_url_bg.9.png \
-  res/drawable-hdpi/address_bar_url_outline.9.png \
+  res/drawable-hdpi/address_bar_url_default.9.png \
+  res/drawable-hdpi/address_bar_url_pressed.9.png \
   res/drawable-hdpi/doorhanger_arrow.png \
   res/drawable-hdpi/doorhanger_bg.9.png \
   res/drawable-hdpi/doorhanger_shadow_bg.9.png \
@@ -484,12 +485,19 @@ RES_DRAWABLE_MDPI_V11 = \
   res/drawable-mdpi-v11/ic_menu_back.png \
   res/drawable-mdpi-v11/ic_menu_bookmark_add.png \
   res/drawable-mdpi-v11/ic_menu_bookmark_remove.png \
+  res/drawable-mdpi-v11/ic_menu_clear_site_settings.png \
   res/drawable-mdpi-v11/ic_menu_find_in_page.png \
   res/drawable-mdpi-v11/ic_menu_reload.png \
   res/drawable-mdpi-v11/ic_menu_save_as_pdf.png \
   res/drawable-mdpi-v11/ic_menu_share.png \
   res/drawable-mdpi-v11/ic_menu_forward.png \
   res/drawable-mdpi-v11/menu.png \
+  res/drawable-mdpi-v11/menu_panel_bg.9.png \
+  res/drawable-mdpi-v11/menu_popup_bg.9.png \
+  res/drawable-mdpi-v11/menu_popup_arrow.png \
+  res/drawable-mdpi-v11/menu_item_texture.png \
+  res/drawable-mdpi-v11/menu_item_pressed_texture.png \
+  res/drawable-mdpi-v11/menu_item_check.png \
   $(NULL)
 
 RES_DRAWABLE_HDPI_V11 = \
@@ -499,12 +507,19 @@ RES_DRAWABLE_HDPI_V11 = \
   res/drawable-hdpi-v11/ic_menu_back.png \
   res/drawable-hdpi-v11/ic_menu_bookmark_add.png \
   res/drawable-hdpi-v11/ic_menu_bookmark_remove.png \
+  res/drawable-hdpi-v11/ic_menu_clear_site_settings.png \
   res/drawable-hdpi-v11/ic_menu_find_in_page.png \
   res/drawable-hdpi-v11/ic_menu_reload.png \
   res/drawable-hdpi-v11/ic_menu_save_as_pdf.png \
   res/drawable-hdpi-v11/ic_menu_share.png \
   res/drawable-hdpi-v11/ic_menu_forward.png \
   res/drawable-hdpi-v11/menu.png \
+  res/drawable-hdpi-v11/menu_panel_bg.9.png \
+  res/drawable-hdpi-v11/menu_popup_bg.9.png \
+  res/drawable-hdpi-v11/menu_popup_arrow.png \
+  res/drawable-hdpi-v11/menu_item_texture.png \
+  res/drawable-hdpi-v11/menu_item_pressed_texture.png \
+  res/drawable-hdpi-v11/menu_item_check.png \
   $(NULL)
 
 RES_DRAWABLE_XHDPI_V11 = \
@@ -530,11 +545,11 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/ic_menu_back.png \
   res/drawable-xhdpi-v11/ic_menu_bookmark_add.png \
   res/drawable-xhdpi-v11/ic_menu_bookmark_remove.png \
+  res/drawable-xhdpi-v11/ic_menu_clear_site_settings.png \
   res/drawable-xhdpi-v11/ic_menu_find_in_page.png \
   res/drawable-xhdpi-v11/ic_menu_reload.png \
   res/drawable-xhdpi-v11/ic_menu_save_as_pdf.png \
   res/drawable-xhdpi-v11/ic_menu_share.png \
-  res/drawable-xhdpi-v11/menu.png \
   res/drawable-xhdpi-v11/tab_new.png \
   res/drawable-xhdpi-v11/tab_close.png \
   res/drawable-xhdpi-v11/tab_thumbnail_default.png \
@@ -546,8 +561,8 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/tabs_plus.png \
   res/drawable-xhdpi-v11/address_bar_texture_port.png \
   res/drawable-xhdpi-v11/address_bar_pressed_texture_port.png \
-  res/drawable-xhdpi-v11/address_bar_url_bg.9.png \
-  res/drawable-xhdpi-v11/address_bar_url_outline.9.png \
+  res/drawable-xhdpi-v11/address_bar_url_default.9.png \
+  res/drawable-xhdpi-v11/address_bar_url_pressed.9.png \
   res/drawable-xhdpi-v11/doorhanger_arrow.png \
   res/drawable-xhdpi-v11/doorhanger_bg.9.png \
   res/drawable-xhdpi-v11/doorhanger_shadow_bg.9.png \
@@ -558,9 +573,15 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/urlbar_stop.png \
   res/drawable-xhdpi-v11/larry_blue.png \
   res/drawable-xhdpi-v11/larry_green.png \
+  res/drawable-xhdpi-v11/menu.png \
+  res/drawable-xhdpi-v11/menu_panel_bg.9.png \
+  res/drawable-xhdpi-v11/menu_popup_bg.9.png \
+  res/drawable-xhdpi-v11/menu_popup_arrow.png \
+  res/drawable-xhdpi-v11/menu_item_texture.png \
+  res/drawable-xhdpi-v11/menu_item_pressed_texture.png \
+  res/drawable-xhdpi-v11/menu_item_check.png \
   res/drawable-xhdpi-v11/site_security_identified.png \
   res/drawable-xhdpi-v11/site_security_verified.png \
-  res/drawable-xhdpi-v11/tabs_button_tail.9.png \
   res/drawable-xhdpi-v11/validation_arrow.png \
   res/drawable-xhdpi-v11/validation_arrow_inverted.png \
   res/drawable-xhdpi-v11/validation_bg.9.png \
@@ -576,8 +597,8 @@ RES_DRAWABLE_LAND_MDPI_V14 = \
   res/drawable-land-mdpi-v14/ic_awesomebar_search.png \
   res/drawable-land-mdpi-v14/address_bar_texture_land.png \
   res/drawable-land-mdpi-v14/address_bar_pressed_texture_land.png \
-  res/drawable-land-mdpi-v14/address_bar_url_bg.9.png \
-  res/drawable-land-mdpi-v14/address_bar_url_outline.9.png \
+  res/drawable-land-mdpi-v14/address_bar_url_default.9.png \
+  res/drawable-land-mdpi-v14/address_bar_url_pressed.9.png \
   res/drawable-land-mdpi-v14/tabs_normal.png \
   res/drawable-land-mdpi-v14/tabs_pressed.png \
   res/drawable-land-mdpi-v14/tabs_more.png \
@@ -592,8 +613,8 @@ RES_DRAWABLE_LAND_HDPI_V14 = \
   res/drawable-land-hdpi-v14/ic_awesomebar_search.png \
   res/drawable-land-hdpi-v14/address_bar_texture_land.png \
   res/drawable-land-hdpi-v14/address_bar_pressed_texture_land.png \
-  res/drawable-land-hdpi-v14/address_bar_url_bg.9.png \
-  res/drawable-land-hdpi-v14/address_bar_url_outline.9.png \
+  res/drawable-land-hdpi-v14/address_bar_url_default.9.png \
+  res/drawable-land-hdpi-v14/address_bar_url_pressed.9.png \
   res/drawable-land-hdpi-v14/tabs_normal.png \
   res/drawable-land-hdpi-v14/tabs_pressed.png \
   res/drawable-land-hdpi-v14/tabs_more.png \
@@ -608,8 +629,8 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
   res/drawable-land-xhdpi-v14/ic_awesomebar_search.png \
   res/drawable-land-xhdpi-v14/address_bar_texture_land.png \
   res/drawable-land-xhdpi-v14/address_bar_pressed_texture_land.png \
-  res/drawable-land-xhdpi-v14/address_bar_url_bg.9.png \
-  res/drawable-land-xhdpi-v14/address_bar_url_outline.9.png \
+  res/drawable-land-xhdpi-v14/address_bar_url_default.9.png \
+  res/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png \
   res/drawable-land-xhdpi-v14/tabs_normal.png \
   res/drawable-land-xhdpi-v14/tabs_pressed.png \
   res/drawable-land-xhdpi-v14/tabs_more.png \
@@ -617,7 +638,6 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
   res/drawable-land-xhdpi-v14/urlbar_stop.png \
   res/drawable-land-xhdpi-v14/site_security_identified.png \
   res/drawable-land-xhdpi-v14/site_security_verified.png \
-  res/drawable-land-xhdpi-v14/tabs_button_tail.9.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_MDPI = \
@@ -627,6 +647,13 @@ RES_DRAWABLE_XLARGE_MDPI = \
   res/drawable-xlarge-mdpi/address_bar_pressed_texture_tablet.png \
   res/drawable-xlarge-mdpi/address_bar_back_button_bg.png \
   res/drawable-xlarge-mdpi/address_bar_back_button_pressed_bg.png \
+  res/drawable-xlarge-mdpi/address_bar_url_default.9.png \
+  res/drawable-xlarge-mdpi/address_bar_url_pressed.9.png \
+  res/drawable-xlarge-mdpi/menu.png \
+  res/drawable-xlarge-mdpi/ic_menu_bookmark_add.png \
+  res/drawable-xlarge-mdpi/ic_menu_bookmark_remove.png \
+  res/drawable-xlarge-mdpi/ic_menu_reload.png \
+  res/drawable-xlarge-mdpi/ic_menu_forward.png \
   res/drawable-xlarge-mdpi/tabs_normal.png \
   res/drawable-xlarge-mdpi/tabs_pressed.png \
   res/drawable-xlarge-mdpi/tabs_more.png \
@@ -639,6 +666,13 @@ RES_DRAWABLE_XLARGE_HDPI = \
   res/drawable-xlarge-hdpi/address_bar_pressed_texture_tablet.png \
   res/drawable-xlarge-hdpi/address_bar_back_button_bg.png \
   res/drawable-xlarge-hdpi/address_bar_back_button_pressed_bg.png \
+  res/drawable-xlarge-hdpi/address_bar_url_default.9.png \
+  res/drawable-xlarge-hdpi/address_bar_url_pressed.9.png \
+  res/drawable-xlarge-hdpi/menu.png \
+  res/drawable-xlarge-hdpi/ic_menu_bookmark_add.png \
+  res/drawable-xlarge-hdpi/ic_menu_bookmark_remove.png \
+  res/drawable-xlarge-hdpi/ic_menu_reload.png \
+  res/drawable-xlarge-hdpi/ic_menu_forward.png \
   res/drawable-xlarge-hdpi/tabs_normal.png \
   res/drawable-xlarge-hdpi/tabs_pressed.png \
   res/drawable-xlarge-hdpi/tabs_more.png \
@@ -651,6 +685,13 @@ RES_DRAWABLE_XLARGE_XHDPI = \
   res/drawable-xlarge-xhdpi/address_bar_pressed_texture_tablet.png \
   res/drawable-xlarge-xhdpi/address_bar_back_button_bg.png \
   res/drawable-xlarge-xhdpi/address_bar_back_button_pressed_bg.png \
+  res/drawable-xlarge-xhdpi/address_bar_url_default.9.png \
+  res/drawable-xlarge-xhdpi/address_bar_url_pressed.9.png \
+  res/drawable-xlarge-xhdpi/menu.png \
+  res/drawable-xlarge-xhdpi/ic_menu_bookmark_add.png \
+  res/drawable-xlarge-xhdpi/ic_menu_bookmark_remove.png \
+  res/drawable-xlarge-xhdpi/ic_menu_reload.png \
+  res/drawable-xlarge-xhdpi/ic_menu_forward.png \
   res/drawable-xlarge-xhdpi/tabs_normal.png \
   res/drawable-xlarge-xhdpi/tabs_pressed.png \
   res/drawable-xlarge-xhdpi/tabs_more.png \
@@ -664,6 +705,13 @@ RES_DRAWABLE_SW600DP_MDPI = \
   res/drawable-sw600dp-mdpi/address_bar_pressed_texture_tablet.png \
   res/drawable-sw600dp-mdpi/address_bar_back_button_bg.png \
   res/drawable-sw600dp-mdpi/address_bar_back_button_pressed_bg.png \
+  res/drawable-sw600dp-mdpi/address_bar_url_default.9.png \
+  res/drawable-sw600dp-mdpi/address_bar_url_pressed.9.png \
+  res/drawable-sw600dp-mdpi/menu.png \
+  res/drawable-sw600dp-mdpi/ic_menu_bookmark_add.png \
+  res/drawable-sw600dp-mdpi/ic_menu_bookmark_remove.png \
+  res/drawable-sw600dp-mdpi/ic_menu_reload.png \
+  res/drawable-sw600dp-mdpi/ic_menu_forward.png \
   res/drawable-sw600dp-mdpi/tabs_normal.png \
   res/drawable-sw600dp-mdpi/tabs_pressed.png \
   res/drawable-sw600dp-mdpi/tabs_more.png \
@@ -676,6 +724,13 @@ RES_DRAWABLE_SW600DP_HDPI = \
   res/drawable-sw600dp-hdpi/address_bar_pressed_texture_tablet.png \
   res/drawable-sw600dp-hdpi/address_bar_back_button_bg.png \
   res/drawable-sw600dp-hdpi/address_bar_back_button_pressed_bg.png \
+  res/drawable-sw600dp-hdpi/address_bar_url_default.9.png \
+  res/drawable-sw600dp-hdpi/address_bar_url_pressed.9.png \
+  res/drawable-sw600dp-hdpi/menu.png \
+  res/drawable-sw600dp-hdpi/ic_menu_bookmark_add.png \
+  res/drawable-sw600dp-hdpi/ic_menu_bookmark_remove.png \
+  res/drawable-sw600dp-hdpi/ic_menu_reload.png \
+  res/drawable-sw600dp-hdpi/ic_menu_forward.png \
   res/drawable-sw600dp-hdpi/tabs_normal.png \
   res/drawable-sw600dp-hdpi/tabs_pressed.png \
   res/drawable-sw600dp-hdpi/tabs_more.png \
@@ -688,6 +743,13 @@ RES_DRAWABLE_SW600DP_XHDPI = \
   res/drawable-sw600dp-xhdpi/address_bar_pressed_texture_tablet.png \
   res/drawable-sw600dp-xhdpi/address_bar_back_button_bg.png \
   res/drawable-sw600dp-xhdpi/address_bar_back_button_pressed_bg.png \
+  res/drawable-sw600dp-xhdpi/address_bar_url_default.9.png \
+  res/drawable-sw600dp-xhdpi/address_bar_url_pressed.9.png \
+  res/drawable-sw600dp-xhdpi/menu.png \
+  res/drawable-sw600dp-xhdpi/ic_menu_bookmark_add.png \
+  res/drawable-sw600dp-xhdpi/ic_menu_bookmark_remove.png \
+  res/drawable-sw600dp-xhdpi/ic_menu_reload.png \
+  res/drawable-sw600dp-xhdpi/ic_menu_forward.png \
   res/drawable-sw600dp-xhdpi/tabs_normal.png \
   res/drawable-sw600dp-xhdpi/tabs_pressed.png \
   res/drawable-sw600dp-xhdpi/tabs_more.png \
@@ -696,7 +758,9 @@ RES_DRAWABLE_SW600DP_XHDPI = \
   $(NULL)
 
 RES_COLOR = \
-  res/color/awesomebar_tab_text.xml
+  res/color/awesomebar_tab_text.xml \
+  res/color/menu_item_title.xml \
+  $(NULL)
 
 RES_MENU = \
   res/menu/awesomebar_contextmenu.xml \
@@ -720,8 +784,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/action_bar_button.xml                  \
   mobile/android/base/resources/drawable/address_bar_bg_shadow.png              \
   mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml       \
-  mobile/android/base/resources/drawable/address_bar_url_default.xml            \
-  mobile/android/base/resources/drawable/address_bar_url_pressed.xml            \
   mobile/android/base/resources/drawable/autocomplete_list_bg.9.png             \
   mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml           \
   mobile/android/base/resources/drawable/awesomebar_tab_press.xml               \
@@ -729,7 +791,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/awesomebar_tab_selected.xml            \
   mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml          \
   mobile/android/base/resources/drawable/desktop_notification.png               \
-  mobile/android/base/resources/drawable/gecko_actionbar_bg.xml                 \
   mobile/android/base/resources/drawable/progress_spinner.xml                   \
   mobile/android/base/resources/drawable/progress_spinner_1.png                 \
   mobile/android/base/resources/drawable/progress_spinner_2.png                 \
@@ -747,7 +808,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/start.png                              \
   mobile/android/base/resources/drawable/site_security_level.xml                \
   mobile/android/base/resources/drawable/tabs_button.xml                        \
-  mobile/android/base/resources/drawable/tabs_button_tail.xml                   \
   mobile/android/base/resources/drawable/tabs_level.xml                         \
   mobile/android/base/resources/drawable/tabs_tray_bg_repeat.xml                \
   mobile/android/base/resources/drawable/tabs_tray_pressed_bg_repeat.xml        \
@@ -759,7 +819,7 @@ MOZ_ANDROID_DRAWABLES += \
 
 MOZ_ANDROID_DRAWABLES += $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' ';  fi)
 
-RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_V11) $(RES_LAYOUT_LAND_V14) $(RES_LAYOUT_XLARGE) $(RES_LAYOUT_SW600DP) $(RES_VALUES) $(RES_VALUES_V11) $(RES_VALUES_XLARGE) $(RES_VALUES_SW600DP) $(RES_VALUES_LAND_V14) $(RES_VALUES_SW600DP_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_XLARGE_MDPI) $(RES_DRAWABLE_XLARGE_HDPI) $(RES_DRAWABLE_XLARGE_XHDPI) $(RES_DRAWABLE_SW600DP_MDPI) $(RES_DRAWABLE_SW600DP_HDPI) $(RES_DRAWABLE_SW600DP_XHDPI) $(RES_COLOR) $(RES_MENU)
+RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_V11) $(RES_LAYOUT_LAND_V14) $(RES_LAYOUT_XLARGE) $(RES_LAYOUT_SW600DP) $(RES_VALUES) $(RES_VALUES_V11) $(RES_VALUES_LAND_V14) $(RES_VALUES_SW600DP_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_XLARGE_MDPI) $(RES_DRAWABLE_XLARGE_HDPI) $(RES_DRAWABLE_XLARGE_XHDPI) $(RES_DRAWABLE_SW600DP_MDPI) $(RES_DRAWABLE_SW600DP_HDPI) $(RES_DRAWABLE_SW600DP_XHDPI) $(RES_COLOR) $(RES_MENU)
 
 RES_DIRS= \
   res/layout              \
@@ -769,8 +829,6 @@ RES_DIRS= \
   res/layout-sw600dp      \
   res/values              \
   res/values-v11          \
-  res/values-xlarge       \
-  res/values-sw600dp      \
   res/values-land-v14     \
   res/values-sw600dp-v14  \
   res/xml                 \
@@ -797,6 +855,7 @@ RES_DIRS= \
   res/drawable-sw600dp-xhdpi  \
   res/color                   \
   res/menu                    \
+  res/menu-v11                \
   res/menu-xlarge             \
   res/menu-sw600dp            \
   $(NULL)
diff --git a/mobile/android/base/MenuItemActionBar.java b/mobile/android/base/MenuItemActionBar.java
new file mode 100644
index 000000000000..bfb7b7689daa
--- /dev/null
+++ b/mobile/android/base/MenuItemActionBar.java
@@ -0,0 +1,83 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ImageButton;
+
+public class MenuItemActionBar extends ImageButton
+                               implements GeckoMenuItem.Layout {
+    private static final String LOGTAG = "GeckoMenuItemActionBar";
+
+    private Context mContext;
+
+    public MenuItemActionBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+
+        DisplayMetrics metrics = new DisplayMetrics();
+        ((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        setLayoutParams(new ViewGroup.LayoutParams((int) (56 * metrics.density),
+                                                   (int) (56 * metrics.density)));
+
+        int padding = (int) (14 * metrics.density);
+        setPadding(padding, padding, padding, padding);
+        setBackgroundResource(R.drawable.action_bar_button);
+        setScaleType(ImageView.ScaleType.FIT_XY);
+    }
+
+    @Override
+    public View getLayout() {
+        return this;
+    }
+
+    @Override
+    public void setIcon(Drawable icon) {
+        if (icon != null) {
+            setImageDrawable(icon);
+            setVisibility(VISIBLE);
+        } else {
+            setVisibility(GONE);
+        }
+    }
+
+    @Override
+    public void setIcon(int icon) {
+        if (icon != 0) {
+            setImageResource(icon);
+            setVisibility(VISIBLE);
+        } else {
+            setVisibility(GONE);
+        }
+    }
+
+    @Override
+    public void setTitle(CharSequence title) {
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        setColorFilter(enabled ? 0 : 0xFF999999);
+    }
+
+    @Override
+    public void setCheckable(boolean checkable) {
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+    }
+}
diff --git a/mobile/android/base/MenuItemDefault.java b/mobile/android/base/MenuItemDefault.java
new file mode 100644
index 000000000000..009127cd7f62
--- /dev/null
+++ b/mobile/android/base/MenuItemDefault.java
@@ -0,0 +1,95 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.Gravity;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.TextView;
+import android.widget.ImageView;
+
+public class MenuItemDefault extends LinearLayout
+                             implements GeckoMenuItem.Layout {
+    private static final String LOGTAG = "GeckoMenuItemDefault";
+
+    private Context mContext;
+
+    private ImageView mIcon;
+    private TextView mTitle;
+    private ImageView mCheck;
+
+    public MenuItemDefault(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContext = context;
+
+        DisplayMetrics metrics = new DisplayMetrics();
+        ((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        setLayoutParams(new LayoutParams((int) (240 * metrics.density),
+                                         (int) (44 * metrics.density)));
+        setBackgroundResource(R.drawable.menu_item_bg);
+
+        inflate(context, R.layout.menu_item, this);
+        mIcon = (ImageView) findViewById(R.id.icon);
+        mTitle = (TextView) findViewById(R.id.title);
+        mCheck = (ImageView) findViewById(R.id.check);
+    }
+
+    @Override
+    public View getLayout() {
+        return this;
+    }
+
+    @Override
+    public void setIcon(Drawable icon) {
+        if (icon != null) {
+            mIcon.setImageDrawable(icon);
+            mIcon.setVisibility(VISIBLE);
+        } else {
+            mIcon.setVisibility(GONE);
+        }
+    }
+
+    @Override
+    public void setIcon(int icon) {
+        if (icon != 0) {
+            mIcon.setImageResource(icon);
+            mIcon.setVisibility(VISIBLE);
+        } else {
+            mIcon.setVisibility(GONE);
+        }
+    }
+
+    @Override
+    public void setTitle(CharSequence title) {
+        mTitle.setText(title);
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        mTitle.setEnabled(enabled);
+        mCheck.setEnabled(enabled);
+        mIcon.setColorFilter(enabled ? 0 : 0xFF999999);
+    }
+
+    @Override
+    public void setCheckable(boolean checkable) {
+        mCheck.setVisibility(checkable ? VISIBLE : GONE);
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        mCheck.setVisibility(checked ? VISIBLE : GONE);
+    }
+}
diff --git a/mobile/android/base/android-sync-files.mk b/mobile/android/base/android-sync-files.mk
index 342ee26890a3..ee30eca15385 100644
--- a/mobile/android/base/android-sync-files.mk
+++ b/mobile/android/base/android-sync-files.mk
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # These files are managed in the android-sync repo. Do not modify directly, or your changes will be lost.
-SYNC_JAVA_FILES := sync/AlreadySyncingException.java sync/CollectionKeys.java sync/CommandProcessor.java sync/CommandRunner.java sync/CredentialsSource.java sync/crypto/CryptoException.java sync/crypto/CryptoInfo.java sync/crypto/HKDF.java sync/crypto/HMACVerificationException.java sync/crypto/KeyBundle.java sync/crypto/MissingCryptoInputException.java sync/crypto/NoKeyBundleException.java sync/crypto/PersistedCrypto5Keys.java sync/CryptoRecord.java sync/DelayedWorkTracker.java sync/delegates/ClientsDataDelegate.java sync/delegates/FreshStartDelegate.java sync/delegates/GlobalSessionCallback.java sync/delegates/InfoCollectionsDelegate.java sync/delegates/KeyUploadDelegate.java sync/delegates/MetaGlobalDelegate.java sync/delegates/WipeServerDelegate.java sync/EngineSettings.java sync/ExtendedJSONObject.java sync/GlobalSession.java sync/HTTPFailureException.java sync/InfoCollections.java sync/jpake/BigIntegerHelper.java sync/jpake/Gx3OrGx4IsZeroOrOneException.java sync/jpake/IncorrectZkpException.java sync/jpake/JPakeClient.java sync/jpake/JPakeCrypto.java sync/jpake/JPakeJson.java sync/jpake/JPakeNoActivePairingException.java sync/jpake/JPakeNumGenerator.java sync/jpake/JPakeNumGeneratorRandom.java sync/jpake/JPakeParty.java sync/jpake/JPakeRequest.java sync/jpake/JPakeRequestDelegate.java sync/jpake/JPakeResponse.java sync/jpake/stage/CompleteStage.java sync/jpake/stage/ComputeFinalStage.java sync/jpake/stage/ComputeKeyVerificationStage.java sync/jpake/stage/ComputeStepOneStage.java sync/jpake/stage/ComputeStepTwoStage.java sync/jpake/stage/DecryptDataStage.java sync/jpake/stage/DeleteChannel.java sync/jpake/stage/GetChannelStage.java sync/jpake/stage/GetRequestStage.java sync/jpake/stage/JPakeStage.java sync/jpake/stage/PutRequestStage.java sync/jpake/stage/VerifyPairingStage.java sync/jpake/Zkp.java sync/KeyBundleProvider.java sync/Logger.java sync/MetaGlobal.java sync/MetaGlobalException.java sync/MetaGlobalMissingEnginesException.java sync/MetaGlobalNotSetException.java sync/middleware/Crypto5MiddlewareRepository.java sync/middleware/Crypto5MiddlewareRepositorySession.java sync/middleware/MiddlewareRepository.java sync/middleware/MiddlewareRepositorySession.java sync/net/BaseResource.java sync/net/CompletedEntity.java sync/net/ConnectionMonitorThread.java sync/net/HandleProgressException.java sync/net/HttpResponseObserver.java sync/net/Resource.java sync/net/ResourceDelegate.java sync/net/SyncResourceDelegate.java sync/net/SyncResponse.java sync/net/SyncStorageCollectionRequest.java sync/net/SyncStorageCollectionRequestDelegate.java sync/net/SyncStorageRecordRequest.java sync/net/SyncStorageRequest.java sync/net/SyncStorageRequestDelegate.java sync/net/SyncStorageRequestIncrementalDelegate.java sync/net/SyncStorageResponse.java sync/net/TLSSocketFactory.java sync/net/WBOCollectionRequestDelegate.java sync/net/WBORequestDelegate.java sync/NoCollectionKeysSetException.java sync/NodeAuthenticationException.java sync/NonArrayJSONException.java sync/NonObjectJSONException.java sync/NullClusterURLException.java sync/PersistedMetaGlobal.java sync/PrefsSource.java sync/receivers/UpgradeReceiver.java sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java sync/repositories/android/AndroidBrowserBookmarksRepository.java sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java sync/repositories/android/AndroidBrowserHistoryDataAccessor.java sync/repositories/android/AndroidBrowserHistoryDataExtender.java sync/repositories/android/AndroidBrowserHistoryRepository.java sync/repositories/android/AndroidBrowserHistoryRepositorySession.java sync/repositories/android/AndroidBrowserRepository.java sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java sync/repositories/android/AndroidBrowserRepositorySession.java sync/repositories/android/BookmarksDeletionManager.java sync/repositories/android/BookmarksInsertionManager.java sync/repositories/android/BrowserContractHelpers.java sync/repositories/android/CachedSQLiteOpenHelper.java sync/repositories/android/ClientsDatabase.java sync/repositories/android/ClientsDatabaseAccessor.java sync/repositories/android/FennecControlHelper.java sync/repositories/android/FennecTabsRepository.java sync/repositories/android/FormHistoryRepositorySession.java sync/repositories/android/PasswordsRepositorySession.java sync/repositories/android/RepoUtils.java sync/repositories/BookmarkNeedsReparentingException.java sync/repositories/BookmarksRepository.java sync/repositories/ConstrainedServer11Repository.java sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionBeginDelegate.java sync/repositories/delegates/RepositorySessionCleanDelegate.java sync/repositories/delegates/RepositorySessionCreationDelegate.java sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/RepositorySessionFinishDelegate.java sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java sync/repositories/delegates/RepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionWipeDelegate.java sync/repositories/domain/BookmarkRecord.java sync/repositories/domain/BookmarkRecordFactory.java sync/repositories/domain/ClientRecord.java sync/repositories/domain/ClientRecordFactory.java sync/repositories/domain/FormHistoryRecord.java sync/repositories/domain/HistoryRecord.java sync/repositories/domain/HistoryRecordFactory.java sync/repositories/domain/PasswordRecord.java sync/repositories/domain/Record.java sync/repositories/domain/TabsRecord.java sync/repositories/domain/VersionConstants.java sync/repositories/HashSetStoreTracker.java sync/repositories/HistoryRepository.java sync/repositories/IdentityRecordFactory.java sync/repositories/InactiveSessionException.java sync/repositories/InvalidBookmarkTypeException.java sync/repositories/InvalidRequestException.java sync/repositories/InvalidSessionTransitionException.java sync/repositories/MultipleRecordsForGuidException.java sync/repositories/NoContentProviderException.java sync/repositories/NoGuidForIdException.java sync/repositories/NoStoreDelegateException.java sync/repositories/NullCursorException.java sync/repositories/ParentNotFoundException.java sync/repositories/ProfileDatabaseException.java sync/repositories/RecordFactory.java sync/repositories/RecordFilter.java sync/repositories/Repository.java sync/repositories/RepositorySession.java sync/repositories/RepositorySessionBundle.java sync/repositories/Server11Repository.java sync/repositories/Server11RepositorySession.java sync/repositories/StoreTracker.java sync/repositories/StoreTrackingRepositorySession.java sync/setup/activities/AccountActivity.java sync/setup/activities/ActivityUtils.java sync/setup/activities/SetupFailureActivity.java sync/setup/activities/SetupSuccessActivity.java sync/setup/activities/SetupSyncActivity.java sync/setup/Constants.java sync/setup/InvalidSyncKeyException.java sync/setup/SyncAccounts.java sync/setup/SyncAuthenticatorService.java sync/stage/AbstractNonRepositorySyncStage.java sync/stage/AndroidBrowserBookmarksServerSyncStage.java sync/stage/AndroidBrowserHistoryServerSyncStage.java sync/stage/CheckPreconditionsStage.java sync/stage/CompletedStage.java sync/stage/EnsureClusterURLStage.java sync/stage/EnsureCrypto5KeysStage.java sync/stage/FennecTabsServerSyncStage.java sync/stage/FetchInfoCollectionsStage.java sync/stage/FetchMetaGlobalStage.java sync/stage/FormHistoryServerSyncStage.java sync/stage/GlobalSyncStage.java sync/stage/NoSuchStageException.java sync/stage/NoSyncIDException.java sync/stage/PasswordsServerSyncStage.java sync/stage/ServerSyncStage.java sync/stage/SyncClientsEngineStage.java sync/stage/UploadMetaGlobalStage.java sync/StubActivity.java sync/syncadapter/SyncAdapter.java sync/syncadapter/SyncService.java sync/SyncConfiguration.java sync/SyncConfigurationException.java sync/SyncException.java sync/synchronizer/ConcurrentRecordConsumer.java sync/synchronizer/RecordConsumer.java sync/synchronizer/RecordsChannel.java sync/synchronizer/RecordsChannelDelegate.java sync/synchronizer/RecordsConsumerDelegate.java sync/synchronizer/SerialRecordConsumer.java sync/synchronizer/SessionNotBegunException.java sync/synchronizer/Synchronizer.java sync/synchronizer/SynchronizerDelegate.java sync/synchronizer/SynchronizerSession.java sync/synchronizer/SynchronizerSessionDelegate.java sync/synchronizer/UnbundleError.java sync/synchronizer/UnexpectedSessionException.java sync/SynchronizerConfiguration.java sync/ThreadPool.java sync/UnexpectedJSONException.java sync/UnknownSynchronizerConfigurationVersionException.java sync/Utils.java
+SYNC_JAVA_FILES := sync/AlreadySyncingException.java sync/CollectionKeys.java sync/CommandProcessor.java sync/CommandRunner.java sync/CredentialsSource.java sync/crypto/CryptoException.java sync/crypto/CryptoInfo.java sync/crypto/HKDF.java sync/crypto/HMACVerificationException.java sync/crypto/KeyBundle.java sync/crypto/MissingCryptoInputException.java sync/crypto/NoKeyBundleException.java sync/crypto/PersistedCrypto5Keys.java sync/CryptoRecord.java sync/DelayedWorkTracker.java sync/delegates/ClientsDataDelegate.java sync/delegates/FreshStartDelegate.java sync/delegates/GlobalSessionCallback.java sync/delegates/InfoCollectionsDelegate.java sync/delegates/KeyUploadDelegate.java sync/delegates/MetaGlobalDelegate.java sync/delegates/WipeServerDelegate.java sync/EngineSettings.java sync/ExtendedJSONObject.java sync/GlobalSession.java sync/HTTPFailureException.java sync/InfoCollections.java sync/jpake/BigIntegerHelper.java sync/jpake/Gx3OrGx4IsZeroOrOneException.java sync/jpake/IncorrectZkpException.java sync/jpake/JPakeClient.java sync/jpake/JPakeCrypto.java sync/jpake/JPakeJson.java sync/jpake/JPakeNoActivePairingException.java sync/jpake/JPakeNumGenerator.java sync/jpake/JPakeNumGeneratorRandom.java sync/jpake/JPakeParty.java sync/jpake/JPakeRequest.java sync/jpake/JPakeRequestDelegate.java sync/jpake/JPakeResponse.java sync/jpake/stage/CompleteStage.java sync/jpake/stage/ComputeFinalStage.java sync/jpake/stage/ComputeKeyVerificationStage.java sync/jpake/stage/ComputeStepOneStage.java sync/jpake/stage/ComputeStepTwoStage.java sync/jpake/stage/DecryptDataStage.java sync/jpake/stage/DeleteChannel.java sync/jpake/stage/GetChannelStage.java sync/jpake/stage/GetRequestStage.java sync/jpake/stage/JPakeStage.java sync/jpake/stage/PutRequestStage.java sync/jpake/stage/VerifyPairingStage.java sync/jpake/Zkp.java sync/KeyBundleProvider.java sync/Logger.java sync/MetaGlobal.java sync/MetaGlobalException.java sync/MetaGlobalMissingEnginesException.java sync/MetaGlobalNotSetException.java sync/middleware/Crypto5MiddlewareRepository.java sync/middleware/Crypto5MiddlewareRepositorySession.java sync/middleware/MiddlewareRepository.java sync/middleware/MiddlewareRepositorySession.java sync/net/BaseResource.java sync/net/CompletedEntity.java sync/net/ConnectionMonitorThread.java sync/net/HandleProgressException.java sync/net/HttpResponseObserver.java sync/net/Resource.java sync/net/ResourceDelegate.java sync/net/SyncResourceDelegate.java sync/net/SyncResponse.java sync/net/SyncStorageCollectionRequest.java sync/net/SyncStorageCollectionRequestDelegate.java sync/net/SyncStorageRecordRequest.java sync/net/SyncStorageRequest.java sync/net/SyncStorageRequestDelegate.java sync/net/SyncStorageRequestIncrementalDelegate.java sync/net/SyncStorageResponse.java sync/net/TLSSocketFactory.java sync/net/WBOCollectionRequestDelegate.java sync/net/WBORequestDelegate.java sync/NoCollectionKeysSetException.java sync/NodeAuthenticationException.java sync/NonArrayJSONException.java sync/NonObjectJSONException.java sync/NullClusterURLException.java sync/PersistedMetaGlobal.java sync/PrefsSource.java sync/receivers/UpgradeReceiver.java sync/repositories/android/AndroidBrowserBookmarksDataAccessor.java sync/repositories/android/AndroidBrowserBookmarksRepository.java sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java sync/repositories/android/AndroidBrowserHistoryDataAccessor.java sync/repositories/android/AndroidBrowserHistoryDataExtender.java sync/repositories/android/AndroidBrowserHistoryRepository.java sync/repositories/android/AndroidBrowserHistoryRepositorySession.java sync/repositories/android/AndroidBrowserRepository.java sync/repositories/android/AndroidBrowserRepositoryDataAccessor.java sync/repositories/android/AndroidBrowserRepositorySession.java sync/repositories/android/BookmarksDeletionManager.java sync/repositories/android/BookmarksInsertionManager.java sync/repositories/android/BrowserContractHelpers.java sync/repositories/android/CachedSQLiteOpenHelper.java sync/repositories/android/ClientsDatabase.java sync/repositories/android/ClientsDatabaseAccessor.java sync/repositories/android/FennecControlHelper.java sync/repositories/android/FennecTabsRepository.java sync/repositories/android/FormHistoryRepositorySession.java sync/repositories/android/PasswordsRepositorySession.java sync/repositories/android/RepoUtils.java sync/repositories/BookmarkNeedsReparentingException.java sync/repositories/BookmarksRepository.java sync/repositories/ConstrainedServer11Repository.java sync/repositories/delegates/DeferrableRepositorySessionCreationDelegate.java sync/repositories/delegates/DeferredRepositorySessionBeginDelegate.java sync/repositories/delegates/DeferredRepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/DeferredRepositorySessionFinishDelegate.java sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionBeginDelegate.java sync/repositories/delegates/RepositorySessionCleanDelegate.java sync/repositories/delegates/RepositorySessionCreationDelegate.java sync/repositories/delegates/RepositorySessionFetchRecordsDelegate.java sync/repositories/delegates/RepositorySessionFinishDelegate.java sync/repositories/delegates/RepositorySessionGuidsSinceDelegate.java sync/repositories/delegates/RepositorySessionStoreDelegate.java sync/repositories/delegates/RepositorySessionWipeDelegate.java sync/repositories/domain/BookmarkRecord.java sync/repositories/domain/BookmarkRecordFactory.java sync/repositories/domain/ClientRecord.java sync/repositories/domain/ClientRecordFactory.java sync/repositories/domain/FormHistoryRecord.java sync/repositories/domain/HistoryRecord.java sync/repositories/domain/HistoryRecordFactory.java sync/repositories/domain/PasswordRecord.java sync/repositories/domain/Record.java sync/repositories/domain/TabsRecord.java sync/repositories/domain/VersionConstants.java sync/repositories/FetchFailedException.java sync/repositories/HashSetStoreTracker.java sync/repositories/HistoryRepository.java sync/repositories/IdentityRecordFactory.java sync/repositories/InactiveSessionException.java sync/repositories/InvalidBookmarkTypeException.java sync/repositories/InvalidRequestException.java sync/repositories/InvalidSessionTransitionException.java sync/repositories/MultipleRecordsForGuidException.java sync/repositories/NoContentProviderException.java sync/repositories/NoGuidForIdException.java sync/repositories/NoStoreDelegateException.java sync/repositories/NullCursorException.java sync/repositories/ParentNotFoundException.java sync/repositories/ProfileDatabaseException.java sync/repositories/RecordFactory.java sync/repositories/RecordFilter.java sync/repositories/Repository.java sync/repositories/RepositorySession.java sync/repositories/RepositorySessionBundle.java sync/repositories/Server11Repository.java sync/repositories/Server11RepositorySession.java sync/repositories/StoreFailedException.java sync/repositories/StoreTracker.java sync/repositories/StoreTrackingRepositorySession.java sync/Server11PreviousPostFailedException.java sync/Server11RecordPostFailedException.java sync/setup/activities/AccountActivity.java sync/setup/activities/ActivityUtils.java sync/setup/activities/SetupFailureActivity.java sync/setup/activities/SetupSuccessActivity.java sync/setup/activities/SetupSyncActivity.java sync/setup/Constants.java sync/setup/InvalidSyncKeyException.java sync/setup/SyncAccounts.java sync/setup/SyncAuthenticatorService.java sync/stage/AbstractNonRepositorySyncStage.java sync/stage/AndroidBrowserBookmarksServerSyncStage.java sync/stage/AndroidBrowserHistoryServerSyncStage.java sync/stage/CheckPreconditionsStage.java sync/stage/CompletedStage.java sync/stage/EnsureClusterURLStage.java sync/stage/EnsureCrypto5KeysStage.java sync/stage/FennecTabsServerSyncStage.java sync/stage/FetchInfoCollectionsStage.java sync/stage/FetchMetaGlobalStage.java sync/stage/FormHistoryServerSyncStage.java sync/stage/GlobalSyncStage.java sync/stage/NoSuchStageException.java sync/stage/NoSyncIDException.java sync/stage/PasswordsServerSyncStage.java sync/stage/ServerSyncStage.java sync/stage/SyncClientsEngineStage.java sync/stage/UploadMetaGlobalStage.java sync/StubActivity.java sync/syncadapter/SyncAdapter.java sync/syncadapter/SyncService.java sync/SyncConfiguration.java sync/SyncConfigurationException.java sync/SyncException.java sync/synchronizer/ConcurrentRecordConsumer.java sync/synchronizer/RecordConsumer.java sync/synchronizer/RecordsChannel.java sync/synchronizer/RecordsChannelDelegate.java sync/synchronizer/RecordsConsumerDelegate.java sync/synchronizer/SerialRecordConsumer.java sync/synchronizer/ServerLocalSynchronizer.java sync/synchronizer/ServerLocalSynchronizerSession.java sync/synchronizer/SessionNotBegunException.java sync/synchronizer/Synchronizer.java sync/synchronizer/SynchronizerDelegate.java sync/synchronizer/SynchronizerSession.java sync/synchronizer/SynchronizerSessionDelegate.java sync/synchronizer/UnbundleError.java sync/synchronizer/UnexpectedSessionException.java sync/SynchronizerConfiguration.java sync/ThreadPool.java sync/UnexpectedJSONException.java sync/UnknownSynchronizerConfigurationVersionException.java sync/Utils.java
 SYNC_PP_JAVA_FILES := sync/GlobalConstants.java
 SYNC_THIRDPARTY_JAVA_FILES := httpclientandroidlib/androidextra/HttpClientAndroidLog.java httpclientandroidlib/annotation/GuardedBy.java httpclientandroidlib/annotation/Immutable.java httpclientandroidlib/annotation/NotThreadSafe.java httpclientandroidlib/annotation/ThreadSafe.java httpclientandroidlib/auth/AUTH.java httpclientandroidlib/auth/AuthenticationException.java httpclientandroidlib/auth/AuthScheme.java httpclientandroidlib/auth/AuthSchemeFactory.java httpclientandroidlib/auth/AuthSchemeRegistry.java httpclientandroidlib/auth/AuthScope.java httpclientandroidlib/auth/AuthState.java httpclientandroidlib/auth/BasicUserPrincipal.java httpclientandroidlib/auth/ContextAwareAuthScheme.java httpclientandroidlib/auth/Credentials.java httpclientandroidlib/auth/InvalidCredentialsException.java httpclientandroidlib/auth/MalformedChallengeException.java httpclientandroidlib/auth/NTCredentials.java httpclientandroidlib/auth/NTUserPrincipal.java httpclientandroidlib/auth/params/AuthParamBean.java httpclientandroidlib/auth/params/AuthParams.java httpclientandroidlib/auth/params/AuthPNames.java httpclientandroidlib/auth/UsernamePasswordCredentials.java httpclientandroidlib/client/AuthCache.java httpclientandroidlib/client/AuthenticationHandler.java httpclientandroidlib/client/CircularRedirectException.java httpclientandroidlib/client/ClientProtocolException.java httpclientandroidlib/client/CookieStore.java httpclientandroidlib/client/CredentialsProvider.java httpclientandroidlib/client/entity/DecompressingEntity.java httpclientandroidlib/client/entity/DeflateDecompressingEntity.java httpclientandroidlib/client/entity/GzipDecompressingEntity.java httpclientandroidlib/client/entity/UrlEncodedFormEntity.java httpclientandroidlib/client/HttpClient.java httpclientandroidlib/client/HttpRequestRetryHandler.java httpclientandroidlib/client/HttpResponseException.java httpclientandroidlib/client/methods/AbortableHttpRequest.java httpclientandroidlib/client/methods/HttpDelete.java httpclientandroidlib/client/methods/HttpEntityEnclosingRequestBase.java httpclientandroidlib/client/methods/HttpGet.java httpclientandroidlib/client/methods/HttpHead.java httpclientandroidlib/client/methods/HttpOptions.java httpclientandroidlib/client/methods/HttpPost.java httpclientandroidlib/client/methods/HttpPut.java httpclientandroidlib/client/methods/HttpRequestBase.java httpclientandroidlib/client/methods/HttpTrace.java httpclientandroidlib/client/methods/HttpUriRequest.java httpclientandroidlib/client/NonRepeatableRequestException.java httpclientandroidlib/client/params/AllClientPNames.java httpclientandroidlib/client/params/AuthPolicy.java httpclientandroidlib/client/params/ClientParamBean.java httpclientandroidlib/client/params/ClientPNames.java httpclientandroidlib/client/params/CookiePolicy.java httpclientandroidlib/client/params/HttpClientParams.java httpclientandroidlib/client/protocol/ClientContext.java httpclientandroidlib/client/protocol/ClientContextConfigurer.java httpclientandroidlib/client/protocol/RequestAcceptEncoding.java httpclientandroidlib/client/protocol/RequestAddCookies.java httpclientandroidlib/client/protocol/RequestAuthCache.java httpclientandroidlib/client/protocol/RequestClientConnControl.java httpclientandroidlib/client/protocol/RequestDefaultHeaders.java httpclientandroidlib/client/protocol/RequestProxyAuthentication.java httpclientandroidlib/client/protocol/RequestTargetAuthentication.java httpclientandroidlib/client/protocol/ResponseAuthCache.java httpclientandroidlib/client/protocol/ResponseContentEncoding.java httpclientandroidlib/client/protocol/ResponseProcessCookies.java httpclientandroidlib/client/RedirectException.java httpclientandroidlib/client/RedirectHandler.java httpclientandroidlib/client/RedirectStrategy.java httpclientandroidlib/client/RequestDirector.java httpclientandroidlib/client/ResponseHandler.java httpclientandroidlib/client/UserTokenHandler.java httpclientandroidlib/client/utils/CloneUtils.java httpclientandroidlib/client/utils/Idn.java httpclientandroidlib/client/utils/JdkIdn.java httpclientandroidlib/client/utils/Punycode.java httpclientandroidlib/client/utils/Rfc3492Idn.java httpclientandroidlib/client/utils/URIUtils.java httpclientandroidlib/client/utils/URLEncodedUtils.java httpclientandroidlib/conn/BasicEofSensorWatcher.java httpclientandroidlib/conn/BasicManagedEntity.java httpclientandroidlib/conn/ClientConnectionManager.java httpclientandroidlib/conn/ClientConnectionManagerFactory.java httpclientandroidlib/conn/ClientConnectionOperator.java httpclientandroidlib/conn/ClientConnectionRequest.java httpclientandroidlib/conn/ConnectionKeepAliveStrategy.java httpclientandroidlib/conn/ConnectionPoolTimeoutException.java httpclientandroidlib/conn/ConnectionReleaseTrigger.java httpclientandroidlib/conn/ConnectTimeoutException.java httpclientandroidlib/conn/EofSensorInputStream.java httpclientandroidlib/conn/EofSensorWatcher.java httpclientandroidlib/conn/HttpHostConnectException.java httpclientandroidlib/conn/HttpRoutedConnection.java httpclientandroidlib/conn/ManagedClientConnection.java httpclientandroidlib/conn/MultihomePlainSocketFactory.java httpclientandroidlib/conn/OperatedClientConnection.java httpclientandroidlib/conn/params/ConnConnectionParamBean.java httpclientandroidlib/conn/params/ConnConnectionPNames.java httpclientandroidlib/conn/params/ConnManagerParamBean.java httpclientandroidlib/conn/params/ConnManagerParams.java httpclientandroidlib/conn/params/ConnManagerPNames.java httpclientandroidlib/conn/params/ConnPerRoute.java httpclientandroidlib/conn/params/ConnPerRouteBean.java httpclientandroidlib/conn/params/ConnRouteParamBean.java httpclientandroidlib/conn/params/ConnRouteParams.java httpclientandroidlib/conn/params/ConnRoutePNames.java httpclientandroidlib/conn/routing/BasicRouteDirector.java httpclientandroidlib/conn/routing/HttpRoute.java httpclientandroidlib/conn/routing/HttpRouteDirector.java httpclientandroidlib/conn/routing/HttpRoutePlanner.java httpclientandroidlib/conn/routing/RouteInfo.java httpclientandroidlib/conn/routing/RouteTracker.java httpclientandroidlib/conn/scheme/HostNameResolver.java httpclientandroidlib/conn/scheme/LayeredSchemeSocketFactory.java httpclientandroidlib/conn/scheme/LayeredSchemeSocketFactoryAdaptor.java httpclientandroidlib/conn/scheme/LayeredSocketFactory.java httpclientandroidlib/conn/scheme/LayeredSocketFactoryAdaptor.java httpclientandroidlib/conn/scheme/PlainSocketFactory.java httpclientandroidlib/conn/scheme/Scheme.java httpclientandroidlib/conn/scheme/SchemeRegistry.java httpclientandroidlib/conn/scheme/SchemeSocketFactory.java httpclientandroidlib/conn/scheme/SchemeSocketFactoryAdaptor.java httpclientandroidlib/conn/scheme/SocketFactory.java httpclientandroidlib/conn/scheme/SocketFactoryAdaptor.java httpclientandroidlib/conn/ssl/AbstractVerifier.java httpclientandroidlib/conn/ssl/AllowAllHostnameVerifier.java httpclientandroidlib/conn/ssl/BrowserCompatHostnameVerifier.java httpclientandroidlib/conn/ssl/SSLSocketFactory.java httpclientandroidlib/conn/ssl/StrictHostnameVerifier.java httpclientandroidlib/conn/ssl/TrustManagerDecorator.java httpclientandroidlib/conn/ssl/TrustSelfSignedStrategy.java httpclientandroidlib/conn/ssl/TrustStrategy.java httpclientandroidlib/conn/ssl/X509HostnameVerifier.java httpclientandroidlib/conn/util/InetAddressUtils.java httpclientandroidlib/ConnectionClosedException.java httpclientandroidlib/ConnectionReuseStrategy.java httpclientandroidlib/cookie/ClientCookie.java httpclientandroidlib/cookie/Cookie.java httpclientandroidlib/cookie/CookieAttributeHandler.java httpclientandroidlib/cookie/CookieIdentityComparator.java httpclientandroidlib/cookie/CookieOrigin.java httpclientandroidlib/cookie/CookiePathComparator.java httpclientandroidlib/cookie/CookieRestrictionViolationException.java httpclientandroidlib/cookie/CookieSpec.java httpclientandroidlib/cookie/CookieSpecFactory.java httpclientandroidlib/cookie/CookieSpecRegistry.java httpclientandroidlib/cookie/MalformedCookieException.java httpclientandroidlib/cookie/params/CookieSpecParamBean.java httpclientandroidlib/cookie/params/CookieSpecPNames.java httpclientandroidlib/cookie/SetCookie.java httpclientandroidlib/cookie/SetCookie2.java httpclientandroidlib/cookie/SM.java httpclientandroidlib/entity/AbstractHttpEntity.java httpclientandroidlib/entity/BasicHttpEntity.java httpclientandroidlib/entity/BufferedHttpEntity.java httpclientandroidlib/entity/ByteArrayEntity.java httpclientandroidlib/entity/ContentLengthStrategy.java httpclientandroidlib/entity/ContentProducer.java httpclientandroidlib/entity/EntityTemplate.java httpclientandroidlib/entity/FileEntity.java httpclientandroidlib/entity/HttpEntityWrapper.java httpclientandroidlib/entity/InputStreamEntity.java httpclientandroidlib/entity/SerializableEntity.java httpclientandroidlib/entity/StringEntity.java httpclientandroidlib/FormattedHeader.java httpclientandroidlib/Header.java httpclientandroidlib/HeaderElement.java httpclientandroidlib/HeaderElementIterator.java httpclientandroidlib/HeaderIterator.java httpclientandroidlib/HttpClientConnection.java httpclientandroidlib/HttpConnection.java httpclientandroidlib/HttpConnectionMetrics.java httpclientandroidlib/HttpEntity.java httpclientandroidlib/HttpEntityEnclosingRequest.java httpclientandroidlib/HttpException.java httpclientandroidlib/HttpHeaders.java httpclientandroidlib/HttpHost.java httpclientandroidlib/HttpInetConnection.java httpclientandroidlib/HttpMessage.java httpclientandroidlib/HttpRequest.java httpclientandroidlib/HttpRequestFactory.java httpclientandroidlib/HttpRequestInterceptor.java httpclientandroidlib/HttpResponse.java httpclientandroidlib/HttpResponseFactory.java httpclientandroidlib/HttpResponseInterceptor.java httpclientandroidlib/HttpServerConnection.java httpclientandroidlib/HttpStatus.java httpclientandroidlib/HttpVersion.java httpclientandroidlib/impl/AbstractHttpClientConnection.java httpclientandroidlib/impl/AbstractHttpServerConnection.java httpclientandroidlib/impl/auth/AuthSchemeBase.java httpclientandroidlib/impl/auth/BasicScheme.java httpclientandroidlib/impl/auth/BasicSchemeFactory.java httpclientandroidlib/impl/auth/DigestScheme.java httpclientandroidlib/impl/auth/DigestSchemeFactory.java httpclientandroidlib/impl/auth/NTLMEngine.java httpclientandroidlib/impl/auth/NTLMEngineException.java httpclientandroidlib/impl/auth/NTLMEngineImpl.java httpclientandroidlib/impl/auth/NTLMScheme.java httpclientandroidlib/impl/auth/NTLMSchemeFactory.java httpclientandroidlib/impl/auth/RFC2617Scheme.java httpclientandroidlib/impl/auth/SpnegoTokenGenerator.java httpclientandroidlib/impl/auth/UnsupportedDigestAlgorithmException.java httpclientandroidlib/impl/client/AbstractAuthenticationHandler.java httpclientandroidlib/impl/client/AbstractHttpClient.java httpclientandroidlib/impl/client/BasicAuthCache.java httpclientandroidlib/impl/client/BasicCookieStore.java httpclientandroidlib/impl/client/BasicCredentialsProvider.java httpclientandroidlib/impl/client/BasicResponseHandler.java httpclientandroidlib/impl/client/ClientParamsStack.java httpclientandroidlib/impl/client/ContentEncodingHttpClient.java httpclientandroidlib/impl/client/DefaultConnectionKeepAliveStrategy.java httpclientandroidlib/impl/client/DefaultHttpClient.java httpclientandroidlib/impl/client/DefaultHttpRequestRetryHandler.java httpclientandroidlib/impl/client/DefaultProxyAuthenticationHandler.java httpclientandroidlib/impl/client/DefaultRedirectHandler.java httpclientandroidlib/impl/client/DefaultRedirectStrategy.java httpclientandroidlib/impl/client/DefaultRedirectStrategyAdaptor.java httpclientandroidlib/impl/client/DefaultRequestDirector.java httpclientandroidlib/impl/client/DefaultTargetAuthenticationHandler.java httpclientandroidlib/impl/client/DefaultUserTokenHandler.java httpclientandroidlib/impl/client/EntityEnclosingRequestWrapper.java httpclientandroidlib/impl/client/RedirectLocations.java httpclientandroidlib/impl/client/RequestWrapper.java httpclientandroidlib/impl/client/RoutedRequest.java httpclientandroidlib/impl/client/TunnelRefusedException.java httpclientandroidlib/impl/conn/AbstractClientConnAdapter.java httpclientandroidlib/impl/conn/AbstractPooledConnAdapter.java httpclientandroidlib/impl/conn/AbstractPoolEntry.java httpclientandroidlib/impl/conn/ConnectionShutdownException.java httpclientandroidlib/impl/conn/DefaultClientConnection.java httpclientandroidlib/impl/conn/DefaultClientConnectionOperator.java httpclientandroidlib/impl/conn/DefaultHttpRoutePlanner.java httpclientandroidlib/impl/conn/DefaultResponseParser.java httpclientandroidlib/impl/conn/HttpInetSocketAddress.java httpclientandroidlib/impl/conn/IdleConnectionHandler.java httpclientandroidlib/impl/conn/LoggingSessionInputBuffer.java httpclientandroidlib/impl/conn/LoggingSessionOutputBuffer.java httpclientandroidlib/impl/conn/ProxySelectorRoutePlanner.java httpclientandroidlib/impl/conn/SchemeRegistryFactory.java httpclientandroidlib/impl/conn/SingleClientConnManager.java httpclientandroidlib/impl/conn/tsccm/AbstractConnPool.java httpclientandroidlib/impl/conn/tsccm/BasicPooledConnAdapter.java httpclientandroidlib/impl/conn/tsccm/BasicPoolEntry.java httpclientandroidlib/impl/conn/tsccm/BasicPoolEntryRef.java httpclientandroidlib/impl/conn/tsccm/ConnPoolByRoute.java httpclientandroidlib/impl/conn/tsccm/PoolEntryRequest.java httpclientandroidlib/impl/conn/tsccm/RefQueueHandler.java httpclientandroidlib/impl/conn/tsccm/RefQueueWorker.java httpclientandroidlib/impl/conn/tsccm/RouteSpecificPool.java httpclientandroidlib/impl/conn/tsccm/ThreadSafeClientConnManager.java httpclientandroidlib/impl/conn/tsccm/WaitingThread.java httpclientandroidlib/impl/conn/tsccm/WaitingThreadAborter.java httpclientandroidlib/impl/conn/Wire.java httpclientandroidlib/impl/cookie/AbstractCookieAttributeHandler.java httpclientandroidlib/impl/cookie/AbstractCookieSpec.java httpclientandroidlib/impl/cookie/BasicClientCookie.java httpclientandroidlib/impl/cookie/BasicClientCookie2.java httpclientandroidlib/impl/cookie/BasicCommentHandler.java httpclientandroidlib/impl/cookie/BasicDomainHandler.java httpclientandroidlib/impl/cookie/BasicExpiresHandler.java httpclientandroidlib/impl/cookie/BasicMaxAgeHandler.java httpclientandroidlib/impl/cookie/BasicPathHandler.java httpclientandroidlib/impl/cookie/BasicSecureHandler.java httpclientandroidlib/impl/cookie/BestMatchSpec.java httpclientandroidlib/impl/cookie/BestMatchSpecFactory.java httpclientandroidlib/impl/cookie/BrowserCompatSpec.java httpclientandroidlib/impl/cookie/BrowserCompatSpecFactory.java httpclientandroidlib/impl/cookie/CookieSpecBase.java httpclientandroidlib/impl/cookie/DateParseException.java httpclientandroidlib/impl/cookie/DateUtils.java httpclientandroidlib/impl/cookie/IgnoreSpec.java httpclientandroidlib/impl/cookie/IgnoreSpecFactory.java httpclientandroidlib/impl/cookie/NetscapeDomainHandler.java httpclientandroidlib/impl/cookie/NetscapeDraftHeaderParser.java httpclientandroidlib/impl/cookie/NetscapeDraftSpec.java httpclientandroidlib/impl/cookie/NetscapeDraftSpecFactory.java httpclientandroidlib/impl/cookie/PublicSuffixFilter.java httpclientandroidlib/impl/cookie/PublicSuffixListParser.java httpclientandroidlib/impl/cookie/RFC2109DomainHandler.java httpclientandroidlib/impl/cookie/RFC2109Spec.java httpclientandroidlib/impl/cookie/RFC2109SpecFactory.java httpclientandroidlib/impl/cookie/RFC2109VersionHandler.java httpclientandroidlib/impl/cookie/RFC2965CommentUrlAttributeHandler.java httpclientandroidlib/impl/cookie/RFC2965DiscardAttributeHandler.java httpclientandroidlib/impl/cookie/RFC2965DomainAttributeHandler.java httpclientandroidlib/impl/cookie/RFC2965PortAttributeHandler.java httpclientandroidlib/impl/cookie/RFC2965Spec.java httpclientandroidlib/impl/cookie/RFC2965SpecFactory.java httpclientandroidlib/impl/cookie/RFC2965VersionAttributeHandler.java httpclientandroidlib/impl/DefaultConnectionReuseStrategy.java httpclientandroidlib/impl/DefaultHttpClientConnection.java httpclientandroidlib/impl/DefaultHttpRequestFactory.java httpclientandroidlib/impl/DefaultHttpResponseFactory.java httpclientandroidlib/impl/DefaultHttpServerConnection.java httpclientandroidlib/impl/EnglishReasonPhraseCatalog.java httpclientandroidlib/impl/entity/EntityDeserializer.java httpclientandroidlib/impl/entity/EntitySerializer.java httpclientandroidlib/impl/entity/LaxContentLengthStrategy.java httpclientandroidlib/impl/entity/StrictContentLengthStrategy.java httpclientandroidlib/impl/HttpConnectionMetricsImpl.java httpclientandroidlib/impl/io/AbstractMessageParser.java httpclientandroidlib/impl/io/AbstractMessageWriter.java httpclientandroidlib/impl/io/AbstractSessionInputBuffer.java httpclientandroidlib/impl/io/AbstractSessionOutputBuffer.java httpclientandroidlib/impl/io/ChunkedInputStream.java httpclientandroidlib/impl/io/ChunkedOutputStream.java httpclientandroidlib/impl/io/ContentLengthInputStream.java httpclientandroidlib/impl/io/ContentLengthOutputStream.java httpclientandroidlib/impl/io/HttpRequestParser.java httpclientandroidlib/impl/io/HttpRequestWriter.java httpclientandroidlib/impl/io/HttpResponseParser.java httpclientandroidlib/impl/io/HttpResponseWriter.java httpclientandroidlib/impl/io/HttpTransportMetricsImpl.java httpclientandroidlib/impl/io/IdentityInputStream.java httpclientandroidlib/impl/io/IdentityOutputStream.java httpclientandroidlib/impl/io/SocketInputBuffer.java httpclientandroidlib/impl/io/SocketOutputBuffer.java httpclientandroidlib/impl/NoConnectionReuseStrategy.java httpclientandroidlib/impl/SocketHttpClientConnection.java httpclientandroidlib/impl/SocketHttpServerConnection.java httpclientandroidlib/io/BufferInfo.java httpclientandroidlib/io/EofSensor.java httpclientandroidlib/io/HttpMessageParser.java httpclientandroidlib/io/HttpMessageWriter.java httpclientandroidlib/io/HttpTransportMetrics.java httpclientandroidlib/io/SessionInputBuffer.java httpclientandroidlib/io/SessionOutputBuffer.java httpclientandroidlib/MalformedChunkCodingException.java httpclientandroidlib/message/AbstractHttpMessage.java httpclientandroidlib/message/BasicHeader.java httpclientandroidlib/message/BasicHeaderElement.java httpclientandroidlib/message/BasicHeaderElementIterator.java httpclientandroidlib/message/BasicHeaderIterator.java httpclientandroidlib/message/BasicHeaderValueFormatter.java httpclientandroidlib/message/BasicHeaderValueParser.java httpclientandroidlib/message/BasicHttpEntityEnclosingRequest.java httpclientandroidlib/message/BasicHttpRequest.java httpclientandroidlib/message/BasicHttpResponse.java httpclientandroidlib/message/BasicLineFormatter.java httpclientandroidlib/message/BasicLineParser.java httpclientandroidlib/message/BasicListHeaderIterator.java httpclientandroidlib/message/BasicNameValuePair.java httpclientandroidlib/message/BasicRequestLine.java httpclientandroidlib/message/BasicStatusLine.java httpclientandroidlib/message/BasicTokenIterator.java httpclientandroidlib/message/BufferedHeader.java httpclientandroidlib/message/HeaderGroup.java httpclientandroidlib/message/HeaderValueFormatter.java httpclientandroidlib/message/HeaderValueParser.java httpclientandroidlib/message/LineFormatter.java httpclientandroidlib/message/LineParser.java httpclientandroidlib/message/ParserCursor.java httpclientandroidlib/MethodNotSupportedException.java httpclientandroidlib/NameValuePair.java httpclientandroidlib/NoHttpResponseException.java httpclientandroidlib/params/AbstractHttpParams.java httpclientandroidlib/params/BasicHttpParams.java httpclientandroidlib/params/CoreConnectionPNames.java httpclientandroidlib/params/CoreProtocolPNames.java httpclientandroidlib/params/DefaultedHttpParams.java httpclientandroidlib/params/HttpAbstractParamBean.java httpclientandroidlib/params/HttpConnectionParamBean.java httpclientandroidlib/params/HttpConnectionParams.java httpclientandroidlib/params/HttpParams.java httpclientandroidlib/params/HttpProtocolParamBean.java httpclientandroidlib/params/HttpProtocolParams.java httpclientandroidlib/params/SyncBasicHttpParams.java httpclientandroidlib/ParseException.java httpclientandroidlib/protocol/BasicHttpContext.java httpclientandroidlib/protocol/BasicHttpProcessor.java httpclientandroidlib/protocol/DefaultedHttpContext.java httpclientandroidlib/protocol/ExecutionContext.java httpclientandroidlib/protocol/HTTP.java httpclientandroidlib/protocol/HttpContext.java httpclientandroidlib/protocol/HttpDateGenerator.java httpclientandroidlib/protocol/HttpExpectationVerifier.java httpclientandroidlib/protocol/HttpProcessor.java httpclientandroidlib/protocol/HttpRequestExecutor.java httpclientandroidlib/protocol/HttpRequestHandler.java httpclientandroidlib/protocol/HttpRequestHandlerRegistry.java httpclientandroidlib/protocol/HttpRequestHandlerResolver.java httpclientandroidlib/protocol/HttpRequestInterceptorList.java httpclientandroidlib/protocol/HttpResponseInterceptorList.java httpclientandroidlib/protocol/HttpService.java httpclientandroidlib/protocol/ImmutableHttpProcessor.java httpclientandroidlib/protocol/RequestConnControl.java httpclientandroidlib/protocol/RequestContent.java httpclientandroidlib/protocol/RequestDate.java httpclientandroidlib/protocol/RequestExpectContinue.java httpclientandroidlib/protocol/RequestTargetHost.java httpclientandroidlib/protocol/RequestUserAgent.java httpclientandroidlib/protocol/ResponseConnControl.java httpclientandroidlib/protocol/ResponseContent.java httpclientandroidlib/protocol/ResponseDate.java httpclientandroidlib/protocol/ResponseServer.java httpclientandroidlib/protocol/SyncBasicHttpContext.java httpclientandroidlib/protocol/UriPatternMatcher.java httpclientandroidlib/ProtocolException.java httpclientandroidlib/ProtocolVersion.java httpclientandroidlib/ReasonPhraseCatalog.java httpclientandroidlib/RequestLine.java httpclientandroidlib/StatusLine.java httpclientandroidlib/TokenIterator.java httpclientandroidlib/TruncatedChunkException.java httpclientandroidlib/UnsupportedHttpVersionException.java httpclientandroidlib/util/ByteArrayBuffer.java httpclientandroidlib/util/CharArrayBuffer.java httpclientandroidlib/util/EncodingUtils.java httpclientandroidlib/util/EntityUtils.java httpclientandroidlib/util/ExceptionUtils.java httpclientandroidlib/util/LangUtils.java httpclientandroidlib/util/VersionInfo.java json-simple/ItemList.java json-simple/JSONArray.java json-simple/JSONAware.java json-simple/JSONObject.java json-simple/JSONStreamAware.java json-simple/JSONValue.java json-simple/parser/ContainerFactory.java json-simple/parser/ContentHandler.java json-simple/parser/JSONParser.java json-simple/parser/ParseException.java json-simple/parser/Yylex.java json-simple/parser/Yytoken.java apache/commons/codec/binary/Base32.java apache/commons/codec/binary/Base32InputStream.java apache/commons/codec/binary/Base32OutputStream.java apache/commons/codec/binary/Base64.java apache/commons/codec/binary/Base64InputStream.java apache/commons/codec/binary/Base64OutputStream.java apache/commons/codec/binary/BaseNCodec.java apache/commons/codec/binary/BaseNCodecInputStream.java apache/commons/codec/binary/BaseNCodecOutputStream.java apache/commons/codec/binary/BinaryCodec.java apache/commons/codec/binary/Hex.java apache/commons/codec/binary/StringUtils.java apache/commons/codec/BinaryDecoder.java apache/commons/codec/BinaryEncoder.java apache/commons/codec/CharEncoding.java apache/commons/codec/Decoder.java apache/commons/codec/DecoderException.java apache/commons/codec/digest/DigestUtils.java apache/commons/codec/Encoder.java apache/commons/codec/EncoderException.java apache/commons/codec/language/AbstractCaverphone.java apache/commons/codec/language/Caverphone.java apache/commons/codec/language/Caverphone1.java apache/commons/codec/language/Caverphone2.java apache/commons/codec/language/ColognePhonetic.java apache/commons/codec/language/DoubleMetaphone.java apache/commons/codec/language/Metaphone.java apache/commons/codec/language/RefinedSoundex.java apache/commons/codec/language/Soundex.java apache/commons/codec/language/SoundexUtils.java apache/commons/codec/net/BCodec.java apache/commons/codec/net/QCodec.java apache/commons/codec/net/QuotedPrintableCodec.java apache/commons/codec/net/RFC1522Codec.java apache/commons/codec/net/URLCodec.java apache/commons/codec/net/Utils.java apache/commons/codec/StringDecoder.java apache/commons/codec/StringEncoder.java apache/commons/codec/StringEncoderComparator.java
 SYNC_RES_DRAWABLE := mobile/android/base/resources/drawable/pin_background.xml mobile/android/base/resources/drawable/sync_ic_launcher.png
diff --git a/mobile/android/base/locales/en-US/sync_strings.dtd b/mobile/android/base/locales/en-US/sync_strings.dtd
index a0a403d5e965..24e21cf4c5cf 100644
--- a/mobile/android/base/locales/en-US/sync_strings.dtd
+++ b/mobile/android/base/locales/en-US/sync_strings.dtd
@@ -44,9 +44,9 @@
   
 <!-- Setup Success -->
 <!ENTITY sync.title.success.label 'Setup Complete'>
-<!ENTITY sync.subtitle.success.label 'Your data is now being downloaded in the background. You can go to Settings to manage your account.'>
+<!ENTITY sync.subtitle.success.label1 'Your data is now being downloaded in the background. You can go to Settings to manage your account, or start browsing with &brandShortName;.'>
 <!ENTITY sync.settings.label 'Settings'>
-<!ENTITY sync.subtitle.manage.label 'Your &syncBrand.fullName.label; account is already set up. Go to Settings to manage your account.'>
+<!ENTITY sync.subtitle.manage.label1 'Your &syncBrand.fullName.label; account is already set up. You can go to Settings to manage your account, or launch &brandShortName;.'>
 
 <!-- Pair Device -->
 <!ENTITY sync.pair.tryagain.label 'Please try again.'>
diff --git a/mobile/android/base/resources/color/menu_item_title.xml b/mobile/android/base/resources/color/menu_item_title.xml
new file mode 100644
index 000000000000..51eb26bf36c5
--- /dev/null
+++ b/mobile/android/base/resources/color/menu_item_title.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false" android:color="#999999" />
+    <item android:color="#222222"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_clear_site_settings.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_clear_site_settings.png
new file mode 100644
index 000000000000..7c20ff643629
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_clear_site_settings.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png
index cc2198ae2568..1d3c9c989af2 100644
Binary files a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png and b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png
index 82ce79b8239d..30434d4cd7d4 100644
Binary files a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png and b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_save_as_pdf.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
index 0bcb0985abb9..483edc20f9fd 100644
Binary files a/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png and b/mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/menu_item_check.png b/mobile/android/base/resources/drawable-hdpi-v11/menu_item_check.png
new file mode 100644
index 000000000000..5fa52a90f090
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/menu_item_check.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/menu_item_pressed_texture.png b/mobile/android/base/resources/drawable-hdpi-v11/menu_item_pressed_texture.png
new file mode 100644
index 000000000000..a03ebd6110f5
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/menu_item_pressed_texture.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/menu_item_texture.png b/mobile/android/base/resources/drawable-hdpi-v11/menu_item_texture.png
new file mode 100644
index 000000000000..98792b726d9b
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/menu_item_texture.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/menu_panel_bg.9.png b/mobile/android/base/resources/drawable-hdpi-v11/menu_panel_bg.9.png
new file mode 100644
index 000000000000..4c7941077254
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/menu_panel_bg.9.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/menu_popup_arrow.png b/mobile/android/base/resources/drawable-hdpi-v11/menu_popup_arrow.png
new file mode 100644
index 000000000000..b92008466d4d
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/menu_popup_arrow.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi-v11/menu_popup_bg.9.png b/mobile/android/base/resources/drawable-hdpi-v11/menu_popup_bg.9.png
new file mode 100644
index 000000000000..b42cebfaad47
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi-v11/menu_popup_bg.9.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable-hdpi/address_bar_url_bg.9.png
deleted file mode 100644
index 81cecd004bb5..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/address_bar_url_bg.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-hdpi/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-hdpi/address_bar_url_default.9.png
new file mode 100644
index 000000000000..19974a096aa6
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-hdpi/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable-hdpi/address_bar_url_outline.9.png
deleted file mode 100644
index b28c9dc72276..000000000000
Binary files a/mobile/android/base/resources/drawable-hdpi/address_bar_url_outline.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..1bf82c73bcbf
Binary files /dev/null and b/mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_bg.9.png
deleted file mode 100644
index 6ec92f9fb94e..000000000000
Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_bg.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_default.9.png
new file mode 100644
index 000000000000..4e6fec0c34fe
Binary files /dev/null and b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_outline.9.png
deleted file mode 100644
index 2da03c826069..000000000000
Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_outline.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..3713f1b9270e
Binary files /dev/null and b/mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_bg.9.png
deleted file mode 100644
index b9f5ab414c98..000000000000
Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_bg.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_default.9.png
new file mode 100644
index 000000000000..d894baf5f768
Binary files /dev/null and b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_outline.9.png
deleted file mode 100644
index 4a8dc9ddde52..000000000000
Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_outline.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..afd8b9332b7b
Binary files /dev/null and b/mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-land-v14/address_bar_bg.xml b/mobile/android/base/resources/drawable-land-v14/address_bar_bg.xml
index a24018c4b16c..91e1147afbfc 100644
--- a/mobile/android/base/resources/drawable-land-v14/address_bar_bg.xml
+++ b/mobile/android/base/resources/drawable-land-v14/address_bar_bg.xml
@@ -3,13 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:right="34dp">
-        <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-            android:src="@drawable/address_bar_texture_land"
-            android:tileMode="repeat"
-            android:dither="false"/>
-     </item>
-
-</layer-list>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/address_bar_texture_land"
+        android:tileMode="repeat"
+        android:dither="false"/>
diff --git a/mobile/android/base/resources/drawable-land-v14/address_bar_pressed_bg.xml b/mobile/android/base/resources/drawable-land-v14/address_bar_pressed_bg.xml
index 4ede5a1dc4c6..bf7f4e61e644 100644
--- a/mobile/android/base/resources/drawable-land-v14/address_bar_pressed_bg.xml
+++ b/mobile/android/base/resources/drawable-land-v14/address_bar_pressed_bg.xml
@@ -3,13 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:right="34dp">
-        <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-            android:src="@drawable/address_bar_pressed_texture_land"
-            android:tileMode="repeat"
-            android:dither="false"/>
-     </item>
-
-</layer-list>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/address_bar_pressed_texture_land"
+        android:tileMode="repeat"
+        android:dither="false"/>
diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_bg.9.png
deleted file mode 100644
index ad6804322d18..000000000000
Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_bg.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_default.9.png
new file mode 100644
index 000000000000..d8f0d6d28bea
Binary files /dev/null and b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_outline.9.png
deleted file mode 100644
index 0c0a837a1e23..000000000000
Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_outline.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..58bdd0f562e8
Binary files /dev/null and b/mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_button_tail.9.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_button_tail.9.png
deleted file mode 100644
index 46b7663a90d2..000000000000
Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/tabs_button_tail.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_clear_site_settings.png b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_clear_site_settings.png
new file mode 100644
index 000000000000..064e830e69a7
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_clear_site_settings.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_forward.png b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_forward.png
index 9675ee5b26fb..2653aef400b3 100644
Binary files a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_forward.png and b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png
index 7c5c78e622ca..e6c1bfea4dd1 100644
Binary files a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png and b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_save_as_pdf.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
index b9eddb77324b..2bed41b7c1a1 100644
Binary files a/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png and b/mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/menu_item_check.png b/mobile/android/base/resources/drawable-mdpi-v11/menu_item_check.png
new file mode 100644
index 000000000000..ef5ce22ed0aa
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v11/menu_item_check.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/menu_item_pressed_texture.png b/mobile/android/base/resources/drawable-mdpi-v11/menu_item_pressed_texture.png
new file mode 100644
index 000000000000..181a9a14a2f4
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v11/menu_item_pressed_texture.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/menu_item_texture.png b/mobile/android/base/resources/drawable-mdpi-v11/menu_item_texture.png
new file mode 100644
index 000000000000..ada123dc3823
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v11/menu_item_texture.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/menu_panel_bg.9.png b/mobile/android/base/resources/drawable-mdpi-v11/menu_panel_bg.9.png
new file mode 100644
index 000000000000..4c7941077254
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v11/menu_panel_bg.9.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/menu_popup_arrow.png b/mobile/android/base/resources/drawable-mdpi-v11/menu_popup_arrow.png
new file mode 100644
index 000000000000..4dedcb60f5fe
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v11/menu_popup_arrow.png differ
diff --git a/mobile/android/base/resources/drawable-mdpi-v11/menu_popup_bg.9.png b/mobile/android/base/resources/drawable-mdpi-v11/menu_popup_bg.9.png
new file mode 100644
index 000000000000..eb82a4ddb8f3
Binary files /dev/null and b/mobile/android/base/resources/drawable-mdpi-v11/menu_popup_bg.9.png differ
diff --git a/mobile/android/base/resources/drawable-nodpi/abouthome_bg.png b/mobile/android/base/resources/drawable-nodpi/abouthome_bg.png
index 2e4cd6f328b4..56fd38099cc5 100644
Binary files a/mobile/android/base/resources/drawable-nodpi/abouthome_bg.png and b/mobile/android/base/resources/drawable-nodpi/abouthome_bg.png differ
diff --git a/mobile/android/base/resources/drawable-nodpi/abouthome_topsites_bg.png b/mobile/android/base/resources/drawable-nodpi/abouthome_topsites_bg.png
index ee1472319c9a..88d8765e4758 100644
Binary files a/mobile/android/base/resources/drawable-nodpi/abouthome_topsites_bg.png and b/mobile/android/base/resources/drawable-nodpi/abouthome_topsites_bg.png differ
diff --git a/mobile/android/base/resources/drawable-nodpi/background.png b/mobile/android/base/resources/drawable-nodpi/background.png
index 611592b5167a..7618bf72d456 100644
Binary files a/mobile/android/base/resources/drawable-nodpi/background.png and b/mobile/android/base/resources/drawable-nodpi/background.png differ
diff --git a/mobile/android/base/resources/drawable-nodpi/tabs_tray_bg.png b/mobile/android/base/resources/drawable-nodpi/tabs_tray_bg.png
index 3af39b8fc766..ccb28d529faa 100644
Binary files a/mobile/android/base/resources/drawable-nodpi/tabs_tray_bg.png and b/mobile/android/base/resources/drawable-nodpi/tabs_tray_bg.png differ
diff --git a/mobile/android/base/resources/drawable-nodpi/tabs_tray_pressed_bg.png b/mobile/android/base/resources/drawable-nodpi/tabs_tray_pressed_bg.png
index 95091c25c179..d659b922e825 100644
Binary files a/mobile/android/base/resources/drawable-nodpi/tabs_tray_pressed_bg.png and b/mobile/android/base/resources/drawable-nodpi/tabs_tray_pressed_bg.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-hdpi/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-sw600dp-hdpi/address_bar_url_default.9.png
new file mode 100644
index 000000000000..0922b48efb23
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-hdpi/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-hdpi/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-sw600dp-hdpi/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..c1b734a25c28
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-hdpi/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_bookmark_add.png
new file mode 100644
index 000000000000..5160d7d5ba2e
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_bookmark_add.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_bookmark_remove.png
new file mode 100644
index 000000000000..be22b10096ee
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_bookmark_remove.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_forward.png
new file mode 100644
index 000000000000..cc2198ae2568
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_reload.png
new file mode 100644
index 000000000000..2dda75d16e01
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-hdpi/ic_menu_reload.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-hdpi/menu.png b/mobile/android/base/resources/drawable-sw600dp-hdpi/menu.png
new file mode 100644
index 000000000000..aa0950472214
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-hdpi/menu.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-mdpi/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-sw600dp-mdpi/address_bar_url_default.9.png
new file mode 100644
index 000000000000..0b077bd4b712
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-mdpi/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-mdpi/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-sw600dp-mdpi/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..be521861225b
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-mdpi/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_bookmark_add.png
new file mode 100644
index 000000000000..cc3a6377a209
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_bookmark_add.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_bookmark_remove.png
new file mode 100644
index 000000000000..a694ccda68b5
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_bookmark_remove.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_forward.png
new file mode 100644
index 000000000000..9675ee5b26fb
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_reload.png
new file mode 100644
index 000000000000..452e7d72cc19
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-mdpi/ic_menu_reload.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-mdpi/menu.png b/mobile/android/base/resources/drawable-sw600dp-mdpi/menu.png
new file mode 100644
index 000000000000..45f5b4c5bb96
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-mdpi/menu.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-xhdpi/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-sw600dp-xhdpi/address_bar_url_default.9.png
new file mode 100644
index 000000000000..763f15206d75
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-xhdpi/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-xhdpi/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-sw600dp-xhdpi/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..04dbda21bf54
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-xhdpi/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_bookmark_add.png
new file mode 100644
index 000000000000..56aafcd6c750
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_bookmark_add.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_bookmark_remove.png
new file mode 100644
index 000000000000..271d019a44e4
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_bookmark_remove.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_forward.png
new file mode 100644
index 000000000000..fa1cb836b863
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_reload.png
new file mode 100644
index 000000000000..2a3f0bcb652c
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-xhdpi/ic_menu_reload.png differ
diff --git a/mobile/android/base/resources/drawable-sw600dp-xhdpi/menu.png b/mobile/android/base/resources/drawable-sw600dp-xhdpi/menu.png
new file mode 100644
index 000000000000..8a169c9da72d
Binary files /dev/null and b/mobile/android/base/resources/drawable-sw600dp-xhdpi/menu.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_bg.9.png
deleted file mode 100644
index e87afc1bcb49..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_bg.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_default.9.png
new file mode 100644
index 000000000000..b45e4a898dff
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_outline.9.png
deleted file mode 100644
index 5102dc0b9799..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_outline.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..453e75a940cf
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_clear_site_settings.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_clear_site_settings.png
new file mode 100644
index 000000000000..3e63b9f6a759
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_clear_site_settings.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png
index 437e693c5820..83388ba62800 100644
Binary files a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png and b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_save_as_pdf.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
index 84cbab1ab4da..41991961138b 100644
Binary files a/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png and b/mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_check.png b/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_check.png
new file mode 100644
index 000000000000..464c4522f2f4
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_check.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_pressed_texture.png b/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_pressed_texture.png
new file mode 100644
index 000000000000..b296b8250e3b
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_pressed_texture.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_texture.png b/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_texture.png
new file mode 100644
index 000000000000..ef407b96c671
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/menu_item_texture.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/menu_panel_bg.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/menu_panel_bg.9.png
new file mode 100644
index 000000000000..4c7941077254
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/menu_panel_bg.9.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_arrow.png b/mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_arrow.png
new file mode 100644
index 000000000000..ba52e510d3cd
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_arrow.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_bg.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_bg.9.png
new file mode 100644
index 000000000000..adb38e211aef
Binary files /dev/null and b/mobile/android/base/resources/drawable-xhdpi-v11/menu_popup_bg.9.png differ
diff --git a/mobile/android/base/resources/drawable-xhdpi-v11/tabs_button_tail.9.png b/mobile/android/base/resources/drawable-xhdpi-v11/tabs_button_tail.9.png
deleted file mode 100644
index caad4880864e..000000000000
Binary files a/mobile/android/base/resources/drawable-xhdpi-v11/tabs_button_tail.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_default.9.png
new file mode 100644
index 000000000000..0922b48efb23
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..c1b734a25c28
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_add.png
new file mode 100644
index 000000000000..5160d7d5ba2e
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_add.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_remove.png
new file mode 100644
index 000000000000..be22b10096ee
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_bookmark_remove.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_forward.png
new file mode 100644
index 000000000000..cc2198ae2568
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_reload.png
new file mode 100644
index 000000000000..2dda75d16e01
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi/ic_menu_reload.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-hdpi/menu.png b/mobile/android/base/resources/drawable-xlarge-hdpi/menu.png
new file mode 100644
index 000000000000..aa0950472214
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-hdpi/menu.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_default.9.png
new file mode 100644
index 000000000000..0b077bd4b712
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..be521861225b
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-mdpi/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_add.png
new file mode 100644
index 000000000000..cc3a6377a209
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_add.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_remove.png
new file mode 100644
index 000000000000..a694ccda68b5
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_bookmark_remove.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_forward.png
new file mode 100644
index 000000000000..9675ee5b26fb
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_reload.png
new file mode 100644
index 000000000000..452e7d72cc19
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-mdpi/ic_menu_reload.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-mdpi/menu.png b/mobile/android/base/resources/drawable-xlarge-mdpi/menu.png
new file mode 100644
index 000000000000..45f5b4c5bb96
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-mdpi/menu.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_default.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_default.9.png
new file mode 100644
index 000000000000..763f15206d75
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..04dbda21bf54
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_add.png b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_add.png
new file mode 100644
index 000000000000..56aafcd6c750
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_add.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_remove.png b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_remove.png
new file mode 100644
index 000000000000..271d019a44e4
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_bookmark_remove.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_forward.png b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_forward.png
new file mode 100644
index 000000000000..fa1cb836b863
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_forward.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_reload.png b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_reload.png
new file mode 100644
index 000000000000..2a3f0bcb652c
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi/ic_menu_reload.png differ
diff --git a/mobile/android/base/resources/drawable-xlarge-xhdpi/menu.png b/mobile/android/base/resources/drawable-xlarge-xhdpi/menu.png
new file mode 100644
index 000000000000..8a169c9da72d
Binary files /dev/null and b/mobile/android/base/resources/drawable-xlarge-xhdpi/menu.png differ
diff --git a/mobile/android/base/resources/drawable/address_bar_bg.xml b/mobile/android/base/resources/drawable/address_bar_bg.xml
index 524110075815..98370c8c51b1 100644
--- a/mobile/android/base/resources/drawable/address_bar_bg.xml
+++ b/mobile/android/base/resources/drawable/address_bar_bg.xml
@@ -3,13 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:right="34dp">
-        <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-            android:src="@drawable/address_bar_texture_port"
-            android:tileMode="repeat"
-            android:dither="false"/>
-     </item>
-
-</layer-list>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/address_bar_texture_port"
+        android:tileMode="repeat"
+        android:dither="false"/>
diff --git a/mobile/android/base/resources/drawable/address_bar_pressed_bg.xml b/mobile/android/base/resources/drawable/address_bar_pressed_bg.xml
index c64973df3f10..41a509476d45 100644
--- a/mobile/android/base/resources/drawable/address_bar_pressed_bg.xml
+++ b/mobile/android/base/resources/drawable/address_bar_pressed_bg.xml
@@ -3,13 +3,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:right="34dp">
-        <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-            android:src="@drawable/address_bar_pressed_texture_port"
-            android:tileMode="repeat"
-            android:dither="false"/>
-     </item>
-
-</layer-list>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/address_bar_pressed_texture_port"
+        android:tileMode="repeat"
+        android:dither="false"/>
diff --git a/mobile/android/base/resources/drawable/address_bar_url.xml b/mobile/android/base/resources/drawable/address_bar_url.xml
new file mode 100644
index 000000000000..0273c98f021e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/address_bar_url.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_focused="true" android:drawable="@drawable/address_bar_url_pressed"/>
+    <item android:state_pressed="true" android:drawable="@drawable/address_bar_url_pressed"/>
+    <item android:drawable="@drawable/address_bar_url_default"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/address_bar_url_bg.9.png b/mobile/android/base/resources/drawable/address_bar_url_bg.9.png
deleted file mode 100644
index c60b4b253381..000000000000
Binary files a/mobile/android/base/resources/drawable/address_bar_url_bg.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable/address_bar_url_default.9.png b/mobile/android/base/resources/drawable/address_bar_url_default.9.png
new file mode 100644
index 000000000000..9f84ce94ffd4
Binary files /dev/null and b/mobile/android/base/resources/drawable/address_bar_url_default.9.png differ
diff --git a/mobile/android/base/resources/drawable/address_bar_url_default.xml b/mobile/android/base/resources/drawable/address_bar_url_default.xml
deleted file mode 100644
index e80260f01a4b..000000000000
--- a/mobile/android/base/resources/drawable/address_bar_url_default.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/background"
-          android:left="1dp"
-          android:top="1dp"
-          android:right="1dp"
-          android:bottom="1dp"
-          android:drawable="@drawable/address_bar_url_bg"/>
-
-</layer-list>
diff --git a/mobile/android/base/resources/drawable/address_bar_url_outline.9.png b/mobile/android/base/resources/drawable/address_bar_url_outline.9.png
deleted file mode 100644
index 2f9d6a00d301..000000000000
Binary files a/mobile/android/base/resources/drawable/address_bar_url_outline.9.png and /dev/null differ
diff --git a/mobile/android/base/resources/drawable/address_bar_url_pressed.9.png b/mobile/android/base/resources/drawable/address_bar_url_pressed.9.png
new file mode 100644
index 000000000000..83f3ae8799ae
Binary files /dev/null and b/mobile/android/base/resources/drawable/address_bar_url_pressed.9.png differ
diff --git a/mobile/android/base/resources/drawable/address_bar_url_pressed.xml b/mobile/android/base/resources/drawable/address_bar_url_pressed.xml
deleted file mode 100644
index 4c1a68ae2c28..000000000000
--- a/mobile/android/base/resources/drawable/address_bar_url_pressed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/outline"
-          android:drawable="@drawable/address_bar_url_outline"/>
-
-    <item android:id="@+id/background"
-          android:left="1dp"
-          android:top="1dp"
-          android:right="1dp"
-          android:bottom="1dp"
-          android:drawable="@drawable/address_bar_url_bg"/>
-
-</layer-list>
diff --git a/mobile/android/base/resources/drawable/menu.xml b/mobile/android/base/resources/drawable/menu.xml
new file mode 100644
index 000000000000..cfc5fe74d14f
--- /dev/null
+++ b/mobile/android/base/resources/drawable/menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+       <solid android:color="#000000"/>
+
+</shape>
diff --git a/mobile/android/base/resources/drawable/menu_item_bg.xml b/mobile/android/base/resources/drawable/menu_item_bg.xml
new file mode 100644
index 000000000000..fd157a9bb1c1
--- /dev/null
+++ b/mobile/android/base/resources/drawable/menu_item_bg.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="true"
+          android:state_pressed="true"
+          android:drawable="@drawable/menu_item_pressed"/>
+
+    <item android:drawable="@drawable/menu_item_default"/>
+
+</selector>
diff --git a/mobile/android/base/resources/drawable/menu_item_default.xml b/mobile/android/base/resources/drawable/menu_item_default.xml
new file mode 100644
index 000000000000..68ff23f946ec
--- /dev/null
+++ b/mobile/android/base/resources/drawable/menu_item_default.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/menu_item_texture"
+        android:tileMode="repeat"
+        android:dither="false"/>
diff --git a/mobile/android/base/resources/drawable/menu_item_pressed.xml b/mobile/android/base/resources/drawable/menu_item_pressed.xml
new file mode 100644
index 000000000000..639ade55c86e
--- /dev/null
+++ b/mobile/android/base/resources/drawable/menu_item_pressed.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+        android:src="@drawable/menu_item_pressed_texture"
+        android:tileMode="repeat"
+        android:dither="false"/>
diff --git a/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml b/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
index 7d8212ef0687..daa28582943a 100644
--- a/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
@@ -16,32 +16,27 @@
 
         <ImageButton android:id="@+id/forward"
                      style="@style/AddressBar.ImageButton.Unused"/>
-        
-        <Button android:id="@+id/awesome_bar"
-                style="@style/AddressBar.Button"
-                android:layout_width="fill_parent"
-                android:layout_marginTop="3dp"
-                android:layout_marginBottom="3dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="44dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                android:layout_centerVertical="true"
-                android:singleLine="true"
-                android:gravity="center_vertical|left"
-                android:hint="@string/awesomebar_default_text"
-                android:textColor="#222222"
-                android:paddingLeft="35dip"
-                android:paddingRight="7dip"/>
 
-        <ImageButton android:id="@+id/favicon"
+        <LinearLayout android:id="@+id/menu_items"
+                      android:layout_width="0dip"
+                      android:layout_height="0dip"
+                      android:visibility="gone"/>
+
+        <ImageView android:id="@+id/spacer"
+                   style="@style/AddressBar.ImageButton"
+                   android:layout_width="44dip"
+                   android:layout_alignParentRight="true"/>
+
+        <ImageButton android:id="@+id/menu"
                      style="@style/AddressBar.ImageButton"
-                     android:layout_width="21.33dip"
-                     android:layout_height="21.33dip"
-                     android:layout_marginLeft="7dip"
-                     android:layout_centerVertical="true"
-                     android:src="@drawable/favicon"
-                     android:layout_alignLeft="@id/awesome_bar"/>
+                     android:layout_width="28.5dip"
+                     android:layout_toLeftOf="@id/spacer"
+                     android:gravity="center_vertical"
+                     android:src="@drawable/menu"
+                     android:background="@drawable/action_bar_button"
+                     android:paddingLeft="4dip"
+                     android:paddingRight="4dip"
+                     android:visibility="gone"/>
 
         <ImageButton android:id="@+id/tabs"
                      style="@style/AddressBar.ImageButton"
@@ -62,6 +57,34 @@
                      android:layout_alignRight="@id/tabs"
                      android:gravity="center_horizontal"
                      android:visibility="gone"/>
+        
+        <Button android:id="@+id/awesome_bar"
+                style="@style/AddressBar.Button"
+                android:layout_width="fill_parent"
+                android:layout_marginTop="3dp"
+                android:layout_marginBottom="3dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentBottom="true"
+                android:layout_toLeftOf="@id/menu"
+                android:layout_centerVertical="true"
+                android:background="@drawable/address_bar_url"
+                android:singleLine="true"
+                android:gravity="center_vertical|left"
+                android:hint="@string/awesomebar_default_text"
+                android:textColor="#222222"
+                android:paddingLeft="35dip"
+                android:paddingRight="7dip"/>
+
+        <ImageButton android:id="@+id/favicon"
+                     style="@style/AddressBar.ImageButton"
+                     android:layout_width="21.33dip"
+                     android:layout_height="21.33dip"
+                     android:layout_marginLeft="7dip"
+                     android:layout_centerVertical="true"
+                     android:src="@drawable/favicon"
+                     android:layout_alignLeft="@id/awesome_bar"/>
 
         <ImageButton android:id="@+id/stop"
                      style="@style/AddressBar.ImageButton"
diff --git a/mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml b/mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml
index 8c9f8b6cc5e0..8179572c755c 100644
--- a/mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml
@@ -9,7 +9,7 @@
 
     <RelativeLayout android:id="@+id/address_bar"
                     style="@style/AddressBar"
-                    android:background="@android:color/transparent">
+                    android:background="@drawable/address_bar_bg">
 
         <ImageButton android:id="@+id/tabs"
                      style="@style/AddressBar.ImageButton"
@@ -30,6 +30,23 @@
                      android:layout_alignLeft="@id/tabs"
                      android:gravity="center_horizontal"
                      android:visibility="gone"/>
+
+        <ImageButton android:id="@+id/menu"
+                     style="@style/AddressBar.ImageButton"
+                     android:layout_width="56dip"
+                     android:layout_alignParentRight="true"
+                     android:gravity="center_vertical"
+                     android:src="@drawable/menu"
+                     android:background="@drawable/action_bar_button"
+                     android:paddingLeft="14dip"
+                     android:paddingRight="14dip"
+                     android:visibility="gone"/>
+
+        <LinearLayout android:id="@+id/menu_items"
+                      android:layout_width="wrap_content"
+                      android:layout_height="fill_parent"
+                      android:orientation="horizontal"
+                      android:layout_toLeftOf="@id/menu"/>
         
         <Button android:id="@+id/awesome_bar"
                 style="@style/AddressBar.Button"
@@ -39,9 +56,10 @@
                 android:layout_marginBottom="6dp"
                 android:layout_marginRight="6dp"
                 android:layout_toRightOf="@id/tabs"
+                android:layout_toLeftOf="@id/menu_items"
                 android:layout_alignParentBottom="true"
                 android:layout_centerVertical="true"
-                android:background="@drawable/address_bar_url_default"
+                android:background="@drawable/address_bar_url"
                 android:singleLine="true"
                 android:gravity="center_vertical|left"
                 android:hint="@string/awesomebar_default_text"
@@ -52,7 +70,7 @@
         <ImageButton android:id="@+id/forward"
                      style="@style/AddressBar.ImageButton"
                      android:layout_width="64dip"
-                     android:layout_height="38dip"
+                     android:layout_height="40dip"
                      android:layout_centerVertical="true"
                      android:layout_alignLeft="@id/awesome_bar"
                      android:paddingLeft="22dp"
diff --git a/mobile/android/base/resources/layout-xlarge/browser_toolbar.xml b/mobile/android/base/resources/layout-xlarge/browser_toolbar.xml
index 8c9f8b6cc5e0..8179572c755c 100644
--- a/mobile/android/base/resources/layout-xlarge/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout-xlarge/browser_toolbar.xml
@@ -9,7 +9,7 @@
 
     <RelativeLayout android:id="@+id/address_bar"
                     style="@style/AddressBar"
-                    android:background="@android:color/transparent">
+                    android:background="@drawable/address_bar_bg">
 
         <ImageButton android:id="@+id/tabs"
                      style="@style/AddressBar.ImageButton"
@@ -30,6 +30,23 @@
                      android:layout_alignLeft="@id/tabs"
                      android:gravity="center_horizontal"
                      android:visibility="gone"/>
+
+        <ImageButton android:id="@+id/menu"
+                     style="@style/AddressBar.ImageButton"
+                     android:layout_width="56dip"
+                     android:layout_alignParentRight="true"
+                     android:gravity="center_vertical"
+                     android:src="@drawable/menu"
+                     android:background="@drawable/action_bar_button"
+                     android:paddingLeft="14dip"
+                     android:paddingRight="14dip"
+                     android:visibility="gone"/>
+
+        <LinearLayout android:id="@+id/menu_items"
+                      android:layout_width="wrap_content"
+                      android:layout_height="fill_parent"
+                      android:orientation="horizontal"
+                      android:layout_toLeftOf="@id/menu"/>
         
         <Button android:id="@+id/awesome_bar"
                 style="@style/AddressBar.Button"
@@ -39,9 +56,10 @@
                 android:layout_marginBottom="6dp"
                 android:layout_marginRight="6dp"
                 android:layout_toRightOf="@id/tabs"
+                android:layout_toLeftOf="@id/menu_items"
                 android:layout_alignParentBottom="true"
                 android:layout_centerVertical="true"
-                android:background="@drawable/address_bar_url_default"
+                android:background="@drawable/address_bar_url"
                 android:singleLine="true"
                 android:gravity="center_vertical|left"
                 android:hint="@string/awesomebar_default_text"
@@ -52,7 +70,7 @@
         <ImageButton android:id="@+id/forward"
                      style="@style/AddressBar.ImageButton"
                      android:layout_width="64dip"
-                     android:layout_height="38dip"
+                     android:layout_height="40dip"
                      android:layout_centerVertical="true"
                      android:layout_alignLeft="@id/awesome_bar"
                      android:paddingLeft="22dp"
diff --git a/mobile/android/base/resources/layout/awesomebar_search.xml b/mobile/android/base/resources/layout/awesomebar_search.xml
index e30872a798fa..7c7f07f7079c 100644
--- a/mobile/android/base/resources/layout/awesomebar_search.xml
+++ b/mobile/android/base/resources/layout/awesomebar_search.xml
@@ -10,12 +10,14 @@
     <view class="org.mozilla.gecko.AwesomeBar$AwesomeBarEditText"
           android:id="@+id/awesomebar_text"
           style="@style/AddressBar.Button"
+          android:background="@drawable/address_bar_url"
           android:layout_margin="4dip"
           android:layout_alignParentBottom="true"
           android:layout_centerVertical="true"
           android:paddingLeft="15dip"
           android:paddingRight="40dip"
           android:hint="@string/awesomebar_default_text"
+          android:textColorHighlight="@color/url_bar_text_highlight"
           android:inputType="textUri|textNoSuggestions"
           android:imeOptions="actionSearch"
           android:selectAllOnFocus="true"
diff --git a/mobile/android/base/resources/layout/browser_toolbar.xml b/mobile/android/base/resources/layout/browser_toolbar.xml
index 778717dbb38e..57b04113e1b9 100644
--- a/mobile/android/base/resources/layout/browser_toolbar.xml
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -16,33 +16,27 @@
 
         <ImageButton android:id="@+id/forward"
                      style="@style/AddressBar.ImageButton.Unused"/>
-                      
-        <Button android:id="@+id/awesome_bar"
-                style="@style/AddressBar.Button"
-                android:layout_width="fill_parent"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="4dp"
-                android:layout_marginRight="50dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/address_bar_url_default"
-                android:singleLine="true"
-                android:gravity="center_vertical|left"
-                android:hint="@string/awesomebar_default_text"
-                android:textColor="#222222"
-                android:paddingLeft="41dip"
-                android:paddingRight="10dip"/>
 
-        <ImageButton android:id="@+id/favicon"
+        <LinearLayout android:id="@+id/menu_items"
+                      android:layout_width="0dip"
+                      android:layout_height="0dip"
+                      android:visibility="gone"/>
+                      
+        <ImageView android:id="@+id/spacer"
+                   style="@style/AddressBar.ImageButton"
+                   android:layout_width="50dip"
+                   android:layout_alignParentRight="true"/>
+
+        <ImageButton android:id="@+id/menu"
                      style="@style/AddressBar.ImageButton"
-                     android:layout_width="21.33dip"
-                     android:layout_height="21.33dip"
-                     android:layout_marginLeft="10dip"
-                     android:layout_centerVertical="true"
-                     android:src="@drawable/favicon"
-                     android:layout_alignLeft="@id/awesome_bar"/>
+                     android:layout_width="36dip"
+                     android:layout_toLeftOf="@id/spacer"
+                     android:gravity="center_vertical"
+                     android:src="@drawable/menu"
+                     android:background="@drawable/action_bar_button"
+                     android:paddingLeft="8dip"
+                     android:paddingRight="8dip"
+                     android:visibility="gone"/>
 
         <ImageButton android:id="@+id/tabs"
                      style="@style/AddressBar.ImageButton"
@@ -63,6 +57,34 @@
                      android:layout_alignRight="@id/tabs"
                      android:gravity="center_horizontal"
                      android:visibility="gone"/>
+        
+        <Button android:id="@+id/awesome_bar"
+                style="@style/AddressBar.Button"
+                android:layout_width="fill_parent"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="4dp"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentBottom="true"
+                android:layout_toLeftOf="@id/menu"
+                android:layout_centerVertical="true"
+                android:background="@drawable/address_bar_url"
+                android:singleLine="true"
+                android:gravity="center_vertical|left"
+                android:hint="@string/awesomebar_default_text"
+                android:textColor="#222222"
+                android:paddingLeft="41dip"
+                android:paddingRight="10dip"/>
+
+        <ImageButton android:id="@+id/favicon"
+                     style="@style/AddressBar.ImageButton"
+                     android:layout_width="21.33dip"
+                     android:layout_height="21.33dip"
+                     android:layout_marginLeft="10dip"
+                     android:layout_centerVertical="true"
+                     android:src="@drawable/favicon"
+                     android:layout_alignLeft="@id/awesome_bar"/>
 
         <ImageButton android:id="@+id/stop"
                      style="@style/AddressBar.ImageButton"
diff --git a/mobile/android/base/resources/layout/find_in_page_content.xml b/mobile/android/base/resources/layout/find_in_page_content.xml
index aab4b22be2b5..1a7e474578a8 100644
--- a/mobile/android/base/resources/layout/find_in_page_content.xml
+++ b/mobile/android/base/resources/layout/find_in_page_content.xml
@@ -3,6 +3,7 @@
 
     <EditText android:id="@+id/find_text"
               android:contentDescription="@string/find_text"
+              android:background="@drawable/address_bar_url"
               android:singleLine="true"
               android:textColor="#000000"
               android:inputType="text"
@@ -12,6 +13,7 @@
               android:layout_marginRight="5dip"
               android:paddingLeft="15dip"
               android:paddingRight="15dip"
+              android:textColorHighlight="@color/url_bar_text_highlight"
               android:imeOptions="actionSearch"
               android:selectAllOnFocus="true"
               android:gravity="center_vertical|left"
diff --git a/mobile/android/base/resources/layout/menu_item.xml b/mobile/android/base/resources/layout/menu_item.xml
new file mode 100644
index 000000000000..a397cadd9909
--- /dev/null
+++ b/mobile/android/base/resources/layout/menu_item.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+     <View android:layout_width="14dp"
+           android:layout_height="fill_parent"
+           android:layout_gravity="center_vertical"/>
+
+     <ImageView android:id="@+id/icon"
+                android:layout_width="24dp"
+                android:layout_height="18dp"
+                android:paddingRight="6dp"
+                android:layout_gravity="center_vertical"
+                android:visibility="gone"/>
+
+     <TextView android:id="@+id/title"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_weight="1.0"
+               android:textSize="16sp"
+               android:textColor="@color/menu_item_title"
+               android:singleLine="true"
+               android:ellipsize="middle"
+               android:layout_gravity="center_vertical"/>
+
+     <ImageView android:id="@+id/check"
+                android:layout_width="20dp"
+                android:layout_height="14dp"
+                android:paddingLeft="6dp"
+                android:layout_gravity="center_vertical"
+                android:src="@drawable/menu_item_check"
+                android:visibility="gone"/>
+
+     <View android:layout_width="14dp"
+           android:layout_height="fill_parent"
+           android:layout_gravity="center_vertical"/>
+
+</merge>
diff --git a/mobile/android/base/resources/layout/menu_popup.xml b/mobile/android/base/resources/layout/menu_popup.xml
new file mode 100644
index 000000000000..72eb5e3aee80
--- /dev/null
+++ b/mobile/android/base/resources/layout/menu_popup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+
+    <RelativeLayout android:id="@+id/menu_panel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/menu_popup_bg">
+
+        <!-- MenuPanel will be added here dynamically -->
+
+    </RelativeLayout>
+
+    <ImageView android:id="@+id/menu_arrow"
+               android:layout_width="28dip"
+               android:layout_height="10dip"
+               android:layout_marginTop="2dip"
+               android:layout_alignParentRight="true"
+               android:src="@drawable/menu_popup_arrow"
+               android:scaleType="fitXY"/>
+
+</RelativeLayout>
diff --git a/mobile/android/base/resources/layout/sync_setup_success.xml b/mobile/android/base/resources/layout/sync_setup_success.xml
index 5ea91affa7c6..20c772ea2222 100644
--- a/mobile/android/base/resources/layout/sync_setup_success.xml
+++ b/mobile/android/base/resources/layout/sync_setup_success.xml
@@ -24,10 +24,15 @@
 	android:text="@string/sync_subtitle_success" />
 
   <LinearLayout
-    style="@style/SyncBottom" >
+    style="@style/SyncBottom"
+    android:orientation="horizontal" >
     <Button
       style="@style/SyncButton"
       android:onClick="settingsClickHandler"
       android:text="@string/sync_settings" />
+    <Button
+      style="@style/SyncButton"
+      android:onClick="launchBrowser"
+      android:text="@string/brand_short_name" />
   </LinearLayout>
 </RelativeLayout>
diff --git a/mobile/android/base/resources/menu-sw600dp/gecko_menu.xml.in b/mobile/android/base/resources/menu-sw600dp/gecko_menu.xml.in
index 5c2306fe6c3d..2d04b76175ef 100644
--- a/mobile/android/base/resources/menu-sw600dp/gecko_menu.xml.in
+++ b/mobile/android/base/resources/menu-sw600dp/gecko_menu.xml.in
@@ -1,55 +1,60 @@
+#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
 
-    <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
-          android:title="@string/bookmark"
-          android:showAsAction="ifRoom"/>
+    <item gecko:id="@+id/reload"
+          gecko:icon="@drawable/ic_menu_reload"
+          gecko:title="@string/reload"
+          gecko:showAsAction="true"/>
 
-    <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
-          android:title="@string/reload"
-          android:showAsAction="ifRoom"/>
+    <item gecko:id="@+id/forward"
+          gecko:icon="@drawable/ic_menu_forward"
+          gecko:title="@string/forward"
+          gecko:visible="false"/>
 
-    <item android:id="@+id/forward"
-          android:icon="@drawable/ic_menu_forward"
-          android:title="@string/forward"
-          android:visible="false"/>
+    <item gecko:id="@+id/bookmark"
+          gecko:icon="@drawable/ic_menu_bookmark_add"
+          gecko:title="@string/bookmark"
+          gecko:showAsAction="true"/>
 
-    <item android:id="@+id/share"
-          android:icon="@drawable/ic_menu_share"
-          android:title="@string/share" /> 
+    <item gecko:id="@+id/share"
+          gecko:icon="@drawable/ic_menu_share"
+          gecko:title="@string/share" /> 
     
-    <item android:id="@+id/save_as_pdf"
-          android:icon="@drawable/ic_menu_save_as_pdf"
-          android:title="@string/save_as_pdf" />
+    <item gecko:id="@+id/save_as_pdf"
+          gecko:icon="@drawable/ic_menu_save_as_pdf"
+          gecko:title="@string/save_as_pdf" />
 
-    <item android:id="@+id/site_settings"
-          android:title="@string/site_settings_title" />
+    <item gecko:id="@+id/find_in_page"
+          gecko:title="@string/find_in_page" />
 
-    <item android:id="@+id/addons"
-          android:title="@string/addons"/>
+    <item gecko:id="@+id/site_settings"
+          gecko:icon="@drawable/ic_menu_clear_site_settings"
+          gecko:title="@string/site_settings_title" />
 
-    <item android:id="@+id/downloads"
-          android:title="@string/downloads"/>
+    <item gecko:id="@+id/addons"
+          gecko:title="@string/addons"/>
 
-    <item android:id="@+id/char_encoding"
-          android:visible="false"
-          android:title="@string/char_encoding"/>
+    <item gecko:id="@+id/downloads"
+          gecko:title="@string/downloads"/>
 
-    <item android:id="@+id/settings"
-          android:title="@string/settings" />
+    <item gecko:id="@+id/char_encoding"
+          gecko:visible="false"
+          gecko:title="@string/char_encoding"/>
+
+    <item gecko:id="@+id/settings"
+          gecko:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
-    <item android:id="@+id/toggle_profiling"
-          android:title="@string/toggle_profiling" />
+    <item gecko:id="@+id/toggle_profiling"
+          gecko:title="@string/toggle_profiling" />
 #endif
 
-    <item android:id="@+id/quit"
-          android:title="@string/quit"
-          android:orderInCategory="10" />
+    <item gecko:id="@+id/quit"
+          gecko:title="@string/quit"
+          gecko:orderInCategory="10" />
 </menu>
diff --git a/mobile/android/base/resources/menu-v11/gecko_menu.xml.in b/mobile/android/base/resources/menu-v11/gecko_menu.xml.in
new file mode 100644
index 000000000000..f0be07d5ac1e
--- /dev/null
+++ b/mobile/android/base/resources/menu-v11/gecko_menu.xml.in
@@ -0,0 +1,57 @@
+#filter substitution
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+
+    <item gecko:id="@+id/reload"
+          gecko:icon="@drawable/ic_menu_reload"
+          gecko:title="@string/reload"/>
+
+    <item gecko:id="@+id/forward"
+          gecko:icon="@drawable/ic_menu_forward"
+          gecko:title="@string/forward"/>
+
+    <item gecko:id="@+id/bookmark"
+          gecko:icon="@drawable/ic_menu_bookmark_add"
+          gecko:title="@string/bookmark"/>
+
+    <item gecko:id="@+id/share"
+          gecko:icon="@drawable/ic_menu_share"
+          gecko:title="@string/share" /> 
+    
+    <item gecko:id="@+id/save_as_pdf"
+          gecko:icon="@drawable/ic_menu_save_as_pdf"
+          gecko:title="@string/save_as_pdf" />
+
+    <item gecko:id="@+id/find_in_page"
+          gecko:title="@string/find_in_page" />
+
+    <item gecko:id="@+id/site_settings"
+          gecko:icon="@drawable/ic_menu_clear_site_settings"
+          gecko:title="@string/site_settings_title" />
+
+    <item gecko:id="@+id/addons"
+          gecko:title="@string/addons"/>
+
+    <item gecko:id="@+id/downloads"
+          gecko:title="@string/downloads"/>
+
+    <item gecko:id="@+id/char_encoding"
+          gecko:visible="false"
+          gecko:title="@string/char_encoding"/>
+
+    <item gecko:id="@+id/settings"
+          gecko:title="@string/settings" />
+
+#ifdef MOZ_PROFILING
+    <item gecko:id="@+id/toggle_profiling"
+          gecko:title="@string/toggle_profiling" />
+#endif
+
+    <item gecko:id="@+id/quit"
+          gecko:title="@string/quit"
+          gecko:orderInCategory="10" />
+</menu>
diff --git a/mobile/android/base/resources/menu-xlarge/gecko_menu.xml.in b/mobile/android/base/resources/menu-xlarge/gecko_menu.xml.in
index 5c2306fe6c3d..2d04b76175ef 100644
--- a/mobile/android/base/resources/menu-xlarge/gecko_menu.xml.in
+++ b/mobile/android/base/resources/menu-xlarge/gecko_menu.xml.in
@@ -1,55 +1,60 @@
+#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
 
-    <item android:id="@+id/bookmark"
-          android:icon="@drawable/ic_menu_bookmark_add"
-          android:title="@string/bookmark"
-          android:showAsAction="ifRoom"/>
+    <item gecko:id="@+id/reload"
+          gecko:icon="@drawable/ic_menu_reload"
+          gecko:title="@string/reload"
+          gecko:showAsAction="true"/>
 
-    <item android:id="@+id/reload"
-          android:icon="@drawable/ic_menu_reload"
-          android:title="@string/reload"
-          android:showAsAction="ifRoom"/>
+    <item gecko:id="@+id/forward"
+          gecko:icon="@drawable/ic_menu_forward"
+          gecko:title="@string/forward"
+          gecko:visible="false"/>
 
-    <item android:id="@+id/forward"
-          android:icon="@drawable/ic_menu_forward"
-          android:title="@string/forward"
-          android:visible="false"/>
+    <item gecko:id="@+id/bookmark"
+          gecko:icon="@drawable/ic_menu_bookmark_add"
+          gecko:title="@string/bookmark"
+          gecko:showAsAction="true"/>
 
-    <item android:id="@+id/share"
-          android:icon="@drawable/ic_menu_share"
-          android:title="@string/share" /> 
+    <item gecko:id="@+id/share"
+          gecko:icon="@drawable/ic_menu_share"
+          gecko:title="@string/share" /> 
     
-    <item android:id="@+id/save_as_pdf"
-          android:icon="@drawable/ic_menu_save_as_pdf"
-          android:title="@string/save_as_pdf" />
+    <item gecko:id="@+id/save_as_pdf"
+          gecko:icon="@drawable/ic_menu_save_as_pdf"
+          gecko:title="@string/save_as_pdf" />
 
-    <item android:id="@+id/site_settings"
-          android:title="@string/site_settings_title" />
+    <item gecko:id="@+id/find_in_page"
+          gecko:title="@string/find_in_page" />
 
-    <item android:id="@+id/addons"
-          android:title="@string/addons"/>
+    <item gecko:id="@+id/site_settings"
+          gecko:icon="@drawable/ic_menu_clear_site_settings"
+          gecko:title="@string/site_settings_title" />
 
-    <item android:id="@+id/downloads"
-          android:title="@string/downloads"/>
+    <item gecko:id="@+id/addons"
+          gecko:title="@string/addons"/>
 
-    <item android:id="@+id/char_encoding"
-          android:visible="false"
-          android:title="@string/char_encoding"/>
+    <item gecko:id="@+id/downloads"
+          gecko:title="@string/downloads"/>
 
-    <item android:id="@+id/settings"
-          android:title="@string/settings" />
+    <item gecko:id="@+id/char_encoding"
+          gecko:visible="false"
+          gecko:title="@string/char_encoding"/>
+
+    <item gecko:id="@+id/settings"
+          gecko:title="@string/settings" />
 
 #ifdef MOZ_PROFILING
-    <item android:id="@+id/toggle_profiling"
-          android:title="@string/toggle_profiling" />
+    <item gecko:id="@+id/toggle_profiling"
+          gecko:title="@string/toggle_profiling" />
 #endif
 
-    <item android:id="@+id/quit"
-          android:title="@string/quit"
-          android:orderInCategory="10" />
+    <item gecko:id="@+id/quit"
+          gecko:title="@string/quit"
+          gecko:orderInCategory="10" />
 </menu>
diff --git a/mobile/android/base/resources/values-sw600dp/styles.xml b/mobile/android/base/resources/values-sw600dp/styles.xml
deleted file mode 100644
index cc18f68cd602..000000000000
--- a/mobile/android/base/resources/values-sw600dp/styles.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<resources>
-    
-    <!--
-        Only overriden styles for tablets are specified here.
-    -->
-
-    <!-- GeckoApp ActionBar -->
-    <style name="ActionBar.GeckoApp">
-         <item name="android:background">@drawable/address_bar_bg</item>
-         <item name="android:displayOptions">showCustom</item>
-         <item name="android:customNavigationLayout">@layout/browser_toolbar</item>
-    </style>
-
-    <!-- GeckoApp ActionBar ActionButton -->
-    <style name="ActionBar.GeckoApp.ActionButton" parent="@android:style/Widget.Holo.ActionButton">
-        <item name="android:background">@drawable/action_bar_button</item>
-        <item name="android:padding">14dip</item>
-        <item name="android:minWidth">56dip</item>
-        <item name="android:minHeight">56dip</item>
-    </style>
-
-    <!-- GeckoApp ActionBar OverflowButton -->
-    <style name="ActionBar.GeckoApp.OverflowButton" parent="ActionBar.GeckoApp.ActionButton">
-        <item name="android:src">@drawable/menu</item>
-    </style>
-
-</resources>
diff --git a/mobile/android/base/resources/values-sw600dp/themes.xml b/mobile/android/base/resources/values-sw600dp/themes.xml
deleted file mode 100644
index 4c97246eba44..000000000000
--- a/mobile/android/base/resources/values-sw600dp/themes.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<resources>
-
-    <!--
-        Only overriden themes for tablets are specified here.
-    -->
-
-    <style name="Gecko.App">
-        <item name="android:windowBackground">@drawable/abouthome_bg_repeat</item>
-        <item name="android:actionBarStyle">@style/ActionBar.GeckoApp</item>
-        <item name="android:actionButtonStyle">@style/ActionBar.GeckoApp.ActionButton</item>
-        <item name="android:actionOverflowButtonStyle">@style/ActionBar.GeckoApp.OverflowButton</item>
-        <item name="android:actionBarDivider">@android:color/transparent</item>
-    </style>
-    
-</resources>
diff --git a/mobile/android/base/resources/values-v11/styles.xml b/mobile/android/base/resources/values-v11/styles.xml
index 201edea71331..37d95c67d2e6 100644
--- a/mobile/android/base/resources/values-v11/styles.xml
+++ b/mobile/android/base/resources/values-v11/styles.xml
@@ -14,7 +14,7 @@
     <style name="BrowserToolbar">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">fill_parent</item>
-        <item name="android:orientation">vertical</item>
+        <item name="android:orientation">horizontal</item>
     </style>
 
     <!-- Address bar -->
@@ -38,7 +38,7 @@
 
     <!-- GeckoApp ActionBar -->
     <style name="ActionBar.GeckoApp">
-         <item name="android:background">@drawable/gecko_actionbar_bg</item>
+         <item name="android:background">#000000</item>
          <item name="android:displayOptions">showCustom</item>
          <item name="android:customNavigationLayout">@layout/browser_toolbar</item>
     </style>
diff --git a/mobile/android/base/resources/values-v11/themes.xml b/mobile/android/base/resources/values-v11/themes.xml
index d760f6a31265..134c8fcb2e45 100644
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -35,6 +35,7 @@
     <style name="Gecko.App">
         <item name="android:windowBackground">@drawable/abouthome_bg_repeat</item>
         <item name="android:actionBarStyle">@style/ActionBar.GeckoApp</item>
+        <item name="android:panelBackground">@drawable/menu_panel_bg</item>
     </style>
 
     <style name="Gecko.Light.AwesomeBar">
diff --git a/mobile/android/base/resources/values-xlarge/styles.xml b/mobile/android/base/resources/values-xlarge/styles.xml
deleted file mode 100644
index cc18f68cd602..000000000000
--- a/mobile/android/base/resources/values-xlarge/styles.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<resources>
-    
-    <!--
-        Only overriden styles for tablets are specified here.
-    -->
-
-    <!-- GeckoApp ActionBar -->
-    <style name="ActionBar.GeckoApp">
-         <item name="android:background">@drawable/address_bar_bg</item>
-         <item name="android:displayOptions">showCustom</item>
-         <item name="android:customNavigationLayout">@layout/browser_toolbar</item>
-    </style>
-
-    <!-- GeckoApp ActionBar ActionButton -->
-    <style name="ActionBar.GeckoApp.ActionButton" parent="@android:style/Widget.Holo.ActionButton">
-        <item name="android:background">@drawable/action_bar_button</item>
-        <item name="android:padding">14dip</item>
-        <item name="android:minWidth">56dip</item>
-        <item name="android:minHeight">56dip</item>
-    </style>
-
-    <!-- GeckoApp ActionBar OverflowButton -->
-    <style name="ActionBar.GeckoApp.OverflowButton" parent="ActionBar.GeckoApp.ActionButton">
-        <item name="android:src">@drawable/menu</item>
-    </style>
-
-</resources>
diff --git a/mobile/android/base/resources/values-xlarge/themes.xml b/mobile/android/base/resources/values-xlarge/themes.xml
deleted file mode 100644
index 4c97246eba44..000000000000
--- a/mobile/android/base/resources/values-xlarge/themes.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<resources>
-
-    <!--
-        Only overriden themes for tablets are specified here.
-    -->
-
-    <style name="Gecko.App">
-        <item name="android:windowBackground">@drawable/abouthome_bg_repeat</item>
-        <item name="android:actionBarStyle">@style/ActionBar.GeckoApp</item>
-        <item name="android:actionButtonStyle">@style/ActionBar.GeckoApp.ActionButton</item>
-        <item name="android:actionOverflowButtonStyle">@style/ActionBar.GeckoApp.OverflowButton</item>
-        <item name="android:actionBarDivider">@android:color/transparent</item>
-    </style>
-    
-</resources>
diff --git a/mobile/android/base/resources/values/attrs.xml b/mobile/android/base/resources/values/attrs.xml
index c772b891bcaf..a95e944b3ba1 100644
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -11,4 +11,16 @@
          <attr name="more_text" format="string"/>
     </declare-styleable>
 
+    <declare-styleable name="MenuItem">
+        <attr name="id" format="string"/>
+        <attr name="orderInCategory" format="string"/>
+        <attr name="title"/>
+        <attr name="icon" format="string"/>
+        <attr name="checkable" format="boolean"/>
+        <attr name="checked" format="boolean"/>
+        <attr name="visible" format="string"/>
+        <attr name="enabled" format="string"/>
+        <attr name="showAsAction" format="boolean"/>
+    </declare-styleable>
+
 </resources>
diff --git a/mobile/android/base/resources/values/colors.xml b/mobile/android/base/resources/values/colors.xml
index 700be395e853..478718b3e996 100644
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -13,5 +13,6 @@
   <color name="identity_verified">#77BAFF</color>
   <color name="identity_identified">#B7D46A</color>
   <color name="tabs_counter_color">#C7D1DB</color>
+  <color name="url_bar_text_highlight">#FF9500</color>
 </resources>
 
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index d34220460c22..b9aaac451f93 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -35,7 +35,7 @@
     <style name="BrowserToolbar">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:orientation">vertical</item>
+        <item name="android:orientation">horizontal</item>
         <item name="android:background">#000000</item>
     </style>
 
diff --git a/mobile/android/base/sync/GlobalConstants.java.in b/mobile/android/base/sync/GlobalConstants.java.in
index ec124331b60b..183e4e9d2b26 100644
--- a/mobile/android/base/sync/GlobalConstants.java.in
+++ b/mobile/android/base/sync/GlobalConstants.java.in
@@ -14,4 +14,6 @@ public class GlobalConstants {
 
   public static final String USER_AGENT = "Firefox AndroidSync " + SYNC_VERSION_STRING +
                                           " (" + PRODUCT_NAME + ")";
+  public static final String BROWSER_INTENT_PACKAGE = "@ANDROID_PACKAGE_NAME@";
+  public static final String BROWSER_INTENT_CLASS = BROWSER_INTENT_PACKAGE + ".App";
 }
diff --git a/mobile/android/base/sync/Server11PreviousPostFailedException.java b/mobile/android/base/sync/Server11PreviousPostFailedException.java
new file mode 100644
index 000000000000..4ea77f37c8c0
--- /dev/null
+++ b/mobile/android/base/sync/Server11PreviousPostFailedException.java
@@ -0,0 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync;
+
+/**
+ * A previous POST failed, so we won't send any more records this session.
+ */
+public class Server11PreviousPostFailedException extends SyncException {
+  private static final long serialVersionUID = -3582490631414624310L;
+}
diff --git a/mobile/android/base/sync/Server11RecordPostFailedException.java b/mobile/android/base/sync/Server11RecordPostFailedException.java
new file mode 100644
index 000000000000..d654d3116a0b
--- /dev/null
+++ b/mobile/android/base/sync/Server11RecordPostFailedException.java
@@ -0,0 +1,12 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync;
+
+/**
+ * The server rejected a record in its "failure" array.
+ */
+public class Server11RecordPostFailedException extends SyncException {
+  private static final long serialVersionUID = -8517471217486190314L;
+}
diff --git a/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java b/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java
index 3c1000e61f52..6fd076accc0c 100644
--- a/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java
+++ b/mobile/android/base/sync/middleware/Crypto5MiddlewareRepositorySession.java
@@ -175,10 +175,10 @@ public class Crypto5MiddlewareRepositorySession extends MiddlewareRepositorySess
     try {
       rec.encrypt();
     } catch (UnsupportedEncodingException e) {
-      delegate.onRecordStoreFailed(e);
+      delegate.onRecordStoreFailed(e, record.guid);
       return;
     } catch (CryptoException e) {
-      delegate.onRecordStoreFailed(e);
+      delegate.onRecordStoreFailed(e, record.guid);
       return;
     }
     // Allow the inner session to do delegate handling.
diff --git a/mobile/android/base/sync/net/BaseResource.java b/mobile/android/base/sync/net/BaseResource.java
index 2b949db26fc4..fa3762cfda84 100644
--- a/mobile/android/base/sync/net/BaseResource.java
+++ b/mobile/android/base/sync/net/BaseResource.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -249,6 +250,10 @@ public class BaseResource implements Resource {
       delegate.handleHttpProtocolException(e);
     } catch (IOException e) {
       delegate.handleHttpIOException(e);
+    } catch (Exception e) {
+      // Bug 740731: Don't let an exception fall through. Wrapping isn't
+      // optimal, but often the exception is treated as an Exception anyway.
+      delegate.handleHttpIOException(new IOException(e));
     }
   }
 
@@ -262,9 +267,16 @@ public class BaseResource implements Resource {
     } catch (KeyManagementException e) {
       Logger.error(LOG_TAG, "Couldn't prepare client.", e);
       delegate.handleTransportException(e);
+      return;
     } catch (NoSuchAlgorithmException e) {
       Logger.error(LOG_TAG, "Couldn't prepare client.", e);
       delegate.handleTransportException(e);
+      return;
+    } catch (Exception e) {
+      // Bug 740731: Don't let an exception fall through. Wrapping isn't
+      // optimal, but often the exception is treated as an Exception anyway.
+      delegate.handleTransportException(new GeneralSecurityException(e));
+      return;
     }
     this.execute();
   }
diff --git a/mobile/android/base/sync/repositories/FetchFailedException.java b/mobile/android/base/sync/repositories/FetchFailedException.java
new file mode 100644
index 000000000000..8b29a37baec7
--- /dev/null
+++ b/mobile/android/base/sync/repositories/FetchFailedException.java
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync.repositories;
+
+import org.mozilla.gecko.sync.SyncException;
+
+public class FetchFailedException extends SyncException {
+  private static final long serialVersionUID = -7533105300182522946L;
+}
diff --git a/mobile/android/base/sync/repositories/Server11RepositorySession.java b/mobile/android/base/sync/repositories/Server11RepositorySession.java
index b2af2e40a3ab..a60eb1a15ffb 100644
--- a/mobile/android/base/sync/repositories/Server11RepositorySession.java
+++ b/mobile/android/base/sync/repositories/Server11RepositorySession.java
@@ -21,6 +21,8 @@ import org.mozilla.gecko.sync.DelayedWorkTracker;
 import org.mozilla.gecko.sync.ExtendedJSONObject;
 import org.mozilla.gecko.sync.HTTPFailureException;
 import org.mozilla.gecko.sync.Logger;
+import org.mozilla.gecko.sync.Server11PreviousPostFailedException;
+import org.mozilla.gecko.sync.Server11RecordPostFailedException;
 import org.mozilla.gecko.sync.UnexpectedJSONException;
 import org.mozilla.gecko.sync.crypto.KeyBundle;
 import org.mozilla.gecko.sync.net.SyncStorageCollectionRequest;
@@ -28,6 +30,7 @@ import org.mozilla.gecko.sync.net.SyncStorageRequest;
 import org.mozilla.gecko.sync.net.SyncStorageRequestDelegate;
 import org.mozilla.gecko.sync.net.SyncStorageResponse;
 import org.mozilla.gecko.sync.net.WBOCollectionRequestDelegate;
+import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFetchRecordsDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionGuidsSinceDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate;
@@ -311,7 +314,25 @@ public class Server11RepositorySession extends RepositorySession {
   }
 
   protected Object recordsBufferMonitor = new Object();
+
+  /**
+   * Data of outbound records.
+   * <p>
+   * We buffer the data (rather than the <code>Record</code>) so that we can
+   * flush the buffer based on outgoing transmission size.
+   * <p>
+   * Access should be synchronized on <code>recordsBufferMonitor</code>.
+   */
   protected ArrayList<byte[]> recordsBuffer = new ArrayList<byte[]>();
+
+  /**
+   * GUIDs of outbound records.
+   * <p>
+   * Used to fail entire outgoing uploads.
+   * <p>
+   * Access should be synchronized on <code>recordsBufferMonitor</code>.
+   */
+  protected ArrayList<String> recordGuidsBuffer = new ArrayList<String>();
   protected int byteCount = PER_BATCH_OVERHEAD;
 
   @Override
@@ -340,6 +361,7 @@ public class Server11RepositorySession extends RepositorySession {
         flush();
       }
       recordsBuffer.add(json);
+      recordGuidsBuffer.add(record.guid);
       byteCount += PER_RECORD_OVERHEAD + delta;
     }
   }
@@ -349,10 +371,12 @@ public class Server11RepositorySession extends RepositorySession {
   protected void flush() {
     if (recordsBuffer.size() > 0) {
       final ArrayList<byte[]> outgoing = recordsBuffer;
+      final ArrayList<String> outgoingGuids = recordGuidsBuffer;
       RepositorySessionStoreDelegate uploadDelegate = this.delegate;
-      storeWorkQueue.execute(new RecordUploadRunnable(uploadDelegate, outgoing, byteCount));
+      storeWorkQueue.execute(new RecordUploadRunnable(uploadDelegate, outgoing, outgoingGuids, byteCount));
 
       recordsBuffer = new ArrayList<byte[]>();
+      recordGuidsBuffer = new ArrayList<String>();
       byteCount = PER_BATCH_OVERHEAD;
     }
   }
@@ -377,6 +401,20 @@ public class Server11RepositorySession extends RepositorySession {
     }
   }
 
+  /**
+   * <code>true</code> if a record upload has failed this session.
+   * <p>
+   * This is only set in begin and possibly by <code>RecordUploadRunnable</code>.
+   * Since those are executed serially, we can use an unsynchronized
+   * volatile boolean here.
+   */
+  protected volatile boolean recordUploadFailed;
+
+  public void begin(RepositorySessionBeginDelegate delegate) throws InvalidSessionTransitionException {
+    recordUploadFailed = false;
+    super.begin(delegate);
+  }
+
   /**
    * Make an HTTP request, and convert HTTP request delegate callbacks into
    * store callbacks within the context of this RepositorySession.
@@ -388,15 +426,18 @@ public class Server11RepositorySession extends RepositorySession {
 
     public final String LOG_TAG = "RecordUploadRunnable";
     private ArrayList<byte[]> outgoing;
+    private ArrayList<String> outgoingGuids;
     private long byteCount;
 
     public RecordUploadRunnable(RepositorySessionStoreDelegate storeDelegate,
                                 ArrayList<byte[]> outgoing,
+                                ArrayList<String> outgoingGuids,
                                 long byteCount) {
       Logger.info(LOG_TAG, "Preparing record upload for " +
                   outgoing.size() + " records (" +
                   byteCount + " bytes).");
-      this.outgoing  = outgoing;
+      this.outgoing = outgoing;
+      this.outgoingGuids = outgoingGuids;
       this.byteCount = byteCount;
     }
 
@@ -419,7 +460,7 @@ public class Server11RepositorySession extends RepositorySession {
         body = response.jsonObjectBody(); // jsonObjectBody() throws or returns non-null.
       } catch (Exception e) {
         Logger.error(LOG_TAG, "Got exception parsing POST success body.", e);
-        // TODO
+        this.handleRequestError(e);
         return;
       }
 
@@ -437,21 +478,34 @@ public class Server11RepositorySession extends RepositorySession {
 
       try {
         JSONArray          success = body.getArray("success");
-        ExtendedJSONObject failed  = body.getObject("failed");
         if ((success != null) &&
             (success.size() > 0)) {
           Logger.debug(LOG_TAG, "Successful records: " + success.toString());
-          // TODO: how do we notify without the whole record?
+          for (Object o : success) {
+            try {
+              delegate.onRecordStoreSucceeded((String) o);
+            } catch (ClassCastException e) {
+              Logger.error(LOG_TAG, "Got exception parsing POST success guid.", e);
+              // Not much to be done.
+            }
+          }
 
           long normalizedTimestamp = getNormalizedTimestamp(response);
           Logger.debug(LOG_TAG, "Passing back upload X-Weave-Timestamp: " + normalizedTimestamp);
           bumpUploadTimestamp(normalizedTimestamp);
         }
+        success = null; // Want to GC this ASAP.
+
+        ExtendedJSONObject failed  = body.getObject("failed");
         if ((failed != null) &&
             (failed.object.size() > 0)) {
           Logger.debug(LOG_TAG, "Failed records: " + failed.object.toString());
-          // TODO: notify.
+          Exception ex = new Server11RecordPostFailedException();
+          for (String guid : failed.keySet()) {
+            delegate.onRecordStoreFailed(ex, guid);
+          }
         }
+        failed = null; // Want to GC this ASAP.
       } catch (UnexpectedJSONException e) {
         Logger.error(LOG_TAG, "Got exception processing success/failed in POST success body.", e);
         // TODO
@@ -462,7 +516,6 @@ public class Server11RepositorySession extends RepositorySession {
 
     @Override
     public void handleRequestFailure(SyncStorageResponse response) {
-      // TODO: ensure that delegate methods don't get called more than once.
       // TODO: call session.interpretHTTPFailure.
       this.handleRequestError(new HTTPFailureException(response));
     }
@@ -470,7 +523,14 @@ public class Server11RepositorySession extends RepositorySession {
     @Override
     public void handleRequestError(final Exception ex) {
       Logger.warn(LOG_TAG, "Got request error: " + ex, ex);
-      delegate.onRecordStoreFailed(ex);
+
+      recordUploadFailed = true;
+      ArrayList<String> failedOutgoingGuids = outgoingGuids;
+      outgoingGuids = null; // Want to GC this ASAP.
+      for (String guid : failedOutgoingGuids) {
+        delegate.onRecordStoreFailed(ex, guid);
+      }
+      return;
     }
 
     public class ByteArraysContentProducer implements ContentProducer {
@@ -520,6 +580,15 @@ public class Server11RepositorySession extends RepositorySession {
 
     @Override
     public void run() {
+      if (recordUploadFailed) {
+        Logger.info(LOG_TAG, "Previous record upload failed.  Failing all records and not retrying.");
+        Exception ex = new Server11PreviousPostFailedException();
+        for (String guid : outgoingGuids) {
+          delegate.onRecordStoreFailed(ex, guid);
+        }
+        return;
+      }
+
       if (outgoing == null ||
           outgoing.size() == 0) {
         Logger.debug(LOG_TAG, "No items: RecordUploadRunnable returning immediately.");
diff --git a/mobile/android/base/sync/repositories/StoreFailedException.java b/mobile/android/base/sync/repositories/StoreFailedException.java
new file mode 100644
index 000000000000..fcb09e32e1f3
--- /dev/null
+++ b/mobile/android/base/sync/repositories/StoreFailedException.java
@@ -0,0 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync.repositories;
+
+import org.mozilla.gecko.sync.SyncException;
+
+public class StoreFailedException extends SyncException {
+  private static final long serialVersionUID = 6080340122855859752L;
+}
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java
index a6aac2c579d6..285615996ce0 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserBookmarksRepositorySession.java
@@ -588,7 +588,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
     try {
       Uri recordURI = dbHelper.insert(toStore);
       if (recordURI == null) {
-        delegate.onRecordStoreFailed(new RuntimeException("Got null URI inserting folder with guid " + toStore.guid + "."));
+        delegate.onRecordStoreFailed(new RuntimeException("Got null URI inserting folder with guid " + toStore.guid + "."), record.guid);
         return false;
       }
       toStore.androidID = ContentUris.parseId(recordURI);
@@ -596,11 +596,11 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
 
       updateBookkeeping(toStore);
     } catch (Exception e) {
-      delegate.onRecordStoreFailed(e);
+      delegate.onRecordStoreFailed(e, record.guid);
       return false;
     }
     trackRecord(toStore);
-    delegate.onRecordStoreSucceeded(toStore);
+    delegate.onRecordStoreSucceeded(record.guid);
     return true;
   }
 
@@ -623,12 +623,14 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
         // Something failed; most pessimistic action is to declare that all insertions failed.
         // TODO: perform the bulkInsert in a transaction and rollback unless all insertions succeed?
         for (Record failed : toStores) {
-          delegate.onRecordStoreFailed(new RuntimeException("Possibly failed to bulkInsert non-folder with guid " + failed.guid + "."));
+          delegate.onRecordStoreFailed(new RuntimeException("Possibly failed to bulkInsert non-folder with guid " + failed.guid + "."), failed.guid);
         }
         return;
       }
     } catch (NullCursorException e) {
-      delegate.onRecordStoreFailed(e); // TODO: include which records failed.
+      for (Record failed : toStores) {
+        delegate.onRecordStoreFailed(e, failed.guid);
+      }
       return;
     }
 
@@ -640,7 +642,7 @@ public class AndroidBrowserBookmarksRepositorySession extends AndroidBrowserRepo
         Logger.warn(LOG_TAG, "Got exception updating bookkeeping of non-folder with guid " + succeeded.guid + ".", e);
       }
       trackRecord(succeeded);
-      delegate.onRecordStoreSucceeded(succeeded);
+      delegate.onRecordStoreSucceeded(succeeded.guid);
     }
   }
 
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java
index 83aabd29d32d..2a56c79f103a 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserHistoryRepositorySession.java
@@ -214,7 +214,7 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
       // Something failed; most pessimistic action is to declare that all insertions failed.
       // TODO: perform the bulkInsert in a transaction and rollback unless all insertions succeed?
       for (HistoryRecord failed : outgoing) {
-        delegate.onRecordStoreFailed(new RuntimeException("Failed to insert history item with guid " + failed.guid + "."));
+        delegate.onRecordStoreFailed(new RuntimeException("Failed to insert history item with guid " + failed.guid + "."), failed.guid);
       }
       return;
     }
@@ -234,7 +234,7 @@ public class AndroidBrowserHistoryRepositorySession extends AndroidBrowserReposi
         throw e;
       }
       trackRecord(succeeded);
-      delegate.onRecordStoreSucceeded(succeeded); // At this point, we are really inserted.
+      delegate.onRecordStoreSucceeded(succeeded.guid); // At this point, we are really inserted.
     }
   }
 
diff --git a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
index 49ee55dd9245..e77735697099 100644
--- a/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/AndroidBrowserRepositorySession.java
@@ -384,7 +384,7 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
       public void run() {
         if (!isActive()) {
           Logger.warn(LOG_TAG, "AndroidBrowserRepositorySession is inactive. Store failing.");
-          delegate.onRecordStoreFailed(new InactiveSessionException(null));
+          delegate.onRecordStoreFailed(new InactiveSessionException(null), record.guid);
           return;
         }
 
@@ -503,24 +503,24 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
           // of reconcileRecords.
           Logger.debug(LOG_TAG, "Calling delegate callback with guid " + replaced.guid +
                                 "(" + replaced.androidID + ")");
-          delegate.onRecordStoreSucceeded(replaced);
+          delegate.onRecordStoreSucceeded(replaced.guid);
           return;
 
         } catch (MultipleRecordsForGuidException e) {
           Logger.error(LOG_TAG, "Multiple records returned for given guid: " + record.guid);
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         } catch (NoGuidForIdException e) {
           Logger.error(LOG_TAG, "Store failed for " + record.guid, e);
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         } catch (NullCursorException e) {
           Logger.error(LOG_TAG, "Store failed for " + record.guid, e);
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         } catch (Exception e) {
           Logger.error(LOG_TAG, "Store failed for " + record.guid, e);
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         }
       }
@@ -539,7 +539,7 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
     // TODO: we ought to mark the record as deleted rather than purging it,
     // in order to support syncing to multiple destinations. Bug 722607.
     dbHelper.purgeGuid(record.guid);
-    delegate.onRecordStoreSucceeded(record);
+    delegate.onRecordStoreSucceeded(record.guid);
   }
 
   protected void insert(Record record) throws NoGuidForIdException, NullCursorException, ParentNotFoundException {
@@ -552,7 +552,7 @@ public abstract class AndroidBrowserRepositorySession extends StoreTrackingRepos
 
     updateBookkeeping(toStore);
     trackRecord(toStore);
-    delegate.onRecordStoreSucceeded(toStore);
+    delegate.onRecordStoreSucceeded(toStore.guid);
 
     Logger.debug(LOG_TAG, "Inserted record with guid " + toStore.guid + " as androidID " + toStore.androidID);
   }
diff --git a/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java b/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java
index d4d3370f494c..570fd7d1d2ad 100644
--- a/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java
+++ b/mobile/android/base/sync/repositories/android/BookmarksDeletionManager.java
@@ -12,7 +12,6 @@ import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.sync.Logger;
 import org.mozilla.gecko.sync.repositories.NullCursorException;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionStoreDelegate;
-import org.mozilla.gecko.sync.repositories.domain.BookmarkRecord;
 
 /**
  * Queue up deletions. Process them at the end.
@@ -222,11 +221,8 @@ public class BookmarksDeletionManager {
       return;
     }
     Logger.trace(LOG_TAG, "Invoking store callback for " + nonFolderGUIDs.length + " GUIDs.");
-    final long now = System.currentTimeMillis();
-    BookmarkRecord r = new BookmarkRecord(null, "bookmarks", now, true);
     for (String guid : nonFolderGUIDs) {
-      r.guid = guid;
-      delegate.onRecordStoreSucceeded(r);
+      delegate.onRecordStoreSucceeded(guid);
     }
   }
 
diff --git a/mobile/android/base/sync/repositories/android/FennecTabsRepository.java b/mobile/android/base/sync/repositories/android/FennecTabsRepository.java
index b88a15fbd66d..166e277c93af 100644
--- a/mobile/android/base/sync/repositories/android/FennecTabsRepository.java
+++ b/mobile/android/base/sync/repositories/android/FennecTabsRepository.java
@@ -140,11 +140,11 @@ public class FennecTabsRepository extends Repository {
         public void run() {
           Logger.debug(LOG_TAG, "Storing tabs for client " + tabsRecord.guid);
           if (!isActive()) {
-            delegate.onRecordStoreFailed(new InactiveSessionException(null));
+            delegate.onRecordStoreFailed(new InactiveSessionException(null), record.guid);
             return;
           }
           if (tabsRecord.guid == null) {
-            delegate.onRecordStoreFailed(new RuntimeException("Can't store record with null GUID."));
+            delegate.onRecordStoreFailed(new RuntimeException("Can't store record with null GUID."), record.guid);
             return;
           }
 
@@ -157,9 +157,9 @@ public class FennecTabsRepository extends Repository {
                 clientsProvider.delete(BrowserContract.Clients.CONTENT_URI,
                                        CLIENT_GUID_IS,
                                        selectionArgs);
-                delegate.onRecordStoreSucceeded(record);
+                delegate.onRecordStoreSucceeded(record.guid);
               } catch (Exception e) {
-                delegate.onRecordStoreFailed(e);
+                delegate.onRecordStoreFailed(e, record.guid);
               }
               return;
             }
@@ -184,10 +184,10 @@ public class FennecTabsRepository extends Repository {
             final int inserted = tabsProvider.bulkInsert(BrowserContract.Tabs.CONTENT_URI, tabsArray);
             Logger.trace(LOG_TAG, "Inserted: " + inserted);
 
-            delegate.onRecordStoreSucceeded(tabsRecord);
+            delegate.onRecordStoreSucceeded(record.guid);
           } catch (Exception e) {
             Logger.warn(LOG_TAG, "Error storing tabs.", e);
-            delegate.onRecordStoreFailed(e);
+            delegate.onRecordStoreFailed(e, record.guid);
           }
         }
       };
diff --git a/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java b/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java
index a90467e0b91c..94803d432766 100644
--- a/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/FormHistoryRepositorySession.java
@@ -450,7 +450,7 @@ public class FormHistoryRepositorySession extends
         try {
           flushInsertQueue();
         } catch (Exception e) {
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         }
       }
@@ -491,7 +491,8 @@ public class FormHistoryRepositorySession extends
           }
           storeDone(now());
         } catch (Exception e) {
-          delegate.onRecordStoreFailed(e);
+          // XXX TODO
+          delegate.onRecordStoreFailed(e, null);
         }
       }
     };
@@ -562,7 +563,7 @@ public class FormHistoryRepositorySession extends
       public void run() {
         if (!isActive()) {
           Logger.warn(LOG_TAG, "FormHistoryRepositorySession is inactive. Store failing.");
-          delegate.onRecordStoreFailed(new InactiveSessionException(null));
+          delegate.onRecordStoreFailed(new InactiveSessionException(null), record.guid);
           return;
         }
 
@@ -605,7 +606,7 @@ public class FormHistoryRepositorySession extends
               Logger.trace(LOG_TAG, "Remote modified, local not. Deleting.");
               deleteExistingRecord(existingRecord);
               trackRecord(record);
-              delegate.onRecordStoreSucceeded(record);
+              delegate.onRecordStoreSucceeded(record.guid);
               return;
             }
 
@@ -614,7 +615,7 @@ public class FormHistoryRepositorySession extends
               Logger.trace(LOG_TAG, "Remote is newer, and deleted. Purging local.");
               deleteExistingRecord(existingRecord);
               trackRecord(record);
-              delegate.onRecordStoreSucceeded(record);
+              delegate.onRecordStoreSucceeded(record.guid);
               return;
             }
 
@@ -638,7 +639,7 @@ public class FormHistoryRepositorySession extends
             Logger.trace(LOG_TAG, "No match. Inserting.");
             insertNewRegularRecord(record);
             trackRecord(record);
-            delegate.onRecordStoreSucceeded(record);
+            delegate.onRecordStoreSucceeded(record.guid);
             return;
           }
 
@@ -650,7 +651,7 @@ public class FormHistoryRepositorySession extends
             Logger.trace(LOG_TAG, "Remote guid different from local guid. Storing to keep remote guid.");
             replaceExistingRecordWithRegularRecord(record, existingRecord);
             trackRecord(record);
-            delegate.onRecordStoreSucceeded(record);
+            delegate.onRecordStoreSucceeded(record.guid);
             return;
           }
 
@@ -660,7 +661,7 @@ public class FormHistoryRepositorySession extends
             Logger.trace(LOG_TAG, "Remote modified, local not. Storing.");
             replaceExistingRecordWithRegularRecord(record, existingRecord);
             trackRecord(record);
-            delegate.onRecordStoreSucceeded(record);
+            delegate.onRecordStoreSucceeded(record.guid);
             return;
           }
 
@@ -669,7 +670,7 @@ public class FormHistoryRepositorySession extends
             Logger.trace(LOG_TAG, "Remote is newer, and not deleted. Storing.");
             replaceExistingRecordWithRegularRecord(record, existingRecord);
             trackRecord(record);
-            delegate.onRecordStoreSucceeded(record);
+            delegate.onRecordStoreSucceeded(record.guid);
             return;
           }
 
@@ -680,7 +681,7 @@ public class FormHistoryRepositorySession extends
           return;
         } catch (Exception e) {
           Logger.error(LOG_TAG, "Store failed for " + record.guid, e);
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         }
       }
diff --git a/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java b/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
index a39e39277dab..2a0fe7b13b48 100644
--- a/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
+++ b/mobile/android/base/sync/repositories/android/PasswordsRepositorySession.java
@@ -257,13 +257,13 @@ public class PasswordsRepositorySession extends
       public void run() {
         if (!isActive()) {
           Logger.warn(LOG_TAG, "RepositorySession is inactive. Store failing.");
-          delegate.onRecordStoreFailed(new InactiveSessionException(null));
+          delegate.onRecordStoreFailed(new InactiveSessionException(null), record.guid);
           return;
         }
 
         final String guid = remoteRecord.guid;
         if (guid == null) {
-          delegate.onRecordStoreFailed(new RuntimeException("Can't store record with null GUID."));
+          delegate.onRecordStoreFailed(new RuntimeException("Can't store record with null GUID."), record.guid);
           return;
         }
 
@@ -272,10 +272,10 @@ public class PasswordsRepositorySession extends
           existingRecord = retrieveByGUID(guid);
         } catch (NullCursorException e) {
           // Indicates a serious problem.
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         } catch (RemoteException e) {
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         }
 
@@ -330,7 +330,15 @@ public class PasswordsRepositorySession extends
         // Now we're processing a non-deleted incoming record.
         if (existingRecord == null) {
           trace("Looking up match for record " + remoteRecord.guid);
-          existingRecord = findExistingRecord(remoteRecord);
+          try {
+            existingRecord = findExistingRecord(remoteRecord);
+          } catch (RemoteException e) {
+            Logger.error(LOG_TAG, "Remote exception in findExistingRecord.");
+            delegate.onRecordStoreFailed(e, record.guid);
+          } catch (NullCursorException e) {
+            Logger.error(LOG_TAG, "Null cursor in findExistingRecord.");
+            delegate.onRecordStoreFailed(e, record.guid);
+          }
         }
 
         if (existingRecord == null) {
@@ -342,11 +350,11 @@ public class PasswordsRepositorySession extends
             inserted = insert(remoteRecord);
           } catch (RemoteException e) {
             Logger.debug(LOG_TAG, "Record insert caused a RemoteException.");
-            delegate.onRecordStoreFailed(e);
+            delegate.onRecordStoreFailed(e, record.guid);
             return;
           }
           trackRecord(inserted);
-          delegate.onRecordStoreSucceeded(inserted);
+          delegate.onRecordStoreSucceeded(inserted.guid);
           return;
         }
 
@@ -369,7 +377,7 @@ public class PasswordsRepositorySession extends
           replaced = replace(existingRecord, toStore);
         } catch (RemoteException e) {
           Logger.debug(LOG_TAG, "Record replace caused a RemoteException.");
-          delegate.onRecordStoreFailed(e);
+          delegate.onRecordStoreFailed(e, record.guid);
           return;
         }
 
@@ -377,7 +385,7 @@ public class PasswordsRepositorySession extends
         // of reconcileRecords.
         Logger.debug(LOG_TAG, "Calling delegate callback with guid " + replaced.guid +
                               "(" + replaced.androidID + ")");
-        delegate.onRecordStoreSucceeded(replaced);
+        delegate.onRecordStoreSucceeded(record.guid);
         return;
       }
     };
@@ -581,7 +589,7 @@ public class PasswordsRepositorySession extends
     Passwords.USERNAME_FIELD  + " = ? AND " +
     Passwords.PASSWORD_FIELD  + " = ?";
 
-  private PasswordRecord findExistingRecord(PasswordRecord record) {
+  private PasswordRecord findExistingRecord(PasswordRecord record) throws NullCursorException, RemoteException {
     PasswordRecord foundRecord = null;
     Cursor cursor = null;
     // Only check the data table.
@@ -610,12 +618,6 @@ public class PasswordsRepositorySession extends
           return foundRecord;
         }
       }
-    } catch (RemoteException e) {
-      Logger.error(LOG_TAG, "Remote exception in findExistingRecord.");
-      delegate.onRecordStoreFailed(e);
-    } catch (NullCursorException e) {
-      Logger.error(LOG_TAG, "Null cursor in findExistingRecord.");
-      delegate.onRecordStoreFailed(e);
     } finally {
       if (cursor != null) {
         cursor.close();
@@ -630,10 +632,10 @@ public class PasswordsRepositorySession extends
       deleteGUID(record.guid);
     } catch (RemoteException e) {
       Logger.error(LOG_TAG, "RemoteException in password delete.");
-      delegate.onRecordStoreFailed(e);
+      delegate.onRecordStoreFailed(e, record.guid);
       return;
     }
-    delegate.onRecordStoreSucceeded(record);
+    delegate.onRecordStoreSucceeded(record.guid);
   }
 
   /**
diff --git a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java
index 4a5697ee918f..2f659c733f68 100644
--- a/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java
+++ b/mobile/android/base/sync/repositories/delegates/DeferredRepositorySessionStoreDelegate.java
@@ -6,8 +6,6 @@ package org.mozilla.gecko.sync.repositories.delegates;
 
 import java.util.concurrent.ExecutorService;
 
-import org.mozilla.gecko.sync.repositories.domain.Record;
-
 public class DeferredRepositorySessionStoreDelegate implements
     RepositorySessionStoreDelegate {
   protected final RepositorySessionStoreDelegate inner;
@@ -20,21 +18,21 @@ public class DeferredRepositorySessionStoreDelegate implements
   }
 
   @Override
-  public void onRecordStoreSucceeded(final Record record) {
+  public void onRecordStoreSucceeded(final String guid) {
     executor.execute(new Runnable() {
       @Override
       public void run() {
-        inner.onRecordStoreSucceeded(record);
+        inner.onRecordStoreSucceeded(guid);
       }
     });
   }
 
   @Override
-  public void onRecordStoreFailed(final Exception ex) {
+  public void onRecordStoreFailed(final Exception ex, final String guid) {
     executor.execute(new Runnable() {
       @Override
       public void run() {
-        inner.onRecordStoreFailed(ex);
+        inner.onRecordStoreFailed(ex, guid);
       }
     });
   }
diff --git a/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java b/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java
index c07cffaaa7ea..01e44c3aea96 100644
--- a/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java
+++ b/mobile/android/base/sync/repositories/delegates/RepositorySessionStoreDelegate.java
@@ -6,8 +6,6 @@ package org.mozilla.gecko.sync.repositories.delegates;
 
 import java.util.concurrent.ExecutorService;
 
-import org.mozilla.gecko.sync.repositories.domain.Record;
-
 /**
  * These methods *must* be invoked asynchronously. Use deferredStoreDelegate if you
  * need help doing this.
@@ -16,11 +14,10 @@ import org.mozilla.gecko.sync.repositories.domain.Record;
  *
  */
 public interface RepositorySessionStoreDelegate {
-  public void onRecordStoreFailed(Exception ex);
+  public void onRecordStoreFailed(Exception ex, String recordGuid);
 
-  // Optionally called with an equivalent (but not necessarily identical) record
-  // when a store has succeeded.
-  public void onRecordStoreSucceeded(Record record);
+  // Called with a GUID when store has succeeded.
+  public void onRecordStoreSucceeded(String guid);
   public void onStoreCompleted(long storeEnd);
   public RepositorySessionStoreDelegate deferredStoreDelegate(ExecutorService executor);
 }
diff --git a/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java b/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java
index c1fe293e0dd5..b006d651fa95 100644
--- a/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java
+++ b/mobile/android/base/sync/setup/activities/SetupSuccessActivity.java
@@ -5,11 +5,11 @@
 package org.mozilla.gecko.sync.setup.activities;
 
 import org.mozilla.gecko.R;
+import org.mozilla.gecko.sync.GlobalConstants;
 import org.mozilla.gecko.sync.Logger;
 import org.mozilla.gecko.sync.setup.Constants;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -19,13 +19,11 @@ import android.widget.TextView;
 public class SetupSuccessActivity extends Activity {
   private final static String LOG_TAG = "SetupSuccessActivity";
   private TextView setupSubtitle;
-  private Context mContext;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
     setTheme(R.style.SyncTheme);
     super.onCreate(savedInstanceState);
-    mContext = getApplicationContext();
     Bundle extras = this.getIntent().getExtras();
     setContentView(R.layout.sync_setup_success);
     setupSubtitle = ((TextView) findViewById(R.id.setup_success_subtitle));
@@ -46,14 +44,15 @@ public class SetupSuccessActivity extends Activity {
   /* Click Handlers */
   public void settingsClickHandler(View target) {
     Intent intent = new Intent(Settings.ACTION_SYNC_SETTINGS);
-    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     startActivity(intent);
   }
 
-  public void pairClickHandler(View target) {
-    Intent intent = new Intent(mContext, SetupSyncActivity.class);
-    intent.setFlags(Constants.FLAG_ACTIVITY_REORDER_TO_FRONT_NO_ANIMATION);
-    intent.putExtra(Constants.INTENT_EXTRA_IS_SETUP, false);
+  public void launchBrowser(View target) {
+    Intent intent = new Intent(Intent.ACTION_MAIN);
+    intent.setClassName(GlobalConstants.BROWSER_INTENT_PACKAGE, GlobalConstants.BROWSER_INTENT_CLASS);
+    // Start Fennec as a new task. If Fennec is already running, bring it to the front.
+    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     startActivity(intent);
   }
 }
diff --git a/mobile/android/base/sync/stage/ServerSyncStage.java b/mobile/android/base/sync/stage/ServerSyncStage.java
index 7677d8a91e2f..5da7324e12f2 100644
--- a/mobile/android/base/sync/stage/ServerSyncStage.java
+++ b/mobile/android/base/sync/stage/ServerSyncStage.java
@@ -37,6 +37,7 @@ import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionBeginDeleg
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionCreationDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionFinishDelegate;
 import org.mozilla.gecko.sync.repositories.delegates.RepositorySessionWipeDelegate;
+import org.mozilla.gecko.sync.synchronizer.ServerLocalSynchronizer;
 import org.mozilla.gecko.sync.synchronizer.Synchronizer;
 import org.mozilla.gecko.sync.synchronizer.SynchronizerDelegate;
 
@@ -139,7 +140,7 @@ public abstract class ServerSyncStage implements
   public Synchronizer getConfiguredSynchronizer(GlobalSession session) throws NoCollectionKeysSetException, URISyntaxException, NonObjectJSONException, IOException, ParseException {
     Repository remote = wrappedServerRepo();
 
-    Synchronizer synchronizer = new Synchronizer();
+    Synchronizer synchronizer = new ServerLocalSynchronizer();
     synchronizer.repositoryA = remote;
     synchronizer.repositoryB = this.getLocalRepository();
     synchronizer.load(getConfig());
@@ -522,11 +523,4 @@ public abstract class ServerSyncStage implements
       session.abort(lastException, reason);
     }
   }
-
-  @Override
-  public void onSynchronizeAborted(Synchronizer synchronize) {
-    Logger.info(LOG_TAG, "onSynchronizeAborted.");
-
-    session.abort(null, "Synchronization was aborted.");
-  }
 }
diff --git a/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java b/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java
index 57447364f0d5..b8ebe2e62685 100644
--- a/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java
+++ b/mobile/android/base/sync/synchronizer/ConcurrentRecordConsumer.java
@@ -84,23 +84,24 @@ class ConcurrentRecordConsumer extends RecordConsumer {
 
   @Override
   public void run() {
+    Record record;
+
     while (true) {
-      synchronized (monitor) {
-        trace("run() took monitor.");
-        if (stopImmediately) {
-          debug("Stopping immediately. Clearing queue.");
-          delegate.getQueue().clear();
-          debug("Notifying consumer.");
-          consumerIsDone();
-          return;
-        }
-        debug("run() dropped monitor.");
-      }
       // The queue is concurrent-safe.
-      while (!delegate.getQueue().isEmpty()) {
-        trace("Grabbing record...");
-        Record record = delegate.getQueue().remove();
-        trace("Storing record... " + delegate);
+      while ((record = delegate.getQueue().poll()) != null) {
+        synchronized (monitor) {
+          trace("run() took monitor.");
+          if (stopImmediately) {
+            debug("Stopping immediately. Clearing queue.");
+            delegate.getQueue().clear();
+            debug("Notifying consumer.");
+            consumerIsDone();
+            return;
+          }
+          debug("run() dropped monitor.");
+        }
+
+        trace("Storing record with guid " + record.guid + ".");
         try {
           delegate.store(record);
         } catch (Exception e) {
diff --git a/mobile/android/base/sync/synchronizer/RecordsChannel.java b/mobile/android/base/sync/synchronizer/RecordsChannel.java
index 379c647ce51d..42fbbe183a07 100644
--- a/mobile/android/base/sync/synchronizer/RecordsChannel.java
+++ b/mobile/android/base/sync/synchronizer/RecordsChannel.java
@@ -6,6 +6,7 @@ package org.mozilla.gecko.sync.synchronizer;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.mozilla.gecko.sync.Logger;
 import org.mozilla.gecko.sync.ThreadPool;
@@ -59,7 +60,7 @@ import org.mozilla.gecko.sync.repositories.domain.Record;
  * @author rnewman
  *
  */
-class RecordsChannel implements
+public class RecordsChannel implements
   RepositorySessionFetchRecordsDelegate,
   RepositorySessionStoreDelegate,
   RecordsConsumerDelegate,
@@ -72,6 +73,9 @@ class RecordsChannel implements
   private long timestamp;
   private long fetchEnd = -1;
 
+  private final AtomicInteger numFetchFailed = new AtomicInteger();
+  private final AtomicInteger numStoreFailed = new AtomicInteger();
+
   public RecordsChannel(RepositorySession source, RepositorySession sink, RecordsChannelDelegate delegate) {
     this.source    = source;
     this.sink      = sink;
@@ -102,22 +106,19 @@ class RecordsChannel implements
   }
 
   /**
-   * Attempt to abort an outstanding fetch. Finish both sessions, and
-   * halt the consumer if it exists.
+   * Get the number of fetch failures recorded so far.
+   * @return number of fetch failures.
    */
-  public void abort() {
-    if (source.isActive()) {
-      source.abort();
-    }
-    if (sink.isActive()) {
-      sink.abort();
-    }
+  public int getFetchFailureCount() {
+    return numFetchFailed.get();
+  }
 
-    toProcess.clear();
-    if (consumer == null) {
-      return;
-    }
-    consumer.halt();
+  /**
+   * Get the number of store failures recorded so far.
+   * @return number of store failures.
+   */
+  public int getStoreFailureCount() {
+    return numStoreFailed.get();
   }
 
   /**
@@ -130,8 +131,11 @@ class RecordsChannel implements
         failed = sink;
       }
       this.delegate.onFlowBeginFailed(this, new SessionNotBegunException(failed));
+      return;
     }
     sink.setStoreDelegate(this);
+    numFetchFailed.set(0);
+    numStoreFailed.set(0);
     // Start a consumer thread.
     this.consumer = new ConcurrentRecordConsumer(this);
     ThreadPool.run(this.consumer);
@@ -154,14 +158,14 @@ class RecordsChannel implements
       sink.store(record);
     } catch (NoStoreDelegateException e) {
       Logger.error(LOG_TAG, "Got NoStoreDelegateException in RecordsChannel.store(). This should not occur. Aborting.", e);
-      delegate.onFlowStoreFailed(this, e);
-      this.abort();
+      delegate.onFlowStoreFailed(this, e, record.guid);
     }
   }
 
   @Override
   public void onFetchFailed(Exception ex, Record record) {
     Logger.warn(LOG_TAG, "onFetchFailed. Calling for immediate stop.", ex);
+    numFetchFailed.incrementAndGet();
     this.consumer.halt();
     delegate.onFlowFetchFailed(this, ex);
   }
@@ -190,14 +194,17 @@ class RecordsChannel implements
   }
 
   @Override
-  public void onRecordStoreFailed(Exception ex) {
+  public void onRecordStoreFailed(Exception ex, String recordGuid) {
+    Logger.trace(LOG_TAG, "Failed to store record with guid " + recordGuid);
+    numStoreFailed.incrementAndGet();
     this.consumer.stored();
-    delegate.onFlowStoreFailed(this, ex);
+    delegate.onFlowStoreFailed(this, ex, recordGuid);
     // TODO: abort?
   }
 
   @Override
-  public void onRecordStoreSucceeded(Record record) {
+  public void onRecordStoreSucceeded(String guid) {
+    Logger.trace(LOG_TAG, "Stored record with guid " + guid);
     this.consumer.stored();
   }
 
@@ -232,6 +239,7 @@ class RecordsChannel implements
         sink.begin(this);
       } catch (InvalidSessionTransitionException e) {
         onBeginFailed(e);
+        return;
       }
     }
     if (session == sink) {
diff --git a/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java b/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java
index f109b671ca92..8daeb7ad5383 100644
--- a/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java
+++ b/mobile/android/base/sync/synchronizer/RecordsChannelDelegate.java
@@ -8,6 +8,6 @@ public interface RecordsChannelDelegate {
   public void onFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd);
   public void onFlowBeginFailed(RecordsChannel recordsChannel, Exception ex);
   public void onFlowFetchFailed(RecordsChannel recordsChannel, Exception ex);
-  public void onFlowStoreFailed(RecordsChannel recordsChannel, Exception ex);
+  public void onFlowStoreFailed(RecordsChannel recordsChannel, Exception ex, String recordGuid);
   public void onFlowFinishFailed(RecordsChannel recordsChannel, Exception ex);
 }
\ No newline at end of file
diff --git a/mobile/android/base/sync/synchronizer/ServerLocalSynchronizer.java b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizer.java
new file mode 100644
index 000000000000..4428e4b4e57a
--- /dev/null
+++ b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizer.java
@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync.synchronizer;
+
+/**
+ * A <code>SynchronizerSession</code> designed to be used between a remote
+ * server and a local repository.
+ * <p>
+ * See <code>ServerLocalSynchronizerSession</code> for error handling details.
+ */
+public class ServerLocalSynchronizer extends Synchronizer {
+  public SynchronizerSession getSynchronizerSession() {
+    return new ServerLocalSynchronizerSession(this, this);
+  }
+}
diff --git a/mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java
new file mode 100644
index 000000000000..fc19c75c706a
--- /dev/null
+++ b/mobile/android/base/sync/synchronizer/ServerLocalSynchronizerSession.java
@@ -0,0 +1,76 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.sync.synchronizer;
+
+import org.mozilla.gecko.sync.Logger;
+import org.mozilla.gecko.sync.repositories.FetchFailedException;
+import org.mozilla.gecko.sync.repositories.StoreFailedException;
+
+/**
+ * A <code>SynchronizerSession</code> designed to be used between a remote
+ * server and a local repository.
+ * <p>
+ * Handles failure cases as follows (in the order they will occur during a sync):
+ * <ul>
+ * <li>Remote fetch failures abort.</li>
+ * <li>Local store failures are ignored.</li>
+ * <li>Local fetch failures abort.</li>
+ * <li>Remote store failures abort.</li>
+ * </ul>
+ */
+public class ServerLocalSynchronizerSession extends SynchronizerSession {
+  protected static final String LOG_TAG = "ServLocSynchronizerSess";
+
+  public ServerLocalSynchronizerSession(Synchronizer synchronizer, SynchronizerSessionDelegate delegate) {
+    super(synchronizer, delegate);
+  }
+
+  public void onFirstFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
+    // Fetch failures always abort.
+    int numRemoteFetchFailed = recordsChannel.getFetchFailureCount();
+    if (numRemoteFetchFailed > 0) {
+      final String message = "Got " + numRemoteFetchFailed + " failures fetching remote records!";
+      Logger.warn(LOG_TAG, message + " Aborting session.");
+      delegate.onSynchronizeFailed(this, new FetchFailedException(), message);
+      return;
+    }
+    Logger.trace(LOG_TAG, "No failures fetching remote records.");
+
+    // Local store failures are ignored.
+    int numLocalStoreFailed = recordsChannel.getStoreFailureCount();
+    if (numLocalStoreFailed > 0) {
+      final String message = "Got " + numLocalStoreFailed + " failures storing local records!";
+      Logger.warn(LOG_TAG, message + " Ignoring local store failures and continuing synchronizer session.");
+    } else {
+      Logger.trace(LOG_TAG, "No failures storing local records.");
+    }
+
+    super.onFirstFlowCompleted(recordsChannel, fetchEnd, storeEnd);
+  }
+
+  public void onSecondFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
+    // Fetch failures always abort.
+    int numLocalFetchFailed = recordsChannel.getFetchFailureCount();
+    if (numLocalFetchFailed > 0) {
+      final String message = "Got " + numLocalFetchFailed + " failures fetching local records!";
+      Logger.warn(LOG_TAG, message + " Aborting session.");
+      delegate.onSynchronizeFailed(this, new FetchFailedException(), message);
+      return;
+    }
+    Logger.trace(LOG_TAG, "No failures fetching local records.");
+
+    // Remote store failures abort!
+    int numRemoteStoreFailed = recordsChannel.getStoreFailureCount();
+    if (numRemoteStoreFailed > 0) {
+      final String message = "Got " + numRemoteStoreFailed + " failures storing remote records!";
+      Logger.warn(LOG_TAG, message + " Aborting session.");
+      delegate.onSynchronizeFailed(this, new StoreFailedException(), message);
+      return;
+    }
+    Logger.trace(LOG_TAG, "No failures storing remote records.");
+
+    super.onSecondFlowCompleted(recordsChannel, fetchEnd, storeEnd);
+  }
+}
diff --git a/mobile/android/base/sync/synchronizer/Synchronizer.java b/mobile/android/base/sync/synchronizer/Synchronizer.java
index a7bc383ee316..09a7f88b66f0 100644
--- a/mobile/android/base/sync/synchronizer/Synchronizer.java
+++ b/mobile/android/base/sync/synchronizer/Synchronizer.java
@@ -27,72 +27,36 @@ import android.util.Log;
  * After synchronizing, call `save` to get back a SynchronizerConfiguration with
  * updated bundle information.
  */
-public class Synchronizer {
+public class Synchronizer implements SynchronizerSessionDelegate {
+  public static final String LOG_TAG = "SyncDelSDelegate";
+
   protected String configSyncID; // Used to pass syncID from load() back into save().
 
-  /**
-   * I translate the fine-grained feedback of a SynchronizerSessionDelegate into
-   * the coarse-grained feedback of a SynchronizerDelegate.
-   */
-  public class SynchronizerDelegateSessionDelegate implements
-      SynchronizerSessionDelegate {
+  protected SynchronizerDelegate synchronizerDelegate;
 
-    private static final String LOG_TAG = "SyncDelSDelegate";
-    private SynchronizerDelegate synchronizerDelegate;
-    private SynchronizerSession  session;
+  @Override
+  public void onInitialized(SynchronizerSession session) {
+    session.synchronize();
+  }
 
-    public SynchronizerDelegateSessionDelegate(SynchronizerDelegate delegate) {
-      this.synchronizerDelegate = delegate;
-    }
+  @Override
+  public void onSynchronized(SynchronizerSession synchronizerSession) {
+    Log.d(LOG_TAG, "Got onSynchronized.");
+    Log.d(LOG_TAG, "Notifying SynchronizerDelegate.");
+    this.synchronizerDelegate.onSynchronized(synchronizerSession.getSynchronizer());
+  }
 
-    @Override
-    public void onInitialized(SynchronizerSession session) {
-      this.session = session;
-      session.synchronize();
-    }
+  @Override
+  public void onSynchronizeSkipped(SynchronizerSession synchronizerSession) {
+    Log.d(LOG_TAG, "Got onSynchronizeSkipped.");
+    Log.d(LOG_TAG, "Notifying SynchronizerDelegate as if on success.");
+    this.synchronizerDelegate.onSynchronized(synchronizerSession.getSynchronizer());
+  }
 
-    @Override
-    public void onSynchronized(SynchronizerSession synchronizerSession) {
-      Log.d(LOG_TAG, "Got onSynchronized.");
-      Log.d(LOG_TAG, "Notifying SynchronizerDelegate.");
-      this.synchronizerDelegate.onSynchronized(synchronizerSession.getSynchronizer());
-    }
-
-    @Override
-    public void onSynchronizeSkipped(SynchronizerSession synchronizerSession) {
-      Log.d(LOG_TAG, "Got onSynchronizeSkipped.");
-      Log.d(LOG_TAG, "Notifying SynchronizerDelegate as if on success.");
-      this.synchronizerDelegate.onSynchronized(synchronizerSession.getSynchronizer());
-    }
-
-    @Override
-    public void onSynchronizeFailed(SynchronizerSession session,
-                                    Exception lastException, String reason) {
-      this.synchronizerDelegate.onSynchronizeFailed(session.getSynchronizer(), lastException, reason);
-    }
-
-    @Override
-    public void onSynchronizeAborted(SynchronizerSession synchronizerSession) {
-      this.synchronizerDelegate.onSynchronizeAborted(session.getSynchronizer());
-    }
-
-    @Override
-    public void onFetchError(Exception e) {
-      session.abort();
-      synchronizerDelegate.onSynchronizeFailed(session.getSynchronizer(), e, "Got fetch error.");
-    }
-
-    @Override
-    public void onStoreError(Exception e) {
-      session.abort();
-      synchronizerDelegate.onSynchronizeFailed(session.getSynchronizer(), e, "Got store error.");
-    }
-
-    @Override
-    public void onSessionError(Exception e) {
-      session.abort();
-      synchronizerDelegate.onSynchronizeFailed(session.getSynchronizer(), e, "Got session error.");
-    }
+  @Override
+  public void onSynchronizeFailed(SynchronizerSession session,
+      Exception lastException, String reason) {
+    this.synchronizerDelegate.onSynchronizeFailed(session.getSynchronizer(), lastException, reason);
   }
 
   public Repository repositoryA;
@@ -100,12 +64,19 @@ public class Synchronizer {
   public RepositorySessionBundle bundleA;
   public RepositorySessionBundle bundleB;
 
+  /**
+   * Fetch a synchronizer session appropriate for this <code>Synchronizer</code>
+   */
+  public SynchronizerSession getSynchronizerSession() {
+    return new SynchronizerSession(this, this);
+  }
+
   /**
    * Start synchronizing, calling delegate's callback methods.
    */
   public void synchronize(Context context, SynchronizerDelegate delegate) {
-    SynchronizerDelegateSessionDelegate sessionDelegate = new SynchronizerDelegateSessionDelegate(delegate);
-    SynchronizerSession session = new SynchronizerSession(this, sessionDelegate);
+    this.synchronizerDelegate = delegate;
+    SynchronizerSession session = getSynchronizerSession();
     session.init(context, bundleA, bundleB);
   }
 
diff --git a/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java b/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java
index 4e61fc589687..a290188ab2b7 100644
--- a/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java
+++ b/mobile/android/base/sync/synchronizer/SynchronizerDelegate.java
@@ -7,5 +7,4 @@ package org.mozilla.gecko.sync.synchronizer;
 public interface SynchronizerDelegate {
   public void onSynchronized(Synchronizer synchronizer);
   public void onSynchronizeFailed(Synchronizer synchronizer, Exception lastException, String reason);
-  public void onSynchronizeAborted(Synchronizer synchronize);
 }
diff --git a/mobile/android/base/sync/synchronizer/SynchronizerSession.java b/mobile/android/base/sync/synchronizer/SynchronizerSession.java
index ef0672778197..1848d69eca97 100644
--- a/mobile/android/base/sync/synchronizer/SynchronizerSession.java
+++ b/mobile/android/base/sync/synchronizer/SynchronizerSession.java
@@ -51,9 +51,9 @@ implements RecordsChannelDelegate,
            RepositorySessionFinishDelegate {
 
   protected static final String LOG_TAG = "SynchronizerSession";
-  private Synchronizer synchronizer;
-  private SynchronizerSessionDelegate delegate;
-  private Context context;
+  protected Synchronizer synchronizer;
+  protected SynchronizerSessionDelegate delegate;
+  protected Context context;
 
   /*
    * Computed during init.
@@ -103,20 +103,6 @@ implements RecordsChannelDelegate,
   protected RecordsChannel channelAToB;
   protected RecordsChannel channelBToA;
 
-  public synchronized void abort() {
-    // Guaranteed to have been begun by the time we get to run.
-    if (channelAToB != null) {
-      channelAToB.abort();
-    }
-
-    // Not guaranteed. It's possible for the second flow to begin after we've aborted.
-    // TODO: stop this from happening!
-    if (channelBToA != null) {
-      channelBToA.abort();
-    }
-    this.delegate.onSynchronizeAborted(this);
-  }
-
   /**
    * Please don't call this until you've been notified with onInitialized.
    */
@@ -142,38 +128,29 @@ implements RecordsChannelDelegate,
     // This is the delegate for the *first* flow.
     RecordsChannelDelegate channelAToBDelegate = new RecordsChannelDelegate() {
       public void onFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
-        Logger.info(LOG_TAG, "First RecordsChannel onFlowCompleted. Fetch end is " + fetchEnd +
-             ". Store end is " + storeEnd + ". Starting next.");
-        pendingATimestamp = fetchEnd;
-        storeEndBTimestamp = storeEnd;
-        flowAToBCompleted = true;
-        channelBToA.flow();
+        session.onFirstFlowCompleted(recordsChannel, fetchEnd, storeEnd);
       }
 
       @Override
       public void onFlowBeginFailed(RecordsChannel recordsChannel, Exception ex) {
-        Logger.warn(LOG_TAG, "First RecordsChannel onFlowBeginFailed. Reporting session error.", ex);
-        session.delegate.onSessionError(ex);
+        Logger.warn(LOG_TAG, "First RecordsChannel onFlowBeginFailed. Logging session error.", ex);
+        session.delegate.onSynchronizeFailed(session, ex, "Failed to begin first flow.");
       }
 
       @Override
       public void onFlowFetchFailed(RecordsChannel recordsChannel, Exception ex) {
-        // TODO: clean up, tear down, abort.
-        Logger.warn(LOG_TAG, "First RecordsChannel onFlowFetchFailed. Reporting fetch error.", ex);
-        session.delegate.onFetchError(ex);
+        Logger.warn(LOG_TAG, "First RecordsChannel onFlowFetchFailed. Logging remote fetch error.", ex);
       }
 
       @Override
-      public void onFlowStoreFailed(RecordsChannel recordsChannel, Exception ex) {
-        // TODO: clean up, tear down, abort.
-        Logger.warn(LOG_TAG, "First RecordsChannel onFlowStoreFailed. Reporting store error.", ex);
-        session.delegate.onStoreError(ex);
+      public void onFlowStoreFailed(RecordsChannel recordsChannel, Exception ex, String recordGuid) {
+        Logger.warn(LOG_TAG, "First RecordsChannel onFlowStoreFailed. Logging local store error.", ex);
       }
 
       @Override
       public void onFlowFinishFailed(RecordsChannel recordsChannel, Exception ex) {
-        Logger.warn(LOG_TAG, "First RecordsChannel onFlowFinishedFailed. Reporting session error.", ex);
-        session.delegate.onSessionError(ex);
+        Logger.warn(LOG_TAG, "First RecordsChannel onFlowFinishedFailed. Logging session error.", ex);
+        session.delegate.onSynchronizeFailed(session, ex, "Failed to finish first flow.");
       }
     };
 
@@ -188,10 +165,34 @@ implements RecordsChannelDelegate,
     }
   }
 
-  @Override
-  public void onFlowCompleted(RecordsChannel channel, long fetchEnd, long storeEnd) {
-    Logger.info(LOG_TAG, "Second RecordsChannel onFlowCompleted. Fetch end is " + fetchEnd +
-         ". Store end is " + storeEnd + ". Finishing.");
+  /**
+   * Called after the first flow completes.
+   * <p>
+   * By default, any fetch and store failures are ignored.
+   * @param recordsChannel the <code>RecordsChannel</code> (for error testing).
+   * @param fetchEnd timestamp when fetches completed.
+   * @param storeEnd timestamp when stores completed.
+   */
+  public void onFirstFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
+    Logger.info(LOG_TAG, "First RecordsChannel onFlowCompleted.");
+    Logger.info(LOG_TAG, "Fetch end is " + fetchEnd + ". Store end is " + storeEnd + ". Starting next.");
+    pendingATimestamp = fetchEnd;
+    storeEndBTimestamp = storeEnd;
+    flowAToBCompleted = true;
+    channelBToA.flow();
+  }
+
+  /**
+   * Called after the second flow completes.
+   * <p>
+   * By default, any fetch and store failures are ignored.
+   * @param recordsChannel the <code>RecordsChannel</code> (for error testing).
+   * @param fetchEnd timestamp when fetches completed.
+   * @param storeEnd timestamp when stores completed.
+   */
+  public void onSecondFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
+    Logger.info(LOG_TAG, "Second RecordsChannel onFlowCompleted.");
+    Logger.info(LOG_TAG, "Fetch end is " + fetchEnd + ". Store end is " + storeEnd + ". Finishing.");
 
     pendingBTimestamp = fetchEnd;
     storeEndATimestamp = storeEnd;
@@ -202,39 +203,35 @@ implements RecordsChannelDelegate,
       this.sessionA.finish(this);
     } catch (InactiveSessionException e) {
       this.onFinishFailed(e);
+      return;
     }
   }
 
+  @Override
+  public void onFlowCompleted(RecordsChannel recordsChannel, long fetchEnd, long storeEnd) {
+    onSecondFlowCompleted(recordsChannel, fetchEnd, storeEnd);
+  }
+
   @Override
   public void onFlowBeginFailed(RecordsChannel recordsChannel, Exception ex) {
-    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowBeginFailed. Reporting session error.", ex);
-    this.delegate.onSessionError(ex);
+    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowBeginFailed. Logging session error.", ex);
+    this.delegate.onSynchronizeFailed(this, ex, "Failed to begin second flow.");
   }
 
   @Override
   public void onFlowFetchFailed(RecordsChannel recordsChannel, Exception ex) {
-    // TODO: clean up, tear down, abort.
-    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowFetchFailed. Reporting fetch error.", ex);
-    this.delegate.onFetchError(ex);
+    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowFetchFailed. Logging local fetch error.", ex);
   }
 
-  /**
-   * We ignore possible store errors, since failure to store a record is not
-   * necessarily a cause to abort. It might mean that the record should be
-   * tracked for re-downloading, or skipped, or we might abort.
-   *
-   * TODO: Bug 709371.
-   */
   @Override
-  public void onFlowStoreFailed(RecordsChannel recordsChannel, Exception ex) {
-    // TODO: clean up, tear down, abort.
-    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowStoreFailed. Ignoring store error.", ex);
+  public void onFlowStoreFailed(RecordsChannel recordsChannel, Exception ex, String recordGuid) {
+    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowStoreFailed. Logging remote store error.", ex);
   }
 
   @Override
   public void onFlowFinishFailed(RecordsChannel recordsChannel, Exception ex) {
-    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowFinishedFailed. Reporting session error.", ex);
-    this.delegate.onSessionError(ex);
+    Logger.warn(LOG_TAG, "Second RecordsChannel onFlowFinishedFailed. Logging session error.", ex);
+    this.delegate.onSynchronizeFailed(this, ex, "Failed to finish second flow.");
   }
 
   /*
@@ -261,7 +258,7 @@ implements RecordsChannelDelegate,
     }
     // We no longer need a reference to our context.
     this.context = null;
-    this.delegate.onSessionError(ex);
+    this.delegate.onSynchronizeFailed(this, ex, "Failed to create session");
   }
 
   /**
@@ -276,7 +273,7 @@ implements RecordsChannelDelegate,
     if (session == null ||
         this.sessionA == session) {
       // TODO: clean up sessionA.
-      this.delegate.onSessionError(new UnexpectedSessionException(session));
+      this.delegate.onSynchronizeFailed(this, new UnexpectedSessionException(session), "Failed to create session.");
       return;
     }
     if (this.sessionA == null) {
@@ -286,7 +283,7 @@ implements RecordsChannelDelegate,
       try {
         this.sessionA.unbundle(this.bundleA);
       } catch (Exception e) {
-        this.delegate.onSessionError(new UnbundleError(e, sessionA));
+        this.delegate.onSynchronizeFailed(this, new UnbundleError(e, sessionA), "Failed to unbundle first session.");
         // TODO: abort
         return;
       }
@@ -302,8 +299,7 @@ implements RecordsChannelDelegate,
       try {
         this.sessionB.unbundle(this.bundleB);
       } catch (Exception e) {
-        // TODO: abort
-        this.delegate.onSessionError(new UnbundleError(e, sessionB));
+        this.delegate.onSynchronizeFailed(this, new UnbundleError(e, sessionA), "Failed to unbundle second session.");
         return;
       }
 
@@ -311,7 +307,7 @@ implements RecordsChannelDelegate,
       return;
     }
     // TODO: need a way to make sure we don't call any more delegate methods.
-    this.delegate.onSessionError(new UnexpectedSessionException(session));
+    this.delegate.onSynchronizeFailed(this, new UnexpectedSessionException(session), "Failed to create session.");
   }
 
   /*
@@ -354,7 +350,8 @@ implements RecordsChannelDelegate,
         this.synchronizer.bundleA = bundle;
       } else {
         // Should not happen!
-        this.delegate.onSessionError(new UnexpectedSessionException(sessionA));
+        this.delegate.onSynchronizeFailed(this, new UnexpectedSessionException(sessionA), "Failed to finish first session.");
+        return;
       }
       if (this.sessionB != null) {
         Logger.info(LOG_TAG, "Finishing session B.");
@@ -363,6 +360,7 @@ implements RecordsChannelDelegate,
           this.sessionB.finish(this);
         } catch (InactiveSessionException e) {
           this.onFinishFailed(e);
+          return;
         }
       }
     } else if (session == sessionB) {
@@ -374,7 +372,8 @@ implements RecordsChannelDelegate,
         this.delegate.onSynchronized(this);
       } else {
         // Should not happen!
-        this.delegate.onSessionError(new UnexpectedSessionException(sessionB));
+        this.delegate.onSynchronizeFailed(this, new UnexpectedSessionException(sessionB), "Failed to finish second session.");
+        return;
       }
     } else {
       // TODO: hurrrrrr...
diff --git a/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java b/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java
index 87ce71f642bb..1d55274e820e 100644
--- a/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java
+++ b/mobile/android/base/sync/synchronizer/SynchronizerSessionDelegate.java
@@ -9,12 +9,5 @@ public interface SynchronizerSessionDelegate {
 
   public void onSynchronized(SynchronizerSession session);
   public void onSynchronizeFailed(SynchronizerSession session, Exception lastException, String reason);
-  public void onSynchronizeAborted(SynchronizerSession synchronizerSession);
   public void onSynchronizeSkipped(SynchronizerSession synchronizerSession);
-
-  // TODO: return value?
-  public void onFetchError(Exception e);
-  public void onStoreError(Exception e);
-  public void onSessionError(Exception e);
-
 }
diff --git a/mobile/android/sync/java-sources.mn b/mobile/android/sync/java-sources.mn
index b08d4ea94da1..be956b538130 100644
--- a/mobile/android/sync/java-sources.mn
+++ b/mobile/android/sync/java-sources.mn
@@ -136,6 +136,7 @@ sync/repositories/domain/PasswordRecord.java
 sync/repositories/domain/Record.java
 sync/repositories/domain/TabsRecord.java
 sync/repositories/domain/VersionConstants.java
+sync/repositories/FetchFailedException.java
 sync/repositories/HashSetStoreTracker.java
 sync/repositories/HistoryRepository.java
 sync/repositories/IdentityRecordFactory.java
@@ -157,8 +158,11 @@ sync/repositories/RepositorySession.java
 sync/repositories/RepositorySessionBundle.java
 sync/repositories/Server11Repository.java
 sync/repositories/Server11RepositorySession.java
+sync/repositories/StoreFailedException.java
 sync/repositories/StoreTracker.java
 sync/repositories/StoreTrackingRepositorySession.java
+sync/Server11PreviousPostFailedException.java
+sync/Server11RecordPostFailedException.java
 sync/setup/activities/AccountActivity.java
 sync/setup/activities/ActivityUtils.java
 sync/setup/activities/SetupFailureActivity.java
@@ -198,6 +202,8 @@ sync/synchronizer/RecordsChannel.java
 sync/synchronizer/RecordsChannelDelegate.java
 sync/synchronizer/RecordsConsumerDelegate.java
 sync/synchronizer/SerialRecordConsumer.java
+sync/synchronizer/ServerLocalSynchronizer.java
+sync/synchronizer/ServerLocalSynchronizerSession.java
 sync/synchronizer/SessionNotBegunException.java
 sync/synchronizer/Synchronizer.java
 sync/synchronizer/SynchronizerDelegate.java
diff --git a/mobile/android/sync/strings.xml.in b/mobile/android/sync/strings.xml.in
index 4355a2132f5a..557e12d0cc1f 100644
--- a/mobile/android/sync/strings.xml.in
+++ b/mobile/android/sync/strings.xml.in
@@ -2,6 +2,9 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+  <!-- Used for setup success. -->
+  <string name="brand_short_name">&brandShortName;</string>
+
   <string name="sync_app_name">&sync.app.name.label;</string>
   <string name="sync_title_connect">&sync.title.adddevice.label;</string>
   <string name="sync_title_pair">&sync.title.pair.label;</string>
@@ -35,9 +38,9 @@
   
   <!-- Setup Success -->
   <string name="sync_title_success">&sync.title.success.label;</string>
-  <string name="sync_subtitle_success">&sync.subtitle.success.label;</string>
+  <string name="sync_subtitle_success">&sync.subtitle.success.label1;</string>
   <string name="sync_settings">&sync.settings.label;</string>
-  <string name="sync_subtitle_manage">&sync.subtitle.manage.label;</string>
+  <string name="sync_subtitle_manage">&sync.subtitle.manage.label1;</string>
   
   <!-- Pair Device -->
   <string name="sync_pair_tryagain">&sync.pair.tryagain.label;</string>
diff --git a/mobile/android/themes/core/images/about-bg-darkblue.png b/mobile/android/themes/core/images/about-bg-darkblue.png
index 339ed9ffc5bb..88d8765e4758 100644
Binary files a/mobile/android/themes/core/images/about-bg-darkblue.png and b/mobile/android/themes/core/images/about-bg-darkblue.png differ
diff --git a/mobile/android/themes/core/images/about-bg-lightblue.png b/mobile/android/themes/core/images/about-bg-lightblue.png
index 9018e2b19721..56fd38099cc5 100644
Binary files a/mobile/android/themes/core/images/about-bg-lightblue.png and b/mobile/android/themes/core/images/about-bg-lightblue.png differ
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 2ddb838ca8a8..911765aa635b 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -652,7 +652,8 @@ pref("javascript.options.typeinference", true);
 pref("javascript.options.mem.high_water_mark", 128);
 pref("javascript.options.mem.max", -1);
 pref("javascript.options.mem.gc_per_compartment", true);
-pref("javascript.options.mem.gc_incremental", false);
+pref("javascript.options.mem.disable_explicit_compartment_gc", true);
+pref("javascript.options.mem.gc_incremental", true);
 pref("javascript.options.mem.gc_incremental_slice_ms", 10);
 pref("javascript.options.mem.log", false);
 pref("javascript.options.gc_on_memory_pressure", true);
diff --git a/mozglue/android/APKOpen.cpp b/mozglue/android/APKOpen.cpp
index 208b557c9511..a47af90f91dc 100644
--- a/mozglue/android/APKOpen.cpp
+++ b/mozglue/android/APKOpen.cpp
@@ -320,6 +320,7 @@ SHELL_WRAPPER3(notifyReadingMessageListFailed, jint, jint, jlong)
 SHELL_WRAPPER2(notifyFilePickerResult, jstring, jlong)
 SHELL_WRAPPER1_WITH_RETURN(getSurfaceBits, jobject, jobject)
 SHELL_WRAPPER1(onFullScreenPluginHidden, jobject)
+SHELL_WRAPPER1_WITH_RETURN(getNextMessageFromQueue, jobject, jobject)
 
 static void * xul_handle = NULL;
 static void * sqlite_handle = NULL;
@@ -738,6 +739,7 @@ loadGeckoLibs(const char *apkName)
   GETFUNC(notifyFilePickerResult);
   GETFUNC(getSurfaceBits);
   GETFUNC(onFullScreenPluginHidden);
+  GETFUNC(getNextMessageFromQueue);
 #undef GETFUNC
   sStartupTimeline = (uint64_t *)__wrap_dlsym(xul_handle, "_ZN7mozilla15StartupTimeline16sStartupTimelineE");
   gettimeofday(&t1, 0);
diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
index 758066e15fa3..9caed53fdc05 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -694,6 +694,8 @@ WebSocketChannel::WebSocketChannel() :
   mOpenRunning(0),
   mChannelWasOpened(0),
   mDataStarted(0),
+  mIncrementedSessionCount(0),
+  mDecrementedSessionCount(0),
   mMaxMessageSize(PR_INT32_MAX),
   mStopOnClose(NS_OK),
   mServerCloseCode(CLOSE_ABNORMAL),
@@ -715,9 +717,6 @@ WebSocketChannel::WebSocketChannel() :
   if (!sWebSocketAdmissions)
     sWebSocketAdmissions = new nsWSAdmissionManager();
 
-  // The active session limit is enforced in AsyncOpen()
-  sWebSocketAdmissions->IncrementSessionCount();
-
   mFramePtr = mBuffer = static_cast<PRUint8 *>(moz_xmalloc(mBufferSize));
 }
 
@@ -725,9 +724,6 @@ WebSocketChannel::~WebSocketChannel()
 {
   LOG(("WebSocketChannel::~WebSocketChannel() %p\n", this));
 
-  if (sWebSocketAdmissions)
-    sWebSocketAdmissions->DecrementSessionCount();
-
   // this stop is a nop if the normal connect/close is followed
   StopSession(NS_ERROR_UNEXPECTED);
   NS_ABORT_IF_FALSE(!mOpenRunning && !mOpenBlocked, "op");
@@ -1556,6 +1552,8 @@ WebSocketChannel::CleanupConnection()
     mTransport->Close(NS_BASE_STREAM_CLOSED);
     mTransport = nsnull;
   }
+
+  DecrementSessionCount();
 }
 
 void
@@ -1711,6 +1709,28 @@ WebSocketChannel::ReleaseSession()
   StopSession(NS_OK);
 }
 
+void
+WebSocketChannel::IncrementSessionCount()
+{
+  if (!mIncrementedSessionCount) {
+    sWebSocketAdmissions->IncrementSessionCount();
+    mIncrementedSessionCount = 1;
+  }
+}
+
+void
+WebSocketChannel::DecrementSessionCount()
+{
+  // Make sure we decrement session count only once, and only if we incremented it.
+  // This code is thread-safe: sWebSocketAdmissions->DecrementSessionCount is
+  // atomic, and mIncrementedSessionCount/mDecrementedSessionCount are set at
+  // times when they'll never be a race condition for checking/setting them.
+  if (mIncrementedSessionCount && !mDecrementedSessionCount) {
+    sWebSocketAdmissions->DecrementSessionCount();
+    mDecrementedSessionCount = 1;
+  }
+}
+
 nsresult
 WebSocketChannel::HandleExtensions()
 {
@@ -2308,7 +2328,14 @@ WebSocketChannel::AsyncOpen(nsIURI *aURI,
   if (NS_FAILED(rv))
     return rv;
 
-  return ApplyForAdmission();
+  rv = ApplyForAdmission();
+  if (NS_FAILED(rv))
+    return rv;
+
+  // Session setup OK, so count it.
+  IncrementSessionCount();
+
+  return rv;
 }
 
 NS_IMETHODIMP
diff --git a/netwerk/protocol/websocket/WebSocketChannel.h b/netwerk/protocol/websocket/WebSocketChannel.h
index 06f421019be7..3fcb34267e65 100644
--- a/netwerk/protocol/websocket/WebSocketChannel.h
+++ b/netwerk/protocol/websocket/WebSocketChannel.h
@@ -128,6 +128,8 @@ private:
   void AbortSession(nsresult reason);
   void ReleaseSession();
   void CleanupConnection();
+  void IncrementSessionCount();
+  void DecrementSessionCount();
 
   void EnsureHdrOut(PRUint32 size);
   void ApplyMask(PRUint32 mask, PRUint8 *data, PRUint64 len);
@@ -185,6 +187,8 @@ private:
   PRUint32                        mOpenRunning               : 1;
   PRUint32                        mChannelWasOpened          : 1;
   PRUint32                        mDataStarted               : 1;
+  PRUint32                        mIncrementedSessionCount   : 1;
+  PRUint32                        mDecrementedSessionCount   : 1;
 
   PRInt32                         mMaxMessageSize;
   nsresult                        mStopOnClose;
diff --git a/security/dbm/Makefile b/security/dbm/Makefile
index b040e249d406..bfcff6a17710 100644
--- a/security/dbm/Makefile
+++ b/security/dbm/Makefile
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
diff --git a/security/dbm/config/config.mk b/security/dbm/config/config.mk
index 535c62e7e4ad..adab1244763e 100644
--- a/security/dbm/config/config.mk
+++ b/security/dbm/config/config.mk
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #
 # These macros are defined by mozilla's configure script.
diff --git a/security/dbm/include/Makefile b/security/dbm/include/Makefile
index 3af3581bf32e..5189628239ca 100644
--- a/security/dbm/include/Makefile
+++ b/security/dbm/include/Makefile
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
diff --git a/security/dbm/include/manifest.mn b/security/dbm/include/manifest.mn
index 56cc6069b6bb..31cbe56eff35 100644
--- a/security/dbm/include/manifest.mn
+++ b/security/dbm/include/manifest.mn
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 CORE_DEPTH = ../..
 
diff --git a/security/dbm/manifest.mn b/security/dbm/manifest.mn
index a4cff53f4d48..48b39176a0af 100644
--- a/security/dbm/manifest.mn
+++ b/security/dbm/manifest.mn
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 CORE_DEPTH = ..
 
diff --git a/security/dbm/src/Makefile b/security/dbm/src/Makefile
index 0fb17f0a17b1..6d9a95bdd32a 100644
--- a/security/dbm/src/Makefile
+++ b/security/dbm/src/Makefile
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
diff --git a/security/dbm/src/config.mk b/security/dbm/src/config.mk
index b05da9fc02c1..e64d886d1857 100644
--- a/security/dbm/src/config.mk
+++ b/security/dbm/src/config.mk
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
 
diff --git a/security/dbm/src/dirent.c b/security/dbm/src/dirent.c
index e1a7bd63ab53..cae92d81b7bc 100644
--- a/security/dbm/src/dirent.c
+++ b/security/dbm/src/dirent.c
@@ -1,7 +1,3 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 #ifdef OS2
 
 #include <stdio.h>
diff --git a/security/dbm/src/manifest.mn b/security/dbm/src/manifest.mn
index 14e2d27d681d..392f5640708b 100644
--- a/security/dbm/src/manifest.mn
+++ b/security/dbm/src/manifest.mn
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 CORE_DEPTH = ../..
 
diff --git a/security/dbm/tests/Makefile b/security/dbm/tests/Makefile
index 08381fde8f07..63bc293880d3 100644
--- a/security/dbm/tests/Makefile
+++ b/security/dbm/tests/Makefile
@@ -1,8 +1,40 @@
 #! gmake
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Netscape security libraries.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1994-2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 DEPTH		= ../..
 CORE_DEPTH	= ../..
 
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index 412711a9c10f..6c9eed28e319 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_13_5_BETA2
+NSS_3_13_5_RTM
diff --git a/security/nss/TAG-INFO-CKBI b/security/nss/TAG-INFO-CKBI
index 412711a9c10f..6c9eed28e319 100644
--- a/security/nss/TAG-INFO-CKBI
+++ b/security/nss/TAG-INFO-CKBI
@@ -1 +1 @@
-NSS_3_13_5_BETA2
+NSS_3_13_5_RTM
diff --git a/security/nss/lib/freebl/ecl/README b/security/nss/lib/freebl/ecl/README
index f086cdefa0a1..b4c92400dee8 100644
--- a/security/nss/lib/freebl/ecl/README
+++ b/security/nss/lib/freebl/ecl/README
@@ -1,6 +1,39 @@
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is the elliptic curve math library.
+
+The Initial Developer of the Original Code is Sun Microsystems, Inc.
+Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+Sun Microsystems, Inc. All Rights Reserved.
+
+Contributor(s):
+    Stephen Fung <fungstep@hotmail.com> and
+    Douglas Stebila <douglas@stebila.ca>, Sun Microsystems Laboratories
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+
+***** END LICENSE BLOCK *****
  
 The ECL exposes routines for constructing and converting curve
 parameters for internal use.
diff --git a/security/nss/lib/freebl/ecl/README.FP b/security/nss/lib/freebl/ecl/README.FP
index 833f42eb32c8..858ac67b85fb 100644
--- a/security/nss/lib/freebl/ecl/README.FP
+++ b/security/nss/lib/freebl/ecl/README.FP
@@ -1,6 +1,39 @@
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is the elliptic curve math library.
+
+The Initial Developer of the Original Code is Sun Microsystems, Inc.
+Portions created by Sun Microsystems, Inc. are Copyright (C) 2003
+Sun Microsystems, Inc. All Rights Reserved.
+
+Contributor(s):
+     Stephen Fung <fungstep@hotmail.com> and
+     Nils Gura <nils.gura@sun.com>, Sun Microsystems Laboratories
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+
+***** END LICENSE BLOCK *****
 
 The ECL exposes routines for constructing and converting curve
 parameters for internal use.
diff --git a/security/nss/lib/freebl/mpi/README b/security/nss/lib/freebl/mpi/README
index c1eab5c98543..1de002a9beeb 100644
--- a/security/nss/lib/freebl/mpi/README
+++ b/security/nss/lib/freebl/mpi/README
@@ -1,6 +1,39 @@
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is the MPI Arbitrary Precision Integer Arithmetic
+library.
+
+The Initial Developer of the Original Code is
+Michael J. Fromberger <sting@linguist.dartmouth.edu>
+Portions created by the Initial Developer are Copyright (C) 1997-2000
+the Initial Developer. All Rights Reserved.
+
+Contributor(s):
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+
+***** END LICENSE BLOCK *****
 
 About the MPI Library
 ---------------------
diff --git a/security/nss/lib/freebl/mpi/montmulfv9.s b/security/nss/lib/freebl/mpi/montmulfv9.s
index 20d99e8ed2c2..c4f28a206fa0 100644
--- a/security/nss/lib/freebl/mpi/montmulfv9.s
+++ b/security/nss/lib/freebl/mpi/montmulfv9.s
@@ -1,6 +1,39 @@
-! This Source Code Form is subject to the terms of the Mozilla Public
-! License, v. 2.0. If a copy of the MPL was not distributed with this
-! file, You can obtain one at http://mozilla.org/MPL/2.0/.
+!  
+! ***** BEGIN LICENSE BLOCK *****
+! Version: MPL 1.1/GPL 2.0/LGPL 2.1
+!
+! The contents of this file are subject to the Mozilla Public License Version
+! 1.1 (the "License"); you may not use this file except in compliance with
+! the License. You may obtain a copy of the License at
+! http://www.mozilla.org/MPL/
+!
+! Software distributed under the License is distributed on an "AS IS" basis,
+! WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+! for the specific language governing rights and limitations under the
+! License.
+!
+! The Original Code is SPARC hand-optimized Montgomery multiply functions.
+!
+! The Initial Developer of the Original Code is
+! Sun Microsystems Inc.
+! Portions created by the Initial Developer are Copyright (C) 1999-2000
+! the Initial Developer. All Rights Reserved.
+!
+! Contributor(s):
+!
+! Alternatively, the contents of this file may be used under the terms of
+! either the GNU General Public License Version 2 or later (the "GPL"), or
+! the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+! in which case the provisions of the GPL or the LGPL are applicable instead
+! of those above. If you wish to allow use of your version of this file only
+! under the terms of either the GPL or the LGPL, and not to allow others to
+! use your version of this file under the terms of the MPL, indicate your
+! decision by deleting the provisions above and replace them with the notice
+! and other provisions required by the GPL or the LGPL. If you do not delete
+! the provisions above, a recipient may use your version of this file under
+! the terms of any one of the MPL, the GPL or the LGPL.
+!
+! ***** END LICENSE BLOCK *****
 
 	.section	".text",#alloc,#execinstr
 	.file	"montmulf.c"
diff --git a/security/nss/lib/freebl/mpi/utils/README b/security/nss/lib/freebl/mpi/utils/README
index d756c447084f..2312b8b92638 100644
--- a/security/nss/lib/freebl/mpi/utils/README
+++ b/security/nss/lib/freebl/mpi/utils/README
@@ -1,6 +1,39 @@
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is the MPI Arbitrary Precision Integer Arithmetic
+library.
+
+The Initial Developer of the Original Code is
+Michael J. Fromberger <sting@linguist.dartmouth.edu>
+Portions created by the Initial Developer are Copyright (C) 1998, 2000
+the Initial Developer. All Rights Reserved.
+
+Contributor(s):
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+
+***** END LICENSE BLOCK *****
 
 Additional MPI utilities
 ------------------------
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index f39ffd1de3b2..6381194b186d 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nss.h,v 1.92.2.2 2012/04/24 01:22:22 kaie%kuix.de Exp $ */
+/* $Id: nss.h,v 1.92.2.4 2012/05/31 18:29:27 kaie%kuix.de Exp $ */
 
 #ifndef __nss_h_
 #define __nss_h_
@@ -71,7 +71,7 @@
 #define NSS_VMINOR   13
 #define NSS_VPATCH   5
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_TRUE
+#define NSS_BETA     PR_FALSE
 
 #ifndef RC_INVOKED
 
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index f2279ce3979d..f04b48486d2f 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -62,6 +62,6 @@
 #define SOFTOKEN_VMINOR   13
 #define SOFTOKEN_VPATCH   5
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_TRUE
+#define SOFTOKEN_BETA     PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/security/nss/lib/util/SECerrs.h b/security/nss/lib/util/SECerrs.h
index b6079ae873da..6e179b18d5f2 100644
--- a/security/nss/lib/util/SECerrs.h
+++ b/security/nss/lib/util/SECerrs.h
@@ -575,4 +575,4 @@ ER3(SEC_ERROR_BAD_CRL_DP_URL,			(SEC_ERROR_BASE + 175),
 "Invalid or unsupported URL in CRL distribution point name.")
 
 ER3(SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED,	(SEC_ERROR_BASE + 176),
-"The certificate was signed using an signature algorithm that is disabled because it is not secure.")
+"The certificate was signed using a signature algorithm that is disabled because it is not secure.")
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index 1923065708f7..a7c69b930baa 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -56,7 +56,7 @@
 #define NSSUTIL_VMINOR   13
 #define NSSUTIL_VPATCH   5
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_TRUE
+#define NSSUTIL_BETA     PR_FALSE
 
 SEC_BEGIN_PROTOS
 
diff --git a/security/nss/pkg/linux/sun-nss.spec b/security/nss/pkg/linux/sun-nss.spec
index 7478322cf2b5..13b5b26dbad3 100644
--- a/security/nss/pkg/linux/sun-nss.spec
+++ b/security/nss/pkg/linux/sun-nss.spec
@@ -21,9 +21,41 @@ and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME,
 X.509 v3 certificates, and other security standards.  See:
 http://www.mozilla.org/projects/security/pki/nss/overview.html
 
-This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at http://mozilla.org/MPL/2.0/.
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.
+
+The Original Code is the Netscape security libraries.
+
+The Initial Developer of the Original Code is
+Netscape Communications Corporation.
+Portions created by the Initial Developer are Copyright (C) 1994-2000
+the Initial Developer. All Rights Reserved.
+
+Contributor(s):
+
+Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.
+
+***** END LICENSE BLOCK *****
 
 %package devel
 Summary: Development Libraries for Network Security Services
diff --git a/security/nss/tests/pkcs11/netscape/trivial/Makefile.in b/security/nss/tests/pkcs11/netscape/trivial/Makefile.in
index f89afe628486..5eb590c9f447 100644
--- a/security/nss/tests/pkcs11/netscape/trivial/Makefile.in
+++ b/security/nss/tests/pkcs11/netscape/trivial/Makefile.in
@@ -1,7 +1,39 @@
 #
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is a trivial PKCS#11 test program.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
 
 MAKEFILE_IN_CVS_ID = "@(#) $RCSfile: Makefile.in,v $ $Revision: 1.3 $ $Date: 2005/01/20 02:25:51 $"
 
diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
index 708a1d288e88..5f54b9efa013 100644
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -184,12 +184,12 @@ ifndef WGET
 	$(error Wget not installed)
 endif
 	$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_PATH)
-	(cd $(_ABS_DIST)/$(PKG_PATH) && $(WGET) -nv -N  "$(EN_US_BINARY_URL)/$(PACKAGE)")
+	(cd $(_ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv -N  "$(EN_US_BINARY_URL)/$(PACKAGE)")
 	@echo "Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PKG_PATH)/$(PACKAGE)"
 ifdef RETRIEVE_WINDOWS_INSTALLER
 ifeq ($(OS_ARCH), WINNT)
 	$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH)
-	(cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) -nv -N "$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe")
+	(cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv -N "$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe")
 	@echo "Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 endif
 endif
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index a925de00df54..befc86c75004 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -1583,6 +1583,18 @@ if [ "$MOZ_WEBM" ]; then
   fi
 fi
 
+if [ "$MOZ_MEDIA_PLUGINS" ]; then
+  add_makefiles "
+    content/media/plugins/Makefile
+  "
+fi
+
+if [ "$MOZ_OMX_PLUGIN" ]; then
+  add_makefiles "
+    media/omx-plugin/Makefile
+  "
+fi
+
 if [ "$MOZ_WAVE" ]; then
  add_makefiles "
    content/media/wave/Makefile
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index ae0cd06783ff..d617f3761b59 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -138,6 +138,12 @@ tier_platform_dirs += \
 		$(NULL)
 endif
 
+ifdef MOZ_OMX_PLUGIN
+tier_platform_dirs += \
+		media/omx-plugin \
+		$(NULL)
+endif
+
 ifndef MOZ_NATIVE_PNG
 tier_platform_dirs += media/libpng
 endif
diff --git a/tools/profiler/TableTicker.cpp b/tools/profiler/TableTicker.cpp
index 42761e2bac23..eac994f90f7a 100644
--- a/tools/profiler/TableTicker.cpp
+++ b/tools/profiler/TableTicker.cpp
@@ -788,6 +788,7 @@ void mozilla_sampler_stop()
   }
 
   t->Stop();
+  delete t;
   tlsTicker.set(NULL);
 }
 
diff --git a/webapprt/CommandLineHandler.js b/webapprt/CommandLineHandler.js
index 9642819f6376..ad410fff27ef 100644
--- a/webapprt/CommandLineHandler.js
+++ b/webapprt/CommandLineHandler.js
@@ -9,14 +9,6 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
-// Initialize DOMApplicationRegistry so it can receive and respond to messages.
-// We catch an exception here on the off chance the registry throws one, as we
-// don't need it for most apps, and exceptions it throws shouldn't prevent apps
-// from loading.
-try {
-  Cu.import("resource://gre/modules/Webapps.jsm");
-} catch(ex) {}
-
 function CommandLineHandler() {}
 
 CommandLineHandler.prototype = {
@@ -38,3 +30,36 @@ CommandLineHandler.prototype = {
 
 let components = [CommandLineHandler];
 let NSGetFactory = XPCOMUtils.generateNSGetFactory(components);
+
+/* There's some work we need to do on startup, before we load the webapp,
+ * and this seems as good a place as any to do it, although it's possible
+ * that in the future we will find a lazier place to do it.
+ *
+ * NOTE: it's very important that the stuff we do here doesn't prevent
+ * the command-line handler from being registered/accessible, since otherwise
+ * the app won't start, which is catastrophic failure.  That's why it's all
+ * wrapped in a try/catch block. */
+
+try {
+  // Initialize DOMApplicationRegistry so it can receive/respond to messages.
+  Cu.import("resource://gre/modules/Webapps.jsm");
+
+  // On firstrun, set permissions to their default values.
+  if (!Services.prefs.getBoolPref("webapprt.firstrun")) {
+    Cu.import("resource://webapprt/modules/WebappRT.jsm");
+    let uri = Services.io.newURI(WebappRT.config.app.origin, null, null);
+
+    // Set AppCache-related permissions.
+    Services.perms.add(uri, "pin-app", Ci.nsIPermissionManager.ALLOW_ACTION);
+    Services.perms.add(uri, "offline-app",
+                       Ci.nsIPermissionManager.ALLOW_ACTION);
+
+    // Now that we've set the appropriate permissions, twiddle the firstrun flag
+    // so we don't try to do so again.
+    Services.prefs.setBoolPref("webapprt.firstrun", true);
+  }
+} catch(ex) {
+#ifdef MOZ_DEBUG
+  dump(ex + "\n");
+#endif
+}
diff --git a/webapprt/ContentPermission.js b/webapprt/ContentPermission.js
new file mode 100644
index 000000000000..2fd6377dcf20
--- /dev/null
+++ b/webapprt/ContentPermission.js
@@ -0,0 +1,89 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://webapprt/modules/WebappRT.jsm");
+
+function ContentPermission() {}
+
+ContentPermission.prototype = {
+  classID: Components.ID("{07ef5b2e-88fb-47bd-8cec-d3b0bef11ac4}"),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionPrompt]),
+
+  prompt: function(request) {
+    // Only handle geolocation requests for now
+    if (request.type != "geolocation") {
+      return;
+    }
+
+    // Reuse any remembered permission preferences
+    let result = Services.perms.testExactPermission(request.uri, "geo");
+    if (result == Ci.nsIPermissionManager.ALLOW_ACTION) {
+      request.allow();
+      return;
+    }
+    else if (result == Ci.nsIPermissionManager.DENY_ACTION) {
+      request.cancel();
+      return;
+    }
+
+    function getChromeWindow(aWindow) {
+      var chromeWin = aWindow
+        .QueryInterface(Ci.nsIInterfaceRequestor)
+        .getInterface(Ci.nsIWebNavigation)
+        .QueryInterface(Ci.nsIDocShellTreeItem)
+        .rootTreeItem
+        .QueryInterface(Ci.nsIInterfaceRequestor)
+        .getInterface(Ci.nsIDOMWindow)
+        .QueryInterface(Ci.nsIDOMChromeWindow);
+      return chromeWin;
+    }
+
+    // Display a prompt at the top level
+    let {name} = WebappRT.config.app.manifest;
+    let requestingWindow = request.window.top;
+    let chromeWin = getChromeWindow(requestingWindow);
+    let bundle = Services.strings.createBundle("chrome://webapprt/locale/webapp.properties");
+
+    // Construct a prompt with share/don't and remember checkbox
+    let remember = {value: false};
+    let choice = Services.prompt.confirmEx(
+      chromeWin,
+      bundle.formatStringFromName("geolocation.title", [name], 1),
+      bundle.GetStringFromName("geolocation.description"),
+      // Set both buttons to strings with the cancel button being default
+      Ci.nsIPromptService.BUTTON_POS_1_DEFAULT |
+        Ci.nsIPromptService.BUTTON_TITLE_IS_STRING * Ci.nsIPromptService.BUTTON_POS_0 |
+        Ci.nsIPromptService.BUTTON_TITLE_IS_STRING * Ci.nsIPromptService.BUTTON_POS_1,
+      bundle.GetStringFromName("geolocation.sharelocation"),
+      bundle.GetStringFromName("geolocation.dontshare"),
+      null,
+      bundle.GetStringFromName("geolocation.remember"),
+      remember);
+
+    // Persist the choice if the user wants to remember
+    if (remember.value) {
+      let action = Ci.nsIPermissionManager.ALLOW_ACTION;
+      if (choice != 0) {
+        action = Ci.nsIPermissionManager.DENY_ACTION;
+      }
+      Services.perms.add(request.uri, "geo", action);
+    }
+
+    // Trigger the selected choice
+    if (choice == 0) {
+      request.allow();
+    }
+    else {
+      request.cancel();
+    }
+  }
+};
+
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPermission]);
diff --git a/webapprt/Makefile.in b/webapprt/Makefile.in
index 24c4f3791249..4b7ccd364e54 100644
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -29,6 +29,7 @@ endif # windows
 EXTRA_PP_COMPONENTS = \
   components.manifest \
   CommandLineHandler.js \
+  ContentPermission.js \
   ContentPolicy.js \
   DirectoryProvider.js \
   $(NULL)
@@ -39,6 +40,10 @@ EXTRA_JS_MODULES = \
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_DEBUG
+DEFINES += -DMOZ_DEBUG=1
+endif
+
 libs::
 	$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_TARGET)/chrome.manifest "resource webapprt ./"
 
diff --git a/webapprt/components.manifest b/webapprt/components.manifest
index 978002eb40ea..90d35992d1cd 100644
--- a/webapprt/components.manifest
+++ b/webapprt/components.manifest
@@ -3,6 +3,10 @@ component {6d69c782-40a3-469b-8bfd-3ee366105a4a} CommandLineHandler.js applicati
 contract @mozilla.org/webapprt/clh;1 {6d69c782-40a3-469b-8bfd-3ee366105a4a} application=webapprt@mozilla.org
 category command-line-handler x-default @mozilla.org/webapprt/clh;1 application=webapprt@mozilla.org
 
+# ContentPermission.js
+component {07ef5b2e-88fb-47bd-8cec-d3b0bef11ac4} ContentPermission.js
+contract @mozilla.org/content-permission/prompt;1 {07ef5b2e-88fb-47bd-8cec-d3b0bef11ac4}
+
 # ContentPolicy.js
 component {75acd178-3d5a-48a7-bd92-fba383520ae6} ContentPolicy.js application=webapprt@mozilla.org
 contract @mozilla.org/webapprt/content-policy;1 {75acd178-3d5a-48a7-bd92-fba383520ae6} application=webapprt@mozilla.org
diff --git a/webapprt/prefs.js b/webapprt/prefs.js
index 37970e73559e..f0cba0b8e4c3 100644
--- a/webapprt/prefs.js
+++ b/webapprt/prefs.js
@@ -11,3 +11,6 @@ pref("extensions.enabledScopes", 1);
 pref("extensions.autoDisableScopes", 1);
 // Disable add-on installation via the web-exposed APIs
 pref("xpinstall.enabled", false);
+
+// Whether or not we've ever run.  We use this to set permissions on firstrun.
+pref("webapprt.firstrun", false);
diff --git a/widget/android/AndroidJNI.cpp b/widget/android/AndroidJNI.cpp
index 3fe4be764265..f8fcc7df552a 100644
--- a/widget/android/AndroidJNI.cpp
+++ b/widget/android/AndroidJNI.cpp
@@ -1002,5 +1002,24 @@ Java_org_mozilla_gecko_GeckoAppShell_onFullScreenPluginHidden(JNIEnv* jenv, jcla
   NS_DispatchToMainThread(runnable);
 }
 
+NS_EXPORT jobject JNICALL
+Java_org_mozilla_gecko_GeckoAppShell_getNextMessageFromQueue(JNIEnv* jenv, jclass, jobject queue)
+{
+    static jclass jMessageQueueCls = nsnull;
+    static jfieldID jMessagesField;
+    static jmethodID jNextMethod;
+    if (!jMessageQueueCls) {
+        jMessageQueueCls = (jclass) jenv->NewGlobalRef(jenv->FindClass("android/os/MessageQueue"));
+        jMessagesField = jenv->GetFieldID(jMessageQueueCls, "mMessages", "Landroid/os/Message;");
+        jNextMethod = jenv->GetMethodID(jMessageQueueCls, "next", "()Landroid/os/Message;");
+    }
+    jobject msg = jenv->GetObjectField(queue, jMessagesField);
+    // if queue.mMessages is null, queue.next() will block, which we don't want
+    if (!msg)
+        return msg;
+    msg = jenv->CallObjectMethod(queue, jNextMethod);
+    return msg;
+}
+
 #endif
 }
diff --git a/widget/xpwidgets/nsBaseWidget.cpp b/widget/xpwidgets/nsBaseWidget.cpp
index d76634269890..ca37528cd167 100644
--- a/widget/xpwidgets/nsBaseWidget.cpp
+++ b/widget/xpwidgets/nsBaseWidget.cpp
@@ -899,7 +899,8 @@ void nsBaseWidget::CreateCompositor()
 
       mLayerManager = lm;
     } else {
-      NS_WARNING("fail to construct LayersChild");
+      // We don't currently want to support not having a LayersChild
+      NS_RUNTIMEABORT("failed to construct LayersChild");
       delete lm;
       mCompositorChild = nsnull;
     }
diff --git a/xpcom/glue/nsINIParser.cpp b/xpcom/glue/nsINIParser.cpp
index 5a07756bd891..e79b0314dd7a 100644
--- a/xpcom/glue/nsINIParser.cpp
+++ b/xpcom/glue/nsINIParser.cpp
@@ -158,7 +158,7 @@ nsINIParser::InitFromFILE(FILE *fd)
             return NS_ERROR_FAILURE;
         }
 
-        nsAutoArrayPtr<char> utf8Buffer = new char[flen];
+        nsAutoArrayPtr<char> utf8Buffer(new char[flen]);
         if (0 == WideCharToMultiByte(CP_UTF8,
                                      0,
                                      reinterpret_cast<LPWSTR>(buffer),