Merge branch 'master' of https://github.com/ajaxorg/ace

.gitignore

@@ -14,7 +14,6 @@
 # A handy place to put stuff that git should ignore:
 /ignore/
 support/async/
-support/dryice/
 support/jsdom/
 support/node-htmlparser/
 support/node-o3-xml/

.gitmodules

@@ -3,4 +3,10 @@
 	url = git://github.com/ajaxorg/cockpit.git
 [submodule "support/pilot"]
 	path = support/pilot
-	url = git://github.com/ajaxorg/pilot.git
+	url = git://github.com/ajaxorg/pilot.git
+[submodule "support/dryice"]
+	path = support/dryice
+	url = git://github.com/ajaxorg/dryice.git
+[submodule "doc/wiki"]
+	path = doc/wiki
+	url = git://github.com/ajaxorg/ace.wiki.git

ChangeLog.txt

@@ -1,8 +1,73 @@
+2011.08.02, Version 0.2.0
+
+* Split view (Julian Viereck)
+  - split editor area horizontally or vertivally to show two files at the same
+    time
+
+* Code Folding (Julian Viereck)
+  - Unstructured code folding
+  - Will be the basis for language aware folding
+
+* Mode behaviours (Chris Spencer)
+  - Adds mode specific hooks which allow transformations of entered text
+  - Autoclosing of braces, paranthesis and quotation marks in C style modes
+  - Autoclosing of angular brackets in XML style modes
+
+* New language modes
+  - Clojure (Carin Meier)
+  - C# (Rob Conery)
+  - Groovy (Ben Tilford)
+  - Scala (Ben Tilford)
+  - JSON
+  - OCaml (Sergi Mansilla)
+  - Perl (Panagiotis Astithas)
+  - SCSS/SASS (Andreas Madsen)
+  - SVG
+  - Textile (Kelley van Evert)
+  - SCAD (Jacob Hansson)
+  
+* Live syntax checks
+  - Lint for Css using CSS Lint <http://csslint.net/>
+  - CoffeeScript
+
+* New Themes
+  - Crimson Editor (iebuggy)
+  - Merbivore (Michael Schwartz)
+  - Merbivore soft (Michael Schwartz)
+  - Solarized dark/light <http://ethanschoonover.com/solarized> (David Alan
+    Hjelle)
+  - Vibrant Ink (Michael Schwartz)
+
+* Small Features/Enhancements
+  - Lots of render performance optimizations (Harutyun Amirjanyan)
+  - Improved Ruby highlighting (Chris Wanstrath, Trent Ogren)
+  - Improved PHP highlighting (Thomas Hruska)
+  - Improved CSS highlighting (Sean Kellogg)
+  - Clicks which cause the editor to be focused don't reset the selection
+  - Make padding text layer specific so that print margin and active line
+    highlight are not affected (Irakli Gozalishvili)
+  - Added setFontSize method
+  - Improved vi keybindings (Trent Ogren)
+  - When unfocused make cursor transparent instead of removing it (Harutyun
+    Amirjanyan)
+  - Support for matching groups in tokenizer with arrays of tokens (Chris
+    Spencer)
+
+* Bug fixes
+  - Add support for the new OSX scroll bars
+  - Properly highlight JavaScript regexp literals
+  - Proper handling of unicode characters in JavaScript identifiers
+  - Fix remove lines command on last line (Harutyun Amirjanyan)
+  - Fix scroll wheel sluggishness in Safari
+  - Make keyboard infrastructure route keys like []^$ the right way (Julian
+    Viereck)
+
 2011.02.14, Version 0.1.6
 
 * Floating Anchors
   - An Anchor is a floating pointer in the document. 
-  - Whenever text is inserted or deleted before the cursor, the position of the cursor is updated
+  - Whenever text is inserted or deleted before the cursor, the position of
+    the cursor is updated
   - Usesd for the cursor and selection
   - Basis for bookmarks, multiple cursors and snippets in the future
 * Extensive support for Cocoa style keybindings on the Mac <https://github.com/ajaxorg/ace/issues/closed#issue/116/comment/767803>
@@ -16,7 +81,8 @@
   - Markers can be in front or behind the text
   - Markers are now stored in the session (was in the renderer)
 * Lots of IE8 fixes including copy, cut and selections
-* Unit tests can also be run in the browser <https://github.com/ajaxorg/ace/blob/master/lib/ace/test/tests.html>
+* Unit tests can also be run in the browser
+  <https://github.com/ajaxorg/ace/blob/master/lib/ace/test/tests.html>
 * Soft wrap can adapt to the width of the editor (Mike Ratcliffe, Joe Cheng)
 * Add minimal node server server.js to run the Ace demo in Chrome
 * The top level editor.html demo has been renamed to index.html

Makefile

@@ -1,6 +1,11 @@
 build:
 	mkdir -p build/src
+	mkdir -p build/demo
 	mkdir -p build/textarea/src
+	
+	cp demo/styles.css build/demo/styles.css
+	cp demo/logo.png build/demo/logo.png
+	
 	./Makefile.dryice.js normal
 	./Makefile.dryice.js bm
 

Makefile.dryice.js

