2021-08-24 22:16:00

1 files changed, 33 insertions, 38 deletions

diff --git a/context/data/scite/context/scite-context.properties b/context/data/scite/context/scite-context.properties
index 3a08c1b89..3d6ff872c 100644
--- a/context/data/scite/context/scite-context.properties
+++ b/context/data/scite/context/scite-context.properties
@@ -185,15 +185,13 @@ import context/scite-ctx
 
 # hard coded compile / build / go
 
-command.build.$(file.patterns.context)=$(name.context.check) $(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.example)=$(name.example.xmlcheck) "$(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.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.subsystem.$(file.patterns.context)=1
 #~ command.compile.subsystem.$(file.patterns.metafun)=1
@@ -201,21 +199,18 @@ command.compile.*.fo=$(name.context.run) $(name.flag.pdfopen) --forcexml --use=f
 #~ command.compile.subsystem.*.fo=1
 
 if PLAT_WIN
-    command.go.$(file.patterns.context)=$(FileName).pdf
-    command.go.$(file.patterns.metafun)=$(FileName).pdf
-    command.go.$(file.patterns.example)=$(FileName).pdf
-    command.go.*.fo=$(FileName).pdf
+    command.go.$(file.patterns.context)="$(FileName).pdf"
+    command.go.$(file.patterns.metafun)="$(FileName).pdf"
+    command.go.$(file.patterns.example)="$(FileName).pdf"
 
 if PLAT_GTK
-    command.go.$(file.patterns.context)=$(name.context.acrobat) $(FileName).pdf
-    command.go.$(file.patterns.metafun)=$(name.context.acrobat) $(FileName).pdf
-    command.go.$(file.patterns.example)=$(name.context.acrobat) $(FileName).pdf
-    command.go.*.fo=$(name.context.acrobat) $(FileName).pdf
+    command.go.$(file.patterns.context)=$(name.context.acrobat) "$(FileName).pdf"
+    command.go.$(file.patterns.metafun)=$(name.context.acrobat) "$(FileName).pdf"
+    command.go.$(file.patterns.example)=$(name.context.acrobat) "$(FileName).pdf"
 
 command.go.subsystem.$(file.patterns.context)=2
 command.go.subsystem.$(file.patterns.metafun)=2
 command.go.subsystem.$(file.patterns.example)=2
-command.go.subsystem.*.fo=2
 
 # 0 : syntax checking
 
@@ -223,9 +218,9 @@ command.name.0.$(file.patterns.context)=Check TeX File
 command.name.0.$(file.patterns.metafun)=
 command.name.0.$(file.patterns.example)=Check XML File
 
-command.0.$(file.patterns.context)=$(name.context.check) $(FileNameExt)
+command.0.$(file.patterns.context)=$(name.context.check) "$(FileNameExt)"
 command.0.$(file.patterns.metafun)=
-command.0.$(file.patterns.example)=$(name.example.xmlcheck) $(FileNameExt)
+command.0.$(file.patterns.example)=$(name.example.xmlcheck) "$(FileNameExt)"
 
 # 1 : normal processing
 
@@ -234,10 +229,10 @@ command.name.1.$(file.patterns.metafun)=Process METAPOST File
 command.name.1.$(file.patterns.example)=Process XML File
 command.name.1.$(file.patterns.lua)=Process Lua File
 
-command.1.$(file.patterns.context)=$(name.context.run) $(FileNameExt)
-command.1.$(file.patterns.metafun)=$(name.context.run) $(FileNameExt) --metapost
-command.1.$(file.patterns.example)=$(name.context.run) $(FileNameExt) --xml
-command.1.$(file.patterns.lua)=$(name.context.mtxrunjit) --script "$(FileNameExt)"
+command.1.$(file.patterns.context)=$(name.context.run) "$(FileNameExt)"
+command.1.$(file.patterns.metafun)=$(name.context.run) "$(FileNameExt)" --metapost
+command.1.$(file.patterns.example)=$(name.context.run) "$(FileNameExt)" --xml
+command.1.$(file.patterns.lua)=$(name.context.mtxrunjit) --script ""$(FileNameExt)""
 
 #~ command.1.subsystem.$(file.patterns.context)=1
 #~ command.1.subsystem.$(file.patterns.metafun)=1
