beta 2013.04.29 23:33

13 files changed, 57 insertions, 20 deletions

diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index ddc9faacf..87ed3475d 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -405,6 +405,33 @@ local function luatex_command(l_flags,c_flags,filename,engine)
     )
 end
 
+local plain_formats = {
+    ["plain"]        = "plain",
+    ["luatex-plain"] = "luatex-plain",
+}
+
+local function plain_format(plainformat)
+    return plainformat and plain_formats[plainformat]
+end
+
+local function run_plain(plainformat,filename)
+    local plainformat = plain_formats[plainformat]
+    if plainformat then
+        local command = format("mtxrun --script --texformat=%s plain %s",plainformat,filename)
+        report("running command: %s\n\n",command)
+        -- todo: load and run
+        local resultname = file.replacesuffix(filename,"pdf")
+        local pdfview = getargument("autopdf") or getargument("closepdf")
+        if pdfview then
+            pdf_close(resultname,pdfview)
+            os.execute(command)
+            pdf_open(resultname,pdfview)
+        else
+            os.execute(command)
+        end
+    end
+end
+
 local function run_texexec(filename,a_purge,a_purgeall)
     if false then
         -- we need to write a top etc too and run mp etc so it's not worth the
@@ -496,6 +523,7 @@ function scripts.context.run(ctxdata,filename)
     local a_arrange     = getargument("arrange")
     local a_noarrange   = getargument("noarrange")
     local a_jiton       = getargument("jiton")
+    local a_texformat   = getargument("texformat")
     --
     a_batchmode = (a_batchmode and "batchmode") or (a_nonstopmode and "nonstopmode") or nil
     a_synctex   = tonumber(a_synctex) or (toboolean(a_synctex,true) and 1) or (a_synctex == "zipped" and 1) or (a_synctex == "unzipped" and -1) or nil
@@ -521,6 +549,8 @@ function scripts.context.run(ctxdata,filename)
         --
         if a_mkii or analysis.engine == 'pdftex' or analysis.engine == 'xetex' then
             run_texexec(filename,a_purge,a_purgeall)
+        elseif plain_format(a_texformat or analysis.texformat) then
+            run_plain(a_texformat or analysis.texformat,filename)
         else
             if analysis.interface and analysis.interface ~= interface then
                 formatname = formatofinterface[analysis.interface] or formatname
diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index 8580fb699..7d2df5d41 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -78726,6 +78726,8 @@ characters.data={
   description="DOUBLE COLON EQUAL",
   direction="on",
   linebreak="al",
+  mathclass="relation",
+  mathname="coloncolonequals",
   specials={ "compat", 0x003A, 0x003A, 0x003D },
   unicodeslot=0x2A74,
  },
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6049086f0..e311ced88 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2013.04.28 19:05}
+\newcontextversion{2013.04.29 23:33}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 2d4d055da..8bc12e0bf 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index e19c0350c..161bf13d4 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 576284e4d..cec91a91c 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.04.28 19:05}
+\edef\contextversion{2013.04.29 23:33}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/luat-cbk.lua b/tex/context/base/luat-cbk.lua
index f8c6926f0..5aa12005b 100644
--- a/tex/context/base/luat-cbk.lua
+++ b/tex/context/base/luat-cbk.lua
@@ -194,11 +194,11 @@ if trace_calls then
     end)
 end
 
