aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/tiddlywiki
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-04 15:31:40 -0700
committerValerio Virgillito2012-05-04 15:31:40 -0700
commit3ebed34665fa73b0ce613b400f3029ebf4476439 (patch)
tree09a3c592035030bda7bb62d1f908ce263377d74c /imports/codemirror/mode/tiddlywiki
parent8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-3ebed34665fa73b0ce613b400f3029ebf4476439.tar.gz
Merge branch 'refs/heads/master' into dom-architecture
Diffstat (limited to 'imports/codemirror/mode/tiddlywiki')
-rw-r--r--imports/codemirror/mode/tiddlywiki/index.html69
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.css2
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.js72
3 files changed, 55 insertions, 88 deletions
diff --git a/imports/codemirror/mode/tiddlywiki/index.html b/imports/codemirror/mode/tiddlywiki/index.html
index 36d0975c..2f7da0e0 100644
--- a/imports/codemirror/mode/tiddlywiki/index.html
+++ b/imports/codemirror/mode/tiddlywiki/index.html
@@ -16,27 +16,18 @@
16!TiddlyWiki Formatting 16!TiddlyWiki Formatting
17* Rendered versions can be found at: http://www.tiddlywiki.com/#Reference 17* Rendered versions can be found at: http://www.tiddlywiki.com/#Reference
18 18
19|!Option|!Syntax|!Output| 19|!Option | !Syntax |
20|bold font|{{{''bold''}}}|''bold''| 20|bold font | ''bold'' |
21|italic type|{{{//italic//}}}|//italic//| 21|italic type | //italic// |
22|underlined text|{{{__underlined__}}}|__underlined__| 22|underlined text | __underlined__ |
23|strikethrough text|{{{--strikethrough--}}}|--strikethrough--| 23|strikethrough text | --strikethrough-- |
24|superscript text|{{{^^super^^script}}}|^^super^^script| 24|superscript text | super^^script^^ |
25|subscript text|{{{~~sub~~script}}}|~~sub~~script| 25|subscript text | sub~~script~~ |
26|highlighted text|{{{@@highlighted@@}}}|@@highlighted@@| 26|highlighted text | @@highlighted@@ |
27|preformatted text|<html><code>{{{preformatted}}}</code></html>|{{{preformatted}}}| 27|preformatted text | {{{preformatted}}} |
28 28
29!Block Elements 29!Block Elements
30!!Headings
31{{{
32!Heading 1
33!!Heading 2
34!!!Heading 3
35!!!!Heading 4
36!!!!!Heading 5
37}}}
38<<< 30<<<
39
40!Heading 1 31!Heading 1
41 32
42!!Heading 2 33!!Heading 2
@@ -49,18 +40,6 @@
49<<< 40<<<
50 41
51!!Lists 42!!Lists
52{{{
53* unordered list, level 1
54** unordered list, level 2
55*** unordered list, level 3
56
57# ordered list, level 1
58## ordered list, level 2
59### unordered list, level 3
60
61; definition list, term
62: definition list, description
63}}}
64<<< 43<<<
65* unordered list, level 1 44* unordered list, level 1
66** unordered list, level 2 45** unordered list, level 2
@@ -75,15 +54,6 @@
75<<< 54<<<
76 55
77!!Blockquotes 56!!Blockquotes
78{{{
79> blockquote, level 1
80>> blockquote, level 2
81>>> blockquote, level 3
82
83<<<
84blockquote
85<<<
86}}}
87<<< 57<<<
88> blockquote, level 1 58> blockquote, level 1
89>> blockquote, level 2 59>> blockquote, level 2
@@ -93,11 +63,6 @@ blockquote
93<<< 63<<<
94 64
95!!Preformatted Text 65!!Preformatted Text
96<html><pre>
97{{{
98preformatted (e.g. code)
99}}}
100</pre></html>
101<<< 66<<<
102{{{ 67{{{
103preformatted (e.g. code) 68preformatted (e.g. code)
@@ -105,6 +70,7 @@ preformatted (e.g. code)
105<<< 70<<<
106 71
107!!Code Sections 72!!Code Sections
73<<<
108{{{ 74{{{
109Text style code 75Text style code
110}}} 76}}}
@@ -116,9 +82,10 @@ JS styled code. TiddlyWiki mixed mode should support highlighter switching in th
116<!--{{{--> 82<!--{{{-->
117XML styled code. TiddlyWiki mixed mode should support highlighter switching in the future. 83XML styled code. TiddlyWiki mixed mode should support highlighter switching in the future.
118<!--}}}--> 84<!--}}}-->
85<<<
119 86
120!!Tables 87!!Tables
121{{{ 88<<<
122|CssClass|k 89|CssClass|k
123|!heading column 1|!heading column 2| 90|!heading column 1|!heading column 2|
124|row 1, column 1|row 1, column 2| 91|row 1, column 1|row 1, column 2|
@@ -128,21 +95,11 @@ XML styled code. TiddlyWiki mixed mode should support highlighter switching in t
128|~| ... | 95|~| ... |
129|CssProperty:value;...| ... | 96|CssProperty:value;...| ... |
130|caption|c 97|caption|c
131}}} 98
132''Annotation:'' 99''Annotation:''
133* The {{{>}}} marker creates a "colspan", causing the current cell to merge with the one to the right. 100* The {{{>}}} marker creates a "colspan", causing the current cell to merge with the one to the right.
134* The {{{~}}} marker creates a "rowspan", causing the current cell to merge with the one above. 101* The {{{~}}} marker creates a "rowspan", causing the current cell to merge with the one above.
135<<< 102<<<
136|CssClass|k
137|!heading column 1|!heading column 2|
138|row 1, column 1|row 1, column 2|
139|row 2, column 1|row 2, column 2|
140|>|COLSPAN|
141|ROWSPAN| ... |
142|~| ... |
143|CssProperty:value;...| ... |
144|caption|c
145<<<
146!!Images /% TODO %/ 103!!Images /% TODO %/
147cf. [[TiddlyWiki.com|http://www.tiddlywiki.com/#EmbeddedImages]] 104cf. [[TiddlyWiki.com|http://www.tiddlywiki.com/#EmbeddedImages]]
148 105
diff --git a/imports/codemirror/mode/tiddlywiki/tiddlywiki.css b/imports/codemirror/mode/tiddlywiki/tiddlywiki.css
index 767f3de2..dba05c0f 100644
--- a/imports/codemirror/mode/tiddlywiki/tiddlywiki.css
+++ b/imports/codemirror/mode/tiddlywiki/tiddlywiki.css
@@ -11,7 +11,7 @@
11.cm-s-default span.cm-link-external {color: blue;} 11.cm-s-default span.cm-link-external {color: blue;}
12.cm-s-default span.cm-brace {color: #170; font-weight: bold;} 12.cm-s-default span.cm-brace {color: #170; font-weight: bold;}
13.cm-s-default span.cm-macro {color: #9E3825;} 13.cm-s-default span.cm-macro {color: #9E3825;}
14.cm-s-default span.cm-table {color: blue;} 14.cm-s-default span.cm-table {color: blue; font-weight: bold;}
15.cm-s-default span.cm-warning {color: red; font-weight: bold;} 15.cm-s-default span.cm-warning {color: red; font-weight: bold;}
16 16
17.cm-s-default span.cm-underlined {text-decoration: underline;} 17.cm-s-default span.cm-underlined {text-decoration: underline;}
diff --git a/imports/codemirror/mode/tiddlywiki/tiddlywiki.js b/imports/codemirror/mode/tiddlywiki/tiddlywiki.js
index e07124c2..1d26967e 100644
--- a/imports/codemirror/mode/tiddlywiki/tiddlywiki.js
+++ b/imports/codemirror/mode/tiddlywiki/tiddlywiki.js
@@ -1,18 +1,18 @@
1/*** 1/***
2 |''Name''|tiddlywiki.js| 2|''Name''|tiddlywiki.js|
3 |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror2| 3|''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
4 |''Author''|PMario| 4|''Author''|PMario|
5 |''Version''|0.1.6| 5|''Version''|0.1.7|
6 |''Status''|''beta''| 6|''Status''|''stable''|
7 |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]| 7|''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
8 |''Documentation''|http://codemirror.tiddlyspace.com/| 8|''Documentation''|http://codemirror.tiddlyspace.com/|
9 |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]| 9|''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
10 |''CoreVersion''|2.5.0| 10|''CoreVersion''|2.5.0|
11 |''Requires''|codemirror.js| 11|''Requires''|codemirror.js|
12 |''Keywords''|syntax highlighting color code mirror codemirror| 12|''Keywords''|syntax highlighting color code mirror codemirror|
13 ! Info 13! Info
14 CoreVersion parameter is needed for TiddlyWiki only! 14CoreVersion parameter is needed for TiddlyWiki only!
15 ***/ 15***/
16//{{{ 16//{{{
17CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) { 17CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
18 var indentUnit = config.indentUnit; 18 var indentUnit = config.indentUnit;
@@ -47,20 +47,20 @@ CodeMirror.defineMode("tiddlywiki", function (config, parserConfig) {
47 }(); 47 }();
48 48
49 var isSpaceName = /[\w_\-]/i, 49 var isSpaceName = /[\w_\-]/i,
50 reHR = /^\-\-\-\-+$/, 50 reHR = /^\-\-\-\-+$/, // <hr>
51 reWikiCommentStart = /^\/\*\*\*$/, // /*** 51 reWikiCommentStart = /^\/\*\*\*$/, // /***
52 reWikiCommentStop = /^\*\*\*\/$/, // ***/ 52 reWikiCommentStop = /^\*\*\*\/$/, // ***/
53 reBlockQuote = /^<<<$/, 53 reBlockQuote = /^<<<$/,
54 54
55 reJsCodeStart = /^\/\/\{\{\{$/, // //{{{ 55 reJsCodeStart = /^\/\/\{\{\{$/, // //{{{ js block start
56 reJsCodeStop = /^\/\/\}\}\}$/, // //}}} 56 reJsCodeStop = /^\/\/\}\}\}$/, // //}}} js stop
57 reXmlCodeStart = /^<!--\{\{\{-->$/, 57 reXmlCodeStart = /^<!--\{\{\{-->$/, // xml block start
58 reXmlCodeStop = /^<!--\}\}\}-->$/,