gollum 3.1.2 → 3.1.3

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/luapage_highlight_rules.js

@@ -8,31 +8,38 @@ var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
 var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules;
 
 var LuaPageHighlightRules = function() {
-    this.$rules = new HtmlHighlightRules().getRules();
-    
-    for (var i in this.$rules) {
-        this.$rules[i].unshift({
+    HtmlHighlightRules.call(this);
+
+    var startRules = [
+        {
             token: "keyword",
             regex: "<\\%\\=?",
-            next: "lua-start"
+            push: "lua-start"
         }, {
             token: "keyword",
             regex: "<\\?lua\\=?",
-            next: "lua-start"
-        });
-    }
-    this.embedRules(LuaHighlightRules, "lua-", [
+            push: "lua-start"
+        }
+    ];
+
+    var endRules = [
         {
             token: "keyword",
             regex: "\\%>",
-            next: "start"
-        },
-        {
+            next: "pop"
+        }, {
             token: "keyword",
             regex: "\\?>",
-            next: "start"
+            next: "pop"
         }
-    ]);
+    ];
+
+    this.embedRules(LuaHighlightRules, "lua-", endRules, ["start"]);
+
+    for (var key in this.$rules)
+        this.$rules[key].unshift.apply(this.$rules[key], startRules);
+
+    this.normalizeRules();
 };
 
 oop.inherits(LuaPageHighlightRules, HtmlHighlightRules);

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/lucene.js

@@ -3,14 +3,17 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var LuceneHighlightRules = require("./lucene_highlight_rules").LuceneHighlightRules;
 
 var Mode = function() {
-    this.$tokenizer =  new Tokenizer(new LuceneHighlightRules().getRules());
+    this.HighlightRules = LuceneHighlightRules;
 };
 
 oop.inherits(Mode, TextMode);
 
+(function() {
+    this.$id = "ace/mode/lucene";
+}).call(Mode.prototype);
+
 exports.Mode = Mode;
 });

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/makefile.js