---~ -- somehow crashes later on
---~
---~ callbacks.freeze("find_.*_file","finding file")
---~ callbacks.freeze("read_.*_file","reading file")
---~ callbacks.freeze("open_.*_file","opening file")
+-- -- somehow crashes later on
+--
+-- callbacks.freeze("find_.*_file","finding file")
+-- callbacks.freeze("read_.*_file","reading file")
+-- callbacks.freeze("open_.*_file","opening file")
 
 --[[ldx--
 <p>The simple case is to remove the callback:</p>
diff --git a/tex/context/base/math-def.mkiv b/tex/context/base/math-def.mkiv
index cc2a8fae6..9201fc540 100644
--- a/tex/context/base/math-def.mkiv
+++ b/tex/context/base/math-def.mkiv
@@ -270,13 +270,14 @@
 \definemathcommand  [colonsep]        {\mkern-1.2mu}
 \definemathcommand  [doublecolonsep]  {\mkern-0.9mu}
 
-%D Now we define all the colon relations .. needs checking with char-def.lua:
+%D Now we define all the colon relations .. needs checking with char-def.lua ...
+%d will move to a separate module.
 
 \definemathcommand [centercolon]      [rel] {\mathstylevcenteredhbox\colon}
 \definemathcommand [colonminus]       [rel] {\centercolon\colonsep\mathrel{-}}
-\definemathcommand [minuscolon]       [rel] {\mathrel{-}\colonsep\centercolon}
-\definemathcommand [colonequals]      [rel] {\centercolon\colonsep=}
-\definemathcommand [equalscolon]      [rel] {=\centercolon\colonsep}
+\definemathcommand [minuscolon]       [rel] {\mathrel{-}\colonsep\centercolon} % native char
+\definemathcommand [colonequals]      [rel] {\centercolon\colonsep=}           % native char
+\definemathcommand [equalscolon]      [rel] {=\centercolon\colonsep}           % native char
 \definemathcommand [colonapprox]      [rel] {\centercolon\colonsep\approx}
 \definemathcommand [approxcolon]      [rel] {\approx\centercolon\colonsep}
 \definemathcommand [colonsim]         [rel] {\centercolon\colonsep\sim}
@@ -285,7 +286,7 @@
 \definemathcommand [coloncolon]       [rel] {\centercolon\doublecolonsep\centercolon}
 \definemathcommand [coloncolonminus]  [rel] {\coloncolon\colonsep\mathrel{-}}
 \definemathcommand [minuscoloncolon]  [rel] {\mathrel{-}\colonsep\coloncolon}
-\definemathcommand [coloncolonequals] [rel] {\coloncolon\colonsep=}
+\definemathcommand [coloncolonequals] [rel] {\coloncolon\colonsep=}            % native char
 \definemathcommand [equalscoloncolon] [rel] {=\coloncolon\colonsep}
 \definemathcommand [coloncolonapprox] [rel] {\coloncolon\colonsep\approx}
 \definemathcommand [approxcoloncolon] [rel] {\approx\coloncolon\colonsep}
diff --git a/tex/context/base/math-ini.lua b/tex/context/base/math-ini.lua
index a06fc3552..4cb0dd547 100644
--- a/tex/context/base/math-ini.lua
+++ b/tex/context/base/math-ini.lua
@@ -11,7 +11,9 @@ if not modules then modules = { } end modules ['math-ini'] = {
 --
 -- isn't characters.data loaded already ... shortcut it here
 --
--- replace code 7 by 0 as we don't use it anyway
+-- replace code 7 by 0 as we don't use it anyway (chars with code 7 will adapt to
+-- to the fam when set ... we use other means .. ok, we could use it for spacing but
+-- then we also have to set the other characters (only a subset done now)
 
 local formatters = string.formatters
 local utfchar, utfbyte = utf.char, utf.byte
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 9e1441c22..bffe2ba8c 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index ce753f4ef..a48d90b78 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index bf22bac29..42acdf352 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 04/29/13 20:30:03
+-- merge date  : 04/29/13 23:33:20
 
 do -- begin closure to overcome local limits and interference
 
diff --git a/tex/generic/context/luatex/luatex-math.tex b/tex/generic/context/luatex/luatex-math.tex
index 3b19939bd..966f2ddec 100644
--- a/tex/generic/context/luatex/luatex-math.tex
+++ b/tex/generic/context/luatex/luatex-math.tex
@@ -39,6 +39,8 @@
 \let \sevenbf = \relax
 \let \fivebf  = \relax
 
+\tenrm
+
 \font\mathfonttextupright         = file:latinmodern-math.otf:ssty=0;fixmath=yes at 10pt
 \font\mathfontscriptupright       = file:latinmodern-math.otf:ssty=1;fixmath=yes at  7pt
 \font\mathfontscriptscriptupright = file:latinmodern-math.otf:ssty=2;fixmath=yes at  5pt
@@ -56,12 +58,12 @@
 \newtoks\everymathbi
 \newtoks\everymathtt
 
-\def\rm {\fam0\relax\the\everymathmrm\relax\tenrm\relax}
-\def\it {\fam0\relax\the\everymathit \relax\tenit\relax}
-\def\sl {\fam0\relax\the\everymathsl \relax\tensl\relax}
-\def\bf {\fam0\relax\the\everymathbf \relax\tenbf\relax}
-\def\bi {\fam0\relax\the\everymathbi \relax\tenbi\relax}
-\def\tt {\fam0\relax\the\everymathtt \relax\tentt\relax}
+\def\rm{\fam0\relax\the\everymathmrm\relax\tenrm\relax}
+\def\it{\fam0\relax\the\everymathit \relax\tenit\relax}
+\def\sl{\fam0\relax\the\everymathsl \relax\tensl\relax}
+\def\bf{\fam0\relax\the\everymathbf \relax\tenbf\relax}
+\def\bi{\fam0\relax\the\everymathbi \relax\tenbi\relax}
+\def\tt{\fam0\relax\the\everymathtt \relax\tentt\relax}
 
 \let\mit     \relax % use names or \Uchar or define a vector
 \let\cal     \relax % idem, i'm not in the mood for this now