codemirror-rails 2.3 → 2.21

data/vendor/assets/javascripts/codemirror/modes/rst.js

@@ -321,6 +321,6 @@ CodeMirror.defineMode('rst', function(config, options) {
             return token;
         }
     };
-}, "python");
+});
 
 CodeMirror.defineMIME("text/x-rst", "rst");

data/vendor/assets/javascripts/codemirror/modes/ruby.js

@@ -30,10 +30,10 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
       return "comment";
     }
     if (stream.eatSpace()) return null;
-    var ch = stream.next(), m;
+    var ch = stream.next();
     if (ch == "`" || ch == "'" || ch == '"' ||
         (ch == "/" && !stream.eol() && stream.peek() != " ")) {
-      return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
+      return chain(readQuoted(ch, "string", ch == '"'), stream, state);
     } else if (ch == "%") {
       var style, embed = false;
       if (stream.eat("s")) style = "atom";
@@ -46,8 +46,13 @@ CodeMirror.defineMode("ruby", function(config, parserConfig) {
     } else if (ch == "#") {
       stream.skipToEnd();
       return "comment";
-    } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
-      return chain(readHereDoc(m[1]), stream, state);
+    } else if (ch == "<" && stream.eat("<")) {
+      stream.eat("-");
+      stream.eat(/[\'\"\`]/);
+      var match = stream.match(/^\w+/);
+      stream.eat(/[\'\"\`]/);
+      if (match) return chain(readHereDoc(match[0]), stream, state);
+      return null;
     } else if (ch == "0") {
       if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
       else if (stream.eat("b")) stream.eatWhile(/[01]/);

data/vendor/assets/javascripts/codemirror/modes/scheme.js

@@ -5,7 +5,7 @@ CodeMirror.defineMode("scheme", function (config, mode) {
     var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
         ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD="keyword";
     var INDENT_WORD_SKIP = 2, KEYWORDS_SKIP = 1;
-
+    
     function makeKeywords(str) {
         var obj = {}, words = str.split(" ");
         for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
@@ -14,6 +14,7 @@ CodeMirror.defineMode("scheme", function (config, mode) {
 
     var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci<? char-ci=? char-ci>=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char<? char=? char>=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci<? string-ci=? string-ci>=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string<? string=? string>=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
     var indentKeys = makeKeywords("define let letrec let* lambda");
+    
 
     function stateStack(indent, type, prev) { // represents a state stack object
         this.indent = indent;
@@ -28,29 +29,21 @@ CodeMirror.defineMode("scheme", function (config, mode) {
     function popStack(state) {
         state.indentStack = state.indentStack.prev;
     }
-
-    var binaryMatcher = new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i);
-    var octalMatcher = new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i);
-    var hexMatcher = new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i);
-    var decimalMatcher = new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);
-
-    function isBinaryNumber (stream) {
-        return stream.match(binaryMatcher);
-    }
-
-    function isOctalNumber (stream) {
-        return stream.match(octalMatcher);
-    }
-
-    function isDecimalNumber (stream, backup) {
-        if (backup === true) {
-            stream.backUp(1);
+    
+    /**
+     * Scheme numbers are complicated unfortunately.
+     * Checks if we're looking at a number, which might be possibly a fraction.
+     * Also checks that it is not part of a longer identifier. Returns true/false accordingly.
+     */
+    function isNumber(ch, stream){ 
+        if(/[0-9]/.exec(ch) != null){ 
+            stream.eatWhile(/[0-9]/);
+            stream.eat(/\//);
+            stream.eatWhile(/[0-9]/);
+            if (stream.eol() || !(/[a-zA-Z\-\_\/]/.exec(stream.peek()))) return true;
+            stream.backUp(stream.current().length - 1); // undo all the eating
         }
-        return stream.match(decimalMatcher);
-    }
-
-    function isHexNumber (stream) {
-        return stream.match(hexMatcher);
+        return false;
     }
 
     return {
@@ -74,13 +67,13 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                 return null;
             }
             var returnType = null;
-
+            
             switch(state.mode){
                 case "string": // multi-line string parsing mode
                     var next, escaped = false;
                     while ((next = stream.next()) != null) {
                         if (next == "\"" && !escaped) {
-
+    
                             state.mode = false;
                             break;
                         }
@@ -92,7 +85,7 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                     var next, maybeEnd = false;
                     while ((next = stream.next()) != null) {
                         if (next == "#" && maybeEnd) {
-
+    
                             state.mode = false;
                             break;
                         }
@@ -113,73 +106,52 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                     }
                 default: // default parsing mode
                     var ch = stream.next();
-
+        
                     if (ch == "\"") {
                         state.mode = "string";
                         returnType = STRING;
-
+        
                     } else if (ch == "'") {
                         returnType = ATOM;
                     } else if (ch == '#') {
-                        if (stream.eat("|")) {                    // Multi-line comment
+                        if (stream.eat("|")) {					// Multi-line comment
                             state.mode = "comment"; // toggle to comment mode
                             returnType = COMMENT;
-                        } else if (stream.eat(/[tf]/i)) {            // #t/#f (atom)
+                        } else if (stream.eat(/[tf]/)) {			// #t/#f (atom)
                             returnType = ATOM;
-                        } else if (stream.eat(';')) {                // S-Expr comment
+                        } else if (stream.eat(';')) {				// S-Expr comment
                             state.mode = "s-expr-comment";
                             returnType = COMMENT;
-                        } else {
-                            var numTest = null, hasExactness = false, hasRadix = true;
-                            if (stream.eat(/[ei]/i)) {
-                                hasExactness = true;
-                            } else {
-                                stream.backUp(1);       // must be radix specifier
-                            }
-                            if (stream.match(/^#b/i)) {
-                                numTest = isBinaryNumber;
-                            } else if (stream.match(/^#o/i)) {
-                                numTest = isOctalNumber;
-                            } else if (stream.match(/^#x/i)) {
-                                numTest = isHexNumber;
-                            } else if (stream.match(/^#d/i)) {
-                                numTest = isDecimalNumber;
-                            } else if (stream.match(/^[-+0-9.]/, false)) {
-                                hasRadix = false;
-                                numTest = isDecimalNumber;
-                            // re-consume the intial # if all matches failed
-                            } else if (!hasExactness) {
-                                stream.eat('#');
-                            }
-                            if (numTest != null) {
-                                if (hasRadix && !hasExactness) {
-                                    // consume optional exactness after radix
-                                    stream.match(/^#[ei]/i);
-                                }
-                                if (numTest(stream))
-                                    returnType = NUMBER;
-                            }
                         }
-                    } else if (/^[-+0-9.]/.test(ch) && isDecimalNumber(stream, true)) { // match non-prefixed number, must be decimal
-                        returnType = NUMBER;
+        
                     } else if (ch == ";") { // comment
                         stream.skipToEnd(); // rest of the line is a comment
                         returnType = COMMENT;
+                    } else if (ch == "-"){
+                        
+                        if(!isNaN(parseInt(stream.peek()))){
+                            stream.eatWhile(/[\/0-9]/);
+                            returnType = NUMBER;
+                        }else{                            
+                            returnType = null;
+                        }
+                    } else if (isNumber(ch,stream)){
+                        returnType = NUMBER;
                     } else if (ch == "(" || ch == "[") {
                         var keyWord = ''; var indentTemp = stream.column();
                         /**
-                        Either
+                        Either 
                         (indent-word ..
                         (non-indent-word ..
                         (;something else, bracket, etc.
                         */
-
+        
                         while ((letter = stream.eat(/[^\s\(\[\;\)\]]/)) != null) {
                             keyWord += letter;
                         }
-
+        
                         if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
-
+        
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
                             // we continue eating the spaces
@@ -193,15 +165,15 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                             }
                         }
                         stream.backUp(stream.current().length - 1); // undo all the eating
-
+                        
                         if(typeof state.sExprComment == "number") state.sExprComment++;
-
+                        
                         returnType = BRACKET;
                     } else if (ch == ")" || ch == "]") {
                         returnType = BRACKET;
                         if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
                             popStack(state);
-
+                            
                             if(typeof state.sExprComment == "number"){
                                 if(--state.sExprComment == 0){
                                     returnType = COMMENT; // final closing bracket
@@ -210,11 +182,11 @@ CodeMirror.defineMode("scheme", function (config, mode) {
                             }
                         }
                     } else {
-                        stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/);
-
+                        stream.eatWhile(/[\w\$_\-]/);
+        
                         if (keywords && keywords.propertyIsEnumerable(stream.current())) {
                             returnType = BUILTIN;
-                        } else returnType = "variable";
+                        }else returnType = null;
                     }
             }
             return (typeof state.sExprComment == "number") ? COMMENT : returnType;
@@ -227,4 +199,4 @@ CodeMirror.defineMode("scheme", function (config, mode) {
     };
 });
 
-CodeMirror.defineMIME("text/x-scheme", "scheme");
+CodeMirror.defineMIME("text/x-scheme", "scheme");

data/vendor/assets/javascripts/codemirror/modes/smalltalk.js

@@ -27,45 +27,45 @@ CodeMirror.defineMode('smalltalk', function(config, modeConfig) {
 
 	var next = function(stream, context, state) {
 		var token = new Token(null, context, false);
-		var aChar = stream.next();
+		var char = stream.next();
 
-		if (aChar === '"') {
+		if (char === '"') {
 			token = nextComment(stream, new Context(nextComment, context));
 
-		} else if (aChar === '\'') {
+		} else if (char === '\'') {
 			token = nextString(stream, new Context(nextString, context));
 
-		} else if (aChar === '#') {
+		} else if (char === '#') {
 			stream.eatWhile(/[^ .]/);
 			token.name = 'string-2';
 
-		} else if (aChar === '$') {
+		} else if (char === '$') {
 			stream.eatWhile(/[^ ]/);
 			token.name = 'string-2';
 
-		} else if (aChar === '|' && state.expectVariable) {
+		} else if (char === '|' && state.expectVariable) {
 			token.context = new Context(nextTemporaries, context);
 
-		} else if (/[\[\]{}()]/.test(aChar)) {
+		} else if (/[\[\]{}()]/.test(char)) {
 			token.name = 'bracket';
-			token.eos = /[\[{(]/.test(aChar);
+			token.eos = /[\[{(]/.test(char);
 
-			if (aChar === '[') {
+			if (char === '[') {
 				state.indentation++;
-			} else if (aChar === ']') {
+			} else if (char === ']') {
 				state.indentation = Math.max(0, state.indentation - 1);
 			}
 
-		} else if (specialChars.test(aChar)) {
+		} else if (specialChars.test(char)) {
 			stream.eatWhile(specialChars);
 			token.name = 'operator';
-			token.eos = aChar !== ';'; // ; cascaded message expression
+			token.eos = char !== ';'; // ; cascaded message expression
 
-		} else if (/\d/.test(aChar)) {
+		} else if (/\d/.test(char)) {
 			stream.eatWhile(/[\w\d]/);
 			token.name = 'number'
 
-		} else if (/[\w_]/.test(aChar)) {
+		} else if (/[\w_]/.test(char)) {
 			stream.eatWhile(/[\w\d_]/);
 			token.name = state.expectVariable ? (keywords.test(stream.current()) ? 'keyword' : 'variable') : null;
 
@@ -88,9 +88,9 @@ CodeMirror.defineMode('smalltalk', function(config, modeConfig) {
 
 	var nextTemporaries = function(stream, context, state) {
 		var token = new Token(null, context, false);
-		var aChar = stream.next();
+		var char = stream.next();
 
-		if (aChar === '|') {
+		if (char === '|') {
 			token.context = context.parent;
 			token.eos = true;
 

data/vendor/assets/javascripts/codemirror/modes/stex.js

@@ -82,37 +82,22 @@ CodeMirror.defineMode("stex", function(cmCfg, modeCfg)
     }
 
     function normal(source, state) {
-	if (source.match(/^\\[a-zA-Z@]+/)) {
+	if (source.match(/^\\[a-z]+/)) {
 	    var cmdName = source.current();
 	    cmdName = cmdName.substr(1, cmdName.length-1);
-            var plug;
-            if (plugins.hasOwnProperty(cmdName)) {
-	      plug = plugins[cmdName];
-            } else {
-              plug = plugins["DEFAULT"];
-            }
+	    var plug = plugins[cmdName];
+	    if (typeof(plug) == 'undefined') {
+		plug = plugins["DEFAULT"];
+	    }
 	    plug = new plug();
 	    pushCommand(state, plug);
 	    setState(state, beginParams);
 	    return plug.style;
 	}
 
-        // escape characters 
-        if (source.match(/^\\[$&%#{}_]/)) {
-          return "tag";
-        }
-
-        // white space control characters
-        if (source.match(/^\\[,;!\/]/)) {
-          return "tag";
-        }
-
 	var ch = source.next();
 	if (ch == "%") {
-            // special case: % at end of its own line; stay in same state
-            if (!source.eol()) {
-              setState(state, inCComment);
-            }
+	    setState(state, inCComment);
 	    return "comment";
 	} 
 	else if (ch=='}' || ch==']') {

data/vendor/assets/javascripts/codemirror/modes/tiddlywiki.js

@@ -1,18 +1,18 @@
 /***
-|''Name''|tiddlywiki.js|
-|''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
-|''Author''|PMario|
-|''Version''|0.1.7|
-|''Status''|''stable''|
-|''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!
-***/
+ |''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;
@@ -47,20 +47,20 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 	}();
 
 	var isSpaceName = /[\w_\-]/i,
-		reHR = /^\-\-\-\-+$/,					// <hr>
+		reHR = /^\-\-\-\-+$/,
 		reWikiCommentStart = /^\/\*\*\*$/,		// /***
 		reWikiCommentStop = /^\*\*\*\/$/,		// ***/
 		reBlockQuote = /^<<<$/,
 
-		reJsCodeStart = /^\/\/\{\{\{$/,			// //{{{ js block start
-		reJsCodeStop = /^\/\/\}\}\}$/,			// //}}} js stop
-		reXmlCodeStart = /^<!--\{\{\{-->$/,		// xml block start
-		reXmlCodeStop = /^<!--\}\}\}-->$/,		// xml stop
+		reJsCodeStart = /^\/\/\{\{\{$/,			// //{{{
+		reJsCodeStop = /^\/\/\}\}\}$/,			// //}}}
+		reXmlCodeStart = /^<!--\{\{\{-->$/,
+		reXmlCodeStop = /^<!--\}\}\}-->$/,
 
-		reCodeBlockStart = /^\{\{\{$/,			// {{{ TW text div block start
-		reCodeBlockStop = /^\}\}\}$/,			// }}} TW text stop
+		reCodeBlockStart = /^\{\{\{$/,
+		reCodeBlockStop = /^\}\}\}$/,
 
-		reCodeStart = /\{\{\{/,					// {{{ code span start
+		reCodeStart = /\{\{\{/,
 		reUntilCodeStop = /.*?\}\}\}/;
 
 	function chain(stream, state, f) {
@@ -95,9 +95,9 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			
 		state.block = false;	// indicates the start of a code block.
 
-		ch = stream.peek(); 	// don't eat, to make matching simpler
+		ch = stream.peek(); // don't eat, to make match simpler
 		
-		// check start of  blocks
+		// check start of  blocks    
 		if (sol && /[<\/\*{}\-]/.test(ch)) {
 			if (stream.match(reCodeBlockStart)) {
 				state.block = true;
@@ -107,16 +107,16 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 				return ret('quote', 'quote');
 			}
 			if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
-				return ret('code', 'comment');
+				return ret('code', 'code');
 			}
 			if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
-				return ret('code', 'comment');
+				return ret('code', 'code');
 			}
 			if (stream.match(reHR)) {
 				return ret('hr', 'hr');
 			}
 		} // sol
-		ch = stream.next();
+		var ch = stream.next();
 
 		if (sol && /[\/\*!#;:>|]/.test(ch)) {
 			if (ch == "!") { // tw header
@@ -125,26 +125,26 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			}
 			if (ch == "*") { // tw list
 				stream.eatWhile('*');
-				return ret("list", "comment");
+				return ret("list", "list");
 			}
 			if (ch == "#") { // tw numbered list
 				stream.eatWhile('#');
-				return ret("list", "comment");
+				return ret("list", "list");
 			}
-			if (ch == ";") { // definition list, term
+			if (ch == ";") { // tw list
 				stream.eatWhile(';');
-				return ret("list", "comment");
+				return ret("list", "list");
 			}
-			if (ch == ":") { // definition list, description
+			if (ch == ":") { // tw list
 				stream.eatWhile(':');
-				return ret("list", "comment");
+				return ret("list", "list");
 			}
 			if (ch == ">") { // single line quote
 				stream.eatWhile(">");
 				return ret("quote", "quote");
 			}
 			if (ch == '|') {
-				return ret('table', 'header');
+				return ret('table', 'table');
 			}
 		}
 
@@ -155,16 +155,13 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		// 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", "link");
+				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 (ch == '~') {	// _no_ CamelCase indicator should be bold
-			return ret('text', 'brace');
-		}
 		if (/[\[\]]/.test(ch)) { // check for [[..]]
 			if (stream.peek() == ch) {
 				stream.next();
@@ -173,7 +170,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		}
 		if (ch == "@") {	// check for space link. TODO fix @@...@@ highlighting
 			stream.eatWhile(isSpaceName);
-			return ret("link", "link");
+			return ret("link-external", "link-external");
 		}
 		if (/\d/.test(ch)) {	// numbers
 			stream.eatWhile(/\d/);
@@ -192,15 +189,9 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 				return chain(stream, state, twTokenUnderline);
 			}
 		}
-		// strikethrough and mdash handling
-		if (ch == "-") {
+		if (ch == "-") { // tw strikethrough TODO looks ugly .. different handling see below;
 			if (stream.eat("-")) {
-				// if strikethrough looks ugly, change CSS.
-				if (stream.peek() != ' ')
-					return chain(stream, state, twTokenStrike);
-				// mdash
-				if (stream.peek() == ' ')
-					return ret('text', 'brace');
+				return chain(stream, state, twTokenStrike);
 			}
 		}
 		if (ch == "'") { // tw bold
@@ -217,7 +208,6 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			return ret(ch);
 		}
 
-		// core macro handling
 		stream.eatWhile(/[\w\$_]/);
 		var word = stream.current(),
 			known = textwords.propertyIsEnumerable(word) && textwords[word];
@@ -266,21 +256,21 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		var ch, sb = state.block;
 		
 		if (sb && stream.current()) {
-			return ret("code", "comment");
+			return ret("code", "code");
 		}
 
 		if (!sb && stream.match(reUntilCodeStop)) {
 			state.tokenize = jsTokenBase;
-			return ret("code", "comment");
+			return ret("code", "code-inline");
 		}
 
 		if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
 			state.tokenize = jsTokenBase;
-			return ret("code", "comment");
+			return ret("code", "code");
 		}
 
 		ch = stream.next();
-		return (sb) ? ret("code", "comment") : ret("code", "comment");
+		return (sb) ? ret("code", "code") : ret("code", "code-inline");
 	}
 
 	// tw em / italic
@@ -311,8 +301,8 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 		return ret("text", "underlined");
 	}
 
-	// tw strike through text looks ugly
-	// change CSS if needed
+	// tw strike through text looks ugly 
+	// TODO just strike through the first and last 2 chars if possible.
 	function twTokenStrike(stream, state) {
 		var maybeEnd = false,
 			ch, nr;
@@ -324,7 +314,7 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
 			}
 			maybeEnd = (ch == "-");
 		}
-		return ret("text", "strikethrough");
+		return ret("text", "line-through");
 	}
 
 	// macro