beta 2014.01.21 15:48

2 files changed, 46 insertions, 22 deletions

diff --git a/context/data/scite/scite-context.properties b/context/data/scite/scite-context.properties
index caf230de7..bc1af717c 100644
--- a/context/data/scite/scite-context.properties
+++ b/context/data/scite/scite-context.properties
@@ -115,9 +115,11 @@ name.metafun.console=$(name.context.console)
 name.example.console=$(name.context.console)
 
 name.context.mtxrun=mtxrun --autogenerate
+name.context.mtxrunjit=mtxrunjit --autogenerate
 
 name.context.check=$(name.context.mtxrun) --script check
 name.context.run=$(name.context.mtxrun) --script context $(name.flag.pdfopen)
+name.context.runjit=$(name.context.mtxrunjit) --script context $(name.flag.pdfopen)
 name.context.texshow=$(name.context.mtxrun) texshow
 name.context.purge=$(name.context.mtxrun) --context --purge --all
 name.context.showcase=$(name.context.mtxrun) --launch showcase.pdf
@@ -162,20 +164,20 @@ import scite-ctx
 
 # hard coded compile / build / go
 
-command.compile.$(file.patterns.context)=$(name.context.check) $(FileNameExt)
-command.compile.$(file.patterns.metafun)=
-command.compile.$(file.patterns.example)=$(name.example.xmlcheck) $(FileNameExt)
-command.compile.*.fo=$(name.example.xmlcheck) $(FileNameExt)
+command.build.$(file.patterns.context)=$(name.context.check) $(FileNameExt)
+command.build.$(file.patterns.metafun)=
+command.build.$(file.patterns.example)=$(name.example.xmlcheck) $(FileNameExt)
+command.build.*.fo=$(name.example.xmlcheck) $(FileNameExt)
 
-command.build.$(file.patterns.context)=$(name.context.run) $(FileNameExt)
-command.build.$(file.patterns.metafun)=$(name.context.mtxrun) --script context $(name.flag.pdfopen) $(FileNameExt)
-command.build.$(file.patterns.example)=$(name.context.run) --forcexml $(FileNameExt)
-command.build.*.fo=$(name.context.run) $(name.flag.pdfopen) --forcexml --use=foxet $(FileNameExt)
+command.compile.$(file.patterns.context)=$(name.context.run) $(FileNameExt)
+command.compile.$(file.patterns.metafun)=$(name.context.run) $(name.flag.pdfopen) $(FileNameExt)
+command.compile.$(file.patterns.example)=$(name.context.run) --forcexml $(FileNameExt)
+command.compile.*.fo=$(name.context.run) $(name.flag.pdfopen) --forcexml --use=foxet $(FileNameExt)
 
-command.build.subsystem.$(file.patterns.context)=1
-command.build.subsystem.$(file.patterns.metafun)=1
-command.build.subsystem.$(file.patterns.example)=1
-command.build.subsystem.*.fo=1
+command.compile.subsystem.$(file.patterns.context)=1
+command.compile.subsystem.$(file.patterns.metafun)=1
+command.compile.subsystem.$(file.patterns.example)=1
+command.compile.subsystem.*.fo=1
 
 if PLAT_WIN
     command.go.$(file.patterns.context)=$(FileName).pdf
@@ -218,6 +220,24 @@ command.1.subsystem.$(file.patterns.context)=1
 command.1.subsystem.$(file.patterns.metafun)=1
 command.1.subsystem.$(file.patterns.example)=1
 
+command.name.29.*=Run with jit
+command.subsystem.29.*=1
+command.29.$(file.patterns.context)=$(name.context.runjit) $(FileNameExt)
+command.29.$(file.patterns.metafun)=$(name.context.runjit) $(FileNameExt) --metapost
+command.29.$(file.patterns.exmaple)=$(name.context.runjit) $(FileNameExt) --xml
+command.groupundo.29.*=yes
+command.save.before.29.*=2
+command.shortcut.29.*=Alt+F12
+
+command.name.30.*=Run with jit
+command.subsystem.30.*=1
+command.30.$(file.patterns.context)=$(name.context.runjit) $(FileNameExt)
+command.30.$(file.patterns.metafun)=$(name.context.runjit) $(FileNameExt) --metapost
+command.30.$(file.patterns.exmaple)=$(name.context.runjit) $(FileNameExt) --xml
+command.groupundo.30.*=yes
+command.save.before.30.*=2
+command.shortcut.30.*=Alt+F7
+
 # 2 : pdf viewing
 
 command.name.2.$(file.patterns.context)=View PDF File with GhostScript
@@ -337,10 +357,9 @@ highlight.indentation.guides=1
 # Editor: keys
 
 user.shortcuts=\
-F12|IDM_COMPILE|\
-Ctrl+F12|IDM_BUILD|\
+F12|IDM_BUILD|\
+Ctrl+F12|IDM_COMPILE|\
 Shift+F12|IDM_GO|\
-Alt+F12|IDM_STOPEXECUTE|\
 
 os.x.home.end.keys=0
 
diff --git a/context/data/scite/scite-ctx.properties b/context/data/scite/scite-ctx.properties
index d56ae653d..acbb33c0b 100644
--- a/context/data/scite/scite-ctx.properties
+++ b/context/data/scite/scite-ctx.properties
@@ -69,14 +69,19 @@ ctx.spellcheck.wordsize.uk=4
 ctx.spellcheck.wordsize.nl=4
 
 ctx.helpinfo=\
-    Shift + F11   pop up menu with ctx options|\
+    Shift + F11        pop up menu with ctx options|\
     |\
-    Ctrl  + B     check spelling|\
-    Ctrl  + M     wrap text (auto indent)|\
-    Ctrl  + R     reset spelling results|\
-    Ctrl  + I     insert template|\
-    Ctrl  + E     open log file|\
-    Ctrl  + +     toggle strip
+    Ctrl  + B          check spelling|\
+    Ctrl  + M          wrap text (auto indent)|\
+    Ctrl  + R          reset spelling results|\
+    Ctrl  + I          insert template|\
+    Ctrl  + E          open log file|\
+    Ctrl  + +          toggle strip|\
+    |\
+    F7 / F12           check (or process)|\
+    Ctrl  + F7 / F12   process|\
+    Alt   + F7 / F12   process with jit|\
+    shift + F7 / F12   launch
 
 command.name.21.$(file.patterns.context)=CTX Action List
 command.subsystem.21.$(file.patterns.context)=3