Merge branch 'timeline-local' into timeline-multiselect

Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
author: Jon Reid 2012-05-15 11:24:53 -0700
committer: Jon Reid 2012-05-15 11:24:53 -0700
commit: 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
tree: d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/mode/tiddlywiki/index.html
parent: 53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parent: e33a4e58c271a9507082694a5268b840fdd05968 (diff)
download: ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
1 files changed, 13 insertions, 56 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 @@
 !TiddlyWiki Formatting
 * Rendered versions can be found at: http://www.tiddlywiki.com/#Reference
-|!Option|!Syntax|!Output|
+|!Option            | !Syntax            |
-|bold font|{{{''bold''}}}|''bold''|
+|bold font          | ''bold''           |
-|italic type|{{{//italic//}}}|//italic//|
+|italic type        | //italic//         |
-|underlined text|{{{__underlined__}}}|__underlined__|
+|underlined text    | __underlined__     |
-|strikethrough text|{{{--strikethrough--}}}|--strikethrough--|
+|strikethrough text | --strikethrough--  |
-|superscript text|{{{^^super^^script}}}|^^super^^script|
+|superscript text   | super^^script^^    |
-|subscript text|{{{~~sub~~script}}}|~~sub~~script|
+|subscript text     | sub~~script~~      |
-|highlighted text|{{{@@highlighted@@}}}|@@highlighted@@|
+|highlighted text   | @@highlighted@@    |
-|preformatted text|<html><code>{{{preformatted}}}</code></html>|{{{preformatted}}}|
+|preformatted text  | {{{preformatted}}} |
 !Block Elements
-!!Headings
-{{{
-!Heading 1
-!!Heading 2
-!!!Heading 3
-!!!!Heading 4
-!!!!!Heading 5
-}}}
 <<<
 !Heading 1
 !!Heading 2
@@ -49,18 +40,6 @@
 <<<
 !!Lists
-{{{
-* unordered list, level 1
-** unordered list, level 2
-*** unordered list, level 3
-# ordered list, level 1
-## ordered list, level 2
-### unordered list, level 3
-; definition list, term
-: definition list, description
-}}}
 <<<
 * unordered list, level 1
 ** unordered list, level 2
@@ -75,15 +54,6 @@
 <<<
 !!Blockquotes
-{{{
-> blockquote, level 1
->> blockquote, level 2
->>> blockquote, level 3
-<<<
-blockquote
-<<<
-}}}
 <<<
 > blockquote, level 1
 >> blockquote, level 2
@@ -93,11 +63,6 @@ blockquote
 <<<
 !!Preformatted Text
-<html><pre>
-{{{
-preformatted (e.g. code)
-}}}
-</pre></html>
 <<<
 {{{
 preformatted (e.g. code)
@@ -105,6 +70,7 @@ preformatted (e.g. code)
 <<<
 !!Code Sections
+<<<
 {{{
 Text style code
 }}}
@@ -116,9 +82,10 @@ JS styled code. TiddlyWiki mixed mode should support highlighter switching in th
 <!--{{{-->
 XML styled code. TiddlyWiki mixed mode should support highlighter switching in the future.
 <!--}}}-->
+<<<
 !!Tables
-{{{
+<<<
 |CssClass|k
 |!heading column 1|!heading column 2|
 |row 1, column 1|row 1, column 2|
@@ -128,21 +95,11 @@ XML styled code. TiddlyWiki mixed mode should support highlighter switching in t
 |~| ... |
 |CssProperty:value;...| ... |
 |caption|c
-}}}
 ''Annotation:''
 * The {{{>}}} marker creates a "colspan", causing the current cell to merge with the one to the right.
 * The {{{~}}} marker creates a "rowspan", causing the current cell to merge with the one above.
 <<<
-|CssClass|k
-|!heading column 1|!heading column 2|
-|row 1, column 1|row 1, column 2|
-|row 2, column 1|row 2, column 2|
-|>|COLSPAN|
-|ROWSPAN| ... |
-|~| ... |
-|CssProperty:value;...| ... |
-|caption|c
-<<<
 !!Images /% TODO %/
 cf. [[TiddlyWiki.com|http://www.tiddlywiki.com/#EmbeddedImages]]
author	Jon Reid	2012-05-15 11:24:53 -0700
committer	Jon Reid	2012-05-15 11:24:53 -0700
commit	3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
tree	d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/mode/tiddlywiki/index.html
parent	53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parent	e33a4e58c271a9507082694a5268b840fdd05968 (diff)
download	ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz

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	<<<
84	blockquote
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	{{{
98	preformatted (e.g. code)
99	}}}
100	</pre></html>
101	<<<	66	<<<
102	{{{	67	{{{
103	preformatted (e.g. code)	68	preformatted (e.g. code)
@@ -105,6 +70,7 @@ preformatted (e.g. code)
105	<<<	70	<<<
106		71
107	!!Code Sections	72	!!Code Sections
		73	<<<
108	{{{	74	{{{
109	Text style code	75	Text style code
110	}}}	76	}}}
@@ -116,9 +82,10 @@ JS styled code. TiddlyWiki mixed mode should support highlighter switching in th
116	<!--{{{-->	82	<!--{{{-->
117	XML styled code. TiddlyWiki mixed mode should support highlighter switching in the future.	83	XML 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 %/
147	cf. [[TiddlyWiki.com\|http://www.tiddlywiki.com/#EmbeddedImages]]	104	cf. [[TiddlyWiki.com\|http://www.tiddlywiki.com/#EmbeddedImages]]
148		105