@@ -26,11 +26,6 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *
- * Contributor(s):
- * 
- *
- *
  * ***** END LICENSE BLOCK ***** */
 
 /*
@@ -42,20 +37,21 @@ define(function(require, exports, module) {
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MakefileHighlightRules = require("./makefile_highlight_rules").MakefileHighlightRules;
 var FoldMode = require("./folding/coffee").FoldMode;
 
 var Mode = function() {
-    var highlighter = new MakefileHighlightRules();
+    this.HighlightRules = MakefileHighlightRules;
     this.foldingRules = new FoldMode();
-    
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
 };
 oop.inherits(Mode, TextMode);
 
 (function() {
-    // Extra logic goes here. 
+       
+    this.lineCommentStart = "#";    
+    this.$indentWithTabs = true;
+    
+    this.$id = "ace/mode/makefile";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/makefile_highlight_rules.js

@@ -21,48 +21,48 @@ var MakefileHighlightRules = function() {
         {
     "start": [
         {
-            "token": "string.interpolated.backtick.makefile",
-            "regex": "`",
-            "next": "shell-start"
+            token: "string.interpolated.backtick.makefile",
+            regex: "`",
+            next: "shell-start"
         },
         {
-            "token": "punctuation.definition.comment.makefile",
-            "regex": /#(?=.)/,
-            "next": "comment"
+            token: "punctuation.definition.comment.makefile",
+            regex: /#(?=.)/,
+            next: "comment"
         },
         {
-            "token": [ "keyword.control.makefile"],
-            "regex": "^(?:\\s*\\b)(\\-??include|ifeq|ifneq|ifdef|ifndef|else|endif|vpath|export|unexport|define|endef|override)(?:\\b)"
+            token: [ "keyword.control.makefile"],
+            regex: "^(?:\\s*\\b)(\\-??include|ifeq|ifneq|ifdef|ifndef|else|endif|vpath|export|unexport|define|endef|override)(?:\\b)"
         },
         {// ^([^\t ]+(\s[^\t ]+)*:(?!\=))\s*.*
-            "token": ["entity.name.function.makefile", "text"],
-            "regex": "^([^\\t ]+(?:\\s[^\\t ]+)*:)(\\s*.*)"
+            token: ["entity.name.function.makefile", "text"],
+            regex: "^([^\\t ]+(?:\\s[^\\t ]+)*:)(\\s*.*)"
         }
     ],
     "comment": [
         {
-            "token" : "punctuation.definition.comment.makefile",
-            "regex" : /.+\\/
+            token : "punctuation.definition.comment.makefile",
+            regex : /.+\\/
         },
         {
-            "token" : "punctuation.definition.comment.makefile",
-            "regex" : ".+",
-            "next"  : "start"
+            token : "punctuation.definition.comment.makefile",
+            regex : ".+",
+            next  : "start"
         }
     ],
     "shell-start": [
         {
-            "token": keywordMapper,
-            "regex" : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+            token: keywordMapper,
+            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
         }, 
         {
-            "token": "string",
-            "regex" : "\\w+"
+            token: "string",
+            regex : "\\w+"
         }, 
         {
-            "token" : "string.interpolated.backtick.makefile",
-            "regex" : "`",
-            "next"  : "start"
+            token : "string.interpolated.backtick.makefile",
+            regex : "`",
+            next  : "start"
         }
     ]
 }

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/markdown.js

@@ -3,7 +3,7 @@
  *
  * 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
@@ -14,7 +14,7 @@
  *     * 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
@@ -36,26 +36,26 @@ var TextMode = require("./text").Mode;
 var JavaScriptMode = require("./javascript").Mode;
 var XmlMode = require("./xml").Mode;
 var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
 var MarkdownHighlightRules = require("./markdown_highlight_rules").MarkdownHighlightRules;
 var MarkdownFoldMode = require("./folding/markdown").FoldMode;
 
 var Mode = function() {
-    var highlighter = new MarkdownHighlightRules();
-    
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$embeds = highlighter.getEmbeds();
+    this.HighlightRules = MarkdownHighlightRules;
+
     this.createModeDelegates({
-      "js-": JavaScriptMode,
-      "xml-": XmlMode,
-      "html-": HtmlMode
+        "js-": JavaScriptMode,
+        "xml-": XmlMode,
+        "html-": HtmlMode
     });
-    
+
     this.foldingRules = new MarkdownFoldMode();
 };
 oop.inherits(Mode, TextMode);
 
 (function() {
+    this.type = "text";
+    this.blockComment = {start: "<!--", end: "-->"};
+
     this.getNextLineIndent = function(state, line, tab) {
         if (state == "listblock") {
             var match = /^(\s*)(?:([-+*])|(\d+)\.)(\s+)/.exec(line);
@@ -69,6 +69,7 @@ oop.inherits(Mode, TextMode);
             return this.$getIndent(line);
         }
     };
+    this.$id = "ace/mode/markdown";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;

data/lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/markdown_highlight_rules.js

@@ -3,7 +3,7 @@
  *
  * 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
@@ -14,7 +14,7 @@
  *     * 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
@@ -32,154 +32,195 @@ define(function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
+var lang = require("../lib/lang");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
 var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
 var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
 var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
 
+var escaped = function(ch) {
+    return "(?:[^" + lang.escapeRegExp(ch) + "\\\\]|\\\\.)*";
+}
+
 function github_embed(tag, prefix) {
     return { // Github style block
         token : "support.function",
-        regex : "^```" + tag + "\\s*$",
-        next  : prefix + "start"
+        regex : "^\\s*```" + tag + "\\s*$",
+        push  : prefix + "start"
     };
 }
 
 var MarkdownHighlightRules = function() {
-
+    HtmlHighlightRules.call(this);
     // regexp must not have capturing parentheses
     // regexps are ordered -> the first match is used
 
-    this.$rules = {
-        "start" : [ {
-            token : "empty_line",
-            regex : '^$'
+    this.$rules["start"].unshift({
+        token : "empty_line",
+        regex : '^$',
+        next: "allowBlock"
+    }, { // h1
+        token: "markup.heading.1",
+        regex: "^=+(?=\\s*$)"
+    }, { // h2
+        token: "markup.heading.2",
+        regex: "^\\-+(?=\\s*$)"
+    }, {
+        token : function(value) {
+            return "markup.heading." + value.length;
+        },
+        regex : /^#{1,6}(?=\s*[^ #]|\s+#.)/,
+        next : "header"
+    },
+       github_embed("(?:javascript|js)", "jscode-"),
+       github_embed("xml", "xmlcode-"),
+       github_embed("html", "htmlcode-"),
+       github_embed("css", "csscode-"),
+    { // Github style block
+        token : "support.function",
+        regex : "^\\s*```\\s*\\S*(?:{.*?\\})?\\s*$",
+        next  : "githubblock"
+    }, { // block quote
+        token : "string.blockquote",
+        regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
+        next  : "blockquote"
+    }, { // HR * - _
+        token : "constant",
+        regex : "^ {0,2}(?:(?: ?\\* ?){3,}|(?: ?\\- ?){3,}|(?: ?\\_ ?){3,})\\s*$",
+        next: "allowBlock"
+    }, { // list
+        token : "markup.list",
+        regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
+        next  : "listblock-start"
+    }, {
+        include : "basic"
+    });
+
+    this.addRules({
+        "basic" : [{
+            token : "constant.language.escape",
+            regex : /\\[\\`*_{}\[\]()#+\-.!]/
         }, { // code span `
-            token : ["support.function", "support.function", "support.function"],
-            regex : "(`+)([^\\r]*?[^`])(\\1)"
-        }, { // code block
-            token : "support.function",
-            regex : "^[ ]{4}.+"
-        }, { // h1
-            token: "markup.heading.1",
-            regex: "^=+(?=\\s*$)"
-        }, { // h2
-            token: "markup.heading.2",
-            regex: "^\\-+(?=\\s*$)"
-        }, { // header
-            token : function(value) {
-                return "markup.heading." + value.search(/[^#]/);
-            },
-            regex : "^#{1,6}(?:[^ #].*| +.*(?:[^ #].*|[^ ]+.* +#+ *))$"
-        }, github_embed("(?:javascript|js)", "js-"),
-           github_embed("xml", "xml-"),
-           github_embed("html", "html-"),
-           github_embed("css", "css-"),
-        { // Github style block
             token : "support.function",
-            regex : "^```[a-zA-Z]*\\s*$",
-            next  : "githubblock"
-        }, { // block quote
-            token : "string",
-            regex : "^>[ ].+$",
-            next  : "blockquote"
+            regex : "(`+)(.*?[^`])(\\1)"
         }, { // reference
             token : ["text", "constant", "text", "url", "string", "text"],
             regex : "^([ ]{0,3}\\[)([^\\]]+)(\\]:\\s*)([^ ]+)(\\s*(?:[\"][^\"]+[\"])?(\\s*))$"
         }, { // link by reference
             token : ["text", "string", "text", "constant", "text"],
-            regex : "(\\[)((?:[[^\\]]*\\]|[^\\[\\]])*)(\\][ ]?(?:\\n[ ]*)?\\[)(.*?)(\\])"
+            regex : "(\\[)(" + escaped("]") + ")(\\]\s*\\[)("+ escaped("]") + ")(\\])"
         }, { // link by url
             token : ["text", "string", "text", "markup.underline", "string", "text"],
-            regex : "(\\[)"+
-                    "(\\[[^\\]]*\\]|[^\\[\\]]*)"+
-                    "(\\]\\([ \\t]*)"+
-                    "(<?(?:(?:[^\\(]*?\\([^\\)]*?\\)\\S*?)|(?:.*?))>?)"+
-                    "((?:[ \t]*\"(?:.*?)\"[ \\t]*)?)"+
-                    "(\\))"
-        }, { // HR *
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\*[ ]?){3,}\\s*$"
-        }, { // HR -
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\-[ ]?){3,}\\s*$"
-        }, { // HR _
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\_[ ]?){3,}\\s*$"
-        }, { // list
-            token : "markup.list",
-            regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
-            next  : "listblock"
+            regex : "(\\[)(" +                                        // [
+                    escaped("]") +                                    // link text
+                    ")(\\]\\()"+                                      // ](
+                    '((?:[^\\)\\s\\\\]|\\\\.|\\s(?=[^"]))*)' +        // href
+                    '(\\s*"' +  escaped('"') + '"\\s*)?' +            // "title"
+                    "(\\))"                                           // )
         }, { // strong ** __
-            token : ["string", "string", "string"],
-            regex : "([*]{2}|[_]{2}(?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
+            token : "string.strong",
+            regex : "([*]{2}|[_]{2}(?=\\S))(.*?\\S[*_]*)(\\1)"
         }, { // emphasis * _
-            token : ["string", "string", "string"],
-            regex : "([*]|[_](?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
-        }, { // 
+            token : "string.emphasis",
+            regex : "([*]|[_](?=\\S))(.*?\\S[*_]*)(\\1)"
+        }, { //
             token : ["text", "url", "text"],
             regex : "(<)("+
                       "(?:https?|ftp|dict):[^'\">\\s]+"+
                       "|"+
                       "(?:mailto:)?[-.\\w]+\\@[-a-z0-9]+(?:\\.[-a-z0-9]+)*\\.[a-z]+"+
                     ")(>)"
+        }],
+
+        // code block
+        "allowBlock": [
+            {token : "support.function", regex : "^ {4}.+", next : "allowBlock"},
+            {token : "empty", regex : "", next : "start"}
+        ],
+
+        "header" : [{
+            regex: "$",
+            next : "start"
+        }, {
+            include: "basic"
         }, {
-            token : "text",
-            regex : "[^\\*_%$`\\[#<>]+"
+            defaultToken : "heading"
         } ],
-        
+
+        "listblock-start" : [{
+            token : "support.variable",
+            regex : /(?:\[[ x]\])?/,
+            next  : "listblock"
+        }],
+
         "listblock" : [ { // Lists only escape on completely blank lines.
             token : "empty_line",
             regex : "^$",
             next  : "start"
-        }, {
+        }, { // list
             token : "markup.list",
-            regex : ".+"
+            regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
+            next  : "listblock-start"
+        }, {
+            include : "basic", noEscape: true
+        }, { // Github style block
+            token : "support.function",
+            regex : "^\\s*```\\s*[a-zA-Z]*(?:{.*?\\})?\\s*$",
+            next  : "githubblock"
+        }, {
+            defaultToken : "list" //do not use markup.list to allow stling leading `*` differntly
         } ],
-        
-        "blockquote" : [ { // BLockquotes only escape on blank lines.
+
+        "blockquote" : [ { // Blockquotes only escape on blank lines.
             token : "empty_line",
             regex : "^\\s*$",
             next  : "start"
+        }, { // block quote
+            token : "string.blockquote",
+            regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
+            next  : "blockquote"
         }, {
-            token : "string",
-            regex : ".+"
+            include : "basic", noEscape: true
+        }, {
+            defaultToken : "string.blockquote"
         } ],
-        
+
         "githubblock" : [ {
             token : "support.function",
-            regex : "^```",
+            regex : "^\\s*```",
             next  : "start"
         }, {
             token : "support.function",
             regex : ".+"
         } ]
-    };
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
+    });
+
+    this.embedRules(JavaScriptHighlightRules, "jscode-", [{
        token : "support.function",
-       regex : "^```",
-       next  : "start"
+       regex : "^\\s*```",
+       next  : "pop"
     }]);
-    
-    this.embedRules(HtmlHighlightRules, "html-", [{
+
+    this.embedRules(HtmlHighlightRules, "htmlcode-", [{
        token : "support.function",
-       regex : "^```",
-       next  : "start"
+       regex : "^\\s*```",
+       next  : "pop"
     }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
+
+    this.embedRules(CssHighlightRules, "csscode-", [{
        token : "support.function",
-       regex : "^```",
-       next  : "start"
+       regex : "^\\s*```",
+       next  : "pop"
     }]);
-    
-    this.embedRules(XmlHighlightRules, "xml-", [{
+
+    this.embedRules(XmlHighlightRules, "xmlcode-", [{
        token : "support.function",
-       regex : "^```",
-       next  : "start"
+       regex : "^\\s*```",
+       next  : "pop"
     }]);
+
+    this.normalizeRules();
 };
 oop.inherits(MarkdownHighlightRules, TextHighlightRules);