gollum 2.4.4 → 2.4.5

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/tokenizer_dev.js

@@ -0,0 +1,205 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define(function(require, exports, module) {
+
+/*
+ * version of Tokenizer with additional logging
+ * and infinite loop checks
+ * can be used for developing/testing new modes
+ **/
+var Tokenizer = function(rules, flag) {
+    flag = flag ? "g" + flag : "g";
+    this.rules = rules;
+
+    this.regExps = {};
+    this.matchMappings = {};
+    for ( var key in this.rules) {
+        var rule = this.rules[key];
+        var state = rule;
+        var ruleRegExps = [];
+        var matchTotal = 0;
+        var mapping = this.matchMappings[key] = {};
+
+        for ( var i = 0; i < state.length; i++) {
+
+            if (state[i].regex instanceof RegExp)
+                state[i].regex = state[i].regex.toString().slice(1, -1);
+
+            // Count number of matching groups. 2 extra groups from the full match
+            // And the catch-all on the end (used to force a match);
+            var matchcount = new RegExp("(?:(" + state[i].regex + ")|(.))").exec("a").length - 2;
+
+            // Replace any backreferences and offset appropriately.
+            var adjustedregex = state[i].regex.replace(/\\([0-9]+)/g, function (match, digit) {
+                return "\\" + (parseInt(digit, 10) + matchTotal + 1);
+            });
+
+            if (matchcount > 1 && state[i].token.length !== matchcount-1)
+                throw new Error("For " + state[i].regex + " the matching groups and length of the token array don't match (rule #" + i + " of state " + key + ")");
+
+            mapping[matchTotal] = {
+                rule: i,
+                len: matchcount
+            };
+            matchTotal += matchcount;
+
+            ruleRegExps.push(adjustedregex);
+        }
+
+        this.regExps[key] = new RegExp("(?:(" + ruleRegExps.join(")|(") + ")|(.))", flag);
+    }
+};
+
+(function() {
+    this.getLineTokens = function(line, startState) {
+        var currentState = startState || "start";
+        var state = this.rules[currentState];
+        var mapping = this.matchMappings[currentState];
+        var re = this.regExps[currentState];
+        re.lastIndex = 0;
+
+        var match, tokens = [];
+
+        var lastIndex = 0;
+
+        var stateTransitions = [];
+        function onStateChange() {
+            stateTransitions.push(startState+"@"+lastIndex);
+        }
+        function initState() {
+            onStateChange();
+            stateTransitions = [];
+            onStateChange();
+        }
+        
+        var token = {
+            type: null,
+            value: "",
+            state: currentState
+        };
+        initState();
+        
+        var maxRecur = 10000;
+        
+        while (match = re.exec(line)) {
+            var type = "default.text";
+            var rule = null;
+            var value = [match[0]];
+
+            for (var i = 0; i < match.length-2; i++) {
+                if (match[i + 1] === undefined)
+                    continue;
+                
+                if (!maxRecur--) {
+                    throw "infinite" + mapping[i].rule + currentState
+                }
+
+                rule = state[mapping[i].rule];
+
+                if (mapping[i].len > 1)
+                    value = match.slice(i+2, i+1+mapping[i].len);
+
+                // compute token type
+                if (typeof rule.token == "function")
+                    type = rule.token.apply(this, value);
+                else
+                    type = rule.token;
+
+                if (rule.next) {
+                    currentState = rule.next;
+                    state = this.rules[currentState];
+                    mapping = this.matchMappings[currentState];
+                    lastIndex = re.lastIndex;
+
+                    re = this.regExps[currentState];
+
+                    if (re === undefined) {
+                         throw new Error("You indicated a state of " + rule.next + " to go to, but it doesn't exist!");
+                    }
+
+                    re.lastIndex = lastIndex;
+
+                    onStateChange();
+                }
+                break;
+            }
+
+            if (value[0]) {
+                if (typeof type == "string") {
+                    value = [value.join("")];
+                    type = [type];
+                }
+                for (var i = 0; i < value.length; i++) {
+                    if (!value[i])
+                        continue;
+
+                    var mergeable = (!rule || rule.merge || type[i] === "text") && token.type === type[i];
+                    
+                    if (false && mergeable) {
+                        token.value += value[i];
+                    } else {
+                        if (token.type) {
+                            token.stateTransitions = stateTransitions;
+                            tokens.push(token);
+                            initState()
+                        }
+                        
+                        token = {
+                            type: type[i],
+                            value: value[i],
+                            state: currentState,
+                            mergeable: mergeable
+                        };
+                    }
+                }
+            }
+
+            if (lastIndex == line.length)
+                break;
+
+            lastIndex = re.lastIndex;
+        }
+
+        if (token.type) {
+            token.stateTransitions = stateTransitions;
+            tokens.push(token);
+        }
+
+        return {
+            tokens : tokens,
+            state : currentState
+        };
+    };
+
+}).call(Tokenizer.prototype);
+
+exports.Tokenizer = Tokenizer;
+});

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/undomanager.js

@@ -1,39 +1,30 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
  *
