From f175e8d455717416cf3c1a54c831896bb37ef78c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Aug 2012 13:37:25 +0200
Subject: [PATCH 01/93] Make StringStream.match return null when the match
 isn't at current position

Closes #761
---
 lib/codemirror.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index fa950dca8c..f2ca8a3019 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2340,6 +2340,7 @@ window.CodeMirror = (function() {
         }
       } else {
         var match = this.string.slice(this.pos).match(pattern);
+        if (match && match.index > 0) return null;
         if (match && consume !== false) this.pos += match[0].length;
         return match;
       }

From a4effe378c3e5dead457af6655ba33adb4cedf39 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Aug 2012 14:41:37 +0200
Subject: [PATCH 02/93] Make right-click select-all work on some browsers

The hack is horrible, but it seems to do the trick.

Also simplifies context-menu handling somewhat.

Issue #755
---
 lib/codemirror.js | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index f2ca8a3019..6ce88b2a70 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -78,7 +78,7 @@ window.CodeMirror = (function() {
         overwrite = false, suppressEdits = false;
     // Variables used by startOperation/endOperation to track what
     // happened during the operation.
-    var updateInput, userSelChange, changes, textChanged, selectionChanged, leaveInputAlone,
+    var updateInput, userSelChange, changes, textChanged, selectionChanged,
         gutterDirty, callbacks;
     // Current visible range (may be bigger than the view window).
     var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0;
@@ -675,7 +675,6 @@ window.CodeMirror = (function() {
         focused = true;
         if (scroller.className.search(/\bCodeMirror-focused\b/) == -1)
           scroller.className += " CodeMirror-focused";
-        if (!leaveInputAlone) resetInput(true);
       }
       slowPoll();
       restartBlink();
@@ -938,7 +937,7 @@ window.CodeMirror = (function() {
     // supported or compatible enough yet to rely on.)
     var prevInput = "";
     function readInput() {
-      if (leaveInputAlone || !focused || hasSelection(input) || options.readOnly) return false;
+      if (!focused || hasSelection(input) || options.readOnly) return false;
       var text = input.value;
       if (text == prevInput) return false;
       shiftSelecting = null;
@@ -1757,6 +1756,7 @@ window.CodeMirror = (function() {
       var offL = eltOffset(lineSpace, true);
       return coordsChar(x - offL.left, y - offL.top);
     }
+    var detectingSelectAll;
     function onContextMenu(e) {
       var pos = posFromMouse(e), scrollPos = scrollbar.scrollTop;
       if (!pos || opera) return; // Opera is difficult.
@@ -1768,19 +1768,28 @@ window.CodeMirror = (function() {
       input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
         "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; " +
         "border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-      leaveInputAlone = true;
-      var val = input.value = getSelection();
       focusInput();
       selectInput(input);
+      clearTimeout(detectingSelectAll);
       function rehide() {
-        var newVal = splitLines(input.value).join("\n");
-        if (newVal != val && !options.readOnly) operation(replaceSelection)(newVal, "end");
         inputDiv.style.position = "relative";
         input.style.cssText = oldCSS;
         if (ie_lt9) scrollbar.scrollTop = scrollPos;
-        leaveInputAlone = false;
         resetInput(true);
         slowPoll();
+
+        // Try to detect the user choosing select-all 
+        if (input.selectionStart != null) {
+          var extval = input.value = " " + input.value, i = 0;
+          prevInput = " ";
+          input.selectionStart = 1; input.selectionEnd = extval.length;
+          detectingSelectAll = setTimeout(function poll(){
+            if (prevInput == " " && input.selectionStart == 0)
+              operation(commands.selectAll)(instance);
+            else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
+            else resetInput();
+          }, 200);
+        }
       }
 
       if (gecko) {
@@ -1962,8 +1971,7 @@ window.CodeMirror = (function() {
       if (newScrollPos) scrollCursorIntoView();
       if (selectionChanged) restartBlink();
 
-      if (focused && !leaveInputAlone &&
-          (updateInput === true || (updateInput !== false && selectionChanged)))
+      if (focused && (updateInput === true || (updateInput !== false && selectionChanged)))
         resetInput(userSelChange);
 
       if (selectionChanged && options.matchBrackets)

From c565edcf01f326fd5c8013c9074696c27eea3c5c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 29 Aug 2012 16:59:32 +0200
Subject: [PATCH 03/93] Add a .INI mode

---
 doc/compress.html   |  1 +
 index.html          |  1 +
 mode/ini/index.html | 34 ++++++++++++++++++++++++++++++++++
 mode/ini/ini.js     | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+)
 create mode 100644 mode/ini/index.html
 create mode 100644 mode/ini/ini.js

diff --git a/doc/compress.html b/doc/compress.html
index 3e4abc1479..f0b60c0506 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -70,6 +70,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/haxe/haxe.js">haxe.js</option>
           <option value="http://codemirror.net/mode/htmlembedded/htmlembedded.js">htmlembedded.js</option>
           <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
+          <option value="http://codemirror.net/mode/ini/ini.js">ini.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/less/less.js">less.js</option>
diff --git a/index.html b/index.html
index 6d074dd334..54f0287ff6 100644
--- a/index.html
+++ b/index.html
@@ -46,6 +46,7 @@ <h2 style="margin-top: 0">Supported modes:</h2>
       <li><a href="mode/htmlembedded/index.html">HTML embedded scripts</a></li>
       <li><a href="mode/htmlmixed/index.html">HTML mixed-mode</a></li>
       <li><a href="mode/clike/index.html">Java</a></li>
+      <li><a href="mode/ini/index.html">.INI</a></li>
       <li><a href="mode/javascript/index.html">JavaScript</a></li>
       <li><a href="mode/jinja2/index.html">Jinja2</a></li>
       <li><a href="mode/less/index.html">LESS</a></li>
diff --git a/mode/ini/index.html b/mode/ini/index.html
new file mode 100644
index 0000000000..ac1a72a7fe
--- /dev/null
+++ b/mode/ini/index.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: INI mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="ini.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid brown; border-bottom: 1px solid brown;}</style>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror: INI mode</h1>
+    <form><textarea id="code" name="code">; last modified 1 April 2001 by John Doe
+[owner]
+name=John Doe
+organization=Acme Widgets Inc.
+ 
+[database]
+; use IP address in case network name resolution is not working
+server=192.0.2.62     
+port=143
+file = "payroll.dat"
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        mode: "ini",
+        lineNumbers: true
+      });
+    </script>
+
+    <p><strong>MIME type defined:</strong> <code>text/ini</code>.</p>
+  </body>
+</html>
diff --git a/mode/ini/ini.js b/mode/ini/ini.js
new file mode 100644
index 0000000000..7042c65081
--- /dev/null
+++ b/mode/ini/ini.js
@@ -0,0 +1,38 @@
+CodeMirror.defineMode("ini", function() {
+  return {
+    startState: function() {
+      return {context: ""};
+    },
+
+    token: function(stream, state) {
+      
+      if (stream.eatSpace()) return null;
+      var ch = stream.next();
+      if (ch == ";") {stream.skipToEnd(); return "comment";}
+      else if (ch == "[") {state.context = "section"; return "bracket";}
+      else if (ch == "]") {state.context = "key"; return "bracket";}
+      else if (ch == "=") {state.context = "value"; return "operator";}
+      else
+      {
+        if (state.context == "section") 
+        {
+          if (!stream.skipTo("]")) stream.skipToEnd();
+          return "keyword";
+        }
+        else if(state.context == "key")
+        {
+          if (!stream.skipTo("=")) stream.skipToEnd();
+          return "attribute";
+        }
+        else if(state.context == "value")
+        {
+          stream.skipToEnd();
+          state.context = "key";
+          return "variable";
+        }
+      }
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/ini", "ini");

From bf3a6f445c94ba07af628d66be7b751636dcffb5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 30 Aug 2012 10:21:23 +0200
Subject: [PATCH 04/93] Revert "Add a .INI mode"

It turns out the properties mode already handles .ini files just fine.

This reverts commit 9afd96d94d65e27329887d16e8e2cd7f6ffed1d6.
---
 doc/compress.html   |  1 -
 index.html          |  1 -
 mode/ini/index.html | 34 ----------------------------------
 mode/ini/ini.js     | 38 --------------------------------------
 4 files changed, 74 deletions(-)
 delete mode 100644 mode/ini/index.html
 delete mode 100644 mode/ini/ini.js

diff --git a/doc/compress.html b/doc/compress.html
index f0b60c0506..3e4abc1479 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -70,7 +70,6 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/haxe/haxe.js">haxe.js</option>
           <option value="http://codemirror.net/mode/htmlembedded/htmlembedded.js">htmlembedded.js</option>
           <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
-          <option value="http://codemirror.net/mode/ini/ini.js">ini.js</option>
           <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
           <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
           <option value="http://codemirror.net/mode/less/less.js">less.js</option>
diff --git a/index.html b/index.html
index 54f0287ff6..6d074dd334 100644
--- a/index.html
+++ b/index.html
@@ -46,7 +46,6 @@ <h2 style="margin-top: 0">Supported modes:</h2>
       <li><a href="mode/htmlembedded/index.html">HTML embedded scripts</a></li>
       <li><a href="mode/htmlmixed/index.html">HTML mixed-mode</a></li>
       <li><a href="mode/clike/index.html">Java</a></li>
-      <li><a href="mode/ini/index.html">.INI</a></li>
       <li><a href="mode/javascript/index.html">JavaScript</a></li>
       <li><a href="mode/jinja2/index.html">Jinja2</a></li>
       <li><a href="mode/less/index.html">LESS</a></li>
diff --git a/mode/ini/index.html b/mode/ini/index.html
deleted file mode 100644
index ac1a72a7fe..0000000000
--- a/mode/ini/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: INI mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="ini.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid brown; border-bottom: 1px solid brown;}</style>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: INI mode</h1>
-    <form><textarea id="code" name="code">; last modified 1 April 2001 by John Doe
-[owner]
-name=John Doe
-organization=Acme Widgets Inc.
- 
-[database]
-; use IP address in case network name resolution is not working
-server=192.0.2.62     
-port=143
-file = "payroll.dat"
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "ini",
-        lineNumbers: true
-      });
-    </script>
-
-    <p><strong>MIME type defined:</strong> <code>text/ini</code>.</p>
-  </body>
-</html>
diff --git a/mode/ini/ini.js b/mode/ini/ini.js
deleted file mode 100644
index 7042c65081..0000000000
--- a/mode/ini/ini.js
+++ /dev/null
@@ -1,38 +0,0 @@
-CodeMirror.defineMode("ini", function() {
-  return {
-    startState: function() {
-      return {context: ""};
-    },
-
-    token: function(stream, state) {
-      
-      if (stream.eatSpace()) return null;
-      var ch = stream.next();
-      if (ch == ";") {stream.skipToEnd(); return "comment";}
-      else if (ch == "[") {state.context = "section"; return "bracket";}
-      else if (ch == "]") {state.context = "key"; return "bracket";}
-      else if (ch == "=") {state.context = "value"; return "operator";}
-      else
-      {
-        if (state.context == "section") 
-        {
-          if (!stream.skipTo("]")) stream.skipToEnd();
-          return "keyword";
-        }
-        else if(state.context == "key")
-        {
-          if (!stream.skipTo("=")) stream.skipToEnd();
-          return "attribute";
-        }
-        else if(state.context == "value")
-        {
-          stream.skipToEnd();
-          state.context = "key";
-          return "variable";
-        }
-      }
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/ini", "ini");

From 1b07cc3f515baf6ce5d68c995a616d80c4c9e346 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Aug 2012 10:21:15 +0200
Subject: [PATCH 05/93] Fix assumption that StringStream.peek returns a string

Closes #776
---
 mode/clojure/clojure.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index d0268a78d6..ce389927db 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -40,9 +40,9 @@ CodeMirror.defineMode("clojure", function (config, mode) {
     var tests = {
         digit: /\d/,
         digit_or_colon: /[\d:]/,
-        hex: /[0-9a-fA-F]/,
+        hex: /[0-9a-f]/i,
         sign: /[+-]/,
-        exponent: /[eE]/,
+        exponent: /e/i,
         keyword_char: /[^\s\(\[\;\)\]]/,
         basic: /[\w\$_\-]/,
         lang_keyword: /[\w*+!\-_?:\/]/
@@ -64,8 +64,7 @@ CodeMirror.defineMode("clojure", function (config, mode) {
 
     function isNumber(ch, stream){
         // hex
-        if ( ch === '0' && 'x' == stream.peek().toLowerCase() ) {
-            stream.eat('x');
+        if ( ch === '0' && stream.eat(/x/i) ) {
             stream.eatWhile(tests.hex);
             return true;
         }
@@ -85,8 +84,7 @@ CodeMirror.defineMode("clojure", function (config, mode) {
                 stream.eatWhile(tests.digit);
             }
 
-            if ( 'e' == stream.peek().toLowerCase() ) {
-                stream.eat(tests.exponent);
+            if ( stream.eat(tests.exponent) ) {
                 stream.eat(tests.sign);
                 stream.eatWhile(tests.digit);
             }

From 6ba24813c96687dac2f23db100780bc42e6ed808 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Aug 2012 15:30:05 +0200
Subject: [PATCH 06/93] Save overhead of operation when polling doesn't find a
 change

---
 lib/codemirror.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6ce88b2a70..be782c74ea 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -911,21 +911,17 @@ window.CodeMirror = (function() {
     function slowPoll() {
       if (pollingFast) return;
       poll.set(options.pollInterval, function() {
-        startOperation();
         readInput();
         if (focused) slowPoll();
-        endOperation();
       });
     }
     function fastPoll() {
       var missed = false;
       pollingFast = true;
       function p() {
-        startOperation();
         var changed = readInput();
         if (!changed && !missed) {missed = true; poll.set(60, p);}
         else {pollingFast = false; slowPoll();}
-        endOperation();
       }
       poll.set(20, p);
     }
@@ -940,6 +936,7 @@ window.CodeMirror = (function() {
       if (!focused || hasSelection(input) || options.readOnly) return false;
       var text = input.value;
       if (text == prevInput) return false;
+      startOperation();
       shiftSelecting = null;
       var same = 0, l = Math.min(prevInput.length, text.length);
       while (same < l && prevInput[same] == text[same]) ++same;
@@ -950,6 +947,7 @@ window.CodeMirror = (function() {
       replaceSelection(text.slice(same), "end");
       if (text.length > 1000) { input.value = prevInput = ""; }
       else prevInput = text;
+      endOperation();
       return true;
     }
     function resetInput(user) {

From a2257ba4ce89b704e10a67e29808e56bcd5ce8fa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Aug 2012 12:48:49 +0200
Subject: [PATCH 07/93] Simplify line content-node API, get rid of makeTab
 indirection

---
 lib/codemirror.js | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index be782c74ea..624f71b19e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -88,7 +88,6 @@ window.CodeMirror = (function() {
     // Tracks the maximum line length so that the horizontal scrollbar
     // can be kept static when scrolling.
     var maxLine = getLine(0), updateMaxLine = false, maxLineChanged = true;
-    var tabCache = {};
     var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
     var goalColumn = null;
 
@@ -363,6 +362,10 @@ window.CodeMirror = (function() {
       for (var n = line; n; n = n.parent) n.height += diff;
     }
 
+    function lineContent(line, wrapAt) {
+      return line.getContent(options.tabSize, wrapAt, options.lineWrapping);
+    }
+
     function setValue(code) {
       var top = {line: 0, ch: 0};
       updateLines(top, {line: doc.size - 1, ch: getLine(doc.size-1).text.length},
@@ -1159,7 +1162,7 @@ window.CodeMirror = (function() {
         if (!nextIntact || nextIntact.from > j) {
           if (line.hidden) var lineElement = elt("pre");
           else {
-            var lineElement = line.getElement(makeTab);
+            var lineElement = lineContent(line);
             if (line.className) lineElement.className = line.className;
             // Kludge to make sure the styled element lies behind the selection (by z-index)
             if (line.bgClassName) {
@@ -1443,7 +1446,7 @@ window.CodeMirror = (function() {
       var indentString = "", pos = 0;
       if (options.indentWithTabs)
         for (var i = Math.floor(indentation / options.tabSize); i; --i) {pos += options.tabSize; indentString += "\t";}
-      while (pos < indentation) {++pos; indentString += " ";}
+      if (pos < indentation) indentString += spaceStr(indentation - pos);
 
       if (indentString != curSpaceString)
         replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length});
@@ -1480,13 +1483,6 @@ window.CodeMirror = (function() {
       }
       changes.push({from: 0, to: doc.size});
     }
-    function makeTab(col) {
-      var w = options.tabSize - col % options.tabSize, cached = tabCache[w];
-      if (cached) return cached;
-      for (var str = "", i = 0; i < w; ++i) str += " ";
-      var span = elt("span", str, "cm-tab");
-      return (tabCache[w] = {element: span, width: w});
-    }
     function themeChanged() {
       scroller.className = scroller.className.replace(/\s*cm-s-\S+/g, "") +
         options.theme.replace(/(^|\s)\s*/g, " cm-s-");
@@ -1643,7 +1639,7 @@ window.CodeMirror = (function() {
       if (ch == 0) return {top: 0, left: 0};
       var wbr = options.lineWrapping && ch < line.text.length &&
                 spanAffectsWrapping.test(line.text.slice(ch - 1, ch + 1));
-      var pre = line.getElement(makeTab, ch, wbr);
+      var pre = lineContent(line, ch);
       removeChildrenAndAdd(measure, pre);
       var anchor = pre.anchor;
       var top = anchor.offsetTop, left = anchor.offsetLeft;
@@ -2598,7 +2594,7 @@ window.CodeMirror = (function() {
     indentation: function(tabSize) {return countColumn(this.text, null, tabSize);},
     // Produces an HTML fragment for the line, taking selection,
     // marking, and highlighting into account.
-    getElement: function(makeTab, wrapAt, wrapWBR) {
+    getContent: function(tabSize, wrapAt, compensateForWrapping) {
       var first = true, col = 0, specials = /[\t\u0000-\u0019\u200b\u2028\u2029\uFEFF]/g;
       var pre = elt("pre");
       function span_(html, text, style) {
@@ -2622,9 +2618,9 @@ window.CodeMirror = (function() {
             if (!m) break;
             pos += skipped + 1;
             if (m[0] == "\t") {
-              var tab = makeTab(col);
-              content.appendChild(tab.element.cloneNode(true));
-              col += tab.width;
+              var tabWidth = tabSize - col % tabSize;
+              content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+              col += tabWidth;
             } else {
               var token = elt("span", "\u2022", "cm-invalidchar");
               token.title = "\\u" + m[0].charCodeAt(0).toString(16);
@@ -2645,7 +2641,7 @@ window.CodeMirror = (function() {
             if (wrapAt > outPos) {
               span_(html, text.slice(0, wrapAt - outPos), style);
               // See comment at the definition of spanAffectsWrapping
-              if (wrapWBR) html.appendChild(elt("wbr"));
+              if (compensateForWrapping) html.appendChild(elt("wbr"));
             }
             html.appendChild(anchor);
             var cut = wrapAt - outPos;
@@ -3085,10 +3081,17 @@ window.CodeMirror = (function() {
     return box;
   }
 
-  // Get a node's text content.
   function eltText(node) {
     return node.textContent || node.innerText || node.nodeValue || "";
   }
+
+  var spaceStrs = [""];
+  function spaceStr(n) {
+    while (spaceStrs.length <= n)
+      spaceStrs.push(spaceStrs[spaceStrs.length - 1] + " ");
+    return spaceStrs[n];
+  }
+
   function selectInput(node) {
     if (ios) { // Mobile Safari apparently has a bug where select() is broken.
       node.selectionStart = 0;

From ff6bc0c6d8815d779be713ddffd3425f70e42ea4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Aug 2012 13:57:34 +0200
Subject: [PATCH 08/93] Change the way highlighting information is updated

 - Background parsing now never goes past the visible part of the
   document.

 - We only store style information for lines that are actually visible
   (and then keep it cached).

 - When the document changes, background highlighting always
   re-highlights from the change to the end of the visible part.

 - Gets rid of compareState mode methods and the hairy heuristic that
   tried to simulate it when absent.

 - The onHighlightComplete callback was removed, since it no longer
   really applies -- the document is only fully parsed when scrolled
   to its end.

This should help preserve memory (a huge document will no longer
immediately have parser state and highlighting information built up
for all lines, but only for the parts that you look at), and removes
the pathological case when you, for example, are typing at the top of
a huge XML document, and opening or closing a tag causes a whole
re-highlight to cascade all the way to the bottom because the
compareState will detect a change.

Issue #688
---
 doc/manual.html             |  17 ----
 lib/codemirror.js           | 160 +++++++++++++-----------------------
 lib/util/multiplex.js       |   8 --
 mode/haxe/haxe.js           |   3 -
 mode/htmlmixed/htmlmixed.js |   6 --
 mode/tiki/tiki.js           |   7 --
 mode/xml/xml.js             |   8 --
 7 files changed, 58 insertions(+), 151 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 6b4dc8c7b5..21e6cbdcbd 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -249,11 +249,6 @@ <h2 id="config">Configuration</h2>
       <dd>When given, will be called whenever the editor is
       scrolled.</dd>
 
-      <dt id="option_onHighlightComplete"><code>onHighlightComplete (function)</code></dt>
-      <dd>Whenever the editor's content has been fully highlighted,
-      this function (if given) will be called. It'll be given a single
-      argument, the editor instance.</dd>
-
       <dt id="option_onUpdate"><code>onUpdate (function)</code></dt>
       <dd>Will be called whenever CodeMirror updates its DOM display.</dd>
 
@@ -1085,18 +1080,6 @@ <h2 id="modeapi">Writing CodeMirror Modes</h2>
     which is given a state and should return a safe copy of that
     state.</p>
 
-    <p id="compareStates">By default, CodeMirror will stop re-parsing
-    a document as soon as it encounters a few lines that were
-    highlighted the same in the old parse as in the new one. It is
-    possible to provide an explicit way to test whether a state is
-    equivalent to another one, which CodeMirror will use (instead of
-    the unchanged-lines heuristic) to decide when to stop
-    highlighting. You do this by providing
-    a <code>compareStates</code> method on your mode object, which
-    takes two state arguments and returns a boolean indicating whether
-    they are equivalent. See the XML mode, which uses this to provide
-    reliable highlighting of bad closing tags, as an example.</p>
-
     <p id="indent">If you want your mode to provide smart indentation
     (though the <a href="#indentLine"><code>indentLine</code></a>
     method and the <code>indentAuto</code>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 624f71b19e..68694effd1 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -64,9 +64,9 @@ window.CodeMirror = (function() {
     var poll = new Delayed(), highlight = new Delayed(), blinker;
 
     // mode holds a mode API object. doc is the tree of Line objects,
-    // work an array of lines that should be parsed, and history the
-    // undo history (instance of History constructor).
-    var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), work, focused;
+    // frontier is the point up to which the content has been parsed,
+    // and history the undo history (instance of History constructor).
+    var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), frontier = 0, focused;
     loadMode();
     // The selection. These are always maintained to point at valid
     // positions. Inverted is used to remember that the user is
@@ -363,6 +363,8 @@ window.CodeMirror = (function() {
     }
 
     function lineContent(line, wrapAt) {
+      if (!line.styles)
+        line.highlight(mode, line.stateAfter = getStateBefore(lineNo(line)), options.tabSize);
       return line.getContent(options.tabSize, wrapAt, options.lineWrapping);
     }
 
@@ -795,19 +797,11 @@ window.CodeMirror = (function() {
         if (recomputeMaxLength) updateMaxLine = true;
       }
 
-      // Add these lines to the work array, so that they will be
-      // highlighted. Adjust work lines if lines were added/removed.
-      var newWork = [], lendiff = newText.length - nlines - 1;
-      for (var i = 0, l = work.length; i < l; ++i) {
-        var task = work[i];
-        if (task < from.line) newWork.push(task);
-        else if (task > to.line) newWork.push(task + lendiff);
-      }
-      var hlEnd = from.line + Math.min(newText.length, 500);
-      highlightLines(from.line, hlEnd);
-      newWork.push(hlEnd);
-      work = newWork;
-      startWorker(100);
+      // Adjust frontier, schedule worker
+      frontier = Math.min(frontier, from.line);
+      startWorker(400);
+
+      var lendiff = newText.length - nlines - 1;
       // Remember that these lines changed, for updating the display
       changes.push({from: from.line, to: to.line + 1, diff: lendiff});
       var changeObj = {from: from, to: to, text: newText};
@@ -1076,6 +1070,7 @@ window.CodeMirror = (function() {
         });
       showingFrom = from; showingTo = to;
       displayOffset = heightAtLine(doc, from);
+      startWorker(100);
 
       // Since this is all rather error prone, it is honoured with the
       // only assertion in the whole file.
@@ -1455,8 +1450,8 @@ window.CodeMirror = (function() {
     function loadMode() {
       mode = CodeMirror.getMode(options, options.mode);
       doc.iter(0, doc.size, function(line) { line.stateAfter = null; });
-      work = [0];
-      startWorker();
+      frontier = 0;
+      startWorker(100);
     }
     function gutterChanged() {
       var visible = options.gutter || options.lineNumbers;
@@ -1867,70 +1862,39 @@ window.CodeMirror = (function() {
       return minline;
     }
     function getStateBefore(n) {
-      var start = findStartLine(n), state = start && getLine(start-1).stateAfter;
+      var pos = findStartLine(n), state = pos && getLine(pos-1).stateAfter;
       if (!state) state = startState(mode);
       else state = copyState(mode, state);
-      doc.iter(start, n, function(line) {
-        line.highlight(mode, state, options.tabSize);
-        line.stateAfter = copyState(mode, state);
+      doc.iter(pos, n, function(line) {
+        line.process(mode, state, options.tabSize);
+        line.stateAfter = (pos == n - 1 || pos % 5 == 0) ? copyState(mode, state) : null;
       });
-      if (start < n) changes.push({from: start, to: n});
-      if (n < doc.size && !getLine(n).stateAfter) work.push(n);
       return state;
     }
-    function highlightLines(start, end) {
-      var state = getStateBefore(start);
-      doc.iter(start, end, function(line) {
-        line.highlight(mode, state, options.tabSize);
-        line.stateAfter = copyState(mode, state);
-      });
-    }
     function highlightWorker() {
-      var end = +new Date + options.workTime;
-      var foundWork = work.length;
-      while (work.length) {
-        if (!getLine(showingFrom).stateAfter) var task = showingFrom;
-        else var task = work.pop();
-        if (task >= doc.size) continue;
-        var start = findStartLine(task), state = start && getLine(start-1).stateAfter;
-        if (state) state = copyState(mode, state);
-        else state = startState(mode);
-
-        var unchanged = 0, compare = mode.compareStates, realChange = false,
-            i = start, bail = false;
-        doc.iter(i, doc.size, function(line) {
-          var hadState = line.stateAfter;
-          if (+new Date > end) {
-            work.push(i);
-            startWorker(options.workDelay);
-            if (realChange) changes.push({from: task, to: i + 1});
-            return (bail = true);
-          }
-          var changed = line.highlight(mode, state, options.tabSize);
-          if (changed) realChange = true;
+      if (frontier >= showingTo) return;
+      var end = +new Date + options.workTime, state = copyState(mode, getStateBefore(frontier));
+      var startFrontier = frontier;
+      doc.iter(frontier, showingTo, function(line) {
+        if (frontier >= showingFrom) { // Visible
+          line.highlight(mode, state, options.tabSize);
           line.stateAfter = copyState(mode, state);
-          var done = null;
-          if (compare) {
-            var same = hadState && compare(hadState, state);
-            if (same != Pass) done = !!same;
-          }
-          if (done == null) {
-            if (changed !== false || !hadState) unchanged = 0;
-            else if (++unchanged > 3 && (!mode.indent || mode.indent(hadState, "") == mode.indent(state, "")))
-              done = true;
-          }
-          if (done) return true;
-          ++i;
-        });
-        if (bail) return;
-        if (realChange) changes.push({from: task, to: i + 1});
-      }
-      if (foundWork && options.onHighlightComplete)
-        options.onHighlightComplete(instance);
+        } else {
+          line.process(mode, state, options.tabSize);
+          line.stateAfter = frontier % 5 == 0 ? copyState(mode, state) : null;
+        }
+        ++frontier;
+        if (+new Date > end) {
+          startWorker(options.workDelay);
+          return true;
+        }
+      });
+      if (showingTo > startFrontier && frontier >= showingFrom)
+        operation(function() {changes.push({from: startFrontier, to: frontier});})();
     }
     function startWorker(time) {
-      if (!work.length) return;
-      highlight.set(time, operation(highlightWorker));
+      if (frontier < showingTo)
+        highlight.set(time, highlightWorker);
     }
 
     // Operations are used to wrap changes in such a way that each
@@ -2029,7 +1993,6 @@ window.CodeMirror = (function() {
     onCursorActivity: null,
     onViewportChange: null,
     onGutterClick: null,
-    onHighlightComplete: null,
     onUpdate: null,
     onFocus: null, onBlur: null, onScroll: null,
     matchBrackets: false,
@@ -2427,8 +2390,7 @@ window.CodeMirror = (function() {
 
   // Line objects. These hold state related to a line, including
   // highlighting info (the styles array).
-  function Line(text, styles) {
-    this.styles = styles || [text, null];
+  function Line(text) {
     this.text = text;
     this.height = 1;
   }
@@ -2445,15 +2407,11 @@ window.CodeMirror = (function() {
     return ln;
   };
   Line.prototype = {
-    // Replace a piece of a line, keeping the styles around it intact.
+    // Replace a piece of a line, keeping the markers intact.
     replace: function(from, to_, text) {
-      var st = [], mk = this.marked, to = to_ == null ? this.text.length : to_;
-      copyStyles(0, from, this.styles, st);
-      if (text) st.push(text, null);
-      copyStyles(to, this.text.length, this.styles, st);
-      this.styles = st;
+      var mk = this.marked, to = to_ == null ? this.text.length : to_;
       this.text = this.text.slice(0, from) + text + this.text.slice(to);
-      this.stateAfter = null;
+      this.stateAfter = this.styles = null;
       if (mk) {
         var diff = text.length - (to - from);
         for (var i = 0; i < mk.length; ++i) {
@@ -2463,11 +2421,10 @@ window.CodeMirror = (function() {
         }
       }
     },
-    // Split a part off a line, keeping styles and markers intact.
+    // Split a part off a line, keeping markers intact.
     split: function(pos, textBefore) {
-      var st = [textBefore, null], mk = this.marked;
-      copyStyles(pos, this.text.length, this.styles, st);
-      var taken = new Line(textBefore + this.text.slice(pos), st);
+      var mk = this.marked;
+      var taken = new Line(textBefore + this.text.slice(pos));
       if (mk) {
         for (var i = 0; i < mk.length; ++i) {
           var mark = mk[i];
@@ -2484,7 +2441,7 @@ window.CodeMirror = (function() {
     append: function(line) {
       var mylen = this.text.length, mk = line.marked, mymk = this.marked;
       this.text += line.text;
-      copyStyles(0, line.text.length, line.styles, this.styles);
+      this.styles = this.stateAfter = null;
       if (mymk) {
         for (var i = 0; i < mymk.length; ++i)
           if (mymk[i].to == null) mymk[i].to = mylen;
@@ -2550,19 +2507,16 @@ window.CodeMirror = (function() {
     // array, which contains alternating fragments of text and CSS
     // classes.
     highlight: function(mode, state, tabSize) {
-      var stream = new StringStream(this.text, tabSize), st = this.styles, pos = 0;
-      var changed = false, curWord = st[0], prevWord;
+      var stream = new StringStream(this.text, tabSize), st = this.styles || (this.styles = []);
+      var pos = st.length = 0;
       if (this.text == "" && mode.blankLine) mode.blankLine(state);
       while (!stream.eol()) {
-        var style = mode.token(stream, state);
-        var substr = this.text.slice(stream.start, stream.pos);
+        var style = mode.token(stream, state), substr = stream.current();
         stream.start = stream.pos;
-        if (pos && st[pos-1] == style)
+        if (pos && st[pos-1] == style) {
           st[pos-2] += substr;
-        else if (substr) {
-          if (!changed && (st[pos+1] != style || (pos && st[pos-2] != prevWord))) changed = true;
+        } else if (substr) {
           st[pos++] = substr; st[pos++] = style;
-          prevWord = curWord; curWord = st[pos];
         }
         // Give up when line is ridiculously long
         if (stream.pos > 5000) {
@@ -2570,12 +2524,14 @@ window.CodeMirror = (function() {
           break;
         }
       }
-      if (st.length != pos) {st.length = pos; changed = true;}
-      if (pos && st[pos-2] != prevWord) changed = true;
-      // Short lines with simple highlights return null, and are
-      // counted as changed by the driver because they are likely to
-      // highlight the same way in various contexts.
-      return changed || (st.length < 5 && this.text.length < 10 ? null : false);
+    },
+    process: function(mode, state, tabSize) {
+      var stream = new StringStream(this.text, tabSize);
+      if (this.text == "" && mode.blankLine) mode.blankLine(state);
+      while (!stream.eol() && stream.pos <= 5000) {
+        mode.token(stream, state);
+        stream.start = stream.pos;
+      }
     },
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
diff --git a/lib/util/multiplex.js b/lib/util/multiplex.js
index 755588b9c4..b7c1838f62 100644
--- a/lib/util/multiplex.js
+++ b/lib/util/multiplex.js
@@ -68,14 +68,6 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
     },
 
-    compareStates: function(a, b) {
-      if (a.innerActive != b.innerActive) return false;
-      var mode = a.innerActive || outer;
-      if (!mode.compareStates) return CodeMirror.Pass;
-      return mode.compareStates(a.innerActive ? a.inner : a.outer,
-                                b.innerActive ? b.inner : b.outer);
-    },
-
     electricChars: outer.electricChars
   };
 };
diff --git a/mode/haxe/haxe.js b/mode/haxe/haxe.js
index ea8bd834e6..64f4eb3ff8 100644
--- a/mode/haxe/haxe.js
+++ b/mode/haxe/haxe.js
@@ -421,9 +421,6 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
       else if (lexical.align) return lexical.column + (closing ? 0 : 1);
       else return lexical.indented + (closing ? 0 : indentUnit);
     },
-	compareStates: function(state1, state2) {
-		return (state1.localVars == state2.localVars) && (state1.context == state2.context);
-	},
 
     electricChars: "{}"
   };
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 260a6d0dfb..5f2fc238c9 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -76,12 +76,6 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
         return cssMode.indent(state.localState, textAfter);
     },
 
-    compareStates: function(a, b) {
-      if (a.mode != b.mode) return false;
-      if (a.localState) return CodeMirror.Pass;
-      return htmlMode.compareStates(a.htmlState, b.htmlState);
-    },
-
     electricChars: "/{}:"
   };
 }, "xml", "javascript", "css");
diff --git a/mode/tiki/tiki.js b/mode/tiki/tiki.js
index 24bf0fbfe5..af83dc1b5b 100644
--- a/mode/tiki/tiki.js
+++ b/mode/tiki/tiki.js
@@ -301,13 +301,6 @@ CodeMirror.defineMode('tiki', function(config, parserConfig) {
 			if (context) return context.indent + indentUnit;
 			else return 0;
 		},
-		compareStates: function(a, b) {
-			if (a.indented != b.indented || a.pluginName != b.pluginName) return false;
-			for (var ca = a.context, cb = b.context; ; ca = ca.prev, cb = cb.prev) {
-				if (!ca || !cb) return ca == cb;
-				if (ca.pluginName != cb.pluginName) return false;
-			}
-		},
 		electricChars: "/"
 	};
 });
diff --git a/mode/xml/xml.js b/mode/xml/xml.js
index cd69f62fd5..860e368f5b 100644
--- a/mode/xml/xml.js
+++ b/mode/xml/xml.js
@@ -308,14 +308,6 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       else return 0;
     },
 
-    compareStates: function(a, b) {
-      if (a.indented != b.indented || a.tokenize != b.tokenize) return false;
-      for (var ca = a.context, cb = b.context; ; ca = ca.prev, cb = cb.prev) {
-        if (!ca || !cb) return ca == cb;
-        if (ca.tagName != cb.tagName || ca.indent != cb.indent) return false;
-      }
-    },
-
     electricChars: "/"
   };
 });

From ee16009813062592104ef07fefdc55c9c4f13342 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 31 Aug 2012 15:58:15 +0200
Subject: [PATCH 09/93] Remove unused function copyStyles

---
 lib/codemirror.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 68694effd1..d020d6de78 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2677,20 +2677,6 @@ window.CodeMirror = (function() {
         for (var i = 0, e = this.marked.length; i < e; ++i) this.marked[i].detach(this);
     }
   };
-  // Utility used by replace and split above
-  function copyStyles(from, to, source, dest) {
-    for (var i = 0, pos = 0, state = 0; pos < to; i+=2) {
-      var part = source[i], end = pos + part.length;
-      if (state == 0) {
-        if (end > from) dest.push(part.slice(from - pos, Math.min(part.length, to - pos)), source[i+1]);
-        if (end >= from) state = 1;
-      } else if (state == 1) {
-        if (end > to) dest.push(part.slice(0, to - pos), source[i+1]);
-        else dest.push(part, source[i+1]);
-      }
-      pos = end;
-    }
-  }
 
   // Data structure that holds the sequence of lines.
   function LeafChunk(lines) {

From 0cae19e8cc5f9dccf55194d934c32bb971938bc9 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Mon, 3 Sep 2012 02:42:36 -0400
Subject: [PATCH 10/93] Add highlighting tests for Markdown mode.

---
 mode/markdown/test.html | 419 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 419 insertions(+)
 create mode 100644 mode/markdown/test.html

diff --git a/mode/markdown/test.html b/mode/markdown/test.html
new file mode 100644
index 0000000000..3f4e9e0c90
--- /dev/null
+++ b/mode/markdown/test.html
@@ -0,0 +1,419 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Markdown mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="../xml/xml.js"></script>
+    <script src="markdown.js"></script>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <link rel="stylesheet" href="../../test/mode_test.css">
+    <script src="../../test/mode_test.js"></script>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  <body>
+    <h1>Tests for the Markdown Mode</h1>
+    <h2>Basics</h2>
+    <script language="javascript">
+      MT = ModeTest;
+      MT.modeName = 'markdown';
+
+      MT.test('foo',
+        null, 'foo');
+    </script>
+    
+    <h2>Code</h2>
+    <script language="javascript">
+
+      // Code blocks using 4 spaces (regardless of CodeMirror.tabSize value)
+      MT.test('    foo',
+        null,      '    ',
+        'comment', 'foo');
+        
+      // Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
+      MT.test('\tfoo',
+        null,      '\t',
+        'comment', 'foo');
+
+      // Inline code using backticks
+      MT.test('foo `bar`',
+        null,      'foo ',
+        'comment', '`bar`');
+        
+      // Unclosed backticks
+      // This should *not* be fixed by only adding the style to closed groups. 
+      // Instead, autocomplete should be added (see issue #344).
+      MT.test('foo `bar',
+        null, 'foo `bar');
+        
+      // Per documentation: "To include a literal backtick character within a 
+      // code span, you can use multiple backticks as the opening and closing 
+      // delimiters"
+      MT.test('``foo ` bar``',
+        'comment', '``foo ` bar``');
+    </script>
+    
+    <h2>Headers</h2>
+    <script language="javascript">
+
+      // atx headers
+      // http://daringfireball.net/projects/markdown/syntax#header
+      // 
+      // H1
+      MT.test('# foo',
+        'header', '# foo');
+      // H2
+      MT.test('## foo',
+        'header', '## foo');
+      // H3
+      MT.test('### foo',
+        'header', '### foo');
+      // H4
+      MT.test('#### foo',
+        'header', '#### foo');
+      // H5
+      MT.test('##### foo',
+        'header', '##### foo');
+      // H6
+      MT.test('###### foo',
+        'header', '###### foo');
+      // H6 - 7x '#' should still be H6, per Dingus
+      // http://daringfireball.net/projects/markdown/dingus
+      MT.test('####### foo',
+        'header', '####### foo');
+        
+      // Setext headers - H1, H2
+      // Per documentation, "Any number of underlining =’s or -’s will work."
+      // http://daringfireball.net/projects/markdown/syntax#header
+      // 
+      // Check if single underlining = works
+      MT.test('foo\n=',
+        'header', 'foo',
+        'header', '=');
+      // Check if 3+ ='s work
+      MT.test('foo\n===',
+        'header', 'foo',
+        'header', '===');
+      // Check if single underlining - works
+      MT.test('foo\n-',
+        'header', 'foo',
+        'header', '-');
+      // Check if 3+ -'s work
+      MT.test('foo\n---',
+        'header', 'foo',
+        'header', '---');
+    </script>
+    
+    <h2>Blockquotes</h2>
+    <script language="javascript">
+
+      // Single-line blockquote with trailing space
+      MT.test('> foo',
+        'quote', '> foo');
+
+      // Single-line blockquote
+      MT.test('>foo',
+        'quote', '>foo');
+
+      // Single-line blockquote followed by normal paragraph
+      MT.test('>foo\n\nbar',
+        'quote', '>foo',
+        null,    'bar');
+
+      // Multi-line blockquote (lazy mode)
+      MT.test('>foo\nbar',
+        'quote', '>foo',
+        'quote', 'bar');
+
+      // Multi-line blockquote followed by normal paragraph (lazy mode)
+      MT.test('>foo\nbar\n\nhello',
+        'quote', '>foo',
+        'quote', 'bar',
+        null,    'hello');
+
+      // Multi-line blockquote (non-lazy mode)
+      MT.test('>foo\n>bar',
+        'quote', '>foo',
+        'quote', '>bar');
+
+      // Multi-line blockquote followed by normal paragraph (non-lazy mode)
+      MT.test('>foo\n>bar\n\nhello',
+        'quote', '>foo',
+        'quote', '>bar',
+        null,    'hello');
+    </script>
+    
+    <h2>Horizontal rules</h2>
+    <script language="javascript">
+
+      // Following tests directly from official Markdown documentation
+      // http://daringfireball.net/projects/markdown/syntax#hr
+      MT.test('* * *',
+        'hr', '* * *');
+        
+      MT.test('***',
+        'hr', '***');
+        
+      MT.test('*****',
+        'hr', '*****');
+        
+      MT.test('- - -',
+        'hr', '- - -');
+        
+      MT.test('---------------------------------------',
+        'hr', '---------------------------------------');
+    </script>
+    
+    <h2>Links</h2>
+    <script language="javascript">
+
+      // Inline link with title
+      MT.test('[foo](http://example.com/ "bar") hello',
+        'link', '[foo]',
+        'string', '(http://example.com/ "bar")',
+        null, ' hello');
+        
+      // Inline link without title
+      MT.test('[foo](http://example.com/) bar',
+        'link', '[foo]',
+        'string', '(http://example.com/)',
+        null, ' bar');
+        
+      // Reference-style links
+      MT.test('[foo][bar] hello',
+        'link', '[foo]',
+        'string', '[bar]',
+        null, ' hello');
+        
+      // Reference-style links with optional space separator (per docuentation)
+      // "You can optionally use a space to separate the sets of brackets"
+      MT.test('[foo] [bar] hello',
+        'link', '[foo]',
+        null, ' ',
+        'string', '[bar]',
+        null, ' hello');
+        
+      // Reference-style links with implicit link name
+      MT.test('[foo][] hello',
+        'link', '[foo]',
+        'string', '[]',
+        null, ' hello');
+        
+      // @todo It would be nice if, at some point, the document was actually
+      // checked to see if the referenced link exists
+      
+      // Link label, for reference-style links (taken from documentation)
+      //
+      // No title
+      MT.test('[foo]: http://example.com/',
+        'link', '[foo]:',
+        'string', ' http://example.com/');
+      // Space in ID
+      MT.test('[foo bar]: http://example.com/ "hello"',
+        'link', '[foo bar]:',
+        'string', ' http://example.com/',
+        'string', ' "hello"');
+      // Double quotes around title
+      MT.test('[foo]: http://example.com/  "bar"',
+        'link', '[foo]:',
+        'string', ' http://example.com/  "bar"');
+      // Single quotes around title
+      MT.test('[foo]: http://example.com/  \'bar\'',
+        'link', '[foo]:',
+        'string', ' http://example.com/  \'bar\'');
+      // Parentheses around title
+      MT.test('[foo]: http://example.com/  (bar)',
+        'link', '[foo]:',
+        'string', ' http://example.com/  (bar)');
+      // Invalid title
+      MT.test('[foo]: http://example.com/ bar',
+        'link', '[foo]:',
+        'string', ' http://example.com/',
+        null, ' bar');
+      // Angle brackets around URL
+      MT.test('[foo]: <http://example.com/>  "bar"',
+        'link', '[foo]:',
+        'string', ' <http://example.com/>  "bar"');
+      // Title on next line per documentation
+      MT.test('[foo]: http://example.com/\n"bar"',
+        'link', '[foo]:',
+        'string', ' http://example.com/',
+        'string', '"bar"');
+        
+      // Automatic links
+      MT.test('<http://example.com/>',
+        'link', '<http://example.com/>');
+        
+      // Automatic email links
+      MT.test('<user@example.com>',
+        'link', '<user@example.com>');
+    </script>
+    
+    <h2>Emphasis</h2>
+    <script language="javascript">
+
+      // Single asterisk
+      MT.test('*foo* bar',
+        'em', '*',
+        'em', 'foo',
+        'em', '*',
+        null, ' bar');
+
+      // Single underscore
+      MT.test('_foo_ bar',
+        'em', '_',
+        'em', 'foo',
+        'em', '_',
+        null, ' bar');
+        
+      // Emphasis characters within a word
+      MT.test('foo*bar*hello',
+        null, 'foo',
+        'em', '*',
+        'em', 'bar',
+        'em', '*',
+        null, 'hello');
+      MT.test('foo_bar_hello',
+        null, 'foo',
+        'em', '_',
+        'em', 'bar',
+        'em', '_',
+        null, 'hello');
+      // Per documentation: "...surround an * or _ with spaces, it’ll be 
+      // treated as a literal asterisk or underscore."
+      MT.test('foo _bar _ hello_ world',
+        null, 'foo',
+        'em', '_',
+        'em', 'bar _ hello',
+        'em', '_',
+        null, 'world');
+        
+      // Unclosed emphasis characters
+      // This should *not* be fixed by only adding the style to closed groups. 
+      // Instead, autocomplete should be added (see issue #344).
+      MT.test('foo *bar',
+        null, 'foo *bar');
+      MT.test('foo _bar',
+        null, 'foo _bar');
+
+      // Double asterisk
+      MT.test('**foo** bar',
+        'strong', '**',
+        'strong', 'foo',
+        'strong', '**',
+        null, ' bar');
+
+      // Double underscore
+      MT.test('__foo__ bar',
+        'strong', '__',
+        'strong', 'foo',
+        'strong', '__',
+        null, ' bar');
+
+      // Triple asterisk
+      MT.test('*foo**bar*hello** world',
+        'em', '*',
+        'em', 'foo',
+        'emstrong', '**',
+        'emstrong', 'bar',
+        'emstrong', '*',
+        'strong', 'hello',
+        'strong', '**',
+        null, ' world');
+
+      // Triple underscore
+      MT.test('_foo__bar_hello__ world',
+        'em', '_',
+        'em', 'foo',
+        'emstrong', '__',
+        'emstrong', 'bar',
+        'emstrong', '_',
+        'strong', 'hello',
+        'strong', '__',
+        null, ' world');
+
+      // Triple mixed
+      // "...same character must be used to open and close an emphasis span.""
+      MT.test('_foo**bar*hello__ world',
+        'em', '_',
+        'em', 'foo**bar*hello',
+        'em', '_',
+        null, '_ world');
+      MT.test('*foo__bar_hello** world',
+        'em', '*',
+        'em', 'foo__bar_hello',
+        'em', '*',
+        null, '* world');
+    </script>
+    
+    <h2>Escaping</h2>
+    <script language="javascript">
+
+      // These characters should be escaped:
+      // \   backslash
+      // `   backtick
+      // *   asterisk
+      // _   underscore
+      // {}  curly braces
+      // []  square brackets
+      // ()  parentheses
+      // #   hash mark
+      // +   plus sign
+      // -   minus sign (hyphen)
+      // .   dot
+      // !   exclamation mark
+      // 
+      // Backtick (code)
+      MT.test('foo \\`bar\\`',
+        null, 'foo ',
+        null, '\\`',
+        null, 'bar',
+        null, '\\`');
+      MT.test('foo \\\\`bar\\\\`',
+        null, 'foo ',
+        null, '\\\\',
+        'comment', '`bar\\\\`');
+      // Asterisk (em)
+      MT.test('foo \\*bar\\*',
+        null, 'foo ',
+        null, '\\*',
+        null, 'bar',
+        null, '\\*');
+      MT.test('foo \\\\*bar\\\\*',
+        null, 'foo ',
+        null, '\\\\',
+        'em', '*',
+        'em', 'bar',
+        'em', '\\\\',
+        'em', '*');
+      // Underscore (em)
+      MT.test('foo \\_bar\\_',
+        null, 'foo ',
+        null, '\\_',
+        null, 'bar',
+        null, '\\_');
+      MT.test('foo \\\\_bar\\\\_',
+        null, 'foo ',
+        null, '\\\\',
+        'em', '_',
+        'em', 'bar',
+        'em', '\\\\',
+        'em', '_');
+      // Hash mark (headers)
+      MT.test('\\# foo',
+        null, '\\#',
+        null, ' foo');
+      MT.test('\\\\# foo',
+        null, '\\\\',
+        null, '# foo');
+    </script>
+
+    <h2>Summary</h2>
+    <script language="javascript">
+      MT.printSummary();
+    </script>
+
+  </body>
+</html>
+

From 59d6bbef9fff62ae57276deab7f6940b39896434 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Sep 2012 09:48:59 +0200
Subject: [PATCH 11/93] [vim keymap] Reset keymap after YY is pressed

Closes #774
---
 keymap/vim.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index 73a4a0a771..b6a41850ef 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -509,7 +509,10 @@
   setupPrefixBindingForKey("Space");
 
   CodeMirror.keyMap["vim-prefix-y"] = {
-    "Y": countTimes(function(cm) { pushInBuffer("\n"+cm.getLine(cm.getCursor().line+yank)); yank++; }),
+    "Y": countTimes(function(cm) {
+      pushInBuffer("\n"+cm.getLine(cm.getCursor().line+yank)); yank++;
+      cm.setOption("keyMap", "vim");
+    }),
     "'": function(cm) {cm.setOption("keyMap", "vim-prefix-y'"); emptyBuffer();},
     nofallthrough: true, style: "fat-cursor"
   };

From 5bc1e8983ff636df09b205aad73988554f13994c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Sep 2012 10:15:16 +0200
Subject: [PATCH 12/93] Remove obsolete before_script section in .travis.yml

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9bdccd0e3e..baa0031d50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,3 @@
 language: node_js
 node_js:
   - 0.8
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"

From a562bed086d59104f3691ef47b6947882083550b Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 2 Sep 2012 22:53:30 -0400
Subject: [PATCH 13/93] [clojure mode] Check if +/- is immediately followed by
 digit before marking as leading sign

Closes #782

Correct highlighting for the following code snippet should highlight the + as an operator, and each 2 as a number (taken from http://clojuredocs.org/clojure_core/1.2.0/clojure.test/deftest)

    (is (= 4 (+ 2 2)))
---
 mode/clojure/clojure.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/clojure/clojure.js b/mode/clojure/clojure.js
index ce389927db..84f6073fd5 100644
--- a/mode/clojure/clojure.js
+++ b/mode/clojure/clojure.js
@@ -70,7 +70,7 @@ CodeMirror.defineMode("clojure", function (config, mode) {
         }
 
         // leading sign
-        if ( ch == '+' || ch == '-' ) {
+        if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
           stream.eat(tests.sign);
           ch = stream.next();
         }

From 3e4a4a4455e08e12ab5b84f0c503044564987eb5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Sep 2012 10:38:23 +0200
Subject: [PATCH 14/93] Tweak context menu hack to make select-all reliable on
 FF

Issue #755
---
 lib/codemirror.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d020d6de78..56c29936d2 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1758,18 +1758,20 @@ window.CodeMirror = (function() {
         "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; " +
         "border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
       focusInput();
-      selectInput(input);
-      clearTimeout(detectingSelectAll);
+      resetInput(true);
+      // Adds "Select all" to context menu in FF
+      if (posEq(sel.from, sel.to)) input.value = prevInput = " ";
+
       function rehide() {
         inputDiv.style.position = "relative";
         input.style.cssText = oldCSS;
         if (ie_lt9) scrollbar.scrollTop = scrollPos;
-        resetInput(true);
         slowPoll();
 
         // Try to detect the user choosing select-all 
         if (input.selectionStart != null) {
-          var extval = input.value = " " + input.value, i = 0;
+          clearTimeout(detectingSelectAll);
+          var extval = input.value = " " + (posEq(sel.from, sel.to) ? "" : input.value), i = 0;
           prevInput = " ";
           input.selectionStart = 1; input.selectionEnd = extval.length;
           detectingSelectAll = setTimeout(function poll(){

From 4ac5b7aec8c998e21612796e18bfeb9a8aa7f393 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Sep 2012 13:09:25 +0200
Subject: [PATCH 15/93] Fix corruption of operation data introduced by
 6ba24813c96687dac2f23db100780bc42e6ed808

---
 lib/codemirror.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 56c29936d2..8eae1226e6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -933,7 +933,7 @@ window.CodeMirror = (function() {
       if (!focused || hasSelection(input) || options.readOnly) return false;
       var text = input.value;
       if (text == prevInput) return false;
-      startOperation();
+      if (!nestedOperation) startOperation();
       shiftSelecting = null;
       var same = 0, l = Math.min(prevInput.length, text.length);
       while (same < l && prevInput[same] == text[same]) ++same;
@@ -944,7 +944,7 @@ window.CodeMirror = (function() {
       replaceSelection(text.slice(same), "end");
       if (text.length > 1000) { input.value = prevInput = ""; }
       else prevInput = text;
-      endOperation();
+      if (!nestedOperation) endOperation();
       return true;
     }
     function resetInput(user) {

From aeccaf59af5a893de333a32e482674d64fc1a699 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Sep 2012 14:41:57 +0200
Subject: [PATCH 16/93] Add CodeMirror.version to API

---
 doc/manual.html   | 16 +++++++--
 lib/codemirror.js | 87 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 99 insertions(+), 4 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 21e6cbdcbd..05ef22030e 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -777,13 +777,23 @@ <h2 id="api">Programming API</h2>
       contextual information for a line.</dd>
     </dl>
 
-    <p id="fromTextArea">Finally, the <code>CodeMirror</code> object
-    itself has a method <code>fromTextArea</code>. This takes a
+    <p id="version">The <code>CodeMirror</code> object itself provides
+    several useful properties. Firstly, its <code>version</code>
+    property contains a string that indicates the version of the
+    library. For releases, this simply
+    contains <code>"major.minor"</code> (for
+    example <code>"2.33"</code>. For beta versions, <code>" B"</code>
+    (space, capital B) is added at the end of the string, for
+    development snapshots, <code>" +"</code> (space, plus) is
+    added.</p>
+
+    <p id="fromTextArea">The <code>CodeMirror.fromTextArea</code>
+    method provides another way to initialize an editor. It takes a
     textarea DOM node as first argument and an optional configuration
     object as second. It will replace the textarea with a CodeMirror
     instance, and wire up the form of that textarea (if any) to make
     sure the editor contents are put into the textarea when the form
-    is submitted. A CodeMirror instance created this way has two
+    is submitted. A CodeMirror instance created this way has three
     additional methods:</p>
 
     <dl>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8eae1226e6..8c2641b5d7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3069,7 +3069,6 @@ window.CodeMirror = (function() {
       e.appendChild(document.createTextNode(str));
     } else e.textContent = str;
   }
-  CodeMirror.setTextContent = setTextContent;
 
   // Used to position the cursor after an undo/redo by finding the
   // last edited character.
@@ -3144,5 +3143,91 @@ window.CodeMirror = (function() {
     for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
   })();
 
+<<<<<<< HEAD
+=======
+  function iterateBidiSections(order, from, to, f) {
+    if (!order) return f(from, to, "ltr");
+    for (var i = 0; i < order.length; ++i) {
+      var part = order[i];
+      if (part.from < to && part.to > from)
+        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
+    }
+  }
+
+  function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
+  function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
+
+  function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
+  function lineRight(line) {
+    var order = getOrder(line);
+    if (!order) return line.text.length;
+    var last = order[order.length-1];
+    return order[0].level != last.level ? line.text.length : bidiRight(last);
+  }
+  function lineStart(line) {
+    var order = getOrder(line);
+    if (!order) return 0;
+    return order[0].level % 2 ? lineRight(line) : lineLeft(line);
+  }
+  function lineEnd(line) {
+    var order = getOrder(line);
+    if (!order) return line.text.length;
+    return order[0].level % 2 ? lineLeft(line) : lineRight(line);
+  }
+
+  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\uA670-\uA672\uA674-\uA67D\uA69F]/;
+
+  // This is somewhat involved. It is needed in order to move
+  // 'visually' through bi-directional text -- i.e., pressing left
+  // should make the cursor go left, even when in RTL text. The
+  // tricky part is the 'jumps', where RTL and LTR text touch each
+  // other. This often requires the cursor offset to move more than
+  // one unit, in order to visually move one unit.
+  function moveVisually(line, start, dir, byUnit) {
+    var bidi = getOrder(line);
+    if (!bidi) return moveLogically(line, start, dir, byUnit);
+    var moveOneUnit = byUnit ? function(pos, dir) {
+      do pos += dir;
+      while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));
+      return pos;
+    } : function(pos, dir) { return pos + dir; };
+    var linedir = bidi[0].level, last = bidi[bidi.length-1];
+    if (linedir == last.level % 2) last = null;
+    for (var i = 0; i < bidi.length; ++i) {
+      var part = bidi[i], sticky = part.level % 2 == linedir;
+      if ((part.from < start && part.to > start) ||
+          (sticky && (part.from == start || part.to == start))) break;
+    }
+    var target = moveOneUnit(start, part.level % 2 ? -dir : dir);
+    if (i == bidi.length) {
+      if (dir > 0) return null; // Moving right from EOL
+      target = last.level % 1 ? moveOneUnit(last.from, 1) : moveOneUnit(last.to, -1);
+      if (moveOneUnit(last.from, 1) == last.to) return bidiRight(bidi[i-2]);
+      else return target;
+    }
+
+    while (target != null) {
+      if (part.level % 2 == linedir) {
+        if (target < part.from || target > part.to) {
+          part = bidi[i += dir];
+          target = part && (dir > 0 == part.level % 2 ? moveOneUnit(part.to, -1) : moveOneUnit(part.from, 1));
+        } else break;
+      } else {
+        if (target == bidiLeft(part)) {
+          part = bidi[--i];
+          target = part && bidiRight(part);
+        } else if (target == bidiRight(part)) {
+          if (part == last) return line.text.length;
+          part = bidi[++i];
+          target = part && bidiLeft(part);
+        } else break;
+      }
+    }
+
+    return target < 0 || target > line.text.length ? null : target;
+  }
+
+  CodeMirror.version = "2.33 +";
+
   return CodeMirror;
 })();

From 79fa0bdbca40d9b275e3a805e9c3d0a033169a6d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 3 Sep 2012 14:46:55 +0200
Subject: [PATCH 17/93] Remove accidentally committed conflict junk

---
 lib/codemirror.js | 84 -----------------------------------------------
 1 file changed, 84 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8c2641b5d7..eba48afca7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3143,90 +3143,6 @@ window.CodeMirror = (function() {
     for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
   })();
 
-<<<<<<< HEAD
-=======
-  function iterateBidiSections(order, from, to, f) {
-    if (!order) return f(from, to, "ltr");
-    for (var i = 0; i < order.length; ++i) {
-      var part = order[i];
-      if (part.from < to && part.to > from)
-        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
-    }
-  }
-
-  function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
-  function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
-
-  function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
-  function lineRight(line) {
-    var order = getOrder(line);
-    if (!order) return line.text.length;
-    var last = order[order.length-1];
-    return order[0].level != last.level ? line.text.length : bidiRight(last);
-  }
-  function lineStart(line) {
-    var order = getOrder(line);
-    if (!order) return 0;
-    return order[0].level % 2 ? lineRight(line) : lineLeft(line);
-  }
-  function lineEnd(line) {
-    var order = getOrder(line);
-    if (!order) return line.text.length;
-    return order[0].level % 2 ? lineLeft(line) : lineRight(line);
-  }
-
-  var isExtendingChar = /[\u0300-\u036F\u0483-\u0487\u0488-\u0489\u0591-\u05BD\u05BF\u05C1-\u05C2\u05C4-\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7-\u06E8\u06EA-\u06ED\uA66F\uA670-\uA672\uA674-\uA67D\uA69F]/;
-
-  // This is somewhat involved. It is needed in order to move
-  // 'visually' through bi-directional text -- i.e., pressing left
-  // should make the cursor go left, even when in RTL text. The
-  // tricky part is the 'jumps', where RTL and LTR text touch each
-  // other. This often requires the cursor offset to move more than
-  // one unit, in order to visually move one unit.
-  function moveVisually(line, start, dir, byUnit) {
-    var bidi = getOrder(line);
-    if (!bidi) return moveLogically(line, start, dir, byUnit);
-    var moveOneUnit = byUnit ? function(pos, dir) {
-      do pos += dir;
-      while (pos > 0 && isExtendingChar.test(line.text.charAt(pos)));
-      return pos;
-    } : function(pos, dir) { return pos + dir; };
-    var linedir = bidi[0].level, last = bidi[bidi.length-1];
-    if (linedir == last.level % 2) last = null;
-    for (var i = 0; i < bidi.length; ++i) {
-      var part = bidi[i], sticky = part.level % 2 == linedir;
-      if ((part.from < start && part.to > start) ||
-          (sticky && (part.from == start || part.to == start))) break;
-    }
-    var target = moveOneUnit(start, part.level % 2 ? -dir : dir);
-    if (i == bidi.length) {
-      if (dir > 0) return null; // Moving right from EOL
-      target = last.level % 1 ? moveOneUnit(last.from, 1) : moveOneUnit(last.to, -1);
-      if (moveOneUnit(last.from, 1) == last.to) return bidiRight(bidi[i-2]);
-      else return target;
-    }
-
-    while (target != null) {
-      if (part.level % 2 == linedir) {
-        if (target < part.from || target > part.to) {
-          part = bidi[i += dir];
-          target = part && (dir > 0 == part.level % 2 ? moveOneUnit(part.to, -1) : moveOneUnit(part.from, 1));
-        } else break;
-      } else {
-        if (target == bidiLeft(part)) {
-          part = bidi[--i];
-          target = part && bidiRight(part);
-        } else if (target == bidiRight(part)) {
-          if (part == last) return line.text.length;
-          part = bidi[++i];
-          target = part && bidiLeft(part);
-        } else break;
-      }
-    }
-
-    return target < 0 || target > line.text.length ? null : target;
-  }
-
   CodeMirror.version = "2.33 +";
 
   return CodeMirror;

From 9adaafac79e948d00eeda7f4c34cb4cb1194bed8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 4 Sep 2012 09:41:04 +0200
Subject: [PATCH 18/93] [shell mode] Fix unsafe use of object

Parsing the word constructor would look up words["constructor"], and
return Object.prototype.constructor instead of a style string.

Closes #793
---
 mode/shell/shell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/shell/shell.js b/mode/shell/shell.js
index 1ad898303e..d4eba852ba 100644
--- a/mode/shell/shell.js
+++ b/mode/shell/shell.js
@@ -60,7 +60,7 @@ CodeMirror.defineMode('shell', function(config) {
     stream.eatWhile(/\w/);
     var cur = stream.current();
     if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
-    return words[cur] || null;
+    return words.hasOwnProperty(cur) ? words[cur] : null;
   }
 
   function tokenString(quote) {

From 2189810311969f270c8e53179f6e8464c1aa63ad Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Mon, 3 Sep 2012 05:54:29 -0400
Subject: [PATCH 19/93] [markdown mode] Improvements to parsing and tester
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(Squashed commit. Below are the original commit messages:)

- Add highlighting test for Markdown for consecutive backticks.

- Make it possible to wrap inline code in multiple backticks.

- Add highlighting test for Markdown mode to only allow a single space
  to separate brackets.

- Make it possible to separate bracket groups with a space.

- Allow for horizontal rules to use dashes.

- Allow for *any* number of -'s or ='s for setex headers.

- Remove requirement that the text for setext headers have to be
  highlighted.

- Might revisit someday to work on this, but in the meantime, it's
  better to prevent regressions than to be picky about what would be
  highlighted in an ideal world.

- Correctly match single line footnotes with title.

- Match inline links in Markdown mode.

- Don't match unclosed code blocks.

- Get mode test highlighter in line with CodeMirror.highlight().

- It would be nice to use all native functions, to avoid having to update this manually each time.

- Fix tests per fixes made to mode test highlighter.

- Properly handle multiple classes for mode tests.

- More correct handling of EM and STRONG in Markdown mode.

  Per Markdown documentation: "You can use whichever style you prefer;
  the lone restriction is that the same character must be used to open
  and close an emphasis span." # This is the 15th commit message:

- Allow escaping of * and _ by surrounding with spaces.

  Per Markdown documentation:

  "But if you surround an * or _ with spaces, it’ll be treated as a
  literal asterisk or underscore."

- More correct support for inline code blocks.

- Adjust Markdown highlighting tests to fit readability, rather than
  100% conformance with Markdown documentation.

  Although unclosed italics, bold, and inline code would not be
  formatted by a Markdown parser, it is extremely helpful to have the
  styles added even when it is not yet closed. It may be a good idea
  to add an 'incomplete' flag for each at some point, in order to
  style it (and mark it) as different. Perhaps piggyback off of
  "error".
---
 mode/markdown/markdown.js | 101 ++++++++++++++++---
 mode/markdown/test.html   | 203 +++++++++++++++++++-------------------
 mode/stex/test.html       |  77 +++++----------
 test/mode_test.js         |  23 ++++-
 4 files changed, 231 insertions(+), 173 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 9eab617573..97ca1b17c4 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -2,12 +2,18 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var htmlFound = CodeMirror.mimeModes.hasOwnProperty("text/html");
   var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? "text/html" : "text/plain");
+  
+  var codeDepth = 0;
+  var prevLineHasContent = false
+  ,   thisLineHasContent = false;
 
   var header   = 'header'
   ,   code     = 'comment'
   ,   quote    = 'quote'
   ,   list     = 'string'
   ,   hr       = 'hr'
+  ,   linkinline = 'link'
+  ,   linkemail = 'link'
   ,   linktext = 'link'
   ,   linkhref = 'string'
   ,   em       = 'em'
@@ -17,8 +23,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   var hrRE = /^([*\-=_])(?:\s*\1){2,}\s*$/
   ,   ulRE = /^[*\-+]\s+/
   ,   olRE = /^[0-9]+\.\s+/
-  ,   headerRE = /^(?:\={3,}|-{3,})$/
-  ,   textRE = /^[^\[*_\\<>`]+/;
+  ,   headerRE = /^(?:\={1,}|-{1,})$/
+  ,   textRE = /^[^\[*_\\<>` ]+/;
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -34,6 +40,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   // Blocks
 
   function blankLine(state) {
+    // Reset CODE state
+    state.code = false;
     // Reset EM state
     state.em = false;
     // Reset STRONG state
@@ -55,7 +63,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return code;
     } else if (stream.eatSpace()) {
       return null;
-    } else if (stream.peek() === '#' || stream.match(headerRE)) {
+    } else if (stream.peek() === '#' || (prevLineHasContent && stream.match(headerRE)) ) {
       state.header = true;
     } else if (stream.eat('>')) {
       state.indentation++;
@@ -94,6 +102,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (state.strong) { styles.push(state.em ? emstrong : strong); }
     else if (state.em) { styles.push(em); }
     
+    if (state.code) { styles.push(code); }
+    
     if (state.header) { styles.push(header); }
     if (state.quote) { styles.push(quote); }
 
@@ -118,12 +128,39 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       stream.next();
       return getType(state);
     }
+    
     if (ch === '`') {
-      return switchInline(stream, state, inlineElement(code, '`'));
+      var t = getType(state);
+      var before = stream.pos;
+      stream.eatWhile('`');
+      var difference = 1 + stream.pos - before;
+      if (!state.code) {
+        codeDepth = difference;
+        state.code = true;
+        return getType(state);
+      } else {
+        if (difference === codeDepth) { // Must be exact
+          state.code = false;
+          return t;
+        }
+        return getType(state);
+      }
+    } else if (state.code) {
+      return getType(state);
     }
-    if (ch === '[' && stream.match(/.*\](?:\(|\[)/, false)) {
+    
+    if (ch === '[' && stream.match(/.*\] ?(?:\(|\[)/, false)) {
       return switchInline(stream, state, linkText);
     }
+    
+    if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, true)) {
+      return switchInline(stream, state, inlineElement(linkinline, '>'));
+    }
+    
+    if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, true)) {
+      return switchInline(stream, state, inlineElement(linkemail, '>'));
+    }
+    
     if (ch === '<' && stream.match(/^\w/, false)) {
       var md_inside = false;
       if (stream.string.indexOf(">")!=-1) {
@@ -143,10 +180,27 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       
     var t = getType(state);
     if (ch === '*' || ch === '_') {
-      if (stream.eat(ch)) {
-        return (state.strong = !state.strong) ? getType(state) : t;
+      if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
+        state.strong = false;
+        return t;
+      } else if (!state.strong && stream.eat(ch)) { // Add STRONG
+        state.strong = ch;
+        return getType(state);
+      } else if (state.em === ch) { // Remove EM
+        state.em = false;
+        return t;
+      } else if (!state.em) { // Add EM
+        state.em = ch;
+        return getType(state);
+      }
+    } else if (ch === ' ') {
+      if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
+        if (stream.peek() === ' ') { // Surrounded by spaces, ignore
+          return getType(state);
+        } else { // Not surrounded by spaces, back up pointer
+          stream.backUp(1);
+        }
       }
-      return (state.em = !state.em) ? getType(state) : t;
     }
     
     return getType(state);
@@ -165,7 +219,10 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function linkHref(stream, state) {
-    stream.eatSpace();
+    // Check if space, and return NULL if so (to avoid marking the space)
+    if(stream.eatSpace()){
+      return null;
+    }
     var ch = stream.next();
     if (ch === '(' || ch === '[') {
       return switchInline(stream, state, inlineElement(linkhref, ch === '(' ? ')' : ']'));
@@ -182,17 +239,22 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function footnoteUrl(stream, state) {
-    stream.eatSpace();
-    stream.match(/^[^\s]+/, true);
+    // Check if space, and return NULL if so (to avoid marking the space)
+    if(stream.eatSpace()){
+      return null;
+    }
+    stream.match(/^[^\s]+(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
     state.f = state.inline = inlineNormal;
     return linkhref;
   }
 
   function inlineRE(endChar) {
     if (!inlineRE[endChar]) {
-      // match any not-escaped-non-endChar and any escaped char
-      // then match endChar or eol
-      inlineRE[endChar] = new RegExp('^(?:[^\\\\\\' + endChar + ']|\\\\.)*(?:\\' + endChar + '|$)');
+      // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741)
+      endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+      // Match any non-endChar, escaped character, as well as the closing 
+      // endChar.
+      inlineRE[endChar] = new RegExp('^(?:[^\\\\]+?|\\\\.)*?(' + endChar + ')');
     }
     return inlineRE[endChar];
   }
@@ -244,7 +306,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     token: function(stream, state) {
       if (stream.sol()) {
-        if (stream.match(/^\s*$/, true)) { return blankLine(state); }
+        if (stream.match(/^\s*$/, true)) {
+          prevLineHasContent = false;
+          return blankLine(state);
+        } else {
+          if(thisLineHasContent){
+            prevLineHasContent = true;
+            thisLineHasContent = false;
+          }
+          thisLineHasContent = true;
+        }
 
         // Reset state.header
         state.header = false;
diff --git a/mode/markdown/test.html b/mode/markdown/test.html
index 3f4e9e0c90..a9ab9d2fc8 100644
--- a/mode/markdown/test.html
+++ b/mode/markdown/test.html
@@ -42,16 +42,36 @@ <h2>Code</h2>
         'comment', '`bar`');
         
       // Unclosed backticks
-      // This should *not* be fixed by only adding the style to closed groups. 
-      // Instead, autocomplete should be added (see issue #344).
+      // Instead of simply marking as CODE, it would be nice to have an 
+      // incomplete flag for CODE, that is styled slightly different.
       MT.test('foo `bar',
-        null, 'foo `bar');
+        null, 'foo ',
+        'comment', '`bar');
         
       // Per documentation: "To include a literal backtick character within a 
       // code span, you can use multiple backticks as the opening and closing 
       // delimiters"
       MT.test('``foo ` bar``',
         'comment', '``foo ` bar``');
+        
+      // Tests based on Dingus
+      // http://daringfireball.net/projects/markdown/dingus
+      // 
+      // Multiple backticks within an inline code block
+      MT.test('`foo```bar`',
+        'comment', '`foo```bar`');
+      // Multiple backticks within an inline code block with a second code block
+      MT.test('`foo```bar` hello `world`',
+        'comment', '`foo```bar`',
+        null, ' hello ',
+        'comment', '`world`');
+      // Unclosed with several different groups of backticks
+      MT.test('``foo ``` bar` hello',
+        'comment', '``foo ``` bar` hello');
+      // Closed with several different groups of backticks
+      MT.test('``foo ``` bar` hello`` world',
+        'comment', '``foo ``` bar` hello``',
+        null, ' world');
     </script>
     
     <h2>Headers</h2>
@@ -86,22 +106,25 @@ <h2>Headers</h2>
       // Setext headers - H1, H2
       // Per documentation, "Any number of underlining =’s or -’s will work."
       // http://daringfireball.net/projects/markdown/syntax#header
+      // Ideally, the text would be marked as `header` as well, but this is 
+      // not really feasible at the moment. So, instead, we're testing against 
+      // what works today, to avoid any regressions.
       // 
       // Check if single underlining = works
       MT.test('foo\n=',
-        'header', 'foo',
+        null, 'foo',
         'header', '=');
       // Check if 3+ ='s work
       MT.test('foo\n===',
-        'header', 'foo',
+        null, 'foo',
         'header', '===');
       // Check if single underlining - works
       MT.test('foo\n-',
-        'header', 'foo',
+        null, 'foo',
         'header', '-');
       // Check if 3+ -'s work
       MT.test('foo\n---',
-        'header', 'foo',
+        null, 'foo',
         'header', '---');
     </script>
     
@@ -193,6 +216,9 @@ <h2>Links</h2>
         null, ' ',
         'string', '[bar]',
         null, ' hello');
+      // Should only allow a single space ("...use *a* space...")
+      MT.test('[foo]  [bar] hello',
+        null, '[foo]  [bar] hello');
         
       // Reference-style links with implicit link name
       MT.test('[foo][] hello',
@@ -208,46 +234,61 @@ <h2>Links</h2>
       // No title
       MT.test('[foo]: http://example.com/',
         'link', '[foo]:',
-        'string', ' http://example.com/');
-      // Space in ID
+        null, ' ',
+        'string', 'http://example.com/');
+      // Space in ID and title
       MT.test('[foo bar]: http://example.com/ "hello"',
         'link', '[foo bar]:',
-        'string', ' http://example.com/',
-        'string', ' "hello"');
+        null, ' ',
+        'string', 'http://example.com/ "hello"');
+      // Double title
+      MT.test('[foo bar]: http://example.com/ "hello" "world"',
+        'link', '[foo bar]:',
+        null, ' ',
+        'string', 'http://example.com/ "hello"',
+        null, ' "world"');
       // Double quotes around title
       MT.test('[foo]: http://example.com/  "bar"',
         'link', '[foo]:',
-        'string', ' http://example.com/  "bar"');
+        null, ' ',
+        'string', 'http://example.com/  "bar"');
       // Single quotes around title
       MT.test('[foo]: http://example.com/  \'bar\'',
         'link', '[foo]:',
-        'string', ' http://example.com/  \'bar\'');
+        null, ' ',
+        'string', 'http://example.com/  \'bar\'');
       // Parentheses around title
       MT.test('[foo]: http://example.com/  (bar)',
         'link', '[foo]:',
-        'string', ' http://example.com/  (bar)');
+        null, ' ',
+        'string', 'http://example.com/  (bar)');
       // Invalid title
       MT.test('[foo]: http://example.com/ bar',
         'link', '[foo]:',
-        'string', ' http://example.com/',
+        null, ' ',
+        'string', 'http://example.com/',
         null, ' bar');
       // Angle brackets around URL
       MT.test('[foo]: <http://example.com/>  "bar"',
         'link', '[foo]:',
-        'string', ' <http://example.com/>  "bar"');
+        null, ' ',
+        'string', '<http://example.com/>  "bar"');
       // Title on next line per documentation
       MT.test('[foo]: http://example.com/\n"bar"',
         'link', '[foo]:',
-        'string', ' http://example.com/',
+        null, ' ',
+        'string', 'http://example.com/',
         'string', '"bar"');
         
       // Automatic links
-      MT.test('<http://example.com/>',
-        'link', '<http://example.com/>');
+      MT.test('<http://example.com/> foo',
+        'link', '<http://example.com/>',
+        null, ' foo');
         
       // Automatic email links
-      MT.test('<user@example.com>',
-        'link', '<user@example.com>');
+      MT.test('<user@example.com> foo',
+        'link', '<user@example.com>',
+        null, ' foo');
     </script>
     
     <h2>Emphasis</h2>
@@ -255,96 +296,80 @@ <h2>Emphasis</h2>
 
       // Single asterisk
       MT.test('*foo* bar',
-        'em', '*',
-        'em', 'foo',
-        'em', '*',
+        'em', '*foo*',
         null, ' bar');
 
       // Single underscore
       MT.test('_foo_ bar',
-        'em', '_',
-        'em', 'foo',
-        'em', '_',
+        'em', '_foo_',
         null, ' bar');
         
       // Emphasis characters within a word
       MT.test('foo*bar*hello',
         null, 'foo',
-        'em', '*',
-        'em', 'bar',
-        'em', '*',
+        'em', '*bar*',
         null, 'hello');
       MT.test('foo_bar_hello',
         null, 'foo',
-        'em', '_',
-        'em', 'bar',
-        'em', '_',
+        'em', '_bar_',
         null, 'hello');
       // Per documentation: "...surround an * or _ with spaces, it’ll be 
       // treated as a literal asterisk or underscore."
+      // 
+      // Inside EM
       MT.test('foo _bar _ hello_ world',
-        null, 'foo',
-        'em', '_',
-        'em', 'bar _ hello',
-        'em', '_',
+        null, 'foo ',
+        'em', '_bar _ hello_',
+        null, ' world');
+      // Outside EM
+      MT.test('foo _ bar_hello_world',
+        null, 'foo _ bar',
+        'em', '_hello_',
         null, 'world');
         
       // Unclosed emphasis characters
-      // This should *not* be fixed by only adding the style to closed groups. 
-      // Instead, autocomplete should be added (see issue #344).
+      // Instead of simply marking as EM / STRONG, it would be nice to have an 
+      // incomplete flag for EM and STRONG, that is styled slightly different.
       MT.test('foo *bar',
-        null, 'foo *bar');
+        null, 'foo ',
+        'em', '*bar');
       MT.test('foo _bar',
-        null, 'foo _bar');
+        null, 'foo ',
+        'em', '_bar');
 
       // Double asterisk
       MT.test('**foo** bar',
-        'strong', '**',
-        'strong', 'foo',
-        'strong', '**',
+        'strong', '**foo**',
         null, ' bar');
 
       // Double underscore
       MT.test('__foo__ bar',
-        'strong', '__',
-        'strong', 'foo',
-        'strong', '__',
+        'strong', '__foo__',
         null, ' bar');
 
       // Triple asterisk
       MT.test('*foo**bar*hello** world',
-        'em', '*',
-        'em', 'foo',
-        'emstrong', '**',
-        'emstrong', 'bar',
-        'emstrong', '*',
-        'strong', 'hello',
-        'strong', '**',
+        'em', '*foo',
+        'emstrong', '**bar*',
+        'strong', 'hello**',
         null, ' world');
 
       // Triple underscore
       MT.test('_foo__bar_hello__ world',
-        'em', '_',
-        'em', 'foo',
-        'emstrong', '__',
-        'emstrong', 'bar',
-        'emstrong', '_',
-        'strong', 'hello',
-        'strong', '__',
+        'em', '_foo',
+        'emstrong', '__bar_',
+        'strong', 'hello__',
         null, ' world');
 
       // Triple mixed
       // "...same character must be used to open and close an emphasis span.""
       MT.test('_foo**bar*hello__ world',
-        'em', '_',
-        'em', 'foo**bar*hello',
-        'em', '_',
-        null, '_ world');
+        'em', '_foo',
+        'emstrong', '**bar*hello__ world');
+        
       MT.test('*foo__bar_hello** world',
-        'em', '*',
-        'em', 'foo__bar_hello',
-        'em', '*',
-        null, '* world');
+        'em', '*foo',
+        'emstrong', '__bar_hello** world');
     </script>
     
     <h2>Escaping</h2>
@@ -366,47 +391,27 @@ <h2>Escaping</h2>
       // 
       // Backtick (code)
       MT.test('foo \\`bar\\`',
-        null, 'foo ',
-        null, '\\`',
-        null, 'bar',
-        null, '\\`');
+        null, 'foo \\`bar\\`');
       MT.test('foo \\\\`bar\\\\`',
-        null, 'foo ',
-        null, '\\\\',
+        null, 'foo \\\\',
         'comment', '`bar\\\\`');
       // Asterisk (em)
       MT.test('foo \\*bar\\*',
-        null, 'foo ',
-        null, '\\*',
-        null, 'bar',
-        null, '\\*');
+        null, 'foo \\*bar\\*');
       MT.test('foo \\\\*bar\\\\*',
-        null, 'foo ',
-        null, '\\\\',
-        'em', '*',
-        'em', 'bar',
-        'em', '\\\\',
-        'em', '*');
+        null, 'foo \\\\',
+        'em', '*bar\\\\*');
       // Underscore (em)
       MT.test('foo \\_bar\\_',
-        null, 'foo ',
-        null, '\\_',
-        null, 'bar',
-        null, '\\_');
+        null, 'foo \\_bar\\_');
       MT.test('foo \\\\_bar\\\\_',
-        null, 'foo ',
-        null, '\\\\',
-        'em', '_',
-        'em', 'bar',
-        'em', '\\\\',
-        'em', '_');
+        null, 'foo \\\\',
+        'em', '_bar\\\\_');
       // Hash mark (headers)
       MT.test('\\# foo',
-        null, '\\#',
-        null, ' foo');
+        null, '\\# foo');
       MT.test('\\\\# foo',
-        null, '\\\\',
-        null, '# foo');
+        null, '\\\\# foo');
     </script>
 
     <h2>Summary</h2>
diff --git a/mode/stex/test.html b/mode/stex/test.html
index 599e592dde..c63b3cbc31 100644
--- a/mode/stex/test.html
+++ b/mode/stex/test.html
@@ -20,8 +20,7 @@ <h2>Basics</h2>
         null, 'foo');
 
       MT.test('foo bar',
-        null, 'foo',
-        null, ' bar');
+        null, 'foo bar');
     </script>
 
     <h2>Tags</h2>
@@ -41,11 +40,7 @@ <h2>Tags</h2>
         'bracket', '{',
         'atom',    'equation',
         'bracket', '}',
-        null,      ' ',
-        null,      ' ',
-        null,      'E',
-        null,      '=mc',
-        null,      '^2',
+        null,      '  E=mc^2',
         'tag',     '\\end',
         'bracket', '{',
         'atom',    'equation',
@@ -55,26 +50,21 @@ <h2>Tags</h2>
         'tag',     '\\begin',
         'bracket', '{',
         'atom',    'module',
-        'bracket', '}',
-        'bracket', '[',
-        'bracket', ']');
+        'bracket', '}[]');
 
       MT.test('\\begin{module}[id=bbt-size]',
         'tag',     '\\begin',
         'bracket', '{',
         'atom',    'module',
-        'bracket', '}',
-        'bracket', '[',
-        null,      'id',
-        null,      '=bbt-size',
+        'bracket', '}[',
+        null,      'id=bbt-size',
         'bracket', ']');
 
       MT.test('\\importmodule[b-b-t]{b-b-t}',
         'tag',     '\\importmodule',
         'bracket', '[',
         'string',   'b-b-t',
-        'bracket', ']',
-        'bracket', '{',
+        'bracket', ']{',
         'builtin', 'b-b-t',
         'bracket', '}');
 
@@ -83,12 +73,8 @@ <h2>Tags</h2>
         'bracket', '[',
         'tag',     '\\KWARCslides',
         'bracket', '{',
-        'string',   'dmath',
-        'string',   '/en',
-        'string',   '/cardinality',
-        'bracket', '}',
-        'bracket', ']',
-        'bracket', '{',
+        'string',   'dmath/en/cardinality',
+        'bracket', '}]{',
         'builtin', 'card',
         'bracket', '}');
 
@@ -96,8 +82,7 @@ <h2>Tags</h2>
         'tag',     '\\PSforPDF',
         'bracket', '[',
         'atom',    '1',
-        'bracket', ']',
-        'bracket', '{',
+        'bracket', ']{',
         null,      '#1',
         'bracket', '}');
     </script>
@@ -105,18 +90,15 @@ <h2>Tags</h2>
     <h2>Comments</h2>
     <script language="javascript">
       MT.test('% foo',
-        'comment', '%',
-        'comment', ' foo');
+        'comment', '% foo');
 
       MT.test('\\item% bar',
         'tag',     '\\item',
-        'comment', '%',
-        'comment', ' bar');
+        'comment', '% bar');
 
       MT.test(' % \\item',
         null,      ' ',
-        'comment', '%',
-        'comment', ' \\item');
+        'comment', '% \\item');
 
       MT.test('%\nfoo',
         'comment', '%',
@@ -136,21 +118,18 @@ <h2>Errors</h2>
         'bracket', '{');
 
       MT.test('% }',
-        'comment', '%',
-        'comment', ' }');
+        'comment', '% }');
     </script>
 
     <h2>Character Escapes</h2>
     <script language="javascript">
       MT.test('the \\# key',
-        null,  'the',
-        null,  ' ',
+        null,  'the ',
         'tag', '\\#',
         null,  ' key');
 
       MT.test('a \\$5 stetson',
-        null, 'a',
-        null, ' ',
+        null, 'a ',
         'tag', '\\$',
         'atom', 5,
         null, ' stetson');
@@ -161,8 +140,7 @@ <h2>Character Escapes</h2>
         null, ' beef');
 
       MT.test('L \\& N',
-        null, 'L',
-        null, ' ',
+        null, 'L ',
         'tag', '\\&',
         null, ' N');
 
@@ -184,14 +162,12 @@ <h2>Character Escapes</h2>
         'bracket','}');
 
       MT.test('section \\S1',
-        null,  'section',
-        null,  ' ',
+        null,  'section ',
         'tag', '\\S',
         'atom',  '1');
 
       MT.test('para \\P2',
-        null,  'para',
-        null,  ' ',
+        null,  'para ',
         'tag', '\\P',
         'atom',  '2');
 
@@ -216,29 +192,20 @@ <h2>Spacing control</h2>
         null,  'y');
 
       MT.test('J.\\ L.\\ is', // period not ending a sentence
-        null, 'J',
-        null, '.',
-        null, '\\',
-        null, ' L',
-        null, '.',
-        null, '\\',
-        null, ' is'); // maybe could be better
+        null, 'J.\\ L.\\ is'); // maybe could be better
 
       MT.test('X\\@. The', // period ending a sentence
         null,  'X',
         'tag', '\\@',
-        null,  '.',
-        null,  ' The');
+        null,  '. The');
 
       MT.test('{\\em If\\/} I', // italic correction
         'bracket', '{',
         'tag',     '\\em',
-        null,      ' ',
-        null,      'If',
+        null,      ' If',
         'tag',     '\\/',
         'bracket', '}',
-        null,      ' ',
-        null,      'I');
+        null,      ' I');
 
     </script>
 
diff --git a/test/mode_test.js b/test/mode_test.js
index d77ac143f8..1479bd9280 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -85,11 +85,26 @@ ModeTest.highlight = function(string, mode) {
     var line = lines[i];
     var stream = new CodeMirror.StringStream(line);
     if (line == "" && mode.blankLine) mode.blankLine(state);
+    var pos = 0;
+    var st = [];
+    /* Start copied code from CodeMirror.highlight */
     while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      var substr = line.slice(stream.start, stream.pos);
-      output.push([style, substr]);
+      var style = mode.token(stream, state), substr = stream.current();
       stream.start = stream.pos;
+      if (pos && st[pos-1] == style) {
+        st[pos-2] += substr;
+      } else if (substr) {
+        st[pos++] = substr; st[pos++] = style;
+      }
+      // Give up when line is ridiculously long
+      if (stream.pos > 5000) {
+        st[pos++] = this.text.slice(stream.pos); st[pos++] = null;
+        break;
+      }
+    }
+    /* End copied code from CodeMirror.highlight */
+    for (var x = 0; x < st.length; x += 2) {
+      output.push([st[x + 1], st[x]]);
     }
   }
 
@@ -131,7 +146,7 @@ ModeTest.prettyPrintOutputTable = function(output) {
     var token = output[i];
     s +=
       '<td class="mt-token">' +
-        '<span class="cm-' + token[0] + '">' +
+        '<span class="cm-' + String(token[0]).replace(/ +/g, " cm-") + '">' +
           ModeTest.htmlEscape(token[1]).replace(/ /g,'&middot;') +
         '</span>' +
       '</td>';

From 367cfc6c8b5e184c667e6d2d83f6e29fcdac0761 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Tue, 4 Sep 2012 11:50:57 -0400
Subject: [PATCH 20/93] [markdown mode] More improvements to parsing and
 tester.

Markdown mode

- Add additional link tests and correctly match link titles on next
  line.

- Adjust tests code so sections (including "Basics") can be rearranged
  and removed easily without breaking the script.

- Add tests and fix highlighting for lists.

Test harness

- Sort styles in mode test script so "quote string" = "string quote".
---
 mode/markdown/markdown.js |  53 ++++++++-
 mode/markdown/test.html   | 231 +++++++++++++++++++++++++++++++++++++-
 test/mode_test.js         |   2 +
 3 files changed, 276 insertions(+), 10 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 97ca1b17c4..e8b0e0d02f 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -24,7 +24,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   ulRE = /^[*\-+]\s+/
   ,   olRE = /^[0-9]+\.\s+/
   ,   headerRE = /^(?:\={1,}|-{1,})$/
-  ,   textRE = /^[^\[*_\\<>` ]+/;
+  ,   textRE = /^[^\[*_\\<>` "'(]+/;
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -40,6 +40,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   // Blocks
 
   function blankLine(state) {
+    // Reset linkTitle state
+    state.linkTitle = false;
     // Reset CODE state
     state.code = false;
     // Reset EM state
@@ -57,8 +59,18 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function blockNormal(stream, state) {
     var match;
+    
+    if (state.list !== false && state.indentationDiff >= 0) { // Continued list
+      if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
+        state.indentation -= state.indentationDiff;
+      }
+      state.list = null;
+    } else { // No longer a list
+      state.list = false;
+    }
+    
     if (state.indentationDiff >= 4) {
-      state.indentation -= state.indentationDiff;
+      state.indentation -= 4;
       stream.skipToEnd();
       return code;
     } else if (stream.eatSpace()) {
@@ -73,8 +85,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     } else if (stream.match(hrRE, true)) {
       return hr;
     } else if (match = stream.match(ulRE, true) || stream.match(olRE, true)) {
-      state.indentation += match[0].length;
-      return list;
+      state.indentation += 4;
+      state.list = true;
     }
     
     return switchInline(stream, state, state.inline);
@@ -106,6 +118,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     
     if (state.header) { styles.push(header); }
     if (state.quote) { styles.push(quote); }
+    if (state.list !== false) { styles.push(list); }
 
     return styles.length ? styles.join(' ') : null;
   }
@@ -122,6 +135,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (typeof style !== 'undefined')
       return style;
     
+    if (state.list) { // List marker (*, +, -, 1., etc)
+      state.list = null;
+      return list;
+    }
+    
     var ch = stream.next();
     
     if (ch === '\\') {
@@ -129,6 +147,20 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     }
     
+    // Matches link titles present on next line
+    if (state.linkTitle) {
+      state.linkTitle = false;
+      var matchCh = ch;
+      if (ch === '(') {
+        matchCh = ')';
+      }
+      matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+      var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
+      if (stream.match(new RegExp(regex), true)) {
+        return linkhref;
+      }
+    }
+    
     if (ch === '`') {
       var t = getType(state);
       var before = stream.pos;
@@ -243,7 +275,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if(stream.eatSpace()){
       return null;
     }
-    stream.match(/^[^\s]+(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
+    // Match URL
+    stream.match(/^[^\s]+/, true);
+    // Check for link title
+    if (stream.peek() === undefined) { // End of line, set flag to check next line
+      state.linkTitle = true;
+    } else { // More content on line, check if link title
+      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
+    }
     state.f = state.inline = inlineNormal;
     return linkhref;
   }
@@ -279,9 +318,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         
         inline: inlineNormal,
         text: handleText,
+        linkTitle: false,
         em: false,
         strong: false,
         header: false,
+        list: false,
         quote: false
       };
     },
@@ -296,9 +337,11 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
           
         inline: s.inline,
         text: s.text,
+        linkTitle: s.linkTitle,
         em: s.em,
         strong: s.strong,
         header: s.header,
+        list: s.list,
         quote: s.quote,
         md_inside: s.md_inside
       };
diff --git a/mode/markdown/test.html b/mode/markdown/test.html
index a9ab9d2fc8..192fd83042 100644
--- a/mode/markdown/test.html
+++ b/mode/markdown/test.html
@@ -14,11 +14,14 @@
   </head>
   <body>
     <h1>Tests for the Markdown Mode</h1>
-    <h2>Basics</h2>
     <script language="javascript">
+      // Initiate ModeTest and set defaults
       MT = ModeTest;
       MT.modeName = 'markdown';
-
+    </script>
+    
+    <h2>Basics</h2>
+    <script language="javascript">
       MT.test('foo',
         null, 'foo');
     </script>
@@ -167,6 +170,203 @@ <h2>Blockquotes</h2>
         null,    'hello');
     </script>
     
+    <h2>Lists</h2>
+    <script language="javascript">
+
+      // Check list types
+      MT.test('* foo\n* bar',
+        'string', '* foo',
+        'string', '* bar');
+      MT.test('+ foo\n+ bar',
+        'string', '+ foo',
+        'string', '+ bar');
+      MT.test('- foo\n- bar',
+        'string', '- foo',
+        'string', '- bar');
+      MT.test('1. foo\n2. bar',
+        'string', '1. foo',
+        'string', '2. bar');
+        
+      // Formatting in lists (*)
+      MT.test('* *foo* bar\n\n* **foo** bar\n\n* ***foo*** bar\n\n* `foo` bar',
+        'string', '* ',
+        'string em', '*foo*',
+        'string', ' bar',
+        'string', '* ',
+        'string strong', '**foo**',
+        'string', ' bar',
+        'string', '* ',
+        'string strong', '**',
+        'string emstrong', '*foo**',
+        'string em', '*',
+        'string', ' bar',
+        'string', '* ',
+        'string comment', '`foo`',
+        'string', ' bar');
+      // Formatting in lists (+)
+      MT.test('+ *foo* bar\n\n+ **foo** bar\n\n+ ***foo*** bar\n\n+ `foo` bar',
+        'string', '+ ',
+        'string em', '*foo*',
+        'string', ' bar',
+        'string', '+ ',
+        'string strong', '**foo**',
+        'string', ' bar',
+        'string', '+ ',
+        'string strong', '**',
+        'string emstrong', '*foo**',
+        'string em', '*',
+        'string', ' bar',
+        'string', '+ ',
+        'string comment', '`foo`',
+        'string', ' bar');
+      // Formatting in lists (-)
+      MT.test('- *foo* bar\n\n- **foo** bar\n\n- ***foo*** bar\n\n- `foo` bar',
+        'string', '- ',
+        'string em', '*foo*',
+        'string', ' bar',
+        'string', '- ',
+        'string strong', '**foo**',
+        'string', ' bar',
+        'string', '- ',
+        'string strong', '**',
+        'string emstrong', '*foo**',
+        'string em', '*',
+        'string', ' bar',
+        'string', '- ',
+        'string comment', '`foo`',
+        'string', ' bar');
+      // Formatting in lists (1.)
+      MT.test('1. *foo* bar\n\n2. **foo** bar\n\n3. ***foo*** bar\n\n4. `foo` bar',
+        'string', '1. ',
+        'string em', '*foo*',
+        'string', ' bar',
+        'string', '2. ',
+        'string strong', '**foo**',
+        'string', ' bar',
+        'string', '3. ',
+        'string strong', '**',
+        'string emstrong', '*foo**',
+        'string em', '*',
+        'string', ' bar',
+        'string', '4. ',
+        'string comment', '`foo`',
+        'string', ' bar');
+        
+      // Paragraph lists
+      MT.test('* foo\n\n* bar',
+        'string', '* foo',
+        'string', '* bar');
+        
+      // Multi-paragraph lists
+      //
+      // 4 spaces
+      MT.test('* foo\n\n* bar\n\n    hello',
+        'string', '* foo',
+        'string', '* bar',
+        null, '    ',
+        'string', 'hello');
+      // 4 spaces, extra blank lines (should still be list, per Dingus)
+      MT.test('* foo\n\n* bar\n\n\n    hello',
+        'string', '* foo',
+        'string', '* bar',
+        null, '    ',
+        'string', 'hello');
+      // 4 spaces, plus 1 space (should still be list, per Dingus)
+      MT.test('* foo\n\n* bar\n\n     hello\n\n    world',
+        'string', '* foo',
+        'string', '* bar',
+        null, '     ',
+        'string', 'hello',
+        null, '    ',
+        'string', 'world');
+      // 1 tab
+      MT.test('* foo\n\n* bar\n\n\thello',
+        'string', '* foo',
+        'string', '* bar',
+        null, '\t',
+        'string', 'hello');
+      // No indent
+      MT.test('* foo\n\n* bar\n\nhello',
+        'string', '* foo',
+        'string', '* bar',
+        null, 'hello');
+      // Blockquote
+      MT.test('* foo\n\n* bar\n\n    > hello',
+        'string', '* foo',
+        'string', '* bar',
+        null, '    ',
+        'string quote', '> hello');
+      // Code block
+      MT.test('* foo\n\n* bar\n\n        > hello\n\n    world',
+        'string', '* foo',
+        'string', '* bar',
+        null, '        ',
+        'comment', '> hello',
+        null, '    ',
+        'string', 'world');
+      // Code block followed by text
+      MT.test('* foo\n\n    bar\n\n        hello\n\n    world',
+        'string', '* foo',
+        null, '    ',
+        'string', 'bar',
+        null, '        ',
+        'comment', 'hello',
+        null, '    ',
+        'string', 'world');
+        
+      // Nested list
+      // 
+      // *
+      MT.test('* foo\n\n    * bar',
+        'string', '* foo',
+        null, '    ',
+        'string', '* bar');
+      // +
+      MT.test('+ foo\n\n    + bar',
+        'string', '+ foo',
+        null, '    ',
+        'string', '+ bar');
+      // -
+      MT.test('- foo\n\n    - bar',
+        'string', '- foo',
+        null, '    ',
+        'string', '- bar');
+      // 1.
+      MT.test('1. foo\n\n    2. bar',
+        'string', '1. foo',
+        null, '    ',
+        'string', '2. bar');
+      // Mixed
+      MT.test('* foo\n\n    + bar\n\n        - hello\n\n            1. world',
+        'string', '* foo',
+        null, '    ',
+        'string', '+ bar',
+        null, '        ',
+        'string', '- hello',
+        null, '            ',
+        'string', '1. world');
+      // Blockquote
+      MT.test('* foo\n\n    + bar\n\n        > hello',
+        'string', '* foo',
+        null, '    ',
+        'string', '+ bar',
+        null, '        ',
+        'quote string', '> hello');
+      // Code
+      MT.test('* foo\n\n    + bar\n\n            hello',
+        'string', '* foo',
+        null, '    ',
+        'string', '+ bar',
+        null, '            ',
+        'comment', 'hello');
+      // Code followed by text
+      MT.test('* foo\n\n        bar\n\nhello',
+        'string', '* foo',
+        null, '        ',
+        'comment', 'bar',
+        null, 'hello');
+    </script>
+    
     <h2>Horizontal rules</h2>
     <script language="javascript">
 
@@ -273,12 +473,33 @@ <h2>Links</h2>
         'link', '[foo]:',
         null, ' ',
         'string', '<http://example.com/>  "bar"');
-      // Title on next line per documentation
-      MT.test('[foo]: http://example.com/\n"bar"',
+      // Title on next line per documentation (double quotes)
+      MT.test('[foo]: http://example.com/\n"bar" hello',
+        'link', '[foo]:',
+        null, ' ',
+        'string', 'http://example.com/',
+        'string', '"bar"',
+        null, ' hello');
+      // Title on next line per documentation (single quotes)
+      MT.test('[foo]: http://example.com/\n\'bar\' hello',
+        'link', '[foo]:',
+        null, ' ',
+        'string', 'http://example.com/',
+        'string', '\'bar\'',
+        null, ' hello');
+      // Title on next line per documentation (parentheses)
+      MT.test('[foo]: http://example.com/\n(bar) hello',
+        'link', '[foo]:',
+        null, ' ',
+        'string', 'http://example.com/',
+        'string', '(bar)',
+        null, ' hello');
+      // Title on next line per documentation (mixed)
+      MT.test('[foo]: http://example.com/\n(bar" hello',
         'link', '[foo]:',
         null, ' ',
         'string', 'http://example.com/',
-        'string', '"bar"');
+        null, '(bar" hello');
         
       // Automatic links
       MT.test('<http://example.com/> foo',
diff --git a/test/mode_test.js b/test/mode_test.js
index 1479bd9280..0bda5a2e78 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -37,6 +37,7 @@ ModeTest.test = function() {
   var text = arguments[0];
   var expectedOutput = [];
   for (var i = 1; i < arguments.length; i += 2) {
+    arguments[i] = (arguments[i] != null ? arguments[i].split(' ').sort().join(' ') : arguments[i]);
     expectedOutput.push([arguments[i],arguments[i + 1]]);
   }
 
@@ -104,6 +105,7 @@ ModeTest.highlight = function(string, mode) {
     }
     /* End copied code from CodeMirror.highlight */
     for (var x = 0; x < st.length; x += 2) {
+      st[x + 1] = (st[x + 1] != null ? st[x + 1].split(' ').sort().join(' ') : st[x + 1]);
       output.push([st[x + 1], st[x]]);
     }
   }

From 82920f7fb646026fc917474fd8edc27843c31eca Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Wed, 5 Sep 2012 00:08:25 -0400
Subject: [PATCH 21/93] Prevent logo from causing a horizontal scrollbar at
 smaller viewport widths.

This was especially noticeable with non-default font-sizes. The wrapper div and additional pre are required due to using the font-size provided by the browser (using em throughout).
---
 doc/compress.html     |  7 +++++--
 doc/docs.css          | 21 ++++++++++++++++-----
 doc/internals.html    |  7 +++++--
 doc/manual.html       |  7 +++++--
 doc/oldrelease.html   |  9 ++++++---
 doc/reporting.html    |  7 +++++--
 doc/upgrade_v2.2.html |  9 ++++++---
 index.html            |  7 +++++--
 8 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 3e4abc1479..a651072c5d 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -10,10 +10,13 @@
 
 <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
 
-<pre class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>/* Script compression
+<div class="grey">
+<img src="baboon.png" class="logo" alt="logo"/>
+<pre>
+/* Script compression
    helper */
 </pre>
+</div>
 
     <p>To optimize loading CodeMirror, especially when including a
     bunch of different modes, it is recommended that you combine and
diff --git a/doc/docs.css b/doc/docs.css
index 9ea1866919..f48e3b72a6 100644
--- a/doc/docs.css
+++ b/doc/docs.css
@@ -39,17 +39,28 @@ pre.code {
 }
 
 .grey {
-  font-size: 2.2em;
-  padding: .5em 1em;
-  line-height: 1.2em;
-  margin-top: .5em;
+  background-color: #eee;
+  border-radius: 6px;
+  margin-bottom: 1.65em;
+  margin-top: 0.825em;
+  padding: 0.825em 1.65em;
   position: relative;
 }
 
 img.logo {
   position: absolute;
-  right: -25px;
+  right: -1em;
   bottom: 4px;
+  max-width: 23.6875em; /* Scale image down with text to prevent clipping */
+}
+
+.grey > pre {
+  background:none;
+  border-radius:0;
+  padding:0;
+  margin:0;
+  font-size:2.2em;
+  line-height:1.2em;
 }
 
 a:link, a:visited, .quasilink {
diff --git a/doc/internals.html b/doc/internals.html
index fd5886e5dc..d859419864 100644
--- a/doc/internals.html
+++ b/doc/internals.html
@@ -11,10 +11,13 @@
 
 <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
 
-<pre class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>/* (Re-) Implementing A Syntax-
+<div class="grey">
+<img src="baboon.png" class="logo" alt="logo"/>
+<pre>
+/* (Re-) Implementing A Syntax-
    Highlighting Editor in JavaScript */
 </pre>
+</div>
 
 <div class="clear"><div class="leftbig blk">
 
diff --git a/doc/manual.html b/doc/manual.html
index 05ef22030e..2d1a136175 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -11,10 +11,13 @@
 
 <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
 
-<pre class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>/* User manual and
+<div class="grey">
+<img src="baboon.png" class="logo" alt="logo"/>
+<pre>
+/* User manual and
    reference guide */
 </pre>
+</div>
 
 <div class="clear"><div class="leftbig blk">
 
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index e873d7a7b1..db38f52275 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -11,10 +11,13 @@
 
 <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
 
-<pre class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>/* Old release history */
-
+<div class="grey">
+<img src="baboon.png" class="logo" alt="logo"/>
+<pre>
+/* Old release
+   history */
 </pre>
+</div>
 
   <p class="rel">27-10-2011: <a href="http://codemirror.net/codemirror-2.16.zip">Version 2.16</a>:</p>
   <ul class="rel-note">
diff --git a/doc/reporting.html b/doc/reporting.html
index 221e2629fb..a616512530 100644
--- a/doc/reporting.html
+++ b/doc/reporting.html
@@ -11,10 +11,13 @@
 
 <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
 
-<pre class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>/* Reporting bugs
+<div class="grey">
+<img src="baboon.png" class="logo" alt="logo"/>
+<pre>
+/* Reporting bugs
    effectively */
 </pre>
+</div>
 
 <div class="left">
 
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
index 7210355196..7e4d840043 100644
--- a/doc/upgrade_v2.2.html
+++ b/doc/upgrade_v2.2.html
@@ -10,10 +10,13 @@
 
 <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
 
-<pre class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>/* Upgrading to v2.2
- */
+<div class="grey">
+<img src="baboon.png" class="logo" alt="logo"/>
+<pre>
+/* Upgrading to
+   v2.2 */
 </pre>
+</div>
 
 <div class="left">
 
diff --git a/index.html b/index.html
index 6d074dd334..5a5a39c5e2 100644
--- a/index.html
+++ b/index.html
@@ -11,10 +11,13 @@
 
 <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
 
-<pre class="grey">
-<img src="doc/baboon.png" class="logo" alt="logo"/>/* In-browser code editing
+<div class="grey">
+<img src="doc/baboon.png" class="logo" alt="logo"/>
+<pre>
+/* In-browser code editing
    made bearable */
 </pre>
+</div>
 
 <div class="clear"><div class="left blk">
 

From 38d0cb8cde4abdaa06816d75a5a00b12a916b1e6 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Thu, 6 Sep 2012 14:03:21 -0400
Subject: [PATCH 22/93] Fully integrate mode tests into main test harness, with
 extra features.

- Integrated stex and Markdown mode tests into main test harness

- Added ability to restart tests partway through

- Added verbose option, to add message to output for *every* test

- Added ability to show verbose messages and run specific tests or all tests for 1+ mode(s) via location.hash

- Added support for custom messages (either return value [pass] or throw value [fail])

- Switched away from .innerHTML, .write(), etc in most places

- Make the progress bar actually 0px wide when 0% complete (and still keep padding)

- Added link to tests from each mode's demo page
---
 mode/markdown/index.html |    2 +
 mode/markdown/test.html  |  645 -----------------------
 mode/markdown/test.js    | 1084 ++++++++++++++++++++++++++++++++++++++
 mode/stex/index.html     |    2 +
 mode/stex/test.html      |  231 --------
 mode/stex/test.js        |  343 ++++++++++++
 test/driver.js           |   79 ++-
 test/index.html          |  131 ++++-
 test/mode_test.css       |   12 -
 test/mode_test.js        |   70 ++-
 test/phantom_driver.js   |    8 +-
 test/test.js             |    4 +-
 12 files changed, 1666 insertions(+), 945 deletions(-)
 delete mode 100644 mode/markdown/test.html
 create mode 100644 mode/markdown/test.js
 delete mode 100644 mode/stex/test.html
 create mode 100644 mode/stex/test.js

diff --git a/mode/markdown/index.html b/mode/markdown/index.html
index 59e79f6fd0..92d5f1fb08 100644
--- a/mode/markdown/index.html
+++ b/mode/markdown/index.html
@@ -337,5 +337,7 @@ <h1>CodeMirror: Markdown mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-markdown</code>.</p>
 
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#markdown_*">normal</a>,  <a href="../../test/index.html#verbose,markdown_*">verbose</a>.</p>
+
   </body>
 </html>
diff --git a/mode/markdown/test.html b/mode/markdown/test.html
deleted file mode 100644
index 192fd83042..0000000000
--- a/mode/markdown/test.html
+++ /dev/null
@@ -1,645 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Markdown mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="../xml/xml.js"></script>
-    <script src="markdown.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
-    <link rel="stylesheet" href="../../test/mode_test.css">
-    <script src="../../test/mode_test.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>Tests for the Markdown Mode</h1>
-    <script language="javascript">
-      // Initiate ModeTest and set defaults
-      MT = ModeTest;
-      MT.modeName = 'markdown';
-    </script>
-    
-    <h2>Basics</h2>
-    <script language="javascript">
-      MT.test('foo',
-        null, 'foo');
-    </script>
-    
-    <h2>Code</h2>
-    <script language="javascript">
-
-      // Code blocks using 4 spaces (regardless of CodeMirror.tabSize value)
-      MT.test('    foo',
-        null,      '    ',
-        'comment', 'foo');
-        
-      // Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
-      MT.test('\tfoo',
-        null,      '\t',
-        'comment', 'foo');
-
-      // Inline code using backticks
-      MT.test('foo `bar`',
-        null,      'foo ',
-        'comment', '`bar`');
-        
-      // Unclosed backticks
-      // Instead of simply marking as CODE, it would be nice to have an 
-      // incomplete flag for CODE, that is styled slightly different.
-      MT.test('foo `bar',
-        null, 'foo ',
-        'comment', '`bar');
-        
-      // Per documentation: "To include a literal backtick character within a 
-      // code span, you can use multiple backticks as the opening and closing 
-      // delimiters"
-      MT.test('``foo ` bar``',
-        'comment', '``foo ` bar``');
-        
-      // Tests based on Dingus
-      // http://daringfireball.net/projects/markdown/dingus
-      // 
-      // Multiple backticks within an inline code block
-      MT.test('`foo```bar`',
-        'comment', '`foo```bar`');
-      // Multiple backticks within an inline code block with a second code block
-      MT.test('`foo```bar` hello `world`',
-        'comment', '`foo```bar`',
-        null, ' hello ',
-        'comment', '`world`');
-      // Unclosed with several different groups of backticks
-      MT.test('``foo ``` bar` hello',
-        'comment', '``foo ``` bar` hello');
-      // Closed with several different groups of backticks
-      MT.test('``foo ``` bar` hello`` world',
-        'comment', '``foo ``` bar` hello``',
-        null, ' world');
-    </script>
-    
-    <h2>Headers</h2>
-    <script language="javascript">
-
-      // atx headers
-      // http://daringfireball.net/projects/markdown/syntax#header
-      // 
-      // H1
-      MT.test('# foo',
-        'header', '# foo');
-      // H2
-      MT.test('## foo',
-        'header', '## foo');
-      // H3
-      MT.test('### foo',
-        'header', '### foo');
-      // H4
-      MT.test('#### foo',
-        'header', '#### foo');
-      // H5
-      MT.test('##### foo',
-        'header', '##### foo');
-      // H6
-      MT.test('###### foo',
-        'header', '###### foo');
-      // H6 - 7x '#' should still be H6, per Dingus
-      // http://daringfireball.net/projects/markdown/dingus
-      MT.test('####### foo',
-        'header', '####### foo');
-        
-      // Setext headers - H1, H2
-      // Per documentation, "Any number of underlining =’s or -’s will work."
-      // http://daringfireball.net/projects/markdown/syntax#header
-      // Ideally, the text would be marked as `header` as well, but this is 
-      // not really feasible at the moment. So, instead, we're testing against 
-      // what works today, to avoid any regressions.
-      // 
-      // Check if single underlining = works
-      MT.test('foo\n=',
-        null, 'foo',
-        'header', '=');
-      // Check if 3+ ='s work
-      MT.test('foo\n===',
-        null, 'foo',
-        'header', '===');
-      // Check if single underlining - works
-      MT.test('foo\n-',
-        null, 'foo',
-        'header', '-');
-      // Check if 3+ -'s work
-      MT.test('foo\n---',
-        null, 'foo',
-        'header', '---');
-    </script>
-    
-    <h2>Blockquotes</h2>
-    <script language="javascript">
-
-      // Single-line blockquote with trailing space
-      MT.test('> foo',
-        'quote', '> foo');
-
-      // Single-line blockquote
-      MT.test('>foo',
-        'quote', '>foo');
-
-      // Single-line blockquote followed by normal paragraph
-      MT.test('>foo\n\nbar',
-        'quote', '>foo',
-        null,    'bar');
-
-      // Multi-line blockquote (lazy mode)
-      MT.test('>foo\nbar',
-        'quote', '>foo',
-        'quote', 'bar');
-
-      // Multi-line blockquote followed by normal paragraph (lazy mode)
-      MT.test('>foo\nbar\n\nhello',
-        'quote', '>foo',
-        'quote', 'bar',
-        null,    'hello');
-
-      // Multi-line blockquote (non-lazy mode)
-      MT.test('>foo\n>bar',
-        'quote', '>foo',
-        'quote', '>bar');
-
-      // Multi-line blockquote followed by normal paragraph (non-lazy mode)
-      MT.test('>foo\n>bar\n\nhello',
-        'quote', '>foo',
-        'quote', '>bar',
-        null,    'hello');
-    </script>
-    
-    <h2>Lists</h2>
-    <script language="javascript">
-
-      // Check list types
-      MT.test('* foo\n* bar',
-        'string', '* foo',
-        'string', '* bar');
-      MT.test('+ foo\n+ bar',
-        'string', '+ foo',
-        'string', '+ bar');
-      MT.test('- foo\n- bar',
-        'string', '- foo',
-        'string', '- bar');
-      MT.test('1. foo\n2. bar',
-        'string', '1. foo',
-        'string', '2. bar');
-        
-      // Formatting in lists (*)
-      MT.test('* *foo* bar\n\n* **foo** bar\n\n* ***foo*** bar\n\n* `foo` bar',
-        'string', '* ',
-        'string em', '*foo*',
-        'string', ' bar',
-        'string', '* ',
-        'string strong', '**foo**',
-        'string', ' bar',
-        'string', '* ',
-        'string strong', '**',
-        'string emstrong', '*foo**',
-        'string em', '*',
-        'string', ' bar',
-        'string', '* ',
-        'string comment', '`foo`',
-        'string', ' bar');
-      // Formatting in lists (+)
-      MT.test('+ *foo* bar\n\n+ **foo** bar\n\n+ ***foo*** bar\n\n+ `foo` bar',
-        'string', '+ ',
-        'string em', '*foo*',
-        'string', ' bar',
-        'string', '+ ',
-        'string strong', '**foo**',
-        'string', ' bar',
-        'string', '+ ',
-        'string strong', '**',
-        'string emstrong', '*foo**',
-        'string em', '*',
-        'string', ' bar',
-        'string', '+ ',
-        'string comment', '`foo`',
-        'string', ' bar');
-      // Formatting in lists (-)
-      MT.test('- *foo* bar\n\n- **foo** bar\n\n- ***foo*** bar\n\n- `foo` bar',
-        'string', '- ',
-        'string em', '*foo*',
-        'string', ' bar',
-        'string', '- ',
-        'string strong', '**foo**',
-        'string', ' bar',
-        'string', '- ',
-        'string strong', '**',
-        'string emstrong', '*foo**',
-        'string em', '*',
-        'string', ' bar',
-        'string', '- ',
-        'string comment', '`foo`',
-        'string', ' bar');
-      // Formatting in lists (1.)
-      MT.test('1. *foo* bar\n\n2. **foo** bar\n\n3. ***foo*** bar\n\n4. `foo` bar',
-        'string', '1. ',
-        'string em', '*foo*',
-        'string', ' bar',
-        'string', '2. ',
-        'string strong', '**foo**',
-        'string', ' bar',
-        'string', '3. ',
-        'string strong', '**',
-        'string emstrong', '*foo**',
-        'string em', '*',
-        'string', ' bar',
-        'string', '4. ',
-        'string comment', '`foo`',
-        'string', ' bar');
-        
-      // Paragraph lists
-      MT.test('* foo\n\n* bar',
-        'string', '* foo',
-        'string', '* bar');
-        
-      // Multi-paragraph lists
-      //
-      // 4 spaces
-      MT.test('* foo\n\n* bar\n\n    hello',
-        'string', '* foo',
-        'string', '* bar',
-        null, '    ',
-        'string', 'hello');
-      // 4 spaces, extra blank lines (should still be list, per Dingus)
-      MT.test('* foo\n\n* bar\n\n\n    hello',
-        'string', '* foo',
-        'string', '* bar',
-        null, '    ',
-        'string', 'hello');
-      // 4 spaces, plus 1 space (should still be list, per Dingus)
-      MT.test('* foo\n\n* bar\n\n     hello\n\n    world',
-        'string', '* foo',
-        'string', '* bar',
-        null, '     ',
-        'string', 'hello',
-        null, '    ',
-        'string', 'world');
-      // 1 tab
-      MT.test('* foo\n\n* bar\n\n\thello',
-        'string', '* foo',
-        'string', '* bar',
-        null, '\t',
-        'string', 'hello');
-      // No indent
-      MT.test('* foo\n\n* bar\n\nhello',
-        'string', '* foo',
-        'string', '* bar',
-        null, 'hello');
-      // Blockquote
-      MT.test('* foo\n\n* bar\n\n    > hello',
-        'string', '* foo',
-        'string', '* bar',
-        null, '    ',
-        'string quote', '> hello');
-      // Code block
-      MT.test('* foo\n\n* bar\n\n        > hello\n\n    world',
-        'string', '* foo',
-        'string', '* bar',
-        null, '        ',
-        'comment', '> hello',
-        null, '    ',
-        'string', 'world');
-      // Code block followed by text
-      MT.test('* foo\n\n    bar\n\n        hello\n\n    world',
-        'string', '* foo',
-        null, '    ',
-        'string', 'bar',
-        null, '        ',
-        'comment', 'hello',
-        null, '    ',
-        'string', 'world');
-        
-      // Nested list
-      // 
-      // *
-      MT.test('* foo\n\n    * bar',
-        'string', '* foo',
-        null, '    ',
-        'string', '* bar');
-      // +
-      MT.test('+ foo\n\n    + bar',
-        'string', '+ foo',
-        null, '    ',
-        'string', '+ bar');
-      // -
-      MT.test('- foo\n\n    - bar',
-        'string', '- foo',
-        null, '    ',
-        'string', '- bar');
-      // 1.
-      MT.test('1. foo\n\n    2. bar',
-        'string', '1. foo',
-        null, '    ',
-        'string', '2. bar');
-      // Mixed
-      MT.test('* foo\n\n    + bar\n\n        - hello\n\n            1. world',
-        'string', '* foo',
-        null, '    ',
-        'string', '+ bar',
-        null, '        ',
-        'string', '- hello',
-        null, '            ',
-        'string', '1. world');
-      // Blockquote
-      MT.test('* foo\n\n    + bar\n\n        > hello',
-        'string', '* foo',
-        null, '    ',
-        'string', '+ bar',
-        null, '        ',
-        'quote string', '> hello');
-      // Code
-      MT.test('* foo\n\n    + bar\n\n            hello',
-        'string', '* foo',
-        null, '    ',
-        'string', '+ bar',
-        null, '            ',
-        'comment', 'hello');
-      // Code followed by text
-      MT.test('* foo\n\n        bar\n\nhello',
-        'string', '* foo',
-        null, '        ',
-        'comment', 'bar',
-        null, 'hello');
-    </script>
-    
-    <h2>Horizontal rules</h2>
-    <script language="javascript">
-
-      // Following tests directly from official Markdown documentation
-      // http://daringfireball.net/projects/markdown/syntax#hr
-      MT.test('* * *',
-        'hr', '* * *');
-        
-      MT.test('***',
-        'hr', '***');
-        
-      MT.test('*****',
-        'hr', '*****');
-        
-      MT.test('- - -',
-        'hr', '- - -');
-        
-      MT.test('---------------------------------------',
-        'hr', '---------------------------------------');
-    </script>
-    
-    <h2>Links</h2>
-    <script language="javascript">
-
-      // Inline link with title
-      MT.test('[foo](http://example.com/ "bar") hello',
-        'link', '[foo]',
-        'string', '(http://example.com/ "bar")',
-        null, ' hello');
-        
-      // Inline link without title
-      MT.test('[foo](http://example.com/) bar',
-        'link', '[foo]',
-        'string', '(http://example.com/)',
-        null, ' bar');
-        
-      // Reference-style links
-      MT.test('[foo][bar] hello',
-        'link', '[foo]',
-        'string', '[bar]',
-        null, ' hello');
-        
-      // Reference-style links with optional space separator (per docuentation)
-      // "You can optionally use a space to separate the sets of brackets"
-      MT.test('[foo] [bar] hello',
-        'link', '[foo]',
-        null, ' ',
-        'string', '[bar]',
-        null, ' hello');
-      // Should only allow a single space ("...use *a* space...")
-      MT.test('[foo]  [bar] hello',
-        null, '[foo]  [bar] hello');
-        
-      // Reference-style links with implicit link name
-      MT.test('[foo][] hello',
-        'link', '[foo]',
-        'string', '[]',
-        null, ' hello');
-        
-      // @todo It would be nice if, at some point, the document was actually
-      // checked to see if the referenced link exists
-      
-      // Link label, for reference-style links (taken from documentation)
-      //
-      // No title
-      MT.test('[foo]: http://example.com/',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/');
-      // Space in ID and title
-      MT.test('[foo bar]: http://example.com/ "hello"',
-        'link', '[foo bar]:',
-        null, ' ',
-        'string', 'http://example.com/ "hello"');
-      // Double title
-      MT.test('[foo bar]: http://example.com/ "hello" "world"',
-        'link', '[foo bar]:',
-        null, ' ',
-        'string', 'http://example.com/ "hello"',
-        null, ' "world"');
-      // Double quotes around title
-      MT.test('[foo]: http://example.com/  "bar"',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/  "bar"');
-      // Single quotes around title
-      MT.test('[foo]: http://example.com/  \'bar\'',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/  \'bar\'');
-      // Parentheses around title
-      MT.test('[foo]: http://example.com/  (bar)',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/  (bar)');
-      // Invalid title
-      MT.test('[foo]: http://example.com/ bar',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/',
-        null, ' bar');
-      // Angle brackets around URL
-      MT.test('[foo]: <http://example.com/>  "bar"',
-        'link', '[foo]:',
-        null, ' ',
-        'string', '<http://example.com/>  "bar"');
-      // Title on next line per documentation (double quotes)
-      MT.test('[foo]: http://example.com/\n"bar" hello',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/',
-        'string', '"bar"',
-        null, ' hello');
-      // Title on next line per documentation (single quotes)
-      MT.test('[foo]: http://example.com/\n\'bar\' hello',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/',
-        'string', '\'bar\'',
-        null, ' hello');
-      // Title on next line per documentation (parentheses)
-      MT.test('[foo]: http://example.com/\n(bar) hello',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/',
-        'string', '(bar)',
-        null, ' hello');
-      // Title on next line per documentation (mixed)
-      MT.test('[foo]: http://example.com/\n(bar" hello',
-        'link', '[foo]:',
-        null, ' ',
-        'string', 'http://example.com/',
-        null, '(bar" hello');
-        
-      // Automatic links
-      MT.test('<http://example.com/> foo',
-        'link', '<http://example.com/>',
-        null, ' foo');
-        
-      // Automatic email links
-      MT.test('<user@example.com> foo',
-        'link', '<user@example.com>',
-        null, ' foo');
-    </script>
-    
-    <h2>Emphasis</h2>
-    <script language="javascript">
-
-      // Single asterisk
-      MT.test('*foo* bar',
-        'em', '*foo*',
-        null, ' bar');
-
-      // Single underscore
-      MT.test('_foo_ bar',
-        'em', '_foo_',
-        null, ' bar');
-        
-      // Emphasis characters within a word
-      MT.test('foo*bar*hello',
-        null, 'foo',
-        'em', '*bar*',
-        null, 'hello');
-      MT.test('foo_bar_hello',
-        null, 'foo',
-        'em', '_bar_',
-        null, 'hello');
-      // Per documentation: "...surround an * or _ with spaces, it’ll be 
-      // treated as a literal asterisk or underscore."
-      // 
-      // Inside EM
-      MT.test('foo _bar _ hello_ world',
-        null, 'foo ',
-        'em', '_bar _ hello_',
-        null, ' world');
-      // Outside EM
-      MT.test('foo _ bar_hello_world',
-        null, 'foo _ bar',
-        'em', '_hello_',
-        null, 'world');
-        
-      // Unclosed emphasis characters
-      // Instead of simply marking as EM / STRONG, it would be nice to have an 
-      // incomplete flag for EM and STRONG, that is styled slightly different.
-      MT.test('foo *bar',
-        null, 'foo ',
-        'em', '*bar');
-      MT.test('foo _bar',
-        null, 'foo ',
-        'em', '_bar');
-
-      // Double asterisk
-      MT.test('**foo** bar',
-        'strong', '**foo**',
-        null, ' bar');
-
-      // Double underscore
-      MT.test('__foo__ bar',
-        'strong', '__foo__',
-        null, ' bar');
-
-      // Triple asterisk
-      MT.test('*foo**bar*hello** world',
-        'em', '*foo',
-        'emstrong', '**bar*',
-        'strong', 'hello**',
-        null, ' world');
-
-      // Triple underscore
-      MT.test('_foo__bar_hello__ world',
-        'em', '_foo',
-        'emstrong', '__bar_',
-        'strong', 'hello__',
-        null, ' world');
-
-      // Triple mixed
-      // "...same character must be used to open and close an emphasis span.""
-      MT.test('_foo**bar*hello__ world',
-        'em', '_foo',
-        'emstrong', '**bar*hello__ world');
-        
-      MT.test('*foo__bar_hello** world',
-        'em', '*foo',
-        'emstrong', '__bar_hello** world');
-    </script>
-    
-    <h2>Escaping</h2>
-    <script language="javascript">
-
-      // These characters should be escaped:
-      // \   backslash
-      // `   backtick
-      // *   asterisk
-      // _   underscore
-      // {}  curly braces
-      // []  square brackets
-      // ()  parentheses
-      // #   hash mark
-      // +   plus sign
-      // -   minus sign (hyphen)
-      // .   dot
-      // !   exclamation mark
-      // 
-      // Backtick (code)
-      MT.test('foo \\`bar\\`',
-        null, 'foo \\`bar\\`');
-      MT.test('foo \\\\`bar\\\\`',
-        null, 'foo \\\\',
-        'comment', '`bar\\\\`');
-      // Asterisk (em)
-      MT.test('foo \\*bar\\*',
-        null, 'foo \\*bar\\*');
-      MT.test('foo \\\\*bar\\\\*',
-        null, 'foo \\\\',
-        'em', '*bar\\\\*');
-      // Underscore (em)
-      MT.test('foo \\_bar\\_',
-        null, 'foo \\_bar\\_');
-      MT.test('foo \\\\_bar\\\\_',
-        null, 'foo \\\\',
-        'em', '_bar\\\\_');
-      // Hash mark (headers)
-      MT.test('\\# foo',
-        null, '\\# foo');
-      MT.test('\\\\# foo',
-        null, '\\\\# foo');
-    </script>
-
-    <h2>Summary</h2>
-    <script language="javascript">
-      MT.printSummary();
-    </script>
-
-  </body>
-</html>
-
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
new file mode 100644
index 0000000000..46bda7b90d
--- /dev/null
+++ b/mode/markdown/test.js
@@ -0,0 +1,1084 @@
+// Initiate ModeTest and set defaults
+var MT = ModeTest;
+MT.modeName = 'markdown';
+MT.modeOptions = {};
+
+MT.testMode(
+  'plainText',
+  'foo',
+  [
+    null, 'foo'
+  ]
+);
+
+// Code blocks using 4 spaces (regardless of CodeMirror.tabSize value)
+MT.testMode(
+  'codeBlocksUsing4Spaces',
+  '    foo',
+  [
+    null, '    ',
+    'comment', 'foo'
+  ]
+);
+
+// Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
+MT.testMode(
+  'codeBlocksUsing1Tab',
+  '\tfoo',
+  [
+    null, '\t',
+    'comment', 'foo'
+  ]
+);
+
+// Inline code using backticks
+MT.testMode(
+  'inlineCodeUsingBackticks',
+  'foo `bar`',
+  [
+    null, 'foo ',
+    'comment', '`bar`'
+  ]
+);
+
+// Unclosed backticks
+// Instead of simply marking as CODE, it would be nice to have an 
+// incomplete flag for CODE, that is styled slightly different.
+MT.testMode(
+  'unclosedBackticks',
+  'foo `bar',
+  [
+    null, 'foo ',
+    'comment', '`bar'
+  ]
+);
+
+// Per documentation: "To include a literal backtick character within a 
+// code span, you can use multiple backticks as the opening and closing 
+// delimiters"
+MT.testMode(
+  'doubleBackticks',
+  '``foo ` bar``',
+  [
+    'comment', '``foo ` bar``'
+  ]
+);
+
+// Tests based on Dingus
+// http://daringfireball.net/projects/markdown/dingus
+// 
+// Multiple backticks within an inline code block
+MT.testMode(
+  'consecutiveBackticks',
+  '`foo```bar`',
+  [
+    'comment', '`foo```bar`'
+  ]
+);
+// Multiple backticks within an inline code block with a second code block
+MT.testMode(
+  'consecutiveBackticks',
+  '`foo```bar` hello `world`',
+  [
+    'comment', '`foo```bar`',
+    null, ' hello ',
+    'comment', '`world`'
+  ]
+);
+// Unclosed with several different groups of backticks
+MT.testMode(
+  'unclosedBackticks',
+  '``foo ``` bar` hello',
+  [
+    'comment', '``foo ``` bar` hello'
+  ]
+);
+// Closed with several different groups of backticks
+MT.testMode(
+  'closedBackticks',
+  '``foo ``` bar` hello`` world',
+  [
+    'comment', '``foo ``` bar` hello``',
+    null, ' world'
+  ]
+);
+
+// atx headers
+// http://daringfireball.net/projects/markdown/syntax#header
+// 
+// H1
+MT.testMode(
+  'atxH1',
+  '# foo',
+  [
+    'header', '# foo'
+  ]
+);
+// H2
+MT.testMode(
+  'atxH2',
+  '## foo',
+  [
+    'header', '## foo'
+  ]
+);
+// H3
+MT.testMode(
+  'atxH3',
+  '### foo',
+  [
+    'header', '### foo'
+  ]
+);
+// H4
+MT.testMode(
+  'atxH4',
+  '#### foo',
+  [
+    'header', '#### foo'
+  ]
+);
+// H5
+MT.testMode(
+  'atxH5',
+  '##### foo',
+  [
+    'header', '##### foo'
+  ]
+);
+// H6
+MT.testMode(
+  'atxH6',
+  '###### foo',
+  [
+    'header', '###### foo'
+  ]
+);
+// H6 - 7x '#' should still be H6, per Dingus
+// http://daringfireball.net/projects/markdown/dingus
+MT.testMode(
+  'atxH6NotH7',
+  '####### foo',
+  [
+    'header', '####### foo'
+  ]
+);
+
+// Setext headers - H1, H2
+// Per documentation, "Any number of underlining =’s or -’s will work."
+// http://daringfireball.net/projects/markdown/syntax#header
+// Ideally, the text would be marked as `header` as well, but this is 
+// not really feasible at the moment. So, instead, we're testing against 
+// what works today, to avoid any regressions.
+// 
+// Check if single underlining = works
+MT.testMode(
+  'setextH1',
+  'foo\n=',
+  [
+    null, 'foo',
+    'header', '='
+  ]
+);
+// Check if 3+ ='s work
+MT.testMode(
+  'setextH1',
+  'foo\n===',
+  [
+    null, 'foo',
+    'header', '==='
+  ]
+);
+// Check if single underlining - works
+MT.testMode(
+  'setextH2',
+  'foo\n-',
+  [
+    null, 'foo',
+    'header', '-'
+  ]
+);
+// Check if 3+ -'s work
+MT.testMode(
+  'setextH2',
+  'foo\n---',
+  [
+    null, 'foo',
+    'header', '---'
+  ]
+);
+
+// Single-line blockquote with trailing space
+MT.testMode(
+  'blockquoteSpace',
+  '> foo',
+  [
+    'quote', '> foo'
+  ]
+);
+
+// Single-line blockquote
+MT.testMode(
+  'blockquoteNoSpace',
+  '>foo',
+  [
+    'quote', '>foo'
+  ]
+);
+
+// Single-line blockquote followed by normal paragraph
+MT.testMode(
+  'blockquoteThenParagraph',
+  '>foo\n\nbar',
+  [
+    'quote', '>foo',
+    null, 'bar'
+  ]
+);
+
+// Multi-line blockquote (lazy mode)
+MT.testMode(
+  'multiBlockquoteLazy',
+  '>foo\nbar',
+  [
+    'quote', '>foo',
+    'quote', 'bar'
+  ]
+);
+
+// Multi-line blockquote followed by normal paragraph (lazy mode)
+MT.testMode(
+  'multiBlockquoteLazyThenParagraph',
+  '>foo\nbar\n\nhello',
+  [
+    'quote', '>foo',
+    'quote', 'bar',
+    null, 'hello'
+  ]
+);
+
+// Multi-line blockquote (non-lazy mode)
+MT.testMode(
+  'multiBlockquote',
+  '>foo\n>bar',
+  [
+    'quote', '>foo',
+    'quote', '>bar'
+  ]
+);
+
+// Multi-line blockquote followed by normal paragraph (non-lazy mode)
+MT.testMode(
+  'multiBlockquoteThenParagraph',
+  '>foo\n>bar\n\nhello',
+  [
+    'quote', '>foo',
+    'quote', '>bar',
+    null, 'hello'
+  ]
+);
+
+// Check list types
+MT.testMode(
+  'listAsterisk',
+  '* foo\n* bar',
+  [
+    'string', '* foo',
+    'string', '* bar'
+  ]
+);
+MT.testMode(
+  'listPlus',
+  '+ foo\n+ bar',
+  [
+    'string', '+ foo',
+    'string', '+ bar'
+  ]
+);
+MT.testMode(
+  'listDash',
+  '- foo\n- bar',
+  [
+    'string', '- foo',
+    'string', '- bar'
+  ]
+);
+MT.testMode(
+  'listNumber',
+  '1. foo\n2. bar',
+  [
+    'string', '1. foo',
+    'string', '2. bar'
+  ]
+);
+
+// Formatting in lists (*)
+MT.testMode(
+  'listAsteriskFormatting',
+  '* *foo* bar\n\n* **foo** bar\n\n* ***foo*** bar\n\n* `foo` bar',
+  [
+    'string', '* ',
+    'string em', '*foo*',
+    'string', ' bar',
+    'string', '* ',
+    'string strong', '**foo**',
+    'string', ' bar',
+    'string', '* ',
+    'string strong', '**',
+    'string emstrong', '*foo**',
+    'string em', '*',
+    'string', ' bar',
+    'string', '* ',
+    'string comment', '`foo`',
+    'string', ' bar'
+  ]
+);
+// Formatting in lists (+)
+MT.testMode(
+  'listPlusFormatting',
+  '+ *foo* bar\n\n+ **foo** bar\n\n+ ***foo*** bar\n\n+ `foo` bar',
+  [
+    'string', '+ ',
+    'string em', '*foo*',
+    'string', ' bar',
+    'string', '+ ',
+    'string strong', '**foo**',
+    'string', ' bar',
+    'string', '+ ',
+    'string strong', '**',
+    'string emstrong', '*foo**',
+    'string em', '*',
+    'string', ' bar',
+    'string', '+ ',
+    'string comment', '`foo`',
+    'string', ' bar'
+  ]
+);
+// Formatting in lists (-)
+MT.testMode(
+  'listDashFormatting',
+  '- *foo* bar\n\n- **foo** bar\n\n- ***foo*** bar\n\n- `foo` bar',
+  [
+    'string', '- ',
+    'string em', '*foo*',
+    'string', ' bar',
+    'string', '- ',
+    'string strong', '**foo**',
+    'string', ' bar',
+    'string', '- ',
+    'string strong', '**',
+    'string emstrong', '*foo**',
+    'string em', '*',
+    'string', ' bar',
+    'string', '- ',
+    'string comment', '`foo`',
+    'string', ' bar'
+  ]
+);
+// Formatting in lists (1.)
+MT.testMode(
+  'listNumberFormatting',
+  '1. *foo* bar\n\n2. **foo** bar\n\n3. ***foo*** bar\n\n4. `foo` bar',
+  [
+    'string', '1. ',
+    'string em', '*foo*',
+    'string', ' bar',
+    'string', '2. ',
+    'string strong', '**foo**',
+    'string', ' bar',
+    'string', '3. ',
+    'string strong', '**',
+    'string emstrong', '*foo**',
+    'string em', '*',
+    'string', ' bar',
+    'string', '4. ',
+    'string comment', '`foo`',
+    'string', ' bar'
+  ]
+);
+
+// Paragraph lists
+MT.testMode(
+  'listParagraph',
+  '* foo\n\n* bar',
+  [
+    'string', '* foo',
+    'string', '* bar'
+  ]
+);
+
+// Multi-paragraph lists
+//
+// 4 spaces
+MT.testMode(
+  'listMultiParagraph',
+  '* foo\n\n* bar\n\n    hello',
+  [
+    'string', '* foo',
+    'string', '* bar',
+    null, '    ',
+    'string', 'hello'
+  ]
+);
+// 4 spaces, extra blank lines (should still be list, per Dingus)
+MT.testMode(
+  'listMultiParagraphExtra',
+  '* foo\n\n* bar\n\n\n    hello',
+  [
+    'string', '* foo',
+    'string', '* bar',
+    null, '    ',
+    'string', 'hello'
+  ]
+);
+// 4 spaces, plus 1 space (should still be list, per Dingus)
+MT.testMode(
+  'listMultiParagraphExtraSpace',
+  '* foo\n\n* bar\n\n     hello\n\n    world',
+  [
+    'string', '* foo',
+    'string', '* bar',
+    null, '     ',
+    'string', 'hello',
+    null, '    ',
+    'string', 'world'
+  ]
+);
+// 1 tab
+MT.testMode(
+  'listTab',
+  '* foo\n\n* bar\n\n\thello',
+  [
+    'string', '* foo',
+    'string', '* bar',
+    null, '\t',
+    'string', 'hello'
+  ]
+);
+// No indent
+MT.testMode(
+  'listNoIndent',
+  '* foo\n\n* bar\n\nhello',
+  [
+    'string', '* foo',
+    'string', '* bar',
+    null, 'hello'
+  ]
+);
+// Blockquote
+MT.testMode(
+  'blockquote',
+  '* foo\n\n* bar\n\n    > hello',
+  [
+    'string', '* foo',
+    'string', '* bar',
+    null, '    ',
+    'string quote', '> hello'
+  ]
+);
+// Code block
+MT.testMode(
+  'blockquoteCode',
+  '* foo\n\n* bar\n\n        > hello\n\n    world',
+  [
+    'string', '* foo',
+    'string', '* bar',
+    null, '        ',
+    'comment', '> hello',
+    null, '    ',
+    'string', 'world'
+  ]
+);
+// Code block followed by text
+MT.testMode(
+  'blockquoteCodeText',
+  '* foo\n\n    bar\n\n        hello\n\n    world',
+  [
+    'string', '* foo',
+    null, '    ',
+    'string', 'bar',
+    null, '        ',
+    'comment', 'hello',
+    null, '    ',
+    'string', 'world'
+  ]
+);
+
+// Nested list
+// 
+// *
+MT.testMode(
+  'listAsteriskNested',
+  '* foo\n\n    * bar',
+  [
+    'string', '* foo',
+    null, '    ',
+    'string', '* bar'
+  ]
+);
+// +
+MT.testMode(
+  'listPlusNested',
+  '+ foo\n\n    + bar',
+  [
+    'string', '+ foo',
+    null, '    ',
+    'string', '+ bar'
+  ]
+);
+// -
+MT.testMode(
+  'listDashNested',
+  '- foo\n\n    - bar',
+  [
+    'string', '- foo',
+    null, '    ',
+    'string', '- bar'
+  ]
+);
+// 1.
+MT.testMode(
+  'listNumberNested',
+  '1. foo\n\n    2. bar',
+  [
+    'string', '1. foo',
+    null, '    ',
+    'string', '2. bar'
+  ]
+);
+// Mixed
+MT.testMode(
+  'listMixed',
+  '* foo\n\n    + bar\n\n        - hello\n\n            1. world',
+  [
+    'string', '* foo',
+    null, '    ',
+    'string', '+ bar',
+    null, '        ',
+    'string', '- hello',
+    null, '            ',
+    'string', '1. world'
+  ]
+);
+// Blockquote
+MT.testMode(
+  'listBlockquote',
+  '* foo\n\n    + bar\n\n        > hello',
+  [
+    'string', '* foo',
+    null, '    ',
+    'string', '+ bar',
+    null, '        ',
+    'quote string', '> hello'
+  ]
+);
+// Code
+MT.testMode(
+  'listCode',
+  '* foo\n\n    + bar\n\n            hello',
+  [
+    'string', '* foo',
+    null, '    ',
+    'string', '+ bar',
+    null, '            ',
+    'comment', 'hello'
+  ]
+);
+// Code followed by text
+MT.testMode(
+  'listCodeText',
+  '* foo\n\n        bar\n\nhello',
+  [
+    'string', '* foo',
+    null, '        ',
+    'comment', 'bar',
+    null, 'hello'
+  ]
+);
+
+// Following tests directly from official Markdown documentation
+// http://daringfireball.net/projects/markdown/syntax#hr
+MT.testMode(
+  'hrSpace',
+  '* * *',
+  [
+    'hr', '* * *'
+  ]
+);
+
+MT.testMode(
+  'hr',
+  '***',
+  [
+    'hr', '***'
+  ]
+);
+
+MT.testMode(
+  'hrLong',
+  '*****',
+  [
+    'hr', '*****'
+  ]
+);
+
+MT.testMode(
+  'hrSpaceDash',
+  '- - -',
+  [
+    'hr', '- - -'
+  ]
+);
+
+MT.testMode(
+  'hrDashLong',
+  '---------------------------------------',
+  [
+    'hr', '---------------------------------------'
+  ]
+);
+
+// Inline link with title
+MT.testMode(
+  'linkTitle',
+  '[foo](http://example.com/ "bar") hello',
+  [
+    'link', '[foo]',
+    'string', '(http://example.com/ "bar")',
+    null, ' hello'
+  ]
+);
+
+// Inline link without title
+MT.testMode(
+  'linkNoTitle',
+  '[foo](http://example.com/) bar',
+  [
+    'link', '[foo]',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Reference-style links
+MT.testMode(
+  'linkReference',
+  '[foo][bar] hello',
+  [
+    'link', '[foo]',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
+
+// Reference-style links with optional space separator (per docuentation)
+// "You can optionally use a space to separate the sets of brackets"
+MT.testMode(
+  'linkReferenceSpace',
+  '[foo] [bar] hello',
+  [
+    'link', '[foo]',
+    null, ' ',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
+// Should only allow a single space ("...use *a* space...")
+MT.testMode(
+  'linkReferenceDoubleSpace',
+  '[foo]  [bar] hello',
+  [
+    null, '[foo]  [bar] hello'
+  ]
+);
+
+// Reference-style links with implicit link name
+MT.testMode(
+  'linkImplicit',
+  '[foo][] hello',
+  [
+    'link', '[foo]',
+    'string', '[]',
+    null, ' hello'
+  ]
+);
+
+// @todo It would be nice if, at some point, the document was actually
+// checked to see if the referenced link exists
+
+// Link label, for reference-style links (taken from documentation)
+//
+// No title
+MT.testMode(
+  'labelNoTitle',
+  '[foo]: http://example.com/',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/'
+  ]
+);
+// Space in ID and title
+MT.testMode(
+  'labelSpaceTitle',
+  '[foo bar]: http://example.com/ "hello"',
+  [
+    'link', '[foo bar]:',
+    null, ' ',
+    'string', 'http://example.com/ "hello"'
+  ]
+);
+// Double title
+MT.testMode(
+  'labelDoubleTitle',
+  '[foo bar]: http://example.com/ "hello" "world"',
+  [
+    'link', '[foo bar]:',
+    null, ' ',
+    'string', 'http://example.com/ "hello"',
+    null, ' "world"'
+  ]
+);
+// Double quotes around title
+MT.testMode(
+  'labelTitleDoubleQuotes',
+  '[foo]: http://example.com/  "bar"',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/  "bar"'
+  ]
+);
+// Single quotes around title
+MT.testMode(
+  'labelTitleSingleQuotes',
+  '[foo]: http://example.com/  \'bar\'',
+  [
+    'link', '[foo]:',
+    null, ' ',
+  'string', 'http://example.com/  \'bar\''
+  ]
+);
+// Parentheses around title
+MT.testMode(
+  'labelTitleParenthese',
+  '[foo]: http://example.com/  (bar)',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/  (bar)'
+  ]
+);
+// Invalid title
+MT.testMode(
+  'labelTitleInvalid',
+  '[foo]: http://example.com/ bar',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/',
+    null, ' bar'
+  ]
+);
+// Angle brackets around URL
+MT.testMode(
+  'labelLinkAngleBrackets',
+  '[foo]: <http://example.com/>  "bar"',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', '<http://example.com/>  "bar"'
+  ]
+);
+// Title on next line per documentation (double quotes)
+MT.testMode(
+  'labelTitleNextDoubleQuotes',
+  '[foo]: http://example.com/\n"bar" hello',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/',
+    'string', '"bar"',
+    null, ' hello'
+  ]
+);
+// Title on next line per documentation (single quotes)
+MT.testMode(
+  'labelTitleNextSingleQuotes',
+  '[foo]: http://example.com/\n\'bar\' hello',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/',
+  'string', '\'bar\'',
+  null, ' hello'
+  ]
+);
+// Title on next line per documentation (parentheses)
+MT.testMode(
+  'labelTitleNextParenthese',
+  '[foo]: http://example.com/\n(bar) hello',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/',
+    'string', '(bar)',
+    null, ' hello'
+  ]
+);
+// Title on next line per documentation (mixed)
+MT.testMode(
+  'labelTitleNextMixed',
+  '[foo]: http://example.com/\n(bar" hello',
+  [
+    'link', '[foo]:',
+    null, ' ',
+    'string', 'http://example.com/',
+    null, '(bar" hello'
+  ]
+);
+
+// Automatic links
+MT.testMode(
+  'linkWeb',
+  '<http://example.com/> foo',
+  [
+    'link', '<http://example.com/>',
+    null, ' foo'
+  ]
+);
+
+// Automatic email links
+MT.testMode(
+  'linkEmail',
+  '<user@example.com> foo',
+  [
+    'link', '<user@example.com>',
+    null, ' foo'
+  ]
+);
+
+// Single asterisk
+MT.testMode(
+  'emAsterisk',
+  '*foo* bar',
+  [
+    'em', '*foo*',
+    null, ' bar'
+  ]
+);
+
+// Single underscore
+MT.testMode(
+  'emUnderscore',
+  '_foo_ bar',
+  [
+    'em', '_foo_',
+    null, ' bar'
+  ]
+);
+
+// Emphasis characters within a word
+MT.testMode(
+  'emInWordAsterisk',
+  'foo*bar*hello',
+  [
+    null, 'foo',
+    'em', '*bar*',
+    null, 'hello'
+  ]
+);
+MT.testMode(
+  'emInWordUnderscore',
+  'foo_bar_hello',
+  [
+    null, 'foo',
+    'em', '_bar_',
+    null, 'hello'
+  ]
+);
+// Per documentation: "...surround an * or _ with spaces, it’ll be 
+// treated as a literal asterisk or underscore."
+// 
+// Inside EM
+MT.testMode(
+  'emEscapedBySpaceIn',
+  'foo _bar _ hello_ world',
+  [
+    null, 'foo ',
+    'em', '_bar _ hello_',
+    null, ' world'
+  ]
+);
+// Outside EM
+MT.testMode(
+  'emEscapedBySpaceOut',
+  'foo _ bar_hello_world',
+  [
+    null, 'foo _ bar',
+    'em', '_hello_',
+    null, 'world'
+  ]
+);
+
+// Unclosed emphasis characters
+// Instead of simply marking as EM / STRONG, it would be nice to have an 
+// incomplete flag for EM and STRONG, that is styled slightly different.
+MT.testMode(
+  'emIncompleteAsterisk',
+  'foo *bar',
+  [
+    null, 'foo ',
+    'em', '*bar'
+  ]
+);
+MT.testMode(
+  'emIncompleteUnderscore',
+  'foo _bar',
+  [
+    null, 'foo ',
+    'em', '_bar'
+  ]
+);
+
+// Double asterisk
+MT.testMode(
+  'strongAsterisk',
+  '**foo** bar',
+  [
+    'strong', '**foo**',
+    null, ' bar'
+  ]
+);
+
+// Double underscore
+MT.testMode(
+  'strongUnderscore',
+  '__foo__ bar',
+  [
+    'strong', '__foo__',
+    null, ' bar'
+  ]
+);
+
+// Triple asterisk
+MT.testMode(
+  'emStrongAsterisk',
+  '*foo**bar*hello** world',
+  [
+    'em', '*foo',
+    'emstrong', '**bar*',
+    'strong', 'hello**',
+    null, ' world'
+  ]
+);
+
+// Triple underscore
+MT.testMode(
+  'emStrongUnderscore',
+  '_foo__bar_hello__ world',
+  [
+    'em', '_foo',
+    'emstrong', '__bar_',
+    'strong', 'hello__',
+    null, ' world'
+  ]
+);
+
+// Triple mixed
+// "...same character must be used to open and close an emphasis span.""
+MT.testMode(
+  'emStrongMixed',
+  '_foo**bar*hello__ world',
+  [
+    'em', '_foo',
+    'emstrong', '**bar*hello__ world'
+  ]
+);
+
+MT.testMode(
+  'emStrongMixed',
+  '*foo__bar_hello** world',
+  [
+    'em', '*foo',
+    'emstrong', '__bar_hello** world'
+  ]
+);
+
+// These characters should be escaped:
+// \   backslash
+// `   backtick
+// *   asterisk
+// _   underscore
+// {}  curly braces
+// []  square brackets
+// ()  parentheses
+// #   hash mark
+// +   plus sign
+// -   minus sign (hyphen)
+// .   dot
+// !   exclamation mark
+// 
+// Backtick (code)
+MT.testMode(
+  'escapeBacktick',
+  'foo \\`bar\\`',
+  [
+    null, 'foo \\`bar\\`'
+  ]
+);
+MT.testMode(
+  'doubleEscapeBacktick',
+  'foo \\\\`bar\\\\`',
+  [
+    null, 'foo \\\\',
+    'comment', '`bar\\\\`'
+  ]
+);
+// Asterisk (em)
+MT.testMode(
+  'escapeAsterisk',
+  'foo \\*bar\\*',
+  [
+    null, 'foo \\*bar\\*'
+  ]
+);
+MT.testMode(
+  'doubleEscapeAsterisk',
+  'foo \\\\*bar\\\\*',
+  [
+    null, 'foo \\\\',
+    'em', '*bar\\\\*'
+  ]
+);
+// Underscore (em)
+MT.testMode(
+  'escapeUnderscore',
+  'foo \\_bar\\_',
+  [
+    null, 'foo \\_bar\\_'
+  ]
+);
+MT.testMode(
+  'doubleEscapeUnderscore',
+  'foo \\\\_bar\\\\_',
+  [
+    null, 'foo \\\\',
+    'em', '_bar\\\\_'
+  ]
+);
+// Hash mark (headers)
+MT.testMode(
+  'escapeHash',
+  '\\# foo',
+  [
+    null, '\\# foo'
+  ]
+);
+MT.testMode(
+  'doubleEscapeHash',
+  '\\\\# foo',
+  [
+    null, '\\\\# foo'
+  ]
+);
\ No newline at end of file
diff --git a/mode/stex/index.html b/mode/stex/index.html
index 39dc0c2436..2dafe69816 100644
--- a/mode/stex/index.html
+++ b/mode/stex/index.html
@@ -92,5 +92,7 @@ <h1>CodeMirror: sTeX mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/x-stex</code>.</p>
 
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#stex_*">normal</a>,  <a href="../../test/index.html#verbose,stex_*">verbose</a>.</p>
+
   </body>
 </html>
diff --git a/mode/stex/test.html b/mode/stex/test.html
deleted file mode 100644
index c63b3cbc31..0000000000
--- a/mode/stex/test.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: sTeX mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="stex.js"></script>
-    <link rel="stylesheet" href="../../test/mode_test.css">
-    <script src="../../test/mode_test.js"></script>
-    <link rel="stylesheet" href="../../doc/docs.css">
-  </head>
-  <body>
-    <h1>Tests for the sTeX Mode</h1>
-    <h2>Basics</h2>
-    <script language="javascript">
-      MT = ModeTest;
-
-      MT.test('foo',
-        null, 'foo');
-
-      MT.test('foo bar',
-        null, 'foo bar');
-    </script>
-
-    <h2>Tags</h2>
-    <script language="javascript">
-      MT.test('\\begin{document}\n\\end{document}',
-        'tag',     '\\begin',
-        'bracket', '{',
-        'atom',    'document',
-        'bracket', '}',
-        'tag',     '\\end',
-        'bracket', '{',
-        'atom',    'document',
-        'bracket', '}');
-
-      MT.test('\\begin{equation}\n  E=mc^2\n\\end{equation}',
-        'tag',     '\\begin',
-        'bracket', '{',
-        'atom',    'equation',
-        'bracket', '}',
-        null,      '  E=mc^2',
-        'tag',     '\\end',
-        'bracket', '{',
-        'atom',    'equation',
-        'bracket', '}');
-
-      MT.test('\\begin{module}[]',
-        'tag',     '\\begin',
-        'bracket', '{',
-        'atom',    'module',
-        'bracket', '}[]');
-
-      MT.test('\\begin{module}[id=bbt-size]',
-        'tag',     '\\begin',
-        'bracket', '{',
-        'atom',    'module',
-        'bracket', '}[',
-        null,      'id=bbt-size',
-        'bracket', ']');
-
-      MT.test('\\importmodule[b-b-t]{b-b-t}',
-        'tag',     '\\importmodule',
-        'bracket', '[',
-        'string',   'b-b-t',
-        'bracket', ']{',
-        'builtin', 'b-b-t',
-        'bracket', '}');
-
-      MT.test('\\importmodule[\\KWARCslides{dmath/en/cardinality}]{card}',
-        'tag',     '\\importmodule',
-        'bracket', '[',
-        'tag',     '\\KWARCslides',
-        'bracket', '{',
-        'string',   'dmath/en/cardinality',
-        'bracket', '}]{',
-        'builtin', 'card',
-        'bracket', '}');
-
-      MT.test('\\PSforPDF[1]{#1}', // could treat #1 specially
-        'tag',     '\\PSforPDF',
-        'bracket', '[',
-        'atom',    '1',
-        'bracket', ']{',
-        null,      '#1',
-        'bracket', '}');
-    </script>
-
-    <h2>Comments</h2>
-    <script language="javascript">
-      MT.test('% foo',
-        'comment', '% foo');
-
-      MT.test('\\item% bar',
-        'tag',     '\\item',
-        'comment', '% bar');
-
-      MT.test(' % \\item',
-        null,      ' ',
-        'comment', '% \\item');
-
-      MT.test('%\nfoo',
-        'comment', '%',
-        null, 'foo');
-    </script>
-
-    <h2>Errors</h2>
-    <script language="javascript">
-      MT.test('\\begin}{',
-        'tag',     '\\begin',
-        'error',   '}',
-        'bracket', '{');
-
-      MT.test('\\item]{',
-        'tag',     '\\item',
-        'error',   ']',
-        'bracket', '{');
-
-      MT.test('% }',
-        'comment', '% }');
-    </script>
-
-    <h2>Character Escapes</h2>
-    <script language="javascript">
-      MT.test('the \\# key',
-        null,  'the ',
-        'tag', '\\#',
-        null,  ' key');
-
-      MT.test('a \\$5 stetson',
-        null, 'a ',
-        'tag', '\\$',
-        'atom', 5,
-        null, ' stetson');
-
-      MT.test('100\\% beef',
-        'atom', '100',
-        'tag', '\\%',
-        null, ' beef');
-
-      MT.test('L \\& N',
-        null, 'L ',
-        'tag', '\\&',
-        null, ' N');
-
-      MT.test('foo\\_bar',
-        null, 'foo',
-        'tag', '\\_',
-        null, 'bar');
-
-      MT.test('\\emph{\\{}',
-        'tag',    '\\emph',
-        'bracket','{',
-        'tag',    '\\{',
-        'bracket','}');
-
-      MT.test('\\emph{\\}}',
-        'tag',    '\\emph',
-        'bracket','{',
-        'tag',    '\\}',
-        'bracket','}');
-
-      MT.test('section \\S1',
-        null,  'section ',
-        'tag', '\\S',
-        'atom',  '1');
-
-      MT.test('para \\P2',
-        null,  'para ',
-        'tag', '\\P',
-        'atom',  '2');
-
-    </script>
-
-    <h2>Spacing control</h2>
-
-    <script language="javascript">
-      MT.test('x\\,y', // thinspace
-        null,  'x',
-        'tag', '\\,',
-        null,  'y');
-
-      MT.test('x\\;y', // thickspace
-        null,  'x',
-        'tag', '\\;',
-        null,  'y');
-
-      MT.test('x\\!y', // negative thinspace
-        null,  'x',
-        'tag', '\\!',
-        null,  'y');
-
-      MT.test('J.\\ L.\\ is', // period not ending a sentence
-        null, 'J.\\ L.\\ is'); // maybe could be better
-
-      MT.test('X\\@. The', // period ending a sentence
-        null,  'X',
-        'tag', '\\@',
-        null,  '. The');
-
-      MT.test('{\\em If\\/} I', // italic correction
-        'bracket', '{',
-        'tag',     '\\em',
-        null,      ' If',
-        'tag',     '\\/',
-        'bracket', '}',
-        null,      ' I');
-
-    </script>
-
-    <h2>New Commands</h2>
-
-    Should be able to define a new command that happens to be a method on Array
-    (e.g. <tt>pop</tt>):
-    <script language="javascript">
-      MT.test('\\newcommand{\\pop}',
-        'tag', '\\newcommand',
-        'bracket', '{',
-        'tag', '\\pop',
-        'bracket', '}');
-    </script>
-
-    <h2>Summary</h2>
-    <script language="javascript">
-      MT.printSummary();
-    </script>
-
-  </body>
-</html>
-
diff --git a/mode/stex/test.js b/mode/stex/test.js
new file mode 100644
index 0000000000..c5a34f3d8d
--- /dev/null
+++ b/mode/stex/test.js
@@ -0,0 +1,343 @@
+var MT = ModeTest;
+MT.modeName = 'stex';
+MT.modeOptions = {};
+
+MT.testMode(
+  'word',
+  'foo',
+  [
+    null, 'foo'
+  ]
+);
+
+MT.testMode(
+  'twoWords',
+  'foo bar',
+  [
+    null, 'foo bar'
+  ]
+);
+
+MT.testMode(
+  'beginEndDocument',
+  '\\begin{document}\n\\end{document}',
+  [
+    'tag', '\\begin',
+    'bracket', '{',
+    'atom', 'document',
+    'bracket', '}',
+    'tag', '\\end',
+    'bracket', '{',
+    'atom', 'document',
+    'bracket', '}'
+  ]
+);
+
+MT.testMode(
+  'beginEndEquation',
+  '\\begin{equation}\n  E=mc^2\n\\end{equation}',
+  [
+    'tag', '\\begin',
+    'bracket', '{',
+    'atom', 'equation',
+    'bracket', '}',
+    null, '  E=mc^2',
+    'tag', '\\end',
+    'bracket', '{',
+    'atom', 'equation',
+    'bracket', '}'
+  ]
+);
+
+MT.testMode(
+  'beginModule',
+  '\\begin{module}[]',
+  [
+    'tag', '\\begin',
+    'bracket', '{',
+    'atom', 'module',
+    'bracket', '}[]'
+  ]
+);
+
+MT.testMode(
+  'beginModuleId',
+  '\\begin{module}[id=bbt-size]',
+  [
+    'tag', '\\begin',
+    'bracket', '{',
+    'atom', 'module',
+    'bracket', '}[',
+    null, 'id=bbt-size',
+    'bracket', ']'
+  ]
+);
+
+MT.testMode(
+  'importModule',
+  '\\importmodule[b-b-t]{b-b-t}',
+  [
+    'tag', '\\importmodule',
+    'bracket', '[',
+    'string', 'b-b-t',
+    'bracket', ']{',
+    'builtin', 'b-b-t',
+    'bracket', '}'
+  ]
+);
+
+MT.testMode(
+  'importModulePath',
+  '\\importmodule[\\KWARCslides{dmath/en/cardinality}]{card}',
+  [
+    'tag', '\\importmodule',
+    'bracket', '[',
+    'tag', '\\KWARCslides',
+    'bracket', '{',
+    'string', 'dmath/en/cardinality',
+    'bracket', '}]{',
+    'builtin', 'card',
+    'bracket', '}'
+  ]
+);
+
+MT.testMode(
+  'psForPDF',
+  '\\PSforPDF[1]{#1}', // could treat #1 specially
+  [
+    'tag', '\\PSforPDF',
+    'bracket', '[',
+    'atom', '1',
+    'bracket', ']{',
+    null, '#1',
+    'bracket', '}'
+  ]
+);
+
+MT.testMode(
+  'comment',
+  '% foo',
+  [
+    'comment', '% foo'
+  ]
+);
+
+MT.testMode(
+  'tagComment',
+  '\\item% bar',
+  [
+    'tag', '\\item',
+    'comment', '% bar'
+  ]
+);
+
+MT.testMode(
+  'commentTag',
+  ' % \\item',
+  [
+    null, ' ',
+    'comment', '% \\item'
+  ]
+);
+
+MT.testMode(
+  'commentLineBreak',
+  '%\nfoo',
+  [
+    'comment', '%',
+    null, 'foo'
+  ]
+);
+
+MT.testMode(
+  'tagErrorCurly',
+  '\\begin}{',
+  [
+    'tag', '\\begin',
+    'error', '}',
+    'bracket', '{'
+  ]
+);
+
+MT.testMode(
+  'tagErrorSquare',
+  '\\item]{',
+  [
+    'tag', '\\item',
+    'error', ']',
+    'bracket', '{'
+  ]
+);
+
+MT.testMode(
+  'commentCurly',
+  '% }',
+  [
+    'comment', '% }'
+  ]
+);
+
+MT.testMode(
+  'tagHash',
+  'the \\# key',
+  [
+    null, 'the ',
+    'tag', '\\#',
+    null, ' key'
+  ]
+);
+
+MT.testMode(
+  'tagNumber',
+  'a \\$5 stetson',
+  [
+    null, 'a ',
+    'tag', '\\$',
+  'atom', 5,
+  null, ' stetson'
+  ]
+);
+
+MT.testMode(
+  'tagPercent',
+  '100\\% beef',
+  [
+    'atom', '100',
+    'tag', '\\%',
+    null, ' beef'
+  ]
+);
+
+MT.testMode(
+  'tagAmpersand',
+  'L \\& N',
+  [
+    null, 'L ',
+    'tag', '\\&',
+    null, ' N'
+  ]
+);
+
+MT.testMode(
+  'tagUnderscore',
+  'foo\\_bar',
+  [
+    null, 'foo',
+    'tag', '\\_',
+    null, 'bar'
+  ]
+);
+
+MT.testMode(
+  'tagBracketOpen',
+  '\\emph{\\{}',
+  [
+    'tag', '\\emph',
+    'bracket', '{',
+    'tag', '\\{',
+    'bracket', '}'
+  ]
+);
+
+MT.testMode(
+  'tagBracketClose',
+  '\\emph{\\}}',
+  [
+    'tag', '\\emph',
+    'bracket', '{',
+    'tag', '\\}',
+    'bracket', '}'
+  ]
+);
+
+MT.testMode(
+  'tagLetterNumber',
+  'section \\S1',
+  [
+    null, 'section ',
+    'tag', '\\S',
+    'atom', '1'
+  ]
+);
+
+MT.testMode(
+  'textTagNumber',
+  'para \\P2',
+  [
+    null, 'para ',
+    'tag', '\\P',
+    'atom', '2'
+  ]
+);
+
+MT.testMode(
+  'thinspace',
+  'x\\,y', // thinspace
+  [
+    null, 'x',
+    'tag', '\\,',
+    null, 'y'
+  ]
+);
+
+MT.testMode(
+  'thickspace',
+  'x\\;y', // thickspace
+  [
+    null, 'x',
+    'tag', '\\;',
+    null, 'y'
+  ]
+);
+
+MT.testMode(
+  'negativeThinspace',
+  'x\\!y', // negative thinspace
+  [
+    null, 'x',
+    'tag', '\\!',
+    null, 'y'
+  ]
+);
+
+MT.testMode(
+  'periodNotSentence',
+  'J.\\ L.\\ is', // period not ending a sentence
+  [
+    null, 'J.\\ L.\\ is'
+  ]
+); // maybe could be better
+
+MT.testMode(
+  'periodSentence',
+  'X\\@. The', // period ending a sentence
+  [
+    null, 'X',
+    'tag', '\\@',
+    null, '. The'
+  ]
+);
+
+MT.testMode(
+  'italicCorrection',
+  '{\\em If\\/} I', // italic correction
+  [
+    'bracket', '{',
+    'tag', '\\em',
+    null, ' If',
+    'tag', '\\/',
+    'bracket', '}',
+    null, ' I'
+  ]
+);
+
+MT.testMode(
+  'tagBracket',
+  '\\newcommand{\\pop}',
+  [
+    'tag', '\\newcommand',
+    'bracket', '{',
+    'tag', '\\pop',
+    'bracket', '}'
+  ]
+);
\ No newline at end of file
diff --git a/test/driver.js b/test/driver.js
index 975c24f9fc..c64360af6e 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -1,35 +1,92 @@
-var tests = [], debug = null;
+var tests = [], debug = null, debugUsed = new Array(), allNames = [];
 
 function Failure(why) {this.message = why;}
 
 function test(name, run, expectedFail) {
+  // Force unique names
+  var originalName = name;
+  var i = 2; // Second function would be NAME_2
+  while(allNames.indexOf(name) !== -1){
+    i++;
+    name = originalName + "_" + i;
+  }
+  allNames.push(name);
+  // Add test
   tests.push({name: name, func: run, expectedFail: expectedFail});
   return name;
 }
 function testCM(name, run, opts, expectedFail) {
-  return test(name, function() {
+  return test("core_" + name, function() {
     var place = document.getElementById("testground"), cm = CodeMirror(place, opts);
-    if (debug) place.style.visibility = "";
-    try {run(cm);}
-    finally {if (!debug) place.removeChild(cm.getWrapperElement());}
+    try {
+      run(cm);
+    } finally {
+      if (debug) {
+        place.style.visibility = "";
+      } else {
+        place.removeChild(cm.getWrapperElement());
+      }
+    }
   }, expectedFail);
 }
 
 function runTests(callback) {
+  if (debug) {
+    if (debug.indexOf("verbose") === 0) {
+      verbose = true;
+      debug.splice(0, 1);
+    }
+    if (debug.length < 1) {
+      debug = null;
+    } else {
+      if (totalTests > debug.length) {
+        totalTests = debug.length;
+      }
+    }
+  }
   function step(i) {
-    if (i == tests.length) return callback("done");
+    if (i === tests.length){
+      running = false;
+      return callback("done");
+    }
     var test = tests[i], expFail = test.expectedFail;
-    if (debug != null && debug != test.name) return step(i + 1);
+    if (debug !== null) {
+      var debugIndex = debug.indexOf(test.name);
+      if (debugIndex !== -1) {
+        // Remove from array for reporting incorrect tests later
+        debug.splice(debugIndex, 1);
+      } else {
+        var wildcardName = test.name.split("_").shift() + "_*";
+        debugIndex = debug.indexOf(wildcardName);
+        if (debugIndex !== -1) {
+          // Remove from array for reporting incorrect tests later
+          debug.splice(debugIndex, 1);
+          debugUsed.push(wildcardName);
+        } else {
+          debugIndex = debugUsed.indexOf(wildcardName);
+          if (debugIndex !== -1) {
+            totalTests++;
+          } else {
+            return step(i + 1);
+          }
+        }
+      }
+    }
     try {
-      test.func();
-      if (expFail) callback("fail", test.name, "was expected to fail, but succeeded");
-      else callback("ok", test.name);
+      var message = test.func();
+      if (expFail) callback("fail", test.name, message);
+      else callback("ok", test.name, message);
     } catch(e) {
       if (expFail) callback("expected", test.name);
       else if (e instanceof Failure) callback("fail", test.name, e.message);
       else callback("error", test.name, e.toString());
     }
-    setTimeout(function(){step(i + 1);}, 20);
+    if (!quit) { // Run next test
+      setTimeout(function(){step(i + 1);}, 50);
+    } else { // Quit tests
+      running = false;
+      return null;
+    }
   }
   step(0);
 }
diff --git a/test/index.html b/test/index.html
index dd319e9db7..486d6d99e6 100644
--- a/test/index.html
+++ b/test/index.html
@@ -1,8 +1,11 @@
 <!doctype html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>CodeMirror: Test Suite</title>
     <link rel="stylesheet" href="../lib/codemirror.css">
+    <link rel="stylesheet" href="../doc/docs.css">
+    <link rel="stylesheet" href="mode_test.css">
     <script src="../lib/codemirror.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../mode/xml/xml.js"></script>
@@ -11,6 +14,7 @@
       .ok {color: #090;}
       .fail {color: #e00;}
       .error {color: #c90;}
+      .done {font-weight: bold;}
     </style>
   </head>
   <body>
@@ -19,42 +23,135 @@ <h1>CodeMirror: Test Suite</h1>
     <p>A limited set of programmatic sanity tests for CodeMirror.</p>
 
     <div style="border: 1px solid black; padding: 1px; max-width: 700px;">
-      <div style="background: #45d; white-space: pre; width: 0px; font-weight: bold; color: white; padding: 3px;" id=progress></div>
+      <div style="background: #45d; white-space: pre; width: 0px; font-weight: bold; color: white;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
     </div>
-    <pre style="padding-left: 5px" id=output></pre>
+    <p id=status>Please enable JavaScript...</p>
+    <div id=output></div>
 
-    <div style="visibility: hidden" id=testground>
-      <form><textarea id="code" name="code"></textarea><input type=submit value=ok name=submit></form>
-    </div>
+    <div style="visibility: hidden" id=testground></div>
 
     <script src="driver.js"></script>
     <script src="test.js"></script>
+    <script src="mode_test.js"></script>
+    <script src="../mode/markdown/markdown.js"></script>
+    <script src="../mode/markdown/test.js"></script>
+    <script src="../mode/stex/stex.js"></script>
+    <script src="../mode/stex/test.js"></script>
     <script>
       window.onload = function() {
-        runTests(displayTest);
+        runHarness();
       };
+      window.addEventListener('hashchange', function(){
+        runHarness();
+      });
 
       function esc(str) {
         return str.replace(/[<&]/, function(ch) { return ch == "<" ? "&lt;" : "&amp;"; });
       }
 
-      var output = document.getElementById("output"), progress = document.getElementById("progress");
-      var count = 0, failed = 0, bad = "";
-      function displayTest(type, name, msg) {
+      var output = document.getElementById("output")
+      ,   progress = document.getElementById("progress")
+      ,   progressRan = document.getElementById("progress_ran").childNodes[0]
+      ,   progressTotal = document.getElementById("progress_total").childNodes[0];
+      var count = 0
+      ,   failed = 0
+      ,   bad = ""
+      ,   running = false // Flag that states tests are running
+      ,   quit = false // Flag to quit tests ASAP
+      ,   verbose = false // Adds message for *every* test to output
+      ;
+      
+      function runHarness(){
+        if (running) {
+          quit = true;
+          setStatus("Restarting tests...", '', true);
+          setTimeout(function(){runHarness();}, 500);
+          return;
+        }
+        if (window.location.hash.substr(1)){
+          debug = window.location.hash.substr(1).split(",");
+        } else {
+          debug = null;
+        }
+        quit = false;
+        running = true;
+        setStatus("Loading tests...");
+        count = 0;
+        failed = 0;
+        bad = "";
+        debugUsed = Array();
+        totalTests = tests.length;
+        progressTotal.nodeValue = " of " + totalTests;
+        progressRan.nodeValue = count;
+        output.innerHTML = '';
+        document.getElementById("testground").innerHTML = "<form>" +
+          "<textarea id=\"code\" name=\"code\"></textarea>" +
+          "<input type=submit value=ok name=submit>" +
+          "</form>";
+        runTests(displayTest);
+      }
+      
+      function setStatus(message, className, force){
+        if (quit && !force) return;
+        if (!message) throw("must provide message");
+        var status = document.getElementById("status").childNodes[0];
+        status.nodeValue = message;
+        status.parentNode.setAttribute("class", className);
+      }
+      function addOutput(name, className, code){
+        var newOutput = document.createElement("dl");
+        var newTitle = document.createElement("dt");
+        newTitle.setAttribute("class", className);
+        newTitle.appendChild(document.createTextNode(name));
+        newOutput.appendChild(newTitle);
+        var newMessage = document.createElement("dd");
+        newMessage.innerHTML = code;
+        newOutput.appendChild(newTitle);
+        newOutput.appendChild(newMessage);
+        output.appendChild(newOutput);
+      }
+      function displayTest(type, name, customMessage) {
+        var message = "???";
         if (type != "done") ++count;
-        progress.style.width = (count * (progress.parentNode.clientWidth - 8) / tests.length) + "px";
-        progress.innerHTML = "Ran " + count + (count < tests.length ? " of " + tests.length : "") + " tests";
+        progress.style.width = (count * (progress.parentNode.clientWidth - 2) / totalTests) + "px";
+        progressTotal.nodeValue = " of " + totalTests +
+          (debugUsed.length && type != "done" ? "+" : "");
+        progressRan.nodeValue = count;
         if (type == "ok") {
-          output.innerHTML = bad + "<span class=ok>Test '" + esc(name) + "' succeeded</span>";
+          message = "Test '" + name + "' succeeded";
+          if (!verbose) customMessage = false;
         } else if (type == "expected") {
-          output.innerHTML = bad + "<span class=ok>Test '" + esc(name) + "' failed as expected</span>";
+          message = "Test '" + name + "' failed as expected";
+          if (!verbose) customMessage = false;
         } else if (type == "error" || type == "fail") {
           ++failed;
-          bad += esc(name) + ": <span class=" + type + ">" + esc(msg) + "</span><br>";
-          output.innerHTML = bad;
+          message = "Test '" + name + "' failed";
         } else if (type == "done") {
-          output.innerHTML = bad + (failed ? "<span class=fail>" + failed + " failure" + (failed > 1 ? "s" : "") + "</span>"
-                                           : "<span class=ok>All passed</span>");
+          if (failed) {
+            type += " fail";
+            message = failed + " failure" + (failed > 1 ? "s" : "");
+          } else if (count < totalTests) {
+            failed = totalTests - count;
+            type += " fail";
+            message = failed + " failure" + (failed > 1 ? "s" : "");
+          } else {
+            type += " ok";
+            message = "All passed";
+          }
+          if (debug && debug.length) {
+            var bogusTests = totalTests - count;
+            message += " — " + bogusTests + " nonexistent test" +
+              (bogusTests > 1 ? "s" : "") + " requested by location.hash: " +
+              "`" + debug.join("`, `") + "`";
+          } else {
+            progressTotal.nodeValue = '';
+          }
+          customMessage = true; // Hack to avoid adding to output
+        }
+        if (verbose && !customMessage)  customMessage = message;
+        setStatus(message, type);
+        if (customMessage.length > 0) {
+          addOutput(name, type, customMessage);
         }
       }
     </script>
diff --git a/test/mode_test.css b/test/mode_test.css
index f425922e5d..1ac66737fb 100644
--- a/test/mode_test.css
+++ b/test/mode_test.css
@@ -8,15 +8,3 @@
 .mt-output .mt-style {
   font-size: x-small;
 }
-
-.mt-test {
-  border-left: 10px solid #fff;
-}
-
-.mt-pass {
-  border-left: 10px solid #cfc;
-}
-
-.mt-fail {
-  border-left: 10px solid #fcc;
-}
diff --git a/test/mode_test.js b/test/mode_test.js
index 0bda5a2e78..b257d6ca36 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -10,33 +10,50 @@ ModeTest.modeOptions = {};
 ModeTest.modeName = CodeMirror.defaults.mode;
 
 /* keep track of results for printSummary */
-ModeTest.tests = 0;
+ModeTest.testCount = 0;
 ModeTest.passes = 0;
 
 /**
  * Run a test; prettyprints the results using document.write().
- *
- * @param string to highlight
- *
- * @param style[i] expected style of the i'th token in string
- *
- * @param token[i] expected value for the i'th token in string
+ * 
+ * @param name Name of test
+ * @param text String to highlight.
+ * @param expected Expected styles and tokens: Array(style, token, [style, token,...])
+ * @param modeName
+ * @param modeOptions
+ * @param expectedFail
  */
-ModeTest.test = function() {
-  ModeTest.tests += 1;
+ModeTest.testMode = function(name, text, expected, modeName, modeOptions, expectedFail) {
+  ModeTest.testCount += 1;
+  
+  if (!modeName) modeName = ModeTest.modeName;
+  
+  if (!modeOptions) modeOptions = ModeTest.modeOptions;
 
-  var mode = CodeMirror.getMode(ModeTest.modeOptions, ModeTest.modeName);
+  var mode = CodeMirror.getMode(modeOptions, modeName);
 
-  if (arguments.length < 1) {
-    throw "must have text for test";
+  if (expected.length < 0) {
+    throw "must have text for test (" + name + ")";
   }
-  if (arguments.length % 2 != 1) {
-    throw "must have text for test plus expected (style, token) pairs";
+  if (expected.length % 2 != 0) {
+    throw "must have text for test (" + name + ") plus expected (style, token) pairs";
   }
+  return test(
+    modeName + "_" + name,
+    function(){
+      var place = document.getElementById("testground"), cm = CodeMirror(place);
+      try {return ModeTest.compare(cm, text, expected, mode);}
+      finally {place.removeChild(cm.getWrapperElement());}
+    },
+    expectedFail
+  );
+  
+}
+
+ModeTest.compare = function (cm, text, arguments, mode) {
 
-  var text = arguments[0];
   var expectedOutput = [];
-  for (var i = 1; i < arguments.length; i += 2) {
+  for (var i = 0; i < arguments.length; i += 2) {
     arguments[i] = (arguments[i] != null ? arguments[i].split(' ').sort().join(' ') : arguments[i]);
     expectedOutput.push([arguments[i],arguments[i + 1]]);
   }
@@ -51,20 +68,26 @@ ModeTest.test = function() {
   }
 
   var s = '';
-  s += '<div class="mt-test ' + passStyle + '">';
-  s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
-  s +=   '<div class="cm-s-default">';
   if (pass || expectedOutput.length == 0) {
+    s += '<div class="mt-test ' + passStyle + '">';
+    s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
+    s +=   '<div class="cm-s-default">';
     s +=   ModeTest.prettyPrintOutputTable(observedOutput);
+    s +=   '</div>';
+    s += '</div>';
+    return s;
   } else {
+    s += '<div class="mt-test ' + passStyle + '">';
+    s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
+    s +=   '<div class="cm-s-default">';
     s += 'expected:';
     s +=   ModeTest.prettyPrintOutputTable(expectedOutput);
     s += 'observed:';
     s +=   ModeTest.prettyPrintOutputTable(observedOutput);
+    s +=   '</div>';
+    s += '</div>';
+    throw s;
   }
-  s +=   '</div>';
-  s += '</div>';
-  document.write(s);
 }
 
 /**
@@ -167,7 +190,8 @@ ModeTest.prettyPrintOutputTable = function(output) {
  * Print how many tests have run so far and how many of those passed.
  */
 ModeTest.printSummary = function() {
-  document.write(ModeTest.passes + ' passes for ' + ModeTest.tests + ' tests');
+  ModeTest.runTests(ModeTest.displayTest);
+  document.write(ModeTest.passes + ' passes for ' + ModeTest.testCount + ' tests');
 }
 
 /**
diff --git a/test/phantom_driver.js b/test/phantom_driver.js
index ad48fd1a84..e5072946c6 100644
--- a/test/phantom_driver.js
+++ b/test/phantom_driver.js
@@ -7,14 +7,14 @@ page.open("http://localhost:3000/test/index.html", function (status) {
   }
   waitFor(function () {
     return page.evaluate(function () {
-      var output = document.getElementById('output');
+      var output = document.getElementById('status');
       if (!output) { return false; }
-      return (/(\d+ failures?|all passed)$/i).test(output.innerText);
+      return (/^(\d+ failures?|all passed)/i).test(output.innerText);
     });
   }, function () {
     var failed = page.evaluate(function () { return window.failed; });
     var output = page.evaluate(function () {
-      return document.getElementById('output').innerText;
+      return document.getElementById('status').innerText;
     });
     console.log(output);
     phantom.exit(failed > 0 ? 1 : 0);
@@ -27,4 +27,4 @@ function waitFor (test, cb) {
   } else {
     setTimeout(function () { waitFor(test, cb); }, 250);
   }
-}
\ No newline at end of file
+}
diff --git a/test/test.js b/test/test.js
index 2c8e398c83..1c307eaba8 100644
--- a/test/test.js
+++ b/test/test.js
@@ -24,7 +24,7 @@ function byClassName(elt, cls) {
 
 var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
 
-test("fromTextArea", function() {
+test("core_fromTextArea", function() {
   var te = document.getElementById("code");
   te.value = "CONTENT";
   var cm = CodeMirror.fromTextArea(te);
@@ -108,7 +108,7 @@ testCM("indent", function(cm) {
   eq(cm.getLine(1), "\t\t  blah();");
 }, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true, tabSize: 8});
 
-test("defaults", function() {
+test("core_defaults", function() {
   var olddefaults = CodeMirror.defaults, defs = CodeMirror.defaults = {};
   for (var opt in olddefaults) defs[opt] = olddefaults[opt];
   defs.indentUnit = 5;

From b306f7cc4051e8e16df7fb8a0db9b094799747ef Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Sep 2012 10:44:52 +0200
Subject: [PATCH 23/93] Stop creating unused CodeMirror instances in mode tests

---
 test/mode_test.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/mode_test.js b/test/mode_test.js
index b257d6ca36..8d9df65e6c 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -41,16 +41,14 @@ ModeTest.testMode = function(name, text, expected, modeName, modeOptions, expect
   return test(
     modeName + "_" + name,
     function(){
-      var place = document.getElementById("testground"), cm = CodeMirror(place);
-      try {return ModeTest.compare(cm, text, expected, mode);}
-      finally {place.removeChild(cm.getWrapperElement());}
+      return ModeTest.compare(text, expected, mode);
     },
     expectedFail
   );
   
 }
 
-ModeTest.compare = function (cm, text, arguments, mode) {
+ModeTest.compare = function (text, arguments, mode) {
 
   var expectedOutput = [];
   for (var i = 0; i < arguments.length; i += 2) {

From dcc976c5a802885e1cacbea3d188e1005f791394 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Sep 2012 10:46:59 +0200
Subject: [PATCH 24/93] Don't wait 50 ms between tests

There are now enough tests to make this take a serious amount of time.

A 0 timeout seems to work just as well.
---
 test/driver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/driver.js b/test/driver.js
index c64360af6e..62af55a117 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -82,7 +82,7 @@ function runTests(callback) {
       else callback("error", test.name, e.toString());
     }
     if (!quit) { // Run next test
-      setTimeout(function(){step(i + 1);}, 50);
+      setTimeout(function(){step(i + 1);}, 0);
     } else { // Quit tests
       running = false;
       return null;

From fafa9d2495ad1b3d3fd771129e7ef44287f8b7e1 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Fri, 7 Sep 2012 10:59:48 -0400
Subject: [PATCH 25/93] Prevent tests from locking up browser on slower
 machines (closes #805).

---
 test/driver.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index 62af55a117..a4b09fef5e 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -44,12 +44,16 @@ function runTests(callback) {
       }
     }
   }
+  var totalTime = 0;
   function step(i) {
     if (i === tests.length){
       running = false;
       return callback("done");
     }
-    var test = tests[i], expFail = test.expectedFail;
+    var test = tests[i]
+    ,   expFail = test.expectedFail
+    ,   startTime = Date.now()
+    ;
     if (debug !== null) {
       var debugIndex = debug.indexOf(test.name);
       if (debugIndex !== -1) {
@@ -82,7 +86,13 @@ function runTests(callback) {
       else callback("error", test.name, e.toString());
     }
     if (!quit) { // Run next test
-      setTimeout(function(){step(i + 1);}, 0);
+      var delay = 0;
+      totalTime += (Date.now() - startTime);
+      if (totalTime > 500){
+        totalTime = 0;
+        delay = 50;
+      }
+      setTimeout(function(){step(i + 1);}, delay);
     } else { // Quit tests
       running = false;
       return null;

From cab941773a50da94ecf524668aefd53b4e7cefe7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Sep 2012 18:18:43 +0200
Subject: [PATCH 26/93] Fix a number of ECMA-5-isms in the test runner

We do still support IE7/8.

Also removes some non-CodeMirror-code-style things like left-aligned
commas and semicolons.
---
 test/driver.js  | 24 ++++++++++++++----------
 test/index.html | 27 +++++++++++++--------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index a4b09fef5e..108ff0eadb 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -2,11 +2,18 @@ var tests = [], debug = null, debugUsed = new Array(), allNames = [];
 
 function Failure(why) {this.message = why;}
 
+function indexOf(collection, elt) {
+  if (collection.indexOf) return collection.indexOf(elt);
+  for (var i = 0, e = collection.length; i < e; ++i)
+    if (collection[i] == elt) return i;
+  return -1;
+}
+
 function test(name, run, expectedFail) {
   // Force unique names
   var originalName = name;
   var i = 2; // Second function would be NAME_2
-  while(allNames.indexOf(name) !== -1){
+  while (indexOf(allNames, name) !== -1){
     i++;
     name = originalName + "_" + i;
   }
@@ -32,7 +39,7 @@ function testCM(name, run, opts, expectedFail) {
 
 function runTests(callback) {
   if (debug) {
-    if (debug.indexOf("verbose") === 0) {
+    if (indexOf(debug, "verbose") === 0) {
       verbose = true;
       debug.splice(0, 1);
     }
@@ -50,24 +57,21 @@ function runTests(callback) {
       running = false;
       return callback("done");
     }
-    var test = tests[i]
-    ,   expFail = test.expectedFail
-    ,   startTime = Date.now()
-    ;
+    var test = tests[i], expFail = test.expectedFail, startTime = +new Date;
     if (debug !== null) {
-      var debugIndex = debug.indexOf(test.name);
+      var debugIndex = indexOf(debug, test.name);
       if (debugIndex !== -1) {
         // Remove from array for reporting incorrect tests later
         debug.splice(debugIndex, 1);
       } else {
         var wildcardName = test.name.split("_").shift() + "_*";
-        debugIndex = debug.indexOf(wildcardName);
+        debugIndex = indexOf(debug, wildcardName);
         if (debugIndex !== -1) {
           // Remove from array for reporting incorrect tests later
           debug.splice(debugIndex, 1);
           debugUsed.push(wildcardName);
         } else {
-          debugIndex = debugUsed.indexOf(wildcardName);
+          debugIndex = indexOf(debugUsed, wildcardName);
           if (debugIndex !== -1) {
             totalTests++;
           } else {
@@ -87,7 +91,7 @@ function runTests(callback) {
     }
     if (!quit) { // Run next test
       var delay = 0;
-      totalTime += (Date.now() - startTime);
+      totalTime += (+new Date) - startTime;
       if (totalTime > 500){
         totalTime = 0;
         delay = 50;
diff --git a/test/index.html b/test/index.html
index 486d6d99e6..af12d844f0 100644
--- a/test/index.html
+++ b/test/index.html
@@ -41,7 +41,7 @@ <h1>CodeMirror: Test Suite</h1>
       window.onload = function() {
         runHarness();
       };
-      window.addEventListener('hashchange', function(){
+      CodeMirror.connect(window, 'hashchange', function(){
         runHarness();
       });
 
@@ -49,17 +49,16 @@ <h1>CodeMirror: Test Suite</h1>
         return str.replace(/[<&]/, function(ch) { return ch == "<" ? "&lt;" : "&amp;"; });
       }
 
-      var output = document.getElementById("output")
-      ,   progress = document.getElementById("progress")
-      ,   progressRan = document.getElementById("progress_ran").childNodes[0]
-      ,   progressTotal = document.getElementById("progress_total").childNodes[0];
-      var count = 0
-      ,   failed = 0
-      ,   bad = ""
-      ,   running = false // Flag that states tests are running
-      ,   quit = false // Flag to quit tests ASAP
-      ,   verbose = false // Adds message for *every* test to output
-      ;
+      var output = document.getElementById("output"),
+          progress = document.getElementById("progress"),
+          progressRan = document.getElementById("progress_ran").childNodes[0],
+          progressTotal = document.getElementById("progress_total").childNodes[0];
+      var count = 0,
+          failed = 0,
+          bad = "",
+          running = false, // Flag that states tests are running
+         quit = false, // Flag to quit tests ASAP
+         verbose = false; // Adds message for *every* test to output
       
       function runHarness(){
         if (running) {
@@ -96,12 +95,12 @@ <h1>CodeMirror: Test Suite</h1>
         if (!message) throw("must provide message");
         var status = document.getElementById("status").childNodes[0];
         status.nodeValue = message;
-        status.parentNode.setAttribute("class", className);
+        status.parentNode.className = className;
       }
       function addOutput(name, className, code){
         var newOutput = document.createElement("dl");
         var newTitle = document.createElement("dt");
-        newTitle.setAttribute("class", className);
+        newTitle.className = className;
         newTitle.appendChild(document.createTextNode(name));
         newOutput.appendChild(newTitle);
         var newMessage = document.createElement("dd");

From 5d3d207cf6dec757b8bfc880158158fe82420e1c Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Fri, 7 Sep 2012 11:12:58 -0400
Subject: [PATCH 27/93] A few small improvements to the test suite:

- Move unchanging styles for #progress to style sheet

- Forgot to update testCM() when I added the `verbose` option
---
 test/driver.js  | 4 +++-
 test/index.html | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index 108ff0eadb..9ee68fac02 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -25,10 +25,12 @@ function test(name, run, expectedFail) {
 function testCM(name, run, opts, expectedFail) {
   return test("core_" + name, function() {
     var place = document.getElementById("testground"), cm = CodeMirror(place, opts);
+    var successful = false;
     try {
       run(cm);
+      successful = true;
     } finally {
-      if (debug) {
+      if ((debug && !successful) || verbose) {
         place.style.visibility = "";
       } else {
         place.removeChild(cm.getWrapperElement());
diff --git a/test/index.html b/test/index.html
index af12d844f0..85fc7b8d48 100644
--- a/test/index.html
+++ b/test/index.html
@@ -15,6 +15,12 @@
       .fail {color: #e00;}
       .error {color: #c90;}
       .done {font-weight: bold;}
+      #progress {
+        background: #45d;
+        color: white;
+        font-weight: bold;
+        white-space: pre;
+      }
     </style>
   </head>
   <body>
@@ -23,7 +29,7 @@ <h1>CodeMirror: Test Suite</h1>
     <p>A limited set of programmatic sanity tests for CodeMirror.</p>
 
     <div style="border: 1px solid black; padding: 1px; max-width: 700px;">
-      <div style="background: #45d; white-space: pre; width: 0px; font-weight: bold; color: white;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
+      <div style="width: 0px;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
     </div>
     <p id=status>Please enable JavaScript...</p>
     <div id=output></div>

From bd9a83b5480d5daefa95d1a2cc197738c382d43f Mon Sep 17 00:00:00 2001
From: dagsta <daya_1@gmx.de>
Date: Fri, 7 Sep 2012 19:56:51 +0300
Subject: [PATCH 28/93] Extend closetag to work with html / PHP Mixed Code

I just added support for closing Tags inside a file in "application/x-httpd-php" Mode including HTML Code
---
 lib/util/closetag.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/util/closetag.js b/lib/util/closetag.js
index 656e93c288..8446ae67e9 100644
--- a/lib/util/closetag.js
+++ b/lib/util/closetag.js
@@ -41,7 +41,7 @@
 		
 		var mode = cm.getOption('mode');
 		
-		if (mode == 'text/html' || mode == 'xml') {
+		if (mode == 'text/html' || mode == 'xml' || mode == 'application/x-httpd-php') {
 		
 			/*
 			 * Relevant structure of token:
@@ -72,7 +72,7 @@
 			}
 			
 			if (ch == '>') {
-				var type = state.htmlState ? state.htmlState.type : state.type; // htmlmixed : xml
+				var type = state.htmlState ? state.htmlState.type : state.html ? state.html.type : state.type; // htmlmixed : xml : php
 				
 				if (tok.className == 'tag' && type == 'closeTag') {
 					throw CodeMirror.Pass; // Don't process the '>' at the end of an end-tag.
@@ -84,10 +84,10 @@
 		
 				tok = cm.getTokenAt(cm.getCursor());
 				state = tok.state;
-				type = state.htmlState ? state.htmlState.type : state.type; // htmlmixed : xml
+				type = state.htmlState ? state.htmlState.type : state.html ? state.html.type : state.type; // htmlmixed : xml : php
 
 				if (tok.className == 'tag' && type != 'selfcloseTag') {
-					var tagName = state.htmlState ? state.htmlState.tagName : state.tagName; // htmlmixed : xml
+					var tagName = state.htmlState ? state.htmlState.tagName : state.html ? state.html.tagName : state.tagName; // htmlmixed : xml : php
 					if (tagName.length > 0 && shouldClose(cm, vd, tagName)) {
 						insertEndTag(cm, indent, pos, tagName);
 					}

From 1cea0775fe251bff6cb4f8dc5fe88caf3064f1fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Sep 2012 20:34:34 +0200
Subject: [PATCH 29/93] [util/closetag] Clean up handling of different modes

---
 lib/util/closetag.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/util/closetag.js b/lib/util/closetag.js
index 8446ae67e9..566d2a30e0 100644
--- a/lib/util/closetag.js
+++ b/lib/util/closetag.js
@@ -26,6 +26,17 @@
 	/** Array of tag names where an end tag is forbidden. */
 	CodeMirror.defaults['closeTagVoid'] = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 
+	function resolveMode(mode) {
+		if (typeof mode == "object") return mode.name;
+		if (mode.indexOf("/") > -1) return resolveMode(CodeMirror.mimeModes[mode]);
+		else return mode;
+	}
+
+	function innerState(state) {
+		// htmlmixed uses .htmlState, PHP .html, XML just the top state object
+		return state.htmlState || state.html || state;
+	}
+
 	/**
 	 * Call during key processing to close tags.  Handles the key event if the tag is closed, otherwise throws CodeMirror.Pass.
 	 * - cm: The editor instance.
@@ -39,9 +50,8 @@
 			throw CodeMirror.Pass;
 		}
 		
-		var mode = cm.getOption('mode');
 		
-		if (mode == 'text/html' || mode == 'xml' || mode == 'application/x-httpd-php') {
+		if (/^(xml|php|htmlmixed)$/.test(resolveMode(cm.getOption('mode')))) {
 		
 			/*
 			 * Relevant structure of token:
@@ -72,7 +82,7 @@
 			}
 			
 			if (ch == '>') {
-				var type = state.htmlState ? state.htmlState.type : state.html ? state.html.type : state.type; // htmlmixed : xml : php
+				var type = innerState(state).type;
 				
 				if (tok.className == 'tag' && type == 'closeTag') {
 					throw CodeMirror.Pass; // Don't process the '>' at the end of an end-tag.
@@ -84,10 +94,10 @@
 		
 				tok = cm.getTokenAt(cm.getCursor());
 				state = tok.state;
-				type = state.htmlState ? state.htmlState.type : state.html ? state.html.type : state.type; // htmlmixed : xml : php
+				var type = innerState(state).type;
 
 				if (tok.className == 'tag' && type != 'selfcloseTag') {
-					var tagName = state.htmlState ? state.htmlState.tagName : state.html ? state.html.tagName : state.tagName; // htmlmixed : xml : php
+					var tagName = innerState(state).tagName;
 					if (tagName.length > 0 && shouldClose(cm, vd, tagName)) {
 						insertEndTag(cm, indent, pos, tagName);
 					}
@@ -100,7 +110,7 @@
 			
 			} else if (ch == '/') {
 				if (tok.className == 'tag' && tok.string == '<') {
-					var tagName = state.htmlState ? (state.htmlState.context ? state.htmlState.context.tagName : '') : (state.context ? state.context.tagName : ''); // htmlmixed : xml
+					var ctx = innerState(state).context, tagName = ctx && ctx.tagName;
 					if (tagName.length > 0) {
 						completeEndTag(cm, pos, tagName);
 						return;

From 2d38a15f8771a11c1d527d7d2a15599d6f6b5b27 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Sep 2012 20:37:55 +0200
Subject: [PATCH 30/93] [util/closetag] Fix problem introduced by previous
 patch

---
 lib/util/closetag.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/closetag.js b/lib/util/closetag.js
index 566d2a30e0..5b2a900139 100644
--- a/lib/util/closetag.js
+++ b/lib/util/closetag.js
@@ -110,7 +110,7 @@
 			
 			} else if (ch == '/') {
 				if (tok.className == 'tag' && tok.string == '<') {
-					var ctx = innerState(state).context, tagName = ctx && ctx.tagName;
+					var ctx = innerState(state).context, tagName = ctx ? ctx.tagName : '';
 					if (tagName.length > 0) {
 						completeEndTag(cm, pos, tagName);
 						return;

From ba11716cb592c099cb6d73017b02cb2eb4080afe Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sat, 8 Sep 2012 16:21:50 -0400
Subject: [PATCH 31/93] Reset `verbose` flag when running tests.

---
 test/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/index.html b/test/index.html
index 85fc7b8d48..ab40e63267 100644
--- a/test/index.html
+++ b/test/index.html
@@ -84,6 +84,7 @@ <h1>CodeMirror: Test Suite</h1>
         count = 0;
         failed = 0;
         bad = "";
+        verbose = false;
         debugUsed = Array();
         totalTests = tests.length;
         progressTotal.nodeValue = " of " + totalTests;

From cde3d179347ab308013c9f8070aaa1886d4284a5 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 9 Sep 2012 01:18:34 -0400
Subject: [PATCH 32/93] Fix bug with duplicate test names starting out at the
 wrong number.

If two tests have the name "foo", the second should appear as "foo_2", but instead it appeared as "foo_3".
---
 test/driver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/driver.js b/test/driver.js
index 9ee68fac02..5ad20425d6 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -14,8 +14,8 @@ function test(name, run, expectedFail) {
   var originalName = name;
   var i = 2; // Second function would be NAME_2
   while (indexOf(allNames, name) !== -1){
-    i++;
     name = originalName + "_" + i;
+    i++;
   }
   allNames.push(name);
   // Add test

From c9fb2ba15ac8caf3815a1f15bc825e2f45212b89 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 9 Sep 2012 01:47:00 -0400
Subject: [PATCH 33/93] Add a text-shadow behind test progress text so it's
 readable while the progress bar hasn't passed yet.

---
 test/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/index.html b/test/index.html
index ab40e63267..edea7d106f 100644
--- a/test/index.html
+++ b/test/index.html
@@ -18,6 +18,7 @@
       #progress {
         background: #45d;
         color: white;
+        text-shadow: 0 0 1px #45d, 0 0 2px #45d, 0 0 3px #45d;
         font-weight: bold;
         white-space: pre;
       }

From d0a4a6733e13a2096efce0df1b2992daf827380c Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sat, 8 Sep 2012 18:36:09 -0400
Subject: [PATCH 34/93] Add tests for CSS mode and fixed found bugs

- Added link to tests on mode page
- More consistent naming with CSS spec (some of the previous var naming was completely incorrect/misleading)
- Improved highlighting
  - Match vendor prefixes
  - Check for known properties and values (known properties are bold, unknown are not)
  - Added highlighting for media queries
- Cleaner stacking of state
---
 mode/css/css.css    |   7 +
 mode/css/css.js     | 400 +++++++++++++++++++++++++++++------
 mode/css/index.html |   3 +
 mode/css/test.js    | 501 ++++++++++++++++++++++++++++++++++++++++++++
 test/index.html     |   2 +
 5 files changed, 850 insertions(+), 63 deletions(-)
 create mode 100644 mode/css/css.css
 create mode 100644 mode/css/test.js

diff --git a/mode/css/css.css b/mode/css/css.css
new file mode 100644
index 0000000000..caa2afdac8
--- /dev/null
+++ b/mode/css/css.css
@@ -0,0 +1,7 @@
+/* Change error (warning) so it's not so scary */
+.cm-s-default span.cm-property {font-weight: bold;}
+.cm-s-default span.cm-property.cm-error {color: black; font-weight: normal;}
+
+/* Differentiate color from .cm-def and change error (warning) so it's not so scary */
+.cm-s-default span.cm-attribute {color: #c0c; font-weight: bold;}
+.cm-s-default span.cm-attribute.cm-error {color: #c0c; font-weight: normal;}
\ No newline at end of file
diff --git a/mode/css/css.js b/mode/css/css.js
index 9428c4e32e..d7163201dd 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -1,60 +1,196 @@
 CodeMirror.defineMode("css", function(config) {
   var indentUnit = config.indentUnit, type;
+  
+  var atMediaTypes = keySet([
+    "all", "aural", "braille", "handheld", "print", "projection", "screen",
+    "tty", "tv", "embossed"
+  ]);
+  
+  var atMediaFeatures = keySet([
+    "width", "min-width", "max-width", "height", "min-height", "max-height",
+    "device-width", "min-device-width", "max-device-width", "device-height",
+    "min-device-height", "max-device-height", "aspect-ratio",
+    "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio",
+    "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
+    "max-color", "color-index", "min-color-index", "max-color-index",
+    "monochrome", "min-monochrome", "max-monochrome", "resolution",
+    "min-resolution", "max-resolution", "scan", "grid"
+  ]);
 
-  var keywords = keySet(["above", "absolute", "activeborder", "activecaption", "afar", "after-white-space", "ahead", "alias", "all", "all-scroll",
-    "alternate", "always", "amharic", "amharic-abegede", "antialiased", "appworkspace", "arabic-indic", "armenian", "asterisks",
-    "auto", "avoid", "background", "backwards", "baseline", "below", "bidi-override", "binary", "bengali", "blink",
-    "block", "block-axis", "bold", "bolder", "border", "border-box", "both", "bottom", "break-all", "break-word", "button",
-    "button-bevel", "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian", "capitalize", "caps-lock-indicator",
-    "caption", "captiontext", "caret", "cell", "center", "checkbox", "circle", "cjk-earthly-branch", "cjk-heavenly-stem", "cjk-ideographic",
-    "clear", "clip", "close-quote", "col-resize", "collapse", "compact", "condensed", "contain", "content", "content-box", "context-menu",
-    "continuous", "copy", "cover", "crop", "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal", "decimal-leading-zero", "default",
-    "default-button", "destination-atop", "destination-in", "destination-out", "destination-over", "devanagari", "disc", "discard", "document",
-    "dot-dash", "dot-dot-dash", "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out", "element",
-    "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede", "ethiopic-abegede-am-et", "ethiopic-abegede-gez",
-    "ethiopic-abegede-ti-er", "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er", "ethiopic-halehame-aa-et",
-    "ethiopic-halehame-am-et", "ethiopic-halehame-gez", "ethiopic-halehame-om-et", "ethiopic-halehame-sid-et",
-    "ethiopic-halehame-so-et", "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig", "ew-resize", "expanded",
-    "extra-condensed", "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "footnotes", "forwards", "from", "geometricPrecision",
-    "georgian", "graytext", "groove", "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew", "help",
-    "hidden", "hide", "higher", "highlight", "highlighttext", "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
-    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite", "infobackground", "infotext", "inherit", "initial", "inline",
-    "inline-axis", "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert", "italic", "justify", "kannada", "katakana",
-    "katakana-iroha", "khmer", "landscape", "lao", "large", "larger", "left", "level", "lighter", "line-through", "linear", "lines",
-    "list-item", "listbox", "listitem", "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian", "lower-greek",
-    "lower-hexadecimal", "lower-latin", "lower-norwegian", "lower-roman", "lowercase", "ltr", "malayalam", "match", "media-controls-background",
-    "media-current-time-display", "media-fullscreen-button", "media-mute-button", "media-play-button", "media-return-to-realtime-button",
-    "media-rewind-button", "media-seek-back-button", "media-seek-forward-button", "media-slider", "media-sliderthumb", "media-time-remaining-display",
-    "media-volume-slider", "media-volume-slider-container", "media-volume-sliderthumb", "medium", "menu", "menulist", "menulist-button",
-    "menulist-text", "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic", "mix", "mongolian", "monospace", "move", "multiple",
-    "myanmar", "n-resize", "narrower", "navy", "ne-resize", "nesw-resize", "no-close-quote", "no-drop", "no-open-quote", "no-repeat", "none",
-    "normal", "not-allowed", "nowrap", "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote", "optimizeLegibility",
-    "optimizeSpeed", "oriya", "oromo", "outset", "outside", "overlay", "overline", "padding", "padding-box", "painted", "paused",
-    "persian", "plus-darker", "plus-lighter", "pointer", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress",
-    "push-button", "radio", "read-only", "read-write", "read-write-plaintext-only", "relative", "repeat", "repeat-x",
-    "repeat-y", "reset", "reverse", "rgb", "rgba", "ridge", "right", "round", "row-resize", "rtl", "run-in", "running", "s-resize", "sans-serif",
-    "scroll", "scrollbar", "se-resize", "searchfield", "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
-    "searchfield-results-decoration", "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama", "single",
-    "skip-white-space", "slide", "slider-horizontal", "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
-    "small", "small-caps", "small-caption", "smaller", "solid", "somali", "source-atop", "source-in", "source-out", "source-over",
-    "space", "square", "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub", "subpixel-antialiased", "super",
-    "sw-resize", "table", "table-caption", "table-cell", "table-column", "table-column-group", "table-footer-group", "table-header-group",
-    "table-row", "table-row-group", "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai", "thick", "thin",
-    "threeddarkshadow", "threedface", "threedhighlight", "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er", "tigrinya-er-abegede",
-    "tigrinya-et", "tigrinya-et-abegede", "to", "top", "transparent", "ultra-condensed", "ultra-expanded", "underline", "up", "upper-alpha", "upper-armenian",
-    "upper-greek", "upper-hexadecimal", "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url", "vertical", "vertical-text", "visible",
-    "visibleFill", "visiblePainted", "visibleStroke", "visual", "w-resize", "wait", "wave", "white", "wider", "window", "windowframe", "windowtext",
-    "x-large", "x-small", "xor", "xx-large", "xx-small", "yellow", "-wap-marquee", "-webkit-activelink", "-webkit-auto", "-webkit-baseline-middle",
-    "-webkit-body", "-webkit-box", "-webkit-center", "-webkit-control", "-webkit-focus-ring-color", "-webkit-grab", "-webkit-grabbing",
-    "-webkit-gradient", "-webkit-inline-box", "-webkit-left", "-webkit-link", "-webkit-marquee", "-webkit-mini-control", "-webkit-nowrap", "-webkit-pictograph",
-    "-webkit-right", "-webkit-small-control", "-webkit-text", "-webkit-xxx-large", "-webkit-zoom-in", "-webkit-zoom-out"]);
+  var propertyKeywords = keySet([
+    "align-content", "align-items", "align-self", "alignment-adjust",
+    "alignment-baseline", "anchor-point", "animation", "animation-delay",
+    "animation-direction", "animation-duration", "animation-iteration-count",
+    "animation-name", "animation-play-state", "animation-timing-function",
+    "appearance", "azimuth", "backface-visibility", "background",
+    "background-attachment", "background-clip", "background-color",
+    "background-image", "background-origin", "background-position",
+    "background-repeat", "background-size", "baseline-shift", "binding",
+    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
+    "bookmark-target", "border", "border-bottom", "border-bottom-color",
+    "border-bottom-left-radius", "border-bottom-right-radius",
+    "border-bottom-style", "border-bottom-width", "border-collapse",
+    "border-color", "border-image", "border-image-outset",
+    "border-image-repeat", "border-image-slice", "border-image-source",
+    "border-image-width", "border-left", "border-left-color",
+    "border-left-style", "border-left-width", "border-radius", "border-right",
+    "border-right-color", "border-right-style", "border-right-width",
+    "border-spacing", "border-style", "border-top", "border-top-color",
+    "border-top-left-radius", "border-top-right-radius", "border-top-style",
+    "border-top-width", "border-width", "bottom", "box-decoration-break",
+    "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
+    "caption-side", "clear", "clip", "color", "color-profile", "column-count",
+    "column-fill", "column-gap", "column-rule", "column-rule-color",
+    "column-rule-style", "column-rule-width", "column-span", "column-width",
+    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
+    "cue-after", "cue-before", "cursor", "direction", "display",
+    "dominant-baseline", "drop-initial-after-adjust",
+    "drop-initial-after-align", "drop-initial-before-adjust",
+    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
+    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
+    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
+    "float", "float-offset", "font", "font-feature-settings", "font-family",
+    "font-kerning", "font-language-override", "font-size", "font-size-adjust",
+    "font-stretch", "font-style", "font-synthesis", "font-variant",
+    "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
+    "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
+    "font-weight", "grid-cell", "grid-column", "grid-column-align",
+    "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow",
+    "grid-row", "grid-row-align", "grid-row-sizing", "grid-row-span",
+    "grid-rows", "grid-template", "hanging-punctuation", "height", "hyphens",
+    "icon", "image-orientation", "image-rendering", "image-resolution",
+    "inline-box-align", "justify-content", "left", "letter-spacing",
+    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
+    "line-stacking-shift", "line-stacking-strategy", "list-style",
+    "list-style-image", "list-style-position", "list-style-type", "margin",
+    "margin-bottom", "margin-left", "margin-right", "margin-top",
+    "marker-offset", "marks", "marquee-direction", "marquee-loop",
+    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
+    "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
+    "nav-left", "nav-right", "nav-up", "opacity", "order", "orphans", "outline",
+    "outline-color", "outline-offset", "outline-style", "outline-width",
+    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
+    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
+    "page", "page-break-after", "page-break-before", "page-break-inside",
+    "page-policy", "pause", "pause-after", "pause-before", "perspective",
+    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
+    "presentation-level", "punctuation-trim", "quotes", "rendering-intent",
+    "resize", "rest", "rest-after", "rest-before", "richness", "right",
+    "rotation", "rotation-point", "ruby-align", "ruby-overhang",
+    "ruby-position", "ruby-span", "size", "speak", "speak-as", "speak-header",
+    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
+    "tab-size", "table-layout", "target", "target-name", "target-new",
+    "target-position", "text-align", "text-align-last", "text-decoration",
+    "text-decoration-color", "text-decoration-line", "text-decoration-skip",
+    "text-decoration-style", "text-emphasis", "text-emphasis-color",
+    "text-emphasis-position", "text-emphasis-style", "text-height",
+    "text-indent", "text-justify", "text-outline", "text-shadow",
+    "text-space-collapse", "text-transform", "text-underline-position",
+    "text-wrap", "top", "transform", "transform-origin", "transform-style",
+    "transition", "transition-delay", "transition-duration",
+    "transition-property", "transition-timing-function", "unicode-bidi",
+    "vertical-align", "visibility", "voice-balance", "voice-duration",
+    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
+    "voice-volume", "volume", "white-space", "widows", "width", "word-break",
+    "word-spacing", "word-wrap", "z-index"
+  ]);
+
+  var colorKeywords = keySet([
+    "black", "silver", "gray", "white", "maroon", "red", "purple", "fuchsia",
+    "green", "lime", "olive", "yellow", "navy", "blue", "teal", "aqua"
+  ]);
+  
+  var valueKeywords = keySet([
+    "above", "absolute", "activeborder", "activecaption", "afar",
+    "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate",
+    "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
+    "arabic-indic", "armenian", "asterisks", "auto", "avoid", "background",
+    "backwards", "baseline", "below", "bidi-override", "binary", "bengali",
+    "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
+    "both", "bottom", "break-all", "break-word", "button", "button-bevel",
+    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian",
+    "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
+    "cell", "center", "checkbox", "circle", "cjk-earthly-branch",
+    "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
+    "col-resize", "collapse", "compact", "condensed", "contain", "content",
+    "content-box", "context-menu", "continuous", "copy", "cover", "crop",
+    "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal",
+    "decimal-leading-zero", "default", "default-button", "destination-atop",
+    "destination-in", "destination-out", "destination-over", "devanagari",
+    "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted",
+    "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
+    "element", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
+    "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
+    "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
+    "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
+    "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
+    "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
+    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et",
+    "ethiopic-halehame-tig", "ew-resize", "expanded", "extra-condensed",
+    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "footnotes",
+    "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
+    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
+    "help", "hidden", "hide", "higher", "highlight", "highlighttext",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
+    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
+    "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
+    "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert",
+    "italic", "justify", "kannada", "katakana", "katakana-iroha", "khmer",
+    "landscape", "lao", "large", "larger", "left", "level", "lighter",
+    "line-through", "linear", "lines", "list-item", "listbox", "listitem",
+    "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
+    "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
+    "lower-roman", "lowercase", "ltr", "malayalam", "match",
+    "media-controls-background", "media-current-time-display",
+    "media-fullscreen-button", "media-mute-button", "media-play-button",
+    "media-return-to-realtime-button", "media-rewind-button",
+    "media-seek-back-button", "media-seek-forward-button", "media-slider",
+    "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",
+    "media-volume-slider-container", "media-volume-sliderthumb", "medium",
+    "menu", "menulist", "menulist-button", "menulist-text",
+    "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
+    "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
+    "narrower", "navy", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
+    "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
+    "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
+    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
+    "outside", "overlay", "overline", "padding", "padding-box", "painted",
+    "paused", "persian", "plus-darker", "plus-lighter", "pointer", "portrait",
+    "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button",
+    "radio", "read-only", "read-write", "read-write-plaintext-only", "relative",
+    "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba",
+    "ridge", "right", "round", "row-resize", "rtl", "run-in", "running",
+    "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield",
+    "searchfield-cancel-button", "searchfield-decoration",
+    "searchfield-results-button", "searchfield-results-decoration",
+    "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
+    "single", "skip-white-space", "slide", "slider-horizontal",
+    "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
+    "small", "small-caps", "small-caption", "smaller", "solid", "somali",
+    "source-atop", "source-in", "source-out", "source-over", "space", "square",
+    "square-button", "start", "static", "status-bar", "stretch", "stroke",
+    "sub", "subpixel-antialiased", "super", "sw-resize", "table",
+    "table-caption", "table-cell", "table-column", "table-column-group",
+    "table-footer-group", "table-header-group", "table-row", "table-row-group",
+    "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
+    "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
+    "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
+    "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
+    "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
+    "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
+    "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
+    "visibleStroke", "visual", "w-resize", "wait", "wave", "white", "wider",
+    "window", "windowframe", "windowtext", "x-large", "x-small", "xor",
+    "xx-large", "xx-small", "yellow"
+  ]);
 
   function keySet(array) { var keys = {}; for (var i = 0; i < array.length; ++i) keys[array[i]] = true; return keys; }
   function ret(style, tp) {type = tp; return style;}
 
   function tokenBase(stream, state) {
     var ch = stream.next();
-    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("meta", stream.current());}
+    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("def", stream.current());}
     else if (ch == "/" && stream.eat("*")) {
       state.tokenize = tokenCComment;
       return tokenCComment(stream, state);
@@ -75,21 +211,35 @@ CodeMirror.defineMode("css", function(config) {
     }
     else if (ch == "!") {
       stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
+      return ret("builtin", "important");
     }
     else if (/\d/.test(ch)) {
       stream.eatWhile(/[\w.%]/);
       return ret("number", "unit");
     }
-    else if (/[,.+>*\/]/.test(ch)) {
+    else if (ch === "-") {
+      if (/\d/.test(stream.peek())) {
+        stream.eatWhile(/[\w.%]/);
+        return ret("number", "unit");
+      } else if (stream.match(/^[^-]+-/)) {
+        return ret("meta", type);
+      }
+    }
+    else if (/[,+>*\/]/.test(ch)) {
       return ret(null, "select-op");
     }
-    else if (/[;{}:\[\]\(\)]/.test(ch)) {
+    else if (ch == "." && stream.match(/^\w+/)) {
+      return ret("qualifier", type);
+    }
+    else if (ch == ":") {
+      return ret("operator", ch);
+    }
+    else if (/[;{}\[\]\(\)]/.test(ch)) {
       return ret(null, ch);
     }
     else {
       stream.eatWhile(/[\w\\\-]/);
-      return ret("variable", "variable");
+      return ret("property", "variable");
     }
   }
 
@@ -138,32 +288,156 @@ CodeMirror.defineMode("css", function(config) {
     },
 
     token: function(stream, state) {
+      
+      // Use these terms when applicable (see http://www.xanthir.com/blog/b4E50)
+      // 
+      // rule** or **ruleset:
+      // A selector + braces combo, or an at-rule.
+      // 
+      // declaration block:
+      // A sequence of declarations.
+      // 
+      // declaration:
+      // A property + colon + value combo.
+      // 
+      // property value:
+      // The entire value of a property.
+      // 
+      // component value:
+      // A single piece of a property value. Like the 5px in
+      // text-shadow: 0 0 5px blue;. Can also refer to things that are
+      // multiple terms, like the 1-4 terms that make up the background-size
+      // portion of the background shorthand.
+      // 
+      // term:
+      // The basic unit of author-facing CSS, like a single number (5),
+      // dimension (5px), string ("foo"), or function. Officially defined
+      //  by the CSS 2.1 grammar (look for the 'term' production)
+      // 
+      // 
+      // simple selector:
+      // A single atomic selector, like a type selector, an attr selector, a
+      // class selector, etc.
+      // 
+      // compound selector:
+      // One or more simple selectors without a combinator. div.example is
+      // compound, div > .example is not.
+      // 
+      // complex selector:
+      // One or more compound selectors chained with combinators.
+      // 
+      // combinator:
+      // The parts of selectors that express relationships. There are four
+      // currently - the space (descendant combinator), the greater-than
+      // bracket (child combinator), the plus sign (next sibling combinator),
+      // and the tilda (following sibling combinator).
+      // 
+      // sequence of selectors:
+      // One or more of the named type of selector chained with commas.
+
       if (stream.eatSpace()) return null;
       var style = state.tokenize(stream, state);
 
+      // Changing style returned based on context
       var context = state.stack[state.stack.length-1];
-      if (type == "hash" && context != "rule") style = "string-2";
-      else if (style == "variable") {
-        if (context == "rule") style = keywords[stream.current()] ? "keyword" : "number";
-        else if (!context || context == "@media{") style = "tag";
+      if (style == "property") {
+        if (context == "propertyValue"){
+          if (valueKeywords[stream.current()]) {
+            style = "string-2";
+          } else if (colorKeywords[stream.current()]) {
+            style = "keyword";
+          } else {
+            style = "variable-2";
+          }
+        } else if (context == "rule") {
+          if (!propertyKeywords[stream.current()]) {
+            style += " error";
+          }
+        } else if (!context || context == "@media{") {
+          style = "tag";
+        } else if (context == "@media") {
+          if (atMediaTypes[stream.current()]) {
+            style = "attribute"; // Known attribute
+          } else if (/^(only|not)$/i.test(stream.current())) {
+            style = "keyword";
+          } else if (stream.current().toLowerCase() == "and") {
+            style = "error"; // "and" is only allowed in @mediaType
+          } else if (atMediaFeatures[stream.current()]) {
+            style = "error"; // Known property, should be in @mediaType(
+          } else {
+            // Unknown, expecting keyword or attribute, assuming attribute
+            style = "attribute error";
+          }
+        } else if (context == "@mediaType") {
+          if (atMediaTypes[stream.current()]) {
+            style = "attribute";
+          } else if (stream.current().toLowerCase() == "and") {
+            style = "operator";
+          } else if (/^(only|not)$/i.test(stream.current())) {
+            style = "error"; // Only allowed in @media
+          } else if (atMediaFeatures[stream.current()]) {
+            style = "error"; // Known property, should be in parentheses
+          } else {
+            // Unknown attribute or property, but expecting property (preceded
+            // by "and"). Should be in parentheses
+            style = "error";
+          }
+        } else if (context == "@mediaType(") {
+          if (propertyKeywords[stream.current()]) {
+            // do nothing, remains "property"
+          } else if (atMediaTypes[stream.current()]) {
+            style = "error"; // Known property, should be in parentheses
+          } else if (stream.current().toLowerCase() == "and") {
+            style = "operator";
+          } else if (/^(only|not)$/i.test(stream.current())) {
+            style = "error"; // Only allowed in @media
+          } else {
+            style += " error";
+          }
+        } else {
+          style = "error";
+        }
+      } else if (style == "atom") {
+        if(!context || context == "@media{") {
+          style = "header";
+        } else if (context == "propertyValue") {
+          if (!/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
+            style += " error";
+          }
+        } else {
+          style = "error";
+        }
+      } else if (context == "@media" && type == "{") {
+        style = "error";
       }
 
-      if (context == "rule" && /^[\{\};]$/.test(type))
-        state.stack.pop();
+      // Push/pop context stack
       if (type == "{") {
-        if (context == "@media") state.stack[state.stack.length-1] = "@media{";
-        else state.stack.push("{");
+        if (context == "@media" || context == "@mediaType") {
+          state.stack.pop();
+          state.stack[state.stack.length-1] = "@media{";
+        }
+        else state.stack.push("rule");
+      }
+      else if (type == "}") {
+        state.stack.pop();
+        if (context == "propertyValue") state.stack.pop();
       }
-      else if (type == "}") state.stack.pop();
       else if (type == "@media") state.stack.push("@media");
-      else if (context == "{" && type != "comment") state.stack.push("rule");
+      else if (context == "@media" && /\b(keyword|attribute)\b/.test(style))
+        state.stack.push("@mediaType");
+      else if (context == "@mediaType" && stream.current() == ",") state.stack.pop();
+      else if (context == "@mediaType" && type == "(") state.stack.push("@mediaType(");
+      else if (context == "@mediaType(" && type == ")") state.stack.pop();
+      else if (context == "rule" && type == ":") state.stack.push("propertyValue");
+      else if (context == "propertyValue" && type == ";") state.stack.pop();
       return style;
     },
 
     indent: function(state, textAfter) {
       var n = state.stack.length;
       if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
+        n -= state.stack[state.stack.length-1] == "propertyValue" ? 2 : 1;
       return state.baseIndent + n * indentUnit;
     },
 
diff --git a/mode/css/index.html b/mode/css/index.html
index 1a591cbf3d..c77a11c5db 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="css.js"></script>
+    <link rel="stylesheet" href="css.css">
     <style>.CodeMirror {background: #f8f8f8;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
@@ -52,5 +53,7 @@ <h1>CodeMirror: CSS mode</h1>
 
     <p><strong>MIME types defined:</strong> <code>text/css</code>.</p>
 
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#css_*">normal</a>,  <a href="../../test/index.html#verbose,css_*">verbose</a>.</p>
+
   </body>
 </html>
diff --git a/mode/css/test.js b/mode/css/test.js
new file mode 100644
index 0000000000..f54336e1e5
--- /dev/null
+++ b/mode/css/test.js
@@ -0,0 +1,501 @@
+// Initiate ModeTest and set defaults
+var MT = ModeTest;
+MT.modeName = 'css';
+MT.modeOptions = {};
+
+// Requires at least one media query
+MT.testMode(
+  'atMediaEmpty',
+  '@media { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'error', '{',
+    null, ' }'
+  ]
+);
+
+MT.testMode(
+  'atMediaMultiple',
+  '@media not screen and (color), not print and (color) { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'keyword', 'not',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' ',
+    'operator', 'and',
+    null, ' (',
+    'property', 'color',
+    null, '), ',
+    'keyword', 'not',
+    null, ' ',
+    'attribute', 'print',
+    null, ' ',
+    'operator', 'and',
+    null, ' (',
+    'property', 'color',
+    null, ') { }'
+  ]
+);
+
+MT.testMode(
+  'atMediaCheckStack',
+  '@media screen { } foo { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' { } ',
+    'tag', 'foo',
+    null, ' { }'
+  ]
+);
+
+MT.testMode(
+  'atMediaCheckStack',
+  '@media screen (color) { } foo { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' (',
+    'property', 'color',
+    null, ') { } ',
+    'tag', 'foo',
+    null, ' { }'
+  ]
+);
+
+MT.testMode(
+  'atMediaCheckStackInvalidAttribute',
+  '@media foobarhello { } foo { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute error', 'foobarhello',
+    null, ' { } ',
+    'tag', 'foo',
+    null, ' { }'
+  ]
+);
+
+// Error, because "and" is only allowed immediately preceding a media expression
+MT.testMode(
+  'atMediaInvalidAttribute',
+  '@media foobarhello { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute error', 'foobarhello',
+    null, ' { }'
+  ]
+);
+
+// Error, because "and" is only allowed immediately preceding a media expression
+MT.testMode(
+  'atMediaInvalidAnd',
+  '@media and screen { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'error', 'and',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' { }'
+  ]
+);
+
+// Error, because "not" is only allowed as the first item in each media query
+MT.testMode(
+  'atMediaInvalidNot',
+  '@media screen not (not) { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' ',
+    'error', 'not',
+    null, ' (',
+    'error', 'not',
+    null, ') { }'
+  ]
+);
+
+// Error, because "only" is only allowed as the first item in each media query
+MT.testMode(
+  'atMediaInvalidOnly',
+  '@media screen only (only) { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' ',
+    'error', 'only',
+    null, ' (',
+    'error', 'only',
+    null, ') { }'
+  ]
+);
+
+// Error, because "foobarhello" is neither a known type or property, but
+// property was expected (after "and"), and it should be in parenthese.
+MT.testMode(
+  'atMediaUnknownType',
+  '@media screen and foobarhello { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' ',
+    'operator', 'and',
+    null, ' ',
+    'error', 'foobarhello',
+    null, ' { }'
+  ]
+);
+
+// Error, because "color" is not a known type, but is a known property, and
+// should be in parentheses.
+MT.testMode(
+  'atMediaInvalidType',
+  '@media screen and color { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' ',
+    'operator', 'and',
+    null, ' ',
+    'error', 'color',
+    null, ' { }'
+  ]
+);
+
+// Error, because "print" is not a known property, but is a known type,
+// and should not be in parenthese.
+MT.testMode(
+  'atMediaInvalidProperty',
+  '@media screen and (print) { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' ',
+    'operator', 'and',
+    null, ' (',
+    'error', 'print',
+    null, ') { }'
+  ]
+);
+
+// Soft error, because "foobarhello" is not a known property or type.
+MT.testMode(
+  'atMediaUnknownProperty',
+  '@media screen and (foobarhello) { }',
+  [
+    'def', '@media',
+    null, ' ',
+    'attribute', 'screen',
+    null, ' ',
+    'operator', 'and',
+    null, ' (',
+    'property error', 'foobarhello',
+    null, ') { }'
+  ]
+);
+
+MT.testMode(
+  'tagSelector',
+  'foo { }',
+  [
+    'tag', 'foo',
+    null, ' { }'
+  ]
+);
+
+MT.testMode(
+  'classSelector',
+  '.foo { }',
+  [
+    'qualifier', '.foo',
+    null, ' { }'
+  ]
+);
+
+MT.testMode(
+  'idSelector',
+  '#foo { #foo }',
+  [
+    'header', '#foo',
+    null, ' { ',
+    'error', '#foo',
+    null, ' }'
+  ]
+);
+
+MT.testMode(
+  'tagSelectorUnclosed',
+  'foo { margin: 0 } bar { }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'margin',
+    'operator', ':',
+    null, ' ',
+    'number', '0',
+    null, ' } ',
+    'tag', 'bar',
+    null, ' { }'
+  ]
+);
+
+MT.testMode(
+  'tagStringNoQuotes',
+  'foo { font-family: hello world; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'font-family',
+    'operator', ':',
+    null, ' ',
+    'variable-2', 'hello',
+    null, ' ',
+    'variable-2', 'world',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagStringDouble',
+  'foo { font-family: "hello world"; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'font-family',
+    'operator', ':',
+    null, ' ',
+    'string', '"hello world"',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagStringSingle',
+  'foo { font-family: \'hello world\'; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'font-family',
+    'operator', ':',
+    null, ' ',
+    'string', '\'hello world\'',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagColorKeyword',
+  'foo { color: black; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'color',
+    'operator', ':',
+    null, ' ',
+    'keyword', 'black',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagColorHex3',
+  'foo { background: #fff; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'background',
+    'operator', ':',
+    null, ' ',
+    'atom', '#fff',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagColorHex6',
+  'foo { background: #ffffff; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'background',
+    'operator', ':',
+    null, ' ',
+    'atom', '#ffffff',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagColorHex4',
+  'foo { background: #ffff; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'background',
+    'operator', ':',
+    null, ' ',
+    'atom error', '#ffff',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagColorHexInvalid',
+  'foo { background: #ffg; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'background',
+    'operator', ':',
+    null, ' ',
+    'atom error', '#ffg',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagNegativeNumber',
+  'foo { margin: -5px; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'margin',
+    'operator', ':',
+    null, ' ',
+    'number', '-5px',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagPositiveNumber',
+  'foo { padding: 5px; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'padding',
+    'operator', ':',
+    null, ' ',
+    'number', '5px',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagVendor',
+  'foo { -foo-box-sizing: -foo-border-box; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'meta', '-foo-',
+    'property', 'box-sizing',
+    'operator', ':',
+    null, ' ',
+    'meta', '-foo-',
+    'string-2', 'border-box',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagBogusProperty',
+  'foo { barhelloworld: 0; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property error', 'barhelloworld',
+    'operator', ':',
+    null, ' ',
+    'number', '0',
+    null, '; }'
+  ]
+);
+
+MT.testMode(
+  'tagTwoProperties',
+  'foo { margin: 0; padding: 0; }',
+  [
+    'tag', 'foo',
+    null, ' { ',
+    'property', 'margin',
+    'operator', ':',
+    null, ' ',
+    'number', '0',
+    null, '; ',
+    'property', 'padding',
+    'operator', ':',
+    null, ' ',
+    'number', '0',
+    null, '; }'
+  ]
+);
+//
+//MT.testMode(
+//  'tagClass',
+//  '@media only screen and (min-width: 500px), print {foo.bar#hello { color: black !important; background: #f00; margin: -5px; padding: 5px; -foo-box-sizing: border-box; } /* world */}',
+//  [
+//    'def', '@media',
+//    null, ' ',
+//    'keyword', 'only',
+//    null, ' ',
+//    'attribute', 'screen',
+//    null, ' ',
+//    'operator', 'and',
+//    null, ' ',
+//    'bracket', '(',
+//    'property', 'min-width',
+//    'operator', ':',
+//    null, ' ',
+//    'number', '500px',
+//    'bracket', ')',
+//    null, ', ',
+//    'attribute', 'print',
+//    null, ' {',
+//    'tag', 'foo',
+//    'qualifier', '.bar',
+//    'header', '#hello',
+//    null, ' { ',
+//    'property', 'color',
+//    'operator', ':',
+//    null, ' ',
+//    'keyword', 'black',
+//    null, ' ',
+//    'builtin', '!important',
+//    null, '; ',
+//    'property', 'background',
+//    'operator', ':',
+//    null, ' ',
+//    'atom', '#f00',
+//    null, '; ',
+//    'property', 'padding',
+//    'operator', ':',
+//    null, ' ',
+//    'number', '5px',
+//    null, '; ',
+//    'property', 'margin',
+//    'operator', ':',
+//    null, ' ',
+//    'number', '-5px',
+//    null, '; ',
+//    'meta', '-foo-',
+//    'property', 'box-sizing',
+//    'operator', ':',
+//    null, ' ',
+//    'string-2', 'border-box',
+//    null, '; } ',
+//    'comment', '/* world */',
+//    null, '}'
+//  ]
+//);
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index edea7d106f..9b10b62118 100644
--- a/test/index.html
+++ b/test/index.html
@@ -40,6 +40,8 @@ <h1>CodeMirror: Test Suite</h1>
     <script src="driver.js"></script>
     <script src="test.js"></script>
     <script src="mode_test.js"></script>
+    <script src="../mode/css/css.js"></script>
+    <script src="../mode/css/test.js"></script>
     <script src="../mode/markdown/markdown.js"></script>
     <script src="../mode/markdown/test.js"></script>
     <script src="../mode/stex/stex.js"></script>

From fdfba6db20ad626fdd5a71fc6273c503b3b3839f Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 09:53:55 +0200
Subject: [PATCH 35/93] [css mode] Partially move back to old look

---
 mode/css/css.css    | 7 -------
 mode/css/css.js     | 4 ++--
 mode/css/index.html | 1 -
 mode/css/test.js    | 4 ++--
 4 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 mode/css/css.css

diff --git a/mode/css/css.css b/mode/css/css.css
deleted file mode 100644
index caa2afdac8..0000000000
--- a/mode/css/css.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Change error (warning) so it's not so scary */
-.cm-s-default span.cm-property {font-weight: bold;}
-.cm-s-default span.cm-property.cm-error {color: black; font-weight: normal;}
-
-/* Differentiate color from .cm-def and change error (warning) so it's not so scary */
-.cm-s-default span.cm-attribute {color: #c0c; font-weight: bold;}
-.cm-s-default span.cm-attribute.cm-error {color: #c0c; font-weight: normal;}
\ No newline at end of file
diff --git a/mode/css/css.js b/mode/css/css.js
index d7163201dd..5e3e233edb 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -211,7 +211,7 @@ CodeMirror.defineMode("css", function(config) {
     }
     else if (ch == "!") {
       stream.match(/^\s*\w*/);
-      return ret("builtin", "important");
+      return ret("keyword", "important");
     }
     else if (/\d/.test(ch)) {
       stream.eatWhile(/[\w.%]/);
@@ -399,7 +399,7 @@ CodeMirror.defineMode("css", function(config) {
         }
       } else if (style == "atom") {
         if(!context || context == "@media{") {
-          style = "header";
+          style = "builtin";
         } else if (context == "propertyValue") {
           if (!/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
             style += " error";
diff --git a/mode/css/index.html b/mode/css/index.html
index c77a11c5db..ae2c3bfcee 100644
--- a/mode/css/index.html
+++ b/mode/css/index.html
@@ -6,7 +6,6 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="css.js"></script>
-    <link rel="stylesheet" href="css.css">
     <style>.CodeMirror {background: #f8f8f8;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
diff --git a/mode/css/test.js b/mode/css/test.js
index f54336e1e5..4e2d0e8e56 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -228,7 +228,7 @@ MT.testMode(
   'idSelector',
   '#foo { #foo }',
   [
-    'header', '#foo',
+    'builtin', '#foo',
     null, ' { ',
     'error', '#foo',
     null, ' }'
@@ -472,7 +472,7 @@ MT.testMode(
 //    null, ' ',
 //    'keyword', 'black',
 //    null, ' ',
-//    'builtin', '!important',
+//    'keyword', '!important',
 //    null, '; ',
 //    'property', 'background',
 //    'operator', ':',

From 328780de299eabb4795eff8e04a87c33769ca1ab Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 10:28:36 +0200
Subject: [PATCH 36/93] On Webkit, add file/line no to test failures caused by
 errors

---
 test/driver.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/driver.js b/test/driver.js
index 5ad20425d6..934cb936c9 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -89,7 +89,10 @@ function runTests(callback) {
     } catch(e) {
       if (expFail) callback("expected", test.name);
       else if (e instanceof Failure) callback("fail", test.name, e.message);
-      else callback("error", test.name, e.toString());
+      else {
+        var pos = /\bat .*?([^\/:]+):(\d+):/.exec(e.stack);
+        callback("error", test.name, e.toString() + (pos ? " (" + pos[1] + ":" + pos[2] + ")" : ""));
+      }
     }
     if (!quit) { // Run next test
       var delay = 0;

From 0d3df7ef16add9a11f3632bcbd048a4a243187bf Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 7 Sep 2012 18:05:32 +0200
Subject: [PATCH 37/93] Make undo/redo preserve text markers and bookmarks

Cleans up the implementation of marked ranges, makes the data
structure for markers-within-a-line persistant, and attaches them to
the lines stored in the undo history when necessary.

Closes #675
---
 doc/manual.html   |  12 +-
 lib/codemirror.js | 467 +++++++++++++++++++++-------------------------
 test/test.js      |  26 ++-
 3 files changed, 241 insertions(+), 264 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 2d1a136175..758b4e5839 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -590,14 +590,20 @@ <h2 id="api">Programming API</h2>
         <dt><code>state</code></dt><dd>The mode's state at the end of this token.</dd>
       </dl></dd>
 
-      <dt id="markText"><code>markText(from, to, className) → object</code></dt>
+      <dt id="markText"><code>markText(from, to, className, options) → object</code></dt>
       <dd>Can be used to mark a range of text with a specific CSS
       class name. <code>from</code> and <code>to</code> should
-      be <code>{line, ch}</code> objects. The method will return an
+      be <code>{line, ch}</code> objects. The <code>options</code>
+      parameter is optional, and can be an object
+      with <code>inclusiveLeft</code> and <code>inclusiveRight</code>
+      properties, which determine whether typing at the left or right
+      of the marker will cause the new text to become part of the
+      marker (the default is false for both). The method will return an
       object with two methods, <code>clear()</code>, which removes the
       mark, and <code>find()</code>, which returns a <code>{from,
       to}</code> (both document positions), indicating the current
-      position of the marked range.</dd>
+      position of the marked range, or <code>undefined</code> if the
+      marker is no longer in the document.</dd>
 
       <dt id="setBookmark"><code>setBookmark(pos) → object</code></dt>
       <dd>Inserts a bookmark, a handle that follows the text around it
diff --git a/lib/codemirror.js b/lib/codemirror.js
index eba48afca7..55c209427a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -702,13 +702,16 @@ window.CodeMirror = (function() {
     // Afterwards, set the selection to selFrom, selTo.
     function updateLines(from, to, newText, selFrom, selTo) {
       if (suppressEdits) return;
+      var old = [];
+      doc.iter(from.line, to.line + 1, function(line) {
+        old.push(newHL(line.text, line.markedSpans));
+      });
       if (history) {
-        var old = [];
-        doc.iter(from.line, to.line + 1, function(line) { old.push(line.text); });
         history.addChange(from.line, newText.length, old);
         while (history.done.length > options.undoDepth) history.done.shift();
       }
-      updateLinesNoUndo(from, to, newText, selFrom, selTo);
+      var lines = updateMarkedSpans(hlSpans(old[0]), hlSpans(old[old.length-1]), from.ch, to.ch, newText);
+      updateLinesNoUndo(from, to, lines, selFrom, selTo);
     }
     function unredoHelper(from, to) {
       if (!from.length) return;
@@ -716,11 +719,12 @@ window.CodeMirror = (function() {
       for (var i = set.length - 1; i >= 0; i -= 1) {
         var change = set[i];
         var replaced = [], end = change.start + change.added;
-        doc.iter(change.start, end, function(line) { replaced.push(line.text); });
+        doc.iter(change.start, end, function(line) { replaced.push(newHL(line.text, line.markedSpans)); });
         out.push({start: change.start, added: change.old.length, old: replaced});
         var pos = {line: change.start + change.old.length - 1,
-                   ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])};
-        updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length}, change.old, pos, pos);
+                   ch: editEnd(hlText(replaced[replaced.length-1]), hlText(change.old[change.old.length-1]))};
+        updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length},
+                          change.old, pos, pos);
       }
       updateInput = true;
       to.push(out);
@@ -728,66 +732,59 @@ window.CodeMirror = (function() {
     function undo() {unredoHelper(history.done, history.undone);}
     function redo() {unredoHelper(history.undone, history.done);}
 
-    function updateLinesNoUndo(from, to, newText, selFrom, selTo) {
+    function updateLinesNoUndo(from, to, lines, selFrom, selTo) {
       if (suppressEdits) return;
       var recomputeMaxLength = false, maxLineLength = maxLine.text.length;
       if (!options.lineWrapping)
         doc.iter(from.line, to.line + 1, function(line) {
           if (!line.hidden && line.text.length == maxLineLength) {recomputeMaxLength = true; return true;}
         });
-      if (from.line != to.line || newText.length > 1) gutterDirty = true;
+      if (from.line != to.line || lines.length > 1) gutterDirty = true;
 
       var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
-      // First adjust the line structure, taking some care to leave highlighting intact.
-      if (from.ch == 0 && to.ch == 0 && newText[newText.length - 1] == "") {
+      var lastHL = lines[lines.length-1];
+
+      // First adjust the line structure
+      if (from.ch == 0 && to.ch == 0 && hlText(lastHL) == "") {
         // This is a whole-line replace. Treated specially to make
         // sure line objects move the way they are supposed to.
         var added = [], prevLine = null;
-        if (from.line) {
-          prevLine = getLine(from.line - 1);
-          prevLine.fixMarkEnds(lastLine);
-        } else lastLine.fixMarkStarts();
-        for (var i = 0, e = newText.length - 1; i < e; ++i)
-          added.push(Line.inheritMarks(newText[i], prevLine));
+        for (var i = 0, e = lines.length - 1; i < e; ++i)
+          added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
+        lastLine.update(lastLine.text, hlSpans(lastHL));
         if (nlines) doc.remove(from.line, nlines, callbacks);
         if (added.length) doc.insert(from.line, added);
       } else if (firstLine == lastLine) {
-        if (newText.length == 1)
-          firstLine.replace(from.ch, to.ch, newText[0]);
-        else {
-          lastLine = firstLine.split(to.ch, newText[newText.length-1]);
-          firstLine.replace(from.ch, null, newText[0]);
-          firstLine.fixMarkEnds(lastLine);
-          var added = [];
-          for (var i = 1, e = newText.length - 1; i < e; ++i)
-            added.push(Line.inheritMarks(newText[i], firstLine));
-          added.push(lastLine);
+        if (lines.length == 1) {
+          firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + firstLine.text.slice(to.ch), hlSpans(lines[0]));
+        } else {
+          for (var added = [], i = 1, e = lines.length - 1; i < e; ++i)
+            added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
+          added.push(new Line(hlText(lastHL) + firstLine.text.slice(to.ch), hlSpans(lastHL)));
+          firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
           doc.insert(from.line + 1, added);
         }
-      } else if (newText.length == 1) {
-        firstLine.replace(from.ch, null, newText[0]);
-        lastLine.replace(null, to.ch, "");
-        firstLine.append(lastLine);
+      } else if (lines.length == 1) {
+        firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + lastLine.text.slice(to.ch), hlSpans(lines[0]));
         doc.remove(from.line + 1, nlines, callbacks);
       } else {
         var added = [];
-        firstLine.replace(from.ch, null, newText[0]);
-        lastLine.replace(null, to.ch, newText[newText.length-1]);
-        firstLine.fixMarkEnds(lastLine);
-        for (var i = 1, e = newText.length - 1; i < e; ++i)
-          added.push(Line.inheritMarks(newText[i], firstLine));
+        firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
+        lastLine.update(hlText(lastHL) + lastLine.text.slice(to.ch), hlSpans(lastHL));
+        for (var i = 1, e = lines.length - 1; i < e; ++i)
+          added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
         if (nlines > 1) doc.remove(from.line + 1, nlines - 1, callbacks);
         doc.insert(from.line + 1, added);
       }
       if (options.lineWrapping) {
         var perLine = Math.max(5, scroller.clientWidth / charWidth() - 3);
-        doc.iter(from.line, from.line + newText.length, function(line) {
+        doc.iter(from.line, from.line + lines.length, function(line) {
           if (line.hidden) return;
           var guess = Math.ceil(line.text.length / perLine) || 1;
           if (guess != line.height) updateLineHeight(line, guess);
         });
       } else {
-        doc.iter(from.line, from.line + newText.length, function(line) {
+        doc.iter(from.line, from.line + lines.length, function(line) {
           var l = line.text;
           if (!line.hidden && l.length > maxLineLength) {
             maxLine = line; maxLineLength = l.length; maxLineChanged = true;
@@ -801,14 +798,20 @@ window.CodeMirror = (function() {
       frontier = Math.min(frontier, from.line);
       startWorker(400);
 
-      var lendiff = newText.length - nlines - 1;
+      var lendiff = lines.length - nlines - 1;
       // Remember that these lines changed, for updating the display
       changes.push({from: from.line, to: to.line + 1, diff: lendiff});
-      var changeObj = {from: from, to: to, text: newText};
-      if (textChanged) {
-        for (var cur = textChanged; cur.next; cur = cur.next) {}
-        cur.next = changeObj;
-      } else textChanged = changeObj;
+      if (options.onChange) {
+        // Normalize lines to contain only strings, since that's what
+        // the change event handler expects
+        for (var i = 0; i < lines.length; ++i)
+          if (typeof lines[i] != "string") lines[i] = lines[i].text;
+        var changeObj = {from: from, to: to, text: lines};
+        if (textChanged) {
+          for (var cur = textChanged; cur.next; cur = cur.next) {}
+          cur.next = changeObj;
+        } else textChanged = changeObj;
+      }
 
       // Update the selection
       function updateLine(n) {return n <= Math.min(to.line, to.line + lendiff) ? n : n + lendiff;}
@@ -1488,74 +1491,71 @@ window.CodeMirror = (function() {
         (style ? " cm-keymap-" + style : "");
     }
 
-    function TextMarker() { this.set = []; }
+    function TextMarker(type, style) { this.lines = []; this.type = type; if (style) this.style = style; }
     TextMarker.prototype.clear = operation(function() {
       var min = Infinity, max = -Infinity;
-      for (var i = 0, e = this.set.length; i < e; ++i) {
-        var line = this.set[i], mk = line.marked;
-        if (!mk || !line.parent) continue;
-        var lineN = lineNo(line);
-        min = Math.min(min, lineN); max = Math.max(max, lineN);
-        for (var j = 0; j < mk.length; ++j)
-          if (mk[j].marker == this) mk.splice(j--, 1);
+      for (var i = 0; i < this.lines.length; ++i) {
+        var line = this.lines[i];
+        var span = getMarkedSpanFor(line.markedSpans, this, true);
+        if (span.from != null || span.to != null) {
+          var lineN = lineNo(line);
+          min = Math.min(min, lineN); max = Math.max(max, lineN);
+        }
       }
       if (min != Infinity)
         changes.push({from: min, to: max + 1});
+      this.lines.length = 0;
     });
     TextMarker.prototype.find = function() {
       var from, to;
-      for (var i = 0, e = this.set.length; i < e; ++i) {
-        var line = this.set[i], mk = line.marked;
-        for (var j = 0; j < mk.length; ++j) {
-          var mark = mk[j];
-          if (mark.marker == this) {
-            if (mark.from != null || mark.to != null) {
-              var found = lineNo(line);
-              if (found != null) {
-                if (mark.from != null) from = {line: found, ch: mark.from};
-                if (mark.to != null) to = {line: found, ch: mark.to};
-              }
-            }
-          }
+      for (var i = 0; i < this.lines.length; ++i) {
+        var line = this.lines[i];
+        var span = getMarkedSpanFor(line.markedSpans, this);
+        if (span.from != null || span.to != null) {
+          var found = lineNo(line);
+          if (span.from != null) from = {line: found, ch: span.from};
+          if (span.to != null) to = {line: found, ch: span.to};
         }
       }
-      return {from: from, to: to};
+      if (this.type == "bookmark") return from;
+      return from && {from: from, to: to};
     };
 
-    function markText(from, to, className) {
+    function markText(from, to, className, options) {
       from = clipPos(from); to = clipPos(to);
-      var tm = new TextMarker();
-      if (!posLess(from, to)) return tm;
-      function add(line, from, to, className) {
-        getLine(line).addMark(new MarkedText(from, to, className, tm));
-      }
-      if (from.line == to.line) add(from.line, from.ch, to.ch, className);
-      else {
-        add(from.line, from.ch, null, className);
-        for (var i = from.line + 1, e = to.line; i < e; ++i)
-          add(i, null, null, className);
-        add(to.line, null, to.ch, className);
-      }
+      var marker = new TextMarker("range", className);
+      if (options && options.inclusiveLeft) marker.inclusiveLeft = true;
+      if (options && options.inclusiveRight) marker.inclusiveRight = true;
+      var curLine = from.line;
+      doc.iter(curLine, to.line + 1, function(line) {
+        var span = {from: curLine == from.line ? from.ch : null,
+                    to: curLine == to.line ? to.ch : null,
+                    marker: marker};
+        (line.markedSpans || (line.markedSpans = [])).push(span);
+        marker.lines.push(line);
+        ++curLine;
+      });
       changes.push({from: from.line, to: to.line + 1});
-      return tm;
+      return marker;
     }
 
     function setBookmark(pos) {
       pos = clipPos(pos);
-      var bm = new Bookmark(pos.ch);
-      getLine(pos.line).addMark(bm);
-      return bm;
+      var marker = new TextMarker("bookmark"), line = getLine(pos.line);
+      var span = {from: pos.ch, to: pos.ch, marker: marker};
+      (line.markedSpans || (line.markedSpans = [])).push(span);
+      marker.lines.push(line);
+      return marker;
     }
 
     function findMarksAt(pos) {
       pos = clipPos(pos);
-      var markers = [], marked = getLine(pos.line).marked;
-      if (!marked) return markers;
-      for (var i = 0, e = marked.length; i < e; ++i) {
-        var m = marked[i];
-        if ((m.from == null || m.from <= pos.ch) &&
-            (m.to == null || m.to >= pos.ch))
-          markers.push(m.marker || m);
+      var markers = [], spans = getLine(pos.line).markedSpans;
+      if (spans) for (var i = 0; i < spans.length; ++i) {
+        var span = spans[i];
+        if ((span.from == null || span.from <= pos.ch) &&
+            (span.to == null || span.to >= pos.ch))
+          markers.push(span.marker);
       }
       return markers;
     }
@@ -2316,69 +2316,123 @@ window.CodeMirror = (function() {
   };
   CodeMirror.StringStream = StringStream;
 
-  function MarkedText(from, to, className, marker) {
-    this.from = from; this.to = to; this.style = className; this.marker = marker;
+  function MarkedSpan(from, to, marker) {
+    this.from = from; this.to = to; this.marker = marker;
   }
-  MarkedText.prototype = {
-    attach: function(line) { this.marker.set.push(line); },
-    detach: function(line) {
-      var ix = indexOf(this.marker.set, line);
-      if (ix > -1) this.marker.set.splice(ix, 1);
-    },
-    split: function(pos, lenBefore) {
-      if (this.to <= pos && this.to != null) return null;
-      var from = this.from < pos || this.from == null ? null : this.from - pos + lenBefore;
-      var to = this.to == null ? null : this.to - pos + lenBefore;
-      return new MarkedText(from, to, this.style, this.marker);
-    },
-    dup: function() { return new MarkedText(null, null, this.style, this.marker); },
-    clipTo: function(fromOpen, from, toOpen, to, diff) {
-      if (fromOpen && to > this.from && (to < this.to || this.to == null))
-        this.from = null;
-      else if (this.from != null && this.from >= from)
-        this.from = Math.max(to, this.from) + diff;
-      if (toOpen && (from < this.to || this.to == null) && (from > this.from || this.from == null))
-        this.to = null;
-      else if (this.to != null && this.to > from)
-        this.to = to < this.to ? this.to + diff : from;
-    },
-    isDead: function() { return this.from != null && this.to != null && this.from >= this.to; },
-    sameSet: function(x) { return this.marker == x.marker; }
-  };
 
-  function Bookmark(pos) {
-    this.from = pos; this.to = pos; this.line = null;
+  function getMarkedSpanFor(spans, marker, del) {
+    if (spans) for (var i = 0; i < spans.length; ++i) {
+      var span = spans[i];
+      if (span.marker == marker) {
+        if (del) spans.splice(i, 1);
+        return span;
+      }
+    }
   }
-  Bookmark.prototype = {
-    attach: function(line) { this.line = line; },
-    detach: function(line) { if (this.line == line) this.line = null; },
-    split: function(pos, lenBefore) {
-      if (pos < this.from) {
-        this.from = this.to = (this.from - pos) + lenBefore;
-        return this;
+
+  function markedSpansBefore(old, startCh, endCh) {
+    if (old) for (var i = 0, nw; i < old.length; ++i) {
+      var span = old[i], marker = span.marker;
+      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
+      if (startsBefore || marker.type == "bookmark" && span.from == startCh && span.from != endCh) {
+        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
+        (nw || (nw = [])).push({from: span.from,
+                                to: endsAfter ? null : span.to,
+                                marker: marker});
       }
-    },
-    isDead: function() { return this.from > this.to; },
-    clipTo: function(fromOpen, from, toOpen, to, diff) {
-      if ((fromOpen || from < this.from) && (toOpen || to > this.to)) {
-        this.from = 0; this.to = -1;
-      } else if (this.from > from) {
-        this.from = this.to = Math.max(to, this.from) + diff;
+    }
+    return nw;
+  }
+
+  function markedSpansAfter(old, endCh) {
+    if (old) for (var i = 0, nw; i < old.length; ++i) {
+      var span = old[i], marker = span.marker;
+      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
+      if (endsAfter || marker.type == "bookmark" && span.from == endCh) {
+        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
+        (nw || (nw = [])).push({from: startsBefore ? null : span.from - endCh,
+                                to: span.to == null ? null : span.to - endCh,
+                                marker: marker});
       }
-    },
-    sameSet: function(x) { return false; },
-    find: function() {
-      if (!this.line || !this.line.parent) return null;
-      return {line: lineNo(this.line), ch: this.from};
-    },
-    clear: function() {
-      if (this.line) {
-        var found = indexOf(this.line.marked, this);
-        if (found != -1) this.line.marked.splice(found, 1);
-        this.line = null;
+    }
+    return nw;
+  }
+
+  function updateMarkedSpans(oldFirst, oldLast, startCh, endCh, newText) {
+    if (!oldFirst && !oldLast) return newText;
+    // Get the spans that 'stick out' on both sides
+    var first = markedSpansBefore(oldFirst, startCh);
+    var last = markedSpansAfter(oldLast, endCh);
+
+    // Next, merge those two ends
+    var sameLine = newText.length == 1, offset = newText[newText.length-1].length + (sameLine ? startCh : 0);
+    if (first) {
+      // Fix up .to properties of first
+      for (var i = 0; i < first.length; ++i) {
+        var span = first[i];
+        if (span.to == null) {
+          var found = getMarkedSpanFor(last, span.marker);
+          if (!found) span.to = startCh;
+          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
+        }
+      }
+    }
+    if (last) {
+      // Fix up .from in last (or move them into first in case of sameLine)
+      for (var i = 0; i < last.length; ++i) {
+        var span = last[i];
+        if (span.to != null) span.to += offset;
+        if (span.from == null) {
+          var found = getMarkedSpanFor(first, span.marker);
+          if (!found) {
+            span.from = offset;
+            if (sameLine) (first || (first = [])).push(span);
+          }
+        } else {
+          span.from += offset;
+          if (sameLine) (first || (first = [])).push(span);
+        }
       }
     }
-  };
+
+    var newMarkers = [newHL(newText[0], first)];
+    if (!sameLine) {
+      // Fill gap with whole-line-spans
+      var gap = newText.length - 2, gapMarkers;
+      if (gap > 0 && first)
+        for (var i = 0; i < first.length; ++i)
+          if (first[i].to == null)
+            (gapMarkers || (gapMarkers = [])).push({from: null, to: null, marker: first[i].marker});
+      for (var i = 0; i < gap; ++i)
+        newMarkers.push(newHL(newText[i+1], gapMarkers));
+      newMarkers.push(newHL(newText[newText.length-1], last));
+    }
+    return newMarkers;
+  }
+
+  // hl stands for history-line, a data structure that can be either a
+  // string (line without markers) or a {text, markedSpans} object.
+  function hlText(val) { return typeof val == "string" ? val : val.text; }
+  function hlSpans(val) { return typeof val == "string" ? null : val.markedSpans; }
+  function newHL(text, spans) { return spans ? {text: text, markedSpans: spans} : text; }
+
+  function detachMarkedSpans(line) {
+    var spans = line.markedSpans;
+    if (!spans) return;
+    for (var i = 0; i < spans.length; ++i) {
+      var lines = spans[i].marker.lines;
+      var ix = indexOf(lines, line);
+      lines.splice(ix, 1);
+    }
+    line.markedSpans = null;
+  }
+
+  function attachMarkedSpans(line, spans) {
+    if (!spans) return;
+    for (var i = 0; i < spans.length; ++i)
+      var marker = spans[i].marker.lines.push(line);
+    line.markedSpans = spans;
+  }
 
   // When measuring the position of the end of a line, different
   // browsers require different approaches. If an empty span is added,
@@ -2392,118 +2446,17 @@ window.CodeMirror = (function() {
 
   // Line objects. These hold state related to a line, including
   // highlighting info (the styles array).
-  function Line(text) {
+  function Line(text, markedSpans) {
     this.text = text;
     this.height = 1;
+    attachMarkedSpans(this, markedSpans);
   }
-  Line.inheritMarks = function(text, orig) {
-    var ln = new Line(text), mk = orig && orig.marked;
-    if (mk) {
-      for (var i = 0; i < mk.length; ++i) {
-        if (mk[i].to == null && mk[i].style) {
-          var newmk = ln.marked || (ln.marked = []), mark = mk[i];
-          var nmark = mark.dup(); newmk.push(nmark); nmark.attach(ln);
-        }
-      }
-    }
-    return ln;
-  };
   Line.prototype = {
-    // Replace a piece of a line, keeping the markers intact.
-    replace: function(from, to_, text) {
-      var mk = this.marked, to = to_ == null ? this.text.length : to_;
-      this.text = this.text.slice(0, from) + text + this.text.slice(to);
+    update: function(text, markedSpans) {
+      this.text = text;
       this.stateAfter = this.styles = null;
-      if (mk) {
-        var diff = text.length - (to - from);
-        for (var i = 0; i < mk.length; ++i) {
-          var mark = mk[i];
-          mark.clipTo(from == null, from || 0, to_ == null, to, diff);
-          if (mark.isDead()) {mark.detach(this); mk.splice(i--, 1);}
-        }
-      }
-    },
-    // Split a part off a line, keeping markers intact.
-    split: function(pos, textBefore) {
-      var mk = this.marked;
-      var taken = new Line(textBefore + this.text.slice(pos));
-      if (mk) {
-        for (var i = 0; i < mk.length; ++i) {
-          var mark = mk[i];
-          var newmark = mark.split(pos, textBefore.length);
-          if (newmark) {
-            if (!taken.marked) taken.marked = [];
-            taken.marked.push(newmark); newmark.attach(taken);
-            if (newmark == mark) mk.splice(i--, 1);
-          }
-        }
-      }
-      return taken;
-    },
-    append: function(line) {
-      var mylen = this.text.length, mk = line.marked, mymk = this.marked;
-      this.text += line.text;
-      this.styles = this.stateAfter = null;
-      if (mymk) {
-        for (var i = 0; i < mymk.length; ++i)
-          if (mymk[i].to == null) mymk[i].to = mylen;
-      }
-      if (mk && mk.length) {
-        if (!mymk) this.marked = mymk = [];
-        outer: for (var i = 0; i < mk.length; ++i) {
-          var mark = mk[i];
-          if (!mark.from) {
-            for (var j = 0; j < mymk.length; ++j) {
-              var mymark = mymk[j];
-              if (mymark.to == mylen && mymark.sameSet(mark)) {
-                mymark.to = mark.to == null ? null : mark.to + mylen;
-                if (mymark.isDead()) {
-                  mymark.detach(this);
-                  mk.splice(i--, 1);
-                }
-                continue outer;
-              }
-            }
-          }
-          mymk.push(mark);
-          mark.attach(this);
-          mark.from += mylen;
-          if (mark.to != null) mark.to += mylen;
-        }
-      }
-    },
-    fixMarkEnds: function(other) {
-      var mk = this.marked, omk = other.marked;
-      if (!mk) return;
-      outer: for (var i = 0; i < mk.length; ++i) {
-        var mark = mk[i], close = mark.to == null;
-        if (close && omk) {
-          for (var j = 0; j < omk.length; ++j) {
-            var om = omk[j];
-            if (!om.sameSet(mark) || om.from != null) continue;
-            if (mark.from == this.text.length && om.to == 0) {
-              omk.splice(j, 1);
-              mk.splice(i--, 1);
-              continue outer;
-            } else {
-              close = false; break;
-            }
-          }
-        }
-        if (close) mark.to = this.text.length;
-      }
-    },
-    fixMarkStarts: function() {
-      var mk = this.marked;
-      if (!mk) return;
-      for (var i = 0; i < mk.length; ++i)
-        if (mk[i].from == null) mk[i].from = 0;
-    },
-    addMark: function(mark) {
-      mark.attach(this);
-      if (this.marked == null) this.marked = [];
-      this.marked.push(mark);
-      this.marked.sort(function(a, b){return (a.from || 0) - (b.from || 0);});
+      detachMarkedSpans(this);
+      attachMarkedSpans(this, markedSpans);
     },
     // Run the given mode's parser over a line, update the styles
     // array, which contains alternating fragments of text and CSS
@@ -2620,7 +2573,7 @@ window.CodeMirror = (function() {
         };
       }
 
-      var st = this.styles, allText = this.text, marked = this.marked;
+      var st = this.styles, allText = this.text, marked = this.markedSpans;
       var len = allText.length;
       function styleToClass(style) {
         if (!style) return null;
@@ -2636,13 +2589,14 @@ window.CodeMirror = (function() {
           span(pre, str, styleToClass(style));
         }
       } else {
+        marked.sort(function(a, b) { return a.from - b.from; });
         var pos = 0, i = 0, text = "", style, sg = 0;
         var nextChange = marked[0].from || 0, marks = [], markpos = 0;
         var advanceMarks = function() {
           var m;
           while (markpos < marked.length &&
                  ((m = marked[markpos]).from == pos || m.from == null)) {
-            if (m.style != null) marks.push(m);
+            if (m.marker.style != null) marks.push(m);
             ++markpos;
           }
           nextChange = markpos < marked.length ? marked[markpos].from : Infinity;
@@ -2662,7 +2616,7 @@ window.CodeMirror = (function() {
               var end = pos + text.length;
               var appliedStyle = style;
               for (var j = 0; j < marks.length; ++j)
-                appliedStyle = (appliedStyle ? appliedStyle + " " : "") + marks[j].style;
+                appliedStyle = (appliedStyle ? appliedStyle + " " : "") + marks[j].marker.style;
               span(pre, end > upto ? text.slice(0, upto - pos) : text, appliedStyle);
               if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
               pos = end;
@@ -2675,8 +2629,7 @@ window.CodeMirror = (function() {
     },
     cleanUp: function() {
       this.parent = null;
-      if (this.marked)
-        for (var i = 0, e = this.marked.length; i < e; ++i) this.marked[i].detach(this);
+      detachMarkedSpans(this);
     }
   };
 
diff --git a/test/test.js b/test/test.js
index 1c307eaba8..bf72734045 100644
--- a/test/test.js
+++ b/test/test.js
@@ -257,13 +257,14 @@ testCM("markTextSingleLine", function(cm) {
     var r = cm.markText({line: 0, ch: 3}, {line: 0, ch: 6}, "foo");
     cm.replaceRange(test.c, {line: 0, ch: test.a}, {line: 0, ch: test.b});
     var f = r.find();
-    eq(f.from && f.from.ch, test.f); eq(f.to && f.to.ch, test.t);
+    eq(f && f.from.ch, test.f); eq(f && f.to.ch, test.t);
   });
 });
 
 testCM("markTextMultiLine", function(cm) {
   function p(v) { return v && {line: v[0], ch: v[1]}; }
   forEach([{a: [0, 0], b: [0, 5], c: "", f: [0, 0], t: [2, 5]},
+           {a: [0, 0], b: [0, 5], c: "foo\n", f: [1, 0], t: [3, 5]},
            {a: [0, 1], b: [0, 10], c: "", f: [0, 1], t: [2, 5]},
            {a: [0, 5], b: [0, 6], c: "x", f: [0, 6], t: [2, 5]},
            {a: [0, 0], b: [1, 0], c: "", f: [0, 0], t: [1, 5]},
@@ -275,16 +276,33 @@ testCM("markTextMultiLine", function(cm) {
            {a: [1, 5], b: [2, 5], c: "", f: [0, 5], t: [1, 5]},
            {a: [2, 0], b: [2, 3], c: "", f: [0, 5], t: [2, 2]},
            {a: [2, 5], b: [3, 0], c: "a\nb", f: [0, 5], t: [2, 5]},
-           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 4]},
+           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 3]},
            {a: [1, 1], b: [1, 9], c: "1\n2\n3", f: [0, 5], t: [4, 5]}], function(test) {
     cm.setValue("aaaaaaaaaa\nbbbbbbbbbb\ncccccccccc\ndddddddd\n");
-    var r = cm.markText({line: 0, ch: 5}, {line: 2, ch: 5}, "foo");
+    var r = cm.markText({line: 0, ch: 5}, {line: 2, ch: 5}, "CodeMirror-matchingbracket");
     cm.replaceRange(test.c, p(test.a), p(test.b));
     var f = r.find();
-    eqPos(f.from, p(test.f)); eqPos(f.to, p(test.t));
+    eqPos(f && f.from, p(test.f)); eqPos(f && f.to, p(test.t));
   });
 });
 
+testCM("markTextUndo", function(cm) {
+  var marker1 = cm.markText({line: 0, ch: 1}, {line: 0, ch: 3}, "CodeMirror-matchingbracket");
+  var marker2 = cm.markText({line: 0, ch: 0}, {line: 2, ch: 1}, "CodeMirror-matchingbracket");
+  var bookmark = cm.setBookmark({line: 1, ch: 5});
+  cm.replaceRange("foo", {line: 0, ch: 2});
+  cm.replaceRange("bar\baz\bug\n", {line: 2, ch: 0}, {line: 3, ch: 0});
+  cm.setValue("");
+  eq(marker1.find(), null); eq(marker2.find(), null); eq(bookmark.find(), null);
+  cm.undo();
+  eqPos(bookmark.find(), {line: 1, ch: 5});
+  cm.undo(); cm.undo();
+  var m1Pos = marker1.find(), m2Pos = marker2.find();
+  eqPos(m1Pos.from, {line: 0, ch: 1}); eqPos(m1Pos.to, {line: 0, ch: 3});
+  eqPos(m2Pos.from, {line: 0, ch: 0}); eqPos(m2Pos.to, {line: 2, ch: 1});
+  eqPos(bookmark.find(), {line: 1, ch: 5});
+}, {value: "1234\n56789\n00\n"});
+
 testCM("markClearBetween", function(cm) {
   cm.setValue("aaa\nbbb\nccc\nddd\n");
   cm.markText({line: 0, ch: 0}, {line: 2}, "foo");

From 9a7a53c2874a0d16674fd84bf24d7aefbc4dd624 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 12:15:12 +0200
Subject: [PATCH 38/93] Introduce a lst() function to reduce arr[arr.length-1]
 noise

---
 lib/codemirror.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 55c209427a..c7bb7cd606 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -710,7 +710,7 @@ window.CodeMirror = (function() {
         history.addChange(from.line, newText.length, old);
         while (history.done.length > options.undoDepth) history.done.shift();
       }
-      var lines = updateMarkedSpans(hlSpans(old[0]), hlSpans(old[old.length-1]), from.ch, to.ch, newText);
+      var lines = updateMarkedSpans(hlSpans(old[0]), hlSpans(lst(old)), from.ch, to.ch, newText);
       updateLinesNoUndo(from, to, lines, selFrom, selTo);
     }
     function unredoHelper(from, to) {
@@ -722,7 +722,7 @@ window.CodeMirror = (function() {
         doc.iter(change.start, end, function(line) { replaced.push(newHL(line.text, line.markedSpans)); });
         out.push({start: change.start, added: change.old.length, old: replaced});
         var pos = {line: change.start + change.old.length - 1,
-                   ch: editEnd(hlText(replaced[replaced.length-1]), hlText(change.old[change.old.length-1]))};
+                   ch: editEnd(hlText(lst(replaced)), hlText(lst(change.old)))};
         updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length},
                           change.old, pos, pos);
       }
@@ -742,7 +742,7 @@ window.CodeMirror = (function() {
       if (from.line != to.line || lines.length > 1) gutterDirty = true;
 
       var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
-      var lastHL = lines[lines.length-1];
+      var lastHL = lst(lines);
 
       // First adjust the line structure
       if (from.ch == 0 && to.ch == 0 && hlText(lastHL) == "") {
@@ -873,7 +873,7 @@ window.CodeMirror = (function() {
         var line = pos.line + code.length - (to.line - from.line) - 1;
         var ch = pos.ch;
         if (pos.line == to.line)
-          ch += code[code.length-1].length - (to.ch - (to.line == from.line ? from.ch : 0));
+          ch += lst(code).length - (to.ch - (to.line == from.line ? from.ch : 0));
         return {line: line, ch: ch};
       }
       var end;
@@ -891,7 +891,7 @@ window.CodeMirror = (function() {
       });
     }
     function replaceRange1(code, from, to, computeSel) {
-      var endch = code.length == 1 ? code[0].length + from.ch : code[code.length-1].length;
+      var endch = code.length == 1 ? code[0].length + from.ch : lst(code).length;
       var newSel = computeSel({line: from.line + code.length - 1, ch: endch});
       updateLines(from, to, code, newSel.from, newSel.to);
     }
@@ -2365,7 +2365,7 @@ window.CodeMirror = (function() {
     var last = markedSpansAfter(oldLast, endCh);
 
     // Next, merge those two ends
-    var sameLine = newText.length == 1, offset = newText[newText.length-1].length + (sameLine ? startCh : 0);
+    var sameLine = newText.length == 1, offset = lst(newText).length + (sameLine ? startCh : 0);
     if (first) {
       // Fix up .to properties of first
       for (var i = 0; i < first.length; ++i) {
@@ -2405,7 +2405,7 @@ window.CodeMirror = (function() {
             (gapMarkers || (gapMarkers = [])).push({from: null, to: null, marker: first[i].marker});
       for (var i = 0; i < gap; ++i)
         newMarkers.push(newHL(newText[i+1], gapMarkers));
-      newMarkers.push(newHL(newText[newText.length-1], last));
+      newMarkers.push(newHL(lst(newText), last));
     }
     return newMarkers;
   }
@@ -2832,7 +2832,7 @@ window.CodeMirror = (function() {
   History.prototype = {
     addChange: function(start, added, old) {
       this.undone.length = 0;
-      var time = +new Date, cur = this.done[this.done.length - 1], last = cur && cur[cur.length - 1];
+      var time = +new Date, cur = lst(this.done), last = cur && lst(cur);
       var dtime = time - this.time;
 
       if (this.compound && cur && !this.closed) {
@@ -2985,10 +2985,12 @@ window.CodeMirror = (function() {
   var spaceStrs = [""];
   function spaceStr(n) {
     while (spaceStrs.length <= n)
-      spaceStrs.push(spaceStrs[spaceStrs.length - 1] + " ");
+      spaceStrs.push(lst(spaceStrs) + " ");
     return spaceStrs[n];
   }
 
+  function lst(arr) { return arr[arr.length-1]; }
+
   function selectInput(node) {
     if (ios) { // Mobile Safari apparently has a bug where select() is broken.
       node.selectionStart = 0;

From d00082ab428da2ea7c5e9dd2bcfb36c9ed360ddd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 13:33:01 +0200
Subject: [PATCH 39/93] Downcase package name in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8658354fc0..9a0d99c2e8 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "CodeMirror",
+    "name": "codemirror",
     "version":"2.33.0",
     "main": "codemirror.js",
     "description": "In-browser code editing made bearable",

From f23da64e25b4a49c267b84dff9287c3e5a82b6f0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 16:42:34 +0200
Subject: [PATCH 40/93] Add a Common Lisp mode

---
 doc/compress.html             |   1 +
 index.html                    |   1 +
 lib/codemirror.css            |   4 +-
 mode/commonlisp/commonlisp.js |  98 ++++++++++++++++++++
 mode/commonlisp/index.html    | 165 ++++++++++++++++++++++++++++++++++
 5 files changed, 267 insertions(+), 2 deletions(-)
 create mode 100644 mode/commonlisp/commonlisp.js
 create mode 100644 mode/commonlisp/index.html

diff --git a/doc/compress.html b/doc/compress.html
index a651072c5d..3b99deae27 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -62,6 +62,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
           <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option>
           <option value="http://codemirror.net/mode/clojure/clojure.js">clojure.js</option>
           <option value="http://codemirror.net/mode/coffeescript/coffeescript.js">coffeescript.js</option>
+          <option value="http://codemirror.net/mode/commonlisp/commonlisp.js">commonlisp.js</option>
           <option value="http://codemirror.net/mode/css/css.js">css.js</option>
           <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
           <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
diff --git a/index.html b/index.html
index 5a5a39c5e2..f7ae5ea393 100644
--- a/index.html
+++ b/index.html
@@ -38,6 +38,7 @@ <h2 style="margin-top: 0">Supported modes:</h2>
       <li><a href="mode/clike/index.html">C, C++, C#</a></li>
       <li><a href="mode/clojure/index.html">Clojure</a></li>
       <li><a href="mode/coffeescript/index.html">CoffeeScript</a></li>
+      <li><a href="mode/commonlisp/index.html">Common Lisp</a></li>
       <li><a href="mode/css/index.html">CSS</a></li>
       <li><a href="mode/diff/index.html">diff</a></li>
       <li><a href="mode/ecl/index.html">ECL</a></li>
diff --git a/lib/codemirror.css b/lib/codemirror.css
index f0e91b2d73..05ad0ed013 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -145,7 +145,7 @@ div.CodeMirror-selected { background: #d9d9d9; }
 .cm-s-default span.cm-error {color: #f00;}
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30a;}
-.cm-s-default span.cm-bracket {color: #cc7;}
+.cm-s-default span.cm-bracket {color: #997;}
 .cm-s-default span.cm-tag {color: #170;}
 .cm-s-default span.cm-attribute {color: #00c;}
 .cm-s-default span.cm-header {color: blue;}
@@ -170,4 +170,4 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
     visibility: hidden;
   }
 
-}
\ No newline at end of file
+}
diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
new file mode 100644
index 0000000000..b95a8686bb
--- /dev/null
+++ b/mode/commonlisp/commonlisp.js
@@ -0,0 +1,98 @@
+CodeMirror.defineMode("commonlisp", function (config) {
+  var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
+  var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
+  var symbol = /[^\s'`,@()\[\]";]/;
+  var type;
+
+  function readSym(stream) {
+    while (ch = stream.next()) {
+      if (ch == "\\") stream.next();
+      else if (!symbol.test(ch)) { stream.backUp(1); break; }
+    }
+    return stream.current();
+  }
+
+  function base(stream, state) {
+    if (stream.eatSpace()) {type = "ws"; return null;}
+    if (stream.match(numLiteral)) return "number";
+    var ch = stream.next();
+    if (ch == "\\") ch = stream.next();
+
+    if (ch == '"') return (state.tokenize = inString)(stream, state);
+    else if (ch == "(") { type = "open"; return "bracket"; }
+    else if (ch == ")" || ch == "]") { type = "close"; return "bracket"; }
+    else if (ch == ";") { stream.skipToEnd(); type = "ws"; return "comment"; }
+    else if (/['`,@]/.test(ch)) return null;
+    else if (ch == "|") {
+      if (stream.skipTo("|")) { stream.next(); return "symbol"; }
+      else { stream.skipToEnd(); return "error"; }
+    } else if (ch == "#") {
+      if (stream.eat("[")) { type = "open"; return "bracket"; }
+      else if (stream.eat(/[+\-=\.]/)) return null;
+      else if (stream.match(/^\d+#/)) return null;
+      else if (stream.eat("|")) return (state.tokenize = inComment)(stream, state);
+      else if (stream.eat(":")) { readSym(stream); return "meta"; }
+      else { stream.next(); return "error"; }
+    } else {
+      var name = readSym(stream);
+      if (name == ".") return null;
+      type = "symbol";
+      if (name == "nil" || name == "t") return "atom";
+      if (name.charAt(0) == ":") return "keyword";
+      return "variable";
+    }
+  }
+
+  function inString(stream, state) {
+    var escaped = false, next;
+    while (next = stream.next()) {
+      if (next == '"' && !escaped) { state.tokenize = base; break; }
+      escaped = !escaped && next == "\\";
+    }
+    return "string";
+  }
+
+  function inComment(stream, state) {
+    var next, last;
+    while (next = stream.next()) {
+      if (next == "#" && last == "|") { state.tokenize = base; break; }
+      last = next;
+    }
+    type = "ws";
+    return "comment";
+  }
+
+  return {
+    startState: function () {
+      return {ctx: {prev: null, start: 0, indentTo: 0}, tokenize: base};
+    },
+
+    token: function (stream, state) {
+      if (stream.sol() && typeof state.ctx.indentTo != "number")
+        state.ctx.indentTo = state.ctx.start + 1;
+
+      type = null;
+      var style = state.tokenize(stream, state);
+      if (type != "ws") {
+        if (state.ctx.indentTo == null) {
+          if (type == "symbol" && assumeBody.test(stream.current()))
+            state.ctx.indentTo = state.ctx.start + config.indentUnit;
+          else
+            state.ctx.indentTo = "next";
+        } else if (state.ctx.indentTo == "next") {
+          state.ctx.indentTo = stream.column();
+        }
+      }
+      if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
+      else if (type == "close") state.ctx = state.ctx.prev;
+      return style;
+    },
+
+    indent: function (state, textAfter) {
+      var i = state.ctx.indentTo;
+      return typeof i == "number" ? i : state.ctx.start + 1;
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/x-common-lisp", "commonlisp");
diff --git a/mode/commonlisp/index.html b/mode/commonlisp/index.html
new file mode 100644
index 0000000000..f9766a844c
--- /dev/null
+++ b/mode/commonlisp/index.html
@@ -0,0 +1,165 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: Common Lisp mode</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="commonlisp.js"></script>
+    <style>.CodeMirror {background: #f8f8f8;}</style>
+    <link rel="stylesheet" href="../../doc/docs.css">
+  </head>
+  <body>
+    <h1>CodeMirror: Common Lisp mode</h1>
+    <form><textarea id="code" name="code">(in-package :cl-postgres)
+
+;; These are used to synthesize reader and writer names for integer
+;; reading/writing functions when the amount of bytes and the
+;; signedness is known. Both the macro that creates the functions and
+;; some macros that use them create names this way.
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun integer-reader-name (bytes signed)
+    (intern (with-standard-io-syntax
+              (format nil "~a~a~a~a" '#:read- (if signed "" '#:u) '#:int bytes))))
+  (defun integer-writer-name (bytes signed)
+    (intern (with-standard-io-syntax
+              (format nil "~a~a~a~a" '#:write- (if signed "" '#:u) '#:int bytes)))))
+
+(defmacro integer-reader (bytes)
+  "Create a function to read integers from a binary stream."
+  (let ((bits (* bytes 8)))
+    (labels ((return-form (signed)
+               (if signed
+                   `(if (logbitp ,(1- bits) result)
+                        (dpb result (byte ,(1- bits) 0) -1)
+                        result)
+                   `result))
+             (generate-reader (signed)
+               `(defun ,(integer-reader-name bytes signed) (socket)
+                  (declare (type stream socket)
+                           #.*optimize*)
+                  ,(if (= bytes 1)
+                       `(let ((result (the (unsigned-byte 8) (read-byte socket))))
+                          (declare (type (unsigned-byte 8) result))
+                          ,(return-form signed))
+                       `(let ((result 0))
+                          (declare (type (unsigned-byte ,bits) result))
+                          ,@(loop :for byte :from (1- bytes) :downto 0
+                                   :collect `(setf (ldb (byte 8 ,(* 8 byte)) result)
+                                                   (the (unsigned-byte 8) (read-byte socket))))
+                          ,(return-form signed))))))
+      `(progn
+;; This causes weird errors on SBCL in some circumstances. Disabled for now.
+;;         (declaim (inline ,(integer-reader-name bytes t)
+;;                          ,(integer-reader-name bytes nil)))
+         (declaim (ftype (function (t) (signed-byte ,bits))
+                         ,(integer-reader-name bytes t)))
+         ,(generate-reader t)
+         (declaim (ftype (function (t) (unsigned-byte ,bits))
+                         ,(integer-reader-name bytes nil)))
+         ,(generate-reader nil)))))
+
+(defmacro integer-writer (bytes)
+  "Create a function to write integers to a binary stream."
+  (let ((bits (* 8 bytes)))
+    `(progn
+      (declaim (inline ,(integer-writer-name bytes t)
+                       ,(integer-writer-name bytes nil)))
+      (defun ,(integer-writer-name bytes nil) (socket value)
+        (declare (type stream socket)
+                 (type (unsigned-byte ,bits) value)
+                 #.*optimize*)
+        ,@(if (= bytes 1)
+              `((write-byte value socket))
+              (loop :for byte :from (1- bytes) :downto 0
+                    :collect `(write-byte (ldb (byte 8 ,(* byte 8)) value)
+                               socket)))
+        (values))
+      (defun ,(integer-writer-name bytes t) (socket value)
+        (declare (type stream socket)
+                 (type (signed-byte ,bits) value)
+                 #.*optimize*)
+        ,@(if (= bytes 1)
+              `((write-byte (ldb (byte 8 0) value) socket))
+              (loop :for byte :from (1- bytes) :downto 0
+                    :collect `(write-byte (ldb (byte 8 ,(* byte 8)) value)
+                               socket)))
+        (values)))))
+
+;; All the instances of the above that we need.
+
+(integer-reader 1)
+(integer-reader 2)
+(integer-reader 4)
+(integer-reader 8)
+
+(integer-writer 1)
+(integer-writer 2)
+(integer-writer 4)
+
+(defun write-bytes (socket bytes)
+  "Write a byte-array to a stream."
+  (declare (type stream socket)
+           (type (simple-array (unsigned-byte 8)) bytes)
+           #.*optimize*)
+  (write-sequence bytes socket))
+
+(defun write-str (socket string)
+  "Write a null-terminated string to a stream \(encoding it when UTF-8
+support is enabled.)."
+  (declare (type stream socket)
+           (type string string)
+           #.*optimize*)
+  (enc-write-string string socket)
+  (write-uint1 socket 0))
+
+(declaim (ftype (function (t unsigned-byte)
+                          (simple-array (unsigned-byte 8) (*)))
+                read-bytes))
+(defun read-bytes (socket length)
+  "Read a byte array of the given length from a stream."
+  (declare (type stream socket)
+           (type fixnum length)
+           #.*optimize*)
+  (let ((result (make-array length :element-type '(unsigned-byte 8))))
+    (read-sequence result socket)
+    result))
+
+(declaim (ftype (function (t) string) read-str))
+(defun read-str (socket)
+  "Read a null-terminated string from a stream. Takes care of encoding
+when UTF-8 support is enabled."
+  (declare (type stream socket)
+           #.*optimize*)
+  (enc-read-string socket :null-terminated t))
+
+(defun skip-bytes (socket length)
+  "Skip a given number of bytes in a binary stream."
+  (declare (type stream socket)
+           (type (unsigned-byte 32) length)
+           #.*optimize*)
+  (dotimes (i length)
+    (read-byte socket)))
+
+(defun skip-str (socket)
+  "Skip a null-terminated string."
+  (declare (type stream socket)
+           #.*optimize*)
+  (loop :for char :of-type fixnum = (read-byte socket)
+        :until (zerop char)))
+
+(defun ensure-socket-is-closed (socket &amp;key abort)
+  (when (open-stream-p socket)
+    (handler-case
+        (close socket :abort abort)
+      (error (error)
+        (warn "Ignoring the error which happened while trying to close PostgreSQL socket: ~A" error)))))
+</textarea></form>
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {lineNumbers: true});
+    </script>
+
+    <p><strong>MIME types defined:</strong> <code>text/x-common-lisp</code>.</p>
+
+  </body>
+</html>

From db012e8a542aa6fe6fdbb7cf886d73d6c389ff9e Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 16:49:46 +0200
Subject: [PATCH 41/93] [commonlisp mode] Fix accidental global

---
 mode/commonlisp/commonlisp.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index b95a8686bb..6f2d1d7af5 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -5,6 +5,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
   var type;
 
   function readSym(stream) {
+    var ch;
     while (ch = stream.next()) {
       if (ch == "\\") stream.next();
       else if (!symbol.test(ch)) { stream.backUp(1); break; }

From 8556412ecd43b14cb180d1e58ca62e8ba9373199 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 16:59:18 +0200
Subject: [PATCH 42/93] [commonlisp mode] Various small fixes

---
 mode/commonlisp/commonlisp.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 6f2d1d7af5..7a56b61de5 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -28,18 +28,20 @@ CodeMirror.defineMode("commonlisp", function (config) {
       if (stream.skipTo("|")) { stream.next(); return "symbol"; }
       else { stream.skipToEnd(); return "error"; }
     } else if (ch == "#") {
-      if (stream.eat("[")) { type = "open"; return "bracket"; }
-      else if (stream.eat(/[+\-=\.]/)) return null;
-      else if (stream.match(/^\d+#/)) return null;
-      else if (stream.eat("|")) return (state.tokenize = inComment)(stream, state);
-      else if (stream.eat(":")) { readSym(stream); return "meta"; }
-      else { stream.next(); return "error"; }
+      var ch = stream.next();
+      if (ch == "[") { type = "open"; return "bracket"; }
+      else if (/[+\-=\.']/.test(ch)) return null;
+      else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null;
+      else if (ch == "|") return (state.tokenize = inComment)(stream, state);
+      else if (ch == ":") { readSym(stream); return "meta"; }
+      else return "error";
     } else {
       var name = readSym(stream);
       if (name == ".") return null;
       type = "symbol";
       if (name == "nil" || name == "t") return "atom";
       if (name.charAt(0) == ":") return "keyword";
+      if (name.charAt(0) == "&") return "variable-2";
       return "variable";
     }
   }

From 53b68526229237773ca65153bc071109fde732a5 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 17:05:20 +0200
Subject: [PATCH 43/93] Add node.js-capable runMode implementation

---
 lib/util/runmode-standalone.js | 105 +++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 lib/util/runmode-standalone.js

diff --git a/lib/util/runmode-standalone.js b/lib/util/runmode-standalone.js
new file mode 100644
index 0000000000..789836b288
--- /dev/null
+++ b/lib/util/runmode-standalone.js
@@ -0,0 +1,105 @@
+/* Just enough of CodeMirror to run runMode under node.js */
+
+function splitLines(string){ return string.split(/\r?\n|\r/); };
+
+// Counts the column offset in a string, taking tabs into account.
+// Used mostly to find indentation.
+function countColumn(string, end) {
+  tabSize = 4;
+  if (end == null) {
+    end = string.search(/[^\s\u00a0]/);
+    if (end == -1) end = string.length;
+  }
+  for (var i = 0, n = 0; i < end; ++i) {
+    if (string.charAt(i) == "\t") n += tabSize - (n % tabSize);
+    else ++n;
+  }
+  return n;
+}
+
+function StringStream(string) {
+  this.pos = this.start = 0;
+  this.string = string;
+}
+StringStream.prototype = {
+  eol: function() {return this.pos >= this.string.length;},
+  sol: function() {return this.pos == 0;},
+  peek: function() {return this.string.charAt(this.pos) || null;},
+  next: function() {
+    if (this.pos < this.string.length)
+      return this.string.charAt(this.pos++);
+  },
+  eat: function(match) {
+    var ch = this.string.charAt(this.pos);
+    if (typeof match == "string") var ok = ch == match;
+    else var ok = ch && (match.test ? match.test(ch) : match(ch));
+    if (ok) {++this.pos; return ch;}
+  },
+  eatWhile: function(match) {
+    var start = this.pos;
+    while (this.eat(match)){}
+    return this.pos > start;
+  },
+  eatSpace: function() {
+    var start = this.pos;
+    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
+    return this.pos > start;
+  },
+  skipToEnd: function() {this.pos = this.string.length;},
+  skipTo: function(ch) {
+    var found = this.string.indexOf(ch, this.pos);
+    if (found > -1) {this.pos = found; return true;}
+  },
+  backUp: function(n) {this.pos -= n;},
+  column: function() {return countColumn(this.string, this.start);},
+  indentation: function() {return countColumn(this.string);},
+  match: function(pattern, consume, caseInsensitive) {
+    if (typeof pattern == "string") {
+      function cased(str) {return caseInsensitive ? str.toLowerCase() : str;}
+      if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {
+        if (consume !== false) this.pos += pattern.length;
+        return true;
+      }
+    }
+    else {
+      var match = this.string.slice(this.pos).match(pattern);
+      if (match && consume !== false) this.pos += match[0].length;
+      return match;
+    }
+  },
+  current: function(){return this.string.slice(this.start, this.pos);}
+};
+exports.StringStream = StringStream;
+
+exports.startState = function(mode, a1, a2) {
+  return mode.startState ? mode.startState(a1, a2) : true;
+};
+
+var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
+exports.defineMode = function(name, mode) { modes[name] = mode; };
+exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
+exports.getMode = function(options, spec) {
+  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec))
+    spec = mimeModes[spec];
+  if (typeof spec == "string")
+    var mname = spec, config = {};
+  else if (spec != null)
+    var mname = spec.name, config = spec;
+  var mfactory = modes[mname];
+  if (!mfactory) throw new Error("Unknown mode: " + spec);
+  return mfactory(options, config || {});
+};
+
+exports.runMode = function(string, modespec, callback) {
+  var mode = exports.getMode({indentUnit: 2}, modespec);
+  var lines = splitLines(string), state = exports.startState(mode);
+  for (var i = 0, e = lines.length; i < e; ++i) {
+    if (i) callback("\n");
+    var stream = new exports.StringStream(lines[i]);
+    while (!stream.eol()) {
+      var style = mode.token(stream, state);
+      callback(stream.current(), style, i, stream.start);
+      stream.start = stream.pos;
+    }
+  }
+};

From 4ec75a9ad878b862880069b6db31ce4f9fa6826c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 10 Sep 2012 17:19:53 +0200
Subject: [PATCH 44/93] Further minimize runmode-standalone.js, fix failing
 build

---
 lib/util/runmode-standalone.js | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/util/runmode-standalone.js b/lib/util/runmode-standalone.js
index 789836b288..afdf044d8d 100644
--- a/lib/util/runmode-standalone.js
+++ b/lib/util/runmode-standalone.js
@@ -2,21 +2,6 @@
 
 function splitLines(string){ return string.split(/\r?\n|\r/); };
 
-// Counts the column offset in a string, taking tabs into account.
-// Used mostly to find indentation.
-function countColumn(string, end) {
-  tabSize = 4;
-  if (end == null) {
-    end = string.search(/[^\s\u00a0]/);
-    if (end == -1) end = string.length;
-  }
-  for (var i = 0, n = 0; i < end; ++i) {
-    if (string.charAt(i) == "\t") n += tabSize - (n % tabSize);
-    else ++n;
-  }
-  return n;
-}
-
 function StringStream(string) {
   this.pos = this.start = 0;
   this.string = string;
@@ -51,8 +36,8 @@ StringStream.prototype = {
     if (found > -1) {this.pos = found; return true;}
   },
   backUp: function(n) {this.pos -= n;},
-  column: function() {return countColumn(this.string, this.start);},
-  indentation: function() {return countColumn(this.string);},
+  column: function() {return this.start;},
+  indentation: function() {return 0;},
   match: function(pattern, consume, caseInsensitive) {
     if (typeof pattern == "string") {
       function cased(str) {return caseInsensitive ? str.toLowerCase() : str;}

From acb6aa6bc39bb9581bbd578865c550745ebd3ca8 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 11 Sep 2012 13:40:39 +0200
Subject: [PATCH 45/93] Add startStyle and endStyle options for markers

Closes #819
---
 doc/manual.html     | 30 ++++++++++++++++++++----------
 lib/codemirror.js   | 14 +++++++++-----
 mode/xml/index.html |  2 +-
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index 758b4e5839..b59a03d5af 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -594,16 +594,26 @@ <h2 id="api">Programming API</h2>
       <dd>Can be used to mark a range of text with a specific CSS
       class name. <code>from</code> and <code>to</code> should
       be <code>{line, ch}</code> objects. The <code>options</code>
-      parameter is optional, and can be an object
-      with <code>inclusiveLeft</code> and <code>inclusiveRight</code>
-      properties, which determine whether typing at the left or right
-      of the marker will cause the new text to become part of the
-      marker (the default is false for both). The method will return an
-      object with two methods, <code>clear()</code>, which removes the
-      mark, and <code>find()</code>, which returns a <code>{from,
-      to}</code> (both document positions), indicating the current
-      position of the marked range, or <code>undefined</code> if the
-      marker is no longer in the document.</dd>
+      parameter is optional. When given, it should be an object that
+      may contain the following configuration options:
+      <dl>
+        <dt><code>inclusiveLeft</code></dt><dd>Determines whether
+        text inserted on the left of the marker will end up inside
+        or outside of it.</dd>
+        <dt><code>inclusiveRight</code></dt><dd>Like <code>inclusiveLeft</code>,
+        but for the right side.</dd>
+        <dt><code>startStyle</code></dt><dd>Can be used to specify
+        an extra CSS class to be applied to the leftmost span that
+        is part of the marker.</dd>
+        <dt><code>endStyle</code></dt><dd>Equivalent
+        to <code>startStyle</code>, but for the rightmost span.</dd>
+      </dl>
+      The method will return an object with two methods,
+      <code>clear()</code>, which removes the mark,
+      and <code>find()</code>, which returns a <code>{from, to}</code>
+      (both document positions), indicating the current position of
+      the marked range, or <code>undefined</code> if the marker is no
+      longer in the document.</dd>
 
       <dt id="setBookmark"><code>setBookmark(pos) → object</code></dt>
       <dd>Inserts a bookmark, a handle that follows the text around it
diff --git a/lib/codemirror.js b/lib/codemirror.js
index c7bb7cd606..1d6aeff686 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1524,8 +1524,8 @@ window.CodeMirror = (function() {
     function markText(from, to, className, options) {
       from = clipPos(from); to = clipPos(to);
       var marker = new TextMarker("range", className);
-      if (options && options.inclusiveLeft) marker.inclusiveLeft = true;
-      if (options && options.inclusiveRight) marker.inclusiveRight = true;
+      if (options) for (var opt in options) if (options.hasOwnProperty(opt))
+        marker[opt] = options[opt];
       var curLine = from.line;
       doc.iter(curLine, to.line + 1, function(line) {
         var span = {from: curLine == from.line ? from.ch : null,
@@ -2596,7 +2596,7 @@ window.CodeMirror = (function() {
           var m;
           while (markpos < marked.length &&
                  ((m = marked[markpos]).from == pos || m.from == null)) {
-            if (m.marker.style != null) marks.push(m);
+            if (m.marker.type == "range") marks.push(m);
             ++markpos;
           }
           nextChange = markpos < marked.length ? marked[markpos].from : Infinity;
@@ -2615,8 +2615,12 @@ window.CodeMirror = (function() {
             if (text) {
               var end = pos + text.length;
               var appliedStyle = style;
-              for (var j = 0; j < marks.length; ++j)
-                appliedStyle = (appliedStyle ? appliedStyle + " " : "") + marks[j].marker.style;
+              for (var j = 0; j < marks.length; ++j) {
+                var mark = marks[j];
+                appliedStyle = (appliedStyle ? appliedStyle + " " : "") + mark.marker.style;
+                if (mark.marker.endStyle && mark.to === Math.min(end, upto)) appliedStyle += " " + mark.marker.endStyle;
+                if (mark.marker.startStyle && mark.from === pos) appliedStyle += " " + mark.marker.startStyle;
+              }
               span(pre, end > upto ? text.slice(0, upto - pos) : text, appliedStyle);
               if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
               pos = end;
diff --git a/mode/xml/index.html b/mode/xml/index.html
index 9628d954c0..49a627de73 100644
--- a/mode/xml/index.html
+++ b/mode/xml/index.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="xml.js"></script>
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <style type="text/css">.foo{border-right: 1px solid red} .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
   </head>
   <body>

From 23c8c3e79ab2ae3e4127150482f94a850a7a8516 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Sep 2012 10:46:46 +0200
Subject: [PATCH 46/93] Add new state introspection mechanism for nested modes

And move closetag over to it.

This makes the code that gets the XML state out of the mode actually
sound and extensible.

Issue #820
---
 doc/manual.html                   | 22 +++++++++
 lib/codemirror.js                 | 16 ++++++-
 lib/util/closetag.js              | 79 +++++++++++++++----------------
 lib/util/multiplex.js             |  6 ++-
 lib/util/overlay.js               |  4 +-
 mode/htmlembedded/htmlembedded.js |  6 ++-
 mode/htmlmixed/htmlmixed.js       | 13 ++---
 mode/php/php.js                   | 10 ++--
 8 files changed, 98 insertions(+), 58 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index b59a03d5af..b0331ca41f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -531,6 +531,11 @@ <h2 id="api">Programming API</h2>
       <dt id="getOption"><code>getOption(option) → value</code></dt>
       <dd>Retrieves the current value of the given option for this
       editor instance.</dd>
+      <dt id="getMode"><code>getMode() → object</code></dt>
+      <dd>Gets the mode object for the editor. Note that this is
+      distinct from <code>getOption("mode")</code>, which gives you
+      the mode specification, rather than the resolved, instantiated
+      <a href="#defineMode">mode object</a>.</dd>
 
       <dt id="cursorCoords"><code>cursorCoords(start, mode) → object</code></dt>
       <dd>Returns an <code>{x, y, yBot}</code> object containing the
@@ -1154,6 +1159,14 @@ <h2 id="modeapi">Writing CodeMirror Modes</h2>
     where <code>mode</code> is the mode that created the given
     state.</p>
 
+    <p id="innerMode">In a nested mode, it is recommended to add an
+    extra methods, <code>innerMode</code> which, given a state object,
+    returns a <code>{state, mode}</code> object with the inner mode
+    and its state for the current position. These are used by utility
+    scripts such as the autoformatter and
+    the <a href="#util_closetag">tag closer</a> to get context
+    information.</p>
+
     <p>To make indentation work properly in a nested parser, it is
     advisable to give the <code>startState</code> method of modes that
     are intended to be nested an optional argument that provides the
@@ -1172,6 +1185,15 @@ <h2 id="modeapi">Writing CodeMirror Modes</h2>
     mode, as in the <a href="#option_mode"><code>mode</code></a>
     option.</p>
 
+    <p id="extendMode">Sometimes, it is useful to add or override mode
+    object properties from external code.
+    The <code>CodeMirror.extendMode</code> can be used to add
+    properties to mode objects produced for a specific mode. Its first
+    argument is the name of the mode, its second an object that
+    specifies the properties that should be added. This is mostly
+    useful to add utilities that can later be looked
+    up <a href="#getMode"><code>getMode</code></a>.</p>
+
 </div><div class="rightsmall blk">
 
     <h2>Contents</h2>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 1d6aeff686..2bc83f352a 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -174,6 +174,7 @@ window.CodeMirror = (function() {
         }
       },
       getOption: function(option) {return options[option];},
+      getMode: function() {return mode;},
       undo: operation(undo),
       redo: operation(redo),
       indentLine: operation(function(n, dir) {
@@ -2037,7 +2038,13 @@ window.CodeMirror = (function() {
     var spec = CodeMirror.resolveMode(spec);
     var mfactory = modes[spec.name];
     if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    return mfactory(options, spec);
+    var modeObj = mfactory(options, spec);
+    if (modeExtensions.hasOwnProperty(spec.name)) {
+      var exts = modeExtensions[spec.name];
+      for (var prop in exts) if (exts.hasOwnProperty(prop)) modeObj[prop] = exts[prop];
+    }
+    modeObj.name = spec.name;
+    return modeObj;
   };
   CodeMirror.listModes = function() {
     var list = [];
@@ -2057,6 +2064,13 @@ window.CodeMirror = (function() {
     extensions[name] = func;
   };
 
+  var modeExtensions = CodeMirror.modeExtensions = {};
+  CodeMirror.extendMode = function(mode, properties) {
+    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
+    for (var prop in properties) if (properties.hasOwnProperty(prop))
+      exts[prop] = properties[prop];
+  };
+
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection({line: 0, ch: 0}, {line: cm.lineCount() - 1});},
     killLine: function(cm) {
diff --git a/lib/util/closetag.js b/lib/util/closetag.js
index 5b2a900139..83dc2c7e75 100644
--- a/lib/util/closetag.js
+++ b/lib/util/closetag.js
@@ -26,16 +26,15 @@
 	/** Array of tag names where an end tag is forbidden. */
 	CodeMirror.defaults['closeTagVoid'] = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 
-	function resolveMode(mode) {
-		if (typeof mode == "object") return mode.name;
-		if (mode.indexOf("/") > -1) return resolveMode(CodeMirror.mimeModes[mode]);
-		else return mode;
+	function innerState(cm, state) {
+		for (var mode = cm.getMode(); mode.innerMode;) {
+			var info = mode.innerMode(state);
+			mode = info.mode;
+			state = info.state;
+		}
+		if (mode.name == "xml") return state;
 	}
 
-	function innerState(state) {
-		// htmlmixed uses .htmlState, PHP .html, XML just the top state object
-		return state.htmlState || state.html || state;
-	}
 
 	/**
 	 * Call during key processing to close tags.  Handles the key event if the tag is closed, otherwise throws CodeMirror.Pass.
@@ -50,39 +49,34 @@
 			throw CodeMirror.Pass;
 		}
 		
+		/*
+		 * Relevant structure of token:
+		 *
+		 * htmlmixed
+		 * 		className
+		 * 		state
+		 * 			htmlState
+		 * 				type
+		 *				tagName
+		 * 				context
+		 * 					tagName
+		 * 			mode
+		 * 
+		 * xml
+		 * 		className
+		 * 		state
+		 * 			tagName
+		 * 			type
+		 */
 		
-		if (/^(xml|php|htmlmixed)$/.test(resolveMode(cm.getOption('mode')))) {
-		
-			/*
-			 * Relevant structure of token:
-			 *
-			 * htmlmixed
-			 * 		className
-			 * 		state
-			 * 			htmlState
-			 * 				type
-			 *				tagName
-			 * 				context
-			 * 					tagName
-			 * 			mode
-			 * 
-			 * xml
-			 * 		className
-			 * 		state
-			 * 			tagName
-			 * 			type
-			 */
-		
-			var pos = cm.getCursor();
-			var tok = cm.getTokenAt(pos);
-			var state = tok.state;
-			
-			if (state.mode && state.mode != 'html') {
-				throw CodeMirror.Pass; // With htmlmixed, we only care about the html sub-mode.
-			}
+		var pos = cm.getCursor();
+		var tok = cm.getTokenAt(pos);
+		var state = innerState(cm, tok.state);
+
+		if (state) {
 			
 			if (ch == '>') {
-				var type = innerState(state).type;
+				var type = state.type;
 				
 				if (tok.className == 'tag' && type == 'closeTag') {
 					throw CodeMirror.Pass; // Don't process the '>' at the end of an end-tag.
@@ -93,11 +87,12 @@
 				cm.setCursor(pos);
 		
 				tok = cm.getTokenAt(cm.getCursor());
-				state = tok.state;
-				var type = innerState(state).type;
+				state = innerState(cm, tok.state);
+				if (!state) throw CodeMirror.Pass;
+				var type = state.type;
 
 				if (tok.className == 'tag' && type != 'selfcloseTag') {
-					var tagName = innerState(state).tagName;
+					var tagName = state.tagName;
 					if (tagName.length > 0 && shouldClose(cm, vd, tagName)) {
 						insertEndTag(cm, indent, pos, tagName);
 					}
@@ -110,7 +105,7 @@
 			
 			} else if (ch == '/') {
 				if (tok.className == 'tag' && tok.string == '<') {
-					var ctx = innerState(state).context, tagName = ctx ? ctx.tagName : '';
+					var ctx = state.context, tagName = ctx ? ctx.tagName : '';
 					if (tagName.length > 0) {
 						completeEndTag(cm, pos, tagName);
 						return;
diff --git a/lib/util/multiplex.js b/lib/util/multiplex.js
index b7c1838f62..214730839d 100644
--- a/lib/util/multiplex.js
+++ b/lib/util/multiplex.js
@@ -68,6 +68,10 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
     },
 
-    electricChars: outer.electricChars
+    electricChars: outer.electricChars,
+
+    innerMode: function(state) {
+      return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer};
+    }
   };
 };
diff --git a/lib/util/overlay.js b/lib/util/overlay.js
index 1d5df6c64c..c38d0ca6bb 100644
--- a/lib/util/overlay.js
+++ b/lib/util/overlay.js
@@ -47,6 +47,8 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
     indent: base.indent && function(state, textAfter) {
       return base.indent(state.base, textAfter);
     },
-    electricChars: base.electricChars
+    electricChars: base.electricChars,
+
+    innerMode: function(state) { return {state: state.base, mode: base}; }
   };
 };
diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index a8a7e6e603..195d48e328 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -58,8 +58,12 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
       };
     },
     
+    electricChars: "/{}:",
 
-    electricChars: "/{}:"
+    innerMode: function(state) {
+      if (state.token == scriptingDispatch) return {state: state.scriptState, mode: scriptingMode};
+      else return {state: state.htmlState, mode: htmlMixedMode};
+    }
   };
 }, "htmlmixed");
 
diff --git a/mode/htmlmixed/htmlmixed.js b/mode/htmlmixed/htmlmixed.js
index 5f2fc238c9..4652848296 100644
--- a/mode/htmlmixed/htmlmixed.js
+++ b/mode/htmlmixed/htmlmixed.js
@@ -1,4 +1,4 @@
-CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
+CodeMirror.defineMode("htmlmixed", function(config) {
   var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true});
   var jsMode = CodeMirror.getMode(config, "javascript");
   var cssMode = CodeMirror.getMode(config, "css");
@@ -9,12 +9,10 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
       if (/^script$/i.test(state.htmlState.context.tagName)) {
         state.token = javascript;
         state.localState = jsMode.startState(htmlMode.indent(state.htmlState, ""));
-        state.mode = "javascript";
       }
       else if (/^style$/i.test(state.htmlState.context.tagName)) {
         state.token = css;
         state.localState = cssMode.startState(htmlMode.indent(state.htmlState, ""));
-        state.mode = "css";
       }
     }
     return style;
@@ -33,7 +31,6 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     if (stream.match(/^<\/\s*script\s*>/i, false)) {
       state.token = html;
       state.localState = null;
-      state.mode = "html";
       return html(stream, state);
     }
     return maybeBackup(stream, /<\/\s*script\s*>/,
@@ -43,7 +40,6 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
     if (stream.match(/^<\/\s*style\s*>/i, false)) {
       state.token = html;
       state.localState = null;
-      state.mode = "html";
       return html(stream, state);
     }
     return maybeBackup(stream, /<\/\s*style\s*>/,
@@ -76,7 +72,12 @@ CodeMirror.defineMode("htmlmixed", function(config, parserConfig) {
         return cssMode.indent(state.localState, textAfter);
     },
 
-    electricChars: "/{}:"
+    electricChars: "/{}:",
+
+    innerMode: function(state) {
+      var mode = state.token == html ? htmlMode : state.token == javascript ? jsMode : cssMode;
+      return {state: state.localState || state.htmlState, mode: mode};
+    }
   };
 }, "xml", "javascript", "css");
 
diff --git a/mode/php/php.js b/mode/php/php.js
index dbe774fa59..b94317c749 100644
--- a/mode/php/php.js
+++ b/mode/php/php.js
@@ -56,14 +56,13 @@
     var phpMode = CodeMirror.getMode(config, phpConfig);
 
     function dispatch(stream, state) { // TODO open PHP inside text/css
-      var isPHP = state.mode == "php";
+      var isPHP = state.curMode == phpMode;
       if (stream.sol() && state.pending != '"') state.pending = null;
       if (state.curMode == htmlMode) {
         if (stream.match(/^<\?\w*/)) {
           state.curMode = phpMode;
           state.curState = state.php;
           state.curClose = "?>";
-	  state.mode = "php";
           return "meta";
         }
         if (state.pending == '"') {
@@ -86,13 +85,11 @@
             state.curMode = jsMode;
             state.curState = jsMode.startState(htmlMode.indent(state.curState, ""));
             state.curClose = /^<\/\s*script\s*>/i;
-	    state.mode = "javascript";
           }
           else if (/^style$/i.test(state.curState.context.tagName)) {
             state.curMode = cssMode;
             state.curState = cssMode.startState(htmlMode.indent(state.curState, ""));
             state.curClose = /^<\/\s*style\s*>/i;
-            state.mode = "css";
           }
         }
         return style;
@@ -101,7 +98,6 @@
         state.curMode = htmlMode;
         state.curState = state.html;
         state.curClose = null;
-	state.mode = "html";
         if (isPHP) return "meta";
         else return dispatch(stream, state);
       } else {
@@ -141,7 +137,9 @@
         return state.curMode.indent(state.curState, textAfter);
       },
 
-      electricChars: "/{}:"
+      electricChars: "/{}:",
+
+      innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
     };
   }, "xml", "clike", "javascript", "css");
   CodeMirror.defineMIME("application/x-httpd-php", "php");

From ad7a8353270621ee9e13efdad0be453366deea21 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Sep 2012 11:57:00 +0200
Subject: [PATCH 47/93] [util/formatting] Move over to new mode
 extension/introspection

This makes the formatter easier to adjust to new mode, and
cleans it up somewhat.
---
 doc/manual.html        |  13 +-
 lib/codemirror.js      |   8 +
 lib/util/closetag.js   |   7 +-
 lib/util/formatting.js | 393 +++++++++++++++--------------------------
 mode/gfm/gfm.js        |   7 +-
 5 files changed, 165 insertions(+), 263 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index b0331ca41f..09fb1c74c5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -959,6 +959,11 @@ <h2 id="addons">Add-ons</h2>
       Depends on
       the <a href="#util_searchcursor"><code>searchcursor</code></a>
       add-on. Demo <a href="../demo/matchhighlighter.html">here</a>.</dd>
+      <dt id="util_formatting"><a href="../lib/util/formatting.js"><code>formatting.js</code></a></dt>
+      <dd>Adds <code>commentRange</code>, <code>autoIndentRange</code>,
+      and <code>autoFormatRange</code> methods that, respectively,
+      comment (or uncomment), indent, or format (add line breaks) a
+      range of code. <a href="../demo/formatting.html">Demo here.</a></dd>
       <dt id="util_closetag"><a href="../lib/util/closetag.js"><code>closetag.js</code></a></dt>
       <dd>Provides utility functions for adding automatic tag closing
       to XML modes. See
@@ -1163,9 +1168,11 @@ <h2 id="modeapi">Writing CodeMirror Modes</h2>
     extra methods, <code>innerMode</code> which, given a state object,
     returns a <code>{state, mode}</code> object with the inner mode
     and its state for the current position. These are used by utility
-    scripts such as the autoformatter and
-    the <a href="#util_closetag">tag closer</a> to get context
-    information.</p>
+    scripts such as the <a href="#util_formatting">autoformatter</a>
+    and the <a href="#util_closetag">tag closer</a> to get context
+    information. Use the <code>CodeMirror.innerMode</code> helper
+    function to, starting from a mode and a state, recursively walk
+    down to the innermost mode and state.</p>
 
     <p>To make indentation work properly in a nested parser, it is
     advisable to give the <code>startState</code> method of modes that
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2bc83f352a..688f5d51b0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2273,6 +2273,14 @@ window.CodeMirror = (function() {
     return mode.startState ? mode.startState(a1, a2) : true;
   }
   CodeMirror.startState = startState;
+  CodeMirror.innerMode = function(mode, state) {
+    while (mode.innerMode) {
+      var info = mode.innerMode(state);
+      state = info.state;
+      mode = info.mode;
+    }
+    return info || {mode: mode, state: state};
+  };
 
   // The character stream used by a mode's parser.
   function StringStream(string, tabSize) {
diff --git a/lib/util/closetag.js b/lib/util/closetag.js
index 83dc2c7e75..5096678473 100644
--- a/lib/util/closetag.js
+++ b/lib/util/closetag.js
@@ -27,12 +27,7 @@
 	CodeMirror.defaults['closeTagVoid'] = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 
 	function innerState(cm, state) {
-		for (var mode = cm.getMode(); mode.innerMode;) {
-			var info = mode.innerMode(state);
-			mode = info.mode;
-			state = info.state;
-		}
-		if (mode.name == "xml") return state;
+		return CodeMirror.innerMode(cm.getMode(), state).state;
 	}
 
 
diff --git a/lib/util/formatting.js b/lib/util/formatting.js
index 22c943fb40..4375dd729a 100644
--- a/lib/util/formatting.js
+++ b/lib/util/formatting.js
@@ -1,110 +1,22 @@
 // ============== Formatting extensions ============================
-// A common storage for all mode-specific formatting features
-if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {};
-
-// Returns the extension of the editor's current mode
-CodeMirror.defineExtension("getModeExt", function () {
-  var mname = CodeMirror.resolveMode(this.getOption("mode")).name;
-  var ext = CodeMirror.modeExtensions[mname];
-  if (!ext) throw new Error("No extensions found for mode " + mname);
-  return ext;
-});
-
-// If the current mode is 'htmlmixed', returns the extension of a mode located at
-// the specified position (can be htmlmixed, css or javascript). Otherwise, simply
-// returns the extension of the editor's current mode.
-CodeMirror.defineExtension("getModeExtAtPos", function (pos) {
-  var token = this.getTokenAt(pos);
-  if (token && token.state && token.state.mode)
-    return CodeMirror.modeExtensions[token.state.mode == "html" ? "htmlmixed" : token.state.mode];
-  else
-    return this.getModeExt();
-});
-
-// Comment/uncomment the specified range
-CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
-  var curMode = this.getModeExtAtPos(this.getCursor());
-  if (isComment) { // Comment range
-    var commentedText = this.getRange(from, to);
-    this.replaceRange(curMode.commentStart + this.getRange(from, to) + curMode.commentEnd
-      , from, to);
-    if (from.line == to.line && from.ch == to.ch) { // An empty comment inserted - put cursor inside
-      this.setCursor(from.line, from.ch + curMode.commentStart.length);
-    }
-  }
-  else { // Uncomment range
-    var selText = this.getRange(from, to);
-    var startIndex = selText.indexOf(curMode.commentStart);
-    var endIndex = selText.lastIndexOf(curMode.commentEnd);
-    if (startIndex > -1 && endIndex > -1 && endIndex > startIndex) {
-      // Take string till comment start
-      selText = selText.substr(0, startIndex)
-      // From comment start till comment end
-        + selText.substring(startIndex + curMode.commentStart.length, endIndex)
-      // From comment end till string end
-        + selText.substr(endIndex + curMode.commentEnd.length);
-    }
-    this.replaceRange(selText, from, to);
-  }
-});
-
-// Applies automatic mode-aware indentation to the specified range
-CodeMirror.defineExtension("autoIndentRange", function (from, to) {
-  var cmInstance = this;
-  this.operation(function () {
-    for (var i = from.line; i <= to.line; i++) {
-      cmInstance.indentLine(i, "smart");
+(function() {
+  // Define extensions for a few modes
+  CodeMirror.extendMode("css", {
+    commentStart: "/*",
+    commentEnd: "*/",
+    wordWrapChars: [";", "\\{", "\\}"],
+    autoFormatLineBreaks: function (text) {
+      return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
     }
   });
-});
-
-// Applies automatic formatting to the specified range
-CodeMirror.defineExtension("autoFormatRange", function (from, to) {
-  var absStart = this.indexFromPos(from);
-  var absEnd = this.indexFromPos(to);
-  // Insert additional line breaks where necessary according to the
-  // mode's syntax
-  var res = this.getModeExt().autoFormatLineBreaks(this.getValue(), absStart, absEnd);
-  var cmInstance = this;
-
-  // Replace and auto-indent the range
-  this.operation(function () {
-    cmInstance.replaceRange(res, from, to);
-    var startLine = cmInstance.posFromIndex(absStart).line;
-    var endLine = cmInstance.posFromIndex(absStart + res.length).line;
-    for (var i = startLine; i <= endLine; i++) {
-      cmInstance.indentLine(i, "smart");
-    }
-  });
-});
-
-// Define extensions for a few modes
-
-CodeMirror.modeExtensions["css"] = {
-  commentStart: "/*",
-  commentEnd: "*/",
-  wordWrapChars: [";", "\\{", "\\}"],
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    text = text.substring(startPos, endPos);
-    return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
-  }
-};
 
-CodeMirror.modeExtensions["javascript"] = {
-  commentStart: "/*",
-  commentEnd: "*/",
-  wordWrapChars: [";", "\\{", "\\}"],
-
-  getNonBreakableBlocks: function (text) {
-    var nonBreakableRegexes = [
-        new RegExp("for\\s*?\\(([\\s\\S]*?)\\)"),
-        new RegExp("\\\\\"([\\s\\S]*?)(\\\\\"|$)"),
-        new RegExp("\\\\\'([\\s\\S]*?)(\\\\\'|$)"),
-        new RegExp("'([\\s\\S]*?)('|$)"),
-        new RegExp("\"([\\s\\S]*?)(\"|$)"),
-        new RegExp("//.*([\r\n]|$)")
-      ];
-    var nonBreakableBlocks = new Array();
+  function jsNonBreakableBlocks(text) {
+    var nonBreakableRegexes = [/for\s*?\((.*?)\)/,
+                               /\"(.*?)(\"|$)/,
+                               /\'(.*?)(\'|$)/,
+                               /\/\*(.*?)(\*\/|$)/,
+                               /\/\/.*/];
+    var nonBreakableBlocks = [];
     for (var i = 0; i < nonBreakableRegexes.length; i++) {
       var curPos = 0;
       while (curPos < text.length) {
@@ -126,174 +38,149 @@ CodeMirror.modeExtensions["javascript"] = {
     });
 
     return nonBreakableBlocks;
-  },
+  }
 
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    text = text.substring(startPos, endPos);
-    var curPos = 0;
-    var reLinesSplitter = new RegExp("(;|\\{|\\})([^\r\n;])", "g");
-    var nonBreakableBlocks = this.getNonBreakableBlocks(text);
-    if (nonBreakableBlocks != null) {
-      var res = "";
-      for (var i = 0; i < nonBreakableBlocks.length; i++) {
-        if (nonBreakableBlocks[i].start > curPos) { // Break lines till the block
-          res += text.substring(curPos, nonBreakableBlocks[i].start).replace(reLinesSplitter, "$1\n$2");
-          curPos = nonBreakableBlocks[i].start;
-        }
-        if (nonBreakableBlocks[i].start <= curPos
-          && nonBreakableBlocks[i].end >= curPos) { // Skip non-breakable block
-          res += text.substring(curPos, nonBreakableBlocks[i].end);
-          curPos = nonBreakableBlocks[i].end;
+  CodeMirror.extendMode("javascript", {
+    commentStart: "/*",
+    commentEnd: "*/",
+    wordWrapChars: [";", "\\{", "\\}"],
+
+    autoFormatLineBreaks: function (text) {
+      var curPos = 0;
+      var reLinesSplitter = /(;|\{|\})([^\r\n;])/g;
+      var nonBreakableBlocks = jsNonBreakableBlocks(text);
+      if (nonBreakableBlocks != null) {
+        var res = "";
+        for (var i = 0; i < nonBreakableBlocks.length; i++) {
+          if (nonBreakableBlocks[i].start > curPos) { // Break lines till the block
+            res += text.substring(curPos, nonBreakableBlocks[i].start).replace(reLinesSplitter, "$1\n$2");
+            curPos = nonBreakableBlocks[i].start;
+          }
+          if (nonBreakableBlocks[i].start <= curPos
+              && nonBreakableBlocks[i].end >= curPos) { // Skip non-breakable block
+            res += text.substring(curPos, nonBreakableBlocks[i].end);
+            curPos = nonBreakableBlocks[i].end;
+          }
         }
+        if (curPos < text.length)
+          res += text.substr(curPos).replace(reLinesSplitter, "$1\n$2");
+        return res;
+      } else {
+        return text.replace(reLinesSplitter, "$1\n$2");
       }
-      if (curPos < text.length - 1) {
-        res += text.substr(curPos).replace(reLinesSplitter, "$1\n$2");
-      }
-      return res;
     }
-    else {
-      return text.replace(reLinesSplitter, "$1\n$2");
-    }
-  }
-};
-
-CodeMirror.modeExtensions["xml"] = {
-  commentStart: "<!--",
-  commentEnd: "-->",
-  wordWrapChars: [">"],
+  });
 
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    text = text.substring(startPos, endPos);
-    var lines = text.split("\n");
-    var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
-    var reOpenBrackets = new RegExp("<", "g");
-    var reCloseBrackets = new RegExp("(>)([^\r\n])", "g");
-    for (var i = 0; i < lines.length; i++) {
-      var mToProcess = lines[i].match(reProcessedPortion);
-      if (mToProcess != null && mToProcess.length > 3) { // The line starts with whitespaces and ends with whitespaces
-        lines[i] = mToProcess[1]
+  CodeMirror.extendMode("xml", {
+    commentStart: "<!--",
+    commentEnd: "-->",
+    wordWrapChars: [">"],
+
+    autoFormatLineBreaks: function (text) {
+      var lines = text.split("\n");
+      var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
+      var reOpenBrackets = new RegExp("<", "g");
+      var reCloseBrackets = new RegExp("(>)([^\r\n])", "g");
+      for (var i = 0; i < lines.length; i++) {
+        var mToProcess = lines[i].match(reProcessedPortion);
+        if (mToProcess != null && mToProcess.length > 3) { // The line starts with whitespaces and ends with whitespaces
+          lines[i] = mToProcess[1]
             + mToProcess[2].replace(reOpenBrackets, "\n$&").replace(reCloseBrackets, "$1\n$2")
             + mToProcess[3];
-        continue;
+          continue;
+        }
       }
+      return lines.join("\n");
     }
+  });
 
-    return lines.join("\n");
+  function localModeAt(cm, pos) {
+    return CodeMirror.innerMode(cm.getMode(), cm.getTokenAt(pos).state).mode;
   }
-};
-
-CodeMirror.modeExtensions["htmlmixed"] = {
-  commentStart: "<!--",
-  commentEnd: "-->",
-  wordWrapChars: [">", ";", "\\{", "\\}"],
 
-  getModeInfos: function (text, absPos) {
-    var modeInfos = new Array();
-    modeInfos[0] =
-      {
-        pos: 0,
-        modeExt: CodeMirror.modeExtensions["xml"],
-        modeName: "xml"
-      };
-
-    var modeMatchers = new Array();
-    modeMatchers[0] =
-      {
-        regex: new RegExp("<style[^>]*>([\\s\\S]*?)(</style[^>]*>|$)", "i"),
-        modeExt: CodeMirror.modeExtensions["css"],
-        modeName: "css"
-      };
-    modeMatchers[1] =
-      {
-        regex: new RegExp("<script[^>]*>([\\s\\S]*?)(</script[^>]*>|$)", "i"),
-        modeExt: CodeMirror.modeExtensions["javascript"],
-        modeName: "javascript"
-      };
+  function enumerateModesBetween(cm, line, start, end) {
+    var outer = cm.getMode();
+    if (!outer.innerMode) return [{from: start, to: end, mode: outer}];
+    var init = CodeMirror.innerMode(outer, cm.getTokenAt({line: line, ch: start}).state);
+    var state = init.state, mode = init.mode;
+    var found = [], stream = new CodeMirror.StringStream(cm.getLine(line));
+    stream.pos = stream.start = start;
+    for (;;) {
+      outer.token(stream, state);
+      var cur = CodeMirror.innerMode(outer, state).mode;
+      if (curMode != mode) {
+        found.push({from: start, to: stream.pos, mode: mode});
+        start = stream.pos;
+        mode = curMode;
+      }
+      if (stream.pos >= end) break;
+      stream.start = stream.pos;
+    }
+    if (start < end) found.push({from: start, to: end, mode: mode});
+    return found;
+  }
 
-    var lastCharPos = (typeof (absPos) !== "undefined" ? absPos : text.length - 1);
-    // Detect modes for the entire text
-    for (var i = 0; i < modeMatchers.length; i++) {
-      var curPos = 0;
-      while (curPos <= lastCharPos) {
-        var m = text.substr(curPos).match(modeMatchers[i].regex);
-        if (m != null) {
-          if (m.length > 1 && m[1].length > 0) {
-            // Push block begin pos
-            var blockBegin = curPos + m.index + m[0].indexOf(m[1]);
-            modeInfos.push(
-              {
-                pos: blockBegin,
-                modeExt: modeMatchers[i].modeExt,
-                modeName: modeMatchers[i].modeName
-              });
-            // Push block end pos
-            modeInfos.push(
-              {
-                pos: blockBegin + m[1].length,
-                modeExt: modeInfos[0].modeExt,
-                modeName: modeInfos[0].modeName
-              });
-            curPos += m.index + m[0].length;
-            continue;
-          }
-          else {
-            curPos += m.index + Math.max(m[0].length, 1);
-          }
-        }
-        else { // No more matches
-          break;
+  // Comment/uncomment the specified range
+  CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
+    var curMode = localModeAt(this, from);
+    this.operation(function() {
+      if (isComment) { // Comment range
+        this.replaceRange(curMode.commentEnd, to);
+        this.replaceRange(curMode.commentStart, from);
+        if (from.line == to.line && from.ch == to.ch) // An empty comment inserted - put cursor inside
+          this.setCursor(from.line, from.ch + curMode.commentStart.length);
+      } else { // Uncomment range
+        var selText = this.getRange(from, to);
+        var startIndex = selText.indexOf(curMode.commentStart);
+        var endIndex = selText.lastIndexOf(curMode.commentEnd);
+        if (startIndex > -1 && endIndex > -1 && endIndex > startIndex) {
+          // Take string till comment start
+          selText = selText.substr(0, startIndex)
+          // From comment start till comment end
+            + selText.substring(startIndex + curMode.commentStart.length, endIndex)
+          // From comment end till string end
+            + selText.substr(endIndex + curMode.commentEnd.length);
         }
+        this.replaceRange(selText, from, to);
       }
-    }
-    // Sort mode infos
-    modeInfos.sort(function sortModeInfo(a, b) {
-      return a.pos - b.pos;
     });
+  });
 
-    return modeInfos;
-  },
-
-  autoFormatLineBreaks: function (text, startPos, endPos) {
-    var modeInfos = this.getModeInfos(text);
-    var reBlockStartsWithNewline = new RegExp("^\\s*?\n");
-    var reBlockEndsWithNewline = new RegExp("\n\\s*?$");
-    var res = "";
-    // Use modes info to break lines correspondingly
-    if (modeInfos.length > 1) { // Deal with multi-mode text
-      for (var i = 1; i <= modeInfos.length; i++) {
-        var selStart = modeInfos[i - 1].pos;
-        var selEnd = (i < modeInfos.length ? modeInfos[i].pos : endPos);
+  // Applies automatic mode-aware indentation to the specified range
+  CodeMirror.defineExtension("autoIndentRange", function (from, to) {
+    var cmInstance = this;
+    this.operation(function () {
+      for (var i = from.line; i <= to.line; i++) {
+        cmInstance.indentLine(i, "smart");
+      }
+    });
+  });
 
-        if (selStart >= endPos) { // The block starts later than the needed fragment
-          break;
+  // Applies automatic formatting to the specified range
+  CodeMirror.defineExtension("autoFormatRange", function (from, to) {
+    var cm = this;
+    cm.operation(function () {
+      for (var cur = from.line, end = to.line; cur <= end; ++cur) {
+        var f = {line: cur, ch: cur == from.line ? from.ch : 0};
+        var t = {line: cur, ch: cur == end ? to.ch : null};
+        var modes = enumerateModesBetween(cm, cur, f.ch, t.ch), mangled = "";
+        var text = cm.getRange(f, t);
+        for (var i = 0; i < modes.length; ++i) {
+          var part = modes.length > 1 ? text.slice(modes[i].from, modes[i].to) : text;
+          if (i) mangled += "\n";
+          if (modes[i].mode.autoFormatLineBreaks) {
+            mangled += modes[i].mode.autoFormatLineBreaks(part);
+          } else mangled += text;
         }
-        if (selStart < startPos) {
-          if (selEnd <= startPos) { // The block starts earlier than the needed fragment
-            continue;
-          }
-          selStart = startPos;
-        }
-        if (selEnd > endPos) {
-          selEnd = endPos;
-        }
-        var textPortion = text.substring(selStart, selEnd);
-        if (modeInfos[i - 1].modeName != "xml") { // Starting a CSS or JavaScript block
-          if (!reBlockStartsWithNewline.test(textPortion)
-              && selStart > 0) { // The block does not start with a line break
-            textPortion = "\n" + textPortion;
-          }
-          if (!reBlockEndsWithNewline.test(textPortion)
-              && selEnd < text.length - 1) { // The block does not end with a line break
-            textPortion += "\n";
-          }
+        if (mangled != text) {
+          for (var count = 0, pos = mangled.indexOf("\n"); pos != -1; pos = mangled.indexOf("\n", pos + 1), ++count) {}
+          cm.replaceRange(mangled, f, t);
+          cur += count;
+          end += count;
         }
-        res += modeInfos[i - 1].modeExt.autoFormatLineBreaks(textPortion);
       }
-    }
-    else { // Single-mode text
-      res = modeInfos[0].modeExt.autoFormatLineBreaks(text.substring(startPos, endPos));
-    }
-
-    return res;
-  }
-};
+      for (var cur = from.line + 1; cur <= end; ++cur)
+        cm.indentLine(cur, "smart");
+    });
+  });
+})();
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index b83fbc683a..2bc273ab68 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -96,7 +96,7 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
     },
 
     copyState: function(state) {
-      return {token: state.token, mode: state.mode, mdState: CodeMirror.copyState(mdMode, state.mdState),
+      return {token: state.token, mdState: CodeMirror.copyState(mdMode, state.mdState),
               localMode: state.localMode,
               localState: state.localMode ? CodeMirror.copyState(state.localMode, state.localState) : null};
     },
@@ -140,6 +140,11 @@ CodeMirror.defineMode("gfm", function(config, parserConfig) {
         }
 
         return state.token(stream, state);
+    },
+
+    innerMode: function(state) {
+      if (state.token == markdown) return {state: state.mdState, mode: mdMode};
+      else return {state: state.localState, mode: state.localMode};
     }
   };
 }, "markdown");

From 03fb1d99a9d79f15bbf6cbeab8485987cc31fcd1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Sep 2012 12:32:00 +0200
Subject: [PATCH 48/93] [util/formatting] Fix a bunch of bugs

That's what you get when you test with the published version,
rather than the one you're actually editing.
---
 lib/util/formatting.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/util/formatting.js b/lib/util/formatting.js
index 4375dd729a..ccd6db1b21 100644
--- a/lib/util/formatting.js
+++ b/lib/util/formatting.js
@@ -99,18 +99,24 @@
   }
 
   function enumerateModesBetween(cm, line, start, end) {
-    var outer = cm.getMode();
+    var outer = cm.getMode(), text = cm.getLine(line);
+    if (end == null) end = text.length;
     if (!outer.innerMode) return [{from: start, to: end, mode: outer}];
-    var init = CodeMirror.innerMode(outer, cm.getTokenAt({line: line, ch: start}).state);
-    var state = init.state, mode = init.mode;
-    var found = [], stream = new CodeMirror.StringStream(cm.getLine(line));
+    var state = cm.getTokenAt({line: line, ch: start}).state;
+    var mode = CodeMirror.innerMode(outer, state).mode;
+    var found = [], stream = new CodeMirror.StringStream(text);
     stream.pos = stream.start = start;
     for (;;) {
       outer.token(stream, state);
-      var cur = CodeMirror.innerMode(outer, state).mode;
+      var curMode = CodeMirror.innerMode(outer, state).mode;
       if (curMode != mode) {
-        found.push({from: start, to: stream.pos, mode: mode});
-        start = stream.pos;
+        var cut = stream.start;
+        // Crappy heuristic to deal with the fact that a change in
+        // mode can occur both at the end and the start of a token,
+        // and we don't know which it was.
+        if (mode.name == "xml" && text.charAt(stream.pos - 1) == ">") cut = stream.pos;
+        found.push({from: start, to: cut, mode: mode});
+        start = cut;
         mode = curMode;
       }
       if (stream.pos >= end) break;
@@ -167,7 +173,7 @@
         var text = cm.getRange(f, t);
         for (var i = 0; i < modes.length; ++i) {
           var part = modes.length > 1 ? text.slice(modes[i].from, modes[i].to) : text;
-          if (i) mangled += "\n";
+          if (mangled) mangled += "\n";
           if (modes[i].mode.autoFormatLineBreaks) {
             mangled += modes[i].mode.autoFormatLineBreaks(part);
           } else mangled += text;
@@ -181,6 +187,7 @@
       }
       for (var cur = from.line + 1; cur <= end; ++cur)
         cm.indentLine(cur, "smart");
+      cm.setSelection(from, cm.getCursor(false));
     });
   });
 })();

From 95b5962bd335ed0d489751a2565aa469adbf60fb Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 12 Sep 2012 20:22:15 +0200
Subject: [PATCH 49/93] Add NoTex to real-world uses

---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index f7ae5ea393..c895bd47df 100644
--- a/index.html
+++ b/index.html
@@ -145,6 +145,7 @@ <h2>Real-world uses:</h2>
       <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
       <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>
       <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
+      <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
     </ul>
 
   </div></div>

From 92367194be9fdc2e3aa5ff3fc539e4fa8700cd93 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 16 Sep 2012 16:51:05 -0400
Subject: [PATCH 50/93] Fix formatting demo's "[Un]Comment Selected"
 functionality (closes #826).

---
 lib/util/formatting.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/util/formatting.js b/lib/util/formatting.js
index ccd6db1b21..2c502b25c6 100644
--- a/lib/util/formatting.js
+++ b/lib/util/formatting.js
@@ -128,15 +128,15 @@
 
   // Comment/uncomment the specified range
   CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
-    var curMode = localModeAt(this, from);
+    var curMode = localModeAt(this, from), cm = this;
     this.operation(function() {
       if (isComment) { // Comment range
-        this.replaceRange(curMode.commentEnd, to);
-        this.replaceRange(curMode.commentStart, from);
+        cm.replaceRange(curMode.commentEnd, to);
+        cm.replaceRange(curMode.commentStart, from);
         if (from.line == to.line && from.ch == to.ch) // An empty comment inserted - put cursor inside
-          this.setCursor(from.line, from.ch + curMode.commentStart.length);
+          cm.setCursor(from.line, from.ch + curMode.commentStart.length);
       } else { // Uncomment range
-        var selText = this.getRange(from, to);
+        var selText = cm.getRange(from, to);
         var startIndex = selText.indexOf(curMode.commentStart);
         var endIndex = selText.lastIndexOf(curMode.commentEnd);
         if (startIndex > -1 && endIndex > -1 && endIndex > startIndex) {
@@ -147,7 +147,7 @@
           // From comment end till string end
             + selText.substr(endIndex + curMode.commentEnd.length);
         }
-        this.replaceRange(selText, from, to);
+        cm.replaceRange(selText, from, to);
       }
     });
   });

From 275d6edfa82014a8bd79b167a507fe5f399ab485 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Sep 2012 11:16:45 +0200
Subject: [PATCH 51/93] [javascript mode] Fix variable-scope-restoration

---
 mode/javascript/javascript.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 6ece1befc9..e754a047f0 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -175,8 +175,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
   var defaultVars = {name: "this", next: {name: "arguments"}};
   function pushcontext() {
-    if (!cx.state.context) cx.state.localVars = defaultVars;
     cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
+    cx.state.localVars = defaultVars;
   }
   function popcontext() {
     cx.state.localVars = cx.state.context.vars;

From 52cfc2e79b6a7530f6297ea3510100d03a5b2ed9 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 17 Sep 2012 15:52:56 +0200
Subject: [PATCH 52/93] [util/simple-hint] Capture pageup/pagedown keys

---
 lib/util/simple-hint.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/simple-hint.js b/lib/util/simple-hint.js
index 8e481c37c2..04909cb236 100644
--- a/lib/util/simple-hint.js
+++ b/lib/util/simple-hint.js
@@ -71,7 +71,7 @@
         if (code == 13) {CodeMirror.e_stop(event); pick();}
         // Escape
         else if (code == 27) {CodeMirror.e_stop(event); close(); editor.focus();}
-        else if (code != 38 && code != 40) {
+        else if (code != 38 && code != 40 && code != 33 && code != 34) {
           close(); editor.focus();
           // Pass the event to the CodeMirror instance so that it can handle things like backspace properly.
           editor.triggerOnKeyDown(event);

From af7755984d836d6a0073a35c7c87bb96b2f447ad Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Sep 2012 09:55:22 +0200
Subject: [PATCH 53/93] [vb mode] Highlight Try/Catch keywords

---
 mode/vb/vb.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mode/vb/vb.js b/mode/vb/vb.js
index 01f9890389..be01d13ad9 100644
--- a/mode/vb/vb.js
+++ b/mode/vb/vb.js
@@ -12,8 +12,8 @@ CodeMirror.defineMode("vb", function(conf, parserConf) {
     var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
     var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
 
-    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property'];
-    var middleKeywords = ['else','elseif','case'];
+    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property', 'try'];
+    var middleKeywords = ['else','elseif','case', 'catch'];
     var endKeywords = ['next','loop'];
    
     var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'in']);

From 949bcc48445ff3deda0cb47a4280f2b76b986e29 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Sep 2012 14:35:41 +0200
Subject: [PATCH 54/93] Make output of getHistory JSON-serializable again

---
 lib/codemirror.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 688f5d51b0..8ed6049bb7 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -193,8 +193,18 @@ window.CodeMirror = (function() {
         history.undone = histData.undone;
       },
       getHistory: function() {
-        history.time = 0;
-        return {done: history.done.concat([]), undone: history.undone.concat([])};
+        function cp(arr) {
+          for (var i = 0, nw = [], nwelt; i < arr.length; ++i) {
+            nw.push(nwelt = []);
+            for (var j = 0, elt = arr[i]; j < elt.length; ++j) {
+              var old = [], cur = elt[j];
+              nwelt.push({start: cur.start, added: cur.added, old: old});
+              for (var k = 0; k < cur.old.length; ++k) old.push(hlText(cur.old[k]));
+            }
+          }
+          return nw;
+        }
+        return {done: cp(history.done), undone: cp(history.undone)};
       },
       matchBrackets: operation(function(){matchBrackets(true);}),
       getTokenAt: operation(function(pos) {

From 54095aac018b76c8cc29a234fcc2f79ce8cab622 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 18 Sep 2012 23:43:24 +0200
Subject: [PATCH 55/93] Flip ctrlKey and metaKey properties on Opera Mac

I don't know what they were thinking, but this, on
recent Opera versions, seems to give the correct
result.

Closes #10
---
 lib/codemirror.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 8ed6049bb7..6e5d6a2ed5 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -612,10 +612,11 @@ window.CodeMirror = (function() {
       }, 50);
 
       var name = keyNames[e_prop(e, "keyCode")], handled = false;
+      var flipCtrlCmd = opera && mac;
       if (name == null || e.altGraphKey) return false;
       if (e_prop(e, "altKey")) name = "Alt-" + name;
-      if (e_prop(e, "ctrlKey")) name = "Ctrl-" + name;
-      if (e_prop(e, "metaKey")) name = "Cmd-" + name;
+      if (e_prop(e, flipCtrlCmd ? "metaKey" : "ctrlKey")) name = "Ctrl-" + name;
+      if (e_prop(e, flipCtrlCmd ? "ctrlKey" : "metaKey")) name = "Cmd-" + name;
 
       var stopped = false;
       function stop() { stopped = true; }

From da3a289048b06a95dbf846ad0204f39a21a083be Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Sep 2012 12:15:36 +0200
Subject: [PATCH 56/93] [commonlisp mode] Fix bug in context management

---
 mode/commonlisp/commonlisp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/commonlisp/commonlisp.js b/mode/commonlisp/commonlisp.js
index 7a56b61de5..4fb4bdf9bd 100644
--- a/mode/commonlisp/commonlisp.js
+++ b/mode/commonlisp/commonlisp.js
@@ -87,7 +87,7 @@ CodeMirror.defineMode("commonlisp", function (config) {
         }
       }
       if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
-      else if (type == "close") state.ctx = state.ctx.prev;
+      else if (type == "close") state.ctx = state.ctx.prev || state.ctx;
       return style;
     },
 

From fc17d2d418d50fba292bae4fdcdb8a5bf1102867 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Sep 2012 13:12:24 +0200
Subject: [PATCH 57/93] Mark release 2.34

---
 doc/compress.html   |  2 ++
 doc/oldrelease.html | 23 ++++++++++++++++++++
 index.html          | 53 +++++++++++++++++++++++++--------------------
 lib/codemirror.js   |  2 +-
 package.json        |  2 +-
 5 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index 3b99deae27..a7e23e21c5 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -30,6 +30,8 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px">
         <option value="http://codemirror.net/">HEAD</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v3.0beta1;f=">3.0beta1</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.34;f=">2.34</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.33;f=">2.33</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.32;f=">2.32</option>
         <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.31;f=">2.31</option>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
index db38f52275..542f57ae1d 100644
--- a/doc/oldrelease.html
+++ b/doc/oldrelease.html
@@ -19,6 +19,29 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
 </pre>
 </div>
 
+  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.18.zip">Version 2.18</a>:</p>
+  <p class="rel-note">Fixes <code>TextMarker.clear</code>, which is broken in 2.17.</p>
+
+  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.17.zip">Version 2.17</a>:</p>
+  <ul class="rel-note">
+    <li>Add support for <a href="manual.html#option_lineWrapping">line
+    wrapping</a> and <a href="manual.html#hideLine">code
+    folding</a>.</li>
+    <li>Add <a href="../mode/gfm/index.html">Github-style Markdown</a> mode.</li>
+    <li>Add <a href="../theme/monokai.css">Monokai</a>
+    and <a href="../theme/rubyblue.css">Rubyblue</a> themes.</li>
+    <li>Add <a href="manual.html#setBookmark"><code>setBookmark</code></a> method.</li>
+    <li>Move some of the demo code into reusable components
+    under <a href="../lib/util/"><code>lib/util</code></a>.</li>
+    <li>Make screen-coord-finding code faster and more reliable.</li>
+    <li>Fix drag-and-drop in Firefox.</li>
+    <li>Improve support for IME.</li>
+    <li>Speed up content rendering.</li>
+    <li>Fix browser's built-in search in Webkit.</li>
+    <li>Make double- and triple-click work in IE.</li>
+    <li>Various fixes to modes.</li>
+  </ul>
+
   <p class="rel">27-10-2011: <a href="http://codemirror.net/codemirror-2.16.zip">Version 2.16</a>:</p>
   <ul class="rel-note">
     <li>Add <a href="../mode/perl/index.html">Perl</a>, <a href="../mode/rust/index.html">Rust</a>, <a href="../mode/tiddlywiki/index.html">TiddlyWiki</a>, and <a href="../mode/groovy/index.html">Groovy</a> modes.</li>
diff --git a/index.html b/index.html
index c895bd47df..32f5024b37 100644
--- a/index.html
+++ b/index.html
@@ -281,10 +281,38 @@ <h2>Reading material</h2>
 
   <h2 id=releases>Releases</h2>
 
+  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
+
+  <ul class="rel-note">
+    <li>New mode: <a href="mode/commonlisp/index.html">Common Lisp</a>.</li>
+    <li>Fix right-click select-all on most browsers.</li>
+    <li>Change the way highlighting happens:<br>&nbsp; Saves memory and CPU cycles.<br>&nbsp; <code>compareStates</code> is no longer needed.<br>&nbsp; <code>onHighlightComplete</code> no longer works.</li>
+    <li>Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.</li>
+    <li>Add a <a href="doc/manual.html#version"><code>CodeMirror.version</code></a> property.</li>
+    <li>More robust handling of nested modes in <a href="demo/formatting.html">formatting</a> and <a href="demo/closetag.html">closetag</a> plug-ins.</li>
+    <li>Un/redo now preserves <a href="doc/manual.html#markText">marked text</a> and bookmarks.</li>
+    <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
+  </ul>
+
+  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
+
+  <p class="rel-note"><strong>BETA release, new major version</strong>. Only partially
+  backwards-compatible. See
+  the <a href="http://codemirror.net/3/doc/upgrade_v3.html">upgrading
+  guide</a> for more information. Major new features are:</p>
+
+  <ul class="rel-note">
+    <li>Bi-directional text support.</li>
+    <li>More powerful gutter model.</li>
+    <li>Support for arbitrary text/widget height.</li>
+    <li>In-line widgets.</li>
+    <li>Generalized event handling.</li>
+  </ul>
+
   <p class="rel">23-08-2012: <a href="http://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
 
   <ul class="rel-note">
-    <li>New mode: <a href="mode/sieve/">Sieve</a>.</li>
+    <li>New mode: <a href="mode/sieve/index.html">Sieve</a>.</li>
     <li>New <a href="doc/manual.html#getViewport"><code>getViewPort</code></a> and <a href="doc/manual.html#option_onViewportChange"><code>onViewportChange</code></a> API.</li>
     <li><a href="doc/manual.html#option_cursorBlinkRate">Configurable</a> cursor blink rate.</li>
     <li>Make binding a key to <code>false</code> disabling handling (again).</li>
@@ -429,29 +457,6 @@ <h2 id=releases>Releases</h2>
     method.</li>
   </ul>
 
-  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.18.zip">Version 2.18</a>:</p>
-  <p class="rel-note">Fixes <code>TextMarker.clear</code>, which is broken in 2.17.</p>
-
-  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.17.zip">Version 2.17</a>:</p>
-  <ul class="rel-note">
-    <li>Add support for <a href="doc/manual.html#option_lineWrapping">line
-    wrapping</a> and <a href="doc/manual.html#hideLine">code
-    folding</a>.</li>
-    <li>Add <a href="mode/gfm/index.html">Github-style Markdown</a> mode.</li>
-    <li>Add <a href="theme/monokai.css">Monokai</a>
-    and <a href="theme/rubyblue.css">Rubyblue</a> themes.</li>
-    <li>Add <a href="doc/manual.html#setBookmark"><code>setBookmark</code></a> method.</li>
-    <li>Move some of the demo code into reusable components
-    under <a href="lib/util/"><code>lib/util</code></a>.</li>
-    <li>Make screen-coord-finding code faster and more reliable.</li>
-    <li>Fix drag-and-drop in Firefox.</li>
-    <li>Improve support for IME.</li>
-    <li>Speed up content rendering.</li>
-    <li>Fix browser's built-in search in Webkit.</li>
-    <li>Make double- and triple-click work in IE.</li>
-    <li>Various fixes to modes.</li>
-  </ul>
-
   <p><a href="doc/oldrelease.html">Older releases...</a></p>
 
 </div></div>
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6e5d6a2ed5..e103baa815 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3135,7 +3135,7 @@ window.CodeMirror = (function() {
     for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
   })();
 
-  CodeMirror.version = "2.33 +";
+  CodeMirror.version = "2.34";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 9a0d99c2e8..81e762b0fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"2.33.0",
+    "version":"2.34.0",
     "main": "codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 230d532f55ff9705c937b998de4688ab6262baaa Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 19 Sep 2012 13:19:13 +0200
Subject: [PATCH 58/93] Bump version post-release

---
 lib/codemirror.js | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index e103baa815..6f58c0f0a0 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -3135,7 +3135,7 @@ window.CodeMirror = (function() {
     for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
   })();
 
-  CodeMirror.version = "2.34";
+  CodeMirror.version = "2.34 +";
 
   return CodeMirror;
 })();
diff --git a/package.json b/package.json
index 81e762b0fc..1ce054f359 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "codemirror",
-    "version":"2.34.0",
+    "version":"2.34.1",
     "main": "codemirror.js",
     "description": "In-browser code editing made bearable",
     "licenses": [{"type": "MIT",

From 553ce94d3c65751970721214617f94635c100640 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 25 Sep 2012 21:20:53 +0200
Subject: [PATCH 59/93] Fix git URL in doc/compress.html

---
 doc/compress.html | 50 +++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/doc/compress.html b/doc/compress.html
index a7e23e21c5..a0fcb5796c 100644
--- a/doc/compress.html
+++ b/doc/compress.html
@@ -30,30 +30,30 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
       <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
       <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px">
         <option value="http://codemirror.net/">HEAD</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v3.0beta1;f=">3.0beta1</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.34;f=">2.34</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.33;f=">2.33</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.32;f=">2.32</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.31;f=">2.31</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.3;f=">2.3</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.25;f=">2.25</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.24;f=">2.24</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.23;f=">2.23</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.22;f=">2.22</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.21;f=">2.21</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.2;f=">2.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.18;f=">2.18</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.16;f=">2.16</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.15;f=">2.15</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.13;f=">2.13</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.12;f=">2.12</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.11;f=">2.11</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.1;f=">2.1</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.02;f=">2.02</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.01;f=">2.01</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.0;f=">2.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=beta2;f=">beta2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=beta1;f=">beta1</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.0beta1;f=">3.0beta1</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.34;f=">2.34</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.33;f=">2.33</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.32;f=">2.32</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.31;f=">2.31</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.3;f=">2.3</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.25;f=">2.25</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.24;f=">2.24</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.23;f=">2.23</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.22;f=">2.22</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.21;f=">2.21</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.2;f=">2.2</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.18;f=">2.18</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.16;f=">2.16</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.15;f=">2.15</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.13;f=">2.13</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.12;f=">2.12</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.11;f=">2.11</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.1;f=">2.1</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.02;f=">2.02</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.01;f=">2.01</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.0;f=">2.0</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=beta2;f=">beta2</option>
+        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=beta1;f=">beta1</option>
       </select></p>
 
       <select multiple="multiple" size="20" name="code_url" style="width: 40em;" class="field" id="files">
@@ -153,7 +153,7 @@ <h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMi
               continue;
             else if (m = opt.value.match(/^http:\/\/codemirror.net\/(.*)$/))
               opt.value = urlprefix + m[1];
-            else if (m = opt.value.match(/http:\/\/marijnhaverbeke.nl\/git\/codemirror2\?a=blob_plain;hb=[^;]+;f=(.*)$/))
+            else if (m = opt.value.match(/http:\/\/marijnhaverbeke.nl\/git\/codemirror\?a=blob_plain;hb=[^;]+;f=(.*)$/))
               opt.value = urlprefix + m[1];
           }
        }

From 6cffb097643a561b2349f4f111c8367bba67f7f1 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 09:53:22 +0200
Subject: [PATCH 60/93] [util/simple-hint] don't close hint dialog when a
 modifier key is pressed

Closes #853
---
 lib/codemirror.js       | 1 +
 lib/util/simple-hint.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6f58c0f0a0..d1459fbc78 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2204,6 +2204,7 @@ window.CodeMirror = (function() {
     var name = keyNames[e_prop(event, "keyCode")];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
   }
+  CodeMirror.isModifierKey = isModifierKey;
 
   CodeMirror.fromTextArea = function(textarea, options) {
     if (!options) options = {};
diff --git a/lib/util/simple-hint.js b/lib/util/simple-hint.js
index 04909cb236..1a937a1c19 100644
--- a/lib/util/simple-hint.js
+++ b/lib/util/simple-hint.js
@@ -71,7 +71,7 @@
         if (code == 13) {CodeMirror.e_stop(event); pick();}
         // Escape
         else if (code == 27) {CodeMirror.e_stop(event); close(); editor.focus();}
-        else if (code != 38 && code != 40 && code != 33 && code != 34) {
+        else if (code != 38 && code != 40 && code != 33 && code != 34 && !CodeMirror.isModifierKey(event)) {
           close(); editor.focus();
           // Pass the event to the CodeMirror instance so that it can handle things like backspace properly.
           editor.triggerOnKeyDown(event);

From 19f0d0683a1385e3d2d04fead44aaace205311e7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 10:44:46 +0200
Subject: [PATCH 61/93] Fix setOption('tabindex', ...)

---
 lib/codemirror.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index d1459fbc78..ea8feba717 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -167,6 +167,7 @@ window.CodeMirror = (function() {
         else if (option == "lineWrapping" && oldVal != value) operation(wrappingChanged)();
         else if (option == "tabSize") updateDisplay(true);
         else if (option == "keyMap") keyMapChanged();
+        else if (option == "tabindex") input.tabIndex = value;
         if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" ||
             option == "theme" || option == "lineNumberFormatter") {
           gutterChanged();

From cc6079bc5d028d042f5e863062bc7ab530e52684 Mon Sep 17 00:00:00 2001
From: feizhang365 <feizhang365@gmail.com>
Date: Mon, 24 Sep 2012 15:59:51 +0800
Subject: [PATCH 62/93] Update lib/util/searchcursor.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix reverse Regexp match which cause memory leak
---
 lib/util/searchcursor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/util/searchcursor.js b/lib/util/searchcursor.js
index 970af899d7..1750aadc11 100644
--- a/lib/util/searchcursor.js
+++ b/lib/util/searchcursor.js
@@ -17,14 +17,14 @@
           query.lastIndex = 0;
           var line = cm.getLine(pos.line).slice(0, pos.ch), match = query.exec(line), start = 0;
           while (match) {
-            start += match.index;
-            line = line.slice(match.index);
+            start += match.index + 1;
+	    line = line.slice(start);
             query.lastIndex = 0;
             var newmatch = query.exec(line);
             if (newmatch) match = newmatch;
             else break;
-            start++;
           }
+          start--;
         } else {
           query.lastIndex = pos.ch;
           var line = cm.getLine(pos.line), match = query.exec(line),

From e8b2cb7d8d669724c2033a35408b263f9530dddd Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 10:56:44 +0200
Subject: [PATCH 63/93] [demo/mustache] Recognize triple braces

---
 demo/mustache.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demo/mustache.html b/demo/mustache.html
index d9051a23eb..c2ce331077 100644
--- a/demo/mustache.html
+++ b/demo/mustache.html
@@ -37,6 +37,7 @@ <h1>{{title}}</h1>
       if (stream.match("{{")) {
         while ((ch = stream.next()) != null)
           if (ch == "}" && stream.next() == "}") break;
+        stream.eat("}");
         return "mustache";
       }
       while (stream.next() != null && !stream.match("{{", false)) {}

From 64d2081a713a37bb13607cb70a9742d64bbaa4cc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 11:14:06 +0200
Subject: [PATCH 64/93] Don't do overwrite when pasting

---
 lib/codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index ea8feba717..5a80bcc304 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -75,7 +75,7 @@ window.CodeMirror = (function() {
     // Selection-related flags. shiftSelecting obviously tracks
     // whether the user is holding shift.
     var shiftSelecting, lastClick, lastDoubleClick, lastScrollTop = 0, draggingText,
-        overwrite = false, suppressEdits = false;
+        overwrite = false, suppressEdits = false, pasteIncoming = false;
     // Variables used by startOperation/endOperation to track what
     // happened during the operation.
     var updateInput, userSelChange, changes, textChanged, selectionChanged,
@@ -128,7 +128,7 @@ window.CodeMirror = (function() {
       connect(scroller, "drop", operation(onDrop));
     }
     connect(scroller, "paste", function(){focusInput(); fastPoll();});
-    connect(input, "paste", fastPoll);
+    connect(input, "paste", function(){pasteIncoming = true; fastPoll();});
     connect(input, "cut", operation(function(){
       if (!options.readOnly) replaceSelection("");
     }));
@@ -955,12 +955,13 @@ window.CodeMirror = (function() {
       while (same < l && prevInput[same] == text[same]) ++same;
       if (same < prevInput.length)
         sel.from = {line: sel.from.line, ch: sel.from.ch - (prevInput.length - same)};
-      else if (overwrite && posEq(sel.from, sel.to))
+      else if (overwrite && posEq(sel.from, sel.to) && !pasteIncoming)
         sel.to = {line: sel.to.line, ch: Math.min(getLine(sel.to.line).text.length, sel.to.ch + (text.length - same))};
       replaceSelection(text.slice(same), "end");
       if (text.length > 1000) { input.value = prevInput = ""; }
       else prevInput = text;
       if (!nestedOperation) endOperation();
+      pasteIncoming = false;
       return true;
     }
     function resetInput(user) {

From cede20793ac828cd0bcd0cab8ced8edee92dd04e Mon Sep 17 00:00:00 2001
From: ahoward <ara.t.howard@gmail.com>
Date: Thu, 27 Sep 2012 09:00:19 -0600
Subject: [PATCH 65/93] embedded ruby configuration

---
 mode/htmlembedded/htmlembedded.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mode/htmlembedded/htmlembedded.js b/mode/htmlembedded/htmlembedded.js
index 195d48e328..b7888689f1 100644
--- a/mode/htmlembedded/htmlembedded.js
+++ b/mode/htmlembedded/htmlembedded.js
@@ -70,3 +70,4 @@ CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
 CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"});
 CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
 CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"});
+CodeMirror.defineMIME("application/x-erb", { name: "htmlembedded", scriptingModeSpec:"ruby"});

From 45f85d3a6701e876f6502ee054509ecdfd621374 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 11:25:25 +0200
Subject: [PATCH 66/93] [javascript&clike modes] Indent block comments with
 CodeMirror.Pass

This'll align them with the previous line. It's not a perfect solution,
but probably better than simply returning 0.

Issue #854
---
 mode/clike/clike.js           | 1 +
 mode/javascript/javascript.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mode/clike/clike.js b/mode/clike/clike.js
index 59555e9432..69668a44d3 100644
--- a/mode/clike/clike.js
+++ b/mode/clike/clike.js
@@ -140,6 +140,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     },
 
     indent: function(state, textAfter) {
+      if (state.tokenize == tokenComment) return CodeMirror.Pass;
       if (state.tokenize != tokenBase && state.tokenize != null) return 0;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index e754a047f0..0dece190ce 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -340,6 +340,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     },
 
     indent: function(state, textAfter) {
+      if (state.tokenize == jsTokenComment) return CodeMirror.Pass;
       if (state.tokenize != jsTokenBase) return 0;
       var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
       if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;

From 831a3a5bb14e48dcb133bfa8c312509c0d035d63 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 11:32:09 +0200
Subject: [PATCH 67/93] Add gittip donation link

---
 index.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 32f5024b37..7a5dbf7af4 100644
--- a/index.html
+++ b/index.html
@@ -257,9 +257,10 @@ <h2>Support CodeMirror</h2>
   <ul>
     <li>Donate
     (<span onclick="document.getElementById('paypal').submit();"
-    class="quasilink">Paypal</span>
-    or <span onclick="document.getElementById('bankinfo').style.display = 'block';"
-             class="quasilink">bank</span>)</li>
+    class="quasilink">Paypal</span>,
+    <span onclick="document.getElementById('bankinfo').style.display = 'block';"
+           class="quasilink">bank</span>, or
+    <a href="https://www.gittip.com/marijnh">Gittip</a>)</li>
     <li>Purchase <a href="#commercial">commercial support</a></li>
   </ul>
 

From 07e933a8aae72b2ca6e6d87e9133cb3f65a3a10c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 12:07:13 +0200
Subject: [PATCH 68/93] [javascript mode] Fix suble parsing bug in for loop
 specs

---
 mode/javascript/javascript.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 0dece190ce..5b377db7d1 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -284,10 +284,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == ",") return cont(vardef1);
   }
   function forspec1(type) {
-    if (type == "var") return cont(vardef1, forspec2);
-    if (type == ";") return pass(forspec2);
+    if (type == "var") return cont(vardef1, expect(";"), forspec2);
+    if (type == ";") return cont(forspec2);
     if (type == "variable") return cont(formaybein);
-    return pass(forspec2);
+    return cont(forspec2);
   }
   function formaybein(type, value) {
     if (value == "in") return cont(expression);

From c9035375b479f99a988d136df8374c4e71f623d4 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 28 Sep 2012 12:13:46 +0200
Subject: [PATCH 69/93] Ensure block-indent doesn't use outdated state

Closes #844
---
 lib/codemirror.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 5a80bcc304..40b5dd65f6 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1462,6 +1462,7 @@ window.CodeMirror = (function() {
 
       if (indentString != curSpaceString)
         replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length});
+      line.stateAfter = null;
     }
 
     function loadMode() {

From 9e77371d7dc66cf3e13265b744ac16df2bbb7c98 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Mon, 1 Oct 2012 19:59:42 -0400
Subject: [PATCH 70/93] [markdown] Fix performance issue with regex matching of
 single closing chars (closes #862).

Also avoid a global variable that snuck through.
---
 mode/markdown/markdown.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index e8b0e0d02f..384e37fe29 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -287,15 +287,16 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return linkhref;
   }
 
+  var savedInlineRE = [];
   function inlineRE(endChar) {
-    if (!inlineRE[endChar]) {
+    if (!savedInlineRE[endChar]) {
       // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741)
       endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
       // Match any non-endChar, escaped character, as well as the closing 
       // endChar.
-      inlineRE[endChar] = new RegExp('^(?:[^\\\\]+?|\\\\.)*?(' + endChar + ')');
+      savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')');
     }
-    return inlineRE[endChar];
+    return savedInlineRE[endChar];
   }
 
   function inlineElement(type, endChar, next) {

From dc768cc71a10ece34ac6b83b7db1eac4c9b9a9df Mon Sep 17 00:00:00 2001
From: "Richard Z.H. Wang" <zhwang@live.com.au>
Date: Mon, 1 Oct 2012 13:37:13 +1000
Subject: [PATCH 71/93] Make runmode escaping global

---
 lib/util/runmode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/runmode.js b/lib/util/runmode.js
index 6723927f2d..327976badf 100644
--- a/lib/util/runmode.js
+++ b/lib/util/runmode.js
@@ -1,6 +1,6 @@
 CodeMirror.runMode = function(string, modespec, callback, options) {
   function esc(str) {
-    return str.replace(/[<&]/, function(ch) { return ch == "<" ? "&lt;" : "&amp;"; });
+    return str.replace(/[<&]/g, function(ch) { return ch == "<" ? "&lt;" : "&amp;"; });
   }
 
   var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);

From f906dfda5474f08bb8a6cd1b5fbc404d47e0e33d Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 16 Sep 2012 17:38:50 -0400
Subject: [PATCH 72/93] [markdown mode] A few fixes for highlighting.

- Prevent "markdown_hrDashLong" test from failing when runHarness() is called manually.

- Render EM / STRONG within link text (closes #823).

- Add highlighting for images (closes #824).
---
 mode/markdown/markdown.js |  37 ++++++++-----
 mode/markdown/test.js     | 112 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 14 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 384e37fe29..4a4d3c29ce 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -12,6 +12,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   quote    = 'quote'
   ,   list     = 'string'
   ,   hr       = 'hr'
+  ,   image    = 'tag'
   ,   linkinline = 'link'
   ,   linkemail = 'link'
   ,   linktext = 'link'
@@ -24,7 +25,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   ,   ulRE = /^[*\-+]\s+/
   ,   olRE = /^[0-9]+\.\s+/
   ,   headerRE = /^(?:\={1,}|-{1,})$/
-  ,   textRE = /^[^\[*_\\<>` "'(]+/;
+  ,   textRE = /^[^!\[\]*_\\<>` "'(]+/;
 
   function switchInline(stream, state, f) {
     state.f = state.inline = f;
@@ -114,6 +115,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (state.strong) { styles.push(state.em ? emstrong : strong); }
     else if (state.em) { styles.push(em); }
     
+    if (state.linkText) { styles.push(linktext); }
+    
     if (state.code) { styles.push(code); }
     
     if (state.header) { styles.push(header); }
@@ -181,8 +184,22 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return getType(state);
     }
     
+    if (ch === '!' && stream.match(/\[.*\] ?(?:\(|\[)/, false)) {
+      stream.match(/\[.*\]/);
+      state.inline = state.f = linkHref;
+      return image;
+    }
+    
     if (ch === '[' && stream.match(/.*\] ?(?:\(|\[)/, false)) {
-      return switchInline(stream, state, linkText);
+      state.linkText = true;
+      return getType(state);
+    }
+    
+    if (ch === ']' && state.linkText) {
+      var type = getType(state);
+      state.linkText = false;
+      state.inline = state.f = linkHref;
+      return type;
     }
     
     if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, true)) {
@@ -238,18 +255,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return getType(state);
   }
 
-  function linkText(stream, state) {
-    while (!stream.eol()) {
-      var ch = stream.next();
-      if (ch === '\\') stream.next();
-      if (ch === ']') {
-        state.inline = state.f = linkHref;
-        return linktext;
-      }
-    }
-    return linktext;
-  }
-
   function linkHref(stream, state) {
     // Check if space, and return NULL if so (to avoid marking the space)
     if(stream.eatSpace()){
@@ -310,6 +315,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   return {
     startState: function() {
+      prevLineHasContent = false;
+      thisLineHasContent = false;
       return {
         f: blockNormal,
         
@@ -319,6 +326,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         
         inline: inlineNormal,
         text: handleText,
+        
+        linkText: false,
         linkTitle: false,
         em: false,
         strong: false,
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 46bda7b90d..447d48d609 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -660,6 +660,80 @@ MT.testMode(
   ]
 );
 
+// Inline link with Em
+MT.testMode(
+  'linkEm',
+  '[*foo*](http://example.com/) bar',
+  [
+    'link', '[',
+    'link em', '*foo*',
+    'link', ']',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Inline link with Strong
+MT.testMode(
+  'linkStrong',
+  '[**foo**](http://example.com/) bar',
+  [
+    'link', '[',
+    'link strong', '**foo**',
+    'link', ']',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Inline link with EmStrong
+MT.testMode(
+  'linkEmStrong',
+  '[***foo***](http://example.com/) bar',
+  [
+    'link', '[',
+    'link strong', '**',
+    'link emstrong', '*foo**',
+    'link em', '*',
+    'link', ']',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Image with title
+MT.testMode(
+  'imageTitle',
+  '![foo](http://example.com/ "bar") hello',
+  [
+    'tag', '![foo]',
+    'string', '(http://example.com/ "bar")',
+    null, ' hello'
+  ]
+);
+
+// Image without title
+MT.testMode(
+  'imageNoTitle',
+  '![foo](http://example.com/) bar',
+  [
+    'tag', '![foo]',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
+// Image with asterisks
+MT.testMode(
+  'imageAsterisks',
+  '![*foo*](http://example.com/) bar',
+  [
+    'tag', '![*foo*]',
+    'string', '(http://example.com/)',
+    null, ' bar'
+  ]
+);
+
 // Reference-style links
 MT.testMode(
   'linkReference',
@@ -670,6 +744,44 @@ MT.testMode(
     null, ' hello'
   ]
 );
+// Reference-style links with Em
+MT.testMode(
+  'linkReferenceEm',
+  '[*foo*][bar] hello',
+  [
+    'link', '[',
+    'link em', '*foo*',
+    'link', ']',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
+// Reference-style links with Strong
+MT.testMode(
+  'linkReferenceStrong',
+  '[**foo**][bar] hello',
+  [
+    'link', '[',
+    'link strong', '**foo**',
+    'link', ']',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
+// Reference-style links with EmStrong
+MT.testMode(
+  'linkReferenceEmStrong',
+  '[***foo***][bar] hello',
+  [
+    'link', '[',
+    'link strong', '**',
+    'link emstrong', '*foo**',
+    'link em', '*',
+    'link', ']',
+    'string', '[bar]',
+    null, ' hello'
+  ]
+);
 
 // Reference-style links with optional space separator (per docuentation)
 // "You can optionally use a space to separate the sets of brackets"

From c8a039d2d128b3ccb8673f4579a404a1d966f28f Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sat, 29 Sep 2012 18:33:15 -0400
Subject: [PATCH 73/93] [markdown] Fix bug with false positive matches of
 inline links.

- Inline links (square brackets followed by parentheses) cannot be separated by space (per Documentation and Dingus).

- Added test that checks both for this and correct highlighting of square brackets by themselves.
---
 mode/markdown/markdown.js |  6 +++---
 mode/markdown/test.js     | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 4a4d3c29ce..2375c4f94e 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -189,12 +189,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       state.inline = state.f = linkHref;
       return image;
     }
-    
-    if (ch === '[' && stream.match(/.*\] ?(?:\(|\[)/, false)) {
+
+    if (ch === '[' && stream.match(/.*\](\(| ?\[)/, false)) {
       state.linkText = true;
       return getType(state);
     }
-    
+
     if (ch === ']' && state.linkText) {
       var type = getType(state);
       state.linkText = false;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index 447d48d609..e7fbc32fbb 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -734,6 +734,17 @@ MT.testMode(
   ]
 );
 
+// Not a link. Should be normal text due to square brackets being used
+// regularly in text, especially in quoted material, and no space is allowed
+// between square brackets and parentheses (per Dingus).
+MT.testMode(
+  'notALink',
+  '[foo] (bar)',
+  [
+    null, '[foo] (bar)'
+  ]
+);
+
 // Reference-style links
 MT.testMode(
   'linkReference',

From 076d906d779d20efd3de01e0edc3d8826fdad7dd Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sat, 29 Sep 2012 21:57:23 -0400
Subject: [PATCH 74/93] [Markdown] [GFM] Rewrite GFM to inherit changes from
 Markdown mode better.

- Add options to Markdown mode to make it easier to extend
- Add GFM text overlay
  - SHA, User@SHA, and User/Project@SHA
  - #Num, User/#Num, and User/Project#Num
  - Vanilla URLs
- Add GFM-specific tests
- Fix overlay code so blankLine() is called
---
 lib/util/overlay.js       |   7 +-
 mode/gfm/gfm.js           | 222 ++++++++++++++-----------------------
 mode/gfm/index.html       |  27 ++++-
 mode/gfm/test.js          | 225 ++++++++++++++++++++++++++++++++++++++
 mode/markdown/markdown.js |  96 +++++++++++++++-
 mode/markdown/test.js     |  13 ++-
 test/index.html           |   3 +
 7 files changed, 443 insertions(+), 150 deletions(-)
 create mode 100644 mode/gfm/test.js

diff --git a/lib/util/overlay.js b/lib/util/overlay.js
index c38d0ca6bb..fba38987bb 100644
--- a/lib/util/overlay.js
+++ b/lib/util/overlay.js
@@ -49,6 +49,11 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
     },
     electricChars: base.electricChars,
 
-    innerMode: function(state) { return {state: state.base, mode: base}; }
+    innerMode: function(state) { return {state: state.base, mode: base}; },
+    
+    blankLine: function(state) {
+      if (base.blankLine) base.blankLine(state.base);
+      if (overlay.blankLine) overlay.blankLine(state.overlay);
+    }
   };
 };
diff --git a/mode/gfm/gfm.js b/mode/gfm/gfm.js
index 2bc273ab68..21b8259390 100644
--- a/mode/gfm/gfm.js
+++ b/mode/gfm/gfm.js
@@ -1,150 +1,94 @@
 CodeMirror.defineMode("gfm", function(config, parserConfig) {
-  var mdMode = CodeMirror.getMode(config, "markdown");
-  var aliases = {
-    html: "htmlmixed",
-    js: "javascript",
-    json: "application/json",
-    c: "text/x-csrc",
-    "c++": "text/x-c++src",
-    java: "text/x-java",
-    csharp: "text/x-csharp",
-    "c#": "text/x-csharp"
-  };
-
-  // make this lazy so that we don't need to load GFM last
-  var getMode = (function () {
-    var i, modes = {}, mimes = {}, mime;
-
-    var list = CodeMirror.listModes();
-    for (i = 0; i < list.length; i++) {
-      modes[list[i]] = list[i];
-    }
-    var mimesList = CodeMirror.listMIMEs();
-    for (i = 0; i < mimesList.length; i++) {
-      mime = mimesList[i].mime;
-      mimes[mime] = mimesList[i].mime;
-    }
-
-    for (var a in aliases) {
-      if (aliases[a] in modes || aliases[a] in mimes)
-        modes[a] = aliases[a];
-    }
-    
-    return function (lang) {
-      return modes[lang] ? CodeMirror.getMode(config, modes[lang]) : null;
-    };
-  }());
-
-  function markdown(stream, state) {
-    // intercept fenced code blocks
-    if (stream.sol() && stream.match(/^```([\w+#]*)/)) {
-      // try switching mode
-      state.localMode = getMode(RegExp.$1);
-      if (state.localMode)
-        state.localState = state.localMode.startState();
-
-      state.token = local;
-      return 'code';
-    }
-
-    return mdMode.token(stream, state.mdState);
-  }
-
-  function local(stream, state) {
-    if (stream.sol() && stream.match(/^```/)) {
-      state.localMode = state.localState = null;
-      state.token = markdown;
-      return 'code';
-    }
-    else if (state.localMode) {
-      return state.localMode.token(stream, state.localState);
-    } else {
-      stream.skipToEnd();
-      return 'code';
-    }
-  }
-
-  // custom handleText to prevent emphasis in the middle of a word
-  // and add autolinking
-  function handleText(stream, mdState) {
-    var match;
-    if (stream.match(/^\w+:\/\/\S+/)) {
-      return 'link';
-    }
-    if (stream.match(/^[^\[*\\<>` _][^\[*\\<>` ]*[^\[*\\<>` _]/)) {
-      return mdMode.getType(mdState);
-    }
-    if (match = stream.match(/^[^\[*\\<>` ]+/)) {
-      var word = match[0];
-      if (word[0] === '_' && word[word.length-1] === '_') {
-        stream.backUp(word.length);
-        return undefined;
-      }
-      return mdMode.getType(mdState);
-    }
-    if (stream.eatSpace()) {
-      return null;
-    }
+  var codeDepth = 0;
+  function blankLine(state) {
+    state.code = false;
+    return null;
   }
-
-  return {
+  var gfmOverlay = {
     startState: function() {
-      var mdState = mdMode.startState();
-      mdState.text = handleText;
-      return {token: markdown, mode: "markdown", mdState: mdState,
-              localMode: null, localState: null};
+      return {
+        code: false,
+        codeBlock: false,
+        ateSpace: false
+      };
     },
-
-    copyState: function(state) {
-      return {token: state.token, mdState: CodeMirror.copyState(mdMode, state.mdState),
-              localMode: state.localMode,
-              localState: state.localMode ? CodeMirror.copyState(state.localMode, state.localState) : null};
+    copyState: function(s) {
+      return {
+        code: s.code,
+        codeBlock: s.codeBlock,
+        ateSpace: s.ateSpace
+      };
     },
-
     token: function(stream, state) {
-        /* Parse GFM double bracket links */
-        var ch;
-        if ((ch = stream.peek()) != undefined && ch == '[') {
-            stream.next(); // Advance the stream
-
-            /* Only handle double bracket links */
-            if ((ch = stream.peek()) == undefined || ch != '[') {
-                stream.backUp(1);
-                return state.token(stream, state);
-            } 
-
-            while ((ch = stream.next()) != undefined && ch != ']') {}
-
-            if (ch == ']' && (ch = stream.next()) != undefined && ch == ']') 
-                return 'link';
-
-            /* If we did not find the second ']' */
-            stream.backUp(1);
-        }
-
-        /* Match GFM latex formulas, as well as latex formulas within '$' */
-        if (stream.match(/^\$[^\$]+\$/)) {
-            return "string";
+      // Hack to prevent formatting override inside code blocks (block and inline)
+      if (state.codeBlock) {
+        if (stream.match(/^```/)) {
+          state.codeBlock = false;
+          return null;
         }
-
-        if (stream.match(/^\\\((.*?)\\\)/)) {
-            return "string";
-        }
-
-        if (stream.match(/^\$\$[^\$]+\$\$/)) {
-            return "string";
+        stream.skipToEnd();
+        return null;
+      }
+      if (stream.sol()) {
+        state.code = false;
+      }
+      if (stream.sol() && stream.match(/^```/)) {
+        stream.skipToEnd();
+        state.codeBlock = true;
+        return null;
+      }
+      // If this block is changed, it may need to be updated in Markdown mode
+      if (stream.peek() === '`') {
+        stream.next();
+        var before = stream.pos;
+        stream.eatWhile('`');
+        var difference = 1 + stream.pos - before;
+        if (!state.code) {
+          codeDepth = difference;
+          state.code = true;
+        } else {
+          if (difference === codeDepth) { // Must be exact
+            state.code = false;
+          }
         }
-        
-        if (stream.match(/^\\\[(.*?)\\\]/)) {
-            return "string";
+        return null;
+      } else if (state.code) {
+        stream.next();
+        return null;
+      }
+      // Check if space. If so, links can be formatted later on
+      if (stream.eatSpace()) {
+        state.ateSpace = true;
+        return null;
+      }
+      if (stream.sol() || state.ateSpace) {
+        state.ateSpace = false;
+        if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
+          // User/Project@SHA
+          // User@SHA
+          // SHA
+          return "link";
+        } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
+          // User/Project#Num
+          // User#Num
+          // #Num
+          return "link";
         }
-
-        return state.token(stream, state);
+      }
+      if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/i)) {
+        // URLs
+        // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
+        return "link";
+      }
+      stream.next();
+      return null;
     },
-
-    innerMode: function(state) {
-      if (state.token == markdown) return {state: state.mdState, mode: mdMode};
-      else return {state: state.localState, mode: state.localMode};
-    }
+    blankLine: blankLine
   };
-}, "markdown");
+  CodeMirror.defineMIME("gfmBase", {
+    name: "markdown",
+    underscoresBreakWords: false,
+    fencedCodeBlocks: true
+  });
+  return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay);
+});
diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index d0214c17d6..1ace668177 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -5,10 +5,17 @@
     <title>CodeMirror: GFM mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
+    <script src="../../lib/util/overlay.js"></script>
     <script src="../xml/xml.js"></script>
     <script src="../markdown/markdown.js"></script>
     <script src="gfm.js"></script>
+    
+    <!-- Code block highlighting modes -->
     <script src="../javascript/javascript.js"></script>
+    <script src="../css/css.js"></script>
+    <script src="../htmlmixed/htmlmixed.js"></script>
+    <script src="../clike/clike.js"></script>
+    
     <link rel="stylesheet" href="../markdown/markdown.css">
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
     <link rel="stylesheet" href="../../doc/docs.css">
@@ -16,14 +23,17 @@
   <body>
     <h1>CodeMirror: GFM mode</h1>
 
-<!-- source: http://daringfireball.net/projects/markdown/basics.text -->
 <form><textarea id="code" name="code">
-Github Flavored Markdown
+GitHub Flavored Markdown
 ========================
 
 Everything from markdown plus GFM features:
 
-## Fenced code blocks
+## URL autolinking
+
+Underscores_are_allowed_between_words.
+
+## Fenced code blocks (and syntax highlighting... someday)
 
 ```javascript
 for (var i = 0; i &lt; items.length; i++) {
@@ -31,7 +41,16 @@ <h1>CodeMirror: GFM mode</h1>
 }
 ```
 
-See http://github.github.com/github-flavored-markdown/
+## A bit of GitHub spice
+
+* SHA: be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
+* User@SHA ref: mojombo@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
+* User/Project@SHA: mojombo/god@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2
+* \#Num: #1
+* User/#Num: mojombo#1
+* User/Project#Num: mojombo/god#1
+
+See http://github.github.com/github-flavored-markdown/.
 
 </textarea></form>
 
diff --git a/mode/gfm/test.js b/mode/gfm/test.js
new file mode 100644
index 0000000000..3a261f8f77
--- /dev/null
+++ b/mode/gfm/test.js
@@ -0,0 +1,225 @@
+// Initiate ModeTest and set defaults
+var MT = ModeTest;
+MT.modeName = 'gfm';
+MT.modeOptions = {};
+
+// Emphasis characters within a word
+MT.testMode(
+  'emInWordAsterisk',
+  'foo*bar*hello',
+  [
+    null, 'foo',
+    'em', '*bar*',
+    null, 'hello'
+  ]
+);
+MT.testMode(
+  'emInWordUnderscore',
+  'foo_bar_hello',
+  [
+    null, 'foo_bar_hello'
+  ]
+);
+MT.testMode(
+  'emStrongUnderscore',
+  '___foo___ bar',
+  [
+    'strong', '__',
+    'emstrong', '_foo__',
+    'em', '_',
+    null, ' bar'
+  ]
+);
+
+// Fenced code blocks
+MT.testMode(
+  'fencedCodeBlocks',
+  '```\nfoo\n\n```\nbar',
+  [
+    'comment', '```',
+    'comment', 'foo',
+    'comment', '```',
+    null, 'bar'
+  ]
+);
+// Fenced code block mode switching
+MT.testMode(
+  'fencedCodeBlockModeSwitching',
+  '```javascript\nfoo\n\n```\nbar',
+  [
+    'comment', '```javascript',
+    'variable', 'foo',
+    'comment', '```',
+    null, 'bar'
+  ]
+);
+
+// SHA
+MT.testMode(
+  'SHA',
+  'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2 bar',
+  [
+    null, 'foo ',
+    'link', 'be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2',
+    null, ' bar'
+  ]
+);
+// GitHub highlights hashes 7-40 chars in length
+MT.testMode(
+  'shortSHA',
+  'foo be6a8cc bar',
+  [
+    null, 'foo ',
+    'link', 'be6a8cc',
+    null, ' bar'
+  ]
+);
+// Invalid SHAs
+// 
+// GitHub does not highlight hashes shorter than 7 chars
+MT.testMode(
+  'tooShortSHA',
+  'foo be6a8c bar',
+  [
+    null, 'foo be6a8c bar'
+  ]
+);
+// GitHub does not highlight hashes longer than 40 chars
+MT.testMode(
+  'longSHA',
+  'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd22 bar',
+  [
+    null, 'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd22 bar'
+  ]
+);
+MT.testMode(
+  'badSHA',
+  'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cg2 bar',
+  [
+    null, 'foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cg2 bar'
+  ]
+);
+// User@SHA
+MT.testMode(
+  'userSHA',
+  'foo bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2 hello',
+  [
+    null, 'foo ',
+    'link', 'bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2',
+    null, ' hello'
+  ]
+);
+// User/Project@SHA
+MT.testMode(
+  'userProjectSHA',
+  'foo bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2 world',
+  [
+    null, 'foo ',
+    'link', 'bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2',
+    null, ' world'
+  ]
+);
+
+// #Num
+MT.testMode(
+  'num',
+  'foo #1 bar',
+  [
+    null, 'foo ',
+    'link', '#1',
+    null, ' bar'
+  ]
+);
+// bad #Num
+MT.testMode(
+  'badNum',
+  'foo #1bar hello',
+  [
+    null, 'foo #1bar hello'
+  ]
+);
+// User#Num
+MT.testMode(
+  'userNum',
+  'foo bar#1 hello',
+  [
+    null, 'foo ',
+    'link', 'bar#1',
+    null, ' hello'
+  ]
+);
+// User/Project#Num
+MT.testMode(
+  'userProjectNum',
+  'foo bar/hello#1 world',
+  [
+    null, 'foo ',
+    'link', 'bar/hello#1',
+    null, ' world'
+  ]
+);
+
+// Vanilla links
+MT.testMode(
+  'vanillaLink',
+  'foo http://www.example.com/ bar',
+  [
+    null, 'foo ',
+    'link', 'http://www.example.com/',
+    null, ' bar'
+  ]
+);
+MT.testMode(
+  'vanillaLinkPunctuation',
+  'foo http://www.example.com/. bar',
+  [
+    null, 'foo ',
+    'link', 'http://www.example.com/',
+    null, '. bar'
+  ]
+);
+MT.testMode(
+  'vanillaLinkExtension',
+  'foo http://www.example.com/index.html bar',
+  [
+    null, 'foo ',
+    'link', 'http://www.example.com/index.html',
+    null, ' bar'
+  ]
+);
+// Not a link
+MT.testMode(
+  'notALink',
+  '```css\nfoo {color:black;}\n```http://www.example.com/',
+  [
+    'comment', '```css',
+    'tag', 'foo',
+    null, ' {',
+    'property', 'color',
+    'operator', ':',
+    'keyword', 'black',
+    null, ';}',
+    'comment', '```',
+    'link', 'http://www.example.com/'
+  ]
+);
+// Not a link
+MT.testMode(
+  'notALink',
+  '``foo `bar` http://www.example.com/`` hello',
+  [
+    'comment', '``foo `bar` http://www.example.com/``',
+    null, ' hello'
+  ]
+);
+// Not a link
+MT.testMode(
+  'notALink',
+  '`foo\nhttp://www.example.com/\n`foo\n\nhttp://www.example.com/',
+  [
+    'comment', '`foo',
+    'link', 'http://www.example.com/',
+    'comment', '`foo',
+    'link', 'http://www.example.com/'
+  ]
+);
\ No newline at end of file
diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 2375c4f94e..33c4a34499 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -2,6 +2,46 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   var htmlFound = CodeMirror.mimeModes.hasOwnProperty("text/html");
   var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? "text/html" : "text/plain");
+  var aliases = {
+    html: "htmlmixed",
+    js: "javascript",
+    json: "application/json",
+    c: "text/x-csrc",
+    "c++": "text/x-c++src",
+    java: "text/x-java",
+    csharp: "text/x-csharp",
+    "c#": "text/x-csharp"
+  };
+
+  var getMode = (function () {
+    var i, modes = {}, mimes = {}, mime;
+
+    var list = CodeMirror.listModes();
+    for (i = 0; i < list.length; i++) {
+      modes[list[i]] = list[i];
+    }
+    var mimesList = CodeMirror.listMIMEs();
+    for (i = 0; i < mimesList.length; i++) {
+      mime = mimesList[i].mime;
+      mimes[mime] = mimesList[i].mime;
+    }
+
+    for (var a in aliases) {
+      if (aliases[a] in modes || aliases[a] in mimes)
+        modes[a] = aliases[a];
+    }
+    
+    return function (lang) {
+      return modes[lang] ? CodeMirror.getMode(cmCfg, modes[lang]) : null;
+    };
+  }());
+  
+  // Should underscores in words open/close em/strong?
+  if (modeCfg.underscoresBreakWords === undefined)
+    modeCfg.underscoresBreakWords = true;
+  
+  // Turn on fenced code blocks? ("```" to start/end)
+  if (modeCfg.fencedCodeBlocks === undefined) modeCfg.fencedCodeBlocks = false;
   
   var codeDepth = 0;
   var prevLineHasContent = false
@@ -43,8 +83,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   function blankLine(state) {
     // Reset linkTitle state
     state.linkTitle = false;
-    // Reset CODE state
-    state.code = false;
     // Reset EM state
     state.em = false;
     // Reset STRONG state
@@ -59,7 +97,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function blockNormal(stream, state) {
-    var match;
     
     if (state.list !== false && state.indentationDiff >= 0) { // Continued list
       if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
@@ -85,9 +122,15 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return switchInline(stream, state, footnoteLink);
     } else if (stream.match(hrRE, true)) {
       return hr;
-    } else if (match = stream.match(ulRE, true) || stream.match(olRE, true)) {
+    } else if (stream.match(ulRE, true) || stream.match(olRE, true)) {
       state.indentation += 4;
       state.list = true;
+    } else if (modeCfg.fencedCodeBlocks && stream.match(/^```([\w+#]*)/, true)) {
+      // try switching mode
+      state.localMode = getMode(RegExp.$1);
+      if (state.localMode) state.localState = state.localMode.startState();
+      switchBlock(stream, state, local);
+      return code;
     }
     
     return switchInline(stream, state, state.inline);
@@ -107,6 +150,30 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     return style;
   }
 
+  function local(stream, state) {
+    if (stream.sol() && stream.match(/^```/, true)) {
+      state.localMode = state.localState = null;
+      state.f = inlineNormal;
+      state.block = blockNormal;
+      return code;
+    } else if (state.localMode) {
+      return state.localMode.token(stream, state.localState);
+    } else {
+      stream.skipToEnd();
+      return code;
+    }
+  }
+
+  function codeBlock(stream, state) {
+    if(stream.match(codeBlockRE, true)){
+      state.f = inlineNormal;
+      state.block = blockNormal;
+      switchInline(stream, state, state.inline);
+      return code;
+    }
+    stream.skipToEnd();
+    return code;
+  }
 
   // Inline
   function getType(state) {
@@ -164,6 +231,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
     }
     
+    // If this block is changed, it may need to be updated in GFM mode
     if (ch === '`') {
       var t = getType(state);
       var before = stream.pos;
@@ -227,8 +295,20 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return "tag";
     }
       
+    var ignoreUnderscore = false;
+    if (!modeCfg.underscoresBreakWords) {
+      if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) {
+        var prevPos = stream.pos - 2;
+        if (prevPos >= 0) {
+          var prevCh = stream.string.charAt(prevPos);
+          if (prevCh !== '_' && prevCh.match(/(\w)/, false)) {
+            ignoreUnderscore = true;
+          }
+        }
+      }
+    }
     var t = getType(state);
-    if (ch === '*' || ch === '_') {
+    if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
       if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
         state.strong = false;
         return t;
@@ -344,6 +424,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         block: s.block,
         htmlState: CodeMirror.copyState(htmlMode, s.htmlState),
         indentation: s.indentation,
+        
+        localMode: s.localMode,
+        localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null,
           
         inline: s.inline,
         text: s.text,
@@ -372,6 +455,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         // Reset state.header
         state.header = false;
+        
+        // Reset state.code
+        state.code = false;
 
         state.f = state.block;
         var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index e7fbc32fbb..e0269dcc40 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -41,6 +41,17 @@ MT.testMode(
   ]
 );
 
+// Block code using single backtick (shouldn't work)
+MT.testMode(
+  'blockCodeSingleBacktick',
+  '`\nfoo\n`',
+  [
+    'comment', '`',
+    null, 'foo',
+    'comment', '`'
+  ]
+);
+
 // Unclosed backticks
 // Instead of simply marking as CODE, it would be nice to have an 
 // incomplete flag for CODE, that is styled slightly different.
@@ -1204,4 +1215,4 @@ MT.testMode(
   [
     null, '\\\\# foo'
   ]
-);
\ No newline at end of file
+);
diff --git a/test/index.html b/test/index.html
index 9b10b62118..043cadea31 100644
--- a/test/index.html
+++ b/test/index.html
@@ -7,6 +7,7 @@
     <link rel="stylesheet" href="../doc/docs.css">
     <link rel="stylesheet" href="mode_test.css">
     <script src="../lib/codemirror.js"></script>
+    <script src="../lib/util/overlay.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
     <script src="../mode/xml/xml.js"></script>
 
@@ -44,6 +45,8 @@ <h1>CodeMirror: Test Suite</h1>
     <script src="../mode/css/test.js"></script>
     <script src="../mode/markdown/markdown.js"></script>
     <script src="../mode/markdown/test.js"></script>
+    <script src="../mode/gfm/gfm.js"></script>
+    <script src="../mode/gfm/test.js"></script>
     <script src="../mode/stex/stex.js"></script>
     <script src="../mode/stex/test.js"></script>
     <script>

From 242961f5e6aae5f8411741b471efdc50eb53087c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 3 Oct 2012 13:45:22 +0200
Subject: [PATCH 75/93] Another kludge in measureLine/lineWrapping interaction

Opening a new span between letters apparently *causes* the browser
to consider that element start to be a good place to break. This
adds zero-width joiners in such a situation to prevent this from
happening.

Closes #867
---
 lib/codemirror.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 40b5dd65f6..bcbd0b727e 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1647,8 +1647,6 @@ window.CodeMirror = (function() {
 
     function measureLine(line, ch) {
       if (ch == 0) return {top: 0, left: 0};
-      var wbr = options.lineWrapping && ch < line.text.length &&
-                spanAffectsWrapping.test(line.text.slice(ch - 1, ch + 1));
       var pre = lineContent(line, ch);
       removeChildrenAndAdd(measure, pre);
       var anchor = pre.anchor;
@@ -2586,13 +2584,17 @@ window.CodeMirror = (function() {
         span = function(html, text, style) {
           var l = text.length;
           if (wrapAt >= outPos && wrapAt < outPos + l) {
-            if (wrapAt > outPos) {
-              span_(html, text.slice(0, wrapAt - outPos), style);
+            var cut = wrapAt - outPos;
+            if (cut) {
+              span_(html, text.slice(0, cut), style);
               // See comment at the definition of spanAffectsWrapping
-              if (compensateForWrapping) html.appendChild(elt("wbr"));
+              if (compensateForWrapping) {
+                var view = text.slice(cut - 1, cut + 1);
+                if (spanAffectsWrapping.test(view)) html.appendChild(elt("wbr"));
+                else if (!ie_lt8 && /\w\w/.test(view)) html.appendChild(document.createTextNode("\u200d"));
+              }
             }
             html.appendChild(anchor);
-            var cut = wrapAt - outPos;
             span_(anchor, opera ? text.slice(cut, cut + 1) : text.slice(cut), style);
             if (opera) span_(html, text.slice(cut + 1), style);
             wrapAt--;

From 84baea555b2f6aa344987d833c91eda6dbc7d035 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <brandon@forewordreviews.com>
Date: Wed, 3 Oct 2012 09:44:09 -0400
Subject: [PATCH 76/93] Add note about mode dependency and links to
 highlighting tests.

---
 mode/gfm/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mode/gfm/index.html b/mode/gfm/index.html
index 1ace668177..05256f4be4 100644
--- a/mode/gfm/index.html
+++ b/mode/gfm/index.html
@@ -63,5 +63,9 @@ <h1>CodeMirror: GFM mode</h1>
       });
     </script>
 
+    <p>Optionally depends on other modes for properly highlighted code blocks.</p>
+
+    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#gfm_*">normal</a>,  <a href="../../test/index.html#verbose,gfm_*">verbose</a>.</p>
+
   </body>
 </html>

From 422a582d46e2aff4da7bf6d5bf979fd36de54893 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sun, 16 Sep 2012 20:59:14 -0400
Subject: [PATCH 77/93] [markdown mode] Fix highlighting for code blocks with
 internal indentation.

---
 mode/markdown/markdown.js |  3 +++
 mode/markdown/test.js     | 48 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/mode/markdown/markdown.js b/mode/markdown/markdown.js
index 33c4a34499..d227fc9b91 100644
--- a/mode/markdown/markdown.js
+++ b/mode/markdown/markdown.js
@@ -461,6 +461,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         state.f = state.block;
         var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
+        var difference = Math.floor((indentation - state.indentation) / 4) * 4;
+        if (difference > 4) difference = 4;
+        indentation = state.indentation + difference;
         state.indentationDiff = indentation - state.indentation;
         state.indentation = indentation;
         if (indentation > 0) { return null; }
diff --git a/mode/markdown/test.js b/mode/markdown/test.js
index e0269dcc40..7572db510b 100644
--- a/mode/markdown/test.js
+++ b/mode/markdown/test.js
@@ -20,6 +20,36 @@ MT.testMode(
     'comment', 'foo'
   ]
 );
+// Code blocks using 4 spaces with internal indentation
+MT.testMode(
+  'codeBlocksUsing4SpacesIndentation',
+  '    bar\n        hello\n            world\n    foo\nbar',
+  [
+    null, '    ',
+    'comment', 'bar',
+    null, '        ',
+    'comment', 'hello',
+    null, '            ',
+    'comment', 'world',
+    null, '    ',
+    'comment', 'foo',
+    null, 'bar'
+  ]
+);
+// Code blocks using 4 spaces with internal indentation
+MT.testMode(
+  'codeBlocksUsing4SpacesIndentation',
+  ' foo\n    bar\n        hello\n    world',
+  [
+    null, ' foo',
+    null, '    ',
+    'comment', 'bar',
+    null, '        ',
+    'comment', 'hello',
+    null, '    ',
+    'comment', 'world'
+  ]
+);
 
 // Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
 MT.testMode(
@@ -595,6 +625,24 @@ MT.testMode(
     'comment', 'hello'
   ]
 );
+// Code with internal indentation
+MT.testMode(
+  'listCodeIndentation',
+  '* foo\n\n        bar\n            hello\n                world\n        foo\n    bar',
+  [
+    'string', '* foo',
+    null, '        ',
+    'comment', 'bar',
+    null, '            ',
+    'comment', 'hello',
+    null, '                ',
+    'comment', 'world',
+    null, '        ',
+    'comment', 'foo',
+    null, '    ',
+    'string', 'bar'
+  ]
+);
 // Code followed by text
 MT.testMode(
   'listCodeText',

From 95383b66c818b09fb1ac13ccad752bac1c253e7a Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Oct 2012 11:57:25 +0200
Subject: [PATCH 78/93] [simplehint util] Support completeSingle option

To turn off the behavior where it'll always complete when only
a single option is left.
---
 lib/util/simple-hint.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/util/simple-hint.js b/lib/util/simple-hint.js
index 1a937a1c19..317b8ec148 100644
--- a/lib/util/simple-hint.js
+++ b/lib/util/simple-hint.js
@@ -25,7 +25,10 @@
         editor.replaceRange(str, result.from, result.to);
       }
       // When there is only one completion, use it directly.
-      if (completions.length == 1) {insert(completions[0]); return true;}
+      if (options.completeSingle && completions.length == 1) {
+        insert(completions[0]);
+        return true;
+      }
 
       // Build the select widget
       var complete = document.createElement("div");
@@ -92,6 +95,7 @@
   };
   CodeMirror.simpleHint.defaults = {
     closeOnBackspace: true,
-    closeOnTokenChange: false
+    closeOnTokenChange: false,
+    completeSingle: true
   };
 })();

From 525f15ce350283d54e2b55564f39b711c8758260 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Oct 2012 12:52:09 +0200
Subject: [PATCH 79/93] [keymap/vim] Stop using .forEach on arrays

---
 keymap/vim.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/keymap/vim.js b/keymap/vim.js
index b6a41850ef..bcfab9cd6c 100644
--- a/keymap/vim.js
+++ b/keymap/vim.js
@@ -318,13 +318,12 @@
   };
 
   // standard mode switching
-  iterList(["d", "t", "T", "f", "F", "c", "r"],
-      function (ch) {
-        CodeMirror.keyMap.vim[toCombo(ch)] = function (cm) {
-          cm.setOption("keyMap", "vim-prefix-" + ch);
-          emptyBuffer();
-        };
-      });
+  iterList(["d", "t", "T", "f", "F", "c", "r"], function (ch) {
+    CodeMirror.keyMap.vim[toCombo(ch)] = function (cm) {
+      cm.setOption("keyMap", "vim-prefix-" + ch);
+      emptyBuffer();
+    };
+  });
 
   function addCountBindings(keyMap) {
     // Add bindings for number keys
@@ -645,7 +644,7 @@
   };
 
   // Map our movement actions each operator and non-operational movement
-  motionList.forEach(function(key, index, array) {
+  iterList(motionList, function(key, index, array) {
     CodeMirror.keyMap['vim-prefix-d'][key] = function(cm) {
       // Get our selected range
       var start = cm.getCursor();
@@ -695,7 +694,7 @@
   });
 
   var nums = [1,2,3,4,5,6,7,8,9];
-  nums.forEach(function(key, index, array) {
+  iterList(nums, function(key, index, array) {
     CodeMirror.keyMap['vim'][key] = function (cm) {
       reptTimes = (reptTimes * 10) + key;
     };
@@ -713,7 +712,7 @@
   // Create our keymaps for each operator and make xa and xi where x is an operator
   // change to the corrosponding keymap
   var operators = ['d', 'y', 'c'];
-  operators.forEach(function(key, index, array) {
+  iterList(operators, function(key, index, array) {
     CodeMirror.keyMap['vim-prefix-'+key+'a'] = {
       auto: 'vim', nofallthrough: true, style: "fat-cursor"
     };

From 5250736f2ea06074d596f703511806d04bea86e7 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Thu, 4 Oct 2012 13:15:12 +0200
Subject: [PATCH 80/93] Set pre elements to overflow: visible

Some sites set them to auto, which messes up our cursor (and probably more)
---
 lib/codemirror.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 05ad0ed013..41b8d09e13 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -80,6 +80,7 @@
   word-wrap: normal;
   line-height: inherit;
   color: inherit;
+  overflow: visible;
 }
 
 .CodeMirror-wrap pre {

From c68ab00979113c1ad9b3ce07a7e2969d59526648 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Oct 2012 10:04:02 +0200
Subject: [PATCH 81/93] [util/simple-hint] Align completion dropdown with
 completed word

Add alignWithWord option to be able to turn that off.
---
 lib/util/simple-hint.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/util/simple-hint.js b/lib/util/simple-hint.js
index 317b8ec148..0ce25f9650 100644
--- a/lib/util/simple-hint.js
+++ b/lib/util/simple-hint.js
@@ -44,7 +44,7 @@
       }
       sel.firstChild.selected = true;
       sel.size = Math.min(10, completions.length);
-      var pos = editor.cursorCoords();
+      var pos = options.alignWithWord ? editor.charCoords(result.from) : editor.cursorCoords();
       complete.style.left = pos.x + "px";
       complete.style.top = pos.yBot + "px";
       document.body.appendChild(complete);
@@ -96,6 +96,7 @@
   CodeMirror.simpleHint.defaults = {
     closeOnBackspace: true,
     closeOnTokenChange: false,
-    completeSingle: true
+    completeSingle: true,
+    alignWithWord: true
   };
 })();

From bcc832b1843542d08da8ed4ed220455f762e49e8 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Thu, 4 Oct 2012 23:09:02 -0400
Subject: [PATCH 82/93] [css] Fix class matching.

This basically matches the CSS3 spec (except it doesn't match non-ascii characters).
---
 mode/css/css.js  | 2 +-
 mode/css/test.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode/css/css.js b/mode/css/css.js
index 5e3e233edb..87d5d7401e 100644
--- a/mode/css/css.js
+++ b/mode/css/css.js
@@ -228,7 +228,7 @@ CodeMirror.defineMode("css", function(config) {
     else if (/[,+>*\/]/.test(ch)) {
       return ret(null, "select-op");
     }
-    else if (ch == "." && stream.match(/^\w+/)) {
+    else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
       return ret("qualifier", type);
     }
     else if (ch == ":") {
diff --git a/mode/css/test.js b/mode/css/test.js
index 4e2d0e8e56..fd6a4b8aa8 100644
--- a/mode/css/test.js
+++ b/mode/css/test.js
@@ -217,9 +217,9 @@ MT.testMode(
 
 MT.testMode(
   'classSelector',
-  '.foo { }',
+  '.foo-bar_hello { }',
   [
-    'qualifier', '.foo',
+    'qualifier', '.foo-bar_hello',
     null, ' { }'
   ]
 );

From 8c7ca5eaab16b8358d6dc86688dfe648f663f7fc Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Oct 2012 16:18:08 +0200
Subject: [PATCH 83/93] Don't mutated makedSpans arrays

And add marker changes to the undo history, so that
un/redoing doesn't cause 'ghost' markers to appear.

Closes #882
---
 lib/codemirror.js | 47 +++++++++++++++++++++++++++++------------------
 test/test.js      | 17 +++++++++++------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index bcbd0b727e..6702234b75 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1508,17 +1508,21 @@ window.CodeMirror = (function() {
 
     function TextMarker(type, style) { this.lines = []; this.type = type; if (style) this.style = style; }
     TextMarker.prototype.clear = operation(function() {
-      var min = Infinity, max = -Infinity;
+      var min, max, seen = {};
       for (var i = 0; i < this.lines.length; ++i) {
-        var line = this.lines[i];
-        var span = getMarkedSpanFor(line.markedSpans, this, true);
-        if (span.from != null || span.to != null) {
-          var lineN = lineNo(line);
-          min = Math.min(min, lineN); max = Math.max(max, lineN);
-        }
+        var line = this.lines[i], lineN = lineNo(line);
+        seen[lineN] = newHL(line.text, line.markedSpans);
+        var span = getMarkedSpanFor(line.markedSpans, this);
+        if (span.from != null) min = lineN;
+        if (span.to != null) max = lineN;
+        line.markedSpans = removeMarkedSpan(line.markedSpans, span);
       }
-      if (min != Infinity)
+      if (min != null) {
         changes.push({from: min, to: max + 1});
+        var old = [];
+        for (var i = min; i <= max; ++i) old.push(seen[i]);
+        history.addChange(min, old.length, old, true);
+      }
       this.lines.length = 0;
     });
     TextMarker.prototype.find = function() {
@@ -1541,24 +1545,27 @@ window.CodeMirror = (function() {
       var marker = new TextMarker("range", className);
       if (options) for (var opt in options) if (options.hasOwnProperty(opt))
         marker[opt] = options[opt];
-      var curLine = from.line;
+      var curLine = from.line, old = [];
       doc.iter(curLine, to.line + 1, function(line) {
         var span = {from: curLine == from.line ? from.ch : null,
                     to: curLine == to.line ? to.ch : null,
                     marker: marker};
-        (line.markedSpans || (line.markedSpans = [])).push(span);
+        old.push(newHL(line.text, line.markedSpans));
+        line.markedSpans = (line.markedSpans || []).concat([span]);
         marker.lines.push(line);
         ++curLine;
       });
       changes.push({from: from.line, to: to.line + 1});
+      history.addChange(from.line, old.length, old, true);
       return marker;
     }
 
     function setBookmark(pos) {
       pos = clipPos(pos);
       var marker = new TextMarker("bookmark"), line = getLine(pos.line);
+      history.addChange(pos.line, 1, [newHL(line.text, line.markedSpans)], true);
       var span = {from: pos.ch, to: pos.ch, marker: marker};
-      (line.markedSpans || (line.markedSpans = [])).push(span);
+      line.markedSpans = (line.markedSpans || []).concat([span]);
       marker.lines.push(line);
       return marker;
     }
@@ -2355,16 +2362,20 @@ window.CodeMirror = (function() {
     this.from = from; this.to = to; this.marker = marker;
   }
 
-  function getMarkedSpanFor(spans, marker, del) {
+  function getMarkedSpanFor(spans, marker) {
     if (spans) for (var i = 0; i < spans.length; ++i) {
       var span = spans[i];
-      if (span.marker == marker) {
-        if (del) spans.splice(i, 1);
-        return span;
-      }
+      if (span.marker == marker) return span;
     }
   }
 
+  function removeMarkedSpan(spans, span) {
+    var r;
+    for (var i = 0; i < spans.lenght; ++i)
+      if (spans[i] == span) (r || (r = [])).push(spans[i]);
+    return r;
+  }
+
   function markedSpansBefore(old, startCh, endCh) {
     if (old) for (var i = 0, nw; i < old.length; ++i) {
       var span = old[i], marker = span.marker;
@@ -2873,12 +2884,12 @@ window.CodeMirror = (function() {
     this.closed = false;
   }
   History.prototype = {
-    addChange: function(start, added, old) {
+    addChange: function(start, added, old, minor) {
       this.undone.length = 0;
       var time = +new Date, cur = lst(this.done), last = cur && lst(cur);
       var dtime = time - this.time;
 
-      if (this.compound && cur && !this.closed) {
+      if (cur && !this.closed && (this.compound || minor)) {
         cur.push({start: start, added: added, old: old});
       } else if (dtime > 400 || !last || this.closed ||
                  last.start > start + old.length || last.start + last.added < start) {
diff --git a/test/test.js b/test/test.js
index bf72734045..9fb4016a4b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -287,16 +287,21 @@ testCM("markTextMultiLine", function(cm) {
 });
 
 testCM("markTextUndo", function(cm) {
-  var marker1 = cm.markText({line: 0, ch: 1}, {line: 0, ch: 3}, "CodeMirror-matchingbracket");
-  var marker2 = cm.markText({line: 0, ch: 0}, {line: 2, ch: 1}, "CodeMirror-matchingbracket");
-  var bookmark = cm.setBookmark({line: 1, ch: 5});
-  cm.replaceRange("foo", {line: 0, ch: 2});
-  cm.replaceRange("bar\baz\bug\n", {line: 2, ch: 0}, {line: 3, ch: 0});
+  var marker1, marker2, bookmark;
+  cm.compoundChange(function(){
+    marker1 = cm.markText({line: 0, ch: 1}, {line: 0, ch: 3}, "CodeMirror-matchingbracket");
+    marker2 = cm.markText({line: 0, ch: 0}, {line: 2, ch: 1}, "CodeMirror-matchingbracket");
+    bookmark = cm.setBookmark({line: 1, ch: 5});
+  });
+  cm.compoundChange(function(){
+    cm.replaceRange("foo", {line: 0, ch: 2});
+    cm.replaceRange("bar\baz\bug\n", {line: 2, ch: 0}, {line: 3, ch: 0});
+  });
   cm.setValue("");
   eq(marker1.find(), null); eq(marker2.find(), null); eq(bookmark.find(), null);
   cm.undo();
   eqPos(bookmark.find(), {line: 1, ch: 5});
-  cm.undo(); cm.undo();
+  cm.undo();
   var m1Pos = marker1.find(), m2Pos = marker2.find();
   eqPos(m1Pos.from, {line: 0, ch: 1}); eqPos(m1Pos.to, {line: 0, ch: 3});
   eqPos(m2Pos.from, {line: 0, ch: 0}); eqPos(m2Pos.to, {line: 2, ch: 1});

From 82702d5306d602da3ddcc4bde07ecda327c64f29 Mon Sep 17 00:00:00 2001
From: ks-ifware <kevin.senn@interfaceware.com>
Date: Thu, 20 Sep 2012 17:03:02 -0300
Subject: [PATCH 84/93] Fixed multi-line Lua comment recognition

Multi-line Lua comments start with "--[[", not "--["
---
 mode/lua/lua.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mode/lua/lua.js b/mode/lua/lua.js
index 60e84a9264..97fb2c6f96 100644
--- a/mode/lua/lua.js
+++ b/mode/lua/lua.js
@@ -64,7 +64,7 @@ CodeMirror.defineMode("lua", function(config, parserConfig) {
   function normal(stream, state) {
     var ch = stream.next();
     if (ch == "-" && stream.eat("-")) {
-      if (stream.eat("["))
+      if (stream.eat("[") && stream.eat("["))
         return (state.cur = bracketed(readBracket(stream), "comment"))(stream, state);
       stream.skipToEnd();
       return "comment";

From ebcd76efe758635a33b7c9ccf03740f9b010c453 Mon Sep 17 00:00:00 2001
From: Brandon Frohs <bfrohs@gmail.com>
Date: Sat, 13 Oct 2012 16:21:30 -0300
Subject: [PATCH 85/93] Fix typo in manual.

---
 doc/manual.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual.html b/doc/manual.html
index 09fb1c74c5..fe10b4c036 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -1120,7 +1120,7 @@ <h2 id="modeapi">Writing CodeMirror Modes</h2>
     state.</p>
 
     <p id="indent">If you want your mode to provide smart indentation
-    (though the <a href="#indentLine"><code>indentLine</code></a>
+    (through the <a href="#indentLine"><code>indentLine</code></a>
     method and the <code>indentAuto</code>
     and <code>newlineAndIndent</code> commands, which keys can be
     <a href="#option_extraKeys">bound</a> to), you must define

From fdf78f757208674d0594fe0ddaa0f1b08bbc1d82 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 15 Oct 2012 21:45:57 +0200
Subject: [PATCH 86/93] Fix typo (lenght)

---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 6702234b75..13d7096471 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2371,7 +2371,7 @@ window.CodeMirror = (function() {
 
   function removeMarkedSpan(spans, span) {
     var r;
-    for (var i = 0; i < spans.lenght; ++i)
+    for (var i = 0; i < spans.length; ++i)
       if (spans[i] == span) (r || (r = [])).push(spans[i]);
     return r;
   }

From 5ea1eb983e17c1273921a49890a4fd51653ac185 Mon Sep 17 00:00:00 2001
From: ComFreek <programmer-comfreek@hotmail.com>
Date: Mon, 15 Oct 2012 18:22:44 +0200
Subject: [PATCH 87/93] Merged JavaScript and TypeScript mode as marijnh
 suggested

---
 mode/javascript/index.html      | 17 ++++++---
 mode/javascript/javascript.js   | 40 +++++++++++++++++++--
 mode/javascript/typescript.html | 61 +++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 6 deletions(-)
 create mode 100644 mode/javascript/typescript.html

diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 206df3fca1..86d3dde3fe 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -69,10 +69,19 @@ <h1>CodeMirror: JavaScript mode</h1>
       });
     </script>
 
-    <p>JavaScript mode supports a single configuration
-    option, <code>json</code>, which will set the mode to expect JSON
-    data rather than a JavaScript program.</p>
+    <p>
+      JavaScript mode supports a two configuration
+      options:
+      <ul>
+        <li><code>json</code> which will set the mode to expect JSON data rather than a JavaScript program.</li>
+        <li>
+          <code>typescript</code> which will activate additional syntax highlighting and some other things for TypeScript code.
+          <br />
+          Click here for the demo which also provides an extra theme: <a href="typescript.html">typescript.html</a>
+        </li>
+      </ul>
+    </p>
 
-    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>.</p>
+    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
   </body>
 </html>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index 5b377db7d1..cbb7bc46ca 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,6 +1,11 @@
-CodeMirror.defineMode("javascript", function(config, parserConfig) {
+/**
+  * The TypeScript extensions are (C) Copyright 2012 by ComFreek <comfreek@outlook.com>
+  */
+
+CodeMirror.defineMode("javascript", function (config, parserConfig) {
   var indentUnit = config.indentUnit;
   var jsonMode = parserConfig.json;
+  var isTS = parserConfig.typescript;
 
   // Tokenizer
 
@@ -8,7 +13,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     function kw(type) {return {type: type, style: "keyword"};}
     var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
     var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-    return {
+    
+    var jsKeywords = {
       "if": A, "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
       "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
@@ -17,6 +23,34 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom
     };
+
+    // Extend the 'normal' keywords with the TypeScript language extensions
+    if (isTS) {
+      var tsKeywords = {
+        // object-like things
+        "interface": kw("interface"),
+        "class": kw("class"),
+        "extends": kw("extends"),
+        "constructor": kw("constructor"),
+
+        // scope modifiers
+        "public": kw("public"),
+        "private": kw("private"),
+        "protected": kw("protected"),
+        "static": kw("static"),
+
+        "super": kw("super"),
+
+        // types
+        "string": type, "number": type, "bool": type, "any": type
+      };
+
+      for (var attr in tsKeywords) {
+        jsKeywords[attr] = tsKeywords[attr];
+      }
+    }
+
+    return jsKeywords;
   }();
 
   var isOperatorChar = /[+\-*&%=<>!?|]/;
@@ -360,3 +394,5 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
 CodeMirror.defineMIME("text/javascript", "javascript");
 CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
+CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
+CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
new file mode 100644
index 0000000000..ba7496b90c
--- /dev/null
+++ b/mode/javascript/typescript.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>CodeMirror: JavaScript mode using TypeScript extension</title>
+    <link rel="stylesheet" href="../../lib/codemirror.css">
+    <script src="../../lib/codemirror.js"></script>
+    <script src="javascript.js"></script>
+    <link rel="stylesheet" href="../../doc/docs.css">
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+  </head>
+  <body>
+    <h1>CodeMirror: JavaScript mode using TypeScript extension</h1>
+
+<div><textarea id="code" name="code">
+class Greeter {
+	greeting: string;
+	constructor (message: string) {
+		this.greeting = message;
+	}
+	greet() {
+		return "Hello, " + this.greeting;
+	}
+}   
+
+var greeter = new Greeter("world");
+
+var button = document.createElement('button')
+button.innerText = "Say Hello"
+button.onclick = function() {
+	alert(greeter.greet())
+}
+
+document.body.appendChild(button)
+
+</textarea></div>
+
+    <script>
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: "text/typescript"
+      });
+    </script>
+
+    <p>
+      JavaScript mode supports a two configuration
+      options:
+      <ul>
+        <li><code>json</code> which will set the mode to expect JSON data rather than a JavaScript program.</li>
+        <li><code>typescript</code> which will activate additional syntax highlighting and some other things for TypeScript code.</li>
+      </ul>
+    </p>
+    
+    <p>
+      This sample also uses the <a href="../../theme/typebox.css">TypeBox.css</a> theme.
+    </p>
+
+    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
+  </body>
+</html>

From b3c1c795f5618fe14d23f9f845b06d1ae1809546 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Oct 2012 11:50:21 +0200
Subject: [PATCH 88/93] Make typescript mode recognize type declarations

---
 mode/javascript/index.html      |  4 +---
 mode/javascript/javascript.js   | 30 ++++++++++++++++++++++--------
 mode/javascript/typescript.html | 19 +++----------------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/mode/javascript/index.html b/mode/javascript/index.html
index 86d3dde3fe..a9fb381fdf 100644
--- a/mode/javascript/index.html
+++ b/mode/javascript/index.html
@@ -75,9 +75,7 @@ <h1>CodeMirror: JavaScript mode</h1>
       <ul>
         <li><code>json</code> which will set the mode to expect JSON data rather than a JavaScript program.</li>
         <li>
-          <code>typescript</code> which will activate additional syntax highlighting and some other things for TypeScript code.
-          <br />
-          Click here for the demo which also provides an extra theme: <a href="typescript.html">typescript.html</a>
+          <code>typescript</code> which will activate additional syntax highlighting and some other things for TypeScript code (<a href="typescript.html">demo</a>).
         </li>
       </ul>
     </p>
diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index cbb7bc46ca..eb258818b0 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -2,7 +2,9 @@
   * The TypeScript extensions are (C) Copyright 2012 by ComFreek <comfreek@outlook.com>
   */
 
-CodeMirror.defineMode("javascript", function (config, parserConfig) {
+// TODO actually recognize syntax of TypeScript constructs
+
+CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var jsonMode = parserConfig.json;
   var isTS = parserConfig.typescript;
@@ -25,7 +27,8 @@ CodeMirror.defineMode("javascript", function (config, parserConfig) {
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
-    if (isTS) {
+    if (isTS) {
+      var type = {type: "variable", style: "variable-3"};
       var tsKeywords = {
         // object-like things
         "interface": kw("interface"),
@@ -42,12 +45,12 @@ CodeMirror.defineMode("javascript", function (config, parserConfig) {
         "super": kw("super"),
 
         // types
-        "string": type, "number": type, "bool": type, "any": type
+        "string": type, "number": type, "bool": type, "any": type
       };
 
-      for (var attr in tsKeywords) {
-        jsKeywords[attr] = tsKeywords[attr];
-      }
+      for (var attr in tsKeywords) {
+        jsKeywords[attr] = tsKeywords[attr];
+      }
     }
 
     return jsKeywords;
@@ -309,8 +312,19 @@ CodeMirror.defineMode("javascript", function (config, parserConfig) {
     if (type == "}") return cont();
     return pass(statement, block);
   }
+  function maybetype(type) {
+    if (type == ":") return cont(typedef);
+    return pass();
+  }
+  function typedef(type) {
+    if (type == "variable"){cx.marked = "variable-3"; return cont();}
+    return pass();
+  }
   function vardef1(type, value) {
-    if (type == "variable"){register(value); return cont(vardef2);}
+    if (type == "variable") {
+      register(value);
+      return isTS ? cont(maybetype, vardef2) : cont(vardef2);
+    }
     return cont();
   }
   function vardef2(type, value) {
@@ -340,7 +354,7 @@ CodeMirror.defineMode("javascript", function (config, parserConfig) {
     if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, statement, popcontext);
   }
   function funarg(type, value) {
-    if (type == "variable") {register(value); return cont();}
+    if (type == "variable") {register(value); return isTS ? cont(maybetype) : cont();}
   }
 
   // Interface
diff --git a/mode/javascript/typescript.html b/mode/javascript/typescript.html
index ba7496b90c..58315e7ac7 100644
--- a/mode/javascript/typescript.html
+++ b/mode/javascript/typescript.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>CodeMirror: JavaScript mode using TypeScript extension</title>
+    <title>CodeMirror: TypeScript mode</title>
     <link rel="stylesheet" href="../../lib/codemirror.css">
     <script src="../../lib/codemirror.js"></script>
     <script src="javascript.js"></script>
@@ -10,7 +10,7 @@
     <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
   </head>
   <body>
-    <h1>CodeMirror: JavaScript mode using TypeScript extension</h1>
+    <h1>CodeMirror: TypeScript mode</h1>
 
 <div><textarea id="code" name="code">
 class Greeter {
@@ -43,19 +43,6 @@ <h1>CodeMirror: JavaScript mode using TypeScript extension</h1>
       });
     </script>
 
-    <p>
-      JavaScript mode supports a two configuration
-      options:
-      <ul>
-        <li><code>json</code> which will set the mode to expect JSON data rather than a JavaScript program.</li>
-        <li><code>typescript</code> which will activate additional syntax highlighting and some other things for TypeScript code.</li>
-      </ul>
-    </p>
-    
-    <p>
-      This sample also uses the <a href="../../theme/typebox.css">TypeBox.css</a> theme.
-    </p>
-
-    <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>, <code>text/typescript</code>, <code>application/typescript</code>.</p>
+    <p>This is a specialization of the <a href="index.html">JavaScript mode</a>.</p>
   </body>
 </html>

From 2b6d7964d8395c415a35f65a4f41f1bd69d02102 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Oct 2012 15:38:50 +0200
Subject: [PATCH 89/93] Fix removing of spans

---
 lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/codemirror.js b/lib/codemirror.js
index 13d7096471..90ccdc512f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -2372,7 +2372,7 @@ window.CodeMirror = (function() {
   function removeMarkedSpan(spans, span) {
     var r;
     for (var i = 0; i < spans.length; ++i)
-      if (spans[i] == span) (r || (r = [])).push(spans[i]);
+      if (spans[i] != span) (r || (r = [])).push(spans[i]);
     return r;
   }
 

From a2d967330d984017ea161750e519f67970288329 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Oct 2012 15:40:31 +0200
Subject: [PATCH 90/93] Remove copyright header

(git is the authoritative source of who wrote what)
---
 mode/javascript/javascript.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mode/javascript/javascript.js b/mode/javascript/javascript.js
index eb258818b0..2f00713866 100644
--- a/mode/javascript/javascript.js
+++ b/mode/javascript/javascript.js
@@ -1,7 +1,3 @@
-/**
-  * The TypeScript extensions are (C) Copyright 2012 by ComFreek <comfreek@outlook.com>
-  */
-
 // TODO actually recognize syntax of TypeScript constructs
 
 CodeMirror.defineMode("javascript", function(config, parserConfig) {

From ac059ffce139543b0f3946af58983e121c7052b0 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Tue, 16 Oct 2012 16:02:11 +0200
Subject: [PATCH 91/93] Add defineInitHook functionality

---
 doc/manual.html   | 7 +++++++
 lib/codemirror.js | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/doc/manual.html b/doc/manual.html
index fe10b4c036..1c60eeeb3a 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -838,6 +838,13 @@ <h2 id="api">Programming API</h2>
     will cause the given value (usually a method) to be added to all
     CodeMirror instances created from then on.</p>
 
+    <p id="defineInitHook">If your extention just needs to run some
+    code whenever a CodeMirror instance is initialized,
+    use <code>CodeMirror.defineInitHook</code>. Give it a function as
+    its only argument, and from then on, that function will be called
+    (with the instance as argument) whenever a new CodeMirror instance
+    is initialized.</p>
+
     <h2 id="addons">Add-ons</h2>
 
     <p>The <code>lib/util</code> directory in the distribution
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 90ccdc512f..2a25803f8c 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1986,6 +1986,7 @@ window.CodeMirror = (function() {
       if (extensions.propertyIsEnumerable(ext) &&
           !instance.propertyIsEnumerable(ext))
         instance[ext] = extensions[ext];
+    for (var i = 0; i < initHooks.length; ++i) initHooks[i](instance);
     return instance;
   } // (end of function CodeMirror)
 
@@ -2083,6 +2084,9 @@ window.CodeMirror = (function() {
     extensions[name] = func;
   };
 
+  var initHooks = [];
+  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
+
   var modeExtensions = CodeMirror.modeExtensions = {};
   CodeMirror.extendMode = function(mode, properties) {
     var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});

From 015688c2c2d223490d446ad81639aaafe1fa6d86 Mon Sep 17 00:00:00 2001
From: Roffis Baetz <roffis@roffiscode.org>
Date: Wed, 17 Oct 2012 20:02:43 -0500
Subject: [PATCH 92/93] First New Commit to File. Add New Stuff!

Signed-off-by: Roffis Baetz <roffis@roffiscode.org>
---
 CodeSITE$%&).html                       |   88 +
 demo/activeline.html                    |   73 -
 demo/changemode.html                    |   51 -
 demo/closetag.html                      |   66 -
 demo/complete.html                      |   71 -
 demo/emacs.html                         |   60 -
 demo/folding.html                       |   62 -
 demo/formatting.html                    |   81 -
 demo/fullscreen.html                    |  147 -
 demo/loadmode.html                      |   40 -
 demo/marker.html                        |   53 -
 demo/matchhighlighter.html              |   38 -
 demo/multiplex.html                     |   60 -
 demo/mustache.html                      |   59 -
 demo/preview.html                       |   76 -
 demo/resize.html                        |   42 -
 demo/runmode.html                       |   50 -
 demo/search.html                        |   85 -
 demo/theme.html                         |   79 -
 demo/vim.html                           |   53 -
 demo/visibletabs.html                   |   53 -
 demo/xmlcomplete.html                   |   71 -
 doc/baboon.png                          |  Bin 23299 -> 0 bytes
 doc/baboon_vector.svg                   |  153 -
 doc/compress.html                       |  163 -
 doc/docs.css                            |  165 -
 doc/internals.html                      |  497 --
 doc/manual.html                         | 1231 ---
 doc/oldrelease.html                     |  305 -
 doc/reporting.html                      |   60 -
 doc/upgrade_v2.2.html                   |   98 -
 index.html                              |  473 --
 js/.DS_Store                            |  Bin 0 -> 6148 bytes
 js/._.DS_Store                          |  Bin 0 -> 4096 bytes
 js/._.jshintrc                          |  Bin 0 -> 4096 bytes
 js/._README.md                          |  Bin 0 -> 4096 bytes
 js/._bootstrap-alert.js                 |  Bin 0 -> 4096 bytes
 js/._bootstrap-button.js                |  Bin 0 -> 4096 bytes
 js/._bootstrap-carousel.js              |  Bin 0 -> 4096 bytes
 js/._bootstrap-collapse.js              |  Bin 0 -> 4096 bytes
 js/._bootstrap-dropdown.js              |  Bin 0 -> 4096 bytes
 js/._bootstrap-modal.js                 |  Bin 0 -> 4096 bytes
 js/._bootstrap-popover.js               |  Bin 0 -> 4096 bytes
 js/._bootstrap-scrollspy.js             |  Bin 0 -> 4096 bytes
 js/._bootstrap-tab.js                   |  Bin 0 -> 4096 bytes
 js/._bootstrap-tooltip.js               |  Bin 0 -> 4096 bytes
 js/._bootstrap-transition.js            |  Bin 0 -> 4096 bytes
 js/._bootstrap-typeahead.js             |  Bin 0 -> 4096 bytes
 js/._tests                              |  Bin 0 -> 4096 bytes
 js/.jshintrc                            |   10 +
 js/README.md                            |  112 +
 js/bootstrap-alert.js                   |   90 +
 js/bootstrap-button.js                  |   96 +
 js/bootstrap-carousel.js                |  169 +
 js/bootstrap-collapse.js                |  157 +
 js/bootstrap-dropdown.js                |  100 +
 js/bootstrap-modal.js                   |  218 +
 js/bootstrap-popover.js                 |   98 +
 js/bootstrap-scrollspy.js               |  151 +
 js/bootstrap-tab.js                     |  135 +
 js/bootstrap-tooltip.js                 |  275 +
 js/bootstrap-transition.js              |   61 +
 js/bootstrap-typeahead.js               |  285 +
 js/tests/._index.html                   |  Bin 0 -> 4096 bytes
 js/tests/._phantom.js                   |  Bin 0 -> 4096 bytes
 js/tests/._server.js                    |  Bin 0 -> 4096 bytes
 js/tests/._unit                         |  Bin 0 -> 4096 bytes
 js/tests/._vendor                       |  Bin 0 -> 4096 bytes
 js/tests/index.html                     |   54 +
 js/tests/phantom.js                     |   63 +
 js/tests/server.js                      |   14 +
 js/tests/unit/._bootstrap-alert.js      |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-button.js     |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-carousel.js   |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-collapse.js   |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-dropdown.js   |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-modal.js      |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-phantom.js    |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-popover.js    |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-scrollspy.js  |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-tab.js        |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-tooltip.js    |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-transition.js |  Bin 0 -> 4096 bytes
 js/tests/unit/._bootstrap-typeahead.js  |  Bin 0 -> 4096 bytes
 js/tests/unit/bootstrap-alert.js        |   56 +
 js/tests/unit/bootstrap-button.js       |   77 +
 js/tests/unit/bootstrap-carousel.js     |   28 +
 js/tests/unit/bootstrap-collapse.js     |   54 +
 js/tests/unit/bootstrap-dropdown.js     |   87 +
 js/tests/unit/bootstrap-modal.js        |  114 +
 js/tests/unit/bootstrap-phantom.js      |   21 +
 js/tests/unit/bootstrap-popover.js      |   93 +
 js/tests/unit/bootstrap-scrollspy.js    |   31 +
 js/tests/unit/bootstrap-tab.js          |   61 +
 js/tests/unit/bootstrap-tooltip.js      |  155 +
 js/tests/unit/bootstrap-transition.js   |   13 +
 js/tests/unit/bootstrap-typeahead.js    |  148 +
 js/tests/vendor/._jquery.js             |  Bin 0 -> 4096 bytes
 js/tests/vendor/._qunit.css             |  Bin 0 -> 4096 bytes
 js/tests/vendor/._qunit.js              |  Bin 0 -> 4096 bytes
 js/tests/vendor/jquery.js               | 9252 +++++++++++++++++++++++
 js/tests/vendor/qunit.css               |  232 +
 js/tests/vendor/qunit.js                | 1510 ++++
 less.js                                 |    9 +
 less/.DS_Store                          |  Bin 0 -> 15364 bytes
 less/._.DS_Store                        |  Bin 0 -> 4096 bytes
 less/._accordion.less                   |  Bin 0 -> 4096 bytes
 less/._alerts.less                      |  Bin 0 -> 4096 bytes
 less/._bootstrap.less                   |  Bin 0 -> 4096 bytes
 less/._breadcrumbs.less                 |  Bin 0 -> 4096 bytes
 less/._button-groups.less               |  Bin 0 -> 4096 bytes
 less/._buttons.less                     |  Bin 0 -> 4096 bytes
 less/._carousel.less                    |  Bin 0 -> 4096 bytes
 less/._close.less                       |  Bin 0 -> 4096 bytes
 less/._code.less                        |  Bin 0 -> 4096 bytes
 less/._component-animations.less        |  Bin 0 -> 4096 bytes
 less/._dropdowns.less                   |  Bin 0 -> 4096 bytes
 less/._forms.less                       |  Bin 0 -> 4096 bytes
 less/._grid.less                        |  Bin 0 -> 4096 bytes
 less/._hero-unit.less                   |  Bin 0 -> 4096 bytes
 less/._labels-badges.less               |  Bin 0 -> 4096 bytes
 less/._layouts.less                     |  Bin 0 -> 4096 bytes
 less/._mixins.less                      |  Bin 0 -> 4096 bytes
 less/._modals.less                      |  Bin 0 -> 4096 bytes
 less/._navbar.less                      |  Bin 0 -> 4096 bytes
 less/._navs.less                        |  Bin 0 -> 4096 bytes
 less/._pager.less                       |  Bin 0 -> 4096 bytes
 less/._pagination.less                  |  Bin 0 -> 4096 bytes
 less/._popovers.less                    |  Bin 0 -> 4096 bytes
 less/._progress-bars.less               |  Bin 0 -> 4096 bytes
 less/._reset.less                       |  Bin 0 -> 4096 bytes
 less/._responsive-1200px-min.less       |  Bin 0 -> 4096 bytes
 less/._responsive-767px-max.less        |  Bin 0 -> 4096 bytes
 less/._responsive-768px-979px.less      |  Bin 0 -> 4096 bytes
 less/._responsive-navbar.less           |  Bin 0 -> 4096 bytes
 less/._responsive-utilities.less        |  Bin 0 -> 4096 bytes
 less/._responsive.less                  |  Bin 0 -> 4096 bytes
 less/._scaffolding.less                 |  Bin 0 -> 4096 bytes
 less/._sprites.less                     |  Bin 0 -> 4096 bytes
 less/._tables.less                      |  Bin 0 -> 4096 bytes
 less/._tests                            |  Bin 0 -> 4096 bytes
 less/._thumbnails.less                  |  Bin 0 -> 4096 bytes
 less/._tooltip.less                     |  Bin 0 -> 4096 bytes
 less/._type.less                        |  Bin 0 -> 4096 bytes
 less/._utilities.less                   |  Bin 0 -> 4096 bytes
 less/._variables.less                   |  Bin 0 -> 4096 bytes
 less/._wells.less                       |  Bin 0 -> 4096 bytes
 less/accordion.less                     |   33 +
 less/alerts.less                        |   58 +
 less/bootstrap.less                     |   62 +
 less/breadcrumbs.less                   |   24 +
 less/button-groups.less                 |  191 +
 less/buttons.less                       |  191 +
 less/carousel.less                      |  121 +
 less/close.less                         |   29 +
 less/code.less                          |   57 +
 less/component-animations.less          |   20 +
 less/dropdowns.less                     |  143 +
 less/forms.less                         |  583 ++
 less/grid.less                          |    5 +
 less/hero-unit.less                     |   22 +
 less/labels-badges.less                 |   55 +
 less/layouts.less                       |   17 +
 less/mixins.less                        |  646 ++
 less/modals.less                        |   90 +
 less/navbar.less                        |  358 +
 less/navs.less                          |  363 +
 less/pager.less                         |   36 +
 less/pagination.less                    |   56 +
 less/popovers.less                      |   49 +
 less/progress-bars.less                 |  117 +
 less/reset.less                         |  131 +
 less/responsive-1200px-min.less         |   26 +
 less/responsive-767px-max.less          |  149 +
 less/responsive-768px-979px.less        |   17 +
 less/responsive-navbar.less             |  153 +
 less/responsive-utilities.less          |   41 +
 less/responsive.less                    |   48 +
 less/scaffolding.less                   |   29 +
 less/sprites.less                       |  191 +
 less/tables.less                        |  176 +
 less/tests/._css-tests.css              |  Bin 0 -> 4096 bytes
 less/tests/._css-tests.html             |  Bin 0 -> 4096 bytes
 less/tests/._forms.html                 |  Bin 0 -> 4096 bytes
 less/tests/._navbar.html                |  Bin 0 -> 4096 bytes
 less/tests/css-tests.css                |   52 +
 less/tests/css-tests.html               |  917 +++
 less/tests/forms.html                   |  179 +
 less/tests/navbar.html                  |  108 +
 less/thumbnails.less                    |   47 +
 less/tooltip.less                       |   35 +
 less/type.less                          |  232 +
 less/utilities.less                     |   23 +
 less/variables.less                     |  206 +
 less/wells.less                         |   27 +
 lib/.DS_Store                           |  Bin 0 -> 6148 bytes
 lib/._.DS_Store                         |  Bin 0 -> 4096 bytes
 lib/._codemirror.css                    |  Bin 0 -> 4096 bytes
 lib/._codemirror.js                     |  Bin 0 -> 4096 bytes
 lib/._util                              |  Bin 0 -> 4096 bytes
 lib/codemirror.css                      |   29 +-
 lib/codemirror.js                       | 1529 ++--
 lib/util/.DS_Store                      |  Bin 0 -> 6148 bytes
 lib/util/._.DS_Store                    |  Bin 0 -> 4096 bytes
 lib/util/._closetag.js                  |  Bin 0 -> 4096 bytes
 lib/util/._dialog.css                   |  Bin 0 -> 4096 bytes
 lib/util/._dialog.js                    |  Bin 0 -> 4096 bytes
 lib/util/._foldcode.js                  |  Bin 0 -> 4096 bytes
 lib/util/._formatting.js                |  Bin 0 -> 4096 bytes
 lib/util/._javascript-hint.js           |  Bin 0 -> 4096 bytes
 lib/util/._loadmode.js                  |  Bin 0 -> 4096 bytes
 lib/util/._match-highlighter.js         |  Bin 0 -> 4096 bytes
 lib/util/._multiplex.js                 |  Bin 0 -> 4096 bytes
 lib/util/._overlay.js                   |  Bin 0 -> 4096 bytes
 lib/util/._pig-hint.js                  |  Bin 0 -> 4096 bytes
 lib/util/._runmode.js                   |  Bin 0 -> 4096 bytes
 lib/util/._search.js                    |  Bin 0 -> 4096 bytes
 lib/util/._searchcursor.js              |  Bin 0 -> 4096 bytes
 lib/util/._simple-hint.css              |  Bin 0 -> 4096 bytes
 lib/util/._simple-hint.js               |  Bin 0 -> 4096 bytes
 lib/util/._xml-hint.js                  |  Bin 0 -> 4096 bytes
 lib/util/closetag.js                    |   70 +-
 lib/util/dialog.js                      |    5 +-
 lib/util/formatting.js                  |  400 +-
 lib/util/javascript-hint.js             |    6 +-
 lib/util/loadmode.js                    |    2 +-
 lib/util/multiplex.js                   |   14 +-
 lib/util/overlay.js                     |    9 +-
 lib/util/pig-hint.js                    |    2 +-
 lib/util/runmode.js                     |   12 +-
 lib/util/search.js                      |    8 +-
 lib/util/searchcursor.js                |   26 +-
 lib/util/simple-hint.js                 |  162 +-
 lib/util/xml-hint.js                    |   16 +-
 test/._driver.js                        |  Bin 0 -> 4096 bytes
 test/._index.html                       |  Bin 0 -> 4096 bytes
 test/._mode_test.css                    |  Bin 0 -> 4096 bytes
 test/._mode_test.js                     |  Bin 0 -> 4096 bytes
 test/._test.js                          |  Bin 0 -> 4096 bytes
 test/driver.js                          |  131 +-
 test/index.html                         |  148 +-
 test/lint/lint.js                       |  120 -
 test/lint/parse-js.js                   | 1372 ----
 test/mode_test.css                      |   12 +
 test/mode_test.js                       |   93 +-
 test/phantom_driver.js                  |   30 -
 test/run.js                             |   32 -
 test/test.js                            |  226 +-
 248 files changed, 21526 insertions(+), 7673 deletions(-)
 create mode 100644 CodeSITE$%&).html
 delete mode 100644 demo/activeline.html
 delete mode 100644 demo/changemode.html
 delete mode 100644 demo/closetag.html
 delete mode 100644 demo/complete.html
 delete mode 100644 demo/emacs.html
 delete mode 100644 demo/folding.html
 delete mode 100644 demo/formatting.html
 delete mode 100644 demo/fullscreen.html
 delete mode 100644 demo/loadmode.html
 delete mode 100644 demo/marker.html
 delete mode 100644 demo/matchhighlighter.html
 delete mode 100644 demo/multiplex.html
 delete mode 100644 demo/mustache.html
 delete mode 100644 demo/preview.html
 delete mode 100644 demo/resize.html
 delete mode 100644 demo/runmode.html
 delete mode 100644 demo/search.html
 delete mode 100644 demo/theme.html
 delete mode 100644 demo/vim.html
 delete mode 100644 demo/visibletabs.html
 delete mode 100644 demo/xmlcomplete.html
 delete mode 100644 doc/baboon.png
 delete mode 100644 doc/baboon_vector.svg
 delete mode 100644 doc/compress.html
 delete mode 100644 doc/docs.css
 delete mode 100644 doc/internals.html
 delete mode 100644 doc/manual.html
 delete mode 100644 doc/oldrelease.html
 delete mode 100644 doc/reporting.html
 delete mode 100644 doc/upgrade_v2.2.html
 delete mode 100644 index.html
 create mode 100644 js/.DS_Store
 create mode 100644 js/._.DS_Store
 create mode 100644 js/._.jshintrc
 create mode 100644 js/._README.md
 create mode 100644 js/._bootstrap-alert.js
 create mode 100644 js/._bootstrap-button.js
 create mode 100644 js/._bootstrap-carousel.js
 create mode 100644 js/._bootstrap-collapse.js
 create mode 100644 js/._bootstrap-dropdown.js
 create mode 100644 js/._bootstrap-modal.js
 create mode 100644 js/._bootstrap-popover.js
 create mode 100644 js/._bootstrap-scrollspy.js
 create mode 100644 js/._bootstrap-tab.js
 create mode 100644 js/._bootstrap-tooltip.js
 create mode 100644 js/._bootstrap-transition.js
 create mode 100644 js/._bootstrap-typeahead.js
 create mode 100644 js/._tests
 create mode 100644 js/.jshintrc
 create mode 100644 js/README.md
 create mode 100644 js/bootstrap-alert.js
 create mode 100644 js/bootstrap-button.js
 create mode 100644 js/bootstrap-carousel.js
 create mode 100644 js/bootstrap-collapse.js
 create mode 100644 js/bootstrap-dropdown.js
 create mode 100644 js/bootstrap-modal.js
 create mode 100644 js/bootstrap-popover.js
 create mode 100644 js/bootstrap-scrollspy.js
 create mode 100644 js/bootstrap-tab.js
 create mode 100644 js/bootstrap-tooltip.js
 create mode 100644 js/bootstrap-transition.js
 create mode 100644 js/bootstrap-typeahead.js
 create mode 100644 js/tests/._index.html
 create mode 100644 js/tests/._phantom.js
 create mode 100644 js/tests/._server.js
 create mode 100644 js/tests/._unit
 create mode 100644 js/tests/._vendor
 create mode 100644 js/tests/index.html
 create mode 100644 js/tests/phantom.js
 create mode 100644 js/tests/server.js
 create mode 100644 js/tests/unit/._bootstrap-alert.js
 create mode 100644 js/tests/unit/._bootstrap-button.js
 create mode 100644 js/tests/unit/._bootstrap-carousel.js
 create mode 100644 js/tests/unit/._bootstrap-collapse.js
 create mode 100644 js/tests/unit/._bootstrap-dropdown.js
 create mode 100644 js/tests/unit/._bootstrap-modal.js
 create mode 100644 js/tests/unit/._bootstrap-phantom.js
 create mode 100644 js/tests/unit/._bootstrap-popover.js
 create mode 100644 js/tests/unit/._bootstrap-scrollspy.js
 create mode 100644 js/tests/unit/._bootstrap-tab.js
 create mode 100644 js/tests/unit/._bootstrap-tooltip.js
 create mode 100644 js/tests/unit/._bootstrap-transition.js
 create mode 100644 js/tests/unit/._bootstrap-typeahead.js
 create mode 100644 js/tests/unit/bootstrap-alert.js
 create mode 100644 js/tests/unit/bootstrap-button.js
 create mode 100644 js/tests/unit/bootstrap-carousel.js
 create mode 100644 js/tests/unit/bootstrap-collapse.js
 create mode 100644 js/tests/unit/bootstrap-dropdown.js
 create mode 100644 js/tests/unit/bootstrap-modal.js
 create mode 100644 js/tests/unit/bootstrap-phantom.js
 create mode 100644 js/tests/unit/bootstrap-popover.js
 create mode 100644 js/tests/unit/bootstrap-scrollspy.js
 create mode 100644 js/tests/unit/bootstrap-tab.js
 create mode 100644 js/tests/unit/bootstrap-tooltip.js
 create mode 100644 js/tests/unit/bootstrap-transition.js
 create mode 100644 js/tests/unit/bootstrap-typeahead.js
 create mode 100644 js/tests/vendor/._jquery.js
 create mode 100644 js/tests/vendor/._qunit.css
 create mode 100644 js/tests/vendor/._qunit.js
 create mode 100644 js/tests/vendor/jquery.js
 create mode 100644 js/tests/vendor/qunit.css
 create mode 100644 js/tests/vendor/qunit.js
 create mode 100644 less.js
 create mode 100644 less/.DS_Store
 create mode 100644 less/._.DS_Store
 create mode 100644 less/._accordion.less
 create mode 100644 less/._alerts.less
 create mode 100644 less/._bootstrap.less
 create mode 100644 less/._breadcrumbs.less
 create mode 100644 less/._button-groups.less
 create mode 100644 less/._buttons.less
 create mode 100644 less/._carousel.less
 create mode 100644 less/._close.less
 create mode 100644 less/._code.less
 create mode 100644 less/._component-animations.less
 create mode 100644 less/._dropdowns.less
 create mode 100644 less/._forms.less
 create mode 100644 less/._grid.less
 create mode 100644 less/._hero-unit.less
 create mode 100644 less/._labels-badges.less
 create mode 100644 less/._layouts.less
 create mode 100644 less/._mixins.less
 create mode 100644 less/._modals.less
 create mode 100644 less/._navbar.less
 create mode 100644 less/._navs.less
 create mode 100644 less/._pager.less
 create mode 100644 less/._pagination.less
 create mode 100644 less/._popovers.less
 create mode 100644 less/._progress-bars.less
 create mode 100644 less/._reset.less
 create mode 100644 less/._responsive-1200px-min.less
 create mode 100644 less/._responsive-767px-max.less
 create mode 100644 less/._responsive-768px-979px.less
 create mode 100644 less/._responsive-navbar.less
 create mode 100644 less/._responsive-utilities.less
 create mode 100644 less/._responsive.less
 create mode 100644 less/._scaffolding.less
 create mode 100644 less/._sprites.less
 create mode 100644 less/._tables.less
 create mode 100644 less/._tests
 create mode 100644 less/._thumbnails.less
 create mode 100644 less/._tooltip.less
 create mode 100644 less/._type.less
 create mode 100644 less/._utilities.less
 create mode 100644 less/._variables.less
 create mode 100644 less/._wells.less
 create mode 100644 less/accordion.less
 create mode 100644 less/alerts.less
 create mode 100644 less/bootstrap.less
 create mode 100644 less/breadcrumbs.less
 create mode 100644 less/button-groups.less
 create mode 100644 less/buttons.less
 create mode 100644 less/carousel.less
 create mode 100644 less/close.less
 create mode 100644 less/code.less
 create mode 100644 less/component-animations.less
 create mode 100644 less/dropdowns.less
 create mode 100644 less/forms.less
 create mode 100644 less/grid.less
 create mode 100644 less/hero-unit.less
 create mode 100644 less/labels-badges.less
 create mode 100644 less/layouts.less
 create mode 100644 less/mixins.less
 create mode 100644 less/modals.less
 create mode 100644 less/navbar.less
 create mode 100644 less/navs.less
 create mode 100644 less/pager.less
 create mode 100644 less/pagination.less
 create mode 100644 less/popovers.less
 create mode 100644 less/progress-bars.less
 create mode 100644 less/reset.less
 create mode 100644 less/responsive-1200px-min.less
 create mode 100644 less/responsive-767px-max.less
 create mode 100644 less/responsive-768px-979px.less
 create mode 100644 less/responsive-navbar.less
 create mode 100644 less/responsive-utilities.less
 create mode 100644 less/responsive.less
 create mode 100644 less/scaffolding.less
 create mode 100644 less/sprites.less
 create mode 100644 less/tables.less
 create mode 100644 less/tests/._css-tests.css
 create mode 100644 less/tests/._css-tests.html
 create mode 100644 less/tests/._forms.html
 create mode 100644 less/tests/._navbar.html
 create mode 100644 less/tests/css-tests.css
 create mode 100644 less/tests/css-tests.html
 create mode 100644 less/tests/forms.html
 create mode 100644 less/tests/navbar.html
 create mode 100644 less/thumbnails.less
 create mode 100644 less/tooltip.less
 create mode 100644 less/type.less
 create mode 100644 less/utilities.less
 create mode 100644 less/variables.less
 create mode 100644 less/wells.less
 create mode 100644 lib/.DS_Store
 create mode 100644 lib/._.DS_Store
 create mode 100644 lib/._codemirror.css
 create mode 100644 lib/._codemirror.js
 create mode 100644 lib/._util
 create mode 100644 lib/util/.DS_Store
 create mode 100644 lib/util/._.DS_Store
 create mode 100644 lib/util/._closetag.js
 create mode 100644 lib/util/._dialog.css
 create mode 100644 lib/util/._dialog.js
 create mode 100644 lib/util/._foldcode.js
 create mode 100644 lib/util/._formatting.js
 create mode 100644 lib/util/._javascript-hint.js
 create mode 100644 lib/util/._loadmode.js
 create mode 100644 lib/util/._match-highlighter.js
 create mode 100644 lib/util/._multiplex.js
 create mode 100644 lib/util/._overlay.js
 create mode 100644 lib/util/._pig-hint.js
 create mode 100644 lib/util/._runmode.js
 create mode 100644 lib/util/._search.js
 create mode 100644 lib/util/._searchcursor.js
 create mode 100644 lib/util/._simple-hint.css
 create mode 100644 lib/util/._simple-hint.js
 create mode 100644 lib/util/._xml-hint.js
 create mode 100644 test/._driver.js
 create mode 100644 test/._index.html
 create mode 100644 test/._mode_test.css
 create mode 100644 test/._mode_test.js
 create mode 100644 test/._test.js
 delete mode 100644 test/lint/lint.js
 delete mode 100644 test/lint/parse-js.js
 delete mode 100644 test/phantom_driver.js
 delete mode 100755 test/run.js

diff --git a/CodeSITE$%&).html b/CodeSITE$%&).html
new file mode 100644
index 0000000000..1e69e35186
--- /dev/null
+++ b/CodeSITE$%&).html
@@ -0,0 +1,88 @@
+<!doctype html>
+<html>
+<link rel="stylesheet/less" type="text/css" href="styles.less">
+<script src="less.js" type="text/javascript"></script>
+  <head>
+    <title>Code Editor</title>
+    <link rel="stylesheet" href="../lib/codemirror.css">
+    <script src="../lib/codemirror.js"></script>
+    <script src="../mode/clike/clike.js"></script>
+    <script src="../keymap/emacs.js"></script>
+    <link rel="stylesheet" href="../doc/docs.css">
+<link href="../assets/css/bootstrap.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
+      }
+    </style>
+    <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <style type="text/css">
+      .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
+    </style>
+  </head>
+  <body>
+  <h1>Code Editor</h1>
+     <div class="navbar navbar-fixed-bottom">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+        <div class="nav-collapse">
+            <ul class="nav">
+              <li class="active"><a href="#">Home</a></li>
+              <li><a href="#">About</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </div>
+    </div>
+<div class="alert">
+  <strong>Welcome!</strong> This is a coding site with lots of coding to do!
+    <form><textarea id="code" name="code">
+<script>
+      CodeMirror.commands.save = function() {
+        var elt = editor.getWrapperElement();
+        elt.style.background = "#def";
+        setTimeout(function() { elt.style.background = ""; }, 1000);
+      };
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "text/x-csrc",
+        keyMap: "emacs"
+      });
+    </script>
+</textarea></form>
+
+
+    <script>
+      CodeMirror.commands.save = function() {
+        var elt = editor.getWrapperElement();
+        elt.style.background = "#def";
+        setTimeout(function() { elt.style.background = ""; }, 300);
+      };
+      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+        lineNumbers: true,
+        mode: "text/x-csrc",
+        keyMap: "emacs"
+      });
+    </script>
+    <script src="../assets/js/jquery.js"></script>
+    <script src="../assets/js/bootstrap-transition.js"></script>
+    <script src="../assets/js/bootstrap-alert.js"></script>
+    <script src="../assets/js/bootstrap-modal.js"></script>
+    <script src="../assets/js/bootstrap-dropdown.js"></script>
+    <script src="../assets/js/bootstrap-scrollspy.js"></script>
+    <script src="../assets/js/bootstrap-tab.js"></script>
+    <script src="../assets/js/bootstrap-tooltip.js"></script>
+    <script src="../assets/js/bootstrap-popover.js"></script>
+    <script src="../assets/js/bootstrap-button.js"></script>
+    <script src="../assets/js/bootstrap-collapse.js"></script>
+    <script src="../assets/js/bootstrap-carousel.js"></script>
+    <script src="../assets/js/bootstrap-typeahead.js"></script>
+
+  </body>
+</html>
+
diff --git a/demo/activeline.html b/demo/activeline.html
deleted file mode 100644
index a42ce97ba8..0000000000
--- a/demo/activeline.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Active Line Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .activeline {background: #e8f2ff !important;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Active Line Demo</h1>
-
-    <form><textarea id="code" name="code">
-<?xml version="1.0" encoding="UTF-8"?>
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"
-     xmlns:georss="http://www.georss.org/georss"
-     xmlns:twitter="http://api.twitter.com">
-  <channel>
-    <title>Twitter / codemirror</title>
-    <link>http://twitter.com/codemirror</link>
-    <atom:link type="application/rss+xml"
-               href="http://twitter.com/statuses/user_timeline/242283288.rss" rel="self"/>
-    <description>Twitter updates from CodeMirror / codemirror.</description>
-    <language>en-us</language>
-    <ttl>40</ttl>
-  <item>
-    <title>codemirror: http://cloud-ide.com &#8212; they're springing up like mushrooms. This one
-      uses CodeMirror as its editor.</title>
-    <description>codemirror: http://cloud-ide.com &#8212; they're springing up like mushrooms. This
-      one uses CodeMirror as its editor.</description>
-    <pubDate>Thu, 17 Mar 2011 23:34:47 +0000</pubDate>
-    <guid>http://twitter.com/codemirror/statuses/48527733722058752</guid>
-    <link>http://twitter.com/codemirror/statuses/48527733722058752</link>
-    <twitter:source>web</twitter:source>
-    <twitter:place/>
-  </item>
-  <item>
-    <title>codemirror: Posted a description of the CodeMirror 2 internals at
-      http://codemirror.net/2/internals.html</title>
-    <description>codemirror: Posted a description of the CodeMirror 2 internals at
-      http://codemirror.net/2/internals.html</description>
-    <pubDate>Wed, 02 Mar 2011 12:15:09 +0000</pubDate>
-    <guid>http://twitter.com/codemirror/statuses/42920879788789760</guid>
-    <link>http://twitter.com/codemirror/statuses/42920879788789760</link>
-    <twitter:source>web</twitter:source>
-    <twitter:place/>
-  </item>
-  </channel>
-</rss></textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  mode: "application/xml",
-  lineNumbers: true,
-  lineWrapping: true,
-  onCursorActivity: function() {
-    editor.setLineClass(hlLine, null, null);
-    hlLine = editor.setLineClass(editor.getCursor().line, null, "activeline");
-  }
-});
-var hlLine = editor.setLineClass(0, "activeline");
-</script>
-
-    <p>Styling the current cursor line.</p>
-
-  </body>
-</html>
diff --git a/demo/changemode.html b/demo/changemode.html
deleted file mode 100644
index a3d42c04bf..0000000000
--- a/demo/changemode.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Mode-Changing Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/scheme/scheme.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Mode-Changing demo</h1>
-
-    <form><textarea id="code" name="code">
-;; If there is Scheme code in here, the editor will be in Scheme mode.
-;; If you put in JS instead, it'll switch to JS mode.
-
-(define (double x)
-  (* x x))
-</textarea></form>
-
-<p>On changes to the content of the above editor, a (crude) script
-tries to auto-detect the language used, and switches the editor to
-either JavaScript or Scheme mode based on that.</p>
-
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-    mode: "scheme",
-    lineNumbers: true,
-    matchBrackets: true,
-    tabMode: "indent",
-    onChange: function() {
-      clearTimeout(pending);
-      setTimeout(update, 400);
-    }
-  });
-  var pending;
-  function looksLikeScheme(code) {
-    return !/^\s*\(\s*function\b/.test(code) && /^\s*[;\(]/.test(code);
-  }
-  function update() {
-    editor.setOption("mode", looksLikeScheme(editor.getValue()) ? "scheme" : "javascript");
-  }
-</script>
-  </body>
-</html>
diff --git a/demo/closetag.html b/demo/closetag.html
deleted file mode 100644
index c405a3c322..0000000000
--- a/demo/closetag.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!doctype html>
-<html>
-	<head>
-    <meta charset="utf-8">
-		<title>CodeMirror: Close-Tag Demo</title>
-		<link rel="stylesheet" href="../lib/codemirror.css">
-		<script src="../lib/codemirror.js"></script>
-		<script src="../lib/util/closetag.js"></script>
-		<script src="../mode/xml/xml.js"></script>
-		<script src="../mode/javascript/javascript.js"></script>
-		<script src="../mode/css/css.js"></script>
-		<script src="../mode/htmlmixed/htmlmixed.js"></script>
-		<link rel="stylesheet" href="../doc/docs.css">
-		<style type="text/css">
-			.CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
-		</style>
-	</head>
-	<body>
-	
-		<h1>Close-Tag Demo</h1>
-		<ul>
-			<li>Type an html tag.  When you type '>' or '/', the tag will auto-close/complete.  Block-level tags will indent.</li>
-			<li>There are options for disabling tag closing or customizing the list of tags to indent.</li>
-			<li>Works with "text/html" (based on htmlmixed.js or xml.js) mode.</li>
-			<li>View source for key binding details.</li>
-		</p>
-
-		<form><textarea id="code" name="code"></textarea></form>
-
-		<script type="text/javascript">
-		var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-			mode: 'text/html',
-			
-			//closeTagEnabled: false, // Set this option to disable tag closing behavior without having to remove the key bindings.
-			//closeTagIndent: false, // Pass false or an array of tag names to override the default indentation behavior.
-			
-			extraKeys: {
-				"'>'": function(cm) { cm.closeTag(cm, '>'); },
-				"'/'": function(cm) { cm.closeTag(cm, '/'); }
-			},
-			
-			/*
-			// extraKeys is the easier way to go, but if you need native key event processing, this should work too.
-			onKeyEvent: function(cm, e) {
-				if (e.type == 'keydown') {
-					var c = e.keyCode || e.which;
-					if (c == 190 || c == 191) {
-						try {
-							cm.closeTag(cm, c == 190 ? '>' : '/');
-							e.stop();
-							return true;
-						} catch (e) {
-							if (e != CodeMirror.Pass) throw e;
-						}
-					}
-				}
-				return false;
-			},
-			*/
-			
-			wordWrap: true
-		});
-		</script>
-
-	</body>
-</html>
diff --git a/demo/complete.html b/demo/complete.html
deleted file mode 100644
index 3b522ec25e..0000000000
--- a/demo/complete.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Autocomplete Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/simple-hint.js"></script>
-    <link rel="stylesheet" href="../lib/util/simple-hint.css">
-    <script src="../lib/util/javascript-hint.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <style type="text/css">.CodeMirror {border: 1px solid #eee;} .CodeMirror-scroll { height: 100% }</style>
-  </head>
-  <body>
-    <h1>CodeMirror: Autocomplete demo</h1>
-
-    <form><textarea id="code" name="code">
-function getCompletions(token, context) {
-  var found = [], start = token.string;
-  function maybeAdd(str) {
-    if (str.indexOf(start) == 0) found.push(str);
-  }
-  function gatherCompletions(obj) {
-    if (typeof obj == "string") forEach(stringProps, maybeAdd);
-    else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
-    else if (obj instanceof Function) forEach(funcProps, maybeAdd);
-    for (var name in obj) maybeAdd(name);
-  }
-
-  if (context) {
-    // If this is a property, see if it belongs to some object we can
-    // find in the current environment.
-    var obj = context.pop(), base;
-    if (obj.className == "js-variable")
-      base = window[obj.string];
-    else if (obj.className == "js-string")
-      base = "";
-    else if (obj.className == "js-atom")
-      base = 1;
-    while (base != null && context.length)
-      base = base[context.pop().string];
-    if (base != null) gatherCompletions(base);
-  }
-  else {
-    // If not, just look in the window object and any local scope
-    // (reading into JS mode internals to get at the local variables)
-    for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
-    gatherCompletions(window);
-    forEach(keywords, maybeAdd);
-  }
-  return found;
-}
-</textarea></form>
-
-<p>Press <strong>ctrl-space</strong> to activate autocompletion. See
-the code (<a href="../lib/util/simple-hint.js">here</a>
-and <a href="../lib/util/javascript-hint.js">here</a>) to figure out
-how it works.</p>
-
-    <script>
-      CodeMirror.commands.autocomplete = function(cm) {
-        CodeMirror.simpleHint(cm, CodeMirror.javascriptHint);
-      }
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        extraKeys: {"Ctrl-Space": "autocomplete"}
-      });
-    </script>
-  </body>
-</html>
diff --git a/demo/emacs.html b/demo/emacs.html
deleted file mode 100644
index b37a46b048..0000000000
--- a/demo/emacs.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Emacs bindings demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/clike/clike.js"></script>
-    <script src="../keymap/emacs.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Emacs bindings demo</h1>
-
-    <form><textarea id="code" name="code">
-#include "syscalls.h"
-/* getchar:  simple buffered version */
-int getchar(void)
-{
-  static char buf[BUFSIZ];
-  static char *bufp = buf;
-  static int n = 0;
-  if (n == 0) {  /* buffer is empty */
-    n = read(0, buf, sizeof buf);
-    bufp = buf;
-  }
-  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
-}
-</textarea></form>
-
-<p>The emacs keybindings are enabled by
-including <a href="../keymap/emacs.js">keymap/emacs.js</a> and setting
-the <code>keyMap</code> option to <code>"emacs"</code>. Because
-CodeMirror's internal API is quite different from Emacs, they are only
-a loose approximation of actual emacs bindings, though.</p>
-
-<p>Also note that a lot of browsers disallow certain keys from being
-captured. For example, Chrome blocks both Ctrl-W and Ctrl-N, with the
-result that idiomatic use of Emacs keys will constantly close your tab
-or open a new window.</p>
-
-    <script>
-      CodeMirror.commands.save = function() {
-        var elt = editor.getWrapperElement();
-        elt.style.background = "#def";
-        setTimeout(function() { elt.style.background = ""; }, 300);
-      };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-csrc",
-        keyMap: "emacs"
-      });
-    </script>
-
-  </body>
-</html>
diff --git a/demo/folding.html b/demo/folding.html
deleted file mode 100644
index 39a6a60e15..0000000000
--- a/demo/folding.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Code Folding Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/foldcode.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .CodeMirror-gutter {min-width: 2.6em; cursor: pointer;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Code Folding Demo</h1>
-
-    <p>Demonstration of code folding using the code
-    in <a href="../lib/util/foldcode.js"><code>foldcode.js</code></a>.
-    Press ctrl-q or click on the gutter to fold a block, again
-    to unfold.</p>
-    <form>
-      <div style="max-width: 50em; margin-bottom: 1em">JavaScript:<br><textarea id="code" name="code"></textarea></div>
-      <div style="max-width: 50em">HTML:<br><textarea id="code-html" name="code-html"></textarea></div>
-    </form>
-    <script id="script">
-window.onload = function() {
-  var te = document.getElementById("code");
-  var sc = document.getElementById("script");
-  te.value = (sc.textContent || sc.innerText || sc.innerHTML).replace(/^\s*/, "");
-  sc.innerHTML = "";
-  var te_html = document.getElementById("code-html");
-  te_html.value = "<html>\n  " + document.documentElement.innerHTML + "\n</html>";
-
-  var foldFunc = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder);
-  window.editor = CodeMirror.fromTextArea(te, {
-    mode: "javascript",
-    lineNumbers: true,
-    lineWrapping: true,
-    onGutterClick: foldFunc,
-    extraKeys: {"Ctrl-Q": function(cm){foldFunc(cm, cm.getCursor().line);}}
-  });
-  foldFunc(editor, 9);
-  foldFunc(editor, 20);
-
-  var foldFunc_html = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder);
-  window.editor_html = CodeMirror.fromTextArea(te_html, {
-    mode: "text/html",
-    lineNumbers: true,
-    lineWrapping: true,
-    onGutterClick: foldFunc_html,
-    extraKeys: {"Ctrl-Q": function(cm){foldFunc_html(cm, cm.getCursor().line);}}
-  })
-  foldFunc_html(editor_html, 1);
-  foldFunc_html(editor_html, 15);
-};
-</script>
-  </body>
-</html>
diff --git a/demo/formatting.html b/demo/formatting.html
deleted file mode 100644
index b9e800d9cf..0000000000
--- a/demo/formatting.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Formatting Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/formatting.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/htmlmixed/htmlmixed.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {
-        border: 1px solid #eee;
-      }
-      td {
-        padding-right: 20px;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Formatting demo</h1>
-
-    <form><textarea id="code" name="code"><script> function (s,e){ for(var i=0; i < 1; i++) test("test();a=1");} </script>
-<script>
-function test(c){  for (var i = 0; i < 10; i++){	          process("a.b();c = null;", 300);}
-}
-</script>
-<table><tr><td>test 1</td></tr><tr><td>test 2</td></tr></table>
-<script> function test() { return 1;} </script>
-<style> .test { font-size: medium; font-family: monospace; }
-</style></textarea></form>
-
-<p>Select a piece of code and click one of the links below to apply automatic formatting to the selected text or comment/uncomment the selected text. Note that the formatting behavior depends on the current block's mode.
-    <table>
-      <tr>
-        <td>
-          <a href="javascript:autoFormatSelection()">
-            Autoformat Selected
-          </a>
-        </td>
-        <td>
-          <a href="javascript:commentSelection(true)">
-            Comment Selected
-          </a>
-        </td>
-        <td>
-          <a href="javascript:commentSelection(false)">
-            Uncomment Selected
-          </a>
-        </td>
-      </tr>
-    </table>
-</p>    
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "htmlmixed"
-      });
-      CodeMirror.commands["selectAll"](editor);
-      
-      function getSelectedRange() {
-        return { from: editor.getCursor(true), to: editor.getCursor(false) };
-      }
-      
-      function autoFormatSelection() {
-        var range = getSelectedRange();
-        editor.autoFormatRange(range.from, range.to);
-      }
-      
-      function commentSelection(isComment) {
-        var range = getSelectedRange();
-        editor.commentRange(isComment, range.from, range.to);
-      }      
-    </script>
-
-  </body>
-</html>
diff --git a/demo/fullscreen.html b/demo/fullscreen.html
deleted file mode 100644
index 69541674d7..0000000000
--- a/demo/fullscreen.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Full Screen Editing</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../theme/night.css">
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror-fullscreen {
-        display: block;
-        position: absolute;
-        top: 0; left: 0;
-        width: 100%;
-        z-index: 9999;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Full Screen Editing</h1>
-
-    <form><textarea id="code" name="code" rows="5">
-  <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
-  <dd>Whether, when indenting, the first N*8 spaces should be
-  replaced by N tabs. Default is false.</dd>
-
-  <dt id="option_tabMode"><code>tabMode (string)</code></dt>
-  <dd>Determines what happens when the user presses the tab key.
-  Must be one of the following:
-    <dl>
-      <dt><code>"classic" (the default)</code></dt>
-      <dd>When nothing is selected, insert a tab. Otherwise,
-      behave like the <code>"shift"</code> mode. (When shift is
-      held, this behaves like the <code>"indent"</code> mode.)</dd>
-      <dt><code>"shift"</code></dt>
-      <dd>Indent all selected lines by
-      one <a href="#option_indentUnit"><code>indentUnit</code></a>.
-      If shift was held while pressing tab, un-indent all selected
-      lines one unit.</dd>
-      <dt><code>"indent"</code></dt>
-      <dd>Indent the line the 'correctly', based on its syntactic
-      context. Only works if the
-      mode <a href="#indent">supports</a> it.</dd>
-      <dt><code>"default"</code></dt>
-      <dd>Do not capture tab presses, let the browser apply its
-      default behaviour (which usually means it skips to the next
-      control).</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-
-</textarea></form>
-  <script>
-    function isFullScreen(cm) {
-      return /\bCodeMirror-fullscreen\b/.test(cm.getWrapperElement().className);
-    }
-    function winHeight() {
-      return window.innerHeight || (document.documentElement || document.body).clientHeight;
-    }
-    function setFullScreen(cm, full) {
-      var wrap = cm.getWrapperElement(), scroll = cm.getScrollerElement();
-      if (full) {
-        wrap.className += " CodeMirror-fullscreen";
-        scroll.style.height = winHeight() + "px";
-        document.documentElement.style.overflow = "hidden";
-      } else {
-        wrap.className = wrap.className.replace(" CodeMirror-fullscreen", "");
-        scroll.style.height = "";
-        document.documentElement.style.overflow = "";
-      }
-      cm.refresh();
-    }
-    CodeMirror.connect(window, "resize", function() {
-      var showing = document.body.getElementsByClassName("CodeMirror-fullscreen")[0];
-      if (!showing) return;
-      showing.CodeMirror.getScrollerElement().style.height = winHeight() + "px";
-    });
-    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-      lineNumbers: true,
-      theme: "night",
-      extraKeys: {
-        "F11": function(cm) {
-          setFullScreen(cm, !isFullScreen(cm));
-        },
-        "Esc": function(cm) {
-          if (isFullScreen(cm)) setFullScreen(cm, false);
-        }
-      }
-    });
-  </script>
-
-    <p>Press <strong>F11</strong> when cursor is in the editor to toggle full screen editing. <strong>Esc</strong> can also be used to <i>exit</i> full screen editing.</p>
-  </body>
-</html>
diff --git a/demo/loadmode.html b/demo/loadmode.html
deleted file mode 100644
index 8813ea859b..0000000000
--- a/demo/loadmode.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Lazy Mode Loading Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/loadmode.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Lazy Mode Loading</h1>
-
-    <form><textarea id="code" name="code">This is the editor.
-// It starts out in plain text mode,
-#  use the control below to load and apply a mode
-  "you'll see the highlighting of" this text /*change*/.
-</textarea></form>
-<p><input type=text value=javascript id=mode> <button type=button onclick="change()">change mode</button></p>
-
-    <script>
-CodeMirror.modeURL = "../mode/%N/%N.js";
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true
-});
-var modeInput = document.getElementById("mode");
-CodeMirror.connect(modeInput, "keypress", function(e) {
-  if (e.keyCode == 13) change();
-});
-function change() {
-   editor.setOption("mode", modeInput.value);
-   CodeMirror.autoLoadMode(editor, modeInput.value);
-}
-</script>
-  </body>
-</html>
diff --git a/demo/marker.html b/demo/marker.html
deleted file mode 100644
index 7bc6c6defe..0000000000
--- a/demo/marker.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Breakpoint Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror-gutter {
-        width: 3em;
-        background: white;
-      }
-      .CodeMirror {
-        border: 1px solid #aaa;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Breakpoint demo</h1>
-
-    <form><textarea id="code" name="code">
-CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true,
-  onGutterClick: function(cm, n) {
-    var info = cm.lineInfo(n);
-    if (info.markerText)
-      cm.clearMarker(n);
-    else
-      cm.setMarker(n, "<span style=\"color: #900\">●</span> %N%");
-  }
-});
-</textarea></form>
-
-<p>Click the line-number gutter to add or remove 'breakpoints'.</p>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        onGutterClick: function(cm, n) {
-          var info = cm.lineInfo(n);
-          if (info.markerText)
-            cm.clearMarker(n);
-          else
-            cm.setMarker(n, "<span style=\"color: #900\">●</span> %N%");
-        }
-      });
-    </script>
-
-  </body>
-</html>
diff --git a/demo/matchhighlighter.html b/demo/matchhighlighter.html
deleted file mode 100644
index 5eef08d8de..0000000000
--- a/demo/matchhighlighter.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Match Highlighter Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/searchcursor.js"></script>
-    <script src="../lib/util/match-highlighter.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-	  
-      span.CodeMirror-matchhighlight { background: #e9e9e9 }
-      .CodeMirror-focused span.CodeMirror-matchhighlight { background: #e7e4ff; !important }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Match Highlighter Demo</h1>
-
-    <form><textarea id="code" name="code">Select this text: hardToSpotVar
-	And everywhere else in your code where hardToSpotVar appears will automatically illuminate.
-Give it a try!  No more hardToSpotVars.</textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers : true,
-  onCursorActivity: function() {
-    editor.matchHighlight("CodeMirror-matchhighlight");
-  }
-});
-</script>
-
-    <p>Highlight matches of selected text on select</p>
-
-  </body>
-</html>
diff --git a/demo/multiplex.html b/demo/multiplex.html
deleted file mode 100644
index 25fffd3294..0000000000
--- a/demo/multiplex.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Multiplexing Parser Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/multiplex.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-      .cm-delimit {color: #fa4;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Multiplexing Parser Demo</h1>
-
-    <form><textarea id="code" name="code">
-<html>
-  <body style="<<magic>>">
-    <h1><< this is not <html >></h1>
-    <<
-        multiline
-        not html
-        at all : &amp;amp; <link/>
-    >>
-    <p>this is html again</p>
-  </body>
-</html>
-</textarea></form>
-
-    <script>
-CodeMirror.defineMode("demo", function(config) {
-  return CodeMirror.multiplexingMode(
-    CodeMirror.getMode(config, "text/html"),
-    {open: "<<", close: ">>",
-     mode: CodeMirror.getMode(config, "text/plain"),
-     delimStyle: "delimit"}
-    // .. more multiplexed styles can follow here
-  );
-});
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  mode: "demo",
-  lineNumbers: true,
-  lineWrapping: true
-});
-</script>
-
-    <p>Demonstration of a multiplexing mode, which, at certain
-    boundary strings, switches to one or more inner modes. The out
-    (HTML) mode does not get fed the content of the <code>&lt;&lt;
-    >></code> blocks. See
-    the <a href="../doc/manual.html#util_multiplex">manual</a> and
-    the <a href="../lib/util/multiplex.js">source</a> for more
-    information.</p>
-
-  </body>
-</html>
diff --git a/demo/mustache.html b/demo/mustache.html
deleted file mode 100644
index c2ce331077..0000000000
--- a/demo/mustache.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Overlay Parser Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/overlay.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border: 1px solid black;}
-      .cm-mustache {color: #0ca;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Overlay Parser Demo</h1>
-
-    <form><textarea id="code" name="code">
-<html>
-  <body>
-    <h1>{{title}}</h1>
-    <p>These are links to {{things}}:</p>
-    <ul>{{#links}}
-      <li><a href="{{url}}">{{text}}</a></li>
-    {{/links}}</ul>
-  </body>
-</html>
-</textarea></form>
-
-    <script>
-CodeMirror.defineMode("mustache", function(config, parserConfig) {
-  var mustacheOverlay = {
-    token: function(stream, state) {
-      var ch;
-      if (stream.match("{{")) {
-        while ((ch = stream.next()) != null)
-          if (ch == "}" && stream.next() == "}") break;
-        stream.eat("}");
-        return "mustache";
-      }
-      while (stream.next() != null && !stream.match("{{", false)) {}
-      return null;
-    }
-  };
-  return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), mustacheOverlay);
-});
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "mustache"});
-</script>
-
-    <p>Demonstration of a mode that parses HTML, highlighting
-    the <a href="http://mustache.github.com/">Mustache</a> templating
-    directives inside of it by using the code
-    in <a href="../lib/util/overlay.js"><code>overlay.js</code></a>. View
-    source to see the 15 lines of code needed to accomplish this.</p>
-
-  </body>
-</html>
diff --git a/demo/preview.html b/demo/preview.html
deleted file mode 100644
index f356891200..0000000000
--- a/demo/preview.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: HTML5 preview</title>
-    <script src=../lib/codemirror.js></script>
-    <script src=../mode/xml/xml.js></script>
-    <script src=../mode/javascript/javascript.js></script>
-    <script src=../mode/css/css.js></script>
-    <script src=../mode/htmlmixed/htmlmixed.js></script>
-    <link rel=stylesheet href=../lib/codemirror.css>
-    <link rel=stylesheet href=../doc/docs.css>
-    <style type=text/css>
-      .CodeMirror {
-        float: left;
-        width: 50%;
-        border: 1px solid black;
-      }
-      iframe {
-        width: 49%;
-        float: left;
-        height: 300px;
-        border: 1px solid black;
-        border-left: 0px;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: HTML5 preview</h1>
-    <textarea id=code name=code>
-<!doctype html>
-<html>
-  <head>
-    <meta charset=utf-8>
-    <title>HTML5 canvas demo</title>
-    <style>p {font-family: monospace;}</style>
-  </head>
-  <body>
-    <p>Canvas pane goes here:</p>
-    <canvas id=pane width=300 height=200></canvas>
-    <script>
-      var canvas = document.getElementById('pane');
-      var context = canvas.getContext('2d');
-
-      context.fillStyle = 'rgb(250,0,0)';
-      context.fillRect(10, 10, 55, 50);
-
-      context.fillStyle = 'rgba(0, 0, 250, 0.5)';
-      context.fillRect(30, 30, 55, 50);
-    </script>
-  </body>
-</html></textarea>
-    <iframe id=preview></iframe>
-    <script>
-      var delay;
-      // Initialize CodeMirror editor with a nice html5 canvas demo.
-      var editor = CodeMirror.fromTextArea(document.getElementById('code'), {
-        mode: 'text/html',
-        tabMode: 'indent',
-        onChange: function() {
-          clearTimeout(delay);
-          delay = setTimeout(updatePreview, 300);
-        }
-      });
-      
-      function updatePreview() {
-        var previewFrame = document.getElementById('preview');
-        var preview =  previewFrame.contentDocument ||  previewFrame.contentWindow.document;
-        preview.open();
-        preview.write(editor.getValue());
-        preview.close();
-      }
-      setTimeout(updatePreview, 300);
-    </script>
-  </body>
-</html>
diff --git a/demo/resize.html b/demo/resize.html
deleted file mode 100644
index f0c9750acf..0000000000
--- a/demo/resize.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Autoresize Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {
-        border: 1px solid #eee;
-      }
-      .CodeMirror-scroll {
-        height: auto;
-        overflow-y: hidden;
-        overflow-x: auto;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Autoresize demo</h1>
-
-    <form><textarea id="code" name="code">
-.CodeMirror-scroll {
-  height: auto;
-  overflow-y: hidden;
-  overflow-x: auto;
-}</textarea></form>
-
-<p>By setting a few CSS properties, CodeMirror can be made to
-automatically resize to fit its content.</p>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true
-      });
-    </script>
-
-  </body>
-</html>
diff --git a/demo/runmode.html b/demo/runmode.html
deleted file mode 100644
index 53ac04f917..0000000000
--- a/demo/runmode.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Mode Runner Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/runmode.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-  </head>
-  <body>
-    <h1>CodeMirror: Mode Runner Demo</h1>
-
-    <textarea id="code" style="width: 90%; height: 7em; border: 1px solid black; padding: .2em .4em;">
-<foobar>
-  <blah>Enter your xml here and press the button below to display
-    it as highlighted by the CodeMirror XML mode</blah>
-  <tag2 foo="2" bar="&amp;quot;bar&amp;quot;"/>
-</foobar></textarea><br>
-    <button onclick="doHighlight();">Highlight!</button>
-    <pre id="output" class="cm-s-default"></pre>
-
-    <script>
-function doHighlight() {
-  CodeMirror.runMode(document.getElementById("code").value, "application/xml",
-                     document.getElementById("output"));
-}
-</script>
-
-    <p>Running a CodeMirror mode outside of the editor.
-    The <code>CodeMirror.runMode</code> function, defined
-    in <code><a href="../lib/util/runmode.js">lib/runmode.js</a></code> takes the following arguments:</p>
-
-    <dl>
-      <dt><code>text (string)</code></dt>
-      <dd>The document to run through the highlighter.</dd>
-      <dt><code>mode (<a href="../doc/manual.html#option_mode">mode spec</a>)</code></dt>
-      <dd>The mode to use (must be loaded as normal).</dd>
-      <dt><code>output (function or DOM node)</code></dt>
-      <dd>If this is a function, it will be called for each token with
-      two arguments, the token's text and the token's style class (may
-      be <code>null</code> for unstyled tokens). If it is a DOM node,
-      the tokens will be converted to <code>span</code> elements as in
-      an editor, and inserted into the node
-      (through <code>innerHTML</code>).</dd>
-    </dl>
-
-  </body>
-</html>
diff --git a/demo/search.html b/demo/search.html
deleted file mode 100644
index 219c80572e..0000000000
--- a/demo/search.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Search/Replace Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <script src="../lib/util/dialog.js"></script>
-    <link rel="stylesheet" href="../lib/util/dialog.css">
-    <script src="../lib/util/searchcursor.js"></script>
-    <script src="../lib/util/search.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      dt {font-family: monospace; color: #666;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Search/Replace Demo</h1>
-
-    <form><textarea id="code" name="code">
-  <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
-  <dd>Whether, when indenting, the first N*8 spaces should be
-  replaced by N tabs. Default is false.</dd>
-
-  <dt id="option_tabMode"><code>tabMode (string)</code></dt>
-  <dd>Determines what happens when the user presses the tab key.
-  Must be one of the following:
-    <dl>
-      <dt><code>"classic" (the default)</code></dt>
-      <dd>When nothing is selected, insert a tab. Otherwise,
-      behave like the <code>"shift"</code> mode. (When shift is
-      held, this behaves like the <code>"indent"</code> mode.)</dd>
-      <dt><code>"shift"</code></dt>
-      <dd>Indent all selected lines by
-      one <a href="#option_indentUnit"><code>indentUnit</code></a>.
-      If shift was held while pressing tab, un-indent all selected
-      lines one unit.</dd>
-      <dt><code>"indent"</code></dt>
-      <dd>Indent the line the 'correctly', based on its syntactic
-      context. Only works if the
-      mode <a href="#indent">supports</a> it.</dd>
-      <dt><code>"default"</code></dt>
-      <dd>Do not capture tab presses, let the browser apply its
-      default behaviour (which usually means it skips to the next
-      control).</dd>
-    </dl></dd>
-
-  <dt id="option_enterMode"><code>enterMode (string)</code></dt>
-  <dd>Determines whether and how new lines are indented when the
-  enter key is pressed. The following modes are supported:
-    <dl>
-      <dt><code>"indent" (the default)</code></dt>
-      <dd>Use the mode's indentation rules to give the new line
-      the correct indentation.</dd>
-      <dt><code>"keep"</code></dt>
-      <dd>Indent the line the same as the previous line.</dd>
-      <dt><code>"flat"</code></dt>
-      <dd>Do not indent the new line.</dd>
-    </dl></dd>
-</textarea></form>
-
-    <script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "text/html", lineNumbers: true});
-</script>
-
-    <p>Demonstration of primitive search/replace functionality. The
-    keybindings (which can be overridden by custom keymaps) are:</p>
-    <dl>
-      <dt>Ctrl-F / Cmd-F</dt><dd>Start searching</dd>
-      <dt>Ctrl-G / Cmd-G</dt><dd>Find next</dd>
-      <dt>Shift-Ctrl-G / Shift-Cmd-G</dt><dd>Find previous</dd>
-      <dt>Shift-Ctrl-F / Cmd-Option-F</dt><dd>Replace</dd>
-      <dt>Shift-Ctrl-R / Shift-Cmd-Option-F</dt><dd>Replace all</dd>
-    </dl>
-    <p>Searching is enabled by
-    including <a href="../lib/util/search.js">lib/util/search.js</a>
-    and <a href="../lib/util/searchcursor.js">lib/util/searchcursor.js</a>.
-    For good-looking input dialogs, you also want to include
-    <a href="../lib/util/dialog.js">lib/util/dialog.js</a>
-    and <a href="../lib/util/dialog.css">lib/util/dialog.css</a>.</p>
-  </body>
-</html>
diff --git a/demo/theme.html b/demo/theme.html
deleted file mode 100644
index f8471202fa..0000000000
--- a/demo/theme.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Theme Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <link rel="stylesheet" href="../theme/neat.css">
-    <link rel="stylesheet" href="../theme/elegant.css">
-    <link rel="stylesheet" href="../theme/erlang-dark.css">
-    <link rel="stylesheet" href="../theme/night.css">
-    <link rel="stylesheet" href="../theme/monokai.css">
-    <link rel="stylesheet" href="../theme/cobalt.css">
-    <link rel="stylesheet" href="../theme/eclipse.css">
-    <link rel="stylesheet" href="../theme/rubyblue.css">
-    <link rel="stylesheet" href="../theme/lesser-dark.css">
-    <link rel="stylesheet" href="../theme/xq-dark.css">
-    <link rel="stylesheet" href="../theme/ambiance.css">
-    <link rel="stylesheet" href="../theme/blackboard.css">
-    <link rel="stylesheet" href="../theme/vibrant-ink.css">
-    <script src="../mode/javascript/javascript.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border: 1px solid black; font-size:13px}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Theme demo</h1>
-
-    <form><textarea id="code" name="code">
-function findSequence(goal) {
-  function find(start, history) {
-    if (start == goal)
-      return history;
-    else if (start > goal)
-      return null;
-    else
-      return find(start + 5, "(" + history + " + 5)") ||
-             find(start * 3, "(" + history + " * 3)");
-  }
-  return find(1, "1");
-}</textarea></form>
-
-<p>Select a theme: <select onchange="selectTheme()" id=select>
-    <option selected>default</option>
-    <option>ambiance</option>
-    <option>blackboard</option>
-    <option>cobalt</option>
-    <option>eclipse</option>
-    <option>elegant</option>
-    <option>erlang-dark</option>
-    <option>lesser-dark</option>
-    <option>monokai</option>
-    <option>neat</option>
-    <option>night</option>
-    <option>rubyblue</option>
-    <option>vibrant-ink</option>
-    <option>xq-dark</option>
-</select>
-</p>
-
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-    lineNumbers: true
-  });
-  var input = document.getElementById("select");
-  function selectTheme() {
-    var theme = input.options[input.selectedIndex].innerHTML;
-    editor.setOption("theme", theme);
-  }
-  var choice = document.location.search && document.location.search.slice(1);
-  if (choice) {
-    input.value = choice;
-    editor.setOption("theme", choice);
-  }
-</script>
-  </body>
-</html>
diff --git a/demo/vim.html b/demo/vim.html
deleted file mode 100644
index 6813cb37fb..0000000000
--- a/demo/vim.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Vim bindings demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/clike/clike.js"></script>
-    <script src="../keymap/vim.js"></script>
-    <script src="../lib/util/dialog.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <link rel="stylesheet" href="../lib/util/dialog.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Vim bindings demo</h1>
-
-    <form><textarea id="code" name="code">
-#include "syscalls.h"
-/* getchar:  simple buffered version */
-int getchar(void)
-{
-  static char buf[BUFSIZ];
-  static char *bufp = buf;
-  static int n = 0;
-  if (n == 0) {  /* buffer is empty */
-    n = read(0, buf, sizeof buf);
-    bufp = buf;
-  }
-  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
-}
-</textarea></form>
-
-<p>The vim keybindings are enabled by
-including <a href="../keymap/vim.js">keymap/vim.js</a> and setting
-the <code>keyMap</code> option to <code>"vim"</code>. Because
-CodeMirror's internal API is quite different from Vim, they are only
-a loose approximation of actual vim bindings, though.</p>
-
-    <script>
-      CodeMirror.commands.save = function(){ alert("Saving"); };
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        mode: "text/x-csrc",
-        keyMap: "vim"
-      });
-    </script>
-
-  </body>
-</html>
diff --git a/demo/visibletabs.html b/demo/visibletabs.html
deleted file mode 100644
index ddc12fb46a..0000000000
--- a/demo/visibletabs.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: Visible tabs demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../mode/clike/clike.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-
-    <style type="text/css">
-      .CodeMirror {border-top: 1px solid #eee; border-bottom: 1px solid #eee;}
-      .cm-tab {
-         background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);
-         background-position: right;
-         background-repeat: no-repeat;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>CodeMirror: Visible tabs demo</h1>
-
-    <form><textarea id="code" name="code">
-#include "syscalls.h"
-/* getchar:  simple buffered version */
-int getchar(void)
-{
-	static char buf[BUFSIZ];
-	static char *bufp = buf;
-	static int n = 0;
-	if (n == 0) {  /* buffer is empty */
-		n = read(0, buf, sizeof buf);
-		bufp = buf;
-	}
-	return (--n >= 0) ? (unsigned char) *bufp++ : EOF;
-}
-</textarea></form>
-
-<p>Tabs inside the editor are spans with the
-class <code>cm-tab</code>, and can be styled.
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        tabSize: 4,
-        indentUnit: 4,
-        indentWithTabs: true,
-        mode: "text/x-csrc"
-      });
-    </script>
-
-  </body>
-</html>
diff --git a/demo/xmlcomplete.html b/demo/xmlcomplete.html
deleted file mode 100644
index baa9aa22f1..0000000000
--- a/demo/xmlcomplete.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CodeMirror: XML Autocomplete Demo</title>
-    <link rel="stylesheet" href="../lib/codemirror.css">
-    <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/simple-hint.js"></script>
-    <link rel="stylesheet" href="../lib/util/simple-hint.css">
-    <script src="../lib/util/closetag.js"></script>
-    <script src="../lib/util/xml-hint.js"></script>
-    <script src="../mode/xml/xml.js"></script>
-    <link rel="stylesheet" href="../doc/docs.css">
-    <style type="text/css">.CodeMirror {border: 1px solid #eee;} .CodeMirror-scroll { height: 100% }</style>
-  </head>
-  <body>
-    <h1>CodeMirror: XML Autocomplete demo</h1>
-
-    <form><textarea id="code" name="code"></textarea></form>
-
-    <p>Type '&lt;' or space inside tag or
-    press <strong>ctrl-space</strong> to activate autocompletion. See
-    the code (<a href="../lib/util/simple-hint.js">here</a>
-    and <a href="../lib/util/xml-hint.js">here</a>) to figure out how
-    it works.</p>
-
-    <script>
-      CodeMirror.xmlHints['<'] = [
-          'levelTop',
-          'levelRoot',
-          'mainLevel'
-      ];
-
-      CodeMirror.xmlHints['<levelTop '] = 
-      CodeMirror.xmlHints['<levelRoot '] = 
-      CodeMirror.xmlHints['<mainLevel '] = [
-          'property1111',
-          'property2222'
-      ];
-
-      CodeMirror.xmlHints['<levelTop><'] = 
-      CodeMirror.xmlHints['<levelRoot><'] = 
-      CodeMirror.xmlHints['<mainLevel><'] = [
-          'second',
-          'two'
-      ];
-
-      CodeMirror.xmlHints['<levelTop><second '] = [
-        'secondProperty'
-      ];
-
-      CodeMirror.xmlHints['<levelTop><second><'] = [
-        'three',
-        'x-three'
-      ];
-
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-            value: '',
-            mode: 'text/html',
-            lineNumbers: true,
-            extraKeys: {
-                "'>'": function(cm) { cm.closeTag(cm, '>'); },
-                "'/'": function(cm) { cm.closeTag(cm, '/'); },
-                "' '": function(cm) { CodeMirror.xmlHint(cm, ' '); },
-                "'<'": function(cm) { CodeMirror.xmlHint(cm, '<'); },
-                "Ctrl-Space": function(cm) { CodeMirror.xmlHint(cm, ''); }
-            }
-        });
-    </script>
-  </body>
-</html>
diff --git a/doc/baboon.png b/doc/baboon.png
deleted file mode 100644
index 55d97f70b817ff2b78ebb409bf34a5147fe40d07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23299
zcmXtA2RM~|*nf^qWM`JWx9se!jBH8STe3ywi4vlWP|C<CvJzgKqfn@XtU5Tdw<LRf
z_xZl->$=|2+k1}Z{KtL&)_oF8uIf@zuu>ohLUlz?%M3wK;qdQRG7|WEstIZd{y`L|
zdBuVZenpVE#KZ5&{q(K}A_$=c{x4Jtp~C?DN0uOM>mYMqx1bQm09Pa=Bt+cP=T@Mz
zqo1p|Z-D!Yb!Aor;Y6-zX;_55T+IoIV6Yth6df`|pO&Jo_lj4Y`xQxw`h63kq<l`k
zAgwS{Q<OGQ*N4K5SmhY~=%>1gdQ2wV+9`BOW&{MU9$qEjO0G3}ueiaHZu{OP#N93A
zj(hr--M@--A-;+i12@JmElh@s^Kc6?Ka}c5EC_LD^53!yzKpLNvkN39CVucnp|=A4
zQnDM1`awivv9(bXJxWAFh8d6X$|f*LYK@7BDYx)&?q?1pqM^ulOt`Nxm4B`79;*@R
z$SXFC0e&T!aV4oZe<4&SRF++~At%Q17J4DywdM~P^*fl$&f;7VQ?2dC*aJbqvBUt^
zRTk$qg!NUqX%!*5rzBe_ySGB!^|i~lxw}Z!Q$1dU5zP~@T%7N4YxU>Y#qJ|i5YhKi
zE!N)BC(rLocVpuPjeWF*&m>j9MVv4!yFSPf6>qb*c`*ZnOLrwag(z~+t#b2fB(Em%
z`t8}L*hC8#W@p+^rLbren$Y-M*O-Wfu#4<YQnmUb+b&7Kva>k+GASE=ohI|ZX_fDR
z)I4#%h{DX|d2CTLGlO%LN$I=NY6<_opl<V-lb2#E^$hm*_O%`Z1UX8<nq^iMo7lj9
zE=ft6$B!SAojuzfOG=&OYI(Fnhhe@&`R!dh0VivwQJZ~+mJsoSfSBQA73cD^=r+U&
zRZF}u^6u8r@i8q6OTy#xmkM0_GRe-Ixtz=@i~IfCNyfM@Q|!+tj%emX8>t;PllQ%E
zFXlG6FY8$!k#~=IBA@Cswd(mq?KL_o-z8SNCq0O{xL%F3QXAu|yEUp~VZopjw1}Sn
z`l2xE_@KnDRq5r+PHN^$!OJeaV<LSL+8E})M3NjB2c$dNQS9S+>@SU=(y(;YOUw`l
zx;;U#Pye5Y;21*>tY<knEC!SM#nRq7h7A1&DJe8sy1G0{O02ZBv}EMu8g*X7I2=a)
zp}@;bu^ZV3N-0uS$?+EqtQ?6SNR7~8l>FFm-bM&|RG$cmm%2l4oP0`-EX0@SkxVc!
zh{jx}V|ysIqn!H~=lZYxl9Cd)s3_%mr6BcR|J@#_^)&xcYEG)Es%lc&dG~Q*Vxr&L
zPuZit{b~(<(*)vnE%6^dXnx7L#Pn}@_~NsLZ#kDr%s&-nO>1-il+aJrCvjf2MNaRz
zP79SAT|g=h7l;&g`;D&4nwij`@u&F=sU#gn9qAY`NqmCCIkfEjyyY=kd7f3?C+TP1
zt&e?uXRs$M(<Q@RHyZ=A-M>q~&%<JG%J@#QYiMYE?&;Cc(TTfiA<XF3pPLLX$Py~c
z&&L!Qb6}daYSpnBR%i9)`oumB(FWh;A;yGq9~k*)!%gA(JeDOI$VT?<bGyUsV*Nt1
z((eV@XDC@^$ZVVMXvdOJ;pXT0-zFU$McizQxZYo4-{6NDt+IcpQz(=^IX=!}YHAv~
zRGcO0_Jx^<h=}a%r~ZEG($doIwv*KO?gX<IICqao-jS$}+kfBcxQ#f+d(>kS1qGjd
zD5;hhcbg=~2>L~ZhTIUGU0;99WFJ9GNJ6O|6eJT98%umR@^@=1<=L~6|NF3P@;><u
z4P&B_H*enDJXookiKSLm4{cadv4bb=vX4G?U0re3av9>#508_2O(1z5!-ShcT%XXO
zIS@m>0)YUL!hDP_3x1_ZBndEnNN`03y1iX3?BDVOyVkH*mSt9(J3DbTH5aQ4=9h=d
z6z;4ti{EU>zql;#J1O(4<ZlP_$Caw~$HZsOVSfGk<&YhHykft%J!G8B_=gBB-xG>f
zPq;Thl>g+Wk_G1vWSK5?;432q#SRe<H<U6=@}zFejZyEqd?zY4xlS~S@O!ZV6A>xt
z$4{R~b8~a~|1vN#a&d8?9-civctu}7vCcx~ik=>sRh3=xowc7C`#x}>7AISqOIL&E
za=(b&9XUkRW|}{t_@K-kX79ttz;GXfh$51d=;`UV#0r-#%{*YT!<1FECAxjheswiR
zsl@!vS!HEq!}-3Ro{nngPeF0VW7W=|zkSQJQL$roRvI-53sV{#8hT|_HjTrfpQxQM
zUv&R=zi?(~xJ=#$tA2d&&xmoKmG*W`<;am_w-=&7!q(Dg=@)?9r%4@1U?nCF@1RvD
z;+5W>oSckLOw@#3WR>;0|L&cnjK_E6+qc)(22~>VOniSt&3|EGVC-psswgAFkQaTT
zc(A)s6(}+{KhLeAa^BO^Q_sKvUv`3)2nh-I6TK<a?>JNYFxAjK7z$8E3`sVt@h51r
z1BsyUNi&p*ii(O)O453CPV9S$DUb5$(O-}6Xtm7o;j(N0k`6OOJ{YeB1_j-Roel^L
zOwGwjhFcnF!K4lASsk$-&=$Onpx;`SabLVRG&Z^t@A0mvH=&3(qRSq4_KxYhm!e3A
z)>E!}ZVHOm4#-cGLT8pqu~`S4a;P^RBjqf1q0_{*w?@yNoWyB9Q0t<LZmz15aB_0O
zKa7mm4>H(oEo<v%b_%gEF$6B|?mQPS(lbfebw0o7o|2M+zJH$x+u%=V_Vr=d-MfyH
zEq9q!!fJbh1_lNcBKF=@S4q&MdcUIA|6qMY?CJbP5Xqw(XrHyx)VN2j>sLrG&1WC^
zk8y5xmWE?|e7x4Z|H1*(qtaWWl@`VNjOlZ%X(c6sHjM#%b8~ZlM%)v>d@=l4?M#|{
zK_weLGQSP=<-vMidtpIANt*?z?cT!CT!=e&Oa-yJGeTX|K$`e8)dI1c4XsQR<hE!y
z^^0;zrwZGe?Qw~J`jp||->AJO{Dy&r<qC8gw~%bE%W)=}nlT+=qQ&ptrNFV(cJ5B%
zg8uYKX*XXZR<Ce?x!iqaq#|Pf1xq;d2%X=jt>T~eOv^uS-K)qe<4%mHU01_|M<gq9
zbH~)q&dm*!m=-QJF65>c72dyp|2tIF9xE3&x51(->7oaYVSm5MQ)Nc(Z@IR$T>hL%
z{VZ_Eb?ly0`QjFWE)&bE_`mnNNoJRx{9H;0ic%4ug2LGEvjt|Qi><qpg{!OHX|d5K
z`wx}wta|)+0;gTn-0jXCIs3Ng^ok4O--*@#JJ0-~mz$nSnUEBbh&?lY#E4G7?bK@B
zdnCs9=!S7>uYmC>4X%Hp!Jo&IMat>E_W6$k1F3Ljjdn1zJ?UTD9&fatwi(`CUtfQ{
z)tM@GLG(MJdfRzsOfPReN+AP#I)b#3rigOd3!?*(JNM3zT|3a7CKgnqNYvvrK1Hnl
z%JvRcKFScemOUW^RnG&K&P4*&#WXau;ri(B#YMe@goLm;XnDOBxi?(a9#T*uCJv<C
zRnomxxW~%1I^+E(f=3(;91pCOk4^om?;M&HMf47-HH0egv)u>{Rq$+#Jp6AwSx#L1
z@oF-U?&B2wV(FDIySsCYt?yqOKL3#Q=|%ZJ^~MEj7g8N#+I?O|xm-50&Xc(%j+^n<
zC*y)PCRGOMSXqUexWYn1P5k|(#(A7SJ(g{bUHe&QaP8Z{zm@&LdY)U#hPc~E*Bu9M
zhSY281b#I-Z01EriR)wn+)ae&5RsL($itxM_PyVaB6|8#Uc7kp@+JGgzIVr)yr|v~
zB*Aq4TTa<wv;RzYL=T@D`lXZ{6-LuqDn3WE(eWIu(6l7OcIZw^n@R-B&iX{z;V*V)
zV=aa7o$|$q|MIOWY(n9f5Wk@YC}YhWVzE5g8g6Q0f*>Tu@54y0gbYY`D-k>sbA3*6
zQy~TJL~li$btS>x6{x7I)Gye=k-g*Hsjt26XWYI#yC-b<mQ26Qs_aj{+9~cKN0hp{
zI&!kVz=5FOyb-Y9lrPoY31I(b`^wMXUjrb|WcY@P;R`vc<HOyDWo07L(!I8yUpy~j
zkFRuyA5=Y$SfV^IGxRO~GbEl;?u-UdVS93?$?xV1w4a__qV*RE)356F94tyGjqv1s
zC2{s9=cUHu&N+SPO}dxkC||+Z%6-hCb`{RR_FR^|S)op{%jj2vfeR@-&C%Ahhw1M*
z5P?0`;rFh6dVM#1TV1U_DhJL}j*BcUEzPd2i7hJS+9njveU+b@?Yog)6c&%Y)r^hn
z_UZcd>qXO@HT}GZE%MvH{!6}~8lk79)zi}>6MYf^s3*-<mwb*0u`m6Z$<3(S8-=Nu
zkR8vDqh!&vk@LZNSQQ@a%{=MJeJ<r3m%ri{5K!>t%NOZ=xM=QeEfacgACj&9N66#M
z^c#m$hZ-v5gH<?KdXu;K;lY`(vUcf<7d^WY85!v5FP}Yo_WjB&K1EWD{o9>ly)K%|
z?%(f_Fp-Q3-n)0NA^KDm;gpqSl=b?7shQiPJ$H^@_;G8+6(b{UKR-z*^>>FV?b|N^
zp7?$!3Vl_~rdBdz?K1bl6IYu6$!>8JPEAkU4e%0Nta9$k%E}VUvU4_dUd17FHg0bG
zXE{`p_Vz+MKYf~kn=GeD*m1UjAYa74Y?Xn5k~N$OSwgUet}UT|xLM`A$q?uS&wT>S
zD8qMFHL}EQwHE060C~TQK8<2m@Iy$cFLb607~@t~%P%s_bSHnjPfp)E`$F24qV0I+
z#^e_C{6uJ1E0LMGxo4qVnvX~E7szYbC2BA`D<arp!M>X|wI28O|1NwS8XC&yy5sLZ
zaOuN<jdH{u4ZOEjM1=C$3(D~|?)^4vGzS3~F~l~0u?f25XXEFSx>{b{V~&Wekt?=2
zr0Uxk{+_w996mV1WHT`)as54!Z|lFz9vR&y7i2wF)%I|NqINCJUUffRPT<^T?U#EE
zzxDI;L+cbuWg4Z;WhGU6rHp@X2Xty(<3<IDLeh6qx#-QC%Y_4Yc!q0#-B!bEWMy@(
z(zcm@q2ir<42s<)DVVR|5dbjGi*XT`kk|J<NsK|?8RX`SYc@SyuDDUJr=K`{K>Fwi
zT8is36*>8<b7D3o0J`z5jDLZe-|!jdqK&>T(eMX)0woSK;q}Fbgx|3*!zD6WPEQWQ
zs*icNxo3B-iI`bkKzVq2-Y_qUcr;Dj_)*+YjuRGiqVt-KP4>9I>uck@tC~Guz7$=4
zcy{1-*CWq$Y@=&i^m`|jiPGUTif{IVk(sHf8g_PeKgzC2*t~Zk=i}oeuY3|OC?s^n
z1bf(ia!_Vyhf3A>NHq~HMUel7oum^=e$?LdL+Md=dU~FENAu2iE*O1BB?ci5r@hNQ
zHN(zrBtZw;o`Zw$T@7kjU*+X-%q=XWOW{v??^7WLI=X_a{+^x$X=&;B_!0$)JhQ1>
zjVokDyhMYyPu(p1{v=i=0c0thJHsU>m$|D1B<dRf6kO`Pt$$2gDTd_edhgo`Z>=iy
z{r&xejt_!?Y0;cl4A2Vs`Z10w{a1;Q)6MrCMn8LfLK&)Cm78PFA?jLP$PUXvrHt9?
z>&WdzS~>4Ahs|c$TO*vx%ItsVzkdAsLjGTyh^S~M5J3dlCw(&0Q!v-GAtUr;)8n(b
zT5B<V?Cqbm(?)?ONBh!w@WLdC7Yvs??>b-9GlC8pw!L@{YX3}5$fQP&5_W&?(-V$Q
z|K0xOUGX@^PZ{Zy>JICzh>uy5@>n&XVN`k*xbV$Q<dy7C8$5}^vjEtgF1SD2ZDqF2
za<KX6h6aW0<>503j^TpM>n}0)&j>a}_Iu~(54GG4oRkS!e`-5@j*jj_R>e)$!vby}
z`KbO}75`0~#*gyr^oP3}x}%l0ea@lxdgIQZza~{{1c($kI44o<qwdEn)O{ZsGGE~C
z>Ft$1G#rIPZ|(`tevSX@;y~fj>UfPy%5SHpB~$x_?g9Og-;5;b9I6q|M#`@{4@O#K
zKcwc^vbzkGw|7=VSeU!}S!u+mXrwHmALeDaPif2UWO!4;_}Z`f^s=%ttT=^sX95XE
z(BM}d_nfX_G&y$m7XIGxiNRt@l}&ebcbj?MSsi<ISP7uL*7?)f-!pcPvU-^hXRp~w
zr2D{GZF*l=P!QTTOb7D97AtJJm!$nfQ}Djh%jW7s2`vQst~eELYd+lW<x1b7*G99m
zv%K}wW}V7HB;QBUcHZdi)0+FRqum9>IFqMN#*HMTq@?iFAdZ^j@!y61!W;EIEw0P~
zbF&*NM7_h*E4E>Ohkz~gej#R#?axS0O?C9EzYRFV$kiN$ql)sS>}Do3>BAm5{n_5`
zge~6O`Q=N9K-+zAkC4<V^L!~IEr~-eR$p+8MAg|hJ>^qpvPqtBvDx(I^hfJzrw6#u
z-*HJQb7iT!qg<{1_@^*d-6xugIuyg-dEOmm#4#%THd(@8t?yK>#0$QtLj<{cZkEXq
z5QhKacP@Y+=aKsBw>#r$U&|#6J*ECBcyg#8Q|hROX2mJae;XdQTsZvJ(<8N#aZ)#G
z$5ZW*W$V>rcY1?G{wf`TQ1H>if<8I?gNIf*pPn4MZUNhmmzb(|nZLz?9&y^JQ``bX
zJp`pNcvQyy8++pfb)ufg6_c~VRhv!$F2-8asAoyBDS3HM3U!|lAlQisVlnfGb5hj?
zTU%Rrinq77mv8>&DiAFaMBxFOYCDg-PrbwW+A>4RflAv;es=UT%&g<1W!Iimc^T;J
zSlK5GRosw=zQY3|4zfA!o;UrGTCMg@9mRiqM40dZkyj43dsqcD)lEgGq+=lZ)gc>p
zG_+^g70{rx5Fjr<EEBwapH<kHl?2y>zwgVpZ#o;3t<`}GR|`EOA|gWjGh0KdR?Upn
z)YQ`NI(+I@<>n>;ZhgP`5>uEv6r^Xew=!kR%4HN36h2pcsQKcMWSMn?oOp$+bL>WB
znpF~rJ6xQc2rv{f3W~wo&zyWJ{mRXU9CCkrjrN$h;5t_0PHpp_cLG2MM}Rc^E5Hrp
z_FG@2wiXuhc#X)EUn7@gc9u0f=gnTma)?GF-oO5%vV3cy0r0W=35SFrK}n1xtBePy
z3#WrY3o1gqo{qxmet$oq&!{cRaPR2l%a?+eF1?6vnAz{FY>c{-)7r=z!shhdmxE(4
zP4n_)&+WwlnaG2n12~CGrzabyCEAb9g@uKNg_+se<qm9JtFpVjr34G-E;)6ps<k_W
zTIsI}DNny!?6X5r3oI79*qK1D)%hTsSt+Olt2##^G!^kTx%GU$85#L+Ss|x9?jI$c
ze`TKz-kP?L_@ix_?ESklftUD+K&03AF#)cW54T2Xi~6eCPrPc6Uda1y&A0naYd(*F
zH=(j`+r6($O4vVF^5cB2ln$&qFE@9cjZtg(Zf5z-OOkGP_y|eQ76CQvt^9Oxt6A~3
zDeWN>mk&FpH!3_jI@)w8dHP3w+rWn1olVIDTTjEr01!&<W_g`#ex!C)y*2)x&%SQ{
zV6E)=^L|15sC_;tWDh|k+Fl)}hl^d;@MUq)BYfMm@7rsm7m^;|IqyGw*jGw|+G9cQ
zpwn}cr2dYWh>Xc<CbwE1@1Rhq7S9XHp$-9clnBFp<|+Fh`|~^+O`Tm`Tmk~07I!0}
z4uQS1?C<Y~<vn=7Vkcxl5ttmQfR4jy@>_pl^KH4ua?uUflP<70Qo(j|^w;=NuX(A(
z9$Y8?-F4eZ_iHQz9x~SN98e(CbvF+hkij945?~|TWTSl$^Ma6-BtNyQS8$9&Gwu|3
zwYE1VVN@+cUmL)ymX?Kyi8_#~82j_lr^g|`XK)>{c*Gd8jurZA>*XbUyb*m`_`NB3
zN%-PwcjG;Eil8cPy*#)dti#R&1==n9pB|qt%hIi|`a9R7(?gp&PlkT3xlt#T@c1!5
z?8g%hwb!3N>phx4`S|$M-u>&w^_MZj=BBN!kfP%A$%wy3S9+HRiytZ8ohhG|GwE#8
z3e|LAvo9Qf?|R0QHZZ>H&&;QUCq+fP1PzxjhV8B!nZGuCWvq7mR4I75NWQ18*yl`P
z)S*1PveEMN@86n8Nyx^e&Oe2a^_Tg#K<;BN9rm(Sh3na-{O@a2ygIc(l2&WjKWIm~
zPhY+?G<qRdH?|lW9zK-Hqw4{Rft6GWqmk;tB2QD)aTBj=@akCV!Ooh9oINdCy)ikJ
zdxUYCywQk>pY7|Vjh4$cC$KnYe7rRu^NR`!(gd-N)Q+qrvmOp_ilw&&JqIqyjlOvB
z{P}Z|f8RZ1W>;?f$9`EF)ID2Olv-3P{&|c7lP?dywG@()O7)p)`x=r|fZMwIQb7ZH
zERVdrd=I6Q_Bmf)Uws3EAu2i147hy>cDyKux7cny+Lc6;JQWAN_SV?gSkAoG^mKZ!
zA2|ERQIadw0~<dv#CF1@ws(>GmC@m0MkFOIEhavm3?$D&`gGw8it6g>mM{bZA3G@e
zVO(bN#9vA`4)v>AyO^Ad!W6o?y586Z+N)QudQ7#cRNici0r?5@>C-1s6)1b}KpWB0
z(QyK?<#S)(On(s?v=BT|DY2j0BOsKD*y<6mZVD0toXy4mOYe&CwRiTNN76_rl1r<p
zuTMeizfz;3V$^Jem}qGck!#0GjCXY0yZUizaj{LlVSwK`36H>#6335mO-CwW+nmUD
zuSga1@C@c2VT_K!w{PE?LQkQ=E*P{=rrF;{n(r@K*kp>^>T7BJ`ST}e`G-(%Z*KwM
zytmhDUM~(5J$m%W=XM)<hMDoM4gn!yY54AXT86y$m}FDP#sy*$lEj|T?o1vdZEq1L
zogFlK;21bG;#a7HqUG4vL{?18GXD(A{T!xbO(r=cY)yXs2qm8=z#V$`F6ukAXa0Z(
z4Ks86M03c@ALoz0<N#1~fizXMf&0=Bm2+cY2QKMfzWVJSZ!bF08E4Co&wP49im}Ce
z0MkoL3CV2otdxhCPc3)<(tukqJL?j$*+E+H_u3t(7ieHQ`c{*`QvcvO2)!p;Sm48J
z)(90IQY2YBOYECIa7t>ulid8)f|7kL;G(_#)EoV#lmTg_55(fQC}w396_nrk3QzNI
zBkRBFsX>9(badoWJ=t@Pb(QRvjM($Di?p@14d%)wF0YGzEH(e(Mu|TW+u;S3Fb4og
zNd6h#H(f7N$bk4^Zut7UpTN;HRm}cwctM43E#V>s?KBX2U0~;#qSv`)esOj`D{}#K
z!sKK}h^hD}yD!Yl%BpVzf~l*tm~#>wa3d}3)|JbB!Uly@6*t0M4M3Dd<&#jcE~*BG
z_`lL3Vh*08B&rv!1-Yw<z63g0Ri9eO`pp18KhAFE^9p{Ld~p^Q7K_%f;K^$<ATlp)
zc}(c=7d19kc_6tnL&S*e?VnFUxiA0$stAsIwpw)C)%K4Msb9=V>*?unau<N4(zAZn
zRLj0rWOg#@@b;^_B)>is=f|&UN08v8?PCX6{gQPqgD;^o6ugdo9v^R2dGiYJ$v5zh
zDMC^Eb4&#4{VKaJ#eJf{AR<F#JqPc%w6+Gjo|17CcApsU(TZHz9W;=jMY5IeO5Y6)
zr9oIF9gu%ZLl2R4-OjP=bp%J7+XpMgPjtNDYS|w+x~b{;1b(4cjnuE&D={lhoP5i3
z+5L3u3Y3Ll_kk$5OYhm_wYT|1MUyBfC<G-Wp1^Ss;O)-~VB^y+=W&`)K$Bg2tY54N
z%s1)vt)bUcN+Ih>(;px5$jWAnQdb6#ySTb8-6^)J`ljs)wNDtYvfBP^Z%N|7F_7p6
z5iLj!GzILej>l@mHV}sY=R5USqHT`=Xj?<XzVykzs%REb_Ye2U@wEI(4m~}6aCFG(
z*no?THLhNOn;->~b+y83<>Z2#_cNc#-y;<_#@@R=S_}iiSr%BfHdcK(D2jL`;NP+(
zo(qFE@C^1OMbwtr*-A}7qhrT<c#QD%@ec6q5u?Shu&^!h{lA;I-@lZjj+jC3{V^AK
z=T4kW#mEcHgzYBLYXX5MsB2bHSI>gJ6bCwp?weaclJGuFu|XCAGXLdyEHI!9p^rU1
z<RJYt_wc;}4Po$c%L7p<+3<Z=@&bO(I`<v|ObqdvFG@}(hlDSnG7h~le)O%%Arh#<
zgYE60mV@Q8#qk;e`v69?ymx+POtRFcu?<4QpQarvYjrv_=zQ7kpO<AQ&YTHOuM-jy
zYPzglTNr_azRY_#1oE%drG|XkmwtYyD9Q`U%!nTl)(QPIV0O5zxjyDgcSPZZQqTrs
z{db{sSG)F|o3J@{2T`aa=TZn_ef&dM{eJbvkJ9w@Hdl9dXK00PmL<u<(KrmMb)nQj
zt*E%zajrK5K`#xxInyKkA^Sk^bF2p_bu7r$=lX#F2yV89F(TiKuF$LScvG6MUl6l#
zrdF5FZVOy^ye{bn)xDLl_Y@ta{@$JC47IZ9!pulU8QvfRb?^*eqwSSZYGkvE$v!`L
zWyE9b9oNapp>MfOU9W>8Aki-1b;&v#c)bS6H|3e!Gpl2Eo?r9$P2;_4@MJmqU`YUk
z<!sAWJBlwAd6tVcJGzhlG1YrzZ`9V&X|gyUt-NOJWt>l1MbTEWcQZpH@4Vq)Xh`YH
zTERvd%6e`eWX1UScm%Wm$)IZO^s7d)CNszF9W)yO4t+a%9e>VEDr{s8bCeiUQ&W|8
zJGYmHg4>RuH?oM8K}T2c|9xMBqiw|3{>|0%t+ym&_$pu4Aen#ppdIi7grGuS;xo*b
z80GxAkdlJAWSh^)Lwc57-PDw}rKN?2fq|E|k4&Vj$icbXXBBnwogBKLCcnf#ot>Wv
zUEn)RIF5lz2&<JNZq)ReEIdC>iXD}NT$``|JMRdX-yzBIXRRl*v<n%+iH!;n|Nkri
z=xYxiJV5Xz{Wr*sayEA0GW+dqPD@9bRsazoPq6h_;$5>wUKkd$sYSJ{D|~{*UXqJ?
z9(%{7iaGpn9^hY-(T(8cAGB$%h_m4s7Y)T6L16N+Bf?LZxB9Ezc;VyRubacKE|Y3h
zHyE&m!#+<`UcWsF*!XFJMh&WwzmJ_VBs7N0zM>myNN}@0^#$b;Hk55^nB_J3DUuA(
zWF3Hy?g0W0&dab%Eu3g^C3tkSqg8~GWI%Te4dvwINP)&Uae5=Hvi!*tYBMvll$S5P
zO%*9dbXR)){b_4MswmJ=BR_OI{(I)SnxIGZ4aYVIU`rwTL>U1^1Usw$^h!EE`P=$!
z>KM4y$L%{)M@L7}^u?sFbflB2r2oWF_{R3-J$ptbARqun1*f?9)rGY2w#a7jk{?aM
zD=E3TK4!*XRs$(u6|pKu*VNQ}bEozrHTvtY#48qGf~eagq<P2Ua&lG+VTz#9o@IZx
zilt{_Vu}^X03CYm*MI8H)PmFW!VL3|S5XN!6~AW7UVd^xg~)Poak1nEQ{IagWiOH}
z%Z8i$$onhF29UksZ38kL454g?_D3*o74h;R5CL27mjcGQcubC<TUwOMt*bRt+Mv~Z
z0wA9N9xq-{M1l--j2xD>3=o8N?%t!oD*5NC{=c;*rlulybGrWFt;OC9k(faW>*OK_
z?Z@njG4MjE>HsCl?xzo}G*TwU`kzT%wkRHc>;I{8et!PLuNP-RK~#Hn!#OW4t$=Ba
z5|P_t4rh`yB;Mso%gLz-Z1%`9B*5S)cC>_Tlf|a=N06PI0BhijIievF&{F*Kho;tb
zqzTnPhJcWZx8qR=6d&t)pB(METe|U@Ns)&;YqX4vuBMR`nW;d>;m9Ul=k7x&>kITL
z<T~k`qe;}WONjt%H6<&>B}H0WGZz#T&@eFxgzmn+Lu4Q3l9!uXd2t8KZHXGU({qV_
zA3C$ckx(ih50uYn#fapaqN2q%iSwwx@ac7UoV>0W8;@4>JxNFySOQ9^!c{eJt~sEV
z##9)c#eV+$##1|=#?U`b3=GfO1R~<4{<m37TqE9B2%JyqxtK{M`SOatdS%S&v)ii)
zCCpe7kwO<2m&FnLhjDSsa+;ovQO8P}nwsBh+>Kl75%Z^VJ8?QYfUqw%Xso#BCfJZT
z@Vs><ju?o&IZg0do<R7x9uCzy)kkLVPw}>-obMzhw<btKD8Gkw%DdRWh%BM!)uae_
z69+5n!C(s4<y=S+88=@VqpMv<RGsm4M@w6Kda&5w+-Ru-%Nyf7ar&jF4;_#XSGmpJ
z-4bOPCp^~_pueGa9-3x8#eUK;$k9~dGuV5|Sc&H)!%sigD4@^WQ|7SrCy<q-wZuJs
zADf+@&$&r;XL+=W8qRWOcQ?1RG@ZcJm)|1=Fd00h)uiao&dxsISb-?<kw%8;Aaiqb
z|LsLnY*TQbOB0Ha1P7L%lkQUrE8Lgo7oCz-@(q7jkwIF<hMk@LKKnXKeahYbXL6yf
zVme$t;2y2db`f{%8!mdD)HpZ2?!Zv=(r2yQRHJKlCex9jPHJ8_#>J}5X|~~8EC6s2
z9OO9`f7Ms52coLi_~du^zVH=1G&B6-#Uks);A@xz64tVqnq|t9M@$l1O`KFTeawH~
z$Ei~M_mLYq*C_IgeFWqpy?UXZXVtsAyAPo=<}20l9F~`hLK#4CBh(>lKP}ylqL2RQ
z#-`tUnBN^$GEK~wi6K3WlgCmfVGU+T8RtLh_TvP2d2u^yzgn7hHm2-%N&LWA0|bPk
zsXdZ@DK-E3#=X$@hyPYWj=&^IWBk03O%6#Hz;fG}dBUG{9UWgO`Ud+TBsLo7iP@Z%
zK3~8ozLgXZAO+c#6hlmPvG(XHo1p=jjdOeOiWNRs;ujeB5ddPf&xF#11`h57iSCrJ
zU!UkM#yCXz71y9?(npgSjf9#{D9rBWJ>Q<SK@XXjh)D>x3?;AMdlP4hnV$KEJIj;G
z&~5!o?8bjB+`)~nJ%-;hB7!`JTm58>j3)0Wg_2skD%tN<D<SIgPW`>T9{@=Nx1C(C
zaa&4KK_=qF#geD*SCl;N#}QN07w)GEs)rQ)4la5{eSxQr7xRV(eGsZNX7``>b35-)
z=ZJs9*Zcy0TkU)3);l^nHu(|rr~Jq;r*pV1MoS+4AdT!cPONJzEBvQ)cc}dp##N?L
zogIFr^(~h03MmFns29Opq~}Df(HgNN_oU)})%(uC(=>5B29}<4hL7UgSd5nk#n3-*
z?F%F`QeNs0dNw<waTRP|3DxV&qSeB-$yP?I7KZB~z4T1dkpTUMq<?(;`sYPEul8eO
zgos!>m9C=t8diak;G?50V=wVJws7t+G8~7wCzP_d7G)pjbS`Im3k%-2S1bN}`TDgB
zG>`9~^C4K9^+9@I5xymx_IsFwPx8@htfCrnR<Bs2bc0(S342g8wX$tfQ~cW!z1d)r
z(uU7u)YsQfE?Qx(+Tin0-je7^vkZYaexqzoHMKnX&igSFf0>oJ%otYLgmiY0CsTG6
zRx_K9l{rMj#2MG!D|0Z6y^v$6Ji~Z2b$Y@CQu_lC=AbLSyEQ7_nxSw!O;VNC*Fs7)
zd6{HVQ^}2!o-Os!QCe1-u)`kJ@E-z7Uq0hFlHJ_v@Ah}6qR%8UFD)!Q1R%T25`IIh
zU38r0Z#9GK^H_MufRZa+oRz$vb2SyUg`Ir|fcYi2W@Tl4yJl}<f`%8{GvysaQx99&
zCB=CbeX06G6s~_(ru2-iGHRN&p`OCN1n1?n-A>~=$}fLw#PB=$4Fs=R0b9PZu)yT7
zdYRez=#~2Z5|#S*1jZ2@s6dI;Rm|QQH&DcVDZOK#2qitMjrP~NSi{kQ;~rEMceGBu
z(E@5EG*(__|EL;fh>oh6RhiFFC&iFvZ|?m;;Y2B_M=)oxo<pw_2KNs)+DC7z)8V=u
zQ}_k5y$i$8;p>Uj61%ggJ#(;!MK9Aq5g11v1AN_@y)vQn*WI|1Zl#7)VHX4PS`b%q
zp7LEY{t*MV#ZUR3#O~=L{*-^}&851-XR{Q8>U}1fm=#R0gU*n}oapop4Gn#sY)|s;
zGeiuVP&EJD_^L11-KP2OMZDoBHq&?EMXck5%9ZTNI<eqNBG@IJ;{Fd``sE|7%B8a9
zeSNk{Ft-GyX?rGRsI8^W$(1H>bv;Q<Gaq?yF?iXcgRKL|X>p*KCsoUf7cYFwpOK6H
z`_-rPmbAfIyI22Zz?0t}N)bKJRimqe1l_iZ5!IH4QeHm<lUQYYaUoeI@p)Xz7y2$U
zIP(QazVqVxIn6bntCqlRG+zHWTlSXItlsprrXA2s>B2ow8UMtwpozP4rAE%G*Ea4K
zy8!ABD9d+H?LvOzgDV8_dUUAz4Z$<m?C@ART3QVoXjSFAwmLc_&kgMCF39>$VjXhU
z9b_1DgHWia_c77|6ert!EkYFEiU=;gy@UjWguDR~VICING~P7X;2#U7!PTVam1SBN
z67G@|ohnD2GifvG938!O=RAYdjo)8y$0m+t>D^#{_toN~W0EPzgS50NQAgJOxMPq4
zT*&dd73ftnB&5QuNJutH;(#N<Q?5mbReY8+zXL*mgL{8wmViLGtz@O8X@XsPPEk=Y
zVa*%ml#BB3?_k0fWn<$sQ@12G9^H;k9D4&lYx9Er%y_LQy{C{0>nWJ?pUwXB9_RMF
ze67?%#t*076fl=KuEfZ|@EvY}@r4T)<`+}Q^HJBQ6$K08)k`J*JI3qG#r+rFVSJ;3
zhCUM6m}r)NeKp6+UlHgivs#og9X&n1eBXcYAVIvap@A8UQf-JM;4=q-PK{NBG*`9e
z**9dqB`H%-^atd|?}bnaKcy}@`G;&G{5llV)6+$+P!^l|n}e1#%}lJV^}sDEgxmP&
zLYGCERkG^wwz>Y5D^krTkpBGH7$`7Yetig=`ok5m?KwK+xb4=;Xa#D!>*%YOy;<}B
zUDjSTE|Q?J{yG}JKGCeJr3ISDEI9lKBoliIuKaX2EgP<N`^pMffP<Kbh<Ugea(6NT
zvw8<>^-~}a^cN_B>UtH}vrN779O@Z4=7DJQDZhZ**C2t6TX#>7ckw?-U&P>N0rw8y
zAk*irR=M$beALE<n};VjugbPLv%Kry%BT=zSw^btL2liq7rWVz0>+5Cwzl@UtjMK7
zzOd;BOrlE`mpJeFG7#{)T?$&{tVdNhf=91@=X~!gED9rfJ3VpiiJm>D$%`s32%#m`
zMu4~5)K5yqsx_C;9I{~suv>J=Bm}k1v$U?V(YXp3Vor`*E(`E<x^GA#^HXiJIs@(1
z%SE~Q#IzGAzb*?_=k(f3cUC1uu0E~+)c6TfO(tblVx3*j>!ymxFv@=P?_Tg)B!@Wt
z2h^3$%KcP9N$JDzaGl|%3bEZ&+Zsm7p5#b!{>uW`mb>&<u3SOT02NlwN`Q~u`P#_r
zr>ZBOhu3-z;h+-F^<}-d@r4%Yryn@%>|#hG>b90a(qGBoH8awhYv;h=K#;1ogSTI@
zpNdGMR`K4BXKL3Np|S2R97KrH{fJZr{Ys?NMHS@0z4;fuCZJsb{?gTZMtE77MDm=v
z3~f%j)nx<|+D3G8ast7LOvbnW+1K{Jb??uG?922O+q*bLq1%^e$4^E6ixDh$UEM{w
z5@;_we#r;~rE_(veM;Xe0TKfa5cPo7Ai<w(AB-G92(N<ztym%5Leo=x#BlLbmN-NL
zLFwQ8^C#7YxLJGU-1heNj~tKJNXwsYw%2V|Hx(FZZyABLhN7oehg?XJD>%PlQ=pc|
z&K5N^JOgJ>2c9wWYCsO*_s8YRe+Y1Dn!)-;M#a!DKdbD!n-9DX`{y+tTutg97+7eK
zCC+kaM}-;sdE1KiSKm;&N|8G?TF=>@UqFCIN{SYr=7U@FXMZ8@<LD?8Xl|ST{%QO8
zh=cK$>{`#N`<T50oDZ(W1`YaIWRD#aqQ$Ff-A=~r9ED8MWvdDak%Pki0ibh5Nk*ip
zwKbkH=7{Kq+gQ7Hef&sB#VVtYcQzrM=-#fXuVp;@-Jqk%`q!8-pi^2$F!J!y2J9i;
z7`$$p@jjU8+&Rq(D-hn9AOY9_;xOd4V!&{`Zgb>@q{rXLa5?jufaa*|+0&=@p<3&|
zML&7+#Fj%aYGp+1eq7uK$Q6SHJoex17g*t*#GRvgon%%P>7CwA9pbL+?h{FL1X9^e
zw>r_x<lBDy-#8=0RA1%iBX{rK1xvFVSQfC`$F;RG%7BqTR>J3UK!%Nlo5Bt10k}1v
zzh!#U8hWN7hP(x9BZ62OC*6OTq14u=N$iSrpoq(_bV}X$U%lzR3plWABV*KTa+FZc
z>JB1BZ?6J^{<k_h_?U=cm86U%oZIYT_gU1Um*`h0$f;Rb50jE8b5ci6USwv*L7=ap
zv5`wrk!5#%;v<OKe-;OLKzQQf;rWQQlrl3%zPX<;($0-HtWzVQ@jWT9Bnx?2J4KqH
z9|1dY0=qITQ-l$?Pd5Z~5hU_pTcg6J&JWb7=XJscE-t(f_K62q%epRC*s>vTHTh*M
zJBHa=3+s}iN&F$3o&b5>ahAWRTrj#LiKdfo;@2|rzH1qBA(sJhW^Jn)X3HczzMvw!
zTO%n975M3k7X~)^q_`S^eK0Gp6b?XHs3^C2a_3Fh&6_W)Wn^b_4K1|7sz(M5#9CI?
z`h<FrI66}%X$highWHD^ga<w^A^)E4zDF?!tAP*QT39^oa=ji4$Jh~E$)?kdfkILe
z>I<TUI&omOnUq@K-CfHS&mZx>!grzavKr92SQ0bLc4W8n;zs_c#hp*e=B1-TKR{aM
zjvkQ6zm0bKCJU5*2;6P(O&)#AQ!@rd=m%usAFV&Cua}4HV=U;W0=s{ug!-~11jML0
zRAodc|C5~qj5)I8?&zSB{@#B^2Vdq5i|<;lo0cRWnlmC_k!=!5;+q^(XMOhfSP&-6
z1N0RFrv7CvbdaC#NGWoaV2lXIhR~y0DDtHc>c%Rg4W-+DJn}sg3A}0T9S;;!PG6x6
z#2Pa%g{*&vj^hcAUajLtlAjI!g<ZP>($Z-G0Rbfddq~=Mp>`bZr@nZ>22$nYT0Q>>
zv)*g=k;Ox65aX-0Q33kHz|QV1{MEYgS3}03F(=v-i6TyMnp-${SCmVO9J#dmuwlo@
z146jTd8yGg*yP&TC{=18+Xdh3pl?E#D9BX_H}m(e=4GpZvZ4iH^tz4>XmGB7*zPkx
zKvEwZK0YyefvZn#1uDK|%No2H1rMd%?4f>f0ay)xiVqFf@Ay23q9?~0Aa6R>*0W|<
zZehB*S*bB!=XWtA@`@JgS9w!wt7A#}5caxl8@$4Q=A0-e`jX)>$mVIu0q$S3T{qEB
z0alKG)l=f-y<ch9s;`CRk}vMJNHJGET)jB>-gip%#%LauII9S1uL^tH_JiusdG!`-
z{|H){K=O<_x?=r-?C3Zl62Hjm?0r$8-I}X`#Bwi5`S5v)Oy<*KlpiDd8K;yj!p;;;
zD*8}rghpK#sY2d`p4)~dXx$nni}+N10KrQV^dcG0!Oq_~b$O9HEFhNkzHAKtJ8uM+
zOyBHbF}{z%_51`8vG3*AFM5x?Ljj3=8tH7k^zR=a<M+Y;b}=k@8G;M9)>xc{kz-T@
zQGVl>W#&SqhV&&>m!wEi+?n?~gSQ)_@46m!O(Fj6ozdea^)!fY)}mmeF=P`=H%@QV
zd1-5DvB`PA`>EFr0V`0jD{LNG!*;)d(@aPE$H@Ap7Tz}<-0EiY9cwxX=ezAIh;E--
z&pWrBqlBF8ITrnz!iF?m|2O&h*w4kAp-@{jNg1iM`XNAcbCEC|HCxUHvTEA?dU6l6
z-BM^bVBd;{d>Tx6_>lA%dW4o1K8bKW__<OrfKI@B*2=He=H~e1jNMBAW9A7tm8qfr
zM_8|~vvbGwUOA!3Fs5$bIwE>DN?lqm$;M4Neur*_hJb}C!V}VzB(&E<f~Fvr24uW8
z>Nu?N($ic8MMZp!4NAv%$odPvxBvy2pSu7Ky3I{1P|!-@JUDGJ^h^kdE$UKYxEp_^
z-cO4+b2p295n}D}Co=6&qX(-eP8NxPRMdRK+PYz7=80P6Eyo<Lcl3nzHp@RsFL!ly
zS#eAlKbP)W*V(mU0fQR+&G-)=Kf0ElPJ~SHaTk~t>Ri8R1y<emw~%v!R^fql0cz*i
ze>byV5k^1e8x28jE-ukLT2IGP>(A>*8-GsbPzn-cWMmwGRqGiV`b&#u(jK8FxFoaL
z-wQrw{O6{^aHQ6yhpu@7&3OL25o8>Tz&rWbvR*$G_2T{e_mq`xbRy753-Bu6*K0=W
zs-8L=QP<YxoVA6}ZOJx11FdO?jy+ftJGncBmconx00&+w29}hR#K-sU1=SNQ5)m4_
zK@<=VVxQp4G3RAiHKYNHa&wnGX@UP;?E3rrU>@@x%Ce<FP-F<Ig|=`;@9TdMx6Q@-
zhU2m{v;dA0dYD8*@)*XWZ+!fqA~0u|h{*|k!yJB*^$}Y`!ZiYQ@S}*KrxY@ZSbYbT
z^-3S?%VN5*s+8<f1~HBSt=4h7O#EGJ9G4Bap24V(-qY87CtDg<N4*W9#h1VYmRv>P
zmuFIG6X`HU!OhL89Qy8AMDpBvI`^UP%jDc-5=^k4Kz|N_A0<Y^&yh~r8!IROEV6wz
z$|0Z+QY_Kq?;J1pLcFp>22vW^knlIjQ;q!G(b4fb$L=Z!F;uiy<eRDhzpaj1*lG3F
zmjZF6qa6Sduxs{~SV%O3cLVyIRoK}^9Jb<=c$2>&Qfyth$%6Dd31$V!B-E>Mx&*m0
zY<W2U?&TW7{YU!v_J0iK@sBEdwYOjluIAXEO-M{^Drw~~OIp`WV&*!OwbV&SO5)`%
zfE9VvGdh0upwPtm^q$u4GC4XAvnJs|gwY_Fc!{aV-{&Z=VUYPI+BzHMAuV?<1gV1h
zvAzZ^4Gi$!NsTr2_b3^z0^j&}8P;U&LL*XAQV8&7U`H*4ib2-U(hB<XTU%;Btam~}
zd)wZ?3g>}&V9!C4YuZc{c7P5yNKv|Ad}E;L^YM2V4_->FBd#$ZMDNnmD8Ah*+FH>x
zsoG_3%Oe#AprU0RW($`;JK!2w?`{R^_Dq_zZ$eFbdq&X>TT_O(Athq5ZKf%As=HMO
zl<;rYuvGPV;>wyun{Z?vM42`NU?Ai*Bxu8j4S}Pngl?*@ue^O1usS9MT}pay0{Cn~
z{Nj+Y8l$;eBl&GgPWBJFeWRHDAxr6%Rb+izwbY8HmG^B_BS$u+e8dB6&X2RMh5zv&
z%;Y#}1UOq(+~@ZL$Iu2v){Y*^f*2#Nr9~o-c@P&zM{5eC8g@THC?pMgZ0=%za&IAQ
z9bqQLnEKe}4TO_5pp!EHi=8Q0&N%$w+AuIWw_b9G|3$}n<qc|w8%rC^&QDWP)H7l8
z9<zH6pKr{t{QdiPe7vBr@Y^pT;6Vy-7d%lt(DQE0`#hocb+P}V>7Dy|1P*kop}LX{
zL*+$&e7kfv-(Z=<J{tYEVp}ekS%I@U`-7P2_kV`js*wjYwDL_M5LkpdH6YP`qzTno
z$Cj)ZpFxK;n{E3>!3RLe;^s|5EtgHsG?2f(L;mB-b!p`r>nEOWdFyA^xBn}~-Ff?K
z*dNWmy^e4Wec0KgCTe=)((b_Gv*{ZUVs$B%3P;(hrjYl#BPdBqDSSuNQ-)Rl>ebhS
zcvUfG*=*#efdJf9{0G(2YHV!$0oSH=11u;*<6PxeaP<Ov?KwkE%e@JF-bDWQV9klF
zVIMsp`R5M*VOOtTVAkge$2Ij6Vjs&id7^Tf_~c|hF_7V5G*7v=zh3~nd1y!h_6EhY
z?(XhCAs$ETf3lZl7glPR4Z~z6?NP^HDx4d!$2HOv4f6B`nQoIrer>ZGvN|iNhnlVp
z)fea1Yo+xspt*|IyUua#Gdtts#5N6nT#zP6Mohqlgb5%MGqW_s>LEs2p(LpTP#ogp
zJpfIUESS8tDAl~^_T^pCg_`=`B2MymJevoUX4~{we3owogxq{Si_*_2JcBzgwGU2N
zU&IJlarh_-Or7*b-e$A|clt6YB!v)cVKFiXqr)J!o<)`+aja9WB0ax?UCO2n%Ov=b
z>R(p#OfRRqi5CxfLj(7|+0%*FMr``V#%}<bKI&b7DZ*V9A$h1QOsvu_@paBJuCLfD
zYO3N1#3g5@&Z&MnqtlmlNZ{I3dL<ylfvwl=sZ9=op}*;JwPzVZPKvfoK?z<X<w6R^
zQ1-v%Xjy342$3+glo^)zXuDJ!$#$H->9qd0#l75{QCQ&NoE3(|1z|SQicAoE^J5{8
zfGque0gPI0ul-^=J=tyVV5Wb%04c5bgoIQxD&jxvq%_)EJPCr=eOwv9A|Z8nPpoYr
zYZ+Qhj|`+lYq^RE5iA^@k@1^|dKd9L%aojosu=nd#nq|CKzCMrOmMf%3@@riaUki<
z62eYDbk^SC_LW$K(=!-uE;%HfM{UM1xDHp^9xg)*Xd`AC{n?MUAgzBrk&Pu{diyV0
zD`?7upnGf-QLTMV2YmH&Z?7iYTVI=QW^e?a0KDWD5$VhJ5_(zyM%P$dWVjAEpAoYo
z+8vTf)ee4rLS@fVRZ=KhN-f=-r`WKAmupJRiYeMo4sNyV&%b!V?0kH8xr|~)jpzc7
z-yLgkA|_U>CW0*V5B19W(JMvM?;g0nJz2&@(I|guw7Mnb+RFftjx?R$DD6guzJ`ej
z&DA{BWC$j{#%HGfU76~7<De_qJ&BT>N-FoI8yJ+%>pgDbp1DOwxOwJFgeBBXHc#Vv
zNTeNz>G>_*%cu%TY8>@4Dz&O$g?xayme&2%CJWxu8};Ii&CM&3^Q)_dP+(rchof~)
zLhkoYh%-u!yIbPsnYvU@iDKt^A~mF^3`y2a{5s^Nm6WpYY)nEhXZiw|lIInbl;#N+
zd3XP9-dt&)lT+_@fgDN@go7(k+{o<j-`vf1bCwVr#RofO?ryoX_GgJ+*Mx{0!2a^%
z@>cAc8SP}$FB+`!%dtD(UmIQzuuoDUL#yJ>(#!q4YZtb}my;^MtpvVo9h9k{rUwD`
zr2Vp$S-;3w(m`LKqg^`h7z(-u>!my8lhkPL4=#{Q(bC$6_)|b|FdzC65P6x1z0E;S
z($Da@Xn%xUdp>YBGfPN!{Y<q0is?>}ZBWqmF$|#&K*-M%21K4de}2UVyf0mdyu~Gb
zR~h@WOk&-3{o~t!b*y68-X_=n-d;*`bF=tcXUMiacd$=n&H^yKylxv6rP_M9-n<Px
z*c=Yf?a7w?@$EU`s7O~vKhnB*l}%nIb<5U(**2O>86it7hRpkegWt{u$&WZ(=(`<n
z*aLGy0Gh$?dJP%wCE~fr#|Xmef&X5BiEv0pf=}G|`{y(*q!XK<)zi`*FQ}cqf?Xbf
z4C^9{Cg2l_;4DSU^^XSB8)y^l+6QV1wUk|p!!kKOp<`hgFMt+Z3dAd7x=*6r5Jq<y
zm#;n(s9)D%O{~Yp#T!GO0Uz&`VWkqYeuu7|ou6MmxoT)wboRW`=gP9y#2xi?j;KA2
z-Er`565>lBJ|DMLp4NO@n7e^m{=weoXJN1CUE0aQ8T@K+OKw38Hv(3CX2W{5mGj|c
z_i~Gk^HgD4o*OVU#7Lp7sGaQbz-sE*)XQbN-^~b_nzPdZ54ehn^6Su0IzD&iyub5#
zLXMGk_=)_B0Xdtct-eUqj&SIFyeci7Q2jbdWtX;(Gq2W%4<BGiBtidT=%xdKI>-ii
zaJsB&41ESnrz=(=!0k(*GrylA420Nk%+}w(p5R%>T%{J_(}{Hxa*8I%FJ@VrF}ICs
zl)%^#WB<6#2enDej!b<1r$;w8`1AM7%;omu9X3y))(DtE9r)$jZUic8(?-4TlwFt*
zR~7JdHcHHE7;l8J1&cZ_%khnS%>E#k!*-fQM6@WTY7Nc$WF^M0e~M0s=>AlDSL7C_
z3>P~?>JA-R5r$j$J}50)8^&QN$hbgugWS~zQjQ2T=)XiHB+G3g;^N%}+K;~HYY-l7
z^+_OTz#B7QNbW5bJ~1h#IQ_N-NfXGWI)hD!pHvq2y8)4IIF@k`bGg3op&W19{{dHp
zM?!)cC<F~d!EcrbX6MS0??xS7-gM7Z)1>A}k@u%&<7MbauIYpy+cUM1->3+L)6mD3
z*sh<CXVfXH0G7vVSh&#B4#L;^hK9WOR=W+kAF{1>0Dwa<`G6lKlYy*KfWQAMa(aFm
z+5u2=T-u|Y@grvtGk61422VXaAvZF+u;6~>dGMUii^TZlPxollOb?Z4g}QSWy4Qt*
zKfXsDQ8*}|mjhPZy6f1}f0-ntLPC$58}jYXdx9X>DC68s*=l(Sq_-ap{?3z1cpP75
z31(VQv|7~BGx(|smv+*)BFJdL*HZA#xz+p^P;aEIwL8bdo%hFv+bl_?-zbO7K?r>f
zY4}|6<iY5BbDzt6IwX|L>RJ|VeeF_U^uB^fO=>1wsxy@$Facy{ZeA(_s>jpg3uAf*
zJ@}J3k)=knpTt3L`J3ib237Z17(zHZa#;|-QfK+~8X9`~ScrO_`L_G*(uM;}>_D#9
z<9j{|#^b~V!HJ{El(4T1$=3&CBrPosFN#5Iefc;X1VUJyM{VMlW^K7`I3b4r!7*u=
zl<AKZrN;YHeIcis0ZcSkhn~soplS^ujwmkf0t`ld;4TbF-QwmxfDE>XFo$yzjCUKK
zVG=I_`6I=qg5Q~ei3vYXvGh5W2k!^~3RD6|;IoRpyzYtd`hTVI*N^whKQCZSS;nu?
zF*~1<Y^D~^;b+KU(pw>DF@?y6WdUaLN}zY(hnSTlobhU*HZU6#fG5~ycj+JPrZCk<
zLrZ%Pq^TJgAdZFcOJG#E<>j~OU{N{3#>1F`@!j)FRlEhXFjK*KwtK7{iQwk$vmTFr
z#ZW!2hojPyVNH7Sgekb8K`|{OLmQB(+d>E&DKOx`a?8c?xQA!i;<xk5a(}G0>OxgU
z@J`0V=ptbcP;d8Ok`2P$+?J_f;JZQ$iGHC!PrjM5&L$b6VucXtgm1xUy8qKsfdHKE
zF|I4zLuzlB4|_jq`#GA4xqW-72nhQFQ2S!RN=i_L5#$k=<{)OivTu)Kmhnho@Upas
znYB{y5bb0=H0c_<Mi;L~g-c{`1zzpAiR)M#E@Q$+)rAs&T)wp`akIg}|2lXFV|BNf
zAf6&7UKaDak2x?C)PH{(Q;LRX|1|$tBt_0?N?(J%6C&x<Nfxm?5fcCSapqfV#5no5
zF>rxbXal$gJXcy#IRzOZ4gN^D`I~FmWH_ygFb!Jw(*ZS*gdtJypS9!=9ei4jg`6xW
zXx<<Lr)88n&~;^)t2T0Ri<#qp()-lbOwdyCe+~yO)BA%QjFq^5dzo4!N~|H6UOPuG
z6%`I2Oq%!nIH5X(fZ@&XUnkJR@9jI)CKkF-7Q+i3X+*)fR4e}(3uzxzDEHl0u)DLL
zQ<)*aF&VZZ_NdRCvh}MeRsr6u-v|yAfBdgx|4vrdQxIJD)|)qYpTBE`0bIzF@D3Vk
zAlCy#@*U2>U=0uaU{$N@WjOGH;cFQ>ev|(KKA>LQ67-YKHKr(nyL)WP<bO)I4o9f}
z|9|$%ID6B{CS*lcMkSPR_Eu&>BAG|w;v&gRl8{akvX48mXLdrQ@sSZ_L>%9z-|r9L
z?%wa$csw5~-0Hgr6UNk!(-HJ+FpGd_GhWCr4ORhJv54tH-n~Ef-B-A928MSKYPMzj
z;5EPrYxBcAt`^a@4VUGJOtEWHli_0-c#sROxI3UtByLDga(TFD?9$E*Cs}`)bcyMJ
z(`+FBt-O@fkwvP!ASaIE@s+4u!<C}OQ&kl>wqY)Wu5EP+tIiGrh->)I)_k+mIBKw9
zC?@|yjmnDcUF_$X9~`e?^sV7Ps@H%Nj2%a9Qe_=qZ+A=NA3XM558{nXXUijf2s1_A
z7|?`+Aq6sDZF6%joA=7ySNs#)SNiyHO0)%8Sh*N>I38PWDzlPYCSJQj!Vp~ZuNE1m
zp%6gUx7b`?6FK`B7S-@OO3@$aJ3I(@L+qASJxk08Yo`ZFfWGpyBdo{n`S<u}F-{o$
zp3J)3dH;e5B9scG`%SjtD8!3$yYqlz;0VM3p?|ap!O!2UT4u?Xvd|{&rPvuqaf~PJ
zy9!d966$ae7;H4%+xFZLXhop`mwF;Z3Lu3n<#XX%FN?=9kTxKJ%>D$;H<hL9iD26(
zsPjEM>JZBO+bZPbtqM85yFjz#sJfN83ZmM8lnn&jcw~W{*?%hfI4w#ePRUw?M31y%
zq>vjWKbv`3B<rqAS-^*h#Ga{fehhlUFzgI0b`iqrRrcB$SM2L<n8Afy0us!yi9++$
zQ|0ODmd6q28>aJ6aeF0<dW3GZ%Gz6euZu)!Xb=dG6>Y?vU3JR(dSIT`9d=OQj!e9;
zk6zn36}N%J1c<@t`gJ)-lYwjTbviue**V{ue}mvcTkbBeh*RYCutfB8<;dq^S(ba@
zr|J7#oLE0#DM(aZ&e4ug14btS*039#C=;*o77HK|+Bn~#fqCkzx3?7F^kfX8`Guzl
zMd|VMa7L6XF8*$CLqk$`rk<hv#h7`iSJsT*g;B8F0|V1<*Oa4&VEG~tFoacEb7kZL
z{5rDr+BV!Q{-q2~2CzLHjq;^775Q`EcGTQ}=}!Q=ScSvOWMh<mAY5tM`N9#l>nn6g
zl{QjT$YP~V+PDp*eenZts;APOpF;ufEx@T)A9h8ZRhNk*choK9hj=Yk7*Qo%>WXEh
zc!$jSj}ntH6kYnd^NJ!pQi!ImzfVRhY#o7dUs=7EIgfh&*%P<wfqQTjCv8%EH9={D
z^GCc&j;Ud;m#!7OdFd94^+Z)hYv5e(GwMkqbSdh4c=xbM)@bJp8A*sYBh)AZxpP7U
zkgIC8C8y4oxh6e2mxa)?C|mjVjk?C385NhD%#@V$n%mi>^;ABFDUmFMoXv2^=|y<-
z3pw`VrPAz}C{!d0%V_)1xMoTbTxBR?+ra%W3SuO_W2LcB?laR8<<MIwex&#*5Y{OH
zCa|%wVc_zF4joZA1wrEv?-NK*PY;4i801nBAaHJ$ofMBp9MHLPBefqo<Ro3}xwpcN
z&>rYMU`Cp${wtq(LIaUwN>~09pQ-<!$pGAt5oIt^y|B7!27FjCq<Squs^lvw#U^cx
z(-NV{gP|OBb9WDqp4nNa?d3G{n}|pTlEW`GJ0uM$)l(-c22r0Y<G?p1OJ8`EOcp^j
znxKDx_zY<O_A$ZJYyxVwtG14<rB*UWTLwxAjzU0RR{9%Em<C<+KL<3Khmj>zdQuDS
zJZvNHEh-fZ>wW*uKzFzlxc>KU?;Pt%`CL-7OX^|3+RTeGnF{KI=^kd|0yb>77~u^)
zeYb%uZ(*z*@9#?2*g>|Ek3MeMuNa5ptmxz@o+G929<xlyEsP7f9%3wL&imB8RZ})r
zF^zG@R8)_>jrmU6J%rlKiHL)plaJX%dzvLRj87A5wi{>if?ERS`kMEmy<+yxcKes)
ze3+{CvV-IgoZ2sIYbOS?yv2)2CZq~<P4A6spQun(l(s**isvXithWArzqE279$d6a
z|3Rp`s}Q{ao68ElmE)CP8Bv1=k|!5zt~{^)ZSaKu+s#sm>240s`yAcVgXE~WzT0Q-
zWL1dALy%`2xRj{_d-+U9Q?5?YCf#TLc8b@M$z<IfV~-z!g+YS+5Ac}?<=AjHr-Kjn
zZ3<cP4(Fhp2Qb5T$6l68EG=|HPOKJ{OS<dAIzRr_^R)C9Mef>PVtGQEQm+HF_a3ey
zTZpcov}rO9`k89{PvZn?AU9;z8JR}2;}W7~gm&@kzn@Zh+nXJq%P3dlF4y#4!9ZXC
zBjJuR*pmw+h#1Si9hO>O83<DvHbl|W*&i0yI4ZB|IAtB;-hOOKJIA~FY2?&JPlb7_
znPYL6IM)}F6^_KE@a+}5wVC4v37`oNf@6RxGDLom-Zc?hl+>*qDm%)}hRnjApjuuZ
z;ud)>{lIjkB`T<Bl|humLV1fq>)+xFJiZZfS`LnEU}(VO?Q0Gn{@7~yihq-xr&z~*
zII6E*w;J=VgrHwh^ux3`^YG@~AE5%Dq$V$2%61rP*=WJzJv}{r0SKP_sT{uPEiWfW
zP}!Dz7Fj5E4)=E2>}$n!y3S8zJO6S@Lxc$3`T;khPQ~X^lgm3Xe@o1p?2Pz1+T)s<
z_Gq+;iAfE-D0yET6b8J(<IyhBWg1U!lzTl67P~Pznr!2{^$OMeD7UxTes}tI&5lU^
z2*LTqlV3wwQsrS&`yT|)gqqIYsOxNR_qMaknXq>HP`J}o^JlA0VIT{Z2%zCH;Ez7}
zlgMehlpL!Egjxv-TKDktJA3)oh}$Y5&XW9HtpSlgXZA2D2aY0qd_5q1n1J)7ySv*J
zgxx&dn9ug&75WfG11pl@E&2}SZ8yT4;G1B=X#e^8pXy}{OCt?~bK}e3SIUSl_IZ{|
zr5OqS0a@{v*&4QKw1kh^i*7NpzT8=R_H8Dj<Xf<<qui{E(_O!LgfdYE;2In{&mbWO
zT1$6-Kj9mT-}jaGhHLwEpGoJsva0{+NPKJ+If-B`Taq-(-=mG56Oz+2^mI@1-t7Qb
zzYDEc!0~^3k*ebkxq^XwvnP;RNMII_a;Z)DQxvk5az3i^35!_b`0jMWW1+`~k>fSw
z-RO~37moX3gDP$c<eqA)7U#d^oLR|ljX4%oHjtV+f7s4GCE5hwdV4Rzw>llZDFsaJ
zR#8>eh{aQ?Zzir>Z;dJ}h{eq))JaqIdM*qxB+)mv%WBJscq<UsY*2vh)^v>}PNwoH
zC%`l`3Pj}Ru&>NOZ+bir-O_;01hGU`N#Y!@?<KBrjS06g#X^?Vmd%+bPYrrJHcJ1!
z&iPbBOEVn27w}uS@9XAej*1BUy~N?5-V>T+SAL;if@cGXrRV(FygWT0WoC8)V+S=>
zVrR}w%dAoz7qDgCe~EW~>yY!q(6Ez2K<VlHelg=t8op$wJkeuCh_Yky_W@HuGSLGR
zjw*<1LnTo+-0;SxgqANGS*>^Jf_K*41_KVW3w^4Wh1P04rIAB}G<phQ(!A<9Omr>2
z+)gLi$BLD)<_<w6K0LH^Uz3*Z_sz0SVp{5F$n@LVjkKE`<3v_=dt%DOE6bM`jE&u(
z=s{4+J7VZ}dUjky1>SdKZ{3~^`7<uaX+ZpKcNe2;F8&}u@89Xp&#f+zTu2^@jo5X)
zE(j)mg+TfV6_v+8s6tgx1}22?2n39D@WxF&a<TY5@~@HZZrtMSg(2$mIS;!>bsbuB
zVy3+tSme){v%S%24rFeOe|YwnN$PW@+sK(|!cj+I)y?m{@7JJ}$&6&C=IcPY&$#m-
zH!?--0d`;LtuU4`ur!@lgq%gO{Easvu>^&3BUzF*^olY(K$eULM8Ym8XbLSTM<M5%
zVKBvB0LEx>SR*gykToPFzT>l5#n@kpog4qX<kZ<W@P0X$`tXYZJuybh?eAsL>-)2G
zaZMpYbfz>1$S^kgTH_kuc~;UIW)=VMsag0=Ja#7j)!6`}xG8mBg8<_Uy{?aERQO$t
zT0}h5a&pVBxxojo5jI$yE3)W>!!ToGR(+iZ^LJUZLG+bOoJs!M{adrEZNdF#jUSV$
zk$Bj-jw_b7*QW^O{8?q~s{>8D3zo?Hl+pK;_UoofvZO2aU3lLgN}~NU;^QNqRKz4V
zyswdYzT#xcN8J}X`Sh55;<@9fQN`%p0hJfe>5g6`Ks#{qR7LHD-XM}g`#ObnB2WLz
zk|CTAUKScnx@cZ}bvsU=>jRaQ&16vPEBtx1P1%yUD@wxpGm9owb*vMK0cj_O`n!WG
zTg7&pq5fzE3VP&~D{i7mT4-`?MuKo&MzaAG_JW**Z()b!JoEw?KT1#U0ck@*B4K}@
z6ye3m&CR~cqp(ZWIdO*j)DE}i(363mUe5Gk`DzJ`<H57>&#*X}Ojk$k5tO~t6Xom!
z#u)0*SH7MmW^yPYMQt}P3f-cg4@ebVS6mbD(Ko(iXTg?zk4B~;voBD_<Vx9g!VqNF
z6e<tS3ROV)FTr77@Ed-&L09ia-eRy<vj@8{ZB30gx+#U4z%4Yp<nuxI*Pi3PV0LU&
zG+DN%>-E8HH(bnfG}Yer%T9`zujxUyY`8$K=v2F5b)^$!zhRX>XF-jK?9g<2P0P$g
zg06o;Ts#eSGL(%`E+NoPPR!yjHHQ7(#q-xPwaqN~+;R#>@=?omu6((t^2GWeNU*yh
zA&;Py(^qG)#(1k~;ddx5h$wKFUchglrf7q{t@>3E16w^3+pQ<sDmk$GWjh)4n@Y%t
z0EgTOc`&js<-*N|_3-Ag%*?dO*~TbLsNQ`CZFTiX`zXUAk#)iKA(f$|NnZknZi8x^
zOV=dImPCV#*c3<mryXRZR1(i3(|(bnNMxOc4(A8_o}fHykvB(ANJ=V$5=HC;^}8TA
z(flS+o!<9G_H}Z?=|$_yQABGFwlraqzN@gO$M}~|E41uZs%7Gm{#<oGS>*3xH+j;=
zQGYbd?<o+H)m#@TehfVu0@Raz=JuO8zFKgBU9goBI>%CD+oWbj3Yx*&7vYnY((IF!
z%DfUAizxrTS|ZE)FSaUet5c&!3=E@b1ZfXw>N)nrWO8x%KcFRSz#tA&%{Lq7rvxpJ
zNqvt_+j3`zk{&M3ig>(r>5?z$0mGAHr#GsF-tuG@;W@0fE{95g;oS?xVQ+Dz@x*$N
zF8jo{?37qIIP?M81x7Xj7}T#qFP&MVj{0Q#Wa8(qynB5g-L^3JCG@yDI)rnbO~T^G
zIen!8V_}Q&2nTnn+T(&Ab1cX-bEF+k>5mEKl3LkSX_)1qg=4a)q{Q?3R8_H>re@>t
zq;r2Kb851YzP$t6efh{$>(s*sp#rh^UsmJBBvDZYrkQi)*_5v0fn|7|Qv8`!>qXQc
zt^b+!EVmuLz{J@`6)`#tFM1V(HtiUQ-Ce$R?V4(~9gw)jz?4Fb=i`3oBMkQrgD=k&
zX&T?KHn}8)I-5O@naVyz<$pZszi>y=iLmArpTQ9VGv9u@()KDRl8>>-%|-mZg{k=a
z1KY!E2ZC6eaZT9~AYD5$VEyuNa<&Vf3B5iKx@nu=8}^`TC=3B@wSFBfk$)v<wf3W(
z*baOB`*PuF-@%<;#1KNl<D#<R$6^x>X<D83dXkRyc(vN{sAx)MKo|CcN(tp$$G}H^
zQ}!+%(w%u^f0mrN`ekv?^Z-eTh534X{>D#HJ&}I-{drm8fMTDZ!ShOHq7$l~Tkqg0
z3PTTJDi;rrZX|%1VNhVyvobSj<y~6xc$^i*kx3<k3;Qfh7l|J)GOrgnXg3LHRmZP$
zeG<6KK$B11j@V-QGyUGjRd+om8=tpl@8?$Q2P;895XsOrW06YJvX-th*-*qS)n0$!
zBI-{AKAfCKR4<{}F#2gUd*L~M|HbGm{6vNGgdwy`aZVCr4nM-YDom=+jcdD--z0o<
zoYOYbZO%IEQ+YmfsBDn7VUd_31uyHdRyj6WimeD``}5)@36VOUS2p?9bMV6cof;0*
za2brf|8HY0;T2lszVx;g?*4#+kDqKVExj&zCCSd~fLy~oHddQyuP`vscVkP-tB(Bu
zg=*eep8e8srsEA}`4mILLIV@WLyLPo6sLctYaZ4%j$HL?Q`%->(MvHLpl~j}mK+g9
zMW8UH`c=FeEFu%zaARw~CFj2&@A#v;x%GUCp;^0?$jWTLC7Q|)!^M-F`u)NfVqVE~
z%CU^;@0hz9`?HX;m*`spx4rKOdaTU{@@cS-bA&NfpY>MFAo-EP>%!kO96l7ga#vB7
zY&-YWeBWV9gszs77+UsUn1SS(cLD$RS6nww_zJF5OUNlc?8U~DgiYU#INaD$X>h)i
zVrb-k(Q&i$y6a!UN~NrMEJKL)gDD3M`l6=sU>QWS&?i2aHUjHe;B&dYT8ebKs8iFq
sx1ooqzT2c(n2t;eclj@Tu-}Q1d=)#eD(-6ph1CdSqf3Tw^j+ir2c10anE(I)

diff --git a/doc/baboon_vector.svg b/doc/baboon_vector.svg
deleted file mode 100644
index dc1667af91..0000000000
--- a/doc/baboon_vector.svg
+++ /dev/null
@@ -1,153 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3181"
-   version="1.1"
-   inkscape:version="0.48.0 r9654"
-   width="1750"
-   height="960"
-   xml:space="preserve"
-   sodipodi:docname="baboon_vector.svg"><metadata
-     id="metadata3187"><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><defs
-     id="defs3185"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3195"><path
-         d="M 0,768 1400,768 1400,0 0,0 0,768 z"
-         id="path3197" /></clipPath><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3215"><path
-         d="M 0,768 1400,768 1400,0 0,0 0,768 z"
-         id="path3217" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="851"
-     id="namedview3183"
-     showgrid="false"
-     inkscape:zoom="0.20550291"
-     inkscape:cx="1534.1667"
-     inkscape:cy="795.78156"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3189" /><g
-     id="g3189"
-     inkscape:groupmode="layer"
-     inkscape:label="baboon_vector"
-     transform="matrix(1.25,0,0,-1.25,0,960)"><g
-       id="g3191"><g
-         id="g3193"
-         clip-path="url(#clipPath3195)"><g
-           id="g3199"
-           transform="translate(458.9561,569.9678)"><path
-             d="m 0,0 59.835,69.355 87.034,26.518 133.949,-7.479 c 0,0 74.116,-32.639 74.795,-34.678 0.68,-2.04 84.314,-59.155 84.314,-59.155 l 12.238,-74.795 5.439,-97.912 -13.598,-25.159 -4.76,-40.797 -18.358,-23.118 24.39,-5.561 0.501,-5.192 -14.012,-60.641 16.477,-93.368 7.223,-49.972 -208.295,-51.754 -18.552,4.005 -37.468,8.325 -10.036,4.036 -66.885,10.101 c 0,0 -14.959,74.793 -16.999,73.433 -2.039,-1.359 -42.836,56.437 -42.836,56.437 l -19.719,65.274 12.48,74.571 -7.961,9.643 -26.479,16.187 -12.716,38.309 4.08,48.277 8.769,38.985 L 6.608,-74.308 0,0 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3201" /></g><g
-           id="g3203"
-           transform="translate(78.8657,682.1582)"><path
-             d="M 0,0 142.789,40.797 259.74,52.355 313.457,-232.543 204.665,-291.698 78.194,-293.738 0,0 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3205" /></g><g
-           id="g3207"
-           transform="translate(269.5122,345.2344)"><path
-             d="M 0,0 18.801,-74.425 40.728,-85.408 59.539,-59.541 40.259,13.503 36.821,15.669 0,0 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path3209" /></g></g></g><g
-       id="g3223"
-       transform="translate(741.918,109.0332)"><path
-         d="m 0,0 -17.236,-9.401 -16.452,-22.721 -0.783,12.537 6.268,17.234 13.317,6.268 L 0,7.833 14.884,3.917 0,0 z m 172.622,-21.824 c -0.031,0.271 -0.081,0.535 -0.117,0.804 -20.85,7.653 -49.59,7.327 -66.874,10.927 -13.849,2.886 -23.047,9.119 -27.032,12.298 -9.863,-8.494 -12.025,-14.377 -12.025,-14.377 0,0 -9.816,15.309 -30.17,25.76 -7.05,3.621 -17.767,5.691 -29.341,5.691 -24.297,0 -52.384,-9.155 -58.339,-32.223 -10.458,-40.511 9.697,-76.594 49.814,-77.623 1.325,-0.034 2.623,-0.12 3.894,-0.12 36.131,0 48.855,8.572 58.323,15.478 0.027,0.021 0.104,0 0.104,0 0,0 25.126,-11.506 53.529,-11.506 4.419,0 9.156,0.415 14.249,1.063 31.641,4.018 47.989,28.124 43.985,63.828"
-         style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3225"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3227"
-       transform="translate(300.8481,270.0254)"><path
-         d="m 0,0 c -3.063,-0.691 -12.535,0.784 -12.535,0.784 l 6.267,-25.853 43.481,13.319 -9.01,27.418 C 28.203,15.668 7.867,1.777 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3229"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3231"
-       transform="translate(211.66052,615.85984)"><path
-         d="m 0,0 -16.243,-2.871 -15.462,-9.4 4.323,-10.938 14.568,9.89 L 2.75,-8.771 0,0 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3233"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3235"
-       transform="translate(274.15732,626.4084)"><path
-         d="m 0,0 -15.64,0.407 -14.279,-3.608 2.008,-9.747 14.756,4.208 L 1.111,-8.215 0,0 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3237"
-         inkscape:connector-curvature="0" /></g><path
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 436.65625 22.28125 C 436.65625 22.28125 338.18375 25.385 251 42.8125 C 163.24875 60.35375 70.40625 99.65625 70.40625 99.65625 L 175.1875 495.28125 L 327.96875 492.34375 L 337.75 527.59375 C 337.75 527.59375 365.095 523.25875 373 518.78125 C 376.31375 516.90375 383.78125 508 383.78125 508 L 377.75 484.65625 L 504.21875 407.15625 L 436.65625 22.28125 z M 410.53125 55.1875 L 465.6875 393.3125 L 346.59375 456.625 L 202.75 466.46875 L 112 114.40625 L 263 79.1875 L 410.53125 55.1875 z "
-       transform="matrix(0.8,0,0,-0.8,0,768)"
-       id="path3253" /><g
-       id="g3247"
-       transform="matrix(1.199238,-0.02879331,0.02673084,1.0520756,172.41935,498.37339)"><path
-         d="m 0,0 c 0,0 -1.861,1.481 -9.143,-1.457 9.712,18.867 9.439,39.989 9.439,39.989 0,0 -3.106,-2.465 -11.311,-8.47 9.241,23.044 5.338,72.525 5.338,72.525 0,0 -17.493,40.746 -13.657,45.799 8.841,11.65 23.834,23.968 44.295,25.594 17.935,1.424 44.606,-4.953 55.865,-15.284 4.536,-4.161 23.367,-47.493 23.367,-47.493 0,0 6.104,-35.271 11.619,-54.108 5.513,-18.839 11.054,-26.674 21.284,-34.825 17.831,-14.207 27.076,-29.938 27.076,-29.938 L 143.399,3.945 c 3.655,-17.356 14.875,-34.28 27.39,-47.672 -12.863,1.507 -19.61,8.783 -19.61,8.783 0,0 2.151,-12.664 9.109,-26.554 l 28.712,15.264 -1.762,10.805 c -5.128,9.304 -9.336,15.534 -9.336,15.534 0,0 2.089,0.956 7.385,-3.572 l -2.005,12.296 c -4.814,9.391 -11.773,16.752 -25.115,31.113 5.944,-6.087 15.438,-5.379 20.751,-4.356 l -0.572,3.512 c -2.231,1.278 -5.494,3.171 -10.241,5.957 -12.43,7.299 -22.326,21.049 -22.326,21.049 0,0 12.85,1.815 20.513,11.022 -7.316,-2.641 -18.585,0.799 -18.585,0.799 -17.086,6.772 -15.022,30.217 -17.687,50.587 -2.667,20.37 -9.299,34.125 -9.299,34.125 0,0 -0.243,2.149 11.91,-5.906 -7.744,33.215 -35.545,44.94 -35.545,44.94 0,0 2.223,2.79 22.843,0.044 -16.469,15.817 -32.303,16.896 -32.303,16.896 0,0 10.077,2.25 23.611,0.24 0,0 -3.327,3.508 -7.549,6.453 L 35.985,194.291 -77.543,167.815 -8.211,-101.17 17.481,-99.413 C 8.602,-85.114 -0.371,-63.837 -2.15,-40.857 -4.911,-5.208 0,0 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3249"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3255"
-       transform="translate(204.22134,580.88353)"><path
-         d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.523,0.677 3.551,1.094 5.786,1.094 2.164,0 4.133,-0.39 5.639,-1.029 0.711,1.081 1.129,2.374 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3257"
-         inkscape:connector-curvature="0" /></g><g
-       id="g3259"
-       transform="translate(256.3311,595.31646)"><path
-         d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.524,0.677 3.552,1.094 5.787,1.094 2.163,0 4.132,-0.39 5.638,-1.029 0.712,1.081 1.129,2.373 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3261"
-         inkscape:connector-curvature="0" /></g><g
-       id="g4174"
-       transform="matrix(0.99694509,0.07810563,-0.07810563,0.99694509,47.348748,-15.348299)"><g
-         transform="translate(222.5098,610.1558)"
-         id="g3219"><path
-           inkscape:connector-curvature="0"
-           id="path3221"
-           style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="m 0,0 4.45,2.752 5.34,3.785 7.05,-8.226 7.093,-33.359 17.801,-51.259 13.86,-30.215 26.261,-1.55 -6.685,-35.653 c 0,0 -49.98,-21.871 -49.545,-21.911 -42.657,4.001 -12.553,43.066 -8.631,47.301 L 3.666,-47.869 0,0 z" /></g><g
-         transform="translate(247.626,467.3545)"
-         id="g3239"><path
-           inkscape:connector-curvature="0"
-           id="path3241"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 0,0 C -3.044,-0.345 -5.232,-3.092 -4.888,-6.136 -4.543,-9.18 1.576,-2.254 13.308,-4.961 13.971,-1.97 3.044,0.344 0,0" /></g><g
-         transform="translate(279.4419,476.5762)"
-         id="g3243"><path
-           inkscape:connector-curvature="0"
-           id="path3245"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 0,0 C 3.271,1.08 6.798,-0.697 7.88,-3.969 8.96,-7.24 -0.55,-3.044 -11.258,-11.329 -13.345,-8.586 -3.272,-1.081 0,0" /></g><g
-         transform="translate(284.1929,525.9082)"
-         id="g3263"><path
-           inkscape:connector-curvature="0"
-           id="path3265"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           d="M 0,0 C 0,0 -6.972,28.671 -6.972,29.355 L 1.585,2.864 9.999,-10.564 13.634,-32.697 7.922,-11.098 0,0 z M -0.633,-15.036 -9.19,-4.86 -16.478,25.776 c -0.202,0.684 9.106,-28.811 9.106,-28.811 l 8.64,-11.642 2.469,-17.336 -4.37,16.977 z m -6.339,-6.085 -10.457,16.826 -5.444,28.646 6.614,-27.842 11.311,-18.026 1.413,-9.583 -3.437,9.979 z m -53.462,-13.246 -1.437,24.944 -2.682,28.754 5.106,-29.895 1.212,-21.677 4.139,-18.236 -6.338,16.11 z m -4.265,-19.55 -6.665,15.516 0.404,29.205 -0.882,28.169 3.104,-28.396 0.808,-26.697 4.242,-15.972 2.423,-6.617 -3.434,4.792 z m -9.695,-2.967 -7.117,16.885 1.318,32.01 0,25.223 2.115,-25.061 -0.581,-31.259 5.869,-16.429 5.056,-8.671 -6.66,7.302 z m 103.144,-7.97 -6.676,20.38 2.141,11.54 L 16.499,-9.376 4.557,13.104 -5.879,53.97 c 0,0 -8.325,-7.41 -16.781,-8.08 -8.455,-0.671 -15.09,4.018 -15.09,4.018 0,0 3.592,-17.761 8.659,-37.597 5.069,-19.836 17.528,-44.866 17.528,-44.866 0,0 21.578,-8.197 24.302,-16.587 2.724,-8.391 -3.508,-22.911 -14.102,-26.551 -10.593,-3.64 -32.284,-8.262 -32.284,-8.262 0,0 -19,1.512 -20.438,14.26 0,0 4.131,16.406 10.418,19.225 6.285,2.819 21.362,11.174 21.362,11.174 l -8.254,1.332 -7.664,-1.332 c 0,0 -4.784,11.295 -10.973,35.086 -6.19,23.79 -8.967,42.485 -8.967,42.485 0,0 -3.912,-4.391 -14.199,-4.885 -10.286,-0.494 -16.031,7.988 -16.031,7.988 l 1.027,-30.185 -1.049,-25.83 -0.15,-29.22 5.102,-15.99 19.818,-30.448 c 0,0 14.102,-9.293 31.728,-9.293 16.453,1.328 51.131,18.047 51.131,18.047 l 9.536,16.687 z" /></g></g><g
-       id="g3267"
-       transform="translate(847.2637,321.5059)"><path
-         d="m 0,0 c 2.252,3.516 6.693,15.3 6.693,15.3 0,0 3.778,-13.306 1.912,-17.213 -3.056,-6.404 -23.905,-15.3 -23.905,-15.3 0,0 12.196,12.364 15.3,17.213 m -33.514,23.16 -0.757,56.352 c 0,0 11.136,-14.028 11.843,-19.739 1.176,-9.491 -11.086,-36.613 -11.086,-36.613 m -17.575,236.921 c 0,0 12.453,-15.338 14.854,-21.39 1.424,-3.591 2.286,-15.287 2.286,-15.287 l -17.14,36.677 z M -98.574,-86.136 c -9.757,-0.906 -29.836,1.016 -38.912,4.708 -7.499,3.05 -25.734,19.656 -25.734,19.656 l 24.187,-10.86 -4.701,17.627 15.272,-22.009 41.813,-5.356 c 0,0 -8.812,-3.477 -11.925,-3.766 m -74.428,157.941 c -4.518,10.057 -1.763,44.065 -1.763,44.065 0,0 7.544,-31.093 12.338,-40.541 6.978,-13.754 37.015,-49.352 37.015,-49.352 0,0 -40.824,30.759 -47.59,45.828 m -17.833,-149.47 -40.407,24.724 1.636,-17.575 0.026,-0.035 -5.178,-29.811 -2.056,-10.701 0.383,-33.34 -4.982,36.406 6.41,41.45 -11.063,8.338 -17.532,43.159 23.502,-38.779 2.351,14.101 40.634,-25.695 11.924,-5.651 13.809,-28.871 -19.457,22.28 z m -85.522,138.863 17.212,-34.424 c 0,0 -12.972,11.185 -15.299,16.257 -1.905,4.152 -1.913,18.167 -1.913,18.167 m -2.367,66.042 c 0,0 -6.206,15.581 -6.323,21.082 -0.168,7.817 4.568,23.148 7.695,30.315 0.755,1.73 4.103,6.341 4.103,6.341 0,0 -4.654,-24.542 -5.347,-32.829 -0.518,-6.205 -0.128,-24.909 -0.128,-24.909 m -7.195,-114.809 c -0.334,3.363 1.912,13.387 1.912,13.387 l 3.825,-29.643 c 0,0 -5.313,11.967 -5.737,16.256 m -20.082,53.549 c -1.394,3.571 -0.956,15.301 -0.956,15.301 l 13.388,-30.6 c 0,0 -10.639,10.71 -12.432,15.299 m -6.03,106.795 c 0,0 -0.315,35.831 4.637,46.379 4.531,9.647 29.936,30.356 29.936,30.356 0,0 -17.824,-22.47 -21.503,-31.2 -5.089,-12.077 -10.119,-51.437 -10.119,-51.437 l -2.951,5.902 z M 50.121,205.01 c 3.335,-9.155 1.168,-38.956 1.168,-38.956 0,0 -5.451,29.987 -9.221,39.366 -4.214,10.487 -23.014,38.907 -23.014,38.907 0,0 26.78,-27.546 31.067,-39.317 M 54.506,95.624 c 0,0 6.884,-18.586 5.738,-24.861 -0.773,-4.241 -9.562,-14.345 -9.562,-14.345 0,0 2.414,12.874 2.868,17.212 0.573,5.474 0.956,21.994 0.956,21.994 M 19.125,-13.389 c 0,0 9.656,22.183 11.062,30.068 1.235,6.941 0,28.203 0,28.203 0,0 8.477,-22.819 7.106,-30.538 C 35.845,6.183 19.125,-13.389 19.125,-13.389 m 441.487,-40.965 c -3.249,8.935 -6.587,17.23 -10.01,24.928 l -1.862,28.873 -8.857,-4.876 -25.862,49.457 -4.828,-10.34 c -32.69,31.48 -70.457,34.284 -111.982,31.646 -65.568,-4.163 -91.587,-41.63 -79.098,-57.241 12.49,-15.613 18.733,-5.205 40.589,5.203 21.858,10.407 74.937,26.017 110.323,-2.082 35.386,-28.1 86.383,-109.281 50.997,-169.646 -35.386,-60.365 -105.626,-105.385 -182.135,-88.465 -86.422,19.112 -126.078,60.082 -177.675,74.811 -8.311,1.334 -18.347,2.789 -24.791,3.191 -12.671,0.792 -21.6,14.727 -21.6,14.727 l 17.181,-9.327 25.763,-2.36 c 2.331,14 9.395,49.054 9.395,49.054 l -8.688,87.29 -18.668,-27.06 -7.246,10.184 -21.349,-22.915 -15.473,-1.959 14.67,6.596 21.38,29.409 6.7,-13.754 19.485,24.691 0.004,-0.011 16.47,9.525 -3.123,68.69 10.407,-10.407 -4.163,40.59 22.173,71.502 -34.662,91.899 16.652,-4.162 -19.773,35.386 -40.591,38.509 9.368,17.693 -93.671,9.368 -20.229,-7.165 -18.437,38.292 13.22,8.813 -69.039,14.69 2.938,19.095 -80.791,-23.303 -26.147,-19.191 -116.339,0 8.814,-10.188 -42.501,-40.641 -8.911,-78.491 7.344,-1.494 8.814,-45.548 23.502,-24.978 19.096,45.533 -14.689,-4.409 41.13,48.474 30.848,26.44 -14.69,-1.469 19.096,16.158 105.763,2.938 72.917,15.799 -41.623,-14.742 -30.181,-7.285 -104.079,-1.043 1.04,-11.449 -64.526,-61.403 14.571,2.081 -27.844,-63.28 c -15.017,-13.719 -28.06,-55.016 -36.687,-75.145 -9.367,-21.856 -20.816,-39.55 -20.816,-39.55 0,0 -30.182,-6.244 -61.405,-18.734 -31.224,-12.489 -43.713,4.163 -43.713,4.163 l -3.122,-8.326 c 0,0 -18.28,-9.057 -39.303,-11.825 -16.43,-2.162 -9.967,-20.946 -9.613,-26.684 0.405,-6.57 4.294,-19.774 8.325,-24.978 3.227,-4.165 12.525,-10.425 17.694,-11.448 12.039,-2.385 28.101,5.204 45.794,17.693 74.936,-6.245 103.241,-10.321 126.974,8.326 14.572,11.448 29.142,22.897 41.631,40.59 l -15.611,42.671 -8.327,-14.569 -5.807,44.931 1.841,17.863 5.547,-51.234 7.789,9.257 35.387,-70.772 11.448,4.164 c 0,0 13.515,-18.583 23.057,-32.881 l -26.02,25.006 -10.224,-5.964 -11.076,22.152 c 0,0 -13.383,-2.353 -24.727,-18.027 -15.862,-21.915 -23.503,-24.678 -17.627,-78.735 5.876,-54.055 16.452,-54.055 64.632,-121.039 11.752,-16.452 14.601,-18.465 14.601,-18.465 l -51.03,-27.365 -22.327,-5.876 -21.384,-11.28 c 0,0 4.744,-8.174 7.495,-9.369 4.739,-2.062 20.613,1.56 20.613,1.56 0,0 15.603,-6.763 36.756,-6.763 21.152,0 32.903,8.225 47.005,8.225 14.101,0 38.78,-8.225 57.582,-5.876 18.802,2.351 22.328,12.927 22.328,12.927 l -51.706,54.057 -4.675,47.096 -56.605,75.769 -3.038,9.437 65.791,-82.24 5.107,-46.75 55.161,-61.405 37.468,-8.325 c 0,0 -0.257,1.226 -0.625,3.114 -6.146,15.664 -6.986,34.894 -1.999,54.214 6.975,27.012 38.85,36.596 64.029,36.596 12.506,0 24.179,-2.312 32.025,-6.341 12.912,-6.63 21.851,-15.076 27.029,-20.917 3.673,4.516 7.133,7.194 11.833,11.11 0,0 12.143,-11.751 45.047,-14.101 27.14,-1.939 45.048,-8.226 70.901,-19.585 53.676,-23.584 102.5,-61.785 207.618,-45.132 105.119,16.651 206.073,113.444 164.442,227.929"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path3269"
-         inkscape:connector-curvature="0" /></g><path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 329.26398,723.3082 -118.025,-19.2 -120.800003,-28.175 72.600003,-281.65 115.075,7.875 95.275,50.65 -44.125,270.5 z m -6.55,-10.575 40.675,-252.4 -87.85,-47.275 -106.125,-7.325 -66.95,262.8 111.4,26.275 108.85,17.925 z"
-       id="path3253-3" /></g></svg>
\ No newline at end of file
diff --git a/doc/compress.html b/doc/compress.html
deleted file mode 100644
index a0fcb5796c..0000000000
--- a/doc/compress.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Compression Helper</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Script compression
-   helper */
-</pre>
-</div>
-
-    <p>To optimize loading CodeMirror, especially when including a
-    bunch of different modes, it is recommended that you combine and
-    minify (and preferably also gzip) the scripts. This page makes
-    those first two steps very easy. Simply select the version and
-    scripts you need in the form below, and
-    click <strong>Compress</strong> to download the minified script
-    file.</p>
-
-    <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post">
-      <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/>
-      <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px">
-        <option value="http://codemirror.net/">HEAD</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v3.0beta1;f=">3.0beta1</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.34;f=">2.34</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.33;f=">2.33</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.32;f=">2.32</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.31;f=">2.31</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.3;f=">2.3</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.25;f=">2.25</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.24;f=">2.24</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.23;f=">2.23</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.22;f=">2.22</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.21;f=">2.21</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.2;f=">2.2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.18;f=">2.18</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.16;f=">2.16</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.15;f=">2.15</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.13;f=">2.13</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.12;f=">2.12</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.11;f=">2.11</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.1;f=">2.1</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.02;f=">2.02</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.01;f=">2.01</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=v2.0;f=">2.0</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=beta2;f=">beta2</option>
-        <option value="http://marijnhaverbeke.nl/git/codemirror?a=blob_plain;hb=beta1;f=">beta1</option>
-      </select></p>
-
-      <select multiple="multiple" size="20" name="code_url" style="width: 40em;" class="field" id="files">
-        <optgroup label="CodeMirror Library">
-          <option value="http://codemirror.net/lib/codemirror.js" selected>codemirror.js</option>
-        </optgroup>
-        <optgroup label="Modes">
-          <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option>
-          <option value="http://codemirror.net/mode/clojure/clojure.js">clojure.js</option>
-          <option value="http://codemirror.net/mode/coffeescript/coffeescript.js">coffeescript.js</option>
-          <option value="http://codemirror.net/mode/commonlisp/commonlisp.js">commonlisp.js</option>
-          <option value="http://codemirror.net/mode/css/css.js">css.js</option>
-          <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option>
-          <option value="http://codemirror.net/mode/ecl/ecl.js">ecl.js</option>
-          <option value="http://codemirror.net/mode/erlang/erlang.js">erlang.js</option>
-          <option value="http://codemirror.net/mode/gfm/gfm.js">gfm.js</option>
-          <option value="http://codemirror.net/mode/go/go.js">go.js</option>
-          <option value="http://codemirror.net/mode/groovy/groovy.js">groovy.js</option>
-          <option value="http://codemirror.net/mode/haskell/haskell.js">haskell.js</option>
-          <option value="http://codemirror.net/mode/haxe/haxe.js">haxe.js</option>
-          <option value="http://codemirror.net/mode/htmlembedded/htmlembedded.js">htmlembedded.js</option>
-          <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option>
-          <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option>
-          <option value="http://codemirror.net/mode/jinja2/jinja2.js">jinja2.js</option>
-          <option value="http://codemirror.net/mode/less/less.js">less.js</option>
-          <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option>
-          <option value="http://codemirror.net/mode/markdown/markdown.js">markdown.js</option>
-          <option value="http://codemirror.net/mode/mysql/mysql.js">mysql.js</option>
-          <option value="http://codemirror.net/mode/ntriples/ntriples.js">ntriples.js</option>
-          <option value="http://codemirror.net/mode/ocaml/ocaml.js">ocaml.js</option>
-          <option value="http://codemirror.net/mode/pascal/pascal.js">pascal.js</option>
-          <option value="http://codemirror.net/mode/perl/perl.js">perl.js</option>
-          <option value="http://codemirror.net/mode/php/php.js">php.js</option>
-          <option value="http://codemirror.net/mode/pig/pig.js">pig.js</option>
-          <option value="http://codemirror.net/mode/plsql/plsql.js">plsql.js</option>
-          <option value="http://codemirror.net/mode/properties/properties.js">properties.js</option>
-          <option value="http://codemirror.net/mode/python/python.js">python.js</option>
-          <option value="http://codemirror.net/mode/r/r.js">r.js</option>
-          <option value="http://codemirror.net/mode/rpm/changes/changes.js">rpm/changes.js</option>
-          <option value="http://codemirror.net/mode/rpm/spec/spec.js">rpm/spec.js</option>
-          <option value="http://codemirror.net/mode/rst/rst.js">rst.js</option>
-          <option value="http://codemirror.net/mode/ruby/ruby.js">ruby.js</option>
-          <option value="http://codemirror.net/mode/rust/rust.js">rust.js</option>
-          <option value="http://codemirror.net/mode/scheme/scheme.js">scheme.js</option>
-          <option value="http://codemirror.net/mode/shell/shell.js">shell.js</option>
-          <option value="http://codemirror.net/mode/sieve/sieve.js">sieve.js</option>
-          <option value="http://codemirror.net/mode/smalltalk/smalltalk.js">smalltalk.js</option>
-          <option value="http://codemirror.net/mode/smarty/smarty.js">smarty.js</option>
-          <option value="http://codemirror.net/mode/sparql/sparql.js">sparql.js</option>
-          <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option>
-          <option value="http://codemirror.net/mode/tiddlywiki/tiddlywiki.js">tiddlywiki.js</option>
-          <option value="http://codemirror.net/mode/tiki/tiki.js">tiki.js</option>
-          <option value="http://codemirror.net/mode/vb/vb.js">vb.js</option>
-          <option value="http://codemirror.net/mode/vbscript/vbscript.js">vbscript.js</option>
-          <option value="http://codemirror.net/mode/velocity/velocity.js">velocity.js</option>
-          <option value="http://codemirror.net/mode/verilog/verilog.js">verilog.js</option>
-          <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option>
-          <option value="http://codemirror.net/mode/xquery/xquery.js">xquery.js</option>
-          <option value="http://codemirror.net/mode/yaml/yaml.js">yaml.js</option>
-        </optgroup>
-        <optgroup label="Utilities and add-ons">
-          <option value="http://codemirror.net/lib/util/overlay.js">overlay.js</option>
-          <option value="http://codemirror.net/lib/util/multiplex.js">multiplex.js</option>
-          <option value="http://codemirror.net/lib/util/runmode.js">runmode.js</option>
-          <option value="http://codemirror.net/lib/util/simple-hint.js">simple-hint.js</option>
-          <option value="http://codemirror.net/lib/util/javascript-hint.js">javascript-hint.js</option>
-          <option value="http://codemirror.net/lib/util/xml-hint.js">xml-hint.js</option>
-          <option value="http://codemirror.net/lib/util/foldcode.js">foldcode.js</option>
-          <option value="http://codemirror.net/lib/util/dialog.js">dialog.js</option>
-          <option value="http://codemirror.net/lib/util/search.js">search.js</option>
-          <option value="http://codemirror.net/lib/util/searchcursor.js">searchcursor.js</option>
-          <option value="http://codemirror.net/lib/util/formatting.js">formatting.js</option>
-          <option value="http://codemirror.net/lib/util/match-highlighter.js">match-highlighter.js</option>
-          <option value="http://codemirror.net/lib/util/closetag.js">closetag.js</option>
-          <option value="http://codemirror.net/lib/util/loadmode.js">loadmode.js</option>
-        </optgroup>
-        <optgroup label="Keymaps">
-          <option value="http://codemirror.net/keymap/emacs.js">emacs.js</option>
-          <option value="http://codemirror.net/keymap/vim.js">vim.js</option>
-        </optgroup>
-      </select></p>
-
-      <p>
-        <button type="submit">Compress</button> with <a href="http://github.com/mishoo/UglifyJS/">UglifyJS</a>
-      </p>
-
-      <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field"></textarea></p>
-    </form>
-
-    <script type="text/javascript">
-      function setVersion(ver) {
-        var urlprefix = ver.options[ver.selectedIndex].value;
-        var select = document.getElementById("files"), m;
-        for (var optgr = select.firstChild; optgr; optgr = optgr.nextSibling)
-          for (var opt = optgr.firstChild; opt; opt = opt.nextSibling) {
-            if (opt.nodeName != "OPTION")
-              continue;
-            else if (m = opt.value.match(/^http:\/\/codemirror.net\/(.*)$/))
-              opt.value = urlprefix + m[1];
-            else if (m = opt.value.match(/http:\/\/marijnhaverbeke.nl\/git\/codemirror\?a=blob_plain;hb=[^;]+;f=(.*)$/))
-              opt.value = urlprefix + m[1];
-          }
-       }
-    </script>
-
-  </body>
-</html>
diff --git a/doc/docs.css b/doc/docs.css
deleted file mode 100644
index f48e3b72a6..0000000000
--- a/doc/docs.css
+++ /dev/null
@@ -1,165 +0,0 @@
-body {
-  font-family: Droid Sans, Arial, sans-serif;
-  line-height: 1.5;
-  max-width: 64.3em;
-  margin: 3em auto;
-  padding: 0 1em;
-}
-
-h1 {
-  letter-spacing: -3px;
-  font-size: 3.23em;
-  font-weight: bold;
-  margin: 0;
-}
-
-h2 {
-  font-size: 1.23em;
-  font-weight: bold;
-  margin: .5em 0;
-  letter-spacing: -1px;
-}
-
-h3 {
-  font-size: 1em;
-  font-weight: bold;
-  margin: .4em 0;
-}
-
-pre {
-  background-color: #eee;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  border-radius: 6px;
-  padding: 1em;
-}
-
-pre.code {
-  margin: 0 1em;
-}
-
-.grey {
-  background-color: #eee;
-  border-radius: 6px;
-  margin-bottom: 1.65em;
-  margin-top: 0.825em;
-  padding: 0.825em 1.65em;
-  position: relative;
-}
-
-img.logo {
-  position: absolute;
-  right: -1em;
-  bottom: 4px;
-  max-width: 23.6875em; /* Scale image down with text to prevent clipping */
-}
-
-.grey > pre {
-  background:none;
-  border-radius:0;
-  padding:0;
-  margin:0;
-  font-size:2.2em;
-  line-height:1.2em;
-}
-
-a:link, a:visited, .quasilink {
-  color: #df0019;
-  cursor: pointer;
-  text-decoration: none;
-}
-
-a:hover, .quasilink:hover {
-  color: #800004;
-}
-
-h1 a:link, h1 a:visited, h1 a:hover {
-  color: black;
-}
-
-ul {
-  margin: 0;
-  padding-left: 1.2em;
-}
-
-a.download {
-  color: white;
-  background-color: #df0019;
-  width: 100%;
-  display: block;
-  text-align: center;
-  font-size: 1.23em;
-  font-weight: bold;
-  text-decoration: none;
-  -moz-border-radius: 6px;
-  -webkit-border-radius: 6px;
-  border-radius: 6px;
-  padding: .5em 0;
-  margin-bottom: 1em;
-}
-
-a.download:hover {
-  background-color: #bb0010;
-}
-
-.rel {
-  margin-bottom: 0;
-}
-
-.rel-note {
-  color: #777;
-  font-size: .9em;
-  margin-top: .1em;
-}
-
-.logo-braces {
-  color: #df0019;
-  position: relative;
-  top: -4px;
-}
-
-.blk {
-  float: left;
-}
-
-.left {
-  width: 37em;
-  padding-right: 6.53em;
-  padding-bottom: 1em;
-}
-
-.left1 {
-  width: 15.24em;
-  padding-right: 6.45em;
-}
-
-.left2 {
-  width: 15.24em;
-}
-
-.right {
-  width: 20.68em;
-}
-
-.leftbig {
-  width: 42.44em;
-  padding-right: 6.53em;
-}
-
-.rightsmall {
-  width: 15.24em;
-}
-
-.clear:after {
-  visibility: hidden;
-  display: block;
-  font-size: 0;
-  content: " ";
-  clear: both;
-  height: 0;
-}
-.clear { display: inline-block; }
-/* start commented backslash hack \*/
-* html .clear { height: 1%; }
-.clear { display: block; }
-/* close commented backslash hack */
diff --git a/doc/internals.html b/doc/internals.html
deleted file mode 100644
index d859419864..0000000000
--- a/doc/internals.html
+++ /dev/null
@@ -1,497 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Internals</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <style>dl dl {margin: 0;} .update {color: #d40 !important}</style>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* (Re-) Implementing A Syntax-
-   Highlighting Editor in JavaScript */
-</pre>
-</div>
-
-<div class="clear"><div class="leftbig blk">
-
-<p style="font-size: 85%" id="intro">
-  <strong>Topic:</strong> JavaScript, code editor implementation<br>
-  <strong>Author:</strong> Marijn Haverbeke<br>
-  <strong>Date:</strong> March 2nd 2011 (updated November 13th 2011)
-</p>
-
-<p>This is a followup to
-my <a href="http://codemirror.net/story.html">Brutal Odyssey to the
-Dark Side of the DOM Tree</a> story. That one describes the
-mind-bending process of implementing (what would become) CodeMirror 1.
-This one describes the internals of CodeMirror 2, a complete rewrite
-and rethink of the old code base. I wanted to give this piece another
-Hunter Thompson copycat subtitle, but somehow that would be out of
-place—the process this time around was one of straightforward
-engineering, requiring no serious mind-bending whatsoever.</p>
-
-<p>So, what is wrong with CodeMirror 1? I'd estimate, by mailing list
-activity and general search-engine presence, that it has been
-integrated into about a thousand systems by now. The most prominent
-one, since a few weeks,
-being <a href="http://googlecode.blogspot.com/2011/01/make-quick-fixes-quicker-on-google.html">Google
-code's project hosting</a>. It works, and it's being used widely.</a>
-
-<p>Still, I did not start replacing it because I was bored. CodeMirror
-1 was heavily reliant on <code>designMode</code>
-or <code>contentEditable</code> (depending on the browser). Neither of
-these are well specified (HTML5 tries
-to <a href="http://www.w3.org/TR/html5/editing.html#contenteditable">specify</a>
-their basics), and, more importantly, they tend to be one of the more
-obscure and buggy areas of browser functionality—CodeMirror, by using
-this functionality in a non-typical way, was constantly running up
-against browser bugs. WebKit wouldn't show an empty line at the end of
-the document, and in some releases would suddenly get unbearably slow.
-Firefox would show the cursor in the wrong place. Internet Explorer
-would insist on linkifying everything that looked like a URL or email
-address, a behaviour that can't be turned off. Some bugs I managed to
-work around (which was often a frustrating, painful process), others,
-such as the Firefox cursor placement, I gave up on, and had to tell
-user after user that they were known problems, but not something I
-could help.</p>
-
-<p>Also, there is the fact that <code>designMode</code> (which seemed
-to be less buggy than <code>contentEditable</code> in Webkit and
-Firefox, and was thus used by CodeMirror 1 in those browsers) requires
-a frame. Frames are another tricky area. It takes some effort to
-prevent getting tripped up by domain restrictions, they don't
-initialize synchronously, behave strangely in response to the back
-button, and, on several browsers, can't be moved around the DOM
-without having them re-initialize. They did provide a very nice way to
-namespace the library, though—CodeMirror 1 could freely pollute the
-namespace inside the frame.</p>
-
-<p>Finally, working with an editable document means working with
-selection in arbitrary DOM structures. Internet Explorer (8 and
-before) has an utterly different (and awkward) selection API than all
-of the other browsers, and even among the different implementations of
-<code>document.selection</code>, details about how exactly a selection
-is represented vary quite a bit. Add to that the fact that Opera's
-selection support tended to be very buggy until recently, and you can
-imagine why CodeMirror 1 contains 700 lines of selection-handling
-code.</p>
-
-<p>And that brings us to the main issue with the CodeMirror 1
-code base: The proportion of browser-bug-workarounds to real
-application code was getting dangerously high. By building on top of a
-few dodgy features, I put the system in a vulnerable position—any
-incompatibility and bugginess in these features, I had to paper over
-with my own code. Not only did I have to do some serious stunt-work to
-get it to work on older browsers (as detailed in the
-previous <a href="http://codemirror.net/story.html">story</a>), things
-also kept breaking in newly released versions, requiring me to come up
-with <em>new</em> scary hacks in order to keep up. This was starting
-to lose its appeal.</p>
-
-<h2 id="approach">General Approach</h2>
-
-<p>What CodeMirror 2 does is try to sidestep most of the hairy hacks
-that came up in version 1. I owe a lot to the
-<a href="http://ace.ajax.org">ACE</a> editor for inspiration on how to
-approach this.</p>
-
-<p>I absolutely did not want to be completely reliant on key events to
-generate my input. Every JavaScript programmer knows that key event
-information is horrible and incomplete. Some people (most awesomely
-Mihai Bazon with <a href="http://ymacs.org">Ymacs</a>) have been able
-to build more or less functioning editors by directly reading key
-events, but it takes a lot of work (the kind of never-ending, fragile
-work I described earlier), and will never be able to properly support
-things like multi-keystoke international character
-input. <a href="#keymap" class="update">[see below for caveat]</a></p>
-
-<p>So what I do is focus a hidden textarea, and let the browser
-believe that the user is typing into that. What we show to the user is
-a DOM structure we built to represent his document. If this is updated
-quickly enough, and shows some kind of believable cursor, it feels
-like a real text-input control.</p>
-
-<p>Another big win is that this DOM representation does not have to
-span the whole document. Some CodeMirror 1 users insisted that they
-needed to put a 30 thousand line XML document into CodeMirror. Putting
-all that into the DOM takes a while, especially since, for some
-reason, an editable DOM tree is slower than a normal one on most
-browsers. If we have full control over what we show, we must only
-ensure that the visible part of the document has been added, and can
-do the rest only when needed. (Fortunately, the <code>onscroll</code>
-event works almost the same on all browsers, and lends itself well to
-displaying things only as they are scrolled into view.)</p>
-
-<h2 id="input">Input</h2>
-
-<p>ACE uses its hidden textarea only as a text input shim, and does
-all cursor movement and things like text deletion itself by directly
-handling key events. CodeMirror's way is to let the browser do its
-thing as much as possible, and not, for example, define its own set of
-key bindings. One way to do this would have been to have the whole
-document inside the hidden textarea, and after each key event update
-the display DOM to reflect what's in that textarea.</p>
-
-<p>That'd be simple, but it is not realistic. For even medium-sized
-document the editor would be constantly munging huge strings, and get
-terribly slow. What CodeMirror 2 does is put the current selection,
-along with an extra line on the top and on the bottom, into the
-textarea.</p>
-
-<p>This means that the arrow keys (and their ctrl-variations), home,
-end, etcetera, do not have to be handled specially. We just read the
-cursor position in the textarea, and update our cursor to match it.
-Also, copy and paste work pretty much for free, and people get their
-native key bindings, without any special work on my part. For example,
-I have emacs key bindings configured for Chrome and Firefox. There is
-no way for a script to detect this. <a class="update"
-href="#keymap">[no longer the case]</a></p>
-
-<p>Of course, since only a small part of the document sits in the
-textarea, keys like page up and ctrl-end won't do the right thing.
-CodeMirror is catching those events and handling them itself.</p>
-
-<h2 id="selection">Selection</h2>
-
-<p>Getting and setting the selection range of a textarea in modern
-browsers is trivial—you just use the <code>selectionStart</code>
-and <code>selectionEnd</code> properties. On IE you have to do some
-insane stuff with temporary ranges and compensating for the fact that
-moving the selection by a 'character' will treat \r\n as a single
-character, but even there it is possible to build functions that
-reliably set and get the selection range.</p>
-
-<p>But consider this typical case: When I'm somewhere in my document,
-press shift, and press the up arrow, something gets selected. Then, if
-I, still holding shift, press the up arrow again, the top of my
-selection is adjusted. The selection remembers where its <em>head</em>
-and its <em>anchor</em> are, and moves the head when we shift-move.
-This is a generally accepted property of selections, and done right by
-every editing component built in the past twenty years.</p>
-
-<p>But not something that the browser selection APIs expose.</p>
-
-<p>Great. So when someone creates an 'upside-down' selection, the next
-time CodeMirror has to update the textarea, it'll re-create the
-selection as an 'upside-up' selection, with the anchor at the top, and
-the next cursor motion will behave in an unexpected way—our second
-up-arrow press in the example above will not do anything, since it is
-interpreted in exactly the same way as the first.</p>
-
-<p>No problem. We'll just, ehm, detect that the selection is
-upside-down (you can tell by the way it was created), and then, when
-an upside-down selection is present, and a cursor-moving key is
-pressed in combination with shift, we quickly collapse the selection
-in the textarea to its start, allow the key to take effect, and then
-combine its new head with its old anchor to get the <em>real</em>
-selection.</p>
-
-<p>In short, scary hacks could not be avoided entirely in CodeMirror
-2.</p>
-
-<p>And, the observant reader might ask, how do you even know that a
-key combo is a cursor-moving combo, if you claim you support any
-native key bindings? Well, we don't, but we can learn. The editor
-keeps a set known cursor-movement combos (initialized to the
-predictable defaults), and updates this set when it observes that
-pressing a certain key had (only) the effect of moving the cursor.
-This, of course, doesn't work if the first time the key is used was
-for extending an inverted selection, but it works most of the
-time.</p>
-
-<h2 id="update">Intelligent Updating</h2>
-
-<p>One thing that always comes up when you have a complicated internal
-state that's reflected in some user-visible external representation
-(in this case, the displayed code and the textarea's content) is
-keeping the two in sync. The naive way is to just update the display
-every time you change your state, but this is not only error prone
-(you'll forget), it also easily leads to duplicate work on big,
-composite operations. Then you start passing around flags indicating
-whether the display should be updated in an attempt to be efficient
-again and, well, at that point you might as well give up completely.</p>
-
-<p>I did go down that road, but then switched to a much simpler model:
-simply keep track of all the things that have been changed during an
-action, and then, only at the end, use this information to update the
-user-visible display.</p>
-
-<p>CodeMirror uses a concept of <em>operations</em>, which start by
-calling a specific set-up function that clears the state and end by
-calling another function that reads this state and does the required
-updating. Most event handlers, and all the user-visible methods that
-change state are wrapped like this. There's a method
-called <code>operation</code> that accepts a function, and returns
-another function that wraps the given function as an operation.</p>
-
-<p>It's trivial to extend this (as CodeMirror does) to detect nesting,
-and, when an operation is started inside an operation, simply
-increment the nesting count, and only do the updating when this count
-reaches zero again.</p>
-
-<p>If we have a set of changed ranges and know the currently shown
-range, we can (with some awkward code to deal with the fact that
-changes can add and remove lines, so we're dealing with a changing
-coordinate system) construct a map of the ranges that were left
-intact. We can then compare this map with the part of the document
-that's currently visible (based on scroll offset and editor height) to
-determine whether something needs to be updated.</p>
-
-<p>CodeMirror uses two update algorithms—a full refresh, where it just
-discards the whole part of the DOM that contains the edited text and
-rebuilds it, and a patch algorithm, where it uses the information
-about changed and intact ranges to update only the out-of-date parts
-of the DOM. When more than 30 percent (which is the current heuristic,
-might change) of the lines need to be updated, the full refresh is
-chosen (since it's faster to do than painstakingly finding and
-updating all the changed lines), in the other case it does the
-patching (so that, if you scroll a line or select another character,
-the whole screen doesn't have to be
-re-rendered). <span class="update">[the full-refresh
-algorithm was dropped, it wasn't really faster than the patching
-one]</span></p>
-
-<p>All updating uses <code>innerHTML</code> rather than direct DOM
-manipulation, since that still seems to be by far the fastest way to
-build documents. There's a per-line function that combines the
-highlighting, <a href="manual.html#markText">marking</a>, and
-selection info for that line into a snippet of HTML. The patch updater
-uses this to reset individual lines, the refresh updater builds an
-HTML chunk for the whole visible document at once, and then uses a
-single <code>innerHTML</code> update to do the refresh.</p>
-
-<h2 id="parse">Parsers can be Simple</h2>
-
-<p>When I wrote CodeMirror 1, I
-thought <a href="http://codemirror.net/story.html#parser">interruptable
-parsers</a> were a hugely scary and complicated thing, and I used a
-bunch of heavyweight abstractions to keep this supposed complexity
-under control: parsers
-were <a href="http://bob.pythonmac.org/archives/2005/07/06/iteration-in-javascript/">iterators</a>
-that consumed input from another iterator, and used funny
-closure-resetting tricks to copy and resume themselves.</p>
-
-<p>This made for a rather nice system, in that parsers formed strictly
-separate modules, and could be composed in predictable ways.
-Unfortunately, it was quite slow (stacking three or four iterators on
-top of each other), and extremely intimidating to people not used to a
-functional programming style.</p>
-
-<p>With a few small changes, however, we can keep all those
-advantages, but simplify the API and make the whole thing less
-indirect and inefficient. CodeMirror
-2's <a href="manual.html#modeapi">mode API</a> uses explicit state
-objects, and makes the parser/tokenizer a function that simply takes a
-state and a character stream abstraction, advances the stream one
-token, and returns the way the token should be styled. This state may
-be copied, optionally in a mode-defined way, in order to be able to
-continue a parse at a given point. Even someone who's never touched a
-lambda in his life can understand this approach. Additionally, far
-fewer objects are allocated in the course of parsing now.</p>
-
-<p>The biggest speedup comes from the fact that the parsing no longer
-has to touch the DOM though. In CodeMirror 1, on an older browser, you
-could <em>see</em> the parser work its way through the document,
-managing some twenty lines in each 50-millisecond time slice it got. It
-was reading its input from the DOM, and updating the DOM as it went
-along, which any experienced JavaScript programmer will immediately
-spot as a recipe for slowness. In CodeMirror 2, the parser usually
-finishes the whole document in a single 100-millisecond time slice—it
-manages some 1500 lines during that time on Chrome. All it has to do
-is munge strings, so there is no real reason for it to be slow
-anymore.</p>
-
-<h2 id="summary">What Gives?</h2>
-
-<p>Given all this, what can you expect from CodeMirror 2?</p>
-
-<ul>
-
-<li><strong>Small.</strong> the base library is
-some <span class="update">45k</span> when minified
-now, <span class="update">17k</span> when gzipped. It's smaller than
-its own logo.</li>
-
-<li><strong>Lightweight.</strong> CodeMirror 2 initializes very
-quickly, and does almost no work when it is not focused. This means
-you can treat it almost like a textarea, have multiple instances on a
-page without trouble.</li>
-
-<li><strong>Huge document support.</strong> Since highlighting is
-really fast, and no DOM structure is being built for non-visible
-content, you don't have to worry about locking up your browser when a
-user enters a megabyte-sized document.</li>
-
-<li><strong>Extended API.</strong> Some things kept coming up in the
-mailing list, such as marking pieces of text or lines, which were
-extremely hard to do with CodeMirror 1. The new version has proper
-support for these built in.</li>
-
-<li><strong>Tab support.</strong> Tabs inside editable documents were,
-for some reason, a no-go. At least six different people announced they
-were going to add tab support to CodeMirror 1, none survived (I mean,
-none delivered a working version). CodeMirror 2 no longer removes tabs
-from your document.</li>
-
-<li><strong>Sane styling.</strong> <code>iframe</code> nodes aren't
-really known for respecting document flow. Now that an editor instance
-is a plain <code>div</code> element, it is much easier to size it to
-fit the surrounding elements. You don't even have to make it scroll if
-you do not <a href="../demo/resize.html">want to</a>.</li>
-
-</ul>
-
-<p>On the downside, a CodeMirror 2 instance is <em>not</em> a native
-editable component. Though it does its best to emulate such a
-component as much as possible, there is functionality that browsers
-just do not allow us to hook into. Doing select-all from the context
-menu, for example, is not currently detected by CodeMirror.</p>
-
-<p id="changes" style="margin-top: 2em;"><span style="font-weight:
-bold">[Updates from November 13th 2011]</span> Recently, I've made
-some changes to the codebase that cause some of the text above to no
-longer be current. I've left the text intact, but added markers at the
-passages that are now inaccurate. The new situation is described
-below.</p>
-
-<h2 id="btree">Content Representation</h2>
-
-<p>The original implementation of CodeMirror 2 represented the
-document as a flat array of line objects. This worked well—splicing
-arrays will require the part of the array after the splice to be
-moved, but this is basically just a simple <code>memmove</code> of a
-bunch of pointers, so it is cheap even for huge documents.</p>
-
-<p>However, I recently added line wrapping and code folding (line
-collapsing, basically). Once lines start taking up a non-constant
-amount of vertical space, looking up a line by vertical position
-(which is needed when someone clicks the document, and to determine
-the visible part of the document during scrolling) can only be done
-with a linear scan through the whole array, summing up line heights as
-you go. Seeing how I've been going out of my way to make big documents
-fast, this is not acceptable.</p>
-
-<p>The new representation is based on a B-tree. The leaves of the tree
-contain arrays of line objects, with a fixed minimum and maximum size,
-and the non-leaf nodes simply hold arrays of child nodes. Each node
-stores both the amount of lines that live below them and the vertical
-space taken up by these lines. This allows the tree to be indexed both
-by line number and by vertical position, and all access has
-logarithmic complexity in relation to the document size.</p>
-
-<p>I gave line objects and tree nodes parent pointers, to the node
-above them. When a line has to update its height, it can simply walk
-these pointers to the top of the tree, adding or subtracting the
-difference in height from each node it encounters. The parent pointers
-also make it cheaper (in complexity terms, the difference is probably
-tiny in normal-sized documents) to find the current line number when
-given a line object. In the old approach, the whole document array had
-to be searched. Now, we can just walk up the tree and count the sizes
-of the nodes coming before us at each level.</p>
-
-<p>I chose B-trees, not regular binary trees, mostly because they
-allow for very fast bulk insertions and deletions. When there is a big
-change to a document, it typically involves adding, deleting, or
-replacing a chunk of subsequent lines. In a regular balanced tree, all
-these inserts or deletes would have to be done separately, which could
-be really expensive. In a B-tree, to insert a chunk, you just walk
-down the tree once to find where it should go, insert them all in one
-shot, and then break up the node if needed. This breaking up might
-involve breaking up nodes further up, but only requires a single pass
-back up the tree. For deletion, I'm somewhat lax in keeping things
-balanced—I just collapse nodes into a leaf when their child count goes
-below a given number. This means that there are some weird editing
-patterns that may result in a seriously unbalanced tree, but even such
-an unbalanced tree will perform well, unless you spend a day making
-strangely repeating edits to a really big document.</p>
-
-<h2 id="keymap">Keymaps</h2>
-
-<p><a href="#approach">Above</a>, I claimed that directly catching key
-events for things like cursor movement is impractical because it
-requires some browser-specific kludges. I then proceeded to explain
-some awful <a href="#selection">hacks</a> that were needed to make it
-possible for the selection changes to be detected through the
-textarea. In fact, the second hack is about as bad as the first.</p>
-
-<p>On top of that, in the presence of user-configurable tab sizes and
-collapsed and wrapped lines, lining up cursor movement in the textarea
-with what's visible on the screen becomes a nightmare. Thus, I've
-decided to move to a model where the textarea's selection is no longer
-depended on.</p>
-
-<p>So I moved to a model where all cursor movement is handled by my
-own code. This adds support for a goal column, proper interaction of
-cursor movement with collapsed lines, and makes it possible for
-vertical movement to move through wrapped lines properly, instead of
-just treating them like non-wrapped lines.</p>
-
-<p>The key event handlers now translate the key event into a string,
-something like <code>Ctrl-Home</code> or <code>Shift-Cmd-R</code>, and
-use that string to look up an action to perform. To make keybinding
-customizable, this lookup goes through
-a <a href="manual.html#option_keyMap">table</a>, using a scheme that
-allows such tables to be chained together (for example, the default
-Mac bindings fall through to a table named 'emacsy', which defines
-basic Emacs-style bindings like <code>Ctrl-F</code>, and which is also
-used by the custom Emacs bindings).</p>
-
-<p>A new
-option <a href="manual.html#option_extraKeys"><code>extraKeys</code></a>
-allows ad-hoc keybindings to be defined in a much nicer way than what
-was possible with the
-old <a href="manual.html#option_onKeyEvent"><code>onKeyEvent</code></a>
-callback. You simply provide an object mapping key identifiers to
-functions, instead of painstakingly looking at raw key events.</p>
-
-<p>Built-in commands map to strings, rather than functions, for
-example <code>"goLineUp"</code> is the default action bound to the up
-arrow key. This allows new keymaps to refer to them without
-duplicating any code. New commands can be defined by assigning to
-the <code>CodeMirror.commands</code> object, which maps such commands
-to functions.</p>
-
-<p>The hidden textarea now only holds the current selection, with no
-extra characters around it. This has a nice advantage: polling for
-input becomes much, much faster. If there's a big selection, this text
-does not have to be read from the textarea every time—when we poll,
-just noticing that something is still selected is enough to tell us
-that no new text was typed.</p>
-
-<p>The reason that cheap polling is important is that many browsers do
-not fire useful events on IME (input method engine) input, which is
-the thing where people inputting a language like Japanese or Chinese
-use multiple keystrokes to create a character or sequence of
-characters. Most modern browsers fire <code>input</code> when the
-composing is finished, but many don't fire anything when the character
-is updated <em>during</em> composition. So we poll, whenever the
-editor is focused, to provide immediate updates of the display.</p>
-
-</div><div class="rightsmall blk">
-
-    <h2>Contents</h2>
-
-    <ul>
-      <li><a href="#intro">Introduction</a></li>
-      <li><a href="#approach">General Approach</a></li>
-      <li><a href="#input">Input</a></li>
-      <li><a href="#selection">Selection</a></li>
-      <li><a href="#update">Intelligent Updating</a></li>
-      <li><a href="#parse">Parsing</a></li>
-      <li><a href="#summary">What Gives?</a></li>
-      <li><a href="#btree">Content Representation</a></li>
-      <li><a href="#keymap">Key Maps</a></li>
-    </ul>
-
-</div></div>
-
-<div style="height: 2em">&nbsp;</div>
-
-</body></html>
diff --git a/doc/manual.html b/doc/manual.html
deleted file mode 100644
index 1c60eeeb3a..0000000000
--- a/doc/manual.html
+++ /dev/null
@@ -1,1231 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: User Manual</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <style>dl dl {margin: 0;}</style>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* User manual and
-   reference guide */
-</pre>
-</div>
-
-<div class="clear"><div class="leftbig blk">
-
-    <h2 id="overview">Overview</h2>
-
-    <p>CodeMirror is a code-editor component that can be embedded in
-    Web pages. The code library provides <em>only</em> the editor
-    component, no accompanying buttons, auto-completion, or other IDE
-    functionality. It does provide a rich API on top of which such
-    functionality can be straightforwardly implemented. See
-    the <a href="#addons">add-ons</a> included in the distribution,
-    and
-    the <a href="https://github.com/jagthedrummer/codemirror-ui">CodeMirror
-    UI</a> project, for reusable implementations of extra features.</p>
-
-    <p>CodeMirror works with language-specific modes. Modes are
-    JavaScript programs that help color (and optionally indent) text
-    written in a given language. The distribution comes with a number
-    of modes (see the <code>mode/</code> directory), and it isn't hard
-    to <a href="#modeapi">write new ones</a> for other languages.</p>
-
-    <h2 id="usage">Basic Usage</h2>
-
-    <p>The easiest way to use CodeMirror is to simply load the script
-    and style sheet found under <code>lib/</code> in the distribution,
-    plus a mode script from one of the <code>mode/</code> directories
-    and a theme stylesheet from <code>theme/</code>. (See
-    also <a href="compress.html">the compression helper</a>.) For
-    example:</p>
-
-    <pre>&lt;script src="lib/codemirror.js">&lt;/script>
-&lt;link rel="stylesheet" href="../lib/codemirror.css">
-&lt;script src="mode/javascript/javascript.js">&lt;/script></pre>
-
-    <p>Having done this, an editor instance can be created like
-    this:</p>
-
-    <pre>var myCodeMirror = CodeMirror(document.body);</pre>
-
-    <p>The editor will be appended to the document body, will start
-    empty, and will use the mode that we loaded. To have more control
-    over the new editor, a configuration object can be passed
-    to <code>CodeMirror</code> as a second argument:</p>
-
-    <pre>var myCodeMirror = CodeMirror(document.body, {
-  value: "function myScript(){return 100;}\n",
-  mode:  "javascript"
-});</pre>
-
-    <p>This will initialize the editor with a piece of code already in
-    it, and explicitly tell it to use the JavaScript mode (which is
-    useful when multiple modes are loaded).
-    See <a href="#config">below</a> for a full discussion of the
-    configuration options that CodeMirror accepts.</p>
-
-    <p>In cases where you don't want to append the editor to an
-    element, and need more control over the way it is inserted, the
-    first argument to the <code>CodeMirror</code> function can also
-    be a function that, when given a DOM element, inserts it into the
-    document somewhere. This could be used to, for example, replace a
-    textarea with a real editor:</p>
-
-    <pre>var myCodeMirror = CodeMirror(function(elt) {
-  myTextArea.parentNode.replaceChild(elt, myTextArea);
-}, {value: myTextArea.value});</pre>
-
-    <p>However, for this use case, which is a common way to use
-    CodeMirror, the library provides a much more powerful
-    shortcut:</p>
-
-    <pre>var myCodeMirror = CodeMirror.fromTextArea(myTextArea);</pre>
-
-    <p>This will, among other things, ensure that the textarea's value
-    is updated when the form (if it is part of a form) is submitted.
-    See the <a href="#fromTextArea">API reference</a> for a full
-    description of this method.</p>
-
-    <h2 id="config">Configuration</h2>
-
-    <p>Both the <code>CodeMirror</code> function and
-    its <code>fromTextArea</code> method take as second (optional)
-    argument an object containing configuration options. Any option
-    not supplied like this will be taken
-    from <code>CodeMirror.defaults</code>, an object containing the
-    default options. You can update this object to change the defaults
-    on your page.</p>
-
-    <p>Options are not checked in any way, so setting bogus option
-    values is bound to lead to odd errors.</p>
-
-    <p>These are the supported options:</p>
-
-    <dl>
-      <dt id="option_value"><code>value (string)</code></dt>
-      <dd>The starting value of the editor.</dd>
-
-      <dt id="option_mode"><code>mode (string or object)</code></dt>
-      <dd>The mode to use. When not given, this will default to the
-      first mode that was loaded. It may be a string, which either
-      simply names the mode or is
-      a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type
-      associated with the mode. Alternatively, it may be an object
-      containing configuration options for the mode, with
-      a <code>name</code> property that names the mode (for
-      example <code>{name: "javascript", json: true}</code>). The demo
-      pages for each mode contain information about what configuration
-      parameters the mode supports. You can ask CodeMirror which modes
-      and MIME types are loaded with
-      the <code>CodeMirror.listModes</code>
-      and <code>CodeMirror.listMIMEs</code> functions.</dd>
-
-      <dt id="option_theme"><code>theme (string)</code></dt>
-      <dd>The theme to style the editor with. You must make sure the
-      CSS file defining the corresponding <code>.cm-s-[name]</code>
-      styles is loaded (see
-      the <a href="../theme/"><code>theme</code></a> directory in the
-      distribution). The default is <code>"default"</code>, for which
-      colors are included in <code>codemirror.css</code>. It is
-      possible to use multiple theming classes at once—for
-      example <code>"foo bar"</code> will assign both
-      the <code>cm-s-foo</code> and the <code>cm-s-bar</code> classes
-      to the editor.</dd>
-
-      <dt id="option_indentUnit"><code>indentUnit (integer)</code></dt>
-      <dd>How many spaces a block (whatever that means in the edited
-      language) should be indented. The default is 2.</dd>
-
-      <dt id="option_smartIndent"><code>smartIndent (boolean)</code></dt>
-      <dd>Whether to use the context-sensitive indentation that the
-      mode provides (or just indent the same as the line before).
-      Defaults to true.</dd>
-
-      <dt id="option_tabSize"><code>tabSize (integer)</code></dt>
-      <dd>The width of a tab character. Defaults to 4.</dd>
-
-      <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt>
-      <dd>Whether, when indenting, the first N*<code>tabSize</code>
-      spaces should be replaced by N tabs. Default is false.</dd>
-
-      <dt id="option_electricChars"><code>electricChars (boolean)</code></dt>
-      <dd>Configures whether the editor should re-indent the current
-      line when a character is typed that might change its proper
-      indentation (only works if the mode supports indentation).
-      Default is true.</dd>
-
-      <dt id="option_autoClearEmptyLines"><code>autoClearEmptyLines (boolean)</code></dt>
-      <dd>When turned on (default is off), this will
-      automatically clear lines consisting only of whitespace when the
-      cursor leaves them. This is mostly useful to prevent auto
-      indentation from introducing trailing whitespace in a file.</dd>
-
-      <dt id="option_keyMap"><code>keyMap (string)</code></dt>
-      <dd>Configures the keymap to use. The default
-      is <code>"default"</code>, which is the only keymap defined
-      in <code>codemirror.js</code> itself. Extra keymaps are found in
-      the <a href="../keymap/"><code>keymap</code></a> directory. See
-      the <a href="#keymaps">section on keymaps</a> for more
-      information.</dd>
-
-      <dt id="option_extraKeys"><code>extraKeys (object)</code></dt>
-      <dd>Can be used to specify extra keybindings for the editor,
-      alongside the ones defined
-      by <a href="#option_keyMap"><code>keyMap</code></a>. Should be
-      either null, or a valid <a href="#keymaps">keymap</a> value.</dd>
-
-      <dt id="option_lineWrapping"><code>lineWrapping (boolean)</code></dt>
-      <dd>Whether CodeMirror should scroll or wrap for long lines.
-      Defaults to <code>false</code> (scroll).</dd>
-
-      <dt id="option_lineNumbers"><code>lineNumbers (boolean)</code></dt>
-      <dd>Whether to show line numbers to the left of the editor.</dd>
-
-      <dt id="option_firstLineNumber"><code>firstLineNumber (integer)</code></dt>
-      <dd>At which number to start counting lines. Default is 1.</dd>
-
-      <dt id="option_lineNumberFormatter"><code>lineNumberFormatter (function(integer))</code></dt>
-      <dd>A function used to format line numbers. The function is passed the current line number. Default prints the line number verbatim.</dd>
-
-      <dt id="option_gutter"><code>gutter (boolean)</code></dt>
-      <dd>Can be used to force a 'gutter' (empty space on the left of
-      the editor) to be shown even when no line numbers are active.
-      This is useful for setting <a href="#setMarker">markers</a>.</dd>
-
-      <dt id="option_fixedGutter"><code>fixedGutter (boolean)</code></dt>
-      <dd>When enabled (off by default), this will make the gutter
-      stay visible when the document is scrolled horizontally.</dd>
-
-      <dt id="option_readOnly"><code>readOnly (boolean)</code></dt>
-      <dd>This disables editing of the editor content by the user. If
-      the special value <code>"nocursor"</code> is given (instead of
-      simply <code>true</code>), focusing of the editor is also
-      disallowed.</dd>
-
-      <dt id="option_onChange"><code>onChange (function)</code></dt>
-      <dd>When given, this function will be called every time the
-      content of the editor is changed. It will be given the editor
-      instance as first argument, and an <code>{from, to, text, next}</code>
-      object containing information about the changes
-      that occurred as second argument. <code>from</code>
-      and <code>to</code> are the positions (in the pre-change
-      coordinate system) where the change started and
-      ended (for example, it might be <code>{ch:0, line:18}</code> if the
-      position is at the beginning of line #19). <code>text</code>
-      is an array of strings representing the text that replaced the changed
-      range (split by line). If multiple changes happened during a single
-      operation, the object will have a <code>next</code> property pointing to
-      another change object (which may point to another, etc).</dd>
-
-      <dt id="option_onCursorActivity"><code>onCursorActivity (function)</code></dt>
-      <dd>Will be called when the cursor or selection moves, or any
-      change is made to the editor content.</dd>
-
-      <dt id="option_onViewportChange"><code>onViewportChange (function)</code></dt>
-      <dd>When given, will be called whenever
-      the <a href="#getViewport">view port</a> of the editor changes
-      (due to scrolling, editing, or any other factor). It will be
-      passed three arguments, the editor instance, the start of the
-      viewport, and its end.</dd>
-
-      <dt id="option_onGutterClick"><code>onGutterClick (function)</code></dt>
-      <dd>When given, will be called whenever the editor gutter (the
-      line-number area) is clicked. Will be given the editor instance
-      as first argument, the (zero-based) number of the line that was
-      clicked as second argument, and the raw <code>mousedown</code>
-      event object as third argument.</dd>
-
-      <dt id="option_onFocus"><code>onFocus, onBlur (function)</code></dt>
-      <dd>The given functions will be called whenever the editor is
-      focused or unfocused.</dd>
-
-      <dt id="option_onScroll"><code>onScroll (function)</code></dt>
-      <dd>When given, will be called whenever the editor is
-      scrolled.</dd>
-
-      <dt id="option_onUpdate"><code>onUpdate (function)</code></dt>
-      <dd>Will be called whenever CodeMirror updates its DOM display.</dd>
-
-      <dt id="option_matchBrackets"><code>matchBrackets (boolean)</code></dt>
-      <dd>Determines whether brackets are matched whenever the cursor
-      is moved next to a bracket.</dd>
-
-      <dt id="option_cursorBlinkRate"><code>cursorBlinkRate (number)</code></dt>
-      <dd>Half-period in milliseconds used for cursor blinking. The default blink
-      rate is 530ms.</dd>
-
-      <dt id="option_workTime"><code>workTime, workDelay (number)</code></dt>
-      <dd>Highlighting is done by a pseudo background-thread that will
-      work for <code>workTime</code> milliseconds, and then use
-      timeout to sleep for <code>workDelay</code> milliseconds. The
-      defaults are 200 and 300, you can change these options to make
-      the highlighting more or less aggressive.</dd>
-
-      <dt id="option_pollInterval"><code>pollInterval (number)</code></dt>
-      <dd>Indicates how quickly CodeMirror should poll its input
-      textarea for changes. Most input is captured by events, but some
-      things, like IME input on some browsers, doesn't generate events
-      that allow CodeMirror to properly detect it. Thus, it polls.
-      Default is 100 milliseconds.</dd>
-
-      <dt id="option_undoDepth"><code>undoDepth (integer)</code></dt>
-      <dd>The maximum number of undo levels that the editor stores.
-      Defaults to 40.</dd>
-
-      <dt id="option_tabindex"><code>tabindex (integer)</code></dt>
-      <dd>The <a href="http://www.w3.org/TR/html401/interact/forms.html#adef-tabindex">tab
-      index</a> to assign to the editor. If not given, no tab index
-      will be assigned.</dd>
-
-      <dt id="option_autofocus"><code>autofocus (boolean)</code></dt>
-      <dd>Can be used to make CodeMirror focus itself on
-      initialization. Defaults to off.
-      When <a href="#fromTextArea"><code>fromTextArea</code></a> is
-      used, and no explicit value is given for this option, it will be
-      set to true when either the source textarea is focused, or it
-      has an <code>autofocus</code> attribute and no other element is
-      focused.</dd>
-
-      <dt id="option_dragDrop"><code>dragDrop (boolean)</code></dt>
-      <dd>Controls whether drag-and-drop is enabled. On by default.</dd>
-
-      <dt id="option_onDragEvent"><code>onDragEvent (function)</code></dt>
-      <dd>When given, this will be called when the editor is handling
-      a <code>dragenter</code>, <code>dragover</code>,
-      or <code>drop</code> event. It will be passed the editor instance
-      and the event object as arguments. The callback can choose to
-      handle the event itself, in which case it should
-      return <code>true</code> to indicate that CodeMirror should not
-      do anything further.</dd>
-
-      <dt id="option_onKeyEvent"><code>onKeyEvent (function)</code></dt>
-      <dd>This provides a rather low-level hook into CodeMirror's key
-      handling. If provided, this function will be called on
-      every <code>keydown</code>, <code>keyup</code>,
-      and <code>keypress</code> event that CodeMirror captures. It
-      will be passed two arguments, the editor instance and the key
-      event. This key event is pretty much the raw key event, except
-      that a <code>stop()</code> method is always added to it. You
-      could feed it to, for example, <code>jQuery.Event</code> to
-      further normalize it.<br>This function can inspect the key
-      event, and handle it if it wants to. It may return true to tell
-      CodeMirror to ignore the event. Be wary that, on some browsers,
-      stopping a <code>keydown</code> does not stop
-      the <code>keypress</code> from firing, whereas on others it
-      does. If you respond to an event, you should probably inspect
-      its <code>type</code> property and only do something when it
-      is <code>keydown</code> (or <code>keypress</code> for actions
-      that need character data).</dd>
-    </dl>
-
-    <h2 id="keymaps">Keymaps</h2>
-
-    <p>Keymaps are ways to associate keys with functionality. A keymap
-    is an object mapping strings that identify the keys to functions
-    that implement their functionality.</p>
-
-    <p>Keys are identified either by name or by character.
-    The <code>CodeMirror.keyNames</code> object defines names for
-    common keys and associates them with their key codes. Examples of
-    names defined here are <code>Enter</code>, <code>F5</code>,
-    and <code>Q</code>. These can be prefixed
-    with <code>Shift-</code>, <code>Cmd-</code>, <code>Ctrl-</code>,
-    and <code>Alt-</code> (in that order!) to specify a modifier. So
-    for example, <code>Shift-Ctrl-Space</code> would be a valid key
-    identifier.</p>
-
-    <p>Alternatively, a character can be specified directly by
-    surrounding it in single quotes, for example <code>'$'</code>
-    or <code>'q'</code>. Due to limitations in the way browsers fire
-    key events, these may not be prefixed with modifiers.</p>
-
-    <p>The <code>CodeMirror.keyMap</code> object associates keymaps
-    with names. User code and keymap definitions can assign extra
-    properties to this object. Anywhere where a keymap is expected, a
-    string can be given, which will be looked up in this object. It
-    also contains the <code>"default"</code> keymap holding the
-    default bindings.</p>
-
-    <p>The values of properties in keymaps can be either functions of
-    a single argument (the CodeMirror instance), strings, or
-    <code>false</code>. Such strings refer to properties of the
-    <code>CodeMirror.commands</code> object, which defines a number of
-    common commands that are used by the default keybindings, and maps
-    them to functions. If the property is set to <code>false</code>,
-    CodeMirror leaves handling of the key up to the browser. A key
-    handler function may throw <code>CodeMirror.Pass</code> to indicate
-    that it has decided not to handle the key, and other handlers (or
-    the default behavior) should be given a turn.</p>
-
-    <p>Keys mapped to command names that start with the
-    characters <code>"go"</code> (which should be used for
-    cursor-movement actions) will be fired even when an
-    extra <code>Shift</code> modifier is present (i.e. <code>"Up":
-    "goLineUp"</code> matches both up and shift-up). This is used to
-    easily implement shift-selection.</p>
-
-    <p>Keymaps can defer to each other by defining
-    a <code>fallthrough</code> property. This indicates that when a
-    key is not found in the map itself, one or more other maps should
-    be searched. It can hold either a single keymap or an array of
-    keymaps.</p>
-
-    <p>When a keymap contains a <code>nofallthrough</code> property
-    set to <code>true</code>, keys matched against that map will be
-    ignored if they don't match any of the bindings in the map (no
-    further child maps will be tried, and the default effect of
-    inserting a character will not occur).</p>
-
-    <h2 id="styling">Customized Styling</h2>
-
-    <p>Up to a certain extent, CodeMirror's look can be changed by
-    modifying style sheet files. The style sheets supplied by modes
-    simply provide the colors for that mode, and can be adapted in a
-    very straightforward way. To style the editor itself, it is
-    possible to alter or override the styles defined
-    in <a href="../lib/codemirror.css"><code>codemirror.css</code></a>.</p>
-
-    <p>Some care must be taken there, since a lot of the rules in this
-    file are necessary to have CodeMirror function properly. Adjusting
-    colors should be safe, of course, and with some care a lot of
-    other things can be changed as well. The CSS classes defined in
-    this file serve the following roles:</p>
-
-    <dl>
-      <dt id="class_CodeMirror"><code>CodeMirror</code></dt>
-      <dd>The outer element of the editor. This should be used for the
-      editor width, borders and positioning. Can also be used to set
-      styles that should hold for everything inside the editor (such
-      as font and font size), or to set a background.</dd>
-
-      <dt id="class_CodeMirror_scroll"><code>CodeMirror-scroll</code></dt>
-      <dd>This determines the editor's height, and whether the editor
-      scrolls (<code>overflow: auto</code> + fixed height). By
-      default, it does. Giving this <code>height: auto; overflow:
-      visible;</code> will cause the editor to resize to fit its
-      content.</dd>
-
-      <dt id="class_CodeMirror_focused"><code>CodeMirror-focused</code></dt>
-      <dd>Whenever the editor is focused, the top element gets this
-      class. This is used to hide the cursor and give the selection a
-      different color when the editor is not focused.</dd>
-
-      <dt id="class_CodeMirror_gutter"><code>CodeMirror-gutter</code></dt>
-      <dd>Use this for giving a background or a border to the editor
-      gutter. Don't set any padding here,
-      use <code>CodeMirror-gutter-text</code> for that. By default,
-      the gutter is 'fluid', meaning it will adjust its width to the
-      maximum line number or line marker width. You can also set a
-      fixed width if you want.</dd>
-
-      <dt id="class_CodeMirror_gutter_text"><code>CodeMirror-gutter-text</code></dt>
-      <dd>Used to style the actual line numbers. For the numbers to
-      line up, you must make sure that the font in the gutter is the
-      same as the one in the rest of the editor, so you should
-      probably only set font style and size in
-      the <code>CodeMirror</code> class.</dd>
-
-      <dt id="class_CodeMirror_lines"><code>CodeMirror-lines</code></dt>
-      <dd>The visible lines. If this has vertical
-      padding, <code>CodeMirror-gutter</code> should have the same
-      padding.</dd>
-
-      <dt id="class_CodeMirror_cursor"><code>CodeMirror-cursor</code></dt>
-      <dd>The cursor is a block element that is absolutely positioned.
-      You can make it look whichever way you want.</dd>
-
-      <dt id="class_CodeMirror_selected"><code>CodeMirror-selected</code></dt>
-      <dd>The selection is represented by <code>span</code> elements
-      with this class.</dd>
-
-      <dt id="class_CodeMirror_matchingbracket"><code>CodeMirror-matchingbracket</code>,
-        <code>CodeMirror-nonmatchingbracket</code></dt>
-      <dd>These are used to style matched (or unmatched) brackets.</dd>
-    </dl>
-
-    <p id="css-resize">So note carefully that, in order to resize the
-    editor, you should set a <code>width</code> on
-    the <a href="#getWrapperElement">wrapper</a>
-    (class <code>CodeMirror</code>) element, and a height on
-    the <a href="#getScrollerElement">scroller</a>
-    (class <code>CodeMirror-scroll</code>) element.</p>
-
-    <p>The actual lines, as well as the cursor, are represented
-    by <code>pre</code> elements. By default no text styling (such as
-    bold) that might change line height is applied. If you do want
-    such effects, you'll have to give <code>CodeMirror pre</code> a
-    fixed height.</p>
-
-    <p>If your page's style sheets do funky things to
-    all <code>div</code> or <code>pre</code> elements (you probably
-    shouldn't do that), you'll have to define rules to cancel these
-    effects out again for elements under the <code>CodeMirror</code>
-    class.</p>
-
-    <p>Themes are also simply CSS files, which define colors for
-    various syntactic elements. See the files in
-    the <a href="../theme/"><code>theme</code></a> directory.</p>
-
-    <h2 id="api">Programming API</h2>
-
-    <p>A lot of CodeMirror features are only available through its API.
-    This has the disadvantage that you need to do work to enable them,
-    and the advantage that CodeMirror will fit seamlessly into your
-    application.</p>
-
-    <p>Whenever points in the document are represented, the API uses
-    objects with <code>line</code> and <code>ch</code> properties.
-    Both are zero-based. CodeMirror makes sure to 'clip' any positions
-    passed by client code so that they fit inside the document, so you
-    shouldn't worry too much about sanitizing your coordinates. If you
-    give <code>ch</code> a value of <code>null</code>, or don't
-    specify it, it will be replaced with the length of the specified
-    line.</p>
-
-    <dl>
-      <dt id="getValue"><code>getValue() → string</code></dt>
-      <dd>Get the current editor content. You can pass it an optional
-      argument to specify the string to be used to separate lines
-      (defaults to <code>"\n"</code>).</dd>
-      <dt id="setValue"><code>setValue(string)</code></dt>
-      <dd>Set the editor content.</dd>
-
-      <dt id="getSelection"><code>getSelection() → string</code></dt>
-      <dd>Get the currently selected code.</dd>
-      <dt id="replaceSelection"><code>replaceSelection(string)</code></dt>
-      <dd>Replace the selection with the given string.</dd>
-
-      <dt id="setSize"><code>setSize(width, height)</code></dt>
-      <dd>Programatically set the size of the editor (overriding the
-      applicable <a href="#css-resize">CSS
-      rules</a>). <code>width</code> and <code>height</code> height
-      can be either numbers (interpreted as pixels) or CSS units
-      (<code>"100%"</code>, for example). You can
-      pass <code>null</code> for either of them to indicate that that
-      dimension should not be changed.</dd>
-      <dt id="focus"><code>focus()</code></dt>
-      <dd>Give the editor focus.</dd>
-      <dt id="scrollTo"><code>scrollTo(x, y)</code></dt>
-      <dd>Scroll the editor to a given (pixel) position. Both
-      arguments may be left as <code>null</code>
-      or <code>undefined</code> to have no effect.</dd>
-      <dt id="getScrollInfo"><code>getScrollInfo()</code></dt>
-      <dd>Get an <code>{x, y, width, height}</code> object that
-      represents the current scroll position and scrollable area size
-      of the editor.</dd>
-
-      <dt id="setOption"><code>setOption(option, value)</code></dt>
-      <dd>Change the configuration of the editor. <code>option</code>
-      should the name of an <a href="#config">option</a>,
-      and <code>value</code> should be a valid value for that
-      option.</dd>
-      <dt id="getOption"><code>getOption(option) → value</code></dt>
-      <dd>Retrieves the current value of the given option for this
-      editor instance.</dd>
-      <dt id="getMode"><code>getMode() → object</code></dt>
-      <dd>Gets the mode object for the editor. Note that this is
-      distinct from <code>getOption("mode")</code>, which gives you
-      the mode specification, rather than the resolved, instantiated
-      <a href="#defineMode">mode object</a>.</dd>
-
-      <dt id="cursorCoords"><code>cursorCoords(start, mode) → object</code></dt>
-      <dd>Returns an <code>{x, y, yBot}</code> object containing the
-      coordinates of the cursor. If <code>mode</code>
-      is <code>"local"</code>, they will be relative to the top-left
-      corner of the editable document. If it is <code>"page"</code> or
-      not given, they are relative to the top-left corner of the
-      page. <code>yBot</code> is the coordinate of the bottom of the
-      cursor. <code>start</code> is a boolean indicating whether you
-      want the start or the end of the selection.</dd>
-      <dt id="charCoords"><code>charCoords(pos, mode) → object</code></dt>
-      <dd>Like <code>cursorCoords</code>, but returns the position of
-      an arbitrary characters. <code>pos</code> should be
-      a <code>{line, ch}</code> object.</dd>
-      <dt id="coordsChar"><code>coordsChar(object) → pos</code></dt>
-      <dd>Given an <code>{x, y}</code> object (in page coordinates),
-      returns the <code>{line, ch}</code> position that corresponds to
-      it.</dd>
-
-      <dt id="undo"><code>undo()</code></dt>
-      <dd>Undo one edit (if any undo events are stored).</dd>
-      <dt id="redo"><code>redo()</code></dt>
-      <dd>Redo one undone edit.</dd>
-      <dt id="historySize"><code>historySize() → object</code></dt>
-      <dd>Returns an object with <code>{undo, redo}</code> properties,
-      both of which hold integers, indicating the amount of stored
-      undo and redo operations.</dd>
-      <dt id="clearHistory"><code>clearHistory()</code></dt>
-      <dd>Clears the editor's undo history.</dd>
-      <dt id="getHistory"><code>getHistory() → object</code></dt>
-      <dd>Get a (JSON-serializeable) representation of the undo history.</dd>
-      <dt id="setHistory"><code>setHistory(object)</code></dt>
-      <dd>Replace the editor's undo history with the one provided,
-      which must be a value as returned
-      by <a href="#getHistory"><code>getHistory</code></a>. Note that
-      this will have entirely undefined results if the editor content
-      isn't also the same as it was when <code>getHistory</code> was
-      called.</dd>
-
-      <dt id="indentLine"><code>indentLine(line, dir)</code></dt>
-      <dd>Reset the given line's indentation to the indentation
-      prescribed by the mode. If the second argument is given,
-      indentation will be increased (if <code>dir</code> is true) or
-      decreased (if false) by an <a href="#option_indentUnit">indent
-      unit</a> instead.</dd>
-
-      <dt id="getTokenAt"><code>getTokenAt(pos) → object</code></dt>
-      <dd>Retrieves information about the token the current mode found
-      before the given position (a <code>{line, ch}</code> object). The
-      returned object has the following properties:
-      <dl>
-        <dt><code>start</code></dt><dd>The character (on the given line) at which the token starts.</dd>
-        <dt><code>end</code></dt><dd>The character at which the token ends.</dd>
-        <dt><code>string</code></dt><dd>The token's string.</dd>
-        <dt><code>className</code></dt><dd>The class the mode assigned
-        to the token. (Can be null when no class was assigned.)</dd>
-        <dt><code>state</code></dt><dd>The mode's state at the end of this token.</dd>
-      </dl></dd>
-
-      <dt id="markText"><code>markText(from, to, className, options) → object</code></dt>
-      <dd>Can be used to mark a range of text with a specific CSS
-      class name. <code>from</code> and <code>to</code> should
-      be <code>{line, ch}</code> objects. The <code>options</code>
-      parameter is optional. When given, it should be an object that
-      may contain the following configuration options:
-      <dl>
-        <dt><code>inclusiveLeft</code></dt><dd>Determines whether
-        text inserted on the left of the marker will end up inside
-        or outside of it.</dd>
-        <dt><code>inclusiveRight</code></dt><dd>Like <code>inclusiveLeft</code>,
-        but for the right side.</dd>
-        <dt><code>startStyle</code></dt><dd>Can be used to specify
-        an extra CSS class to be applied to the leftmost span that
-        is part of the marker.</dd>
-        <dt><code>endStyle</code></dt><dd>Equivalent
-        to <code>startStyle</code>, but for the rightmost span.</dd>
-      </dl>
-      The method will return an object with two methods,
-      <code>clear()</code>, which removes the mark,
-      and <code>find()</code>, which returns a <code>{from, to}</code>
-      (both document positions), indicating the current position of
-      the marked range, or <code>undefined</code> if the marker is no
-      longer in the document.</dd>
-
-      <dt id="setBookmark"><code>setBookmark(pos) → object</code></dt>
-      <dd>Inserts a bookmark, a handle that follows the text around it
-      as it is being edited, at the given position. A bookmark has two
-      methods <code>find()</code> and <code>clear()</code>. The first
-      returns the current position of the bookmark, if it is still in
-      the document, and the second explicitly removes the
-      bookmark.</dd>
-
-      <dt id="findMarksAt"><code>findMarksAt(pos) → array</code></dt>
-      <dd>Returns an array of all the bookmarks and marked ranges
-      present at the given position.</dd>
-
-      <dt id="setMarker"><code>setMarker(line, text, className) → lineHandle</code></dt>
-      <dd>Add a gutter marker for the given line. Gutter markers are
-      shown in the line-number area (instead of the number for this
-      line). Both <code>text</code> and <code>className</code> are
-      optional. Setting <code>text</code> to a Unicode character like
-      ● tends to give a nice effect. To put a picture in the gutter,
-      set <code>text</code> to a space and <code>className</code> to
-      something that sets a background image. If you
-      specify <code>text</code>, the given text (which may contain
-      HTML) will, by default, replace the line number for that line.
-      If this is not what you want, you can include the
-      string <code>%N%</code> in the text, which will be replaced by
-      the line number.</dd>
-      <dt id="clearMarker"><code>clearMarker(line)</code></dt>
-      <dd>Clears a marker created
-      with <code>setMarker</code>. <code>line</code> can be either a
-      number or a handle returned by <code>setMarker</code> (since a
-      number may now refer to a different line if something was added
-      or deleted).</dd>
-      <dt id="setLineClass"><code>setLineClass(line, className, backgroundClassName) → lineHandle</code></dt>
-      <dd>Set a CSS class name for the given line. <code>line</code>
-      can be a number or a line handle (as returned
-      by <code>setMarker</code> or this
-      function). <code>className</code> will be used to style the text
-      for the line, and <code>backgroundClassName</code> to style its
-      background (which lies behind the selection).
-      Pass <code>null</code> to clear the classes for a line.</dd>
-      <dt id="hideLine"><code>hideLine(line) → lineHandle</code></dt>
-      <dd>Hide the given line (either by number or by handle). Hidden
-      lines don't show up in the editor, and their numbers are skipped
-      when <a href="#option_lineNumbers">line numbers</a> are enabled.
-      Deleting a region around them does delete them, and coping a
-      region around will include them in the copied text.</dd>
-      <dt id="showLine"><code>showLine(line) → lineHandle</code></dt>
-      <dd>The inverse of <code>hideLine</code>—re-shows a previously
-      hidden line, by number or by handle.</dd>
-
-      <dt id="onDeleteLine"><code>onDeleteLine(line, func)</code></dt>
-      <dd>Register a function that should be called when the line is
-      deleted from the document.</dd>
-
-      <dt id="lineInfo"><code>lineInfo(line) → object</code></dt>
-      <dd>Returns the line number, text content, and marker status of
-      the given line, which can be either a number or a handle
-      returned by <code>setMarker</code>. The returned object has the
-      structure <code>{line, handle, text, markerText, markerClass,
-      lineClass, bgClass}</code>.</dd>
-
-      <dt id="getLineHandle"><code>getLineHandle(num) → lineHandle</code></dt>
-      <dd>Fetches the line handle for the given line number.</dd>
-
-      <dt id="getViewport"><code>getViewport() → object</code></dt>
-      <dd>Returns a <code>{from, to}</code> object indicating the
-      start (inclusive) and end (exclusive) of the currently displayed
-      part of the document. In big documents, when most content is
-      scrolled out of view, CodeMirror will only render the visible
-      part, and a margin around it. See also
-      the <a href="#option_onViewportChange"><code>onViewportChange</code></a>
-      option.</dd>
-
-      <dt id="addWidget"><code>addWidget(pos, node, scrollIntoView)</code></dt>
-      <dd>Puts <code>node</code>, which should be an absolutely
-      positioned DOM node, into the editor, positioned right below the
-      given <code>{line, ch}</code> position.
-      When <code>scrollIntoView</code> is true, the editor will ensure
-      that the entire node is visible (if possible). To remove the
-      widget again, simply use DOM methods (move it somewhere else, or
-      call <code>removeChild</code> on its parent).</dd>
-
-      <dt id="matchBrackets"><code>matchBrackets()</code></dt>
-      <dd>Force matching-bracket-highlighting to happen.</dd>
-
-      <dt id="lineCount"><code>lineCount() → number</code></dt>
-      <dd>Get the number of lines in the editor.</dd>
-
-      <dt id="getCursor"><code>getCursor(start) → object</code></dt>
-      <dd><code>start</code> is a boolean indicating whether the start
-      or the end of the selection must be retrieved. If it is not
-      given, the current cursor pos, i.e. the side of the selection
-      that would move if you pressed an arrow key, is chosen.
-      A <code>{line, ch}</code> object will be returned.</dd>
-      <dt id="somethingSelected"><code>somethingSelected() → boolean</code></dt>
-      <dd>Return true if any text is selected.</dd>
-      <dt id="setCursor"><code>setCursor(pos)</code></dt>
-      <dd>Set the cursor position. You can either pass a
-      single <code>{line, ch}</code> object, or the line and the
-      character as two separate parameters.</dd>
-      <dt id="setSelection"><code>setSelection(start, end)</code></dt>
-      <dd>Set the selection range. <code>start</code>
-      and <code>end</code> should be <code>{line, ch}</code> objects.</dd>
-
-      <dt id="getLine"><code>getLine(n) → string</code></dt>
-      <dd>Get the content of line <code>n</code>.</dd>
-      <dt id="setLine"><code>setLine(n, text)</code></dt>
-      <dd>Set the content of line <code>n</code>.</dd>
-      <dt id="removeLine"><code>removeLine(n)</code></dt>
-      <dd>Remove the given line from the document.</dd>
-
-      <dt id="getRange"><code>getRange(from, to) → string</code></td>
-      <dd>Get the text between the given points in the editor, which
-      should be <code>{line, ch}</code> objects. An optional third
-      argument can be given to indicate the line separator string to
-      use (defaults to <code>"\n"</code>).</dd>
-      <dt id="replaceRange"><code>replaceRange(string, from, to)</code></dt>
-      <dd>Replace the part of the document between <code>from</code>
-      and <code>to</code> with the given string. <code>from</code>
-      and <code>to</code> must be <code>{line, ch}</code>
-      objects. <code>to</code> can be left off to simply insert the
-      string at position <code>from</code>.</dd>
-
-      <dt id="posFromIndex"><code>posFromIndex(index) → object</code></dt>
-      <dd>Calculates and returns a <code>{line, ch}</code> object for a
-      zero-based <code>index</code> who's value is relative to the start of the
-      editor's text. If the <code>index</code> is out of range of the text then
-      the returned object is clipped to start or end of the text
-      respectively.</dd>
-      <dt id="indexFromPos"><code>indexFromPos(object) → number</code></dt>
-      <dd>The reverse of <a href="#posFromIndex"><code>posFromIndex</code></a>.</dd>
-    </dl>
-
-    <p>The following are more low-level methods:</p>
-
-    <dl>
-      <dt id="operation"><code>operation(func) → result</code></dt>
-      <dd>CodeMirror internally buffers changes and only updates its
-      DOM structure after it has finished performing some operation.
-      If you need to perform a lot of operations on a CodeMirror
-      instance, you can call this method with a function argument. It
-      will call the function, buffering up all changes, and only doing
-      the expensive update after the function returns. This can be a
-      lot faster. The return value from this method will be the return
-      value of your function.</dd>
-
-      <dt id="compoundChange"><code>compoundChange(func) → result</code></dt>
-      <dd>Will call the given function (and return its result),
-      combining all changes made while that function executes into a
-      single undo event.</dd>
-
-      <dt id="refresh"><code>refresh()</code></dt>
-      <dd>If your code does something to change the size of the editor
-      element (window resizes are already listened for), or unhides
-      it, you should probably follow up by calling this method to
-      ensure CodeMirror is still looking as intended.</dd>
-
-      <dt id="getInputField"><code>getInputField() → textarea</code></dt>
-      <dd>Returns the hidden textarea used to read input.</dd>
-      <dt id="getWrapperElement"><code>getWrapperElement() → node</code></dt>
-      <dd>Returns the DOM node that represents the editor, and
-      controls its width. Remove this from your tree to delete an
-      editor instance. Set it's <code>width</code> style when
-      resizing.</dd>
-      <dt id="getScrollerElement"><code>getScrollerElement() → node</code></dt>
-      <dd>Returns the DOM node that is responsible for the vertical
-      sizing and horizontal scrolling of the editor. You can change
-      the <code>height</code> style of this element to resize an
-      editor. (You might have to call
-      the <a href="#refresh"><code>refresh</code></a> method
-      afterwards.)</dd>
-      <dt id="getGutterElement"><code>getGutterElement() → node</code></dt>
-      <dd>Fetches the DOM node that represents the editor gutter.</dd>
-
-      <dt id="getStateAfter"><code>getStateAfter(line) → state</code></dt>
-      <dd>Returns the mode's parser state, if any, at the end of the
-      given line number. If no line number is given, the state at the
-      end of the document is returned. This can be useful for storing
-      parsing errors in the state, or getting other kinds of
-      contextual information for a line.</dd>
-    </dl>
-
-    <p id="version">The <code>CodeMirror</code> object itself provides
-    several useful properties. Firstly, its <code>version</code>
-    property contains a string that indicates the version of the
-    library. For releases, this simply
-    contains <code>"major.minor"</code> (for
-    example <code>"2.33"</code>. For beta versions, <code>" B"</code>
-    (space, capital B) is added at the end of the string, for
-    development snapshots, <code>" +"</code> (space, plus) is
-    added.</p>
-
-    <p id="fromTextArea">The <code>CodeMirror.fromTextArea</code>
-    method provides another way to initialize an editor. It takes a
-    textarea DOM node as first argument and an optional configuration
-    object as second. It will replace the textarea with a CodeMirror
-    instance, and wire up the form of that textarea (if any) to make
-    sure the editor contents are put into the textarea when the form
-    is submitted. A CodeMirror instance created this way has three
-    additional methods:</p>
-
-    <dl>
-      <dt id="save"><code>save()</code></dt>
-      <dd>Copy the content of the editor into the textarea.</dd>
-
-      <dt id="toTextArea"><code>toTextArea()</code></dt>
-      <dd>Remove the editor, and restore the original textarea (with
-      the editor's current content).</dd>
-
-      <dt id="getTextArea"><code>getTextArea() → textarea</code></dt>
-      <dd>Returns the textarea that the instance was based on.</dd>
-    </dl>
-
-    <p id="defineExtension">If you want to define extra methods in terms
-    of the CodeMirror API, it is possible to
-    use <code>CodeMirror.defineExtension(name, value)</code>. This
-    will cause the given value (usually a method) to be added to all
-    CodeMirror instances created from then on.</p>
-
-    <p id="defineInitHook">If your extention just needs to run some
-    code whenever a CodeMirror instance is initialized,
-    use <code>CodeMirror.defineInitHook</code>. Give it a function as
-    its only argument, and from then on, that function will be called
-    (with the instance as argument) whenever a new CodeMirror instance
-    is initialized.</p>
-
-    <h2 id="addons">Add-ons</h2>
-
-    <p>The <code>lib/util</code> directory in the distribution
-    contains a number of reusable components that implement extra
-    editor functionality. In brief, they are:</p>
-
-    <dl>
-      <dt id="util_dialog"><a href="../lib/util/dialog.js"><code>dialog.js</code></a></dt>
-      <dd>Provides a very simple way to query users for text input.
-      Adds an <code>openDialog</code> method to CodeMirror instances,
-      which can be called with an HTML fragment that provides the
-      prompt (should include an <code>input</code> tag), and a
-      callback function that is called when text has been entered.
-      Depends on <code>lib/util/dialog.css</code>.</dd>
-      <dt id="util_searchcursor"><a href="../lib/util/searchcursor.js"><code>searchcursor.js</code></a></dt>
-      <dd>Adds the <code>getSearchCursor(query, start, caseFold) →
-      cursor</code> method to CodeMirror instances, which can be used
-      to implement search/replace functionality. <code>query</code>
-      can be a regular expression or a string (only strings will match
-      across lines—if they contain newlines). <code>start</code>
-      provides the starting position of the search. It can be
-      a <code>{line, ch}</code> object, or can be left off to default
-      to the start of the document. <code>caseFold</code> is only
-      relevant when matching a string. It will cause the search to be
-      case-insensitive. A search cursor has the following methods:
-        <dl>
-          <dt><code>findNext(), findPrevious() → boolean</code></dt>
-          <dd>Search forward or backward from the current position.
-          The return value indicates whether a match was found. If
-          matching a regular expression, the return value will be the
-          array returned by the <code>match</code> method, in case you
-          want to extract matched groups.</dd>
-          <dt><code>from(), to() → object</code></dt>
-          <dd>These are only valid when the last call
-          to <code>findNext</code> or <code>findPrevious</code> did
-          not return false. They will return <code>{line, ch}</code>
-          objects pointing at the start and end of the match.</dd>
-          <dt><code>replace(text)</code></dt>
-          <dd>Replaces the currently found match with the given text
-          and adjusts the cursor position to reflect the
-          replacement.</dd>
-        </dl></dd>
-
-      <dt id="util_search"><a href="../lib/util/search.js"><code>search.js</code></a></dt>
-      <dd>Implements the search commands. CodeMirror has keys bound to
-      these by default, but will not do anything with them unless an
-      implementation is provided. Depends
-      on <code>searchcursor.js</code>, and will make use
-      of <a href="#util_dialog"><code>openDialog</code></a> when
-      available to make prompting for search queries less ugly.</dd>
-      <dt id="util_foldcode"><a href="../lib/util/foldcode.js"><code>foldcode.js</code></a></dt>
-      <dd>Helps with code folding.
-      See <a href="../demo/folding.html">the demo</a> for an example.
-      Call <code>CodeMirror.newFoldFunction</code> with a range-finder
-      helper function to create a function that will, when applied to
-      a CodeMirror instance and a line number, attempt to fold or
-      unfold the block starting at the given line. A range-finder is a
-      language-specific function that also takes an instance and a
-      line number, and returns an end line for the block, or null if
-      no block is started on that line. This file
-      provides <code>CodeMirror.braceRangeFinder</code>, which finds
-      blocks in brace languages (JavaScript, C, Java,
-      etc), <code>CodeMirror.indentRangeFinder</code>, for languages
-      where indentation determines block structure (Python, Haskell),
-      and <code>CodeMirror.tagRangeFinder</code>, for XML-style
-      languages.</dd>
-      <dt id="util_runmode"><a href="../lib/util/runmode.js"><code>runmode.js</code></a></dt>
-      <dd>Can be used to run a CodeMirror mode over text without
-      actually opening an editor instance.
-      See <a href="../demo/runmode.html">the demo</a> for an
-      example.</dd>
-      <dt id="util_overlay"><a href="../lib/util/overlay.js"><code>overlay.js</code></a></dt>
-      <dd>Mode combinator that can be used to extend a mode with an
-      'overlay' — a secondary mode is run over the stream, along with
-      the base mode, and can color specific pieces of text without
-      interfering with the base mode.
-      Defines <code>CodeMirror.overlayMode</code>, which is used to
-      create such a mode. See <a href="../demo/mustache.html">this
-      demo</a> for a detailed example.</dd>
-      <dt id="util_multiplex"><a href="../lib/util/multiplex.js"><code>multiplex.js</code></a></dt>
-      <dd>Mode combinator that can be used to easily 'multiplex'
-      between several modes.
-      Defines <code>CodeMirror.multiplexingMode</code> which, when
-      given as first argument a mode object, and as other arguments
-      any number of <code>{open, close, mode [, delimStyle]}</code>
-      objects, will return a mode object that starts parsing using the
-      mode passed as first argument, but will switch to another mode
-      as soon as it encounters a string that occurs in one of
-      the <code>open</code> fields of the passed objects. When in a
-      sub-mode, it will go back to the top mode again when
-      the <code>close</code> string is encountered.
-      When <code>delimStyle</code> is specified, it will be the token
-      style returned for the delimiter tokens. The outer mode will not
-      see the content between the delimiters.
-      See <a href="../demo/multiplex.html">this demo</a> for an
-      example.</dd>
-      <dt id="util_simple-hint"><a href="../lib/util/simple-hint.js"><code>simple-hint.js</code></a></dt>
-      <dd>Provides a framework for showing autocompletion hints.
-      Defines <code>CodeMirror.simpleHint</code>, which takes a
-      CodeMirror instance and a hinting function, and pops up a widget
-      that allows the user to select a completion. Hinting functions
-      are function that take an editor instance, and return
-      a <code>{list, from, to}</code> object, where <code>list</code>
-      is an array of strings (the completions), and <code>from</code>
-      and <code>to</code> give the start and end of the token that is
-      being completed. Depends
-      on <code>lib/util/simple-hint.css</code>.</dd>
-      <dt id="util_javascript-hint"><a href="../lib/util/javascript-hint.js"><code>javascript-hint.js</code></a></dt>
-      <dd>Defines <code>CodeMirror.javascriptHint</code>
-      and <code>CodeMirror.coffeescriptHint</code>, which are simple
-      hinting functions for the JavaScript and CoffeeScript
-      modes.</dd>
-      <dt id="util_match-highlighter"><a href="../lib/util/match-highlighter.js"><code>match-highlighter.js</code></a></dt>
-      <dd>Adds a <code>matchHighlight</code> method to CodeMirror
-      instances that can be called (typically from
-      a <a href="#option_onCursorActivity"><code>onCursorActivity</code></a>
-      handler) to highlight all instances of a currently selected word
-      with the a classname given as a first argument to the method.
-      Depends on
-      the <a href="#util_searchcursor"><code>searchcursor</code></a>
-      add-on. Demo <a href="../demo/matchhighlighter.html">here</a>.</dd>
-      <dt id="util_formatting"><a href="../lib/util/formatting.js"><code>formatting.js</code></a></dt>
-      <dd>Adds <code>commentRange</code>, <code>autoIndentRange</code>,
-      and <code>autoFormatRange</code> methods that, respectively,
-      comment (or uncomment), indent, or format (add line breaks) a
-      range of code. <a href="../demo/formatting.html">Demo here.</a></dd>
-      <dt id="util_closetag"><a href="../lib/util/closetag.js"><code>closetag.js</code></a></dt>
-      <dd>Provides utility functions for adding automatic tag closing
-      to XML modes. See
-      the <a href="../demo/closetag.html">demo</a>.</dd>
-      <dt id="util_loadmode"><a href="../lib/util/loadmode.js"><code>loadmode.js</code></a></dt>
-      <dd>Defines a <code>CodeMirror.requireMode(modename,
-      callback)</code> function that will try to load a given mode and
-      call the callback when it succeeded. You'll have to
-      set <code>CodeMirror.modeURL</code> to a string that mode paths
-      can be constructed from, for
-      example <code>"mode/%N/%N.js"</code>—the <code>%N</code>'s will
-      be replaced with the mode name. Also
-      defines <code>CodeMirror.autoLoadMode(instance, mode)</code>,
-      which will ensure the given mode is loaded and cause the given
-      editor instance to refresh its mode when the loading
-      succeeded. See the <a href="../demo/loadmode.html">demo</a>.</dd>
-    </dl>
-
-    <h2 id="modeapi">Writing CodeMirror Modes</h2>
-
-    <p>Modes typically consist of a single JavaScript file. This file
-    defines, in the simplest case, a lexer (tokenizer) for your
-    language—a function that takes a character stream as input,
-    advances it past a token, and returns a style for that token. More
-    advanced modes can also handle indentation for the language.</p>
-
-    <p id="defineMode">The mode script should
-    call <code>CodeMirror.defineMode</code> to register itself with
-    CodeMirror. This function takes two arguments. The first should be
-    the name of the mode, for which you should use a lowercase string,
-    preferably one that is also the name of the files that define the
-    mode (i.e. <code>"xml"</code> is defined <code>xml.js</code>). The
-    second argument should be a function that, given a CodeMirror
-    configuration object (the thing passed to
-    the <code>CodeMirror</code> function) and an optional mode
-    configuration object (as in
-    the <a href="#option_mode"><code>mode</code></a> option), returns
-    a mode object.</p>
-
-    <p>Typically, you should use this second argument
-    to <code>defineMode</code> as your module scope function (modes
-    should not leak anything into the global scope!), i.e. write your
-    whole mode inside this function.</p>
-
-    <p>The main responsibility of a mode script is <em>parsing</em>
-    the content of the editor. Depending on the language and the
-    amount of functionality desired, this can be done in really easy
-    or extremely complicated ways. Some parsers can be stateless,
-    meaning that they look at one element (<em>token</em>) of the code
-    at a time, with no memory of what came before. Most, however, will
-    need to remember something. This is done by using a <em>state
-    object</em>, which is an object that is always passed when
-    reading a token, and which can be mutated by the tokenizer.</p>
-
-    <p id="startState">Modes that use a state must define
-    a <code>startState</code> method on their mode object. This is a
-    function of no arguments that produces a state object to be used
-    at the start of a document.</p>
-
-    <p id="token">The most important part of a mode object is
-    its <code>token(stream, state)</code> method. All modes must
-    define this method. It should read one token from the stream it is
-    given as an argument, optionally update its state, and return a
-    style string, or <code>null</code> for tokens that do not have to
-    be styled. For your styles, you can either use the 'standard' ones
-    defined in the themes (without the <code>cm-</code> prefix), or
-    define your own and have people include a custom CSS file for your
-    mode.<p>
-
-    <p id="StringStream">The stream object encapsulates a line of code
-    (tokens may never span lines) and our current position in that
-    line. It has the following API:</p>
-
-    <dl>
-      <dt><code>eol() → boolean</code></dt>
-      <dd>Returns true only if the stream is at the end of the
-      line.</dd>
-      <dt><code>sol() → boolean</code></dt>
-      <dd>Returns true only if the stream is at the start of the
-      line.</dd>
-
-      <dt><code>peek() → character</code></dt>
-      <dd>Returns the next character in the stream without advancing
-      it. Will return an empty string at the end of the line.</dd>
-      <dt><code>next() → character</code></dt>
-      <dd>Returns the next character in the stream and advances it.
-      Also returns <code>undefined</code> when no more characters are
-      available.</dd>
-
-      <dt><code>eat(match) → character</code></dt>
-      <dd><code>match</code> can be a character, a regular expression,
-      or a function that takes a character and returns a boolean. If
-      the next character in the stream 'matches' the given argument,
-      it is consumed and returned. Otherwise, <code>undefined</code>
-      is returned.</dd>
-      <dt><code>eatWhile(match) → boolean</code></dt>
-      <dd>Repeatedly calls <code>eat</code> with the given argument,
-      until it fails. Returns true if any characters were eaten.</dd>
-      <dt><code>eatSpace() → boolean</code></dt>
-      <dd>Shortcut for <code>eatWhile</code> when matching
-      white-space.</dd>
-      <dt><code>skipToEnd()</code></dt>
-      <dd>Moves the position to the end of the line.</dd>
-      <dt><code>skipTo(ch) → boolean</code></dt>
-      <dd>Skips to the next occurrence of the given character, if
-      found on the current line (doesn't advance the stream if the
-      character does not occur on the line). Returns true if the
-      character was found.</dd>
-      <dt><code>match(pattern, consume, caseFold) → boolean</code></dt>
-      <dd>Act like a
-      multi-character <code>eat</code>—if <code>consume</code> is true
-      or not given—or a look-ahead that doesn't update the stream
-      position—if it is false. <code>pattern</code> can be either a
-      string or a regular expression starting with <code>^</code>.
-      When it is a string, <code>caseFold</code> can be set to true to
-      make the match case-insensitive. When successfully matching a
-      regular expression, the returned value will be the array
-      returned by <code>match</code>, in case you need to extract
-      matched groups.</dd>
-
-      <dt><code>backUp(n)</code></dt>
-      <dd>Backs up the stream <code>n</code> characters. Backing it up
-      further than the start of the current token will cause things to
-      break, so be careful.</dd>
-      <dt><code>column() → integer</code></dt>
-      <dd>Returns the column (taking into account tabs) at which the
-      current token starts. Can be used to find out whether a token
-      starts a new line.</dd>
-      <dt><code>indentation() → integer</code></dt>
-      <dd>Tells you how far the current line has been indented, in
-      spaces. Corrects for tab characters.</dd>
-
-      <dt><code>current() → string</code></dt>
-      <dd>Get the string between the start of the current token and
-      the current stream position.</dd>
-    </dl>
-
-    <p id="blankLine">By default, blank lines are simply skipped when
-    tokenizing a document. For languages that have significant blank
-    lines, you can define a <code>blankLine(state)</code> method on
-    your mode that will get called whenever a blank line is passed
-    over, so that it can update the parser state.</p>
-
-    <p id="copyState">Because state object are mutated, and CodeMirror
-    needs to keep valid versions of a state around so that it can
-    restart a parse at any line, copies must be made of state objects.
-    The default algorithm used is that a new state object is created,
-    which gets all the properties of the old object. Any properties
-    which hold arrays get a copy of these arrays (since arrays tend to
-    be used as mutable stacks). When this is not correct, for example
-    because a mode mutates non-array properties of its state object, a
-    mode object should define a <code>copyState</code> method,
-    which is given a state and should return a safe copy of that
-    state.</p>
-
-    <p id="indent">If you want your mode to provide smart indentation
-    (through the <a href="#indentLine"><code>indentLine</code></a>
-    method and the <code>indentAuto</code>
-    and <code>newlineAndIndent</code> commands, which keys can be
-    <a href="#option_extraKeys">bound</a> to), you must define
-    an <code>indent(state, textAfter)</code> method on your mode
-    object.</p>
-
-    <p>The indentation method should inspect the given state object,
-    and optionally the <code>textAfter</code> string, which contains
-    the text on the line that is being indented, and return an
-    integer, the amount of spaces to indent. It should usually take
-    the <a href="#option_indentUnit"><code>indentUnit</code></a>
-    option into account.</p>
-
-    <p id="electricChars">Finally, a mode may define
-    an <code>electricChars</code> property, which should hold a string
-    containing all the characters that should trigger the behaviour
-    described for
-    the <a href="#option_electricChars"><code>electricChars</code></a>
-    option.</p>
-
-    <p>So, to summarize, a mode <em>must</em> provide
-    a <code>token</code> method, and it <em>may</em>
-    provide <code>startState</code>, <code>copyState</code>,
-    <code>compareStates</code>, and <code>indent</code> methods. For
-    an example of a trivial mode, see
-    the <a href="../mode/diff/diff.js">diff mode</a>, for a more involved
-    example, see the <a href="../mode/clike/clike.js">C-like
-    mode</a>.</p>
-
-    <p>Sometimes, it is useful for modes to <em>nest</em>—to have one
-    mode delegate work to another mode. An example of this kind of
-    mode is the <a href="../mode/htmlmixed/htmlmixed.js">mixed-mode HTML
-    mode</a>. To implement such nesting, it is usually necessary to
-    create mode objects and copy states yourself. To create a mode
-    object, there are <code>CodeMirror.getMode(options,
-    parserConfig)</code>, where the first argument is a configuration
-    object as passed to the mode constructor function, and the second
-    argument is a mode specification as in
-    the <a href="#option_mode"><code>mode</code></a> option. To copy a
-    state object, call <code>CodeMirror.copyState(mode, state)</code>,
-    where <code>mode</code> is the mode that created the given
-    state.</p>
-
-    <p id="innerMode">In a nested mode, it is recommended to add an
-    extra methods, <code>innerMode</code> which, given a state object,
-    returns a <code>{state, mode}</code> object with the inner mode
-    and its state for the current position. These are used by utility
-    scripts such as the <a href="#util_formatting">autoformatter</a>
-    and the <a href="#util_closetag">tag closer</a> to get context
-    information. Use the <code>CodeMirror.innerMode</code> helper
-    function to, starting from a mode and a state, recursively walk
-    down to the innermost mode and state.</p>
-
-    <p>To make indentation work properly in a nested parser, it is
-    advisable to give the <code>startState</code> method of modes that
-    are intended to be nested an optional argument that provides the
-    base indentation for the block of code. The JavaScript and CSS
-    parser do this, for example, to allow JavaScript and CSS code
-    inside the mixed-mode HTML mode to be properly indented.</p>
-
-    <p>Finally, it is possible to associate your mode, or a certain
-    configuration of your mode, with
-    a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type. For
-    example, the JavaScript mode associates itself
-    with <code>text/javascript</code>, and its JSON variant
-    with <code>application/json</code>. To do this,
-    call <code>CodeMirror.defineMIME(mime, modeSpec)</code>,
-    where <code>modeSpec</code> can be a string or object specifying a
-    mode, as in the <a href="#option_mode"><code>mode</code></a>
-    option.</p>
-
-    <p id="extendMode">Sometimes, it is useful to add or override mode
-    object properties from external code.
-    The <code>CodeMirror.extendMode</code> can be used to add
-    properties to mode objects produced for a specific mode. Its first
-    argument is the name of the mode, its second an object that
-    specifies the properties that should be added. This is mostly
-    useful to add utilities that can later be looked
-    up <a href="#getMode"><code>getMode</code></a>.</p>
-
-</div><div class="rightsmall blk">
-
-    <h2>Contents</h2>
-
-    <ul>
-      <li><a href="#overview">Overview</a></li>
-      <li><a href="#usage">Basic Usage</a></li>
-      <li><a href="#config">Configuration</a></li>
-      <li><a href="#keymaps">Keymaps</a></li>
-      <li><a href="#styling">Customized Styling</a></li>
-      <li><a href="#api">Programming API</a></li>
-      <li><a href="#addons">Add-ons</a></li>
-      <li><a href="#modeapi">Writing CodeMirror Modes</a></li>
-    </ul>
-
-</div></div>
-
-<div style="height: 2em">&nbsp;</div>
-
-  </body>
-</html>
diff --git a/doc/oldrelease.html b/doc/oldrelease.html
deleted file mode 100644
index 542f57ae1d..0000000000
--- a/doc/oldrelease.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <link rel="alternate" href="http://twitter.com/statuses/user_timeline/242283288.rss" type="application/rss+xml"/>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Old release
-   history */
-</pre>
-</div>
-
-  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.18.zip">Version 2.18</a>:</p>
-  <p class="rel-note">Fixes <code>TextMarker.clear</code>, which is broken in 2.17.</p>
-
-  <p class="rel">21-11-2011: <a href="http://codemirror.net/codemirror-2.17.zip">Version 2.17</a>:</p>
-  <ul class="rel-note">
-    <li>Add support for <a href="manual.html#option_lineWrapping">line
-    wrapping</a> and <a href="manual.html#hideLine">code
-    folding</a>.</li>
-    <li>Add <a href="../mode/gfm/index.html">Github-style Markdown</a> mode.</li>
-    <li>Add <a href="../theme/monokai.css">Monokai</a>
-    and <a href="../theme/rubyblue.css">Rubyblue</a> themes.</li>
-    <li>Add <a href="manual.html#setBookmark"><code>setBookmark</code></a> method.</li>
-    <li>Move some of the demo code into reusable components
-    under <a href="../lib/util/"><code>lib/util</code></a>.</li>
-    <li>Make screen-coord-finding code faster and more reliable.</li>
-    <li>Fix drag-and-drop in Firefox.</li>
-    <li>Improve support for IME.</li>
-    <li>Speed up content rendering.</li>
-    <li>Fix browser's built-in search in Webkit.</li>
-    <li>Make double- and triple-click work in IE.</li>
-    <li>Various fixes to modes.</li>
-  </ul>
-
-  <p class="rel">27-10-2011: <a href="http://codemirror.net/codemirror-2.16.zip">Version 2.16</a>:</p>
-  <ul class="rel-note">
-    <li>Add <a href="../mode/perl/index.html">Perl</a>, <a href="../mode/rust/index.html">Rust</a>, <a href="../mode/tiddlywiki/index.html">TiddlyWiki</a>, and <a href="../mode/groovy/index.html">Groovy</a> modes.</li>
-    <li>Dragging text inside the editor now moves, rather than copies.</li>
-    <li>Add a <a href="manual.html#coordsFromIndex"><code>coordsFromIndex</code></a> method.</li>
-    <li><strong>API change</strong>: <code>setValue</code> now no longer clears history. Use <a href="manual.html#clearHistory"><code>clearHistory</code></a> for that.</li>
-    <li><strong>API change</strong>: <a href="manual.html#markText"><code>markText</code></a> now
-    returns an object with <code>clear</code> and <code>find</code>
-    methods. Marked text is now more robust when edited.</li>
-    <li>Fix editing code with tabs in Internet Explorer.</li>
-  </ul>
-
-  <p class="rel">26-09-2011: <a href="http://codemirror.net/codemirror-2.15.zip">Version 2.15</a>:</p>
-  <p class="rel-note">Fix bug that snuck into 2.14: Clicking the
-  character that currently has the cursor didn't re-focus the
-  editor.</p>
-
-  <p class="rel">26-09-2011: <a href="http://codemirror.net/codemirror-2.14.zip">Version 2.14</a>:</p>
-  <ul class="rel-note">
-    <li>Add <a href="../mode/clojure/index.html">Clojure</a>, <a href="../mode/pascal/index.html">Pascal</a>, <a href="../mode/ntriples/index.html">NTriples</a>, <a href="../mode/jinja2/index.html">Jinja2</a>, and <a href="../mode/markdown/index.html">Markdown</a> modes.</li>
-    <li>Add <a href="../theme/cobalt.css">Cobalt</a> and <a href="../theme/eclipse.css">Eclipse</a> themes.</li>
-    <li>Add a <a href="manual.html#option_fixedGutter"><code>fixedGutter</code></a> option.</li>
-    <li>Fix bug with <code>setValue</code> breaking cursor movement.</li>
-    <li>Make gutter updates much more efficient.</li>
-    <li>Allow dragging of text out of the editor (on modern browsers).</li>
-  </ul>
-
-
-  <p class="rel">23-08-2011: <a href="http://codemirror.net/codemirror-2.13.zip">Version 2.13</a>:</p>
-  <ul class="rel-note">
-    <li>Add <a href="../mode/ruby/index.html">Ruby</a>, <a href="../mode/r/index.html">R</a>, <a href="../mode/coffeescript/index.html">CoffeeScript</a>, and <a href="../mode/velocity/index.html">Velocity</a> modes.</li>
-    <li>Add <a href="manual.html#getGutterElement"><code>getGutterElement</code></a> to API.</li>
-    <li>Several fixes to scrolling and positioning.</li>
-    <li>Add <a href="manual.html#option_smartHome"><code>smartHome</code></a> option.</li>
-    <li>Add an experimental <a href="../mode/xmlpure/index.html">pure XML</a> mode.</li>
-  </ul>
-
-  <p class="rel">25-07-2011: <a href="http://codemirror.net/codemirror-2.12.zip">Version 2.12</a>:</p>
-  <ul class="rel-note">
-    <li>Add a <a href="../mode/sparql/index.html">SPARQL</a> mode.</li>
-    <li>Fix bug with cursor jumping around in an unfocused editor in IE.</li>
-    <li>Allow key and mouse events to bubble out of the editor. Ignore widget clicks.</li>
-    <li>Solve cursor flakiness after undo/redo.</li>
-    <li>Fix block-reindent ignoring the last few lines.</li>
-    <li>Fix parsing of multi-line attrs in XML mode.</li>
-    <li>Use <code>innerHTML</code> for HTML-escaping.</li>
-    <li>Some fixes to indentation in C-like mode.</li>
-    <li>Shrink horiz scrollbars when long lines removed.</li>
-    <li>Fix width feedback loop bug that caused the width of an inner DIV to shrink.</li>
-  </ul>
-
-  <p class="rel">04-07-2011: <a href="http://codemirror.net/codemirror-2.11.zip">Version 2.11</a>:</p>
-  <ul class="rel-note">
-    <li>Add a <a href="../mode/scheme/index.html">Scheme mode</a>.</li>
-    <li>Add a <code>replace</code> method to search cursors, for cursor-preserving replacements.</li>
-    <li>Make the <a href="../mode/clike/index.html">C-like mode</a> mode more customizable.</li>
-    <li>Update XML mode to spot mismatched tags.</li>
-    <li>Add <code>getStateAfter</code> API and <code>compareState</code> mode API methods for finer-grained mode magic.</li>
-    <li>Add a <code>getScrollerElement</code> API method to manipulate the scrolling DIV.</li>
-    <li>Fix drag-and-drop for Firefox.</li>
-    <li>Add a C# configuration for the <a href="../mode/clike/index.html">C-like mode</a>.</li>
-    <li>Add <a href="../demo/fullscreen.html">full-screen editing</a> and <a href="../demo/changemode.html">mode-changing</a> demos.</li>
-  </ul>
-
-  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.1.zip">Version 2.1</a>:</p>
-  <p class="rel-note">Add
-  a <a href="manual.html#option_theme">theme</a> system
-  (<a href="../demo/theme.html">demo</a>). Note that this is not
-  backwards-compatible—you'll have to update your styles and
-  modes!</p>
-
-  <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.02.zip">Version 2.02</a>:</p>
-  <ul class="rel-note">
-    <li>Add a <a href="../mode/lua/index.html">Lua mode</a>.</li>
-    <li>Fix reverse-searching for a regexp.</li>
-    <li>Empty lines can no longer break highlighting.</li>
-    <li>Rework scrolling model (the outer wrapper no longer does the scrolling).</li>
-    <li>Solve horizontal jittering on long lines.</li>
-    <li>Add <a href="../demo/runmode.html">runmode.js</a>.</li>
-    <li>Immediately re-highlight text when typing.</li>
-    <li>Fix problem with 'sticking' horizontal scrollbar.</li>
-  </ul>
-
-  <p class="rel">26-05-2011: <a href="http://codemirror.net/codemirror-2.01.zip">Version 2.01</a>:</p>
-  <ul class="rel-note">
-    <li>Add a <a href="../mode/smalltalk/index.html">Smalltalk mode</a>.</li>
-    <li>Add a <a href="../mode/rst/index.html">reStructuredText mode</a>.</li>
-    <li>Add a <a href="../mode/python/index.html">Python mode</a>.</li>
-    <li>Add a <a href="../mode/plsql/index.html">PL/SQL mode</a>.</li>
-    <li><code>coordsChar</code> now works</li>
-    <li>Fix a problem where <code>onCursorActivity</code> interfered with <code>onChange</code>.</li>
-    <li>Fix a number of scrolling and mouse-click-position glitches.</li>
-    <li>Pass information about the changed lines to <code>onChange</code>.</li>
-    <li>Support cmd-up/down on OS X.</li>
-    <li>Add triple-click line selection.</li>
-    <li>Don't handle shift when changing the selection through the API.</li>
-    <li>Support <code>"nocursor"</code> mode for <code>readOnly</code> option.</li>
-    <li>Add an <code>onHighlightComplete</code> option.</li>
-    <li>Fix the context menu for Firefox.</li>
-  </ul>
-
-  <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-2.0.zip">Version 2.0</a>:</p>
-  <p class="rel-note">CodeMirror 2 is a complete rewrite that's
-  faster, smaller, simpler to use, and less dependent on browser
-  quirks. See <a href="internals.html">this</a>
-  and <a href="http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9f580">this</a>
-  for more information.</a>
-
-  <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p>
-  <ul class="rel-note">
-    <li>Fix error when debug history overflows.</li>
-    <li>Refine handling of C# verbatim strings.</li>
-    <li>Fix some issues with JavaScript indentation.</li>
-  </ul>
-
-  <p class="rel">22-02-2011: <a href="https://github.com/marijnh/codemirror/tree/beta2">Version 2.0 beta 2</a>:</p>
-  <p class="rel-note">Somewhat more mature API, lots of bugs shaken out.</a>
-
-  <p class="rel">17-02-2011: <a href="http://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p>
-  <ul class="rel-note">
-    <li><code>tabMode: "spaces"</code> was modified slightly (now indents when something is selected).</li>
-    <li>Fixes a bug that would cause the selection code to break on some IE versions.</li>
-    <li>Disabling spell-check on WebKit browsers now works.</li>
-  </ul>
-
-  <p class="rel">08-02-2011: <a href="http://codemirror.net/">Version 2.0 beta 1</a>:</p>
-  <p class="rel-note">CodeMirror 2 is a complete rewrite of
-  CodeMirror, no longer depending on an editable frame.</p>
-
-  <p class="rel">19-01-2011: <a href="http://codemirror.net/codemirror-0.93.zip">Version 0.93</a>:</p>
-  <ul class="rel-note">
-    <li>Added a <a href="contrib/regex/index.html">Regular Expression</a> parser.</li>
-    <li>Fixes to the PHP parser.</li>
-    <li>Support for regular expression in search/replace.</li>
-    <li>Add <code>save</code> method to instances created with <code>fromTextArea</code>.</li>
-    <li>Add support for MS T-SQL in the SQL parser.</li>
-    <li>Support use of CSS classes for highlighting brackets.</li>
-    <li>Fix yet another hang with line-numbering in hidden editors.</li>
-  </ul>
-
-  <p class="rel">17-12-2010: <a href="http://codemirror.net/codemirror-0.92.zip">Version 0.92</a>:</p>
-  <ul class="rel-note">
-    <li>Make CodeMirror work in XHTML documents.</li>
-    <li>Fix bug in handling of backslashes in Python strings.</li>
-    <li>The <code>styleNumbers</code> option is now officially
-    supported and documented.</li>
-    <li><code>onLineNumberClick</code> option added.</li>
-    <li>More consistent names <code>onLoad</code> and
-    <code>onCursorActivity</code> callbacks. Old names still work, but
-    are deprecated.</li>
-    <li>Add a <a href="contrib/freemarker/index.html">Freemarker</a> mode.</li>
-  </ul>
-
-  <p class="rel">11-11-2010: <a
-  href="http://codemirror.net/codemirror-0.91.zip">Version 0.91</a>:</p>
-  <ul class="rel-note">
-    <li>Adds support for <a href="contrib/java">Java</a>.</li>
-    <li>Small additions to the <a href="contrib/php">PHP</a> and <a href="contrib/sql">SQL</a> parsers.</li>
-    <li>Work around various <a href="https://bugs.webkit.org/show_bug.cgi?id=47806">Webkit</a> <a href="https://bugs.webkit.org/show_bug.cgi?id=23474">issues</a>.</li>
-    <li>Fix <code>toTextArea</code> to update the code in the textarea.</li>
-    <li>Add a <code>noScriptCaching</code> option (hack to ease development).</li>
-    <li>Make sub-modes of <a href="mixedtest.html">HTML mixed</a> mode configurable.</li>
-  </ul>
-
-  <p class="rel">02-10-2010: <a
-  href="http://codemirror.net/codemirror-0.9.zip">Version 0.9</a>:</p>
-  <ul class="rel-note">
-    <li>Add support for searching backwards.</li>
-    <li>There are now parsers for <a href="contrib/scheme/index.html">Scheme</a>, <a href="contrib/xquery/index.html">XQuery</a>, and <a href="contrib/ometa/index.html">OmetaJS</a>.</li>
-    <li>Makes <code>height: "dynamic"</code> more robust.</li>
-    <li>Fixes bug where paste did not work on OS X.</li>
-    <li>Add a <code>enterMode</code> and <code>electricChars</code> options to make indentation even more customizable.</li>
-    <li>Add <code>firstLineNumber</code> option.</li>
-    <li>Fix bad handling of <code>@media</code> rules by the CSS parser.</li>
-    <li>Take a new, more robust approach to working around the invisible-last-line bug in WebKit.</li>
-  </ul>
-
-  <p class="rel">22-07-2010: <a
-  href="http://codemirror.net/codemirror-0.8.zip">Version 0.8</a>:</p>
-  <ul class="rel-note">
-    <li>Add a <code>cursorCoords</code> method to find the screen
-    coordinates of the cursor.</li>
-    <li>A number of fixes and support for more syntax in the PHP parser.</li>
-    <li>Fix indentation problem with JSON-mode JS parser in Webkit.</li>
-    <li>Add a <a href="compress.html">minification</a> UI.</li>
-    <li>Support a <code>height: dynamic</code> mode, where the editor's
-    height will adjust to the size of its content.</li>
-    <li>Better support for IME input mode.</li>
-    <li>Fix JavaScript parser getting confused when seeing a no-argument
-    function call.</li>
-    <li>Have CSS parser see the difference between selectors and other
-    identifiers.</li>
-    <li>Fix scrolling bug when pasting in a horizontally-scrolled
-    editor.</li>
-    <li>Support <code>toTextArea</code> method in instances created with
-    <code>fromTextArea</code>.</li>
-    <li>Work around new Opera cursor bug that causes the cursor to jump
-    when pressing backspace at the end of a line.</li>
-  </ul>
-
-  <p class="rel">27-04-2010: <a
-  href="http://codemirror.net/codemirror-0.67.zip">Version
-  0.67</a>:</p>
-  <p class="rel-note">More consistent page-up/page-down behaviour
-  across browsers. Fix some issues with hidden editors looping forever
-  when line-numbers were enabled. Make PHP parser parse
-  <code>"\\"</code> correctly. Have <code>jumpToLine</code> work on
-  line handles, and add <code>cursorLine</code> function to fetch the
-  line handle where the cursor currently is. Add new
-  <code>setStylesheet</code> function to switch style-sheets in a
-  running editor.</p>
-
-  <p class="rel">01-03-2010: <a
-  href="http://codemirror.net/codemirror-0.66.zip">Version
-  0.66</a>:</p>
-  <p class="rel-note">Adds <code>removeLine</code> method to API.
-  Introduces the <a href="contrib/plsql/index.html">PLSQL parser</a>.
-  Marks XML errors by adding (rather than replacing) a CSS class, so
-  that they can be disabled by modifying their style. Fixes several
-  selection bugs, and a number of small glitches.</p>
-
-  <p class="rel">12-11-2009: <a
-  href="http://codemirror.net/codemirror-0.65.zip">Version
-  0.65</a>:</p>
-  <p class="rel-note">Add support for having both line-wrapping and
-  line-numbers turned on, make paren-highlighting style customisable
-  (<code>markParen</code> and <code>unmarkParen</code> config
-  options), work around a selection bug that Opera
-  <em>re</em>introduced in version 10.</p>
-
-  <p class="rel">23-10-2009: <a
-  href="http://codemirror.net/codemirror-0.64.zip">Version
-  0.64</a>:</p>
-  <p class="rel-note">Solves some issues introduced by the
-  paste-handling changes from the previous release. Adds
-  <code>setSpellcheck</code>, <code>setTextWrapping</code>,
-  <code>setIndentUnit</code>, <code>setUndoDepth</code>,
-  <code>setTabMode</code>, and <code>setLineNumbers</code> to
-  customise a running editor. Introduces an <a
-  href="contrib/sql/index.html">SQL</a> parser. Fixes a few small
-  problems in the <a href="contrib/python/index.html">Python</a>
-  parser. And, as usual, add workarounds for various newly discovered
-  browser incompatibilities.</p>
-
-<p class="rel"><em>31-08-2009</em>: <a
-href="http://codemirror.net/codemirror-0.63.zip">Version
-0.63</a>:</p>
-<p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several
-serious IE8 issues (cursor jumping, end-of-document bugs) and a number
-of small problems.</p>
-
-<p class="rel"><em>30-05-2009</em>: <a
-href="http://codemirror.net/codemirror-0.62.zip">Version
-0.62</a>:</p>
-<p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a>
-and <a href="contrib/lua/index.html">Lua</a> parsers. Add
-<code>setParser</code> (on-the-fly mode changing) and
-<code>clearHistory</code> methods. Make parsing passes time-based
-instead of lines-based (see the <code>passTime</code> option).</p>
-
-</body></html>
diff --git a/doc/reporting.html b/doc/reporting.html
deleted file mode 100644
index a616512530..0000000000
--- a/doc/reporting.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Reporting Bugs</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-    <style>li { margin-top: 1em; }</style>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Reporting bugs
-   effectively */
-</pre>
-</div>
-
-<div class="left">
-
-<p>So you found a problem in CodeMirror. By all means, report it! Bug
-reports from users are the main drive behind improvements to
-CodeMirror. But first, please read over these points:</p>
-
-<ol>
-  <li>CodeMirror is maintained by volunteers. They don't owe you
-  anything, so be polite. Reports with an indignant or belligerent
-  tone tend to be moved to the bottom of the pile.</li>
-
-  <li>Include information about <strong>the browser in which the
-  problem occurred</strong>. Even if you tested several browsers, and
-  the problem occurred in all of them, mention this fact in the bug
-  report. Also include browser version numbers and the operating
-  system that you're on.</li>
-
-  <li>Mention which release of CodeMirror you're using. Preferably,
-  try also with the current development snapshot, to ensure the
-  problem has not already been fixed.</li>
-
-  <li>Mention very precisely what went wrong. "X is broken" is not a
-  good bug report. What did you expect to happen? What happened
-  instead? Describe the exact steps a maintainer has to take to make
-  the problem occur. We can not fix something that we can not
-  observe.</li>
-
-  <li>If the problem can not be reproduced in any of the demos
-  included in the CodeMirror distribution, please provide an HTML
-  document that demonstrates the problem. The best way to do this is
-  to go to <a href="http://jsbin.com/ihunin/edit">jsbin.com</a>, enter
-  it there, press save, and include the resulting link in your bug
-  report.</li>
-</ol>
-
-</div>
-
-  </body>
-</html>
diff --git a/doc/upgrade_v2.2.html b/doc/upgrade_v2.2.html
deleted file mode 100644
index 7e4d840043..0000000000
--- a/doc/upgrade_v2.2.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror: Upgrading to v2.2</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="docs.css"/>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="baboon.png" class="logo" alt="logo"/>
-<pre>
-/* Upgrading to
-   v2.2 */
-</pre>
-</div>
-
-<div class="left">
-
-<p>There are a few things in the 2.2 release that require some care
-when upgrading.</p>
-
-<h2>No more default.css</h2>
-
-<p>The default theme is now included
-in <a href="../lib/codemirror.css"><code>codemirror.css</code></a>, so
-you do not have to included it separately anymore. (It was tiny, so
-even if you're not using it, the extra data overhead is negligible.)
-
-<h2>Different key customization</h2>
-
-<p>CodeMirror has moved to a system
-where <a href="manual.html#option_keyMap">keymaps</a> are used to
-bind behavior to keys. This means <a href="../demo/emacs.html">custom
-bindings</a> are now possible.</p>
-
-<p>Three options that influenced key
-behavior, <code>tabMode</code>, <code>enterMode</code>,
-and <code>smartHome</code>, are no longer supported. Instead, you can
-provide custom bindings to influence the way these keys act. This is
-done through the
-new <a href="manual.html#option_extraKeys"><code>extraKeys</code></a>
-option, which can hold an object mapping key names to functionality. A
-simple example would be:</p>
-
-<pre>  extraKeys: {
-    "Ctrl-S": function(instance) { saveText(instance.getValue()); },
-    "Ctrl-/": "undo"
-  }</pre>
-
-<p>Keys can be mapped either to functions, which will be given the
-editor instance as argument, or to strings, which are mapped through
-functions through the <code>CodeMirror.commands</code> table, which
-contains all the built-in editing commands, and can be inspected and
-extended by external code.</p>
-
-<p>By default, the <code>Home</code> key is bound to
-the <code>"goLineStartSmart"</code> command, which moves the cursor to
-the first non-whitespace character on the line. You can set do this to
-make it always go to the very start instead:</p>
-
-<pre>  extraKeys: {"Home": "goLineStart"}</pre>
-
-<p>Similarly, <code>Enter</code> is bound
-to <code>"newlineAndIndent"</code> by default. You can bind it to
-something else to get different behavior. To disable special handling
-completely and only get a newline character inserted, you can bind it
-to <code>false</code>:</p>
-
-<pre>  extraKeys: {"Enter": false}</pre>
-
-<p>The same works for <code>Tab</code>. If you don't want CodeMirror
-to handle it, bind it to <code>false</code>. The default behaviour is
-to indent the current line more (<code>"indentMore"</code> command),
-and indent it less when shift is held (<code>"indentLess"</code>).
-There are also <code>"indentAuto"</code> (smart indent)
-and <code>"insertTab"</code> commands provided for alternate
-behaviors. Or you can write your own handler function to do something
-different altogether.</p>
-
-<h2>Tabs</h2>
-
-<p>Handling of tabs changed completely. The display width of tabs can
-now be set with the <code>tabSize</code> option, and tabs can
-be <a href="../demo/visibletabs.html">styled</a> by setting CSS rules
-for the <code>cm-tab</code> class.</p>
-
-<p>The default width for tabs is now 4, as opposed to the 8 that is
-hard-wired into browsers. If you are relying on 8-space tabs, make
-sure you explicitly set <code>tabSize: 8</code> in your options.</p>
-
-</div>
-
-  </body>
-</html>
diff --git a/index.html b/index.html
deleted file mode 100644
index 7a5dbf7af4..0000000000
--- a/index.html
+++ /dev/null
@@ -1,473 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <title>CodeMirror</title>
-    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/>
-    <link rel="stylesheet" type="text/css" href="doc/docs.css"/>
-    <link rel="alternate" href="http://twitter.com/statuses/user_timeline/242283288.rss" type="application/rss+xml"/>
-  </head>
-  <body>
-
-<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1>
-
-<div class="grey">
-<img src="doc/baboon.png" class="logo" alt="logo"/>
-<pre>
-/* In-browser code editing
-   made bearable */
-</pre>
-</div>
-
-<div class="clear"><div class="left blk">
-
-  <p style="margin-top: 0">CodeMirror is a JavaScript component that
-  provides a code editor in the browser. When a mode is available for
-  the language you are coding in, it will color your code, and
-  optionally help with indentation.</p>
-
-  <p>A <a href="doc/manual.html">rich programming API</a> and a CSS
-  theming system are available for customizing CodeMirror to fit your
-  application, and extending it with new functionality.</p>
-
-  <div class="clear"><div class="left1 blk">
-
-    <h2 style="margin-top: 0">Supported modes:</h2>
-
-    <ul>
-      <li><a href="mode/clike/index.html">C, C++, C#</a></li>
-      <li><a href="mode/clojure/index.html">Clojure</a></li>
-      <li><a href="mode/coffeescript/index.html">CoffeeScript</a></li>
-      <li><a href="mode/commonlisp/index.html">Common Lisp</a></li>
-      <li><a href="mode/css/index.html">CSS</a></li>
-      <li><a href="mode/diff/index.html">diff</a></li>
-      <li><a href="mode/ecl/index.html">ECL</a></li>
-      <li><a href="mode/erlang/index.html">Erlang</a></li>
-      <li><a href="mode/go/index.html">Go</a></li>
-      <li><a href="mode/groovy/index.html">Groovy</a></li>
-      <li><a href="mode/haskell/index.html">Haskell</a></li>
-      <li><a href="mode/haxe/index.html">Haxe</a></li>
-      <li><a href="mode/htmlembedded/index.html">HTML embedded scripts</a></li>
-      <li><a href="mode/htmlmixed/index.html">HTML mixed-mode</a></li>
-      <li><a href="mode/clike/index.html">Java</a></li>
-      <li><a href="mode/javascript/index.html">JavaScript</a></li>
-      <li><a href="mode/jinja2/index.html">Jinja2</a></li>
-      <li><a href="mode/less/index.html">LESS</a></li>
-      <li><a href="mode/lua/index.html">Lua</a></li>
-      <li><a href="mode/markdown/index.html">Markdown</a> (<a href="mode/gfm/index.html">Github-flavour</a>)</li>
-      <li><a href="mode/mysql/index.html">MySQL</a></li>
-      <li><a href="mode/ntriples/index.html">NTriples</a></li>
-      <li><a href="mode/ocaml/index.html">OCaml</a></li>
-      <li><a href="mode/pascal/index.html">Pascal</a></li>
-      <li><a href="mode/perl/index.html">Perl</a></li>
-      <li><a href="mode/php/index.html">PHP</a></li>
-      <li><a href="mode/pig/index.html">Pig Latin</a></li>
-      <li><a href="mode/plsql/index.html">PL/SQL</a></li>
-      <li><a href="mode/properties/index.html">Properties files</a></li>
-      <li><a href="mode/python/index.html">Python</a></li>
-      <li><a href="mode/r/index.html">R</a></li>
-      <li>RPM <a href="mode/rpm/spec/index.html">spec</a> and <a href="mode/rpm/changes/index.html">changelog</a></li>
-      <li><a href="mode/rst/index.html">reStructuredText</a></li>
-      <li><a href="mode/ruby/index.html">Ruby</a></li>
-      <li><a href="mode/rust/index.html">Rust</a></li>
-      <li><a href="mode/clike/scala.html">Scala</a></li>
-      <li><a href="mode/scheme/index.html">Scheme</a></li>
-      <li><a href="mode/shell/index.html">Shell</a></li>
-      <li><a href="mode/sieve/index.html">Sieve</a></li>
-      <li><a href="mode/smalltalk/index.html">Smalltalk</a></li>
-      <li><a href="mode/smarty/index.html">Smarty</a></li>
-      <li><a href="mode/sparql/index.html">SPARQL</a></li>
-      <li><a href="mode/stex/index.html">sTeX, LaTeX</a></li>
-      <li><a href="mode/tiddlywiki/index.html">Tiddlywiki</a></li>
-      <li><a href="mode/tiki/index.html">Tiki wiki</a></li>
-      <li><a href="mode/vb/index.html">VB.NET</a></li>
-      <li><a href="mode/vbscript/index.html">VBScript</a></li>
-      <li><a href="mode/velocity/index.html">Velocity</a></li>
-      <li><a href="mode/verilog/index.html">Verilog</a></li>
-      <li><a href="mode/xml/index.html">XML/HTML</a></li>
-      <li><a href="mode/xquery/index.html">XQuery</a></li>
-      <li><a href="mode/yaml/index.html">YAML</a></li>
-    </ul>
-
-  </div><div class="left2 blk">
-
-    <h2 style="margin-top: 0">Usage demos:</h2>
-
-    <ul>
-      <li><a href="demo/complete.html">Autocompletion</a> (<a href="demo/xmlcomplete.html">XML</a>)</li>
-      <li><a href="demo/search.html">Search/replace</a></li>
-      <li><a href="demo/folding.html">Code folding</a></li>
-      <li><a href="demo/mustache.html">Mode overlays</a></li>
-      <li><a href="demo/multiplex.html">Mode multiplexer</a></li>
-      <li><a href="demo/preview.html">HTML editor with preview</a></li>
-      <li><a href="demo/resize.html">Auto-resizing editor</a></li>
-      <li><a href="demo/marker.html">Setting breakpoints</a></li>
-      <li><a href="demo/activeline.html">Highlighting the current line</a></li>
-      <li><a href="demo/matchhighlighter.html">Highlighting selection matches</a></li>
-      <li><a href="demo/theme.html">Theming</a></li>
-      <li><a href="demo/runmode.html">Stand-alone highlighting</a></li>
-      <li><a href="demo/fullscreen.html">Full-screen editing</a></li>
-      <li><a href="demo/changemode.html">Mode auto-changing</a></li>
-      <li><a href="demo/visibletabs.html">Visible tabs</a></li>
-      <li><a href="demo/formatting.html">Autoformatting of code</a></li>
-      <li><a href="demo/emacs.html">Emacs keybindings</a></li>
-      <li><a href="demo/vim.html">Vim keybindings</a></li>
-      <li><a href="demo/closetag.html">Automatic xml tag closing</a></li>
-      <li><a href="demo/loadmode.html">Lazy mode loading</a></li>
-    </ul>
-
-    <h2>Real-world uses:</h2>
-
-    <ul>
-      <li><a href="http://jsbin.com">jsbin.com</a> (JS playground)</li>
-      <li><a href="http://www.chris-granger.com/2012/04/12/light-table---a-new-ide-concept/">Light Table</a> (experimental IDE)</li>
-      <li><a href="http://brackets.io">Adobe Brackets</a> (code editor)</li>
-      <li><a href="http://www.mergely.com/">Mergely</a> (interactive diffing)</li>
-      <li><a href="https://script.google.com/">Google Apps Script</a></li>
-      <li><a href="https://github.com/github/android">GitHub's Android app</a></li>
-      <li><a href="http://eloquentjavascript.net/chapter1.html">Eloquent JavaScript</a> (book)</li>
-      <li><a href="http://media.chikuyonok.ru/codemirror2/">Zen Coding</a> (fast XML editing)</li>
-      <li><a href="http://paperjs.org/">Paper.js</a> (graphics scripting)</li>
-      <li><a href="http://tour.golang.org">Go language tour</a></li>
-      <li><a href="http://codev.it/">Codev</a> (collaborative IDE)</li>
-      <li><a href="http://enjalot.com/tributary/2636296/sinwaves.js">Tributary</a> (augmented editing)</li>
-      <li><a href="http://prose.io/">Prose.io</a> (github content editor)</li>
-      <li><a href="http://www.wescheme.org/">WeScheme</a> (learning tool)</li>
-      <li><a href="http://webglplayground.net/">WebGL playground</a></li>
-      <li><a href="http://ql.io/">ql.io</a> (http API query helper)</li>
-      <li><a href="http://elm-lang.org/Examples.elm">Elm language examples</a></li>
-      <li><a href="https://thefiletree.com">The File Tree</a> (collab editor)</li>
-      <li><a href="http://bluegriffon.org/">BlueGriffon</a> (HTML editor)</li>
-      <li><a href="http://www.jshint.com/">JSHint</a> (JS linter)</li>
-      <li><a href="http://kl1p.com/cmtest/1">kl1p</a> (paste service)</li>
-      <li><a href="http://sqlfiddle.com">SQLFiddle</a> (SQL playground)</li>
-      <li><a href="http://try.haxe.org">Try Haxe</a> (Haxe Playground) </li>
-      <li><a href="http://cssdeck.com/">CSSDeck</a> (CSS showcase)</li>
-      <li><a href="http://www.ckwnc.com/">CKWNC</a> (UML editor)</li>
-      <li><a href="http://www.sketchpatch.net/labs/livecodelabIntro.html">sketchPatch Livecodelab</a></li>
-      <li><a href="https://notex.ch">NoTex</a> (rST authoring)</li>
-    </ul>
-
-  </div></div>
-
-  <h2 id="code">Getting the code</h2>
-
-  <p>All of CodeMirror is released under a <a
-  href="LICENSE">MIT-style</a> license. To get it, you can download
-  the <a href="http://codemirror.net/codemirror.zip">latest
-  release</a> or the current <a
-  href="http://codemirror.net/codemirror-latest.zip">development
-  snapshot</a> as zip files. To create a custom minified script file,
-  you can use the <a href="doc/compress.html">compression API</a>.</p>
-
-  <p>We use <a href="http://git-scm.com/">git</a> for version control.
-  The main repository can be fetched in this way:</p>
-
-  <pre class="code">git clone http://marijnhaverbeke.nl/git/codemirror</pre>
-
-  <p>CodeMirror can also be found on GitHub at <a
-  href="http://github.com/marijnh/CodeMirror">marijnh/CodeMirror</a>.
-  If you plan to hack on the code and contribute patches, the best way
-  to do it is to create a GitHub fork, and send pull requests.</p>
-
-  <h2 id="documention">Documentation</h2>
-
-  <p>The <a href="doc/manual.html">manual</a> is your first stop for
-  learning how to use this library. It starts with a quick explanation
-  of how to use the editor, and then describes the API in detail.</p>
-
-  <p>For those who want to learn more about the code, there is
-  an <a href="doc/internals.html">overview of the internals</a> available.
-  The <a href="http://github.com/marijnh/CodeMirror">source code</a>
-  itself is, for the most part, also well commented.</p>
-
-  <h2 id="support">Support and bug reports</h2>
-
-  <p>Community discussion, questions, and informal bug reporting is
-  done on
-  the <a href="http://groups.google.com/group/codemirror">CodeMirror
-  Google group</a>. There is a separate
-  group, <a href="http://groups.google.com/group/codemirror-announce">CodeMirror-announce</a>,
-  which is lower-volume, and is only used for major announcements—new
-  versions and such. These will be cross-posted to both groups, so you
-  don't need to subscribe to both.</p>
-
-  <p>Though bug reports through e-mail are responded to, the preferred
-  way to report bugs is to use
-  the <a href="http://github.com/marijnh/CodeMirror/issues">Github
-  issue tracker</a>. Before reporting a
-  bug, <a href="doc/reporting.html">read these pointers</a>. Also,
-  the issue tracker is for <em>bugs</em>, not requests for help.</p>
-
-  <p>When none of these seem fitting, you can
-  simply <a href="mailto:marijnh@gmail.com">e-mail the maintainer</a>
-  directly.</p>
-
-  <h2 id="supported">Supported browsers</h2>
-
-  <p>The following <em>desktop</em> browsers are able to run CodeMirror:</p>
-
-  <ul>
-    <li>Firefox 2 or higher</li>
-    <li>Chrome, any version</li>
-    <li>Safari 3 or higher</li>
-    <li>Opera 9 or higher (with some key-handling problems on OS X)</li>
-    <li>Internet Explorer 7 or higher in standards mode<br>
-      <em>(So not quirks mode. But quasi-standards mode with a
-      transitional doctype is also flaky. <code>&lt;!doctype
-      html></code> is recommended.)</em></li>
-  </ul>
-
-  <p>I am not actively testing against every new browser release, and
-  vendors have a habit of introducing bugs all the time, so I am
-  relying on the community to tell me when something breaks.
-  See <a href="#support">here</a> for information on how to contact
-  me.</p>
-
-  <p>Mobile browsers mostly kind of work, but, because of limitations
-  and their fundamentally different UI assumptions, show a lot of
-  quirks that are hard to work around.</p>
-
-  <h2 id="commercial">Commercial support</h2>
-
-  <p>CodeMirror is developed and maintained by me, Marijn Haverbeke,
-  in my own time. If your company is getting value out of CodeMirror,
-  please consider purchasing a support contract.</p>
-
-  <ul>
-    <li>You'll be funding further work on CodeMirror.</li>
-    <li>You ensure that you get a quick response when you have a
-    problem, even when I am otherwise busy.</li>
-  </ul>
-
-  <p>CodeMirror support contracts exist in two
-  forms—<strong>basic</strong> at €100 per month,
-  and <strong>premium</strong> at €500 per
-  month. <a href="mailto:marijnh@gmail.com">Contact me</a> for further
-  information.</p>
-
-</div>
-
-<div class="right blk">
-
-  <a href="http://codemirror.net/codemirror.zip" class="download">Download the latest release</a>
-
-  <h2>Support CodeMirror</h2>
-
-  <ul>
-    <li>Donate
-    (<span onclick="document.getElementById('paypal').submit();"
-    class="quasilink">Paypal</span>,
-    <span onclick="document.getElementById('bankinfo').style.display = 'block';"
-           class="quasilink">bank</span>, or
-    <a href="https://www.gittip.com/marijnh">Gittip</a>)</li>
-    <li>Purchase <a href="#commercial">commercial support</a></li>
-  </ul>
-
-  <p id="bankinfo" style="display: none;">
-    Bank: <i>Rabobank</i><br/>
-    Country: <i>Netherlands</i><br/>
-    SWIFT: <i>RABONL2U</i><br/>
-    Account: <i>147850770</i><br/>
-    Name: <i>Marijn Haverbeke</i><br/>
-    IBAN: <i>NL26 RABO 0147 8507 70</i>
-  </p>
-
-  <h2>Reading material</h2>
-
-  <ul>
-    <li><a href="doc/manual.html">User manual</a></li>
-    <li><a href="http://github.com/marijnh/CodeMirror">Browse the code</a></li>
-  </ul>
-
-  <h2 id=releases>Releases</h2>
-
-  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-2.34.zip">Version 2.34</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="mode/commonlisp/index.html">Common Lisp</a>.</li>
-    <li>Fix right-click select-all on most browsers.</li>
-    <li>Change the way highlighting happens:<br>&nbsp; Saves memory and CPU cycles.<br>&nbsp; <code>compareStates</code> is no longer needed.<br>&nbsp; <code>onHighlightComplete</code> no longer works.</li>
-    <li>Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.</li>
-    <li>Add a <a href="doc/manual.html#version"><code>CodeMirror.version</code></a> property.</li>
-    <li>More robust handling of nested modes in <a href="demo/formatting.html">formatting</a> and <a href="demo/closetag.html">closetag</a> plug-ins.</li>
-    <li>Un/redo now preserves <a href="doc/manual.html#markText">marked text</a> and bookmarks.</li>
-    <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.33...v2.34">Full list</a> of patches.</li>
-  </ul>
-
-  <p class="rel">19-09-2012: <a href="http://codemirror.net/codemirror-3.0beta1.zip">Version 3.0, beta 1</a>:</p>
-
-  <p class="rel-note"><strong>BETA release, new major version</strong>. Only partially
-  backwards-compatible. See
-  the <a href="http://codemirror.net/3/doc/upgrade_v3.html">upgrading
-  guide</a> for more information. Major new features are:</p>
-
-  <ul class="rel-note">
-    <li>Bi-directional text support.</li>
-    <li>More powerful gutter model.</li>
-    <li>Support for arbitrary text/widget height.</li>
-    <li>In-line widgets.</li>
-    <li>Generalized event handling.</li>
-  </ul>
-
-  <p class="rel">23-08-2012: <a href="http://codemirror.net/codemirror-2.33.zip">Version 2.33</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="mode/sieve/index.html">Sieve</a>.</li>
-    <li>New <a href="doc/manual.html#getViewport"><code>getViewPort</code></a> and <a href="doc/manual.html#option_onViewportChange"><code>onViewportChange</code></a> API.</li>
-    <li><a href="doc/manual.html#option_cursorBlinkRate">Configurable</a> cursor blink rate.</li>
-    <li>Make binding a key to <code>false</code> disabling handling (again).</li>
-    <li>Show non-printing characters as red dots.</li>
-    <li>More tweaks to the scrolling model.</li>
-    <li>Expanded testsuite. Basic linter added.</li>
-    <li>Remove most uses of <code>innerHTML</code>. Remove <code>CodeMirror.htmlEscape</code>.</li>
-    <li><a href="https://github.com/marijnh/CodeMirror/compare/v2.32...v2.33">Full list</a> of patches.</li>
-  </ul>
-
-  <p class="rel">23-07-2012: <a href="http://codemirror.net/codemirror-2.32.zip">Version 2.32</a>:</p>
-
-  <p class="rel-note">Emergency fix for a bug where an editor with
-  line wrapping on IE will break when there is <em>no</em>
-  scrollbar.</p>
-
-  <p class="rel">20-07-2012: <a href="http://codemirror.net/codemirror-2.31.zip">Version 2.31</a>:</p>
-
-  <ul class="rel-note">
-    <li>New modes: <a href="mode/ocaml/index.html">OCaml</a>, <a href="mode/haxe/index.html">Haxe</a>, and <a href="mode/vb/index.html">VB.NET</a>.</li>
-    <li>Several fixes to the new scrolling model.</li>
-    <li>Add a <a href="doc/manual.html#setSize"><code>setSize</code></a> method for programmatic resizing.</li>
-    <li>Add <a href="doc/manual.html#getHistory"><code>getHistory</code></a> and <a href="doc/manual.html#setHistory"><code>setHistory</code></a> methods.</li>
-    <li>Allow custom line separator string in <a href="doc/manual.html#getValue"><code>getValue</code></a> and <a href="doc/manual.html#getRange"><code>getRange</code></a>.</li>
-    <li>Support double- and triple-click drag, double-clicking whitespace.</li>
-    <li>And more... <a href="https://github.com/marijnh/CodeMirror/compare/v2.3...v2.31">(all patches)</a></li>
-  </ul>
-
-  <p class="rel">22-06-2012: <a href="http://codemirror.net/codemirror-2.3.zip">Version 2.3</a>:</p>
-
-  <ul class="rel-note">
-    <li><strong>New scrollbar implementation</strong>. Should flicker less. Changes DOM structure of the editor.</li>
-    <li>New theme: <a href="demo/theme.html?vibrant-ink">vibrant-ink</a>.</li>
-    <li>Many extensions to the VIM keymap (including text objects).</li>
-    <li>Add <a href="demo/multiplex.html">mode-multiplexing</a> utility script.</li>
-    <li>Fix bug where right-click paste works in read-only mode.</li>
-    <li>Add a <a href="doc/manual.html#getScrollInfo"><code>getScrollInfo</code></a> method.</li>
-    <li>Lots of other <a href="https://github.com/marijnh/CodeMirror/compare/v2.25...v2.3">fixes</a>.</li>
-  </ul>
-
-  <p class="rel">23-05-2012: <a href="http://codemirror.net/codemirror-2.25.zip">Version 2.25</a>:</p>
-
-  <ul class="rel-note">
-    <li>New mode: <a href="mode/erlang/index.html">Erlang</a>.</li>
-    <li><strong>Remove xmlpure mode</strong> (use <a href="mode/xml/index.html">xml.js</a>).</li>
-    <li>Fix line-wrapping in Opera.</li>
-    <li>Fix X Windows middle-click paste in Chrome.</li>
-    <li>Fix bug that broke pasting of huge documents.</li>
-    <li>Fix backspace and tab key repeat in Opera.</li>
-  </ul>
-
-  <p class="rel">23-04-2012: <a href="http://codemirror.net/codemirror-2.24.zip">Version 2.24</a>:</p>
-
-  <ul class="rel-note">
-    <li><strong>Drop support for Internet Explorer 6</strong>.</li>
-    <li>New
-    modes: <a href="mode/shell/index.html">Shell</a>, <a href="mode/tiki/index.html">Tiki
-    wiki</a>, <a href="mode/pig/index.html">Pig Latin</a>.</li>
-    <li>New themes: <a href="demo/theme.html?ambiance">Ambiance</a>, <a href="demo/theme.html?blackboard">Blackboard</a>.</li>
-    <li>More control over drag/drop
-    with <a href="doc/manual.html#option_dragDrop"><code>dragDrop</code></a>
-    and <a href="doc/manual.html#option_onDragEvent"><code>onDragEvent</code></a>
-    options.</li>
-    <li>Make HTML mode a bit less pedantic.</li>
-    <li>Add <a href="doc/manual.html#compoundChange"><code>compoundChange</code></a> API method.</li>
-    <li>Several fixes in undo history and line hiding.</li>
-    <li>Remove (broken) support for <code>catchall</code> in key maps,
-    add <code>nofallthrough</code> boolean field instead.</li>
-  </ul>
-
-  <p class="rel">26-03-2012: <a href="http://codemirror.net/codemirror-2.23.zip">Version 2.23</a>:</p>
-
-  <ul class="rel-note">
-    <li>Change <strong>default binding for tab</strong> <a href="javascript:void(document.getElementById('tabbinding').style.display='')">[more]</a>
-      <div style="display: none" id=tabbinding>
-        Starting in 2.23, these bindings are default:
-        <ul><li>Tab: Insert tab character</li>
-          <li>Shift-tab: Reset line indentation to default</li>
-          <li>Ctrl/Cmd-[: Reduce line indentation (old tab behaviour)</li>
-          <li>Ctrl/Cmd-]: Increase line indentation (old shift-tab behaviour)</li>
-        </ul>
-      </div>
-    </li>
-    <li>New modes: <a href="mode/xquery/index.html">XQuery</a> and <a href="mode/vbscript/index.html">VBScript</a>.</li>
-    <li>Two new themes: <a href="mode/less/index.html">lesser-dark</a> and <a href="mode/xquery/index.html">xq-dark</a>.</li>
-    <li>Differentiate between background and text styles in <a href="doc/manual.html#setLineClass"><code>setLineClass</code></a>.</li>
-    <li>Fix drag-and-drop in IE9+.</li>
-    <li>Extend <a href="doc/manual.html#charCoords"><code>charCoords</code></a>
-    and <a href="doc/manual.html#cursorCoords"><code>cursorCoords</code></a> with a <code>mode</code> argument.</li>
-    <li>Add <a href="doc/manual.html#option_autofocus"><code>autofocus</code></a> option.</li>
-    <li>Add <a href="doc/manual.html#findMarksAt"><code>findMarksAt</code></a> method.</li>
-  </ul>
-
-  <p class="rel">27-02-2012: <a href="http://codemirror.net/codemirror-2.22.zip">Version 2.22</a>:</p>
-
-  <ul class="rel-note">
-    <li>Allow <a href="doc/manual.html#keymaps">key handlers</a> to pass up events, allow binding characters.</li>
-    <li>Add <a href="doc/manual.html#option_autoClearEmptyLines"><code>autoClearEmptyLines</code></a> option.</li>
-    <li>Properly use tab stops when rendering tabs.</li>
-    <li>Make PHP mode more robust.</li>
-    <li>Support indentation blocks in <a href="doc/manual.html#util_foldcode">code folder</a>.</li>
-    <li>Add a script for <a href="doc/manual.html#util_match-highlighter">highlighting instances of the selection</a>.</li>
-    <li>New <a href="mode/properties/index.html">.properties</a> mode.</li>
-    <li>Fix many bugs.</li>
-  </ul>
-
-  <p class="rel">27-01-2012: <a href="http://codemirror.net/codemirror-2.21.zip">Version 2.21</a>:</p>
-
-  <ul class="rel-note">
-    <li>Added <a href="mode/less/index.html">LESS</a>, <a href="mode/mysql/index.html">MySQL</a>,
-    <a href="mode/go/index.html">Go</a>, and <a href="mode/verilog/index.html">Verilog</a> modes.</li>
-    <li>Add <a href="doc/manual.html#option_smartIndent"><code>smartIndent</code></a>
-    option.</li>
-    <li>Support a cursor in <a href="doc/manual.html#option_readOnly"><code>readOnly</code></a>-mode.</li>
-    <li>Support assigning multiple styles to a token.</li>
-    <li>Use a new approach to drawing the selection.</li>
-    <li>Add <a href="doc/manual.html#scrollTo"><code>scrollTo</code></a> method.</li>
-    <li>Allow undo/redo events to span non-adjacent lines.</li>
-    <li>Lots and lots of bugfixes.</li>
-  </ul>
-
-  <p class="rel">20-12-2011: <a href="http://codemirror.net/codemirror-2.2.zip">Version 2.2</a>:</p>
-
-  <ul class="rel-note">
-    <li>Slightly incompatible API changes. Read <a href="doc/upgrade_v2.2.html">this</a>.</li>
-    <li>New approach
-    to <a href="doc/manual.html#option_extraKeys">binding</a> keys,
-    support for <a href="doc/manual.html#option_keyMap">custom
-    bindings</a>.</li>
-    <li>Support for overwrite (insert).</li>
-    <li><a href="doc/manual.html#option_tabSize">Custom-width</a>
-    and <a href="demo/visibletabs.html">stylable</a> tabs.</li>
-    <li>Moved more code into <a href="doc/manual.html#addons">add-on scripts</a>.</li>
-    <li>Support for sane vertical cursor movement in wrapped lines.</li>
-    <li>More reliable handling of
-    editing <a href="doc/manual.html#markText">marked text</a>.</li>
-    <li>Add minimal <a href="demo/emacs.html">emacs</a>
-    and <a href="demo/vim.html">vim</a> bindings.</li>
-    <li>Rename <code>coordsFromIndex</code>
-    to <a href="doc/manual.html#posFromIndex"><code>posFromIndex</code></a>,
-    add <a href="doc/manual.html#indexFromPos"><code>indexFromPos</code></a>
-    method.</li>
-  </ul>
-
-  <p><a href="doc/oldrelease.html">Older releases...</a></p>
-
-</div></div>
-
-<div style="height: 2em">&nbsp;</div>
-
-  <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal">
-    <input type="hidden" name="cmd" value="_s-xclick"/>
-    <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/>
-  </form>
-
-  </body>
-</html>
diff --git a/js/.DS_Store b/js/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ceee7fe40a78aee54b4b826699f1b5b94dd199a9
GIT binary patch
literal 6148
zcmeHK%SyvQ6g{IAs)7{X%Pid}_y<v{;KEJ)0h^|vQf;xRk6k{)kMaZj8$I{VAc?&J
zaUmje%gjk9b5HI)nMVeIJD%l-KnFmZMX<HP$}qVvWzH5t%No%s#}ozb(Z>Y)bG>6j
zR3Iww*A$SsyN(QF{t8s*ZyzHJIhzX{;0DvP(Rh%J#u@v|VsXl{_pZh(V8i6dFr$A#
z?mLs^^$W|E$ui)Ia!-yK;~O$6BOcfLCexVyBVD0{%VK)_7E`VfO^`FL$A;`gqnC<C
zw$8U?$QhBD7et{d$EK;!gd9>H^o?0ri9S`HZIfq;f#xL|P09G&s8E%wV{#SDDYN`#
z?6`JC7ds~zHS)F!Tr(0QC()+Hv(pfV>_~Ua=UTZM#-fa%8k?<9K}{x9xsNNYb1O2(
zF;wGPMh_=ALKo-61Kc8?pHJ?oqRA3t9qN4iI`bs!YEQn{9~$>;vG%IRSVsk-0#Sia
z1!R3lSOn96rAJ*lSm_af*kZF9ujTVVe3F1^z|te{(42QAdRG^Y7|y%1Jqi8NfTc(8
z4i^p|E<D+V6N=NPlRwe!aH+>wM+Kq+bp;mv-;V76C(Y;ox>NiY6^IJ_D+OGud(k~+
zN?~uEOHTIMgyoV&O!}1`)rD2qj`c#e;$0Rs-b>_ym<B98vV|5u1XPAtMFoCUfe-$A
B09gP4

literal 0
HcmV?d00001

diff --git a/js/._.DS_Store b/js/._.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8ac37fc9adc12c023d85488dfaf3036e73962005
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIk*Y|peR=07!nd>
zJ?rFuhz^DdtcpejM?+vV1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONfXX4j2s96b
z!9Xq~BePhcD784hv?w`MAuYcsTOl*ABsH%jGe0jeC#O;&CpE1^At@&@FB{m^h3Xp8
P6srH>UXfvt`~M#R%-A0@

literal 0
HcmV?d00001

diff --git a/js/._.jshintrc b/js/._.jshintrc
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._README.md b/js/._README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-alert.js b/js/._bootstrap-alert.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-button.js b/js/._bootstrap-button.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-carousel.js b/js/._bootstrap-carousel.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-collapse.js b/js/._bootstrap-collapse.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-dropdown.js b/js/._bootstrap-dropdown.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-modal.js b/js/._bootstrap-modal.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-popover.js b/js/._bootstrap-popover.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-scrollspy.js b/js/._bootstrap-scrollspy.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-tab.js b/js/._bootstrap-tab.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-tooltip.js b/js/._bootstrap-tooltip.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-transition.js b/js/._bootstrap-transition.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._bootstrap-typeahead.js b/js/._bootstrap-typeahead.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/._tests b/js/._tests
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/.jshintrc b/js/.jshintrc
new file mode 100644
index 0000000000..bbac349e8f
--- /dev/null
+++ b/js/.jshintrc
@@ -0,0 +1,10 @@
+{
+    "validthis": true,
+    "laxcomma" : true,
+    "laxbreak" : true,
+    "browser"  : true,
+    "debug"    : true,
+    "boss"     : true,
+    "expr"     : true,
+    "asi"      : true
+}
\ No newline at end of file
diff --git a/js/README.md b/js/README.md
new file mode 100644
index 0000000000..b7927ba6b2
--- /dev/null
+++ b/js/README.md
@@ -0,0 +1,112 @@
+## 2.0 BOOTSTRAP JS PHILOSOPHY
+These are the high-level design rules which guide the development of Bootstrap's plugin apis.
+
+---
+
+### DATA-ATTRIBUTE API
+
+We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API.
+
+We acknowledge that this isn't always the most performant and it may sometimes be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
+
+    $('body').off('.data-api')
+
+To target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:
+
+    $('body').off('.alert.data-api')
+
+---
+
+### PROGRAMATIC API
+
+We also believe you should be able to use all plugins provided by Bootstrap purely through the JavaScript API.
+
+All public APIs should be single, chainable methods, and return the collection acted upon.
+
+    $(".btn.danger").button("toggle").addClass("fat")
+
+All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior:
+
+    $("#myModal").modal() // initialized with defaults
+    $("#myModal").modal({ keyboard: false }) // initialized with no keyboard
+    $("#myModal").modal('show') // initializes and invokes show immediately
+
+---
+
+### OPTIONS
+
+Options should be sparse and add universal value. We should pick the right defaults.
+
+All plugins should have a default object which can be modified to affect all instances' default options. The defaults object should be available via `$.fn.plugin.defaults`.
+
+    $.fn.modal.defaults = { … }
+
+An options definition should take the following form:
+
+    *noun*: *adjective* - describes or modifies a quality of an instance
+
+Examples:
+
+    backdrop: true
+    keyboard: false
+    placement: 'top'
+
+---
+
+### EVENTS
+
+All events should have an infinitive and past participle form. The infinitive is fired just before an action takes place, the past participle on completion of the action.
+
+    show | shown
+    hide | hidden
+
+All infinitive events should provide preventDefault functionality. This provides the abililty to stop the execution of an action.
+
+    $('#myModal').on('show', function (e) {
+        if (!data) return e.preventDefault() // stops modal from being shown
+    })
+
+---
+
+### CONSTRUCTORS
+
+Each plugin should expose its raw constructor on a `Constructor` property -- accessed in the following way:
+
+
+    $.fn.popover.Constructor
+
+---
+
+### DATA ACCESSOR
+
+Each plugin stores a copy of the invoked class on an object. This class instance can be accessed directly through jQuery's data API like this:
+
+    $('[rel=popover]').data('popover') instanceof $.fn.popover.Constructor
+
+---
+
+### DATA ATTRIBUTES
+
+Data attributes should take the following form:
+
+- data-{{verb}}={{plugin}} - defines main interaction
+- data-target || href^=# - defined on "control" element (if element controls an element other than self)
+- data-{{noun}} - defines class instance options
+
+Examples:
+
+    // control other targets
+    data-toggle="modal" data-target="#foo"
+    data-toggle="collapse" data-target="#foo" data-parent="#bar"
+
+    // defined on element they control
+    data-spy="scroll"
+
+    data-dismiss="modal"
+    data-dismiss="alert"
+
+    data-toggle="dropdown"
+
+    data-toggle="button"
+    data-toggle="buttons-checkbox"
+    data-toggle="buttons-radio"
\ No newline at end of file
diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
new file mode 100644
index 0000000000..57890a9a28
--- /dev/null
+++ b/js/bootstrap-alert.js
@@ -0,0 +1,90 @@
+/* ==========================================================
+ * bootstrap-alert.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function (el) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+
+    e && e.preventDefault()
+
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+    $parent.trigger(e = $.Event('close'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js
new file mode 100644
index 0000000000..7f187be620
--- /dev/null
+++ b/js/bootstrap-button.js
@@ -0,0 +1,96 @@
+/* ============================================================
+ * bootstrap-button.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.parent('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.toggleClass('active')
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(function () {
+    $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
+      var $btn = $(e.target)
+      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+      $btn.button('toggle')
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
new file mode 100644
index 0000000000..551de58911
--- /dev/null
+++ b/js/bootstrap-carousel.js
@@ -0,0 +1,169 @@
+/* ==========================================================
+ * bootstrap-carousel.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.options = options
+    this.options.slide && this.slide(this.options.slide)
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.prototype = {
+
+    cycle: function (e) {
+      if (!e) this.paused = false
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      return this
+    }
+
+  , to: function (pos) {
+      var $active = this.$element.find('.active')
+        , children = $active.parent().children()
+        , activePos = children.index($active)
+        , that = this
+
+      if (pos > (children.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activePos == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
+    }
+
+  , pause: function (e) {
+      if (!e) this.paused = true
+      clearInterval(this.interval)
+      this.interval = null
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+        , e = $.Event('slide')
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      if ($next.hasClass('active')) return
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (typeof option == 'string' || (option = options.slide)) data[option]()
+      else if (options.interval) data.cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  , pause: 'hover'
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(function () {
+    $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data())
+      $target.carousel(options)
+      e.preventDefault()
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
new file mode 100644
index 0000000000..fbc915b9f9
--- /dev/null
+++ b/js/bootstrap-collapse.js
@@ -0,0 +1,157 @@
+/* =============================================================
+ * bootstrap-collapse.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSIBLE PLUGIN DEFINITION
+  * ============================== */
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSIBLE DATA-API
+  * ==================== */
+
+  $(function () {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
+      var $this = $(this), href
+        , target = $this.attr('data-target')
+          || e.preventDefault()
+          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+        , option = $(target).data('collapse') ? 'toggle' : $this.data()
+      $(target).collapse(option)
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
new file mode 100644
index 0000000000..454a9684b5
--- /dev/null
+++ b/js/bootstrap-dropdown.js
@@ -0,0 +1,100 @@
+/* ============================================================
+ * bootstrap-dropdown.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle="dropdown"]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , selector
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      selector = $this.attr('data-target')
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.length || ($parent = $this.parent())
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) $parent.toggleClass('open')
+
+      return false
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).parent().removeClass('open')
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(function () {
+    $('html').on('click.dropdown.data-api', clearMenus)
+    $('body')
+      .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
+      .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
new file mode 100644
index 0000000000..38fd0c8468
--- /dev/null
+++ b/js/bootstrap-modal.js
@@ -0,0 +1,218 @@
+/* =========================================================
+ * bootstrap-modal.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (content, options) {
+    this.options = options
+    this.$element = $(content)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        $('body').addClass('modal-open')
+
+        this.isShown = true
+
+        escape.call(this)
+        backdrop.call(this, function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element
+            .show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element.addClass('in')
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
+            that.$element.trigger('shown')
+
+        })
+      }
+
+    , hide: function (e) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        $('body').removeClass('modal-open')
+
+        escape.call(this)
+
+        this.$element.removeClass('in')
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          hideWithTransition.call(this) :
+          hideModal.call(this)
+      }
+
+  }
+
+
+ /* MODAL PRIVATE METHODS
+  * ===================== */
+
+  function hideWithTransition() {
+    var that = this
+      , timeout = setTimeout(function () {
+          that.$element.off($.support.transition.end)
+          hideModal.call(that)
+        }, 500)
+
+    this.$element.one($.support.transition.end, function () {
+      clearTimeout(timeout)
+      hideModal.call(that)
+    })
+  }
+
+  function hideModal(that) {
+    this.$element
+      .hide()
+      .trigger('hidden')
+
+    backdrop.call(this)
+  }
+
+  function backdrop(callback) {
+    var that = this
+      , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .appendTo(document.body)
+
+      if (this.options.backdrop != 'static') {
+        this.$backdrop.click($.proxy(this.hide, this))
+      }
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      doAnimate ?
+        this.$backdrop.one($.support.transition.end, callback) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      $.support.transition && this.$element.hasClass('fade')?
+        this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
+        removeBackdrop.call(this)
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  function removeBackdrop() {
+    this.$backdrop.remove()
+    this.$backdrop = null
+  }
+
+  function escape() {
+    var that = this
+    if (this.isShown && this.options.keyboard) {
+      $(document).on('keyup.dismiss.modal', function ( e ) {
+        e.which == 27 && that.hide()
+      })
+    } else if (!this.isShown) {
+      $(document).off('keyup.dismiss.modal')
+    }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
+
+      e.preventDefault()
+      $target.modal(option)
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
new file mode 100644
index 0000000000..39fbe358eb
--- /dev/null
+++ b/js/bootstrap-popover.js
@@ -0,0 +1,98 @@
+/* ===========================================================
+ * bootstrap-popover.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Popover = function ( element, options ) {
+    this.init('popover', element, options)
+  }
+
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title)
+      $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = $e.attr('data-content')
+        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+
+      return content
+    }
+
+  , tip: function () {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
new file mode 100644
index 0000000000..dce3718126
--- /dev/null
+++ b/js/bootstrap-scrollspy.js
@@ -0,0 +1,151 @@
+/* =============================================================
+ * bootstrap-scrollspy.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+  /* SCROLLSPY CLASS DEFINITION
+   * ========================== */
+
+  function ScrollSpy( element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body')
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        var self = this
+          , $targets
+
+        this.offsets = $([])
+        this.targets = $([])
+
+        $targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var $el = $(this)
+              , href = $el.data('target') || $el.attr('href')
+              , $href = /^#\w/.test(href) && $(href)
+            return ( $href
+              && href.length
+              && [[ $href.position().top, href ]] ) || null
+          })
+          .sort(function (a, b) { return a[0] - b[0] })
+          .each(function () {
+            self.offsets.push(this[0])
+            self.targets.push(this[1])
+          })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+          , maxScroll = scrollHeight - this.$scrollElement.height()
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        if (scrollTop >= maxScroll) {
+          return activeTarget != (i = targets.last()[0])
+            && this.activate ( i )
+        }
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+          , selector
+
+        this.activeTarget = target
+
+        $(this.selector)
+          .parent('.active')
+          .removeClass('active')
+
+        selector = this.selector
+          + '[data-target="' + target + '"],'
+          + this.selector + '[href="' + target + '"]'
+
+        active = $(selector)
+          .parent('li')
+          .addClass('active')
+
+        if (active.parent('.dropdown-menu'))  {
+          active = active.closest('li.dropdown').addClass('active')
+        }
+
+        active.trigger('activate')
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  $.fn.scrollspy = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js
new file mode 100644
index 0000000000..d87f35099a
--- /dev/null
+++ b/js/bootstrap-tab.js
@@ -0,0 +1,135 @@
+/* ========================================================
+ * bootstrap-tab.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function ( element ) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+        , e
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active a').last()[0]
+
+      e = $.Event('show', {
+        relatedTarget: previous
+      })
+
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(function () {
+    $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+      e.preventDefault()
+      $(this).tab('show')
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
new file mode 100644
index 0000000000..b476f1c4e6
--- /dev/null
+++ b/js/bootstrap-tooltip.js
@@ -0,0 +1,275 @@
+/* ===========================================================
+ * bootstrap-tooltip.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      if (this.options.trigger != 'manual') {
+        eventIn  = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
+        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
+        this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this))
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (this.timeout) clearTimeout(this.timeout)
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , inside
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+
+      if (this.hasContent() && this.enabled) {
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        inside = /in/.test(placement)
+
+        $tip
+          .remove()
+          .css({ top: 0, left: 0, display: 'block' })
+          .appendTo(inside ? this.$element : document.body)
+
+        pos = this.getPosition(inside)
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (inside ? placement.split(' ')[1] : placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        $tip
+          .css(tp)
+          .addClass(placement)
+          .addClass('in')
+      }
+    }
+
+  , isHTML: function(text) {
+      // html string detection logic adapted from jQuery
+      return typeof text != 'string'
+        || ( text.charAt(0) === "<"
+          && text.charAt( text.length - 1 ) === ">"
+          && text.length >= 3
+        ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text)
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).remove()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.remove()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.remove()
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function (inside) {
+      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
+        width: this.$element[0].offsetWidth
+      , height: this.$element[0].offsetHeight
+      })
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function () {
+      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover'
+  , title: ''
+  , delay: 0
+  }
+
+}(window.jQuery);
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
new file mode 100644
index 0000000000..534182622d
--- /dev/null
+++ b/js/bootstrap-transition.js
@@ -0,0 +1,61 @@
+/* ===================================================
+ * bootstrap-transition.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  $(function () {
+
+    "use strict"; // jshint ;_;
+
+
+    /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
+     * ======================================================= */
+
+    $.support.transition = (function () {
+
+      var transitionEnd = (function () {
+
+        var el = document.createElement('bootstrap')
+          , transEndEventNames = {
+               'WebkitTransition' : 'webkitTransitionEnd'
+            ,  'MozTransition'    : 'transitionend'
+            ,  'OTransition'      : 'oTransitionEnd'
+            ,  'msTransition'     : 'MSTransitionEnd'
+            ,  'transition'       : 'transitionend'
+            }
+          , name
+
+        for (name in transEndEventNames){
+          if (el.style[name] !== undefined) {
+            return transEndEventNames[name]
+          }
+        }
+
+      }())
+
+      return transitionEnd && {
+        end: transitionEnd
+      }
+
+    })()
+
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
new file mode 100644
index 0000000000..ad44b90852
--- /dev/null
+++ b/js/bootstrap-typeahead.js
@@ -0,0 +1,285 @@
+/* =============================================================
+ * bootstrap-typeahead.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.$menu = $(this.options.menu).appendTo('body')
+    this.source = this.options.source
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.offset(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu.css({
+        top: pos.top + pos.height
+      , left: pos.left
+      })
+
+      this.$menu.show()
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var that = this
+        , items
+        , q
+
+      this.query = this.$element.val()
+
+      if (!this.query) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.grep(this.source, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if ($.browser.webkit || $.browser.msie) {
+        this.$element.on('keydown', $.proxy(this.keypress, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , keypress: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          if (e.type != 'keydown') break
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          if (e.type != 'keydown') break
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , blur: function (e) {
+      var that = this
+      setTimeout(function () { that.hide() }, 150)
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+    }
+
+  , mouseenter: function (e) {
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(function () {
+    $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+      var $this = $(this)
+      if ($this.data('typeahead')) return
+      e.preventDefault()
+      $this.typeahead($this.data())
+    })
+  })
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/tests/._index.html b/js/tests/._index.html
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/._phantom.js b/js/tests/._phantom.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/._server.js b/js/tests/._server.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/._unit b/js/tests/._unit
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/._vendor b/js/tests/._vendor
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/index.html b/js/tests/index.html
new file mode 100644
index 0000000000..2f8f71b12e
--- /dev/null
+++ b/js/tests/index.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bootstrap Plugin Test Suite</title>
+
+  <!-- jquery -->
+  <!--<script src="http://code.jquery.com/jquery-1.7.min.js"></script>-->
+  <script src="vendor/jquery.js"></script>
+
+  <!-- qunit -->
+  <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
+  <script src="vendor/qunit.js"></script>
+
+  <!-- phantomjs logging script-->
+  <script src="unit/bootstrap-phantom.js"></script>
+
+  <!--  plugin sources -->
+  <script src="../../js/bootstrap-transition.js"></script>
+  <script src="../../js/bootstrap-alert.js"></script>
+  <script src="../../js/bootstrap-button.js"></script>
+  <script src="../../js/bootstrap-carousel.js"></script>
+  <script src="../../js/bootstrap-collapse.js"></script>
+  <script src="../../js/bootstrap-dropdown.js"></script>
+  <script src="../../js/bootstrap-modal.js"></script>
+  <script src="../../js/bootstrap-scrollspy.js"></script>
+  <script src="../../js/bootstrap-tab.js"></script>
+  <script src="../../js/bootstrap-tooltip.js"></script>
+  <script src="../../js/bootstrap-popover.js"></script>
+  <script src="../../js/bootstrap-typeahead.js"></script>
+
+  <!-- unit tests -->
+  <script src="unit/bootstrap-transition.js"></script>
+  <script src="unit/bootstrap-alert.js"></script>
+  <script src="unit/bootstrap-button.js"></script>
+  <script src="unit/bootstrap-carousel.js"></script>
+  <script src="unit/bootstrap-collapse.js"></script>
+  <script src="unit/bootstrap-dropdown.js"></script>
+  <script src="unit/bootstrap-modal.js"></script>
+  <script src="unit/bootstrap-scrollspy.js"></script>
+  <script src="unit/bootstrap-tab.js"></script>
+  <script src="unit/bootstrap-tooltip.js"></script>
+  <script src="unit/bootstrap-popover.js"></script>
+  <script src="unit/bootstrap-typeahead.js"></script>
+</head>
+<body>
+  <div>
+    <h1 id="qunit-header">Bootstrap Plugin Test Suite</h1>
+    <h2 id="qunit-banner"></h2>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    <div id="qunit-fixture"></div>
+  </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/js/tests/phantom.js b/js/tests/phantom.js
new file mode 100644
index 0000000000..4105bf529d
--- /dev/null
+++ b/js/tests/phantom.js
@@ -0,0 +1,63 @@
+// Simple phantom.js integration script
+// Adapted from Modernizr
+
+function waitFor(testFx, onReady, timeOutMillis) {
+  var maxtimeOutMillis = timeOutMillis ? timeOutMillis :  5001 //< Default Max Timout is 5s
+    , start = new Date().getTime()
+    , condition = false
+    , interval = setInterval(function () {
+        if ((new Date().getTime() - start < maxtimeOutMillis) && !condition) {
+          // If not time-out yet and condition not yet fulfilled
+          condition = (typeof(testFx) === "string" ? eval(testFx) : testFx()) //< defensive code
+        } else {
+          if (!condition) {
+            // If condition still not fulfilled (timeout but condition is 'false')
+            console.log("'waitFor()' timeout")
+            phantom.exit(1)
+          } else {
+            // Condition fulfilled (timeout and/or condition is 'true')
+            typeof(onReady) === "string" ? eval(onReady) : onReady() //< Do what it's supposed to do once the condition is fulfilled
+            clearInterval(interval) //< Stop this interval
+          }
+        }
+    }, 100) //< repeat check every 100ms
+}
+
+
+if (phantom.args.length === 0 || phantom.args.length > 2) {
+  console.log('Usage: phantom.js URL')
+  phantom.exit()
+}
+
+var page = new WebPage()
+
+// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
+page.onConsoleMessage = function(msg) {
+  console.log(msg)
+};
+
+page.open(phantom.args[0], function(status){
+  if (status !== "success") {
+    console.log("Unable to access network")
+    phantom.exit()
+  } else {
+    waitFor(function(){
+      return page.evaluate(function(){
+        var el = document.getElementById('qunit-testresult')
+        if (el && el.innerText.match('completed')) {
+          return true
+        }
+        return false
+      })
+    }, function(){
+      var failedNum = page.evaluate(function(){
+        var el = document.getElementById('qunit-testresult')
+        try {
+          return el.getElementsByClassName('failed')[0].innerHTML
+        } catch (e) { }
+        return 10000
+      });
+      phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0)
+    })
+  }
+})
\ No newline at end of file
diff --git a/js/tests/server.js b/js/tests/server.js
new file mode 100644
index 0000000000..7c8445feb8
--- /dev/null
+++ b/js/tests/server.js
@@ -0,0 +1,14 @@
+/*
+ * Simple connect server for phantom.js
+ * Adapted from Modernizr
+ */
+
+var connect = require('connect')
+  , http = require('http')
+  , fs   = require('fs')
+  , app = connect()
+      .use(connect.static(__dirname + '/../../'));
+
+http.createServer(app).listen(3000);
+
+fs.writeFileSync(__dirname + '/pid.txt', process.pid, 'utf-8')
\ No newline at end of file
diff --git a/js/tests/unit/._bootstrap-alert.js b/js/tests/unit/._bootstrap-alert.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-button.js b/js/tests/unit/._bootstrap-button.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-carousel.js b/js/tests/unit/._bootstrap-carousel.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-collapse.js b/js/tests/unit/._bootstrap-collapse.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-dropdown.js b/js/tests/unit/._bootstrap-dropdown.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-modal.js b/js/tests/unit/._bootstrap-modal.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-phantom.js b/js/tests/unit/._bootstrap-phantom.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-popover.js b/js/tests/unit/._bootstrap-popover.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-scrollspy.js b/js/tests/unit/._bootstrap-scrollspy.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-tab.js b/js/tests/unit/._bootstrap-tab.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-tooltip.js b/js/tests/unit/._bootstrap-tooltip.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-transition.js b/js/tests/unit/._bootstrap-transition.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/._bootstrap-typeahead.js b/js/tests/unit/._bootstrap-typeahead.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/unit/bootstrap-alert.js b/js/tests/unit/bootstrap-alert.js
new file mode 100644
index 0000000000..7f24e0e6be
--- /dev/null
+++ b/js/tests/unit/bootstrap-alert.js
@@ -0,0 +1,56 @@
+$(function () {
+
+    module("bootstrap-alerts")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).alert, 'alert method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).alert()[0] == document.body, 'document.body returned')
+      })
+
+      test("should fade element out on clicking .close", function () {
+        var alertHTML = '<div class="alert-message warning fade in">'
+          + '<a class="close" href="#" data-dismiss="alert">×</a>'
+          + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
+          + '</div>'
+          , alert = $(alertHTML).alert()
+
+        alert.find('.close').click()
+
+        ok(!alert.hasClass('in'), 'remove .in class on .close click')
+      })
+
+      test("should remove element when clicking .close", function () {
+        $.support.transition = false
+
+        var alertHTML = '<div class="alert-message warning fade in">'
+          + '<a class="close" href="#" data-dismiss="alert">×</a>'
+          + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>'
+          + '</div>'
+          , alert = $(alertHTML).appendTo('#qunit-fixture').alert()
+
+        ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom')
+
+        alert.find('.close').click()
+
+        ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom')
+      })
+
+      test("should not fire closed when close is prevented", function () {
+        $.support.transition = false
+        stop();
+        $('<div class="alert"/>')
+          .bind('close', function (e) {
+            e.preventDefault();
+            ok(true);
+            start();
+          })
+          .bind('closed', function () {
+            ok(false);
+          })
+          .alert('close')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-button.js b/js/tests/unit/bootstrap-button.js
new file mode 100644
index 0000000000..03c4a8e9d5
--- /dev/null
+++ b/js/tests/unit/bootstrap-button.js
@@ -0,0 +1,77 @@
+$(function () {
+
+    module("bootstrap-buttons")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).button, 'button method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).button()[0] == document.body, 'document.body returned')
+      })
+
+      test("should return set state to loading", function () {
+        var btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
+        equals(btn.html(), 'mdo', 'btn text equals mdo')
+        btn.button('loading')
+        equals(btn.html(), 'fat', 'btn text equals fat')
+        stop()
+        setTimeout(function () {
+          ok(btn.attr('disabled'), 'btn is disabled')
+          ok(btn.hasClass('disabled'), 'btn has disabled class')
+          start()
+        }, 0)
+      })
+
+      test("should return reset state", function () {
+        var btn = $('<button class="btn" data-loading-text="fat">mdo</button>')
+        equals(btn.html(), 'mdo', 'btn text equals mdo')
+        btn.button('loading')
+        equals(btn.html(), 'fat', 'btn text equals fat')
+        stop()
+        setTimeout(function () {
+          ok(btn.attr('disabled'), 'btn is disabled')
+          ok(btn.hasClass('disabled'), 'btn has disabled class')
+          start()
+          stop()
+        }, 0)
+        btn.button('reset')
+        equals(btn.html(), 'mdo', 'btn text equals mdo')
+        setTimeout(function () {
+          ok(!btn.attr('disabled'), 'btn is not disabled')
+          ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
+          start()
+        }, 0)
+      })
+
+      test("should toggle active", function () {
+        var btn = $('<button class="btn">mdo</button>')
+        ok(!btn.hasClass('active'), 'btn does not have active class')
+        btn.button('toggle')
+        ok(btn.hasClass('active'), 'btn has class active')
+      })
+
+      test("should toggle active when btn children are clicked", function () {
+        var btn = $('<button class="btn" data-toggle="button">mdo</button>')
+          , inner = $('<i></i>')
+        btn
+          .append(inner)
+          .appendTo($('#qunit-fixture'))
+        ok(!btn.hasClass('active'), 'btn does not have active class')
+        inner.click()
+        ok(btn.hasClass('active'), 'btn has class active')
+      })
+
+     test("should toggle active when btn children are clicked within btn-group", function () {
+        var btngroup = $('<div class="btn-group" data-toggle="buttons-checkbox"></div>')
+          , btn = $('<button class="btn">fat</button>')
+          , inner = $('<i></i>')
+        btngroup
+          .append(btn.append(inner))
+          .appendTo($('#qunit-fixture'))
+        ok(!btn.hasClass('active'), 'btn does not have active class')
+        inner.click()
+        ok(btn.hasClass('active'), 'btn has class active')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-carousel.js b/js/tests/unit/bootstrap-carousel.js
new file mode 100644
index 0000000000..92c23e227c
--- /dev/null
+++ b/js/tests/unit/bootstrap-carousel.js
@@ -0,0 +1,28 @@
+$(function () {
+
+    module("bootstrap-carousel")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).carousel, 'carousel method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).carousel()[0] == document.body, 'document.body returned')
+      })
+
+      test("should not fire sliden when slide is prevented", function () {
+        $.support.transition = false
+        stop();
+        $('<div class="carousel"/>')
+          .bind('slide', function (e) {
+            e.preventDefault();
+            ok(true);
+            start();
+          })
+          .bind('slid', function () {
+            ok(false);
+          })
+          .carousel('next')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-collapse.js b/js/tests/unit/bootstrap-collapse.js
new file mode 100644
index 0000000000..fb66135db9
--- /dev/null
+++ b/js/tests/unit/bootstrap-collapse.js
@@ -0,0 +1,54 @@
+$(function () {
+
+    module("bootstrap-collapse")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).collapse, 'collapse method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).collapse()[0] == document.body, 'document.body returned')
+      })
+
+      test("should show a collapsed element", function () {
+        var el = $('<div class="collapse"></div>').collapse('show')
+        ok(el.hasClass('in'), 'has class in')
+        ok(/height/.test(el.attr('style')), 'has height set')
+      })
+
+      test("should hide a collapsed element", function () {
+        var el = $('<div class="collapse"></div>').collapse('hide')
+        ok(!el.hasClass('in'), 'does not have class in')
+        ok(/height/.test(el.attr('style')), 'has height set')
+      })
+
+      test("should not fire shown when show is prevented", function () {
+        $.support.transition = false
+        stop();
+        $('<div class="collapse"/>')
+          .bind('show', function (e) {
+            e.preventDefault();
+            ok(true);
+            start();
+          })
+          .bind('shown', function () {
+            ok(false);
+          })
+          .collapse('show')
+      })
+
+      test("should reset style to auto after finishing opening collapse", function () {
+        $.support.transition = false
+        stop();
+        $('<div class="collapse" style="height: 0px"/>')
+          .bind('show', function () {
+            ok(this.style.height == '0px')
+          })
+          .bind('shown', function () {
+            ok(this.style.height == 'auto')
+            start()
+          })
+          .collapse('show')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-dropdown.js b/js/tests/unit/bootstrap-dropdown.js
new file mode 100644
index 0000000000..4e52c8485e
--- /dev/null
+++ b/js/tests/unit/bootstrap-dropdown.js
@@ -0,0 +1,87 @@
+$(function () {
+
+    module("bootstrap-dropdowns")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).dropdown, 'dropdown method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).dropdown()[0] == document.body, 'document.body returned')
+      })
+
+      test("should not open dropdown if target is disabled", function () {
+        var dropdownHTML = '<ul class="tabs">'
+          + '<li class="dropdown">'
+          + '<button disabled href="#" class="btn dropdown-toggle" data-toggle="dropdown">Dropdown</button>'
+          + '<ul class="dropdown-menu">'
+          + '<li><a href="#">Secondary link</a></li>'
+          + '<li><a href="#">Something else here</a></li>'
+          + '<li class="divider"></li>'
+          + '<li><a href="#">Another link</a></li>'
+          + '</ul>'
+          + '</li>'
+          + '</ul>'
+          , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
+
+        ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
+      })
+
+      test("should not open dropdown if target is disabled", function () {
+        var dropdownHTML = '<ul class="tabs">'
+          + '<li class="dropdown">'
+          + '<button href="#" class="btn dropdown-toggle disabled" data-toggle="dropdown">Dropdown</button>'
+          + '<ul class="dropdown-menu">'
+          + '<li><a href="#">Secondary link</a></li>'
+          + '<li><a href="#">Something else here</a></li>'
+          + '<li class="divider"></li>'
+          + '<li><a href="#">Another link</a></li>'
+          + '</ul>'
+          + '</li>'
+          + '</ul>'
+          , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
+
+        ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
+      })
+
+      test("should add class open to menu if clicked", function () {
+        var dropdownHTML = '<ul class="tabs">'
+          + '<li class="dropdown">'
+          + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
+          + '<ul class="dropdown-menu">'
+          + '<li><a href="#">Secondary link</a></li>'
+          + '<li><a href="#">Something else here</a></li>'
+          + '<li class="divider"></li>'
+          + '<li><a href="#">Another link</a></li>'
+          + '</ul>'
+          + '</li>'
+          + '</ul>'
+          , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
+
+        ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
+      })
+
+      test("should remove open class if body clicked", function () {
+        var dropdownHTML = '<ul class="tabs">'
+          + '<li class="dropdown">'
+          + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
+          + '<ul class="dropdown-menu">'
+          + '<li><a href="#">Secondary link</a></li>'
+          + '<li><a href="#">Something else here</a></li>'
+          + '<li class="divider"></li>'
+          + '<li><a href="#">Another link</a></li>'
+          + '</ul>'
+          + '</li>'
+          + '</ul>'
+          , dropdown = $(dropdownHTML)
+            .appendTo('#qunit-fixture')
+            .find('[data-toggle="dropdown"]')
+            .dropdown()
+            .click()
+        ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
+        $('body').click()
+        ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed')
+        dropdown.remove()
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js
new file mode 100644
index 0000000000..0851f64a72
--- /dev/null
+++ b/js/tests/unit/bootstrap-modal.js
@@ -0,0 +1,114 @@
+$(function () {
+
+    module("bootstrap-modal")
+
+      test("should be defined on jquery object", function () {
+        var div = $("<div id='modal-test'></div>")
+        ok(div.modal, 'modal method is defined')
+      })
+
+      test("should return element", function () {
+        var div = $("<div id='modal-test'></div>")
+        ok(div.modal() == div, 'document.body returned')
+        $('#modal-test').remove()
+      })
+
+      test("should expose defaults var for settings", function () {
+        ok($.fn.modal.defaults, 'default object exposed')
+      })
+
+      test("should insert into dom when show method is called", function () {
+        stop()
+        $.support.transition = false
+        $("<div id='modal-test'></div>")
+          .bind("shown", function () {
+            ok($('#modal-test').length, 'modal insterted into dom')
+            $(this).remove()
+            start()
+          })
+          .modal("show")
+      })
+
+      test("should fire show event", function () {
+        stop()
+        $.support.transition = false
+        $("<div id='modal-test'></div>")
+          .bind("show", function () {
+            ok(true, "show was called")
+          })
+          .bind("shown", function () {
+            $(this).remove()
+            start()
+          })
+          .modal("show")
+      })
+
+      test("should not fire shown when default prevented", function () {
+        stop()
+        $.support.transition = false
+        $("<div id='modal-test'></div>")
+          .bind("show", function (e) {
+            e.preventDefault()
+            ok(true, "show was called")
+            start()
+          })
+          .bind("shown", function () {
+            ok(false, "shown was called")
+          })
+          .modal("show")
+      })
+
+      test("should hide modal when hide is called", function () {
+        stop()
+        $.support.transition = false
+
+        $("<div id='modal-test'></div>")
+          .bind("shown", function () {
+            ok($('#modal-test').is(":visible"), 'modal visible')
+            ok($('#modal-test').length, 'modal insterted into dom')
+            $(this).modal("hide")
+          })
+          .bind("hidden", function() {
+            ok(!$('#modal-test').is(":visible"), 'modal hidden')
+            $('#modal-test').remove()
+            start()
+          })
+          .modal("show")
+      })
+
+      test("should toggle when toggle is called", function () {
+        stop()
+        $.support.transition = false
+        var div = $("<div id='modal-test'></div>")
+        div
+          .bind("shown", function () {
+            ok($('#modal-test').is(":visible"), 'modal visible')
+            ok($('#modal-test').length, 'modal insterted into dom')
+            div.modal("toggle")
+          })
+          .bind("hidden", function() {
+            ok(!$('#modal-test').is(":visible"), 'modal hidden')
+            div.remove()
+            start()
+          })
+          .modal("toggle")
+      })
+
+      test("should remove from dom when click [data-dismiss=modal]", function () {
+        stop()
+        $.support.transition = false
+        var div = $("<div id='modal-test'><span class='close' data-dismiss='modal'></span></div>")
+        div
+          .bind("shown", function () {
+            ok($('#modal-test').is(":visible"), 'modal visible')
+            ok($('#modal-test').length, 'modal insterted into dom')
+            div.find('.close').click()
+          })
+          .bind("hidden", function() {
+            ok(!$('#modal-test').is(":visible"), 'modal hidden')
+            div.remove()
+            start()
+          })
+          .modal("toggle")
+      })
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-phantom.js b/js/tests/unit/bootstrap-phantom.js
new file mode 100644
index 0000000000..a04aeaa878
--- /dev/null
+++ b/js/tests/unit/bootstrap-phantom.js
@@ -0,0 +1,21 @@
+// Logging setup for phantom integration
+// adapted from Modernizr
+
+QUnit.begin = function () {
+  console.log("Starting test suite")
+  console.log("================================================\n")
+}
+
+QUnit.moduleDone = function (opts) {
+  if (opts.failed === 0) {
+    console.log("\u2714 All tests passed in '" + opts.name + "' module")
+  } else {
+    console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module")
+  }
+}
+
+QUnit.done = function (opts) {
+  console.log("\n================================================")
+  console.log("Tests completed in " + opts.runtime + " milliseconds")
+  console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.")
+}
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js
new file mode 100644
index 0000000000..afd6b170b4
--- /dev/null
+++ b/js/tests/unit/bootstrap-popover.js
@@ -0,0 +1,93 @@
+$(function () {
+
+    module("bootstrap-popover")
+
+      test("should be defined on jquery object", function () {
+        var div = $('<div></div>')
+        ok(div.popover, 'popover method is defined')
+      })
+
+      test("should return element", function () {
+        var div = $('<div></div>')
+        ok(div.popover() == div, 'document.body returned')
+      })
+
+      test("should render popover element", function () {
+        $.support.transition = false
+        var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
+          .appendTo('#qunit-fixture')
+          .popover('show')
+
+        ok($('.popover').length, 'popover was inserted')
+        popover.popover('hide')
+        ok(!$(".popover").length, 'popover removed')
+      })
+
+      test("should store popover instance in popover data object", function () {
+        $.support.transition = false
+        var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
+          .popover()
+
+        ok(!!popover.data('popover'), 'popover instance exists')
+      })
+
+      test("should get title and content from options", function () {
+        $.support.transition = false
+        var popover = $('<a href="#">@fat</a>')
+          .appendTo('#qunit-fixture')
+          .popover({
+            title: function () {
+              return '@fat'
+            }
+          , content: function () {
+              return 'loves writing tests （╯°□°）╯︵ ┻━┻'
+            }
+          })
+
+        popover.popover('show')
+
+        ok($('.popover').length, 'popover was inserted')
+        equals($('.popover .popover-title').text(), '@fat', 'title correctly inserted')
+        equals($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted')
+
+        popover.popover('hide')
+        ok(!$('.popover').length, 'popover was removed')
+        $('#qunit-fixture').empty()
+      })
+
+      test("should get title and content from attributes", function () {
+        $.support.transition = false
+        var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>')
+          .appendTo('#qunit-fixture')
+          .popover()
+          .popover('show')
+
+        ok($('.popover').length, 'popover was inserted')
+        equals($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
+        equals($('.popover .popover-content').text(), "loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻", 'content correctly inserted')
+
+        popover.popover('hide')
+        ok(!$('.popover').length, 'popover was removed')
+        $('#qunit-fixture').empty()
+      })
+    
+      test("should respect custom classes", function() {
+        $.support.transition = false
+        var popover = $('<a href="#">@fat</a>')
+          .appendTo('#qunit-fixture')
+          .popover({
+            title: 'Test'
+          , content: 'Test'
+          , template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
+          })
+        
+        popover.popover('show')
+
+        ok($('.popover').length, 'popover was inserted')
+        ok($('.popover').hasClass('foobar'), 'custom class is present')
+
+        popover.popover('hide')
+        ok(!$('.popover').length, 'popover was removed')
+        $('#qunit-fixture').empty()
+      })
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-scrollspy.js b/js/tests/unit/bootstrap-scrollspy.js
new file mode 100644
index 0000000000..bee46a925e
--- /dev/null
+++ b/js/tests/unit/bootstrap-scrollspy.js
@@ -0,0 +1,31 @@
+$(function () {
+
+    module("bootstrap-scrollspy")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).scrollspy, 'scrollspy method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).scrollspy()[0] == document.body, 'document.body returned')
+      })
+
+      test("should switch active class on scroll", function () {
+        var sectionHTML = '<div id="masthead"></div>'
+          , $section = $(sectionHTML).append('#qunit-fixture')
+          , topbarHTML ='<div class="topbar">'
+          + '<div class="topbar-inner">'
+          + '<div class="container">'
+          + '<h3><a href="#">Bootstrap</a></h3>'
+          + '<ul class="nav">'
+          + '<li><a href="#masthead">Overview</a></li>'
+          + '</ul>'
+          + '</div>'
+          + '</div>'
+          + '</div>'
+          , $topbar = $(topbarHTML).scrollspy()
+
+        ok($topbar.find('.active', true))
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js
new file mode 100644
index 0000000000..9878047810
--- /dev/null
+++ b/js/tests/unit/bootstrap-tab.js
@@ -0,0 +1,61 @@
+$(function () {
+
+    module("bootstrap-tabs")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).tab, 'tabs method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).tab()[0] == document.body, 'document.body returned')
+      })
+
+      test("should activate element by tab id", function () {
+        var tabsHTML =
+            '<ul class="tabs">'
+          + '<li><a href="#home">Home</a></li>'
+          + '<li><a href="#profile">Profile</a></li>'
+          + '</ul>'
+
+        $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
+
+        $(tabsHTML).find('li:last a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "profile")
+
+        $(tabsHTML).find('li:first a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "home")
+      })
+
+      test("should activate element by tab id", function () {
+        var pillsHTML =
+            '<ul class="pills">'
+          + '<li><a href="#home">Home</a></li>'
+          + '<li><a href="#profile">Profile</a></li>'
+          + '</ul>'
+
+        $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture")
+
+        $(pillsHTML).find('li:last a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "profile")
+
+        $(pillsHTML).find('li:first a').tab('show')
+        equals($("#qunit-fixture").find('.active').attr('id'), "home")
+      })
+
+
+      test("should not fire closed when close is prevented", function () {
+        $.support.transition = false
+        stop();
+        $('<div class="tab"/>')
+          .bind('show', function (e) {
+            e.preventDefault();
+            ok(true);
+            start();
+          })
+          .bind('shown', function () {
+            ok(false);
+          })
+          .tab('show')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
new file mode 100644
index 0000000000..7b0c10de00
--- /dev/null
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -0,0 +1,155 @@
+$(function () {
+
+    module("bootstrap-tooltip")
+
+      test("should be defined on jquery object", function () {
+        var div = $("<div></div>")
+        ok(div.tooltip, 'popover method is defined')
+      })
+
+      test("should return element", function () {
+        var div = $("<div></div>")
+        ok(div.tooltip() == div, 'document.body returned')
+      })
+
+      test("should expose default settings", function () {
+        ok(!!$.fn.tooltip.defaults, 'defaults is defined')
+      })
+
+      test("should remove title attribute", function () {
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip()
+        ok(!tooltip.attr('title'), 'title tag was removed')
+      })
+
+      test("should add data attribute for referencing original title", function () {
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip()
+        equals(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
+      })
+
+      test("should place tooltips relative to placement option", function () {
+        $.support.transition = false
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+          .appendTo('#qunit-fixture')
+          .tooltip({placement: 'bottom'})
+          .tooltip('show')
+
+        ok($(".tooltip").is('.fade.bottom.in'), 'has correct classes applied')
+        tooltip.tooltip('hide')
+      })
+
+      test("should always allow html entities", function () {
+        $.support.transition = false
+        var tooltip = $('<a href="#" rel="tooltip" title="<b>@fat</b>"></a>')
+          .appendTo('#qunit-fixture')
+          .tooltip('show')
+
+        ok($('.tooltip b').length, 'b tag was inserted')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
+      })
+
+      test("should respect custom classes", function () {
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+          .appendTo('#qunit-fixture')
+          .tooltip({ template: '<div class="tooltip some-class"><div class="tooltip-arrow"/><div class="tooltip-inner"/></div>'})
+          .tooltip('show')
+
+        ok($('.tooltip').hasClass('some-class'), 'custom class is present')
+        tooltip.tooltip('hide')
+        ok(!$(".tooltip").length, 'tooltip removed')
+      })
+
+      test("should not show tooltip if leave event occurs before delay expires", function () {
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+          .appendTo('#qunit-fixture')
+          .tooltip({ delay: 200 })
+
+        stop()
+
+        tooltip.trigger('mouseenter')
+
+        setTimeout(function () {
+          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+          tooltip.trigger('mouseout')
+          setTimeout(function () {
+            ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+            start()
+          }, 200)
+        }, 100)
+      })
+
+      test("should not show tooltip if leave event occurs before delay expires, even if hide delay is 0", function () {
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+          .appendTo('#qunit-fixture')
+          .tooltip({ delay: { show: 200, hide: 0} })
+
+        stop()
+
+        tooltip.trigger('mouseenter')
+
+        setTimeout(function () {
+          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+          tooltip.trigger('mouseout')
+          setTimeout(function () {
+            ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+            start()
+          }, 200)
+        }, 100)
+      })
+
+      test("should not show tooltip if leave event occurs before delay expires", function () {
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+          .appendTo('#qunit-fixture')
+          .tooltip({ delay: 100 })
+        stop()
+        tooltip.trigger('mouseenter')
+        setTimeout(function () {
+          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+          tooltip.trigger('mouseout')
+          setTimeout(function () {
+            ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+            start()
+          }, 100)
+        }, 50)
+      })
+
+      test("should show tooltip if leave event hasn't occured before delay expires", function () {
+        var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+          .appendTo('#qunit-fixture')
+          .tooltip({ delay: 150 })
+        stop()
+        tooltip.trigger('mouseenter')
+        setTimeout(function () {
+          ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in')
+        }, 100)
+        setTimeout(function () {
+          ok($(".tooltip").is('.fade.in'), 'tooltip has faded in')
+          start()
+        }, 200)
+      })
+
+      test("should detect if title string is html or text: foo", function () {
+        ok(!$.fn.tooltip.Constructor.prototype.isHTML('foo'), 'correctly detected html')
+      })
+
+      test("should detect if title string is html or text: &amp;lt;foo&amp;gt;", function () {
+        ok(!$.fn.tooltip.Constructor.prototype.isHTML('&lt;foo&gt;'), 'correctly detected html')
+      })
+
+      test("should detect if title string is html or text: &lt;div>foo&lt;/div>", function () {
+        ok($.fn.tooltip.Constructor.prototype.isHTML('<div>foo</div>'), 'correctly detected html')
+      })
+
+      test("should detect if title string is html or text: asdfa&lt;div>foo&lt;/div>asdfasdf", function () {
+        ok($.fn.tooltip.Constructor.prototype.isHTML('asdfa<div>foo</div>asdfasdf'), 'correctly detected html')
+      })
+
+      test("should detect if title string is html or text: document.createElement('div')", function () {
+        ok($.fn.tooltip.Constructor.prototype.isHTML(document.createElement('div')), 'correctly detected html')
+      })
+
+      test("should detect if title string is html or text: $('&lt;div />)", function () {
+        ok($.fn.tooltip.Constructor.prototype.isHTML($('<div></div>')), 'correctly detected html')
+      })
+
+})
diff --git a/js/tests/unit/bootstrap-transition.js b/js/tests/unit/bootstrap-transition.js
new file mode 100644
index 0000000000..086773fa27
--- /dev/null
+++ b/js/tests/unit/bootstrap-transition.js
@@ -0,0 +1,13 @@
+$(function () {
+
+    module("bootstrap-transition")
+
+      test("should be defined on jquery support object", function () {
+        ok($.support.transition !== undefined, 'transition object is defined')
+      })
+
+      test("should provide an end object", function () {
+        ok($.support.transition ? $.support.transition.end : true, 'end string is defined')
+      })
+
+})
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
new file mode 100644
index 0000000000..4e2428d6a4
--- /dev/null
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -0,0 +1,148 @@
+$(function () {
+
+    module("bootstrap-typeahead")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).typeahead, 'alert method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).typeahead()[0] == document.body, 'document.body returned')
+      })
+
+      test("should listen to an input", function () {
+        var $input = $('<input />')
+        $input.typeahead()
+        ok($input.data('events').blur, 'has a blur event')
+        ok($input.data('events').keypress, 'has a keypress event')
+        ok($input.data('events').keyup, 'has a keyup event')
+        if ($.browser.webkit || $.browser.msie) {
+          ok($input.data('events').keydown, 'has a keydown event')
+        } else {
+          ok($input.data('events').keydown, 'does not have a keydown event')
+        }
+      })
+
+      test("should create a menu", function () {
+        var $input = $('<input />')
+        ok($input.typeahead().data('typeahead').$menu, 'has a menu')
+      })
+
+      test("should listen to the menu", function () {
+        var $input = $('<input />')
+          , $menu = $input.typeahead().data('typeahead').$menu
+
+        ok($menu.data('events').mouseover, 'has a mouseover(pseudo: mouseenter)')
+        ok($menu.data('events').click, 'has a click')
+      })
+
+      test("should show menu when query entered", function () {
+        var $input = $('<input />').typeahead({
+              source: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('a')
+        typeahead.lookup()
+
+        ok(typeahead.$menu.is(":visible"), 'typeahead is visible')
+        equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
+        equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
+
+        typeahead.$menu.remove()
+      })
+
+      test("should not explode when regex chars are entered", function () {
+        var $input = $('<input />').typeahead({
+              source: ['aa', 'ab', 'ac', 'mdo*', 'fat+']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('+')
+        typeahead.lookup()
+
+        ok(typeahead.$menu.is(":visible"), 'typeahead is visible')
+        equals(typeahead.$menu.find('li').length, 1, 'has 1 item in menu')
+        equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
+
+        typeahead.$menu.remove()
+      })
+
+      test("should hide menu when query entered", function () {
+        stop()
+        var $input = $('<input />').typeahead({
+              source: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('a')
+        typeahead.lookup()
+
+        ok(typeahead.$menu.is(":visible"), 'typeahead is visible')
+        equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
+        equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
+
+        $input.blur()
+
+        setTimeout(function () {
+          ok(!typeahead.$menu.is(":visible"), "typeahead is no longer visible")
+          start()
+        }, 200)
+
+        typeahead.$menu.remove()
+      })
+
+      test("should set next item when down arrow is pressed", function () {
+        var $input = $('<input />').typeahead({
+              source: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+
+        $input.val('a')
+        typeahead.lookup()
+
+        ok(typeahead.$menu.is(":visible"), 'typeahead is visible')
+        equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
+        equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
+        ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
+
+        $input.trigger({
+          type: 'keydown'
+        , keyCode: 40
+        })
+
+        ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active")
+
+
+        $input.trigger({
+          type: 'keydown'
+        , keyCode: 38
+        })
+
+        ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
+
+        typeahead.$menu.remove()
+      })
+
+
+      test("should set input value to selected item", function () {
+        var $input = $('<input />').typeahead({
+              source: ['aa', 'ab', 'ac']
+            })
+          , typeahead = $input.data('typeahead')
+          , changed = false
+
+        $input.val('a')
+        typeahead.lookup()
+
+        $input.change(function() { changed = true });
+
+        $(typeahead.$menu.find('li')[2]).mouseover().click()
+
+        equals($input.val(), 'ac', 'input value was correctly set')
+        ok(!typeahead.$menu.is(':visible'), 'the menu was hidden')
+        ok(changed, 'a change event was fired')
+
+        typeahead.$menu.remove()
+      })
+})
diff --git a/js/tests/vendor/._jquery.js b/js/tests/vendor/._jquery.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/vendor/._qunit.css b/js/tests/vendor/._qunit.css
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/vendor/._qunit.js b/js/tests/vendor/._qunit.js
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/js/tests/vendor/jquery.js b/js/tests/vendor/jquery.js
new file mode 100644
index 0000000000..00c4e23a27
--- /dev/null
+++ b/js/tests/vendor/jquery.js
@@ -0,0 +1,9252 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document,
+	navigator = window.navigator,
+	location = window.location;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+	quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Matches dashed string for camelizing
+	rdashAlpha = /-([a-z]|[0-9])/ig,
+	rmsPrefix = /^-ms-/,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return ( letter + "" ).toUpperCase();
+	},
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+
+	// The deferred used on DOM ready
+	readyList,
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context && document.body ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = quickExpr.exec( selector );
+			}
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+					doc = ( context ? context.ownerDocument || context : document );
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
+					}
+
+					return jQuery.merge( this, selector );
+
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return ( context || rootjQuery ).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if ( selector.selector !== undefined ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.7.1",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = this.constructor();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// Add the callback
+		readyList.add( fn );
+
+		return this;
+	},
+
+	eq: function( i ) {
+		i = +i;
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
+
+		if ( deep && window.jQuery === jQuery ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+		// Either a released hold or an DOMready/load event and not yet ready
+		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 1 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
+			}
+
+			// If there are functions bound, to execute
+			readyList.fireWith( document, [ jQuery ] );
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).off( "ready" );
+			}
+		}
+	},
+
+	bindReady: function() {
+		if ( readyList ) {
+			return;
+		}
+
+		readyList = jQuery.Callbacks( "once memory" );
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	// A crude way of determining if an object is a window
+	isWindow: function( obj ) {
+		return obj && typeof obj === "object" && "setInterval" in obj;
+	},
+
+	isNumeric: function( obj ) {
+		return !isNaN( parseFloat(obj) ) && isFinite( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		try {
+			// Not own constructor property must be Object
+			if ( obj.constructor &&
+				!hasOwn.call(obj, "constructor") &&
+				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+				return false;
+			}
+		} catch ( e ) {
+			// IE8,9 Will throw exceptions on certain host objects #9897
+			return false;
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+
+		var key;
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw new Error( msg );
+	},
+
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+			.replace( rvalidtokens, "]" )
+			.replace( rvalidbraces, "")) ) {
+
+			return ( new Function( "return " + data ) )();
+
+		}
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	parseXML: function( data ) {
+		var xml, tmp;
+		try {
+			if ( window.DOMParser ) { // Standard
+				tmp = new DOMParser();
+				xml = tmp.parseFromString( data , "text/xml" );
+			} else { // IE
+				xml = new ActiveXObject( "Microsoft.XMLDOM" );
+				xml.async = "false";
+				xml.loadXML( data );
+			}
+		} catch( e ) {
+			xml = undefined;
+		}
+		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Convert dashed to camelCase; used by the css and data modules
+	// Microsoft forgot to hump their vendor prefix (#9572)
+	camelCase: function( string ) {
+		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction( object );
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return object;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type( array );
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array, i ) {
+		var len;
+
+		if ( array ) {
+			if ( indexOf ) {
+				return indexOf.call( array, elem, i );
+			}
+
+			len = array.length;
+			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+
+			for ( ; i < len; i++ ) {
+				// Skip accessing in sparse arrays
+				if ( i in array && array[ i ] === elem ) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length,
+			j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [], retVal;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value, key, ret = [],
+			i = 0,
+			length = elems.length,
+			// jquery objects are treated as arrays
+			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
+
+		// Go through the array, translating each of the items to their
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object
+		} else {
+			for ( key in elems ) {
+				value = callback( elems[ key ], key, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		if ( typeof context === "string" ) {
+			var tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		var args = slice.call( arguments, 2 ),
+			proxy = function() {
+				return fn.apply( context, args.concat( slice.call( arguments ) ) );
+			};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, key, value, exec, fn, pass ) {
+		var length = elems.length;
+
+		// Setting many attributes
+		if ( typeof key === "object" ) {
+			for ( var k in key ) {
+				jQuery.access( elems, k, key[k], exec, fn, value );
+			}
+			return elems;
+		}
+
+		// Setting one attribute
+		if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = !pass && exec && jQuery.isFunction(value);
+
+			for ( var i = 0; i < length; i++ ) {
+				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+			}
+
+			return elems;
+		}
+
+		// Getting an attribute
+		return length ? fn( elems[0], key ) : undefined;
+	},
+
+	now: function() {
+		return ( new Date() ).getTime();
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	sub: function() {
+		function jQuerySub( selector, context ) {
+			return new jQuerySub.fn.init( selector, context );
+		}
+		jQuery.extend( true, jQuerySub, this );
+		jQuerySub.superclass = this;
+		jQuerySub.fn = jQuerySub.prototype = this();
+		jQuerySub.fn.constructor = jQuerySub;
+		jQuerySub.sub = this.sub;
+		jQuerySub.fn.init = function init( selector, context ) {
+			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+				context = jQuerySub( context );
+			}
+
+			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		};
+		jQuerySub.fn.init.prototype = jQuerySub.fn;
+		var rootjQuerySub = jQuerySub(document);
+		return jQuerySub;
+	},
+
+	browser: {}
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+// IE doesn't match non-breaking spaces with \s
+if ( rnotwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch(e) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+return jQuery;
+
+})();
+
+
+// String to Object flags format cache
+var flagsCache = {};
+
+// Convert String-formatted flags into Object-formatted ones and store in cache
+function createFlags( flags ) {
+	var object = flagsCache[ flags ] = {},
+		i, length;
+	flags = flags.split( /\s+/ );
+	for ( i = 0, length = flags.length; i < length; i++ ) {
+		object[ flags[i] ] = true;
+	}
+	return object;
+}
+
+/*
+ * Create a callback list using the following parameters:
+ *
+ *	flags:	an optional list of space-separated flags that will change how
+ *			the callback list behaves
+ *
+ * By default a callback list will act like an event callback list and can be
+ * "fired" multiple times.
+ *
+ * Possible flags:
+ *
+ *	once:			will ensure the callback list can only be fired once (like a Deferred)
+ *
+ *	memory:			will keep track of previous values and will call any callback added
+ *					after the list has been fired right away with the latest "memorized"
+ *					values (like a Deferred)
+ *
+ *	unique:			will ensure a callback can only be added once (no duplicate in the list)
+ *
+ *	stopOnFalse:	interrupt callings when a callback returns false
+ *
+ */
+jQuery.Callbacks = function( flags ) {
+
+	// Convert flags from String-formatted to Object-formatted
+	// (we check in cache first)
+	flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {};
+
+	var // Actual callback list
+		list = [],
+		// Stack of fire calls for repeatable lists
+		stack = [],
+		// Last fire value (for non-forgettable lists)
+		memory,
+		// Flag to know if list is currently firing
+		firing,
+		// First callback to fire (used internally by add and fireWith)
+		firingStart,
+		// End of the loop when firing
+		firingLength,
+		// Index of currently firing callback (modified by remove if needed)
+		firingIndex,
+		// Add one or several callbacks to the list
+		add = function( args ) {
+			var i,
+				length,
+				elem,
+				type,
+				actual;
+			for ( i = 0, length = args.length; i < length; i++ ) {
+				elem = args[ i ];
+				type = jQuery.type( elem );
+				if ( type === "array" ) {
+					// Inspect recursively
+					add( elem );
+				} else if ( type === "function" ) {
+					// Add if not in unique mode and callback is not in
+					if ( !flags.unique || !self.has( elem ) ) {
+						list.push( elem );
+					}
+				}
+			}
+		},
+		// Fire callbacks
+		fire = function( context, args ) {
+			args = args || [];
+			memory = !flags.memory || [ context, args ];
+			firing = true;
+			firingIndex = firingStart || 0;
+			firingStart = 0;
+			firingLength = list.length;
+			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
+				if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) {
+					memory = true; // Mark as halted
+					break;
+				}
+			}
+			firing = false;
+			if ( list ) {
+				if ( !flags.once ) {
+					if ( stack && stack.length ) {
+						memory = stack.shift();
+						self.fireWith( memory[ 0 ], memory[ 1 ] );
+					}
+				} else if ( memory === true ) {
+					self.disable();
+				} else {
+					list = [];
+				}
+			}
+		},
+		// Actual Callbacks object
+		self = {
+			// Add a callback or a collection of callbacks to the list
+			add: function() {
+				if ( list ) {
+					var length = list.length;
+					add( arguments );
+					// Do we need to add the callbacks to the
+					// current firing batch?
+					if ( firing ) {
+						firingLength = list.length;
+					// With memory, if we're not firing then
+					// we should call right away, unless previous
+					// firing was halted (stopOnFalse)
+					} else if ( memory && memory !== true ) {
+						firingStart = length;
+						fire( memory[ 0 ], memory[ 1 ] );
+					}
+				}
+				return this;
+			},
+			// Remove a callback from the list
+			remove: function() {
+				if ( list ) {
+					var args = arguments,
+						argIndex = 0,
+						argLength = args.length;
+					for ( ; argIndex < argLength ; argIndex++ ) {
+						for ( var i = 0; i < list.length; i++ ) {
+							if ( args[ argIndex ] === list[ i ] ) {
+								// Handle firingIndex and firingLength
+								if ( firing ) {
+									if ( i <= firingLength ) {
+										firingLength--;
+										if ( i <= firingIndex ) {
+											firingIndex--;
+										}
+									}
+								}
+								// Remove the element
+								list.splice( i--, 1 );
+								// If we have some unicity property then
+								// we only need to do this once
+								if ( flags.unique ) {
+									break;
+								}
+							}
+						}
+					}
+				}
+				return this;
+			},
+			// Control if a given callback is in the list
+			has: function( fn ) {
+				if ( list ) {
+					var i = 0,
+						length = list.length;
+					for ( ; i < length; i++ ) {
+						if ( fn === list[ i ] ) {
+							return true;
+						}
+					}
+				}
+				return false;
+			},
+			// Remove all callbacks from the list
+			empty: function() {
+				list = [];
+				return this;
+			},
+			// Have the list do nothing anymore
+			disable: function() {
+				list = stack = memory = undefined;
+				return this;
+			},
+			// Is it disabled?
+			disabled: function() {
+				return !list;
+			},
+			// Lock the list in its current state
+			lock: function() {
+				stack = undefined;
+				if ( !memory || memory === true ) {
+					self.disable();
+				}
+				return this;
+			},
+			// Is it locked?
+			locked: function() {
+				return !stack;
+			},
+			// Call all callbacks with the given context and arguments
+			fireWith: function( context, args ) {
+				if ( stack ) {
+					if ( firing ) {
+						if ( !flags.once ) {
+							stack.push( [ context, args ] );
+						}
+					} else if ( !( flags.once && memory ) ) {
+						fire( context, args );
+					}
+				}
+				return this;
+			},
+			// Call all the callbacks with the given arguments
+			fire: function() {
+				self.fireWith( this, arguments );
+				return this;
+			},
+			// To know if the callbacks have already been called at least once
+			fired: function() {
+				return !!memory;
+			}
+		};
+
+	return self;
+};
+
+
+
+
+var // Static reference to slice
+	sliceDeferred = [].slice;
+
+jQuery.extend({
+
+	Deferred: function( func ) {
+		var doneList = jQuery.Callbacks( "once memory" ),
+			failList = jQuery.Callbacks( "once memory" ),
+			progressList = jQuery.Callbacks( "memory" ),
+			state = "pending",
+			lists = {
+				resolve: doneList,
+				reject: failList,
+				notify: progressList
+			},
+			promise = {
+				done: doneList.add,
+				fail: failList.add,
+				progress: progressList.add,
+
+				state: function() {
+					return state;
+				},
+
+				// Deprecated
+				isResolved: doneList.fired,
+				isRejected: failList.fired,
+
+				then: function( doneCallbacks, failCallbacks, progressCallbacks ) {
+					deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks );
+					return this;
+				},
+				always: function() {
+					deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments );
+					return this;
+				},
+				pipe: function( fnDone, fnFail, fnProgress ) {
+					return jQuery.Deferred(function( newDefer ) {
+						jQuery.each( {
+							done: [ fnDone, "resolve" ],
+							fail: [ fnFail, "reject" ],
+							progress: [ fnProgress, "notify" ]
+						}, function( handler, data ) {
+							var fn = data[ 0 ],
+								action = data[ 1 ],
+								returned;
+							if ( jQuery.isFunction( fn ) ) {
+								deferred[ handler ](function() {
+									returned = fn.apply( this, arguments );
+									if ( returned && jQuery.isFunction( returned.promise ) ) {
+										returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify );
+									} else {
+										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
+									}
+								});
+							} else {
+								deferred[ handler ]( newDefer[ action ] );
+							}
+						});
+					}).promise();
+				},
+				// Get a promise for this deferred
+				// If obj is provided, the promise aspect is added to the object
+				promise: function( obj ) {
+					if ( obj == null ) {
+						obj = promise;
+					} else {
+						for ( var key in promise ) {
+							obj[ key ] = promise[ key ];
+						}
+					}
+					return obj;
+				}
+			},
+			deferred = promise.promise({}),
+			key;
+
+		for ( key in lists ) {
+			deferred[ key ] = lists[ key ].fire;
+			deferred[ key + "With" ] = lists[ key ].fireWith;
+		}
+
+		// Handle state
+		deferred.done( function() {
+			state = "resolved";
+		}, failList.disable, progressList.lock ).fail( function() {
+			state = "rejected";
+		}, doneList.disable, progressList.lock );
+
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		// All done!
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( firstParam ) {
+		var args = sliceDeferred.call( arguments, 0 ),
+			i = 0,
+			length = args.length,
+			pValues = new Array( length ),
+			count = length,
+			pCount = length,
+			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
+				firstParam :
+				jQuery.Deferred(),
+			promise = deferred.promise();
+		function resolveFunc( i ) {
+			return function( value ) {
+				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
+				if ( !( --count ) ) {
+					deferred.resolveWith( deferred, args );
+				}
+			};
+		}
+		function progressFunc( i ) {
+			return function( value ) {
+				pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
+				deferred.notifyWith( promise, pValues );
+			};
+		}
+		if ( length > 1 ) {
+			for ( ; i < length; i++ ) {
+				if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) {
+					args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) );
+				} else {
+					--count;
+				}
+			}
+			if ( !count ) {
+				deferred.resolveWith( deferred, args );
+			}
+		} else if ( deferred !== firstParam ) {
+			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
+		}
+		return promise;
+	}
+});
+
+
+
+
+jQuery.support = (function() {
+
+	var support,
+		all,
+		a,
+		select,
+		opt,
+		input,
+		marginDiv,
+		fragment,
+		tds,
+		events,
+		eventName,
+		i,
+		isSupported,
+		div = document.createElement( "div" ),
+		documentElement = document.documentElement;
+
+	// Preliminary tests
+	div.setAttribute("className", "t");
+	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	all = div.getElementsByTagName( "*" );
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return {};
+	}
+
+	// First batch of supports tests
+	select = document.createElement( "select" );
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName( "input" )[ 0 ];
+
+	support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText instead)
+		style: /top/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: ( a.getAttribute("href") === "/a" ),
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: ( input.value === "on" ),
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		getSetAttribute: div.className !== "t",
+
+		// Tests for enctype support on a form(#6743)
+		enctype: !!document.createElement("form").enctype,
+
+		// Makes sure cloning an html5 element does not cause problems
+		// Where outerHTML is undefined, this still works
+		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
+
+		// Will be defined later
+		submitBubbles: true,
+		changeBubbles: true,
+		focusinBubbles: false,
+		deleteExpando: true,
+		noCloneEvent: true,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true
+	};
+
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
+	}
+
+	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+		div.attachEvent( "onclick", function() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			support.noCloneEvent = false;
+		});
+		div.cloneNode( true ).fireEvent( "onclick" );
+	}
+
+	// Check if a radio maintains its value
+	// after being appended to the DOM
+	input = document.createElement("input");
+	input.value = "t";
+	input.setAttribute("type", "radio");
+	support.radioValue = input.value === "t";
+
+	input.setAttribute("checked", "checked");
+	div.appendChild( input );
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( div.lastChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
+
+	fragment.removeChild( input );
+	fragment.appendChild( div );
+
+	div.innerHTML = "";
+
+	// Check if div with explicit width and no margin-right incorrectly
+	// gets computed margin-right based on width of container. For more
+	// info see bug #3333
+	// Fails in WebKit before Feb 2011 nightlies
+	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+	if ( window.getComputedStyle ) {
+		marginDiv = document.createElement( "div" );
+		marginDiv.style.width = "0";
+		marginDiv.style.marginRight = "0";
+		div.style.width = "2px";
+		div.appendChild( marginDiv );
+		support.reliableMarginRight =
+			( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
+	}
+
+	// Technique from Juriy Zaytsev
+	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
+	// We only care about the case where non-standard event systems
+	// are used, namely in IE. Short-circuiting here helps us to
+	// avoid an eval call (in setAttribute) which can cause CSP
+	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+	if ( div.attachEvent ) {
+		for( i in {
+			submit: 1,
+			change: 1,
+			focusin: 1
+		}) {
+			eventName = "on" + i;
+			isSupported = ( eventName in div );
+			if ( !isSupported ) {
+				div.setAttribute( eventName, "return;" );
+				isSupported = ( typeof div[ eventName ] === "function" );
+			}
+			support[ i + "Bubbles" ] = isSupported;
+		}
+	}
+
+	fragment.removeChild( div );
+
+	// Null elements to avoid leaks in IE
+	fragment = select = opt = marginDiv = div = input = null;
+
+	// Run tests that need a body at doc ready
+	jQuery(function() {
+		var container, outer, inner, table, td, offsetSupport,
+			conMarginTop, ptlm, vb, style, html,
+			body = document.getElementsByTagName("body")[0];
+
+		if ( !body ) {
+			// Return for frameset docs that don't have a body
+			return;
+		}
+
+		conMarginTop = 1;
+		ptlm = "position:absolute;top:0;left:0;width:1px;height:1px;margin:0;";
+		vb = "visibility:hidden;border:0;";
+		style = "style='" + ptlm + "border:5px solid #000;padding:0;'";
+		html = "<div " + style + "><div></div></div>" +
+			"<table " + style + " cellpadding='0' cellspacing='0'>" +
+			"<tr><td></td></tr></table>";
+
+		container = document.createElement("div");
+		container.style.cssText = vb + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
+		body.insertBefore( container, body.firstChild );
+
+		// Construct the test element
+		div = document.createElement("div");
+		container.appendChild( div );
+
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		// (only IE 8 fails this test)
+		div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
+		tds = div.getElementsByTagName( "td" );
+		isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+		tds[ 0 ].style.display = "";
+		tds[ 1 ].style.display = "none";
+
+		// Check if empty table cells still have offsetWidth/Height
+		// (IE <= 8 fail this test)
+		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+
+		// Figure out if the W3C box model works as expected
+		div.innerHTML = "";
+		div.style.width = div.style.paddingLeft = "1px";
+		jQuery.boxModel = support.boxModel = div.offsetWidth === 2;
+
+		if ( typeof div.style.zoom !== "undefined" ) {
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			// (IE < 8 does this)
+			div.style.display = "inline";
+			div.style.zoom = 1;
+			support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
+
+			// Check if elements with layout shrink-wrap their children
+			// (IE 6 does this)
+			div.style.display = "";
+			div.innerHTML = "<div style='width:4px;'></div>";
+			support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
+		}
+
+		div.style.cssText = ptlm + vb;
+		div.innerHTML = html;
+
+		outer = div.firstChild;
+		inner = outer.firstChild;
+		td = outer.nextSibling.firstChild.firstChild;
+
+		offsetSupport = {
+			doesNotAddBorder: ( inner.offsetTop !== 5 ),
+			doesAddBorderForTableAndCells: ( td.offsetTop === 5 )
+		};
+
+		inner.style.position = "fixed";
+		inner.style.top = "20px";
+
+		// safari subtracts parent border width here which is 5px
+		offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 );
+		inner.style.position = inner.style.top = "";
+
+		outer.style.overflow = "hidden";
+		outer.style.position = "relative";
+
+		offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 );
+		offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop );
+
+		body.removeChild( container );
+		div  = container = null;
+
+		jQuery.extend( support, offsetSupport );
+	});
+
+	return support;
+})();
+
+
+
+
+var rbrace = /^(?:\{.*\}|\[.*\])$/,
+	rmultiDash = /([A-Z])/g;
+
+jQuery.extend({
+	cache: {},
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var privateCache, thisCache, ret,
+			internalKey = jQuery.expando,
+			getByName = typeof name === "string",
+
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
+
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
+
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey,
+			isEvents = name === "events";
+
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) {
+			return;
+		}
+
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ internalKey ] = id = ++jQuery.uuid;
+			} else {
+				id = internalKey;
+			}
+		}
+
+		if ( !cache[ id ] ) {
+			cache[ id ] = {};
+
+			// Avoids exposing jQuery metadata on plain JS objects when the object
+			// is serialized using JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+		}
+
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if ( typeof name === "object" || typeof name === "function" ) {
+			if ( pvt ) {
+				cache[ id ] = jQuery.extend( cache[ id ], name );
+			} else {
+				cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+			}
+		}
+
+		privateCache = thisCache = cache[ id ];
+
+		// jQuery data() is stored in a separate object inside the object's internal data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data.
+		if ( !pvt ) {
+			if ( !thisCache.data ) {
+				thisCache.data = {};
+			}
+
+			thisCache = thisCache.data;
+		}
+
+		if ( data !== undefined ) {
+			thisCache[ jQuery.camelCase( name ) ] = data;
+		}
+
+		// Users should not attempt to inspect the internal events object using jQuery.data,
+		// it is undocumented and subject to change. But does anyone listen? No.
+		if ( isEvents && !thisCache[ name ] ) {
+			return privateCache.events;
+		}
+
+		// Check for both converted-to-camel and non-converted data property names
+		// If a data property was specified
+		if ( getByName ) {
+
+			// First Try to find as-is property data
+			ret = thisCache[ name ];
+
+			// Test for null|undefined property data
+			if ( ret == null ) {
+
+				// Try to find the camelCased property
+				ret = thisCache[ jQuery.camelCase( name ) ];
+			}
+		} else {
+			ret = thisCache;
+		}
+
+		return ret;
+	},
+
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var thisCache, i, l,
+
+			// Reference to internal data cache key
+			internalKey = jQuery.expando,
+
+			isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+
+			// See jQuery.data for more information
+			id = isNode ? elem[ internalKey ] : internalKey;
+
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
+
+		if ( name ) {
+
+			thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
+			if ( thisCache ) {
+
+				// Support array or space separated string names for data keys
+				if ( !jQuery.isArray( name ) ) {
+
+					// try the string as a key before any manipulation
+					if ( name in thisCache ) {
+						name = [ name ];
+					} else {
+
+						// split the camel cased version by spaces unless a key with the spaces exists
+						name = jQuery.camelCase( name );
+						if ( name in thisCache ) {
+							name = [ name ];
+						} else {
+							name = name.split( " " );
+						}
+					}
+				}
+
+				for ( i = 0, l = name.length; i < l; i++ ) {
+					delete thisCache[ name[i] ];
+				}
+
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
+					return;
+				}
+			}
+		}
+
+		// See jQuery.data for more information
+		if ( !pvt ) {
+			delete cache[ id ].data;
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !isEmptyDataObject(cache[ id ]) ) {
+				return;
+			}
+		}
+
+		// Browsers that fail expando deletion also refuse to delete expandos on
+		// the window, but it will allow it on all other JS objects; other browsers
+		// don't care
+		// Ensure that `cache` is not a window object #10080
+		if ( jQuery.support.deleteExpando || !cache.setInterval ) {
+			delete cache[ id ];
+		} else {
+			cache[ id ] = null;
+		}
+
+		// We destroyed the cache and need to eliminate the expando on the node to avoid
+		// false lookups in the cache for entries that no longer exist
+		if ( isNode ) {
+			// IE does not allow us to delete expando properties from nodes,
+			// nor does it have a removeAttribute function on Document nodes;
+			// we must handle all of these cases
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ internalKey ];
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( internalKey );
+			} else {
+				elem[ internalKey ] = null;
+			}
+		}
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
+		}
+
+		return true;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var parts, attr, name,
+			data = null;
+
+		if ( typeof key === "undefined" ) {
+			if ( this.length ) {
+				data = jQuery.data( this[0] );
+
+				if ( this[0].nodeType === 1 && !jQuery._data( this[0], "parsedAttrs" ) ) {
+					attr = this[0].attributes;
+					for ( var i = 0, l = attr.length; i < l; i++ ) {
+						name = attr[i].name;
+
+						if ( name.indexOf( "data-" ) === 0 ) {
+							name = jQuery.camelCase( name.substring(5) );
+
+							dataAttr( this[0], name, data[ name ] );
+						}
+					}
+					jQuery._data( this[0], "parsedAttrs", true );
+				}
+			}
+
+			return data;
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			// Try to fetch any internally stored data first
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+				data = dataAttr( this[0], key, data );
+			}
+
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+
+		} else {
+			return this.each(function() {
+				var self = jQuery( this ),
+					args = [ parts[0], value ];
+
+				self.triggerHandler( "setData" + parts[1] + "!", args );
+				jQuery.data( this, key, value );
+				self.triggerHandler( "changeData" + parts[1] + "!", args );
+			});
+		}
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+
+		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				jQuery.isNumeric( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	for ( var name in obj ) {
+
+		// if the public data object is empty, the private is still empty
+		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
+			continue;
+		}
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+
+
+
+function handleQueueMarkDefer( elem, type, src ) {
+	var deferDataKey = type + "defer",
+		queueDataKey = type + "queue",
+		markDataKey = type + "mark",
+		defer = jQuery._data( elem, deferDataKey );
+	if ( defer &&
+		( src === "queue" || !jQuery._data(elem, queueDataKey) ) &&
+		( src === "mark" || !jQuery._data(elem, markDataKey) ) ) {
+		// Give room for hard-coded callbacks to fire first
+		// and eventually mark/queue something else on the element
+		setTimeout( function() {
+			if ( !jQuery._data( elem, queueDataKey ) &&
+				!jQuery._data( elem, markDataKey ) ) {
+				jQuery.removeData( elem, deferDataKey, true );
+				defer.fire();
+			}
+		}, 0 );
+	}
+}
+
+jQuery.extend({
+
+	_mark: function( elem, type ) {
+		if ( elem ) {
+			type = ( type || "fx" ) + "mark";
+			jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 );
+		}
+	},
+
+	_unmark: function( force, elem, type ) {
+		if ( force !== true ) {
+			type = elem;
+			elem = force;
+			force = false;
+		}
+		if ( elem ) {
+			type = type || "fx";
+			var key = type + "mark",
+				count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 );
+			if ( count ) {
+				jQuery._data( elem, key, count );
+			} else {
+				jQuery.removeData( elem, key, true );
+				handleQueueMarkDefer( elem, type, "mark" );
+			}
+		}
+	},
+
+	queue: function( elem, type, data ) {
+		var q;
+		if ( elem ) {
+			type = ( type || "fx" ) + "queue";
+			q = jQuery._data( elem, type );
+
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !q || jQuery.isArray(data) ) {
+					q = jQuery._data( elem, type, jQuery.makeArray(data) );
+				} else {
+					q.push( data );
+				}
+			}
+			return q || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift(),
+			hooks = {};
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift( "inprogress" );
+			}
+
+			jQuery._data( elem, type + ".run", hooks );
+			fn.call( elem, function() {
+				jQuery.dequeue( elem, type );
+			}, hooks );
+		}
+
+		if ( !queue.length ) {
+			jQuery.removeData( elem, type + "queue " + type + ".run", true );
+			handleQueueMarkDefer( elem, type, "queue" );
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined ) {
+			return jQuery.queue( this[0], type );
+		}
+		return this.each(function() {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function( next, hooks ) {
+			var timeout = setTimeout( next, time );
+			hooks.stop = function() {
+				clearTimeout( timeout );
+			};
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, object ) {
+		if ( typeof type !== "string" ) {
+			object = type;
+			type = undefined;
+		}
+		type = type || "fx";
+		var defer = jQuery.Deferred(),
+			elements = this,
+			i = elements.length,
+			count = 1,
+			deferDataKey = type + "defer",
+			queueDataKey = type + "queue",
+			markDataKey = type + "mark",
+			tmp;
+		function resolve() {
+			if ( !( --count ) ) {
+				defer.resolveWith( elements, [ elements ] );
+			}
+		}
+		while( i-- ) {
+			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
+					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
+						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
+					jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) {
+				count++;
+				tmp.add( resolve );
+			}
+		}
+		resolve();
+		return defer.promise();
+	}
+});
+
+
+
+
+var rclass = /[\n\t\r]/g,
+	rspace = /\s+/,
+	rreturn = /\r/g,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	getSetAttribute = jQuery.support.getSetAttribute,
+	nodeHook, boolHook, fixSpecified;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+
+	prop: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.prop );
+	},
+
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	},
+
+	addClass: function( value ) {
+		var classNames, i, l, elem,
+			setClass, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call(this, j, this.className) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			classNames = value.split( rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className && classNames.length === 1 ) {
+						elem.className = value;
+
+					} else {
+						setClass = " " + elem.className + " ";
+
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
+								setClass += classNames[ c ] + " ";
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classNames, i, l, elem, className, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call(this, j, this.className) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			classNames = ( value || "" ).split( rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						className = (" " + elem.className + " ").replace( rclass, " " );
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[ c ] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( rspace );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ",
+			i = 0,
+			l = this.length;
+		for ( ; i < l; i++ ) {
+			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		var hooks, ret, isFunction,
+			elem = this[0];
+
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ?
+					// handle most common string cases
+					ret.replace(rreturn, "") :
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return;
+		}
+
+		isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var self = jQuery(this), val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, self.val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// attributes.value is undefined in Blackberry 4.7 but
+				// uses .value. See #6932
+				var val = elem.attributes.value;
+				return !val || val.specified ? elem.value : elem.text;
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value, i, max, option,
+					index = elem.selectedIndex,
+					values = [],
+					options = elem.options,
+					one = elem.type === "select-one";
+
+				// Nothing was selected
+				if ( index < 0 ) {
+					return null;
+				}
+
+				// Loop through all the selected options
+				i = one ? index : 0;
+				max = one ? index + 1 : options.length;
+				for ( ; i < max; i++ ) {
+					option = options[ i ];
+
+					// Don't return options that are disabled or in a disabled optgroup
+					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
+				if ( one && !values.length && options.length ) {
+					return jQuery( options[ index ] ).val();
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var values = jQuery.makeArray( value );
+
+				jQuery(elem).find("option").each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	},
+
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+
+	attr: function( elem, name, value, pass ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery( elem )[ name ]( value );
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( typeof elem.getAttribute === "undefined" ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		// All attributes are lowercase
+		// Grab necessary hook if one is defined
+		if ( notxml ) {
+			name = name.toLowerCase();
+			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return;
+
+			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, "" + value );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+
+			ret = elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret === null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, value ) {
+		var propName, attrNames, name, l,
+			i = 0;
+
+		if ( value && elem.nodeType === 1 ) {
+			attrNames = value.toLowerCase().split( rspace );
+			l = attrNames.length;
+
+			for ( ; i < l; i++ ) {
+				name = attrNames[ i ];
+
+				if ( name ) {
+					propName = jQuery.propFix[ name ] || name;
+
+					// See #9699 for explanation of this approach (setting first, then removal)
+					jQuery.attr( elem, name, "" );
+					elem.removeAttribute( getSetAttribute ? name : propName );
+
+					// Set corresponding property to false for boolean attributes
+					if ( rboolean.test( name ) && propName in elem ) {
+						elem[ propName ] = false;
+					}
+				}
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
+				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to it's default in case type is set after value
+					// This is for element creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		},
+		// Use the value property for back compat
+		// Use the nodeHook for button elements in IE6/7 (#1954)
+		value: {
+			get: function( elem, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.get( elem, name );
+				}
+				return name in elem ?
+					elem.value :
+					null;
+			},
+			set: function( elem, value, name ) {
+				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
+					return nodeHook.set( elem, value, name );
+				}
+				// Does not return so that setAttribute is also used
+				elem.value = value;
+			}
+		}
+	},
+
+	propFix: {
+		tabindex: "tabIndex",
+		readonly: "readOnly",
+		"for": "htmlFor",
+		"class": "className",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		cellpadding: "cellPadding",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		usemap: "useMap",
+		frameborder: "frameBorder",
+		contenteditable: "contentEditable"
+	},
+
+	prop: function( elem, name, value ) {
+		var ret, hooks, notxml,
+			nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return;
+		}
+
+		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return ( elem[ name ] = value );
+			}
+
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
+				return ret;
+
+			} else {
+				return elem[ name ];
+			}
+		}
+	},
+
+	propHooks: {
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				var attributeNode = elem.getAttributeNode("tabindex");
+
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	}
+});
+
+// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional)
+jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex;
+
+// Hook for boolean attributes
+boolHook = {
+	get: function( elem, name ) {
+		// Align boolean attributes with corresponding properties
+		// Fall back to attribute presence where some booleans are not supported
+		var attrNode,
+			property = jQuery.prop( elem, name );
+		return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+			name.toLowerCase() :
+			undefined;
+	},
+	set: function( elem, value, name ) {
+		var propName;
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			// value is true since we know at this point it's type boolean and not false
+			// Set boolean attributes to the same name and set the DOM property
+			propName = jQuery.propFix[ name ] || name;
+			if ( propName in elem ) {
+				// Only set the IDL specifically if it already exists on the element
+				elem[ propName ] = true;
+			}
+
+			elem.setAttribute( name, name.toLowerCase() );
+		}
+		return name;
+	}
+};
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !getSetAttribute ) {
+
+	fixSpecified = {
+		name: true,
+		id: true
+	};
+
+	// Use this for any attribute in IE6/7
+	// This fixes almost every IE6/7 issue
+	nodeHook = jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret;
+			ret = elem.getAttributeNode( name );
+			return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ?
+				ret.nodeValue :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Set the existing or create a new attribute node
+			var ret = elem.getAttributeNode( name );
+			if ( !ret ) {
+				ret = document.createAttribute( name );
+				elem.setAttributeNode( ret );
+			}
+			return ( ret.nodeValue = value + "" );
+		}
+	};
+
+	// Apply the nodeHook to tabindex
+	jQuery.attrHooks.tabindex.set = nodeHook.set;
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		});
+	});
+
+	// Set contenteditable to false on removals(#10429)
+	// Setting to empty string throws an error as an invalid value
+	jQuery.attrHooks.contenteditable = {
+		get: nodeHook.get,
+		set: function( elem, value, name ) {
+			if ( value === "" ) {
+				value = "false";
+			}
+			nodeHook.set( elem, value, name );
+		}
+	};
+}
+
+
+// Some attributes require a special call on IE
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret = elem.getAttribute( name, 2 );
+				return ret === null ? undefined : ret;
+			}
+		});
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Normalize to lowercase since IE uppercases css property names
+			return elem.style.cssText.toLowerCase() || undefined;
+		},
+		set: function( elem, value ) {
+			return ( elem.style.cssText = "" + value );
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
+		}
+	});
+}
+
+// IE6/7 call enctype encoding
+if ( !jQuery.support.enctype ) {
+	jQuery.propFix.enctype = "encoding";
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+	jQuery.each([ "radio", "checkbox" ], function() {
+		jQuery.valHooks[ this ] = {
+			get: function( elem ) {
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			}
+		};
+	});
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+			}
+		}
+	});
+});
+
+
+
+
+var rformElems = /^(?:textarea|input|select)$/i,
+	rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
+	rhoverHack = /\bhover(\.\S+)?\b/,
+	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|contextmenu)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+	rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,
+	quickParse = function( selector ) {
+		var quick = rquickIs.exec( selector );
+		if ( quick ) {
+			//   0  1    2   3
+			// [ _, tag, id, class ]
+			quick[1] = ( quick[1] || "" ).toLowerCase();
+			quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" );
+		}
+		return quick;
+	},
+	quickIs = function( elem, m ) {
+		var attrs = elem.attributes || {};
+		return (
+			(!m[1] || elem.nodeName.toLowerCase() === m[1]) &&
+			(!m[2] || (attrs.id || {}).value === m[2]) &&
+			(!m[3] || m[3].test( (attrs[ "class" ] || {}).value ))
+		);
+	},
+	hoverHack = function( events ) {
+		return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+	};
+
+/*
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
+ */
+jQuery.event = {
+
+	add: function( elem, types, handler, data, selector ) {
+
+		var elemData, eventHandle, events,
+			t, tns, type, namespaces, handleObj,
+			handleObjIn, quick, handlers, special;
+
+		// Don't attach events to noData or text/comment nodes (allow plain objects tho)
+		if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
+			return;
+		}
+
+		// Caller can pass in an object of custom data in lieu of the handler
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+		}
+
+		// Make sure that the handler has a unique ID, used to find/remove it later
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure and main handler, if this is the first
+		events = elemData.events;
+		if ( !events ) {
+			elemData.events = events = {};
+		}
+		eventHandle = elemData.handle;
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+			eventHandle.elem = elem;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = jQuery.trim( hoverHack(types) ).split( " " );
+		for ( t = 0; t < types.length; t++ ) {
+
+			tns = rtypenamespace.exec( types[t] ) || [];
+			type = tns[1];
+			namespaces = ( tns[2] || "" ).split( "." ).sort();
+
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
+
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
+
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
+
+			// handleObj is passed to all event handlers
+			handleObj = jQuery.extend({
+				type: type,
+				origType: tns[1],
+				data: data,
+				handler: handler,
+				guid: handler.guid,
+				selector: selector,
+				quick: quickParse( selector ),
+				namespace: namespaces.join(".")
+			}, handleObjIn );
+
+			// Init the event handler queue if we're the first
+			handlers = events[ type ];
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+				handlers.delegateCount = 0;
+
+				// Only use addEventListener/attachEvent if the special events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add to the element's handler list, delegates in front
+			if ( selector ) {
+				handlers.splice( handlers.delegateCount++, 0, handleObj );
+			} else {
+				handlers.push( handleObj );
+			}
+
+			// Keep track of which events have ever been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, selector, mappedTypes ) {
+
+		var elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
+			t, tns, type, origType, namespaces, origCount,
+			j, events, special, handle, eventType, handleObj;
+
+		if ( !elemData || !(events = elemData.events) ) {
+			return;
+		}
+
+		// Once for each type.namespace in types; type may be omitted
+		types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
+		for ( t = 0; t < types.length; t++ ) {
+			tns = rtypenamespace.exec( types[t] ) || [];
+			type = origType = tns[1];
+			namespaces = tns[2];
+
+			// Unbind all events (on this namespace, if provided) for the element
+			if ( !type ) {
+				for ( type in events ) {
+					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				}
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+			type = ( selector? special.delegateType : special.bindType ) || type;
+			eventType = events[ type ] || [];
+			origCount = eventType.length;
+			namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
+
+			// Remove matching events
+			for ( j = 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( ( mappedTypes || origType === handleObj.origType ) &&
+					 ( !handler || handler.guid === handleObj.guid ) &&
+					 ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
+					 ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
+					eventType.splice( j--, 1 );
+
+					if ( handleObj.selector ) {
+						eventType.delegateCount--;
+					}
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
+					}
+				}
+			}
+
+			// Remove generic event handler if we removed something and no more handlers exist
+			// (avoids potential for endless recursion during removal of special event handlers)
+			if ( eventType.length === 0 && origCount !== eventType.length ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery.removeData( elem, [ "events", "handle" ], true );
+		}
+	},
+
+	// Events that are safe to short-circuit if no handlers are attached.
+	// Native DOM events should not be added, they may have inline handlers.
+	customEvent: {
+		"getData": true,
+		"setData": true,
+		"changeData": true
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		// Don't do events on text and comment nodes
+		if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
+			return;
+		}
+
+		// Event object or event type
+		var type = event.type || event,
+			namespaces = [],
+			cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType;
+
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+
+		if ( type.indexOf( "!" ) >= 0 ) {
+			// Exclusive events trigger only for the exact event (no namespaces)
+			type = type.slice(0, -1);
+			exclusive = true;
+		}
+
+		if ( type.indexOf( "." ) >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+
+		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
+			// No jQuery handlers for this event type, and it can't have inline handlers
+			return;
+		}
+
+		// Caller can pass in an Event, Object, or just an event type string
+		event = typeof event === "object" ?
+			// jQuery.Event object
+			event[ jQuery.expando ] ? event :
+			// Object literal
+			new jQuery.Event( type, event ) :
+			// Just the event type (string)
+			new jQuery.Event( type );
+
+		event.type = type;
+		event.isTrigger = true;
+		event.exclusive = exclusive;
+		event.namespace = namespaces.join( "." );
+		event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
+		ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
+
+		// Handle a global trigger
+		if ( !elem ) {
+
+			// TODO: Stop taunting the data cache; remove global events and always attach to document
+			cache = jQuery.cache;
+			for ( i in cache ) {
+				if ( cache[ i ].events && cache[ i ].events[ type ] ) {
+					jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
+				}
+			}
+			return;
+		}
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data != null ? jQuery.makeArray( data ) : [];
+		data.unshift( event );
+
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
+
+		// Determine event propagation path in advance, per W3C events spec (#9951)
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		eventPath = [[ elem, special.bindType || type ]];
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+
+			bubbleType = special.delegateType || type;
+			cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
+			old = null;
+			for ( ; cur; cur = cur.parentNode ) {
+				eventPath.push([ cur, bubbleType ]);
+				old = cur;
+			}
+
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( old && old === elem.ownerDocument ) {
+				eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
+			}
+		}
+
+		// Fire handlers on the event path
+		for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
+
+			cur = eventPath[i][0];
+			event.type = eventPath[i][1];
+
+			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+			// Note that this is a bare JS function and not a jQuery handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) {
+				event.preventDefault();
+			}
+		}
+		event.type = type;
+
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+
+			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction() check here because IE6/7 fails that test.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				// IE<9 dies on focus/blur to hidden element (#1486)
+				if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
+
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					old = elem[ ontype ];
+
+					if ( old ) {
+						elem[ ontype ] = null;
+					}
+
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					elem[ type ]();
+					jQuery.event.triggered = undefined;
+
+					if ( old ) {
+						elem[ ontype ] = old;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	dispatch: function( event ) {
+
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event || window.event );
+
+		var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
+			delegateCount = handlers.delegateCount,
+			args = [].slice.call( arguments, 0 ),
+			run_all = !event.exclusive && !event.namespace,
+			handlerQueue = [],
+			i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related;
+
+		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+		args[0] = event;
+		event.delegateTarget = this;
+
+		// Determine handlers that should run if there are delegated events
+		// Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && !event.target.disabled && !(event.button && event.type === "click") ) {
+
+			// Pregenerate a single jQuery object for reuse with .is()
+			jqcur = jQuery(this);
+			jqcur.context = this.ownerDocument || this;
+
+			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
+				selMatch = {};
+				matches = [];
+				jqcur[0] = cur;
+				for ( i = 0; i < delegateCount; i++ ) {
+					handleObj = handlers[ i ];
+					sel = handleObj.selector;
+
+					if ( selMatch[ sel ] === undefined ) {
+						selMatch[ sel ] = (
+							handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel )
+						);
+					}
+					if ( selMatch[ sel ] ) {
+						matches.push( handleObj );
+					}
+				}
+				if ( matches.length ) {
+					handlerQueue.push({ elem: cur, matches: matches });
+				}
+			}
+		}
+
+		// Add the remaining (directly-bound) handlers
+		if ( handlers.length > delegateCount ) {
+			handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
+		}
+
+		// Run delegates first; they may want to stop propagation beneath us
+		for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
+			matched = handlerQueue[ i ];
+			event.currentTarget = matched.elem;
+
+			for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
+				handleObj = matched.matches[ j ];
+
+				// Triggered event must either 1) be non-exclusive and have no namespace, or
+				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+				if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
+
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
+							.apply( matched.elem, args );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	// Includes some event props shared by KeyEvent and MouseEvent
+	// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
+	props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+
+	fixHooks: {},
+
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
+
+			// Add which for key events
+			if ( event.which == null ) {
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+
+			return event;
+		}
+	},
+
+	mouseHooks: {
+		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
+			var eventDoc, doc, body,
+				button = original.button,
+				fromElement = original.fromElement;
+
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
+
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
+
+			// Add relatedTarget, if necessary
+			if ( !event.relatedTarget && fromElement ) {
+				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			}
+
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+
+			return event;
+		}
+	},
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop,
+			originalEvent = event,
+			fixHook = jQuery.event.fixHooks[ event.type ] || {},
+			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+
+		event = jQuery.Event( originalEvent );
+
+		for ( i = copy.length; i; ) {
+			prop = copy[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
+		if ( !event.target ) {
+			event.target = originalEvent.srcElement || document;
+		}
+
+		// Target should not be a text node (#504, Safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8)
+		if ( event.metaKey === undefined ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
+	},
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady
+		},
+
+		load: {
+			// Prevent triggered image.load events from bubbling to window.load
+			noBubble: true
+		},
+
+		focus: {
+			delegateType: "focusin"
+		},
+		blur: {
+			delegateType: "focusout"
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	},
+
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{ type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
+};
+
+// Some plugins are using, but it's undocumented/deprecated and will be removed.
+// The 1.7 special event interface should provide all the hooks needed now.
+jQuery.event.handle = jQuery.event.dispatch;
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !(this instanceof jQuery.Event) ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// Create a timestamp if incoming event doesn't have one
+	this.timeStamp = src && src.timeStamp || jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Create mouseenter/leave events using mouseover/out and event-time checks
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		delegateType: fix,
+		bindType: fix,
+
+		handle: function( event ) {
+			var target = this,
+				related = event.relatedTarget,
+				handleObj = event.handleObj,
+				selector = handleObj.selector,
+				ret;
+
+			// For mousenter/leave call the handler if related is outside the target.
+			// NB: No relatedTarget if the mouse left/entered the browser window
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
+				event.type = handleObj.origType;
+				ret = handleObj.handler.apply( this, arguments );
+				event.type = fix;
+			}
+			return ret;
+		}
+	};
+});
+
+// IE submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Lazy-add a submit handler when a descendant form may potentially be submitted
+			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
+				// Node name check avoids a VML-related crash in IE (#9807)
+				var elem = e.target,
+					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
+				if ( form && !form._submit_attached ) {
+					jQuery.event.add( form, "submit._submit", function( event ) {
+						// If form was submitted by the user, bubble the event up the tree
+						if ( this.parentNode && !event.isTrigger ) {
+							jQuery.event.simulate( "submit", this.parentNode, event, true );
+						}
+					});
+					form._submit_attached = true;
+				}
+			});
+			// return undefined since we don't need an event listener
+		},
+
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
+
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
+		}
+	};
+}
+
+// IE change delegation and checkbox/radio fix
+if ( !jQuery.support.changeBubbles ) {
+
+	jQuery.event.special.change = {
+
+		setup: function() {
+
+			if ( rformElems.test( this.nodeName ) ) {
+				// IE doesn't fire change on a check/radio until blur; trigger it on click
+				// after a propertychange. Eat the blur-change in special.change.handle.
+				// This still fires onchange a second time for check/radio after blur.
+				if ( this.type === "checkbox" || this.type === "radio" ) {
+					jQuery.event.add( this, "propertychange._change", function( event ) {
+						if ( event.originalEvent.propertyName === "checked" ) {
+							this._just_changed = true;
+						}
+					});
+					jQuery.event.add( this, "click._change", function( event ) {
+						if ( this._just_changed && !event.isTrigger ) {
+							this._just_changed = false;
+							jQuery.event.simulate( "change", this, event, true );
+						}
+					});
+				}
+				return false;
+			}
+			// Delegated event; lazy-add a change handler on descendant inputs
+			jQuery.event.add( this, "beforeactivate._change", function( e ) {
+				var elem = e.target;
+
+				if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) {
+					jQuery.event.add( elem, "change._change", function( event ) {
+						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
+							jQuery.event.simulate( "change", this.parentNode, event, true );
+						}
+					});
+					elem._change_attached = true;
+				}
+			});
+		},
+
+		handle: function( event ) {
+			var elem = event.target;
+
+			// Swallow native change events from checkbox/radio, we already triggered them above
+			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
+				return event.handleObj.handler.apply( this, arguments );
+			}
+		},
+
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
+
+			return rformElems.test( this.nodeName );
+		}
+	};
+}
+
+// Create "bubbling" focus and blur events
+if ( !jQuery.support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0,
+			handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+	});
+}
+
+jQuery.fn.extend({
+
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var origFn, type;
+
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) {
+				// ( types-Object, data )
+				data = selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
+		return this.each( function() {
+			jQuery.event.add( this, types, fn, data, selector );
+		});
+	},
+	one: function( types, selector, data, fn ) {
+		return this.on.call( this, types, selector, data, fn, 1 );
+	},
+	off: function( types, selector, fn ) {
+		if ( types && types.preventDefault && types.handleObj ) {
+			// ( event )  dispatched jQuery.Event
+			var handleObj = types.handleObj;
+			jQuery( types.delegateTarget ).off(
+				handleObj.namespace? handleObj.type + "." + handleObj.namespace : handleObj.type,
+				handleObj.selector,
+				handleObj.handler
+			);
+			return this;
+		}
+		if ( typeof types === "object" ) {
+			// ( types-object [, selector] )
+			for ( var type in types ) {
+				this.off( type, selector, types[ type ] );
+			}
+			return this;
+		}
+		if ( selector === false || typeof selector === "function" ) {
+			// ( types [, fn] )
+			fn = selector;
+			selector = undefined;
+		}
+		if ( fn === false ) {
+			fn = returnFalse;
+		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+
+	bind: function( types, data, fn ) {
+		return this.on( types, null, data, fn );
+	},
+	unbind: function( types, fn ) {
+		return this.off( types, null, fn );
+	},
+
+	live: function( types, data, fn ) {
+		jQuery( this.context ).on( types, this.selector, data, fn );
+		return this;
+	},
+	die: function( types, fn ) {
+		jQuery( this.context ).off( types, this.selector || "**", fn );
+		return this;
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.on( types, selector, data, fn );
+	},
+	undelegate: function( selector, types, fn ) {
+		// ( namespace ) or ( selector, types [, fn] )
+		return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn );
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			return jQuery.event.trigger( type, data, this[0], true );
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			guid = fn.guid || jQuery.guid++,
+			i = 0,
+			toggler = function( event ) {
+				// Figure out which function to execute
+				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+				// Make sure that clicks stop
+				event.preventDefault();
+
+				// and execute the function
+				return args[ lastToggle ].apply( this, arguments ) || false;
+			};
+
+		// link all the functions, so any of them can unbind this click handler
+		toggler.guid = guid;
+		while ( i < args.length ) {
+			args[ i++ ].guid = guid;
+		}
+
+		return this.click( toggler );
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+
+	if ( rkeyEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
+	}
+
+	if ( rmouseEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
+	}
+});
+
+
+
+/*!
+ * Sizzle CSS Selector Engine
+ *  Copyright 2012, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	expando = "sizcache" + (Math.random() + '').replace('.', ''),
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true,
+	rBackslash = /\\/g,
+	rReturn = /\r\n/g,
+	rNonWord = /\W/;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function() {
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
+		soFar = selector;
+
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
+
+			parts.push( m[1] );
+
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context, seed );
+
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+
+				set = posProcess( selector, set, seed );
+			}
+		}
+
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray( set );
+
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function( results ) {
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort( sortOrder );
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
+};
+
+Sizzle.find = function( expr, context, isXML ) {
+	var set, i, len, match, type, left;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( i = 0, len = Expr.order.length; i < len; i++ ) {
+		type = Expr.order[i];
+
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			left = match[1];
+			match.splice( 1, 1 );
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace( rBackslash, "" );
+				set = Expr.find[ type ]( match, context, isXML );
+
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( "*" ) :
+			[];
+	}
+
+	return { set: set, expr: expr };
+};
+
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		type, found, item, filter, left,
+		i, pass,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+
+	while ( expr && set.length ) {
+		for ( type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				filter = Expr.filter[ type ];
+				left = match[1];
+
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							pass = not ^ found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+
+								} else {
+									curLoop[i] = false;
+								}
+
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw new Error( "Syntax error, unrecognized expression: " + msg );
+};
+
+/**
+ * Utility function for retreiving the text value of an array of DOM nodes
+ * @param {Array|Element} elem
+ */
+var getText = Sizzle.getText = function( elem ) {
+    var i, node,
+		nodeType = elem.nodeType,
+		ret = "";
+
+	if ( nodeType ) {
+		if ( nodeType === 1 || nodeType === 9 ) {
+			// Use textContent || innerText for elements
+			if ( typeof elem.textContent === 'string' ) {
+				return elem.textContent;
+			} else if ( typeof elem.innerText === 'string' ) {
+				// Replace IE's carriage returns
+				return elem.innerText.replace( rReturn, '' );
+			} else {
+				// Traverse it's children
+				for ( elem = elem.firstChild; elem; elem = elem.nextSibling) {
+					ret += getText( elem );
+				}
+			}
+		} else if ( nodeType === 3 || nodeType === 4 ) {
+			return elem.nodeValue;
+		}
+	} else {
+
+		// If no nodeType, this is expected to be an array
+		for ( i = 0; (node = elem[i]); i++ ) {
+			// Do not traverse comment nodes
+			if ( node.nodeType !== 8 ) {
+				ret += getText( node );
+			}
+		}
+	}
+	return ret;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+
+	leftMatch: {},
+
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+
+	attrHandle: {
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		},
+		type: function( elem ) {
+			return elem.getAttribute( "type" );
+		}
+	},
+
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !rNonWord.test( part ),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+
+		"": function(checkSet, part, isXML){
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
+		},
+
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
+		}
+	},
+
+	find: {
+		ID: function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		},
+
+		NAME: function( match, context ) {
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [],
+					results = context.getElementsByName( match[1] );
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+
+		TAG: function( match, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( match[1] );
+			}
+		}
+	},
+	preFilter: {
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace( rBackslash, "" ) + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+
+		ID: function( match ) {
+			return match[1].replace( rBackslash, "" );
+		},
+
+		TAG: function( match, curLoop ) {
+			return match[1].replace( rBackslash, "" ).toLowerCase();
+		},
+
+		CHILD: function( match ) {
+			if ( match[1] === "nth" ) {
+				if ( !match[2] ) {
+					Sizzle.error( match[0] );
+				}
+
+				match[2] = match[2].replace(/^\+|\s*/g, '');
+
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+			else if ( match[2] ) {
+				Sizzle.error( match[0] );
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1] = match[1].replace( rBackslash, "" );
+
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			// Handle if an un-quoted value was used
+			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+
+					return false;
+				}
+
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+
+			return match;
+		},
+
+		POS: function( match ) {
+			match.unshift( true );
+
+			return match;
+		}
+	},
+
+	filters: {
+		enabled: function( elem ) {
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+
+		disabled: function( elem ) {
+			return elem.disabled === true;
+		},
+
+		checked: function( elem ) {
+			return elem.checked === true;
+		},
+
+		selected: function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
+			return elem.selected === true;
+		},
+
+		parent: function( elem ) {
+			return !!elem.firstChild;
+		},
+
+		empty: function( elem ) {
+			return !elem.firstChild;
+		},
+
+		has: function( elem, i, match ) {
+			return !!Sizzle( match[3], elem ).length;
+		},
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
+		},
+
+		text: function( elem ) {
+			var attr = elem.getAttribute( "type" ), type = elem.type;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
+		},
+
+		radio: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
+		},
+
+		checkbox: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
+		},
+
+		password: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
+		},
+
+		submit: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "submit" === elem.type;
+		},
+
+		image: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
+		},
+
+		reset: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "reset" === elem.type;
+		},
+
+		button: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && "button" === elem.type || name === "button";
+		},
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
+		},
+
+		focus: function( elem ) {
+			return elem === elem.ownerDocument.activeElement;
+		}
+	},
+	setFilters: {
+		first: function( elem, i ) {
+			return i === 0;
+		},
+
+		last: function( elem, i, match, array ) {
+			return i === array.length - 1;
+		},
+
+		even: function( elem, i ) {
+			return i % 2 === 0;
+		},
+
+		odd: function( elem, i ) {
+			return i % 2 === 1;
+		},
+
+		lt: function( elem, i, match ) {
+			return i < match[3] - 0;
+		},
+
+		gt: function( elem, i, match ) {
+			return i > match[3] - 0;
+		},
+
+		nth: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		},
+
+		eq: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+
+			} else {
+				Sizzle.error( name );
+			}
+		},
+
+		CHILD: function( elem, match ) {
+			var first, last,
+				doneName, parent, cache,
+				count, diff,
+				type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) {
+							return false;
+						}
+					}
+
+					if ( type === "first" ) {
+						return true;
+					}
+
+					node = elem;
+
+				case "last":
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) {
+							return false;
+						}
+					}
+
+					return true;
+
+				case "nth":
+					first = match[2];
+					last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+
+					doneName = match[0];
+					parent = elem.parentNode;
+
+					if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {
+						count = 0;
+
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						}
+
+						parent[ expando ] = doneName;
+					}
+
+					diff = elem.nodeIndex - last;
+
+					if ( first === 0 ) {
+						return diff === 0;
+
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+
+		ID: function( elem, match ) {
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
+		},
+
+		CLASS: function( elem, match ) {
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+
+		ATTR: function( elem, match ) {
+			var name = match[1],
+				result = Sizzle.attr ?
+					Sizzle.attr( elem, name ) :
+					Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				!type && Sizzle.attr ?
+				result != null :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function( array, results ) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder, siblingCheck;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+	};
+
+} else {
+	sortOrder = function( a, b ) {
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Fallback to using sourceIndex (in IE) if it's available on both nodes
+		} else if ( a.sourceIndex && b.sourceIndex ) {
+			return a.sourceIndex - b.sourceIndex;
+		}
+
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+
+		var cur = a.nextSibling;
+		}
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
+	};
+}
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+
+		Expr.filter.ID = function( elem, match ) {
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+
+	// release memory in IE
+	root = form = null;
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
+		};
+	}
+
+	// release memory in IE
+	div = null;
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+
+		Sizzle = function( query, context, extra, seed ) {
+			context = context || document;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && !Sizzle.isXML(context) ) {
+				// See if we find a selector to speed up
+				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
+
+				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
+					// Speed-up: Sizzle("TAG")
+					if ( match[1] ) {
+						return makeArray( context.getElementsByTagName( query ), extra );
+
+					// Speed-up: Sizzle(".CLASS")
+					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
+						return makeArray( context.getElementsByClassName( match[2] ), extra );
+					}
+				}
+
+				if ( context.nodeType === 9 ) {
+					// Speed-up: Sizzle("body")
+					// The body element only exists once, optimize finding it
+					if ( query === "body" && context.body ) {
+						return makeArray( [ context.body ], extra );
+
+					// Speed-up: Sizzle("#ID")
+					} else if ( match && match[3] ) {
+						var elem = context.getElementById( match[3] );
+
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						if ( elem && elem.parentNode ) {
+							// Handle the case where IE and Opera return items
+							// by name instead of ID
+							if ( elem.id === match[3] ) {
+								return makeArray( [ elem ], extra );
+							}
+
+						} else {
+							return makeArray( [], extra );
+						}
+					}
+
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var oldContext = context,
+						old = context.getAttribute( "id" ),
+						nid = old || id,
+						hasParent = context.parentNode,
+						relativeHierarchySelector = /^\s*[+~]/.test( query );
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					} else {
+						nid = nid.replace( /'/g, "\\$&" );
+					}
+					if ( relativeHierarchySelector && hasParent ) {
+						context = context.parentNode;
+					}
+
+					try {
+						if ( !relativeHierarchySelector || hasParent ) {
+							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
+						}
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							oldContext.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		// release memory in IE
+		div = null;
+	})();
+}
+
+(function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
+
+	if ( matches ) {
+		// Check to see if it's possible to do matchesSelector
+		// on a disconnected node (IE 9 fails this)
+		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
+			pseudoWorks = false;
+
+		try {
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( document.documentElement, "[test!='']:sizzle" );
+
+		} catch( pseudoError ) {
+			pseudoWorks = true;
+		}
+
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try {
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						var ret = matches.call( node, expr );
+
+						// IE 9's matchesSelector returns false on disconnected nodes
+						if ( ret || !disconnectedMatch ||
+								// As well, disconnected nodes are said to be in a document
+								// fragment in IE 9, so check for that
+								node.document && node.document.nodeType !== 11 ) {
+							return ret;
+						}
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function( match, context, isXML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	// release memory in IE
+	div = null;
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem[ expando ] === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem[ expando ] = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem[ expando ] === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem[ expando ] = doneName;
+						elem.sizset = i;
+					}
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
+
+Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833)
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function( selector, context, seed ) {
+	var match,
+		tmpSet = [],
+		later = "",
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet, seed );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+// Override sizzle attribute retrieval
+Sizzle.attr = jQuery.attr;
+Sizzle.selectors.attrMap = {};
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})();
+
+
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.POS,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var self = this,
+			i, l;
+
+		if ( typeof selector !== "string" ) {
+			return jQuery( selector ).filter(function() {
+				for ( i = 0, l = self.length; i < l; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			});
+		}
+
+		var ret = this.pushStack( "", "find", selector ),
+			length, n, r;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( n = length; n < ret.length; n++ ) {
+					for ( r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+
+	is: function( selector ) {
+		return !!selector && (
+			typeof selector === "string" ?
+				// If this is a positional selector, check membership in the returned set
+				// so $("p:first").is("p:last") won't return true for a doc with two "p".
+				POS.test( selector ) ?
+					jQuery( selector, this.context ).index( this[0] ) >= 0 :
+					jQuery.filter( selector, this ).length > 0 :
+				this.filter( selector ).length > 0 );
+	},
+
+	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+
+		// Array (deprecated as of jQuery 1.7)
+		if ( jQuery.isArray( selectors ) ) {
+			var level = 1;
+
+			while ( cur && cur.ownerDocument && cur !== context ) {
+				for ( i = 0; i < selectors.length; i++ ) {
+
+					if ( jQuery( cur ).is( selectors[ i ] ) ) {
+						ret.push({ selector: selectors[ i ], elem: cur, level: level });
+					}
+				}
+
+				cur = cur.parentNode;
+				level++;
+			}
+
+			return ret;
+		}
+
+		// String
+		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
+						break;
+					}
+				}
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
+
+		return this.pushStack( ret, "closest", selectors );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+
+		// No argument, return index in parent
+		if ( !elem ) {
+			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
+		}
+
+		// index in selector
+		if ( typeof elem === "string" ) {
+			return jQuery.inArray( this[0], jQuery( elem ) );
+		}
+
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, slice.call( arguments ).join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+	// Can't pass null or undefined to indexOf in Firefox 4
+	// Set to 0 to skip string check
+	qualifier = qualifier || 0;
+
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return ( elem === qualifier ) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
+	});
+}
+
+
+
+
+function createSafeFragment( document ) {
+	var list = nodeNames.split( "|" ),
+	safeFrag = document.createDocumentFragment();
+
+	if ( safeFrag.createElement ) {
+		while ( list.length ) {
+			safeFrag.createElement(
+				list.pop()
+			);
+		}
+	}
+	return safeFrag;
+}
+
+var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|" +
+		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+	rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnoInnerhtml = /<(?:script|style)/i,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	rnoshimcache = new RegExp("<(?:" + nodeNames + ")", "i"),
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /\/(java|ecma)script/i,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	},
+	safeFragment = createSafeFragment( document );
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery( this );
+
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery.clean( arguments );
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery.clean(arguments) );
+			return set;
+		}
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, "<$1></$2>");
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery( this );
+
+				self.html( value.call(this, i, self.html()) );
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.length ?
+				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+				this;
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = jQuery.buildFragment( args, this, scripts );
+			}
+
+			fragment = results.fragment;
+
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						// Make sure that we do not leak memory by inadvertently discarding
+						// the original fragment (which might have attached data) instead of
+						// using it; in addition, use the original fragment object for the last
+						// item instead of first because it can end up being emptied incorrectly
+						// in certain situations (Bug #8070).
+						// Fragments from the fragment cache must always be cloned and never used
+						// in place.
+						results.cacheable || ( l > 1 && i < lastIndex ) ?
+							jQuery.clone( fragment, true, true ) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, evalScript );
+			}
+		}
+
+		return this;
+	}
+});
+
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
+
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
+
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
+			}
+		}
+	}
+
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
+
+function cloneFixAttributes( src, dest ) {
+	var nodeName;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// clearAttributes removes the attributes, which we don't want,
+	// but also removes the attachEvent events, which we *do* want
+	if ( dest.clearAttributes ) {
+		dest.clearAttributes();
+	}
+
+	// mergeAttributes, in contrast, only merges back on the
+	// original attributes, not the events
+	if ( dest.mergeAttributes ) {
+		dest.mergeAttributes( src );
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 fail to clone children inside object elements that use
+	// the proprietary classid attribute value (rather than the type
+	// attribute) to identify the type of content to display
+	if ( nodeName === "object" ) {
+		dest.outerHTML = src.outerHTML;
+
+	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+		if ( src.checked ) {
+			dest.defaultChecked = dest.checked = src.checked;
+		}
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+
+	// Event data gets referenced instead of copied if the expando
+	// gets copied too
+	dest.removeAttribute( jQuery.expando );
+}
+
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults, doc,
+	first = args[ 0 ];
+
+	// nodes may contain either an explicit document object,
+	// a jQuery collection or context object.
+	// If nodes[0] contains a valid object to assign to doc
+	if ( nodes && nodes[0] ) {
+		doc = nodes[0].ownerDocument || nodes[0];
+	}
+
+	// Ensure that an attr object doesn't incorrectly stand in as a document object
+	// Chrome and Firefox seem to allow this to occur and will throw exception
+	// Fixes #8950
+	if ( !doc.createDocumentFragment ) {
+		doc = document;
+	}
+
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
+	if ( args.length === 1 && typeof first === "string" && first.length < 512 && doc === document &&
+		first.charAt(0) === "<" && !rnocache.test( first ) &&
+		(jQuery.support.checkClone || !rchecked.test( first )) &&
+		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
+
+		cacheable = true;
+
+		cacheresults = jQuery.fragments[ first ];
+		if ( cacheresults && cacheresults !== 1 ) {
+			fragment = cacheresults;
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ first ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [],
+			insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = ( i > 0 ? this.clone(true) : this ).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+function getAll( elem ) {
+	if ( typeof elem.getElementsByTagName !== "undefined" ) {
+		return elem.getElementsByTagName( "*" );
+
+	} else if ( typeof elem.querySelectorAll !== "undefined" ) {
+		return elem.querySelectorAll( "*" );
+
+	} else {
+		return [];
+	}
+}
+
+// Used in clean, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( elem.type === "checkbox" || elem.type === "radio" ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+// Finds all inputs and passes them to fixDefaultChecked
+function findInputs( elem ) {
+	var nodeName = ( elem.nodeName || "" ).toLowerCase();
+	if ( nodeName === "input" ) {
+		fixDefaultChecked( elem );
+	// Skip scripts, get other children
+	} else if ( nodeName !== "script" && typeof elem.getElementsByTagName !== "undefined" ) {
+		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
+	}
+}
+
+// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js
+function shimCloneNode( elem ) {
+	var div = document.createElement( "div" );
+	safeFragment.appendChild( div );
+
+	div.innerHTML = elem.outerHTML;
+	return div.firstChild;
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var srcElements,
+			destElements,
+			i,
+			// IE<=8 does not properly clone detached, unknown element nodes
+			clone = jQuery.support.html5Clone || !rnoshimcache.test( "<" + elem.nodeName ) ?
+				elem.cloneNode( true ) :
+				shimCloneNode( elem );
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			// IE copies events bound via attachEvent when using cloneNode.
+			// Calling detachEvent on the clone will also remove the events
+			// from the original. In order to get around this, we use some
+			// proprietary methods to clear the events. Thanks to MooTools
+			// guys for this hotness.
+
+			cloneFixAttributes( elem, clone );
+
+			// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
+			srcElements = getAll( elem );
+			destElements = getAll( clone );
+
+			// Weird iteration because IE will replace the length property
+			// with an element if you are cloning the body and one of the
+			// elements on the page has a name or id of "length"
+			for ( i = 0; srcElements[i]; ++i ) {
+				// Ensure that the destination node is not null; Fixes #9587
+				if ( destElements[i] ) {
+					cloneFixAttributes( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			cloneCopyEvent( elem, clone );
+
+			if ( deepDataAndEvents ) {
+				srcElements = getAll( elem );
+				destElements = getAll( clone );
+
+				for ( i = 0; srcElements[i]; ++i ) {
+					cloneCopyEvent( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		srcElements = destElements = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	clean: function( elems, context, fragment, scripts ) {
+		var checkScriptType;
+
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [], j;
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" ) {
+				if ( !rhtml.test( elem ) ) {
+					elem = context.createTextNode( elem );
+				} else {
+					// Fix "XHTML"-style tags in all browsers
+					elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+					// Trim whitespace, otherwise indexOf won't work as expected
+					var tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(),
+						wrap = wrapMap[ tag ] || wrapMap._default,
+						depth = wrap[0],
+						div = context.createElement("div");
+
+					// Append wrapper element to unknown element safe doc fragment
+					if ( context === document ) {
+						// Use the fragment we've already created for this document
+						safeFragment.appendChild( div );
+					} else {
+						// Use a fragment created with the owner document
+						createSafeFragment( context ).appendChild( div );
+					}
+
+					// Go to html and back, then peel off extra wrappers
+					div.innerHTML = wrap[1] + elem + wrap[2];
+
+					// Move to the right depth
+					while ( depth-- ) {
+						div = div.lastChild;
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						var hasBody = rtbody.test(elem),
+							tbody = tag === "table" && !hasBody ?
+								div.firstChild && div.firstChild.childNodes :
+
+								// String was a bare <thead> or <tfoot>
+								wrap[1] === "<table>" && !hasBody ?
+									div.childNodes :
+									[];
+
+						for ( j = tbody.length - 1; j >= 0 ; --j ) {
+							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+								tbody[ j ].parentNode.removeChild( tbody[ j ] );
+							}
+						}
+					}
+
+					// IE completely kills leading whitespace when innerHTML is used
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+					}
+
+					elem = div.childNodes;
+				}
+			}
+
+			// Resets defaultChecked for any radios and checkboxes
+			// about to be appended to the DOM in IE 6/7 (#8060)
+			var len;
+			if ( !jQuery.support.appendChecked ) {
+				if ( elem[0] && typeof (len = elem.length) === "number" ) {
+					for ( j = 0; j < len; j++ ) {
+						findInputs( elem[j] );
+					}
+				} else {
+					findInputs( elem );
+				}
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			checkScriptType = function( elem ) {
+				return !elem.type || rscriptType.test( elem.type );
+			};
+			for ( i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
+
+						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+					}
+					fragment.appendChild( ret[i] );
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	cleanData: function( elems ) {
+		var data, id,
+			cache = jQuery.cache,
+			special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
+			id = elem[ jQuery.expando ];
+
+			if ( id ) {
+				data = cache[ id ];
+
+				if ( data && data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						// This is a shortcut to avoid jQuery.event.remove's overhead
+						} else {
+							jQuery.removeEvent( elem, type, data.handle );
+						}
+					}
+
+					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+					if ( data.handle ) {
+						data.handle.elem = null;
+					}
+				}
+
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+
+				delete cache[ id ];
+			}
+		}
+	}
+});
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	// fixed for IE9, see #8346
+	rupper = /([A-Z]|^ms)/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+	rrelNum = /^([\-+])=([\-+.\de]+)/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+	curCSS,
+
+	getComputedStyle,
+	currentStyle;
+
+jQuery.fn.css = function( name, value ) {
+	// Setting 'undefined' is a no-op
+	if ( arguments.length === 2 && value === undefined ) {
+		return this;
+	}
+
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
+	});
+};
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity", "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
+				value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( value == null || type === "number" && isNaN( value ) ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra ) {
+		var ret, hooks;
+
+		// Make sure that we're working with the right name
+		name = jQuery.camelCase( name );
+		hooks = jQuery.cssHooks[ name ];
+		name = jQuery.cssProps[ name ] || name;
+
+		// cssFloat needs a special treatment
+		if ( name === "cssFloat" ) {
+			name = "float";
+		}
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
+
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name );
+		}
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	}
+});
+
+// DEPRECATED, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
+
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			var val;
+
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					return getWH( elem, name, extra );
+				} else {
+					jQuery.swap( elem, cssShow, function() {
+						val = getWH( elem, name, extra );
+					});
+				}
+
+				return val;
+			}
+		},
+
+		set: function( elem, value ) {
+			if ( rnumpx.test( value ) ) {
+				// ignore negative width and height values #1599
+				value = parseFloat( value );
+
+				if ( value >= 0 ) {
+					return value + "px";
+				}
+
+			} else {
+				return value;
+			}
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( parseFloat( RegExp.$1 ) / 100 ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle,
+				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) {
+
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+				// if "filter:" is present at all, clearType is disabled, we want to avoid this
+				// style.removeAttribute is IE Only, but so apparently is this code path...
+				style.removeAttribute( "filter" );
+
+				// if there there is no filter style applied in a css rule, we are done
+				if ( currentStyle && !currentStyle.filter ) {
+					return;
+				}
+			}
+
+			// otherwise, set new filter values
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+jQuery(function() {
+	// This hook cannot be added until DOM ready because the support test
+	// for it is not run until after DOM ready
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				// Work around by temporarily setting element display to inline-block
+				var ret;
+				jQuery.swap( elem, { "display": "inline-block" }, function() {
+					if ( computed ) {
+						ret = curCSS( elem, "margin-right", "marginRight" );
+					} else {
+						ret = elem.style.marginRight;
+					}
+				});
+				return ret;
+			}
+		};
+	}
+});
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, name ) {
+		var ret, defaultView, computedStyle;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+
+		if ( (defaultView = elem.ownerDocument.defaultView) &&
+				(computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+		}
+
+		return ret;
+	};
+}
+
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left, rsLeft, uncomputed,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			style = elem.style;
+
+		// Avoid setting ret to empty string here
+		// so we don't default to auto
+		if ( ret === null && style && (uncomputed = style[ name ]) ) {
+			ret = uncomputed;
+		}
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+
+			// Remember the original values
+			left = style.left;
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : ( ret || 0 );
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWH( elem, name, extra ) {
+
+	// Start with offset property
+	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		which = name === "width" ? cssWidth : cssHeight,
+		i = 0,
+		len = which.length;
+
+	if ( val > 0 ) {
+		if ( extra !== "border" ) {
+			for ( ; i < len; i++ ) {
+				if ( !extra ) {
+					val -= parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
+				}
+				if ( extra === "margin" ) {
+					val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
+				} else {
+					val -= parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
+				}
+			}
+		}
+
+		return val + "px";
+	}
+
+	// Fall back to computed then uncomputed css if necessary
+	val = curCSS( elem, name, name );
+	if ( val < 0 || val == null ) {
+		val = elem.style[ name ] || 0;
+	}
+	// Normalize "", auto, and prepare for extra
+	val = parseFloat( val ) || 0;
+
+	// Add padding, border, margin
+	if ( extra ) {
+		for ( ; i < len; i++ ) {
+			val += parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
+			if ( extra !== "padding" ) {
+				val += parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
+			}
+			if ( extra === "margin" ) {
+				val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
+			}
+		}
+	}
+
+	return val + "px";
+}
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return ( width === 0 && height === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rquery = /\?/,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rspacesAjax = /\s+/,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Document location
+	ajaxLocation,
+
+	// Document location segments
+	ajaxLocParts,
+
+	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+	allTypes = ["*/"] + ["*"];
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		if ( jQuery.isFunction( func ) ) {
+			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
+				i = 0,
+				length = dataTypes.length,
+				dataType,
+				list,
+				placeBefore;
+
+			// For each dataType in the dataTypeExpression
+			for ( ; i < length; i++ ) {
+				dataType = dataTypes[ i ];
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 ) || "*";
+				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( func );
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+		dataType /* internal */, inspected /* internal */ ) {
+
+	dataType = dataType || options.dataTypes[ 0 ];
+	inspected = inspected || {};
+
+	inspected[ dataType ] = true;
+
+	var list = structure[ dataType ],
+		i = 0,
+		length = list ? list.length : 0,
+		executeOnly = ( structure === prefilters ),
+		selection;
+
+	for ( ; i < length && ( executeOnly || !selection ); i++ ) {
+		selection = list[ i ]( options, originalOptions, jqXHR );
+		// If we got redirected to another dataType
+		// we try there if executing only and not done already
+		if ( typeof selection === "string" ) {
+			if ( !executeOnly || inspected[ selection ] ) {
+				selection = undefined;
+			} else {
+				options.dataTypes.unshift( selection );
+				selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected );
+			}
+		}
+	}
+	// If we're only executing or nothing was selected
+	// we try the catchall dataType if not done already
+	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+		selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected );
+	}
+	// unnecessary when only executing (prefilters)
+	// but it'll be ignored by the caller in that case
+	return selection;
+}
+
+// A special extend for ajax options
+// that takes "flat" options (not to be deep extended)
+// Fixes #9887
+function ajaxExtend( target, src ) {
+	var key, deep,
+		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+	for ( key in src ) {
+		if ( src[ key ] !== undefined ) {
+			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+		}
+	}
+	if ( deep ) {
+		jQuery.extend( true, target, deep );
+	}
+}
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf( " " );
+		if ( off >= 0 ) {
+			var selector = url.slice( off, url.length );
+			url = url.slice( 0, off );
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = undefined;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			// Complete callback (responseText is used internally)
+			complete: function( jqXHR, status, responseText ) {
+				// Store the response as specified by the jqXHR object
+				responseText = jqXHR.responseText;
+				// If successful, inject the HTML into all the matched elements
+				if ( jqXHR.isResolved() ) {
+					// #4825: Get the actual response in case
+					// a dataFilter is present in ajaxSettings
+					jqXHR.done(function( r ) {
+						responseText = r;
+					});
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [ responseText, status, jqXHR ] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+
+	serializeArray: function() {
+		return this.map(function(){
+			return this.elements ? jQuery.makeArray( this.elements ) : this;
+		})
+		.filter(function(){
+			return this.name && !this.disabled &&
+				( this.checked || rselectTextarea.test( this.nodeName ) ||
+					rinput.test( this.type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val, i ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+	jQuery.fn[ o ] = function( f ){
+		return this.on( o, f );
+	};
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			type: method,
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	};
+});
+
+jQuery.extend({
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function( target, settings ) {
+		if ( settings ) {
+			// Building a settings object
+			ajaxExtend( target, jQuery.ajaxSettings );
+		} else {
+			// Extending ajaxSettings
+			settings = target;
+			target = jQuery.ajaxSettings;
+		}
+		ajaxExtend( target, settings );
+		return target;
+	},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			text: "text/plain",
+			json: "application/json, text/javascript",
+			"*": allTypes
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// List of data converters
+		// 1) key format is "source_type destination_type" (a single space in-between)
+		// 2) the catchall symbol "*" can be used for source_type
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		},
+
+		// For options that shouldn't be deep extended:
+		// you can add your own custom options here if
+		// and when you create one that shouldn't be
+		// deep extended (see ajaxExtend)
+		flatOptions: {
+			context: true,
+			url: true
+		}
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events
+			// It's the callbackContext if one was provided in the options
+			// and if it's a DOM node or a jQuery collection
+			globalEventContext = callbackContext !== s &&
+				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+						jQuery( callbackContext ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery.Callbacks( "once memory" ),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// ifModified key
+			ifModifiedKey,
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// The jqXHR state
+			state = 0,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Fake xhr
+			jqXHR = {
+
+				readyState: 0,
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( !state ) {
+						var lname = name.toLowerCase();
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match === undefined ? null : match;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					statusText = statusText || "abort";
+					if ( transport ) {
+						transport.abort( statusText );
+					}
+					done( 0, statusText );
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status, nativeStatusText, responses, headers ) {
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status > 0 ? 4 : 0;
+
+			var isSuccess,
+				success,
+				error,
+				statusText = nativeStatusText,
+				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
+				lastModified,
+				etag;
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+
+					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
+						jQuery.lastModified[ ifModifiedKey ] = lastModified;
+					}
+					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
+						jQuery.etag[ ifModifiedKey ] = etag;
+					}
+				}
+
+				// If not modified
+				if ( status === 304 ) {
+
+					statusText = "notmodified";
+					isSuccess = true;
+
+				// If we have data
+				} else {
+
+					try {
+						success = ajaxConvert( s, response );
+						statusText = "success";
+						isSuccess = true;
+					} catch(e) {
+						// We have a parsererror
+						statusText = "parsererror";
+						error = e;
+					}
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if ( !statusText || status ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = "" + ( nativeStatusText || statusText );
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+						[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		// Attach deferreds
+		deferred.promise( jqXHR );
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+		jqXHR.complete = completeDeferred.add;
+
+		// Status-dependent callbacks
+		jqXHR.statusCode = function( map ) {
+			if ( map ) {
+				var tmp;
+				if ( state < 2 ) {
+					for ( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+					}
+				} else {
+					tmp = map[ jqXHR.status ];
+					jqXHR.then( tmp, tmp );
+				}
+			}
+			return this;
+		};
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
+
+		// Determine if a cross-domain request is in order
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefiler, stop there
+		if ( state === 2 ) {
+			return false;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+				// #9682: remove data so that it's not used in an eventual retry
+				delete s.data;
+			}
+
+			// Get ifModifiedKey before adding the anti-cache parameter
+			ifModifiedKey = s.url;
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts, "$1_=" + ts );
+
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			ifModifiedKey = ifModifiedKey || s.url;
+			if ( jQuery.lastModified[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+			}
+			if ( jQuery.etag[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
+			}
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+				// Abort if not done already
+				jqXHR.abort();
+				return false;
+
+		}
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout( function(){
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch (e) {
+				// Propagate exception as error if not done
+				if ( state < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					throw e;
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction( value ) ? value() : value;
+				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+			};
+
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			});
+
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[ prefix ], traditional, add );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join( "&" ).replace( r20, "+" );
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && obj != null && typeof obj === "object" ) {
+		// Serialize object item.
+		for ( var name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields,
+		ct,
+		type,
+		finalDataType,
+		firstDataType;
+
+	// Fill responseXXX fields
+	for ( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	var dataTypes = s.dataTypes,
+		converters = {},
+		i,
+		key,
+		length = dataTypes.length,
+		tmp,
+		// Current and previous dataTypes
+		current = dataTypes[ 0 ],
+		prev,
+		// Conversion expression
+		conversion,
+		// Conversion function
+		conv,
+		// Conversion functions (transitive conversion)
+		conv1,
+		conv2;
+
+	// For each dataType in the chain
+	for ( i = 1; i < length; i++ ) {
+
+		// Create converters map
+		// with lowercased keys
+		if ( i === 1 ) {
+			for ( key in s.converters ) {
+				if ( typeof key === "string" ) {
+					converters[ key.toLowerCase() ] = s.converters[ key ];
+				}
+			}
+		}
+
+		// Get the dataTypes
+		prev = current;
+		current = dataTypes[ i ];
+
+		// If current is auto dataType, update it to prev
+		if ( current === "*" ) {
+			current = prev;
+		// If no auto and dataTypes are actually different
+		} else if ( prev !== "*" && prev !== current ) {
+
+			// Get the converter
+			conversion = prev + " " + current;
+			conv = converters[ conversion ] || converters[ "* " + current ];
+
+			// If there is no direct converter, search transitively
+			if ( !conv ) {
+				conv2 = undefined;
+				for ( conv1 in converters ) {
+					tmp = conv1.split( " " );
+					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
+						conv2 = converters[ tmp[1] + " " + current ];
+						if ( conv2 ) {
+							conv1 = converters[ conv1 ];
+							if ( conv1 === true ) {
+								conv = conv2;
+							} else if ( conv2 === true ) {
+								conv = conv1;
+							}
+							break;
+						}
+					}
+				}
+			}
+			// If we found no converter, dispatch an error
+			if ( !( conv || conv2 ) ) {
+				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
+			}
+			// If found converter is not an equivalence
+			if ( conv !== true ) {
+				// Convert with 1 or 2 converters accordingly
+				response = conv ? conv( response ) : conv2( conv1(response) );
+			}
+		}
+	}
+	return response;
+}
+
+
+
+
+var jsc = jQuery.now(),
+	jsre = /(\=)\?(&|$)|\?\?/i;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		return jQuery.expando + "_" + ( jsc++ );
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
+		( typeof s.data === "string" );
+
+	if ( s.dataTypes[ 0 ] === "jsonp" ||
+		s.jsonp !== false && ( jsre.test( s.url ) ||
+				inspectData && jsre.test( s.data ) ) ) {
+
+		var responseContainer,
+			jsonpCallback = s.jsonpCallback =
+				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
+			previous = window[ jsonpCallback ],
+			url = s.url,
+			data = s.data,
+			replace = "$1" + jsonpCallback + "$2";
+
+		if ( s.jsonp !== false ) {
+			url = url.replace( jsre, replace );
+			if ( s.url === url ) {
+				if ( inspectData ) {
+					data = data.replace( jsre, replace );
+				}
+				if ( s.data === data ) {
+					// Add callback manually
+					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+				}
+			}
+		}
+
+		s.url = url;
+		s.data = data;
+
+		// Install callback
+		window[ jsonpCallback ] = function( response ) {
+			responseContainer = [ response ];
+		};
+
+		// Clean-up function
+		jqXHR.always(function() {
+			// Set callback back to previous value
+			window[ jsonpCallback ] = previous;
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( previous ) ) {
+				window[ jsonpCallback ]( responseContainer[ 0 ] );
+			}
+		});
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( jsonpCallback + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Delegate to script
+		return "script";
+	}
+});
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /javascript|ecmascript/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = "async";
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+
+						// Dereference the script
+						script = undefined;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// This arises when a base node is used (#2709 and #4378).
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( 0, 1 );
+				}
+			}
+		};
+	}
+});
+
+
+
+
+var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject ? function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	} : false,
+	xhrId = 0,
+	xhrCallbacks;
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+(function( xhr ) {
+	jQuery.extend( jQuery.support, {
+		ajax: !!xhr,
+		cors: !!xhr && ( "withCredentials" in xhr )
+	});
+})( jQuery.ajaxSettings.xhr() );
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var xhr = s.xhr(),
+						handle,
+						i;
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( _ ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+
+						var status,
+							statusText,
+							responseHeaders,
+							responses,
+							xml;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occured
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+									responses = {};
+									xml = xhr.responseXML;
+
+									// Construct response list
+									if ( xml && xml.documentElement /* #4958 */ ) {
+										responses.xml = xml;
+									}
+									responses.text = xhr.responseText;
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					// if we're in sync mode or it's in cache
+					// and has been retrieved directly (IE6 & IE7)
+					// we need to manually fire the callback
+					if ( !s.async || xhr.readyState === 4 ) {
+						callback();
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback(0,1);
+					}
+				}
+			};
+		}
+	});
+}
+
+
+
+
+var elemdisplay = {},
+	iframe, iframeDoc,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	],
+	fxNow;
+
+jQuery.fn.extend({
+	show: function( speed, easing, callback ) {
+		var elem, display;
+
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback );
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.style ) {
+					display = elem.style.display;
+
+					// Reset the inline display of this element to learn if it is
+					// being hidden by cascaded rules or not
+					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
+						display = elem.style.display = "";
+					}
+
+					// Set elements which have been overridden with display: none
+					// in a stylesheet to whatever the default browser style is
+					// for such an element
+					if ( display === "" && jQuery.css(elem, "display") === "none" ) {
+						jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
+					}
+				}
+			}
+
+			// Set the display of most of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.style ) {
+					display = elem.style.display;
+
+					if ( display === "" || display === "none" ) {
+						elem.style.display = jQuery._data( elem, "olddisplay" ) || "";
+					}
+				}
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, easing, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, easing, callback);
+
+		} else {
+			var elem, display,
+				i = 0,
+				j = this.length;
+
+			for ( ; i < j; i++ ) {
+				elem = this[i];
+				if ( elem.style ) {
+					display = jQuery.css( elem, "display" );
+
+					if ( display !== "none" && !jQuery._data( elem, "olddisplay" ) ) {
+						jQuery._data( elem, "olddisplay", display );
+					}
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				if ( this[i].style ) {
+					this[i].style.display = "none";
+				}
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2, callback ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, easing, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, easing, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed( speed, easing, callback );
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete, [ false ] );
+		}
+
+		// Do not change referenced properties as per-property easing will be lost
+		prop = jQuery.extend( {}, prop );
+
+		function doAnimation() {
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			if ( optall.queue === false ) {
+				jQuery._mark( this );
+			}
+
+			var opt = jQuery.extend( {}, optall ),
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				name, val, p, e,
+				parts, start, end, unit,
+				method;
+
+			// will store per property easing and be used to determine when an animation is complete
+			opt.animatedProperties = {};
+
+			for ( p in prop ) {
+
+				// property name normalization
+				name = jQuery.camelCase( p );
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+				}
+
+				val = prop[ name ];
+
+				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
+				if ( jQuery.isArray( val ) ) {
+					opt.animatedProperties[ name ] = val[ 1 ];
+					val = prop[ name ] = val[ 0 ];
+				} else {
+					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
+				}
+
+				if ( val === "hide" && hidden || val === "show" && !hidden ) {
+					return opt.complete.call( this );
+				}
+
+				if ( isElement && ( name === "height" || name === "width" ) ) {
+					// Make sure that nothing sneaks out
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+
+						// inline-level elements accept inline-block;
+						// block-level elements need to be inline with layout
+						if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( this.nodeName ) === "inline" ) {
+							this.style.display = "inline-block";
+
+						} else {
+							this.style.zoom = 1;
+						}
+					}
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			for ( p in prop ) {
+				e = new jQuery.fx( this, opt, p );
+				val = prop[ p ];
+
+				if ( rfxtypes.test( val ) ) {
+
+					// Tracks whether to show or hide based on private
+					// data attached to the element
+					method = jQuery._data( this, "toggle" + p ) || ( val === "toggle" ? hidden ? "show" : "hide" : 0 );
+					if ( method ) {
+						jQuery._data( this, "toggle" + p, method === "show" ? "hide" : "show" );
+						e[ method ]();
+					} else {
+						e[ val ]();
+					}
+
+				} else {
+					parts = rfxnum.exec( val );
+					start = e.cur();
+
+					if ( parts ) {
+						end = parseFloat( parts[2] );
+						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							jQuery.style( this, p, (end || 1) + unit);
+							start = ( (end || 1) / e.cur() ) * start;
+							jQuery.style( this, p, start + unit);
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			}
+
+			// For JS strict compliance
+			return true;
+		}
+
+		return optall.queue === false ?
+			this.each( doAnimation ) :
+			this.queue( optall.queue, doAnimation );
+	},
+
+	stop: function( type, clearQueue, gotoEnd ) {
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
+		if ( clearQueue && type !== false ) {
+			this.queue( type || "fx", [] );
+		}
+
+		return this.each(function() {
+			var index,
+				hadTimers = false,
+				timers = jQuery.timers,
+				data = jQuery._data( this );
+
+			// clear marker counters if we know they won't be
+			if ( !gotoEnd ) {
+				jQuery._unmark( true, this );
+			}
+
+			function stopQueue( elem, data, index ) {
+				var hooks = data[ index ];
+				jQuery.removeData( elem, index, true );
+				hooks.stop( gotoEnd );
+			}
+
+			if ( type == null ) {
+				for ( index in data ) {
+					if ( data[ index ] && data[ index ].stop && index.indexOf(".run") === index.length - 4 ) {
+						stopQueue( this, data, index );
+					}
+				}
+			} else if ( data[ index = type + ".run" ] && data[ index ].stop ){
+				stopQueue( this, data, index );
+			}
+
+			for ( index = timers.length; index--; ) {
+				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
+					if ( gotoEnd ) {
+
+						// force the next step to be the last
+						timers[ index ]( true );
+					} else {
+						timers[ index ].saveState();
+					}
+					hadTimers = true;
+					timers.splice( index, 1 );
+				}
+			}
+
+			// start the next in the queue if the last step wasn't forced
+			// timers currently will call their complete callbacks, which will dequeue
+			// but only if they were gotoEnd
+			if ( !( gotoEnd && hadTimers ) ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	}
+
+});
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout( clearFxNow, 0 );
+	return ( fxNow = jQuery.now() );
+}
+
+function clearFxNow() {
+	fxNow = undefined;
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice( 0, num )), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx( "show", 1 ),
+	slideUp: genFx( "hide", 1 ),
+	slideToggle: genFx( "toggle", 1 ),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+
+		// normalize opt.queue - true/undefined/null -> "fx"
+		if ( opt.queue == null || opt.queue === true ) {
+			opt.queue = "fx";
+		}
+
+		// Queueing
+		opt.old = opt.complete;
+
+		opt.complete = function( noUnmark ) {
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+
+			if ( opt.queue ) {
+				jQuery.dequeue( this, opt.queue );
+			} else if ( noUnmark !== false ) {
+				jQuery._unmark( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ( ( -Math.cos( p*Math.PI ) / 2 ) + 0.5 ) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		options.orig = options.orig || {};
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		( jQuery.fx.step[ this.prop ] || jQuery.fx.step._default )( this );
+	},
+
+	// Get the current size
+	cur: function() {
+		if ( this.elem[ this.prop ] != null && (!this.elem.style || this.elem.style[ this.prop ] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var parsed,
+			r = jQuery.css( this.elem, this.prop );
+		// Empty strings, null, undefined and "auto" are converted to 0,
+		// complex values such as "rotate(1rad)" are returned as is,
+		// simple values such as "10px" are parsed to Float.
+		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx;
+
+		this.startTime = fxNow || createFxNow();
+		this.end = to;
+		this.now = this.start = from;
+		this.pos = this.state = 0;
+		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
+
+		function t( gotoEnd ) {
+			return self.step( gotoEnd );
+		}
+
+		t.queue = this.options.queue;
+		t.elem = this.elem;
+		t.saveState = function() {
+			if ( self.options.hide && jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) {
+				jQuery._data( self.elem, "fxshow" + self.prop, self.start );
+			}
+		};
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval( fx.tick, fx.interval );
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		var dataShow = jQuery._data( this.elem, "fxshow" + this.prop );
+
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[ this.prop ] = dataShow || jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any flash of content
+		if ( dataShow !== undefined ) {
+			// This show is picking up where a previous hide or show left off
+			this.custom( this.cur(), dataShow );
+		} else {
+			this.custom( this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur() );
+		}
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[ this.prop ] = jQuery._data( this.elem, "fxshow" + this.prop ) || jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom( this.cur(), 0 );
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var p, n, complete,
+			t = fxNow || createFxNow(),
+			done = true,
+			elem = this.elem,
+			options = this.options;
+
+		if ( gotoEnd || t >= options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			options.animatedProperties[ this.prop ] = true;
+
+			for ( p in options.animatedProperties ) {
+				if ( options.animatedProperties[ p ] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				// Reset the overflow
+				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+
+					jQuery.each( [ "", "X", "Y" ], function( index, value ) {
+						elem.style[ "overflow" + value ] = options.overflow[ index ];
+					});
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( options.hide ) {
+					jQuery( elem ).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( options.hide || options.show ) {
+					for ( p in options.animatedProperties ) {
+						jQuery.style( elem, p, options.orig[ p ] );
+						jQuery.removeData( elem, "fxshow" + p, true );
+						// Toggle data is no longer needed
+						jQuery.removeData( elem, "toggle" + p, true );
+					}
+				}
+
+				// Execute the complete function
+				// in the event that the complete function throws an exception
+				// we must ensure it won't be called twice. #5684
+
+				complete = options.complete;
+				if ( complete ) {
+
+					options.complete = false;
+					complete.call( elem );
+				}
+			}
+
+			return false;
+
+		} else {
+			// classical easing cannot be used with an Infinity duration
+			if ( options.duration == Infinity ) {
+				this.now = t;
+			} else {
+				n = t - this.startTime;
+				this.state = n / options.duration;
+
+				// Perform the easing function, defaults to swing
+				this.pos = jQuery.easing[ options.animatedProperties[this.prop] ]( this.state, n, 0, 1, options.duration );
+				this.now = this.start + ( (this.end - this.start) * this.pos );
+			}
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timer,
+			timers = jQuery.timers,
+			i = 0;
+
+		for ( ; i < timers.length; i++ ) {
+			timer = timers[ i ];
+			// Checks the timer has not already been removed
+			if ( !timer() && timers[ i ] === timer ) {
+				timers.splice( i--, 1 );
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+
+	interval: 13,
+
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+
+	speeds: {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style( fx.elem, "opacity", fx.now );
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+// Adds width/height step functions
+// Do not set anything below 0
+jQuery.each([ "width", "height" ], function( i, prop ) {
+	jQuery.fx.step[ prop ] = function( fx ) {
+		jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
+	};
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+// Try to restore the default display value of an element
+function defaultDisplay( nodeName ) {
+
+	if ( !elemdisplay[ nodeName ] ) {
+
+		var body = document.body,
+			elem = jQuery( "<" + nodeName + ">" ).appendTo( body ),
+			display = elem.css( "display" );
+		elem.remove();
+
+		// If the simple way fails,
+		// get element's real default display by attaching it to a temp iframe
+		if ( display === "none" || display === "" ) {
+			// No iframe to use yet, so create it
+			if ( !iframe ) {
+				iframe = document.createElement( "iframe" );
+				iframe.frameBorder = iframe.width = iframe.height = 0;
+			}
+
+			body.appendChild( iframe );
+
+			// Create a cacheable copy of the iframe document on first call.
+			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+			// document to it; WebKit & Firefox won't allow reusing the iframe document.
+			if ( !iframeDoc || !iframe.createElement ) {
+				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+				iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "<!doctype html>" : "" ) + "<html><body>" );
+				iframeDoc.close();
+			}
+
+			elem = iframeDoc.createElement( nodeName );
+
+			iframeDoc.body.appendChild( elem );
+
+			display = jQuery.css( elem, "display" );
+			body.removeChild( iframe );
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
+
+
+
+var rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0], box;
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		var doc = elem.ownerDocument,
+			docElem = doc.documentElement;
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow(doc),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
+			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.offset = {
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if ( options.top != null ) {
+			props.top = ( options.top - curOffset.top ) + curTop;
+		}
+		if ( options.left != null ) {
+			props.left = ( options.left - curOffset.left ) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function( val ) {
+		var elem, win;
+
+		if ( val === undefined ) {
+			elem = this[ 0 ];
+
+			if ( !elem ) {
+				return null;
+			}
+
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
+
+		// Set the scroll offset
+		return this.each(function() {
+			win = getWindow( this );
+
+			if ( win ) {
+				win.scrollTo(
+					!i ? val : jQuery( win ).scrollLeft(),
+					 i ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				this[ method ] = val;
+			}
+		});
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+
+
+
+// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn[ "inner" + name ] = function() {
+		var elem = this[0];
+		return elem ?
+			elem.style ?
+			parseFloat( jQuery.css( elem, type, "padding" ) ) :
+			this[ type ]() :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn[ "outer" + name ] = function( margin ) {
+		var elem = this[0];
+		return elem ?
+			elem.style ?
+			parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
+			this[ type ]() :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		if ( jQuery.isWindow( elem ) ) {
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+			var docElemProp = elem.document.documentElement[ "client" + name ],
+				body = elem.document.body;
+			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
+				body && body[ "client" + name ] || docElemProp;
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNumeric( ret ) ? ret : orig;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
+	};
+
+});
+
+
+
+
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+
+// Expose jQuery as an AMD module, but only for AMD loaders that
+// understand the issues with loading multiple versions of jQuery
+// in a page that all might call define(). The loader will indicate
+// they have special allowances for multiple jQuery versions by
+// specifying define.amd.jQuery = true. Register as a named module,
+// since jQuery can be concatenated with other files that may use define,
+// but not use a proper concatenation script that understands anonymous
+// AMD modules. A named AMD is safest and most robust way to register.
+// Lowercase jquery is used because AMD module names are derived from
+// file names, and jQuery is normally delivered in a lowercase file name.
+// Do this after creating the global so that if an AMD module wants to call
+// noConflict to hide this version of jQuery, it will work.
+if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
+	define( "jquery", [], function () { return jQuery; } );
+}
+
+
+
+})( window );
diff --git a/js/tests/vendor/qunit.css b/js/tests/vendor/qunit.css
new file mode 100644
index 0000000000..b3e3d002d7
--- /dev/null
+++ b/js/tests/vendor/qunit.css
@@ -0,0 +1,232 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ *
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699a4;
+	background-color: #0d3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: normal;
+
+	border-radius: 15px 15px 0 0;
+	-moz-border-radius: 15px 15px 0 0;
+	-webkit-border-top-right-radius: 15px;
+	-webkit-border-top-left-radius: 15px;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #c2ccd1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #fff;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 0 0.5em 2em;
+	color: #5E740B;
+	background-color: #eee;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 0 0.5em 2.5em;
+	background-color: #2b81af;
+	color: #fff;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 0.5em 0.4em 2.5em;
+	border-bottom: 1px solid #fff;
+	list-style-position: inside;
+}
+
+#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
+	display: none;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #c2ccd1;
+	text-decoration: none;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests ol {
+	margin-top: 0.5em;
+	padding: 0.5em;
+
+	background-color: #fff;
+
+	border-radius: 15px;
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: .2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 .5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	background-color: #e0f2be;
+	color: #374e0c;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	background-color: #ffcaca;
+	color: #500;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: black; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	margin: 0.5em;
+	padding: 0.4em 0.5em 0.4em 0.5em;
+	background-color: #fff;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #5E740B;
+	background-color: #fff;
+	border-left: 26px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #fff;
+	border-left: 26px solid #EE5757;
+	white-space: pre;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 15px 15px;
+	-moz-border-radius: 0 0 15px 15px;
+	-webkit-border-bottom-right-radius: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+}
+
+#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: green;   }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/** Result */
+
+#qunit-testresult {
+	padding: 0.5em 0.5em 0.5em 2.5em;
+
+	color: #2b81af;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid white;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+}
+
+/** Runoff */
+
+#qunit-fixture {
+  display:none;
+}
\ No newline at end of file
diff --git a/js/tests/vendor/qunit.js b/js/tests/vendor/qunit.js
new file mode 100644
index 0000000000..46c95b298e
--- /dev/null
+++ b/js/tests/vendor/qunit.js
@@ -0,0 +1,1510 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ *
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var defined = {
+	setTimeout: typeof window.setTimeout !== "undefined",
+	sessionStorage: (function() {
+		try {
+			return !!sessionStorage.getItem;
+		} catch(e) {
+			return false;
+		}
+	})()
+};
+
+var testId = 0;
+
+var Test = function(name, testName, expected, testEnvironmentArg, async, callback) {
+	this.name = name;
+	this.testName = testName;
+	this.expected = expected;
+	this.testEnvironmentArg = testEnvironmentArg;
+	this.async = async;
+	this.callback = callback;
+	this.assertions = [];
+};
+Test.prototype = {
+	init: function() {
+		var tests = id("qunit-tests");
+		if (tests) {
+			var b = document.createElement("strong");
+				b.innerHTML = "Running " + this.name;
+			var li = document.createElement("li");
+				li.appendChild( b );
+				li.className = "running";
+				li.id = this.id = "test-output" + testId++;
+			tests.appendChild( li );
+		}
+	},
+	setup: function() {
+		if (this.module != config.previousModule) {
+			if ( config.previousModule ) {
+				QUnit.moduleDone( {
+					name: config.previousModule,
+					failed: config.moduleStats.bad,
+					passed: config.moduleStats.all - config.moduleStats.bad,
+					total: config.moduleStats.all
+				} );
+			}
+			config.previousModule = this.module;
+			config.moduleStats = { all: 0, bad: 0 };
+			QUnit.moduleStart( {
+				name: this.module
+			} );
+		}
+
+		config.current = this;
+		this.testEnvironment = extend({
+			setup: function() {},
+			teardown: function() {}
+		}, this.moduleTestEnvironment);
+		if (this.testEnvironmentArg) {
+			extend(this.testEnvironment, this.testEnvironmentArg);
+		}
+
+		QUnit.testStart( {
+			name: this.testName
+		} );
+
+		// allow utility functions to access the current test environment
+		// TODO why??
+		QUnit.current_testEnvironment = this.testEnvironment;
+
+		try {
+			if ( !config.pollution ) {
+				saveGlobal();
+			}
+
+			this.testEnvironment.setup.call(this.testEnvironment);
+		} catch(e) {
+			QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message );
+		}
+	},
+	run: function() {
+		if ( this.async ) {
+			QUnit.stop();
+		}
+
+		if ( config.notrycatch ) {
+			this.callback.call(this.testEnvironment);
+			return;
+		}
+		try {
+			this.callback.call(this.testEnvironment);
+		} catch(e) {
+			fail("Test " + this.testName + " died, exception and test follows", e, this.callback);
+			QUnit.ok( false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) );
+			// else next test will carry the responsibility
+			saveGlobal();
+
+			// Restart the tests if they're blocking
+			if ( config.blocking ) {
+				start();
+			}
+		}
+	},
+	teardown: function() {
+		try {
+			this.testEnvironment.teardown.call(this.testEnvironment);
+			checkPollution();
+		} catch(e) {
+			QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message );
+		}
+	},
+	finish: function() {
+		if ( this.expected && this.expected != this.assertions.length ) {
+			QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" );
+		}
+
+		var good = 0, bad = 0,
+			tests = id("qunit-tests");
+
+		config.stats.all += this.assertions.length;
+		config.moduleStats.all += this.assertions.length;
+
+		if ( tests ) {
+			var ol = document.createElement("ol");
+
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				var assertion = this.assertions[i];
+
+				var li = document.createElement("li");
+				li.className = assertion.result ? "pass" : "fail";
+				li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+				ol.appendChild( li );
+
+				if ( assertion.result ) {
+					good++;
+				} else {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+
+			// store result when possible
+			if ( QUnit.config.reorder && defined.sessionStorage ) {
+				if (bad) {
+					sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad);
+				} else {
+					sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName);
+				}
+			}
+
+			if (bad == 0) {
+				ol.style.display = "none";
+			}
+
+			var b = document.createElement("strong");
+			b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
+
+			var a = document.createElement("a");
+			a.innerHTML = "Rerun";
+			a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+
+			addEvent(b, "click", function() {
+				var next = b.nextSibling.nextSibling,
+					display = next.style.display;
+				next.style.display = display === "none" ? "block" : "none";
+			});
+
+			addEvent(b, "dblclick", function(e) {
+				var target = e && e.target ? e.target : window.event.srcElement;
+				if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
+					target = target.parentNode;
+				}
+				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
+					window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+				}
+			});
+
+			var li = id(this.id);
+			li.className = bad ? "fail" : "pass";
+			li.removeChild( li.firstChild );
+			li.appendChild( b );
+			li.appendChild( a );
+			li.appendChild( ol );
+
+		} else {
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				if ( !this.assertions[i].result ) {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+		}
+
+		try {
+			QUnit.reset();
+		} catch(e) {
+			fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
+		}
+
+		QUnit.testDone( {
+			name: this.testName,
+			failed: bad,
+			passed: this.assertions.length - bad,
+			total: this.assertions.length
+		} );
+	},
+
+	queue: function() {
+		var test = this;
+		synchronize(function() {
+			test.init();
+		});
+		function run() {
+			// each of these can by async
+			synchronize(function() {
+				test.setup();
+			});
+			synchronize(function() {
+				test.run();
+			});
+			synchronize(function() {
+				test.teardown();
+			});
+			synchronize(function() {
+				test.finish();
+			});
+		}
+		// defer when previous test run passed, if storage is available
+		var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName);
+		if (bad) {
+			run();
+		} else {
+			synchronize(run);
+		};
+	}
+
+};
+
+var QUnit = {
+
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+		config.currentModuleTestEnviroment = testEnvironment;
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+
+	test: function(testName, expected, callback, async) {
+		var name = '<span class="test-name">' + testName + '</span>', testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg = expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+		}
+
+		if ( !validTest(config.currentModule + ": " + testName) ) {
+			return;
+		}
+
+		var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
+		test.module = config.currentModule;
+		test.moduleTestEnvironment = config.currentModuleTestEnviroment;
+		test.queue();
+	},
+
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.current.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		a = !!a;
+		var details = {
+			result: a,
+			message: msg
+		};
+		msg = escapeHtml(msg);
+		QUnit.log(details);
+		config.current.assertions.push({
+			result: a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		QUnit.push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		QUnit.push(expected != actual, actual, expected, message);
+	},
+
+	deepEqual: function(actual, expected, message) {
+		QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	notDeepEqual: function(actual, expected, message) {
+		QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		QUnit.push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		QUnit.push(expected !== actual, actual, expected, message);
+	},
+
+	raises: function(block, expected, message) {
+		var actual, ok = false;
+
+		if (typeof expected === 'string') {
+			message = expected;
+			expected = null;
+		}
+
+		try {
+			block();
+		} catch (e) {
+			actual = e;
+		}
+
+		if (actual) {
+			// we don't want to validate thrown error
+			if (!expected) {
+				ok = true;
+			// expected is a regexp
+			} else if (QUnit.objectType(expected) === "regexp") {
+				ok = expected.test(actual);
+			// expected is a constructor
+			} else if (actual instanceof expected) {
+				ok = true;
+			// expected is a validation function which returns true is validation passed
+			} else if (expected.call({}, actual) === true) {
+				ok = true;
+			}
+		}
+
+		QUnit.ok(ok, message);
+	},
+
+	start: function() {
+		config.semaphore--;
+		if (config.semaphore > 0) {
+			// don't start until equal number of stop-calls
+			return;
+		}
+		if (config.semaphore < 0) {
+			// ignore if start is called more often then stop
+			config.semaphore = 0;
+		}
+		// A slight delay, to avoid any current callbacks
+		if ( defined.setTimeout ) {
+			window.setTimeout(function() {
+				if (config.semaphore > 0) {
+					return;
+				}
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+
+	stop: function(timeout) {
+		config.semaphore++;
+		config.blocking = true;
+
+		if ( timeout && defined.setTimeout ) {
+			clearTimeout(config.timeout);
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true,
+
+	// when enabled, show only failing tests
+	// gets persisted through sessionStorage and can be changed in UI via checkbox
+	hidepassed: false,
+
+	// by default, run previously failed tests first
+	// very useful in combination with "Hide passed tests" checked
+	reorder: true,
+
+	// by default, modify document.title when suite is done
+	altertitle: true,
+
+	urlConfig: ['noglobals', 'notrycatch']
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		params = location.search.slice( 1 ).split( "&" ),
+		length = params.length,
+		urlParams = {},
+		current;
+
+	if ( params[ 0 ] ) {
+		for ( var i = 0; i < length; i++ ) {
+			current = params[ i ].split( "=" );
+			current[ 0 ] = decodeURIComponent( current[ 0 ] );
+			// allow just a key to turn on a flag, e.g., test.html?noglobals
+			current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true;
+			urlParams[ current[ 0 ] ] = current[ 1 ];
+		}
+	}
+
+	QUnit.urlParams = urlParams;
+	config.filter = urlParams.filter;
+
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+// define these after exposing globals to keep them in these QUnit namespace only
+extend(QUnit, {
+	config: config,
+
+	// Initialize the configuration options
+	init: function() {
+		extend(config, {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			updateRate: 1000,
+			blocking: false,
+			autostart: true,
+			autorun: false,
+			filter: "",
+			queue: [],
+			semaphore: 0
+		});
+
+		var tests = id( "qunit-tests" ),
+			banner = id( "qunit-banner" ),
+			result = id( "qunit-testresult" );
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+
+		if ( tests ) {
+			result = document.createElement( "p" );
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests );
+			result.innerHTML = 'Running...<br/>&nbsp;';
+		}
+	},
+
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 *
+	 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery( "#qunit-fixture" ).html( config.fixture );
+		} else {
+			var main = id( 'qunit-fixture' );
+			if ( main ) {
+				main.innerHTML = config.fixture;
+			}
+		}
+	},
+
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+
+	// Safe object type checking
+	is: function( type, obj ) {
+		return QUnit.objectType( obj ) == type;
+	},
+
+	objectType: function( obj ) {
+		if (typeof obj === "undefined") {
+				return "undefined";
+
+		// consider: typeof null === object
+		}
+		if (obj === null) {
+				return "null";
+		}
+
+		var type = Object.prototype.toString.call( obj )
+			.match(/^\[object\s(.*)\]$/)[1] || '';
+
+		switch (type) {
+				case 'Number':
+						if (isNaN(obj)) {
+								return "nan";
+						} else {
+								return "number";
+						}
+				case 'String':
+				case 'Boolean':
+				case 'Array':
+				case 'Date':
+				case 'RegExp':
+				case 'Function':
+						return type.toLowerCase();
+		}
+		if (typeof obj === "object") {
+				return "object";
+		}
+		return undefined;
+	},
+
+	push: function(result, actual, expected, message) {
+		var details = {
+			result: result,
+			message: message,
+			actual: actual,
+			expected: expected
+		};
+
+		message = escapeHtml(message) || (result ? "okay" : "failed");
+		message = '<span class="test-message">' + message + "</span>";
+		expected = escapeHtml(QUnit.jsDump.parse(expected));
+		actual = escapeHtml(QUnit.jsDump.parse(actual));
+		var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
+		if (actual != expected) {
+			output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
+			output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
+		}
+		if (!result) {
+			var source = sourceFromStacktrace();
+			if (source) {
+				details.source = source;
+				output += '<tr class="test-source"><th>Source: </th><td><pre>' + escapeHtml(source) + '</pre></td></tr>';
+			}
+		}
+		output += "</table>";
+
+		QUnit.log(details);
+
+		config.current.assertions.push({
+			result: !!result,
+			message: output
+		});
+	},
+
+	url: function( params ) {
+		params = extend( extend( {}, QUnit.urlParams ), params );
+		var querystring = "?",
+			key;
+		for ( key in params ) {
+			querystring += encodeURIComponent( key ) + "=" +
+				encodeURIComponent( params[ key ] ) + "&";
+		}
+		return window.location.pathname + querystring.slice( 0, -1 );
+	},
+
+	extend: extend,
+	id: id,
+	addEvent: addEvent,
+
+	// Logging callbacks; all receive a single argument with the listed properties
+	// run test/logs.html for any related changes
+	begin: function() {},
+	// done: { failed, passed, total, runtime }
+	done: function() {},
+	// log: { result, actual, expected, message }
+	log: function() {},
+	// testStart: { name }
+	testStart: function() {},
+	// testDone: { name, failed, passed, total }
+	testDone: function() {},
+	// moduleStart: { name }
+	moduleStart: function() {},
+	// moduleDone: { name, failed, passed, total }
+	moduleDone: function() {}
+});
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+QUnit.load = function() {
+	QUnit.begin({});
+
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var urlConfigHtml = '', len = config.urlConfig.length;
+	for ( var i = 0, val; i < len, val = config.urlConfig[i]; i++ ) {
+		config[val] = QUnit.urlParams[val];
+		urlConfigHtml += '<label><input name="' + val + '" type="checkbox"' + ( config[val] ? ' checked="checked"' : '' ) + '>' + val + '</label>';
+	}
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	var banner = id("qunit-header");
+	if ( banner ) {
+		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' + urlConfigHtml;
+		addEvent( banner, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+	}
+
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		addEvent( filter, "click", function() {
+			var ol = document.getElementById("qunit-tests");
+			if ( filter.checked ) {
+				ol.className = ol.className + " hidepass";
+			} else {
+				var tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
+				ol.className = tmp.replace(/ hidepass /, " ");
+			}
+			if ( defined.sessionStorage ) {
+				if (filter.checked) {
+					sessionStorage.setItem("qunit-filter-passed-tests", "true");
+				} else {
+					sessionStorage.removeItem("qunit-filter-passed-tests");
+				}
+			}
+		});
+		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests") ) {
+			filter.checked = true;
+			var ol = document.getElementById("qunit-tests");
+			ol.className = ol.className + " hidepass";
+		}
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('qunit-fixture');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if (config.autostart) {
+		QUnit.start();
+	}
+};
+
+addEvent(window, "load", QUnit.load);
+
+function done() {
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( {
+			name: config.currentModule,
+			failed: config.moduleStats.bad,
+			passed: config.moduleStats.all - config.moduleStats.bad,
+			total: config.moduleStats.all
+		} );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		runtime = +new Date - config.started,
+		passed = config.stats.all - config.stats.bad,
+		html = [
+			'Tests completed in ',
+			runtime,
+			' milliseconds.<br/>',
+			'<span class="passed">',
+			passed,
+			'</span> tests of <span class="total">',
+			config.stats.all,
+			'</span> passed, <span class="failed">',
+			config.stats.bad,
+			'</span> failed.'
+		].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {
+		id( "qunit-testresult" ).innerHTML = html;
+	}
+
+	if ( config.altertitle && typeof document !== "undefined" && document.title ) {
+		// show ✖ for good, ✔ for bad suite result in title
+		// use escape sequences in case file gets loaded with non-utf-8-charset
+		document.title = [
+			(config.stats.bad ? "\u2716" : "\u2714"),
+			document.title.replace(/^[\u2714\u2716] /i, "")
+		].join(" ");
+	}
+
+	QUnit.done( {
+		failed: config.stats.bad,
+		passed: passed,
+		total: config.stats.all,
+		runtime: runtime
+	} );
+}
+
+function validTest( name ) {
+	var filter = config.filter,
+		run = false;
+
+	if ( !filter ) {
+		return true;
+	}
+
+	var not = filter.charAt( 0 ) === "!";
+	if ( not ) {
+		filter = filter.slice( 1 );
+	}
+
+	if ( name.indexOf( filter ) !== -1 ) {
+		return !not;
+	}
+
+	if ( not ) {
+		run = true;
+	}
+
+	return run;
+}
+
+// so far supports only Firefox, Chrome and Opera (buggy)
+// could be extended in the future to use something like https://github.com/csnover/TraceKit
+function sourceFromStacktrace() {
+	try {
+		throw new Error();
+	} catch ( e ) {
+		if (e.stacktrace) {
+			// Opera
+			return e.stacktrace.split("\n")[6];
+		} else if (e.stack) {
+			// Firefox, Chrome
+			return e.stack.split("\n")[4];
+		} else if (e.sourceURL) {
+			// Safari, PhantomJS
+			// TODO sourceURL points at the 'throw new Error' line above, useless
+			//return e.sourceURL + ":" + e.line;
+		}
+	}
+}
+
+function escapeHtml(s) {
+	if (!s) {
+		return "";
+	}
+	s = s + "";
+	return s.replace(/[\&"<>\\]/g, function(s) {
+		switch(s) {
+			case "&": return "&amp;";
+			case "\\": return "\\\\";
+			case '"': return '\"';
+			case "<": return "&lt;";
+			case ">": return "&gt;";
+			default: return s;
+		}
+	});
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	var start = (new Date()).getTime();
+
+	while ( config.queue.length && !config.blocking ) {
+		if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) {
+			config.queue.shift()();
+		} else {
+			window.setTimeout( process, 13 );
+			break;
+		}
+	}
+	if (!config.blocking && !config.queue.length) {
+		done();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+
+	var newGlobals = diff( config.pollution, old );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+	}
+
+	var deletedGlobals = diff( old, config.pollution );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		if ( b[prop] === undefined ) {
+			delete a[prop];
+		} else {
+			a[prop] = b[prop];
+		}
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+	var innerEquiv; // the real equiv function
+	var callers = []; // stack to decide between skip/abort functions
+	var parents = []; // stack to avoiding loops from circular referencing
+
+	// Call the o related callback with the given arguments.
+	function bindCallbacks(o, callbacks, args) {
+		var prop = QUnit.objectType(o);
+		if (prop) {
+			if (QUnit.objectType(callbacks[prop]) === "function") {
+				return callbacks[prop].apply(callbacks, args);
+			} else {
+				return callbacks[prop]; // or undefined
+			}
+		}
+	}
+
+	var callbacks = function () {
+
+		// for string, boolean, number and null
+		function useStrictEquality(b, a) {
+			if (b instanceof a.constructor || a instanceof b.constructor) {
+				// to catch short annotaion VS 'new' annotation of a
+				// declaration
+				// e.g. var i = 1;
+				// var j = new Number(1);
+				return a == b;
+			} else {
+				return a === b;
+			}
+		}
+
+		return {
+			"string" : useStrictEquality,
+			"boolean" : useStrictEquality,
+			"number" : useStrictEquality,
+			"null" : useStrictEquality,
+			"undefined" : useStrictEquality,
+
+			"nan" : function(b) {
+				return isNaN(b);
+			},
+
+			"date" : function(b, a) {
+				return QUnit.objectType(b) === "date"
+						&& a.valueOf() === b.valueOf();
+			},
+
+			"regexp" : function(b, a) {
+				return QUnit.objectType(b) === "regexp"
+						&& a.source === b.source && // the regex itself
+						a.global === b.global && // and its modifers
+													// (gmi) ...
+						a.ignoreCase === b.ignoreCase
+						&& a.multiline === b.multiline;
+			},
+
+			// - skip when the property is a method of an instance (OOP)
+			// - abort otherwise,
+			// initial === would have catch identical references anyway
+			"function" : function() {
+				var caller = callers[callers.length - 1];
+				return caller !== Object && typeof caller !== "undefined";
+			},
+
+			"array" : function(b, a) {
+				var i, j, loop;
+				var len;
+
+				// b could be an object literal here
+				if (!(QUnit.objectType(b) === "array")) {
+					return false;
+				}
+
+				len = a.length;
+				if (len !== b.length) { // safe and faster
+					return false;
+				}
+
+				// track reference to avoid circular references
+				parents.push(a);
+				for (i = 0; i < len; i++) {
+					loop = false;
+					for (j = 0; j < parents.length; j++) {
+						if (parents[j] === a[i]) {
+							loop = true;// dont rewalk array
+						}
+					}
+					if (!loop && !innerEquiv(a[i], b[i])) {
+						parents.pop();
+						return false;
+					}
+				}
+				parents.pop();
+				return true;
+			},
+
+			"object" : function(b, a) {
+				var i, j, loop;
+				var eq = true; // unless we can proove it
+				var aProperties = [], bProperties = []; // collection of
+														// strings
+
+				// comparing constructors is more strict than using
+				// instanceof
+				if (a.constructor !== b.constructor) {
+					return false;
+				}
+
+				// stack constructor before traversing properties
+				callers.push(a.constructor);
+				// track reference to avoid circular references
+				parents.push(a);
+
+				for (i in a) { // be strict: don't ensures hasOwnProperty
+								// and go deep
+					loop = false;
+					for (j = 0; j < parents.length; j++) {
+						if (parents[j] === a[i])
+							loop = true; // don't go down the same path
+											// twice
+					}
+					aProperties.push(i); // collect a's properties
+
+					if (!loop && !innerEquiv(a[i], b[i])) {
+						eq = false;
+						break;
+					}
+				}
+
+				callers.pop(); // unstack, we are done
+				parents.pop();
+
+				for (i in b) {
+					bProperties.push(i); // collect b's properties
+				}
+
+				// Ensures identical properties name
+				return eq
+						&& innerEquiv(aProperties.sort(), bProperties
+								.sort());
+			}
+		};
+	}();
+
+	innerEquiv = function() { // can take multiple arguments
+		var args = Array.prototype.slice.apply(arguments);
+		if (args.length < 2) {
+			return true; // end transition
+		}
+
+		return (function(a, b) {
+			if (a === b) {
+				return true; // catch the most you can
+			} else if (a === null || b === null || typeof a === "undefined"
+					|| typeof b === "undefined"
+					|| QUnit.objectType(a) !== QUnit.objectType(b)) {
+				return false; // don't lose time with error prone cases
+			} else {
+				return bindCallbacks(a, callbacks, [ b, a ]);
+			}
+
+			// apply transition with (1..n) arguments
+		})(args[0], args[1])
+				&& arguments.callee.apply(this, args.splice(1,
+						args.length - 1));
+	};
+
+	return innerEquiv;
+
+}();
+
+/**
+ * jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com |
+ * http://flesler.blogspot.com Licensed under BSD
+ * (http://www.opensource.org/licenses/bsd-license.php) Date: 5/15/2008
+ *
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr, stack ) {
+		var i = arr.length, ret = Array(i);
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] , undefined , stack);
+		this.down();
+		return join( '[', ret, ']' );
+	};
+
+	var reName = /^function (\w+)/;
+
+	var jsDump = {
+		parse:function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance
+			stack = stack || [ ];
+			var parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;
+			var inStack = inArray(obj, stack);
+			if (inStack != -1) {
+				return 'recursion('+(inStack - stack.length)+')';
+			}
+			//else
+			if (type == 'function')  {
+					stack.push(obj);
+					var res = parser.call( this, obj, stack );
+					stack.pop();
+					return res;
+			}
+			// else
+			return (type == 'string') ? parser : this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
+				type = "window";
+			} else if (obj.nodeType === 9) {
+				type = "document";
+			} else if (obj.nodeType) {
+				type = "node";
+			} else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
+				type = "array";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote,
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			'undefined':'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+
+				ret = [ ret, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, QUnit.jsDump.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map, stack ) {
+				var ret = [ ];
+				QUnit.jsDump.up();
+				for ( var key in map ) {
+				    var val = map[key];
+					ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(val, undefined, stack));
+                }
+				QUnit.jsDump.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = QUnit.jsDump.HTML ? '&lt;' : '<',
+					close = QUnit.jsDump.HTML ? '&gt;' : '>';
+
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+
+				for ( var a in QUnit.jsDump.DOMAttrs ) {
+					var val = node[QUnit.jsDump.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + QUnit.jsDump.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';
+
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'  ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+// from Sizzle.js
+function getText( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+//from jquery.js
+function inArray( elem, array ) {
+	if ( array.indexOf ) {
+		return array.indexOf( elem );
+	}
+
+	for ( var i = 0, length = array.length; i < length; i++ ) {
+		if ( array[ i ] === elem ) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+/*
+ * Javascript Diff Algorithm
+ *  By John Resig (http://ejohn.org/)
+ *  Modified by Chu Alan "sprite"
+ *
+ * Released under the MIT license.
+ *
+ * More Info:
+ *  http://ejohn.org/projects/javascript-diff-algorithm/
+ *
+ * Usage: QUnit.diff(expected, actual)
+ *
+ * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ */
+QUnit.diff = (function() {
+	function diff(o, n) {
+		var ns = {};
+		var os = {};
+
+		for (var i = 0; i < n.length; i++) {
+			if (ns[n[i]] == null)
+				ns[n[i]] = {
+					rows: [],
+					o: null
+				};
+			ns[n[i]].rows.push(i);
+		}
+
+		for (var i = 0; i < o.length; i++) {
+			if (os[o[i]] == null)
+				os[o[i]] = {
+					rows: [],
+					n: null
+				};
+			os[o[i]].rows.push(i);
+		}
+
+		for (var i in ns) {
+			if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
+				n[ns[i].rows[0]] = {
+					text: n[ns[i].rows[0]],
+					row: os[i].rows[0]
+				};
+				o[os[i].rows[0]] = {
+					text: o[os[i].rows[0]],
+					row: ns[i].rows[0]
+				};
+			}
+		}
+
+		for (var i = 0; i < n.length - 1; i++) {
+			if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
+			n[i + 1] == o[n[i].row + 1]) {
+				n[i + 1] = {
+					text: n[i + 1],
+					row: n[i].row + 1
+				};
+				o[n[i].row + 1] = {
+					text: o[n[i].row + 1],
+					row: i + 1
+				};
+			}
+		}
+
+		for (var i = n.length - 1; i > 0; i--) {
+			if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
+			n[i - 1] == o[n[i].row - 1]) {
+				n[i - 1] = {
+					text: n[i - 1],
+					row: n[i].row - 1
+				};
+				o[n[i].row - 1] = {
+					text: o[n[i].row - 1],
+					row: i - 1
+				};
+			}
+		}
+
+		return {
+			o: o,
+			n: n
+		};
+	}
+
+	return function(o, n) {
+		o = o.replace(/\s+$/, '');
+		n = n.replace(/\s+$/, '');
+		var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+
+		var str = "";
+
+		var oSpace = o.match(/\s+/g);
+		if (oSpace == null) {
+			oSpace = [" "];
+		}
+		else {
+			oSpace.push(" ");
+		}
+		var nSpace = n.match(/\s+/g);
+		if (nSpace == null) {
+			nSpace = [" "];
+		}
+		else {
+			nSpace.push(" ");
+		}
+
+		if (out.n.length == 0) {
+			for (var i = 0; i < out.o.length; i++) {
+				str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+			}
+		}
+		else {
+			if (out.n[0].text == null) {
+				for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
+					str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+				}
+			}
+
+			for (var i = 0; i < out.n.length; i++) {
+				if (out.n[i].text == null) {
+					str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+				}
+				else {
+					var pre = "";
+
+					for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
+						pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+					}
+					str += " " + out.n[i].text + nSpace[i] + pre;
+				}
+			}
+		}
+
+		return str;
+	};
+})();
+
+})(this);
\ No newline at end of file
diff --git a/less.js b/less.js
new file mode 100644
index 0000000000..309bf550db
--- /dev/null
+++ b/less.js
@@ -0,0 +1,9 @@
+//
+// LESS - Leaner CSS v1.3.0
+// http://lesscss.org
+// 
+// Copyright (c) 2009-2011, Alexis Sellier
+// Licensed under the Apache 2.0 License.
+//
+(function(a,b){function c(b){return a.less[b.split("/")[1]]}function l(){var a=document.getElementsByTagName("style");for(var b=0;b<a.length;b++)a[b].type.match(j)&&(new d.Parser).parse(a[b].innerHTML||"",function(c,d){var e=d.toCSS(),f=a[b];f.type="text/css",f.styleSheet?f.styleSheet.cssText=e:f.innerHTML=e})}function m(a,b){for(var c=0;c<d.sheets.length;c++)n(d.sheets[c],a,b,d.sheets.length-(c+1))}function n(b,c,e,f){var h=a.location.href.replace(/[#?].*$/,""),i=b.href.replace(/\?.*$/,""),j=g&&g.getItem(i),k=g&&g.getItem(i+":timestamp"),l={css:j,timestamp:k};/^(https?|file):/.test(i)||(i.charAt(0)=="/"?i=a.location.protocol+"//"+a.location.host+i:i=h.slice(0,h.lastIndexOf("/")+1)+i);var m=i.match(/([^\/]+)$/)[1];q(b.href,b.type,function(a,g){if(!e&&l&&g&&(new Date(g)).valueOf()===(new Date(l.timestamp)).valueOf())p(l.css,b),c(null,null,a,b,{local:!0,remaining:f});else try{(new d.Parser({optimization:d.optimization,paths:[i.replace(/[\w\.-]+$/,"")],mime:b.type,filename:m})).parse(a,function(d,e){if(d)return u(d,i);try{c(d,e,a,b,{local:!1,lastModified:g,remaining:f}),s(document.getElementById("less-error-message:"+o(i)))}catch(d){u(d,i)}})}catch(h){u(h,i)}},function(a,b){throw new Error("Couldn't load "+b+" ("+a+")")})}function o(a){return a.replace(/^[a-z]+:\/\/?[^\/]+/,"").replace(/^\//,"").replace(/\?.*$/,"").replace(/\.[^\.\/]+$/,"").replace(/[^\.\w-]+/g,"-").replace(/\./g,":")}function p(a,b,c){var d,e=b.href?b.href.replace(/\?.*$/,""):"",f="less:"+(b.title||o(e));(d=document.getElementById(f))===null&&(d=document.createElement("style"),d.type="text/css",d.media=b.media||"screen",d.id=f,document.getElementsByTagName("head")[0].appendChild(d));if(d.styleSheet)try{d.styleSheet.cssText=a}catch(h){throw new Error("Couldn't reassign styleSheet.cssText.")}else(function(a){d.childNodes.length>0?d.firstChild.nodeValue!==a.nodeValue&&d.replaceChild(a,d.firstChild):d.appendChild(a)})(document.createTextNode(a));c&&g&&(t("saving "+e+" to cache."),g.setItem(e,a),g.setItem(e+":timestamp",c))}function q(a,b,c,e){function i(b,c,d){b.status>=200&&b.status<300?c(b.responseText,b.getResponseHeader("Last-Modified")):typeof d=="function"&&d(b.status,a)}var g=r(),h=f?!1:d.async;typeof g.overrideMimeType=="function"&&g.overrideMimeType("text/css"),g.open("GET",a,h),g.setRequestHeader("Accept",b||"text/x-less, text/css; q=0.9, */*; q=0.5"),g.send(null),f?g.status===0||g.status>=200&&g.status<300?c(g.responseText):e(g.status,a):h?g.onreadystatechange=function(){g.readyState==4&&i(g,c,e)}:i(g,c,e)}function r(){if(a.XMLHttpRequest)return new XMLHttpRequest;try{return new ActiveXObject("MSXML2.XMLHTTP.3.0")}catch(b){return t("browser doesn't support AJAX."),null}}function s(a){return a&&a.parentNode.removeChild(a)}function t(a){d.env=="development"&&typeof console!="undefined"&&console.log("less: "+a)}function u(a,b){var c="less-error-message:"+o(b),e='<li><label>{line}</label><pre class="{class}">{content}</pre></li>',f=document.createElement("div"),g,h,i=[],j=a.filename||b;f.id=c,f.className="less-error-message",h="<h3>"+(a.message||"There is an error in your .less file")+"</h3>"+'<p>in <a href="'+j+'">'+j+"</a> ";var k=function(a,b,c){a.extract[b]&&i.push(e.replace(/\{line\}/,parseInt(a.line)+(b-1)).replace(/\{class\}/,c).replace(/\{content\}/,a.extract[b]))};a.stack?h+="<br/>"+a.stack.split("\n").slice(1).join("<br/>"):a.extract&&(k(a,0,""),k(a,1,"line"),k(a,2,""),h+="on line "+a.line+", column "+(a.column+1)+":</p>"+"<ul>"+i.join("")+"</ul>"),f.innerHTML=h,p([".less-error-message ul, .less-error-message li {","list-style-type: none;","margin-right: 15px;","padding: 4px 0;","margin: 0;","}",".less-error-message label {","font-size: 12px;","margin-right: 15px;","padding: 4px 0;","color: #cc7777;","}",".less-error-message pre {","color: #dd6666;","padding: 4px 0;","margin: 0;","display: inline-block;","}",".less-error-message pre.line {","color: #ff0000;","}",".less-error-message h3 {","font-size: 20px;","font-weight: bold;","padding: 15px 0 5px 0;","margin: 0;","}",".less-error-message a {","color: #10a","}",".less-error-message .error {","color: red;","font-weight: bold;","padding-bottom: 2px;","border-bottom: 1px dashed red;","}"].join("\n"),{title:"error-message"}),f.style.cssText=["font-family: Arial, sans-serif","border: 1px solid #e00","background-color: #eee","border-radius: 5px","-webkit-border-radius: 5px","-moz-border-radius: 5px","color: #e00","padding: 15px","margin-bottom: 15px"].join(";"),d.env=="development"&&(g=setInterval(function(){document.body&&(document.getElementById(c)?document.body.replaceChild(f,document.getElementById(c)):document.body.insertBefore(f,document.body.firstChild),clearInterval(g))},10))}typeof define=="function"&&define.amd&&define("less",[],function(){return d}),Array.isArray||(Array.isArray=function(a){return Object.prototype.toString.call(a)==="[object Array]"||a instanceof Array}),Array.prototype.forEach||(Array.prototype.forEach=function(a,b){var c=this.length>>>0;for(var d=0;d<c;d++)d in this&&a.call(b,this[d],d,this)}),Array.prototype.map||(Array.prototype.map=function(a){var b=this.length>>>0,c=new Array(b),d=arguments[1];for(var e=0;e<b;e++)e in this&&(c[e]=a.call(d,this[e],e,this));return c}),Array.prototype.filter||(Array.prototype.filter=function(a){var b=[],c=arguments[1];for(var d=0;d<this.length;d++)a.call(c,this[d])&&b.push(this[d]);return b}),Array.prototype.reduce||(Array.prototype.reduce=function(a){var b=this.length>>>0,c=0;if(b===0&&arguments.length===1)throw new TypeError;if(arguments.length>=2)var d=arguments[1];else do{if(c in this){d=this[c++];break}if(++c>=b)throw new TypeError}while(!0);for(;c<b;c++)c in this&&(d=a.call(null,d,this[c],c,this));return d}),Array.prototype.indexOf||(Array.prototype.indexOf=function(a){var b=this.length,c=arguments[1]||0;if(!b)return-1;if(c>=b)return-1;c<0&&(c+=b);for(;c<b;c++){if(!Object.prototype.hasOwnProperty.call(this,c))continue;if(a===this[c])return c}return-1}),Object.keys||(Object.keys=function(a){var b=[];for(var c in a)Object.prototype.hasOwnProperty.call(a,c)&&b.push(c);return b}),String.prototype.trim||(String.prototype.trim=function(){return String(this).replace(/^\s\s*/,"").replace(/\s\s*$/,"")});var d,e;typeof environment=="object"&&{}.toString.call(environment)==="[object Environment]"?(typeof a=="undefined"?d={}:d=a.less={},e=d.tree={},d.mode="rhino"):typeof a=="undefined"?(d=exports,e=c("./tree"),d.mode="node"):(typeof a.less=="undefined"&&(a.less={}),d=a.less,e=a.less.tree={},d.mode="browser"),d.Parser=function v(a){function q(){h=k[g],i=f,l=f}function r(){k[g]=h,f=i,l=f}function s(){f>l&&(k[g]=k[g].slice(f-l),l=f)}function t(a){var c,d,e,h,i,j,n,o;if(a instanceof Function)return a.call(m.parsers);if(typeof a=="string")c=b.charAt(f)===a?a:null,e=1,s();else{s();if(c=a.exec(k[g]))e=c[0].length;else return null}if(c){o=f+=e,j=f+k[g].length-e;while(f<j){h=b.charCodeAt(f);if(h!==32&&h!==10&&h!==9)break;f++}return k[g]=k[g].slice(e+(f-o)),l=f,k[g].length===0&&g<k.length-1&&g++,typeof c=="string"?c:c.length===1?c[0]:c}}function u(a,c){var d=t(a);if(!d)v(c||(typeof a=="string"?"expected '"+a+"' got '"+b.charAt(f)+"'":"unexpected token"));else return d}function v(a,b){throw{index:f,type:b||"Syntax",message:a}}function w(a){return typeof a=="string"?b.charAt(f)===a:a.test(k[g])?!0:!1}function x(a){return d.mode==="node"?c("path").basename(a):a.match(/[^\/]+$/)[0]}function y(a,c){return a.filename&&c.filename&&a.filename!==c.filename?m.imports.contents[x(a.filename)]:b}function z(a,b){for(var c=a,d=-1;c>=0&&b.charAt(c)!=="\n";c--)d++;return{line:typeof a=="number"?(b.slice(0,a).match(/\n/g)||"").length:null,column:d}}function A(a,b){var c=y(a,b),d=z(a.index,c),e=d.line,f=d.column,g=c.split("\n");this.type=a.type||"Syntax",this.message=a.message,this.filename=a.filename||b.filename,this.index=a.index,this.line=typeof e=="number"?e+1:null,this.callLine=a.call&&z(a.call,c).line+1,this.callExtract=g[z(a.call,c).line],this.stack=a.stack,this.column=f,this.extract=[g[e-1],g[e],g[e+1]]}var b,f,g,h,i,j,k,l,m,n=this,o=function(){},p=this.imports={paths:a&&a.paths||[],queue:[],files:{},contents:{},mime:a&&a.mime,error:null,push:function(b,c){var e=this;this.queue.push(b),d.Parser.importer(b,this.paths,function(a,d,f){e.queue.splice(e.queue.indexOf(b),1),e.files[b]=d,e.contents[b]=f,a&&!e.error&&(e.error=a),c(a,d),e.queue.length===0&&o()},a)}};return this.env=a=a||{},this.optimization="optimization"in this.env?this.env.optimization:1,this.env.filename=this.env.filename||null,m={imports:p,parse:function(h,i){var n,p,q,r,s,u,v=[],w,x=null;f=g=l=j=0,b=h.replace(/\r\n/g,"\n"),k=function(c){var d=0,e=/[^"'`\{\}\/\(\)\\]+/g,f=/\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,g=/"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`\\\r\n]|\\.)*)`/g,h=0,i,j=c[0],k;for(var l=0,m,n;l<b.length;l++){e.lastIndex=l,(i=e.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0])),m=b.charAt(l),f.lastIndex=g.lastIndex=l,(i=g.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0]),m=b.charAt(l)),!k&&m==="/"&&(n=b.charAt(l+1),(n==="/"||n==="*")&&(i=f.exec(b))&&i.index===l&&(l+=i[0].length,j.push(i[0]),m=b.charAt(l)));switch(m){case"{":if(!k){h++,j.push(m);break};case"}":if(!k){h--,j.push(m),c[++d]=j=[];break};case"(":if(!k){k=!0,j.push(m);break};case")":if(k){k=!1,j.push(m);break};default:j.push(m)}}return h>0&&(x=new A({index:l,type:"Parse",message:"missing closing `}`",filename:a.filename},a)),c.map(function(a){return a.join("")})}([[]]);if(x)return i(x);try{n=new e.Ruleset([],t(this.parsers.primary)),n.root=!0}catch(y){return i(new A(y,a))}n.toCSS=function(b){var f,g,h;return function(f,g){var h=[],i;f=f||{},typeof g=="object"&&!Array.isArray(g)&&(g=Object.keys(g).map(function(a){var b=g[a];return b instanceof e.Value||(b instanceof e.Expression||(b=new e.Expression([b])),b=new e.Value([b])),new e.Rule("@"+a,b,!1,0)}),h=[new e.Ruleset(null,g)]);try{var j=b.call(this,{frames:h}).toCSS([],{compress:f.compress||!1})}catch(k){throw new A(k,a)}if(i=m.imports.error)throw i instanceof A?i:new A(i,a);return f.yuicompress&&d.mode==="node"?c("./cssmin").compressor.cssmin(j):f.compress?j.replace(/(\s)+/g,"$1"):j}}(n.eval);if(f<b.length-1){f=j,u=b.split("\n"),s=(b.slice(0,f).match(/\n/g)||"").length+1;for(var z=f,B=-1;z>=0&&b.charAt(z)!=="\n";z--)B++;x={type:"Parse",message:"Syntax Error on line "+s,index:f,filename:a.filename,line:s,column:B,extract:[u[s-2],u[s-1],u[s]]}}this.imports.queue.length>0?o=function(){i(x,n)}:i(x,n)},parsers:{primary:function(){var a,b=[];while((a=t(this.mixin.definition)||t(this.rule)||t(this.ruleset)||t(this.mixin.call)||t(this.comment)||t(this.directive))||t(/^[\s\n]+/))a&&b.push(a);return b},comment:function(){var a;if(b.charAt(f)!=="/")return;if(b.charAt(f+1)==="/")return new e.Comment(t(/^\/\/.*/),!0);if(a=t(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/))return new e.Comment(a)},entities:{quoted:function(){var a,c=f,d;b.charAt(c)==="~"&&(c++,d=!0);if(b.charAt(c)!=='"'&&b.charAt(c)!=="'")return;d&&t("~");if(a=t(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/))return new e.Quoted(a[0],a[1]||a[2],d)},keyword:function(){var a;if(a=t(/^[_A-Za-z-][_A-Za-z0-9-]*/))return e.colors.hasOwnProperty(a)?new e.Color(e.colors[a].slice(1)):new e.Keyword(a)},call:function(){var b,c,d=f;if(!(b=/^([\w-]+|%|progid:[\w\.]+)\(/.exec(k[g])))return;b=b[1].toLowerCase();if(b==="url")return null;f+=b.length;if(b==="alpha")return t(this.alpha);t("("),c=t(this.entities.arguments);if(!t(")"))return;if(b)return new e.Call(b,c,d,a.filename)},arguments:function(){var a=[],b;while(b=t(this.entities.assignment)||t(this.expression)){a.push(b);if(!t(","))break}return a},literal:function(){return t(this.entities.dimension)||t(this.entities.color)||t(this.entities.quoted)},assignment:function(){var a,b;if((a=t(/^\w+(?=\s?=)/i))&&t("=")&&(b=t(this.entity)))return new e.Assignment(a,b)},url:function(){var a;if(b.charAt(f)!=="u"||!t(/^url\(/))return;return a=t(this.entities.quoted)||t(this.entities.variable)||t(this.entities.dataURI)||t(/^[-\w%@$\/.&=:;#+?~]+/)||"",u(")"),new e.URL(a.value||a.data||a instanceof e.Variable?a:new e.Anonymous(a),p.paths)},dataURI:function(){var a;if(t(/^data:/)){a={},a.mime=t(/^[^\/]+\/[^,;)]+/)||"",a.charset=t(/^;\s*charset=[^,;)]+/)||"",a.base64=t(/^;\s*base64/)||"",a.data=t(/^,\s*[^)]+/);if(a.data)return a}},variable:function(){var c,d=f;if(b.charAt(f)==="@"&&(c=t(/^@@?[\w-]+/)))return new e.Variable(c,d,a.filename)},color:function(){var a;if(b.charAt(f)==="#"&&(a=t(/^#([a-fA-F0-9]{6}|[a-fA-F0-9]{3})/)))return new e.Color(a[1])},dimension:function(){var a,c=b.charCodeAt(f);if(c>57||c<45||c===47)return;if(a=t(/^(-?\d*\.?\d+)(px|%|em|rem|pc|ex|in|deg|s|ms|pt|cm|mm|rad|grad|turn)?/))return new e.Dimension(a[1],a[2])},javascript:function(){var a,c=f,d;b.charAt(c)==="~"&&(c++,d=!0);if(b.charAt(c)!=="`")return;d&&t("~");if(a=t(/^`([^`]*)`/))return new e.JavaScript(a[1],f,d)}},variable:function(){var a;if(b.charAt(f)==="@"&&(a=t(/^(@[\w-]+)\s*:/)))return a[1]},shorthand:function(){var a,b;if(!w(/^[@\w.%-]+\/[@\w.-]+/))return;if((a=t(this.entity))&&t("/")&&(b=t(this.entity)))return new e.Shorthand(a,b)},mixin:{call:function(){var c=[],d,g,h,i=f,j=b.charAt(f),k=!1;if(j!=="."&&j!=="#")return;while(d=t(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/))c.push(new e.Element(g,d,f)),g=t(">");t("(")&&(h=t(this.entities.arguments))&&t(")"),t(this.important)&&(k=!0);if(c.length>0&&(t(";")||w("}")))return new e.mixin.Call(c,h||[],i,a.filename,k)},definition:function(){var a,c=[],d,g,h,i,j,k=!1;if(b.charAt(f)!=="."&&b.charAt(f)!=="#"||w(/^[^{]*(;|})/))return;q();if(d=t(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)){a=d[1];do{if(b.charAt(f)==="."&&t(/^\.{3}/)){k=!0;break}if(!(h=t(this.entities.variable)||t(this.entities.literal)||t(this.entities.keyword)))break;if(h instanceof e.Variable)if(t(":"))i=u(this.expression,"expected expression"),c.push({name:h.name,value:i});else{if(t(/^\.{3}/)){c.push({name:h.name,variadic:!0}),k=!0;break}c.push({name:h.name})}else c.push({value:h})}while(t(","));u(")"),t(/^when/)&&(j=u(this.conditions,"expected condition")),g=t(this.block);if(g)return new e.mixin.Definition(a,c,g,j,k);r()}}},entity:function(){return t(this.entities.literal)||t(this.entities.variable)||t(this.entities.url)||t(this.entities.call)||t(this.entities.keyword)||t(this.entities.javascript)||t(this.comment)},end:function(){return t(";")||w("}")},alpha:function(){var a;if(!t(/^\(opacity=/i))return;if(a=t(/^\d+/)||t(this.entities.variable))return u(")"),new e.Alpha(a)},element:function(){var a,b,c,d;c=t(this.combinator),a=t(/^(?:\d+\.\d+|\d+)%/)||t(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/)||t("*")||t(this.attribute)||t(/^\([^)@]+\)/),a||t("(")&&(d=t(this.entities.variable))&&t(")")&&(a=new e.Paren(d));if(a)return new e.Element(c,a,f);if(c.value&&c.value.charAt(0)==="&")return new e.Element(c,null,f)},combinator:function(){var a,c=b.charAt(f);if(c===">"||c==="+"||c==="~"){f++;while(b.charAt(f)===" ")f++;return new e.Combinator(c)}if(c==="&"){a="&",f++,b.charAt(f)===" "&&(a="& ");while(b.charAt(f)===" ")f++;return new e.Combinator(a)}return b.charAt(f-1)===" "?new e.Combinator(" "):new e.Combinator(null)},selector:function(){var a,c,d=[],g,h;if(t("("))return a=t(this.entity),u(")"),new e.Selector([new e.Element("",a,f)]);while(c=t(this.element)){g=b.charAt(f),d.push(c);if(g==="{"||g==="}"||g===";"||g===",")break}if(d.length>0)return new e.Selector(d)},tag:function(){return t(/^[a-zA-Z][a-zA-Z-]*[0-9]?/)||t("*")},attribute:function(){var a="",b,c,d;if(!t("["))return;if(b=t(/^[a-zA-Z-]+/)||t(this.entities.quoted))(d=t(/^[|~*$^]?=/))&&(c=t(this.entities.quoted)||t(/^[\w-]+/))?a=[b,d,c.toCSS?c.toCSS():c].join(""):a=b;if(!t("]"))return;if(a)return"["+a+"]"},block:function(){var a;if(t("{")&&(a=t(this.primary))&&t("}"))return a},ruleset:function(){var b=[],c,d,g;q();while(c=t(this.selector)){b.push(c),t(this.comment);if(!t(","))break;t(this.comment)}if(b.length>0&&(d=t(this.block)))return new e.Ruleset(b,d,a.strictImports);j=f,r()},rule:function(){var a,c,d=b.charAt(f),h,l;q();if(d==="."||d==="#"||d==="&")return;if(a=t(this.variable)||t(this.property)){a.charAt(0)!="@"&&(l=/^([^@+\/'"*`(;{}-]*);/.exec(k[g]))?(f+=l[0].length-1,c=new e.Anonymous(l[1])):a==="font"?c=t(this.font):c=t(this.value),h=t(this.important);if(c&&t(this.end))return new e.Rule(a,c,h,i);j=f,r()}},"import":function(){var a,b,c=f;if(t(/^@import\s+/)&&(a=t(this.entities.quoted)||t(this.entities.url))){b=t(this.mediaFeatures);if(t(";"))return new e.Import(a,p,b,c)}},mediaFeature:function(){var a,b,c=[];do if(a=t(this.entities.keyword))c.push(a);else if(t("(")){b=t(this.property),a=t(this.entity);if(!t(")"))return null;if(b&&a)c.push(new e.Paren(new e.Rule(b,a,null,f,!0)));else if(a)c.push(new e.Paren(a));else return null}while(a);if(c.length>0)return new e.Expression(c)},mediaFeatures:function(){var a,b=[];do if(a=t(this.mediaFeature)){b.push(a);if(!t(","))break}else if(a=t(this.entities.variable)){b.push(a);if(!t(","))break}while(a);return b.length>0?b:null},media:function(){var a,b;if(t(/^@media/)){a=t(this.mediaFeatures);if(b=t(this.block))return new e.Media(b,a)}},directive:function(){var a,c,d,g,h,i;if(b.charAt(f)!=="@")return;if(c=t(this["import"])||t(this.media))return c;if(a=t(/^@page|@keyframes/)||t(/^@(?:-webkit-|-moz-|-o-|-ms-)[a-z0-9-]+/)){g=(t(/^[^{]+/)||"").trim();if(d=t(this.block))return new e.Directive(a+" "+g,d)}else if(a=t(/^@[-a-z]+/))if(a==="@font-face"){if(d=t(this.block))return new e.Directive(a,d)}else if((c=t(this.entity))&&t(";"))return new e.Directive(a,c)},font:function(){var a=[],b=[],c,d,f,g;while(g=t(this.shorthand)||t(this.entity))b.push(g);a.push(new e.Expression(b));if(t(","))while(g=t(this.expression)){a.push(g);if(!t(","))break}return new e.Value(a)},value:function(){var a,b=[],c;while(a=t(this.expression)){b.push(a);if(!t(","))break}if(b.length>0)return new e.Value(b)},important:function(){if(b.charAt(f)==="!")return t(/^! *important/)},sub:function(){var a;if(t("(")&&(a=t(this.expression))&&t(")"))return a},multiplication:function(){var a,b,c,d;if(a=t(this.operand)){while(!w(/^\/\*/)&&(c=t("/")||t("*"))&&(b=t(this.operand)))d=new e.Operation(c,[d||a,b]);return d||a}},addition:function(){var a,c,d,g;if(a=t(this.multiplication)){while((d=t(/^[-+]\s+/)||b.charAt(f-1)!=" "&&(t("+")||t("-")))&&(c=t(this.multiplication)))g=new e.Operation(d,[g||a,c]);return g||a}},conditions:function(){var a,b,c=f,d;if(a=t(this.condition)){while(t(",")&&(b=t(this.condition)))d=new e.Condition("or",d||a,b,c);return d||a}},condition:function(){var a,b,c,d,g=f,h=!1;t(/^not/)&&(h=!0),u("(");if(a=t(this.addition)||t(this.entities.keyword)||t(this.entities.quoted))return(d=t(/^(?:>=|=<|[<=>])/))?(b=t(this.addition)||t(this.entities.keyword)||t(this.entities.quoted))?c=new e.Condition(d,a,b,g,h):v("expected expression"):c=new e.Condition("=",a,new e.Keyword("true"),g,h),u(")"),t(/^and/)?new e.Condition("and",c,t(this.condition)):c},operand:function(){var a,c=b.charAt(f+1);b.charAt(f)==="-"&&(c==="@"||c==="(")&&(a=t("-"));var d=t(this.sub)||t(this.entities.dimension)||t(this.entities.color)||t(this.entities.variable)||t(this.entities.call);return a?new e.Operation("*",[new e.Dimension(-1),d]):d},expression:function(){var a,b,c=[],d;while(a=t(this.addition)||t(this.entity))c.push(a);if(c.length>0)return new e.Expression(c)},property:function(){var a;if(a=t(/^(\*?-?[-a-z_0-9]+)\s*:/))return a[1]}}}};if(d.mode==="browser"||d.mode==="rhino")d.Parser.importer=function(a,b,c,d){!/^([a-z]+:)?\//.test(a)&&b.length>0&&(a=b[0]+a),n({href:a,title:a,type:d.mime},function(e){e&&typeof d.errback=="function"?d.errback.call(null,a,b,c,d):c.apply(null,arguments)},!0)};(function(a){function b(b){return a.functions.hsla(b.h,b.s,b.l,b.a)}function c(b){if(b instanceof a.Dimension)return parseFloat(b.unit=="%"?b.value/100:b.value);if(typeof b=="number")return b;throw{error:"RuntimeError",message:"color functions take numbers as parameters"}}function d(a){return Math.min(1,Math.max(0,a))}a.functions={rgb:function(a,b,c){return this.rgba(a,b,c,1)},rgba:function(b,d,e,f){var g=[b,d,e].map(function(a){return c(a)}),f=c(f);return new a.Color(g,f)},hsl:function(a,b,c){return this.hsla(a,b,c,1)},hsla:function(a,b,d,e){function h(a){return a=a<0?a+1:a>1?a-1:a,a*6<1?g+(f-g)*a*6:a*2<1?f:a*3<2?g+(f-g)*(2/3-a)*6:g}a=c(a)%360/360,b=c(b),d=c(d),e=c(e);var f=d<=.5?d*(b+1):d+b-d*b,g=d*2-f;return this.rgba(h(a+1/3)*255,h(a)*255,h(a-1/3)*255,e)},hue:function(b){return new a.Dimension(Math.round(b.toHSL().h))},saturation:function(b){return new a.Dimension(Math.round(b.toHSL().s*100),"%")},lightness:function(b){return new a.Dimension(Math.round(b.toHSL().l*100),"%")},alpha:function(b){return new a.Dimension(b.toHSL().a)},saturate:function(a,c){var e=a.toHSL();return e.s+=c.value/100,e.s=d(e.s),b(e)},desaturate:function(a,c){var e=a.toHSL();return e.s-=c.value/100,e.s=d(e.s),b(e)},lighten:function(a,c){var e=a.toHSL();return e.l+=c.value/100,e.l=d(e.l),b(e)},darken:function(a,c){var e=a.toHSL();return e.l-=c.value/100,e.l=d(e.l),b(e)},fadein:function(a,c){var e=a.toHSL();return e.a+=c.value/100,e.a=d(e.a),b(e)},fadeout:function(a,c){var e=a.toHSL();return e.a-=c.value/100,e.a=d(e.a),b(e)},fade:function(a,c){var e=a.toHSL();return e.a=c.value/100,e.a=d(e.a),b(e)},spin:function(a,c){var d=a.toHSL(),e=(d.h+c.value)%360;return d.h=e<0?360+e:e,b(d)},mix:function(b,c,d){var e=d.value/100,f=e*2-1,g=b.toHSL().a-c.toHSL().a,h=((f*g==-1?f:(f+g)/(1+f*g))+1)/2,i=1-h,j=[b.rgb[0]*h+c.rgb[0]*i,b.rgb[1]*h+c.rgb[1]*i,b.rgb[2]*h+c.rgb[2]*i],k=b.alpha*e+c.alpha*(1-e);return new a.Color(j,k)},greyscale:function(b){return this.desaturate(b,new a.Dimension(100))},e:function(b){return new a.Anonymous(b instanceof a.JavaScript?b.evaluated:b)},escape:function(b){return new a.Anonymous(encodeURI(b.value).replace(/=/g,"%3D").replace(/:/g,"%3A").replace(/#/g,"%23").replace(/;/g,"%3B").replace(/\(/g,"%28").replace(/\)/g,"%29"))},"%":function(b){var c=Array.prototype.slice.call(arguments,1),d=b.value;for(var e=0;e<c.length;e++)d=d.replace(/%[sda]/i,function(a){var b=a.match(/s/i)?c[e].value:c[e].toCSS();return a.match(/[A-Z]$/)?encodeURIComponent(b):b});return d=d.replace(/%%/g,"%"),new a.Quoted('"'+d+'"',d)},round:function(a){return this._math("round",a)},ceil:function(a){return this._math("ceil",a)},floor:function(a){return this._math("floor",a)},_math:function(b,d){if(d instanceof a.Dimension)return new a.Dimension(Math[b](c(d)),d.unit);if(typeof d=="number")return Math[b](d);throw{type:"Argument",message:"argument must be a number"}},argb:function(b){return new a.Anonymous(b.toARGB())},percentage:function(b){return new a.Dimension(b.value*100,"%")},color:function(b){if(b instanceof a.Quoted)return new a.Color(b.value.slice(1));throw{type:"Argument",message:"argument must be a string"}},iscolor:function(b){return this._isa(b,a.Color)},isnumber:function(b){return this._isa(b,a.Dimension)},isstring:function(b){return this._isa(b,a.Quoted)},iskeyword:function(b){return this._isa(b,a.Keyword)},isurl:function(b){return this._isa(b,a.URL)},ispixel:function(b){return b instanceof a.Dimension&&b.unit==="px"?a.True:a.False},ispercentage:function(b){return b instanceof a.Dimension&&b.unit==="%"?a.True:a.False},isem:function(b){return b instanceof a.Dimension&&b.unit==="em"?a.True:a.False},_isa:function(b,c){return b instanceof c?a.True:a.False}}})(c("./tree")),function(a){a.colors={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgrey:"#a9a9a9",darkgreen:"#006400",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",grey:"#808080",green:"#008000",greenyellow:"#adff2f",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgrey:"#d3d3d3",lightgreen:"#90ee90",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370d8",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#d87093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"}}(c("./tree")),function(a){a.Alpha=function(a){this.value=a},a.Alpha.prototype={toCSS:function(){return"alpha(opacity="+(this.value.toCSS?this.value.toCSS():this.value)+")"},eval:function(a){return this.value.eval&&(this.value=this.value.eval(a)),this}}}(c("../tree")),function(a){a.Anonymous=function(a){this.value=a.value||a},a.Anonymous.prototype={toCSS:function(){return this.value},eval:function(){return this}}}(c("../tree")),function(a){a.Assignment=function(a,b){this.key=a,this.value=b},a.Assignment.prototype={toCSS:function(){return this.key+"="+(this.value.toCSS?this.value.toCSS():this.value)},eval:function(a){return this.value.eval&&(this.value=this.value.eval(a)),this}}}(c("../tree")),function(a){a.Call=function(a,b,c,d){this.name=a,this.args=b,this.index=c,this.filename=d},a.Call.prototype={eval:function(b){var c=this.args.map(function(a){return a.eval(b)});if(!(this.name in a.functions))return new a.Anonymous(this.name+"("+c.map(function(a){return a.toCSS()}).join(", ")+")");try{return a.functions[this.name].apply(a.functions,c)}catch(d){throw{type:d.type||"Runtime",message:"error evaluating function `"+this.name+"`"+(d.message?": "+d.message:""),index:this.index,filename:this.filename}}},toCSS:function(a){return this.eval(a).toCSS()}}}(c("../tree")),function(a){a.Color=function(a,b){Array.isArray(a)?this.rgb=a:a.length==6?this.rgb=a.match(/.{2}/g).map(function(a){return parseInt(a,16)}):this.rgb=a.split("").map(function(a){return parseInt(a+a,16)}),this.alpha=typeof b=="number"?b:1},a.Color.prototype={eval:function(){return this},toCSS:function(){return this.alpha<1?"rgba("+this.rgb.map(function(a){return Math.round(a)}).concat(this.alpha).join(", ")+")":"#"+this.rgb.map(function(a){return a=Math.round(a),a=(a>255?255:a<0?0:a).toString(16),a.length===1?"0"+a:a}).join("")},operate:function(b,c){var d=[];c instanceof a.Color||(c=c.toColor());for(var e=0;e<3;e++)d[e]=a.operate(b,this.rgb[e],c.rgb[e]);return new a.Color(d,this.alpha+c.alpha)},toHSL:function(){var a=this.rgb[0]/255,b=this.rgb[1]/255,c=this.rgb[2]/255,d=this.alpha,e=Math.max(a,b,c),f=Math.min(a,b,c),g,h,i=(e+f)/2,j=e-f;if(e===f)g=h=0;else{h=i>.5?j/(2-e-f):j/(e+f);switch(e){case a:g=(b-c)/j+(b<c?6:0);break;case b:g=(c-a)/j+2;break;case c:g=(a-b)/j+4}g/=6}return{h:g*360,s:h,l:i,a:d}},toARGB:function(){var a=[Math.round(this.alpha*255)].concat(this.rgb);return"#"+a.map(function(a){return a=Math.round(a),a=(a>255?255:a<0?0:a).toString(16),a.length===1?"0"+a:a}).join("")}}}(c("../tree")),function(a){a.Comment=function(a,b){this.value=a,this.silent=!!b},a.Comment.prototype={toCSS:function(a){return a.compress?"":this.value},eval:function(){return this}}}(c("../tree")),function(a){a.Condition=function(a,b,c,d,e){this.op=a.trim(),this.lvalue=b,this.rvalue=c,this.index=d,this.negate=e},a.Condition.prototype.eval=function(a){var b=this.lvalue.eval(a),c=this.rvalue.eval(a),d=this.index,e,e=function(a){switch(a){case"and":return b&&c;case"or":return b||c;default:if(b.compare)e=b.compare(c);else if(c.compare)e=c.compare(b);else throw{type:"Type",message:"Unable to perform comparison",index:d};switch(e){case-1:return a==="<"||a==="=<";case 0:return a==="="||a===">="||a==="=<";case 1:return a===">"||a===">="}}}(this.op);return this.negate?!e:e}}(c("../tree")),function(a){a.Dimension=function(a,b){this.value=parseFloat(a),this.unit=b||null},a.Dimension.prototype={eval:function(){return this},toColor:function(){return new a.Color([this.value,this.value,this.value])},toCSS:function(){var a=this.value+this.unit;return a},operate:function(b,c){return new a.Dimension(a.operate(b,this.value,c.value),this.unit||c.unit)},compare:function(b){return b instanceof a.Dimension?b.value>this.value?-1:b.value<this.value?1:0:-1}}}(c("../tree")),function(a){a.Directive=function(b,c,d){this.name=b,Array.isArray(c)?(this.ruleset=new a.Ruleset([],c),this.ruleset.allowImports=!0):this.value=c},a.Directive.prototype={toCSS:function(a,b){return this.ruleset?(this.ruleset.root=!0,this.name+(b.compress?"{":" {\n  ")+this.ruleset.toCSS(a,b).trim().replace(/\n/g,"\n  ")+(b.compress?"}":"\n}\n")):this.name+" "+this.value.toCSS()+";\n"},eval:function(a){return a.frames.unshift(this),this.ruleset=this.ruleset&&this.ruleset.eval(a),a.frames.shift(),this},variable:function(b){return a.Ruleset.prototype.variable.call(this.ruleset,b)},find:function(){return a.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return a.Ruleset.prototype.rulesets.apply(this.ruleset)}}}(c("../tree")),function(a){a.Element=function(b,c,d){this.combinator=b instanceof a.Combinator?b:new a.Combinator(b),typeof c=="string"?this.value=c.trim():c?this.value=c:this.value="",this.index=d},a.Element.prototype.eval=function(b){return new a.Element(this.combinator,this.value.eval?this.value.eval(b):this.value,this.index)},a.Element.prototype.toCSS=function(a){return this.combinator.toCSS(a||{})+(this.value.toCSS?this.value.toCSS(a):this.value)},a.Combinator=function(a){a===" "?this.value=" ":a==="& "?this.value="& ":this.value=a?a.trim():""},a.Combinator.prototype.toCSS=function(a){return{"":""," ":" ","&":"","& ":" ",":":" :","+":a.compress?"+":" + ","~":a.compress?"~":" ~ ",">":a.compress?">":" > "}[this.value]}}(c("../tree")),function(a){a.Expression=function(a){this.value=a},a.Expression.prototype={eval:function(b){return this.value.length>1?new a.Expression(this.value.map(function(a){return a.eval(b)})):this.value.length===1?this.value[0].eval(b):this},toCSS:function(a){return this.value.map(function(b){return b.toCSS?b.toCSS(a):""}).join(" ")}}}(c("../tree")),function(a){a.Import=function(b,c,d,e){var f=this;this.index=e,this._path=b,this.features=d&&new a.Value(d),b instanceof a.Quoted?this.path=/\.(le?|c)ss(\?.*)?$/.test(b.value)?b.value:b.value+".less":this.path=b.value.value||b.value,this.css=/css(\?.*)?$/.test(this.path),this.css||c.push(this.path,function(b,c){b&&(b.index=e),f.root=c||new a.Ruleset([],[])})},a.Import.prototype={toCSS:function(a){var b=this.features?" "+this.features.toCSS(a):"";return this.css?"@import "+this._path.toCSS()+b+";\n":""},eval:function(b){var c,d=this.features&&this.features.eval(b);if(this.css)return this;c=new a.Ruleset([],this.root.rules.slice(0));for(var e=0;e<c.rules.length;e++)c.rules[e]instanceof a.Import&&Array.prototype
+.splice.apply(c.rules,[e,1].concat(c.rules[e].eval(b)));return this.features?new a.Media(c.rules,this.features.value):c.rules}}}(c("../tree")),function(a){a.JavaScript=function(a,b,c){this.escaped=c,this.expression=a,this.index=b},a.JavaScript.prototype={eval:function(b){var c,d=this,e={},f=this.expression.replace(/@\{([\w-]+)\}/g,function(c,e){return a.jsify((new a.Variable("@"+e,d.index)).eval(b))});try{f=new Function("return ("+f+")")}catch(g){throw{message:"JavaScript evaluation error: `"+f+"`",index:this.index}}for(var h in b.frames[0].variables())e[h.slice(1)]={value:b.frames[0].variables()[h].value,toJS:function(){return this.value.eval(b).toCSS()}};try{c=f.call(e)}catch(g){throw{message:"JavaScript evaluation error: '"+g.name+": "+g.message+"'",index:this.index}}return typeof c=="string"?new a.Quoted('"'+c+'"',c,this.escaped,this.index):Array.isArray(c)?new a.Anonymous(c.join(", ")):new a.Anonymous(c)}}}(c("../tree")),function(a){a.Keyword=function(a){this.value=a},a.Keyword.prototype={eval:function(){return this},toCSS:function(){return this.value},compare:function(b){return b instanceof a.Keyword?b.value===this.value?0:1:-1}},a.True=new a.Keyword("true"),a.False=new a.Keyword("false")}(c("../tree")),function(a){a.Media=function(b,c){var d=new a.Element("&",null,0),e=[new a.Selector([d])];this.features=new a.Value(c),this.ruleset=new a.Ruleset(e,b),this.ruleset.allowImports=!0},a.Media.prototype={toCSS:function(a,b){var c=this.features.toCSS(b);return this.ruleset.root=a.length===0||a[0].multiMedia,"@media "+c+(b.compress?"{":" {\n  ")+this.ruleset.toCSS(a,b).trim().replace(/\n/g,"\n  ")+(b.compress?"}":"\n}\n")},eval:function(b){b.mediaBlocks||(b.mediaBlocks=[],b.mediaPath=[]);var c=b.mediaBlocks.length;b.mediaPath.push(this),b.mediaBlocks.push(this);var d=new a.Media([],[]);return d.features=this.features.eval(b),b.frames.unshift(this.ruleset),d.ruleset=this.ruleset.eval(b),b.frames.shift(),b.mediaBlocks[c]=d,b.mediaPath.pop(),b.mediaPath.length===0?d.evalTop(b):d.evalNested(b)},variable:function(b){return a.Ruleset.prototype.variable.call(this.ruleset,b)},find:function(){return a.Ruleset.prototype.find.apply(this.ruleset,arguments)},rulesets:function(){return a.Ruleset.prototype.rulesets.apply(this.ruleset)},evalTop:function(b){var c=this;if(b.mediaBlocks.length>1){var d=new a.Element("&",null,0),e=[new a.Selector([d])];c=new a.Ruleset(e,b.mediaBlocks),c.multiMedia=!0}return delete b.mediaBlocks,delete b.mediaPath,c},evalNested:function(b){var c,d,e=b.mediaPath.concat([this]);for(c=0;c<e.length;c++)d=e[c].features instanceof a.Value?e[c].features.value:e[c].features,e[c]=Array.isArray(d)?d:[d];return this.features=new a.Value(this.permute(e).map(function(b){b=b.map(function(b){return b.toCSS?b:new a.Anonymous(b)});for(c=b.length-1;c>0;c--)b.splice(c,0,new a.Anonymous("and"));return new a.Expression(b)})),new a.Ruleset([],[])},permute:function(a){if(a.length===0)return[];if(a.length===1)return a[0];var b=[],c=this.permute(a.slice(1));for(var d=0;d<c.length;d++)for(var e=0;e<a[0].length;e++)b.push([a[0][e]].concat(c[d]));return b}}}(c("../tree")),function(a){a.mixin={},a.mixin.Call=function(b,c,d,e,f){this.selector=new a.Selector(b),this.arguments=c,this.index=d,this.filename=e,this.important=f},a.mixin.Call.prototype={eval:function(a){var b,c,d=[],e=!1;for(var f=0;f<a.frames.length;f++)if((b=a.frames[f].find(this.selector)).length>0){c=this.arguments&&this.arguments.map(function(b){return b.eval(a)});for(var g=0;g<b.length;g++)if(b[g].match(c,a))try{Array.prototype.push.apply(d,b[g].eval(a,this.arguments,this.important).rules),e=!0}catch(h){throw{message:h.message,index:this.index,filename:this.filename,stack:h.stack}}if(e)return d;throw{type:"Runtime",message:"No matching definition was found for `"+this.selector.toCSS().trim()+"("+this.arguments.map(function(a){return a.toCSS()}).join(", ")+")`",index:this.index,filename:this.filename}}throw{type:"Name",message:this.selector.toCSS().trim()+" is undefined",index:this.index,filename:this.filename}}},a.mixin.Definition=function(b,c,d,e,f){this.name=b,this.selectors=[new a.Selector([new a.Element(null,b)])],this.params=c,this.condition=e,this.variadic=f,this.arity=c.length,this.rules=d,this._lookups={},this.required=c.reduce(function(a,b){return!b.name||b.name&&!b.value?a+1:a},0),this.parent=a.Ruleset.prototype,this.frames=[]},a.mixin.Definition.prototype={toCSS:function(){return""},variable:function(a){return this.parent.variable.call(this,a)},variables:function(){return this.parent.variables.call(this)},find:function(){return this.parent.find.apply(this,arguments)},rulesets:function(){return this.parent.rulesets.apply(this)},evalParams:function(b,c){var d=new a.Ruleset(null,[]),e;for(var f=0,g,h;f<this.params.length;f++)if(h=this.params[f].name)if(this.params[f].variadic&&c){e=[];for(var i=f;i<c.length;i++)e.push(c[i].eval(b));d.rules.unshift(new a.Rule(h,(new a.Expression(e)).eval(b)))}else if(g=c&&c[f]||this.params[f].value)d.rules.unshift(new a.Rule(h,g.eval(b)));else throw{type:"Runtime",message:"wrong number of arguments for "+this.name+" ("+c.length+" for "+this.arity+")"};return d},eval:function(b,c,d){var e=this.evalParams(b,c),f,g=[],h,i;for(var j=0;j<Math.max(this.params.length,c&&c.length);j++)g.push(c[j]||this.params[j].value);return e.rules.unshift(new a.Rule("@arguments",(new a.Expression(g)).eval(b))),h=d?this.rules.map(function(b){return new a.Rule(b.name,b.value,"!important",b.index)}):this.rules.slice(0),(new a.Ruleset(null,h)).eval({frames:[this,e].concat(this.frames,b.frames)})},match:function(a,b){var c=a&&a.length||0,d,e;if(!this.variadic){if(c<this.required)return!1;if(c>this.params.length)return!1;if(this.required>0&&c>this.params.length)return!1}if(this.condition&&!this.condition.eval({frames:[this.evalParams(b,a)].concat(b.frames)}))return!1;d=Math.min(c,this.arity);for(var f=0;f<d;f++)if(!this.params[f].name&&a[f].eval(b).toCSS()!=this.params[f].value.eval(b).toCSS())return!1;return!0}}}(c("../tree")),function(a){a.Operation=function(a,b){this.op=a.trim(),this.operands=b},a.Operation.prototype.eval=function(b){var c=this.operands[0].eval(b),d=this.operands[1].eval(b),e;if(c instanceof a.Dimension&&d instanceof a.Color)if(this.op==="*"||this.op==="+")e=d,d=c,c=e;else throw{name:"OperationError",message:"Can't substract or divide a color from a number"};return c.operate(this.op,d)},a.operate=function(a,b,c){switch(a){case"+":return b+c;case"-":return b-c;case"*":return b*c;case"/":return b/c}}}(c("../tree")),function(a){a.Paren=function(a){this.value=a},a.Paren.prototype={toCSS:function(a){return"("+this.value.toCSS(a)+")"},eval:function(b){return new a.Paren(this.value.eval(b))}}}(c("../tree")),function(a){a.Quoted=function(a,b,c,d){this.escaped=c,this.value=b||"",this.quote=a.charAt(0),this.index=d},a.Quoted.prototype={toCSS:function(){return this.escaped?this.value:this.quote+this.value+this.quote},eval:function(b){var c=this,d=this.value.replace(/`([^`]+)`/g,function(d,e){return(new a.JavaScript(e,c.index,!0)).eval(b).value}).replace(/@\{([\w-]+)\}/g,function(d,e){var f=(new a.Variable("@"+e,c.index)).eval(b);return"value"in f?f.value:f.toCSS()});return new a.Quoted(this.quote+d+this.quote,d,this.escaped,this.index)}}}(c("../tree")),function(a){a.Rule=function(b,c,d,e,f){this.name=b,this.value=c instanceof a.Value?c:new a.Value([c]),this.important=d?" "+d.trim():"",this.index=e,this.inline=f||!1,b.charAt(0)==="@"?this.variable=!0:this.variable=!1},a.Rule.prototype.toCSS=function(a){return this.variable?"":this.name+(a.compress?":":": ")+this.value.toCSS(a)+this.important+(this.inline?"":";")},a.Rule.prototype.eval=function(b){return new a.Rule(this.name,this.value.eval(b),this.important,this.index,this.inline)},a.Shorthand=function(a,b){this.a=a,this.b=b},a.Shorthand.prototype={toCSS:function(a){return this.a.toCSS(a)+"/"+this.b.toCSS(a)},eval:function(){return this}}}(c("../tree")),function(a){a.Ruleset=function(a,b,c){this.selectors=a,this.rules=b,this._lookups={},this.strictImports=c},a.Ruleset.prototype={eval:function(b){var c=this.selectors&&this.selectors.map(function(a){return a.eval(b)}),d=new a.Ruleset(c,this.rules.slice(0),this.strictImports);d.root=this.root,d.allowImports=this.allowImports,b.frames.unshift(d);if(d.root||d.allowImports||!d.strictImports)for(var e=0;e<d.rules.length;e++)d.rules[e]instanceof a.Import&&Array.prototype.splice.apply(d.rules,[e,1].concat(d.rules[e].eval(b)));for(var e=0;e<d.rules.length;e++)d.rules[e]instanceof a.mixin.Definition&&(d.rules[e].frames=b.frames.slice(0));for(var e=0;e<d.rules.length;e++)d.rules[e]instanceof a.mixin.Call&&Array.prototype.splice.apply(d.rules,[e,1].concat(d.rules[e].eval(b)));for(var e=0,f;e<d.rules.length;e++)f=d.rules[e],f instanceof a.mixin.Definition||(d.rules[e]=f.eval?f.eval(b):f);return b.frames.shift(),d},match:function(a){return!a||a.length===0},variables:function(){return this._variables?this._variables:this._variables=this.rules.reduce(function(b,c){return c instanceof a.Rule&&c.variable===!0&&(b[c.name]=c),b},{})},variable:function(a){return this.variables()[a]},rulesets:function(){return this._rulesets?this._rulesets:this._rulesets=this.rules.filter(function(b){return b instanceof a.Ruleset||b instanceof a.mixin.Definition})},find:function(b,c){c=c||this;var d=[],e,f,g=b.toCSS();return g in this._lookups?this._lookups[g]:(this.rulesets().forEach(function(e){if(e!==c)for(var g=0;g<e.selectors.length;g++)if(f=b.match(e.selectors[g])){b.elements.length>e.selectors[g].elements.length?Array.prototype.push.apply(d,e.find(new a.Selector(b.elements.slice(1)),c)):d.push(e);break}}),this._lookups[g]=d)},toCSS:function(b,c){var d=[],e=[],f=[],g=[],h,i;this.root||(b.length===0?g=this.selectors.map(function(a){return[a]}):this.joinSelectors(g,b,this.selectors));for(var j=0;j<this.rules.length;j++)i=this.rules[j],i.rules||i instanceof a.Directive||i instanceof a.Media?f.push(i.toCSS(g,c)):i instanceof a.Comment?i.silent||(this.root?f.push(i.toCSS(c)):e.push(i.toCSS(c))):i.toCSS&&!i.variable?e.push(i.toCSS(c)):i.value&&!i.variable&&e.push(i.value.toString());return f=f.join(""),this.root?d.push(e.join(c.compress?"":"\n")):e.length>0&&(h=g.map(function(a){return a.map(function(a){return a.toCSS(c)}).join("").trim()}).join(c.compress?",":",\n"),d.push(h,(c.compress?"{":" {\n  ")+e.join(c.compress?"":"\n  ")+(c.compress?"}":"\n}\n"))),d.push(f),d.join("")+(c.compress?"\n":"")},joinSelectors:function(a,b,c){for(var d=0;d<c.length;d++)this.joinSelector(a,b,c[d])},joinSelector:function(b,c,d){var e=[],f=[],g=[],h=[],i=!1,j;for(var k=0;k<d.elements.length;k++)j=d.elements[k],j.combinator.value.charAt(0)==="&"&&(i=!0),i?h.push(j):g.push(j);i||(h=g,g=[]),g.length>0&&e.push(new a.Selector(g)),h.length>0&&f.push(new a.Selector(h));for(var l=0;l<c.length;l++)b.push(e.concat(c[l]).concat(f))}}}(c("../tree")),function(a){a.Selector=function(a){this.elements=a,this.elements[0].combinator.value===""&&(this.elements[0].combinator.value=" ")},a.Selector.prototype.match=function(a){var b=this.elements.length,c=a.elements.length,d=Math.min(b,c);if(b<c)return!1;for(var e=0;e<d;e++)if(this.elements[e].value!==a.elements[e].value)return!1;return!0},a.Selector.prototype.eval=function(b){return new a.Selector(this.elements.map(function(a){return a.eval(b)}))},a.Selector.prototype.toCSS=function(a){return this._css?this._css:this._css=this.elements.map(function(b){return typeof b=="string"?" "+b.trim():b.toCSS(a)}).join("")}}(c("../tree")),function(b){b.URL=function(b,c){b.data?this.attrs=b:(typeof a!="undefined"&&!/^(?:https?:\/\/|file:\/\/|data:|\/)/.test(b.value)&&c.length>0&&(b.value=c[0]+(b.value.charAt(0)==="/"?b.value.slice(1):b.value)),this.value=b,this.paths=c)},b.URL.prototype={toCSS:function(){return"url("+(this.attrs?"data:"+this.attrs.mime+this.attrs.charset+this.attrs.base64+this.attrs.data:this.value.toCSS())+")"},eval:function(a){return this.attrs?this:new b.URL(this.value.eval(a),this.paths)}}}(c("../tree")),function(a){a.Value=function(a){this.value=a,this.is="value"},a.Value.prototype={eval:function(b){return this.value.length===1?this.value[0].eval(b):new a.Value(this.value.map(function(a){return a.eval(b)}))},toCSS:function(a){return this.value.map(function(b){return b.toCSS(a)}).join(a.compress?",":", ")}}}(c("../tree")),function(a){a.Variable=function(a,b,c){this.name=a,this.index=b,this.file=c},a.Variable.prototype={eval:function(b){var c,d,e=this.name;e.indexOf("@@")==0&&(e="@"+(new a.Variable(e.slice(1))).eval(b).value);if(c=a.find(b.frames,function(a){if(d=a.variable(e))return d.value.eval(b)}))return c;throw{type:"Name",message:"variable "+e+" is undefined",filename:this.file,index:this.index}}}}(c("../tree")),function(a){a.find=function(a,b){for(var c=0,d;c<a.length;c++)if(d=b.call(a,a[c]))return d;return null},a.jsify=function(a){return Array.isArray(a.value)&&a.value.length>1?"["+a.value.map(function(a){return a.toCSS(!1)}).join(", ")+"]":a.toCSS(!1)}}(c("./tree"));var f=location.protocol==="file:"||location.protocol==="chrome:"||location.protocol==="chrome-extension:"||location.protocol==="resource:";d.env=d.env||(location.hostname=="127.0.0.1"||location.hostname=="0.0.0.0"||location.hostname=="localhost"||location.port.length>0||f?"development":"production"),d.async=!1,d.poll=d.poll||(f?1e3:1500),d.watch=function(){return this.watchMode=!0},d.unwatch=function(){return this.watchMode=!1},d.env==="development"?(d.optimization=0,/!watch/.test(location.hash)&&d.watch(),d.watchTimer=setInterval(function(){d.watchMode&&m(function(a,b,c,d,e){b&&p(b.toCSS(),d,e.lastModified)})},d.poll)):d.optimization=3;var g;try{g=typeof a.localStorage=="undefined"?null:a.localStorage}catch(h){g=null}var i=document.getElementsByTagName("link"),j=/^text\/(x-)?less$/;d.sheets=[];for(var k=0;k<i.length;k++)(i[k].rel==="stylesheet/less"||i[k].rel.match(/stylesheet/)&&i[k].type.match(j))&&d.sheets.push(i[k]);d.refresh=function(a){var b,c;b=c=new Date,m(function(a,d,e,f,g){g.local?t("loading "+f.href+" from cache."):(t("parsed "+f.href+" successfully."),p(d.toCSS(),f,g.lastModified)),t("css for "+f.href+" generated in "+(new Date-c)+"ms"),g.remaining===0&&t("css generated in "+(new Date-b)+"ms"),c=new Date},a),l()},d.refreshStyles=l,d.refresh(d.env==="development")})(window);
\ No newline at end of file
diff --git a/less/.DS_Store b/less/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5e315d49ee6abeb3afd499c060fde6f2a46af78e
GIT binary patch
literal 15364
zcmeHMOHLa>5UmDB!XFG`5rt$kOR_M6ECTE-L?UIIY_g1v`B*ZHWg7xJFLQ((AxFs~
z2gng}i{!nU7U{O>31Sh2sM_kO@wi`Azt=TA(`^xP`xm`!kxWFEP-#~iINVbBJL_Co
z@K>J0I^ab{(v!aAaxR;5t?hy-U<#N5rhqA63j7NS;F-;`R4=R@O#xHD6u41<^FxM8
z+xB)^Se-g>&?NwD1(&tp9P0qZWZt&DofcN1@L8-LoQFEU#Bc>1zh`U?+xB)^*a9xD
zfQ$2yonN6ijSgI<&Be6~Ye!SS6qr|lYxkyf<Pe`cTE7qENX9aLGsq9SgS?A&ytQ7V
zZv51OGm$#5Y&nt%T5sz4JnGvFswrJW%M~*Lwj;w7*1es<t^zwk#18fv4smuNXSkA#
z?Y__8*U<U`kte!O(UKGR$Z=(u_Mxml2do>Bk7R5i?+~|)9(R1aF*poLS%=6PkOTCS
zsD#SOG{jVOOnYerdAX&4*SaFkpau7Ej!-AkLXXd}t8)fB@w+>vj3bXtj1u)7!shZ3
zo|0IHk&du6IR<8g$Y~5lH^NkPJo|{2P)Rvo1)Q653a0F13t2#>lOz`7=|b!p#-xK>
z;7E>v@8VkzJ>Z>_h_5U|9}V?!jrh#UG>%L|Tphaf<qEY#Q)T-jU`tevKJu<j#$w*O
z7<CTBrScn<G7C{v^o*!v9A<13r-nS~sD8;PWVG-;V6@^f)ZurACe$ah2)(Si&V0Yr
zEJ*hi*%=|%fMnKi{?M7ykN>EgZ{(xqu}392N4{SJzE3@-xJSnrfA+j3+wwxT@EIZ}
zTACZ&g}rqar|yx@^@PtIc_}+L9y{=y@Tj_my?j>Uao2m?gYP{(Pk43IJoNfF;q?yL
z$-G(I4RlO#=3Ur_Zkz}DWp^?;M;=#h?Oh4C2)&BD;nU$*XT1ULQD*c>N^y>1gl_=P
zjAXw{<{#DJOQ1s??Ky`PnUd(Oat%?Bd=$)B@f!liY%y%Pf|jS4+xV2`I8od5T}D<R
zx&bub6b7(;@Jsa%qg#0ru&Sc{HQFbimShwmnmYg9Y2?Xq273u+)c%i3a@-<p4NpZr
zKT1^Lm{mRn?C@G)#S}0FOaW8C6u74Xiv=#@{{O4=|Nr;&ZZK286nF><xXQu1gMIYW
z@2$`EnS1RS>IYO7wwo4KAvoxEJgjcV;|sUrH&EGji<SlFZEvTA#TAsl{%3%`N^59a
z|5Jw4TG-bAWh?0iz5dtiw}UBQ3YY?>fGJ=Km;$DNDPRhi0;Yf|U<#N5rhqA63jCJ}
F`~q`rUS|LR

literal 0
HcmV?d00001

diff --git a/less/._.DS_Store b/less/._.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8ac37fc9adc12c023d85488dfaf3036e73962005
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIk*Y|peR=07!nd>
zJ?rFuhz^DdtcpejM?+vV1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONfXX4j2s96b
z!9Xq~BePhcD784hv?w`MAuYcsTOl*ABsH%jGe0jeC#O;&CpE1^At@&@FB{m^h3Xp8
P6srH>UXfvt`~M#R%-A0@

literal 0
HcmV?d00001

diff --git a/less/._accordion.less b/less/._accordion.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._alerts.less b/less/._alerts.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._bootstrap.less b/less/._bootstrap.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._breadcrumbs.less b/less/._breadcrumbs.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._button-groups.less b/less/._button-groups.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._buttons.less b/less/._buttons.less
new file mode 100644
index 0000000000000000000000000000000000000000..cfd1d53fdf9a9cb987ec793f9ec25f80fbaf20e9
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=G(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E01UM_h5!Hn

literal 0
HcmV?d00001

diff --git a/less/._carousel.less b/less/._carousel.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._close.less b/less/._close.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._code.less b/less/._code.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._component-animations.less b/less/._component-animations.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._dropdowns.less b/less/._dropdowns.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._forms.less b/less/._forms.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._grid.less b/less/._grid.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._hero-unit.less b/less/._hero-unit.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._labels-badges.less b/less/._labels-badges.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._layouts.less b/less/._layouts.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._mixins.less b/less/._mixins.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._modals.less b/less/._modals.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._navbar.less b/less/._navbar.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._navs.less b/less/._navs.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._pager.less b/less/._pager.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._pagination.less b/less/._pagination.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._popovers.less b/less/._popovers.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._progress-bars.less b/less/._progress-bars.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._reset.less b/less/._reset.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._responsive-1200px-min.less b/less/._responsive-1200px-min.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._responsive-767px-max.less b/less/._responsive-767px-max.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._responsive-768px-979px.less b/less/._responsive-768px-979px.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._responsive-navbar.less b/less/._responsive-navbar.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._responsive-utilities.less b/less/._responsive-utilities.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._responsive.less b/less/._responsive.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._scaffolding.less b/less/._scaffolding.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._sprites.less b/less/._sprites.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._tables.less b/less/._tables.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._tests b/less/._tests
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._thumbnails.less b/less/._thumbnails.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._tooltip.less b/less/._tooltip.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._type.less b/less/._type.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._utilities.less b/less/._utilities.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._variables.less b/less/._variables.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/._wells.less b/less/._wells.less
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/accordion.less b/less/accordion.less
new file mode 100644
index 0000000000..31b8cdc33d
--- /dev/null
+++ b/less/accordion.less
@@ -0,0 +1,33 @@
+// ACCORDION
+// ---------
+
+
+// Parent container
+.accordion {
+  margin-bottom: @baseLineHeight;
+}
+
+// Group == heading + body
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  .border-radius(4px);
+}
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+// General toggle styles
+.accordion-toggle {
+  cursor: pointer;
+}
+
+// Inner needs the styles because you can't animate properly with any styles on the element
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
diff --git a/less/alerts.less b/less/alerts.less
new file mode 100644
index 0000000000..46a0d77bfd
--- /dev/null
+++ b/less/alerts.less
@@ -0,0 +1,58 @@
+// ALERT STYLES
+// ------------
+
+// Base alert styles
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: @baseLineHeight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  background-color: @warningBackground;
+  border: 1px solid @warningBorder;
+  .border-radius(4px);
+  color: @warningText;
+}
+.alert-heading {
+  color: inherit;
+}
+
+// Adjust close link position
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 18px;
+}
+
+// Alternate styles
+// ----------------
+
+.alert-success {
+  background-color: @successBackground;
+  border-color: @successBorder;  
+  color: @successText;
+}
+.alert-danger,
+.alert-error {
+  background-color: @errorBackground;
+  border-color: @errorBorder;
+  color: @errorText;
+}
+.alert-info {
+  background-color: @infoBackground;
+  border-color: @infoBorder;
+  color: @infoText;
+}
+
+// Block alerts
+// ------------------------
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+.alert-block p + p {
+  margin-top: 5px;
+}
diff --git a/less/bootstrap.less b/less/bootstrap.less
new file mode 100644
index 0000000000..c43875a804
--- /dev/null
+++ b/less/bootstrap.less
@@ -0,0 +1,62 @@
+/*!
+ * Bootstrap v2.0.4
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+// CSS Reset
+@import "reset.less";
+
+// Core variables and mixins
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.less";
+
+// Grid system and page structure
+@import "scaffolding.less";
+@import "grid.less";
+@import "layouts.less";
+
+// Base CSS
+@import "type.less";
+@import "code.less";
+@import "forms.less";
+@import "tables.less";
+
+// Components: common
+@import "sprites.less";
+@import "dropdowns.less";
+@import "wells.less";
+@import "component-animations.less";
+@import "close.less";
+
+// Components: Buttons & Alerts
+@import "buttons.less";
+@import "button-groups.less";
+@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import "navs.less";
+@import "navbar.less";
+@import "breadcrumbs.less";
+@import "pagination.less";
+@import "pager.less";
+
+// Components: Popovers
+@import "modals.less";
+@import "tooltip.less";
+@import "popovers.less";
+
+// Components: Misc
+@import "thumbnails.less";
+@import "labels-badges.less";
+@import "progress-bars.less";
+@import "accordion.less";
+@import "carousel.less";
+@import "hero-unit.less";
+
+// Utility classes
+@import "utilities.less"; // Has to be last to override when necessary
diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
new file mode 100644
index 0000000000..111f12279f
--- /dev/null
+++ b/less/breadcrumbs.less
@@ -0,0 +1,24 @@
+// BREADCRUMBS
+// -----------
+
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 @baseLineHeight;
+  list-style: none;
+  #gradient > .vertical(@white, #f5f5f5);
+  border: 1px solid #ddd;
+  .border-radius(3px);
+  .box-shadow(inset 0 1px 0 @white);
+  li {
+    display: inline-block;
+    .ie7-inline-block();
+    text-shadow: 0 1px 0 @white;
+  }
+  .divider {
+    padding: 0 5px;
+    color: @grayLight;
+  }
+  .active a {
+    color: @grayDark;
+  }
+}
diff --git a/less/button-groups.less b/less/button-groups.less
new file mode 100644
index 0000000000..5338c5a450
--- /dev/null
+++ b/less/button-groups.less
@@ -0,0 +1,191 @@
+// BUTTON GROUPS
+// -------------
+
+
+// Make the div behave like a button
+.btn-group {
+  position: relative;
+  .clearfix(); // clears the floated buttons
+  .ie7-restore-left-whitespace();
+}
+
+// Space out series of button groups
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+// Optional: Group multiple button groups together for a toolbar
+.btn-toolbar {
+  margin-top: @baseLineHeight / 2;
+  margin-bottom: @baseLineHeight / 2;
+  .btn-group {
+    display: inline-block;
+    .ie7-inline-block();
+  }
+}
+
+// Float them, remove border radius, then re-add to first and last elements
+.btn-group > .btn {
+  position: relative;
+  float: left;
+  margin-left: -1px;
+  .border-radius(0);
+}
+// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
+.btn-group > .btn:first-child {
+  margin-left: 0;
+     -webkit-border-top-left-radius: 4px;
+         -moz-border-radius-topleft: 4px;
+             border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+      -moz-border-radius-bottomleft: 4px;
+          border-bottom-left-radius: 4px;
+}
+// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+     -webkit-border-top-right-radius: 4px;
+         -moz-border-radius-topright: 4px;
+             border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+      -moz-border-radius-bottomright: 4px;
+          border-bottom-right-radius: 4px;
+}
+// Reset corners for large buttons
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+     -webkit-border-top-left-radius: 6px;
+         -moz-border-radius-topleft: 6px;
+             border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+      -moz-border-radius-bottomleft: 6px;
+          border-bottom-left-radius: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+     -webkit-border-top-right-radius: 6px;
+         -moz-border-radius-topright: 6px;
+             border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+      -moz-border-radius-bottomright: 6px;
+          border-bottom-right-radius: 6px;
+}
+
+// On hover/focus/active, bring the proper btn to front
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+// On active and open, don't show outline
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+
+
+// Split button dropdowns
+// ----------------------
+
+// Give the line between buttons some depth
+.btn-group > .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+  *padding-top: 4px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-mini.dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+.btn-group > .btn-small.dropdown-toggle {
+  *padding-top: 4px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-large.dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
+}
+
+.btn-group.open {
+
+  // The clickable button for toggling the menu
+  // Remove the gradient and set the same inset shadow as the :active state
+  .dropdown-toggle {
+    background-image: none;
+    .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+  }
+
+  // Keep the hover's background when dropdown is open
+  .btn.dropdown-toggle {
+    background-color: @btnBackgroundHighlight;
+  }
+  .btn-primary.dropdown-toggle {
+    background-color: @btnPrimaryBackgroundHighlight;
+  }
+  .btn-warning.dropdown-toggle {
+    background-color: @btnWarningBackgroundHighlight;
+  }
+  .btn-danger.dropdown-toggle {
+    background-color: @btnDangerBackgroundHighlight;
+  }
+  .btn-success.dropdown-toggle {
+    background-color: @btnSuccessBackgroundHighlight;
+  }
+  .btn-info.dropdown-toggle {
+    background-color: @btnInfoBackgroundHighlight;
+  }
+  .btn-inverse.dropdown-toggle {
+    background-color: @btnInverseBackgroundHighlight;
+  }
+}
+
+
+// Reposition the caret
+.btn .caret {
+  margin-top: 7px;
+  margin-left: 0;
+}
+.btn:hover .caret,
+.open.btn-group .caret {
+  .opacity(100);
+}
+// Carets in other button sizes
+.btn-mini .caret {
+  margin-top: 5px;
+}
+.btn-small .caret {
+  margin-top: 6px;
+}
+.btn-large .caret {
+  margin-top: 6px;
+  border-left-width:  5px;
+  border-right-width: 5px;
+  border-top-width:   5px;
+}
+// Upside down carets for .dropup
+.dropup .btn-large .caret {
+  border-bottom: 5px solid @black;
+  border-top: 0;
+}
+
+
+
+// Account for other colors
+.btn-primary,
+.btn-warning,
+.btn-danger,
+.btn-info,
+.btn-success,
+.btn-inverse {
+  .caret {
+    border-top-color: @white;
+    border-bottom-color: @white;
+    .opacity(75);
+  }
+}
+
diff --git a/less/buttons.less b/less/buttons.less
new file mode 100644
index 0000000000..c44ff3e6fc
--- /dev/null
+++ b/less/buttons.less
@@ -0,0 +1,191 @@
+// BUTTON STYLES
+// -------------
+
+
+// Base styles
+// --------------------------------------------------
+
+// Core
+.btn {
+  display: inline-block;
+  .ie7-inline-block();
+  padding: 4px 10px 4px;
+  margin-bottom: 0; // For input.btn
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  *line-height: 20px;
+  color: @grayDark;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255,255,255,.75);
+  vertical-align: middle;
+  cursor: pointer;
+  .buttonBackground(@btnBackground, @btnBackgroundHighlight);
+  border: 1px solid @btnBorder;
+  *border: 0; // Remove the border to prevent IE7's black border on input:focus
+  border-bottom-color: darken(@btnBorder, 10%);
+  .border-radius(4px);
+  .ie7-restore-left-whitespace(); // Give IE7 some love
+  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
+}
+
+// Hover state
+.btn:hover {
+  color: @grayDark;
+  text-decoration: none;
+  background-color: darken(@white, 10%);
+  *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
+  background-position: 0 -15px;
+
+  // transition is only when going to hover, otherwise the background
+  // behind the gradient (there for IE<=9 fallback) gets mismatched
+  .transition(background-position .1s linear);
+}
+
+// Focus state for keyboard and accessibility
+.btn:focus {
+  .tab-focus();
+}
+
+// Active state
+.btn.active,
+.btn:active {
+  background-color: darken(@white, 10%);
+  background-color: darken(@white, 15%) e("\9");
+  background-image: none;
+  outline: 0;
+  .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+}
+
+// Disabled state
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-color: darken(@white, 10%);
+  background-image: none;
+  .opacity(65);
+  .box-shadow(none);
+}
+
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn-large {
+  padding: 9px 14px;
+  font-size: @baseFontSize + 2px;
+  line-height: normal;
+  .border-radius(5px);
+}
+.btn-large [class^="icon-"] {
+  margin-top: 1px;
+}
+
+// Small
+.btn-small {
+  padding: 5px 9px;
+  font-size: @baseFontSize - 2px;
+  line-height: @baseLineHeight - 2px;
+}
+.btn-small [class^="icon-"] {
+  margin-top: -1px;
+}
+
+// Mini
+.btn-mini {
+  padding: 2px 6px;
+  font-size: @baseFontSize - 2px;
+  line-height: @baseLineHeight - 4px;
+}
+
+
+// Alternate buttons
+// --------------------------------------------------
+
+// Set text color
+// -------------------------
+.btn-primary,
+.btn-primary:hover,
+.btn-warning,
+.btn-warning:hover,
+.btn-danger,
+.btn-danger:hover,
+.btn-success,
+.btn-success:hover,
+.btn-info,
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover {
+  color: @white;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+}
+// Provide *some* extra contrast for those who can get it
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255,255,255,.75);
+}
+
+// Set the backgrounds
+// -------------------------
+.btn {
+  // reset here as of 2.0.3 due to Recess property order
+  border-color: #ccc;
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);
+}
+.btn-primary {
+  .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
+}
+// Warning appears are orange
+.btn-warning {
+  .buttonBackground(@btnWarningBackground, @btnWarningBackgroundHighlight);
+}
+// Danger and error appear as red
+.btn-danger {
+  .buttonBackground(@btnDangerBackground, @btnDangerBackgroundHighlight);
+}
+// Success appears as green
+.btn-success {
+  .buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
+}
+// Info appears as a neutral blue
+.btn-info {
+  .buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
+}
+// Inverse appears as dark gray
+.btn-inverse {
+  .buttonBackground(@btnInverseBackground, @btnInverseBackgroundHighlight);
+}
+
+
+// Cross-browser Jank
+// --------------------------------------------------
+
+button.btn,
+input[type="submit"].btn {
+
+  // Firefox 3.6 only I believe
+  &::-moz-focus-inner {
+    padding: 0;
+    border: 0;
+  }
+
+  // IE7 has some default padding on button controls
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+  &.btn-large {
+    *padding-top: 7px;
+    *padding-bottom: 7px;
+  }
+  &.btn-small {
+    *padding-top: 3px;
+    *padding-bottom: 3px;
+  }
+  &.btn-mini {
+    *padding-top: 1px;
+    *padding-bottom: 1px;
+  }
+}
diff --git a/less/carousel.less b/less/carousel.less
new file mode 100644
index 0000000000..8fbd303154
--- /dev/null
+++ b/less/carousel.less
@@ -0,0 +1,121 @@
+// CAROUSEL
+// --------
+
+.carousel {
+  position: relative;
+  margin-bottom: @baseLineHeight;
+  line-height: 1;
+}
+
+.carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
+
+.carousel {
+
+  .item {
+    display: none;
+    position: relative;
+    .transition(.6s ease-in-out left);
+  }
+
+  // Account for jankitude on images
+  .item > img {
+    display: block;
+    line-height: 1;
+  }
+
+  .active,
+  .next,
+  .prev { display: block; }
+
+  .active {
+    left: 0;
+  }
+
+  .next,
+  .prev {
+    position: absolute;
+    top: 0;
+    width: 100%;
+  }
+
+  .next {
+    left: 100%;
+  }
+  .prev {
+    left: -100%;
+  }
+  .next.left,
+  .prev.right {
+    left: 0;
+  }
+
+  .active.left {
+    left: -100%;
+  }
+  .active.right {
+    left: 100%;
+  }
+
+}
+
+// Left/right controls for nav
+// ---------------------------
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: @white;
+  text-align: center;
+  background: @grayDarker;
+  border: 3px solid @white;
+  .border-radius(23px);
+  .opacity(50);
+
+  // we can't have this transition here
+  // because webkit cancels the carousel
+  // animation if you trip this while
+  // in the middle of another animation
+  // ;_;
+  // .transition(opacity .2s linear);
+
+  // Reposition the right one
+  &.right {
+    left: auto;
+    right: 15px;
+  }
+
+  // Hover state
+  &:hover {
+    color: @white;
+    text-decoration: none;
+    .opacity(90);
+  }
+}
+
+// Caption for text below images
+// -----------------------------
+
+.carousel-caption {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 10px 15px 5px;
+  background: @grayDark;
+  background: rgba(0,0,0,.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+  color: @white;
+}
diff --git a/less/close.less b/less/close.less
new file mode 100644
index 0000000000..31fe6fcb36
--- /dev/null
+++ b/less/close.less
@@ -0,0 +1,29 @@
+// CLOSE ICONS
+// -----------
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: @baseLineHeight;
+  color: @black;
+  text-shadow: 0 1px 0 rgba(255,255,255,1);
+  .opacity(20);
+  &:hover {
+    color: @black;
+    text-decoration: none;
+    cursor: pointer;
+    .opacity(40);
+  }
+}
+
+// Additional properties for button version
+// iOS requires the button element instead of an anchor tag.
+// If you want the anchor version, it requires `href="#"`.
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
\ No newline at end of file
diff --git a/less/code.less b/less/code.less
new file mode 100644
index 0000000000..0cae749a05
--- /dev/null
+++ b/less/code.less
@@ -0,0 +1,57 @@
+// Code.less
+// Code typography styles for the <code> and <pre> elements
+// --------------------------------------------------------
+
+// Inline and block code styles
+code,
+pre {
+  padding: 0 3px 2px;
+  #font > #family > .monospace;
+  font-size: @baseFontSize - 1;
+  color: @grayDark;
+  .border-radius(3px);
+}
+
+// Inline code
+code {
+  padding: 2px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+// Blocks of code
+pre {
+  display: block;
+  padding: (@baseLineHeight - 1) / 2;
+  margin: 0 0 @baseLineHeight / 2;
+  font-size: @baseFontSize * .925; // 13px to 12px
+  line-height: @baseLineHeight;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc; // fallback for IE7-8
+  border: 1px solid rgba(0,0,0,.15);
+  .border-radius(4px);
+
+  // Make prettyprint styles more spaced out for readability
+  &.prettyprint {
+    margin-bottom: @baseLineHeight;
+  }
+
+  // Account for some code outputs that place code tags in pre tags
+  code {
+    padding: 0;
+    color: inherit;
+    background-color: transparent;
+    border: 0;
+  }
+}
+
+// Enable scrollable blocks of code
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
\ No newline at end of file
diff --git a/less/component-animations.less b/less/component-animations.less
new file mode 100644
index 0000000000..1e1e78b851
--- /dev/null
+++ b/less/component-animations.less
@@ -0,0 +1,20 @@
+// COMPONENT ANIMATIONS
+// --------------------
+
+.fade {
+  opacity: 0;
+  .transition(opacity .15s linear);
+  &.in {
+    opacity: 1;
+  }
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  .transition(height .35s ease);
+  &.in {
+    height: auto;
+  }
+}
diff --git a/less/dropdowns.less b/less/dropdowns.less
new file mode 100644
index 0000000000..5e232556a6
--- /dev/null
+++ b/less/dropdowns.less
@@ -0,0 +1,143 @@
+// DROPDOWN MENUS
+// --------------
+
+// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
+.dropup,
+.dropdown {
+  position: relative;
+}
+.dropdown-toggle {
+  // The caret makes the toggle a bit too tall in IE7
+  *margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+// Dropdown arrow/caret
+// --------------------
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top:   4px solid @black;
+  border-right: 4px solid transparent;
+  border-left:  4px solid transparent;
+  content: "";
+  .opacity(30);
+}
+
+// Place the caret
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+.dropdown:hover .caret,
+.open .caret {
+  .opacity(100);
+}
+
+// The dropdown menu (ul)
+// ----------------------
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: @zindexDropdown;
+  display: none; // none by default, but block on "open" of the menu
+  float: left;
+  min-width: 160px;
+  padding: 4px 0;
+  margin: 1px 0 0; // override default ul
+  list-style: none;
+  background-color: @dropdownBackground;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0,0,0,.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  .border-radius(5px);
+  .box-shadow(0 5px 10px rgba(0,0,0,.2));
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+
+  // Aligns the dropdown menu to right
+  &.pull-right {
+    right: 0;
+    left: auto;
+  }
+
+  // Dividers (basically an hr) within the dropdown
+  .divider {
+    .nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
+  }
+
+  // Links within the dropdown menu
+  a {
+    display: block;
+    padding: 3px 15px;
+    clear: both;
+    font-weight: normal;
+    line-height: @baseLineHeight;
+    color: @dropdownLinkColor;
+    white-space: nowrap;
+  }
+}
+
+// Hover state
+// -----------
+.dropdown-menu li > a:hover,
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
+  color: @dropdownLinkColorHover;
+  text-decoration: none;
+  background-color: @dropdownLinkBackgroundHover;
+}
+
+// Open state for the dropdown
+// ---------------------------
+.open {
+  // IE7's z-index only goes to the nearest positioned ancestor, which would
+  // make the menu appear below buttons that appeared later on the page
+  *z-index: @zindexDropdown;
+
+  & > .dropdown-menu {
+    display: block;
+  }
+}
+
+// Right aligned dropdowns
+// ---------------------------
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+// Allow for dropdowns to go bottom up (aka, dropup-menu)
+// ------------------------------------------------------
+// Just add .dropup after the standard .dropdown class and you're set, bro.
+// TODO: abstract this so that the navbar fixed styles are not placed here?
+.dropup,
+.navbar-fixed-bottom .dropdown {
+  // Reverse the caret
+  .caret {
+    border-top: 0;
+    border-bottom: 4px solid @black;
+    content: "\2191";
+  }
+  // Different positioning for bottom up menu
+  .dropdown-menu {
+    top: auto;
+    bottom: 100%;
+    margin-bottom: 1px;
+  }
+}
+
+// Typeahead
+// ---------
+.typeahead {
+  margin-top: 2px; // give it some space to breathe
+  .border-radius(4px);
+}
diff --git a/less/forms.less b/less/forms.less
new file mode 100644
index 0000000000..1163fe9140
--- /dev/null
+++ b/less/forms.less
@@ -0,0 +1,583 @@
+// Forms.less
+// Base styles for various input types, form layouts, and states
+// -------------------------------------------------------------
+
+
+// GENERAL STYLES
+// --------------
+
+// Make all forms have space below them
+form {
+  margin: 0 0 @baseLineHeight;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+// Groups of fields with labels on top (legends)
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: @baseLineHeight * 1.5;
+  font-size: @baseFontSize * 1.5;
+  line-height: @baseLineHeight * 2;
+  color: @grayDark;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+
+  // Small
+  small {
+    font-size: @baseLineHeight * .75;
+    color: @grayLight;
+  }
+}
+
+// Set font for forms
+label,
+input,
+button,
+select,
+textarea {
+  #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
+}
+input,
+button,
+select,
+textarea {
+  font-family: @baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
+}
+
+// Identify controls by their labels
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+// Form controls
+// -------------------------
+
+// Shared size and type resets
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: @baseLineHeight;
+  padding: 4px;
+  margin-bottom: 9px;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @gray;
+}
+
+// Reset appearance properties for textual inputs and textarea
+// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
+input,
+textarea {
+  width: 210px;
+}
+// Reset height since textareas have rows
+textarea {
+  height: auto;
+}
+// Everything else
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: @inputBackground;
+  border: 1px solid @inputBorder;
+  .border-radius(@inputBorderRadius);
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  @transition: border linear .2s, box-shadow linear .2s;
+  .transition(@transition);
+
+  // Focus state
+  &:focus {
+    border-color: rgba(82,168,236,.8);
+    outline: 0;
+    outline: thin dotted \9; /* IE6-9 */
+    .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
+  }
+}
+
+// Position radios and checkboxes better
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 3px 0;
+  *margin-top: 0; /* IE7 */
+  line-height: normal;
+  cursor: pointer;
+}
+
+// Reset width of input buttons, radios, checkboxes
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto; // Override of generic input selector
+}
+
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+// Set the height of select and file controls to match text inputs
+select,
+input[type="file"] {
+  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
+  line-height: 28px;
+}
+
+// Make select elements obey height by applying a border
+select {
+  width: 220px; // default input width + 10px of padding that doesn't get applied
+  border: 1px solid #bbb;
+}
+
+// Make multiple select elements height not fixed
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+// Focus for select, file, radio, and checkbox
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  .tab-focus();
+}
+
+
+
+// CHECKBOXES & RADIOS
+// -------------------
+
+// Indent the labels to position radios/checkboxes as hanging
+.radio,
+.checkbox {
+  min-height: 18px; // clear the floating input if there is no label text
+  padding-left: 18px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -18px;
+}
+
+// Move the options list down to align with labels
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px; // has to be padding because margin collaspes
+}
+
+// Radios and checkboxes on same line
+// TODO v3: Convert .inline to .control-inline
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px; // space out consecutive inline controls
+}
+
+
+
+// INPUT SIZES
+// -----------
+
+// General classes for quick sizes
+.input-mini       { width: 60px; }
+.input-small      { width: 90px; }
+.input-medium     { width: 150px; }
+.input-large      { width: 210px; }
+.input-xlarge     { width: 270px; }
+.input-xxlarge    { width: 530px; }
+
+// Grid style input sizes
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+// Redeclare since the fluid row class is more specific
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+// Ensure input-prepend/append never wraps
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+
+
+// GRID SIZING FOR INPUTS
+// ----------------------
+
+#grid > .input(@gridColumnWidth, @gridGutterWidth);
+
+
+
+// DISABLED STATE
+// --------------
+
+// Disabled and read-only inputs
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: @inputDisabledBackground;
+  border-color: #ddd;
+}
+// Explicitly reset the colors here
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+
+
+
+// FORM FIELD FEEDBACK STATES
+// --------------------------
+
+// Warning
+.control-group.warning {
+  .formFieldState(@warningText, @warningText, @warningBackground);
+}
+// Error
+.control-group.error {
+  .formFieldState(@errorText, @errorText, @errorBackground);
+}
+// Success
+.control-group.success {
+  .formFieldState(@successText, @successText, @successBackground);
+}
+
+// HTML5 invalid states
+// Shares styles with the .control-group.error above
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+  &:focus {
+    border-color: darken(#ee5f5b, 10%);
+    .box-shadow(0 0 6px lighten(#ee5f5b, 20%));
+  }
+}
+
+
+
+// FORM ACTIONS
+// ------------
+
+.form-actions {
+  padding: (@baseLineHeight - 1) 20px @baseLineHeight;
+  margin-top: @baseLineHeight;
+  margin-bottom: @baseLineHeight;
+  background-color: @formActionsBackground;
+  border-top: 1px solid #e5e5e5;
+  .clearfix(); // Adding clearfix to allow for .pull-right button containers
+}
+
+// For text that needs to appear as an input but should not be an input
+.uneditable-input {
+  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
+  white-space: nowrap;
+  cursor: not-allowed;
+  background-color: @inputBackground;
+  border-color: #eee;
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+}
+
+// Placeholder text gets special styles; can't be bundled together though for some reason
+.placeholder();
+
+
+
+// HELP TEXT
+// ---------
+
+.help-block,
+.help-inline {
+  color: @gray; // lighten the text some for contrast
+}
+
+.help-block {
+  display: block; // account for any element using help-block
+  margin-bottom: @baseLineHeight / 2;
+}
+
+.help-inline {
+  display: inline-block;
+  .ie7-inline-block();
+  vertical-align: middle;
+  padding-left: 5px;
+}
+
+
+
+// INPUT GROUPS
+// ------------
+
+// Allow us to put symbols and text within the input field for a cleaner look
+.input-prepend,
+.input-append {
+  margin-bottom: 5px;
+  input,
+  select,
+  .uneditable-input {
+    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
+    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
+    *margin-left: 0;
+    vertical-align: middle;
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+    // Make input on top when focused so blue border and shadow always show
+    &:focus {
+      z-index: 2;
+    }
+  }
+  .uneditable-input {
+    border-left-color: #ccc;
+  }
+  .add-on {
+    display: inline-block;
+    width: auto;
+    height: @baseLineHeight;
+    min-width: 16px;
+    padding: 4px 5px;
+    font-weight: normal;
+    line-height: @baseLineHeight;
+    text-align: center;
+    text-shadow: 0 1px 0 @white;
+    vertical-align: middle;
+    background-color: @grayLighter;
+    border: 1px solid #ccc;
+  }
+  .add-on,
+  .btn {
+    margin-left: -1px;
+    .border-radius(0);
+  }
+  .active {
+    background-color: lighten(@green, 30);
+    border-color: @green;
+  }
+}
+.input-prepend {
+  .add-on,
+  .btn {
+    margin-right: -1px;
+  }
+  .add-on:first-child,
+  .btn:first-child {
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+}
+.input-append {
+  input,
+  select,
+  .uneditable-input {
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+  .uneditable-input {
+    border-right-color: #ccc;
+    border-left-color: #eee;
+  }
+  .add-on:last-child,
+  .btn:last-child {
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+  }
+}
+// Remove all border-radius for inputs with both prepend and append
+.input-prepend.input-append {
+  input,
+  select,
+  .uneditable-input {
+    .border-radius(0);
+  }
+  .add-on:first-child,
+  .btn:first-child {
+    margin-right: -1px;
+    .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+  }
+  .add-on:last-child,
+  .btn:last-child {
+    margin-left: -1px;
+    .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
+  }
+}
+
+
+
+// SEARCH FORM
+// -----------
+
+.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
+  margin-bottom: 0; // remove the default margin on all inputs
+  .border-radius(14px);
+}
+
+
+
+// HORIZONTAL & VERTICAL FORMS
+// ---------------------------
+
+// Common properties
+// -----------------
+
+.form-search,
+.form-inline,
+.form-horizontal {
+  input,
+  textarea,
+  select,
+  .help-inline,
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
+    display: inline-block;
+    .ie7-inline-block();
+    margin-bottom: 0;
+  }
+  // Re-hide hidden elements due to specifity
+  .hide {
+    display: none;
+  }
+}
+.form-search label,
+.form-inline label {
+  display: inline-block;
+}
+// Remove margin for input-prepend/-append
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+// Inline checkbox/radio labels (remove padding on left)
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+// Remove float and margin, set to inline-block
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+
+// Margin to space out fieldsets
+.control-group {
+  margin-bottom: @baseLineHeight / 2;
+}
+
+// Legend collapses margin, so next element is responsible for spacing
+legend + .control-group {
+  margin-top: @baseLineHeight;
+  -webkit-margin-top-collapse: separate;
+}
+
+// Horizontal-specific styles
+// --------------------------
+
+.form-horizontal {
+  // Increase spacing between groups
+  .control-group {
+    margin-bottom: @baseLineHeight;
+    .clearfix();
+  }
+  // Float the labels left
+  .control-label {
+    float: left;
+    width: 140px;
+    padding-top: 5px;
+    text-align: right;
+  }
+  // Move over all input controls and content
+  .controls {
+    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
+    // don't inherit the margin of the parent, in this case .controls
+    *display: inline-block;
+    *padding-left: 20px;
+    margin-left: 160px;
+    *margin-left: 0;
+    &:first-child {
+      *padding-left: 160px;
+    }
+  }
+  // Remove bottom margin on block level help text since that's accounted for on .control-group
+  .help-block {
+    margin-top: @baseLineHeight / 2;
+    margin-bottom: 0;
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-actions {
+    padding-left: 160px;
+  }
+}
diff --git a/less/grid.less b/less/grid.less
new file mode 100644
index 0000000000..e62a960932
--- /dev/null
+++ b/less/grid.less
@@ -0,0 +1,5 @@
+// Fixed (940px)
+#grid > .core(@gridColumnWidth, @gridGutterWidth);
+
+// Fluid (940px)
+#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
\ No newline at end of file
diff --git a/less/hero-unit.less b/less/hero-unit.less
new file mode 100644
index 0000000000..0ffe82962a
--- /dev/null
+++ b/less/hero-unit.less
@@ -0,0 +1,22 @@
+// HERO UNIT
+// ---------
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: @heroUnitBackground;
+  .border-radius(6px);
+  h1 {
+    margin-bottom: 0;
+    font-size: 60px;
+    line-height: 1;
+    color: @heroUnitHeadingColor;
+    letter-spacing: -1px;
+  }
+  p {
+    font-size: 18px;
+    font-weight: 200;
+    line-height: @baseLineHeight * 1.5;
+    color: @heroUnitLeadColor;
+  }
+}
diff --git a/less/labels-badges.less b/less/labels-badges.less
new file mode 100644
index 0000000000..0fbd7bbc61
--- /dev/null
+++ b/less/labels-badges.less
@@ -0,0 +1,55 @@
+// LABELS & BADGES
+// ---------------
+
+// Base classes
+.label,
+.badge {
+  font-size: @baseFontSize * .846;
+  font-weight: bold;
+  line-height: 14px; // ensure proper line-height if floated
+  color: @white;
+  vertical-align: baseline;
+  white-space: nowrap;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  background-color: @grayLight;
+}
+// Set unique padding and border-radii
+.label {
+  padding: 1px 4px 2px;
+  .border-radius(3px);
+}
+.badge {
+  padding: 1px 9px 2px;
+  .border-radius(9px);
+}
+
+// Hover state, but only for links
+a {
+  &.label:hover,
+  &.badge:hover {
+    color: @white;
+    text-decoration: none;
+    cursor: pointer;
+  }
+}
+
+// Colors
+// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
+.label,
+.badge {
+  // Important (red)
+  &-important         { background-color: @errorText; }
+  &-important[href]   { background-color: darken(@errorText, 10%); }
+  // Warnings (orange)
+  &-warning           { background-color: @orange; }
+  &-warning[href]     { background-color: darken(@orange, 10%); }
+  // Success (green)
+  &-success           { background-color: @successText; }
+  &-success[href]     { background-color: darken(@successText, 10%); }
+  // Info (turquoise)
+  &-info              { background-color: @infoText; }
+  &-info[href]        { background-color: darken(@infoText, 10%); }
+  // Inverse (black)
+  &-inverse           { background-color: @grayDark; }
+  &-inverse[href]     { background-color: darken(@grayDark, 10%); }
+}
diff --git a/less/layouts.less b/less/layouts.less
new file mode 100644
index 0000000000..cc53627ff7
--- /dev/null
+++ b/less/layouts.less
@@ -0,0 +1,17 @@
+//
+// Layouts
+// Fixed-width and fluid (with sidebar) layouts
+// --------------------------------------------
+
+
+// Container (centered, fixed-width layouts)
+.container {
+  .container-fixed();
+}
+
+// Fluid layouts (left aligned, with sidebar, min- & max-width content)
+.container-fluid {
+  padding-right: @gridGutterWidth;
+  padding-left: @gridGutterWidth;
+  .clearfix();
+}
\ No newline at end of file
diff --git a/less/mixins.less b/less/mixins.less
new file mode 100644
index 0000000000..c3b57ed142
--- /dev/null
+++ b/less/mixins.less
@@ -0,0 +1,646 @@
+// Mixins.less
+// Snippets of reusable CSS to develop faster and keep code readable
+// -----------------------------------------------------------------
+
+
+// UTILITY MIXINS
+// --------------------------------------------------
+
+// Clearfix
+// --------
+// For clearing floats like a boss h5bp.com/q
+.clearfix {
+  *zoom: 1;
+  &:before,
+  &:after {
+    display: table;
+    content: "";
+  }
+  &:after {
+    clear: both;
+  }
+}
+
+// Webkit-style focus
+// ------------------
+.tab-focus() {
+  // Default
+  outline: thin dotted #333;
+  // Webkit
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+// Center-align a block level element
+// ----------------------------------
+.center-block() {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+// IE7 inline-block
+// ----------------
+.ie7-inline-block() {
+  *display: inline; /* IE7 inline-block hack */
+  *zoom: 1;
+}
+
+// IE7 likes to collapse whitespace on either side of the inline-block elements.
+// Ems because we're attempting to match the width of a space character. Left
+// version is for form buttons, which typically come after other elements, and
+// right version is for icons, which come before. Applying both is ok, but it will
+// mean that space between those elements will be .6em (~2 space characters) in IE7,
+// instead of the 1 space in other browsers.
+.ie7-restore-left-whitespace() {
+  *margin-left: .3em;
+
+  &:first-child {
+    *margin-left: 0;
+  }
+}
+
+.ie7-restore-right-whitespace() {
+  *margin-right: .3em;
+
+  &:last-child {
+    *margin-left: 0;
+  }
+}
+
+// Sizing shortcuts
+// -------------------------
+.size(@height, @width) {
+  width: @width;
+  height: @height;
+}
+.square(@size) {
+  .size(@size, @size);
+}
+
+// Placeholder text
+// -------------------------
+.placeholder(@color: @placeholderText) {
+  &:-moz-placeholder {
+    color: @color;
+  }
+  &:-ms-input-placeholder {
+    color: @color;
+  }
+  &::-webkit-input-placeholder {
+    color: @color;
+  }
+}
+
+// Text overflow
+// -------------------------
+// Requires inline-block or block for proper styling
+.text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+// CSS image replacement
+// -------------------------
+// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+
+// FONTS
+// --------------------------------------------------
+
+#font {
+  #family {
+    .serif() {
+      font-family: @serifFontFamily;
+    }
+    .sans-serif() {
+      font-family: @sansFontFamily;
+    }
+    .monospace() {
+      font-family: @monoFontFamily;
+    }
+  }
+  .shorthand(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    font-size: @size;
+    font-weight: @weight;
+    line-height: @lineHeight;
+  }
+  .serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .sans-serif(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .sans-serif;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+  .monospace(@size: @baseFontSize, @weight: normal, @lineHeight: @baseLineHeight) {
+    #font > #family > .monospace;
+    #font > .shorthand(@size, @weight, @lineHeight);
+  }
+}
+
+
+// FORMS
+// --------------------------------------------------
+
+// Block level inputs
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 28px;        // Make inputs at least the height of their button counterpart
+  .box-sizing(border-box); // Makes inputs behave like true block-level elements
+}
+
+
+// Mixin for form field states
+.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
+  // Set the text color
+  > label,
+  .help-block,
+  .help-inline {
+    color: @textColor;
+  }
+  // Style inputs accordingly
+  .checkbox,
+  .radio,
+  input,
+  select,
+  textarea {
+    color: @textColor;
+    border-color: @borderColor;
+    &:focus {
+      border-color: darken(@borderColor, 10%);
+      .box-shadow(0 0 6px lighten(@borderColor, 20%));
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on,
+  .input-append .add-on {
+    color: @textColor;
+    background-color: @backgroundColor;
+    border-color: @textColor;
+  }
+}
+
+
+
+// CSS3 PROPERTIES
+// --------------------------------------------------
+
+// Border Radius
+.border-radius(@radius) {
+  -webkit-border-radius: @radius;
+     -moz-border-radius: @radius;
+          border-radius: @radius;
+}
+
+// Drop shadows
+.box-shadow(@shadow) {
+  -webkit-box-shadow: @shadow;
+     -moz-box-shadow: @shadow;
+          box-shadow: @shadow;
+}
+
+// Transitions
+.transition(@transition) {
+  -webkit-transition: @transition;
+     -moz-transition: @transition;
+      -ms-transition: @transition;
+       -o-transition: @transition;
+          transition: @transition;
+}
+
+// Transformations
+.rotate(@degrees) {
+  -webkit-transform: rotate(@degrees);
+     -moz-transform: rotate(@degrees);
+      -ms-transform: rotate(@degrees);
+       -o-transform: rotate(@degrees);
+          transform: rotate(@degrees);
+}
+.scale(@ratio) {
+  -webkit-transform: scale(@ratio);
+     -moz-transform: scale(@ratio);
+      -ms-transform: scale(@ratio);
+       -o-transform: scale(@ratio);
+          transform: scale(@ratio);
+}
+.translate(@x, @y) {
+  -webkit-transform: translate(@x, @y);
+     -moz-transform: translate(@x, @y);
+      -ms-transform: translate(@x, @y);
+       -o-transform: translate(@x, @y);
+          transform: translate(@x, @y);
+}
+.skew(@x, @y) {
+  -webkit-transform: skew(@x, @y);
+     -moz-transform: skew(@x, @y);
+      -ms-transform: skew(@x, @y);
+       -o-transform: skew(@x, @y);
+          transform: skew(@x, @y);
+}
+.translate3d(@x, @y, @z) {
+  -webkit-transform: translate(@x, @y, @z);
+     -moz-transform: translate(@x, @y, @z);
+      -ms-transform: translate(@x, @y, @z);
+       -o-transform: translate(@x, @y, @z);
+          transform: translate(@x, @y, @z);
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden
+// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
+.backface-visibility(@visibility){
+	-webkit-backface-visibility: @visibility;
+	   -moz-backface-visibility: @visibility;
+	    -ms-backface-visibility: @visibility;
+	        backface-visibility: @visibility;
+}
+
+// Background clipping
+// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
+.background-clip(@clip) {
+  -webkit-background-clip: @clip;
+     -moz-background-clip: @clip;
+          background-clip: @clip;
+}
+
+// Background sizing
+.background-size(@size){
+  -webkit-background-size: @size;
+     -moz-background-size: @size;
+       -o-background-size: @size;
+          background-size: @size;
+}
+
+
+// Box sizing
+.box-sizing(@boxmodel) {
+  -webkit-box-sizing: @boxmodel;
+     -moz-box-sizing: @boxmodel;
+      -ms-box-sizing: @boxmodel;
+          box-sizing: @boxmodel;
+}
+
+// User select
+// For selecting text on the page
+.user-select(@select) {
+  -webkit-user-select: @select;
+     -moz-user-select: @select;
+      -ms-user-select: @select;
+       -o-user-select: @select;
+          user-select: @select;
+}
+
+// Resize anything
+.resizable(@direction) {
+  resize: @direction; // Options: horizontal, vertical, both
+  overflow: auto; // Safari fix
+}
+
+// CSS3 Content Columns
+.content-columns(@columnCount, @columnGap: @gridGutterWidth) {
+  -webkit-column-count: @columnCount;
+     -moz-column-count: @columnCount;
+          column-count: @columnCount;
+  -webkit-column-gap: @columnGap;
+     -moz-column-gap: @columnGap;
+          column-gap: @columnGap;
+}
+
+// Optional hyphenation
+.hyphens(@mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: @mode;
+     -moz-hyphens: @mode;
+      -ms-hyphens: @mode;
+       -o-hyphens: @mode;
+          hyphens: @mode;
+}
+
+// Opacity
+.opacity(@opacity) {
+  opacity: @opacity / 100;
+  filter: ~"alpha(opacity=@{opacity})";
+}
+
+
+
+// BACKGROUNDS
+// --------------------------------------------------
+
+// Add an alphatransparency value to any background or border color (via Elyse Holladay)
+#translucent {
+  .background(@color: @white, @alpha: 1) {
+    background-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+  }
+  .border(@color: @white, @alpha: 1) {
+    border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
+    .background-clip(padding-box);
+  }
+}
+
+// Gradient Bar Colors for buttons and alerts
+.gradientBar(@primaryColor, @secondaryColor) {
+  #gradient > .vertical(@primaryColor, @secondaryColor);
+  border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%);
+  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
+}
+
+// Gradients
+#gradient {
+  .horizontal(@startColor: #555, @endColor: #333) {
+    background-color: @endColor;
+    background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(left, @startColor, @endColor); // IE10
+    background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(left, @startColor, @endColor); // Le standard
+    background-repeat: repeat-x;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down
+  }
+  .vertical(@startColor: #555, @endColor: #333) {
+    background-color: mix(@startColor, @endColor, 60%);
+    background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
+    background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(top, @startColor, @endColor); // The standard
+    background-repeat: repeat-x;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
+  }
+  .directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
+    background-color: @endColor;
+    background-repeat: repeat-x;
+    background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
+    background-image: -ms-linear-gradient(@deg, @startColor, @endColor); // IE10
+    background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
+    background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
+    background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
+  }
+  .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
+    background-color: mix(@midColor, @endColor, 80%);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
+    background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
+    background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
+    background-repeat: no-repeat;
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
+  }
+  .radial(@innerColor: #555, @outerColor: #333)  {
+    background-color: @outerColor;
+    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
+    background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -ms-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
+    background-repeat: no-repeat;
+  }
+  .striped(@color, @angle: -45deg) {
+    background-color: @color;
+    background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
+    background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -ms-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+  }
+}
+// Reset filters for IE
+.reset-filter() {
+  filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
+}
+
+
+
+// COMPONENT MIXINS
+// --------------------------------------------------
+
+// Horizontal dividers
+// -------------------------
+// Dividers (basically an hr) within dropdowns and nav lists
+.nav-divider(@top: #e5e5e5, @bottom: @white) {
+  // IE7 needs a set width since we gave a height. Restricting just
+  // to IE7 to keep the 1px left/right space in other browsers.
+  // It is unclear where IE is getting the extra space that we need
+  // to negative-margin away, but so it goes.
+  *width: 100%;
+  height: 1px;
+  margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: @top;
+  border-bottom: 1px solid @bottom;
+}
+
+// Button backgrounds
+// ------------------
+.buttonBackground(@startColor, @endColor) {
+  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
+  .gradientBar(@startColor, @endColor);
+  *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+  .reset-filter();
+
+  // in these cases the gradient won't cover the background, so we override
+  &:hover, &:active, &.active, &.disabled, &[disabled] {
+    background-color: @endColor;
+    *background-color: darken(@endColor, 5%);
+  }
+
+  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
+  &:active,
+  &.active {
+    background-color: darken(@endColor, 10%) e("\9");
+  }
+}
+
+// Navbar vertical align
+// -------------------------
+// Vertically center elements in the navbar.
+// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
+.navbarVerticalAlign(@elementHeight) {
+  margin-top: (@navbarHeight - @elementHeight) / 2;
+}
+
+// Popover arrows
+// -------------------------
+// For tipsies and popovers
+#popoverArrow {
+  .top(@arrowWidth: 5px, @color: @black) {
+    bottom: 0;
+    left: 50%;
+    margin-left: -@arrowWidth;
+    border-left: @arrowWidth solid transparent;
+    border-right: @arrowWidth solid transparent;
+    border-top: @arrowWidth solid @color;
+  }
+  .left(@arrowWidth: 5px, @color: @black) {
+    top: 50%;
+    right: 0;
+    margin-top: -@arrowWidth;
+    border-top: @arrowWidth solid transparent;
+    border-bottom: @arrowWidth solid transparent;
+    border-left: @arrowWidth solid @color;
+  }
+  .bottom(@arrowWidth: 5px, @color: @black) {
+    top: 0;
+    left: 50%;
+    margin-left: -@arrowWidth;
+    border-left: @arrowWidth solid transparent;
+    border-right: @arrowWidth solid transparent;
+    border-bottom: @arrowWidth solid @color;
+  }
+  .right(@arrowWidth: 5px, @color: @black) {
+    top: 50%;
+    left: 0;
+    margin-top: -@arrowWidth;
+    border-top: @arrowWidth solid transparent;
+    border-bottom: @arrowWidth solid transparent;
+    border-right: @arrowWidth solid @color;
+  }
+}
+
+// Grid System
+// -----------
+
+// Centered container element
+.container-fixed() {
+  margin-right: auto;
+  margin-left: auto;
+  .clearfix();
+}
+
+// Table columns
+.tableColumns(@columnSpan: 1) {
+  float: none; // undo default grid column styles
+  width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
+  margin-left: 0; // undo default grid column styles
+}
+
+// Make a Grid
+// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
+.makeRow() {
+  margin-left: @gridGutterWidth * -1;
+  .clearfix();
+}
+.makeColumn(@columns: 1, @offset: 0) {
+  float: left;
+  margin-left: (@gridColumnWidth * @offset) + (@gridGutterWidth * (@offset - 1)) + (@gridGutterWidth * 2);
+  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+}
+
+// The Grid
+#grid {
+
+  .core (@gridColumnWidth, @gridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      (~".span@{index}") { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .offsetX (@index) when (@index > 0) {
+      (~".offset@{index}") { .offset(@index); }
+      .offsetX(@index - 1);
+    }
+    .offsetX (0) {}
+
+    .offset (@columns) {
+      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
+    }
+
+    .span (@columns) {
+      width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+    }
+
+    .row {
+      margin-left: @gridGutterWidth * -1;
+      .clearfix();
+    }
+
+    [class*="span"] {
+      float: left;
+      margin-left: @gridGutterWidth;
+    }
+
+    // Set the container width, and override it for fixed navbars in media queries
+    .container,
+    .navbar-fixed-top .container,
+    .navbar-fixed-bottom .container { .span(@gridColumns); }
+
+    // generate .spanX and .offsetX
+    .spanX (@gridColumns);
+    .offsetX (@gridColumns);
+
+  }
+
+  .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      (~".span@{index}") { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .span (@columns) {
+      width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
+      *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
+    }
+
+    .row-fluid {
+      width: 100%;
+      .clearfix();
+      [class*="span"] {
+        .input-block-level();
+        float: left;
+        margin-left: @fluidGridGutterWidth;
+        *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
+      }
+      [class*="span"]:first-child {
+        margin-left: 0;
+      }
+
+      // generate .spanX
+      .spanX (@gridColumns);
+    }
+
+  }
+
+  .input(@gridColumnWidth, @gridGutterWidth) {
+
+    .spanX (@index) when (@index > 0) {
+      (~"input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index}") { .span(@index); }
+      .spanX(@index - 1);
+    }
+    .spanX (0) {}
+
+    .span(@columns) {
+      width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 10;
+    }
+
+    input,
+    textarea,
+    .uneditable-input {
+      margin-left: 0; // override margin-left from core grid system
+    }
+
+    // generate .spanX
+    .spanX (@gridColumns);
+
+  }
+
+}
diff --git a/less/modals.less b/less/modals.less
new file mode 100644
index 0000000000..870ad0dfe6
--- /dev/null
+++ b/less/modals.less
@@ -0,0 +1,90 @@
+// MODALS
+// ------
+
+// Recalculate z-index where appropriate
+.modal-open {
+  .dropdown-menu {  z-index: @zindexDropdown + @zindexModal; }
+  .dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
+  .popover       {  z-index: @zindexPopover  + @zindexModal; }
+  .tooltip       {  z-index: @zindexTooltip  + @zindexModal; }
+}
+
+// Background
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: @zindexModalBackdrop;
+  background-color: @black;
+  // Fade for backdrop
+  &.fade { opacity: 0; }
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  .opacity(80);
+}
+
+// Base modal
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: @zindexModal;
+  overflow: auto;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  background-color: @white;
+  border: 1px solid #999;
+  border: 1px solid rgba(0,0,0,.3);
+  *border: 1px solid #999; /* IE6-7 */
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+  .background-clip(padding-box);
+  &.fade {
+    .transition(e('opacity .3s linear, top .3s ease-out'));
+    top: -25%;
+  }
+  &.fade.in { top: 50%; }
+}
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+  // Close icon
+  .close { margin-top: 2px; }
+}
+
+// Body (where all modal content resides)
+.modal-body {
+  overflow-y: auto;
+  max-height: 400px;
+  padding: 15px;
+}
+// Remove bottom margin if need be
+.modal-form {
+  margin-bottom: 0;
+}
+
+// Footer (for actions)
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right; // right align buttons
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  .border-radius(0 0 6px 6px);
+  .box-shadow(inset 0 1px 0 @white);
+  .clearfix(); // clear it in case folks use .pull-* classes on buttons
+
+  // Properly space out buttons
+  .btn + .btn {
+    margin-left: 5px;
+    margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
+  }
+  // but override that for button groups
+  .btn-group .btn + .btn {
+    margin-left: -1px;
+  }
+}
diff --git a/less/navbar.less b/less/navbar.less
new file mode 100644
index 0000000000..818f8a5a23
--- /dev/null
+++ b/less/navbar.less
@@ -0,0 +1,358 @@
+// NAVBAR (FIXED AND STATIC)
+// -------------------------
+
+
+// COMMON STYLES
+// -------------
+
+.navbar {
+  // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
+  *position: relative;
+  *z-index: 2;
+
+  overflow: visible;
+  margin-bottom: @baseLineHeight;
+}
+
+// Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
+.navbar-inner {
+  min-height: @navbarHeight;
+  padding-left:  20px;
+  padding-right: 20px;
+  #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+  .border-radius(4px);
+  .box-shadow(~"0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1)");
+}
+
+// Set width to auto for default container
+// We then reset it for fixed navbars in the #gridSystem mixin
+.navbar .container {
+  width: auto;
+}
+
+// Override the default collapsed state
+.nav-collapse.collapse {
+  height: auto;
+}
+
+
+// Brand, links, text, and buttons
+.navbar {
+  color: @navbarText;
+  // Hover and active states
+  .brand:hover {
+    text-decoration: none;
+  }
+  // Website or project name
+  .brand {
+    float: left;
+    display: block;
+    // Vertically center the text given @navbarHeight
+    @elementHeight: 20px;
+    padding: ((@navbarHeight - @elementHeight) / 2 - 2) 20px ((@navbarHeight - @elementHeight) / 2 + 2);
+    margin-left: -20px; // negative indent to left-align the text down the page
+    font-size: 20px;
+    font-weight: 200;
+    line-height: 1;
+    color: @navbarBrandColor;
+  }
+  // Plain text in topbar
+  .navbar-text {
+    margin-bottom: 0;
+    line-height: @navbarHeight;
+  }
+  // Janky solution for now to account for links outside the .nav
+  .navbar-link {
+    color: @navbarLinkColor;
+    &:hover {
+      color: @navbarLinkColorHover;
+    }
+  }
+  // Buttons in navbar
+  .btn,
+  .btn-group {
+    .navbarVerticalAlign(30px); // Vertically center in navbar
+  }
+  .btn-group .btn {
+    margin: 0; // then undo the margin here so we don't accidentally double it
+  }
+}
+
+// Navbar forms
+.navbar-form {
+  margin-bottom: 0; // remove default bottom margin
+  .clearfix();
+  input,
+  select,
+  .radio,
+  .checkbox {
+    .navbarVerticalAlign(30px); // Vertically center in navbar
+  }
+  input,
+  select {
+    display: inline-block;
+    margin-bottom: 0;
+  }
+  input[type="image"],
+  input[type="checkbox"],
+  input[type="radio"] {
+    margin-top: 3px;
+  }
+  .input-append,
+  .input-prepend {
+    margin-top: 6px;
+    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
+    input {
+      margin-top: 0; // remove the margin on top since it's on the parent
+    }
+  }
+}
+
+// Navbar search
+.navbar-search {
+  position: relative;
+  float: left;
+  .navbarVerticalAlign(28px); // Vertically center in navbar
+  margin-bottom: 0;
+  .search-query {
+    padding: 4px 9px;
+    #font > .sans-serif(13px, normal, 1);
+    color: @white;
+    background-color: @navbarSearchBackground;
+    border: 1px solid @navbarSearchBorder;
+    .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
+    .transition(none);
+
+    .placeholder(@navbarSearchPlaceholderColor);
+
+    // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
+    &:focus,
+    &.focused {
+      padding: 5px 10px;
+      color: @grayDark;
+      text-shadow: 0 1px 0 @white;
+      background-color: @navbarSearchBackgroundFocus;
+      border: 0;
+      .box-shadow(0 0 3px rgba(0,0,0,.15));
+      outline: 0;
+    }
+  }
+}
+
+
+
+// FIXED NAVBAR
+// ------------
+
+// Shared (top/bottom) styles
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: @zindexFixedNavbar;
+  margin-bottom: 0; // remove 18px margin for static navbar
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-left:  0;
+  padding-right: 0;
+  .border-radius(0);
+}
+
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  #grid > .core > .span(@gridColumns);
+}
+
+// Fixed to top
+.navbar-fixed-top {
+  top: 0;
+}
+
+// Fixed to bottom
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+
+
+// NAVIGATION
+// ----------
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right; // redeclare due to specificity
+}
+.navbar .nav > li {
+  display: block;
+  float: left;
+}
+
+// Links
+.navbar .nav > li > a {
+  float: none;
+  // Vertically center the text given @navbarHeight
+  @elementHeight: 20px;
+  padding: ((@navbarHeight - @elementHeight) / 2 - 1) 10px ((@navbarHeight - @elementHeight) / 2 + 1);
+  line-height: 19px;
+  color: @navbarLinkColor;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+}
+// Buttons
+.navbar .btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  // Vertically center the button given @navbarHeight
+  @elementHeight: 28px;
+  margin: ((@navbarHeight - @elementHeight) / 2 - 1) 5px ((@navbarHeight - @elementHeight) / 2);
+  line-height: @baseLineHeight;
+}
+.navbar .btn-group {
+  margin: 0;
+  // Vertically center the button given @navbarHeight
+  @elementHeight: 28px;
+  padding: ((@navbarHeight - @elementHeight) / 2 - 1) 5px ((@navbarHeight - @elementHeight) / 2);
+}
+// Hover
+.navbar .nav > li > a:hover {
+  background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
+  color: @navbarLinkColorHover;
+  text-decoration: none;
+}
+
+// Active nav items
+.navbar .nav .active > a,
+.navbar .nav .active > a:hover {
+  color: @navbarLinkColorActive;
+  text-decoration: none;
+  background-color: @navbarLinkBackgroundActive;
+}
+
+// Dividers (basically a vertical hr)
+.navbar .divider-vertical {
+  height: @navbarHeight;
+  width: 1px;
+  margin: 0 9px;
+  overflow: hidden;
+  background-color: @navbarBackground;
+  border-right: 1px solid @navbarBackgroundHighlight;
+}
+
+// Secondary (floated right) nav in topbar
+.navbar .nav.pull-right {
+  margin-left: 10px;
+  margin-right: 0;
+}
+
+// Navbar button for toggling navbar items in responsive layouts
+// These definitions need to come after '.navbar .btn'
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-left: 5px;
+  margin-right: 5px;
+  .buttonBackground(@navbarBackgroundHighlight, @navbarBackground);
+  .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075)");
+}
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  .border-radius(1px);
+  .box-shadow(0 1px 0 rgba(0,0,0,.25));
+}
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+
+// Dropdown menus
+// --------------
+
+// Menu position and menu carets
+.navbar .dropdown-menu {
+  &:before {
+    content: '';
+    display: inline-block;
+    border-left:   7px solid transparent;
+    border-right:  7px solid transparent;
+    border-bottom: 7px solid #ccc;
+    border-bottom-color: @dropdownBorder;
+    position: absolute;
+    top: -7px;
+    left: 9px;
+  }
+  &:after {
+    content: '';
+    display: inline-block;
+    border-left:   6px solid transparent;
+    border-right:  6px solid transparent;
+    border-bottom: 6px solid @dropdownBackground;
+    position: absolute;
+    top: -6px;
+    left: 10px;
+  }
+}
+// Menu position and menu caret support for dropups via extra dropup class
+.navbar-fixed-bottom .dropdown-menu {
+  &:before {
+    border-top: 7px solid #ccc;
+    border-top-color: @dropdownBorder;
+    border-bottom: 0;
+    bottom: -7px;
+    top: auto;
+  }
+  &:after {
+    border-top: 6px solid @dropdownBackground;
+    border-bottom: 0;
+    bottom: -6px;
+    top: auto;
+  }
+}
+// Dropdown toggle caret
+.navbar .nav li.dropdown .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open .caret {
+  border-top-color: @white;
+  border-bottom-color: @white;
+}
+.navbar .nav li.dropdown.active .caret {
+  .opacity(100);
+}
+
+// Remove background color from open dropdown
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  background-color: transparent;
+}
+
+// Dropdown link on hover
+.navbar .nav li.dropdown.active > .dropdown-toggle:hover {
+  color: @white;
+}
+
+// Right aligned menus need alt position
+// TODO: rejigger this at some point to simplify the selectors
+.navbar .pull-right .dropdown-menu,
+.navbar .dropdown-menu.pull-right {
+  left: auto;
+  right: 0;
+  &:before {
+    left: auto;
+    right: 12px;
+  }
+  &:after {
+    left: auto;
+    right: 13px;
+  }
+}
\ No newline at end of file
diff --git a/less/navs.less b/less/navs.less
new file mode 100644
index 0000000000..5cb9f9f3a2
--- /dev/null
+++ b/less/navs.less
@@ -0,0 +1,363 @@
+// NAVIGATIONS
+// -----------
+
+
+
+// BASE CLASS
+// ----------
+
+.nav {
+  margin-left: 0;
+  margin-bottom: @baseLineHeight;
+  list-style: none;
+}
+
+// Make links block level
+.nav > li > a {
+  display: block;
+}
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: @grayLighter;
+}
+
+// Redeclare pull classes because of specifity
+.nav > .pull-right {
+  float: right;
+}
+
+// Nav headers (for dropdowns and lists)
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: @baseLineHeight;
+  color: @grayLight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  text-transform: uppercase;
+}
+// Space them out when they follow another list item (link)
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+
+// NAV LIST
+// --------
+
+.nav-list {
+  padding-left: 15px;
+  padding-right: 15px;
+  margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-left:  -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+}
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover {
+  color: @white;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
+  background-color: @linkColor;
+}
+.nav-list [class^="icon-"] {
+  margin-right: 2px;
+}
+// Dividers (basically an hr) within the dropdown
+.nav-list .divider {
+  .nav-divider();
+}
+
+
+
+// TABS AND PILLS
+// -------------
+
+// Common styles
+.nav-tabs,
+.nav-pills {
+  .clearfix();
+}
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px; // keeps the overall height an even number
+}
+
+// TABS
+// ----
+
+// Give the tabs something to sit on
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+// Make the list-items overlay the bottom border
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+// Actual tabs (as links)
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: @baseLineHeight;
+  border: 1px solid transparent;
+  .border-radius(4px 4px 0 0);
+  &:hover {
+    border-color: @grayLighter @grayLighter #ddd;
+  }
+}
+// Active state, and it's :hover to override normal :hover
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
+  color: @gray;
+  background-color: @white;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+
+
+// PILLS
+// -----
+
+// Links rendered as pills
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  .border-radius(5px);
+}
+
+// Active state
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover {
+  color: @white;
+  background-color: @linkColor;
+}
+
+
+
+// STACKED NAV
+// -----------
+
+// Stacked tabs and pills
+.nav-stacked > li {
+  float: none;
+}
+.nav-stacked > li > a {
+  margin-right: 0; // no need for the gap between nav items
+}
+
+// Tabs
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  .border-radius(0);
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+  .border-radius(4px 4px 0 0);
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+  .border-radius(0 0 4px 4px);
+}
+.nav-tabs.nav-stacked > li > a:hover {
+  border-color: #ddd;
+  z-index: 2;
+}
+
+// Pills
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
+}
+
+
+
+// DROPDOWNS
+// ---------
+
+.nav-tabs .dropdown-menu {
+  .border-radius(0 0 5px 5px); // remove the top rounded corners here since there is a hard edge above the menu
+}
+.nav-pills .dropdown-menu {
+  .border-radius(4px); // make rounded corners match the pills
+}
+
+// Default dropdown links
+// -------------------------
+// Make carets use linkColor to start
+.nav-tabs .dropdown-toggle .caret,
+.nav-pills .dropdown-toggle .caret {
+  border-top-color: @linkColor;
+  border-bottom-color: @linkColor;
+  margin-top: 6px;
+}
+.nav-tabs .dropdown-toggle:hover .caret,
+.nav-pills .dropdown-toggle:hover .caret {
+  border-top-color: @linkColorHover;
+  border-bottom-color: @linkColorHover;
+}
+
+// Active dropdown links
+// -------------------------
+.nav-tabs .active .dropdown-toggle .caret,
+.nav-pills .active .dropdown-toggle .caret {
+  border-top-color: @grayDark;
+  border-bottom-color: @grayDark;
+}
+
+// Active:hover dropdown links
+// -------------------------
+.nav > .dropdown.active > a:hover {
+  color: @black;
+  cursor: pointer;
+}
+
+// Open dropdowns
+// -------------------------
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover {
+  color: @white;
+  background-color: @grayLight;
+  border-color: @grayLight;
+}
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret {
+  border-top-color: @white;
+  border-bottom-color: @white;
+  .opacity(100);
+}
+
+// Dropdowns in stacked tabs
+.tabs-stacked .open > a:hover {
+  border-color: @grayLight;
+}
+
+
+
+// TABBABLE
+// --------
+
+
+// COMMON STYLES
+// -------------
+
+// Clear any floats
+.tabbable {
+  .clearfix();
+}
+.tab-content {
+  overflow: auto; // prevent content from running below tabs
+}
+
+// Remove border on bottom, left, right
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+// Show/hide tabbable areas
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+
+// BOTTOM
+// ------
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below > .nav-tabs > li > a {
+  .border-radius(0 0 4px 4px);
+  &:hover {
+    border-bottom-color: transparent;
+    border-top-color: #ddd;
+  }
+}
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+// LEFT & RIGHT
+// ------------
+
+// Common styles
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+// Tabs on the left
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  .border-radius(4px 0 0 4px);
+}
+.tabs-left > .nav-tabs > li > a:hover {
+  border-color: @grayLighter #ddd @grayLighter @grayLighter;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: @white;
+}
+
+// Tabs on the right
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  .border-radius(0 4px 4px 0);
+}
+.tabs-right > .nav-tabs > li > a:hover {
+  border-color: @grayLighter @grayLighter @grayLighter #ddd;
+}
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: @white;
+}
diff --git a/less/pager.less b/less/pager.less
new file mode 100644
index 0000000000..4244b5eb80
--- /dev/null
+++ b/less/pager.less
@@ -0,0 +1,36 @@
+// PAGER
+// -----
+
+.pager {
+  margin-left: 0;
+  margin-bottom: @baseLineHeight;
+  list-style: none;
+  text-align: center;
+  .clearfix();
+}
+.pager li {
+  display: inline;
+}
+.pager a {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  .border-radius(15px);
+}
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+.pager .next a {
+  float: right;
+}
+.pager .previous a {
+  float: left;
+}
+.pager .disabled a,
+.pager .disabled a:hover {
+  color: @grayLight;
+  background-color: #fff;
+  cursor: default;
+}
\ No newline at end of file
diff --git a/less/pagination.less b/less/pagination.less
new file mode 100644
index 0000000000..38cf65cc44
--- /dev/null
+++ b/less/pagination.less
@@ -0,0 +1,56 @@
+// PAGINATION
+// ----------
+
+.pagination {
+  height: @baseLineHeight * 2;
+  margin: @baseLineHeight 0;
+ }
+.pagination ul {
+  display: inline-block;
+  .ie7-inline-block();
+  margin-left: 0;
+  margin-bottom: 0;
+  .border-radius(3px);
+  .box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+.pagination li {
+    display: inline;
+  }
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: (@baseLineHeight * 2) - 2;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination a:hover,
+.pagination .active a {
+  background-color: #f5f5f5;
+}
+.pagination .active a {
+  color: @grayLight;
+  cursor: default;
+}
+.pagination .disabled span,
+.pagination .disabled a,
+.pagination .disabled a:hover {
+  color: @grayLight;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination li:first-child a {
+  border-left-width: 1px;
+  .border-radius(3px 0 0 3px);
+}
+.pagination li:last-child a {
+  .border-radius(0 3px 3px 0);
+}
+
+// Centered
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
diff --git a/less/popovers.less b/less/popovers.less
new file mode 100644
index 0000000000..558d99ec99
--- /dev/null
+++ b/less/popovers.less
@@ -0,0 +1,49 @@
+// POPOVERS
+// --------
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: @zindexPopover;
+  display: none;
+  padding: 5px;
+  &.top    { margin-top:  -5px; }
+  &.right  { margin-left:  5px; }
+  &.bottom { margin-top:   5px; }
+  &.left   { margin-left: -5px; }
+  &.top .arrow    { #popoverArrow > .top(); }
+  &.right .arrow  { #popoverArrow > .right(); }
+  &.bottom .arrow { #popoverArrow > .bottom(); }
+  &.left .arrow   { #popoverArrow > .left();  }
+  .arrow {
+    position: absolute;
+    width: 0;
+    height: 0;
+  }
+}
+.popover-inner {
+  padding: 3px;
+  width: 280px;
+  overflow: hidden;
+  background: @black; // has to be full background declaration for IE fallback
+  background: rgba(0,0,0,.8);
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-title {
+  padding: 9px 15px;
+  line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom:1px solid #eee;
+  .border-radius(3px 3px 0 0);
+}
+.popover-content {
+  padding: 14px;
+  background-color: @white;
+  .border-radius(0 0 3px 3px);
+  .background-clip(padding-box);
+  p, ul, ol {
+    margin-bottom: 0;
+  }
+}
diff --git a/less/progress-bars.less b/less/progress-bars.less
new file mode 100644
index 0000000000..3b47e64828
--- /dev/null
+++ b/less/progress-bars.less
@@ -0,0 +1,117 @@
+// PROGRESS BARS
+// -------------
+
+
+// ANIMATIONS
+// ----------
+
+// Webkit
+@-webkit-keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+// Firefox
+@-moz-keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+// IE9
+@-ms-keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+// Opera
+@-o-keyframes progress-bar-stripes {
+  from  { background-position: 0 0; }
+  to    { background-position: 40px 0; }
+}
+
+// Spec
+@keyframes progress-bar-stripes {
+  from  { background-position: 40px 0; }
+  to    { background-position: 0 0; }
+}
+
+
+
+// THE BARS
+// --------
+
+// Outer container
+.progress {
+  overflow: hidden;
+  height: 18px;
+  margin-bottom: 18px;
+  #gradient > .vertical(#f5f5f5, #f9f9f9);
+  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+  .border-radius(4px);
+}
+
+// Bar of progress
+.progress .bar {
+  width: 0%;
+  height: 18px;
+  color: @white;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  #gradient > .vertical(#149bdf, #0480be);
+  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
+  .box-sizing(border-box);
+  .transition(width .6s ease);
+}
+
+// Striped bars
+.progress-striped .bar {
+  #gradient > .striped(#149bdf);
+  .background-size(40px 40px);
+}
+
+// Call animation for the active one
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+
+
+// COLORS
+// ------
+
+// Danger (red)
+.progress-danger .bar {
+  #gradient > .vertical(#ee5f5b, #c43c35);
+}
+.progress-danger.progress-striped .bar {
+  #gradient > .striped(#ee5f5b);
+}
+
+// Success (green)
+.progress-success .bar {
+  #gradient > .vertical(#62c462, #57a957);
+}
+.progress-success.progress-striped .bar {
+  #gradient > .striped(#62c462);
+}
+
+// Info (teal)
+.progress-info .bar {
+  #gradient > .vertical(#5bc0de, #339bb9);
+}
+.progress-info.progress-striped .bar {
+  #gradient > .striped(#5bc0de);
+}
+
+// Warning (orange)
+.progress-warning .bar {
+  #gradient > .vertical(lighten(@orange, 15%), @orange);
+}
+.progress-warning.progress-striped .bar {
+  #gradient > .striped(lighten(@orange, 15%));
+}
diff --git a/less/reset.less b/less/reset.less
new file mode 100644
index 0000000000..2332e03c30
--- /dev/null
+++ b/less/reset.less
@@ -0,0 +1,131 @@
+// Reset.less
+// Adapted from Normalize.css http://github.com/necolas/normalize.css
+// ------------------------------------------------------------------------
+
+// Display in IE6-9 and FF3
+// -------------------------
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+// Display block in IE6-9 and FF3
+// -------------------------
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+// Prevents modern browsers from displaying 'audio' without controls
+// -------------------------
+
+audio:not([controls]) {
+    display: none;
+}
+
+// Base settings
+// -------------------------
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+// Focus states
+a:focus {
+  .tab-focus();
+}
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}
+
+// Prevents sub and sup affecting line-height in all browsers
+// -------------------------
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+
+// Img border in a's and image quality
+// -------------------------
+
+img {
+  max-width: 100%; // Make images inherently responsive
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+// Prevent max-width from affecting Google Maps
+#map_canvas img {
+  max-width: none;
+}
+
+// Forms
+// -------------------------
+
+// Font size in all browsers, margin changes, misc consistency
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+button,
+input {
+  *overflow: visible; // Inner spacing ie IE6/7
+  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
+  padding: 0;
+  border: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer; // Cursors on all buttons applied consistently
+  -webkit-appearance: button; // Style clickable inputs in iOS
+}
+input[type="search"] { // Appearance in Safari/Chrome
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
+}
+textarea {
+  overflow: auto; // Remove vertical scrollbar in IE6-9
+  vertical-align: top; // Readability and alignment cross-browser
+}
diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less
new file mode 100644
index 0000000000..a7c9f4e004
--- /dev/null
+++ b/less/responsive-1200px-min.less
@@ -0,0 +1,26 @@
+// LARGE DESKTOP & UP
+// ------------------
+
+@media (min-width: 1200px) {
+
+  // Fixed grid
+  #grid > .core(70px, 30px);
+
+  // Fluid grid
+  #grid > .fluid(5.982905983%, 2.564102564%);
+
+  // Input grid
+  #grid > .input(70px, 30px);
+
+  // Thumbnails
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+
+}
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
new file mode 100644
index 0000000000..614c6905c2
--- /dev/null
+++ b/less/responsive-767px-max.less
@@ -0,0 +1,149 @@
+// UP TO LANDSCAPE PHONE
+// ---------------------
+
+@media (max-width: 480px) {
+
+  // Smooth out the collapsing/expanding nav
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
+  }
+
+  // Block level the page header small tag for readability
+  .page-header h1 small {
+    display: block;
+    line-height: @baseLineHeight;
+  }
+
+  // Update checkboxes for iOS
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+
+  // Remove the horizontal form styles
+  .form-horizontal .control-group > label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  // Move over all input controls and content
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  // Move the options list down to align with labels
+  .form-horizontal .control-list {
+    padding-top: 0; // has to be padding because margin collaspes
+  }
+  // Move over buttons in .form-actions to align with .controls
+  .form-horizontal .form-actions {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+
+  // Modals
+  .modal {
+    position: absolute;
+    top:   10px;
+    left:  10px;
+    right: 10px;
+    width: auto;
+    margin: 0;
+    &.fade.in { top: auto; }
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+
+  // Carousel
+  .carousel-caption {
+    position: static;
+  }
+
+}
+
+
+
+// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
+// --------------------------------------------------
+
+@media (max-width: 767px) {
+
+  // Padding to set content in a bit
+  body {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  // Negative indent the now static "fixed" navbar
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    margin-left: -20px;
+    margin-right: -20px;
+  }
+  // Remove padding on container given explicit padding set on body
+  .container-fluid {
+    padding: 0;
+  }
+
+  // TYPOGRAPHY
+  // ----------
+  // Reset horizontal dl
+  .dl-horizontal {
+    dt {
+      float: none;
+      clear: none;
+      width: auto;
+      text-align: left;
+    }
+    dd {
+      margin-left: 0;
+    }
+  }
+
+  // GRID & CONTAINERS
+  // -----------------
+  // Remove width from containers
+  .container {
+    width: auto;
+  }
+  // Fluid rows
+  .row-fluid {
+    width: 100%;
+  }
+  // Undo negative margin on rows and thumbnails
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  // Make all grid-sized elements block level again
+  [class*="span"],
+  .row-fluid [class*="span"] {
+    float: none;
+    display: block;
+    width: auto;
+    margin-left: 0;
+  }
+
+  // FORM FIELDS
+  // -----------
+  // Make span* classes full width
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    .input-block-level();
+  }
+  // But don't let it screw up prepend/append inputs
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block; // redeclare so they don't wrap to new lines
+    width: auto;
+  }
+
+}
diff --git a/less/responsive-768px-979px.less b/less/responsive-768px-979px.less
new file mode 100644
index 0000000000..76f4f6df15
--- /dev/null
+++ b/less/responsive-768px-979px.less
@@ -0,0 +1,17 @@
+// PORTRAIT TABLET TO DEFAULT DESKTOP
+// ----------------------------------
+
+@media (min-width: 768px) and (max-width: 979px) {
+
+  // Fixed grid
+  #grid > .core(42px, 20px);
+
+  // Fluid grid
+  #grid > .fluid(5.801104972%, 2.762430939%);
+
+  // Input grid
+  #grid > .input(42px, 20px);
+
+  // No need to reset .thumbnails here since it's the same @gridGutterWidth
+
+}
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
new file mode 100644
index 0000000000..8d31db5310
--- /dev/null
+++ b/less/responsive-navbar.less
@@ -0,0 +1,153 @@
+// TABLETS AND BELOW
+// -----------------
+@media (max-width: 979px) {
+
+  // UNFIX THE TOPBAR
+  // ----------------
+  // Remove any padding from the body
+  body {
+    padding-top: 0;
+  }
+  // Unfix the navbar
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: @baseLineHeight;
+  }
+  .navbar-fixed-bottom {
+    margin-top: @baseLineHeight;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  // Account for brand name
+  .navbar .brand {
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0 0 0 -5px;
+  }
+
+  // COLLAPSIBLE NAVBAR
+  // ------------------
+  // Nav collapse clears brand
+  .nav-collapse {
+    clear: both;
+  }
+  // Block-level the nav
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 (@baseLineHeight / 2);
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: @navbarText;
+    text-shadow: none;
+  }
+  // Nav and dropdown links in navbar
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 6px 15px;
+    font-weight: bold;
+    color: @navbarLinkColor;
+    .border-radius(3px);
+  }
+  // Buttons
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    .border-radius(4px);
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .dropdown-menu a:hover {
+    background-color: @navbarBackground;
+  }
+  // Buttons in the navbar
+  .nav-collapse.in .btn-group {
+    margin-top: 5px;
+    padding: 0;
+  }
+  // Dropdowns in the navbar
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    float: none;
+    display: block;
+    max-width: none;
+    margin: 0 15px;
+    padding: 0;
+    background-color: transparent;
+    border: none;
+    .border-radius(0);
+    .box-shadow(none);
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  // Forms in navbar
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: (@baseLineHeight / 2) 15px;
+    margin: (@baseLineHeight / 2) 0;
+    border-top: 1px solid @navbarBackground;
+    border-bottom: 1px solid @navbarBackground;
+    .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
+  }
+  // Pull right (secondary) nav content
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  // Hide everything in the navbar save .brand and toggle button */
+  .nav-collapse,
+  .nav-collapse.collapse {
+    overflow: hidden;
+    height: 0;
+  }
+  // Navbar button
+  .navbar .btn-navbar {
+    display: block;
+  }
+
+  // STATIC NAVBAR
+  // -------------
+  .navbar-static .navbar-inner {
+    padding-left:  10px;
+    padding-right: 10px;
+  }
+}
+
+
+// DEFAULT DESKTOP
+// ---------------
+
+// Required to make the collapsing navbar work on regular desktops
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
\ No newline at end of file
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less
new file mode 100644
index 0000000000..572846c0fa
--- /dev/null
+++ b/less/responsive-utilities.less
@@ -0,0 +1,41 @@
+// RESPONSIVE CLASSES
+// ------------------
+
+// Hide from screenreaders and browsers
+// Credit: HTML5 Boilerplate
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+// Visibility utilities
+
+// For desktops
+.visible-phone     { display: none !important; }
+.visible-tablet    { display: none !important; }
+.visible-desktop   { } // Don't set initially
+.hidden-phone      { }
+.hidden-tablet     { }
+.hidden-desktop    { display: none !important; }
+
+// Phones only
+@media (max-width: 767px) {
+  // Show
+  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
+  // Hide
+  .hidden-phone      { display: none !important; }
+  // Hide everything else
+  .hidden-desktop    { display: inherit !important; }
+  .visible-desktop   { display: none !important; }
+}
+
+// Tablets & small desktops only
+@media (min-width: 768px) and (max-width: 979px) {
+  // Show
+  .visible-tablet    { display: inherit !important; }
+  // Hide
+  .hidden-tablet     { display: none !important; }
+  // Hide everything else
+  .hidden-desktop    { display: inherit !important; }
+  .visible-desktop   { display: none !important ; }
+}
diff --git a/less/responsive.less b/less/responsive.less
new file mode 100644
index 0000000000..734b1988bf
--- /dev/null
+++ b/less/responsive.less
@@ -0,0 +1,48 @@
+/*!
+ * Bootstrap Responsive v2.0.4
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+
+// Responsive.less
+// For phone and tablet devices
+// -------------------------------------------------------------
+
+
+// REPEAT VARIABLES & MIXINS
+// -------------------------
+// Required since we compile the responsive stuff separately
+
+@import "variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "mixins.less";
+
+
+// RESPONSIVE CLASSES
+// ------------------
+
+@import "responsive-utilities.less";
+
+
+// MEDIA QUERIES
+// ------------------
+
+// Phones to portrait tablets and narrow desktops
+@import "responsive-767px-max.less";
+
+// Tablets to regular desktops
+@import "responsive-768px-979px.less";
+
+// Large desktops
+@import "responsive-1200px-min.less";
+
+
+// RESPONSIVE NAVBAR
+// ------------------
+
+// From 979px and below, show a button to toggle navbar contents
+@import "responsive-navbar.less";
diff --git a/less/scaffolding.less b/less/scaffolding.less
new file mode 100644
index 0000000000..57c74eda07
--- /dev/null
+++ b/less/scaffolding.less
@@ -0,0 +1,29 @@
+// Scaffolding
+// Basic and global styles for generating a grid system, structural layout, and page templates
+// -------------------------------------------------------------------------------------------
+
+
+// Body reset
+// ----------
+
+body {
+  margin: 0;
+  font-family: @baseFontFamily;
+  font-size: @baseFontSize;
+  line-height: @baseLineHeight;
+  color: @textColor;
+  background-color: @bodyBackground;
+}
+
+
+// Links
+// -----
+
+a {
+  color: @linkColor;
+  text-decoration: none;
+}
+a:hover {
+  color: @linkColorHover;
+  text-decoration: underline;
+}
diff --git a/less/sprites.less b/less/sprites.less
new file mode 100644
index 0000000000..72a3a916b6
--- /dev/null
+++ b/less/sprites.less
@@ -0,0 +1,191 @@
+// SPRITES
+// Glyphs and icons for buttons, nav, and more
+// -------------------------------------------
+
+
+// ICONS
+// -----
+
+// All icons receive the styles of the <i> tag with a base class
+// of .i and are then given a unique class to add width, height,
+// and background-position. Your resulting HTML will look like
+// <i class="icon-inbox"></i>.
+
+// For the white version of the icons, just add the .icon-white class:
+// <i class="icon-inbox icon-white"></i>
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  .ie7-restore-right-whitespace();
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("@{iconSpritePath}");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+
+}
+.icon-white {
+  background-image: url("@{iconWhiteSpritePath}");
+}
+
+.icon-glass              { background-position: 0      0; }
+.icon-music              { background-position: -24px  0; }
+.icon-search             { background-position: -48px  0; }
+.icon-envelope           { background-position: -72px  0; }
+.icon-heart              { background-position: -96px  0; }
+.icon-star               { background-position: -120px 0; }
+.icon-star-empty         { background-position: -144px 0; }
+.icon-user               { background-position: -168px 0; }
+.icon-film               { background-position: -192px 0; }
+.icon-th-large           { background-position: -216px 0; }
+.icon-th                 { background-position: -240px 0; }
+.icon-th-list            { background-position: -264px 0; }
+.icon-ok                 { background-position: -288px 0; }
+.icon-remove             { background-position: -312px 0; }
+.icon-zoom-in            { background-position: -336px 0; }
+.icon-zoom-out           { background-position: -360px 0; }
+.icon-off                { background-position: -384px 0; }
+.icon-signal             { background-position: -408px 0; }
+.icon-cog                { background-position: -432px 0; }
+.icon-trash              { background-position: -456px 0; }
+
+.icon-home               { background-position: 0      -24px; }
+.icon-file               { background-position: -24px  -24px; }
+.icon-time               { background-position: -48px  -24px; }
+.icon-road               { background-position: -72px  -24px; }
+.icon-download-alt       { background-position: -96px  -24px; }
+.icon-download           { background-position: -120px -24px; }
+.icon-upload             { background-position: -144px -24px; }
+.icon-inbox              { background-position: -168px -24px; }
+.icon-play-circle        { background-position: -192px -24px; }
+.icon-repeat             { background-position: -216px -24px; }
+.icon-refresh            { background-position: -240px -24px; }
+.icon-list-alt           { background-position: -264px -24px; }
+.icon-lock               { background-position: -287px -24px; } // 1px off
+.icon-flag               { background-position: -312px -24px; }
+.icon-headphones         { background-position: -336px -24px; }
+.icon-volume-off         { background-position: -360px -24px; }
+.icon-volume-down        { background-position: -384px -24px; }
+.icon-volume-up          { background-position: -408px -24px; }
+.icon-qrcode             { background-position: -432px -24px; }
+.icon-barcode            { background-position: -456px -24px; }
+
+.icon-tag                { background-position: 0      -48px; }
+.icon-tags               { background-position: -25px  -48px; } // 1px off
+.icon-book               { background-position: -48px  -48px; }
+.icon-bookmark           { background-position: -72px  -48px; }
+.icon-print              { background-position: -96px  -48px; }
+.icon-camera             { background-position: -120px -48px; }
+.icon-font               { background-position: -144px -48px; }
+.icon-bold               { background-position: -167px -48px; } // 1px off
+.icon-italic             { background-position: -192px -48px; }
+.icon-text-height        { background-position: -216px -48px; }
+.icon-text-width         { background-position: -240px -48px; }
+.icon-align-left         { background-position: -264px -48px; }
+.icon-align-center       { background-position: -288px -48px; }
+.icon-align-right        { background-position: -312px -48px; }
+.icon-align-justify      { background-position: -336px -48px; }
+.icon-list               { background-position: -360px -48px; }
+.icon-indent-left        { background-position: -384px -48px; }
+.icon-indent-right       { background-position: -408px -48px; }
+.icon-facetime-video     { background-position: -432px -48px; }
+.icon-picture            { background-position: -456px -48px; }
+
+.icon-pencil             { background-position: 0      -72px; }
+.icon-map-marker         { background-position: -24px  -72px; }
+.icon-adjust             { background-position: -48px  -72px; }
+.icon-tint               { background-position: -72px  -72px; }
+.icon-edit               { background-position: -96px  -72px; }
+.icon-share              { background-position: -120px -72px; }
+.icon-check              { background-position: -144px -72px; }
+.icon-move               { background-position: -168px -72px; }
+.icon-step-backward      { background-position: -192px -72px; }
+.icon-fast-backward      { background-position: -216px -72px; }
+.icon-backward           { background-position: -240px -72px; }
+.icon-play               { background-position: -264px -72px; }
+.icon-pause              { background-position: -288px -72px; }
+.icon-stop               { background-position: -312px -72px; }
+.icon-forward            { background-position: -336px -72px; }
+.icon-fast-forward       { background-position: -360px -72px; }
+.icon-step-forward       { background-position: -384px -72px; }
+.icon-eject              { background-position: -408px -72px; }
+.icon-chevron-left       { background-position: -432px -72px; }
+.icon-chevron-right      { background-position: -456px -72px; }
+
+.icon-plus-sign          { background-position: 0      -96px; }
+.icon-minus-sign         { background-position: -24px  -96px; }
+.icon-remove-sign        { background-position: -48px  -96px; }
+.icon-ok-sign            { background-position: -72px  -96px; }
+.icon-question-sign      { background-position: -96px  -96px; }
+.icon-info-sign          { background-position: -120px -96px; }
+.icon-screenshot         { background-position: -144px -96px; }
+.icon-remove-circle      { background-position: -168px -96px; }
+.icon-ok-circle          { background-position: -192px -96px; }
+.icon-ban-circle         { background-position: -216px -96px; }
+.icon-arrow-left         { background-position: -240px -96px; }
+.icon-arrow-right        { background-position: -264px -96px; }
+.icon-arrow-up           { background-position: -289px -96px; } // 1px off
+.icon-arrow-down         { background-position: -312px -96px; }
+.icon-share-alt          { background-position: -336px -96px; }
+.icon-resize-full        { background-position: -360px -96px; }
+.icon-resize-small       { background-position: -384px -96px; }
+.icon-plus               { background-position: -408px -96px; }
+.icon-minus              { background-position: -433px -96px; }
+.icon-asterisk           { background-position: -456px -96px; }
+
+.icon-exclamation-sign   { background-position: 0      -120px; }
+.icon-gift               { background-position: -24px  -120px; }
+.icon-leaf               { background-position: -48px  -120px; }
+.icon-fire               { background-position: -72px  -120px; }
+.icon-eye-open           { background-position: -96px  -120px; }
+.icon-eye-close          { background-position: -120px -120px; }
+.icon-warning-sign       { background-position: -144px -120px; }
+.icon-plane              { background-position: -168px -120px; }
+.icon-calendar           { background-position: -192px -120px; }
+.icon-random             { background-position: -216px -120px; }
+.icon-comment            { background-position: -240px -120px; }
+.icon-magnet             { background-position: -264px -120px; }
+.icon-chevron-up         { background-position: -288px -120px; }
+.icon-chevron-down       { background-position: -313px -119px; } // 1px, 1px off
+.icon-retweet            { background-position: -336px -120px; }
+.icon-shopping-cart      { background-position: -360px -120px; }
+.icon-folder-close       { background-position: -384px -120px; }
+.icon-folder-open        { background-position: -408px -120px; }
+.icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
+.icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off
+
+.icon-hdd                     { background-position: 0      -144px; }
+.icon-bullhorn                { background-position: -24px  -144px; }
+.icon-bell                    { background-position: -48px  -144px; }
+.icon-certificate             { background-position: -72px  -144px; }
+.icon-thumbs-up               { background-position: -96px  -144px; }
+.icon-thumbs-down             { background-position: -120px -144px; }
+.icon-hand-right              { background-position: -144px -144px; }
+.icon-hand-left               { background-position: -168px -144px; }
+.icon-hand-up                 { background-position: -192px -144px; }
+.icon-hand-down               { background-position: -216px -144px; }
+.icon-circle-arrow-right      { background-position: -240px -144px; }
+.icon-circle-arrow-left       { background-position: -264px -144px; }
+.icon-circle-arrow-up         { background-position: -288px -144px; }
+.icon-circle-arrow-down       { background-position: -312px -144px; }
+.icon-globe                   { background-position: -336px -144px; }
+.icon-wrench                  { background-position: -360px -144px; }
+.icon-tasks                   { background-position: -384px -144px; }
+.icon-filter                  { background-position: -408px -144px; }
+.icon-briefcase               { background-position: -432px -144px; }
+.icon-fullscreen              { background-position: -456px -144px; }
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/less/tables.less b/less/tables.less
new file mode 100644
index 0000000000..b4f6027bf9
--- /dev/null
+++ b/less/tables.less
@@ -0,0 +1,176 @@
+//
+// Tables.less
+// Tables for, you guessed it, tabular data
+// ----------------------------------------
+
+
+// BASE TABLES
+// -----------------
+
+table {
+  max-width: 100%;
+  background-color: @tableBackground;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+// BASELINE STYLES
+// ---------------
+
+.table {
+  width: 100%;
+  margin-bottom: @baseLineHeight;
+  // Cells
+  th,
+  td {
+    padding: 8px;
+    line-height: @baseLineHeight;
+    text-align: left;
+    vertical-align: top;
+    border-top: 1px solid @tableBorder;
+  }
+  th {
+    font-weight: bold;
+  }
+  // Bottom align for column headings
+  thead th {
+    vertical-align: bottom;
+  }
+  // Remove top border from thead by default
+  caption + thead tr:first-child th,
+  caption + thead tr:first-child td,
+  colgroup + thead tr:first-child th,
+  colgroup + thead tr:first-child td,
+  thead:first-child tr:first-child th,
+  thead:first-child tr:first-child td {
+    border-top: 0;
+  }
+  // Account for multiple tbody instances
+  tbody + tbody {
+    border-top: 2px solid @tableBorder;
+  }
+}
+
+
+
+// CONDENSED TABLE W/ HALF PADDING
+// -------------------------------
+
+.table-condensed {
+  th,
+  td {
+    padding: 4px 5px;
+  }
+}
+
+
+// BORDERED VERSION
+// ----------------
+
+.table-bordered {
+  border: 1px solid @tableBorder;
+  border-collapse: separate; // Done so we can round those corners!
+  *border-collapse: collapsed; // IE7 can't round corners anyway
+  border-left: 0;
+  .border-radius(4px);
+  th,
+  td {
+    border-left: 1px solid @tableBorder;
+  }
+  // Prevent a double border
+  caption + thead tr:first-child th,
+  caption + tbody tr:first-child th,
+  caption + tbody tr:first-child td,
+  colgroup + thead tr:first-child th,
+  colgroup + tbody tr:first-child th,
+  colgroup + tbody tr:first-child td,
+  thead:first-child tr:first-child th,
+  tbody:first-child tr:first-child th,
+  tbody:first-child tr:first-child td {
+    border-top: 0;
+  }
+  // For first th or td in the first row in the first thead or tbody
+  thead:first-child tr:first-child th:first-child,
+  tbody:first-child tr:first-child td:first-child {
+    -webkit-border-top-left-radius: 4px;
+            border-top-left-radius: 4px;
+        -moz-border-radius-topleft: 4px;
+  }
+  thead:first-child tr:first-child th:last-child,
+  tbody:first-child tr:first-child td:last-child {
+    -webkit-border-top-right-radius: 4px;
+            border-top-right-radius: 4px;
+        -moz-border-radius-topright: 4px;
+  }
+  // For first th or td in the first row in the first thead or tbody
+  thead:last-child tr:last-child th:first-child,
+  tbody:last-child tr:last-child td:first-child {
+    .border-radius(0 0 0 4px);
+    -webkit-border-bottom-left-radius: 4px;
+            border-bottom-left-radius: 4px;
+        -moz-border-radius-bottomleft: 4px;
+  }
+  thead:last-child tr:last-child th:last-child,
+  tbody:last-child tr:last-child td:last-child {
+    -webkit-border-bottom-right-radius: 4px;
+            border-bottom-right-radius: 4px;
+        -moz-border-radius-bottomright: 4px;
+  }
+}
+
+
+// ZEBRA-STRIPING
+// --------------
+
+// Default zebra-stripe styles (alternating gray and transparent backgrounds)
+.table-striped {
+  tbody {
+    tr:nth-child(odd) td,
+    tr:nth-child(odd) th {
+      background-color: @tableBackgroundAccent;
+    }
+  }
+}
+
+
+// HOVER EFFECT
+// ------------
+// Placed here since it has to come after the potential zebra striping
+.table {
+  tbody tr:hover td,
+  tbody tr:hover th {
+    background-color: @tableBackgroundHover;
+  }
+}
+
+
+// TABLE CELL SIZING
+// -----------------
+
+// Change the columns
+table {
+  .span1     { .tableColumns(1); }
+  .span2     { .tableColumns(2); }
+  .span3     { .tableColumns(3); }
+  .span4     { .tableColumns(4); }
+  .span5     { .tableColumns(5); }
+  .span6     { .tableColumns(6); }
+  .span7     { .tableColumns(7); }
+  .span8     { .tableColumns(8); }
+  .span9     { .tableColumns(9); }
+  .span10    { .tableColumns(10); }
+  .span11    { .tableColumns(11); }
+  .span12    { .tableColumns(12); }
+  .span13    { .tableColumns(13); }
+  .span14    { .tableColumns(14); }
+  .span15    { .tableColumns(15); }
+  .span16    { .tableColumns(16); }
+  .span17    { .tableColumns(17); }
+  .span18    { .tableColumns(18); }
+  .span19    { .tableColumns(19); }
+  .span20    { .tableColumns(20); }
+  .span21    { .tableColumns(21); }
+  .span22    { .tableColumns(22); }
+  .span23    { .tableColumns(23); }
+  .span24    { .tableColumns(24); }
+}
diff --git a/less/tests/._css-tests.css b/less/tests/._css-tests.css
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/tests/._css-tests.html b/less/tests/._css-tests.html
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/tests/._forms.html b/less/tests/._forms.html
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/tests/._navbar.html b/less/tests/._navbar.html
new file mode 100644
index 0000000000000000000000000000000000000000..b43092fa16c9c9668504512e5ac504d5f698207c
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%&@kE9z|`73
zKR-PuHKxMIz&WERKR4Cd*~QV(*xA5D*V)O{RM*7K!b#V{*xW+b#MRi;z}4Ky(8a_U
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0I)(hfB*mh

literal 0
HcmV?d00001

diff --git a/less/tests/css-tests.css b/less/tests/css-tests.css
new file mode 100644
index 0000000000..e0870be449
--- /dev/null
+++ b/less/tests/css-tests.css
@@ -0,0 +1,52 @@
+/*!
+ * Bootstrap CSS Tests
+ */
+
+
+/* Remove background image */
+body {
+  background-image: none;
+}
+
+/* Space out subhead */
+.subhead {
+  margin-bottom: 36px;
+}
+h4 {
+  margin-bottom: 5px;
+}
+
+
+/* colgroup tests */
+.col1 {
+  background-color: rgba(255,0,0,.1);
+}
+.col2 {
+  background-color: rgba(0,255,0,.1);
+}
+.col3 {
+  background-color: rgba(0,0,255,.1);
+}
+
+
+/* Fluid row inputs */
+#rowInputs .row > [class*=span],
+#fluidRowInputs .row-fluid > [class*=span] {
+  background-color: rgba(255,0,0,.1);
+}
+
+
+/* Fluid grid */
+.fluid-grid {
+  margin-bottom: 45px;
+}
+.fluid-grid .row {
+  height: 40px;
+  padding-top: 10px;
+  margin-top: 10px;
+  color: #ddd;
+  text-align: center;
+}
+.fluid-grid .span1 {
+  background-color: #999;
+}
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
new file mode 100644
index 0000000000..b7177e5c68
--- /dev/null
+++ b/less/tests/css-tests.html
@@ -0,0 +1,917 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>CSS Tests · Twitter Bootstrap</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="../../docs/assets/css/docs.css" rel="stylesheet">
+    <link href="../../docs/assets/js/google-code-prettify/prettify.css" rel="stylesheet">
+
+    <!-- CSS just for the tests page -->
+    <link href="css-tests.css" rel="stylesheet">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+  </head>
+
+  <body>
+
+
+  <!-- Navbar
+    ================================================== -->
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="../../docs/index.html">Bootstrap</a>
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+
+
+<!-- Masthead
+================================================== -->
+<header class="jumbotron subhead" id="overview">
+  <h1>CSS Tests</h1>
+  <p class="lead">One stop shop for quick debugging and edge-case tests of CSS.</p>
+</header>
+
+
+
+
+<!-- Fluid grid
+================================================== -->
+
+<div class="page-header">
+  <h1>Fluid grids</h1>
+</div>
+
+<div class="fluid-grid">
+  <div class="row">
+    <div class="span12">12
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span11">11
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+    <div class="span1">1
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span10">10
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+    <div class="span2">2
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span9">9
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+    <div class="span3">3
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span8">8
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+    <div class="span4">4
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span7">7
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+    <div class="span5">5
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="span6">6
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+    <div class="span6">6
+      <div class="row-fluid">
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+        <div class="span1">1</div>
+      </div>
+    </div>
+  </div>
+</div> <!-- fluid grids -->
+
+
+
+<!-- Tables
+================================================== -->
+
+<div class="page-header">
+  <h1>Tables</h1>
+</div>
+
+<div class="row">
+  <div class="span6">
+    <h4>Bordered without thead</h4>
+    <table class="table table-bordered">
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+      </tbody>
+    </table>
+    <h4>Bordered without thead, with caption</h4>
+    <table class="table table-bordered">
+      <caption>Table caption</caption>
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+      </tbody>
+    </table>
+    <h4>Bordered without thead, with colgroup</h4>
+    <table class="table table-bordered">
+      <colgroup>
+        <col class="col1">
+        <col class="col2">
+        <col class="col3">
+      </colgroup>
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+      </tbody>
+    </table>
+    <h4>Bordered with thead, with colgroup</h4>
+    <table class="table table-bordered">
+      <colgroup>
+        <col class="col1">
+        <col class="col2">
+        <col class="col3">
+      </colgroup>
+      <thead>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+      </tbody>
+    </table>
+  </div><!--/span-->
+  <div class="span6">
+    <h4>Bordered with thead and caption</h4>
+    <table class="table table-bordered">
+      <caption>Table caption</caption>
+      <thead>
+        <tr>
+          <th>1</th>
+          <th>2</th>
+          <th>3</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2</td>
+          <td>3</td>
+        </tr>
+      </tbody>
+    </table>
+    <h4>Bordered with rowspan and colspan</h4>
+    <table class="table table-bordered">
+      <thead>
+        <tr>
+          <th>1</th>
+          <th>2</th>
+          <th>3</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td colspan="2">1 and 2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td rowspan="2">2</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td rowspan="2">1</td>
+          <td>3</td>
+        </tr>
+        <tr>
+          <td colspan="2">2 and 3</td>
+        </tr>
+      </tbody>
+    </table>
+  </div><!--/span-->
+</div><!--/row-->
+
+
+
+<!-- Forms
+================================================== -->
+
+<div class="page-header">
+  <h1>Forms</h1>
+</div>
+
+<div class="row">
+  <div class="span4">
+    <h4>Prepend and append on inputs</h4>
+    <form>
+      <div class="controls">
+        <div class="input-prepend">
+          <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-append">
+          <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-prepend input-append">
+          <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
+        </div>
+      </div>
+    </form>
+  </div><!--/span-->
+  <div class="span6">
+    <h4>Prepend and append with uneditable</h4>
+    <form>
+      <div class="input-prepend">
+        <span class="add-on">$</span><span class="span2 uneditable-input">Some value here</span>
+      </div>
+      <div class="input-append">
+        <span class="span2 uneditable-input">Some value here</span><span class="add-on">.00</span>
+      </div>
+    </form>
+  </div><!--/span-->
+</div><!--/row-->
+
+<h4>Fluid prepended and appended inputs</h4>
+<div class="row-fluid">
+  <div class="span6">
+    <form>
+      <div class="controls">
+        <div class="input-prepend">
+          <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-append">
+          <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
+        </div>
+      </div>
+      <div class="controls">
+        <div class="input-prepend input-append">
+          <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
+
+<h4>Fixed row with inputs</h4>
+<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
+
+<div class="rowInputs">
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span1" placeholder="span1">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span2" placeholder="span2">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span3" placeholder="span3">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span4" placeholder="span4">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span5" placeholder="span5">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span6" placeholder="span6">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span7" placeholder="span7">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span8" placeholder="span8">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span9" placeholder="span9">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span10" placeholder="span10">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span11" placeholder="span11">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row">
+    <div class="span12">
+      <input type="text" class="span12" placeholder="span12">
+    </div><!--/span-->
+  </div><!--/row-->
+</div>
+<br>
+
+<h4>Fluid row with inputs</h4>
+<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
+<div id="fluidRowInputs">
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span1" placeholder="span1">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span2" placeholder="span2">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span3" placeholder="span3">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span4" placeholder="span4">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span5" placeholder="span5">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span6" placeholder="span6">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span7" placeholder="span7">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span8" placeholder="span8">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span9" placeholder="span9">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span10" placeholder="span10">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span11" placeholder="span11">
+    </div><!--/span-->
+  </div><!--/row-->
+  <div class="row-fluid">
+    <div class="span12">
+      <input type="text" class="span12" placeholder="span12">
+    </div><!--/span-->
+  </div><!--/row-->
+</div>
+<br>
+
+
+<!-- Dropdowns
+================================================== -->
+
+<div class="page-header">
+  <h1>Dropdowns</h1>
+</div>
+
+<h4>Dropdown link with hash URL</h4>
+<ul class="nav nav-pills">
+  <li class="active"><a href="#">Link</a></li>
+  <li><a href="#">Example link</a></li>
+  <li class="dropdown">
+    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+      Dropdown <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <li><a href="#">Action</a></li>
+      <li><a href="#">Another action</a></li>
+      <li><a href="#">Something else here</a></li>
+      <li class="divider"></li>
+      <li><a href="#">Separated link</a></li>
+    </ul>
+  </li>
+</ul>
+
+<h4>Dropdown link with custom URL and data-target</h4>
+<ul class="nav nav-pills">
+  <li class="active"><a href="#">Link</a></li>
+  <li><a href="#">Example link</a></li>
+  <li class="dropdown">
+    <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
+      Dropdown <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <li><a href="#">Action</a></li>
+      <li><a href="#">Another action</a></li>
+      <li><a href="#">Something else here</a></li>
+      <li class="divider"></li>
+      <li><a href="#">Separated link</a></li>
+    </ul>
+  </li>
+</ul>
+
+<h4>Dropdown on a button</h4>
+<div style="position: relative;">
+  <button class="btn" type="button" data-toggle="dropdown">Dropdown <span class="caret"></span></button>
+  <ul class="dropdown-menu">
+    <li><a href="#">Action</a></li>
+    <li><a href="#">Another action</a></li>
+    <li><a href="#">Something else here</a></li>
+    <li class="divider"></li>
+    <li><a href="#">Separated link</a></li>
+  </ul>
+</div>
+
+<br>
+
+
+<!-- Thumbnails
+================================================== -->
+
+<div class="page-header">
+  <h1>Thumbnails</h1>
+</div>
+
+<h4>Default thumbnails (no grid sizing)</h4>
+<ul class="thumbnails">
+  <li class="thumbnail">
+    <img src="http://placehold.it/260x180" alt="">
+  </li>
+  <li class="thumbnail">
+    <img src="http://placehold.it/260x180" alt="">
+  </li>
+  <li class="thumbnail">
+    <img src="http://placehold.it/260x180" alt="">
+  </li>
+  <li class="thumbnail">
+    <img src="http://placehold.it/260x180" alt="">
+  </li>
+</ul>
+
+<!-- NOT CURRENTLY SUPPORTED
+<h4>Offset thumbnails</h4>
+<ul class="thumbnails">
+  <li class="span3 offset3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+</ul>
+-->
+
+<h4>Standard grid sizing</h4>
+<ul class="thumbnails">
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3 offset3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+  <li class="span3">
+    <a href="#" class="thumbnail">
+      <img src="http://placehold.it/260x180" alt="">
+    </a>
+  </li>
+</ul>
+
+<h4>Fluid thumbnails</h4>
+<div class="row-fluid">
+  <div class="span8">
+    <ul class="thumbnails">
+      <li class="span4">
+        <a href="#" class="thumbnail">
+          <img src="http://placehold.it/260x180" alt="">
+        </a>
+      </li>
+      <li class="span4">
+        <a href="#" class="thumbnail">
+          <img src="http://placehold.it/260x180" alt="">
+        </a>
+      </li>
+      <li class="span4">
+        <a href="#" class="thumbnail">
+          <img src="http://placehold.it/260x180" alt="">
+        </a>
+      </li>
+    </ul>
+  </div>
+</div>
+
+
+
+<!-- Tabs
+================================================== -->
+
+<div class="page-header">
+  <h1>Tabs</h1>
+</div>
+
+<div class="tabbable tabs-left" style="margin-bottom: 18px;">
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="#tab1" data-toggle="tab">Section 1</a></li>
+    <li><a href="#tab2" data-toggle="tab">Section 2</a></li>
+    <li><a href="#tab3" data-toggle="tab">Section 3</a></li>
+  </ul>
+  <div class="tab-content" style="padding-bottom: 9px; border-bottom: 1px solid #ddd;">
+    <div class="tab-pane active" id="tab1">
+      <p>I'm in Section 1.</p>
+
+      <div class="tabbable" style="background: #f5f5f5; padding: 20px;">
+        <ul class="nav nav-tabs">
+          <li class="active"><a href="#tab1-1" data-toggle="tab">1.1</a></li>
+          <li><a href="#tab1-2" data-toggle="tab">1.2</a></li>
+          <li><a href="#tab1-3" data-toggle="tab">1.3</a></li>
+        </ul>
+        <div class="tab-content" style="padding-bottom: 9px; border-bottom: 1px solid #ddd;">
+          <div class="tab-pane active" id="tab1-1">
+            <p>I'm in Section 1.1.</p>
+          </div>
+          <div class="tab-pane" id="tab1-2">
+            <p>I'm in Section 1.2.</p>
+          </div>
+          <div class="tab-pane" id="tab1-3">
+            <p>I'm in Section 1.3.</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="tab-pane" id="tab2">
+      <p>Howdy, I'm in Section 2.</p>
+    </div>
+    <div class="tab-pane" id="tab3">
+      <p>What up girl, this is Section 3.</p>
+    </div>
+  </div>
+</div> <!-- /tabbable -->
+
+
+
+<!-- Labels
+================================================== -->
+
+<div class="page-header">
+  <h1>Labels</h1>
+</div>
+
+<div class="row">
+  <div class="span4">
+    <h4>Inline label</h4>
+    <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Maecenas sed diam <span class="label label-warning">Label name</span> eget risus varius blandit sit amet non magna. Fusce <code>.class-name</code> dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
+  </div><!--/span-->
+  <div class="span4">
+    <form class="form-horizontal">
+      <label>Example label</label>
+      <input type="text" placeholder="Input"> <span class="help-inline"><span class="label">Hey!</span> Read this.</span>
+    </form>
+  </div><!--/span-->
+  <div class="span4">
+
+  </div><!--/span-->
+</div><!--/row-->
+
+
+
+
+
+
+
+     <!-- Footer
+      ================================================== -->
+      <footer class="footer">
+        <p class="pull-right"><a href="#">Back to top</a></p>
+        <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
+        <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+        <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+      </footer>
+
+    </div><!-- /container -->
+
+
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+    <script src="../../docs/assets/js/jquery.js"></script>
+    <script src="../../docs/assets/js/google-code-prettify/prettify.js"></script>
+    <script src="../../docs/assets/js/bootstrap-transition.js"></script>
+    <script src="../../docs/assets/js/bootstrap-alert.js"></script>
+    <script src="../../docs/assets/js/bootstrap-modal.js"></script>
+    <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
+    <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
+    <script src="../../docs/assets/js/bootstrap-tab.js"></script>
+    <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
+    <script src="../../docs/assets/js/bootstrap-popover.js"></script>
+    <script src="../../docs/assets/js/bootstrap-button.js"></script>
+    <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
+    <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
+    <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
+    <script src="../../docs/assets/js/application.js"></script>
+
+
+  </body>
+</html>
diff --git a/less/tests/forms.html b/less/tests/forms.html
new file mode 100644
index 0000000000..a63d728a00
--- /dev/null
+++ b/less/tests/forms.html
@@ -0,0 +1,179 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Bootstrap, from Twitter</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
+    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 30px;
+        padding-bottom: 30px;
+      }
+    </style>
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+  </head>
+
+  <body>
+
+    <form class="container">
+
+      <div class="page-header">
+        <h1>Form controls</h1>
+      </div>
+
+      <div class="row">
+        <div class="span4">
+
+          <label>Select</label>
+          <select>
+            <option>Select</option>
+            <option>Option 2</option>
+            <option>Option 3</option>
+          </select>
+
+          <hr>
+
+          <label>textarea</label>
+          <textarea>Textarea</textarea>
+
+          <hr>
+
+          <label>text</label>
+          <input type="text" value="Text input">
+
+          <hr>
+
+          <label>password</label>
+          <input type="password" value="Password input">
+
+          <hr>
+
+          <label>checkbox</label>
+          <input type="checkbox" value="">
+
+          <hr>
+
+          <label>radio</label>
+          <input type="radio" value="">
+
+          <hr>
+
+          <label>button</label>
+          <input type="button" value="Button">
+
+          <hr>
+
+          <label>submit</label>
+          <input type="submit" value="Submit">
+
+          <hr>
+
+          <label>reset</label>
+          <input type="reset" value="Reset">
+
+        </div><!-- /span4 -->
+        <div class="span4">
+
+          <label>file</label>
+          <input type="file" value="">
+
+          <hr>
+
+          <label>hidden</label>
+          <input type="hidden" value="hidden">
+
+          <hr>
+
+          <label>image</label>
+          <input type="image" value="">
+
+          <hr>
+
+          <label>datetime</label>
+          <input type="datetime" value="">
+
+          <hr>
+
+          <label>datetime-local</label>
+          <input type="datetime-local" value="">
+
+          <hr>
+
+          <label>date</label>
+          <input type="date" value="">
+
+          <hr>
+
+          <label>month</label>
+          <input type="month" value="">
+
+          <hr>
+
+          <label>time</label>
+          <input type="time" value="">
+
+          <hr>
+
+          <label>week</label>
+          <input type="week" value="">
+
+        </div><!-- /span4 -->
+        <div class="span4">
+
+          <label>number</label>
+          <input type="number" value="">
+
+          <hr>
+
+          <label>range</label>
+          <input type="range" value="">
+
+          <hr>
+
+          <label>email</label>
+          <input type="email" value="">
+
+          <hr>
+
+          <label>url</label>
+          <input type="url" value="">
+
+          <hr>
+
+          <label>search</label>
+          <input type="search" value="">
+
+          <hr>
+
+          <label>tel</label>
+          <input type="tel" value="">
+
+          <hr>
+
+          <label>color</label>
+          <input type="color" value="">
+
+        </div><!-- /span4 -->
+      </div><!-- /row -->
+
+    </form> <!-- /container -->
+
+  </body>
+</html>
diff --git a/less/tests/navbar.html b/less/tests/navbar.html
new file mode 100644
index 0000000000..17754bf6e8
--- /dev/null
+++ b/less/tests/navbar.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Bootstrap, from Twitter</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
+    <style>
+      body {
+        padding-top: 60px;
+        padding-bottom: 30px;
+      }
+    </style>
+    <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
+  </head>
+
+  <body>
+
+    <!-- Fixed navbar -->
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </a>
+          <a class="brand" href="#">Project name</a>
+          <div class="nav-collapse">
+            <ul class="nav">
+              <li class="active"><a href="#">Home</a></li>
+              <li><a href="#about">About</a></li>
+              <li><a href="#contact">Contact</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+
+      <!-- Static navbar -->
+      <div class="navbar">
+        <div class="navbar-inner">
+          <div class="container">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </a>
+            <a class="brand" href="#">Project name</a>
+            <div class="nav-collapse">
+              <ul class="nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li><a href="#about">About</a></li>
+                <li><a href="#contact">Contact</a></li>
+              </ul>
+            </div><!--/.nav-collapse -->
+          </div>
+        </div>
+      </div>
+
+      <!-- Main hero unit for a primary marketing message or call to action -->
+      <div class="hero-unit">
+        <h1>Navbar example</h1>
+        <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
+        <p>
+          <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs &raquo;</a>
+        </p>
+      </div>
+
+    </div> <!-- /container -->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="../assets/js/jquery.js"></script>
+    <script src="../assets/js/bootstrap-transition.js"></script>
+    <script src="../assets/js/bootstrap-alert.js"></script>
+    <script src="../assets/js/bootstrap-modal.js"></script>
+    <script src="../assets/js/bootstrap-dropdown.js"></script>
+    <script src="../assets/js/bootstrap-scrollspy.js"></script>
+    <script src="../assets/js/bootstrap-tab.js"></script>
+    <script src="../assets/js/bootstrap-tooltip.js"></script>
+    <script src="../assets/js/bootstrap-popover.js"></script>
+    <script src="../assets/js/bootstrap-button.js"></script>
+    <script src="../assets/js/bootstrap-collapse.js"></script>
+    <script src="../assets/js/bootstrap-carousel.js"></script>
+    <script src="../assets/js/bootstrap-typeahead.js"></script>
+
+  </body>
+</html>
diff --git a/less/thumbnails.less b/less/thumbnails.less
new file mode 100644
index 0000000000..aa69f8e33d
--- /dev/null
+++ b/less/thumbnails.less
@@ -0,0 +1,47 @@
+// THUMBNAILS
+// ----------
+// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
+
+// Make wrapper ul behave like the grid
+.thumbnails {
+  margin-left: -@gridGutterWidth;
+  list-style: none;
+  .clearfix();
+}
+// Fluid rows have no left margin
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+// Float li to make thumbnails appear in a row
+.thumbnails > li {
+  float: left; // Explicity set the float since we don't require .span* classes
+  margin-bottom: @baseLineHeight;
+  margin-left: @gridGutterWidth;
+}
+
+// The actual thumbnail (can be `a` or `div`)
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 1;
+  border: 1px solid #ddd;
+  .border-radius(4px);
+  .box-shadow(0 1px 1px rgba(0,0,0,.075));
+}
+// Add a hover state for linked versions only
+a.thumbnail:hover {
+  border-color: @linkColor;
+  .box-shadow(0 1px 4px rgba(0,105,214,.25));
+}
+
+// Images and captions
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
+}
+.thumbnail .caption {
+  padding: 9px;
+}
diff --git a/less/tooltip.less b/less/tooltip.less
new file mode 100644
index 0000000000..5111a193f0
--- /dev/null
+++ b/less/tooltip.less
@@ -0,0 +1,35 @@
+// TOOLTIP
+// ------=
+
+.tooltip {
+  position: absolute;
+  z-index: @zindexTooltip;
+  display: block;
+  visibility: visible;
+  padding: 5px;
+  font-size: 11px;
+  .opacity(0);
+  &.in     { .opacity(80); }
+  &.top    { margin-top:  -2px; }
+  &.right  { margin-left:  2px; }
+  &.bottom { margin-top:   2px; }
+  &.left   { margin-left: -2px; }
+  &.top .tooltip-arrow    { #popoverArrow > .top(); }
+  &.left .tooltip-arrow   { #popoverArrow > .left(); }
+  &.bottom .tooltip-arrow { #popoverArrow > .bottom(); }
+  &.right .tooltip-arrow  { #popoverArrow > .right(); }
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: @white;
+  text-align: center;
+  text-decoration: none;
+  background-color: @black;
+  .border-radius(4px);
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
diff --git a/less/type.less b/less/type.less
new file mode 100644
index 0000000000..bdf8e605e1
--- /dev/null
+++ b/less/type.less
@@ -0,0 +1,232 @@
+// Typography.less
+// Headings, body text, lists, code, and more for a versatile and durable typography system
+// ----------------------------------------------------------------------------------------
+
+
+// BODY TEXT
+// ---------
+
+p {
+  margin: 0 0 @baseLineHeight / 2;
+  small {
+    font-size: @baseFontSize - 2;
+    color: @grayLight;
+  }
+}
+.lead {
+  margin-bottom: @baseLineHeight;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: @baseLineHeight * 1.5;
+}
+
+// HEADINGS
+// --------
+
+h1, h2, h3, h4, h5, h6 {
+  margin: 0;
+  font-family: @headingsFontFamily;
+  font-weight: @headingsFontWeight;
+  color: @headingsColor;
+  text-rendering: optimizelegibility; // Fix the character spacing for headings
+  small {
+    font-weight: normal;
+    color: @grayLight;
+  }
+}
+h1 {
+  font-size: 30px;
+  line-height: @baseLineHeight * 2;
+  small {
+    font-size: 18px;
+  }
+}
+h2 {
+  font-size: 24px;
+  line-height: @baseLineHeight * 2;
+  small {
+    font-size: 18px;
+  }
+}
+h3 {
+  font-size: 18px;
+  line-height: @baseLineHeight * 1.5;
+  small {
+    font-size: 14px;
+  }
+}
+h4, h5, h6 {
+  line-height: @baseLineHeight;
+}
+h4 {
+  font-size: 14px;
+  small {
+    font-size: 12px;
+  }
+}
+h5 {
+  font-size: 12px;
+}
+h6 {
+  font-size: 11px;
+  color: @grayLight;
+  text-transform: uppercase;
+}
+
+// Page header
+.page-header {
+  padding-bottom: @baseLineHeight - 1;
+  margin: @baseLineHeight 0;
+  border-bottom: 1px solid @grayLighter;
+}
+.page-header h1 {
+  line-height: 1;
+}
+
+
+
+// LISTS
+// -----
+
+// Unordered and Ordered lists
+ul, ol {
+  padding: 0;
+  margin: 0 0 @baseLineHeight / 2 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+ul {
+  list-style: disc;
+}
+ol {
+  list-style: decimal;
+}
+li {
+  line-height: @baseLineHeight;
+}
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+// Description Lists
+dl {
+  margin-bottom: @baseLineHeight;
+}
+dt,
+dd {
+  line-height: @baseLineHeight;
+}
+dt {
+  font-weight: bold;
+  line-height: @baseLineHeight - 1; // fix jank Helvetica Neue font bug
+}
+dd {
+  margin-left: @baseLineHeight / 2;
+}
+// Horizontal layout (like forms)
+.dl-horizontal {
+  dt {
+    float: left;
+    width: 120px;
+    clear: left;
+    text-align: right;
+    .text-overflow();
+  }
+  dd {
+    margin-left: 130px;
+  }
+}
+
+// MISC
+// ----
+
+// Horizontal rules
+hr {
+  margin: @baseLineHeight 0;
+  border: 0;
+  border-top: 1px solid @hrBorder;
+  border-bottom: 1px solid @white;
+}
+
+// Emphasis
+strong {
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+}
+.muted {
+  color: @grayLight;
+}
+
+// Abbreviations and acronyms
+abbr[title] {
+  cursor: help;
+  border-bottom: 1px dotted @grayLight;
+}
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+// Blockquotes
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 @baseLineHeight;
+  border-left: 5px solid @grayLighter;
+  p {
+    margin-bottom: 0;
+    #font > .shorthand(16px,300,@baseLineHeight * 1.25);
+  }
+  small {
+    display: block;
+    line-height: @baseLineHeight;
+    color: @grayLight;
+    &:before {
+      content: '\2014 \00A0';
+    }
+  }
+
+  // Float right with text-align: right
+  &.pull-right {
+    float: right;
+    padding-right: 15px;
+    padding-left: 0;
+    border-right: 5px solid @grayLighter;
+    border-left: 0;
+    p,
+    small {
+      text-align: right;
+    }
+  }
+}
+
+// Quotes
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+// Addresses
+address {
+  display: block;
+  margin-bottom: @baseLineHeight;
+  font-style: normal;
+  line-height: @baseLineHeight;
+}
+
+// Misc
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
+}
diff --git a/less/utilities.less b/less/utilities.less
new file mode 100644
index 0000000000..d60d220311
--- /dev/null
+++ b/less/utilities.less
@@ -0,0 +1,23 @@
+// UTILITY CLASSES
+// ---------------
+
+// Quick floats
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+
+// Toggling content
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+
+// Visibility
+.invisible {
+  visibility: hidden;
+}
diff --git a/less/variables.less b/less/variables.less
new file mode 100644
index 0000000000..b931d3d2a2
--- /dev/null
+++ b/less/variables.less
@@ -0,0 +1,206 @@
+// Variables.less
+// Variables to customize the look and feel of Bootstrap
+// -----------------------------------------------------
+
+
+
+// GLOBAL VALUES
+// --------------------------------------------------
+
+
+// Grays
+// -------------------------
+@black:                 #000;
+@grayDarker:            #222;
+@grayDark:              #333;
+@gray:                  #555;
+@grayLight:             #999;
+@grayLighter:           #eee;
+@white:                 #fff;
+
+
+// Accent colors
+// -------------------------
+@blue:                  #049cdb;
+@blueDark:              #0064cd;
+@green:                 #46a546;
+@red:                   #9d261d;
+@yellow:                #ffc40d;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @white;
+@textColor:             @grayDark;
+
+
+// Links
+// -------------------------
+@linkColor:             #08c;
+@linkColorHover:        darken(@linkColor, 15%);
+
+
+// Typography
+// -------------------------
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Menlo, Monaco, Consolas, "Courier New", monospace;
+
+@baseFontSize:          13px;
+@baseFontFamily:        @sansFontFamily;
+@baseLineHeight:        18px;
+@altFontFamily:         @serifFontFamily;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+
+// Tables
+// -------------------------
+@tableBackground:                   transparent; // overall background-color
+@tableBackgroundAccent:             #f9f9f9; // for striping
+@tableBackgroundHover:              #f5f5f5; // for hover
+@tableBorder:                       #ddd; // table and cell border
+
+
+// Buttons
+// -------------------------
+@btnBackground:                     @white;
+@btnBackgroundHighlight:            darken(@white, 10%);
+@btnBorder:                         #ccc;
+
+@btnPrimaryBackground:              @linkColor;
+@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);
+
+@btnInfoBackground:                 #5bc0de;
+@btnInfoBackgroundHighlight:        #2f96b4;
+
+@btnSuccessBackground:              #62c462;
+@btnSuccessBackgroundHighlight:     #51a351;
+
+@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackgroundHighlight:     @orange;
+
+@btnDangerBackground:               #ee5f5b;
+@btnDangerBackgroundHighlight:      #bd362f;
+
+@btnInverseBackground:              @gray;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+
+// Forms
+// -------------------------
+@inputBackground:               @white;
+@inputBorder:                   #ccc;
+@inputBorderRadius:             3px;
+@inputDisabledBackground:       @grayLighter;
+@formActionsBackground:         #f5f5f5;
+
+// Dropdowns
+// -------------------------
+@dropdownBackground:            @white;
+@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownLinkColor:             @grayDark;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkBackgroundHover:   @linkColor;
+@dropdownDividerTop:            #e5e5e5;
+@dropdownDividerBottom:         @white;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:          1000;
+@zindexPopover:           1010;
+@zindexTooltip:           1020;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
+
+// Input placeholder text color
+// -------------------------
+@placeholderText:         @grayLight;
+
+
+// Hr border color
+// -------------------------
+@hrBorder:                @grayLighter;
+
+
+// Navbar
+// -------------------------
+@navbarHeight:                    40px;
+@navbarBackground:                @grayDarker;
+@navbarBackgroundHighlight:       @grayDark;
+
+@navbarText:                      @grayLight;
+@navbarLinkColor:                 @grayLight;
+@navbarLinkColorHover:            @white;
+@navbarLinkColorActive:           @navbarLinkColorHover;
+@navbarLinkBackgroundHover:       transparent;
+@navbarLinkBackgroundActive:      @navbarBackground;
+
+@navbarSearchBackground:          lighten(@navbarBackground, 25%);
+@navbarSearchBackgroundFocus:     @white;
+@navbarSearchBorder:              darken(@navbarSearchBackground, 30%);
+@navbarSearchPlaceholderColor:    #ccc;
+@navbarBrandColor:                @navbarLinkColor;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground:              @grayLighter;
+@heroUnitHeadingColor:            inherit;
+@heroUnitLeadColor:               inherit;
+
+
+// Form states and alerts
+// -------------------------
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
+
+@errorText:               #b94a48;
+@errorBackground:         #f2dede;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+
+@successText:             #468847;
+@successBackground:       #dff0d8;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+
+
+// GRID
+// --------------------------------------------------
+
+// Default 940px grid
+// -------------------------
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         20px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth:    6.382978723%;
+@fluidGridGutterWidth:    2.127659574%;
diff --git a/less/wells.less b/less/wells.less
new file mode 100644
index 0000000000..9300061a50
--- /dev/null
+++ b/less/wells.less
@@ -0,0 +1,27 @@
+// WELLS
+// -----
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0,0,0,.05);
+  .border-radius(4px);
+  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  blockquote {
+    border-color: #ddd;
+    border-color: rgba(0,0,0,.15);
+  }
+}
+
+// Sizes
+.well-large {
+  padding: 24px;
+  .border-radius(6px);
+}
+.well-small {
+  padding: 9px;
+  .border-radius(3px);
+}
diff --git a/lib/.DS_Store b/lib/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c80479179cc01d573c00cdddcf54890fd11cda35
GIT binary patch
literal 6148
zcmeHK&2G~`5S~p#YYU2ULFKsO)I(GyYNT@DU_}MNts<3rpcUA0MT|_giXCzY0r!Ra
z41Iu}`#Ry9-EGt~^jM^#nP~PK&(E&?t+VSTBGnzIZK4Jd1yIIXh~_WCan=>7dCxjf
z**?BgMkD+TROB%*z;pMU`k1klPU-gi?Z8`5@gX<;BsU52_$7G<-JV;4MYMTO?YEW6
zt2>o-8dHh)C0`yvedIi-n$OV^E%K5{apv#jB00;mqHMLURc)>QWPKwD!{FKRQ8rA?
zq-(~*wD{B;m`N{7Pm_3bV(l_6$3-_D*~md$4iK^Sp)on^W1oGLrRCsrV{1C?blOe5
z+nzP`bZ@WK)ScbevsoAfVdFA*@oMMI`@?wpbN1`Ey-!m34_MjscmwA!7Eh5D{XD^d
z99%em^hU$n48Ov6(+S5#gaKhd7<eEC{8AG<eW3oOTVX&Lc)Seo`k<kVk;lrRT{_U%
zBLJ`tw-wm@naDNTW8|@NhzLZvQlKkU{)nMmIsDq^MII}MuAG!Vd?-J%@+TB!M@RqK
zrjv>sN-GQq1IrAoxyuIc|8MU<|1THGl`tR-{8tR9`hIV}i%0T%>&nCNUaO&Bpe&qM
mIb4*$uv;;5c`JSiwF19p0~mR%9Kr*U4*^SqG{V3?W#A9?jB%6z

literal 0
HcmV?d00001

diff --git a/lib/._.DS_Store b/lib/._.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8ac37fc9adc12c023d85488dfaf3036e73962005
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIk*Y|peR=07!nd>
zJ?rFuhz^DdtcpejM?+vV1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONfXX4j2s96b
z!9Xq~BePhcD784hv?w`MAuYcsTOl*ABsH%jGe0jeC#O;&CpE1^At@&@FB{m^h3Xp8
P6srH>UXfvt`~M#R%-A0@

literal 0
HcmV?d00001

diff --git a/lib/._codemirror.css b/lib/._codemirror.css
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/._codemirror.js b/lib/._codemirror.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/._util b/lib/._util
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/codemirror.css b/lib/codemirror.css
index 41b8d09e13..fb5b6d544c 100644
--- a/lib/codemirror.css
+++ b/lib/codemirror.css
@@ -9,7 +9,8 @@
 }
 
 .CodeMirror-scroll {
-  overflow: auto;
+  overflow-x: auto;
+  overflow-y: hidden;
   height: 300px;
   /* This is needed to prevent an IE[67] bug where the scrolled content
      is visible outside of the scrolling box. */
@@ -19,11 +20,13 @@
 
 /* Vertical scrollbar */
 .CodeMirror-scrollbar {
-  position: absolute;
-  right: 0; top: 0;
+  float: right;
   overflow-x: hidden;
   overflow-y: scroll;
-  z-index: 5;
+
+  /* This corrects for the 1px gap introduced to the left of the scrollbar
+     by the rule for .CodeMirror-scrollbar-inner. */
+  margin-left: -1px;
 }
 .CodeMirror-scrollbar-inner {
   /* This needs to have a nonzero width in order for the scrollbar to appear
@@ -66,6 +69,10 @@
   white-space: pre;
   cursor: text;
 }
+.CodeMirror-lines * {
+  /* Necessary for throw-scrolling to decelerate properly on Safari. */
+  pointer-events: none;
+}
 
 .CodeMirror pre {
   -moz-border-radius: 0;
@@ -80,7 +87,6 @@
   word-wrap: normal;
   line-height: inherit;
   color: inherit;
-  overflow: visible;
 }
 
 .CodeMirror-wrap pre {
@@ -146,7 +152,7 @@ div.CodeMirror-selected { background: #d9d9d9; }
 .cm-s-default span.cm-error {color: #f00;}
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30a;}
-.cm-s-default span.cm-bracket {color: #997;}
+.cm-s-default span.cm-bracket {color: #cc7;}
 .cm-s-default span.cm-tag {color: #170;}
 .cm-s-default span.cm-attribute {color: #00c;}
 .cm-s-default span.cm-header {color: blue;}
@@ -159,16 +165,5 @@ span.cm-em {font-style: italic;}
 span.cm-emstrong {font-style: italic; font-weight: bold;}
 span.cm-link {text-decoration: underline;}
 
-span.cm-invalidchar {color: #f00;}
-
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-
-@media print {
-
-  /* Hide the cursor when printing */
-  .CodeMirror pre.CodeMirror-cursor {
-    visibility: hidden;
-  }
-
-}
diff --git a/lib/codemirror.js b/lib/codemirror.js
index 2a25803f8c..532dd8974f 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -1,10 +1,11 @@
+// CodeMirror version 2.32
+//
 // All functions that need access to the editor's state live inside
 // the CodeMirror function. Below that, at the bottom of the file,
 // some utilities are defined.
 
 // CodeMirror is the only global var we claim
-window.CodeMirror = (function() {
-  "use strict";
+var CodeMirror = (function() {
   // This is the function that produces an editor instance. Its
   // closure is used to store the editor state.
   function CodeMirror(place, givenOptions) {
@@ -14,33 +15,38 @@ window.CodeMirror = (function() {
       if (defaults.hasOwnProperty(opt))
         options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt];
 
-    var input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em");
-    input.setAttribute("wrap", "off"); input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off");
-    // Wraps and hides input textarea
-    var inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The empty scrollbar content, used solely for managing the scrollbar thumb.
-    var scrollbarInner = elt("div", null, "CodeMirror-scrollbar-inner");
-    // The vertical scrollbar. Horizontal scrolling is handled by the scroller itself.
-    var scrollbar = elt("div", [scrollbarInner], "CodeMirror-scrollbar");
-    // DIVs containing the selection and the actual code
-    var lineDiv = elt("div"), selectionDiv = elt("div", null, null, "position: relative; z-index: -1");
-    // Blinky cursor, and element used to ensure cursor fits at the end of a line
-    var cursor = elt("pre", "\u00a0", "CodeMirror-cursor"), widthForcer = elt("pre", "\u00a0", "CodeMirror-cursor", "visibility: hidden");
-    // Used to measure text size
-    var measure = elt("div", null, null, "position: absolute; width: 100%; height: 0px; overflow: hidden; visibility: hidden;");
-    var lineSpace = elt("div", [measure, cursor, widthForcer, selectionDiv, lineDiv], null, "position: relative; z-index: 0");
-    var gutterText = elt("div", null, "CodeMirror-gutter-text"), gutter = elt("div", [gutterText], "CodeMirror-gutter");
-    // Moved around its parent to cover visible view
-    var mover = elt("div", [gutter, elt("div", [lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the text, causes scrolling
-    var sizer = elt("div", [mover], null, "position: relative");
-    // Provides scrolling
-    var scroller = elt("div", [sizer], "CodeMirror-scroll");
-    scroller.setAttribute("tabIndex", "-1");
     // The element in which the editor lives.
-    var wrapper = elt("div", [inputDiv, scrollbar, scroller], "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : ""));
+    var wrapper = document.createElement("div");
+    wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : "");
+    // This mess creates the base DOM structure for the editor.
+    wrapper.innerHTML =
+      '<div style="overflow: hidden; position: relative; width: 3px; height: 0px;">' + // Wraps and hides input textarea
+        '<textarea style="position: absolute; padding: 0; width: 1px; height: 1em" wrap="off" ' +
+          'autocorrect="off" autocapitalize="off"></textarea></div>' +
+      '<div class="CodeMirror-scrollbar">' + // The vertical scrollbar. Horizontal scrolling is handled by the scroller itself.
+        '<div class="CodeMirror-scrollbar-inner">' + // The empty scrollbar content, used solely for managing the scrollbar thumb.
+      '</div></div>' + // This must be before the scroll area because it's float-right.
+      '<div class="CodeMirror-scroll" tabindex="-1">' +
+        '<div style="position: relative">' + // Set to the height of the text, causes scrolling
+          '<div style="position: relative">' + // Moved around its parent to cover visible view
+            '<div class="CodeMirror-gutter"><div class="CodeMirror-gutter-text"></div></div>' +
+            // Provides positioning relative to (visible) text origin
+            '<div class="CodeMirror-lines"><div style="position: relative; z-index: 0">' +
+              // Used to measure text size
+              '<div style="position: absolute; width: 100%; height: 0px; overflow: hidden; visibility: hidden;"></div>' +
+              '<pre class="CodeMirror-cursor">&#160;</pre>' + // Absolutely positioned blinky cursor
+              '<pre class="CodeMirror-cursor" style="visibility: hidden">&#160;</pre>' + // Used to force a width
+              '<div style="position: relative; z-index: -1"></div><div></div>' + // DIVs containing the selection and the actual code
+            '</div></div></div></div></div>';
     if (place.appendChild) place.appendChild(wrapper); else place(wrapper);
-
+    // I've never seen more elegant code in my life.
+    var inputDiv = wrapper.firstChild, input = inputDiv.firstChild,
+        scroller = wrapper.lastChild, code = scroller.firstChild,
+        mover = code.firstChild, gutter = mover.firstChild, gutterText = gutter.firstChild,
+        lineSpace = gutter.nextSibling.firstChild, measure = lineSpace.firstChild,
+        cursor = measure.nextSibling, widthForcer = cursor.nextSibling,
+        selectionDiv = widthForcer.nextSibling, lineDiv = selectionDiv.nextSibling,
+        scrollbar = inputDiv.nextSibling, scrollbarInner = scrollbar.firstChild;
     themeChanged(); keyMapChanged();
     // Needed to hide big blue blinking cursor on Mobile Safari
     if (ios) input.style.width = "0px";
@@ -52,21 +58,33 @@ window.CodeMirror = (function() {
     // Needed to handle Tab key in KHTML
     if (khtml) inputDiv.style.height = "1px", inputDiv.style.position = "absolute";
 
-    // Check for OS X >= 10.7. This has transparent scrollbars, so the
-    // overlaying of one scrollbar with another won't work. This is a
-    // temporary hack to simply turn off the overlay scrollbar. See
-    // issue #727.
-    if (mac_geLion) { scrollbar.style.zIndex = -2; scrollbar.style.visibility = "hidden"; }
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    else if (ie_lt8) scrollbar.style.minWidth = "18px";
+    // Check for OS X >= 10.7. If so, we need to force a width on the scrollbar, and 
+    // make it overlap the content. (But we only do this if the scrollbar doesn't already
+    // have a natural width. If the mouse is plugged in or the user sets the system pref
+    // to always show scrollbars, the scrollbar shouldn't overlap.)
+    if (mac_geLion) {
+      scrollbar.className += (overlapScrollbars() ? " cm-sb-overlap" : " cm-sb-nonoverlap");
+    } else if (ie_lt8) {
+      // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+      scrollbar.className += " cm-sb-ie7";
+    }
+
+    // Check for problem with IE innerHTML not working when we have a
+    // P (or similar) parent node.
+    try { stringWidth("x"); }
+    catch (e) {
+      if (e.message.match(/runtime/i))
+        e = new Error("A CodeMirror inside a P-style element does not work in Internet Explorer. (innerHTML bug)");
+      throw e;
+    }
 
     // Delayed object wrap timeouts, making sure only one is active. blinker holds an interval.
     var poll = new Delayed(), highlight = new Delayed(), blinker;
 
     // mode holds a mode API object. doc is the tree of Line objects,
-    // frontier is the point up to which the content has been parsed,
-    // and history the undo history (instance of History constructor).
-    var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), frontier = 0, focused;
+    // work an array of lines that should be parsed, and history the
+    // undo history (instance of History constructor).
+    var mode, doc = new BranchChunk([new LeafChunk([new Line("")])]), work, focused;
     loadMode();
     // The selection. These are always maintained to point at valid
     // positions. Inverted is used to remember that the user is
@@ -74,11 +92,11 @@ window.CodeMirror = (function() {
     var sel = {from: {line: 0, ch: 0}, to: {line: 0, ch: 0}, inverted: false};
     // Selection-related flags. shiftSelecting obviously tracks
     // whether the user is holding shift.
-    var shiftSelecting, lastClick, lastDoubleClick, lastScrollTop = 0, draggingText,
-        overwrite = false, suppressEdits = false, pasteIncoming = false;
+    var shiftSelecting, lastClick, lastDoubleClick, lastScrollTop = 0, lastScrollLeft = 0, draggingText,
+        overwrite = false, suppressEdits = false;
     // Variables used by startOperation/endOperation to track what
     // happened during the operation.
-    var updateInput, userSelChange, changes, textChanged, selectionChanged,
+    var updateInput, userSelChange, changes, textChanged, selectionChanged, leaveInputAlone,
         gutterDirty, callbacks;
     // Current visible range (may be bigger than the view window).
     var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0;
@@ -87,9 +105,8 @@ window.CodeMirror = (function() {
     var bracketHighlighted;
     // Tracks the maximum line length so that the horizontal scrollbar
     // can be kept static when scrolling.
-    var maxLine = getLine(0), updateMaxLine = false, maxLineChanged = true;
-    var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
-    var goalColumn = null;
+    var maxLine = "", updateMaxLine = false, maxLineChanged = true;
+    var tabCache = {};
 
     // Initialize the content.
     operation(function(){setValue(options.value || ""); updateInput = false;})();
@@ -103,13 +120,12 @@ window.CodeMirror = (function() {
     // which point we can't mess with it anymore. Context menu is
     // handled in onMouseDown for Gecko.
     if (!gecko) connect(scroller, "contextmenu", onContextMenu);
-    connect(scroller, "scroll", onScrollMain);
-    connect(scrollbar, "scroll", onScrollBar);
+    connect(scroller, "scroll", onScroll);
+    connect(scrollbar, "scroll", onScroll);
     connect(scrollbar, "mousedown", function() {if (focused) setTimeout(focusInput, 0);});
-    var resizeHandler = connect(window, "resize", function() {
-      if (wrapper.parentNode) updateDisplay(true);
-      else resizeHandler();
-    }, true);
+    connect(scroller, "mousewheel", onMouseWheel);
+    connect(scroller, "DOMMouseScroll", onMouseWheel);
+    connect(window, "resize", function() {updateDisplay(true);});
     connect(input, "keyup", operation(onKeyUp));
     connect(input, "input", fastPoll);
     connect(input, "keydown", operation(onKeyDown));
@@ -117,24 +133,24 @@ window.CodeMirror = (function() {
     connect(input, "focus", onFocus);
     connect(input, "blur", onBlur);
 
-    function drag_(e) {
-      if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
-      e_stop(e);
-    }
     if (options.dragDrop) {
       connect(scroller, "dragstart", onDragStart);
+      function drag_(e) {
+        if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
+        e_stop(e);
+      }
       connect(scroller, "dragenter", drag_);
       connect(scroller, "dragover", drag_);
       connect(scroller, "drop", operation(onDrop));
     }
     connect(scroller, "paste", function(){focusInput(); fastPoll();});
-    connect(input, "paste", function(){pasteIncoming = true; fastPoll();});
+    connect(input, "paste", fastPoll);
     connect(input, "cut", operation(function(){
       if (!options.readOnly) replaceSelection("");
     }));
 
     // Needed to handle Tab key in KHTML
-    if (khtml) connect(sizer, "mouseup", function() {
+    if (khtml) connect(code, "mouseup", function() {
         if (document.activeElement == input) input.blur();
         focusInput();
     });
@@ -167,15 +183,12 @@ window.CodeMirror = (function() {
         else if (option == "lineWrapping" && oldVal != value) operation(wrappingChanged)();
         else if (option == "tabSize") updateDisplay(true);
         else if (option == "keyMap") keyMapChanged();
-        else if (option == "tabindex") input.tabIndex = value;
-        if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" ||
-            option == "theme" || option == "lineNumberFormatter") {
+        if (option == "lineNumbers" || option == "gutter" || option == "firstLineNumber" || option == "theme") {
           gutterChanged();
           updateDisplay(true);
         }
       },
       getOption: function(option) {return options[option];},
-      getMode: function() {return mode;},
       undo: operation(undo),
       redo: operation(redo),
       indentLine: operation(function(n, dir) {
@@ -194,23 +207,13 @@ window.CodeMirror = (function() {
         history.undone = histData.undone;
       },
       getHistory: function() {
-        function cp(arr) {
-          for (var i = 0, nw = [], nwelt; i < arr.length; ++i) {
-            nw.push(nwelt = []);
-            for (var j = 0, elt = arr[i]; j < elt.length; ++j) {
-              var old = [], cur = elt[j];
-              nwelt.push({start: cur.start, added: cur.added, old: old});
-              for (var k = 0; k < cur.old.length; ++k) old.push(hlText(cur.old[k]));
-            }
-          }
-          return nw;
-        }
-        return {done: cp(history.done), undone: cp(history.undone)};
+        history.time = 0;
+        return {done: history.done.concat([]), undone: history.undone.concat([])};
       },
       matchBrackets: operation(function(){matchBrackets(true);}),
       getTokenAt: operation(function(pos) {
         pos = clipPos(pos);
-        return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), options.tabSize, pos.ch);
+        return getLine(pos.line).getTokenAt(mode, getStateBefore(pos.line), pos.ch);
       }),
       getStateAfter: function(line) {
         line = clipLine(line == null ? doc.size - 1: line);
@@ -247,16 +250,15 @@ window.CodeMirror = (function() {
         return line;
       },
       lineInfo: lineInfo,
-      getViewport: function() { return {from: showingFrom, to: showingTo};},
       addWidget: function(pos, node, scroll, vert, horiz) {
         pos = localCoords(clipPos(pos));
         var top = pos.yBot, left = pos.x;
         node.style.position = "absolute";
-        sizer.appendChild(node);
+        code.appendChild(node);
         if (vert == "over") top = pos.y;
         else if (vert == "near") {
           var vspace = Math.max(scroller.offsetHeight, doc.height * textHeight()),
-              hspace = Math.max(sizer.clientWidth, lineSpace.clientWidth) - paddingLeft();
+              hspace = Math.max(code.clientWidth, lineSpace.clientWidth) - paddingLeft();
           if (pos.yBot + node.offsetHeight > vspace && pos.y > node.offsetHeight)
             top = pos.y - node.offsetHeight;
           if (left + node.offsetWidth > hspace)
@@ -265,11 +267,11 @@ window.CodeMirror = (function() {
         node.style.top = (top + paddingTop()) + "px";
         node.style.left = node.style.right = "";
         if (horiz == "right") {
-          left = sizer.clientWidth - node.offsetWidth;
+          left = code.clientWidth - node.offsetWidth;
           node.style.right = "0px";
         } else {
           if (horiz == "left") left = 0;
-          else if (horiz == "middle") left = (sizer.clientWidth - node.offsetWidth) / 2;
+          else if (horiz == "middle") left = (code.clientWidth - node.offsetWidth) / 2;
           node.style.left = (left + paddingLeft()) + "px";
         }
         if (scroll)
@@ -337,7 +339,7 @@ window.CodeMirror = (function() {
       },
       scrollTo: function(x, y) {
         if (x != null) scroller.scrollLeft = x;
-        if (y != null) scrollbar.scrollTop = scroller.scrollTop = y;
+        if (y != null) scrollbar.scrollTop = y;
         updateDisplay([]);
       },
       getScrollInfo: function() {
@@ -351,7 +353,6 @@ window.CodeMirror = (function() {
         }
         if (width != null) wrapper.style.width = interpret(width);
         if (height != null) scroller.style.height = interpret(height);
-        instance.refresh();
       },
 
       operation: function(f){return operation(f)();},
@@ -374,12 +375,6 @@ window.CodeMirror = (function() {
       for (var n = line; n; n = n.parent) n.height += diff;
     }
 
-    function lineContent(line, wrapAt) {
-      if (!line.styles)
-        line.highlight(mode, line.stateAfter = getStateBefore(lineNo(line)), options.tabSize);
-      return line.getContent(options.tabSize, wrapAt, options.lineWrapping);
-    }
-
     function setValue(code) {
       var top = {line: 0, ch: 0};
       updateLines(top, {line: doc.size - 1, ch: getLine(doc.size-1).text.length},
@@ -392,30 +387,25 @@ window.CodeMirror = (function() {
       return text.join(lineSep || "\n");
     }
 
-    function onScrollBar(e) {
-      if (scrollbar.scrollTop != lastScrollTop) {
-        lastScrollTop = scroller.scrollTop = scrollbar.scrollTop;
-        updateDisplay([]);
+    function onScroll(e) {
+      if (scroller.scrollTop) {
+        scrollbar.scrollTop += scroller.scrollTop;
+        scroller.scrollTop = 0;
       }
-    }
-
-    function onScrollMain(e) {
-      if (options.fixedGutter && gutter.style.left != scroller.scrollLeft + "px")
-        gutter.style.left = scroller.scrollLeft + "px";
-      if (scroller.scrollTop != lastScrollTop) {
-        lastScrollTop = scroller.scrollTop;
-        if (scrollbar.scrollTop != lastScrollTop)
-          scrollbar.scrollTop = lastScrollTop;
+      if (lastScrollTop != scrollbar.scrollTop || lastScrollLeft != scroller.scrollLeft) {
+        lastScrollTop = scrollbar.scrollTop;
+        lastScrollLeft = scroller.scrollLeft;
         updateDisplay([]);
+        if (options.fixedGutter) gutter.style.left = scroller.scrollLeft + "px";
+        if (options.onScroll) options.onScroll(instance);
       }
-      if (options.onScroll) options.onScroll(instance);
     }
 
     function onMouseDown(e) {
       setShift(e_prop(e, "shiftKey"));
       // Check whether this is a click in a widget
       for (var n = e_target(e); n != wrapper; n = n.parentNode)
-        if (n.parentNode == sizer && n != mover) return;
+        if (n.parentNode == code && n != mover) return;
 
       // See if this is a click in the gutter
       for (var n = e_target(e); n != wrapper; n = n.parentNode)
@@ -458,21 +448,21 @@ window.CodeMirror = (function() {
         setSelectionUser(word.from, word.to);
       } else { lastClick = {time: now, pos: start}; }
 
-      function dragEnd(e2) {
-        if (webkit) scroller.draggable = false;
-        draggingText = false;
-        up(); drop();
-        if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-          e_preventDefault(e2);
-          setCursor(start.line, start.ch, true);
-          focusInput();
-        }
-      }
       var last = start, going;
       if (options.dragDrop && dragAndDrop && !options.readOnly && !posEq(sel.from, sel.to) &&
           !posLess(start, sel.from) && !posLess(sel.to, start) && type == "single") {
         // Let the drag handler handle this.
         if (webkit) scroller.draggable = true;
+        function dragEnd(e2) {
+          if (webkit) scroller.draggable = false;
+          draggingText = false;
+          up(); drop();
+          if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
+            e_preventDefault(e2);
+            setCursor(start.line, start.ch, true);
+            focusInput();
+          }
+        }
         var up = connect(document, "mouseup", operation(dragEnd), true);
         var drop = connect(scroller, "drop", operation(dragEnd), true);
         draggingText = true;
@@ -535,12 +525,11 @@ window.CodeMirror = (function() {
     }
     function onDrop(e) {
       if (options.onDragEvent && options.onDragEvent(instance, addStop(e))) return;
-      e_preventDefault(e);
+      e.preventDefault();
       var pos = posFromMouse(e, true), files = e.dataTransfer.files;
       if (!pos || options.readOnly) return;
       if (files && files.length && window.FileReader && window.File) {
-        var n = files.length, text = Array(n), read = 0;
-        var loadFile = function(file, i) {
+        function loadFile(file, i) {
           var reader = new FileReader;
           reader.onload = function() {
             text[i] = reader.result;
@@ -553,7 +542,8 @@ window.CodeMirror = (function() {
             }
           };
           reader.readAsText(file);
-        };
+        }
+        var n = files.length, text = Array(n), read = 0;
         for (var i = 0; i < n; ++i) loadFile(files[i], i);
       } else {
         // Don't do a replace if the drop happened inside of the selected text.
@@ -576,10 +566,13 @@ window.CodeMirror = (function() {
     function onDragStart(e) {
       var txt = getSelection();
       e.dataTransfer.setData("Text", txt);
-
+      
       // Use dummy image instead of default browsers image.
-      if (e.dataTransfer.setDragImage)
-        e.dataTransfer.setDragImage(elt('img'), 0, 0);
+      if (gecko || chrome || opera) {
+        var img = document.createElement('img');
+        img.scr = 'data:image/gif;base64,R0lGODdhAgACAIAAAAAAAP///ywAAAAAAgACAAACAoRRADs='; //1x1 image
+        e.dataTransfer.setDragImage(img, 0, 0);
+      }
     }
 
     function doHandleBinding(bound, dropShift) {
@@ -601,7 +594,6 @@ window.CodeMirror = (function() {
       }
       return true;
     }
-    var maybeTransition;
     function handleKeyBinding(e) {
       // Handle auto keymap transitions
       var startMap = getKeyMap(options.keyMap), next = startMap.auto;
@@ -613,11 +605,10 @@ window.CodeMirror = (function() {
       }, 50);
 
       var name = keyNames[e_prop(e, "keyCode")], handled = false;
-      var flipCtrlCmd = opera && mac;
       if (name == null || e.altGraphKey) return false;
       if (e_prop(e, "altKey")) name = "Alt-" + name;
-      if (e_prop(e, flipCtrlCmd ? "metaKey" : "ctrlKey")) name = "Ctrl-" + name;
-      if (e_prop(e, flipCtrlCmd ? "ctrlKey" : "metaKey")) name = "Cmd-" + name;
+      if (e_prop(e, "ctrlKey")) name = "Ctrl-" + name;
+      if (e_prop(e, "metaKey")) name = "Cmd-" + name;
 
       var stopped = false;
       function stop() { stopped = true; }
@@ -649,7 +640,7 @@ window.CodeMirror = (function() {
       return handled;
     }
 
-    var lastStoppedKey = null;
+    var lastStoppedKey = null, maybeTransition;
     function onKeyDown(e) {
       if (!focused) onFocus();
       if (ie && e.keyCode == 27) { e.returnValue = false; }
@@ -693,6 +684,7 @@ window.CodeMirror = (function() {
         focused = true;
         if (scroller.className.search(/\bCodeMirror-focused\b/) == -1)
           scroller.className += " CodeMirror-focused";
+        if (!leaveInputAlone) resetInput(true);
       }
       slowPoll();
       restartBlink();
@@ -711,20 +703,53 @@ window.CodeMirror = (function() {
       setTimeout(function() {if (!focused) shiftSelecting = null;}, 150);
     }
 
+    function chopDelta(delta) {
+      // Make sure we always scroll a little bit for any nonzero delta.
+      if (delta > 0.0 && delta < 1.0) return 1;
+      else if (delta > -1.0 && delta < 0.0) return -1;
+      else return Math.round(delta);
+    }
+
+    function onMouseWheel(e) {
+      var deltaX = 0, deltaY = 0;
+      if (e.type == "DOMMouseScroll") { // Firefox
+        var delta = -e.detail * 8.0;
+        if (e.axis == e.HORIZONTAL_AXIS) deltaX = delta;
+        else if (e.axis == e.VERTICAL_AXIS) deltaY = delta;
+      } else if (e.wheelDeltaX !== undefined && e.wheelDeltaY !== undefined) { // WebKit
+        deltaX = e.wheelDeltaX / 3.0;
+        deltaY = e.wheelDeltaY / 3.0;
+      } else if (e.wheelDelta !== undefined) { // IE or Opera
+        deltaY = e.wheelDelta / 3.0;
+      }
+
+      var scrolled = false;
+      deltaX = chopDelta(deltaX);
+      deltaY = chopDelta(deltaY);
+      if ((deltaX > 0 && scroller.scrollLeft > 0) ||
+          (deltaX < 0 && scroller.scrollLeft + scroller.clientWidth < scroller.scrollWidth)) {
+        scroller.scrollLeft -= deltaX;
+        scrolled = true;
+      }
+      if ((deltaY > 0 && scrollbar.scrollTop > 0) ||
+          (deltaY < 0 && scrollbar.scrollTop + scrollbar.clientHeight < scrollbar.scrollHeight)) {
+        scrollbar.scrollTop -= deltaY;
+        scrolled = true;
+      }
+      if (scrolled) e_stop(e);
+    }
+
     // Replace the range from from to to by the strings in newText.
     // Afterwards, set the selection to selFrom, selTo.
     function updateLines(from, to, newText, selFrom, selTo) {
       if (suppressEdits) return;
-      var old = [];
-      doc.iter(from.line, to.line + 1, function(line) {
-        old.push(newHL(line.text, line.markedSpans));
-      });
       if (history) {
+        var old = [];
+        doc.iter(from.line, to.line + 1, function(line) { old.push(line.text); });
         history.addChange(from.line, newText.length, old);
         while (history.done.length > options.undoDepth) history.done.shift();
       }
-      var lines = updateMarkedSpans(hlSpans(old[0]), hlSpans(lst(old)), from.ch, to.ch, newText);
-      updateLinesNoUndo(from, to, lines, selFrom, selTo);
+      updateLinesNoUndo(from, to, newText, selFrom, selTo);
     }
     function unredoHelper(from, to) {
       if (!from.length) return;
@@ -732,12 +757,11 @@ window.CodeMirror = (function() {
       for (var i = set.length - 1; i >= 0; i -= 1) {
         var change = set[i];
         var replaced = [], end = change.start + change.added;
-        doc.iter(change.start, end, function(line) { replaced.push(newHL(line.text, line.markedSpans)); });
+        doc.iter(change.start, end, function(line) { replaced.push(line.text); });
         out.push({start: change.start, added: change.old.length, old: replaced});
         var pos = {line: change.start + change.old.length - 1,
-                   ch: editEnd(hlText(lst(replaced)), hlText(lst(change.old)))};
-        updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length},
-                          change.old, pos, pos);
+                   ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])};
+        updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: getLine(end-1).text.length}, change.old, pos, pos);
       }
       updateInput = true;
       to.push(out);
@@ -745,86 +769,95 @@ window.CodeMirror = (function() {
     function undo() {unredoHelper(history.done, history.undone);}
     function redo() {unredoHelper(history.undone, history.done);}
 
-    function updateLinesNoUndo(from, to, lines, selFrom, selTo) {
+    function updateLinesNoUndo(from, to, newText, selFrom, selTo) {
       if (suppressEdits) return;
-      var recomputeMaxLength = false, maxLineLength = maxLine.text.length;
+      var recomputeMaxLength = false, maxLineLength = maxLine.length;
       if (!options.lineWrapping)
         doc.iter(from.line, to.line + 1, function(line) {
           if (!line.hidden && line.text.length == maxLineLength) {recomputeMaxLength = true; return true;}
         });
-      if (from.line != to.line || lines.length > 1) gutterDirty = true;
+      if (from.line != to.line || newText.length > 1) gutterDirty = true;
 
       var nlines = to.line - from.line, firstLine = getLine(from.line), lastLine = getLine(to.line);
-      var lastHL = lst(lines);
-
-      // First adjust the line structure
-      if (from.ch == 0 && to.ch == 0 && hlText(lastHL) == "") {
+      // First adjust the line structure, taking some care to leave highlighting intact.
+      if (from.ch == 0 && to.ch == 0 && newText[newText.length - 1] == "") {
         // This is a whole-line replace. Treated specially to make
         // sure line objects move the way they are supposed to.
         var added = [], prevLine = null;
-        for (var i = 0, e = lines.length - 1; i < e; ++i)
-          added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
-        lastLine.update(lastLine.text, hlSpans(lastHL));
+        if (from.line) {
+          prevLine = getLine(from.line - 1);
+          prevLine.fixMarkEnds(lastLine);
+        } else lastLine.fixMarkStarts();
+        for (var i = 0, e = newText.length - 1; i < e; ++i)
+          added.push(Line.inheritMarks(newText[i], prevLine));
         if (nlines) doc.remove(from.line, nlines, callbacks);
         if (added.length) doc.insert(from.line, added);
       } else if (firstLine == lastLine) {
-        if (lines.length == 1) {
-          firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + firstLine.text.slice(to.ch), hlSpans(lines[0]));
-        } else {
-          for (var added = [], i = 1, e = lines.length - 1; i < e; ++i)
-            added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
-          added.push(new Line(hlText(lastHL) + firstLine.text.slice(to.ch), hlSpans(lastHL)));
-          firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
+        if (newText.length == 1)
+          firstLine.replace(from.ch, to.ch, newText[0]);
+        else {
+          lastLine = firstLine.split(to.ch, newText[newText.length-1]);
+          firstLine.replace(from.ch, null, newText[0]);
+          firstLine.fixMarkEnds(lastLine);
+          var added = [];
+          for (var i = 1, e = newText.length - 1; i < e; ++i)
+            added.push(Line.inheritMarks(newText[i], firstLine));
+          added.push(lastLine);
           doc.insert(from.line + 1, added);
         }
-      } else if (lines.length == 1) {
-        firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]) + lastLine.text.slice(to.ch), hlSpans(lines[0]));
+      } else if (newText.length == 1) {
+        firstLine.replace(from.ch, null, newText[0]);
+        lastLine.replace(null, to.ch, "");
+        firstLine.append(lastLine);
         doc.remove(from.line + 1, nlines, callbacks);
       } else {
         var added = [];
-        firstLine.update(firstLine.text.slice(0, from.ch) + hlText(lines[0]), hlSpans(lines[0]));
-        lastLine.update(hlText(lastHL) + lastLine.text.slice(to.ch), hlSpans(lastHL));
-        for (var i = 1, e = lines.length - 1; i < e; ++i)
-          added.push(new Line(hlText(lines[i]), hlSpans(lines[i])));
+        firstLine.replace(from.ch, null, newText[0]);
+        lastLine.replace(null, to.ch, newText[newText.length-1]);
+        firstLine.fixMarkEnds(lastLine);
+        for (var i = 1, e = newText.length - 1; i < e; ++i)
+          added.push(Line.inheritMarks(newText[i], firstLine));
         if (nlines > 1) doc.remove(from.line + 1, nlines - 1, callbacks);
         doc.insert(from.line + 1, added);
       }
       if (options.lineWrapping) {
         var perLine = Math.max(5, scroller.clientWidth / charWidth() - 3);
-        doc.iter(from.line, from.line + lines.length, function(line) {
+        doc.iter(from.line, from.line + newText.length, function(line) {
           if (line.hidden) return;
           var guess = Math.ceil(line.text.length / perLine) || 1;
           if (guess != line.height) updateLineHeight(line, guess);
         });
       } else {
-        doc.iter(from.line, from.line + lines.length, function(line) {
+        doc.iter(from.line, from.line + newText.length, function(line) {
           var l = line.text;
           if (!line.hidden && l.length > maxLineLength) {
-            maxLine = line; maxLineLength = l.length; maxLineChanged = true;
+            maxLine = l; maxLineLength = l.length; maxLineChanged = true;
             recomputeMaxLength = false;
           }
         });
         if (recomputeMaxLength) updateMaxLine = true;
       }
 
-      // Adjust frontier, schedule worker
-      frontier = Math.min(frontier, from.line);
-      startWorker(400);
-
-      var lendiff = lines.length - nlines - 1;
+      // Add these lines to the work array, so that they will be
+      // highlighted. Adjust work lines if lines were added/removed.
+      var newWork = [], lendiff = newText.length - nlines - 1;
+      for (var i = 0, l = work.length; i < l; ++i) {
+        var task = work[i];
+        if (task < from.line) newWork.push(task);
+        else if (task > to.line) newWork.push(task + lendiff);
+      }
+      var hlEnd = from.line + Math.min(newText.length, 500);
+      highlightLines(from.line, hlEnd);
+      newWork.push(hlEnd);
+      work = newWork;
+      startWorker(100);
       // Remember that these lines changed, for updating the display
       changes.push({from: from.line, to: to.line + 1, diff: lendiff});
-      if (options.onChange) {
-        // Normalize lines to contain only strings, since that's what
-        // the change event handler expects
-        for (var i = 0; i < lines.length; ++i)
-          if (typeof lines[i] != "string") lines[i] = lines[i].text;
-        var changeObj = {from: from, to: to, text: lines};
-        if (textChanged) {
-          for (var cur = textChanged; cur.next; cur = cur.next) {}
-          cur.next = changeObj;
-        } else textChanged = changeObj;
-      }
+      var changeObj = {from: from, to: to, text: newText};
+      if (textChanged) {
+        for (var cur = textChanged; cur.next; cur = cur.next) {}
+        cur.next = changeObj;
+      } else textChanged = changeObj;
 
       // Update the selection
       function updateLine(n) {return n <= Math.min(to.line, to.line + lendiff) ? n : n + lendiff;}
@@ -834,43 +867,46 @@ window.CodeMirror = (function() {
 
     function needsScrollbar() {
       var realHeight = doc.height * textHeight() + 2 * paddingTop();
-      return realHeight * .99 > scroller.offsetHeight ? realHeight : false;
+      return realHeight - 1 > scroller.offsetHeight ? realHeight : false;
     }
 
     function updateVerticalScroll(scrollTop) {
       var scrollHeight = needsScrollbar();
       scrollbar.style.display = scrollHeight ? "block" : "none";
       if (scrollHeight) {
-        scrollbarInner.style.height = sizer.style.minHeight = scrollHeight + "px";
-        scrollbar.style.height = scroller.clientHeight + "px";
-        if (scrollTop != null) {
-          scrollbar.scrollTop = scroller.scrollTop = scrollTop;
-          // 'Nudge' the scrollbar to work around a Webkit bug where,
-          // in some situations, we'd end up with a scrollbar that
-          // reported its scrollTop (and looked) as expected, but
-          // *behaved* as if it was still in a previous state (i.e.
-          // couldn't scroll up, even though it appeared to be at the
-          // bottom).
-          if (webkit) setTimeout(function() {
-            if (scrollbar.scrollTop != scrollTop) return;
-            scrollbar.scrollTop = scrollTop + (scrollTop ? -1 : 1);
-            scrollbar.scrollTop = scrollTop;
-          }, 0);
-        }
-      } else {
-        sizer.style.minHeight = "";
+        scrollbarInner.style.height = scrollHeight + "px";
+        scrollbar.style.height = scroller.offsetHeight + "px";
+        if (scrollTop != null) scrollbar.scrollTop = scrollTop;
       }
       // Position the mover div to align with the current virtual scroll position
-      mover.style.top = displayOffset * textHeight() + "px";
+      mover.style.top = (displayOffset * textHeight() - scrollbar.scrollTop) + "px";
+    }
+  
+    // On Mac OS X Lion and up, detect whether the mouse is plugged in by measuring 
+    // the width of a div with a scrollbar in it. If the width is <= 1, then
+    // the mouse isn't plugged in and scrollbars should overlap the content.
+    function overlapScrollbars() {
+      var tmpSb = document.createElement('div'),
+          tmpSbInner = document.createElement('div');
+      tmpSb.className = "CodeMirror-scrollbar";
+      tmpSb.style.cssText = "position: absolute; left: -9999px; height: 100px;";
+      tmpSbInner.className = "CodeMirror-scrollbar-inner";
+      tmpSbInner.style.height = "200px";
+      tmpSb.appendChild(tmpSbInner);
+
+      document.body.appendChild(tmpSb);
+      var result = (tmpSb.offsetWidth <= 1);
+      document.body.removeChild(tmpSb);
+      return result;
     }
 
     function computeMaxLength() {
-      maxLine = getLine(0); maxLineChanged = true;
-      var maxLineLength = maxLine.text.length;
-      doc.iter(1, doc.size, function(line) {
+      var maxLineLength = 0; 
+      maxLine = ""; maxLineChanged = true;
+      doc.iter(0, doc.size, function(line) {
         var l = line.text;
         if (!line.hidden && l.length > maxLineLength) {
-          maxLineLength = l.length; maxLine = line;
+          maxLineLength = l.length; maxLine = l;
         }
       });
       updateMaxLine = false;
@@ -886,7 +922,7 @@ window.CodeMirror = (function() {
         var line = pos.line + code.length - (to.line - from.line) - 1;
         var ch = pos.ch;
         if (pos.line == to.line)
-          ch += lst(code).length - (to.ch - (to.line == from.line ? from.ch : 0));
+          ch += code[code.length-1].length - (to.ch - (to.line == from.line ? from.ch : 0));
         return {line: line, ch: ch};
       }
       var end;
@@ -904,7 +940,7 @@ window.CodeMirror = (function() {
       });
     }
     function replaceRange1(code, from, to, computeSel) {
-      var endch = code.length == 1 ? code[0].length + from.ch : lst(code).length;
+      var endch = code.length == 1 ? code[0].length + from.ch : code[code.length-1].length;
       var newSel = computeSel({line: from.line + code.length - 1, ch: endch});
       updateLines(from, to, code, newSel.from, newSel.to);
     }
@@ -921,20 +957,25 @@ window.CodeMirror = (function() {
       return getRange(sel.from, sel.to, lineSep);
     }
 
+    var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll
     function slowPoll() {
       if (pollingFast) return;
       poll.set(options.pollInterval, function() {
+        startOperation();
         readInput();
         if (focused) slowPoll();
+        endOperation();
       });
     }
     function fastPoll() {
       var missed = false;
       pollingFast = true;
       function p() {
+        startOperation();
         var changed = readInput();
         if (!changed && !missed) {missed = true; poll.set(60, p);}
         else {pollingFast = false; slowPoll();}
+        endOperation();
       }
       poll.set(20, p);
     }
@@ -946,29 +987,26 @@ window.CodeMirror = (function() {
     // supported or compatible enough yet to rely on.)
     var prevInput = "";
     function readInput() {
-      if (!focused || hasSelection(input) || options.readOnly) return false;
+      if (leaveInputAlone || !focused || hasSelection(input) || options.readOnly) return false;
       var text = input.value;
       if (text == prevInput) return false;
-      if (!nestedOperation) startOperation();
       shiftSelecting = null;
       var same = 0, l = Math.min(prevInput.length, text.length);
       while (same < l && prevInput[same] == text[same]) ++same;
       if (same < prevInput.length)
         sel.from = {line: sel.from.line, ch: sel.from.ch - (prevInput.length - same)};
-      else if (overwrite && posEq(sel.from, sel.to) && !pasteIncoming)
+      else if (overwrite && posEq(sel.from, sel.to))
         sel.to = {line: sel.to.line, ch: Math.min(getLine(sel.to.line).text.length, sel.to.ch + (text.length - same))};
       replaceSelection(text.slice(same), "end");
       if (text.length > 1000) { input.value = prevInput = ""; }
       else prevInput = text;
-      if (!nestedOperation) endOperation();
-      pasteIncoming = false;
       return true;
     }
     function resetInput(user) {
       if (!posEq(sel.from, sel.to)) {
         prevInput = "";
         input.value = getSelection();
-        if (focused) selectInput(input);
+        selectInput(input);
       } else if (user) prevInput = input.value = "";
     }
 
@@ -976,23 +1014,16 @@ window.CodeMirror = (function() {
       if (options.readOnly != "nocursor") input.focus();
     }
 
+    function scrollEditorIntoView() {
+      var rect = cursor.getBoundingClientRect();
+      // IE returns bogus coordinates when the instance sits inside of an iframe and the cursor is hidden
+      if (ie && rect.top == rect.bottom) return;
+      var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
+      if (rect.top < 0 || rect.bottom > winH) scrollCursorIntoView();
+    }
     function scrollCursorIntoView() {
       var coords = calculateCursorCoords();
-      scrollIntoView(coords.x, coords.y, coords.x, coords.yBot);
-      if (!focused) return;
-      var box = sizer.getBoundingClientRect(), doScroll = null;
-      if (coords.y + box.top < 0) doScroll = true;
-      else if (coords.y + box.top + textHeight() > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
-      if (doScroll != null) {
-        var hidden = cursor.style.display == "none";
-        if (hidden) {
-          cursor.style.display = "";
-          cursor.style.left = coords.x + "px";
-          cursor.style.top = (coords.y - displayOffset) + "px";
-        }
-        cursor.scrollIntoView(doScroll);
-        if (hidden) cursor.style.display = "none";
-      }
+      return scrollIntoView(coords.x, coords.y, coords.x, coords.yBot);
     }
     function calculateCursorCoords() {
       var cursor = localCoords(sel.inverted ? sel.from : sel.to);
@@ -1000,16 +1031,17 @@ window.CodeMirror = (function() {
       return {x: x, y: cursor.y, yBot: cursor.yBot};
     }
     function scrollIntoView(x1, y1, x2, y2) {
-      var scrollPos = calculateScrollPos(x1, y1, x2, y2);
-      if (scrollPos.scrollLeft != null) {scroller.scrollLeft = scrollPos.scrollLeft;}
-      if (scrollPos.scrollTop != null) {scrollbar.scrollTop = scroller.scrollTop = scrollPos.scrollTop;}
+      var scrollPos = calculateScrollPos(x1, y1, x2, y2), scrolled = false;
+      if (scrollPos.scrollLeft != null) {scroller.scrollLeft = scrollPos.scrollLeft; scrolled = true;}
+      if (scrollPos.scrollTop != null) {scrollbar.scrollTop = scrollPos.scrollTop; scrolled = true;}
+      if (scrolled && options.onScroll) options.onScroll(instance);
     }
     function calculateScrollPos(x1, y1, x2, y2) {
       var pl = paddingLeft(), pt = paddingTop();
       y1 += pt; y2 += pt; x1 += pl; x2 += pl;
       var screen = scroller.clientHeight, screentop = scrollbar.scrollTop, result = {};
-      var docBottom = needsScrollbar() || Infinity;
-      var atTop = y1 < pt + 10, atBottom = y2 + pt > docBottom - 10;
+      var docBottom = scroller.scrollHeight;
+      var atTop = y1 < pt + 10, atBottom = y2 + pt > docBottom - 10;;
       if (y1 < screentop) result.scrollTop = atTop ? 0 : Math.max(0, y1);
       else if (y2 > screentop + screen) result.scrollTop = (atBottom ? docBottom : y2) - screen;
 
@@ -1081,13 +1113,8 @@ window.CodeMirror = (function() {
       // This is just a bogus formula that detects when the editor is
       // resized or the font size changes.
       if (different) lastSizeC = scroller.clientHeight + th;
-      if (from != showingFrom || to != showingTo && options.onViewportChange)
-        setTimeout(function(){
-          if (options.onViewportChange) options.onViewportChange(instance, from, to);
-        });
       showingFrom = from; showingTo = to;
       displayOffset = heightAtLine(doc, from);
-      startWorker(100);
 
       // Since this is all rather error prone, it is honoured with the
       // only assertion in the whole file.
@@ -1098,10 +1125,6 @@ window.CodeMirror = (function() {
       function checkHeights() {
         var curNode = lineDiv.firstChild, heightChanged = false;
         doc.iter(showingFrom, showingTo, function(line) {
-          // Work around bizarro IE7 bug where, sometimes, our curNode
-          // is magically replaced with a new node in the DOM, leaving
-          // us with a reference to an orphan (nextSibling-less) node.
-          if (!curNode) return;
           if (!line.hidden) {
             var height = Math.round(curNode.offsetHeight / th) || 1;
             if (line.height != height) {
@@ -1114,7 +1137,16 @@ window.CodeMirror = (function() {
         return heightChanged;
       }
 
-      if (options.lineWrapping) checkHeights();
+      if (options.lineWrapping) {
+        checkHeights();
+        var scrollHeight = needsScrollbar();
+        var shouldHaveScrollbar = scrollHeight ? "block" : "none";
+        if (scrollbar.style.display != shouldHaveScrollbar) {
+          scrollbar.style.display = shouldHaveScrollbar;
+          if (scrollHeight) scrollbarInner.style.height = scrollHeight + "px";
+          checkHeights();
+        }
+      }
 
       gutter.style.display = gutterDisplay;
       if (different || gutterDirty) {
@@ -1151,14 +1183,14 @@ window.CodeMirror = (function() {
     }
 
     function patchDisplay(from, to, intact) {
-      function killNode(node) {
-        var tmp = node.nextSibling;
-        node.parentNode.removeChild(node);
-        return tmp;
-      }
       // The first pass removes the DOM nodes that aren't intact.
-      if (!intact.length) removeChildren(lineDiv);
+      if (!intact.length) lineDiv.innerHTML = "";
       else {
+        function killNode(node) {
+          var tmp = node.nextSibling;
+          node.parentNode.removeChild(node);
+          return tmp;
+        }
         var domPos = 0, curNode = lineDiv.firstChild, n;
         for (var i = 0; i < intact.length; ++i) {
           var cur = intact[i];
@@ -1169,20 +1201,21 @@ window.CodeMirror = (function() {
       }
       // This pass fills in the lines that actually changed.
       var nextIntact = intact.shift(), curNode = lineDiv.firstChild, j = from;
+      var scratch = document.createElement("div");
       doc.iter(from, to, function(line) {
         if (nextIntact && nextIntact.to == j) nextIntact = intact.shift();
         if (!nextIntact || nextIntact.from > j) {
-          if (line.hidden) var lineElement = elt("pre");
+          if (line.hidden) var html = scratch.innerHTML = "<pre></pre>";
           else {
-            var lineElement = lineContent(line);
-            if (line.className) lineElement.className = line.className;
+            var html = '<pre' + (line.className ? ' class="' + line.className + '"' : '') + '>'
+              + line.getHTML(makeTab) + '</pre>';
             // Kludge to make sure the styled element lies behind the selection (by z-index)
-            if (line.bgClassName) {
-              var pre = elt("pre", "\u00a0", line.bgClassName, "position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: -2");
-              lineElement = elt("div", [pre, lineElement], null, "position: relative");
-            }
+            if (line.bgClassName)
+              html = '<div style="position: relative"><pre class="' + line.bgClassName +
+              '" style="position: absolute; left: 0; right: 0; top: 0; bottom: 0; z-index: -2">&#160;</pre>' + html + "</div>";
           }
-          lineDiv.insertBefore(lineElement, curNode);
+          scratch.innerHTML = html;
+          lineDiv.insertBefore(scratch.firstChild, curNode);
         } else {
           curNode = curNode.nextSibling;
         }
@@ -1194,10 +1227,10 @@ window.CodeMirror = (function() {
       if (!options.gutter && !options.lineNumbers) return;
       var hText = mover.offsetHeight, hEditor = scroller.clientHeight;
       gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px";
-      var fragment = document.createDocumentFragment(), i = showingFrom, normalNode;
+      var html = [], i = showingFrom, normalNode;
       doc.iter(showingFrom, Math.max(showingTo, showingFrom + 1), function(line) {
         if (line.hidden) {
-          fragment.appendChild(elt("pre"));
+          html.push("<pre></pre>");
         } else {
           var marker = line.gutterMarker;
           var text = options.lineNumbers ? options.lineNumberFormatter(i + options.firstLineNumber) : null;
@@ -1205,18 +1238,15 @@ window.CodeMirror = (function() {
             text = marker.text.replace("%N%", text != null ? text : "");
           else if (text == null)
             text = "\u00a0";
-          var markerElement = fragment.appendChild(elt("pre", null, marker && marker.style));
-          markerElement.innerHTML = text;
-          for (var j = 1; j < line.height; ++j) {
-            markerElement.appendChild(elt("br"));
-            markerElement.appendChild(document.createTextNode("\u00a0"));
-          }
+          html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text);
+          for (var j = 1; j < line.height; ++j) html.push("<br/>&#160;");
+          html.push("</pre>");
           if (!marker) normalNode = i;
         }
         ++i;
       });
       gutter.style.display = "none";
-      removeChildrenAndAdd(gutterText, fragment);
+      gutterText.innerHTML = html.join("");
       // Make sure scrolling doesn't cause number gutter size to pop
       if (normalNode != null && options.lineNumbers) {
         var node = gutterText.childNodes[normalNode - showingFrom];
@@ -1244,15 +1274,15 @@ window.CodeMirror = (function() {
         cursor.style.display = "";
         selectionDiv.style.display = "none";
       } else {
-        var sameLine = fromPos.y == toPos.y, fragment = document.createDocumentFragment();
+        var sameLine = fromPos.y == toPos.y, html = "";
         var clientWidth = lineSpace.clientWidth || lineSpace.offsetWidth;
         var clientHeight = lineSpace.clientHeight || lineSpace.offsetHeight;
-        var add = function(left, top, right, height) {
+        function add(left, top, right, height) {
           var rstyle = quirksMode ? "width: " + (!right ? clientWidth : clientWidth - right - left) + "px"
                                   : "right: " + right + "px";
-          fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                                   "px; top: " + top + "px; " + rstyle + "; height: " + height + "px"));
-        };
+          html += '<div class="CodeMirror-selected" style="position: absolute; left: ' + left +
+            'px; top: ' + top + 'px; ' + rstyle + '; height: ' + height + 'px"></div>';
+        }
         if (sel.from.ch && fromPos.y >= 0) {
           var right = sameLine ? clientWidth - toPos.x : 0;
           add(fromPos.x, fromPos.y, right, th);
@@ -1263,7 +1293,7 @@ window.CodeMirror = (function() {
           add(0, middleStart, 0, middleHeight);
         if ((!sameLine || !sel.from.ch) && toPos.y < clientHeight - .5 * th)
           add(0, toPos.y, clientWidth - toPos.x, th);
-        removeChildrenAndAdd(selectionDiv, fragment);
+        selectionDiv.innerHTML = html;
         cursor.style.display = "none";
         selectionDiv.style.display = "";
       }
@@ -1395,16 +1425,13 @@ window.CodeMirror = (function() {
       else replaceRange("", sel.from, findPosH(dir, unit));
       userSelChange = true;
     }
+    var goalColumn = null;
     function moveV(dir, unit) {
       var dist = 0, pos = localCoords(sel.inverted ? sel.from : sel.to, true);
       if (goalColumn != null) pos.x = goalColumn;
-      if (unit == "page") {
-        var screen = Math.min(scroller.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-        var target = coordsChar(pos.x, pos.y + screen * dir);
-      } else if (unit == "line") {
-        var th = textHeight();
-        var target = coordsChar(pos.x, pos.y + .5 * th + dir * th);
-      }
+      if (unit == "page") dist = Math.min(scroller.clientHeight, window.innerHeight || document.documentElement.clientHeight);
+      else if (unit == "line") dist = textHeight();
+      var target = coordsChar(pos.x, pos.y + dist * dir + 2);
       if (unit == "page") scrollbar.scrollTop += localCoords(target, true).y - pos.y;
       setCursor(target.line, target.ch, true);
       goalColumn = pos.x;
@@ -1413,15 +1440,10 @@ window.CodeMirror = (function() {
     function findWordAt(pos) {
       var line = getLine(pos.line).text;
       var start = pos.ch, end = pos.ch;
-      if (line) {
-        if (pos.after === false || end == line.length) --start; else ++end;
-        var startChar = line.charAt(start);
-        var check = isWordChar(startChar) ? isWordChar :
-                    /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);} :
-                    function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-        while (start > 0 && check(line.charAt(start - 1))) --start;
-        while (end < line.length && check(line.charAt(end))) ++end;
-      }
+      var check = isWordChar(line.charAt(start < line.length ? start : start - 1)) ?
+        isWordChar : function(ch) {return !isWordChar(ch);};
+      while (start > 0 && check(line.charAt(start - 1))) --start;
+      while (end < line.length && check(line.charAt(end))) ++end;
       return {from: {line: pos.line, ch: start}, to: {line: pos.line, ch: end}};
     }
     function selectLine(line) {
@@ -1458,18 +1480,16 @@ window.CodeMirror = (function() {
       var indentString = "", pos = 0;
       if (options.indentWithTabs)
         for (var i = Math.floor(indentation / options.tabSize); i; --i) {pos += options.tabSize; indentString += "\t";}
-      if (pos < indentation) indentString += spaceStr(indentation - pos);
+      while (pos < indentation) {++pos; indentString += " ";}
 
-      if (indentString != curSpaceString)
-        replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length});
-      line.stateAfter = null;
+      replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length});
     }
 
     function loadMode() {
       mode = CodeMirror.getMode(options, options.mode);
       doc.iter(0, doc.size, function(line) { line.stateAfter = null; });
-      frontier = 0;
-      startWorker(100);
+      work = [0];
+      startWorker();
     }
     function gutterChanged() {
       var visible = options.gutter || options.lineNumbers;
@@ -1486,16 +1506,24 @@ window.CodeMirror = (function() {
           var guess = Math.ceil(line.text.length / perLine) || 1;
           if (guess != 1) updateLineHeight(line, guess);
         });
-        lineSpace.style.minWidth = widthForcer.style.left = "";
+        lineSpace.style.width = code.style.width = "";
+        widthForcer.style.left = "";
       } else {
         wrapper.className = wrapper.className.replace(" CodeMirror-wrap", "");
-        computeMaxLength();
+        maxLine = ""; maxLineChanged = true;
         doc.iter(0, doc.size, function(line) {
           if (line.height != 1 && !line.hidden) updateLineHeight(line, 1);
+          if (line.text.length > maxLine.length) maxLine = line.text;
         });
       }
       changes.push({from: 0, to: doc.size});
     }
+    function makeTab(col) {
+      var w = options.tabSize - col % options.tabSize, cached = tabCache[w];
+      if (cached) return cached;
+      for (var str = '<span class="cm-tab">', i = 0; i < w; ++i) str += " ";
+      return (tabCache[w] = {html: str + "</span>", width: w});
+    }
     function themeChanged() {
       scroller.className = scroller.className.replace(/\s*cm-s-\S+/g, "") +
         options.theme.replace(/(^|\s)\s*/g, " cm-s-");
@@ -1506,78 +1534,74 @@ window.CodeMirror = (function() {
         (style ? " cm-keymap-" + style : "");
     }
 
-    function TextMarker(type, style) { this.lines = []; this.type = type; if (style) this.style = style; }
+    function TextMarker() { this.set = []; }
     TextMarker.prototype.clear = operation(function() {
-      var min, max, seen = {};
-      for (var i = 0; i < this.lines.length; ++i) {
-        var line = this.lines[i], lineN = lineNo(line);
-        seen[lineN] = newHL(line.text, line.markedSpans);
-        var span = getMarkedSpanFor(line.markedSpans, this);
-        if (span.from != null) min = lineN;
-        if (span.to != null) max = lineN;
-        line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      }
-      if (min != null) {
+      var min = Infinity, max = -Infinity;
+      for (var i = 0, e = this.set.length; i < e; ++i) {
+        var line = this.set[i], mk = line.marked;
+        if (!mk || !line.parent) continue;
+        var lineN = lineNo(line);
+        min = Math.min(min, lineN); max = Math.max(max, lineN);
+        for (var j = 0; j < mk.length; ++j)
+          if (mk[j].marker == this) mk.splice(j--, 1);
+      }
+      if (min != Infinity)
         changes.push({from: min, to: max + 1});
-        var old = [];
-        for (var i = min; i <= max; ++i) old.push(seen[i]);
-        history.addChange(min, old.length, old, true);
-      }
-      this.lines.length = 0;
     });
     TextMarker.prototype.find = function() {
       var from, to;
-      for (var i = 0; i < this.lines.length; ++i) {
-        var line = this.lines[i];
-        var span = getMarkedSpanFor(line.markedSpans, this);
-        if (span.from != null || span.to != null) {
-          var found = lineNo(line);
-          if (span.from != null) from = {line: found, ch: span.from};
-          if (span.to != null) to = {line: found, ch: span.to};
+      for (var i = 0, e = this.set.length; i < e; ++i) {
+        var line = this.set[i], mk = line.marked;
+        for (var j = 0; j < mk.length; ++j) {
+          var mark = mk[j];
+          if (mark.marker == this) {
+            if (mark.from != null || mark.to != null) {
+              var found = lineNo(line);
+              if (found != null) {
+                if (mark.from != null) from = {line: found, ch: mark.from};
+                if (mark.to != null) to = {line: found, ch: mark.to};
+              }
+            }
+          }
         }
       }
-      if (this.type == "bookmark") return from;
-      return from && {from: from, to: to};
+      return {from: from, to: to};
     };
 
-    function markText(from, to, className, options) {
+    function markText(from, to, className) {
       from = clipPos(from); to = clipPos(to);
-      var marker = new TextMarker("range", className);
-      if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-        marker[opt] = options[opt];
-      var curLine = from.line, old = [];
-      doc.iter(curLine, to.line + 1, function(line) {
-        var span = {from: curLine == from.line ? from.ch : null,
-                    to: curLine == to.line ? to.ch : null,
-                    marker: marker};
-        old.push(newHL(line.text, line.markedSpans));
-        line.markedSpans = (line.markedSpans || []).concat([span]);
-        marker.lines.push(line);
-        ++curLine;
-      });
+      var tm = new TextMarker();
+      if (!posLess(from, to)) return tm;
+      function add(line, from, to, className) {
+        getLine(line).addMark(new MarkedText(from, to, className, tm));
+      }
+      if (from.line == to.line) add(from.line, from.ch, to.ch, className);
+      else {
+        add(from.line, from.ch, null, className);
+        for (var i = from.line + 1, e = to.line; i < e; ++i)
+          add(i, null, null, className);
+        add(to.line, null, to.ch, className);
+      }
       changes.push({from: from.line, to: to.line + 1});
-      history.addChange(from.line, old.length, old, true);
-      return marker;
+      return tm;
     }
 
     function setBookmark(pos) {
       pos = clipPos(pos);
-      var marker = new TextMarker("bookmark"), line = getLine(pos.line);
-      history.addChange(pos.line, 1, [newHL(line.text, line.markedSpans)], true);
-      var span = {from: pos.ch, to: pos.ch, marker: marker};
-      line.markedSpans = (line.markedSpans || []).concat([span]);
-      marker.lines.push(line);
-      return marker;
+      var bm = new Bookmark(pos.ch);
+      getLine(pos.line).addMark(bm);
+      return bm;
     }
 
     function findMarksAt(pos) {
       pos = clipPos(pos);
-      var markers = [], spans = getLine(pos.line).markedSpans;
-      if (spans) for (var i = 0; i < spans.length; ++i) {
-        var span = spans[i];
-        if ((span.from == null || span.from <= pos.ch) &&
-            (span.to == null || span.to >= pos.ch))
-          markers.push(span.marker);
+      var markers = [], marked = getLine(pos.line).marked;
+      if (!marked) return markers;
+      for (var i = 0, e = marked.length; i < e; ++i) {
+        var m = marked[i];
+        if ((m.from == null || m.from <= pos.ch) &&
+            (m.to == null || m.to >= pos.ch))
+          markers.push(m.marker || m);
       }
       return markers;
     }
@@ -1617,10 +1641,11 @@ window.CodeMirror = (function() {
         if (line.hidden != hidden) {
           line.hidden = hidden;
           if (!options.lineWrapping) {
-            if (hidden && line.text.length == maxLine.text.length) {
+            var l = line.text;
+            if (hidden && l.length == maxLine.length) {
               updateMaxLine = true;
-            } else if (!hidden && line.text.length > maxLine.text.length) {
-              maxLine = line; updateMaxLine = false;
+            } else if (!hidden && l.length > maxLine.length) {
+              maxLine = l; updateMaxLine = false;
             }
           }
           updateLineHeight(line, hidden ? 0 : 1);
@@ -1652,16 +1677,53 @@ window.CodeMirror = (function() {
               markerClass: marker && marker.style, lineClass: line.className, bgClass: line.bgClassName};
     }
 
+    function stringWidth(str) {
+      measure.innerHTML = "<pre><span>x</span></pre>";
+      measure.firstChild.firstChild.firstChild.nodeValue = str;
+      return measure.firstChild.firstChild.offsetWidth || 10;
+    }
+    // These are used to go from pixel positions to character
+    // positions, taking varying character widths into account.
+    function charFromX(line, x) {
+      if (x <= 0) return 0;
+      var lineObj = getLine(line), text = lineObj.text;
+      function getX(len) {
+        return measureLine(lineObj, len).left;
+      }
+      var from = 0, fromX = 0, to = text.length, toX;
+      // Guess a suitable upper bound for our search.
+      var estimated = Math.min(to, Math.ceil(x / charWidth()));
+      for (;;) {
+        var estX = getX(estimated);
+        if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2));
+        else {toX = estX; to = estimated; break;}
+      }
+      if (x > toX) return to;
+      // Try to guess a suitable lower bound as well.
+      estimated = Math.floor(to * 0.8); estX = getX(estimated);
+      if (estX < x) {from = estimated; fromX = estX;}
+      // Do a binary search between these bounds.
+      for (;;) {
+        if (to - from <= 1) return (toX - x > x - fromX) ? from : to;
+        var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
+        if (middleX > x) {to = middle; toX = middleX;}
+        else {from = middle; fromX = middleX;}
+      }
+    }
+
+    var tempId = "CodeMirror-temp-" + Math.floor(Math.random() * 0xffffff).toString(16);
     function measureLine(line, ch) {
       if (ch == 0) return {top: 0, left: 0};
-      var pre = lineContent(line, ch);
-      removeChildrenAndAdd(measure, pre);
-      var anchor = pre.anchor;
-      var top = anchor.offsetTop, left = anchor.offsetLeft;
+      var wbr = options.lineWrapping && ch < line.text.length &&
+                spanAffectsWrapping.test(line.text.slice(ch - 1, ch + 1));
+      measure.innerHTML = "<pre>" + line.getHTML(makeTab, ch, tempId, wbr) + "</pre>";
+      var elt = document.getElementById(tempId);
+      var top = elt.offsetTop, left = elt.offsetLeft;
       // Older IEs report zero offsets for spans directly after a wrap
       if (ie && top == 0 && left == 0) {
-        var backup = elt("span", "x");
-        anchor.parentNode.insertBefore(backup, anchor.nextSibling);
+        var backup = document.createElement("span");
+        backup.innerHTML = "x";
+        elt.parentNode.insertBefore(backup, elt.nextSibling);
         top = backup.offsetTop;
       }
       return {top: top, left: left};
@@ -1678,19 +1740,17 @@ window.CodeMirror = (function() {
     }
     // Coords must be lineSpace-local
     function coordsChar(x, y) {
+      if (y < 0) y = 0;
       var th = textHeight(), cw = charWidth(), heightPos = displayOffset + Math.floor(y / th);
-      if (heightPos < 0) return {line: 0, ch: 0};
       var lineNo = lineAtHeight(doc, heightPos);
       if (lineNo >= doc.size) return {line: doc.size - 1, ch: getLine(doc.size - 1).text.length};
       var lineObj = getLine(lineNo), text = lineObj.text;
       var tw = options.lineWrapping, innerOff = tw ? heightPos - heightAtLine(doc, lineNo) : 0;
       if (x <= 0 && innerOff == 0) return {line: lineNo, ch: 0};
-      var wrongLine = false;
       function getX(len) {
         var sp = measureLine(lineObj, len);
         if (tw) {
           var off = Math.round(sp.top / th);
-          wrongLine = off != innerOff;
           return Math.max(0, sp.left + (off - innerOff) * scroller.clientWidth);
         }
         return sp.left;
@@ -1709,12 +1769,9 @@ window.CodeMirror = (function() {
       if (estX < x) {from = estimated; fromX = estX;}
       // Do a binary search between these bounds.
       for (;;) {
-        if (to - from <= 1) {
-          var after = x - fromX < toX - x;
-          return {line: lineNo, ch: after ? from : to, after: after};
-        }
+        if (to - from <= 1) return {line: lineNo, ch: (toX - x > x - fromX) ? from : to};
         var middle = Math.ceil((from + to) / 2), middleX = getX(middle);
-        if (middleX > x) {to = middle; toX = middleX; if (wrongLine) toX += 1000; }
+        if (middleX > x) {to = middle; toX = middleX;}
         else {from = middle; fromX = middleX;}
       }
     }
@@ -1723,32 +1780,26 @@ window.CodeMirror = (function() {
       return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot};
     }
 
-    var cachedHeight, cachedHeightFor, measurePre;
+    var cachedHeight, cachedHeightFor, measureText;
     function textHeight() {
-      if (measurePre == null) {
-        measurePre = elt("pre");
-        for (var i = 0; i < 49; ++i) {
-          measurePre.appendChild(document.createTextNode("x"));
-          measurePre.appendChild(elt("br"));
-        }
-        measurePre.appendChild(document.createTextNode("x"));
+      if (measureText == null) {
+        measureText = "<pre>";
+        for (var i = 0; i < 49; ++i) measureText += "x<br/>";
+        measureText += "x</pre>";
       }
       var offsetHeight = lineDiv.clientHeight;
       if (offsetHeight == cachedHeightFor) return cachedHeight;
       cachedHeightFor = offsetHeight;
-      removeChildrenAndAdd(measure, measurePre.cloneNode(true));
+      measure.innerHTML = measureText;
       cachedHeight = measure.firstChild.offsetHeight / 50 || 1;
-      removeChildren(measure);
+      measure.innerHTML = "";
       return cachedHeight;
     }
     var cachedWidth, cachedWidthFor = 0;
     function charWidth() {
       if (scroller.clientWidth == cachedWidthFor) return cachedWidth;
       cachedWidthFor = scroller.clientWidth;
-      var anchor = elt("span", "x");
-      var pre = elt("pre", [anchor]);
-      removeChildrenAndAdd(measure, pre);
-      return (cachedWidth = anchor.offsetWidth || 10);
+      return (cachedWidth = stringWidth("x"));
     }
     function paddingTop() {return lineSpace.offsetTop;}
     function paddingLeft() {return lineSpace.offsetLeft;}
@@ -1765,7 +1816,6 @@ window.CodeMirror = (function() {
       var offL = eltOffset(lineSpace, true);
       return coordsChar(x - offL.left, y - offL.top);
     }
-    var detectingSelectAll;
     function onContextMenu(e) {
       var pos = posFromMouse(e), scrollPos = scrollbar.scrollTop;
       if (!pos || opera) return; // Opera is difficult.
@@ -1777,30 +1827,19 @@ window.CodeMirror = (function() {
       input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
         "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: white; " +
         "border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+      leaveInputAlone = true;
+      var val = input.value = getSelection();
       focusInput();
-      resetInput(true);
-      // Adds "Select all" to context menu in FF
-      if (posEq(sel.from, sel.to)) input.value = prevInput = " ";
-
+      selectInput(input);
       function rehide() {
+        var newVal = splitLines(input.value).join("\n");
+        if (newVal != val && !options.readOnly) operation(replaceSelection)(newVal, "end");
         inputDiv.style.position = "relative";
         input.style.cssText = oldCSS;
         if (ie_lt9) scrollbar.scrollTop = scrollPos;
+        leaveInputAlone = false;
+        resetInput(true);
         slowPoll();
-
-        // Try to detect the user choosing select-all 
-        if (input.selectionStart != null) {
-          clearTimeout(detectingSelectAll);
-          var extval = input.value = " " + (posEq(sel.from, sel.to) ? "" : input.value), i = 0;
-          prevInput = " ";
-          input.selectionStart = 1; input.selectionEnd = extval.length;
-          detectingSelectAll = setTimeout(function poll(){
-            if (prevInput == " " && input.selectionStart == 0)
-              operation(commands.selectAll)(instance);
-            else if (i++ < 10) detectingSelectAll = setTimeout(poll, 500);
-            else resetInput();
-          }, 200);
-        }
       }
 
       if (gecko) {
@@ -1821,7 +1860,7 @@ window.CodeMirror = (function() {
       cursor.style.visibility = "";
       blinker = setInterval(function() {
         cursor.style.visibility = (on = !on) ? "" : "hidden";
-      }, options.cursorBlinkRate);
+      }, 650);
     }
 
     var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
@@ -1884,39 +1923,70 @@ window.CodeMirror = (function() {
       return minline;
     }
     function getStateBefore(n) {
-      var pos = findStartLine(n), state = pos && getLine(pos-1).stateAfter;
+      var start = findStartLine(n), state = start && getLine(start-1).stateAfter;
       if (!state) state = startState(mode);
       else state = copyState(mode, state);
-      doc.iter(pos, n, function(line) {
-        line.process(mode, state, options.tabSize);
-        line.stateAfter = (pos == n - 1 || pos % 5 == 0) ? copyState(mode, state) : null;
+      doc.iter(start, n, function(line) {
+        line.highlight(mode, state, options.tabSize);
+        line.stateAfter = copyState(mode, state);
       });
+      if (start < n) changes.push({from: start, to: n});
+      if (n < doc.size && !getLine(n).stateAfter) work.push(n);
       return state;
     }
+    function highlightLines(start, end) {
+      var state = getStateBefore(start);
+      doc.iter(start, end, function(line) {
+        line.highlight(mode, state, options.tabSize);
+        line.stateAfter = copyState(mode, state);
+      });
+    }
     function highlightWorker() {
-      if (frontier >= showingTo) return;
-      var end = +new Date + options.workTime, state = copyState(mode, getStateBefore(frontier));
-      var startFrontier = frontier;
-      doc.iter(frontier, showingTo, function(line) {
-        if (frontier >= showingFrom) { // Visible
-          line.highlight(mode, state, options.tabSize);
+      var end = +new Date + options.workTime;
+      var foundWork = work.length;
+      while (work.length) {
+        if (!getLine(showingFrom).stateAfter) var task = showingFrom;
+        else var task = work.pop();
+        if (task >= doc.size) continue;
+        var start = findStartLine(task), state = start && getLine(start-1).stateAfter;
+        if (state) state = copyState(mode, state);
+        else state = startState(mode);
+
+        var unchanged = 0, compare = mode.compareStates, realChange = false,
+            i = start, bail = false;
+        doc.iter(i, doc.size, function(line) {
+          var hadState = line.stateAfter;
+          if (+new Date > end) {
+            work.push(i);
+            startWorker(options.workDelay);
+            if (realChange) changes.push({from: task, to: i + 1});
+            return (bail = true);
+          }
+          var changed = line.highlight(mode, state, options.tabSize);
+          if (changed) realChange = true;
           line.stateAfter = copyState(mode, state);
-        } else {
-          line.process(mode, state, options.tabSize);
-          line.stateAfter = frontier % 5 == 0 ? copyState(mode, state) : null;
-        }
-        ++frontier;
-        if (+new Date > end) {
-          startWorker(options.workDelay);
-          return true;
-        }
-      });
-      if (showingTo > startFrontier && frontier >= showingFrom)
-        operation(function() {changes.push({from: startFrontier, to: frontier});})();
+          var done = null;
+          if (compare) {
+            var same = hadState && compare(hadState, state);
+            if (same != Pass) done = !!same;
+          }
+          if (done == null) {
+            if (changed !== false || !hadState) unchanged = 0;
+            else if (++unchanged > 3 && (!mode.indent || mode.indent(hadState, "") == mode.indent(state, "")))
+              done = true;
+          }
+          if (done) return true;
+          ++i;
+        });
+        if (bail) return;
+        if (realChange) changes.push({from: task, to: i + 1});
+      }
+      if (foundWork && options.onHighlightComplete)
+        options.onHighlightComplete(instance);
     }
     function startWorker(time) {
-      if (frontier < showingTo)
-        highlight.set(time, highlightWorker);
+      if (!work.length) return;
+      highlight.set(time, operation(highlightWorker));
     }
 
     // Operations are used to wrap changes in such a way that each
@@ -1930,11 +2000,9 @@ window.CodeMirror = (function() {
     function endOperation() {
       if (updateMaxLine) computeMaxLength();
       if (maxLineChanged && !options.lineWrapping) {
-        var cursorWidth = widthForcer.offsetWidth, left = measureLine(maxLine, maxLine.text.length).left;
-        if (!ie_lt8) {
-          widthForcer.style.left = left + "px";
-          lineSpace.style.minWidth = (left + cursorWidth) + "px";
-        }
+        var cursorWidth = widthForcer.offsetWidth, left = stringWidth(maxLine);
+        widthForcer.style.left = left + "px";
+        lineSpace.style.minWidth = (left + cursorWidth) + "px";
         maxLineChanged = false;
       }
       var newScrollPos, updated;
@@ -1942,16 +2010,16 @@ window.CodeMirror = (function() {
         var coords = calculateCursorCoords();
         newScrollPos = calculateScrollPos(coords.x, coords.y, coords.x, coords.yBot);
       }
-      if (changes.length || newScrollPos && newScrollPos.scrollTop != null)
-        updated = updateDisplay(changes, true, newScrollPos && newScrollPos.scrollTop);
-      if (!updated) {
+      if (changes.length) updated = updateDisplay(changes, true, (newScrollPos ? newScrollPos.scrollTop : null));
+      else {
         if (selectionChanged) updateSelection();
         if (gutterDirty) updateGutter();
       }
       if (newScrollPos) scrollCursorIntoView();
-      if (selectionChanged) restartBlink();
+      if (selectionChanged) {scrollEditorIntoView(); restartBlink();}
 
-      if (focused && (updateInput === true || (updateInput !== false && selectionChanged)))
+      if (focused && !leaveInputAlone &&
+          (updateInput === true || (updateInput !== false && selectionChanged)))
         resetInput(userSelChange);
 
       if (selectionChanged && options.matchBrackets)
@@ -1986,7 +2054,6 @@ window.CodeMirror = (function() {
       if (extensions.propertyIsEnumerable(ext) &&
           !instance.propertyIsEnumerable(ext))
         instance[ext] = extensions[ext];
-    for (var i = 0; i < initHooks.length; ++i) initHooks[i](instance);
     return instance;
   } // (end of function CodeMirror)
 
@@ -2014,12 +2081,11 @@ window.CodeMirror = (function() {
     dragDrop: true,
     onChange: null,
     onCursorActivity: null,
-    onViewportChange: null,
     onGutterClick: null,
+    onHighlightComplete: null,
     onUpdate: null,
     onFocus: null, onBlur: null, onScroll: null,
     matchBrackets: false,
-    cursorBlinkRate: 530,
     workTime: 100,
     workDelay: 200,
     pollInterval: 100,
@@ -2058,13 +2124,7 @@ window.CodeMirror = (function() {
     var spec = CodeMirror.resolveMode(spec);
     var mfactory = modes[spec.name];
     if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    var modeObj = mfactory(options, spec);
-    if (modeExtensions.hasOwnProperty(spec.name)) {
-      var exts = modeExtensions[spec.name];
-      for (var prop in exts) if (exts.hasOwnProperty(prop)) modeObj[prop] = exts[prop];
-    }
-    modeObj.name = spec.name;
-    return modeObj;
+    return mfactory(options, spec);
   };
   CodeMirror.listModes = function() {
     var list = [];
@@ -2084,16 +2144,6 @@ window.CodeMirror = (function() {
     extensions[name] = func;
   };
 
-  var initHooks = [];
-  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
-
-  var modeExtensions = CodeMirror.modeExtensions = {};
-  CodeMirror.extendMode = function(mode, properties) {
-    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-    for (var prop in properties) if (properties.hasOwnProperty(prop))
-      exts[prop] = properties[prop];
-  };
-
   var commands = CodeMirror.commands = {
     selectAll: function(cm) {cm.setSelection({line: 0, ch: 0}, {line: cm.lineCount() - 1});},
     killLine: function(cm) {
@@ -2191,10 +2241,6 @@ window.CodeMirror = (function() {
     function lookup(map) {
       map = getKeyMap(map);
       var found = map[name];
-      if (found === false) {
-        if (stop) stop();
-        return true;
-      }
       if (found != null && handle(found)) return true;
       if (map.nofallthrough) {
         if (stop) stop();
@@ -2216,22 +2262,14 @@ window.CodeMirror = (function() {
     var name = keyNames[e_prop(event, "keyCode")];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
   }
-  CodeMirror.isModifierKey = isModifierKey;
 
   CodeMirror.fromTextArea = function(textarea, options) {
     if (!options) options = {};
     options.value = textarea.value;
     if (!options.tabindex && textarea.tabindex)
       options.tabindex = textarea.tabindex;
-    // Set autofocus to true if this textarea is focused, or if it has
-    // autofocus and no other element is focused.
-    if (options.autofocus == null) {
-      var hasFocus = document.body;
-      // doc.activeElement occasionally throws on IE
-      try { hasFocus = document.activeElement; } catch(e) {}
-      options.autofocus = hasFocus == textarea ||
-        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
-    }
+    if (options.autofocus == null && textarea.getAttribute("autofocus") != null)
+      options.autofocus = true;
 
     function save() {textarea.value = instance.getValue();}
     if (textarea.form) {
@@ -2239,12 +2277,13 @@ window.CodeMirror = (function() {
       var rmSubmit = connect(textarea.form, "submit", save, true);
       if (typeof textarea.form.submit == "function") {
         var realSubmit = textarea.form.submit;
-        textarea.form.submit = function wrappedSubmit() {
+        function wrappedSubmit() {
           save();
           textarea.form.submit = realSubmit;
           textarea.form.submit();
           textarea.form.submit = wrappedSubmit;
-        };
+        }
+        textarea.form.submit = wrappedSubmit;
       }
     }
 
@@ -2267,18 +2306,6 @@ window.CodeMirror = (function() {
     return instance;
   };
 
-  var gecko = /gecko\/\d{7}/i.test(navigator.userAgent);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
-  var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
-  var quirksMode = ie && document.documentMode == 5;
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var opera = /Opera\//.test(navigator.userAgent);
-  var safari = /Apple Computer/.test(navigator.vendor);
-  var khtml = /KHTML\//.test(navigator.userAgent);
-  var mac_geLion = /Mac OS X 10\D([7-9]|\d\d)\D/.test(navigator.userAgent);
-
   // Utility functions for working with state. Exported because modes
   // sometimes need to do this.
   function copyState(mode, state) {
@@ -2297,14 +2324,6 @@ window.CodeMirror = (function() {
     return mode.startState ? mode.startState(a1, a2) : true;
   }
   CodeMirror.startState = startState;
-  CodeMirror.innerMode = function(mode, state) {
-    while (mode.innerMode) {
-      var info = mode.innerMode(state);
-      state = info.state;
-      mode = info.mode;
-    }
-    return info || {mode: mode, state: state};
-  };
 
   // The character stream used by a mode's parser.
   function StringStream(string, tabSize) {
@@ -2315,7 +2334,7 @@ window.CodeMirror = (function() {
   StringStream.prototype = {
     eol: function() {return this.pos >= this.string.length;},
     sol: function() {return this.pos == 0;},
-    peek: function() {return this.string.charAt(this.pos) || undefined;},
+    peek: function() {return this.string.charAt(this.pos);},
     next: function() {
       if (this.pos < this.string.length)
         return this.string.charAt(this.pos++);
@@ -2346,14 +2365,13 @@ window.CodeMirror = (function() {
     indentation: function() {return countColumn(this.string, null, this.tabSize);},
     match: function(pattern, consume, caseInsensitive) {
       if (typeof pattern == "string") {
-        var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
+        function cased(str) {return caseInsensitive ? str.toLowerCase() : str;}
         if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) {
           if (consume !== false) this.pos += pattern.length;
           return true;
         }
       } else {
         var match = this.string.slice(this.pos).match(pattern);
-        if (match && match.index > 0) return null;
         if (match && consume !== false) this.pos += match[0].length;
         return match;
       }
@@ -2362,166 +2380,210 @@ window.CodeMirror = (function() {
   };
   CodeMirror.StringStream = StringStream;
 
-  function MarkedSpan(from, to, marker) {
-    this.from = from; this.to = to; this.marker = marker;
-  }
-
-  function getMarkedSpanFor(spans, marker) {
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.marker == marker) return span;
-    }
+  function MarkedText(from, to, className, marker) {
+    this.from = from; this.to = to; this.style = className; this.marker = marker;
   }
+  MarkedText.prototype = {
+    attach: function(line) { this.marker.set.push(line); },
+    detach: function(line) {
+      var ix = indexOf(this.marker.set, line);
+      if (ix > -1) this.marker.set.splice(ix, 1);
+    },
+    split: function(pos, lenBefore) {
+      if (this.to <= pos && this.to != null) return null;
+      var from = this.from < pos || this.from == null ? null : this.from - pos + lenBefore;
+      var to = this.to == null ? null : this.to - pos + lenBefore;
+      return new MarkedText(from, to, this.style, this.marker);
+    },
+    dup: function() { return new MarkedText(null, null, this.style, this.marker); },
+    clipTo: function(fromOpen, from, toOpen, to, diff) {
+      if (fromOpen && to > this.from && (to < this.to || this.to == null))
+        this.from = null;
+      else if (this.from != null && this.from >= from)
+        this.from = Math.max(to, this.from) + diff;
+      if (toOpen && (from < this.to || this.to == null) && (from > this.from || this.from == null))
+        this.to = null;
+      else if (this.to != null && this.to > from)
+        this.to = to < this.to ? this.to + diff : from;
+    },
+    isDead: function() { return this.from != null && this.to != null && this.from >= this.to; },
+    sameSet: function(x) { return this.marker == x.marker; }
+  };
 
-  function removeMarkedSpan(spans, span) {
-    var r;
-    for (var i = 0; i < spans.length; ++i)
-      if (spans[i] != span) (r || (r = [])).push(spans[i]);
-    return r;
+  function Bookmark(pos) {
+    this.from = pos; this.to = pos; this.line = null;
   }
-
-  function markedSpansBefore(old, startCh, endCh) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore || marker.type == "bookmark" && span.from == startCh && span.from != endCh) {
-        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push({from: span.from,
-                                to: endsAfter ? null : span.to,
-                                marker: marker});
+  Bookmark.prototype = {
+    attach: function(line) { this.line = line; },
+    detach: function(line) { if (this.line == line) this.line = null; },
+    split: function(pos, lenBefore) {
+      if (pos < this.from) {
+        this.from = this.to = (this.from - pos) + lenBefore;
+        return this;
       }
-    }
-    return nw;
-  }
-
-  function markedSpansAfter(old, endCh) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || marker.type == "bookmark" && span.from == endCh) {
-        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push({from: startsBefore ? null : span.from - endCh,
-                                to: span.to == null ? null : span.to - endCh,
-                                marker: marker});
-      }
-    }
-    return nw;
-  }
-
-  function updateMarkedSpans(oldFirst, oldLast, startCh, endCh, newText) {
-    if (!oldFirst && !oldLast) return newText;
-    // Get the spans that 'stick out' on both sides
-    var first = markedSpansBefore(oldFirst, startCh);
-    var last = markedSpansAfter(oldLast, endCh);
-
-    // Next, merge those two ends
-    var sameLine = newText.length == 1, offset = lst(newText).length + (sameLine ? startCh : 0);
-    if (first) {
-      // Fix up .to properties of first
-      for (var i = 0; i < first.length; ++i) {
-        var span = first[i];
-        if (span.to == null) {
-          var found = getMarkedSpanFor(last, span.marker);
-          if (!found) span.to = startCh;
-          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
-        }
+    },
+    isDead: function() { return this.from > this.to; },
+    clipTo: function(fromOpen, from, toOpen, to, diff) {
+      if ((fromOpen || from < this.from) && (toOpen || to > this.to)) {
+        this.from = 0; this.to = -1;
+      } else if (this.from > from) {
+        this.from = this.to = Math.max(to, this.from) + diff;
       }
-    }
-    if (last) {
-      // Fix up .from in last (or move them into first in case of sameLine)
-      for (var i = 0; i < last.length; ++i) {
-        var span = last[i];
-        if (span.to != null) span.to += offset;
-        if (span.from == null) {
-          var found = getMarkedSpanFor(first, span.marker);
-          if (!found) {
-            span.from = offset;
-            if (sameLine) (first || (first = [])).push(span);
-          }
-        } else {
-          span.from += offset;
-          if (sameLine) (first || (first = [])).push(span);
-        }
+    },
+    sameSet: function(x) { return false; },
+    find: function() {
+      if (!this.line || !this.line.parent) return null;
+      return {line: lineNo(this.line), ch: this.from};
+    },
+    clear: function() {
+      if (this.line) {
+        var found = indexOf(this.line.marked, this);
+        if (found != -1) this.line.marked.splice(found, 1);
+        this.line = null;
       }
     }
-
-    var newMarkers = [newHL(newText[0], first)];
-    if (!sameLine) {
-      // Fill gap with whole-line-spans
-      var gap = newText.length - 2, gapMarkers;
-      if (gap > 0 && first)
-        for (var i = 0; i < first.length; ++i)
-          if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push({from: null, to: null, marker: first[i].marker});
-      for (var i = 0; i < gap; ++i)
-        newMarkers.push(newHL(newText[i+1], gapMarkers));
-      newMarkers.push(newHL(lst(newText), last));
-    }
-    return newMarkers;
-  }
-
-  // hl stands for history-line, a data structure that can be either a
-  // string (line without markers) or a {text, markedSpans} object.
-  function hlText(val) { return typeof val == "string" ? val : val.text; }
-  function hlSpans(val) { return typeof val == "string" ? null : val.markedSpans; }
-  function newHL(text, spans) { return spans ? {text: text, markedSpans: spans} : text; }
-
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i) {
-      var lines = spans[i].marker.lines;
-      var ix = indexOf(lines, line);
-      lines.splice(ix, 1);
-    }
-    line.markedSpans = null;
-  }
-
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      var marker = spans[i].marker.lines.push(line);
-    line.markedSpans = spans;
-  }
-
-  // When measuring the position of the end of a line, different
-  // browsers require different approaches. If an empty span is added,
-  // many browsers report bogus offsets. Of those, some (Webkit,
-  // recent IE) will accept a space without moving the whole span to
-  // the next line when wrapping it, others work with a zero-width
-  // space.
-  var eolSpanContent = " ";
-  if (gecko || (ie && !ie_lt8)) eolSpanContent = "\u200b";
-  else if (opera) eolSpanContent = "";
+  };
 
   // Line objects. These hold state related to a line, including
   // highlighting info (the styles array).
-  function Line(text, markedSpans) {
+  function Line(text, styles) {
+    this.styles = styles || [text, null];
     this.text = text;
     this.height = 1;
-    attachMarkedSpans(this, markedSpans);
+    this.marked = this.gutterMarker = this.className = this.bgClassName = this.handlers = null;
+    this.stateAfter = this.parent = this.hidden = null;
+  }
+  Line.inheritMarks = function(text, orig) {
+    var ln = new Line(text), mk = orig && orig.marked;
+    if (mk) {
+      for (var i = 0; i < mk.length; ++i) {
+        if (mk[i].to == null && mk[i].style) {
+          var newmk = ln.marked || (ln.marked = []), mark = mk[i];
+          var nmark = mark.dup(); newmk.push(nmark); nmark.attach(ln);
+        }
+      }
+    }
+    return ln;
   }
   Line.prototype = {
-    update: function(text, markedSpans) {
-      this.text = text;
-      this.stateAfter = this.styles = null;
-      detachMarkedSpans(this);
-      attachMarkedSpans(this, markedSpans);
+    // Replace a piece of a line, keeping the styles around it intact.
+    replace: function(from, to_, text) {
+      var st = [], mk = this.marked, to = to_ == null ? this.text.length : to_;
+      copyStyles(0, from, this.styles, st);
+      if (text) st.push(text, null);
+      copyStyles(to, this.text.length, this.styles, st);
+      this.styles = st;
+      this.text = this.text.slice(0, from) + text + this.text.slice(to);
+      this.stateAfter = null;
+      if (mk) {
+        var diff = text.length - (to - from);
+        for (var i = 0; i < mk.length; ++i) {
+          var mark = mk[i];
+          mark.clipTo(from == null, from || 0, to_ == null, to, diff);
+          if (mark.isDead()) {mark.detach(this); mk.splice(i--, 1);}
+        }
+      }
+    },
+    // Split a part off a line, keeping styles and markers intact.
+    split: function(pos, textBefore) {
+      var st = [textBefore, null], mk = this.marked;
+      copyStyles(pos, this.text.length, this.styles, st);
+      var taken = new Line(textBefore + this.text.slice(pos), st);
+      if (mk) {
+        for (var i = 0; i < mk.length; ++i) {
+          var mark = mk[i];
+          var newmark = mark.split(pos, textBefore.length);
+          if (newmark) {
+            if (!taken.marked) taken.marked = [];
+            taken.marked.push(newmark); newmark.attach(taken);
+            if (newmark == mark) mk.splice(i--, 1);
+          }
+        }
+      }
+      return taken;
+    },
+    append: function(line) {
+      var mylen = this.text.length, mk = line.marked, mymk = this.marked;
+      this.text += line.text;
+      copyStyles(0, line.text.length, line.styles, this.styles);
+      if (mymk) {
+        for (var i = 0; i < mymk.length; ++i)
+          if (mymk[i].to == null) mymk[i].to = mylen;
+      }
+      if (mk && mk.length) {
+        if (!mymk) this.marked = mymk = [];
+        outer: for (var i = 0; i < mk.length; ++i) {
+          var mark = mk[i];
+          if (!mark.from) {
+            for (var j = 0; j < mymk.length; ++j) {
+              var mymark = mymk[j];
+              if (mymark.to == mylen && mymark.sameSet(mark)) {
+                mymark.to = mark.to == null ? null : mark.to + mylen;
+                if (mymark.isDead()) {
+                  mymark.detach(this);
+                  mk.splice(i--, 1);
+                }
+                continue outer;
+              }
+            }
+          }
+          mymk.push(mark);
+          mark.attach(this);
+          mark.from += mylen;
+          if (mark.to != null) mark.to += mylen;
+        }
+      }
+    },
+    fixMarkEnds: function(other) {
+      var mk = this.marked, omk = other.marked;
+      if (!mk) return;
+      outer: for (var i = 0; i < mk.length; ++i) {
+        var mark = mk[i], close = mark.to == null;
+        if (close && omk) {
+          for (var j = 0; j < omk.length; ++j) {
+            var om = omk[j];
+            if (!om.sameSet(mark) || om.from != null) continue
+            if (mark.from == this.text.length && om.to == 0) {
+              omk.splice(j, 1);
+              mk.splice(i--, 1);
+              continue outer;
+            } else {
+              close = false; break;
+            }
+          }
+        }
+        if (close) mark.to = this.text.length;
+      }
+    },
+    fixMarkStarts: function() {
+      var mk = this.marked;
+      if (!mk) return;
+      for (var i = 0; i < mk.length; ++i)
+        if (mk[i].from == null) mk[i].from = 0;
+    },
+    addMark: function(mark) {
+      mark.attach(this);
+      if (this.marked == null) this.marked = [];
+      this.marked.push(mark);
+      this.marked.sort(function(a, b){return (a.from || 0) - (b.from || 0);});
     },
     // Run the given mode's parser over a line, update the styles
     // array, which contains alternating fragments of text and CSS
     // classes.
     highlight: function(mode, state, tabSize) {
-      var stream = new StringStream(this.text, tabSize), st = this.styles || (this.styles = []);
-      var pos = st.length = 0;
+      var stream = new StringStream(this.text, tabSize), st = this.styles, pos = 0;
+      var changed = false, curWord = st[0], prevWord;
       if (this.text == "" && mode.blankLine) mode.blankLine(state);
       while (!stream.eol()) {
-        var style = mode.token(stream, state), substr = stream.current();
+        var style = mode.token(stream, state);
+        var substr = this.text.slice(stream.start, stream.pos);
         stream.start = stream.pos;
-        if (pos && st[pos-1] == style) {
+        if (pos && st[pos-1] == style)
           st[pos-2] += substr;
-        } else if (substr) {
+        else if (substr) {
+          if (!changed && (st[pos+1] != style || (pos && st[pos-2] != prevWord))) changed = true;
           st[pos++] = substr; st[pos++] = style;
+          prevWord = curWord; curWord = st[pos];
         }
         // Give up when line is ridiculously long
         if (stream.pos > 5000) {
@@ -2529,19 +2591,17 @@ window.CodeMirror = (function() {
           break;
         }
       }
-    },
-    process: function(mode, state, tabSize) {
-      var stream = new StringStream(this.text, tabSize);
-      if (this.text == "" && mode.blankLine) mode.blankLine(state);
-      while (!stream.eol() && stream.pos <= 5000) {
-        mode.token(stream, state);
-        stream.start = stream.pos;
-      }
+      if (st.length != pos) {st.length = pos; changed = true;}
+      if (pos && st[pos-2] != prevWord) changed = true;
+      // Short lines with simple highlights return null, and are
+      // counted as changed by the driver because they are likely to
+      // highlight the same way in various contexts.
+      return changed || (st.length < 5 && this.text.length < 10 ? null : false);
     },
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(mode, state, tabSize, ch) {
-      var txt = this.text, stream = new StringStream(txt, tabSize);
+    getTokenAt: function(mode, state, ch) {
+      var txt = this.text, stream = new StringStream(txt);
       while (stream.pos < ch && !stream.eol()) {
         stream.start = stream.pos;
         var style = mode.token(stream, state);
@@ -2555,102 +2615,94 @@ window.CodeMirror = (function() {
     indentation: function(tabSize) {return countColumn(this.text, null, tabSize);},
     // Produces an HTML fragment for the line, taking selection,
     // marking, and highlighting into account.
-    getContent: function(tabSize, wrapAt, compensateForWrapping) {
-      var first = true, col = 0, specials = /[\t\u0000-\u0019\u200b\u2028\u2029\uFEFF]/g;
-      var pre = elt("pre");
-      function span_(html, text, style) {
+    getHTML: function(makeTab, wrapAt, wrapId, wrapWBR) {
+      var html = [], first = true, col = 0;
+      function span_(text, style) {
         if (!text) return;
         // Work around a bug where, in some compat modes, IE ignores leading spaces
         if (first && ie && text.charAt(0) == " ") text = "\u00a0" + text.slice(1);
         first = false;
-        if (!specials.test(text)) {
+        if (text.indexOf("\t") == -1) {
           col += text.length;
-          var content = document.createTextNode(text);
+          var escaped = htmlEscape(text);
         } else {
-          var content = document.createDocumentFragment(), pos = 0;
-          while (true) {
-            specials.lastIndex = pos;
-            var m = specials.exec(text);
-            var skipped = m ? m.index - pos : text.length - pos;
-            if (skipped) {
-              content.appendChild(document.createTextNode(text.slice(pos, pos + skipped)));
-              col += skipped;
-            }
-            if (!m) break;
-            pos += skipped + 1;
-            if (m[0] == "\t") {
-              var tabWidth = tabSize - col % tabSize;
-              content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-              col += tabWidth;
+          var escaped = "";
+          for (var pos = 0;;) {
+            var idx = text.indexOf("\t", pos);
+            if (idx == -1) {
+              escaped += htmlEscape(text.slice(pos));
+              col += text.length - pos;
+              break;
             } else {
-              var token = elt("span", "\u2022", "cm-invalidchar");
-              token.title = "\\u" + m[0].charCodeAt(0).toString(16);
-              content.appendChild(token);
-              col += 1;
+              col += idx - pos;
+              var tab = makeTab(col);
+              escaped += htmlEscape(text.slice(pos, idx)) + tab.html;
+              col += tab.width;
+              pos = idx + 1;
             }
           }
         }
-        if (style) html.appendChild(elt("span", [content], style));
-        else html.appendChild(content);
+        if (style) html.push('<span class="', style, '">', escaped, "</span>");
+        else html.push(escaped);
       }
       var span = span_;
       if (wrapAt != null) {
-        var outPos = 0, anchor = pre.anchor = elt("span");
-        span = function(html, text, style) {
+        var outPos = 0, open = "<span id=\"" + wrapId + "\">";
+        span = function(text, style) {
           var l = text.length;
           if (wrapAt >= outPos && wrapAt < outPos + l) {
-            var cut = wrapAt - outPos;
-            if (cut) {
-              span_(html, text.slice(0, cut), style);
+            if (wrapAt > outPos) {
+              span_(text.slice(0, wrapAt - outPos), style);
               // See comment at the definition of spanAffectsWrapping
-              if (compensateForWrapping) {
-                var view = text.slice(cut - 1, cut + 1);
-                if (spanAffectsWrapping.test(view)) html.appendChild(elt("wbr"));
-                else if (!ie_lt8 && /\w\w/.test(view)) html.appendChild(document.createTextNode("\u200d"));
-              }
+              if (wrapWBR) html.push("<wbr>");
             }
-            html.appendChild(anchor);
-            span_(anchor, opera ? text.slice(cut, cut + 1) : text.slice(cut), style);
-            if (opera) span_(html, text.slice(cut + 1), style);
+            html.push(open);
+            var cut = wrapAt - outPos;
+            span_(opera ? text.slice(cut, cut + 1) : text.slice(cut), style);
+            html.push("</span>");
+            if (opera) span_(text.slice(cut + 1), style);
             wrapAt--;
             outPos += l;
           } else {
             outPos += l;
-            span_(html, text, style);
-            if (outPos == wrapAt && outPos == len) {
-              setTextContent(anchor, eolSpanContent);
-              html.appendChild(anchor);
-            }
+            span_(text, style);
+            // Output empty wrapper when at end of line
+            // (Gecko and IE8+ do strange wrapping when adding a space
+            // to the end of the line. Other browsers don't react well
+            // to zero-width spaces. So we do hideous browser sniffing
+            // to determine which to use.)
+            if (outPos == wrapAt && outPos == len)
+              html.push(open + (gecko || (ie && !ie_lt8) ? "&#x200b;" : " ") + "</span>");
             // Stop outputting HTML when gone sufficiently far beyond measure
             else if (outPos > wrapAt + 10 && /\s/.test(text)) span = function(){};
           }
-        };
+        }
       }
 
-      var st = this.styles, allText = this.text, marked = this.markedSpans;
+      var st = this.styles, allText = this.text, marked = this.marked;
       var len = allText.length;
       function styleToClass(style) {
         if (!style) return null;
         return "cm-" + style.replace(/ +/g, " cm-");
       }
+
       if (!allText && wrapAt == null) {
-        span(pre, " ");
+        span(" ");
       } else if (!marked || !marked.length) {
         for (var i = 0, ch = 0; ch < len; i+=2) {
           var str = st[i], style = st[i+1], l = str.length;
           if (ch + l > len) str = str.slice(0, len - ch);
           ch += l;
-          span(pre, str, styleToClass(style));
+          span(str, styleToClass(style));
         }
       } else {
-        marked.sort(function(a, b) { return a.from - b.from; });
         var pos = 0, i = 0, text = "", style, sg = 0;
         var nextChange = marked[0].from || 0, marks = [], markpos = 0;
-        var advanceMarks = function() {
+        function advanceMarks() {
           var m;
           while (markpos < marked.length &&
                  ((m = marked[markpos]).from == pos || m.from == null)) {
-            if (m.marker.type == "range") marks.push(m);
+            if (m.style != null) marks.push(m);
             ++markpos;
           }
           nextChange = markpos < marked.length ? marked[markpos].from : Infinity;
@@ -2660,7 +2712,7 @@ window.CodeMirror = (function() {
             if (to == pos) marks.splice(i--, 1);
             else nextChange = Math.min(to, nextChange);
           }
-        };
+        }
         var m = 0;
         while (pos < len) {
           if (nextChange == pos) advanceMarks();
@@ -2669,13 +2721,9 @@ window.CodeMirror = (function() {
             if (text) {
               var end = pos + text.length;
               var appliedStyle = style;
-              for (var j = 0; j < marks.length; ++j) {
-                var mark = marks[j];
-                appliedStyle = (appliedStyle ? appliedStyle + " " : "") + mark.marker.style;
-                if (mark.marker.endStyle && mark.to === Math.min(end, upto)) appliedStyle += " " + mark.marker.endStyle;
-                if (mark.marker.startStyle && mark.from === pos) appliedStyle += " " + mark.marker.startStyle;
-              }
-              span(pre, end > upto ? text.slice(0, upto - pos) : text, appliedStyle);
+              for (var j = 0; j < marks.length; ++j)
+                appliedStyle = (appliedStyle ? appliedStyle + " " : "") + marks[j].style;
+              span(end > upto ? text.slice(0, upto - pos) : text, appliedStyle);
               if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
               pos = end;
             }
@@ -2683,13 +2731,28 @@ window.CodeMirror = (function() {
           }
         }
       }
-      return pre;
+      return html.join("");
     },
     cleanUp: function() {
       this.parent = null;
-      detachMarkedSpans(this);
+      if (this.marked)
+        for (var i = 0, e = this.marked.length; i < e; ++i) this.marked[i].detach(this);
     }
   };
+  // Utility used by replace and split above
+  function copyStyles(from, to, source, dest) {
+    for (var i = 0, pos = 0, state = 0; pos < to; i+=2) {
+      var part = source[i], end = pos + part.length;
+      if (state == 0) {
+        if (end > from) dest.push(part.slice(from - pos, Math.min(part.length, to - pos)), source[i+1]);
+        if (end >= from) state = 1;
+      } else if (state == 1) {
+        if (end > to) dest.push(part.slice(0, to - pos), source[i+1]);
+        else dest.push(part, source[i+1]);
+      }
+      pos = end;
+    }
+  }
 
   // Data structure that holds the sequence of lines.
   function LeafChunk(lines) {
@@ -2888,12 +2951,12 @@ window.CodeMirror = (function() {
     this.closed = false;
   }
   History.prototype = {
-    addChange: function(start, added, old, minor) {
+    addChange: function(start, added, old) {
       this.undone.length = 0;
-      var time = +new Date, cur = lst(this.done), last = cur && lst(cur);
+      var time = +new Date, cur = this.done[this.done.length - 1], last = cur && cur[cur.length - 1];
       var dtime = time - this.time;
 
-      if (cur && !this.closed && (this.compound || minor)) {
+      if (this.compound && cur && !this.closed) {
         cur.push({start: start, added: added, old: old});
       } else if (dtime > 400 || !last || this.closed ||
                  last.start > start + old.length || last.start + last.added < start) {
@@ -2975,18 +3038,30 @@ window.CodeMirror = (function() {
 
   var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
 
+  var gecko = /gecko\/\d{7}/i.test(navigator.userAgent);
+  var ie = /MSIE \d/.test(navigator.userAgent);
+  var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
+  var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
+  var quirksMode = ie && document.documentMode == 5;
+  var webkit = /WebKit\//.test(navigator.userAgent);
+  var chrome = /Chrome\//.test(navigator.userAgent);
+  var opera = /Opera\//.test(navigator.userAgent);
+  var safari = /Apple Computer/.test(navigator.vendor);
+  var khtml = /KHTML\//.test(navigator.userAgent);
+  var mac_geLion = /Mac OS X 10\D([7-9]|\d\d)\D/.test(navigator.userAgent);
+
   // Detect drag-and-drop
   var dragAndDrop = function() {
     // There is *some* kind of drag-and-drop support in IE6-8, but I
     // couldn't get it to work yet.
     if (ie_lt9) return false;
-    var div = elt('div');
+    var div = document.createElement('div');
     return "draggable" in div || "dragDrop" in div;
   }();
 
   // Feature-detect whether newlines in textareas are converted to \r\n
   var lineSep = function () {
-    var te = elt("textarea");
+    var te = document.createElement("textarea");
     te.value = "foo\nbar";
     if (te.value.indexOf("\r") > -1) return "\r\n";
     return "\n";
@@ -3018,6 +3093,11 @@ window.CodeMirror = (function() {
     return n;
   }
 
+  function computedStyle(elt) {
+    if (elt.currentStyle) return elt.currentStyle;
+    return window.getComputedStyle(elt, null);
+  }
+
   function eltOffset(node, screen) {
     // Take the parts of bounding client rect that we are interested in so we are able to edit if need be,
     // since the returned value cannot be changed externally (they are kept in sync as the element moves within the page)
@@ -3036,19 +3116,10 @@ window.CodeMirror = (function() {
     return box;
   }
 
+  // Get a node's text content.
   function eltText(node) {
     return node.textContent || node.innerText || node.nodeValue || "";
   }
-
-  var spaceStrs = [""];
-  function spaceStr(n) {
-    while (spaceStrs.length <= n)
-      spaceStrs.push(lst(spaceStrs) + " ");
-    return spaceStrs[n];
-  }
-
-  function lst(arr) { return arr[arr.length-1]; }
-
   function selectInput(node) {
     if (ios) { // Mobile Safari apparently has a bug where select() is broken.
       node.selectionStart = 0;
@@ -3061,27 +3132,27 @@ window.CodeMirror = (function() {
   function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);}
   function copyPos(x) {return {line: x.line, ch: x.ch};}
 
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") setTextContent(e, content);
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-  function removeChildren(e) {
-    e.innerHTML = "";
-    return e;
-  }
-  function removeChildrenAndAdd(parent, e) {
-    removeChildren(parent).appendChild(e);
+  var escapeElement = document.createElement("pre");
+  function htmlEscape(str) {
+    escapeElement.textContent = str;
+    return escapeElement.innerHTML;
   }
-  function setTextContent(e, str) {
-    if (ie_lt9) {
-      e.innerHTML = "";
-      e.appendChild(document.createTextNode(str));
-    } else e.textContent = str;
+  // Recent (late 2011) Opera betas insert bogus newlines at the start
+  // of the textContent, so we strip those.
+  if (htmlEscape("a") == "\na") {
+    htmlEscape = function(str) {
+      escapeElement.textContent = str;
+      return escapeElement.innerHTML.slice(1);
+    };
+  // Some IEs don't preserve tabs through innerHTML
+  } else if (htmlEscape("\t") != "\t") {
+    htmlEscape = function(str) {
+      escapeElement.innerHTML = "";
+      escapeElement.appendChild(document.createTextNode(str));
+      return escapeElement.innerHTML;
+    };
   }
+  CodeMirror.htmlEscape = htmlEscape;
 
   // Used to position the cursor after an undo/redo by finding the
   // last edited character.
@@ -3156,7 +3227,5 @@ window.CodeMirror = (function() {
     for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
   })();
 
-  CodeMirror.version = "2.34 +";
-
   return CodeMirror;
 })();
diff --git a/lib/util/.DS_Store b/lib/util/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c00a957d86ad5551029c1b41ae0a372a1f1f8e67
GIT binary patch
literal 6148
zcmeHKOHRWu6nus*+JsL*ELdjA1|)6}RRxJHT!1z$rBzC*^rN!NF*p<l;0W9T<~>`;
zaZM#Q2qC}9p47?sdB#qh5RvLE2bV-`B5I;AHX>A>;PYHIV#l-`0hRPIqy_b8L>DyK
zxH>ch2Z95C%>ll5W6CI}g63r3zw?{C$ohHF#})i|xJEhqkiZd9L<1V*Zf7Rn@fr9o
z=hfk~9L~gLs9T2-(*yd?!OMUHjF6u#P9F8<u=a&j(iG!c;5Vix^Hg$}qUyy`b&TG7
zv_hF9V+rOA{BwGgJ{G?0#47DRV)3Mh(N4FFnU&hC6EoTjxpck}j&kH>TtIp0%P!jO
ze)iDM5<FHt0}g5J<FRtpw3J5}>q@fZQ2*@ZKxvH=BLk0bt3N!aHC6;AOU%eNcQB(h
zPD@s24@~yQvj#-Z+R}4aV`Ru!qNPCXW3w`sJ;n&NgSI};I#;aFW*;DvpY2_{HExXg
znquDUoEt1r`);YlV)}7l&*o^x8bci%2o3}Xz8v7^LxRGX8mu(RqXU(E0stFmmcTK;
zEHEcAm>R4!;tWD*Do|6E`NU9~j`qY{ml~`zYC0+N@u5s+Wxi09WJmvrTuv(080z3a
zaG>tMuKwHR{r~Fw@Bca}{0j~Q2mX}<s?ojcb|A^@tsCNauT4<yQ8@UzN~2IvneA8(
fcq=|dk-)ix4}ht`N+Vhj;YC1f2vu<4R~`5SM(GRY

literal 0
HcmV?d00001

diff --git a/lib/util/._.DS_Store b/lib/util/._.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..8ac37fc9adc12c023d85488dfaf3036e73962005
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIk*Y|peR=07!nd>
zJ?rFuhz^DdtcpejM?+vV1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONfXX4j2s96b
z!9Xq~BePhcD784hv?w`MAuYcsTOl*ABsH%jGe0jeC#O;&CpE1^At@&@FB{m^h3Xp8
P6srH>UXfvt`~M#R%-A0@

literal 0
HcmV?d00001

diff --git a/lib/util/._closetag.js b/lib/util/._closetag.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._dialog.css b/lib/util/._dialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._dialog.js b/lib/util/._dialog.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._foldcode.js b/lib/util/._foldcode.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._formatting.js b/lib/util/._formatting.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._javascript-hint.js b/lib/util/._javascript-hint.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._loadmode.js b/lib/util/._loadmode.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._match-highlighter.js b/lib/util/._match-highlighter.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._multiplex.js b/lib/util/._multiplex.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._overlay.js b/lib/util/._overlay.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._pig-hint.js b/lib/util/._pig-hint.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._runmode.js b/lib/util/._runmode.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._search.js b/lib/util/._search.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._searchcursor.js b/lib/util/._searchcursor.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._simple-hint.css b/lib/util/._simple-hint.css
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._simple-hint.js b/lib/util/._simple-hint.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/._xml-hint.js b/lib/util/._xml-hint.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/lib/util/closetag.js b/lib/util/closetag.js
index 5096678473..656e93c288 100644
--- a/lib/util/closetag.js
+++ b/lib/util/closetag.js
@@ -26,11 +26,6 @@
 	/** Array of tag names where an end tag is forbidden. */
 	CodeMirror.defaults['closeTagVoid'] = ['area', 'base', 'br', 'col', 'command', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'];
 
-	function innerState(cm, state) {
-		return CodeMirror.innerMode(cm.getMode(), state).state;
-	}
-
-
 	/**
 	 * Call during key processing to close tags.  Handles the key event if the tag is closed, otherwise throws CodeMirror.Pass.
 	 * - cm: The editor instance.
@@ -44,34 +39,40 @@
 			throw CodeMirror.Pass;
 		}
 		
-		/*
-		 * Relevant structure of token:
-		 *
-		 * htmlmixed
-		 * 		className
-		 * 		state
-		 * 			htmlState
-		 * 				type
-		 *				tagName
-		 * 				context
-		 * 					tagName
-		 * 			mode
-		 * 
-		 * xml
-		 * 		className
-		 * 		state
-		 * 			tagName
-		 * 			type
-		 */
+		var mode = cm.getOption('mode');
 		
-		var pos = cm.getCursor();
-		var tok = cm.getTokenAt(pos);
-		var state = innerState(cm, tok.state);
-
-		if (state) {
+		if (mode == 'text/html' || mode == 'xml') {
+		
+			/*
+			 * Relevant structure of token:
+			 *
+			 * htmlmixed
+			 * 		className
+			 * 		state
+			 * 			htmlState
+			 * 				type
+			 *				tagName
+			 * 				context
+			 * 					tagName
+			 * 			mode
+			 * 
+			 * xml
+			 * 		className
+			 * 		state
+			 * 			tagName
+			 * 			type
+			 */
+		
+			var pos = cm.getCursor();
+			var tok = cm.getTokenAt(pos);
+			var state = tok.state;
+			
+			if (state.mode && state.mode != 'html') {
+				throw CodeMirror.Pass; // With htmlmixed, we only care about the html sub-mode.
+			}
 			
 			if (ch == '>') {
-				var type = state.type;
+				var type = state.htmlState ? state.htmlState.type : state.type; // htmlmixed : xml
 				
 				if (tok.className == 'tag' && type == 'closeTag') {
 					throw CodeMirror.Pass; // Don't process the '>' at the end of an end-tag.
@@ -82,12 +83,11 @@
 				cm.setCursor(pos);
 		
 				tok = cm.getTokenAt(cm.getCursor());
-				state = innerState(cm, tok.state);
-				if (!state) throw CodeMirror.Pass;
-				var type = state.type;
+				state = tok.state;
+				type = state.htmlState ? state.htmlState.type : state.type; // htmlmixed : xml
 
 				if (tok.className == 'tag' && type != 'selfcloseTag') {
-					var tagName = state.tagName;
+					var tagName = state.htmlState ? state.htmlState.tagName : state.tagName; // htmlmixed : xml
 					if (tagName.length > 0 && shouldClose(cm, vd, tagName)) {
 						insertEndTag(cm, indent, pos, tagName);
 					}
@@ -100,7 +100,7 @@
 			
 			} else if (ch == '/') {
 				if (tok.className == 'tag' && tok.string == '<') {
-					var ctx = state.context, tagName = ctx ? ctx.tagName : '';
+					var tagName = state.htmlState ? (state.htmlState.context ? state.htmlState.context.tagName : '') : (state.context ? state.context.tagName : ''); // htmlmixed : xml
 					if (tagName.length > 0) {
 						completeEndTag(cm, pos, tagName);
 						return;
diff --git a/lib/util/dialog.js b/lib/util/dialog.js
index 7aad7eaecf..36ea10f44d 100644
--- a/lib/util/dialog.js
+++ b/lib/util/dialog.js
@@ -30,10 +30,7 @@
       inp.focus();
       CodeMirror.connect(inp, "blur", close);
     } else if (button = dialog.getElementsByTagName("button")[0]) {
-      CodeMirror.connect(button, "click", function() {
-        close();
-        me.focus();
-      });
+      CodeMirror.connect(button, "click", close);
       button.focus();
       CodeMirror.connect(button, "blur", close);
     }
diff --git a/lib/util/formatting.js b/lib/util/formatting.js
index 2c502b25c6..ccac9b1aa3 100644
--- a/lib/util/formatting.js
+++ b/lib/util/formatting.js
@@ -1,22 +1,110 @@
 // ============== Formatting extensions ============================
-(function() {
-  // Define extensions for a few modes
-  CodeMirror.extendMode("css", {
-    commentStart: "/*",
-    commentEnd: "*/",
-    wordWrapChars: [";", "\\{", "\\}"],
-    autoFormatLineBreaks: function (text) {
-      return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
+// A common storage for all mode-specific formatting features
+if (!CodeMirror.modeExtensions) CodeMirror.modeExtensions = {};
+
+// Returns the extension of the editor's current mode
+CodeMirror.defineExtension("getModeExt", function () {
+  var mname = CodeMirror.resolveMode(this.getOption("mode")).name;
+  var ext = CodeMirror.modeExtensions[mname];
+  if (!ext) throw new Error("No extensions found for mode " + mname);
+  return ext;
+});
+
+// If the current mode is 'htmlmixed', returns the extension of a mode located at
+// the specified position (can be htmlmixed, css or javascript). Otherwise, simply
+// returns the extension of the editor's current mode.
+CodeMirror.defineExtension("getModeExtAtPos", function (pos) {
+  var token = this.getTokenAt(pos);
+  if (token && token.state && token.state.mode)
+    return CodeMirror.modeExtensions[token.state.mode == "html" ? "htmlmixed" : token.state.mode];
+  else
+    return this.getModeExt();
+});
+
+// Comment/uncomment the specified range
+CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
+  var curMode = this.getModeExtAtPos(this.getCursor());
+  if (isComment) { // Comment range
+    var commentedText = this.getRange(from, to);
+    this.replaceRange(curMode.commentStart + this.getRange(from, to) + curMode.commentEnd
+      , from, to);
+    if (from.line == to.line && from.ch == to.ch) { // An empty comment inserted - put cursor inside
+      this.setCursor(from.line, from.ch + curMode.commentStart.length);
+    }
+  }
+  else { // Uncomment range
+    var selText = this.getRange(from, to);
+    var startIndex = selText.indexOf(curMode.commentStart);
+    var endIndex = selText.lastIndexOf(curMode.commentEnd);
+    if (startIndex > -1 && endIndex > -1 && endIndex > startIndex) {
+      // Take string till comment start
+      selText = selText.substr(0, startIndex)
+      // From comment start till comment end
+        + selText.substring(startIndex + curMode.commentStart.length, endIndex)
+      // From comment end till string end
+        + selText.substr(endIndex + curMode.commentEnd.length);
+    }
+    this.replaceRange(selText, from, to);
+  }
+});
+
+// Applies automatic mode-aware indentation to the specified range
+CodeMirror.defineExtension("autoIndentRange", function (from, to) {
+  var cmInstance = this;
+  this.operation(function () {
+    for (var i = from.line; i <= to.line; i++) {
+      cmInstance.indentLine(i, "smart");
     }
   });
+});
+
+// Applies automatic formatting to the specified range
+CodeMirror.defineExtension("autoFormatRange", function (from, to) {
+  var absStart = this.indexFromPos(from);
+  var absEnd = this.indexFromPos(to);
+  // Insert additional line breaks where necessary according to the
+  // mode's syntax
+  var res = this.getModeExt().autoFormatLineBreaks(this.getValue(), absStart, absEnd);
+  var cmInstance = this;
+
+  // Replace and auto-indent the range
+  this.operation(function () {
+    cmInstance.replaceRange(res, from, to);
+    var startLine = cmInstance.posFromIndex(absStart).line;
+    var endLine = cmInstance.posFromIndex(absStart + res.length).line;
+    for (var i = startLine; i <= endLine; i++) {
+      cmInstance.indentLine(i, "smart");
+    }
+  });
+});
+
+// Define extensions for a few modes
+
+CodeMirror.modeExtensions["css"] = {
+  commentStart: "/*",
+  commentEnd: "*/",
+  wordWrapChars: [";", "\\{", "\\}"],
+  autoFormatLineBreaks: function (text, startPos, endPos) {
+    text = text.substring(startPos, endPos);
+    return text.replace(new RegExp("(;|\\{|\\})([^\r\n])", "g"), "$1\n$2");
+  }
+};
 
-  function jsNonBreakableBlocks(text) {
-    var nonBreakableRegexes = [/for\s*?\((.*?)\)/,
-                               /\"(.*?)(\"|$)/,
-                               /\'(.*?)(\'|$)/,
-                               /\/\*(.*?)(\*\/|$)/,
-                               /\/\/.*/];
-    var nonBreakableBlocks = [];
+CodeMirror.modeExtensions["javascript"] = {
+  commentStart: "/*",
+  commentEnd: "*/",
+  wordWrapChars: [";", "\\{", "\\}"],
+
+  getNonBreakableBlocks: function (text) {
+    var nonBreakableRegexes = [
+        new RegExp("for\\s*?\\(([\\s\\S]*?)\\)"),
+        new RegExp("\\\\\"([\\s\\S]*?)(\\\\\"|$)"),
+        new RegExp("\\\\\'([\\s\\S]*?)(\\\\\'|$)"),
+        new RegExp("'([\\s\\S]*?)('|$)"),
+        new RegExp("\"([\\s\\S]*?)(\"|$)"),
+        new RegExp("//.*([\r\n]|$)")
+      ];
+    var nonBreakableBlocks = new Array();
     for (var i = 0; i < nonBreakableRegexes.length; i++) {
       var curPos = 0;
       while (curPos < text.length) {
@@ -38,156 +126,174 @@
     });
 
     return nonBreakableBlocks;
-  }
+  },
 
-  CodeMirror.extendMode("javascript", {
-    commentStart: "/*",
-    commentEnd: "*/",
-    wordWrapChars: [";", "\\{", "\\}"],
-
-    autoFormatLineBreaks: function (text) {
-      var curPos = 0;
-      var reLinesSplitter = /(;|\{|\})([^\r\n;])/g;
-      var nonBreakableBlocks = jsNonBreakableBlocks(text);
-      if (nonBreakableBlocks != null) {
-        var res = "";
-        for (var i = 0; i < nonBreakableBlocks.length; i++) {
-          if (nonBreakableBlocks[i].start > curPos) { // Break lines till the block
-            res += text.substring(curPos, nonBreakableBlocks[i].start).replace(reLinesSplitter, "$1\n$2");
-            curPos = nonBreakableBlocks[i].start;
-          }
-          if (nonBreakableBlocks[i].start <= curPos
-              && nonBreakableBlocks[i].end >= curPos) { // Skip non-breakable block
-            res += text.substring(curPos, nonBreakableBlocks[i].end);
-            curPos = nonBreakableBlocks[i].end;
-          }
+  autoFormatLineBreaks: function (text, startPos, endPos) {
+    text = text.substring(startPos, endPos);
+    var curPos = 0;
+    var reLinesSplitter = new RegExp("(;|\\{|\\})([^\r\n])", "g");
+    var nonBreakableBlocks = this.getNonBreakableBlocks(text);
+    if (nonBreakableBlocks != null) {
+      var res = "";
+      for (var i = 0; i < nonBreakableBlocks.length; i++) {
+        if (nonBreakableBlocks[i].start > curPos) { // Break lines till the block
+          res += text.substring(curPos, nonBreakableBlocks[i].start).replace(reLinesSplitter, "$1\n$2");
+          curPos = nonBreakableBlocks[i].start;
         }
-        if (curPos < text.length)
-          res += text.substr(curPos).replace(reLinesSplitter, "$1\n$2");
-        return res;
-      } else {
-        return text.replace(reLinesSplitter, "$1\n$2");
+        if (nonBreakableBlocks[i].start <= curPos
+          && nonBreakableBlocks[i].end >= curPos) { // Skip non-breakable block
+          res += text.substring(curPos, nonBreakableBlocks[i].end);
+          curPos = nonBreakableBlocks[i].end;
+        }
+      }
+      if (curPos < text.length - 1) {
+        res += text.substr(curPos).replace(reLinesSplitter, "$1\n$2");
       }
+      return res;
     }
-  });
+    else {
+      return text.replace(reLinesSplitter, "$1\n$2");
+    }
+  }
+};
+
+CodeMirror.modeExtensions["xml"] = {
+  commentStart: "<!--",
+  commentEnd: "-->",
+  wordWrapChars: [">"],
 
-  CodeMirror.extendMode("xml", {
-    commentStart: "<!--",
-    commentEnd: "-->",
-    wordWrapChars: [">"],
-
-    autoFormatLineBreaks: function (text) {
-      var lines = text.split("\n");
-      var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
-      var reOpenBrackets = new RegExp("<", "g");
-      var reCloseBrackets = new RegExp("(>)([^\r\n])", "g");
-      for (var i = 0; i < lines.length; i++) {
-        var mToProcess = lines[i].match(reProcessedPortion);
-        if (mToProcess != null && mToProcess.length > 3) { // The line starts with whitespaces and ends with whitespaces
-          lines[i] = mToProcess[1]
+  autoFormatLineBreaks: function (text, startPos, endPos) {
+    text = text.substring(startPos, endPos);
+    var lines = text.split("\n");
+    var reProcessedPortion = new RegExp("(^\\s*?<|^[^<]*?)(.+)(>\\s*?$|[^>]*?$)");
+    var reOpenBrackets = new RegExp("<", "g");
+    var reCloseBrackets = new RegExp("(>)([^\r\n])", "g");
+    for (var i = 0; i < lines.length; i++) {
+      var mToProcess = lines[i].match(reProcessedPortion);
+      if (mToProcess != null && mToProcess.length > 3) { // The line starts with whitespaces and ends with whitespaces
+        lines[i] = mToProcess[1]
             + mToProcess[2].replace(reOpenBrackets, "\n$&").replace(reCloseBrackets, "$1\n$2")
             + mToProcess[3];
-          continue;
-        }
+        continue;
       }
-      return lines.join("\n");
     }
-  });
 
-  function localModeAt(cm, pos) {
-    return CodeMirror.innerMode(cm.getMode(), cm.getTokenAt(pos).state).mode;
+    return lines.join("\n");
   }
+};
 
-  function enumerateModesBetween(cm, line, start, end) {
-    var outer = cm.getMode(), text = cm.getLine(line);
-    if (end == null) end = text.length;
-    if (!outer.innerMode) return [{from: start, to: end, mode: outer}];
-    var state = cm.getTokenAt({line: line, ch: start}).state;
-    var mode = CodeMirror.innerMode(outer, state).mode;
-    var found = [], stream = new CodeMirror.StringStream(text);
-    stream.pos = stream.start = start;
-    for (;;) {
-      outer.token(stream, state);
-      var curMode = CodeMirror.innerMode(outer, state).mode;
-      if (curMode != mode) {
-        var cut = stream.start;
-        // Crappy heuristic to deal with the fact that a change in
-        // mode can occur both at the end and the start of a token,
-        // and we don't know which it was.
-        if (mode.name == "xml" && text.charAt(stream.pos - 1) == ">") cut = stream.pos;
-        found.push({from: start, to: cut, mode: mode});
-        start = cut;
-        mode = curMode;
-      }
-      if (stream.pos >= end) break;
-      stream.start = stream.pos;
-    }
-    if (start < end) found.push({from: start, to: end, mode: mode});
-    return found;
-  }
+CodeMirror.modeExtensions["htmlmixed"] = {
+  commentStart: "<!--",
+  commentEnd: "-->",
+  wordWrapChars: [">", ";", "\\{", "\\}"],
+
+  getModeInfos: function (text, absPos) {
+    var modeInfos = new Array();
+    modeInfos[0] =
+      {
+        pos: 0,
+        modeExt: CodeMirror.modeExtensions["xml"],
+        modeName: "xml"
+      };
+
+    var modeMatchers = new Array();
+    modeMatchers[0] =
+      {
+        regex: new RegExp("<style[^>]*>([\\s\\S]*?)(</style[^>]*>|$)", "i"),
+        modeExt: CodeMirror.modeExtensions["css"],
+        modeName: "css"
+      };
+    modeMatchers[1] =
+      {
+        regex: new RegExp("<script[^>]*>([\\s\\S]*?)(</script[^>]*>|$)", "i"),
+        modeExt: CodeMirror.modeExtensions["javascript"],
+        modeName: "javascript"
+      };
 
-  // Comment/uncomment the specified range
-  CodeMirror.defineExtension("commentRange", function (isComment, from, to) {
-    var curMode = localModeAt(this, from), cm = this;
-    this.operation(function() {
-      if (isComment) { // Comment range
-        cm.replaceRange(curMode.commentEnd, to);
-        cm.replaceRange(curMode.commentStart, from);
-        if (from.line == to.line && from.ch == to.ch) // An empty comment inserted - put cursor inside
-          cm.setCursor(from.line, from.ch + curMode.commentStart.length);
-      } else { // Uncomment range
-        var selText = cm.getRange(from, to);
-        var startIndex = selText.indexOf(curMode.commentStart);
-        var endIndex = selText.lastIndexOf(curMode.commentEnd);
-        if (startIndex > -1 && endIndex > -1 && endIndex > startIndex) {
-          // Take string till comment start
-          selText = selText.substr(0, startIndex)
-          // From comment start till comment end
-            + selText.substring(startIndex + curMode.commentStart.length, endIndex)
-          // From comment end till string end
-            + selText.substr(endIndex + curMode.commentEnd.length);
+    var lastCharPos = (typeof (absPos) !== "undefined" ? absPos : text.length - 1);
+    // Detect modes for the entire text
+    for (var i = 0; i < modeMatchers.length; i++) {
+      var curPos = 0;
+      while (curPos <= lastCharPos) {
+        var m = text.substr(curPos).match(modeMatchers[i].regex);
+        if (m != null) {
+          if (m.length > 1 && m[1].length > 0) {
+            // Push block begin pos
+            var blockBegin = curPos + m.index + m[0].indexOf(m[1]);
+            modeInfos.push(
+              {
+                pos: blockBegin,
+                modeExt: modeMatchers[i].modeExt,
+                modeName: modeMatchers[i].modeName
+              });
+            // Push block end pos
+            modeInfos.push(
+              {
+                pos: blockBegin + m[1].length,
+                modeExt: modeInfos[0].modeExt,
+                modeName: modeInfos[0].modeName
+              });
+            curPos += m.index + m[0].length;
+            continue;
+          }
+          else {
+            curPos += m.index + Math.max(m[0].length, 1);
+          }
+        }
+        else { // No more matches
+          break;
         }
-        cm.replaceRange(selText, from, to);
       }
+    }
+    // Sort mode infos
+    modeInfos.sort(function sortModeInfo(a, b) {
+      return a.pos - b.pos;
     });
-  });
 
-  // Applies automatic mode-aware indentation to the specified range
-  CodeMirror.defineExtension("autoIndentRange", function (from, to) {
-    var cmInstance = this;
-    this.operation(function () {
-      for (var i = from.line; i <= to.line; i++) {
-        cmInstance.indentLine(i, "smart");
-      }
-    });
-  });
+    return modeInfos;
+  },
+
+  autoFormatLineBreaks: function (text, startPos, endPos) {
+    var modeInfos = this.getModeInfos(text);
+    var reBlockStartsWithNewline = new RegExp("^\\s*?\n");
+    var reBlockEndsWithNewline = new RegExp("\n\\s*?$");
+    var res = "";
+    // Use modes info to break lines correspondingly
+    if (modeInfos.length > 1) { // Deal with multi-mode text
+      for (var i = 1; i <= modeInfos.length; i++) {
+        var selStart = modeInfos[i - 1].pos;
+        var selEnd = (i < modeInfos.length ? modeInfos[i].pos : endPos);
 
-  // Applies automatic formatting to the specified range
-  CodeMirror.defineExtension("autoFormatRange", function (from, to) {
-    var cm = this;
-    cm.operation(function () {
-      for (var cur = from.line, end = to.line; cur <= end; ++cur) {
-        var f = {line: cur, ch: cur == from.line ? from.ch : 0};
-        var t = {line: cur, ch: cur == end ? to.ch : null};
-        var modes = enumerateModesBetween(cm, cur, f.ch, t.ch), mangled = "";
-        var text = cm.getRange(f, t);
-        for (var i = 0; i < modes.length; ++i) {
-          var part = modes.length > 1 ? text.slice(modes[i].from, modes[i].to) : text;
-          if (mangled) mangled += "\n";
-          if (modes[i].mode.autoFormatLineBreaks) {
-            mangled += modes[i].mode.autoFormatLineBreaks(part);
-          } else mangled += text;
+        if (selStart >= endPos) { // The block starts later than the needed fragment
+          break;
         }
-        if (mangled != text) {
-          for (var count = 0, pos = mangled.indexOf("\n"); pos != -1; pos = mangled.indexOf("\n", pos + 1), ++count) {}
-          cm.replaceRange(mangled, f, t);
-          cur += count;
-          end += count;
+        if (selStart < startPos) {
+          if (selEnd <= startPos) { // The block starts earlier than the needed fragment
+            continue;
+          }
+          selStart = startPos;
+        }
+        if (selEnd > endPos) {
+          selEnd = endPos;
+        }
+        var textPortion = text.substring(selStart, selEnd);
+        if (modeInfos[i - 1].modeName != "xml") { // Starting a CSS or JavaScript block
+          if (!reBlockStartsWithNewline.test(textPortion)
+              && selStart > 0) { // The block does not start with a line break
+            textPortion = "\n" + textPortion;
+          }
+          if (!reBlockEndsWithNewline.test(textPortion)
+              && selEnd < text.length - 1) { // The block does not end with a line break
+            textPortion += "\n";
+          }
         }
+        res += modeInfos[i - 1].modeExt.autoFormatLineBreaks(textPortion);
       }
-      for (var cur = from.line + 1; cur <= end; ++cur)
-        cm.indentLine(cur, "smart");
-      cm.setSelection(from, cm.getCursor(false));
-    });
-  });
-})();
+    }
+    else { // Single-mode text
+      res = modeInfos[0].modeExt.autoFormatLineBreaks(text.substring(startPos, endPos));
+    }
+
+    return res;
+  }
+};
diff --git a/lib/util/javascript-hint.js b/lib/util/javascript-hint.js
index ff15adb3ac..2117e5af14 100644
--- a/lib/util/javascript-hint.js
+++ b/lib/util/javascript-hint.js
@@ -38,7 +38,7 @@
           case '(': level--; break;
           default: break;
           }
-        } while (level > 0);
+        } while (level > 0)
         tprop = getToken(editor, {line: cur.line, ch: tprop.start});
 				if (tprop.className == 'variable')
 					tprop.className = 'function';
@@ -55,7 +55,7 @@
   CodeMirror.javascriptHint = function(editor) {
     return scriptHint(editor, javascriptKeywords,
                       function (e, cur) {return e.getTokenAt(cur);});
-  };
+  }
 
   function getCoffeeScriptToken(editor, cur) {
   // This getToken, it is for coffeescript, imitates the behavior of
@@ -77,7 +77,7 @@
 
   CodeMirror.coffeescriptHint = function(editor) {
     return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken);
-  };
+  }
 
   var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
                      "toUpperCase toLowerCase split concat match replace search").split(" ");
diff --git a/lib/util/loadmode.js b/lib/util/loadmode.js
index 60fafbb178..48d5a7abf2 100644
--- a/lib/util/loadmode.js
+++ b/lib/util/loadmode.js
@@ -4,7 +4,7 @@
   var loading = {};
   function splitCallback(cont, n) {
     var countDown = n;
-    return function() { if (--countDown == 0) cont(); };
+    return function() { if (--countDown == 0) cont(); }
   }
   function ensureDeps(mode, cont) {
     var deps = CodeMirror.modes[mode].dependencies;
diff --git a/lib/util/multiplex.js b/lib/util/multiplex.js
index 214730839d..c8bb1e9785 100644
--- a/lib/util/multiplex.js
+++ b/lib/util/multiplex.js
@@ -35,7 +35,7 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
           if (found == stream.pos) {
             stream.match(other.open);
             state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
+            state.inner = CodeMirror.startState(other.mode, outer.indent(state.outer, ""));
             return other.delimStyle;
           } else if (found != -1 && found < cutOff) {
             cutOff = found;
@@ -68,10 +68,14 @@ CodeMirror.multiplexingMode = function(outer /*, others */) {
       return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
     },
 
-    electricChars: outer.electricChars,
+    compareStates: function(a, b) {
+      if (a.innerActive != b.innerActive) return false;
+      var mode = a.innerActive || outer;
+      if (!mode.compareStates) return CodeMirror.Pass;
+      return mode.compareStates(a.innerActive ? a.inner : a.outer,
+                                b.innerActive ? b.inner : b.outer);
+    },
 
-    innerMode: function(state) {
-      return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer};
-    }
+    electricChars: outer.electricChars
   };
 };
diff --git a/lib/util/overlay.js b/lib/util/overlay.js
index fba38987bb..1d5df6c64c 100644
--- a/lib/util/overlay.js
+++ b/lib/util/overlay.js
@@ -47,13 +47,6 @@ CodeMirror.overlayMode = CodeMirror.overlayParser = function(base, overlay, comb
     indent: base.indent && function(state, textAfter) {
       return base.indent(state.base, textAfter);
     },
-    electricChars: base.electricChars,
-
-    innerMode: function(state) { return {state: state.base, mode: base}; },
-    
-    blankLine: function(state) {
-      if (base.blankLine) base.blankLine(state.base);
-      if (overlay.blankLine) overlay.blankLine(state.overlay);
-    }
+    electricChars: base.electricChars
   };
 };
diff --git a/lib/util/pig-hint.js b/lib/util/pig-hint.js
index 08e0dbfae0..d696c3abac 100644
--- a/lib/util/pig-hint.js
+++ b/lib/util/pig-hint.js
@@ -43,7 +43,7 @@
   
   CodeMirror.pigHint = function(editor) {
     return scriptHint(editor, pigKeywordsU, function (e, cur) {return e.getTokenAt(cur);});
-  };
+  }
  
  function toTitleCase(str) {
     return str.replace(/(?:^|\s)\w/g, function(match) {
diff --git a/lib/util/runmode.js b/lib/util/runmode.js
index 327976badf..fc58d857d9 100644
--- a/lib/util/runmode.js
+++ b/lib/util/runmode.js
@@ -1,8 +1,4 @@
 CodeMirror.runMode = function(string, modespec, callback, options) {
-  function esc(str) {
-    return str.replace(/[<&]/g, function(ch) { return ch == "<" ? "&lt;" : "&amp;"; });
-  }
-
   var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
   var isNode = callback.nodeType == 1;
   var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
@@ -19,12 +15,12 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
       for (var pos = 0;;) {
         var idx = text.indexOf("\t", pos);
         if (idx == -1) {
-          escaped += esc(text.slice(pos));
+          escaped += CodeMirror.htmlEscape(text.slice(pos));
           col += text.length - pos;
           break;
         } else {
           col += idx - pos;
-          escaped += esc(text.slice(pos, idx));
+          escaped += CodeMirror.htmlEscape(text.slice(pos, idx));
           var size = tabSize - col % tabSize;
           col += size;
           for (var i = 0; i < size; ++i) escaped += " ";
@@ -33,10 +29,10 @@ CodeMirror.runMode = function(string, modespec, callback, options) {
       }
 
       if (style) 
-        accum.push("<span class=\"cm-" + esc(style) + "\">" + escaped + "</span>");
+        accum.push("<span class=\"cm-" + CodeMirror.htmlEscape(style) + "\">" + escaped + "</span>");
       else
         accum.push(escaped);
-    };
+    }
   }
   var lines = CodeMirror.splitLines(string), state = CodeMirror.startState(mode);
   for (var i = 0, e = lines.length; i < e; ++i) {
diff --git a/lib/util/search.js b/lib/util/search.js
index 356283ab84..c5a2bccfaf 100644
--- a/lib/util/search.js
+++ b/lib/util/search.js
@@ -40,7 +40,7 @@
         if (!query || state.query) return;
         state.query = parseQuery(query);
         if (cm.lineCount() < 2000) { // This is too expensive on big documents.
-          for (var cursor = getSearchCursor(cm, state.query); cursor.findNext();)
+          for (var cursor = getSearchCursor(cm, query); cursor.findNext();)
             state.marked.push(cm.markText(cursor.from(), cursor.to(), "CodeMirror-searching"));
         }
         state.posFrom = state.posTo = cm.getCursor();
@@ -57,14 +57,14 @@
     }
     cm.setSelection(cursor.from(), cursor.to());
     state.posFrom = cursor.from(); state.posTo = cursor.to();
-  });}
+  })}
   function clearSearch(cm) {cm.operation(function() {
     var state = getSearchState(cm);
     if (!state.query) return;
     state.query = null;
     for (var i = 0; i < state.marked.length; ++i) state.marked[i].clear();
     state.marked.length = 0;
-  });}
+  })}
 
   var replaceQueryDialog =
     'Replace: <input type="text" style="width: 10em"/> <span style="color: #888">(Use /re/ syntax for regexp search)</span>';
@@ -83,7 +83,7 @@
                 cursor.replace(text.replace(/\$(\d)/, function(w, i) {return match[i];}));
               } else cursor.replace(text);
             }
-          });});
+          })});
         } else {
           clearSearch(cm);
           var cursor = getSearchCursor(cm, query, cm.getCursor());
diff --git a/lib/util/searchcursor.js b/lib/util/searchcursor.js
index 1750aadc11..ec3f73c3fa 100644
--- a/lib/util/searchcursor.js
+++ b/lib/util/searchcursor.js
@@ -10,32 +10,30 @@
     // It takes a position and a direction, and returns an object
     // describing the next occurrence of the query, or null if no
     // more matches were found.
-    if (typeof query != "string") { // Regexp match
-      if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
+    if (typeof query != "string") // Regexp match
       this.matches = function(reverse, pos) {
         if (reverse) {
-          query.lastIndex = 0;
-          var line = cm.getLine(pos.line).slice(0, pos.ch), match = query.exec(line), start = 0;
+          var line = cm.getLine(pos.line).slice(0, pos.ch), match = line.match(query), start = 0;
           while (match) {
-            start += match.index + 1;
-	    line = line.slice(start);
-            query.lastIndex = 0;
-            var newmatch = query.exec(line);
+            var ind = line.indexOf(match[0]);
+            start += ind;
+            line = line.slice(ind + 1);
+            var newmatch = line.match(query);
             if (newmatch) match = newmatch;
             else break;
+            start++;
           }
-          start--;
-        } else {
-          query.lastIndex = pos.ch;
-          var line = cm.getLine(pos.line), match = query.exec(line),
-          start = match && match.index;
+        }
+        else {
+          var line = cm.getLine(pos.line).slice(pos.ch), match = line.match(query),
+          start = match && pos.ch + line.indexOf(match[0]);
         }
         if (match)
           return {from: {line: pos.line, ch: start},
                   to: {line: pos.line, ch: start + match[0].length},
                   match: match};
       };
-    } else { // String query
+    else { // String query
       if (caseFold) query = query.toLowerCase();
       var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
       var target = query.split("\n");
diff --git a/lib/util/simple-hint.js b/lib/util/simple-hint.js
index 0ce25f9650..7eef32c8ea 100644
--- a/lib/util/simple-hint.js
+++ b/lib/util/simple-hint.js
@@ -1,102 +1,76 @@
 (function() {
-  CodeMirror.simpleHint = function(editor, getHints, givenOptions) {
-    // Determine effective options based on given values and defaults.
-    var options = {}, defaults = CodeMirror.simpleHint.defaults;
-    for (var opt in defaults)
-      if (defaults.hasOwnProperty(opt))
-        options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt];
-    
-    function collectHints(previousToken) {
-      // We want a single cursor position.
-      if (editor.somethingSelected()) return;
+  CodeMirror.simpleHint = function(editor, getHints) {
+    // We want a single cursor position.
+    if (editor.somethingSelected()) return;
+    //don't show completion if the token is empty
+    var tempToken = editor.getTokenAt(editor.getCursor());
+    if(!(/[\S]/gi.test(tempToken.string))) return;
 
-      var tempToken = editor.getTokenAt(editor.getCursor());
-
-      // Don't show completions if token has changed and the option is set.
-      if (options.closeOnTokenChange && previousToken != null &&
-          (tempToken.start != previousToken.start || tempToken.className != previousToken.className)) {
-        return;
-      }
-
-      var result = getHints(editor);
-      if (!result || !result.list.length) return;
-      var completions = result.list;
-      function insert(str) {
-        editor.replaceRange(str, result.from, result.to);
-      }
-      // When there is only one completion, use it directly.
-      if (options.completeSingle && completions.length == 1) {
-        insert(completions[0]);
-        return true;
-      }
+    var result = getHints(editor);
+    if (!result || !result.list.length) return;
+    var completions = result.list;
+    function insert(str) {
+      editor.replaceRange(str, result.from, result.to);
+    }
+    // When there is only one completion, use it directly.
+    if (completions.length == 1) {insert(completions[0]); return true;}
 
-      // Build the select widget
-      var complete = document.createElement("div");
-      complete.className = "CodeMirror-completions";
-      var sel = complete.appendChild(document.createElement("select"));
-      // Opera doesn't move the selection when pressing up/down in a
-      // multi-select, but it does properly support the size property on
-      // single-selects, so no multi-select is necessary.
-      if (!window.opera) sel.multiple = true;
-      for (var i = 0; i < completions.length; ++i) {
-        var opt = sel.appendChild(document.createElement("option"));
-        opt.appendChild(document.createTextNode(completions[i]));
-      }
-      sel.firstChild.selected = true;
-      sel.size = Math.min(10, completions.length);
-      var pos = options.alignWithWord ? editor.charCoords(result.from) : editor.cursorCoords();
-      complete.style.left = pos.x + "px";
-      complete.style.top = pos.yBot + "px";
-      document.body.appendChild(complete);
-      // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
-      var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
-      if(winW - pos.x < sel.clientWidth)
-        complete.style.left = (pos.x - sel.clientWidth) + "px";
-      // Hack to hide the scrollbar.
-      if (completions.length <= 10)
-        complete.style.width = (sel.clientWidth - 1) + "px";
+    // Build the select widget
+    var complete = document.createElement("div");
+    complete.className = "CodeMirror-completions";
+    var sel = complete.appendChild(document.createElement("select"));
+    // Opera doesn't move the selection when pressing up/down in a
+    // multi-select, but it does properly support the size property on
+    // single-selects, so no multi-select is necessary.
+    if (!window.opera) sel.multiple = true;
+    for (var i = 0; i < completions.length; ++i) {
+      var opt = sel.appendChild(document.createElement("option"));
+      opt.appendChild(document.createTextNode(completions[i]));
+    }
+    sel.firstChild.selected = true;
+    sel.size = Math.min(10, completions.length);
+    var pos = editor.cursorCoords();
+    complete.style.left = pos.x + "px";
+    complete.style.top = pos.yBot + "px";
+    document.body.appendChild(complete);
+    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
+    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
+    if(winW - pos.x < sel.clientWidth)
+      complete.style.left = (pos.x - sel.clientWidth) + "px";
+    // Hack to hide the scrollbar.
+    if (completions.length <= 10)
+      complete.style.width = (sel.clientWidth - 1) + "px";
 
-      var done = false;
-      function close() {
-        if (done) return;
-        done = true;
-        complete.parentNode.removeChild(complete);
-      }
-      function pick() {
-        insert(completions[sel.selectedIndex]);
-        close();
-        setTimeout(function(){editor.focus();}, 50);
+    var done = false;
+    function close() {
+      if (done) return;
+      done = true;
+      complete.parentNode.removeChild(complete);
+    }
+    function pick() {
+      insert(completions[sel.selectedIndex]);
+      close();
+      setTimeout(function(){editor.focus();}, 50);
+    }
+    CodeMirror.connect(sel, "blur", close);
+    CodeMirror.connect(sel, "keydown", function(event) {
+      var code = event.keyCode;
+      // Enter
+      if (code == 13) {CodeMirror.e_stop(event); pick();}
+      // Escape
+      else if (code == 27) {CodeMirror.e_stop(event); close(); editor.focus();}
+      else if (code != 38 && code != 40) {
+        close(); editor.focus();
+        // Pass the event to the CodeMirror instance so that it can handle things like backspace properly.
+        editor.triggerOnKeyDown(event);
+        setTimeout(function(){CodeMirror.simpleHint(editor, getHints);}, 50);
       }
-      CodeMirror.connect(sel, "blur", close);
-      CodeMirror.connect(sel, "keydown", function(event) {
-        var code = event.keyCode;
-        // Enter
-        if (code == 13) {CodeMirror.e_stop(event); pick();}
-        // Escape
-        else if (code == 27) {CodeMirror.e_stop(event); close(); editor.focus();}
-        else if (code != 38 && code != 40 && code != 33 && code != 34 && !CodeMirror.isModifierKey(event)) {
-          close(); editor.focus();
-          // Pass the event to the CodeMirror instance so that it can handle things like backspace properly.
-          editor.triggerOnKeyDown(event);
-          // Don't show completions if the code is backspace and the option is set.
-          if (!options.closeOnBackspace || code != 8) {
-            setTimeout(function(){collectHints(tempToken);}, 50);
-          }
-        }
-      });
-      CodeMirror.connect(sel, "dblclick", pick);
+    });
+    CodeMirror.connect(sel, "dblclick", pick);
 
-      sel.focus();
-      // Opera sometimes ignores focusing a freshly created node
-      if (window.opera) setTimeout(function(){if (!done) sel.focus();}, 100);
-      return true;
-    }
-    return collectHints();
-  };
-  CodeMirror.simpleHint.defaults = {
-    closeOnBackspace: true,
-    closeOnTokenChange: false,
-    completeSingle: true,
-    alignWithWord: true
+    sel.focus();
+    // Opera sometimes ignores focusing a freshly created node
+    if (window.opera) setTimeout(function(){if (!done) sel.focus();}, 100);
+    return true;
   };
 })();
diff --git a/lib/util/xml-hint.js b/lib/util/xml-hint.js
index 816e3b4a69..677661ae03 100644
--- a/lib/util/xml-hint.js
+++ b/lib/util/xml-hint.js
@@ -1,4 +1,4 @@
-
+
 (function() {
 
     CodeMirror.xmlHints = [];
@@ -15,7 +15,7 @@
         // dirty hack for simple-hint to receive getHint event on space
         var getTokenAt = editor.getTokenAt;
 
-        editor.getTokenAt = function() { return 'disabled'; };
+        editor.getTokenAt = function() { return 'disabled'; }
         CodeMirror.simpleHint(cm, getHint);
 
         editor.getTokenAt = getTokenAt;
@@ -40,7 +40,7 @@
                 }
             }
 
-            text = text.slice(0, text.length - typed.length);
+            text = text.substr(0, text.length - typed.length);
 
             var path = getActiveElement(cm, text) + simbol;
             var hints = CodeMirror.xmlHints[path];
@@ -58,10 +58,10 @@
             return {
                 list: hints,
                 from: { line: cursor.line, ch: cursor.ch - typed.length },
-                to: cursor
+                to: cursor,
             };
         };
-    };
+    }
 
     var getActiveElement = function(codeMirror, text) {
 
@@ -76,7 +76,7 @@
             while ((match = regex.exec(text)) != null) {
                 matches.push({
                     tag: match[1],
-                    selfclose: (match[0].slice(match[0].length - 2) === '/>')
+                    selfclose: (match[0].substr(-1) === '/>')
                 });
             }
 
@@ -114,7 +114,7 @@
 
         if (close < open)
         {
-            text = text.slice(open);
+            text = text.substr(open);
 
             if(text != '<') {
 
@@ -127,7 +127,7 @@
                 if (space < 0)
                     space = text.length;
 
-                return text.slice(0, space);
+                return text.substr(0, space);
             }
         }
 
diff --git a/test/._driver.js b/test/._driver.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/test/._index.html b/test/._index.html
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/test/._mode_test.css b/test/._mode_test.css
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/test/._mode_test.js b/test/._mode_test.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/test/._test.js b/test/._test.js
new file mode 100644
index 0000000000000000000000000000000000000000..8260cd06689b6c813eb09635c721fe6087369f0e
GIT binary patch
literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vvYvJF
zKST$^44`snG%bukK2%&ZIX_n~v7jI)Rj;r#u_!UGBr`9S!N9=4(Aw0%D9zH;%)r_`
zKR-PuHKxMIz&WERKR4Cd*u>P-!pzB3*VWX;QrE=7&{EgJ$jnUF!qCyg*~HAz#Ld|Z
z&B{^kXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQM$S0Z?ZXguy^ABqOs}p(wRD
zzqBYhRUs|EC|e;juOt=N?aa?h%*m-#$Vp8rQAo;3%*zJ$g`v8JG==JaxL0Ht<o^E$
E0Et65TmS$7

literal 0
HcmV?d00001

diff --git a/test/driver.js b/test/driver.js
index 934cb936c9..1589e53c12 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -1,129 +1,42 @@
-var tests = [], debug = null, debugUsed = new Array(), allNames = [];
+var tests = [], runOnly = null;
 
 function Failure(why) {this.message = why;}
 
-function indexOf(collection, elt) {
-  if (collection.indexOf) return collection.indexOf(elt);
-  for (var i = 0, e = collection.length; i < e; ++i)
-    if (collection[i] == elt) return i;
-  return -1;
-}
-
-function test(name, run, expectedFail) {
-  // Force unique names
-  var originalName = name;
-  var i = 2; // Second function would be NAME_2
-  while (indexOf(allNames, name) !== -1){
-    name = originalName + "_" + i;
-    i++;
-  }
-  allNames.push(name);
-  // Add test
-  tests.push({name: name, func: run, expectedFail: expectedFail});
-  return name;
-}
-function testCM(name, run, opts, expectedFail) {
-  return test("core_" + name, function() {
+function test(name, run) {tests.push({name: name, func: run}); return name;}
+function testCM(name, run, opts) {
+  return test(name, function() {
     var place = document.getElementById("testground"), cm = CodeMirror(place, opts);
-    var successful = false;
-    try {
-      run(cm);
-      successful = true;
-    } finally {
-      if ((debug && !successful) || verbose) {
-        place.style.visibility = "";
-      } else {
-        place.removeChild(cm.getWrapperElement());
-      }
-    }
-  }, expectedFail);
+    try {run(cm);}
+    finally {place.removeChild(cm.getWrapperElement());}
+  });
 }
 
 function runTests(callback) {
-  if (debug) {
-    if (indexOf(debug, "verbose") === 0) {
-      verbose = true;
-      debug.splice(0, 1);
-    }
-    if (debug.length < 1) {
-      debug = null;
-    } else {
-      if (totalTests > debug.length) {
-        totalTests = debug.length;
-      }
-    }
-  }
-  var totalTime = 0;
   function step(i) {
-    if (i === tests.length){
-      running = false;
-      return callback("done");
-    }
-    var test = tests[i], expFail = test.expectedFail, startTime = +new Date;
-    if (debug !== null) {
-      var debugIndex = indexOf(debug, test.name);
-      if (debugIndex !== -1) {
-        // Remove from array for reporting incorrect tests later
-        debug.splice(debugIndex, 1);
-      } else {
-        var wildcardName = test.name.split("_").shift() + "_*";
-        debugIndex = indexOf(debug, wildcardName);
-        if (debugIndex !== -1) {
-          // Remove from array for reporting incorrect tests later
-          debug.splice(debugIndex, 1);
-          debugUsed.push(wildcardName);
-        } else {
-          debugIndex = indexOf(debugUsed, wildcardName);
-          if (debugIndex !== -1) {
-            totalTests++;
-          } else {
-            return step(i + 1);
-          }
-        }
-      }
-    }
-    try {
-      var message = test.func();
-      if (expFail) callback("fail", test.name, message);
-      else callback("ok", test.name, message);
-    } catch(e) {
-      if (expFail) callback("expected", test.name);
-      else if (e instanceof Failure) callback("fail", test.name, e.message);
-      else {
-        var pos = /\bat .*?([^\/:]+):(\d+):/.exec(e.stack);
-        callback("error", test.name, e.toString() + (pos ? " (" + pos[1] + ":" + pos[2] + ")" : ""));
-      }
-    }
-    if (!quit) { // Run next test
-      var delay = 0;
-      totalTime += (+new Date) - startTime;
-      if (totalTime > 500){
-        totalTime = 0;
-        delay = 50;
-      }
-      setTimeout(function(){step(i + 1);}, delay);
-    } else { // Quit tests
-      running = false;
-      return null;
+    if (i == tests.length) return callback("done");
+    var test = tests[i];
+    if (runOnly != null && runOnly != test.name) return step(i + 1);
+    try {test.func(); callback("ok", test.name);}
+    catch(e) {
+      if (e instanceof Failure)
+        callback("fail", test.name, e.message);
+      else
+        callback("error", test.name, e.toString());
     }
+    setTimeout(function(){step(i + 1);}, 20);
   }
   step(0);
 }
 
-function label(str, msg) {
-  if (msg) return str + " (" + msg + ")";
-  return str;
-}
 function eq(a, b, msg) {
-  if (a != b) throw new Failure(label(a + " != " + b, msg));
+  if (a != b) throw new Failure(a + " != " + b + (msg ? " (" + msg + ")" : ""));
 }
 function eqPos(a, b, msg) {
-  function str(p) { return "{line:" + p.line + ",ch:" + p.ch + "}"; }
   if (a == b) return;
-  if (a == null) throw new Failure(label("comparing null to " + str(b)));
-  if (b == null) throw new Failure(label("comparing " + str(a) + " to null"));
-  if (a.line != b.line || a.ch != b.ch) throw new Failure(label(str(a) + " != " + str(b), msg));
+  if (a == null || b == null) throw new Failure("comparing point to null");
+  eq(a.line, b.line, msg);
+  eq(a.ch, b.ch, msg);
 }
 function is(a, msg) {
-  if (!a) throw new Failure(label("assertion failed", msg));
+  if (!a) throw new Failure("assertion failed" + (msg ? " (" + msg + ")" : ""));
 }
diff --git a/test/index.html b/test/index.html
index 043cadea31..1f8559a576 100644
--- a/test/index.html
+++ b/test/index.html
@@ -1,28 +1,15 @@
 <!doctype html>
 <html>
   <head>
-    <meta charset="utf-8">
     <title>CodeMirror: Test Suite</title>
     <link rel="stylesheet" href="../lib/codemirror.css">
-    <link rel="stylesheet" href="../doc/docs.css">
-    <link rel="stylesheet" href="mode_test.css">
     <script src="../lib/codemirror.js"></script>
-    <script src="../lib/util/overlay.js"></script>
     <script src="../mode/javascript/javascript.js"></script>
-    <script src="../mode/xml/xml.js"></script>
 
     <style type="text/css">
       .ok {color: #090;}
       .fail {color: #e00;}
       .error {color: #c90;}
-      .done {font-weight: bold;}
-      #progress {
-        background: #45d;
-        color: white;
-        text-shadow: 0 0 1px #45d, 0 0 2px #45d, 0 0 3px #45d;
-        font-weight: bold;
-        white-space: pre;
-      }
     </style>
   </head>
   <body>
@@ -31,139 +18,36 @@ <h1>CodeMirror: Test Suite</h1>
     <p>A limited set of programmatic sanity tests for CodeMirror.</p>
 
     <div style="border: 1px solid black; padding: 1px; max-width: 700px;">
-      <div style="width: 0px;" id=progress><div style="padding: 3px;">Ran <span id="progress_ran">0</span><span id="progress_total"> of 0</span> tests</div></div>
+      <div style="background: #45d; white-space: pre; width: 0px; font-weight: bold; color: white; padding: 3px;" id=progress></div>
     </div>
-    <p id=status>Please enable JavaScript...</p>
-    <div id=output></div>
+    <pre style="padding-left: 5px" id=output></pre>
 
-    <div style="visibility: hidden" id=testground></div>
+    <div style="visibility: hidden" id=testground>
+      <form><textarea id="code" name="code"></textarea><input type=submit value=ok name=submit></form>
+    </div>
 
     <script src="driver.js"></script>
     <script src="test.js"></script>
-    <script src="mode_test.js"></script>
-    <script src="../mode/css/css.js"></script>
-    <script src="../mode/css/test.js"></script>
-    <script src="../mode/markdown/markdown.js"></script>
-    <script src="../mode/markdown/test.js"></script>
-    <script src="../mode/gfm/gfm.js"></script>
-    <script src="../mode/gfm/test.js"></script>
-    <script src="../mode/stex/stex.js"></script>
-    <script src="../mode/stex/test.js"></script>
     <script>
       window.onload = function() {
-        runHarness();
+        runTests(displayTest);
       };
-      CodeMirror.connect(window, 'hashchange', function(){
-        runHarness();
-      });
 
-      function esc(str) {
-        return str.replace(/[<&]/, function(ch) { return ch == "<" ? "&lt;" : "&amp;"; });
-      }
-
-      var output = document.getElementById("output"),
-          progress = document.getElementById("progress"),
-          progressRan = document.getElementById("progress_ran").childNodes[0],
-          progressTotal = document.getElementById("progress_total").childNodes[0];
-      var count = 0,
-          failed = 0,
-          bad = "",
-          running = false, // Flag that states tests are running
-         quit = false, // Flag to quit tests ASAP
-         verbose = false; // Adds message for *every* test to output
-      
-      function runHarness(){
-        if (running) {
-          quit = true;
-          setStatus("Restarting tests...", '', true);
-          setTimeout(function(){runHarness();}, 500);
-          return;
-        }
-        if (window.location.hash.substr(1)){
-          debug = window.location.hash.substr(1).split(",");
-        } else {
-          debug = null;
-        }
-        quit = false;
-        running = true;
-        setStatus("Loading tests...");
-        count = 0;
-        failed = 0;
-        bad = "";
-        verbose = false;
-        debugUsed = Array();
-        totalTests = tests.length;
-        progressTotal.nodeValue = " of " + totalTests;
-        progressRan.nodeValue = count;
-        output.innerHTML = '';
-        document.getElementById("testground").innerHTML = "<form>" +
-          "<textarea id=\"code\" name=\"code\"></textarea>" +
-          "<input type=submit value=ok name=submit>" +
-          "</form>";
-        runTests(displayTest);
-      }
-      
-      function setStatus(message, className, force){
-        if (quit && !force) return;
-        if (!message) throw("must provide message");
-        var status = document.getElementById("status").childNodes[0];
-        status.nodeValue = message;
-        status.parentNode.className = className;
-      }
-      function addOutput(name, className, code){
-        var newOutput = document.createElement("dl");
-        var newTitle = document.createElement("dt");
-        newTitle.className = className;
-        newTitle.appendChild(document.createTextNode(name));
-        newOutput.appendChild(newTitle);
-        var newMessage = document.createElement("dd");
-        newMessage.innerHTML = code;
-        newOutput.appendChild(newTitle);
-        newOutput.appendChild(newMessage);
-        output.appendChild(newOutput);
-      }
-      function displayTest(type, name, customMessage) {
-        var message = "???";
+      var output = document.getElementById("output"), progress = document.getElementById("progress");
+      var count = 0, failed = 0, bad = "";
+      function displayTest(type, name, msg) {
         if (type != "done") ++count;
-        progress.style.width = (count * (progress.parentNode.clientWidth - 2) / totalTests) + "px";
-        progressTotal.nodeValue = " of " + totalTests +
-          (debugUsed.length && type != "done" ? "+" : "");
-        progressRan.nodeValue = count;
+        progress.style.width = (count * (progress.parentNode.clientWidth - 8) / tests.length) + "px";
+        progress.innerHTML = "Ran " + count + (count < tests.length ? " of " + tests.length : "") + " tests";
         if (type == "ok") {
-          message = "Test '" + name + "' succeeded";
-          if (!verbose) customMessage = false;
-        } else if (type == "expected") {
-          message = "Test '" + name + "' failed as expected";
-          if (!verbose) customMessage = false;
+          output.innerHTML = bad + "<span class=ok>Test '" + CodeMirror.htmlEscape(name) + "' succeeded</span>";
         } else if (type == "error" || type == "fail") {
           ++failed;
-          message = "Test '" + name + "' failed";
+          bad += CodeMirror.htmlEscape(name) + ": <span class=" + type + ">" + CodeMirror.htmlEscape(msg) + "</span>\n";
+          output.innerHTML = bad;
         } else if (type == "done") {
-          if (failed) {
-            type += " fail";
-            message = failed + " failure" + (failed > 1 ? "s" : "");
-          } else if (count < totalTests) {
-            failed = totalTests - count;
-            type += " fail";
-            message = failed + " failure" + (failed > 1 ? "s" : "");
-          } else {
-            type += " ok";
-            message = "All passed";
-          }
-          if (debug && debug.length) {
-            var bogusTests = totalTests - count;
-            message += " — " + bogusTests + " nonexistent test" +
-              (bogusTests > 1 ? "s" : "") + " requested by location.hash: " +
-              "`" + debug.join("`, `") + "`";
-          } else {
-            progressTotal.nodeValue = '';
-          }
-          customMessage = true; // Hack to avoid adding to output
-        }
-        if (verbose && !customMessage)  customMessage = message;
-        setStatus(message, type);
-        if (customMessage.length > 0) {
-          addOutput(name, type, customMessage);
+          output.innerHTML = bad + (failed ? "<span class=fail>" + failed + " failure" + (failed > 1 ? "s" : "") + "</span>"
+                                           : "<span class=ok>All passed</span>");
         }
       }
     </script>
diff --git a/test/lint/lint.js b/test/lint/lint.js
deleted file mode 100644
index 1a3125cefa..0000000000
--- a/test/lint/lint.js
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- Simple linter, based on UglifyJS's [1] parse-js module
-
- All of the existing linters either cramp my style or have huge
- dependencies (Closure). So here's a very simple, non-invasive one
- that only spots
-
-  - missing semicolons and trailing commas
-  - variables or properties that are reserved words
-  - assigning to a variable you didn't declare
-
- [1]: https://github.com/mishoo/UglifyJS/
-*/
-
-var fs = require("fs"), parse_js = require("./parse-js").parse;
-
-var reserved = {};
-"break case catch continue debugger default delete do else false finally for function if in\
- instanceof new null return switch throw true try typeof var void while with abstract enum\
- int short boolean export interface static byte extends long super char final native\
- synchonized class float package throws const goto private transient implements protected\
- volatile double import public const".split(" ").forEach(function(word) { reserved[word] = true; });
-
-function checkVariable(scope, name, pos) {
-  while (scope) {
-    if (scope.cur.hasOwnProperty(name)) return;
-    scope = scope.prev;
-  }
-  fail("Accidental global: " + name, pos);
-}
-function checkProperty(name, pos) {
-  if (reserved.hasOwnProperty(name)) {
-    fail("Using a keyword or reserved word as a property: " + name, pos);
-  }
-}
-
-function walk(ast, scope) {
-  var tp = ast[0];
-  if (typeof tp != "string") tp = tp.name;
-  function sub(ast) { if (ast) walk(ast, scope); }
-  function subn(array) { if (array) array.forEach(sub); }
-  if (tp == "block" || tp == "splice" || tp == "toplevel" || tp == "array") {
-    subn(ast[1]);
-  } else if (tp == "var" || tp == "const") {
-    ast[1].forEach(function(def) { scope.cur[def[0]] = true; if (def[1]) sub(def[1]); });
-  } else if (tp == "try") {
-    subn(ast[1]);
-    if (ast[2]) { scope.cur[ast[2][0]] = true; subn(ast[2][1]); }
-    subn(ast[3]);
-  } else if (tp == "throw" || tp == "return" || tp == "dot" || tp == "stat") {
-    sub(ast[1]);
-  } else if (tp == "dot") {
-    sub(ast[1]);
-    checkProperty(ast[2], ast[0]);
-  } else if (tp == "new" || tp == "call") {
-    sub(ast[1]); subn(ast[2]);
-  } else if (tp == "switch") {
-    sub(ast[1]);
-    ast[2].forEach(function(part) { sub(part[0]); subn(part[1]); });
-  } else if (tp == "conditional" || tp == "if" || tp == "for" || tp == "for-in") {
-    sub(ast[1]); sub(ast[2]); sub(ast[3]); sub(ast[4]);
-  } else if (tp == "assign") {
-    if (ast[2][0].name == "name") checkVariable(scope, ast[2][1], ast[2][0]);
-    sub(ast[2]); sub(ast[3]);
-  } else if (tp == "function" || tp == "defun") {
-    if (tp == "defun") scope.cur[ast[1]] = true;
-    var nscope = {prev: scope, cur: {}};
-    ast[2].forEach(function(arg) { nscope.cur[arg] = true; });
-    ast[3].forEach(function(ast) { walk(ast, nscope); });
-  } else if (tp == "while" || tp == "do" || tp == "sub" || tp == "with") {
-    sub(ast[1]); sub(ast[2]);
-  } else if (tp == "binary" || tp == "unary-prefix" || tp == "unary-postfix" || tp == "label") {
-    if (/\+\+|--/.test(ast[1]) && ast[2][0].name == "name") checkVariable(scope, ast[2][1], ast[2][0]);
-    sub(ast[2]); sub(ast[3]);
-  } else if (tp == "object") {
-    ast[1].forEach(function(prop) {
-      if (prop.type != "string") checkProperty(prop[0], ast[0]);
-      sub(prop[1]); sub(prop[2]);
-    });
-  } else if (tp == "seq") {
-    subn(ast.slice(1));
-  } else if (tp == "name") {
-    if (reserved.hasOwnProperty(ast[1]) && !/^(?:null|true|false)$/.test(ast[1]))
-      fail("Using reserved word as variable name: " + ast[1], ast[0]);
-  }
-}
-
-var failed = false, curFile;
-function fail(msg, pos) {
-  if (typeof pos == "object") pos = pos.start.line + 1;
-  console.log(curFile + ": " + msg + (typeof pos == "number" ? " (" + pos + ")" : ""));
-  failed = true;
-}
-
-function checkFile(fileName) {
-  curFile = fileName.match(/[^\/+]*\.js$/)[0];
-  var file = fs.readFileSync(fileName, "utf8");
-  var badChar = file.match(/[\x00-\x08\x0b\x0c\x0e-\x19\uFEFF]/);
-  if (badChar) fail("Undesirable character " + badChar[0].charCodeAt(0) + " at position " + badChar.index);
-  if (/^#!/.test(file)) file = file.slice(file.indexOf("\n") + 1);
-  try {
-    var parsed = parse_js(file, true, true);
-  } catch(e) {
-    fail(e.message, e.line);
-    return;
-  }
-  walk(parsed, {prev: null, cur: {}});
-}
-
-function checkDir(dir) {
-  fs.readdirSync(dir).forEach(function(file) {
-    var fname = dir + "/" + file;
-    if (/\.js$/.test(file)) checkFile(fname);
-    else if (fs.lstatSync(fname).isDirectory()) checkDir(fname);
-  });
-}
-
-exports.checkDir = checkDir;
-exports.checkFile = checkFile;
-exports.success = function() { return !failed; };
diff --git a/test/lint/parse-js.js b/test/lint/parse-js.js
deleted file mode 100644
index c165a273f3..0000000000
--- a/test/lint/parse-js.js
+++ /dev/null
@@ -1,1372 +0,0 @@
-/***********************************************************************
-
-  A JavaScript tokenizer / parser / beautifier / compressor.
-
-  This version is suitable for Node.js.  With minimal changes (the
-  exports stuff) it should work on any JS platform.
-
-  This file contains the tokenizer/parser.  It is a port to JavaScript
-  of parse-js [1], a JavaScript parser library written in Common Lisp
-  by Marijn Haverbeke.  Thank you Marijn!
-
-  [1] http://marijn.haverbeke.nl/parse-js/
-
-  Exported functions:
-
-    - tokenizer(code) -- returns a function.  Call the returned
-      function to fetch the next token.
-
-    - parse(code) -- returns an AST of the given JavaScript code.
-
-  -------------------------------- (C) ---------------------------------
-
-                           Author: Mihai Bazon
-                         <mihai.bazon@gmail.com>
-                       http://mihai.bazon.net/blog
-
-  Distributed under the BSD license:
-
-    Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
-    Based on parse-js (http://marijn.haverbeke.nl/parse-js/).
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-        * Redistributions of source code must retain the above
-          copyright notice, this list of conditions and the following
-          disclaimer.
-
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials
-          provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
- ***********************************************************************/
-
-/* -----[ Tokenizer (constants) ]----- */
-
-var KEYWORDS = array_to_hash([
-        "break",
-        "case",
-        "catch",
-        "const",
-        "continue",
-        "debugger",
-        "default",
-        "delete",
-        "do",
-        "else",
-        "finally",
-        "for",
-        "function",
-        "if",
-        "in",
-        "instanceof",
-        "new",
-        "return",
-        "switch",
-        "throw",
-        "try",
-        "typeof",
-        "var",
-        "void",
-        "while",
-        "with"
-]);
-
-var RESERVED_WORDS = array_to_hash([
-        "abstract",
-        "boolean",
-        "byte",
-        "char",
-        "class",
-        "double",
-        "enum",
-        "export",
-        "extends",
-        "final",
-        "float",
-        "goto",
-        "implements",
-        "import",
-        "int",
-        "interface",
-        "long",
-        "native",
-        "package",
-        "private",
-        "protected",
-        "public",
-        "short",
-        "static",
-        "super",
-        "synchronized",
-        "throws",
-        "transient",
-        "volatile"
-]);
-
-var KEYWORDS_BEFORE_EXPRESSION = array_to_hash([
-        "return",
-        "new",
-        "delete",
-        "throw",
-        "else",
-        "case"
-]);
-
-var KEYWORDS_ATOM = array_to_hash([
-        "false",
-        "null",
-        "true",
-        "undefined"
-]);
-
-var OPERATOR_CHARS = array_to_hash(characters("+-*&%=<>!?|~^"));
-
-var RE_HEX_NUMBER = /^0x[0-9a-f]+$/i;
-var RE_OCT_NUMBER = /^0[0-7]+$/;
-var RE_DEC_NUMBER = /^\d*\.?\d*(?:e[+-]?\d*(?:\d\.?|\.?\d)\d*)?$/i;
-
-var OPERATORS = array_to_hash([
-        "in",
-        "instanceof",
-        "typeof",
-        "new",
-        "void",
-        "delete",
-        "++",
-        "--",
-        "+",
-        "-",
-        "!",
-        "~",
-        "&",
-        "|",
-        "^",
-        "*",
-        "/",
-        "%",
-        ">>",
-        "<<",
-        ">>>",
-        "<",
-        ">",
-        "<=",
-        ">=",
-        "==",
-        "===",
-        "!=",
-        "!==",
-        "?",
-        "=",
-        "+=",
-        "-=",
-        "/=",
-        "*=",
-        "%=",
-        ">>=",
-        "<<=",
-        ">>>=",
-        "|=",
-        "^=",
-        "&=",
-        "&&",
-        "||"
-]);
-
-var WHITESPACE_CHARS = array_to_hash(characters(" \u00a0\n\r\t\f\u000b\u200b\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000"));
-
-var PUNC_BEFORE_EXPRESSION = array_to_hash(characters("[{(,.;:"));
-
-var PUNC_CHARS = array_to_hash(characters("[]{}(),;:"));
-
-var REGEXP_MODIFIERS = array_to_hash(characters("gmsiy"));
-
-/* -----[ Tokenizer ]----- */
-
-var UNICODE = {  // Unicode 6.1
-        letter: new RegExp("[\\u0041-\\u005A\\u0061-\\u007A\\u00AA\\u00B5\\u00BA\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02C1\\u02C6-\\u02D1\\u02E0-\\u02E4\\u02EC\\u02EE\\u0370-\\u0374\\u0376\\u0377\\u037A-\\u037D\\u0386\\u0388-\\u038A\\u038C\\u038E-\\u03A1\\u03A3-\\u03F5\\u03F7-\\u0481\\u048A-\\u0527\\u0531-\\u0556\\u0559\\u0561-\\u0587\\u05D0-\\u05EA\\u05F0-\\u05F2\\u0620-\\u064A\\u066E\\u066F\\u0671-\\u06D3\\u06D5\\u06E5\\u06E6\\u06EE\\u06EF\\u06FA-\\u06FC\\u06FF\\u0710\\u0712-\\u072F\\u074D-\\u07A5\\u07B1\\u07CA-\\u07EA\\u07F4\\u07F5\\u07FA\\u0800-\\u0815\\u081A\\u0824\\u0828\\u0840-\\u0858\\u08A0\\u08A2-\\u08AC\\u0904-\\u0939\\u093D\\u0950\\u0958-\\u0961\\u0971-\\u0977\\u0979-\\u097F\\u0985-\\u098C\\u098F\\u0990\\u0993-\\u09A8\\u09AA-\\u09B0\\u09B2\\u09B6-\\u09B9\\u09BD\\u09CE\\u09DC\\u09DD\\u09DF-\\u09E1\\u09F0\\u09F1\\u0A05-\\u0A0A\\u0A0F\\u0A10\\u0A13-\\u0A28\\u0A2A-\\u0A30\\u0A32\\u0A33\\u0A35\\u0A36\\u0A38\\u0A39\\u0A59-\\u0A5C\\u0A5E\\u0A72-\\u0A74\\u0A85-\\u0A8D\\u0A8F-\\u0A91\\u0A93-\\u0AA8\\u0AAA-\\u0AB0\\u0AB2\\u0AB3\\u0AB5-\\u0AB9\\u0ABD\\u0AD0\\u0AE0\\u0AE1\\u0B05-\\u0B0C\\u0B0F\\u0B10\\u0B13-\\u0B28\\u0B2A-\\u0B30\\u0B32\\u0B33\\u0B35-\\u0B39\\u0B3D\\u0B5C\\u0B5D\\u0B5F-\\u0B61\\u0B71\\u0B83\\u0B85-\\u0B8A\\u0B8E-\\u0B90\\u0B92-\\u0B95\\u0B99\\u0B9A\\u0B9C\\u0B9E\\u0B9F\\u0BA3\\u0BA4\\u0BA8-\\u0BAA\\u0BAE-\\u0BB9\\u0BD0\\u0C05-\\u0C0C\\u0C0E-\\u0C10\\u0C12-\\u0C28\\u0C2A-\\u0C33\\u0C35-\\u0C39\\u0C3D\\u0C58\\u0C59\\u0C60\\u0C61\\u0C85-\\u0C8C\\u0C8E-\\u0C90\\u0C92-\\u0CA8\\u0CAA-\\u0CB3\\u0CB5-\\u0CB9\\u0CBD\\u0CDE\\u0CE0\\u0CE1\\u0CF1\\u0CF2\\u0D05-\\u0D0C\\u0D0E-\\u0D10\\u0D12-\\u0D3A\\u0D3D\\u0D4E\\u0D60\\u0D61\\u0D7A-\\u0D7F\\u0D85-\\u0D96\\u0D9A-\\u0DB1\\u0DB3-\\u0DBB\\u0DBD\\u0DC0-\\u0DC6\\u0E01-\\u0E30\\u0E32\\u0E33\\u0E40-\\u0E46\\u0E81\\u0E82\\u0E84\\u0E87\\u0E88\\u0E8A\\u0E8D\\u0E94-\\u0E97\\u0E99-\\u0E9F\\u0EA1-\\u0EA3\\u0EA5\\u0EA7\\u0EAA\\u0EAB\\u0EAD-\\u0EB0\\u0EB2\\u0EB3\\u0EBD\\u0EC0-\\u0EC4\\u0EC6\\u0EDC-\\u0EDF\\u0F00\\u0F40-\\u0F47\\u0F49-\\u0F6C\\u0F88-\\u0F8C\\u1000-\\u102A\\u103F\\u1050-\\u1055\\u105A-\\u105D\\u1061\\u1065\\u1066\\u106E-\\u1070\\u1075-\\u1081\\u108E\\u10A0-\\u10C5\\u10C7\\u10CD\\u10D0-\\u10FA\\u10FC-\\u1248\\u124A-\\u124D\\u1250-\\u1256\\u1258\\u125A-\\u125D\\u1260-\\u1288\\u128A-\\u128D\\u1290-\\u12B0\\u12B2-\\u12B5\\u12B8-\\u12BE\\u12C0\\u12C2-\\u12C5\\u12C8-\\u12D6\\u12D8-\\u1310\\u1312-\\u1315\\u1318-\\u135A\\u1380-\\u138F\\u13A0-\\u13F4\\u1401-\\u166C\\u166F-\\u167F\\u1681-\\u169A\\u16A0-\\u16EA\\u16EE-\\u16F0\\u1700-\\u170C\\u170E-\\u1711\\u1720-\\u1731\\u1740-\\u1751\\u1760-\\u176C\\u176E-\\u1770\\u1780-\\u17B3\\u17D7\\u17DC\\u1820-\\u1877\\u1880-\\u18A8\\u18AA\\u18B0-\\u18F5\\u1900-\\u191C\\u1950-\\u196D\\u1970-\\u1974\\u1980-\\u19AB\\u19C1-\\u19C7\\u1A00-\\u1A16\\u1A20-\\u1A54\\u1AA7\\u1B05-\\u1B33\\u1B45-\\u1B4B\\u1B83-\\u1BA0\\u1BAE\\u1BAF\\u1BBA-\\u1BE5\\u1C00-\\u1C23\\u1C4D-\\u1C4F\\u1C5A-\\u1C7D\\u1CE9-\\u1CEC\\u1CEE-\\u1CF1\\u1CF5\\u1CF6\\u1D00-\\u1DBF\\u1E00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC2-\\u1FC4\\u1FC6-\\u1FCC\\u1FD0-\\u1FD3\\u1FD6-\\u1FDB\\u1FE0-\\u1FEC\\u1FF2-\\u1FF4\\u1FF6-\\u1FFC\\u2071\\u207F\\u2090-\\u209C\\u2102\\u2107\\u210A-\\u2113\\u2115\\u2119-\\u211D\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2139\\u213C-\\u213F\\u2145-\\u2149\\u214E\\u2160-\\u2188\\u2C00-\\u2C2E\\u2C30-\\u2C5E\\u2C60-\\u2CE4\\u2CEB-\\u2CEE\\u2CF2\\u2CF3\\u2D00-\\u2D25\\u2D27\\u2D2D\\u2D30-\\u2D67\\u2D6F\\u2D80-\\u2D96\\u2DA0-\\u2DA6\\u2DA8-\\u2DAE\\u2DB0-\\u2DB6\\u2DB8-\\u2DBE\\u2DC0-\\u2DC6\\u2DC8-\\u2DCE\\u2DD0-\\u2DD6\\u2DD8-\\u2DDE\\u2E2F\\u3005-\\u3007\\u3021-\\u3029\\u3031-\\u3035\\u3038-\\u303C\\u3041-\\u3096\\u309D-\\u309F\\u30A1-\\u30FA\\u30FC-\\u30FF\\u3105-\\u312D\\u3131-\\u318E\\u31A0-\\u31BA\\u31F0-\\u31FF\\u3400-\\u4DB5\\u4E00-\\u9FCC\\uA000-\\uA48C\\uA4D0-\\uA4FD\\uA500-\\uA60C\\uA610-\\uA61F\\uA62A\\uA62B\\uA640-\\uA66E\\uA67F-\\uA697\\uA6A0-\\uA6EF\\uA717-\\uA71F\\uA722-\\uA788\\uA78B-\\uA78E\\uA790-\\uA793\\uA7A0-\\uA7AA\\uA7F8-\\uA801\\uA803-\\uA805\\uA807-\\uA80A\\uA80C-\\uA822\\uA840-\\uA873\\uA882-\\uA8B3\\uA8F2-\\uA8F7\\uA8FB\\uA90A-\\uA925\\uA930-\\uA946\\uA960-\\uA97C\\uA984-\\uA9B2\\uA9CF\\uAA00-\\uAA28\\uAA40-\\uAA42\\uAA44-\\uAA4B\\uAA60-\\uAA76\\uAA7A\\uAA80-\\uAAAF\\uAAB1\\uAAB5\\uAAB6\\uAAB9-\\uAABD\\uAAC0\\uAAC2\\uAADB-\\uAADD\\uAAE0-\\uAAEA\\uAAF2-\\uAAF4\\uAB01-\\uAB06\\uAB09-\\uAB0E\\uAB11-\\uAB16\\uAB20-\\uAB26\\uAB28-\\uAB2E\\uABC0-\\uABE2\\uAC00-\\uD7A3\\uD7B0-\\uD7C6\\uD7CB-\\uD7FB\\uF900-\\uFA6D\\uFA70-\\uFAD9\\uFB00-\\uFB06\\uFB13-\\uFB17\\uFB1D\\uFB1F-\\uFB28\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40\\uFB41\\uFB43\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0-\\uFDFB\\uFE70-\\uFE74\\uFE76-\\uFEFC\\uFF21-\\uFF3A\\uFF41-\\uFF5A\\uFF66-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC]"),
-        combining_mark: new RegExp("[\\u0300-\\u036F\\u0483-\\u0487\\u0591-\\u05BD\\u05BF\\u05C1\\u05C2\\u05C4\\u05C5\\u05C7\\u0610-\\u061A\\u064B-\\u065F\\u0670\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u07A6-\\u07B0\\u07EB-\\u07F3\\u0816-\\u0819\\u081B-\\u0823\\u0825-\\u0827\\u0829-\\u082D\\u0859-\\u085B\\u08E4-\\u08FE\\u0900-\\u0903\\u093A-\\u093C\\u093E-\\u094F\\u0951-\\u0957\\u0962\\u0963\\u0981-\\u0983\\u09BC\\u09BE-\\u09C4\\u09C7\\u09C8\\u09CB-\\u09CD\\u09D7\\u09E2\\u09E3\\u0A01-\\u0A03\\u0A3C\\u0A3E-\\u0A42\\u0A47\\u0A48\\u0A4B-\\u0A4D\\u0A51\\u0A70\\u0A71\\u0A75\\u0A81-\\u0A83\\u0ABC\\u0ABE-\\u0AC5\\u0AC7-\\u0AC9\\u0ACB-\\u0ACD\\u0AE2\\u0AE3\\u0B01-\\u0B03\\u0B3C\\u0B3E-\\u0B44\\u0B47\\u0B48\\u0B4B-\\u0B4D\\u0B56\\u0B57\\u0B62\\u0B63\\u0B82\\u0BBE-\\u0BC2\\u0BC6-\\u0BC8\\u0BCA-\\u0BCD\\u0BD7\\u0C01-\\u0C03\\u0C3E-\\u0C44\\u0C46-\\u0C48\\u0C4A-\\u0C4D\\u0C55\\u0C56\\u0C62\\u0C63\\u0C82\\u0C83\\u0CBC\\u0CBE-\\u0CC4\\u0CC6-\\u0CC8\\u0CCA-\\u0CCD\\u0CD5\\u0CD6\\u0CE2\\u0CE3\\u0D02\\u0D03\\u0D3E-\\u0D44\\u0D46-\\u0D48\\u0D4A-\\u0D4D\\u0D57\\u0D62\\u0D63\\u0D82\\u0D83\\u0DCA\\u0DCF-\\u0DD4\\u0DD6\\u0DD8-\\u0DDF\\u0DF2\\u0DF3\\u0E31\\u0E34-\\u0E3A\\u0E47-\\u0E4E\\u0EB1\\u0EB4-\\u0EB9\\u0EBB\\u0EBC\\u0EC8-\\u0ECD\\u0F18\\u0F19\\u0F35\\u0F37\\u0F39\\u0F3E\\u0F3F\\u0F71-\\u0F84\\u0F86\\u0F87\\u0F8D-\\u0F97\\u0F99-\\u0FBC\\u0FC6\\u102B-\\u103E\\u1056-\\u1059\\u105E-\\u1060\\u1062-\\u1064\\u1067-\\u106D\\u1071-\\u1074\\u1082-\\u108D\\u108F\\u109A-\\u109D\\u135D-\\u135F\\u1712-\\u1714\\u1732-\\u1734\\u1752\\u1753\\u1772\\u1773\\u17B4-\\u17D3\\u17DD\\u180B-\\u180D\\u18A9\\u1920-\\u192B\\u1930-\\u193B\\u19B0-\\u19C0\\u19C8\\u19C9\\u1A17-\\u1A1B\\u1A55-\\u1A5E\\u1A60-\\u1A7C\\u1A7F\\u1B00-\\u1B04\\u1B34-\\u1B44\\u1B6B-\\u1B73\\u1B80-\\u1B82\\u1BA1-\\u1BAD\\u1BE6-\\u1BF3\\u1C24-\\u1C37\\u1CD0-\\u1CD2\\u1CD4-\\u1CE8\\u1CED\\u1CF2-\\u1CF4\\u1DC0-\\u1DE6\\u1DFC-\\u1DFF\\u20D0-\\u20DC\\u20E1\\u20E5-\\u20F0\\u2CEF-\\u2CF1\\u2D7F\\u2DE0-\\u2DFF\\u302A-\\u302F\\u3099\\u309A\\uA66F\\uA674-\\uA67D\\uA69F\\uA6F0\\uA6F1\\uA802\\uA806\\uA80B\\uA823-\\uA827\\uA880\\uA881\\uA8B4-\\uA8C4\\uA8E0-\\uA8F1\\uA926-\\uA92D\\uA947-\\uA953\\uA980-\\uA983\\uA9B3-\\uA9C0\\uAA29-\\uAA36\\uAA43\\uAA4C\\uAA4D\\uAA7B\\uAAB0\\uAAB2-\\uAAB4\\uAAB7\\uAAB8\\uAABE\\uAABF\\uAAC1\\uAAEB-\\uAAEF\\uAAF5\\uAAF6\\uABE3-\\uABEA\\uABEC\\uABED\\uFB1E\\uFE00-\\uFE0F\\uFE20-\\uFE26]"),
-        connector_punctuation: new RegExp("[\\u005F\\u203F\\u2040\\u2054\\uFE33\\uFE34\\uFE4D-\\uFE4F\\uFF3F]"),
-        digit: new RegExp("[\\u0030-\\u0039\\u0660-\\u0669\\u06F0-\\u06F9\\u07C0-\\u07C9\\u0966-\\u096F\\u09E6-\\u09EF\\u0A66-\\u0A6F\\u0AE6-\\u0AEF\\u0B66-\\u0B6F\\u0BE6-\\u0BEF\\u0C66-\\u0C6F\\u0CE6-\\u0CEF\\u0D66-\\u0D6F\\u0E50-\\u0E59\\u0ED0-\\u0ED9\\u0F20-\\u0F29\\u1040-\\u1049\\u1090-\\u1099\\u17E0-\\u17E9\\u1810-\\u1819\\u1946-\\u194F\\u19D0-\\u19D9\\u1A80-\\u1A89\\u1A90-\\u1A99\\u1B50-\\u1B59\\u1BB0-\\u1BB9\\u1C40-\\u1C49\\u1C50-\\u1C59\\uA620-\\uA629\\uA8D0-\\uA8D9\\uA900-\\uA909\\uA9D0-\\uA9D9\\uAA50-\\uAA59\\uABF0-\\uABF9\\uFF10-\\uFF19]")
-};
-
-function is_letter(ch) {
-        return UNICODE.letter.test(ch);
-};
-
-function is_digit(ch) {
-        ch = ch.charCodeAt(0);
-        return ch >= 48 && ch <= 57;
-};
-
-function is_unicode_digit(ch) {
-        return UNICODE.digit.test(ch);
-}
-
-function is_alphanumeric_char(ch) {
-        return is_digit(ch) || is_letter(ch);
-};
-
-function is_unicode_combining_mark(ch) {
-        return UNICODE.combining_mark.test(ch);
-};
-
-function is_unicode_connector_punctuation(ch) {
-        return UNICODE.connector_punctuation.test(ch);
-};
-
-function is_identifier_start(ch) {
-        return ch == "$" || ch == "_" || is_letter(ch);
-};
-
-function is_identifier_char(ch) {
-        return is_identifier_start(ch)
-                || is_unicode_combining_mark(ch)
-                || is_unicode_digit(ch)
-                || is_unicode_connector_punctuation(ch)
-                || ch == "\u200c" // zero-width non-joiner <ZWNJ>
-                || ch == "\u200d" // zero-width joiner <ZWJ> (in my ECMA-262 PDF, this is also 200c)
-        ;
-};
-
-function parse_js_number(num) {
-        if (RE_HEX_NUMBER.test(num)) {
-                return parseInt(num.substr(2), 16);
-        } else if (RE_OCT_NUMBER.test(num)) {
-                return parseInt(num.substr(1), 8);
-        } else if (RE_DEC_NUMBER.test(num)) {
-                return parseFloat(num);
-        }
-};
-
-function JS_Parse_Error(message, line, col, pos) {
-        this.message = message;
-        this.line = line + 1;
-        this.col = col + 1;
-        this.pos = pos + 1;
-        this.stack = new Error().stack;
-};
-
-JS_Parse_Error.prototype.toString = function() {
-        return this.message + " (line: " + this.line + ", col: " + this.col + ", pos: " + this.pos + ")" + "\n\n" + this.stack;
-};
-
-function js_error(message, line, col, pos) {
-        throw new JS_Parse_Error(message, line, col, pos);
-};
-
-function is_token(token, type, val) {
-        return token.type == type && (val == null || token.value == val);
-};
-
-var EX_EOF = {};
-
-function tokenizer($TEXT) {
-
-        var S = {
-                text            : $TEXT.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, ''),
-                pos             : 0,
-                tokpos          : 0,
-                line            : 0,
-                tokline         : 0,
-                col             : 0,
-                tokcol          : 0,
-                newline_before  : false,
-                regex_allowed   : false,
-                comments_before : []
-        };
-
-        function peek() { return S.text.charAt(S.pos); };
-
-        function next(signal_eof, in_string) {
-                var ch = S.text.charAt(S.pos++);
-                if (signal_eof && !ch)
-                        throw EX_EOF;
-                if (ch == "\n") {
-                        S.newline_before = S.newline_before || !in_string;
-                        ++S.line;
-                        S.col = 0;
-                } else {
-                        ++S.col;
-                }
-                return ch;
-        };
-
-        function eof() {
-                return !S.peek();
-        };
-
-        function find(what, signal_eof) {
-                var pos = S.text.indexOf(what, S.pos);
-                if (signal_eof && pos == -1) throw EX_EOF;
-                return pos;
-        };
-
-        function start_token() {
-                S.tokline = S.line;
-                S.tokcol = S.col;
-                S.tokpos = S.pos;
-        };
-
-        function token(type, value, is_comment) {
-                S.regex_allowed = ((type == "operator" && !HOP(UNARY_POSTFIX, value)) ||
-                                   (type == "keyword" && HOP(KEYWORDS_BEFORE_EXPRESSION, value)) ||
-                                   (type == "punc" && HOP(PUNC_BEFORE_EXPRESSION, value)));
-                var ret = {
-                        type   : type,
-                        value  : value,
-                        line   : S.tokline,
-                        col    : S.tokcol,
-                        pos    : S.tokpos,
-                        endpos : S.pos,
-                        nlb    : S.newline_before
-                };
-                if (!is_comment) {
-                        ret.comments_before = S.comments_before;
-                        S.comments_before = [];
-                        // make note of any newlines in the comments that came before
-                        for (var i = 0, len = ret.comments_before.length; i < len; i++) {
-                                ret.nlb = ret.nlb || ret.comments_before[i].nlb;
-                        }
-                }
-                S.newline_before = false;
-                return ret;
-        };
-
-        function skip_whitespace() {
-                while (HOP(WHITESPACE_CHARS, peek()))
-                        next();
-        };
-
-        function read_while(pred) {
-                var ret = "", ch = peek(), i = 0;
-                while (ch && pred(ch, i++)) {
-                        ret += next();
-                        ch = peek();
-                }
-                return ret;
-        };
-
-        function parse_error(err) {
-                js_error(err, S.tokline, S.tokcol, S.tokpos);
-        };
-
-        function read_num(prefix) {
-                var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
-                var num = read_while(function(ch, i){
-                        if (ch == "x" || ch == "X") {
-                                if (has_x) return false;
-                                return has_x = true;
-                        }
-                        if (!has_x && (ch == "E" || ch == "e")) {
-                                if (has_e) return false;
-                                return has_e = after_e = true;
-                        }
-                        if (ch == "-") {
-                                if (after_e || (i == 0 && !prefix)) return true;
-                                return false;
-                        }
-                        if (ch == "+") return after_e;
-                        after_e = false;
-                        if (ch == ".") {
-                                if (!has_dot && !has_x && !has_e)
-                                        return has_dot = true;
-                                return false;
-                        }
-                        return is_alphanumeric_char(ch);
-                });
-                if (prefix)
-                        num = prefix + num;
-                var valid = parse_js_number(num);
-                if (!isNaN(valid)) {
-                        return token("num", valid);
-                } else {
-                        parse_error("Invalid syntax: " + num);
-                }
-        };
-
-        function read_escaped_char(in_string) {
-                var ch = next(true, in_string);
-                switch (ch) {
-                    case "n" : return "\n";
-                    case "r" : return "\r";
-                    case "t" : return "\t";
-                    case "b" : return "\b";
-                    case "v" : return "\u000b";
-                    case "f" : return "\f";
-                    case "0" : return "\0";
-                    case "x" : return String.fromCharCode(hex_bytes(2));
-                    case "u" : return String.fromCharCode(hex_bytes(4));
-                    case "\n": return "";
-                    default  : return ch;
-                }
-        };
-
-        function hex_bytes(n) {
-                var num = 0;
-                for (; n > 0; --n) {
-                        var digit = parseInt(next(true), 16);
-                        if (isNaN(digit))
-                                parse_error("Invalid hex-character pattern in string");
-                        num = (num << 4) | digit;
-                }
-                return num;
-        };
-
-        function read_string() {
-                return with_eof_error("Unterminated string constant", function(){
-                        var quote = next(), ret = "";
-                        for (;;) {
-                                var ch = next(true);
-                                if (ch == "\\") {
-                                        // read OctalEscapeSequence (XXX: deprecated if "strict mode")
-                                        // https://github.com/mishoo/UglifyJS/issues/178
-                                        var octal_len = 0, first = null;
-                                        ch = read_while(function(ch){
-                                                if (ch >= "0" && ch <= "7") {
-                                                        if (!first) {
-                                                                first = ch;
-                                                                return ++octal_len;
-                                                        }
-                                                        else if (first <= "3" && octal_len <= 2) return ++octal_len;
-                                                        else if (first >= "4" && octal_len <= 1) return ++octal_len;
-                                                }
-                                                return false;
-                                        });
-                                        if (octal_len > 0) ch = String.fromCharCode(parseInt(ch, 8));
-                                        else ch = read_escaped_char(true);
-                                }
-                                else if (ch == quote) break;
-                                ret += ch;
-                        }
-                        return token("string", ret);
-                });
-        };
-
-        function read_line_comment() {
-                next();
-                var i = find("\n"), ret;
-                if (i == -1) {
-                        ret = S.text.substr(S.pos);
-                        S.pos = S.text.length;
-                } else {
-                        ret = S.text.substring(S.pos, i);
-                        S.pos = i;
-                }
-                return token("comment1", ret, true);
-        };
-
-        function read_multiline_comment() {
-                next();
-                return with_eof_error("Unterminated multiline comment", function(){
-                        var i = find("*/", true),
-                            text = S.text.substring(S.pos, i);
-                        S.pos = i + 2;
-                        S.line += text.split("\n").length - 1;
-                        S.newline_before = S.newline_before || text.indexOf("\n") >= 0;
-
-                        // https://github.com/mishoo/UglifyJS/issues/#issue/100
-                        if (/^@cc_on/i.test(text)) {
-                                warn("WARNING: at line " + S.line);
-                                warn("*** Found \"conditional comment\": " + text);
-                                warn("*** UglifyJS DISCARDS ALL COMMENTS.  This means your code might no longer work properly in Internet Explorer.");
-                        }
-
-                        return token("comment2", text, true);
-                });
-        };
-
-        function read_name() {
-                var backslash = false, name = "", ch, escaped = false, hex;
-                while ((ch = peek()) != null) {
-                        if (!backslash) {
-                                if (ch == "\\") escaped = backslash = true, next();
-                                else if (is_identifier_char(ch)) name += next();
-                                else break;
-                        }
-                        else {
-                                if (ch != "u") parse_error("Expecting UnicodeEscapeSequence -- uXXXX");
-                                ch = read_escaped_char();
-                                if (!is_identifier_char(ch)) parse_error("Unicode char: " + ch.charCodeAt(0) + " is not valid in identifier");
-                                name += ch;
-                                backslash = false;
-                        }
-                }
-                if (HOP(KEYWORDS, name) && escaped) {
-                        hex = name.charCodeAt(0).toString(16).toUpperCase();
-                        name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1);
-                }
-                return name;
-        };
-
-        function read_regexp(regexp) {
-                return with_eof_error("Unterminated regular expression", function(){
-                        var prev_backslash = false, ch, in_class = false;
-                        while ((ch = next(true))) if (prev_backslash) {
-                                regexp += "\\" + ch;
-                                prev_backslash = false;
-                        } else if (ch == "[") {
-                                in_class = true;
-                                regexp += ch;
-                        } else if (ch == "]" && in_class) {
-                                in_class = false;
-                                regexp += ch;
-                        } else if (ch == "/" && !in_class) {
-                                break;
-                        } else if (ch == "\\") {
-                                prev_backslash = true;
-                        } else {
-                                regexp += ch;
-                        }
-                        var mods = read_name();
-                        return token("regexp", [ regexp, mods ]);
-                });
-        };
-
-        function read_operator(prefix) {
-                function grow(op) {
-                        if (!peek()) return op;
-                        var bigger = op + peek();
-                        if (HOP(OPERATORS, bigger)) {
-                                next();
-                                return grow(bigger);
-                        } else {
-                                return op;
-                        }
-                };
-                return token("operator", grow(prefix || next()));
-        };
-
-        function handle_slash() {
-                next();
-                var regex_allowed = S.regex_allowed;
-                switch (peek()) {
-                    case "/":
-                        S.comments_before.push(read_line_comment());
-                        S.regex_allowed = regex_allowed;
-                        return next_token();
-                    case "*":
-                        S.comments_before.push(read_multiline_comment());
-                        S.regex_allowed = regex_allowed;
-                        return next_token();
-                }
-                return S.regex_allowed ? read_regexp("") : read_operator("/");
-        };
-
-        function handle_dot() {
-                next();
-                return is_digit(peek())
-                        ? read_num(".")
-                        : token("punc", ".");
-        };
-
-        function read_word() {
-                var word = read_name();
-                return !HOP(KEYWORDS, word)
-                        ? token("name", word)
-                        : HOP(OPERATORS, word)
-                        ? token("operator", word)
-                        : HOP(KEYWORDS_ATOM, word)
-                        ? token("atom", word)
-                        : token("keyword", word);
-        };
-
-        function with_eof_error(eof_error, cont) {
-                try {
-                        return cont();
-                } catch(ex) {
-                        if (ex === EX_EOF) parse_error(eof_error);
-                        else throw ex;
-                }
-        };
-
-        function next_token(force_regexp) {
-                if (force_regexp != null)
-                        return read_regexp(force_regexp);
-                skip_whitespace();
-                start_token();
-                var ch = peek();
-                if (!ch) return token("eof");
-                if (is_digit(ch)) return read_num();
-                if (ch == '"' || ch == "'") return read_string();
-                if (HOP(PUNC_CHARS, ch)) return token("punc", next());
-                if (ch == ".") return handle_dot();
-                if (ch == "/") return handle_slash();
-                if (HOP(OPERATOR_CHARS, ch)) return read_operator();
-                if (ch == "\\" || is_identifier_start(ch)) return read_word();
-                parse_error("Unexpected character '" + ch + "'");
-        };
-
-        next_token.context = function(nc) {
-                if (nc) S = nc;
-                return S;
-        };
-
-        return next_token;
-
-};
-
-/* -----[ Parser (constants) ]----- */
-
-var UNARY_PREFIX = array_to_hash([
-        "typeof",
-        "void",
-        "delete",
-        "--",
-        "++",
-        "!",
-        "~",
-        "-",
-        "+"
-]);
-
-var UNARY_POSTFIX = array_to_hash([ "--", "++" ]);
-
-var ASSIGNMENT = (function(a, ret, i){
-        while (i < a.length) {
-                ret[a[i]] = a[i].substr(0, a[i].length - 1);
-                i++;
-        }
-        return ret;
-})(
-        ["+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&="],
-        { "=": true },
-        0
-);
-
-var PRECEDENCE = (function(a, ret){
-        for (var i = 0, n = 1; i < a.length; ++i, ++n) {
-                var b = a[i];
-                for (var j = 0; j < b.length; ++j) {
-                        ret[b[j]] = n;
-                }
-        }
-        return ret;
-})(
-        [
-                ["||"],
-                ["&&"],
-                ["|"],
-                ["^"],
-                ["&"],
-                ["==", "===", "!=", "!=="],
-                ["<", ">", "<=", ">=", "in", "instanceof"],
-                [">>", "<<", ">>>"],
-                ["+", "-"],
-                ["*", "/", "%"]
-        ],
-        {}
-);
-
-var STATEMENTS_WITH_LABELS = array_to_hash([ "for", "do", "while", "switch" ]);
-
-var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "name" ]);
-
-/* -----[ Parser ]----- */
-
-function NodeWithToken(str, start, end) {
-        this.name = str;
-        this.start = start;
-        this.end = end;
-};
-
-NodeWithToken.prototype.toString = function() { return this.name; };
-
-function parse($TEXT, exigent_mode, embed_tokens) {
-
-        var S = {
-                input         : typeof $TEXT == "string" ? tokenizer($TEXT, true) : $TEXT,
-                token         : null,
-                prev          : null,
-                peeked        : null,
-                in_function   : 0,
-                in_directives : true,
-                in_loop       : 0,
-                labels        : []
-        };
-
-        S.token = next();
-
-        function is(type, value) {
-                return is_token(S.token, type, value);
-        };
-
-        function peek() { return S.peeked || (S.peeked = S.input()); };
-
-        function next() {
-                S.prev = S.token;
-                if (S.peeked) {
-                        S.token = S.peeked;
-                        S.peeked = null;
-                } else {
-                        S.token = S.input();
-                }
-                S.in_directives = S.in_directives && (
-                        S.token.type == "string" || is("punc", ";")
-                );
-                return S.token;
-        };
-
-        function prev() {
-                return S.prev;
-        };
-
-        function croak(msg, line, col, pos) {
-                var ctx = S.input.context();
-                js_error(msg,
-                         line != null ? line : ctx.tokline,
-                         col != null ? col : ctx.tokcol,
-                         pos != null ? pos : ctx.tokpos);
-        };
-
-        function token_error(token, msg) {
-                croak(msg, token.line, token.col);
-        };
-
-        function unexpected(token) {
-                if (token == null)
-                        token = S.token;
-                token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
-        };
-
-        function expect_token(type, val) {
-                if (is(type, val)) {
-                        return next();
-                }
-                token_error(S.token, "Unexpected token " + S.token.type + ", expected " + type);
-        };
-
-        function expect(punc) { return expect_token("punc", punc); };
-
-        function can_insert_semicolon() {
-                return !exigent_mode && (
-                        S.token.nlb || is("eof") || is("punc", "}")
-                );
-        };
-
-        function semicolon() {
-                if (is("punc", ";")) next();
-                else if (!can_insert_semicolon()) unexpected();
-        };
-
-        function as() {
-                return slice(arguments);
-        };
-
-        function parenthesised() {
-                expect("(");
-                var ex = expression();
-                expect(")");
-                return ex;
-        };
-
-        function add_tokens(str, start, end) {
-                return str instanceof NodeWithToken ? str : new NodeWithToken(str, start, end);
-        };
-
-        function maybe_embed_tokens(parser) {
-                if (embed_tokens) return function() {
-                        var start = S.token;
-                        var ast = parser.apply(this, arguments);
-                        ast[0] = add_tokens(ast[0], start, prev());
-                        return ast;
-                };
-                else return parser;
-        };
-
-        var statement = maybe_embed_tokens(function() {
-                if (is("operator", "/") || is("operator", "/=")) {
-                        S.peeked = null;
-                        S.token = S.input(S.token.value.substr(1)); // force regexp
-                }
-                switch (S.token.type) {
-                    case "string":
-                        var dir = S.in_directives, stat = simple_statement();
-                        if (dir && stat[1][0] == "string" && !is("punc", ","))
-                            return as("directive", stat[1][1]);
-                        return stat;
-                    case "num":
-                    case "regexp":
-                    case "operator":
-                    case "atom":
-                        return simple_statement();
-
-                    case "name":
-                        return is_token(peek(), "punc", ":")
-                                ? labeled_statement(prog1(S.token.value, next, next))
-                                : simple_statement();
-
-                    case "punc":
-                        switch (S.token.value) {
-                            case "{":
-                                return as("block", block_());
-                            case "[":
-                            case "(":
-                                return simple_statement();
-                            case ";":
-                                next();
-                                return as("block");
-                            default:
-                                unexpected();
-                        }
-
-                    case "keyword":
-                        switch (prog1(S.token.value, next)) {
-                            case "break":
-                                return break_cont("break");
-
-                            case "continue":
-                                return break_cont("continue");
-
-                            case "debugger":
-                                semicolon();
-                                return as("debugger");
-
-                            case "do":
-                                return (function(body){
-                                        expect_token("keyword", "while");
-                                        return as("do", prog1(parenthesised, semicolon), body);
-                                })(in_loop(statement));
-
-                            case "for":
-                                return for_();
-
-                            case "function":
-                                return function_(true);
-
-                            case "if":
-                                return if_();
-
-                            case "return":
-                                if (S.in_function == 0)
-                                        croak("'return' outside of function");
-                                return as("return",
-                                          is("punc", ";")
-                                          ? (next(), null)
-                                          : can_insert_semicolon()
-                                          ? null
-                                          : prog1(expression, semicolon));
-
-                            case "switch":
-                                return as("switch", parenthesised(), switch_block_());
-
-                            case "throw":
-                                if (S.token.nlb)
-                                        croak("Illegal newline after 'throw'");
-                                return as("throw", prog1(expression, semicolon));
-
-                            case "try":
-                                return try_();
-
-                            case "var":
-                                return prog1(var_, semicolon);
-
-                            case "const":
-                                return prog1(const_, semicolon);
-
-                            case "while":
-                                return as("while", parenthesised(), in_loop(statement));
-
-                            case "with":
-                                return as("with", parenthesised(), statement());
-
-                            default:
-                                unexpected();
-                        }
-                }
-        });
-
-        function labeled_statement(label) {
-                S.labels.push(label);
-                var start = S.token, stat = statement();
-                if (exigent_mode && !HOP(STATEMENTS_WITH_LABELS, stat[0]))
-                        unexpected(start);
-                S.labels.pop();
-                return as("label", label, stat);
-        };
-
-        function simple_statement() {
-                return as("stat", prog1(expression, semicolon));
-        };
-
-        function break_cont(type) {
-                var name;
-                if (!can_insert_semicolon()) {
-                        name = is("name") ? S.token.value : null;
-                }
-                if (name != null) {
-                        next();
-                        if (!member(name, S.labels))
-                                croak("Label " + name + " without matching loop or statement");
-                }
-                else if (S.in_loop == 0)
-                        croak(type + " not inside a loop or switch");
-                semicolon();
-                return as(type, name);
-        };
-
-        function for_() {
-                expect("(");
-                var init = null;
-                if (!is("punc", ";")) {
-                        init = is("keyword", "var")
-                                ? (next(), var_(true))
-                                : expression(true, true);
-                        if (is("operator", "in")) {
-                                if (init[0] == "var" && init[1].length > 1)
-                                        croak("Only one variable declaration allowed in for..in loop");
-                                return for_in(init);
-                        }
-                }
-                return regular_for(init);
-        };
-
-        function regular_for(init) {
-                expect(";");
-                var test = is("punc", ";") ? null : expression();
-                expect(";");
-                var step = is("punc", ")") ? null : expression();
-                expect(")");
-                return as("for", init, test, step, in_loop(statement));
-        };
-
-        function for_in(init) {
-                var lhs = init[0] == "var" ? as("name", init[1][0]) : init;
-                next();
-                var obj = expression();
-                expect(")");
-                return as("for-in", init, lhs, obj, in_loop(statement));
-        };
-
-        var function_ = function(in_statement) {
-                var name = is("name") ? prog1(S.token.value, next) : null;
-                if (in_statement && !name)
-                        unexpected();
-                expect("(");
-                return as(in_statement ? "defun" : "function",
-                          name,
-                          // arguments
-                          (function(first, a){
-                                  while (!is("punc", ")")) {
-                                          if (first) first = false; else expect(",");
-                                          if (!is("name")) unexpected();
-                                          a.push(S.token.value);
-                                          next();
-                                  }
-                                  next();
-                                  return a;
-                          })(true, []),
-                          // body
-                          (function(){
-                                  ++S.in_function;
-                                  var loop = S.in_loop;
-                                  S.in_directives = true;
-                                  S.in_loop = 0;
-                                  var a = block_();
-                                  --S.in_function;
-                                  S.in_loop = loop;
-                                  return a;
-                          })());
-        };
-
-        function if_() {
-                var cond = parenthesised(), body = statement(), belse;
-                if (is("keyword", "else")) {
-                        next();
-                        belse = statement();
-                }
-                return as("if", cond, body, belse);
-        };
-
-        function block_() {
-                expect("{");
-                var a = [];
-                while (!is("punc", "}")) {
-                        if (is("eof")) unexpected();
-                        a.push(statement());
-                }
-                next();
-                return a;
-        };
-
-        var switch_block_ = curry(in_loop, function(){
-                expect("{");
-                var a = [], cur = null;
-                while (!is("punc", "}")) {
-                        if (is("eof")) unexpected();
-                        if (is("keyword", "case")) {
-                                next();
-                                cur = [];
-                                a.push([ expression(), cur ]);
-                                expect(":");
-                        }
-                        else if (is("keyword", "default")) {
-                                next();
-                                expect(":");
-                                cur = [];
-                                a.push([ null, cur ]);
-                        }
-                        else {
-                                if (!cur) unexpected();
-                                cur.push(statement());
-                        }
-                }
-                next();
-                return a;
-        });
-
-        function try_() {
-                var body = block_(), bcatch, bfinally;
-                if (is("keyword", "catch")) {
-                        next();
-                        expect("(");
-                        if (!is("name"))
-                                croak("Name expected");
-                        var name = S.token.value;
-                        next();
-                        expect(")");
-                        bcatch = [ name, block_() ];
-                }
-                if (is("keyword", "finally")) {
-                        next();
-                        bfinally = block_();
-                }
-                if (!bcatch && !bfinally)
-                        croak("Missing catch/finally blocks");
-                return as("try", body, bcatch, bfinally);
-        };
-
-        function vardefs(no_in) {
-                var a = [];
-                for (;;) {
-                        if (!is("name"))
-                                unexpected();
-                        var name = S.token.value;
-                        next();
-                        if (is("operator", "=")) {
-                                next();
-                                a.push([ name, expression(false, no_in) ]);
-                        } else {
-                                a.push([ name ]);
-                        }
-                        if (!is("punc", ","))
-                                break;
-                        next();
-                }
-                return a;
-        };
-
-        function var_(no_in) {
-                return as("var", vardefs(no_in));
-        };
-
-        function const_() {
-                return as("const", vardefs());
-        };
-
-        function new_() {
-                var newexp = expr_atom(false), args;
-                if (is("punc", "(")) {
-                        next();
-                        args = expr_list(")");
-                } else {
-                        args = [];
-                }
-                return subscripts(as("new", newexp, args), true);
-        };
-
-        var expr_atom = maybe_embed_tokens(function(allow_calls) {
-                if (is("operator", "new")) {
-                        next();
-                        return new_();
-                }
-                if (is("punc")) {
-                        switch (S.token.value) {
-                            case "(":
-                                next();
-                                return subscripts(prog1(expression, curry(expect, ")")), allow_calls);
-                            case "[":
-                                next();
-                                return subscripts(array_(), allow_calls);
-                            case "{":
-                                next();
-                                return subscripts(object_(), allow_calls);
-                        }
-                        unexpected();
-                }
-                if (is("keyword", "function")) {
-                        next();
-                        return subscripts(function_(false), allow_calls);
-                }
-                if (HOP(ATOMIC_START_TOKEN, S.token.type)) {
-                        var atom = S.token.type == "regexp"
-                                ? as("regexp", S.token.value[0], S.token.value[1])
-                                : as(S.token.type, S.token.value);
-                        return subscripts(prog1(atom, next), allow_calls);
-                }
-                unexpected();
-        });
-
-        function expr_list(closing, allow_trailing_comma, allow_empty) {
-                var first = true, a = [];
-                while (!is("punc", closing)) {
-                        if (first) first = false; else expect(",");
-                        if (allow_trailing_comma && is("punc", closing)) break;
-                        if (is("punc", ",") && allow_empty) {
-                                a.push([ "atom", "undefined" ]);
-                        } else {
-                                a.push(expression(false));
-                        }
-                }
-                next();
-                return a;
-        };
-
-        function array_() {
-                return as("array", expr_list("]", !exigent_mode, true));
-        };
-
-        function object_() {
-                var first = true, a = [];
-                while (!is("punc", "}")) {
-                        if (first) first = false; else expect(",");
-                        if (!exigent_mode && is("punc", "}"))
-                                // allow trailing comma
-                                break;
-                        var type = S.token.type;
-                        var name = as_property_name();
-                        if (type == "name" && (name == "get" || name == "set") && !is("punc", ":")) {
-                                a.push([ as_name(), function_(false), name ]);
-                        } else {
-                                expect(":");
-                                a.push([ name, expression(false) ]);
-                        }
-                        // FIXME [!!] Line not in original parse-js,
-                        // added to be able to warn about unquoted
-                        // keyword properties
-                        a[a.length - 1].type = type;
-                }
-                next();
-                return as("object", a);
-        };
-
-        function as_property_name() {
-                switch (S.token.type) {
-                    case "num":
-                    case "string":
-                        return prog1(S.token.value, next);
-                }
-                return as_name();
-        };
-
-        function as_name() {
-                switch (S.token.type) {
-                    case "name":
-                    case "operator":
-                    case "keyword":
-                    case "atom":
-                        return prog1(S.token.value, next);
-                    default:
-                        unexpected();
-                }
-        };
-
-        function subscripts(expr, allow_calls) {
-                if (is("punc", ".")) {
-                        next();
-                        return subscripts(as("dot", expr, as_name()), allow_calls);
-                }
-                if (is("punc", "[")) {
-                        next();
-                        return subscripts(as("sub", expr, prog1(expression, curry(expect, "]"))), allow_calls);
-                }
-                if (allow_calls && is("punc", "(")) {
-                        next();
-                        return subscripts(as("call", expr, expr_list(")")), true);
-                }
-                return expr;
-        };
-
-        function maybe_unary(allow_calls) {
-                if (is("operator") && HOP(UNARY_PREFIX, S.token.value)) {
-                        return make_unary("unary-prefix",
-                                          prog1(S.token.value, next),
-                                          maybe_unary(allow_calls));
-                }
-                var val = expr_atom(allow_calls);
-                while (is("operator") && HOP(UNARY_POSTFIX, S.token.value) && !S.token.nlb) {
-                        val = make_unary("unary-postfix", S.token.value, val);
-                        next();
-                }
-                return val;
-        };
-
-        function make_unary(tag, op, expr) {
-                if ((op == "++" || op == "--") && !is_assignable(expr))
-                        croak("Invalid use of " + op + " operator");
-                return as(tag, op, expr);
-        };
-
-        function expr_op(left, min_prec, no_in) {
-                var op = is("operator") ? S.token.value : null;
-                if (op && op == "in" && no_in) op = null;
-                var prec = op != null ? PRECEDENCE[op] : null;
-                if (prec != null && prec > min_prec) {
-                        next();
-                        var right = expr_op(maybe_unary(true), prec, no_in);
-                        return expr_op(as("binary", op, left, right), min_prec, no_in);
-                }
-                return left;
-        };
-
-        function expr_ops(no_in) {
-                return expr_op(maybe_unary(true), 0, no_in);
-        };
-
-        function maybe_conditional(no_in) {
-                var expr = expr_ops(no_in);
-                if (is("operator", "?")) {
-                        next();
-                        var yes = expression(false);
-                        expect(":");
-                        return as("conditional", expr, yes, expression(false, no_in));
-                }
-                return expr;
-        };
-
-        function is_assignable(expr) {
-                if (!exigent_mode) return true;
-                switch (expr[0]+"") {
-                    case "dot":
-                    case "sub":
-                    case "new":
-                    case "call":
-                        return true;
-                    case "name":
-                        return expr[1] != "this";
-                }
-        };
-
-        function maybe_assign(no_in) {
-                var left = maybe_conditional(no_in), val = S.token.value;
-                if (is("operator") && HOP(ASSIGNMENT, val)) {
-                        if (is_assignable(left)) {
-                                next();
-                                return as("assign", ASSIGNMENT[val], left, maybe_assign(no_in));
-                        }
-                        croak("Invalid assignment");
-                }
-                return left;
-        };
-
-        var expression = maybe_embed_tokens(function(commas, no_in) {
-                if (arguments.length == 0)
-                        commas = true;
-                var expr = maybe_assign(no_in);
-                if (commas && is("punc", ",")) {
-                        next();
-                        return as("seq", expr, expression(true, no_in));
-                }
-                return expr;
-        });
-
-        function in_loop(cont) {
-                try {
-                        ++S.in_loop;
-                        return cont();
-                } finally {
-                        --S.in_loop;
-                }
-        };
-
-        return as("toplevel", (function(a){
-                while (!is("eof"))
-                        a.push(statement());
-                return a;
-        })([]));
-
-};
-
-/* -----[ Utilities ]----- */
-
-function curry(f) {
-        var args = slice(arguments, 1);
-        return function() { return f.apply(this, args.concat(slice(arguments))); };
-};
-
-function prog1(ret) {
-        if (ret instanceof Function)
-                ret = ret();
-        for (var i = 1, n = arguments.length; --n > 0; ++i)
-                arguments[i]();
-        return ret;
-};
-
-function array_to_hash(a) {
-        var ret = {};
-        for (var i = 0; i < a.length; ++i)
-                ret[a[i]] = true;
-        return ret;
-};
-
-function slice(a, start) {
-        return Array.prototype.slice.call(a, start || 0);
-};
-
-function characters(str) {
-        return str.split("");
-};
-
-function member(name, array) {
-        for (var i = array.length; --i >= 0;)
-                if (array[i] == name)
-                        return true;
-        return false;
-};
-
-function HOP(obj, prop) {
-        return Object.prototype.hasOwnProperty.call(obj, prop);
-};
-
-var warn = function() {};
-
-/* -----[ Exports ]----- */
-
-exports.tokenizer = tokenizer;
-exports.parse = parse;
-exports.slice = slice;
-exports.curry = curry;
-exports.member = member;
-exports.array_to_hash = array_to_hash;
-exports.PRECEDENCE = PRECEDENCE;
-exports.KEYWORDS_ATOM = KEYWORDS_ATOM;
-exports.RESERVED_WORDS = RESERVED_WORDS;
-exports.KEYWORDS = KEYWORDS;
-exports.ATOMIC_START_TOKEN = ATOMIC_START_TOKEN;
-exports.OPERATORS = OPERATORS;
-exports.is_alphanumeric_char = is_alphanumeric_char;
-exports.is_identifier_start = is_identifier_start;
-exports.is_identifier_char = is_identifier_char;
-exports.set_logger = function(logger) {
-        warn = logger;
-};
-
-// Local variables:
-// js-indent-level: 8
-// End:
diff --git a/test/mode_test.css b/test/mode_test.css
index 1ac66737fb..f425922e5d 100644
--- a/test/mode_test.css
+++ b/test/mode_test.css
@@ -8,3 +8,15 @@
 .mt-output .mt-style {
   font-size: x-small;
 }
+
+.mt-test {
+  border-left: 10px solid #fff;
+}
+
+.mt-pass {
+  border-left: 10px solid #cfc;
+}
+
+.mt-fail {
+  border-left: 10px solid #fcc;
+}
diff --git a/test/mode_test.js b/test/mode_test.js
index 8d9df65e6c..d77ac143f8 100644
--- a/test/mode_test.js
+++ b/test/mode_test.js
@@ -10,49 +10,33 @@ ModeTest.modeOptions = {};
 ModeTest.modeName = CodeMirror.defaults.mode;
 
 /* keep track of results for printSummary */
-ModeTest.testCount = 0;
+ModeTest.tests = 0;
 ModeTest.passes = 0;
 
 /**
  * Run a test; prettyprints the results using document.write().
- * 
- * @param name Name of test
- * @param text String to highlight.
- * @param expected Expected styles and tokens: Array(style, token, [style, token,...])
- * @param modeName
- * @param modeOptions
- * @param expectedFail
+ *
+ * @param string to highlight
+ *
+ * @param style[i] expected style of the i'th token in string
+ *
+ * @param token[i] expected value for the i'th token in string
  */
-ModeTest.testMode = function(name, text, expected, modeName, modeOptions, expectedFail) {
-  ModeTest.testCount += 1;
-  
-  if (!modeName) modeName = ModeTest.modeName;
-  
-  if (!modeOptions) modeOptions = ModeTest.modeOptions;
+ModeTest.test = function() {
+  ModeTest.tests += 1;
 
-  var mode = CodeMirror.getMode(modeOptions, modeName);
+  var mode = CodeMirror.getMode(ModeTest.modeOptions, ModeTest.modeName);
 
-  if (expected.length < 0) {
-    throw "must have text for test (" + name + ")";
+  if (arguments.length < 1) {
+    throw "must have text for test";
   }
-  if (expected.length % 2 != 0) {
-    throw "must have text for test (" + name + ") plus expected (style, token) pairs";
+  if (arguments.length % 2 != 1) {
+    throw "must have text for test plus expected (style, token) pairs";
   }
-  return test(
-    modeName + "_" + name,
-    function(){
-      return ModeTest.compare(text, expected, mode);
-    },
-    expectedFail
-  );
-  
-}
-
-ModeTest.compare = function (text, arguments, mode) {
 
+  var text = arguments[0];
   var expectedOutput = [];
-  for (var i = 0; i < arguments.length; i += 2) {
-    arguments[i] = (arguments[i] != null ? arguments[i].split(' ').sort().join(' ') : arguments[i]);
+  for (var i = 1; i < arguments.length; i += 2) {
     expectedOutput.push([arguments[i],arguments[i + 1]]);
   }
 
@@ -66,26 +50,20 @@ ModeTest.compare = function (text, arguments, mode) {
   }
 
   var s = '';
+  s += '<div class="mt-test ' + passStyle + '">';
+  s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
+  s +=   '<div class="cm-s-default">';
   if (pass || expectedOutput.length == 0) {
-    s += '<div class="mt-test ' + passStyle + '">';
-    s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
-    s +=   '<div class="cm-s-default">';
     s +=   ModeTest.prettyPrintOutputTable(observedOutput);
-    s +=   '</div>';
-    s += '</div>';
-    return s;
   } else {
-    s += '<div class="mt-test ' + passStyle + '">';
-    s +=   '<pre>' + ModeTest.htmlEscape(text) + '</pre>';
-    s +=   '<div class="cm-s-default">';
     s += 'expected:';
     s +=   ModeTest.prettyPrintOutputTable(expectedOutput);
     s += 'observed:';
     s +=   ModeTest.prettyPrintOutputTable(observedOutput);
-    s +=   '</div>';
-    s += '</div>';
-    throw s;
   }
+  s +=   '</div>';
+  s += '</div>';
+  document.write(s);
 }
 
 /**
@@ -107,27 +85,11 @@ ModeTest.highlight = function(string, mode) {
     var line = lines[i];
     var stream = new CodeMirror.StringStream(line);
     if (line == "" && mode.blankLine) mode.blankLine(state);
-    var pos = 0;
-    var st = [];
-    /* Start copied code from CodeMirror.highlight */
     while (!stream.eol()) {
-      var style = mode.token(stream, state), substr = stream.current();
+      var style = mode.token(stream, state);
+      var substr = line.slice(stream.start, stream.pos);
+      output.push([style, substr]);
       stream.start = stream.pos;
-      if (pos && st[pos-1] == style) {
-        st[pos-2] += substr;
-      } else if (substr) {
-        st[pos++] = substr; st[pos++] = style;
-      }
-      // Give up when line is ridiculously long
-      if (stream.pos > 5000) {
-        st[pos++] = this.text.slice(stream.pos); st[pos++] = null;
-        break;
-      }
-    }
-    /* End copied code from CodeMirror.highlight */
-    for (var x = 0; x < st.length; x += 2) {
-      st[x + 1] = (st[x + 1] != null ? st[x + 1].split(' ').sort().join(' ') : st[x + 1]);
-      output.push([st[x + 1], st[x]]);
     }
   }
 
@@ -169,7 +131,7 @@ ModeTest.prettyPrintOutputTable = function(output) {
     var token = output[i];
     s +=
       '<td class="mt-token">' +
-        '<span class="cm-' + String(token[0]).replace(/ +/g, " cm-") + '">' +
+        '<span class="cm-' + token[0] + '">' +
           ModeTest.htmlEscape(token[1]).replace(/ /g,'&middot;') +
         '</span>' +
       '</td>';
@@ -188,8 +150,7 @@ ModeTest.prettyPrintOutputTable = function(output) {
  * Print how many tests have run so far and how many of those passed.
  */
 ModeTest.printSummary = function() {
-  ModeTest.runTests(ModeTest.displayTest);
-  document.write(ModeTest.passes + ' passes for ' + ModeTest.testCount + ' tests');
+  document.write(ModeTest.passes + ' passes for ' + ModeTest.tests + ' tests');
 }
 
 /**
diff --git a/test/phantom_driver.js b/test/phantom_driver.js
deleted file mode 100644
index e5072946c6..0000000000
--- a/test/phantom_driver.js
+++ /dev/null
@@ -1,30 +0,0 @@
-var page = require('webpage').create();
-
-page.open("http://localhost:3000/test/index.html", function (status) {
-  if (status != "success") {
-    console.log("page couldn't be loaded successfully");
-    phantom.exit(1);
-  }
-  waitFor(function () {
-    return page.evaluate(function () {
-      var output = document.getElementById('status');
-      if (!output) { return false; }
-      return (/^(\d+ failures?|all passed)/i).test(output.innerText);
-    });
-  }, function () {
-    var failed = page.evaluate(function () { return window.failed; });
-    var output = page.evaluate(function () {
-      return document.getElementById('status').innerText;
-    });
-    console.log(output);
-    phantom.exit(failed > 0 ? 1 : 0);
-  });
-});
-
-function waitFor (test, cb) {
-  if (test()) {
-    cb();
-  } else {
-    setTimeout(function () { waitFor(test, cb); }, 250);
-  }
-}
diff --git a/test/run.js b/test/run.js
deleted file mode 100755
index 8c7649a17d..0000000000
--- a/test/run.js
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-var lint = require("./lint/lint");
-
-lint.checkDir("mode");
-lint.checkDir("lib");
-
-var ok = lint.success();
-
-var files = new (require('node-static').Server)('.');
-
-var server = require('http').createServer(function (req, res) {
-  req.addListener('end', function () {
-    files.serve(req, res);
-  });
-}).addListener('error', function (err) {
-  throw err;
-}).listen(3000, function () {
-  var child_process = require('child_process');
-  child_process.exec("which phantomjs", function (err) {
-    if (err) {
-      console.error("PhantomJS is not installed. Download from http://phantomjs.org");
-      process.exit(1);
-    }
-    var cmd = 'phantomjs test/phantom_driver.js';
-    child_process.exec(cmd, function (err, stdout) {
-      server.close();
-      console.log(stdout);
-      process.exit(err || !ok ? 1 : 0);
-    });
-  });
-});
diff --git a/test/test.js b/test/test.js
index 9fb4016a4b..54eeba583a 100644
--- a/test/test.js
+++ b/test/test.js
@@ -22,9 +22,7 @@ function byClassName(elt, cls) {
   return found;
 }
 
-var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
-
-test("core_fromTextArea", function() {
+test("fromTextArea", function() {
   var te = document.getElementById("code");
   te.value = "CONTENT";
   var cm = CodeMirror.fromTextArea(te);
@@ -102,13 +100,9 @@ testCM("indent", function(cm) {
   cm.setOption("indentUnit", 8);
   cm.indentLine(1);
   eq(cm.getLine(1), "\tblah();");
-  cm.setOption("indentUnit", 10);
-  cm.setOption("tabSize", 4);
-  cm.indentLine(1);
-  eq(cm.getLine(1), "\t\t  blah();");
 }, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true, tabSize: 8});
 
-test("core_defaults", function() {
+test("defaults", function() {
   var olddefaults = CodeMirror.defaults, defs = CodeMirror.defaults = {};
   for (var opt in olddefaults) defs[opt] = olddefaults[opt];
   defs.indentUnit = 5;
@@ -257,14 +251,13 @@ testCM("markTextSingleLine", function(cm) {
     var r = cm.markText({line: 0, ch: 3}, {line: 0, ch: 6}, "foo");
     cm.replaceRange(test.c, {line: 0, ch: test.a}, {line: 0, ch: test.b});
     var f = r.find();
-    eq(f && f.from.ch, test.f); eq(f && f.to.ch, test.t);
+    eq(f.from && f.from.ch, test.f); eq(f.to && f.to.ch, test.t);
   });
 });
 
 testCM("markTextMultiLine", function(cm) {
   function p(v) { return v && {line: v[0], ch: v[1]}; }
   forEach([{a: [0, 0], b: [0, 5], c: "", f: [0, 0], t: [2, 5]},
-           {a: [0, 0], b: [0, 5], c: "foo\n", f: [1, 0], t: [3, 5]},
            {a: [0, 1], b: [0, 10], c: "", f: [0, 1], t: [2, 5]},
            {a: [0, 5], b: [0, 6], c: "x", f: [0, 6], t: [2, 5]},
            {a: [0, 0], b: [1, 0], c: "", f: [0, 0], t: [1, 5]},
@@ -276,38 +269,16 @@ testCM("markTextMultiLine", function(cm) {
            {a: [1, 5], b: [2, 5], c: "", f: [0, 5], t: [1, 5]},
            {a: [2, 0], b: [2, 3], c: "", f: [0, 5], t: [2, 2]},
            {a: [2, 5], b: [3, 0], c: "a\nb", f: [0, 5], t: [2, 5]},
-           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 3]},
+           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 4]},
            {a: [1, 1], b: [1, 9], c: "1\n2\n3", f: [0, 5], t: [4, 5]}], function(test) {
     cm.setValue("aaaaaaaaaa\nbbbbbbbbbb\ncccccccccc\ndddddddd\n");
-    var r = cm.markText({line: 0, ch: 5}, {line: 2, ch: 5}, "CodeMirror-matchingbracket");
+    var r = cm.markText({line: 0, ch: 5}, {line: 2, ch: 5}, "foo");
     cm.replaceRange(test.c, p(test.a), p(test.b));
     var f = r.find();
-    eqPos(f && f.from, p(test.f)); eqPos(f && f.to, p(test.t));
+    eqPos(f.from, p(test.f)); eqPos(f.to, p(test.t));
   });
 });
 
-testCM("markTextUndo", function(cm) {
-  var marker1, marker2, bookmark;
-  cm.compoundChange(function(){
-    marker1 = cm.markText({line: 0, ch: 1}, {line: 0, ch: 3}, "CodeMirror-matchingbracket");
-    marker2 = cm.markText({line: 0, ch: 0}, {line: 2, ch: 1}, "CodeMirror-matchingbracket");
-    bookmark = cm.setBookmark({line: 1, ch: 5});
-  });
-  cm.compoundChange(function(){
-    cm.replaceRange("foo", {line: 0, ch: 2});
-    cm.replaceRange("bar\baz\bug\n", {line: 2, ch: 0}, {line: 3, ch: 0});
-  });
-  cm.setValue("");
-  eq(marker1.find(), null); eq(marker2.find(), null); eq(bookmark.find(), null);
-  cm.undo();
-  eqPos(bookmark.find(), {line: 1, ch: 5});
-  cm.undo();
-  var m1Pos = marker1.find(), m2Pos = marker2.find();
-  eqPos(m1Pos.from, {line: 0, ch: 1}); eqPos(m1Pos.to, {line: 0, ch: 3});
-  eqPos(m2Pos.from, {line: 0, ch: 0}); eqPos(m2Pos.to, {line: 2, ch: 1});
-  eqPos(bookmark.find(), {line: 1, ch: 5});
-}, {value: "1234\n56789\n00\n"});
-
 testCM("markClearBetween", function(cm) {
   cm.setValue("aaa\nbbb\nccc\nddd\n");
   cm.markText({line: 0, ch: 0}, {line: 2}, "foo");
@@ -351,7 +322,7 @@ testCM("scrollSnap", function(cm) {
   cm.setCursor({line: 100, ch: 180});
   cm.setCursor({line: 199, ch: 0});
   info = cm.getScrollInfo();
-  is(info.x == 0 && info.y > info.height - 100, "scrolled clean to bottom");
+  is(info.x == 0 && info.y == info.height - 100, "scrolled clean to bottom");
 });
 
 testCM("selectionPos", function(cm) {
@@ -386,7 +357,7 @@ testCM("selectionPos", function(cm) {
     }
   }
   is(sawTop && sawBottom && sawMiddle, "all parts");
-}, null, ie_lt8);
+});
 
 testCM("restoreHistory", function(cm) {
   cm.setValue("abc\ndef");
@@ -493,185 +464,4 @@ testCM("wrappingAndResizing", function(cm) {
     var coords = cm.charCoords(pos);
     eqPos(pos, cm.coordsChar({x: coords.x + 2, y: coords.y + 2}));
   });
-}, null, ie_lt8);
-
-testCM("measureEndOfLine", function(cm) {
-  cm.setSize(null, "auto");
-  var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
-  var w = 20, lh = inner.offsetHeight;
-  for (var step = 10;; w += step) {
-    cm.setSize(w);
-    if (inner.offsetHeight < 2.5 * lh) {
-      if (step == 10) { w -= 10; step = 1; }
-      else { break; }
-    }
-  }
-  cm.setValue(cm.getValue() + "\n\n");
-  var endPos = cm.charCoords({line: 0, ch: 18}, "local");
-  is(endPos.y > lh * .8, "not at top");
-  is(endPos.x > w - 20, "not at right");
-  endPos = cm.charCoords({line: 0, ch: 18});
-  eqPos(cm.coordsChar({x: endPos.x, y: endPos.y + 2}), {line: 0, ch: 18});
-}, {mode: "text/html", value: "<!-- foo barrr -->", lineWrapping: true}, ie_lt8);
-
-testCM("scrollVerticallyAndHorizontally", function(cm) {
-  cm.setSize(100, 100);
-  addDoc(cm, 40, 40);
-  cm.setCursor(39);
-  var wrap = cm.getWrapperElement(), bar = byClassName(wrap, "CodeMirror-scrollbar")[0];
-  is(bar.offsetHeight < wrap.offsetHeight, "vertical scrollbar limited by horizontal one");
-  var cursorBox = byClassName(wrap, "CodeMirror-cursor")[0].getBoundingClientRect();
-  var editorBox = wrap.getBoundingClientRect();
-  is(cursorBox.bottom < editorBox.top + cm.getScrollerElement().clientHeight,
-     "bottom line visible");
-}, {gutter: true});
-
-testCM("moveV stuck", function(cm) {
-  var lines = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild, h0 = lines.offsetHeight;
-  var val = "fooooooooooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar\n";
-  cm.setValue(val);
-  for (var w = 50;; w += 5) {
-    cm.setSize(w);
-    if (lines.offsetHeight <= 3 * h0) break;
-  }
-  cm.setCursor({line: 0, ch: val.length - 1});
-  cm.moveV(-1, "line");
-  eqPos(cm.getCursor(), {line: 0, ch: 26});
-}, {lineWrapping: true}, ie_lt8);
-
-testCM("clickTab", function(cm) {
-  var p0 = cm.charCoords({line: 0, ch: 0}), p1 = cm.charCoords({line: 0, ch: 1});
-  eqPos(cm.coordsChar({x: p0.x + 5, y: p0.y + 5}), {line: 0, ch: 0});
-  eqPos(cm.coordsChar({x: p1.x - 5, y: p1.y + 5}), {line: 0, ch: 1});
-}, {value: "\t\n\n", lineWrapping: true, tabSize: 8});
-
-testCM("verticalScroll", function(cm) {
-  cm.setSize(100, 200);
-  cm.setValue("foo\nbar\nbaz\n");
-  var sc = cm.getScrollerElement(), baseWidth = sc.scrollWidth;
-  cm.setLine(0, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah");
-  is(sc.scrollWidth > baseWidth, "scrollbar present");
-  cm.setLine(0, "foo");
-  eq(sc.scrollWidth, baseWidth, "scrollbar gone");
-  cm.setLine(0, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah");
-  cm.setLine(1, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbh");
-  is(sc.scrollWidth > baseWidth, "present again");
-  var curWidth = sc.scrollWidth;
-  cm.setLine(0, "foo");
-  is(sc.scrollWidth < curWidth, "scrollbar smaller");
-  is(sc.scrollWidth > baseWidth, "but still present");
-});
-
-testCM("extraKeys", function(cm) {
-  var outcome;
-  function fakeKey(expected, code, props) {
-    if (typeof code == "string") code = code.charCodeAt(0);
-    var e = {type: "keydown", keyCode: code, preventDefault: function(){}, stopPropagation: function(){}};
-    if (props) for (var n in props) e[n] = props[n];
-    outcome = null;
-    cm.triggerOnKeyDown(e);
-    eq(outcome, expected);
-  }
-  CodeMirror.commands.testCommand = function() {outcome = "tc";};
-  CodeMirror.commands.goTestCommand = function() {outcome = "gtc";};
-  cm.setOption("extraKeys", {"Shift-X": function() {outcome = "sx";},
-                             "X": function() {outcome = "x";},
-                             "Ctrl-Alt-U": function() {outcome = "cau";},
-                             "End": "testCommand",
-                             "Home": "goTestCommand",
-                             "Tab": false});
-  fakeKey(null, "U");
-  fakeKey("cau", "U", {ctrlKey: true, altKey: true});
-  fakeKey(null, "U", {shiftKey: true, ctrlKey: true, altKey: true});
-  fakeKey("x", "X");
-  fakeKey("sx", "X", {shiftKey: true});
-  fakeKey("tc", 35);
-  fakeKey(null, 35, {shiftKey: true});
-  fakeKey("gtc", 36);
-  fakeKey("gtc", 36, {shiftKey: true});
-  fakeKey(null, 9);
 });
-
-testCM("wordMovementCommands", function(cm) {
-  cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), {line: 0, ch: 0});
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), {line: 0, ch: 7});
-  cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), {line: 0, ch: 5});
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), {line: 0, ch: 12});
-  cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), {line: 0, ch: 9});
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), {line: 1, ch: 1});
-  cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), {line: 1, ch: 9});
-  cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), {line: 1, ch: 13});
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), {line: 2, ch: 0});
-}, {value: "this is (the) firstline.\na foo12\u00e9\u00f8\u00d7bar\n"});
-
-testCM("charMovementCommands", function(cm) {
-  cm.execCommand("goCharLeft"); cm.execCommand("goColumnLeft");
-  eqPos(cm.getCursor(), {line: 0, ch: 0});
-  cm.execCommand("goCharRight"); cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), {line: 0, ch: 2});
-  cm.setCursor({line: 1, ch: 0});
-  cm.execCommand("goColumnLeft");
-  eqPos(cm.getCursor(), {line: 1, ch: 0});
-  cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), {line: 0, ch: 5});
-  cm.execCommand("goColumnRight");
-  eqPos(cm.getCursor(), {line: 0, ch: 5});
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), {line: 1, ch: 0});
-  cm.execCommand("goLineEnd");
-  eqPos(cm.getCursor(), {line: 1, ch: 5});
-  cm.execCommand("goLineStartSmart");
-  eqPos(cm.getCursor(), {line: 1, ch: 1});
-  cm.execCommand("goLineStartSmart");
-  eqPos(cm.getCursor(), {line: 1, ch: 0});
-  cm.setCursor({line: 2, ch: 0});
-  cm.execCommand("goCharRight"); cm.execCommand("goColumnRight");
-  eqPos(cm.getCursor(), {line: 2, ch: 0});
-}, {value: "line1\n ine2\n"});
-
-testCM("verticalMovementCommands", function(cm) {
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), {line: 0, ch: 0});
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), {line: 1, ch: 0});
-  cm.setCursor({line: 1, ch: 12});
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), {line: 2, ch: 5});
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), {line: 3, ch: 0});
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), {line: 2, ch: 5});
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), {line: 1, ch: 12});
-  cm.execCommand("goPageDown");
-  eqPos(cm.getCursor(), {line: 5, ch: 0});
-  cm.execCommand("goPageDown"); cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), {line: 5, ch: 0});
-  cm.execCommand("goPageUp");
-  eqPos(cm.getCursor(), {line: 0, ch: 0});
-}, {value: "line1\nlong long line2\nline3\n\nline5\n"});
-
-testCM("verticalMovementCommandsWrapping", function(cm) {
-  cm.setSize(120);
-  cm.setCursor({line: 0, ch: 5});
-  cm.execCommand("goLineDown");
-  eq(cm.getCursor().line, 0);
-  is(cm.getCursor().ch > 5, "moved beyond wrap");
-  for (var i = 0; ; ++i) {
-    is(i < 20, "no endless loop");
-    cm.execCommand("goLineDown");
-    var cur = cm.getCursor();
-    if (cur.line == 1) eq(cur.ch, 5);
-    if (cur.line == 2) { eq(cur.ch, 1); break; }
-  }
-}, {value: "a very long line that wraps around somehow so that we can test cursor movement\nshortone\nk",
-    lineWrapping: true});

From 64c2ff3a7082d6042b2e0df0263fbef449341c60 Mon Sep 17 00:00:00 2001
From: Roffis Baetz <speed9dev@gmail.com>
Date: Wed, 17 Oct 2012 20:16:38 -0500
Subject: [PATCH 93/93] Update README.md

---
 README.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8ed9871a46..0dced3c6e3 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,13 @@
-# CodeMirror [![Build Status](https://secure.travis-ci.org/marijnh/CodeMirror.png?branch=master)](http://travis-ci.org/marijnh/CodeMirror)
+# CoderFAV
 
-CodeMirror is a JavaScript component that provides a code editor in
-the browser. When a mode is available for the language you are coding
-in, it will color your code, and optionally help with indentation.
+The none stop awesome Coder editor for the web. I have been working with Dart and
+wanted to build an editor for it. This isn't quite finished but it also supports other Web languages like
+HTML, CSS, Javascript, and PHP. If you didn't notice it this project is based on Codemirror.  I will be keeping you updated. Look below for updates
 
-The project page is http://codemirror.net
-The manual is at http://codemirror.net/doc/manual.html
+The project page is http://rispity.net
+
+# Updates
+
+10/17/12 First Commit to Project
+
+10/17/12 Demo Server being set up