@@ -246,19 +241,19 @@ command.1.$(file.patterns.lua)=$(name.context.mtxrunjit) --script "$(FileNameExt
 
 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.example)=$(name.context.runjit) $(FileNameExt) --xml
-command.29.$(file.patterns.lua)=$(name.context.mtxrunjit)  --script "$(FileNameExt)"
+command.29.$(file.patterns.context)=$(name.context.runjit) "$(FileNameExt)"
+command.29.$(file.patterns.metafun)=$(name.context.runjit) "$(FileNameExt)" --metapost
+command.29.$(file.patterns.example)=$(name.context.runjit) "$(FileNameExt)" --xml
+command.29.$(file.patterns.lua)=$(name.context.mtxrunjit)  --script ""$(FileNameExt)""
 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.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
@@ -316,11 +311,11 @@ command.name.7.$(file.patterns.context)=Generate Listing
 command.name.7.$(file.patterns.metafun)=Generate Listing
 command.name.7.$(file.patterns.example)=Generate Listing
 
-command.7=$(name.context.run)                          --extra=listing --pretty --result=$(FileName) $(FileNameExt)
-command.7.$(file.patterns.context)=$(name.context.run) --extra=listing --pretty --result=$(FileName) $(FileNameExt)
-command.7.$(file.patterns.metafun)=$(name.context.run) --extra=listing --pretty --result=$(FileName) $(FileNameExt)
-command.7.$(file.patterns.example)=$(name.context.run) --extra=listing --pretty --result=$(FileName) $(FileNameExt)
-command.7.$(file.patterns.lua)=$(name.context.run) --extra=listing --pretty --result=$(FileName) $(FileNameExt)
+command.7=$(name.context.run)                          --extra=listing --pretty --result=$(FileName) "$(FileNameExt)"
+command.7.$(file.patterns.context)=$(name.context.run) --extra=listing --pretty --result=$(FileName) "$(FileNameExt)"
+command.7.$(file.patterns.metafun)=$(name.context.run) --extra=listing --pretty --result=$(FileName) "$(FileNameExt)"
+command.7.$(file.patterns.example)=$(name.context.run) --extra=listing --pretty --result=$(FileName) "$(FileNameExt)"
+command.7.$(file.patterns.lua)=$(name.context.run) --extra=listing --pretty --result=$(FileName) "$(FileNameExt)"
 
 #~ command.7.subsystem=1
 #~ command.7.subsystem.$(file.patterns.context)=1
@@ -333,9 +328,9 @@ command.7.$(file.patterns.lua)=$(name.context.run) --extra=listing --pretty --re
 command.name.10.$(file.patterns.context)=Process and Arrange
 command.name.10.$(file.patterns.metafun)=Process and Arrange
 command.name.10.$(file.patterns.example)=Process and Arrange
-command.10.$(file.patterns.context)=$(name.context.run) --arrange         $(FileNameExt)
-command.10.$(file.patterns.metafun)=$(name.context.run)           --mptex $(FileNameExt)
-command.10.$(file.patterns.example)=$(name.context.run) --arrange --xml   $(FileNameExt)
+command.10.$(file.patterns.context)=$(name.context.run) --arrange         "$(FileNameExt)"
+command.10.$(file.patterns.metafun)=$(name.context.run)           --mptex "$(FileNameExt)"
+command.10.$(file.patterns.example)=$(name.context.run) --arrange --xml   "$(FileNameExt)"
 #~ command.10.subsystem.$(file.patterns.context)=1
 #~ command.10.subsystem.$(file.patterns.metafun)=1
 #~ command.10.subsystem.$(file.patterns.example)=1
@@ -609,7 +604,7 @@ filter.metafun=MetaFun|$(file.patterns.metafun)|
 #~ lexer.$(file.patterns.metafun)=metapost
 
 command.compile.$(file.patterns.metafun)=
-command.build.$(file.patterns.metafun)=$(name.context.mtxrun) --script context $(name.flag.pdfopen) $(FileNameExt)
+command.build.$(file.patterns.metafun)=$(name.context.mtxrun) --script context $(name.flag.pdfopen) "$(FileNameExt)"
 command.go.$(file.patterns.metafun)=gv $(FileName).1
 
 command.0.$(file.patterns.metafun)=