Merge branch 'refs/heads/ninja-internal' into ToolFixes

1 files changed, 374 insertions, 0 deletions

diff --git a/imports/codemirror/mode/tiddlywiki/tiddlywiki.js b/imports/codemirror/mode/tiddlywiki/tiddlywiki.js
new file mode 100755
index 00000000..e07124c2
--- /dev/null
+++ b/imports/codemirror/mode/tiddlywiki/tiddlywiki.js
@@ -0,0 +1,374 @@
+/***
+ |''Name''|tiddlywiki.js|
+ |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror2|
+ |''Author''|PMario|
+ |''Version''|0.1.6|
+ |''Status''|''beta''|
+ |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
+ |''Documentation''|http://codemirror.tiddlyspace.com/|
+ |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
+ |''CoreVersion''|2.5.0|
+ |''Requires''|codemirror.js|
+ |''Keywords''|syntax highlighting color code mirror codemirror|
+ ! Info
+ CoreVersion parameter is needed for TiddlyWiki only!
+ ***/
+//{{{
+CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
+        var indentUnit = config.indentUnit;
+
+        // Tokenizer
+        var textwords = function () {
+                function kw(type) {
+                        return {
+                                type: type,
+                                style: "text"
+                        };
+                }
+                return {};
+        }();
+
+        var keywords = function () {
+                function kw(type) {
+                        return { type: type, style: "macro"};
+                }
+                return {
+                        "allTags": kw('allTags'), "closeAll": kw('closeAll'), "list": kw('list'),
+                        "newJournal": kw('newJournal'), "newTiddler": kw('newTiddler'),
+                        "permaview": kw('permaview'), "saveChanges": kw('saveChanges'),
+                        "search": kw('search'), "slider": kw('slider'), "tabs": kw('tabs'),
+                        "tag": kw('tag'), "tagging": kw('tagging'),     "tags": kw('tags'),
+                        "tiddler": kw('tiddler'), "timeline": kw('timeline'),
+                        "today": kw('today'), "version": kw('version'), "option": kw('option'),
+
+                        "with": kw('with'),
+                        "filter": kw('filter')
+                };
+        }();
+
+        var isSpaceName = /[\w_\-]/i,
+                reHR = /^\-\-\-\-+$/,
+                reWikiCommentStart = /^\/\*\*\*$/,              // /***
+                reWikiCommentStop = /^\*\*\*\/$/,               // ***/
+                reBlockQuote = /^<<<$/,
+
+                reJsCodeStart = /^\/\/\{\{\{$/,                 // //{{{
+                reJsCodeStop = /^\/\/\}\}\}$/,                  // //}}}
+                reXmlCodeStart = /^<!--\{\{\{-->$/,
+                reXmlCodeStop = /^<!--\}\}\}-->$/,
+
+                reCodeBlockStart = /^\{\{\{$/,
+                reCodeBlockStop = /^\}\}\}$/,
+
+                reCodeStart = /\{\{\{/,
+                reUntilCodeStop = /.*?\}\}\}/;
+
+        function chain(stream, state, f) {
+                state.tokenize = f;
+                return f(stream, state);
+        }
+
+        // used for strings
+        function nextUntilUnescaped(stream, end) {
+                var escaped = false,
+                        next;
+                while ((next = stream.next()) != null) {
+                        if (next == end && !escaped) return false;
+                        escaped = !escaped && next == "\\";
+                }
+                return escaped;
+        }
+
+        // Used as scratch variables to communicate multiple values without
+        // consing up tons of objects.
+        var type, content;
+
+        function ret(tp, style, cont) {
+                type = tp;
+                content = cont;
+                return style;
+        }
+
+        function jsTokenBase(stream, state) {
+                var sol = stream.sol(), 
+                        ch, tch;
+                        
+                state.block = false;    // indicates the start of a code block.
+
+                ch = stream.peek(); // don't eat, to make match simpler
+                
+                // check start of  blocks    
+                if (sol && /[<\/\*{}\-]/.test(ch)) {
+                        if (stream.match(reCodeBlockStart)) {
+                                state.block = true;
+                                return chain(stream, state, twTokenCode);
+                        }
+                        if (stream.match(reBlockQuote)) {
+                                return ret('quote', 'quote');
+                        }
+                        if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
+                                return ret('code', 'code');
+                        }
+                        if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
+                                return ret('code', 'code');
+                        }
+                        if (stream.match(reHR)) {
+                                return ret('hr', 'hr');
+                        }
+                } // sol
+                var ch = stream.next();
+
+                if (sol && /[\/\*!#;:>|]/.test(ch)) {
+                        if (ch == "!") { // tw header
+                                stream.skipToEnd();
+                                return ret("header", "header");
+                        }
+                        if (ch == "*") { // tw list
+                                stream.eatWhile('*');
+                                return ret("list", "list");
+                        }
+                        if (ch == "#") { // tw numbered list
+                                stream.eatWhile('#');
+                                return ret("list", "list");
+                        }
+                        if (ch == ";") { // tw list
+                                stream.eatWhile(';');
+                                return ret("list", "list");
+                        }
+                        if (ch == ":") { // tw list
+                                stream.eatWhile(':');
+                                return ret("list", "list");
+                        }
+                        if (ch == ">") { // single line quote
+                                stream.eatWhile(">");
+                                return ret("quote", "quote");
+                        }
+                        if (ch == '|') {
+                                return ret('table', 'table');
+                        }
+                }
+
+                if (ch == '{' && stream.match(/\{\{/)) {
+                        return chain(stream, state, twTokenCode);
+                }
+
+                // rudimentary html:// file:// link matching. TW knows much more ...
+                if (/[hf]/i.test(ch)) {
+                        if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
+                                return ret("link-external", "link-external");
+                        }
+                }
+                // just a little string indicator, don't want to have the whole string covered
+                if (ch == '"') {
+                        return ret('string', 'string');
+                }
+                if (/[\[\]]/.test(ch)) { // check for [[..]]
+                        if (stream.peek() == ch) {
+                                stream.next();
+                                return ret('brace', 'brace');
+                        }
+                }
+                if (ch == "@") {        // check for space link. TODO fix @@...@@ highlighting
+                        stream.eatWhile(isSpaceName);
+                        return ret("link-external", "link-external");
+                }
+                if (/\d/.test(ch)) {    // numbers
+                        stream.eatWhile(/\d/);
+                        return ret("number", "number");
+                }
+                if (ch == "/") { // tw invisible comment
+                        if (stream.eat("%")) {
+                                return chain(stream, state, twTokenComment);
+                        }
+                        else if (stream.eat("/")) { // 
+                                return chain(stream, state, twTokenEm);
+                        }
+                }
+                if (ch == "_") { // tw underline
+                        if (stream.eat("_")) {
+                                return chain(stream, state, twTokenUnderline);
+                        }
+                }
+                if (ch == "-") { // tw strikethrough TODO looks ugly .. different handling see below;
+                        if (stream.eat("-")) {
+                                return chain(stream, state, twTokenStrike);
+                        }
+                }
+                if (ch == "'") { // tw bold
+                        if (stream.eat("'")) {
+                                return chain(stream, state, twTokenStrong);
+                        }
+                }
+                if (ch == "<") { // tw macro
+                        if (stream.eat("<")) {
+                                return chain(stream, state, twTokenMacro);
+                        }
+                }
+                else {