beta 2014.04.25 00:45

15 files changed, 306 insertions, 11 deletions

diff --git a/metapost/context/base/metafun.mpiv b/metapost/context/base/metafun.mpiv
index a113675e6..095b84b0e 100644
--- a/metapost/context/base/metafun.mpiv
+++ b/metapost/context/base/metafun.mpiv
@@ -19,6 +19,7 @@ input "mp-base.mpiv" ;
 input "mp-tool.mpiv" ;
 input "mp-mlib.mpiv" ;
 %     "mp-core.mpiv" ; % todo: namespace and cleanup
+input "mp-luas.mpiv" ; % experimental
 input "mp-page.mpiv" ; % todo: namespace and cleanup
 input "mp-butt.mpiv" ; % todo: namespace and cleanup
 input "mp-shap.mpiv" ; % will be improved
diff --git a/metapost/context/base/mp-luas.mpiv b/metapost/context/base/mp-luas.mpiv
new file mode 100644
index 000000000..b926b586c
--- /dev/null
+++ b/metapost/context/base/mp-luas.mpiv
@@ -0,0 +1,90 @@
+%D \module
+%D   [       file=mp-luas.mpiv,
+%D        version=2014.04.14,
+%D          title=\CONTEXT\ \METAPOST\ graphics,
+%D       subtitle=\LUA,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+if known context_luas : endinput ; fi ;
+
+boolean context_luas ; context_luas := true ;
+
+% First variant:
+%
+% let lua = runscript ;
+%
+% Second variant:
+%
+% vardef lua (text t) =
+%     runscript(for s = t : s & endfor "")
+% enddef;
+%
+% Third variant:
+%
+% vardef lua (text t) =
+%     runscript("" for s = t :
+%         if string s :
+%             & s
+%         elseif numeric s :
+%             & decimal s
+%         elseif boolean s :
+%             & if s : "true" else "false" fi
+%         fi endfor)
+% enddef;
+%
+% Fourth variant:
+
+vardef mlib_luas_luacall(text t) =
+    runscript("" for s = t :
+        if string s :
+            & s
+        elseif numeric s :
+            & decimal s
+        elseif boolean s :
+            & if s : "true" else "false" fi
+        fi endfor
+    )
+enddef ;
+
+vardef mlib_luas_lualist(expr c)(text t) =
+    save b ; boolean b ; b := false ;
+    runscript(c & "(" for s = t :
+        if b :
+            & ","
+        else :
+            hide(b := true)
+        fi
+        if string s :
+            & ditto & s & ditto
+        elseif numeric s :
+            & decimal s
+        elseif boolean s :
+            & if s : "true" else "false" fi
+        fi endfor & ")"
+    )
+enddef ;
+
+def luacall = mlib_luas_luacall enddef ; % why no let
+
+vardef lualist@#(text t) = mlib_luas_lualist(str @#)(t) enddef ;
+
+string mlib_luas_s ; % saves save/restore
+
+vardef lua@#(text t) =
+    mlib_luas_s := str @# ;
+    if length(mlib_luas_s) > 0 :
+        mlib_luas_lualist(mlib_luas_s,t)
+    else :
+        mlib_luas_luacall(t)
+    fi
+enddef ;
+
+vardef MP@#(text t) =
+    mlib_luas_lualist("MP." & str @#,t)
+enddef ;
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 0bf619a92..30778c50c 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{2014.04.24 09:39}
+\newcontextversion{2014.04.25 00:45}
 
 %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 d3a7def2d..d778e2a07 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 950fd8a7b..7ac90cc8d 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.04.24 09:39}
+\edef\contextversion{2014.04.25 00:45}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index 38069eba7..dcd2a5c33 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -1296,7 +1296,9 @@
 %D
 %D \typebuffer \getbuffer
 
-\unexpanded\def\mathstylehbox#1%
+% to be tested: {#1} but it could have side effects
+
+\unexpanded\def\mathstylehbox#1% sensitive for: a \over b => {a\over b} or \frac{a}{b}
   {\normalexpanded{\hbox\bgroup
      \startimath\triggermathstyle\normalmathstyle}\mathsurround\zeropoint#1\stopimath\egroup}
 
diff --git a/tex/context/base/math-rad.mkvi b/tex/context/base/math-rad.mkvi
index f27114b88..027b5c27d 100644
--- a/tex/context/base/math-rad.mkvi
+++ b/tex/context/base/math-rad.mkvi
@@ -74,8 +74,8 @@
 \def\math_radical_indeed#body%
   {\math_radical_alternative{#body}\endgroup}
 
-\setvalue{\??mathradicalalternative\v!default}% #1%
-  {\rootradical{\currentmathradicaldegree}}
+\setvalue{\??mathradicalalternative\v!default}%  #body%
+  {\rootradical{\currentmathradicaldegree}}   % {#body}}
 
 \setvalue{\??mathradicalalternative\v!normal}#body%
   {\edef\p_color{\mathradicalparameter\c!color}%
diff --git a/tex/context/base/mlib-ctx.mkiv b/tex/context/base/mlib-ctx.mkiv
index 75ff45488..e4c1cb6fe 100644
--- a/tex/context/base/mlib-ctx.mkiv
+++ b/tex/context/base/mlib-ctx.mkiv
@@ -18,6 +18,7 @@
 
 \registerctxluafile{mlib-run}{1.001}
 \registerctxluafile{mlib-ctx}{1.001}
+\registerctxluafile{mlib-lua}{1.001}
 
 \unprotect
 
diff --git a/tex/context/base/mlib-lua.lua b/tex/context/base/mlib-lua.lua
new file mode 100644
index 000000000..9c7a2e43a
--- /dev/null
+++ b/tex/context/base/mlib-lua.lua
@@ -0,0 +1,185 @@
+if not modules then modules = { } end modules ['mlib-pdf'] = {
+    version   = 1.001,
+    comment   = "companion to mlib-ctx.mkiv",
+    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+    copyright = "PRAGMA ADE / ConTeXt Development Team",
+    license   = "see context related readme files",
+}
+
+-- This is very preliminary code!
+
+local type, tostring, select, loadstring = type, tostring, select, loadstring
+local formatters = string.formatters
+local find, gsub = string.find, string.gsub
+local concat = table.concat
+local lpegmatch = lpeg.match
+
+local report_luarun = logs.reporter("metapost","lua")
+
+local trace_luarun  = false  trackers.register("metapost.lua",function(v) trace_luarun = v end)
+local trace_enabled = true
+
+mp = mp or { } -- system namespace
+MP = MP or { } -- user namespace
+
+local buffer, n, max = { }, 0, 10 -- we reuse upto max
+
+function mp._f_()
+    if trace_enabled and trace_luarun then
+        local result = concat(buffer," ",1,n)
+        if n > max then
+            buffer = { }
+        end
+        n = 0
+        report_luarun("data: %s",result)
+        return result
+    else
+        if n == 0 then
+            return ""
+        end
+        local result
+        if n == 1 then
+            result = buffer[1]
+        else
+            result = concat(buffer," ",1,n)
+        end
+        if n > max then
+            buffer = { }
+        end
+        n = 0
+        return result
+    end
+end
+
+local f_pair      = formatters["(%s,%s)"]
+local f_triplet   = formatters["(%s,%s,%s)"]
+local f_quadruple = formatters["(%s,%s,%s,%s)"]
+
+function mp.print(...)
+    for i=1,select("#",...) do
+        n = n + 1
+        buffer[n] = tostring((select(i,...)))
+    end
+end
+
+function mp.pair(x,y)
+    n = n + 1
+    if type(x) == "table" then
+        buffer[n] = f_pair(x[1],x[2])
+    else
+        buffer[n] = f_pair(x,y)
+    end
+end
+
+function mp.triplet(x,y,z)
+    n = n + 1
+    if type(x) == "table" then
+        buffer[n] = f_triplet(x[1],x[2],x[3])
+    else
+        buffer[n] = f_triplet(x,y,z)
+    end
+end
+
+function mp.quadruple(w,x,y,z)
+    n = n + 1
+    if type(w) == "table" then
+        buffer[n] = f_quadruple(w[1],w[2],w[3],w[4])
+    else
+        buffer[n] = f_quadruple(w,x,y,z)
+    end
+end
+
+local replacer = lpeg.replacer("@","%%")
+
+function mp.format(fmt,...)
+    n = n + 1
+    if not find(fmt,"%%") then
+        fmt = lpegmatch(replacer,fmt)
+    end
+    buffer[n] = formatters[fmt](...)
+end
+
+function mp.quoted(fmt,s,...)
+    n = n + 1
+    if s then
+        if not find(fmt,"%%") then
+            fmt = lpegmatch(replacer,fmt)
+        end
+        buffer[n] = '"' .. formatters[fmt](s,...) .. '"'
+    else
+        buffer[n] = '"' .. fmt .. '"'
+    end
+end
+
+local f_code = formatters["%s return mp._f_()"]
+
+function metapost.runscript(code)
+    local f = loadstring(f_code(code))
+    if f then
+        return tostring(f())
+    else
+        return ""
+    end
+end
+
+local cache, n = { }, 0 -- todo: when > n then reset cache or make weak
+
+function metapost.runscript(code)
+    if trace_enabled and trace_luarun then
+        report_luarun("code: %s",code)
+    end
+    if n > 100 then
+        cache = nil -- forget about caching
+        local f = loadstring(f_code(code))
+        if f then
+            return tostring(f())
+        else
+            return ""
+        end
+    else
+        local f = cache[code]
+        if f then
+            return tostring(f())
+        else
+            f = loadstring(f_code(code))
+            if f then
+                n = n + 1
+                cache[code] = f
+                return tostring(f())
+            else
+                return ""
+            end
+        end
+    end
+end
+
+-- function metapost.initializescriptrunner(mpx)
+--     mp.numeric = function(s) return mpx:get_numeric(s) end
+--     mp.string  = function(s) return mpx:get_string (s) end
+--     mp.boolean = function(s) return mpx:get_boolean(s) end
+--     mp.number  = mp.numeric
+-- end
+
+local get_numeric = mplib.get_numeric
+local get_string  = mplib.get_string
+local get_boolean = mplib.get_boolean
+local get_number  = get_numeric
+
+-- function metapost.initializescriptrunner(mpx)
+--     mp.numeric = function(s) return get_numeric(mpx,s) end
+--     mp.string  = function(s) return get_string (mpx,s) end
+--     mp.boolean = function(s) return get_boolean(mpx,s) end
+--     mp.number  = mp.numeric
+-- end
+
+local currentmpx = nil
+
+mp.numeric = function(s) return get_numeric(currentmpx,s) end
+mp.string  = function(s) return get_string (currentmpx,s) end
+mp.boolean = function(s) return get_boolean(currentmpx,s) end
+mp.number  = mp.numeric
+
+function metapost.initializescriptrunner(mpx,trialrun)
+    currentmpx = mpx
+    trace_enabled = not trialrun
+end
diff --git a/tex/context/base/s-math-repertoire.mkiv b/tex/context/base/s-math-repertoire.mkiv
index a66d7fc6d..314d23868 100644
--- a/tex/context/base/s-math-repertoire.mkiv
+++ b/tex/context/base/s-math-repertoire.mkiv
@@ -418,13 +418,13 @@
 
 \continueifinputfile{s-math-repertoire.mkiv}
 
-\showmathcharacterssetbodyfonts{lucidanova,cambria,xits,modern,pagella,termes,bonum}
+\showmathcharacterssetbodyfonts{lucidanova,cambria,xits,modern,pagella,termes,bonum,schola}
 
 \starttext
 
     \doifelse {\getdocumentargument{bodyfont}} {} {
 
-        \setupbodyfont[cambria,   12pt]
+      % \setupbodyfont[cambria,   12pt]
       % \setupbodyfont[modern,    12pt]
       % \setupbodyfont[lmvirtual, 12pt]
       % \setupbodyfont[pxvirtual, 12pt]
@@ -437,6 +437,7 @@
       % \setupbodyfont[lucidanova,12pt]
       % \setupbodyfont[pagella,   12pt]
       % \setupbodyfont[bonum,     12pt]
+        \setupbodyfont[schola,    12pt]
 
     } {
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index b5e209209..88d9476f1 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 cf8618b44..08433c7cd 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/type-imp-texgyre.mkiv b/tex/context/base/type-imp-texgyre.mkiv
index 24185f41d..b2aaa3629 100644
--- a/tex/context/base/type-imp-texgyre.mkiv
+++ b/tex/context/base/type-imp-texgyre.mkiv
@@ -153,7 +153,7 @@
         \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
         \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [helvetica]      [\s!default] [\s!rscale=0.9]
         \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.05]
-        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [times]          [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [termes]         [\s!default]
         \quittypescriptscanning
     \stoptypescript
 
@@ -161,7 +161,7 @@
         \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
         \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default] [\s!rscale=1.075]
         \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.075]
-        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [palatino]       [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [pagella]        [\s!default]
         \quittypescriptscanning
     \stoptypescript
 
@@ -169,7 +169,7 @@
         \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default]
         \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [modern]         [\s!default] [\s!rscale=1.1]
         \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [modern]         [\s!default] [\s!rscale=1.1]
-        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [modern]         [\s!default] [\s!rscale=1.1]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [schola]         [\s!default] [\s!rscale=1.1]
         \quittypescriptscanning
     \stoptypescript
 
@@ -277,3 +277,12 @@
     \stoptypescript
 
 \stoptypescriptcollection
+
+\starttypescriptcollection[texgyre-math-schola]
+
+    \starttypescript [\s!math][schoolbook,schola][\s!all]
+        \loadfontgoodies[texgyre]
+        \definefontsynonym[\s!MathRoman][file:texgyre-schola-math-regular.otf][\s!features=\s!math\mathsizesuffix]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/fonts/texgyre.lfg b/tex/context/fonts/texgyre.lfg
index 7782aa509..785982037 100644
--- a/tex/context/fonts/texgyre.lfg
+++ b/tex/context/fonts/texgyre.lfg
@@ -26,5 +26,11 @@ return {
             "tgbonummath-regular.otf",
             "tgbonum-math.otf",
         },
+        ["texgyre-schola-math-regular.otf"] = {
+            "texgyreschola-math.otf", -- beta
+            "texgyrescholamath-regular.otf",
+            "tgscholamath-regular.otf",
+            "tgschola-math.otf",
+        },
     },
 }
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e03e51919..1ac353e30 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/24/14 09:39:51
+-- merge date  : 04/25/14 00:45:16
 
 do -- begin closure to overcome local limits and interference