@@ -72,7 +72,7 @@ if (!target) {
 
 console.log("using targetDir '", targetDir, "'");
 
-var copy = require('dryice').copy;
+var copy = require('./support/dryice/lib/dryice').copy;
 
 var aceHome = __dirname;
 
@@ -80,7 +80,9 @@ console.log('# ace ---------');
 
 var aceProject = [
     aceHome + '/support/pilot/lib',
-    aceHome + '/lib'
+    aceHome + '/support/cockpit/lib',
+    aceHome + '/lib',
+    aceHome
 ];
 
 if (target == "normal") {
@@ -90,6 +92,8 @@ if (target == "normal") {
         source: "build_support/editor.html",
         dest:   targetDir + '/editor.html'
     });
+    
+    demo();
 } else if(target == "bm") {
     copy({
         source: "build_support/editor_textarea.html",
@@ -201,7 +205,8 @@ console.log('# ace modes ---------');
 project.assumeAllFilesLoaded();
 [
     "css", "html", "javascript", "php", "python", "xml", "ruby", "java", "c_cpp",
-    "coffee", "perl", "csharp", "svg", "clojure", "scss", "json"
+    "coffee", "perl", "csharp", "svg", "clojure", "scss", "json", "groovy",
+    "ocaml", "scala", "textile", "scad"
 ].forEach(function(mode) {
     console.log("mode " + mode);
     copy({
@@ -219,9 +224,10 @@ project.assumeAllFilesLoaded();
 console.log('# ace themes ---------');
 
 [
-    "clouds", "clouds_midnight", "cobalt", "dawn", "idle_fingers", "kr_theme",
-    "mono_industrial", "monokai", "pastel_on_dark", "twilight", "eclipse",
-    "merbivore", "merbivore_soft", "vibrant_ink"
+    "clouds", "clouds_midnight", "cobalt", "crimson_editor", "dawn", "eclipse",
+    "idle_fingers", "kr_theme", "merbivore", "merbivore_soft",
+    "mono_industrial", "monokai", "pastel_on_dark", "solarized_dark",
+    "solarized_light", "textmate", "twilight", "vibrant_ink"
 ].forEach(function(theme) {
     copy({
         source: [{
@@ -307,7 +313,6 @@ project.assumeAllFilesLoaded();
 console.log('# cockpit ---------');
 
 project.assumeAllFilesLoaded();
-project.addRoot(aceHome + '/support/cockpit/lib');
 
 var cockpit = copy.createDataObject();
 copy({
@@ -350,42 +355,65 @@ copy({
     dest: 'build/src/cockpit-uncompressed.js'
 });
 
-// copy complex demo
-//copy({
-//    source: aceHome + "/editor.html",
-//    filter: [ function(data) {
-//        var includes = [
-//            "ace", "cockpit",
-//            "keybinding-vim", "keybinding-emacs",
-//            "mode-javascript", "mode-css", "mode-html", "mode-php", "mode-python",
-//            "mode-xml",
-//            "theme-clouds", "theme-clouds_midnight", "theme-cobalt",
-//            "theme-dawn", "theme-idle_fingers", "theme-kr_theme",
-//            "theme-mono_industrial", "theme-monokai", "theme-pastel_on_dark",
-//            "theme-twilight"
-//        ].map(function(module) {
-//            return '<script src="src/' + module + '.js" type="text/javascript"></script>';
-//        }).join("\n");
-//        return (
-//            data.replace('<script src="demo/require.js" type="text/javascript" charset="utf-8"></script>', includes)
-//                .replace('<script src="demo/boot.js" type="text/javascript"></script>', '<script src="demo/demo.js" type="text/javascript"></script>\n<script>require("demo").launch()</script>')
-//        )
-//    } ],
-//    dest: "build/editor-demo.html"
-//});
-//copy({
-//    source: [{
-//        root: aceHome + '/demo',
-//        include: "demo.js"
-//    }],
-//    filter: [ copy.filter.moduleDefines ],
-//    dest: "build/demo/demo.js"
-//});
-//copy({
-//    source: aceHome + '/demo/styles.css',
-//    dest: "build/demo/styles.css"
-//});
-//copy({
-//    source: aceHome + '/demo/logo.png',
-//    dest: "build/demo/logo.png"
-//});
+function demo() {
+    console.log('# kitchen sink ---------');
+
+    copy({
+        source: "kitchen-sink.html",
+        dest:   "build/kitchen-sink.html",
+        filter: [ function(data) {
+            return (data
+                .replace("DEVEL-->", "")
+                .replace("<!--DEVEL", "")
+                .replace("PACKAGE-->", "")
+                .replace("<!--PACKAGE", ""));
+        }]
+    });
+
+    var project = copy.createCommonJsProject(aceProject);
+    var demo = copy.createDataObject();
+    copy({
+        source: [
+            'build_support/mini_require.js'
+        ],
+        dest: demo
+    });
+    copy({
+        source: [
+            copy.source.commonjs({
+                project: project,
+                require: [ "cockpit/index", "pilot/index", "ace/defaults", "demo/boot" ]
+            })
+        ],
+        filter: [ copy.filter.moduleDefines ],
+        dest: demo
+    });
+    copy({
+        source: {
+            root: project,
+            include: /.*\.css$/,
+            exclude: /tests?\//
+        },
+        filter: [ copy.filter.addDefines ],
+        dest: demo
+    });
+    copy({
+        source: {
+            root: aceHome + '/support/cockpit/lib',
+            include: /.*\.css$|.*\.html$/,
+            exclude: /tests?\//
+        },
+        filter: [ copy.filter.addDefines ],
+        dest: demo
+    });
+
+    copy({
+        source: demo,
+        filter: copy.filter.uglifyjs,
+        dest: 'build/demo/kitchen-sink.js'
+    });
+    copy({
+        source: demo,
+        dest: 'build/demo/kitchen-sink-uncompressed.js'
+    });
+}

Readme.md

@@ -108,9 +108,9 @@ The editor can then be opened at http://localhost:8888/index.html.
 Package Ace
 -----------
 
-To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. To install dryice and all its dependencies simply call:
+To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. Before you can build you need to make sure that the submodules are up to date.
 
-    npm link .
+    git submodule update --init --recursive
 
 Afterwards Ace can be built by calling
 

build/ChangeLog.txt

@@ -1,8 +1,73 @@
+2011.08.02, Version 0.2.0
+
+* Split view (Julian Viereck)
+  - split editor area horizontally or vertivally to show two files at the same
+    time
+
+* Code Folding (Julian Viereck)
+  - Unstructured code folding
+  - Will be the basis for language aware folding
+
+* Mode behaviours (Chris Spencer)
+  - Adds mode specific hooks which allow transformations of entered text
+  - Autoclosing of braces, paranthesis and quotation marks in C style modes
+  - Autoclosing of angular brackets in XML style modes
+
+* New language modes
+  - Clojure (Carin Meier)
+  - C# (Rob Conery)
+  - Groovy (Ben Tilford)
+  - Scala (Ben Tilford)
+  - JSON
+  - OCaml (Sergi Mansilla)
+  - Perl (Panagiotis Astithas)
+  - SCSS/SASS (Andreas Madsen)
+  - SVG
+  - Textile (Kelley van Evert)
+  - SCAD (Jacob Hansson)
+  
+* Live syntax checks
+  - Lint for Css using CSS Lint <http://csslint.net/>
+  - CoffeeScript
+
+* New Themes
+  - Crimson Editor (iebuggy)
+  - Merbivore (Michael Schwartz)
+  - Merbivore soft (Michael Schwartz)
+  - Solarized dark/light <http://ethanschoonover.com/solarized> (David Alan
+    Hjelle)
+  - Vibrant Ink (Michael Schwartz)
+
+* Small Features/Enhancements
+  - Lots of render performance optimizations (Harutyun Amirjanyan)
+  - Improved Ruby highlighting (Chris Wanstrath, Trent Ogren)
+  - Improved PHP highlighting (Thomas Hruska)
+  - Improved CSS highlighting (Sean Kellogg)
+  - Clicks which cause the editor to be focused don't reset the selection
+  - Make padding text layer specific so that print margin and active line
+    highlight are not affected (Irakli Gozalishvili)
+  - Added setFontSize method
+  - Improved vi keybindings (Trent Ogren)
+  - When unfocused make cursor transparent instead of removing it (Harutyun
+    Amirjanyan)
+  - Support for matching groups in tokenizer with arrays of tokens (Chris
+    Spencer)
+
+* Bug fixes
+  - Add support for the new OSX scroll bars
+  - Properly highlight JavaScript regexp literals
+  - Proper handling of unicode characters in JavaScript identifiers
+  - Fix remove lines command on last line (Harutyun Amirjanyan)
+  - Fix scroll wheel sluggishness in Safari
+  - Make keyboard infrastructure route keys like []^$ the right way (Julian
+    Viereck)
+
 2011.02.14, Version 0.1.6
 
 * Floating Anchors
   - An Anchor is a floating pointer in the document. 
-  - Whenever text is inserted or deleted before the cursor, the position of the cursor is updated
+  - Whenever text is inserted or deleted before the cursor, the position of
+    the cursor is updated
   - Usesd for the cursor and selection
   - Basis for bookmarks, multiple cursors and snippets in the future
 * Extensive support for Cocoa style keybindings on the Mac <https://github.com/ajaxorg/ace/issues/closed#issue/116/comment/767803>
@@ -16,7 +81,8 @@
   - Markers can be in front or behind the text
   - Markers are now stored in the session (was in the renderer)
 * Lots of IE8 fixes including copy, cut and selections
-* Unit tests can also be run in the browser <https://github.com/ajaxorg/ace/blob/master/lib/ace/test/tests.html>
+* Unit tests can also be run in the browser
+  <https://github.com/ajaxorg/ace/blob/master/lib/ace/test/tests.html>
 * Soft wrap can adapt to the width of the editor (Mike Ratcliffe, Joe Cheng)
 * Add minimal node server server.js to run the Ace demo in Chrome
 * The top level editor.html demo has been renamed to index.html

build/Readme.md

@@ -108,9 +108,9 @@ The editor can then be opened at http://localhost:8888/index.html.
 Package Ace
 -----------
 
-To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. To install dryice and all its dependencies simply call:
+To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. Before you can build you need to make sure that the submodules are up to date.
 
-    npm link .
+    git submodule update --init --recursive
 
 Afterwards Ace can be built by calling
 

build/demo/styles.css

@@ -0,0 +1,64 @@
+html {
+    height: 100%;
+    width: 100%;
+    overflow: hidden;
+}
+
+body {
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    width: 100%;
+    font-family: Arial, Helvetica, sans-serif, Tahoma, Verdana, sans-serif;
+    font-size: 12px;
+    background: rgb(14, 98, 165);
+    color: white;
+}
+
+#logo {
+    padding: 15px;
+    margin-left: 65px;
+}
+
+#editor {
+    position: absolute;
+    top:  0px;
+    left: 280px;
+    bottom: 0px;
+    right: 0px;
+    background: white;
+}
+
+#controls {
+    padding: 5px;
+}
+
+#controls td {
+    text-align: right;
+}
+
+#controls td + td {
+    text-align: left;
+}
+
+#cockpitInput {
+    position: absolute;
+    left: 280px;
+    right: 0px;
+    bottom: 0;
+
+    border: none; outline: none;
+    font-family: consolas, courier, monospace;
+    font-size: 120%;
+}
+
+#cockpitOutput {
+    padding: 10px;
+    margin: 0 15px;
+    border: 1px solid #AAA;
+    -moz-border-radius-topleft: 10px;
+    -moz-border-radius-topright: 10px;
+    border-top-left-radius: 4px; border-top-right-radius: 4px;
+    background: #DDD; color: #000;
+}

build/kitchen-sink.html

@@ -0,0 +1,710 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+   "http://www.w3.org/TR/html4/strict.dtd">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Ace Kitchen Sink</title>
+    <meta name="author" content="Fabian Jakobs">
+    <link rel="stylesheet" href="demo/styles.css" type="text/css" media="screen" charset="utf-8">
+</head>
+<body>
+  <img id="logo" src="demo/logo.png">
+  <table id="controls">
+    <tr>
+      <td>
+        <label for="doc">Document</label>
+      </td><td>
+        <select id="doc" size="1">
+          <option value="js">JavaScript</option>
+          <option value="plain">Plain Text</option>
+          <option value="svg">SVG</option>
+          <option value="html">HTML</option>
+          <option value="css">CSS</option>
+          <option value="scss">SCSS</option>
+          <option value="coffee">CoffeeScript</option>
+          <option value="json">JSON</option>
+          <option value="python">Python</option>
+          <option value="ruby">Ruby</option>
+          <option value="perl">Perl</option>
+          <option value="php">PHP</option>
+          <option value="java">Java</option>
+          <option value="csharp">C#</option>
+          <option value="c_cpp">C++</option>
+          <option value="clojure">Clojure</option>
+          <option value="ocaml">OCaml</option>
+          <option value="textile">Textile</option>
+          <option value="groovy">Groovy</option>
+          <option value="scala">Scala</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="mode">Mode</label>
+      </td><td>
+        <select id="mode" size="1">
+          <option value="text">Plain Text</option>
+          <option value="javascript">JavaScript</option>
+          <option value="xml">XML</option>
+          <option value="html">HTML</option>
+          <option value="css">CSS</option>
+          <option value="scss">SCSS</option>
+          <option value="python">Python</option>
+          <option value="php">PHP</option>
+          <option value="java">Java</option>
+          <option value="ruby">Ruby</option>
+          <option value="c_cpp">C/C++</option>
+          <option value="coffee">CoffeeScript</option>
+          <option value="json">JSON</option>
+          <option value="perl">Perl</option>
+          <option value="clojure">Clojure</option>
+          <option value="ocaml">OCaml</option>
+          <option value="csharp">C#</option>
+          <option value="svg">SVG</option>
+          <option value="textile">Textile</option>
+          <option value="groovy">Groovy</option>
+          <option value="scala">Scala</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <label for="split">Split</label>
+      </td><td>
+        <select id="split" size="1">
+          <option value="none">None</option>
+          <option value="below">Below</option>
+          <option value="beside">Beside</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="theme">Theme</label>
+      </td><td>
+        <select id="theme" size="1">
+          <option value="ace/theme/clouds">Clouds</option>
+          <option value="ace/theme/clouds_midnight">Clouds Midnight</option>
+          <option value="ace/theme/cobalt">Cobalt</option>
+          <option value="ace/theme/crimson_editor">Crimson Editor</option>
+          <option value="ace/theme/dawn">Dawn</option>
+          <option value="ace/theme/eclipse">Eclipse</option>
+          <option value="ace/theme/idle_fingers">idleFingers</option>
+          <option value="ace/theme/kr_theme">krTheme</option>
+          <option value="ace/theme/merbivore">Merbivore</option>
+          <option value="ace/theme/merbivore_soft">Merbivore Soft</option>
+          <option value="ace/theme/mono_industrial">Mono Industrial</option>
+          <option value="ace/theme/monokai">Monokai</option>
+          <option value="ace/theme/pastel_on_dark">Pastel on dark</option>
+          <option value="ace/theme/solarized_dark">Solarized Dark</option>
+          <option value="ace/theme/solarized_light">Solarized Light</option>
+          <option value="ace/theme/textmate" selected="selected">TextMate</option>
+          <option value="ace/theme/twilight">Twilight</option>
+          <option value="ace/theme/vibrant_ink">Vibrant Ink</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="fontsize">Font Size</label>
+      </td><td>
+        <select id="fontsize" size="1">
+          <option value="10px">10px</option>
+          <option value="11px">11px</option>
+          <option value="12px" selected="selected">12px</option>
+          <option value="14px">14px</option>
+          <option value="16px">16px</option>
+          <option value="20px">20px</option>
+          <option value="24px">24px</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="select_style">Full Line Selection</label>
+      </td><td>
+        <input type="checkbox" name="select_style" id="select_style" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="highlight_active">Highlight Active Line</label>
+      </td><td>
+        <input type="checkbox" name="highlight_active" id="highlight_active" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_hidden">Show Invisibles</label>
+      </td><td>
+        <input type="checkbox" name="show_hidden" id="show_hidden" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_hscroll">Persistent HScroll</label>
+      </td><td>
+        <input type="checkbox" name="show_hscroll" id="show_hscroll">
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="keybinding">Key Binding</label>
+      </td><td>
+        <select id="keybinding" size="1">
+          <option value="ace">Ace</option>
+          <option value="vim">Vim</option>
+          <option value="emacs">Emacs</option>
+          <option value="custom">Custom</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="soft_wrap">Soft Wrap</label>
+      </td><td>
+        <select id="soft_wrap" size="1">
+          <option value="off">Off</option>
+          <option value="40">40 Chars</option>
+          <option value="80">80 Chars</option>
+          <option value="free">Free</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_gutter">Show Gutter</label>
+      </td><td>
+        <input type="checkbox" id="show_gutter" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_print_margin">Show Print Margin</label>
+      </td><td>
+        <input type="checkbox" id="show_print_margin" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="soft_tab">Use Soft Tab</label>
+      </td><td>
+        <input type="checkbox" id="soft_tab" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="highlight_selected_word">Highlight selected word</label>
+      </td>
+      <td>
+        <input type="checkbox" id="highlight_selected_word" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="enable_behaviours">Enable Behaviours</label>
+      </td>
+      <td>
+        <input type="checkbox" id="enable_behaviours">
+      </td>
+    </tr>
+    </table>
+
+    <div id="editor">
+    </div>
+        <script type="text/editor" id="csharptext">public void HelloWorld() {
+   //Say Hello!
+   Console.WriteLine("Hello World");
+}</script>
+    <script type="text/editor" id="jstext">function foo(items) {
+    for (var i=0; i<items.length; i++) {
+        alert(items[i] + "juhu");
+    }	// Real Tab.
+}</script>
+
+    <script type="text/editor" id="csstext">.text-layer {
+    font-family: Monaco, "Courier New", monospace;
+    font-size: 12px;
+    cursor: text;
+}</script>
+
+    <script type="text/editor" id="scsstext">/* style.scss */
+
+#navbar {
+    $navbar-width: 800px;
+    $items: 5;
+    $navbar-color: #ce4dd6;
+
+    width: $navbar-width;
+    border-bottom: 2px solid $navbar-color;
+
+    li {
+        float: left;
+        width: $navbar-width/$items - 10px;
+
+        background-color: lighten($navbar-color, 20%);
+        &:hover {
+            background-color: lighten($navbar-color, 10%);
+        }
+    }
+}</script>
+
+    <script type="text/editor" id="htmltext"><html>
+<head>
+
+<style type="text/css">
+.text-layer {
+    font-family: Monaco, "Courier New", monospace;
+    font-size: 12px;
+    cursor: text;
+}
+</style>
+
+</head>
+<body>
+    <h1 style="color:red">Juhu Kinners</h1>
+</body>
+</html></script>
+
+    <script type="text/editor" id="javatext">public class InfiniteLoop {
+
+    /*
+     * This will cause the program to hang...
+     *
+     * Taken from:
+     * http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308/
+     */
+    public static void main(String[] args) {
+        double d = Double.parseDouble("2.2250738585072012e-308");
+
+        // unreachable code
+        System.out.println("Value: " + d);
+    }
+}</script>
+
+    <script type="text/editor" id="pythontext">#!/usr/local/bin/python
+
+import string, sys
+
+# If no arguments were given, print a helpful message
+if len(sys.argv)==1:
+    print 'Usage: celsius temp1 temp2 ...'
+    sys.exit(0)
+
+# Loop over the arguments
+for i in sys.argv[1:]:
+    try:
+        fahrenheit=float(string.atoi(i))
+    except string.atoi_error:
+        print repr(i), "not a numeric value"
+    else:
+        celsius=(fahrenheit-32)*5.0/9.0
+        print '%i\260F = %i\260C' % (int(fahrenheit), int(celsius+.5))</script>
+
+    <script type="text/editor" id="phptext"><?php
+
+function nfact($n) {
+  if ($n == 0) {
+    return 1;
+  }
+  else {
+    return $n * nfact($n - 1);
+  }
+}
+
+echo "\n\nPlease enter a whole number ... ";
+$num = trim(fgets(STDIN));
+
+// ===== PROCESS - Determing the factorial of the input number =====
+$output = "\n\nFactorial " . $num . " = " . nfact($num) . "\n\n";
+echo $output;
+
+?></script>
+
+  <script type="text/editor" id="plaintext">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
+</script>
+
+    <script type="text/editor" id="rubytext">#!/usr/bin/ruby
+
+# Program to find the factorial of a number
+def fact(n)
+    if n == 0
+        1
+    else
+        n * fact(n-1)
+    end
+end
+
+puts fact(ARGV[0].to_i)
+</script>
+
+<script type="text/editor" id="cpptext">// compound assignment operators
+
+#include <iostream>
+using namespace std;
+
+int main ()
+{
+    int a, b=3; /* foobar */
+    a = b;
+    a+=2; // equivalent to a=a+2
+    cout << a;
+    return 0;
+}
+</script>
+
+<script type="text/editor" id="coffeetext">#!/usr/bin/env coffee
+
+try
+    throw URIError decodeURI(0xC0ffee * 123456.7e-8 / .9)
+catch e
+    console.log 'qstring' + "qqstring" + '''
+        qdoc
+    ''' + """
+        qqdoc
+    """
+
+do ->
+    ###
+    herecomment
+    ###
+    re = /regex/imgy.test ///
+        heregex  # comment
+    ///imgy
+    this isnt: `just JavaScript`
+    undefined</script>
+
+<script type="text/editor" id="jsontext">{
+ "query": {
+  "count": 10,
+  "created": "2011-06-21T08:10:46Z",
+  "lang": "en-US",
+  "results": {
+   "photo": [
+    {
+     "farm": "6",
+     "id": "5855620975",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "f1f5e8515d",
+     "server": "5110",
+     "title": "7087 bandit cat"
+    },
+    {
+     "farm": "4",
+     "id": "5856170534",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "ff1efb2a6f",
+     "server": "3217",
+     "title": "6975 rusty cat"
+    },
+    {
+     "farm": "6",
+     "id": "5856172972",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "51249875@N03",
+     "secret": "6c6887347c",
+     "server": "5192",
+     "title": "watermarked-cats"
+    },
+    {
+     "farm": "6",
+     "id": "5856168328",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "0c1cfdf64c",
+     "server": "5078",
+     "title": "7020 mandy cat"
+    },
+    {
+     "farm": "3",
+     "id": "5856171774",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "7f5a3180ab",
+     "server": "2696",
+     "title": "7448 bobby cat"
+    }
+   ]
+  }
+ }
+}</script>
+
+<script type="text/editor" id="perltext">#!/usr/bin/perl
+use strict;
+use warnings;
+my $num_primes = 0;
+my @primes;
+
+# Put 2 as the first prime so we won't have an empty array
+$primes[$num_primes] = 2;
+$num_primes++;
+
+MAIN_LOOP:
+for my $number_to_check (3 .. 200)
+{
+    for my $p (0 .. ($num_primes-1))
+    {
+        if ($number_to_check % $primes[$p] == 0)
+        {
+            next MAIN_LOOP;
+        }
+    }
+
+    # If we reached this point it means $number_to_check is not
+    # divisable by any prime number that came before it.
+    $primes[$num_primes] = $number_to_check;
+    $num_primes++;
+}
+
+for my $p (0 .. ($num_primes-1))
+{
+    print $primes[$p], ", ";
+}
+print "\n";
+
+</script>
+
+<script type="text/editor" id="ocamltext">(*
+ * Example of early return implementation taken from
+ * http://ocaml.janestreet.com/?q=node/91
+ *)
+
+let with_return (type t) (f : _ -> t) =
+  let module M =
+     struct exception Return of t end
+  in
+  let return = { return = (fun x -> raise (M.Return x)); } in
+  try f return with M.Return x -> x
+
+
+(* Function that uses the 'early return' functionality provided by `with_return` *)
+let sum_until_first_negative list =
+  with_return (fun r ->
+    List.fold list ~init:0 ~f:(fun acc x ->
+      if x >= 0 then acc + x else r.return acc))
+</script>
+
+<script type="text/editor" id="clojuretext">(defn parting
+  "returns a String parting in a given language"
+  ([] (parting "World"))
+  ([name] (parting name "en"))
+  ([name language]
+    ; condp is similar to a case statement in other languages.
+    ; It is described in more detail later.
+    ; It is used here to take different actions based on whether the
+    ; parameter "language" is set to "en", "es" or something else.
+    (condp = language
+      "en" (str "Goodbye, " name)
+      "es" (str "Adios, " name)
+      (throw (IllegalArgumentException.
+        (str "unsupported language " language))))))
+
+(println (parting)) ; -> Goodbye, World
+(println (parting "Mark")) ; -> Goodbye, Mark
+(println (parting "Mark" "es")) ; -> Adios, Mark
+(println (parting "Mark", "xy")) ; -> java.lang.IllegalArgumentException: unsupported language xy</script>
+
+<script type="text/editor" id="svgtext"><svg
+  width="800" height="600"
+  xmlns="http://www.w3.org/2000/svg"
+  onload="StartAnimation(evt)">
+
+  <title>Test Tube Progress Bar</title>
+  <desc>Created for the Web Directions SVG competition</desc>
+
+  <script type="text/ecmascript"><![CDATA[
+    var timevalue = 0;
+    var timer_increment = 1;
+    var max_time = 100;
+    var hickory;
+    var dickory;
+    var dock;
+    var i;
+
+    function StartAnimation(evt) {
+        hickory  = evt.target.ownerDocument.getElementById("hickory");
+        dickory = evt.target.ownerDocument.getElementById("dickory");
+        dock = evt.target.ownerDocument.getElementById("dock");
+
+        ShowAndGrowElement();
+    }
+    function ShowAndGrowElement() {
+        timevalue = timevalue + timer_increment;
+        if (timevalue > max_time)
+            return;
+        // Scale the text string gradually until it is 20 times larger
+        scalefactor = (timevalue * 650) / max_time;
+
+        if (timevalue < 30) {
+            hickory.setAttribute("display", "");
+            hickory.setAttribute("transform", "translate(" + (600+scalefactor*3*-1 ) + ", -144 )");
+        }
+
+        if (timevalue > 30 && timevalue < 66) {
+            dickory.setAttribute("display", "");
+            dickory.setAttribute("transform", "translate(" + (-795+scalefactor*2) + ", 0 )");
+        }
+        if (timevalue > 66) {
+            dock.setAttribute("display", "");
+            dock.setAttribute("transform", "translate(" + (1450+scalefactor*2*-1) + ", 144 )");
+        }
+
+        // Call ShowAndGrowElement again <timer_increment> milliseconds later.
+        setTimeout("ShowAndGrowElement()", timer_increment)
+    }
+    window.ShowAndGrowElement = ShowAndGrowElement
+  ]]>&lt;/script>
+
+  <rect
+    fill="#2e3436"
+    fill-rule="nonzero"
+    stroke-width="3"
+    y="0"
+    x="0"
+    height="600"
+    width="800"
+    id="rect3590"/>
+
+    <text
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="50"
+       y="350"
+       id="hickory"
+       display="none">
+        Hickory,</text>
+    <text
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="50"
+       y="350"
+       id="dickory"
+       display="none">
+        dickory,</text>
+    <text
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="50"
+       y="350"
+       id="dock"
+       display="none">
+        dock!</text>
+</svg></script>
+<script type="text/editor" id="textiletext">h1. Textile document
+
+h2. Heading Two
+
+h3. A two-line
+    header
+
+h2. Another two-line
+header
+
+Paragraph:
+one, two,
+thee lines!
+
+p(classone two three). This is a paragraph with classes
+
+p(#id). (one with an id)
+
+p(one two three#my_id). ..classes + id
+
+* Unordered list
+** sublist
+* back again!
+** sublist again..
+
+# ordered
+
+bg. Blockquote!
+    This is a two-list blockquote..!
+
+</script>
+
+<script type="text/editor" id="groovy">
+//http://groovy.codehaus.org/Concurrency+with+Groovy
+import java.util.concurrent.atomic.AtomicInteger
+
+def counter = new AtomicInteger()
+
+synchronized out(message) {
+    println(message)
+}
+
+def th = Thread.start {
+    for( i in 1..8 ) {
+        sleep 30
+        out "thread loop $i"
+        counter.incrementAndGet()
+    }
+}
+
+for( j in 1..4 ) {
+    sleep 50
+    out "main loop $j"
+    counter.incrementAndGet()
+}
+
+th.join()
+
+assert counter.get() == 12
+</script>
+
+<script type="text/editor" id="scala">//http://www.scala-lang.org/node/227
+/* Defines a new method 'sort' for array objects */
+object implicits extends Application {
+  implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
+    new {
+      def sort(p: (A, A) => Boolean) = {
+        util.Sorting.stableSort(x, p); x
+      }
+    }
+  val x = Array(2, 3, 1, 4)
+  println("x = "+ x.sort((x: Int, y: Int) => x < y))
+}</script>
+  <input id="cockpitInput" type="text"/>
+
+<!-- 
+  <script type="text/javascript">
+      var require = {
+          paths: {
+              demo: "../demo",
+              ace: "../lib/ace",
+              cockpit: "../support/cockpit/lib/cockpit",
+              pilot: "../support/pilot/lib/pilot"
+          }
+      };
+  </script>
+  <script src="demo/require.js" data-main="demo/boot" type="text/javascript" charset="utf-8"></script>
+ -->
+  
+
+  <script src="demo/kitchen-sink.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" charset="utf-8">
+    require("demo/boot");
+  </script>
+
+
+</body>
+</html>

build/src/keybinding-emacs.js

@@ -1 +1 @@
-define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b!=0&&(c==""||c==String.fromCharCode(0)))return null;var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
+define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b==0||c!=""&&c!=String.fromCharCode(0)){var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})

build/src/keybinding-vim.js

@@ -1 +1 @@
-define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"i",then:"insertMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},{regex:["([0-9]*)","(k|up)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(j|down|enter)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(l|right)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(h|left)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{key:"shift-g",exec:"gotoend"},{key:"b",exec:"gotowordleft"},{key:"e",exec:"gotowordright"},{key:"x",exec:"del"},{key:"shift-x",exec:"backspace"},{key:"shift-d",exec:"removetolineend"},{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}]};b.Vim=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b!=0&&(c==""||c==String.fromCharCode(0)))return null;var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})
+define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){var d=a("ace/keyboard/state_handler").StateHandler,e=a("ace/keyboard/state_handler").matchCharacterOnly,f={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},{regex:["([0-9]*)","(k|up)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(j|down|enter)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(l|right)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["([0-9]*)","(h|left)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{key:"shift-g",exec:"gotoend"},{key:"b",exec:"gotowordleft"},{key:"e",exec:"gotowordright"},{key:"x",exec:"del"},{key:"shift-x",exec:"backspace"},{key:"shift-d",exec:"removetolineend"},{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(f)}),define("ace/keyboard/state_handler",["require","exports","module"],function(a,b,c){function e(a){this.keymapping=this.$buildKeymappingRegex(a)}var d=!1;e.prototype={$buildKeymappingRegex:function(a){for(state in a)this.$buildBindingsRegex(a[state]);return a},$buildBindingsRegex:function(a){a.forEach(function(a){a.key?a.key=new RegExp("^"+a.key+"$"):Array.isArray(a.regex)?(a.key=new RegExp("^"+a.regex[1]+"$"),a.regex=new RegExp(a.regex.join("")+"$")):a.regex&&(a.regex=new RegExp(a.regex+"$"))})},$composeBuffer:function(a,b,c){if(a.state==null||a.buffer==null)a.state="start",a.buffer="";var d=[];b&1&&d.push("ctrl"),b&8&&d.push("command"),b&2&&d.push("option"),b&4&&d.push("shift"),c&&d.push(c);var e=d.join("-"),f=a.buffer+e;b!=2&&(a.buffer=f);return{bufferToUse:f,symbolicName:e}},$find:function(a,b,c,e,f){var g={};this.keymapping[a.state].some(function(h){var i;if(h.key&&!h.key.test(c))return!1;if(h.regex&&!(i=h.regex.exec(b)))return!1;if(h.match&&!h.match(b,e,f,c))return!1;if(h.disallowMatches)for(var j=0;j<h.disallowMatches.length;j++)if(!!i[h.disallowMatches[j]])return!1;if(h.exec){g.command=h.exec;if(h.params){var k;g.args={},h.params.forEach(function(a){a.match!=null&&i!=null?k=i[a.match]||a.defaultValue:k=a.defaultValue,a.type==="number"&&(k=parseInt(k)),g.args[a.name]=k})}a.buffer=""}h.then&&(a.state=h.then,a.buffer=""),g.command==null&&(g.command="null"),d&&console.log("KeyboardStateMapper#find",h);return!0});if(g.command)return g;a.buffer="";return!1},handleKeyboard:function(a,b,c){if(b==0||c!=""&&c!=String.fromCharCode(0)){var e=this.$composeBuffer(a,b,c),f=e.bufferToUse,g=e.symbolicName;e=this.$find(a,f,g,b,c),d&&console.log("KeyboardStateMapper#match",f,g,e);return e}return null}},b.matchCharacterOnly=function(a,b,c,d){return b==0?!0:b==4&&c.length==1?!0:!1},b.StateHandler=e})

build/src/mode-python.js

@@ -1 +1 @@
-define("ace/mode/python",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/python_highlight_rules").PythonHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/python_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen",regex:"[\\[\\(\\{]"},{token:"rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){if(!/^\s+$/.test(a))return!1;return/^\s*\}/.test(b)},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);if(b)return b[1];return""}}).call(e.prototype),b.MatchingBraceOutdent=e})
+define("ace/mode/python",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/python_highlight_rules").PythonHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/python_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen",regex:"[\\[\\(\\{]"},{token:"rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})

build/src/mode-textile.js

@@ -0,0 +1 @@
+define("ace/mode/textile",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/textile_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/textile_highlight_rules").TextileHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return a=="intag"?c:""},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/textile_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"keyword",regex:"h1|h2|h3|h4|h5|h6|bq|p|bc|pre",next:"blocktag"},{token:"keyword",regex:"[\\*]+|[#]+"},{token:"text",regex:".+"}],blocktag:[{token:"keyword",regex:"\\. ",next:"start"},{token:"keyword",regex:"\\(",next:"blocktagproperties"}],blocktagproperties:[{token:"keyword",regex:"\\)",next:"blocktag"},{token:"string",regex:"[a-zA-Z0-9\\-_]+"},{token:"keyword",regex:"#"}]}};d.inherits(f,e),b.TextileHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})

build/src/theme-crimson_editor.js

@@ -0,0 +1 @@
+define("ace/theme/crimson_editor",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-crimson-editor .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-crimson-editor .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-crimson-editor .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-crimson-editor .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-crimson-editor .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-crimson-editor .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-crimson-editor .ace_text-layer {\n  cursor: text;\n  color: rgb(64, 64, 64);\n}\n\n.ace-crimson-editor .ace_cursor {\n  border-left: 2px solid black;\n}\n\n.ace-crimson-editor .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid black;\n}\n\n.ace-crimson-editor .ace_line .ace_invisible {\n  color: rgb(191, 191, 191);\n}\n\n.ace-crimson-editor .ace_line .ace_identifier {\n  color: black;\n}\n\n.ace-crimson-editor .ace_line .ace_keyword {\n  color: blue;\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_buildin {\n  color: rgb(88, 72, 246);\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_language {\n  color: rgb(255, 156, 0);\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_library {\n  color: rgb(6, 150, 14);\n}\n\n.ace-crimson-editor .ace_line .ace_invalid {\n  text-decoration: line-through;\n  color: rgb(224, 0, 0);\n}\n\n.ace-crimson-editor .ace_line .ace_fold {\n    background-color: #E4E4E4;\n    border-radius: 3px;\n}\n\n.ace-crimson-editor .ace_line .ace_support.ace_function {\n  color: rgb(192, 0, 0);\n}\n\n.ace-crimson-editor .ace_line .ace_support.ace_constant {\n  color: rgb(6, 150, 14);\n}\n\n.ace-crimson-editor .ace_line .ace_support.ace_type,\n.ace-crimson-editor .ace_line .ace_support.ace_class {\n  color: rgb(109, 121, 222);\n}\n\n.ace-crimson-editor .ace_line .ace_keyword.ace_operator {\n  color: rgb(49, 132, 149);\n}\n\n.ace-crimson-editor .ace_line .ace_string {\n  color: rgb(128, 0, 128);\n}\n\n.ace-crimson-editor .ace_line .ace_comment {\n  color: rgb(76, 136, 107);\n}\n\n.ace-crimson-editor .ace_line .ace_comment.ace_doc {\n  color: rgb(0, 102, 255);\n}\n\n.ace-crimson-editor .ace_line .ace_comment.ace_doc.ace_tag {\n  color: rgb(128, 159, 191);\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_numeric {\n  color: rgb(0, 0, 64);\n}\n\n.ace-crimson-editor .ace_line .ace_variable {\n  color: rgb(0, 64, 128);\n}\n\n.ace-crimson-editor .ace_line .ace_xml_pe {\n  color: rgb(104, 104, 91);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_selection {\n  background: rgb(181, 213, 255);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_step {\n  background: rgb(252, 255, 0);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_stack {\n  background: rgb(164, 229, 101);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgb(192, 192, 192);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_active_line {\n  background: rgb(232, 242, 254);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_selected_word {\n  background: rgb(250, 250, 255);\n  border: 1px solid rgb(200, 200, 250);\n}\n\n.ace-crimson-editor .ace_string.ace_regex {\n  color: rgb(192, 0, 192);\n}";d.importCssString(e),b.cssClass="ace-crimson-editor"})

build/src/theme-solarized_dark.js

@@ -0,0 +1 @@
+define("ace/theme/solarized_dark",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-solarized-dark .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-solarized-dark .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-solarized-dark .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-solarized-dark .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-solarized-dark .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-solarized-dark .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-solarized-dark .ace_scroller {\n  background-color: #002B36;\n}\n\n.ace-solarized-dark .ace_text-layer {\n  cursor: text;\n  color: #93A1A1;\n}\n\n.ace-solarized-dark .ace_cursor {\n  border-left: 2px solid #D30102;\n}\n\n.ace-solarized-dark .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid #D30102;\n}\n \n.ace-solarized-dark .ace_marker-layer .ace_selection {\n  background: #073642;\n}\n\n.ace-solarized-dark .ace_marker-layer .ace_step {\n  background: rgb(198, 219, 174);\n}\n\n.ace-solarized-dark .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-dark .ace_marker-layer .ace_active_line {\n  background: #073642;\n}\n\n       \n.ace-solarized-dark .ace_invisible {\n  color: rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-dark .ace_keyword {\n  color:#859900;\n}\n\n.ace-solarized-dark .ace_keyword.ace_operator {\n  \n}\n\n.ace-solarized-dark .ace_constant {\n  \n}\n\n.ace-solarized-dark .ace_constant.ace_language {\n  color:#B58900;\n}\n\n.ace-solarized-dark .ace_constant.ace_library {\n  \n}\n\n.ace-solarized-dark .ace_constant.ace_numeric {\n  color:#D33682;\n}\n\n.ace-solarized-dark .ace_invalid {\n  \n}\n\n.ace-solarized-dark .ace_invalid.ace_illegal {\n  \n}\n\n.ace-solarized-dark .ace_invalid.ace_deprecated {\n  \n}\n\n.ace-solarized-dark .ace_support {\n  \n}\n\n.ace-solarized-dark .ace_support.ace_function {\n  color:#268BD2;\n}\n\n.ace-solarized-dark .ace_function.ace_buildin {\n  \n}\n\n.ace-solarized-dark .ace_string {\n  color:#2AA198;\n}\n\n.ace-solarized-dark .ace_string.ace_regexp {\n  color:#D30102;\n}\n\n.ace-solarized-dark .ace_comment {\n  font-style:italic;\ncolor:#657B83;\n}\n\n.ace-solarized-dark .ace_comment.ace_doc {\n  \n}\n\n.ace-solarized-dark .ace_comment.ace_doc.ace_tag {\n  \n}\n\n.ace-solarized-dark .ace_variable {\n  \n}\n\n.ace-solarized-dark .ace_variable.ace_language {\n  color:#268BD2;\n}\n\n.ace-solarized-dark .ace_xml_pe {\n  \n}\n\n.ace-solarized-dark .ace_collab.ace_user1 {\n     \n}";d.importCssString(e),b.cssClass="ace-solarized-dark"})

build/src/theme-solarized_light.js

@@ -0,0 +1 @@
+define("ace/theme/solarized_light",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-solarized-light .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-solarized-light .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-solarized-light .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-solarized-light .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-solarized-light .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-solarized-light .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-solarized-light .ace_scroller {\n  background-color: #FDF6E3;\n}\n\n.ace-solarized-light .ace_text-layer {\n  cursor: text;\n  color: #586E75;\n}\n\n.ace-solarized-light .ace_cursor {\n  border-left: 2px solid #000000;\n}\n\n.ace-solarized-light .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid #000000;\n}\n \n.ace-solarized-light .ace_marker-layer .ace_selection {\n  background: #073642;\n}\n\n.ace-solarized-light .ace_marker-layer .ace_step {\n  background: rgb(198, 219, 174);\n}\n\n.ace-solarized-light .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-light .ace_marker-layer .ace_active_line {\n  background: #EEE8D5;\n}\n\n       \n.ace-solarized-light .ace_invisible {\n  color: rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-light .ace_keyword {\n  color:#859900;\n}\n\n.ace-solarized-light .ace_keyword.ace_operator {\n  \n}\n\n.ace-solarized-light .ace_constant {\n  \n}\n\n.ace-solarized-light .ace_constant.ace_language {\n  color:#B58900;\n}\n\n.ace-solarized-light .ace_constant.ace_library {\n  \n}\n\n.ace-solarized-light .ace_constant.ace_numeric {\n  color:#D33682;\n}\n\n.ace-solarized-light .ace_invalid {\n  \n}\n\n.ace-solarized-light .ace_invalid.ace_illegal {\n  \n}\n\n.ace-solarized-light .ace_invalid.ace_deprecated {\n  \n}\n\n.ace-solarized-light .ace_support {\n  \n}\n\n.ace-solarized-light .ace_support.ace_function {\n  color:#268BD2;\n}\n\n.ace-solarized-light .ace_function.ace_buildin {\n  \n}\n\n.ace-solarized-light .ace_string {\n  color:#2AA198;\n}\n\n.ace-solarized-light .ace_string.ace_regexp {\n  color:#D30102;\n}\n\n.ace-solarized-light .ace_comment {\n  color:#93A1A1;\n}\n\n.ace-solarized-light .ace_comment.ace_doc {\n  \n}\n\n.ace-solarized-light .ace_comment.ace_doc.ace_tag {\n  \n}\n\n.ace-solarized-light .ace_variable {\n  \n}\n\n.ace-solarized-light .ace_variable.ace_language {\n  color:#268BD2;\n}\n\n.ace-solarized-light .ace_xml_pe {\n  \n}\n\n.ace-solarized-light .ace_collab.ace_user1 {\n     \n}";d.importCssString(e),b.cssClass="ace-solarized-light"})

build/src/theme-textmate.js

@@ -0,0 +1 @@
+define("ace/theme/textmate",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-tm .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-tm .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-tm .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-tm .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-tm .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-tm .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-tm .ace_text-layer {\n  cursor: text;\n}\n\n.ace-tm .ace_cursor {\n  border-left: 2px solid black;\n}\n\n.ace-tm .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid black;\n}\n        \n.ace-tm .ace_line .ace_invisible {\n  color: rgb(191, 191, 191);\n}\n\n.ace-tm .ace_line .ace_keyword {\n  color: blue;\n}\n\n.ace-tm .ace_line .ace_constant.ace_buildin {\n  color: rgb(88, 72, 246);\n}\n\n.ace-tm .ace_line .ace_constant.ace_language {\n  color: rgb(88, 92, 246);\n}\n\n.ace-tm .ace_line .ace_constant.ace_library {\n  color: rgb(6, 150, 14);\n}\n\n.ace-tm .ace_line .ace_invalid {\n  background-color: rgb(153, 0, 0);\n  color: white;\n}\n\n.ace-tm .ace_line .ace_fold {\n    background-color: #E4E4E4;\n    border-radius: 3px;\n}\n\n.ace-tm .ace_line .ace_support.ace_function {\n  color: rgb(60, 76, 114);\n}\n\n.ace-tm .ace_line .ace_support.ace_constant {\n  color: rgb(6, 150, 14);\n}\n\n.ace-tm .ace_line .ace_support.ace_type,\n.ace-tm .ace_line .ace_support.ace_class {\n  color: rgb(109, 121, 222);\n}\n\n.ace-tm .ace_line .ace_keyword.ace_operator {\n  color: rgb(104, 118, 135);\n}\n\n.ace-tm .ace_line .ace_string {\n  color: rgb(3, 106, 7);\n}\n\n.ace-tm .ace_line .ace_comment {\n  color: rgb(76, 136, 107);\n}\n\n.ace-tm .ace_line .ace_comment.ace_doc {\n  color: rgb(0, 102, 255);\n}\n\n.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\n  color: rgb(128, 159, 191);\n}\n\n.ace-tm .ace_line .ace_constant.ace_numeric {\n  color: rgb(0, 0, 205);\n}\n\n.ace-tm .ace_line .ace_variable {\n  color: rgb(49, 132, 149);\n}\n\n.ace-tm .ace_line .ace_xml_pe {\n  color: rgb(104, 104, 91);\n}\n\n.ace-tm .ace_marker-layer .ace_selection {\n  background: rgb(181, 213, 255);\n}\n\n.ace-tm .ace_marker-layer .ace_step {\n  background: rgb(252, 255, 0);\n}\n\n.ace-tm .ace_marker-layer .ace_stack {\n  background: rgb(164, 229, 101);\n}\n\n.ace-tm .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgb(192, 192, 192);\n}\n\n.ace-tm .ace_marker-layer .ace_active_line {\n  background: rgba(0, 0, 0, 0.07);\n}\n\n.ace-tm .ace_marker-layer .ace_selected_word {\n  background: rgb(250, 250, 255);\n  border: 1px solid rgb(200, 200, 250);\n}\n\n.ace-tm .ace_string.ace_regex {\n  color: rgb(255, 0, 0)\n}";d.importCssString(e),b.cssClass="ace-tm"})

build/textarea/ChangeLog.txt

@@ -1,8 +1,73 @@
+2011.08.02, Version 0.2.0
+
+* Split view (Julian Viereck)
+  - split editor area horizontally or vertivally to show two files at the same
+    time
+
+* Code Folding (Julian Viereck)
+  - Unstructured code folding
+  - Will be the basis for language aware folding
+
+* Mode behaviours (Chris Spencer)
+  - Adds mode specific hooks which allow transformations of entered text
+  - Autoclosing of braces, paranthesis and quotation marks in C style modes
+  - Autoclosing of angular brackets in XML style modes
+
+* New language modes
+  - Clojure (Carin Meier)
+  - C# (Rob Conery)
+  - Groovy (Ben Tilford)
+  - Scala (Ben Tilford)
+  - JSON
+  - OCaml (Sergi Mansilla)
+  - Perl (Panagiotis Astithas)
+  - SCSS/SASS (Andreas Madsen)
+  - SVG
+  - Textile (Kelley van Evert)
+  - SCAD (Jacob Hansson)
+  
+* Live syntax checks
+  - Lint for Css using CSS Lint <http://csslint.net/>
+  - CoffeeScript
+
+* New Themes
+  - Crimson Editor (iebuggy)
+  - Merbivore (Michael Schwartz)
+  - Merbivore soft (Michael Schwartz)
+  - Solarized dark/light <http://ethanschoonover.com/solarized> (David Alan
+    Hjelle)
+  - Vibrant Ink (Michael Schwartz)
+
+* Small Features/Enhancements
+  - Lots of render performance optimizations (Harutyun Amirjanyan)
+  - Improved Ruby highlighting (Chris Wanstrath, Trent Ogren)
+  - Improved PHP highlighting (Thomas Hruska)
+  - Improved CSS highlighting (Sean Kellogg)
+  - Clicks which cause the editor to be focused don't reset the selection
+  - Make padding text layer specific so that print margin and active line
+    highlight are not affected (Irakli Gozalishvili)
+  - Added setFontSize method
+  - Improved vi keybindings (Trent Ogren)
+  - When unfocused make cursor transparent instead of removing it (Harutyun
+    Amirjanyan)
+  - Support for matching groups in tokenizer with arrays of tokens (Chris
+    Spencer)
+
+* Bug fixes
+  - Add support for the new OSX scroll bars
+  - Properly highlight JavaScript regexp literals
+  - Proper handling of unicode characters in JavaScript identifiers
+  - Fix remove lines command on last line (Harutyun Amirjanyan)
+  - Fix scroll wheel sluggishness in Safari
+  - Make keyboard infrastructure route keys like []^$ the right way (Julian
+    Viereck)
+
 2011.02.14, Version 0.1.6
 
 * Floating Anchors
   - An Anchor is a floating pointer in the document. 
-  - Whenever text is inserted or deleted before the cursor, the position of the cursor is updated
+  - Whenever text is inserted or deleted before the cursor, the position of
+    the cursor is updated
   - Usesd for the cursor and selection
   - Basis for bookmarks, multiple cursors and snippets in the future
 * Extensive support for Cocoa style keybindings on the Mac <https://github.com/ajaxorg/ace/issues/closed#issue/116/comment/767803>
@@ -16,7 +81,8 @@
   - Markers can be in front or behind the text
   - Markers are now stored in the session (was in the renderer)
 * Lots of IE8 fixes including copy, cut and selections
-* Unit tests can also be run in the browser <https://github.com/ajaxorg/ace/blob/master/lib/ace/test/tests.html>
+* Unit tests can also be run in the browser
+  <https://github.com/ajaxorg/ace/blob/master/lib/ace/test/tests.html>
 * Soft wrap can adapt to the width of the editor (Mike Ratcliffe, Joe Cheng)
 * Add minimal node server server.js to run the Ace demo in Chrome
 * The top level editor.html demo has been renamed to index.html

build/textarea/Readme.md

@@ -108,9 +108,9 @@ The editor can then be opened at http://localhost:8888/index.html.
 Package Ace
 -----------
 
-To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. To install dryice and all its dependencies simply call:
+To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. Before you can build you need to make sure that the submodules are up to date.
 
-    npm link .
+    git submodule update --init --recursive
 
 Afterwards Ace can be built by calling
 

build/textarea/src/mode-python.js

@@ -1 +1 @@
-__ace_shadowed__.define("ace/mode/python",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/python_highlight_rules").PythonHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),__ace_shadowed__.define("ace/mode/python_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen",regex:"[\\[\\(\\{]"},{token:"rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),__ace_shadowed__.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){if(!/^\s+$/.test(a))return!1;return/^\s*\}/.test(b)},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);if(b)return b[1];return""}}).call(e.prototype),b.MatchingBraceOutdent=e})
+__ace_shadowed__.define("ace/mode/python",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/python_highlight_rules").PythonHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[\:]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),__ace_shadowed__.define("ace/mode/python_highlight_rules",["require","exports","module","pilot/oop","pilot/lang","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("pilot/lang"),f=a("ace/mode/text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen",regex:"[\\[\\(\\{]"},{token:"rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),__ace_shadowed__.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})

build/textarea/src/mode-textile.js

@@ -0,0 +1 @@
+__ace_shadowed__.define("ace/mode/textile",["require","exports","module","pilot/oop","ace/mode/text","ace/tokenizer","ace/mode/textile_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/textile_highlight_rules").TextileHighlightRules,h=a("ace/mode/matching_brace_outdent").MatchingBraceOutdent,i=a("ace/range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return a=="intag"?c:""},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),__ace_shadowed__.define("ace/mode/textile_highlight_rules",["require","exports","module","pilot/oop","ace/mode/text_highlight_rules"],function(a,b,c){var d=a("pilot/oop"),e=a("ace/mode/text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"keyword",regex:"h1|h2|h3|h4|h5|h6|bq|p|bc|pre",next:"blocktag"},{token:"keyword",regex:"[\\*]+|[#]+"},{token:"text",regex:".+"}],blocktag:[{token:"keyword",regex:"\\. ",next:"start"},{token:"keyword",regex:"\\(",next:"blocktagproperties"}],blocktagproperties:[{token:"keyword",regex:"\\)",next:"blocktag"},{token:"string",regex:"[a-zA-Z0-9\\-_]+"},{token:"keyword",regex:"#"}]}};d.inherits(f,e),b.TextileHighlightRules=f}),__ace_shadowed__.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){var d=a("ace/range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})

build/textarea/src/theme-crimson_editor.js

@@ -0,0 +1 @@
+__ace_shadowed__.define("ace/theme/crimson_editor",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-crimson-editor .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-crimson-editor .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-crimson-editor .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-crimson-editor .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-crimson-editor .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-crimson-editor .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-crimson-editor .ace_text-layer {\n  cursor: text;\n  color: rgb(64, 64, 64);\n}\n\n.ace-crimson-editor .ace_cursor {\n  border-left: 2px solid black;\n}\n\n.ace-crimson-editor .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid black;\n}\n\n.ace-crimson-editor .ace_line .ace_invisible {\n  color: rgb(191, 191, 191);\n}\n\n.ace-crimson-editor .ace_line .ace_identifier {\n  color: black;\n}\n\n.ace-crimson-editor .ace_line .ace_keyword {\n  color: blue;\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_buildin {\n  color: rgb(88, 72, 246);\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_language {\n  color: rgb(255, 156, 0);\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_library {\n  color: rgb(6, 150, 14);\n}\n\n.ace-crimson-editor .ace_line .ace_invalid {\n  text-decoration: line-through;\n  color: rgb(224, 0, 0);\n}\n\n.ace-crimson-editor .ace_line .ace_fold {\n    background-color: #E4E4E4;\n    border-radius: 3px;\n}\n\n.ace-crimson-editor .ace_line .ace_support.ace_function {\n  color: rgb(192, 0, 0);\n}\n\n.ace-crimson-editor .ace_line .ace_support.ace_constant {\n  color: rgb(6, 150, 14);\n}\n\n.ace-crimson-editor .ace_line .ace_support.ace_type,\n.ace-crimson-editor .ace_line .ace_support.ace_class {\n  color: rgb(109, 121, 222);\n}\n\n.ace-crimson-editor .ace_line .ace_keyword.ace_operator {\n  color: rgb(49, 132, 149);\n}\n\n.ace-crimson-editor .ace_line .ace_string {\n  color: rgb(128, 0, 128);\n}\n\n.ace-crimson-editor .ace_line .ace_comment {\n  color: rgb(76, 136, 107);\n}\n\n.ace-crimson-editor .ace_line .ace_comment.ace_doc {\n  color: rgb(0, 102, 255);\n}\n\n.ace-crimson-editor .ace_line .ace_comment.ace_doc.ace_tag {\n  color: rgb(128, 159, 191);\n}\n\n.ace-crimson-editor .ace_line .ace_constant.ace_numeric {\n  color: rgb(0, 0, 64);\n}\n\n.ace-crimson-editor .ace_line .ace_variable {\n  color: rgb(0, 64, 128);\n}\n\n.ace-crimson-editor .ace_line .ace_xml_pe {\n  color: rgb(104, 104, 91);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_selection {\n  background: rgb(181, 213, 255);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_step {\n  background: rgb(252, 255, 0);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_stack {\n  background: rgb(164, 229, 101);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgb(192, 192, 192);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_active_line {\n  background: rgb(232, 242, 254);\n}\n\n.ace-crimson-editor .ace_marker-layer .ace_selected_word {\n  background: rgb(250, 250, 255);\n  border: 1px solid rgb(200, 200, 250);\n}\n\n.ace-crimson-editor .ace_string.ace_regex {\n  color: rgb(192, 0, 192);\n}";d.importCssString(e),b.cssClass="ace-crimson-editor"})

build/textarea/src/theme-solarized_dark.js

@@ -0,0 +1 @@
+__ace_shadowed__.define("ace/theme/solarized_dark",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-solarized-dark .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-solarized-dark .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-solarized-dark .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-solarized-dark .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-solarized-dark .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-solarized-dark .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-solarized-dark .ace_scroller {\n  background-color: #002B36;\n}\n\n.ace-solarized-dark .ace_text-layer {\n  cursor: text;\n  color: #93A1A1;\n}\n\n.ace-solarized-dark .ace_cursor {\n  border-left: 2px solid #D30102;\n}\n\n.ace-solarized-dark .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid #D30102;\n}\n \n.ace-solarized-dark .ace_marker-layer .ace_selection {\n  background: #073642;\n}\n\n.ace-solarized-dark .ace_marker-layer .ace_step {\n  background: rgb(198, 219, 174);\n}\n\n.ace-solarized-dark .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-dark .ace_marker-layer .ace_active_line {\n  background: #073642;\n}\n\n       \n.ace-solarized-dark .ace_invisible {\n  color: rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-dark .ace_keyword {\n  color:#859900;\n}\n\n.ace-solarized-dark .ace_keyword.ace_operator {\n  \n}\n\n.ace-solarized-dark .ace_constant {\n  \n}\n\n.ace-solarized-dark .ace_constant.ace_language {\n  color:#B58900;\n}\n\n.ace-solarized-dark .ace_constant.ace_library {\n  \n}\n\n.ace-solarized-dark .ace_constant.ace_numeric {\n  color:#D33682;\n}\n\n.ace-solarized-dark .ace_invalid {\n  \n}\n\n.ace-solarized-dark .ace_invalid.ace_illegal {\n  \n}\n\n.ace-solarized-dark .ace_invalid.ace_deprecated {\n  \n}\n\n.ace-solarized-dark .ace_support {\n  \n}\n\n.ace-solarized-dark .ace_support.ace_function {\n  color:#268BD2;\n}\n\n.ace-solarized-dark .ace_function.ace_buildin {\n  \n}\n\n.ace-solarized-dark .ace_string {\n  color:#2AA198;\n}\n\n.ace-solarized-dark .ace_string.ace_regexp {\n  color:#D30102;\n}\n\n.ace-solarized-dark .ace_comment {\n  font-style:italic;\ncolor:#657B83;\n}\n\n.ace-solarized-dark .ace_comment.ace_doc {\n  \n}\n\n.ace-solarized-dark .ace_comment.ace_doc.ace_tag {\n  \n}\n\n.ace-solarized-dark .ace_variable {\n  \n}\n\n.ace-solarized-dark .ace_variable.ace_language {\n  color:#268BD2;\n}\n\n.ace-solarized-dark .ace_xml_pe {\n  \n}\n\n.ace-solarized-dark .ace_collab.ace_user1 {\n     \n}";d.importCssString(e),b.cssClass="ace-solarized-dark"})

build/textarea/src/theme-solarized_light.js

@@ -0,0 +1 @@
+__ace_shadowed__.define("ace/theme/solarized_light",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-solarized-light .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-solarized-light .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-solarized-light .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-solarized-light .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-solarized-light .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-solarized-light .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-solarized-light .ace_scroller {\n  background-color: #FDF6E3;\n}\n\n.ace-solarized-light .ace_text-layer {\n  cursor: text;\n  color: #586E75;\n}\n\n.ace-solarized-light .ace_cursor {\n  border-left: 2px solid #000000;\n}\n\n.ace-solarized-light .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid #000000;\n}\n \n.ace-solarized-light .ace_marker-layer .ace_selection {\n  background: #073642;\n}\n\n.ace-solarized-light .ace_marker-layer .ace_step {\n  background: rgb(198, 219, 174);\n}\n\n.ace-solarized-light .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-light .ace_marker-layer .ace_active_line {\n  background: #EEE8D5;\n}\n\n       \n.ace-solarized-light .ace_invisible {\n  color: rgba(147, 161, 161, 0.50);\n}\n\n.ace-solarized-light .ace_keyword {\n  color:#859900;\n}\n\n.ace-solarized-light .ace_keyword.ace_operator {\n  \n}\n\n.ace-solarized-light .ace_constant {\n  \n}\n\n.ace-solarized-light .ace_constant.ace_language {\n  color:#B58900;\n}\n\n.ace-solarized-light .ace_constant.ace_library {\n  \n}\n\n.ace-solarized-light .ace_constant.ace_numeric {\n  color:#D33682;\n}\n\n.ace-solarized-light .ace_invalid {\n  \n}\n\n.ace-solarized-light .ace_invalid.ace_illegal {\n  \n}\n\n.ace-solarized-light .ace_invalid.ace_deprecated {\n  \n}\n\n.ace-solarized-light .ace_support {\n  \n}\n\n.ace-solarized-light .ace_support.ace_function {\n  color:#268BD2;\n}\n\n.ace-solarized-light .ace_function.ace_buildin {\n  \n}\n\n.ace-solarized-light .ace_string {\n  color:#2AA198;\n}\n\n.ace-solarized-light .ace_string.ace_regexp {\n  color:#D30102;\n}\n\n.ace-solarized-light .ace_comment {\n  color:#93A1A1;\n}\n\n.ace-solarized-light .ace_comment.ace_doc {\n  \n}\n\n.ace-solarized-light .ace_comment.ace_doc.ace_tag {\n  \n}\n\n.ace-solarized-light .ace_variable {\n  \n}\n\n.ace-solarized-light .ace_variable.ace_language {\n  color:#268BD2;\n}\n\n.ace-solarized-light .ace_xml_pe {\n  \n}\n\n.ace-solarized-light .ace_collab.ace_user1 {\n     \n}";d.importCssString(e),b.cssClass="ace-solarized-light"})

build/textarea/src/theme-textmate.js

@@ -0,0 +1 @@
+__ace_shadowed__.define("ace/theme/textmate",["require","exports","module"],function(a,b,c){var d=a("pilot/dom"),e=".ace-tm .ace_editor {\n  border: 2px solid rgb(159, 159, 159);\n}\n\n.ace-tm .ace_editor.ace_focus {\n  border: 2px solid #327fbd;\n}\n\n.ace-tm .ace_gutter {\n  width: 50px;\n  background: #e8e8e8;\n  color: #333;\n  overflow : hidden;\n}\n\n.ace-tm .ace_gutter-layer {\n  width: 100%;\n  text-align: right;\n}\n\n.ace-tm .ace_gutter-layer .ace_gutter-cell {\n  padding-right: 6px;\n}\n\n.ace-tm .ace_print_margin {\n  width: 1px;\n  background: #e8e8e8;\n}\n\n.ace-tm .ace_text-layer {\n  cursor: text;\n}\n\n.ace-tm .ace_cursor {\n  border-left: 2px solid black;\n}\n\n.ace-tm .ace_cursor.ace_overwrite {\n  border-left: 0px;\n  border-bottom: 1px solid black;\n}\n        \n.ace-tm .ace_line .ace_invisible {\n  color: rgb(191, 191, 191);\n}\n\n.ace-tm .ace_line .ace_keyword {\n  color: blue;\n}\n\n.ace-tm .ace_line .ace_constant.ace_buildin {\n  color: rgb(88, 72, 246);\n}\n\n.ace-tm .ace_line .ace_constant.ace_language {\n  color: rgb(88, 92, 246);\n}\n\n.ace-tm .ace_line .ace_constant.ace_library {\n  color: rgb(6, 150, 14);\n}\n\n.ace-tm .ace_line .ace_invalid {\n  background-color: rgb(153, 0, 0);\n  color: white;\n}\n\n.ace-tm .ace_line .ace_fold {\n    background-color: #E4E4E4;\n    border-radius: 3px;\n}\n\n.ace-tm .ace_line .ace_support.ace_function {\n  color: rgb(60, 76, 114);\n}\n\n.ace-tm .ace_line .ace_support.ace_constant {\n  color: rgb(6, 150, 14);\n}\n\n.ace-tm .ace_line .ace_support.ace_type,\n.ace-tm .ace_line .ace_support.ace_class {\n  color: rgb(109, 121, 222);\n}\n\n.ace-tm .ace_line .ace_keyword.ace_operator {\n  color: rgb(104, 118, 135);\n}\n\n.ace-tm .ace_line .ace_string {\n  color: rgb(3, 106, 7);\n}\n\n.ace-tm .ace_line .ace_comment {\n  color: rgb(76, 136, 107);\n}\n\n.ace-tm .ace_line .ace_comment.ace_doc {\n  color: rgb(0, 102, 255);\n}\n\n.ace-tm .ace_line .ace_comment.ace_doc.ace_tag {\n  color: rgb(128, 159, 191);\n}\n\n.ace-tm .ace_line .ace_constant.ace_numeric {\n  color: rgb(0, 0, 205);\n}\n\n.ace-tm .ace_line .ace_variable {\n  color: rgb(49, 132, 149);\n}\n\n.ace-tm .ace_line .ace_xml_pe {\n  color: rgb(104, 104, 91);\n}\n\n.ace-tm .ace_marker-layer .ace_selection {\n  background: rgb(181, 213, 255);\n}\n\n.ace-tm .ace_marker-layer .ace_step {\n  background: rgb(252, 255, 0);\n}\n\n.ace-tm .ace_marker-layer .ace_stack {\n  background: rgb(164, 229, 101);\n}\n\n.ace-tm .ace_marker-layer .ace_bracket {\n  margin: -1px 0 0 -1px;\n  border: 1px solid rgb(192, 192, 192);\n}\n\n.ace-tm .ace_marker-layer .ace_active_line {\n  background: rgba(0, 0, 0, 0.07);\n}\n\n.ace-tm .ace_marker-layer .ace_selected_word {\n  background: rgb(250, 250, 255);\n  border: 1px solid rgb(200, 200, 250);\n}\n\n.ace-tm .ace_string.ace_regex {\n  color: rgb(255, 0, 0)\n}";d.importCssString(e),b.cssClass="ace-tm"})

build_support/boot_textarea.js

@@ -410,34 +410,45 @@ function setupSettingPanel(settingDiv, settingOpener, api, options) {
         mode: {
             text:       "Plain",
             javascript: "JavaScript",
-            coffee:     "CoffeeScript",
+            xml:        "XML",
             html:       "HTML",
             css:        "CSS",
             scss:       "SCSS",
-            xml:        "XML",
-            svg:        "SVG",
-            c_cpp:      "C++",
-            csharp:     "C#",
-            java:       "Java",
-            php:        "PHP",
-            ruby:       "Ruby",
-            perl:       "Perl",
             python:     "Python",
-            clojure:    "Clojure"
+            php:        "PHP",
+            java:       "Java",
+            ruby:       "Ruby",
+            c_cpp:      "C/C++",
+            coffee:     "CoffeeScript",
+            json:       "json",
+            perl:       "Perl",
+            clojure:    "Clojure",
+            ocaml:      "OCaml",
+            csharp:     "C#",
+            svg:        "SVG",
+            textile:    "Textile",
+            groovy:     "Groovy",
+            Scala:      "Scala"
         },
         theme: {
-            textmate:         "Textmate",
-            eclipse:          "Eclipse",
             clouds:           "Clouds",
             clouds_midnight:  "Clouds Midnight",
             cobalt:           "Cobalt",
+            crimson_editor:   "Crimson Editor",
             dawn:             "Dawn",
+            eclipse:          "Eclipse",
             idle_fingers:     "Idle Fingers",
             kr_theme:         "Kr Theme",
+            merbivore:        "Merbivore",
+            merbivore_soft:   "Merbivore Soft",
             mono_industrial:  "Mono Industrial",
             monokai:          "Monokai",
             pastel_on_dark:   "Pastel On Dark",
-            twilight:         "Twilight"
+            solarized_dark:   "Solarized Dark",
+            solarized_light:  "Solarized Light",
+            textmate:         "Textmate",
+            twilight:         "Twilight",
+            vibrant_ink:      "Vibrant Ink"
         },
         gutter: BOOL,
         fontSize: {
@@ -456,7 +467,7 @@ function setupSettingPanel(settingDiv, settingOpener, api, options) {
         showPrintMargin:    BOOL,
         useSoftTabs:        BOOL,
         showInvisibles:     BOOL
-    }
+    };
 
     var table = [];
     table.push("<table><tr><th>Setting</th><th>Value</th></tr>");

demo/boot.js

@@ -35,25 +35,25 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-require({
-    paths: {
-        demo: "../demo",
-        ace: "../lib/ace",
-        cockpit: "../support/cockpit/lib/cockpit",
-        pilot: "../support/pilot/lib/pilot"
-    }
-});
+define(function(require, exports, module) {
 
-var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
-             "pilot/environment", "demo/demo" ];
+require("pilot/fixoldbrowsers");
+require("pilot/plugin_manager");
+require("pilot/settings");
+require("pilot/environment");
+require("demo/demo");
+
+require("pilot/index");
+require("cockpit/index");
+require("ace/defaults");
 
 var plugins = [ "pilot/index", "cockpit/index", "ace/defaults" ];
-require(deps, function() {
-    var catalog = require("pilot/plugin_manager").catalog;
-    catalog.registerPlugins(plugins).then(function() {
-        var env = require("pilot/environment").create();
-        catalog.startupPlugins({ env: env }).then(function() {
-            require("demo/demo").launch(env);
-        });
+var catalog = require("pilot/plugin_manager").catalog;
+catalog.registerPlugins(plugins).then(function() {
+    var env = require("pilot/environment").create();
+    catalog.startupPlugins({ env: env }).then(function() {
+        require("demo/demo").launch(env);
     });
+});
+
 });

demo/demo.js

@@ -84,7 +84,11 @@ exports.launch = function(env) {
       emacs: emacs,
       // This is a way to define simple keyboard remappings
       custom: new HashHandler({
-          "gotoright": "Tab"
+          "gotoright":      "Tab",
+          "indent":         "]",
+          "outdent":        "[",
+          "gotolinestart":  "^",
+          "gotolineend":    "$"
       })
     }
 
@@ -241,6 +245,7 @@ exports.launch = function(env) {
     var highlightSelectedWordE = document.getElementById("highlight_selected_word");
     var showHScrollEl = document.getElementById("show_hscroll");
     var softTabEl = document.getElementById("soft_tab");
+    var behavioursEl = document.getElementById("enable_behaviours");
 
     bindDropdown("doc", function(value) {
         var doc = docs[value];
@@ -338,6 +343,7 @@ exports.launch = function(env) {
         highlightSelectedWordE.checked = editor.getHighlightSelectedWord();
         showHScrollEl.checked = editor.renderer.getHScrollBarAlwaysVisible();
         softTabEl.checked = session.getUseSoftTabs();
+        behavioursEl.checked = editor.getBehavioursEnabled()
     }
 
     bindDropdown("mode", function(value) {
@@ -345,7 +351,14 @@ exports.launch = function(env) {
     });
 
     bindDropdown("theme", function(value) {
-        env.editor.setTheme(value);
+        if (require.packaged) {
+            loadTheme(value, function() {
+                env.editor.setTheme(value);
+            });
+        }
+        else {
+            env.editor.setTheme(value);
+        }
     });
 
     bindDropdown("keybinding", function(value) {
@@ -414,6 +427,10 @@ exports.launch = function(env) {
         env.editor.getSession().setUseSoftTabs(checked);
     });
 
+    bindCheckbox("enable_behaviours", function(checked) {
+        env.editor.setBehavioursEnabled(checked);
+    });
+
     var secondSession = null;
     bindDropdown("split", function(value) {
         var sp = env.split;
@@ -584,7 +601,7 @@ exports.launch = function(env) {
 
     // Fake-Print with custom lookup-sender-match function.
     canon.addCommand({
-        name: "save",
+        name: "print",
         bindKey: {
             win: "Ctrl-P",
             mac: "Command-P",
@@ -653,11 +670,11 @@ exports.launch = function(env) {
             var fold = session.getFoldAt(range.start.row, range.start.column);
             var column;
 
-            if(fold) {
+            if (fold) {
                 session.expandFold(fold);
                 selection.setSelectionRange(fold.range)
-            } else if(br) {
-                if(range.compare(br.row,br.column) == 1)
+            } else if (br) {
+                if (range.compare(br.row, br.column) == 1)
                     range.end = br;
                 else
                     range.start = br;
@@ -682,7 +699,7 @@ exports.launch = function(env) {
         } else {
             addFold = true;
         }
-        if(addFold) {
+        if (addFold) {
             var placeHolder = session.getTextRange(range);
             if(placeHolder.length < 3)
                 return;
@@ -692,4 +709,25 @@ exports.launch = function(env) {
     }
 };
 
+var themes = {};
+function loadTheme(name, callback) {
+    if (themes[name])
+        return;
+        
+    themes[name] = 1;
+    var base = name.split("/").pop();
+    var fileName = "src/theme-" + base + ".js";
+    loadScriptFile(fileName, callback)
+}
+
+function loadScriptFile(path, callback) {
+    var head = document.getElementsByTagName('head')[0];
+    var s = document.createElement('script');
+
+    s.src = path;
+    head.appendChild(s);
+    
+    s.onload = callback;
+}
+
 });

demo/text.js

@@ -0,0 +1,262 @@
+/**
+ * @license RequireJS text 0.25.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/requirejs for details
+ */
+/*jslint regexp: false, nomen: false, plusplus: false, strict: false */
+/*global require: false, XMLHttpRequest: false, ActiveXObject: false,
+  define: false, window: false, process: false, Packages: false,
+  java: false, location: false */
+
+(function () {
+    var progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'],
+        xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,
+        bodyRegExp = /<body[^>]*>\s*([\s\S]+)\s*<\/body>/im,
+        hasLocation = typeof location !== 'undefined' && location.href,
+        buildMap = [];
+
+    define(function () {
+        var text, get, fs;
+
+        if (typeof window !== "undefined" && window.navigator && window.document) {
+            get = function (url, callback) {
+                var xhr = text.createXhr();
+                xhr.open('GET', url, true);
+                xhr.onreadystatechange = function (evt) {
+                    //Do not explicitly handle errors, those should be
+                    //visible via console output in the browser.
+                    if (xhr.readyState === 4) {
+                        callback(xhr.responseText);
+                    }
+                };
+                xhr.send(null);
+            };
+        } else if (typeof process !== "undefined" &&
+                 process.versions &&
+                 !!process.versions.node) {
+            //Using special require.nodeRequire, something added by r.js.
+            fs = require.nodeRequire('fs');
+
+            get = function (url, callback) {
+                callback(fs.readFileSync(url, 'utf8'));
+            };
+        } else if (typeof Packages !== 'undefined') {
+            //Why Java, why is this so awkward?
+            get = function (url, callback) {
+                var encoding = "utf-8",
+                    file = new java.io.File(url),
+                    lineSeparator = java.lang.System.getProperty("line.separator"),
+                    input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding)),
+                    stringBuffer, line,
+                    content = '';
+                try {
+                    stringBuffer = new java.lang.StringBuffer();
+                    line = input.readLine();
+
+                    // Byte Order Mark (BOM) - The Unicode Standard, version 3.0, page 324
+                    // http://www.unicode.org/faq/utf_bom.html
+
+                    // Note that when we use utf-8, the BOM should appear as "EF BB BF", but it doesn't due to this bug in the JDK:
+                    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4508058
+                    if (line && line.length() && line.charAt(0) === 0xfeff) {
+                        // Eat the BOM, since we've already found the encoding on this file,
+                        // and we plan to concatenating this buffer with others; the BOM should
+                        // only appear at the top of a file.
+                        line = line.substring(1);
+                    }
+
+                    stringBuffer.append(line);
+
+                    while ((line = input.readLine()) !== null) {
+                        stringBuffer.append(lineSeparator);
+                        stringBuffer.append(line);
+                    }
+                    //Make sure we return a JavaScript string and not a Java string.
+                    content = String(stringBuffer.toString()); //String
+                } finally {
+                    input.close();
+                }
+                callback(content);
+            };
+        }
+
+        text = {
+            version: '0.25.0',
+
+            strip: function (content) {
+                //Strips <?xml ...?> declarations so that external SVG and XML
+                //documents can be added to a document without worry. Also, if the string
+                //is an HTML document, only the part inside the body tag is returned.
+                if (content) {
+                    content = content.replace(xmlRegExp, "");
+                    var matches = content.match(bodyRegExp);
+                    if (matches) {
+                        content = matches[1];
+                    }
+                } else {
+                    content = "";
+                }
+                return content;
+            },
+
+            jsEscape: function (content) {
+                return content.replace(/(['\\])/g, '\\$1')
+                    .replace(/[\f]/g, "\\f")
+                    .replace(/[\b]/g, "\\b")
+                    .replace(/[\n]/g, "\\n")
+                    .replace(/[\t]/g, "\\t")
+                    .replace(/[\r]/g, "\\r");
+            },
+
+            createXhr: function () {
+                //Would love to dump the ActiveX crap in here. Need IE 6 to die first.
+                var xhr, i, progId;
+                if (typeof XMLHttpRequest !== "undefined") {
+                    return new XMLHttpRequest();
+                } else {
+                    for (i = 0; i < 3; i++) {
+                        progId = progIds[i];
+                        try {
+                            xhr = new ActiveXObject(progId);
+                        } catch (e) {}
+
+                        if (xhr) {
+                            progIds = [progId];  // so faster next time
+                            break;
+                        }
+                    }
+                }
+
+                if (!xhr) {
+                    throw new Error("createXhr(): XMLHttpRequest not available");
+                }
+
+                return xhr;
+            },
+
+            get: get,
+
+            /**
+             * Parses a resource name into its component parts. Resource names
+             * look like: module/name.ext!strip, where the !strip part is
+             * optional.
+             * @param {String} name the resource name
+             * @returns {Object} with properties "moduleName", "ext" and "strip"
+             * where strip is a boolean.
+             */
+            parseName: function (name) {
+                var strip = false, index = name.indexOf("."),
+                    modName = name.substring(0, index),
+                    ext = name.substring(index + 1, name.length);
+
+                index = ext.indexOf("!");
+                if (index !== -1) {
+                    //Pull off the strip arg.
+                    strip = ext.substring(index + 1, ext.length);
+                    strip = strip === "strip";
+                    ext = ext.substring(0, index);
+                }
+
+                return {
+                    moduleName: modName,
+                    ext: ext,
+                    strip: strip
+                };
+            },
+
+            xdRegExp: /^((\w+)\:)?\/\/([^\/\\]+)/,
+
+            /**
+             * Is an URL on another domain. Only works for browser use, returns
+             * false in non-browser environments. Only used to know if an
+             * optimized .js version of a text resource should be loaded
+             * instead.
+             * @param {String} url
+             * @returns Boolean
+             */
+            canUseXhr: function (url, protocol, hostname, port) {
+                var match = text.xdRegExp.exec(url),
+                    uProtocol, uHostName, uPort;
+                if (!match) {
+                    return true;
+                }
+                uProtocol = match[2];
+                uHostName = match[3];
+
+                uHostName = uHostName.split(':');
+                uPort = uHostName[1];
+                uHostName = uHostName[0];
+
+                return (!uProtocol || uProtocol === protocol) &&
+                       (!uHostName || uHostName === hostname) &&
+                       ((!uPort && !uHostName) || uPort === port);
+            },
+
+            finishLoad: function (name, strip, content, onLoad, config) {
+                content = strip ? text.strip(content) : content;
+                if (config.isBuild && config.inlineText) {
+                    buildMap[name] = content;
+                }
+                onLoad(content);
+            },
+
+            load: function (name, req, onLoad, config) {
+                //Name has format: some.module.filext!strip
+                //The strip part is optional.
+                //if strip is present, then that means only get the string contents
+                //inside a body tag in an HTML string. For XML/SVG content it means
+                //removing the <?xml ...?> declarations so the content can be inserted
+                //into the current doc without problems.
+
+                var parsed = text.parseName(name),
+                    nonStripName = parsed.moduleName + '.' + parsed.ext,
+                    url = req.toUrl(nonStripName);
+
+                //Load the text. Use XHR if possible and in a browser.
+                if (!hasLocation || text.canUseXhr(url)) {
+                    text.get(url, function (content) {
+                        text.finishLoad(name, parsed.strip, content, onLoad, config);
+                    });
+                } else {
+                    //Need to fetch the resource across domains. Assume
+                    //the resource has been optimized into a JS module. Fetch
+                    //by the module name + extension, but do not include the
+                    //!strip part to avoid file system issues.
+                    req([nonStripName], function (content) {
+                        text.finishLoad(parsed.moduleName + '.' + parsed.ext,
+                                        parsed.strip, content, onLoad, config);
+                    });
+                }
+            },
+
+            write: function (pluginName, moduleName, write, config) {
+                if (moduleName in buildMap) {
+                    var content = text.jsEscape(buildMap[moduleName]);
+                    write("define('" + pluginName + "!" + moduleName  +
+                          "', function () { return '" + content + "';});\n");
+                }
+            },
+
+            writeFile: function (pluginName, moduleName, req, write, config) {
+                var parsed = text.parseName(moduleName),
+                    nonStripName = parsed.moduleName + '.' + parsed.ext,
+                    //Use a '.js' file name so that it indicates it is a
+                    //script that can be loaded across domains.
+                    fileName = req.toUrl(parsed.moduleName + '.' +
+                                         parsed.ext) + '.js';
+
+                //Leverage own load() method to load plugin value, but only
+                //write out values that do not have the strip argument,
+                //to avoid any potential issues with ! in file names.
+                text.load(nonStripName, req, function (value) {
+                    //Use own write() method to construct full module value.
+                    text.write(pluginName, nonStripName, function (contents) {
+                        write(fileName, contents);
+                    }, config);
+                }, config);
+            }
+        };
+
+        return text;
+    });
+}());

doc/site/iphone.css

@@ -0,0 +1,25 @@
+#wrapper {
+    position:relative;
+    overflow:hidden;
+}
+
+#wrapper .content .column1 {
+    margin:0 16px 0 15px;
+}
+
+#header .content .signature {
+    font-size:18px;
+    bottom:0;
+}
+
+UL.menu-list LI {
+    font-size:22px;
+}
+
+UL.menu-footer LI {
+    font-size:22px;
+}
+
+PRE{
+    font-size:22px;
+}

doc/site/style.css

@@ -0,0 +1,230 @@
+body {
+    margin:0;
+    padding:0;
+    background-color:#e6f5fc;
+    
+}
+
+H2, H3, H4 {
+    font-family:Trebuchet MS;
+    font-weight:bold;
+    margin:0;
+    padding:0;
+}
+
+H2 {
+    font-size:28px;
+    color:#263842;
+    padding-bottom:6px;
+}
+
+H3 {
+    font-family:Trebuchet MS;
+    font-weight:bold;
+    font-size:22px;
+    color:#253741;
+    margin-top:43px;
+    margin-bottom:8px;
+}
+
+H4 {
+    font-family:Trebuchet MS;
+    font-weight:bold;
+    font-size:21px;
+    color:#222222;
+    margin-bottom:4px;
+}
+
+P {
+    padding:13px 0;
+    margin:0;
+    line-height:22px;
+}
+
+UL{
+    line-height : 22px;
+}
+
+PRE{
+    background : #333;
+    color : white;
+    padding : 10px;
+}
+
+#header {
+    height : 227px;
+    position:relative;
+    overflow:hidden;
+    background: url(images/background.png) repeat-x 0 0;
+    border-bottom:1px solid #c9e8fa;   
+}
+
+#header .content .signature {
+    font-family:Trebuchet MS;
+    font-size:11px;
+    color:#ebe4d6;
+    position:absolute;
+    bottom:5px;
+    right:42px;
+    letter-spacing : 1px;
+}
+
+.content {
+    width:970px;
+    position:relative;
+    overflow:hidden;
+    margin:0 auto;
+}
+
+#header .content {
+    height:184px;
+    margin-top:22px;
+}
+
+#header .content .logo {
+    width  : 282px;
+    height : 184px;
+    background:url(images/logo.png) no-repeat 0 0;
+    position:absolute;
+    top:0;
+    left:0;
+}
+
+#header .content .title {
+    width  : 605px;
+    height : 58px;
+    background:url(images/ace.png) no-repeat 0 0;
+    position:absolute;
+    top:98px;
+    left:329px;
+}
+
+#wrapper {
+    background:url(images/body_background.png) repeat-x 0 0;
+    min-height:250px;
+}
+
+#wrapper .content {
+    font-family:Arial;
+    font-size:14px;
+    color:#222222;
+    width:1000px;
+}
+
+#wrapper .content .column1 {
+    position:relative;
+    overflow:hidden;
+    float:left;
+    width:315px;
+    margin-right:31px;
+}
+
+#wrapper .content .column2 {
+    position:relative;
+    overflow:hidden;
+    float:left;
+    width:600px;
+    padding-top:47px;
+}
+
+.fork_on_github {
+    width:310px;
+    height:80px;
+    background:url(images/fork_on_github.png) no-repeat 0 0;
+    position:relative;
+    overflow:hidden;
+    margin-top:49px;
+    cursor:pointer;
+}
+
+.fork_on_github:hover {
+    background-position:0 -80px;
+}
+
+.divider {
+    height:3px;
+    background-color:#bedaea;
+    margin-bottom:3px;
+}
+
+.menu {
+    padding:23px 0 0 24px;
+}
+
+UL.content-list {
+    padding:15px;
+    margin:0;
+}
+
+UL.menu-list {
+    padding:0;
+    margin:0 0 20px 0;
+    list-style-type:none;
+    line-height : 16px;
+}
+
+UL.menu-list LI {
+    color:#2557b4;
+    font-family:Trebuchet MS;
+    font-size:14px;
+    padding:7px 0;
+    border-bottom:1px dotted #d6e2e7;
+}
+
+UL.menu-list LI:last-child {
+    border-bottom:0;
+}
+
+A {
+    color:#2557b4;
+    text-decoration:none;
+}
+
+A:hover {
+    text-decoration:underline;
+}
+
+P#first{
+    background : rgba(255,255,255,0.5);
+    padding : 20px;
+    font-size : 16px;
+    line-height : 24px;
+    margin : 0 0 20px 0;
+}
+
+#footer {
+    height:40px;
+    position:relative;
+    overflow:hidden;
+    background:url(images/bottombar.png) repeat-x 0 0;
+    position:relative;
+    margin-top:40px;
+}
+
+UL.menu-footer {
+    padding:0;
+    margin:8px 11px 0 0;
+    list-style-type:none;
+    float:right;
+}
+
+UL.menu-footer LI {
+    color:white;
+    font-family:Arial;
+    font-size:12px;
+    display:inline-block;
+    margin:0 1px;
+}
+
+UL.menu-footer LI A {
+    color:#8dd0ff;
+    text-decoration:none;
+}
+
+UL.menu-footer LI A:hover {
+    text-decoration:underline;
+}
+
+
+
+

doc/wiki

@@ -0,0 +1 @@
+Subproject commit cc5ccde4565f7b21c81345f47e941e011e94b810

index.html

@@ -1,686 +1,127 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">
-
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Editor</title>
-    <meta name="author" content="Fabian Jakobs">
-    <link rel="stylesheet" href="demo/styles.css" type="text/css" media="screen" charset="utf-8">
-</head>
-<body>
-  <img id="logo" src="demo/logo.png">
-  <table id="controls">
-    <tr>
-      <td>
-        <label for="doc">Document</label>
-      </td><td>
-        <select id="doc" size="1">
-          <option value="js">JavaScript</option>
-          <option value="plain">Plain Text</option>
-          <option value="svg">SVG</option>
-          <option value="html">HTML</option>
-          <option value="css">CSS</option>
-          <option value="scss">SCSS</option>
-          <option value="coffee">CoffeeScript</option>
-          <option value="json">JSON</option>
-          <option value="python">Python</option>
-          <option value="ruby">Ruby</option>
-          <option value="perl">Perl</option>
-          <option value="php">PHP</option>
-          <option value="java">Java</option>
-          <option value="csharp">C#</option>
-          <option value="c_cpp">C++</option>
-          <option value="svg">SVG</option>
-          <option value="clojure">Clojure</option>
-          <option value="ocaml">OCaml</option>
-          <option value="textile">Textile</option>
-          <option value="groovy">Groovy</option>
-          <option value="scala">Scala</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="mode">Mode</label>
-      </td><td>
-        <select id="mode" size="1">
-          <option value="text">Plain Text</option>
-          <option value="javascript">JavaScript</option>
-          <option value="xml">XML</option>
-          <option value="html">HTML</option>
-          <option value="css">CSS</option>
-          <option value="scss">SCSS</option>
-          <option value="python">Python</option>
-          <option value="php">PHP</option>
-          <option value="java">Java</option>
-          <option value="ruby">Ruby</option>
-          <option value="c_cpp">C/C++</option>
-          <option value="coffee">CoffeeScript</option>
-          <option value="json">JSON</option>
-          <option value="perl">Perl</option>
-          <option value="clojure">Clojure</option>
-          <option value="ocaml">OCaml</option>
-          <option value="csharp">C-Sharp</option>
-          <option value="svg">SVG</option>
-          <option value="textile">Textile</option>
-          <option value="groovy">Groovy</option>
-          <option value="scala">Scala</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <label for="split">Split</label>
-      </td><td>
-        <select id="split" size="1">
-          <option value="none">None</option>
-          <option value="below">Below</option>
-          <option value="beside">Beside</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="theme">Theme</label>
-      </td><td>
-        <select id="theme" size="1">
-          <option value="ace/theme/textmate">TextMate</option>
-          <option value="ace/theme/eclipse">Eclipse</option>
-          <option value="ace/theme/dawn">Dawn</option>
-          <option value="ace/theme/idle_fingers">idleFingers</option>
-          <option value="ace/theme/pastel_on_dark">Pastel on dark</option>
-          <option value="ace/theme/twilight">Twilight</option>
-          <option value="ace/theme/clouds">Clouds</option>
-          <option value="ace/theme/clouds_midnight">Clouds Midnight</option>
-          <option value="ace/theme/kr_theme">krTheme</option>
-          <option value="ace/theme/mono_industrial">Mono Industrial</option>
-          <option value="ace/theme/monokai">Monokai</option>
-          <option value="ace/theme/merbivore">Merbivore</option>
-          <option value="ace/theme/merbivore_soft">Merbivore Soft</option>
-          <option value="ace/theme/vibrant_ink">Vibrant Ink</option>
-          <option value="ace/theme/solarized_dark">Solarized Dark</option>
-          <option value="ace/theme/solarized_light">Solarized Light</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="fontsize">Font Size</label>
-      </td><td>
-        <select id="fontsize" size="1">
-          <option value="10px">10px</option>
-          <option value="11px">11px</option>
-          <option value="12px" selected="selected">12px</option>
-          <option value="14px">14px</option>
-          <option value="16px">16px</option>
-          <option value="20px">20px</option>
-          <option value="24px">24px</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="select_style">Full Line Selection</label>
-      </td><td>
-        <input type="checkbox" name="select_style" id="select_style" checked>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="highlight_active">Highlight Active Line</label>
-      </td><td>
-        <input type="checkbox" name="highlight_active" id="highlight_active" checked>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="show_hidden">Show Invisibles</label>
-      </td><td>
-        <input type="checkbox" name="show_hidden" id="show_hidden" checked>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="show_hscroll">Persistent HScroll</label>
-      </td><td>
-        <input type="checkbox" name="show_hscroll" id="show_hscroll">
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="keybinding">Key Binding</label>
-      </td><td>
-        <select id="keybinding" size="1">
-          <option value="ace">Ace</option>
-          <option value="vim">Vim</option>
-          <option value="emacs">Emacs</option>
-          <option value="custom">Custom</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="soft_wrap">Soft Wrap</label>
-      </td><td>
-        <select id="soft_wrap" size="1">
-          <option value="off">Off</option>
-          <option value="40">40 Chars</option>
-          <option value="80">80 Chars</option>
-          <option value="free">Free</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="show_gutter">Show Gutter</label>
-      </td><td>
-        <input type="checkbox" id="show_gutter" checked>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="show_print_margin">Show Print Margin</label>
-      </td><td>
-        <input type="checkbox" id="show_print_margin" checked>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="soft_tab">Use Soft Tab</label>
-      </td><td>
-        <input type="checkbox" id="soft_tab" checked>
-      </td>
-    </tr>
-    <tr>
-      <td >
-        <label for="highlight_selected_word">Highlight selected word</label>
-      </td><td>
-        <input type="checkbox" id="highlight_selected_word" checked>
-      </td>
-      </tr>
-    </table>
-
-    <div id="editor">
-    </div>
-        <script type="text/editor" id="csharptext">public void HelloWorld() {
-   //Say Hello!
-   Console.WriteLine("Hello World");
-}</script>
-    <script type="text/editor" id="jstext">function foo(items) {
-    for (var i=0; i<items.length; i++) {
-        alert(items[i] + "juhu");
-    }	// Real Tab.
-}
-// A magic character: >> ぁ <<
-</script>
-
-    <script type="text/editor" id="csstext">.text-layer {
-    font-family: Monaco, "Courier New", monospace;
-    font-size: 12px;
-    cursor: text;
-}</script>
-
-    <script type="text/editor" id="scsstext">/* style.scss */
-
-#navbar {
-    $navbar-width: 800px;
-    $items: 5;
-    $navbar-color: #ce4dd6;
-
-    width: $navbar-width;
-    border-bottom: 2px solid $navbar-color;
-
-    li {
-        float: left;
-        width: $navbar-width/$items - 10px;
-
-        background-color: lighten($navbar-color, 20%);
-        &:hover {
-            background-color: lighten($navbar-color, 10%);
-        }
-    }
-}</script>
-
-    <script type="text/editor" id="htmltext"><html>
-<head>
-
-<style type="text/css">
-.text-layer {
-    font-family: Monaco, "Courier New", monospace;
-    font-size: 12px;
-    cursor: text;
-}
-</style>
-
-</head>
-<body>
-    <h1 style="color:red">Juhu Kinners</h1>
-</body>
-</html></script>
-
-    <script type="text/editor" id="javatext">public class InfiniteLoop {
-
-    /*
-     * This will cause the program to hang...
-     *
-     * Taken from:
-     * http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308/
-     */
-    public static void main(String[] args) {
-        double d = Double.parseDouble("2.2250738585072012e-308");
-
-        // unreachable code
-        System.out.println("Value: " + d);
-    }
-}</script>
-
-    <script type="text/editor" id="pythontext">#!/usr/local/bin/python
-
-import string, sys
-
-# If no arguments were given, print a helpful message
-if len(sys.argv)==1:
-    print 'Usage: celsius temp1 temp2 ...'
-    sys.exit(0)
-
-# Loop over the arguments
-for i in sys.argv[1:]:
-    try:
-        fahrenheit=float(string.atoi(i))
-    except string.atoi_error:
-        print repr(i), "not a numeric value"
-    else:
-        celsius=(fahrenheit-32)*5.0/9.0
-        print '%i\260F = %i\260C' % (int(fahrenheit), int(celsius+.5))
-</script>
-
-    <script type="text/editor" id="phptext"><?php
-
-function nfact($n) {
-  if ($n == 0) {
-    return 1;
-  }
-  else {
-    return $n * nfact($n - 1);
-  }
-}
-
-echo "\n\nPlease enter a whole number ... ";
-$num = trim(fgets(STDIN));
-
-// ===== PROCESS - Determing the factorial of the input number =====
-$output = "\n\nFactorial " . $num . " = " . nfact($num) . "\n\n";
-echo $output;
-
-?></script>
-
-  <script type="text/editor" id="plaintext">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
-
-Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
-
-At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
-</script>
-
-    <script type="text/editor" id="rubytext">#!/usr/bin/ruby
-
-# Program to find the factorial of a number
-def fact(n)
-    if n == 0
-        1
-    else
-        n * fact(n-1)
-    end
-end
-
-puts fact(ARGV[0].to_i)
-</script>
-
-<script type="text/editor" id="cpptext">// compound assignment operators
-
-#include <iostream>
-using namespace std;
-
-int main ()
-{
-    int a, b=3; /* foobar */
-    a = b;
-    a+=2; // equivalent to a=a+2
-    cout << a;
-    return 0;
-}
-</script>
-
-<script type="text/editor" id="coffeetext">#!/usr/bin/env coffee
-
-try
-    throw URIError decodeURI(0xC0ffee * 123456.7e-8 / .9)
-catch e
-    console.log 'qstring' + "qqstring" + '''
-        qdoc
-    ''' + """
-        qqdoc
-    """
-
-do ->
-    ###
-    herecomment
-    ###
-    re = /regex/imgy.test ///
-        heregex  # comment
-    ///imgy
-    this isnt: `just JavaScript`
-    undefined</script>
-
-<script type="text/editor" id="jsontext">{
- "query": {
-  "count": 10,
-  "created": "2011-06-21T08:10:46Z",
-  "lang": "en-US",
-  "results": {
-   "photo": [
-    {
-     "farm": "6",
-     "id": "5855620975",
-     "isfamily": "0",
-     "isfriend": "0",
-     "ispublic": "1",
-     "owner": "32021554@N04",
-     "secret": "f1f5e8515d",
-     "server": "5110",
-     "title": "7087 bandit cat"
-    },
-    {
-     "farm": "4",
-     "id": "5856170534",
-     "isfamily": "0",
-     "isfriend": "0",
-     "ispublic": "1",
-     "owner": "32021554@N04",
-     "secret": "ff1efb2a6f",
-     "server": "3217",
-     "title": "6975 rusty cat"
-    },
-    {
-     "farm": "6",
-     "id": "5856172972",
-     "isfamily": "0",
-     "isfriend": "0",
-     "ispublic": "1",
-     "owner": "51249875@N03",
-     "secret": "6c6887347c",
-     "server": "5192",
-     "title": "watermarked-cats"
-    },
-    {
-     "farm": "6",
-     "id": "5856168328",
-     "isfamily": "0",
-     "isfriend": "0",
-     "ispublic": "1",
-     "owner": "32021554@N04",
-     "secret": "0c1cfdf64c",
-     "server": "5078",
-     "title": "7020 mandy cat"
-    },
-    {
-     "farm": "3",
-     "id": "5856171774",
-     "isfamily": "0",
-     "isfriend": "0",
-     "ispublic": "1",
-     "owner": "32021554@N04",
-     "secret": "7f5a3180ab",
-     "server": "2696",
-     "title": "7448 bobby cat"
-    }
-   ]
-  }
- }
-}</script>
-
-<script type="text/editor" id="perltext">#!/usr/bin/perl
-use strict;
-use warnings;
-my $num_primes = 0;
-my @primes;
-
-# Put 2 as the first prime so we won't have an empty array
-$primes[$num_primes] = 2;
-$num_primes++;
-
-MAIN_LOOP:
-for my $number_to_check (3 .. 200)
-{
-    for my $p (0 .. ($num_primes-1))
-    {
-        if ($number_to_check % $primes[$p] == 0)
-        {
-            next MAIN_LOOP;
-        }
-    }
-
-    # If we reached this point it means $number_to_check is not
-    # divisable by any prime number that came before it.
-    $primes[$num_primes] = $number_to_check;
-    $num_primes++;
-}
-
-for my $p (0 .. ($num_primes-1))
-{
-    print $primes[$p], ", ";
-}
-print "\n";
-
-</script>
-
-<script type="text/editor" id="ocamltext">(*
- * Example of early return implementation taken from
- * http://ocaml.janestreet.com/?q=node/91
- *)
-
-let with_return (type t) (f : _ -> t) =
-  let module M =
-     struct exception Return of t end
-  in
-  let return = { return = (fun x -> raise (M.Return x)); } in
-  try f return with M.Return x -> x
-
-
-(* Function that uses the 'early return' functionality provided by `with_return` *)
-let sum_until_first_negative list =
-  with_return (fun r ->
-    List.fold list ~init:0 ~f:(fun acc x ->
-      if x >= 0 then acc + x else r.return acc))
-</script>
-
-<script type="text/editor" id="clojuretext">(defn parting
-  "returns a String parting in a given language"
-  ([] (parting "World"))
-  ([name] (parting name "en"))
-  ([name language]
-    ; condp is similar to a case statement in other languages.
-    ; It is described in more detail later.
-    ; It is used here to take different actions based on whether the
-    ; parameter "language" is set to "en", "es" or something else.
-    (condp = language
-      "en" (str "Goodbye, " name)
-      "es" (str "Adios, " name)
-      (throw (IllegalArgumentException.
-        (str "unsupported language " language))))))
-
-(println (parting)) ; -> Goodbye, World
-(println (parting "Mark")) ; -> Goodbye, Mark
-(println (parting "Mark" "es")) ; -> Adios, Mark
-(println (parting "Mark", "xy")) ; -> java.lang.IllegalArgumentException: unsupported language xy</script>
-
-<script type="text/editor" id="svgtext"><svg
-  width="800" height="600"
-  xmlns="http://www.w3.org/2000/svg"
-  onload="StartAnimation(evt)">
-
-  <title>Test Tube Progress Bar</title>
-  <desc>Created for the Web Directions SVG competition</desc>
-
-  <script type="text/ecmascript"><![CDATA[
-    var timevalue = 0;
-    var timer_increment = 1;
-    var max_time = 100;
-    var hickory;
-    var dickory;
-    var dock;
-    var i;
-
-    function StartAnimation(evt) {
-        hickory  = evt.target.ownerDocument.getElementById("hickory");
-        dickory = evt.target.ownerDocument.getElementById("dickory");
-        dock = evt.target.ownerDocument.getElementById("dock");
-
-        ShowAndGrowElement();
-    }
-    function ShowAndGrowElement() {
-        timevalue = timevalue + timer_increment;
-        if (timevalue > max_time)
-            return;
-        // Scale the text string gradually until it is 20 times larger
-        scalefactor = (timevalue * 650) / max_time;
-
-        if (timevalue < 30) {
-            hickory.setAttribute("display", "");
-            hickory.setAttribute("transform", "translate(" + (600+scalefactor*3*-1 ) + ", -144 )");
-        }
-
-        if (timevalue > 30 && timevalue < 66) {
-            dickory.setAttribute("display", "");
-            dickory.setAttribute("transform", "translate(" + (-795+scalefactor*2) + ", 0 )");
-        }
-        if (timevalue > 66) {
-            dock.setAttribute("display", "");
-            dock.setAttribute("transform", "translate(" + (1450+scalefactor*2*-1) + ", 144 )");
-        }
-
-        // Call ShowAndGrowElement again <timer_increment> milliseconds later.
-        setTimeout("ShowAndGrowElement()", timer_increment)
-    }
-    window.ShowAndGrowElement = ShowAndGrowElement
-  ]]>&lt;/script>
-
-  <rect
-    fill="#2e3436"
-    fill-rule="nonzero"
-    stroke-width="3"
-    y="0"
-    x="0"
-    height="600"
-    width="800"
-    id="rect3590"/>
-
-    <text
-       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="50"
-       y="350"
-       id="hickory"
-       display="none">
-        Hickory,</text>
-    <text
-       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="50"
-       y="350"
-       id="dickory"
-       display="none">
-        dickory,</text>
-    <text
-       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="50"
-       y="350"
-       id="dock"
-       display="none">
-        dock!</text>
-</svg></script>
-<script type="text/editor" id="textiletext">h1. Textile document
-
-h2. Heading Two
-
-h3. A two-line
-    header
-
-h2. Another two-line
-header
-
-Paragraph:
-one, two,
-thee lines!
-
-p(classone two three). This is a paragraph with classes
-
-p(#id). (one with an id)
-
-p(one two three#my_id). ..classes + id
-
-* Unordered list
-** sublist
-* back again!
-** sublist again..
-
-# ordered
-
-bg. Blockquote!
-    This is a two-list blockquote..!
-
-</script>
-
-<script type="text/editor" id="groovy">
-//http://groovy.codehaus.org/Concurrency+with+Groovy
-import java.util.concurrent.atomic.AtomicInteger
-
-def counter = new AtomicInteger()
-
-synchronized out(message) {
-    println(message)
-}
-
-def th = Thread.start {
-    for( i in 1..8 ) {
-        sleep 30
-        out "thread loop $i"
-        counter.incrementAndGet()
-    }
-}
-
-for( j in 1..4 ) {
-    sleep 50
-    out "main loop $j"
-    counter.incrementAndGet()
-}
-
-th.join()
-
-assert counter.get() == 12
-</script>
-
-<script type="text/editor" id="scala">
-//http://www.scala-lang.org/node/227
-/* Defines a new method 'sort' for array objects */
-object implicits extends Application {
-  implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
-    new {
-      def sort(p: (A, A) => Boolean) = {
-        util.Sorting.stableSort(x, p); x
-      }
-    }
-  val x = Array(2, 3, 1, 4)
-  println("x = "+ x.sort((x: Int, y: Int) => x < y))
-}
-</script>
-  <input id="cockpitInput" type="text"/>
-
-  <script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
-  <script src="demo/boot.js" type="text/javascript"></script>
-</body>
-</html>
+<!DOCTYPE html> 
+<html xmlns="http://www.w3.org/1999/xhtml"> 
+    <head profile="http://www.w3.org/2005/10/profile"> 
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> 
+        <title>ACE - Ajax.org Cloud9 Editor</title> 
+        <meta name="description" content=""/> 
+        <meta name="keywords" content=""/> 
+        <link href="doc/site/style.css" rel="stylesheet" type="text/css" /> 
+        <link rel="stylesheet" media="all and (max-device-width: 480px)" href="doc/site/iphone.css"> 
+        <link rel="stylesheet" media="all and (min-device-width: 481px) and (max-device-width: 1024px)" href="doc/site/iphone.css"> 
+    </head> 
+    <body> 
+        <div id="header"> 
+            <div class="content"> 
+                <div class="logo"></div> 
+                <div class="title"></div> 
+                <div class="signature">Previously Skywriter, Bespin</div> 
+            </div> 
+        </div> 
+        <div id="wrapper"> 
+            <div class="content"> 
+                <div class="column1"> 
+                    <a href="http://github.com/ajaxorg/ace"><div class="fork_on_github"></div></a> 
+                    <div class="menu"> 
+                        <h4>User Resources</h4> 
+                        <ul class="menu-list"> 
+                            <li><a href="http://groups.google.com/group/ace-discuss">Ace Google Group</a></li> 
+                            <li><a href="http://groups.google.com/group/ace-internals">Ace Core Google Group</a></li> 
+                            <li><a href="irc://irc.freenode.net/%23ace">irc.freenode.net #ace</a></li> 
+                        </ul> 
+                        <h4>Related Projects</h4> 
+                        <ul class="menu-list"> 
+                            <li><a href="https://github.com/joewalker/pilot">Pilot</a></li> 
+                            <li><a href="https://github.com/joewalker/gcli">GCLI</a></li> 
+                            <li><a href="https://github.com/mozilla/dryice">DryIce</a></li>
+                            <li><a href="https://github.com/cadorn/ace-extjs">Ace wrapper for ExtJS</a></li>
+                            <li><a href="https://github.com/daveho/AceGWT">Ace wrapper for GWT</a></li>
+                        </ul> 
+                        <h4>Projects Using Ace</h4> 
+                        <ul class="menu-list"> 
+                            <li><a href="https://github.com/ajaxorg/cloud9">Cloud9 IDE</a></li> 
+                            <li><a href="https://github.com/Gozala/sky-edit">Sky Edit</a></li> 
+                            <li><a href="http://www.bluegriffon.org/">Blue Griffon</a></li>
+                            <li><a href="http://rstudio.org/">RStudio</a></li>
+                            <li><a href="http://www.playmycode.com/">Play My Code</a></li>
+                            <li><a href="http://demo.qooxdoo.org/devel/playground/#">Qooxdoo playground</a></li> 
+                            <li><a href="http://ext.radiantcms.org/extensions/264-ace">Radiant CMS</a></li> 
+                            <li><a href="http://developercompanion.com/">Developer Companion</a></li> 
+                            <li><a href="https://builder.addons.mozilla.org/">Mozilla Add-on Builder</a></li> 
+                            <li><a href="http://www.projectdirigible.com/">Dirigible</a></li> 
+                            <li><a href="http://shiftedit.net/">shiftEdit</a></li> 
+                            <li><a href="http://www.akshell.com/">Akshell</a></li>
+                            <li><a href="http://beanstalkapp.com/">beanstalk</a></li>
+                        </ul> 
+                        <h4>Syntax Highlighters</h4> 
+                        <ul class="menu-list"> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">Javascript</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">HTML</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">CSS</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">XML</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">Python</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">PHP</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">Java</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">Ruby</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">C++</a></li> 
+                            <li><a href="https://github.com/ajaxorg/ace/tree/master/lib/ace/mode">CoffeeScript</a></li> 
+                        </ul> 
+                    </div> 
+                </div> 
+                <div class="column2"> 
+                    <p id="first">Ace is a standalone code editor written in JavaScript. Our goal is to create a web based code editor that matches and extends the features, usability and performance of existing native editors such as TextMate, Vim or Eclipse. It can be easily embedded in any web page and JavaScript application. Ace is developed as the primary editor for <a href="http://www.cloud9ide.com">Cloud9 IDE</a> and the successor of the Mozilla Skywriter (Bespin) Project.</p> 
+ 
+                    <h2>Features</h2> 
+                    <div class="divider"></div> 
+ 
+<ul class="content-list"> 
+    <li><a href="http://pcwalton.blogspot.com/2010/11/syntax-highlighting-specification.html">Syntax highlighting</a></li> 
+    <li>Auto indentation and outdent</li> 
+    <li><a href="https://github.com/joewalker/cockpit">An optional command line</a></li> 
+    <li>Work with huge documents (100,000 lines and more are no problem)</li> 
+    <li>Fully customizable key bindings including VI and Emacs modes</li> 
+    <li>Themes (TextMate themes can be imported)</li> 
+    <li>Search and replace with regular expressions</li> 
+    <li>Highlight matching parentheses</li> 
+    <li>Toggle between soft tabs and real tabs</li> 
+    <li>Displays hidden characters</li> 
+    <li>Highlight selected word</li> 
+</ul> 
+ 
+                    <h2>Take Ace for a spin!</h2> 
+                    <div class="divider"></div> 
+<p>Check out the <a href="build/kitchen-sink.html">Ace live demo</a> or get a <a href="http://c9.io">Cloud9 IDE account</a> to experience Ace while editing one of your own GitHub projects.</p> 
+ 
+                    <h2>History</h2> 
+                    <div class="divider"></div> 
+                    <p>Previously known as “Bespin” or lately “Skywriter” it’s now known as Ace (Ajax.org Cloud9 Editor)! Bespin and Ace started as two independent projects both aiming to build a no compromise code editor component for the web. Bespin started as part of Mozilla Labs and was based on the &lt;canvas> tag, while Ace is the Editor component of the <a href="http://cloud9ide.com">Cloud9 IDE</a> and is using the DOM for rendering. After the release of Ace at <a href="http://jsconf.eu/2010/speaker/kick_ass_code_editing_and_end.html">JSConf.eu 2010</a> in Berlin the Skywriter team decided to merge Ace with a simplified version of Skywriter's plugin system  and some of Skywriter's  extensibility points. All these changes have been merged back to Ace now, which supersedes Skywriter. Both <a href="http://ajax.org">Ajax.org</a> and <a href="http://mozilla.org">Mozilla</a> are actively developing and maintaining Ace.</p> 
+ 
+                    
+                    <h2>Getting the code</h2> 
+                    <div class="divider"></div> 
+                    <p>Ace is a community project. We actively encourage and support contributions. The Ace source code is <a href="http://github.com/ajaxorg/ace">hosted on GitHub</a>. It is released under the Mozilla tri-license (MPL/GPL/LGPL). This is the same license used by Firefox. This license is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
+                    <pre>git clone git://github.com/ajaxorg/ace.git</pre></p> 
+ 
+                </div> 
+            </div> 
+        </div> 
+        <div id="footer"> 
+            <ul class="menu-footer"> 
+                <li><a href="http://www.cloud9ide.com">About Cloud9</a></li> 
+                <li>|</li> 
+                <li>Ace & Cloud9 IDE are &copy; <a href="http://ajax.org">Ajax.org</a> 2011</li> 
+            </ul> 
+        </div> 
+ 
+        <script type="text/javascript"> 
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-18736001-1']);
+ _gaq.push(['_trackPageview']);
+ 
+ (function() {
+   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+   ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+        </script> 
+    </body> 
+</html> 

kitchen-sink.html

@@ -0,0 +1,710 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+   "http://www.w3.org/TR/html4/strict.dtd">
+
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Ace Kitchen Sink</title>
+    <meta name="author" content="Fabian Jakobs">
+    <link rel="stylesheet" href="demo/styles.css" type="text/css" media="screen" charset="utf-8">
+</head>
+<body>
+  <img id="logo" src="demo/logo.png">
+  <table id="controls">
+    <tr>
+      <td>
+        <label for="doc">Document</label>
+      </td><td>
+        <select id="doc" size="1">
+          <option value="js">JavaScript</option>
+          <option value="plain">Plain Text</option>
+          <option value="svg">SVG</option>
+          <option value="html">HTML</option>
+          <option value="css">CSS</option>
+          <option value="scss">SCSS</option>
+          <option value="coffee">CoffeeScript</option>
+          <option value="json">JSON</option>
+          <option value="python">Python</option>
+          <option value="ruby">Ruby</option>
+          <option value="perl">Perl</option>
+          <option value="php">PHP</option>
+          <option value="java">Java</option>
+          <option value="csharp">C#</option>
+          <option value="c_cpp">C++</option>
+          <option value="clojure">Clojure</option>
+          <option value="ocaml">OCaml</option>
+          <option value="textile">Textile</option>
+          <option value="groovy">Groovy</option>
+          <option value="scala">Scala</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="mode">Mode</label>
+      </td><td>
+        <select id="mode" size="1">
+          <option value="text">Plain Text</option>
+          <option value="javascript">JavaScript</option>
+          <option value="xml">XML</option>
+          <option value="html">HTML</option>
+          <option value="css">CSS</option>
+          <option value="scss">SCSS</option>
+          <option value="python">Python</option>
+          <option value="php">PHP</option>
+          <option value="java">Java</option>
+          <option value="ruby">Ruby</option>
+          <option value="c_cpp">C/C++</option>
+          <option value="coffee">CoffeeScript</option>
+          <option value="json">JSON</option>
+          <option value="perl">Perl</option>
+          <option value="clojure">Clojure</option>
+          <option value="ocaml">OCaml</option>
+          <option value="csharp">C#</option>
+          <option value="svg">SVG</option>
+          <option value="textile">Textile</option>
+          <option value="groovy">Groovy</option>
+          <option value="scala">Scala</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <label for="split">Split</label>
+      </td><td>
+        <select id="split" size="1">
+          <option value="none">None</option>
+          <option value="below">Below</option>
+          <option value="beside">Beside</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="theme">Theme</label>
+      </td><td>
+        <select id="theme" size="1">
+          <option value="ace/theme/clouds">Clouds</option>
+          <option value="ace/theme/clouds_midnight">Clouds Midnight</option>
+          <option value="ace/theme/cobalt">Cobalt</option>
+          <option value="ace/theme/crimson_editor">Crimson Editor</option>
+          <option value="ace/theme/dawn">Dawn</option>
+          <option value="ace/theme/eclipse">Eclipse</option>
+          <option value="ace/theme/idle_fingers">idleFingers</option>
+          <option value="ace/theme/kr_theme">krTheme</option>
+          <option value="ace/theme/merbivore">Merbivore</option>
+          <option value="ace/theme/merbivore_soft">Merbivore Soft</option>
+          <option value="ace/theme/mono_industrial">Mono Industrial</option>
+          <option value="ace/theme/monokai">Monokai</option>
+          <option value="ace/theme/pastel_on_dark">Pastel on dark</option>
+          <option value="ace/theme/solarized_dark">Solarized Dark</option>
+          <option value="ace/theme/solarized_light">Solarized Light</option>
+          <option value="ace/theme/textmate" selected="selected">TextMate</option>
+          <option value="ace/theme/twilight">Twilight</option>
+          <option value="ace/theme/vibrant_ink">Vibrant Ink</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="fontsize">Font Size</label>
+      </td><td>
+        <select id="fontsize" size="1">
+          <option value="10px">10px</option>
+          <option value="11px">11px</option>
+          <option value="12px" selected="selected">12px</option>
+          <option value="14px">14px</option>
+          <option value="16px">16px</option>
+          <option value="20px">20px</option>
+          <option value="24px">24px</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="select_style">Full Line Selection</label>
+      </td><td>
+        <input type="checkbox" name="select_style" id="select_style" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="highlight_active">Highlight Active Line</label>
+      </td><td>
+        <input type="checkbox" name="highlight_active" id="highlight_active" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_hidden">Show Invisibles</label>
+      </td><td>
+        <input type="checkbox" name="show_hidden" id="show_hidden" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_hscroll">Persistent HScroll</label>
+      </td><td>
+        <input type="checkbox" name="show_hscroll" id="show_hscroll">
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="keybinding">Key Binding</label>
+      </td><td>
+        <select id="keybinding" size="1">
+          <option value="ace">Ace</option>
+          <option value="vim">Vim</option>
+          <option value="emacs">Emacs</option>
+          <option value="custom">Custom</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="soft_wrap">Soft Wrap</label>
+      </td><td>
+        <select id="soft_wrap" size="1">
+          <option value="off">Off</option>
+          <option value="40">40 Chars</option>
+          <option value="80">80 Chars</option>
+          <option value="free">Free</option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_gutter">Show Gutter</label>
+      </td><td>
+        <input type="checkbox" id="show_gutter" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="show_print_margin">Show Print Margin</label>
+      </td><td>
+        <input type="checkbox" id="show_print_margin" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="soft_tab">Use Soft Tab</label>
+      </td><td>
+        <input type="checkbox" id="soft_tab" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="highlight_selected_word">Highlight selected word</label>
+      </td>
+      <td>
+        <input type="checkbox" id="highlight_selected_word" checked>
+      </td>
+    </tr>
+    <tr>
+      <td >
+        <label for="enable_behaviours">Enable Behaviours</label>
+      </td>
+      <td>
+        <input type="checkbox" id="enable_behaviours">
+      </td>
+    </tr>
+    </table>
+
+    <div id="editor">
+    </div>
+        <script type="text/editor" id="csharptext">public void HelloWorld() {
+   //Say Hello!
+   Console.WriteLine("Hello World");
+}</script>
+    <script type="text/editor" id="jstext">function foo(items) {
+    for (var i=0; i<items.length; i++) {
+        alert(items[i] + "juhu");
+    }	// Real Tab.
+}</script>
+
+    <script type="text/editor" id="csstext">.text-layer {
+    font-family: Monaco, "Courier New", monospace;
+    font-size: 12px;
+    cursor: text;
+}</script>
+
+    <script type="text/editor" id="scsstext">/* style.scss */
+
+#navbar {
+    $navbar-width: 800px;
+    $items: 5;
+    $navbar-color: #ce4dd6;
+
+    width: $navbar-width;
+    border-bottom: 2px solid $navbar-color;
+
+    li {
+        float: left;
+        width: $navbar-width/$items - 10px;
+
+        background-color: lighten($navbar-color, 20%);
+        &:hover {
+            background-color: lighten($navbar-color, 10%);
+        }
+    }
+}</script>
+
+    <script type="text/editor" id="htmltext"><html>
+<head>
+
+<style type="text/css">
+.text-layer {
+    font-family: Monaco, "Courier New", monospace;
+    font-size: 12px;
+    cursor: text;
+}
+</style>
+
+</head>
+<body>
+    <h1 style="color:red">Juhu Kinners</h1>
+</body>
+</html></script>
+
+    <script type="text/editor" id="javatext">public class InfiniteLoop {
+
+    /*
+     * This will cause the program to hang...
+     *
+     * Taken from:
+     * http://www.exploringbinary.com/java-hangs-when-converting-2-2250738585072012e-308/
+     */
+    public static void main(String[] args) {
+        double d = Double.parseDouble("2.2250738585072012e-308");
+
+        // unreachable code
+        System.out.println("Value: " + d);
+    }
+}</script>
+
+    <script type="text/editor" id="pythontext">#!/usr/local/bin/python
+
+import string, sys
+
+# If no arguments were given, print a helpful message
+if len(sys.argv)==1:
+    print 'Usage: celsius temp1 temp2 ...'
+    sys.exit(0)
+
+# Loop over the arguments
+for i in sys.argv[1:]:
+    try:
+        fahrenheit=float(string.atoi(i))
+    except string.atoi_error:
+        print repr(i), "not a numeric value"
+    else:
+        celsius=(fahrenheit-32)*5.0/9.0
+        print '%i\260F = %i\260C' % (int(fahrenheit), int(celsius+.5))</script>
+
+    <script type="text/editor" id="phptext"><?php
+
+function nfact($n) {
+  if ($n == 0) {
+    return 1;
+  }
+  else {
+    return $n * nfact($n - 1);
+  }
+}
+
+echo "\n\nPlease enter a whole number ... ";
+$num = trim(fgets(STDIN));
+
+// ===== PROCESS - Determing the factorial of the input number =====
+$output = "\n\nFactorial " . $num . " = " . nfact($num) . "\n\n";
+echo $output;
+
+?></script>
+
+  <script type="text/editor" id="plaintext">Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur
+</script>
+
+    <script type="text/editor" id="rubytext">#!/usr/bin/ruby
+
+# Program to find the factorial of a number
+def fact(n)
+    if n == 0
+        1
+    else
+        n * fact(n-1)
+    end
+end
+
+puts fact(ARGV[0].to_i)
+</script>
+
+<script type="text/editor" id="cpptext">// compound assignment operators
+
+#include <iostream>
+using namespace std;
+
+int main ()
+{
+    int a, b=3; /* foobar */
+    a = b;
+    a+=2; // equivalent to a=a+2
+    cout << a;
+    return 0;
+}
+</script>
+
+<script type="text/editor" id="coffeetext">#!/usr/bin/env coffee
+
+try
+    throw URIError decodeURI(0xC0ffee * 123456.7e-8 / .9)
+catch e
+    console.log 'qstring' + "qqstring" + '''
+        qdoc
+    ''' + """
+        qqdoc
+    """
+
+do ->
+    ###
+    herecomment
+    ###
+    re = /regex/imgy.test ///
+        heregex  # comment
+    ///imgy
+    this isnt: `just JavaScript`
+    undefined</script>
+
+<script type="text/editor" id="jsontext">{
+ "query": {
+  "count": 10,
+  "created": "2011-06-21T08:10:46Z",
+  "lang": "en-US",
+  "results": {
+   "photo": [
+    {
+     "farm": "6",
+     "id": "5855620975",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "f1f5e8515d",
+     "server": "5110",
+     "title": "7087 bandit cat"
+    },
+    {
+     "farm": "4",
+     "id": "5856170534",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "ff1efb2a6f",
+     "server": "3217",
+     "title": "6975 rusty cat"
+    },
+    {
+     "farm": "6",
+     "id": "5856172972",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "51249875@N03",
+     "secret": "6c6887347c",
+     "server": "5192",
+     "title": "watermarked-cats"
+    },
+    {
+     "farm": "6",
+     "id": "5856168328",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "0c1cfdf64c",
+     "server": "5078",
+     "title": "7020 mandy cat"
+    },
+    {
+     "farm": "3",
+     "id": "5856171774",
+     "isfamily": "0",
+     "isfriend": "0",
+     "ispublic": "1",
+     "owner": "32021554@N04",
+     "secret": "7f5a3180ab",
+     "server": "2696",
+     "title": "7448 bobby cat"
+    }
+   ]
+  }
+ }
+}</script>
+
+<script type="text/editor" id="perltext">#!/usr/bin/perl
+use strict;
+use warnings;
+my $num_primes = 0;
+my @primes;
+
+# Put 2 as the first prime so we won't have an empty array
+$primes[$num_primes] = 2;
+$num_primes++;
+
+MAIN_LOOP:
+for my $number_to_check (3 .. 200)
+{
+    for my $p (0 .. ($num_primes-1))
+    {
+        if ($number_to_check % $primes[$p] == 0)
+        {
+            next MAIN_LOOP;
+        }
+    }
+
+    # If we reached this point it means $number_to_check is not
+    # divisable by any prime number that came before it.
+    $primes[$num_primes] = $number_to_check;
+    $num_primes++;
+}
+
+for my $p (0 .. ($num_primes-1))
+{
+    print $primes[$p], ", ";
+}
+print "\n";
+
+</script>
+
+<script type="text/editor" id="ocamltext">(*
+ * Example of early return implementation taken from
+ * http://ocaml.janestreet.com/?q=node/91
+ *)
+
+let with_return (type t) (f : _ -> t) =
+  let module M =
+     struct exception Return of t end
+  in
+  let return = { return = (fun x -> raise (M.Return x)); } in
+  try f return with M.Return x -> x
+
+
+(* Function that uses the 'early return' functionality provided by `with_return` *)
+let sum_until_first_negative list =
+  with_return (fun r ->
+    List.fold list ~init:0 ~f:(fun acc x ->
+      if x >= 0 then acc + x else r.return acc))
+</script>
+
+<script type="text/editor" id="clojuretext">(defn parting
+  "returns a String parting in a given language"
+  ([] (parting "World"))
+  ([name] (parting name "en"))
+  ([name language]
+    ; condp is similar to a case statement in other languages.
+    ; It is described in more detail later.
+    ; It is used here to take different actions based on whether the
+    ; parameter "language" is set to "en", "es" or something else.
+    (condp = language
+      "en" (str "Goodbye, " name)
+      "es" (str "Adios, " name)
+      (throw (IllegalArgumentException.
+        (str "unsupported language " language))))))
+
+(println (parting)) ; -> Goodbye, World
+(println (parting "Mark")) ; -> Goodbye, Mark
+(println (parting "Mark" "es")) ; -> Adios, Mark
+(println (parting "Mark", "xy")) ; -> java.lang.IllegalArgumentException: unsupported language xy</script>
+
+<script type="text/editor" id="svgtext"><svg
+  width="800" height="600"
+  xmlns="http://www.w3.org/2000/svg"
+  onload="StartAnimation(evt)">
+
+  <title>Test Tube Progress Bar</title>
+  <desc>Created for the Web Directions SVG competition</desc>
+
+  <script type="text/ecmascript"><![CDATA[
+    var timevalue = 0;
+    var timer_increment = 1;
+    var max_time = 100;
+    var hickory;
+    var dickory;
+    var dock;
+    var i;
+
+    function StartAnimation(evt) {
+        hickory  = evt.target.ownerDocument.getElementById("hickory");
+        dickory = evt.target.ownerDocument.getElementById("dickory");
+        dock = evt.target.ownerDocument.getElementById("dock");
+
+        ShowAndGrowElement();
+    }
+    function ShowAndGrowElement() {
+        timevalue = timevalue + timer_increment;
+        if (timevalue > max_time)
+            return;
+        // Scale the text string gradually until it is 20 times larger
+        scalefactor = (timevalue * 650) / max_time;
+
+        if (timevalue < 30) {
+            hickory.setAttribute("display", "");
+            hickory.setAttribute("transform", "translate(" + (600+scalefactor*3*-1 ) + ", -144 )");
+        }
+
+        if (timevalue > 30 && timevalue < 66) {
+            dickory.setAttribute("display", "");
+            dickory.setAttribute("transform", "translate(" + (-795+scalefactor*2) + ", 0 )");
+        }
+        if (timevalue > 66) {
+            dock.setAttribute("display", "");
+            dock.setAttribute("transform", "translate(" + (1450+scalefactor*2*-1) + ", 144 )");
+        }
+
+        // Call ShowAndGrowElement again <timer_increment> milliseconds later.
+        setTimeout("ShowAndGrowElement()", timer_increment)
+    }
+    window.ShowAndGrowElement = ShowAndGrowElement
+  ]]>&lt;/script>
+
+  <rect
+    fill="#2e3436"
+    fill-rule="nonzero"
+    stroke-width="3"
+    y="0"
+    x="0"
+    height="600"
+    width="800"
+    id="rect3590"/>
+
+    <text
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="50"
+       y="350"
+       id="hickory"
+       display="none">
+        Hickory,</text>
+    <text
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="50"
+       y="350"
+       id="dickory"
+       display="none">
+        dickory,</text>
+    <text
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
+       x="50"
+       y="350"
+       id="dock"
+       display="none">
+        dock!</text>
+</svg></script>
+<script type="text/editor" id="textiletext">h1. Textile document
+
+h2. Heading Two
+
+h3. A two-line
+    header
+
+h2. Another two-line
+header
+
+Paragraph:
+one, two,
+thee lines!
+
+p(classone two three). This is a paragraph with classes
+
+p(#id). (one with an id)
+
+p(one two three#my_id). ..classes + id
+
+* Unordered list
+** sublist
+* back again!
+** sublist again..
+
+# ordered
+
+bg. Blockquote!
+    This is a two-list blockquote..!
+
+</script>
+
+<script type="text/editor" id="groovy">
+//http://groovy.codehaus.org/Concurrency+with+Groovy
+import java.util.concurrent.atomic.AtomicInteger
+
+def counter = new AtomicInteger()
+
+synchronized out(message) {
+    println(message)
+}
+
+def th = Thread.start {
+    for( i in 1..8 ) {
+        sleep 30
+        out "thread loop $i"
+        counter.incrementAndGet()
+    }
+}
+
+for( j in 1..4 ) {
+    sleep 50
+    out "main loop $j"
+    counter.incrementAndGet()
+}
+
+th.join()
+
+assert counter.get() == 12
+</script>
+
+<script type="text/editor" id="scala">//http://www.scala-lang.org/node/227
+/* Defines a new method 'sort' for array objects */
+object implicits extends Application {
+  implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
+    new {
+      def sort(p: (A, A) => Boolean) = {
+        util.Sorting.stableSort(x, p); x
+      }
+    }
+  val x = Array(2, 3, 1, 4)
+  println("x = "+ x.sort((x: Int, y: Int) => x < y))
+}</script>
+  <input id="cockpitInput" type="text"/>
+
+<!-- DEVEL-->
+  <script type="text/javascript">
+      var require = {
+          paths: {
+              demo: "../demo",
+              ace: "../lib/ace",
+              cockpit: "../support/cockpit/lib/cockpit",
+              pilot: "../support/pilot/lib/pilot"
+          }
+      };
+  </script>
+  <script src="demo/require.js" data-main="demo/boot" type="text/javascript" charset="utf-8"></script>
+<!--DEVEL -->
+  
+<!--PACKAGE
+  <script src="demo/kitchen-sink.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" charset="utf-8">
+    require("demo/boot");
+  </script>
+PACKAGE-->
+
+</body>
+</html>

lib/ace/anchor.js

@@ -134,6 +134,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
     };
 
     this.setPosition = function(row, column, noClip) {
+        var pos;
         if (noClip) {
             pos = {
                 row: row,

lib/ace/css/editor.css

@@ -1,8 +1,7 @@
 .ace_editor {
     position: absolute;
     overflow: hidden;
-
-    font-family: "Menlo", "Monaco", "Courier New", monospace;
+    font-family: Monaco, "Menlo", "Courier New", monospace;
     font-size: 12px;
 }
 
@@ -81,6 +80,7 @@
     opacity: 0;
     background: transparent;
     appearance: none;
+    -moz-appearance: none;
     border: none;
     resize: none;
     outline: none;
@@ -97,7 +97,6 @@
 }
 
 .ace_text-layer {
-    font-family: Monaco, "Courier New", monospace;
     color: black;
 }
 
@@ -109,7 +108,7 @@
 .ace_cursor-layer {
     z-index: 4;
     cursor: text;
-    pointer-events: none;
+    /* setting pointer-events: none; here will break mouse wheel scrolling in Safari */
 }
 
 .ace_cursor {

lib/ace/document.js

@@ -87,7 +87,7 @@ var Document = function(text) {
 
 
     this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r?\n)/m);
+        var match = text.match(/^.*?(\r\n|\r|\n)/m);
         if (match) {
             this.$autoNewLine = match[1];
         } else {
@@ -111,7 +111,8 @@ var Document = function(text) {
     this.$autoNewLine = "\n";
     this.$newLineMode = "auto";
     this.setNewLineMode = function(newLineMode) {
-        if (this.$newLineMode === newLineMode) return;
+        if (this.$newLineMode === newLineMode)
+            return;
 
         this.$newLineMode = newLineMode;
     };
@@ -183,14 +184,12 @@ var Document = function(text) {
         var firstLine = lines.splice(0, 1)[0];
         var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
 
-        this._dispatchEvent("changeStart");
         position = this.insertInLine(position, firstLine);
         if (lastLine !== null) {
             position = this.insertNewLine(position); // terminate first line
             position = this.insertLines(position.row, lines);
             position = this.insertInLine(position, lastLine || "");
         }
-        this._dispatchEvent("changeEnd");
         return position;
     };
 
@@ -202,7 +201,6 @@ var Document = function(text) {
         args.push.apply(args, lines);
         this.$lines.splice.apply(this.$lines, args);
 
-        this._dispatchEvent("changeStart");
         var range = new Range(row, 0, row + lines.length, 0);
         var delta = {
             action: "insertLines",
@@ -210,7 +208,6 @@ var Document = function(text) {
             lines: lines
         };
         this._dispatchEvent("change", { data: delta });
-        this._dispatchEvent("changeEnd");
         return range.end;
     },
 
@@ -218,7 +215,6 @@ var Document = function(text) {
         position = this.$clipPosition(position);
         var line = this.$lines[position.row] || "";
 
-        this._dispatchEvent("changeStart");
         this.$lines[position.row] = line.substring(0, position.column);
         this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
 
@@ -233,7 +229,6 @@ var Document = function(text) {
             text: this.getNewLineCharacter()
         };
         this._dispatchEvent("change", { data: delta });
-        this._dispatchEvent("changeEnd");
 
         return end;
     };
@@ -244,7 +239,6 @@ var Document = function(text) {
 
         var line = this.$lines[position.row] || "";
 
-        this._dispatchEvent("changeStart");
         this.$lines[position.row] = line.substring(0, position.column) + text
                 + line.substring(position.column);
 
@@ -259,7 +253,6 @@ var Document = function(text) {
             text: text
         };
         this._dispatchEvent("change", { data: delta });
-        this._dispatchEvent("changeEnd");
 
         return end;
     };
@@ -275,7 +268,6 @@ var Document = function(text) {
         var firstRow = range.start.row;
         var lastRow = range.end.row;
 
-        this._dispatchEvent("changeStart");
         if (range.isMultiLine()) {
             var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
             var lastFullRow = lastRow - 1;
@@ -294,7 +286,6 @@ var Document = function(text) {
         else {
             this.removeInLine(firstRow, range.start.column, range.end.column);
         }
-        this._dispatchEvent("changeEnd");
         return range.start;
     };
 
@@ -306,7 +297,6 @@ var Document = function(text) {
         var line = this.getLine(row);
         var removed = line.substring(startColumn, endColumn);
         var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this._dispatchEvent("changeStart");
         this.$lines.splice(row, 1, newLine);
 
         var delta = {
@@ -315,7 +305,6 @@ var Document = function(text) {
             text: removed
         };
         this._dispatchEvent("change", { data: delta });
-        this._dispatchEvent("changeEnd");
         return range.start;
     };
 
@@ -327,7 +316,6 @@ var Document = function(text) {
      * @return {String[]} The removed lines
      */
     this.removeLines = function(firstRow, lastRow) {
-        this._dispatchEvent("changeStart");
         var range = new Range(firstRow, 0, lastRow + 1, 0);
         var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
 
@@ -338,7 +326,6 @@ var Document = function(text) {
             lines: removed
         };
         this._dispatchEvent("change", { data: delta });
-        this._dispatchEvent("changeEnd");
         return removed;
     };
 
@@ -349,7 +336,6 @@ var Document = function(text) {
         var range = new Range(row, firstLine.length, row+1, 0);
         var line = firstLine + secondLine;
 
-        this._dispatchEvent("changeStart");
         this.$lines.splice(row, 2, line);
 
         var delta = {
@@ -358,7 +344,6 @@ var Document = function(text) {
             text: this.getNewLineCharacter()
         };
         this._dispatchEvent("change", { data: delta });
-        this._dispatchEvent("changeEnd");
     };
 
     this.replace = function(range, text) {
@@ -370,7 +355,6 @@ var Document = function(text) {
         if (text == this.getTextRange(range))
             return range.end;
 
-        this._dispatchEvent("changeStart");
         this.remove(range);
         if (text) {
             var end = this.insert(range.start, text);
@@ -378,7 +362,6 @@ var Document = function(text) {
         else {
             end = range.start;
         }
-        this._dispatchEvent("changeEnd");
 
         return end;
     };

lib/ace/edit_session.js

@@ -56,7 +56,6 @@ var EditSession = function(text, mode) {
     this.$backMarkers = {};
     this.$markerId = 1;
     this.$rowCache = [];
-    this.$rowCacheSize = 1000;
     this.$wrapData = [];
     this.$foldData = [];
     this.$foldData.toString = function() {
@@ -66,7 +65,6 @@ var EditSession = function(text, mode) {
         });
         return str;
     }
-    this.$docChangeCounter = 0;
 
     if (text instanceof Document) {
         this.setDocument(text);
@@ -92,8 +90,6 @@ var EditSession = function(text, mode) {
 
         this.doc = doc;
         doc.on("change", this.onChange.bind(this));
-        doc.on("changeStart", this.onChangeStart.bind(this));
-        doc.on("changeEnd",   this.onChangeEnd.bind(this));
         this.on("changeFold", this.onChangeFold.bind(this));
     };
 
@@ -101,10 +97,6 @@ var EditSession = function(text, mode) {
         return this.doc;
     };
 
-    this.onChangeStart = function() {
-        this.$docChangeCounter ++;
-    };
-
     this.$resetRowCache = function(row) {
         if (row == 0) {
             this.$rowCache = [];
@@ -117,29 +109,6 @@ var EditSession = function(text, mode) {
                 return;
             }
         }
-    }
-
-    this.onChangeEnd = function() {
-        this.$docChangeCounter --;
-        if (this.$docChangeCounter == 0
-            && !this.$fromUndo && this.$undoManager)
-        {
-            if (this.$deltasFold.length) {
-                this.$deltas.push({
-                    group: "fold",
-                    deltas: this.$deltasFold
-                });
-                this.$deltasFold = [];
-            }
-            if (this.$deltasDoc) {
-                this.$deltas.push({
-                    group: "doc",
-                    deltas: this.$deltasDoc
-                });
-                this.$deltasDoc = [];
-            }
-            this.$informUndoManager.schedule();
-        }
     };
 
     this.onChangeFold = function(e) {
@@ -162,6 +131,8 @@ var EditSession = function(text, mode) {
                     folds:  removedFolds
                 });
             }
+            
+            this.$informUndoManager.schedule();
         }
 
         this.bgTokenizer.start(delta.range.start.row);
@@ -170,6 +141,9 @@ var EditSession = function(text, mode) {
 
     this.setValue = function(text) {
         this.doc.setValue(text);
+        this.selection.moveCursorTo(0, 0);
+        this.selection.clearSelection();
+        
         this.$resetRowCache(0);
         this.$deltas = [];
         this.$deltasDoc = [];
@@ -201,19 +175,37 @@ var EditSession = function(text, mode) {
         this.$deltasDoc = [];
         this.$deltasFold = [];
 
-        if (this.$informUndoManager) {
+        if (this.$informUndoManager)
             this.$informUndoManager.cancel();
-        }
 
         if (undoManager) {
             var self = this;
             this.$syncInformUndoManager = function() {
                 self.$informUndoManager.cancel();
-                if (self.$deltas.length > 0)
-                    undoManager.execute({
-                        action : "aceupdate",
-                        args   : [self.$deltas, self]
+                
+                if (self.$deltasFold.length) {
+                    self.$deltas.push({
+                        group: "fold",
+                        deltas: self.$deltasFold
                     });
+                    self.$deltasFold = [];
+                }
+                
+                if (self.$deltasDoc.length) {
+                    self.$deltas.push({
+                        group: "doc",
+                        deltas: self.$deltasDoc
+                    });
+                    self.$deltasDoc = [];
+                }
+                
+                if (self.$deltas.length > 0) {
+                    undoManager.execute({
+                        action: "aceupdate",
+                        args: [self.$deltas, self]
+                    });
+                }
+                
                 self.$deltas = [];
             }
             this.$informUndoManager =
@@ -392,9 +384,6 @@ var EditSession = function(text, mode) {
         }
     };
 
-    this.tokenRe = /^[\w\d]+/g;
-    this.nonTokenRe = /^(?:[^\w\d]|[\u3040-\u309F]|[\u30A0-\u30FF]|[\u4E00-\u9FFF\uF900-\uFAFF\u3400-\u4DBF])+/g;
-
     this.getWordRange = function(row, column) {
         var line = this.getLine(row);
 
@@ -485,6 +474,9 @@ var EditSession = function(text, mode) {
 
         this.bgTokenizer.setDocument(this.getDocument());
         this.bgTokenizer.start(0);
+        
+        this.tokenRe = mode.tokenRe;
+        this.nonTokenRe = mode.nonTokenRe;
 
         this._dispatchEvent("changeMode");
     };
@@ -898,6 +890,28 @@ var EditSession = function(text, mode) {
     this.$clipRowToDocument = function(row) {
         return Math.max(0, Math.min(row, this.doc.getLength()-1));
     };
+    
+    this.$clipPositionToDocument = function(row, column) {
+        column = Math.max(0, column);
+
+        if (row < 0) {
+            row = 0;
+            column = 0;
+        } else {
+            var len = this.doc.getLength();
+            if (row >= len) {
+                row = len - 1;
+                column = this.doc.getLine(len-1).length;
+            } else {
+                column = Math.min(this.doc.getLine(row).length, column);
+            }
+        }
+        
+        return {
+            row: row,
+            column: column
+        };
+    };
 
     // WRAPMODE
     this.$wrapLimit = 80;
@@ -1352,6 +1366,9 @@ var EditSession = function(text, mode) {
         return [screenColumn, column];
     }
 
+    /**
+     * Returns the number of rows required to render this row on the screen
+     */
     this.getRowLength = function(row) {
         if (!this.$useWrapMode || !this.$wrapData[row]) {
             return 1;
@@ -1360,15 +1377,16 @@ var EditSession = function(text, mode) {
         }
     }
 
+    /**
+     * Returns the height in pixels required to render this row on the screen
+     **/
     this.getRowHeight = function(config, row) {
         return this.getRowLength(row) * config.lineHeight;
     }
 
     this.getScreenLastRowColumn = function(screenRow) {
-        // Note: This won't work if someone has more then
-        // 1.7976931348623158e+307 characters in one row. But I think we can
-        // live with this limitation ;)
-        return this.screenToDocumentColumn(screenRow, Number.MAX_VALUE / 10)
+        //return this.screenToDocumentColumn(screenRow, Number.MAX_VALUE / 10)
+        return this.documentToScreenColumn(screenRow, this.doc.getLine(screenRow).length);
     };
 
     this.getDocumentLastRowColumn = function(docRow, docColumn) {
@@ -1405,6 +1423,13 @@ var EditSession = function(text, mode) {
     };
 
     this.screenToDocumentPosition = function(screenRow, screenColumn) {
+        if (screenRow < 0) {
+            return {
+                row: 0,
+                column: 0
+            }
+        }
+        
         var line;
         var docRow = 0;
         var docColumn = 0;
@@ -1412,45 +1437,44 @@ var EditSession = function(text, mode) {
         var foldLineRowLength;
         var row = 0;
         var rowLength = 0;
-        var splits = null;
 
         var rowCache = this.$rowCache;
-        var doCache = !rowCache.length;
         for (var i = 0; i < rowCache.length; i++) {
             if (rowCache[i].screenRow < screenRow) {
                 row = rowCache[i].screenRow;
                 docRow = rowCache[i].docRow;
-                doCache = i == rowCache.length - 1;
+            }
+            else {
+                break;
             }
         }
-        var docRowCacheLast = docRow;
+        var doCache = !rowCache.length || i == rowCache.length;
+        
         // clamp row before clamping column, for selection on last line
         var maxRow = this.getLength() - 1;
 
         var foldLine = this.getNextFold(docRow);
-        var foldStart = foldLine ?foldLine.start.row :Infinity;
+        var foldStart = foldLine ? foldLine.start.row : Infinity;
 
         while (row <= screenRow) {
-            if (doCache
-                && docRow - docRowCacheLast > this.$rowCacheSize) {
-                rowCache.push({
-                    docRow: docRow,
-                    screenRow: row
-                });
-                docRowCacheLast = docRow;
-            }
             rowLength = this.getRowLength(docRow);
             if (row + rowLength - 1 >= screenRow || docRow >= maxRow) {
                 break;
             } else {
                 row += rowLength;
                 docRow++;
-                if(docRow > foldStart) {
+                if (docRow > foldStart) {
                     docRow = foldLine.end.row+1;
                     foldLine = this.getNextFold(docRow);
-                    foldStart = foldLine ?foldLine.start.row :Infinity;
+                    foldStart = foldLine ? foldLine.start.row : Infinity;
                 }
             }
+            if (doCache) {
+                rowCache.push({
+                    docRow: docRow,
+                    screenRow: row
+                });
+            }
         }
 
         if (foldLine && foldLine.start.row <= docRow)
@@ -1460,6 +1484,7 @@ var EditSession = function(text, mode) {
             foldLine = null;
         }
 
+        var splits = [];
         if (this.$useWrapMode) {
             splits = this.$wrapData[docRow];
             if (splits) {
@@ -1473,6 +1498,10 @@ var EditSession = function(text, mode) {
 
         docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
 
+        // clip row at the end of the document
+        if (row + splits.length < screenRow)
+            docColumn = Number.MAX_VALUE;
+
         // Need to do some clamping action here.
         if (this.$useWrapMode) {
             if (docColumn >= column) {
@@ -1488,7 +1517,7 @@ var EditSession = function(text, mode) {
         if (foldLine) {
             return foldLine.idxToPosition(docColumn);
         }
-
+        
         return {
             row: docRow,
             column: docColumn
@@ -1497,10 +1526,15 @@ var EditSession = function(text, mode) {
 
     this.documentToScreenPosition = function(docRow, docColumn) {
         // Normalize the passed in arguments.
-        if (docColumn == null) {
-            docColumn = docRow.column;
-            docRow = docRow.row;
-        }
+        if (typeof docColumn === "undefined")
+            var pos = this.$clipPositionToDocument(docRow.row, docRow.column);
+        else 
+            pos = this.$clipPositionToDocument(docRow, docColumn);
+
+        docRow = pos.row;
+        docColumn = pos.column;
+        
+        var LL = this.$rowCache.length;
 
         var wrapData;
         // Special case in wrapMode if the doc is at the end of the document.
@@ -1530,16 +1564,16 @@ var EditSession = function(text, mode) {
 
         var rowEnd, row = 0;
         var rowCache = this.$rowCache;
-        //
-        var doCache = !rowCache.length;
+
         for (var i = 0; i < rowCache.length; i++) {
             if (rowCache[i].docRow < docRow) {
                 screenRow = rowCache[i].screenRow;
                 row = rowCache[i].docRow;
-                doCache = i == rowCache.length - 1;
+            } else {
+                break;
             }
         }
-        var docRowCacheLast = row;
+        var doCache = !rowCache.length || i == rowCache.length;
 
         var foldLine = this.getNextFold(row);
         var foldStart = foldLine ?foldLine.start.row :Infinity;
@@ -1551,20 +1585,20 @@ var EditSession = function(text, mode) {
                     break;
                 foldLine = this.getNextFold(rowEnd);
                 foldStart = foldLine ?foldLine.start.row :Infinity;
-            } else {
-                rowEnd = row + 1;
             }
-            if (doCache
-                && row - docRowCacheLast > this.$rowCacheSize) {
-                rowCache.push({
-                    docRow: row,
-                    screenRow: screenRow
-                });
-                docRowCacheLast = row;
+            else {
+                rowEnd = row + 1;
             }
 
             screenRow += this.getRowLength(row);
             row = rowEnd;
+                        
+            if (doCache) {
+                rowCache.push({
+                    docRow: row,
+                    screenRow: screenRow
+                });
+            }
         }
 
         // Calculate the text line that is displayed in docRow on the screen.
@@ -1586,7 +1620,8 @@ var EditSession = function(text, mode) {
                 screenRowOffset++;
             }
             textLine = textLine.substring(
-                wrapRow[screenRowOffset - 1] || 0,  textLine.length);
+                wrapRow[screenRowOffset - 1] || 0, textLine.length
+            );
         }
 
         return {

lib/ace/edit_session/fold.js

@@ -0,0 +1,79 @@
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *      Julian Viereck <julian DOT viereck AT gmail DOT com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module) {
+
+/**
+ * Simple fold-data struct.
+ **/
+var Fold = exports.Fold = function(range, placeholder) {
+    this.foldLine = null;
+    this.placeholder = placeholder;
+    this.range = range;
+    this.start = range.start;
+    this.end = range.end;
+
+    this.sameRow = range.start.row == range.end.row;
+    this.subFolds = [];
+};
+
+(function() {
+
+    this.toString = function() {
+        return '"' + this.placeholder + '" ' + this.range.toString();
+    };
+
+    this.setFoldLine = function(foldLine) {
+        this.foldLine = foldLine;
+        this.subFolds.forEach(function(fold) {
+            fold.setFoldLine(foldLine);
+        });
+    };
+
+    this.clone = function() {
+        var range = this.range.clone();
+        var fold = new Fold(range, this.placeholder);
+        this.subFolds.forEach(function(subFold) {
+            fold.subFolds.push(subFold.clone());
+        });
+        return fold;
+    };
+
+}).call(Fold.prototype);
+
+});

lib/ace/edit_session/folding.js

@@ -40,40 +40,7 @@ define(function(require, exports, module) {
 
 var Range = require("ace/range").Range;
 var FoldLine = require("ace/edit_session/fold_line").FoldLine;
-
-/**
- * Simple fold-data struct.
- **/
-function Fold(range, placeholder) {
-    this.foldLine = null;
-    this.placeholder = placeholder;
-    this.range = range;
-    this.start = range.start;
-    this.end = range.end;
-
-    this.sameRow = range.start.row == range.end.row;
-    this.subFolds = [];
-}
-
-Fold.prototype.toString = function() {
-    return '"' + this.placeholder + '" ' + this.range.toString();
-}
-
-Fold.prototype.setFoldLine = function(foldLine) {
-    this.foldLine = foldLine;
-    this.subFolds.forEach(function(fold) {
-        fold.setFoldLine(foldLine);
-    });
-}
-
-Fold.prototype.clone = function() {
-    var range = this.range.clone();
-    var fold = new Fold(range, this.placeholder);
-    this.subFolds.forEach(function(subFold) {
-        fold.subFolds.push(subFold.clone());
-    });
-    return fold;
-}
+var Fold = require("ace/edit_session/fold").Fold;
 
 function Folding() {
     /**
@@ -83,25 +50,22 @@ function Folding() {
      */
     this.getFoldAt = function(row, column, side) {
         var foldLine = this.getFoldLine(row);
-        if (foldLine) {
-            var folds = foldLine.folds,
-                fold;
-
-            for (var i = 0; i < folds.length; i++) {
-                fold = folds[i];
-                if (fold.range.contains(row, column)) {
-                    if (side == 1 && fold.range.isEnd(row, column)) {
-                        continue;
-                    } else if (side == -1 && fold.range.isStart(row, column)) {
-                        continue;
-                    }
-                    return fold;
-                }
-            }
-        } else {
+        if (!foldLine)
             return null;
+            
+        var folds = foldLine.folds;
+        for (var i = 0; i < folds.length; i++) {
+            var fold = folds[i];
+            if (fold.range.contains(row, column)) {
+                if (side == 1 && fold.range.isEnd(row, column)) {
+                    continue;
+                } else if (side == -1 && fold.range.isStart(row, column)) {
+                    continue;
+                }
+                return fold;
+            }
         }
-    }
+    };
 
     /**
      * Returns all folds in the given range. Note, that this will return folds
@@ -109,33 +73,30 @@ function Folding() {
      */
     this.getFoldsInRange = function(range) {
         range = range.clone();
-        var start = range.start,
-            end = range.end;
-        var foldLines = this.$foldData,
-            folds,
-            fold;
-        var cmp,
-            foundFolds = [];
+        var start = range.start;
+        var end = range.end;
+        var foldLines = this.$foldData;
+        var foundFolds = [];
 
         start.column += 1;
         end.column -= 1;
 
         for (var i = 0; i < foldLines.length; i++) {
-            cmp = foldLines[i].range.compareRange(range);
-            // Range is before foldLine. No intersection. This means,
-            // there might be other foldLines that intersect.
+            var cmp = foldLines[i].range.compareRange(range);
             if (cmp == 2) {
+                // Range is before foldLine. No intersection. This means,
+                // there might be other foldLines that intersect.
                 continue;
-            } else
-            // Range is after foldLine. There can't be any other foldLines then,
-            // so let's give up.
-            if (cmp == -2) {
+            }
+            else if (cmp == -2) {
+                // Range is after foldLine. There can't be any other foldLines then,
+                // so let's give up.
                 break;
             }
 
-            folds = foldLines[i].folds;
+            var folds = foldLines[i].folds;
             for (var j = 0; j < folds.length; j++) {
-                fold = folds[j];
+                var fold = folds[j];
                 cmp = fold.range.compareRange(range);
                 if (cmp == -2) {
                     break;
@@ -171,46 +132,44 @@ function Folding() {
      */
     this.getFoldStringAt = function(row, column, trim, foldLine) {
         var foldLine = foldLine || this.getFoldLine(row);
-        if (!foldLine) {
+        if (!foldLine)
             return null;
-        } else {
-            var fold, lastFold, cmp, str;
-            lastFold = {
-                end: { column: 0 }
-            };
-            // TODO: Refactor to use getNextFoldTo function.
-            for (var i = 0; i < foldLine.folds.length; i++) {
-                fold = foldLine.folds[i];
-                cmp = fold.range.compareEnd(row, column);
-                if (cmp == -1) {
-                    str = this.getLine(fold.start.row).
-                                substring(lastFold.end.column, fold.start.column);
-                    break;
-                } else if (cmp == 0) {
-                    return null;
-                }
-                lastFold = fold;
+            
+        var lastFold = {
+            end: { column: 0 }
+        };
+        // TODO: Refactor to use getNextFoldTo function.
+        for (var i = 0; i < foldLine.folds.length; i++) {
+            var fold = foldLine.folds[i];
+            var cmp = fold.range.compareEnd(row, column);
+            if (cmp == -1) {
+                var str = this
+                    .getLine(fold.start.row)
+                    .substring(lastFold.end.column, fold.start.column);
+                break;
             }
-            if (!str) {
-                str = this.getLine(fold.start.row).
-                                substring(lastFold.end.column);
-            }
-            if (trim == -1) {
-                return str.substring(0, column - lastFold.end.column);
-            } else if (trim == 1) {
-                return str.substring(column - lastFold.end.column)
-            } else {
-                return str;
+            else if (cmp == 0) {
+                return null;
             }
+            lastFold = fold;
         }
+        if (!str)
+            str = this.getLine(fold.start.row).substring(lastFold.end.column);
+
+        if (trim == -1)
+            return str.substring(0, column - lastFold.end.column);
+        else if (trim == 1)
+            return str.substring(column - lastFold.end.column)
+        else
+            return str;
     }
 
     this.getFoldLine = function(docRow, startFoldLine) {
         var foldData = this.$foldData;
         var i = 0;
-        if(startFoldLine)
+        if (startFoldLine)
             i = foldData.indexOf(startFoldLine);
-        if(i == -1)
+        if (i == -1)
             i = 0;
         for (i; i < foldData.length; i++) {
             var foldLine = foldData[i];
@@ -227,9 +186,9 @@ function Folding() {
     this.getNextFold = function(docRow, startFoldLine) {
         var foldData = this.$foldData, ans;
         var i = 0;
-        if(startFoldLine)
+        if (startFoldLine)
             i = foldData.indexOf(startFoldLine);
-        if(i == -1)
+        if (i == -1)
             i = 0;
         for (i; i < foldData.length; i++) {
             var foldLine = foldData[i];
@@ -246,7 +205,7 @@ function Folding() {
             var foldLine = foldData[i],
                 end = foldLine.end.row,
                 start = foldLine.start.row;
-            if(end >= last) {
+            if (end >= last) {
                 if(start < last) {
                     if(start >= first)
                         rowCount -= last-start;
@@ -279,76 +238,52 @@ function Folding() {
      *      The new created Fold object or an existing fold object in case the
      *      passed in range fits an existing fold exactly.
      */
-    this.addFold = function(placeholder, startRow, startColumn, endRow, endColumn) {
-        var range;
+    this.addFold = function(placeholder, range) {
         var foldData = this.$foldData;
-        var foldRow  = null;
-        var foldLine;
-        var fold;
-        var argsFold;
-        var folds;
         var added = false;
 
-        if (placeholder instanceof Fold) {
-            argsFold = placeholder;
-            startRow = argsFold.range;
-            placeholder = argsFold.placeholder;
-        }
-
-        // Normalize parameters.
-        if (!(startRow instanceof Range)) {
-            range = new Range(startRow, startColumn, endRow, endColumn);
-        } else {
-            range = startRow;
-            startRow = range.start.row;
-            startColumn = range.start.column;
-            endRow = range.end.row;
-            endColumn = range.end.column;
-        }
+        if (placeholder instanceof Fold)
+            var fold = placeholder;
+        else
+            fold = new Fold(range, placeholder);
 
+        var startRow = fold.start.row;
+        var startColumn = fold.start.column;
+        var endRow = fold.end.row;
+        var endColumn = fold.end.column;
+        
         // --- Some checking ---
-        if (placeholder.length < 2) {
+        if (fold.placeholder.length < 2)
             throw "Placeholder has to be at least 2 characters";
-        }
 
-        if (startRow == endRow && endColumn - startColumn < 2) {
+        if (startRow == endRow && endColumn - startColumn < 2)
             throw "The range has to be at least 2 characters width";
-        }
 
-        fold = this.getFoldAt(startRow, startColumn, 1);
-        if (fold
-            && fold.range.isEnd(endRow, endColumn)
-            && fold.range.isStart(startRow, startColumn))
-        {
+        var existingFold = this.getFoldAt(startRow, startColumn, 1);
+        if (
+            existingFold
+            && existingFold.range.isEnd(endRow, endColumn)
+            && existingFold.range.isStart(startRow, startColumn)
+        ) {
             return fold;
         }
 
-        fold = this.getFoldAt(startRow, startColumn, 1);
-        if (fold && !fold.range.isStart(startRow, startColumn)) {
+        existingFold = this.getFoldAt(startRow, startColumn, 1);
+        if (existingFold && !existingFold.range.isStart(startRow, startColumn))
             throw "A fold can't start inside of an already existing fold";
-        }
 
-        fold = this.getFoldAt(endRow, endColumn, -1);
-        if (fold && !fold.range.isEnd(endRow, endColumn)) {
+        existingFold = this.getFoldAt(endRow, endColumn, -1);
+        if (existingFold && !existingFold.range.isEnd(endRow, endColumn))
             throw "A fold can't end inside of an already existing fold";
-        }
 
-        if (endRow >= this.doc.getLength()) {
+        if (endRow >= this.doc.getLength())
             throw "End of fold is outside of the document.";
-        }
 
-        if (endColumn > this.getLine(endRow).length
-            || startColumn > this.getLine(startRow).length)
-        {
+        if (endColumn > this.getLine(endRow).length || startColumn > this.getLine(startRow).length)
             throw "End of fold is outside of the document.";
-        }
-
-        // --- Start adding the fold ---
-        // Use the passed in fold or create a new one.
-        fold = argsFold || new Fold(range, placeholder);
 
         // Check if there are folds in the range we create the new fold for.
-        folds = this.getFoldsInRange(range);
+        var folds = this.getFoldsInRange(fold.range);
         if (folds.length > 0) {
             // Remove the folds from fold data.
             this.removeFolds(folds);
@@ -357,12 +292,13 @@ function Folding() {
         }
 
         for (var i = 0; i < foldData.length; i++) {
-            foldLine = foldData[i];
+            var foldLine = foldData[i];
             if (endRow == foldLine.start.row) {
                 foldLine.addFold(fold);
                 added = true;
                 break;
-            } else if (startRow == foldLine.end.row) {
+            }
+            else if (startRow == foldLine.end.row) {
                 foldLine.addFold(fold);
                 added = true;
                 if (!fold.sameRow) {
@@ -375,18 +311,17 @@ function Folding() {
                     }
                 }
                 break;
-            } else if (endRow <= foldLine.start.row) {
+            }
+            else if (endRow <= foldLine.start.row) {
                 break;
             }
         }
 
-        if (!added) {
+        if (!added)
             foldLine = this.$addFoldLine(new FoldLine(this.$foldData, fold));
-        }
 
-        if (this.$useWrapMode) {
+        if (this.$useWrapMode)
             this.$updateWrapData(foldLine.start.row, foldLine.start.row);
-        }
 
         // Notify that fold data has changed.
         this.$modified = true;

lib/ace/edit_session_test.js

@@ -155,6 +155,18 @@ module.exports = {
         assert.equal(session.getValue(), ["1", "1", "2", "3"].join("\n"));
     },
 
+    "test: getScreenLastRowColumn": function() {
+        var session = new EditSession([
+            "juhu",
+            "12\t\t34",
+            "ぁぁa"
+        ]);
+        
+        assert.equal(session.getScreenLastRowColumn(0), 4);
+        assert.equal(session.getScreenLastRowColumn(1), 10);
+        assert.equal(session.getScreenLastRowColumn(2), 5);
+    },
+
     "test: convert document to screen coordinates" : function() {
         var session = new EditSession("01234\t567890\t1234");
         session.setTabSize(4);
@@ -187,9 +199,20 @@ module.exports = {
         assert.equal(session.documentToScreenColumn(0, 3), 9);
     },
 
-    "test: documentToScreen with soft wrap and multibyte characters": function() {
-        var tabSize = 4;
-        var wrapLimit = 12;
+    "test: documentToScreen without soft wrap": function() {
+        var session = new EditSession([
+            "juhu",
+            "12\t\t34",
+            "ぁぁa"
+        ]);
+        
+        assert.position(session.documentToScreenPosition(0, 3), 0, 3);
+        assert.position(session.documentToScreenPosition(1, 3), 1, 4);
+        assert.position(session.documentToScreenPosition(1, 4), 1, 8);
+        assert.position(session.documentToScreenPosition(2, 2), 2, 4);
+    },
+    
+    "test: documentToScreen with soft wrap": function() {
         var session = new EditSession(["foo bar foo bar"]);
         session.setUseWrapMode(true);
         session.setWrapLimitRange(12, 12);
@@ -197,6 +220,9 @@ module.exports = {
 
         assert.position(session.documentToScreenPosition(0, 11), 0, 11);
         assert.position(session.documentToScreenPosition(0, 12), 1, 0);
+    },
+    
+    "test: documentToScreen with soft wrap and multibyte characters": function() {
 
         session = new EditSession(["ぁぁa"]);
         session.setUseWrapMode(true);
@@ -208,6 +234,13 @@ module.exports = {
         assert.position(session.documentToScreenPosition(0, 4), 2, 1);
     },
 
+    "test: documentToScreen should clip position to the document boundaries": function() {
+        var session = new EditSession("foo bar\njuhu kinners");
+        
+        assert.position(session.documentToScreenPosition(-1, 4), 0, 0);
+        assert.position(session.documentToScreenPosition(3, 0), 1, 12);
+    },
+
     "test: convert screen to document coordinates" : function() {
         var session = new EditSession("01234\t567890\t1234");
         session.setTabSize(4);
@@ -233,9 +266,7 @@ module.exports = {
         assert.equal(session.screenToDocumentColumn(0, 14), 13);
     },
 
-    "test: screenToDocument with soft wrap and multi byte characters": function() {
-        var tabSize = 4;
-        var wrapLimit = 12;
+    "test: screenToDocument with soft wrap": function() {
         var session = new EditSession(["foo bar foo bar"]);
         session.setUseWrapMode(true);
         session.setWrapLimitRange(12, 12);
@@ -246,7 +277,9 @@ module.exports = {
         // Check if the position is clamped the right way.
         assert.position(session.screenToDocumentPosition(0, 12), 0, 11);
         assert.position(session.screenToDocumentPosition(0, 20), 0, 11);
-
+    },
+    
+    "test: screenToDocument with soft wrap and multi byte characters": function() {
         session = new EditSession(["ぁ a"]);
         session.setUseWrapMode(true);
         session.adjustWrapLimit(80);
@@ -257,6 +290,18 @@ module.exports = {
         assert.position(session.screenToDocumentPosition(0, 4), 0, 3);
         assert.position(session.screenToDocumentPosition(0, 5), 0, 3);
     },
+    
+    "test: screenToDocument should clip position to the document boundaries": function() {
+        var session = new EditSession("foo bar\njuhu kinners");
+        
+        assert.position(session.screenToDocumentPosition(-1, 4), 0, 0);
+        assert.position(session.screenToDocumentPosition(0, -1), 0, 0);
+        assert.position(session.screenToDocumentPosition(0, 30), 0, 7);
+        assert.position(session.screenToDocumentPosition(2, 4), 1, 12);
+        assert.position(session.screenToDocumentPosition(1, 30), 1, 12);
+        assert.position(session.screenToDocumentPosition(20, 50), 1, 12);
+        assert.position(session.screenToDocumentPosition(20, 5), 1, 12);
+    },
 
     "test: wrapLine split function" : function() {
         var splits;
@@ -526,9 +571,10 @@ module.exports = {
 
     "test fold one-line text insert": function() {
         // These are mostly test for the FoldLine.addRemoveChars function.
-        var session = createFoldTestSession(),
-            undoManager = session.getUndoManager(),
-            foldLines = session.$foldData;
+        var session = createFoldTestSession();
+        var undoManager = session.getUndoManager();
+        var foldLines = session.$foldData;
+        
         function insert(row, column, text) {
             session.insert({row: row, column: column}, text);
 
@@ -731,45 +777,45 @@ module.exports = {
 
         // Adding a fold. The split position is inside of the fold. As placeholder
         // are not splitable, the split should be before the split.
-        session.addFold("woot", 0, 4, 0, 15);
+        session.addFold("woot", new Range(0, 4, 0, 15));
         assertWrap([4], [8], [8]);
 
         // Remove the fold again which should reset the wrapData.
         removeFoldAssertWrap(0, 4, [8], [8], [8]);
 
-        session.addFold("woot", 0, 6, 0, 9);
+        session.addFold("woot", new Range(0, 6, 0, 9));
         assertWrap([6, 13], [8], [8]);
         removeFoldAssertWrap(0, 6, [8], [8], [8]);
 
         // The fold fits into the wrap limit - no split expected.
-        session.addFold("woot", 0, 3, 0, 15);
+        session.addFold("woot", new Range(0, 3, 0, 15));
         assertWrap([], [8], [8]);
         removeFoldAssertWrap(0, 4, [8], [8], [8]);
 
         // Fold after split position should be all fine.
-        session.addFold("woot", 0, 8, 0, 15);
+        session.addFold("woot", new Range(0, 8, 0, 15));
         assertWrap([8], [8], [8]);
         removeFoldAssertWrap(0, 8, [8], [8], [8]);
 
         // Fold's placeholder is far too long for wrapSplit.
-        session.addFold("woot0123456789", 0, 8, 0, 15);
+        session.addFold("woot0123456789", new Range(0, 8, 0, 15));
         assertWrap([8], [8], [8]);
         removeFoldAssertWrap(0, 8, [8], [8], [8]);
 
         // Fold's placeholder is far too long for wrapSplit
         // + content at the end of the line
-        session.addFold("woot0123456789", 0, 6, 0, 8);
+        session.addFold("woot0123456789", new Range(0, 6, 0, 8));
         assertWrap([6, 20], [8], [8]);
         removeFoldAssertWrap(0, 8, [8], [8], [8]);
 
-        session.addFold("woot0123456789", 0, 6, 0, 8);
-        session.addFold("woot0123456789", 0, 8, 0, 10);
+        session.addFold("woot0123456789", new Range(0, 6, 0, 8));
+        session.addFold("woot0123456789", new Range(0, 8, 0, 10));
         assertWrap([6, 20, 34], [8], [8]);
         session.removeFold(session.getFoldAt(0, 7));
         removeFoldAssertWrap(0, 8, [8], [8], [8]);
 
-        session.addFold("woot0123456789", 0, 7, 0, 9);
-        session.addFold("woot0123456789", 0, 13, 0, 15);
+        session.addFold("woot0123456789", new Range(0, 7, 0, 9));
+        session.addFold("woot0123456789", new Range(0, 13, 0, 15));
         assertWrap([7, 21, 25], [8], [8]);
         session.removeFold(session.getFoldAt(0, 7));
         removeFoldAssertWrap(0, 14, [8], [8], [8]);
@@ -778,15 +824,15 @@ module.exports = {
 
         // Add a fold over two lines. Note, that the wrapData[1] stays the
         // same. This is an implementation detail and expected behavior.
-        session.addFold("woot", 0, 8, 1, 15);
+        session.addFold("woot", new Range(0, 8, 1, 15));
         assertWrap([8], [8 /* See comments */], [8]);
         removeFoldAssertWrap(0, 8, [8], [8], [8]);
 
-        session.addFold("woot", 0, 9, 1, 11);
+        session.addFold("woot", new Range(0, 9, 1, 11));
         assertWrap([8, 14], [8 /* See comments */], [8]);
         removeFoldAssertWrap(0, 9, [8], [8], [8]);
 
-        session.addFold("woot", 0, 9, 1, 15);
+        session.addFold("woot", new Range(0, 9, 1, 15));
         assertWrap([8], [8 /* See comments */], [8]);
         removeFoldAssertWrap(0, 9, [8], [8], [8]);
 
@@ -797,14 +843,10 @@ module.exports = {
         var session = createFoldTestSession();
         var fold;
 
-        function tryAddFold(
-            placeholder,
-            startRow, startColumn, endRow, endColumn, shouldFail)
-        {
+        function tryAddFold(placeholder, range, shouldFail) {
             var fail = false;
             try {
-                fold = session.addFold(placeholder,
-                    startRow, startColumn, endRow, endColumn);
+                fold = session.addFold(placeholder, range);
             } catch (e) {
                 fail = true;
             }
@@ -813,19 +855,19 @@ module.exports = {
             }
         }
 
-        tryAddFold("foo", 0, 13, 0, 17, true);
-        tryAddFold("foo", 0, 14, 0, 18, true);
-        tryAddFold("foo", 0, 13, 0, 18, false);
+        tryAddFold("foo", new Range(0, 13, 0, 17), true);
+        tryAddFold("foo", new Range(0, 14, 0, 18), true);
+        tryAddFold("foo", new Range(0, 13, 0, 18), false);
         assert.equal(session.$foldData[0].folds.length, 1);
 
-        tryAddFold("f", 0, 13, 0, 18, true);
-        tryAddFold("foo", 0, 18, 0, 21, false);
+        tryAddFold("f", new Range(0, 13, 0, 18), true);
+        tryAddFold("foo", new Range(0, 18, 0, 21), false);
         assert.equal(session.$foldData[0].folds.length, 2);
         session.removeFold(fold);
 
-        tryAddFold("foo", 0, 18, 0, 22, true);
-        tryAddFold("foo", 0, 18, 0, 19, true);
-        tryAddFold("foo", 0, 22, 1, 10, true);
+        tryAddFold("foo", new Range(0, 18, 0, 22), true);
+        tryAddFold("foo", new Range(0, 18, 0, 19), true);
+        tryAddFold("foo", new Range(0, 22, 1, 10), true);
     },
 
     "test add subfolds": function() {
@@ -835,7 +877,7 @@ module.exports = {
 
         oldFold = foldData[0].folds[0];
 
-        fold = session.addFold("fold0", 0, 10, 0, 21);
+        fold = session.addFold("fold0", new Range(0, 10, 0, 21));
         assert.equal(foldData[0].folds.length, 1);
         assert.equal(fold.subFolds.length, 1);
         assert.equal(fold.subFolds[0], oldFold);
@@ -845,7 +887,7 @@ module.exports = {
         assert.equal(foldData[0].folds[0], oldFold);
         assert.equal(fold.subFolds.length, 0);
 
-        fold = session.addFold("fold0", 0, 13, 2, 10);
+        fold = session.addFold("fold0", new Range(0, 13, 2, 10));
         assert.equal(foldData.length, 1);
         assert.equal(fold.subFolds.length, 2);
         assert.equal(fold.subFolds[0], oldFold);
@@ -861,5 +903,5 @@ module.exports = {
 });
 
 if (typeof module !== "undefined" && module === require.main) {
-    require("asyncjs/test").testcase(module.exports).exec()
+    require("asyncjs").test.testcase(module.exports).exec()
 }

lib/ace/editor.js

@@ -115,7 +115,8 @@ var Editor =function(renderer, session) {
     };
 
     this.setSession = function(session) {
-        if (this.session == session) return;
+        if (this.session == session)
+            return;
 
         if (this.session) {
             var oldSession = this.session;
@@ -253,7 +254,7 @@ var Editor =function(renderer, session) {
             var pos = self.session.findMatchingBracket(self.getCursorPosition());
             if (pos) {
                 var range = new Range(pos.row, pos.column, pos.row, pos.column+1);
-                self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket");
+                self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text");
             }
         }, 10);
     };
@@ -271,6 +272,10 @@ var Editor =function(renderer, session) {
         }
         this.textInput.focus();
     };
+    
+    this.isFocused = function() {
+        return this.textInput.isFocused();
+    };
 
     this.blur = function() {
         this.textInput.blur();
@@ -339,7 +344,7 @@ var Editor =function(renderer, session) {
             } else {
                 range = new Range(cursor.row, 0, cursor.row+1, 0);
             }
-            session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "line");
+            session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
         }
     };
 
@@ -426,14 +431,14 @@ var Editor =function(renderer, session) {
         var mode = session.getMode();
 
         var cursor = this.getCursorPosition();
-        
+
         if (this.getBehavioursEnabled()) {
             // Get a transform if the current mode wants one.
             var transform = mode.transformAction(session.getState(cursor.row), 'insertion', this, session, text);
             if (transform)
                 text = transform.text;
         }
-        
+
         text = text.replace("\t", this.session.getTabString());
 
         // remove selected text
@@ -449,13 +454,13 @@ var Editor =function(renderer, session) {
 
         this.clearSelection();
 
-        var start         = cursor.column;
-        var lineState     = session.getState(cursor.row);
+        var start = cursor.column;
+        var lineState = session.getState(cursor.row);
         var shouldOutdent = mode.checkOutdent(lineState, session.getLine(cursor.row), text);
-        var line          = session.getLine(cursor.row);
-        var lineIndent    = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
-        var end           = session.insert(cursor, text);
-        
+        var line = session.getLine(cursor.row);
+        var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
+        var end = session.insert(cursor, text);
+
         if (transform && transform.selection) {
             if (transform.selection.length == 2) { // Transform relative to the current column
                 this.selection.setSelectionRange(
@@ -469,7 +474,7 @@ var Editor =function(renderer, session) {
                               transform.selection[3]));
             }
         }
-        
+
         var lineState = session.getState(cursor.row);
 
         // TODO disabled multiline auto indent
@@ -515,8 +520,27 @@ var Editor =function(renderer, session) {
         }
     };
 
-    this.onTextInput = function(text) {
-        this.keyBinding.onTextInput(text);
+    this.onTextInput = function(text, notPasted) {
+        // In case the text was not pasted and we got only one character, then
+        // handel it as a command key stroke.
+        if (notPasted && text.length == 1) {
+            // Note: The `null` as `keyCode` is important here, as there are
+            // some checks in the code for `keyCode == 0` meaning the text comes
+            // from the keyBinding.onTextInput code path.
+            var handled = this.keyBinding.onCommandKey({}, 0, null, text);
+
+            // Check if the text was handled. If not, then handled it as "normal"
+            // text and insert it to the editor directly. This shouldn't be done
+            // using the this.keyBinding.onTextInput(text) function, as it would
+            // make the `text` get sent to the keyboardHandler twice, which might
+            // turn out to be a bad thing in case there is a custome keyboard
+            // handler like the StateHandler.
+            if (!handled) {
+                this.insert(text);
+            }
+        } else {
+            this.keyBinding.onTextInput(text);
+        }
     };
 
     this.onCommandKey = function(e, hashId, keyCode) {
@@ -619,12 +643,12 @@ var Editor =function(renderer, session) {
     this.getReadOnly = function() {
         return this.$readOnly;
     };
-    
-    this.$modeBehaviours = false;
+
+    this.$modeBehaviours = true;
     this.setBehavioursEnabled = function (enabled) {
         this.$modeBehaviours = enabled;
     }
-    
+
     this.getBehavioursEnabled = function () {
         return this.$modeBehaviours;
     }
@@ -646,7 +670,7 @@ var Editor =function(renderer, session) {
 
         if (this.selection.isEmpty())
             this.selection.selectLeft();
-        
+
         var range = this.getSelectionRange();
         if (this.getBehavioursEnabled()) {
             var session = this.session;
@@ -798,7 +822,14 @@ var Editor =function(renderer, session) {
             return;
 
         var rows = this.$getSelectedRows();
-        this.session.remove(new Range(rows.first, 0, rows.last+1, 0));
+        if (rows.last == 0 || rows.last+1 < this.session.getLength())
+            var range = new Range(rows.first, 0, rows.last+1, 0)
+        else
+            var range = new Range(
+                rows.first-1, this.session.getLine(rows.first).length,
+                rows.last, this.session.getLine(rows.last).length
+            );
+        this.session.remove(range);
         this.clearSelection();
     };
 
@@ -1001,11 +1032,11 @@ var Editor =function(renderer, session) {
     };
 
 
-    this.gotoLine = function(lineNumber, row) {
+    this.gotoLine = function(lineNumber, column) {
         this.selection.clearSelection();
 
         this.$blockScrolling += 1;
-        this.moveCursorTo(lineNumber-1, row || 0);
+        this.moveCursorTo(lineNumber-1, column || 0);
         this.$blockScrolling -= 1;
 
         if (!this.isRowVisible(this.getCursorPosition().row)) {
@@ -1093,6 +1124,9 @@ var Editor =function(renderer, session) {
             this.$search.set(options);
 
         var range = this.$search.find(this.session);
+        if (!range)
+            return;
+
         this.$tryReplace(range, replacement);
         if (range !== null)
             this.selection.setSelectionRange(range);

lib/ace/editor_navigation_test.js

@@ -150,6 +150,16 @@ module.exports = {
 
         editor.navigateUp();
         assert.position(editor.getCursorPosition(), 0, 1);
+    },
+    
+    "test: typing text should update the desired column": function() {
+        var editor = new Editor(new MockRenderer(), new EditSession(["1234", "1234567890"]));
+
+        editor.navigateTo(0, 3);
+        editor.insert("juhu");
+        
+        editor.navigateDown();
+        assert.position(editor.getCursorPosition(), 1, 7);
     }
 };