beta 2010.02.02 23:09

4 files changed, 34 insertions, 21 deletions

diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua
index 94e0063f9..7c4b36711 100644
--- a/scripts/context/lua/mtx-fonts.lua
+++ b/scripts/context/lua/mtx-fonts.lua
@@ -129,6 +129,7 @@ local function list_specifications(t,info)
                 entry.weight      or "<noweight>",
                 entry.style       or "<nostyle>",
                 entry.width       or "<nowidth>",
+                entry.variant     or "<novariant>",
                 entry.fontname,
                 entry.filename,
                 subfont(entry.subfont),
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 220d12b55..6e5d1a848 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -11962,10 +11962,7 @@ else
 
 end
 
-if is_mkii_stub then
-    -- execute mkii script
-    ok = runners.execute_script(filename,false,true)
-elseif environment.argument("selfmerge") then
+if environment.argument("selfmerge") then
     -- embed used libraries
     utils.merger.selfmerge(own.name,own.libs,own.list)
 elseif environment.argument("selfclean") then
@@ -11977,9 +11974,14 @@ elseif environment.argument("selfupdate") then
 elseif environment.argument("ctxlua") or environment.argument("internal") then
     -- run a script by loading it (using libs)
     ok = runners.execute_script(filename,true)
-elseif environment.argument("script") or environment.argument("s") or environment.argument("scripts") then
+elseif environment.argument("script") or environment.argument("scripts") then
     -- run a script by loading it (using libs), pass args
-    ok = runners.execute_ctx_script(filename)
+    if is_mkii_stub then
+    -- execute mkii script
+        ok = runners.execute_script(filename,false,true)
+    else
+        ok = runners.execute_ctx_script(filename)
+    end
 elseif environment.argument("execute") then
     -- execute script
     ok = runners.execute_script(filename)
@@ -12016,6 +12018,9 @@ elseif environment.argument("help") or filename=='help' or filename == "" then
     -- execute script
 elseif filename:find("^bin:") then
     ok = runners.execute_program(filename)
+elseif is_mkii_stub then
+    -- execute mkii script
+    ok = runners.execute_script(filename,false,true)
 else
     ok = runners.execute_ctx_script(filename)
     if not ok then
@@ -12029,5 +12034,4 @@ end
 
 if ok == false then ok = 1 elseif ok == true then ok = 0 end
 
-
 os.exit(ok)
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 220d12b55..6e5d1a848 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -11962,10 +11962,7 @@ else
 
 end
 
-if is_mkii_stub then
-    -- execute mkii script
-    ok = runners.execute_script(filename,false,true)
-elseif environment.argument("selfmerge") then
+if environment.argument("selfmerge") then
     -- embed used libraries
     utils.merger.selfmerge(own.name,own.libs,own.list)
 elseif environment.argument("selfclean") then
@@ -11977,9 +11974,14 @@ elseif environment.argument("selfupdate") then
 elseif environment.argument("ctxlua") or environment.argument("internal") then
     -- run a script by loading it (using libs)
     ok = runners.execute_script(filename,true)
-elseif environment.argument("script") or environment.argument("s") or environment.argument("scripts") then
+elseif environment.argument("script") or environment.argument("scripts") then
     -- run a script by loading it (using libs), pass args
-    ok = runners.execute_ctx_script(filename)
+    if is_mkii_stub then
+    -- execute mkii script
+        ok = runners.execute_script(filename,false,true)
+    else
+        ok = runners.execute_ctx_script(filename)
+    end
 elseif environment.argument("execute") then
     -- execute script
     ok = runners.execute_script(filename)
@@ -12016,6 +12018,9 @@ elseif environment.argument("help") or filename=='help' or filename == "" then
     -- execute script
 elseif filename:find("^bin:") then
     ok = runners.execute_program(filename)
+elseif is_mkii_stub then
+    -- execute mkii script
+    ok = runners.execute_script(filename,false,true)
 else
     ok = runners.execute_ctx_script(filename)
     if not ok then
@@ -12029,5 +12034,4 @@ end
 
 if ok == false then ok = 1 elseif ok == true then ok = 0 end
 
-
 os.exit(ok)
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 220d12b55..6e5d1a848 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -11962,10 +11962,7 @@ else
 
 end
 
-if is_mkii_stub then
-    -- execute mkii script
-    ok = runners.execute_script(filename,false,true)
-elseif environment.argument("selfmerge") then
+if environment.argument("selfmerge") then
     -- embed used libraries
     utils.merger.selfmerge(own.name,own.libs,own.list)
 elseif environment.argument("selfclean") then
@@ -11977,9 +11974,14 @@ elseif environment.argument("selfupdate") then
 elseif environment.argument("ctxlua") or environment.argument("internal") then
     -- run a script by loading it (using libs)
     ok = runners.execute_script(filename,true)
-elseif environment.argument("script") or environment.argument("s") or environment.argument("scripts") then
+elseif environment.argument("script") or environment.argument("scripts") then
     -- run a script by loading it (using libs), pass args
-    ok = runners.execute_ctx_script(filename)
+    if is_mkii_stub then
+    -- execute mkii script
+        ok = runners.execute_script(filename,false,true)
+    else
+        ok = runners.execute_ctx_script(filename)
+    end
 elseif environment.argument("execute") then
     -- execute script
     ok = runners.execute_script(filename)
@@ -12016,6 +12018,9 @@ elseif environment.argument("help") or filename=='help' or filename == "" then
     -- execute script
 elseif filename:find("^bin:") then
     ok = runners.execute_program(filename)
+elseif is_mkii_stub then
+    -- execute mkii script
+    ok = runners.execute_script(filename,false,true)
 else
     ok = runners.execute_ctx_script(filename)
     if not ok then
@@ -12029,5 +12034,4 @@ end
 
 if ok == false then ok = 1 elseif ok == true then ok = 0 end
 
-
 os.exit(ok)