aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/stex
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 11:42:09 -0700
committerJonathan Duran2012-07-17 11:42:09 -0700
commitb4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /imports/codemirror/mode/stex
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'imports/codemirror/mode/stex')
-rw-r--r--imports/codemirror/mode/stex/stex.js10
-rw-r--r--imports/codemirror/mode/stex/test.html12
2 files changed, 18 insertions, 4 deletions
diff --git a/imports/codemirror/mode/stex/stex.js b/imports/codemirror/mode/stex/stex.js
index b89e619e..c0739ded 100644
--- a/imports/codemirror/mode/stex/stex.js
+++ b/imports/codemirror/mode/stex/stex.js
@@ -85,10 +85,12 @@ CodeMirror.defineMode("stex", function(cmCfg, modeCfg)
85 if (source.match(/^\\[a-zA-Z@]+/)) { 85 if (source.match(/^\\[a-zA-Z@]+/)) {
86 var cmdName = source.current(); 86 var cmdName = source.current();
87 cmdName = cmdName.substr(1, cmdName.length-1); 87 cmdName = cmdName.substr(1, cmdName.length-1);
88 var plug = plugins[cmdName]; 88 var plug;
89 if (typeof(plug) == 'undefined') { 89 if (plugins.hasOwnProperty(cmdName)) {
90 plug = plugins["DEFAULT"]; 90 plug = plugins[cmdName];
91 } 91 } else {
92 plug = plugins["DEFAULT"];
93 }
92 plug = new plug(); 94 plug = new plug();
93 pushCommand(state, plug); 95 pushCommand(state, plug);
94 setState(state, beginParams); 96 setState(state, beginParams);
diff --git a/imports/codemirror/mode/stex/test.html b/imports/codemirror/mode/stex/test.html
index b53a6a24..a60f4184 100644
--- a/imports/codemirror/mode/stex/test.html
+++ b/imports/codemirror/mode/stex/test.html
@@ -241,6 +241,18 @@
241 241
242 </script> 242 </script>
243 243
244 <h2>New Commands</h2>
245
246 Should be able to define a new command that happens to be a method on Array
247 (e.g. <tt>pop</tt>):
248 <script language="javascript">
249 MT.test('\\newcommand{\\pop}',
250 'tag', '\\newcommand',
251 'bracket', '{',
252 'tag', '\\pop',
253 'bracket', '}');
254 </script>
255
244 <h2>Summary</h2> 256 <h2>Summary</h2>
245 <script language="javascript"> 257 <script language="javascript">
246 MT.printSummary(); 258 MT.printSummary();