- * 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):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan 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.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
@@ -41,16 +32,18 @@ define(function(require, exports, module) {
 "use strict";
 
 /**
- * class UndoManager
+ * 
  *
  * This object maintains the undo stack for an [[EditSession `EditSession`]].
- *
+ * @class UndoManager
  **/
 
 /**
- * new UndoManager()
+ * 
  * 
  * Resets the current undo state and creates a new `UndoManager`.
+ * 
+ * @constructor
  **/
 var UndoManager = function() {
     this.reset();
@@ -59,12 +52,12 @@ var UndoManager = function() {
 (function() {
 
     /**
-    * UndoManager.execute(options) -> Void
-    * - options (Object): Contains additional properties
-    *
     * Provides a means for implementing your own undo manager. `options` has one property, `args`, an [[Array `Array`]], with two elements:
-    * * `args[0]` is an array of deltas
-    * * `args[1]` is the document to associate with
+    *
+    * - `args[0]` is an array of deltas
+    * - `args[1]` is the document to associate with
+    *
+    * @param {Object} options Contains additional properties
     *
     **/
     this.execute = function(options) {
@@ -75,10 +68,11 @@ var UndoManager = function() {
     };
 
     /**
-    * UndoManager.undo(dontSelect) -> Range
-    * - dontSelect (Boolean): {:dontSelect}
+    * [Perform an undo operation on the document, reverting the last change.]{: #UndoManager.undo}
+    * @param {Boolean} dontSelect {:dontSelect}
     *
-    * [Perform an undo operation on the document, reverting the last change. Returns the range of the undo.]{: #UndoManager.undo}
+    * 
+    * @returns {Range} The range of the undo.
     **/
     this.undo = function(dontSelect) {
         var deltas = this.$undoStack.pop();
@@ -92,10 +86,10 @@ var UndoManager = function() {
     };
 
     /**
-    * UndoManager.redo(dontSelect) -> Void
-    * - dontSelect (Boolean): {:dontSelect}
-    *
     * [Perform a redo operation on the document, reimplementing the last change.]{: #UndoManager.redo}
+    * @param {Boolean} dontSelect {:dontSelect}
+    *
+    * 
     **/
     this.redo = function(dontSelect) {
         var deltas = this.$redoStack.pop();
@@ -109,8 +103,7 @@ var UndoManager = function() {
     };
 
     /**
-    * UndoManager.reset() -> Void
-    *
+    * 
     * Destroys the stack of undo and redo redo operations.
     **/
     this.reset = function() {
@@ -119,18 +112,18 @@ var UndoManager = function() {
     };
 
     /**
-    * UndoManager.hasUndo() -> Boolean
-    *
+    * 
     * Returns `true` if there are undo operations left to perform.
+    * @returns {Boolean}
     **/
     this.hasUndo = function() {
         return this.$undoStack.length > 0;
     };
 
     /**
-    * UndoManager.hasRedo() -> Boolean
-    *
+    * 
     * Returns `true` if there are redo operations left to perform.
+    * @returns {Boolean}
     **/
     this.hasRedo = function() {
         return this.$redoStack.length > 0;

data/lib/gollum/frontend/public/gollum/livepreview/js/ace/lib/ace/virtual_renderer.js

@@ -1,40 +1,30 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
  *
- * 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):
- *      Fabian Jakobs <fabian@ajax.org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.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.
+ * Copyright (c) 2010, Ajax.org B.V.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
@@ -54,24 +44,26 @@ var CursorLayer = require("./layer/cursor").Cursor;
 var ScrollBar = require("./scrollbar").ScrollBar;
 var RenderLoop = require("./renderloop").RenderLoop;
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var editorCss = require("ace/requirejs/text!./css/editor.css");
+var editorCss = require("./requirejs/text!./css/editor.css");
 
 dom.importCssString(editorCss, "ace_editor");
 
 /**
- * class VirtualRenderer
+ * 
  *
  * The class that is responsible for drawing everything you see on the screen!
- *
+ * @class VirtualRenderer
  **/
 
 /**
- * new VirtualRenderer(container, theme)
- * - container (DOMElement): The root element of the editor
- * - theme (String): The starting theme
- *
  * Constructs a new `VirtualRenderer` within the `container` specified, applying the given `theme`.
+ * @param {DOMElement} container The root element of the editor
+ * @param {String} theme The starting theme
+ *
+ * 
  *
+ * 
+ * @constructor
  **/
 
 var VirtualRenderer = function(container, theme) {
@@ -102,9 +94,9 @@ var VirtualRenderer = function(container, theme) {
     this.content.className = "ace_content";
     this.scroller.appendChild(this.content);
 
+    this.setHighlightGutterLine(true);
     this.$gutterLayer = new GutterLayer(this.$gutter);
     this.$gutterLayer.on("changeGutterWidth", this.onResize.bind(this, true));
-    this.setFadeFoldWidgets(true);
 
     this.$markerBack = new MarkerLayer(this.content);
 
@@ -113,11 +105,7 @@ var VirtualRenderer = function(container, theme) {
 
     this.$markerFront = new MarkerLayer(this.content);
 
-    this.characterWidth = textLayer.getCharacterWidth();
-    this.lineHeight = textLayer.getLineHeight();
-
     this.$cursorLayer = new CursorLayer(this.content);
-    this.$cursorPadding = 8;
 
     // Indicates whether the horizontal scrollbar is visible
     this.$horizScroll = false;
@@ -146,12 +134,8 @@ var VirtualRenderer = function(container, theme) {
     };
 
     this.$textLayer.addEventListener("changeCharacterSize", function() {
-        _self.characterWidth = textLayer.getCharacterWidth();
-        _self.lineHeight = textLayer.getLineHeight();
-        _self.$updatePrintMargin();
+        _self.updateCharacterSize();
         _self.onResize(true);
-
-        _self.$loop.schedule(_self.CHANGE_FULL);
     });
 
     this.$size = {
@@ -181,8 +165,8 @@ var VirtualRenderer = function(container, theme) {
     );
     this.$loop.schedule(this.CHANGE_FULL);
 
+    this.updateCharacterSize();
     this.setPadding(4);
-    this.$updatePrintMargin();
 };
 
 (function() {
@@ -201,11 +185,21 @@ var VirtualRenderer = function(container, theme) {
     this.CHANGE_H_SCROLL = 1024;
 
     oop.implement(this, EventEmitter);
+    
+    this.updateCharacterSize = function() {
+        if (this.$textLayer.allowBoldFonts != this.$allowBoldFonts) {
+            this.$allowBoldFonts = this.$textLayer.allowBoldFonts;
+            this.setStyle("ace_nobold", !this.$allowBoldFonts);
+        }
+        
+        this.characterWidth = this.$textLayer.getCharacterWidth();
+        this.lineHeight = this.$textLayer.getLineHeight();
+        this.$updatePrintMargin();
+    };
 
     /**
-    * VirtualRenderer.setSession(session) -> Void
     * 
-    * Associates an [[EditSession `EditSession`]].
+    * Associates the renderer with an [[EditSession `EditSession`]].
     **/
     this.setSession = function(session) {
         this.session = session;
@@ -222,11 +216,11 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.updateLines(firstRow, lastRow) -> Void
-    * - firstRow (Number): The first row to update
-    * - lastRow (Number): The last row to update
-    *
     * Triggers a partial update of the text, from the range given by the two parameters.
+    * @param {Number} firstRow The first row to update
+    * @param {Number} lastRow The last row to update
+    *
+    * 
     **/
     this.updateLines = function(firstRow, lastRow) {
         if (lastRow === undefined)
@@ -249,9 +243,12 @@ var VirtualRenderer = function(container, theme) {
         this.$loop.schedule(this.CHANGE_LINES);
     };
 
+    this.onChangeTabSize = function() {
+        this.$loop.schedule(this.CHANGE_TEXT | this.CHANGE_MARKER);
+        this.$textLayer.onChangeTabSize();
+    };
+
     /**
-    * VirtualRenderer.updateText() -> Void
-    *
     * Triggers a full update of the text, for all the rows.
     **/
     this.updateText = function() {
@@ -259,9 +256,10 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.updateFull() -> Void
-    *
     * Triggers a full update of all the layers, for all the rows.
+    * @param {Boolean} force If `true`, forces the changes through
+    *
+    * 
     **/
     this.updateFull = function(force) {
         if (force){
@@ -273,8 +271,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.updateFontSize() -> Void
-    *
+    * 
     * Updates the font size.
     **/
     this.updateFontSize = function() {
@@ -282,10 +279,13 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.onResize(force) -> Void
-    * - force (Boolean): If `true`, recomputes the size, even if the height and width haven't changed
-    *
     * [Triggers a resize of the editor.]{: #VirtualRenderer.onResize}
+    * @param {Boolean} force If `true`, recomputes the size, even if the height and width haven't changed
+    * @param {Number} gutterWidth The width of the gutter in pixels
+    * @param {Number} width The width of the editor in pixels
+    * @param {Number} height The hiehgt of the editor, in pixels
+    *
+    * 
     **/
     this.onResize = function(force, gutterWidth, width, height) {
         var changes = this.CHANGE_SIZE;
@@ -337,8 +337,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.adjustWrapLimit() -> Void
-    *
+    * 
     * Adjusts the wrap limit, which is the number of characters that can fit within the width of the edit area on screen.
     **/
     this.adjustWrapLimit = function() {
@@ -348,10 +347,10 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.setAnimatedScroll(shouldAnimate) -> Void
-    * - shouldAnimate (Boolean): Set to `true` to show animated scrolls
-    *
     * Identifies whether you want to have an animated scroll or not.
+    * @param {Boolean} shouldAnimate Set to `true` to show animated scrolls
+    *
+    * 
     *
     **/
     this.setAnimatedScroll = function(shouldAnimate){
@@ -359,19 +358,19 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getAnimatedScroll() -> Boolean
-    *
+    * 
     * Returns whether an animated scroll happens or not.
+    * @returns {Boolean}
     **/
     this.getAnimatedScroll = function() {
         return this.$animatedScroll;
     };
 
     /**
-    * VirtualRenderer.setShowInvisibles(showInvisibles) -> Void
-    * - showInvisibles (Boolean): Set to `true` to show invisibles
-    *
     * Identifies whether you want to show invisible characters or not.
+    * @param {Boolean} showInvisibles Set to `true` to show invisibles
+    *
+    * 
     *
     **/
     this.setShowInvisibles = function(showInvisibles) {
@@ -380,21 +379,30 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getShowInvisibles() -> Boolean
-    *
+    * 
     * Returns whether invisible characters are being shown or not.
+    * @returns {Boolean}
     **/
     this.getShowInvisibles = function() {
         return this.$textLayer.showInvisibles;
     };
 
+    this.getDisplayIndentGuides = function() {
+        return this.$textLayer.displayIndentGuides;
+    };
+    
+    this.setDisplayIndentGuides = function(display) {
+        if (this.$textLayer.setDisplayIndentGuides(display))
+            this.$loop.schedule(this.CHANGE_TEXT);
+    };
+    
     this.$showPrintMargin = true;
 
     /**
-    * VirtualRenderer.setShowPrintMargin(showPrintMargin)
-    * - showPrintMargin (Boolean): Set to `true` to show the print margin
-    *
     * Identifies whether you want to show the print margin or not.
+    * @param {Boolean} showPrintMargin Set to `true` to show the print margin
+    *
+    * 
     *
     **/
     this.setShowPrintMargin = function(showPrintMargin) {
@@ -403,9 +411,8 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getShowPrintMargin() -> Boolean
-    *
-    * Returns whetherthe print margin is being shown or not.
+    * Returns whether the print margin is being shown or not.
+    * @returns {Boolean}
     **/
     this.getShowPrintMargin = function() {
         return this.$showPrintMargin;
@@ -414,10 +421,10 @@ var VirtualRenderer = function(container, theme) {
     this.$printMarginColumn = 80;
 
     /**
-    * VirtualRenderer.setPrintMarginColumn(showPrintMargin)
-    * - showPrintMargin (Boolean): Set to `true` to show the print margin column
-    *
     * Identifies whether you want to show the print margin column or not.
+    * @param {Boolean} showPrintMargin Set to `true` to show the print margin column
+    *
+    * 
     *
     **/
     this.setPrintMarginColumn = function(showPrintMargin) {
@@ -426,28 +433,28 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getPrintMarginColumn() -> Boolean
-    *
+    * 
     * Returns whether the print margin column is being shown or not.
+    * @returns {Boolean}
     **/
     this.getPrintMarginColumn = function() {
         return this.$printMarginColumn;
     };
 
     /**
-    * VirtualRenderer.getShowGutter() -> Boolean
-    *
+    * 
     * Returns `true` if the gutter is being shown.
+    * @returns {Boolean}
     **/
     this.getShowGutter = function(){
         return this.showGutter;
     };
 
     /**
-    * VirtualRenderer.setShowGutter(show) -> Void
-    * - show (Boolean): Set to `true` to show the gutter
-    *
     * Identifies whether you want to show the gutter or not.
+    * @param {Boolean} show Set to `true` to show the gutter
+    *
+    * 
     **/
     this.setShowGutter = function(show){
         if(this.showGutter === show)
@@ -468,53 +475,45 @@ var VirtualRenderer = function(container, theme) {
             dom.removeCssClass(this.$gutter, "ace_fade-fold-widgets");
     };
 
-    this.$highlightGutterLine = true;
+    this.$highlightGutterLine = false;
     this.setHighlightGutterLine = function(shouldHighlight) {
         if (this.$highlightGutterLine == shouldHighlight)
             return;
         this.$highlightGutterLine = shouldHighlight;
 
-        this.$loop.schedule(this.CHANGE_GUTTER);
+        if (!this.$gutterLineHighlight) {
+            this.$gutterLineHighlight = dom.createElement("div");
+            this.$gutterLineHighlight.className = "ace_gutter-active-line";
+            this.$gutter.appendChild(this.$gutterLineHighlight);
+            return;
+        }
+
+        this.$gutterLineHighlight.style.display = shouldHighlight ? "" : "none";
+        // if cursorlayer have never been updated there's nothing on screen to update
+        if (this.$cursorLayer.$pixelPos)
+            this.$updateGutterLineHighlight();
     };
 
     this.getHighlightGutterLine = function() {
         return this.$highlightGutterLine;
     };
 
-    this.$updateGutterLineHighlight = function(gutterReady) {
-        var i = this.session.selection.lead.row;
-        if (i == this.$gutterLineHighlight)
-            return;
-
-        if (!gutterReady) {
-            var lineEl, ch = this.$gutterLayer.element.children;
-            var index = this.$gutterLineHighlight - this.layerConfig.firstRow;
-            if (index >= 0 && (lineEl = ch[index]))
-                dom.removeCssClass(lineEl, "ace_gutter_active_line");
-
-            index = i - this.layerConfig.firstRow;
-            if (index >= 0 && (lineEl = ch[index]))
-                dom.addCssClass(lineEl, "ace_gutter_active_line");
-        }
-
-        this.$gutterLayer.removeGutterDecoration(this.$gutterLineHighlight, "ace_gutter_active_line");
-        this.$gutterLayer.addGutterDecoration(i, "ace_gutter_active_line");
-        this.$gutterLineHighlight = i;
+    this.$updateGutterLineHighlight = function() {
+        this.$gutterLineHighlight.style.top = this.$cursorLayer.$pixelPos.top - this.layerConfig.offset + "px";
+        this.$gutterLineHighlight.style.height = this.layerConfig.lineHeight + "px";
     };
     
     this.$updatePrintMargin = function() {
-        var containerEl;
-
         if (!this.$showPrintMargin && !this.$printMarginEl)
             return;
 
         if (!this.$printMarginEl) {
-            containerEl = dom.createElement("div");
-            containerEl.className = "ace_print_margin_layer";
+            var containerEl = dom.createElement("div");
+            containerEl.className = "ace_layer ace_print-margin-layer";
             this.$printMarginEl = dom.createElement("div");
-            this.$printMarginEl.className = "ace_print_margin";
+            this.$printMarginEl.className = "ace_print-margin";
             containerEl.appendChild(this.$printMarginEl);
-            this.content.insertBefore(containerEl, this.$textLayer.element);
+            this.content.insertBefore(containerEl, this.content.firstChild);
         }
 
         var style = this.$printMarginEl.style;
@@ -523,27 +522,27 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getContainerElement() -> DOMElement
-    *
+    * 
     * Returns the root element containing this renderer.
+    * @returns {DOMElement}
     **/
     this.getContainerElement = function() {
         return this.container;
     };
 
     /**
-    * VirtualRenderer.getMouseEventTarget() -> DOMElement
-    *
+    * 
     * Returns the element that the mouse events are attached to
+    * @returns {DOMElement}
     **/
     this.getMouseEventTarget = function() {
         return this.content;
     };
 
     /**
-    * VirtualRenderer.getTextAreaContainer() -> DOMElement
-    *
+    * 
     * Returns the element to which the hidden text area is added.
+    * @returns {DOMElement}
     **/
     this.getTextAreaContainer = function() {
         return this.container;
@@ -579,27 +578,27 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getFirstVisibleRow() -> Number
-    *
+    * 
     * [Returns the index of the first visible row.]{: #VirtualRenderer.getFirstVisibleRow}
+    * @returns {Number}
     **/
     this.getFirstVisibleRow = function() {
         return this.layerConfig.firstRow;
     };
 
     /**
-    * VirtualRenderer.getFirstFullyVisibleRow() -> Number
-    *
+    * 
     * Returns the index of the first fully visible row. "Fully" here means that the characters in the row are not truncated; that the top and the bottom of the row are on the screen.
+    * @returns {Number}
     **/
     this.getFirstFullyVisibleRow = function() {
         return this.layerConfig.firstRow + (this.layerConfig.offset === 0 ? 0 : 1);
     };
 
     /**
-    * VirtualRenderer.getLastFullyVisibleRow() -> Number
-    *
+    * 
     * Returns the index of the last fully visible row. "Fully" here means that the characters in the row are not truncated; that the top and the bottom of the row are on the screen.
+    * @returns {Number}
     **/
     this.getLastFullyVisibleRow = function() {
         var flint = Math.floor((this.layerConfig.height + this.layerConfig.offset) / this.layerConfig.lineHeight);
@@ -607,9 +606,9 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getLastVisibleRow() -> Number
-    *
+    * 
     * [Returns the index of the last visible row.]{: #VirtualRenderer.getLastVisibleRow}
+    * @returns {Number}
     **/
     this.getLastVisibleRow = function() {
         return this.layerConfig.lastRow;
@@ -618,10 +617,10 @@ var VirtualRenderer = function(container, theme) {
     this.$padding = null;
 
     /**
-    * VirtualRenderer.setPadding(padding) -> Void
-    * - padding (Number): A new padding value (in pixels)
-    * 
     * Sets the padding for all the layers.
+    * @param {Number} padding A new padding value (in pixels)
+    * 
+    * 
     *
     **/
     this.setPadding = function(padding) {
@@ -635,19 +634,19 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getHScrollBarAlwaysVisible() -> Boolean
-    *
+    * 
     * Returns whether the horizontal scrollbar is set to be always visible.
+    * @returns {Boolean}
     **/
     this.getHScrollBarAlwaysVisible = function() {
         return this.$horizScrollAlwaysVisible;
     };
 
     /**
-    * VirtualRenderer.setHScrollBarAlwaysVisible(alwaysVisible) -> Void
-    * - alwaysVisible (Boolean): Set to `true` to make the horizontal scroll bar visible
-    *
     * Identifies whether you want to show the horizontal scrollbar or not. 
+    * @param {Boolean} alwaysVisible Set to `true` to make the horizontal scroll bar visible
+    *
+    * 
     **/
     this.setHScrollBarAlwaysVisible = function(alwaysVisible) {
         if (this.$horizScrollAlwaysVisible != alwaysVisible) {
@@ -684,7 +683,7 @@ var VirtualRenderer = function(container, theme) {
             this.scrollLeft = scrollLeft;
             this.session.setScrollLeft(scrollLeft);
 
-            this.scroller.className = this.scrollLeft == 0 ? "ace_scroller" : "ace_scroller horscroll";
+            this.scroller.className = this.scrollLeft == 0 ? "ace_scroller" : "ace_scroller ace_scroll-left";
         }
 
         // full
@@ -693,15 +692,13 @@ var VirtualRenderer = function(container, theme) {
             // update scrollbar first to not lose scroll position when gutter calls resize
             this.$updateScrollBar();
             this.$textLayer.update(this.layerConfig);
-            if (this.showGutter) {
-                if (this.$highlightGutterLine)
-                    this.$updateGutterLineHighlight(true);
+            if (this.showGutter)
                 this.$gutterLayer.update(this.layerConfig);
-            }
             this.$markerBack.update(this.layerConfig);
             this.$markerFront.update(this.layerConfig);
             this.$cursorLayer.update(this.layerConfig);
             this.$moveTextAreaToCursor();
+            this.$highlightGutterLine && this.$updateGutterLineHighlight();
             return;
         }
 
@@ -713,15 +710,13 @@ var VirtualRenderer = function(container, theme) {
             else
                 this.$textLayer.scrollLines(this.layerConfig);
 
-            if (this.showGutter) {
-                if (this.$highlightGutterLine)
-                    this.$updateGutterLineHighlight(true);
+            if (this.showGutter)
                 this.$gutterLayer.update(this.layerConfig);
-            }
             this.$markerBack.update(this.layerConfig);
             this.$markerFront.update(this.layerConfig);
             this.$cursorLayer.update(this.layerConfig);
             this.$moveTextAreaToCursor();
+            this.$highlightGutterLine && this.$updateGutterLineHighlight();
             return;
         }
 
@@ -731,12 +726,10 @@ var VirtualRenderer = function(container, theme) {
                 this.$gutterLayer.update(this.layerConfig);
         }
         else if (changes & this.CHANGE_LINES) {
-            if (this.$updateLines()) {
-                this.$updateScrollBar();
-                if (this.showGutter)
-                    this.$gutterLayer.update(this.layerConfig);
-            }
-        } else if (changes & this.CHANGE_GUTTER) {
+            if (this.$updateLines() || (changes & this.CHANGE_GUTTER) && this.showGutter)
+                this.$gutterLayer.update(this.layerConfig);
+        }
+        else if (changes & this.CHANGE_TEXT || changes & this.CHANGE_GUTTER) {
             if (this.showGutter)
                 this.$gutterLayer.update(this.layerConfig);
         }
@@ -744,7 +737,7 @@ var VirtualRenderer = function(container, theme) {
         if (changes & this.CHANGE_CURSOR) {
             this.$cursorLayer.update(this.layerConfig);
             this.$moveTextAreaToCursor();
-            this.$highlightGutterLine && this.$updateGutterLineHighlight(false);
+            this.$highlightGutterLine && this.$updateGutterLineHighlight();
         }
 
         if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) {
@@ -786,7 +779,7 @@ var VirtualRenderer = function(container, theme) {
 
         // Map lines on the screen to lines in the document.
         var firstRowScreen, firstRowHeight;
-        var lineHeight = { lineHeight: this.lineHeight };
+        var lineHeight = this.lineHeight;
         firstRow = session.screenToDocumentRow(firstRow, 0);
 
         // Check if firstRow is inside of a foldLine. If true, then use the first
@@ -797,13 +790,13 @@ var VirtualRenderer = function(container, theme) {
         }
 
         firstRowScreen = session.documentToScreenRow(firstRow, 0);
-        firstRowHeight = session.getRowHeight(lineHeight, firstRow);
+        firstRowHeight = session.getRowLength(firstRow) * lineHeight;
 
         lastRow = Math.min(session.screenToDocumentRow(lastRow, 0), session.getLength() - 1);
-        minHeight = this.$size.scrollerHeight + session.getRowHeight(lineHeight, lastRow)+
+        minHeight = this.$size.scrollerHeight + session.getRowLength(lastRow) * lineHeight +
                                                 firstRowHeight;
 
-        offset = this.scrollTop - firstRowScreen * this.lineHeight;
+        offset = this.scrollTop - firstRowScreen * lineHeight;
 
         this.layerConfig = {
             width : longestLine,
@@ -811,7 +804,7 @@ var VirtualRenderer = function(container, theme) {
             firstRow : firstRow,
             firstRowScreen: firstRowScreen,
             lastRow : lastRow,
-            lineHeight : this.lineHeight,
+            lineHeight : lineHeight,
             characterWidth : this.characterWidth,
             minHeight : minHeight,
             maxHeight : maxHeight,
@@ -865,8 +858,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.updateFrontMarkers() -> Void
-    *
+    * 
     * Schedules an update to all the front markers in the document.
     **/
     this.updateFrontMarkers = function() {
@@ -875,8 +867,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.updateBackMarkers() -> Void
-    *
+    * 
     * Schedules an update to all the back markers in the document.
     **/
     this.updateBackMarkers = function() {
@@ -884,33 +875,25 @@ var VirtualRenderer = function(container, theme) {
         this.$loop.schedule(this.CHANGE_MARKER_BACK);
     };
 
-    /**
-    * VirtualRenderer.addGutterDecoration(row, className) -> Void
-    * - row (Number): The row number
-    * - className (String): The class to add
-    *
-    * Adds `className` to the `row`, to be used for CSS stylings and whatnot.
+    /** 
+    * 
+    * Deprecated; (moved to [[EditSession]])
+    * @deprecated
     **/
     this.addGutterDecoration = function(row, className){
         this.$gutterLayer.addGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
     };
 
-    /**
-    * VirtualRenderer.removeGutterDecoration(row, className)-> Void
-    * - row (Number): The row number
-    * - className (String): The class to add
-    *
-    * Removes `className` from the `row`.
+    /** 
+    * Deprecated; (moved to [[EditSession]])
+    * @deprecated
     **/
     this.removeGutterDecoration = function(row, className){
         this.$gutterLayer.removeGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
     };
 
     /**
-    * VirtualRenderer.updateBreakpoints() -> Void
-    *
+    * 
     * Redraw breakpoints.
     **/
     this.updateBreakpoints = function(rows) {
@@ -918,10 +901,11 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.setAnnotations(annotations) -> Void
-    * - annotations (Array): An array containing annotations
-    *
+    * 
     * Sets annotations for the gutter.
+    * @param {Array} annotations An array containing annotations
+    *
+    * 
     **/
     this.setAnnotations = function(annotations) {
         this.$gutterLayer.setAnnotations(annotations);
@@ -929,8 +913,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.updateCursor() -> Void
-    *
+    * 
     * Updates the cursor icon.
     **/
     this.updateCursor = function() {
@@ -938,8 +921,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.hideCursor() -> Void
-    *
+    * 
     * Hides the cursor icon.
     **/
     this.hideCursor = function() {
@@ -947,8 +929,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.showCursor() -> Void
-    *
+    * 
     * Shows the cursor icon.
     **/
     this.showCursor = function() {
@@ -962,8 +943,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.scrollCursorIntoView(cursor, offset) -> Void
-    *
+    * 
     * Scrolls the cursor into the first visibile area of the editor
     **/
     this.scrollCursorIntoView = function(cursor, offset) {
@@ -997,47 +977,48 @@ var VirtualRenderer = function(container, theme) {
         }
     };
 
-    /** related to: EditSession.getScrollTop
-    * VirtualRenderer.getScrollTop() -> Number
-    *
+    /** 
     * {:EditSession.getScrollTop}
+    * @related EditSession.getScrollTop
+    * @returns {Number}
     **/
     this.getScrollTop = function() {
         return this.session.getScrollTop();
     };
 
-    /** related to: EditSession.getScrollLeft
-    * VirtualRenderer.getScrollLeft() -> Number
-    *
+    /** 
     * {:EditSession.getScrollLeft}
+    * @related EditSession.getScrollLeft
+    * @returns {Number}
     **/
     this.getScrollLeft = function() {
         return this.session.getScrollLeft();
     };
 
     /**
-    * VirtualRenderer.getScrollTopRow() -> Number
-    *
+    * 
     * Returns the first visible row, regardless of whether it's fully visible or not.
+    * @returns {Number}
     **/
     this.getScrollTopRow = function() {
         return this.scrollTop / this.lineHeight;
     };
 
     /**
-    * VirtualRenderer.getScrollBottomRow() -> Number
-    *
+    * 
     * Returns the last visible row, regardless of whether it's fully visible or not.
+    * @returns {Number}
     **/
     this.getScrollBottomRow = function() {
         return Math.max(0, Math.floor((this.scrollTop + this.$size.scrollerHeight) / this.lineHeight) - 1);
     };
 
-    /** related to: EditSession.setScrollTop
-    * VirtualRenderer.scrollToRow(row) -> Void
-    * - row (Number): A row id
+    /** 
+    * Gracefully scrolls from the top of the editor to the row indicated.
+    * @param {Number} row A row id
     *
-    * Gracefully scrolls the top of the editor to the row indicated.
+    * 
+    * @related EditSession.setScrollTop
     **/
     this.scrollToRow = function(row) {
         this.session.setScrollTop(row * this.lineHeight);
@@ -1048,9 +1029,11 @@ var VirtualRenderer = function(container, theme) {
             cursor = {row: cursor, column: 0};
 
         var pos = this.$cursorLayer.getPixelPosition(cursor);
-        var offset = pos.top - this.$size.scrollerHeight * (alignment || 0);
+        var h = this.$size.scrollerHeight - this.lineHeight;
+        var offset = pos.top - h * (alignment || 0);
 
         this.session.setScrollTop(offset);
+        return offset;
     };
 
     this.STEPS = 8;
@@ -1070,13 +1053,13 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.scrollToLine(line, center, animate, callback) -> Void
-    * - line (Number): A line number
-    * - center (Boolean): If `true`, centers the editor the to indicated line
-    * - animate (Boolean): If `true` animates scrolling
-    * - callback (Function): Function to be called after the animation has finished
-    *
     * Gracefully scrolls the editor to the row indicated.
+    * @param {Number} line A line number
+    * @param {Boolean} center If `true`, centers the editor the to indicated line
+    * @param {Boolean} animate If `true` animates scrolling
+    * @param {Function} callback Function to be called after the animation has finished
+    *
+    * 
     **/
     this.scrollToLine = function(line, center, animate, callback) {
         var pos = this.$cursorLayer.getPixelPosition({row: line, column: 0});
@@ -1120,11 +1103,11 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.scrollToY(scrollTop) -> Number
-    * - scrollTop (Number): The position to scroll to
-    *
     * Scrolls the editor to the y pixel indicated.
+    * @param {Number} scrollTop The position to scroll to
     *
+    * 
+    * @returns {Number}
     **/
     this.scrollToY = function(scrollTop) {
         // after calling scrollBar.setScrollTop
@@ -1136,11 +1119,11 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.scrollToX(scrollLeft) -> Number
-    * - scrollLeft (Number): The position to scroll to
-    *
-    * Scrolls the editor to the x pixel indicated.
+    * Scrolls the editor across the x-axis to the pixel indicated.
+    * @param {Number} scrollLeft The position to scroll to
     *
+    * 
+    * @returns {Number}
     **/
     this.scrollToX = function(scrollLeft) {
         if (scrollLeft < 0)
@@ -1152,11 +1135,11 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.scrollBy(deltaX, deltaY) -> Void
-    * - deltaX (Number): The x value to scroll by
-    * - deltaY (Number): The y value to scroll by
-    *
     * Scrolls the editor across both x- and y-axes.
+    * @param {Number} deltaX The x value to scroll by
+    * @param {Number} deltaY The y value to scroll by
+    *
+    * 
     **/
     this.scrollBy = function(deltaX, deltaY) {
         deltaY && this.session.setScrollTop(this.session.getScrollTop() + deltaY);
@@ -1164,11 +1147,12 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.isScrollableBy(deltaX, deltaY) -> Boolean
-    * - deltaX (Number): The x value to scroll by
-    * - deltaY (Number): The y value to scroll by
-    *
     * Returns `true` if you can still scroll by either parameter; in other words, you haven't reached the end of the file or line.
+    * @param {Number} deltaX The x value to scroll by
+    * @param {Number} deltaY The y value to scroll by
+    *
+    * 
+    * @returns {Boolean}
     **/
     this.isScrollableBy = function(deltaX, deltaY) {
         if (deltaY < 0 && this.session.getScrollTop() > 0)
@@ -1202,13 +1186,13 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.textToScreenCoordinates(row, column) -> Object
-    * - row (Number): The document row position
-    * - column (Number): The document column position
-    *
     * Returns an object containing the `pageX` and `pageY` coordinates of the document position.
+    * @param {Number} row The document row position
+    * @param {Number} column The document column position
     *
+    * 
     *
+    * @returns {Object}
     **/
     this.textToScreenCoordinates = function(row, column) {
         var canvasPos = this.scroller.getBoundingClientRect();
@@ -1224,8 +1208,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.visualizeFocus() -> Void
-    *
+    * 
     * Focuses the current container.
     **/
     this.visualizeFocus = function() {
@@ -1233,18 +1216,17 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.visualizeBlur() -> Void
-    *
+    * 
     * Blurs the current container.
     **/
     this.visualizeBlur = function() {
         dom.removeCssClass(this.container, "ace_focus");
     };
 
-    /** internal, hide
-    * VirtualRenderer.showComposition(position) -> Void
-    * - position (Number):
+    /** 
+    * @param {Number} position
     *
+    * @private
     **/
     this.showComposition = function(position) {
         if (!this.$composition)
@@ -1260,8 +1242,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.setCompositionText(text) -> Void
-    * - text (String): A string of text to use
+    * @param {String} text A string of text to use
     *
     * Sets the inner text of the current composition to `text`.
     **/
@@ -1270,8 +1251,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.hideComposition() -> Void
-    *
+    * 
     * Hides the current composition.
     **/
     this.hideComposition = function() {
@@ -1288,16 +1268,14 @@ var VirtualRenderer = function(container, theme) {
         if (!config.get("packaged"))
             return callback();
 
-        var base = name.split("/").pop();
-        var filename = config.get("themePath") + "/theme-" + base + config.get("suffix");
-        net.loadScript(filename, callback);
+        net.loadScript(config.moduleUrl(name, "theme"), callback);
     };
 
     /**
-    * VirtualRenderer.setTheme(theme) -> Void
-    * - theme (String): The path to a theme
-    *
     * [Sets a new theme for the editor. `theme` should exist, and be a directory path, like `ace/theme/textmate`.]{: #VirtualRenderer.setTheme}
+    * @param {String} theme The path to a theme
+    *
+    * 
     **/
     this.setTheme = function(theme) {
         var _self = this;
@@ -1332,18 +1310,19 @@ var VirtualRenderer = function(container, theme) {
                 _self.container.ownerDocument
             );
 
-            if (_self.$theme)
-                dom.removeCssClass(_self.container, _self.$theme);
+            if (_self.theme)
+                dom.removeCssClass(_self.container, _self.theme.cssClass);
 
-            _self.$theme = theme ? theme.cssClass : null;
+            // this is kept only for backwards compatibility
+            _self.$theme = theme.cssClass;
 
-            if (_self.$theme)
-                dom.addCssClass(_self.container, _self.$theme);
+            _self.theme = theme;
+            dom.addCssClass(_self.container, theme.cssClass);
+            dom.setCssClass(_self.container, "ace_dark", theme.isDark);
 
-            if (theme && theme.isDark)
-                dom.addCssClass(_self.container, "ace_dark");
-            else
-                dom.removeCssClass(_self.container, "ace_dark");
+            var padding = theme.padding || 4;
+            if (_self.$padding && padding != _self.$padding)
+                _self.setPadding(padding);
 
             // force re-measure of the gutter width
             if (_self.$size) {
@@ -1354,9 +1333,8 @@ var VirtualRenderer = function(container, theme) {
     };
 
     /**
-    * VirtualRenderer.getTheme() -> String
-    *
     * [Returns the path of the current theme.]{: #VirtualRenderer.getTheme}
+    * @returns {String}
     **/
     this.getTheme = function() {
         return this.$themeValue;
@@ -1367,28 +1345,27 @@ var VirtualRenderer = function(container, theme) {
     // a certain mode that editor is in.
 
     /**
-    * VirtualRenderer.setStyle(style) -> Void
-    * - style (String): A class name
-    *
     * [Adds a new class, `style`, to the editor.]{: #VirtualRenderer.setStyle}
+    * @param {String} style A class name
+    *
+    * 
     **/
-    this.setStyle = function setStyle(style) {
-      dom.addCssClass(this.container, style);
+    this.setStyle = function setStyle(style, include) {
+        dom.setCssClass(this.container, style, include != false);
     };
 
     /**
-    * VirtualRenderer.unsetStyle(style) -> Void
-    * - style (String): A class name
-    *
     * [Removes the class `style` from the editor.]{: #VirtualRenderer.unsetStyle}
+    * @param {String} style A class name
+    *
+    * 
     **/
     this.unsetStyle = function unsetStyle(style) {
-      dom.removeCssClass(this.container, style);
+        dom.removeCssClass(this.container, style);
     };
 
     /**
-    * VirtualRenderer.destroy()
-    *
+    * 
     * Destroys the text and cursor layers for this renderer.
     **/
     this.destroy = function() {