ConTeXt 2014.04.28 23:24

git-svn-id: svn://tug.org/texlive/trunk@33856 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 41 insertions, 23 deletions

diff --git a/Master/texmf-dist/context/data/scite/scite-context.properties b/Master/texmf-dist/context/data/scite/scite-context.properties
index ce56084c07d..78850ef0d0e 100644
--- a/Master/texmf-dist/context/data/scite/scite-context.properties
+++ b/Master/texmf-dist/context/data/scite/scite-context.properties
@@ -29,7 +29,7 @@
 
 # 1: better anti-aliasing on windows, also slightly diffent lineheights
 
-technology=1
+#~ technology=1
 
 # not much difference
 #
@@ -51,6 +51,8 @@ virtual.space=1
 textwrapper.margin=4
 textwrapper.length=68
 
+output.wrap=0
+
 # xml.auto.close.tags=1
 
 # ConTeXt: suffixes (really needed)
@@ -64,7 +66,7 @@ open.suffix.$(file.patterns.context)=.tex
 # Example : patterns
 
 file.patterns.xml=
-file.patterns.example=*.xml;*.xsl;*.xsd;*.fo;*.exa;*.rlb;*.rlg;*.rlv;*.rng;*.xfdf;*.xslt;*.dtd;*.lmx;*.htm;*.html;*.xhtml*.ctx;*.export;
+file.patterns.example=*.xml;*.xsl;*.xsd;*.fo;*.exa;*.rlb;*.rlg;*.rlv;*.rng;*.xfdf;*.xslt;*.dtd;*.lmx;*.htm;*.html;*.xhtml;*.ctx;*.export;*.svg;*.xul
 open.suffix.$(file.patterns.example)=.xml
 filter.example=eXaMpLe|$(file.patterns.example)|
 #~ lexer.$(file.patterns.example)=xml
@@ -100,25 +102,24 @@ if PLAT_WIN
     name.context.gsview=gsview32.exe
     name.context.acrobat=
     name.flag.pdfopen=--autopdf
-    name.flag.pdfopen=--autopdf=sumatra
-
-# consoles: rxvt,konsole | acrobat: acroread,xpdfopen
-#
-#   name.flag.pdfopen=--autopdf --xpdf
+    #~ name.flag.pdfopen=--autopdf=default
 
 if PLAT_GTK
     name.context.console=rxvt
     name.context.gsview=gv
     name.context.acrobat=acroread
     name.flag.pdfopen=--autopdf
+    name.flag.pdfopen=--autopdf=sumatra
 
 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
@@ -159,24 +160,24 @@ xml.auto.close.tags=1
 
 # extensions
 
-import scite-ctx
+import context/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
@@ -219,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
@@ -338,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