beta 2013.05.16 13:51

23 files changed, 135 insertions, 447 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 15f5767d0..b345d61f0 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -6297,7 +6297,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-log"] = package.loaded["trac-log"] or true
 
--- original size: 21920, stripped down to: 14287
+-- original size: 21914, stripped down to: 14287
 
 if not modules then modules={} end modules ['trac-log']={
   version=1.001,
@@ -16008,8 +16008,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 667735
--- stripped bytes    : 244545
+-- original bytes    : 667729
+-- stripped bytes    : 244539
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 15f5767d0..b345d61f0 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -6297,7 +6297,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-log"] = package.loaded["trac-log"] or true
 
--- original size: 21920, stripped down to: 14287
+-- original size: 21914, stripped down to: 14287
 
 if not modules then modules={} end modules ['trac-log']={
   version=1.001,
@@ -16008,8 +16008,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 667735
--- stripped bytes    : 244545
+-- original bytes    : 667729
+-- stripped bytes    : 244539
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 15f5767d0..b345d61f0 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -6297,7 +6297,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-log"] = package.loaded["trac-log"] or true
 
--- original size: 21920, stripped down to: 14287
+-- original size: 21914, stripped down to: 14287
 
 if not modules then modules={} end modules ['trac-log']={
   version=1.001,
@@ -16008,8 +16008,8 @@ end -- of closure
 
 -- used libraries    : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 667735
--- stripped bytes    : 244545
+-- original bytes    : 667729
+-- stripped bytes    : 244539
 
 -- end library merge
 
diff --git a/tex/context/base/cont-fil.mkiv b/tex/context/base/cont-fil.mkiv
index b0eff65ff..42d333992 100644
--- a/tex/context/base/cont-fil.mkiv
+++ b/tex/context/base/cont-fil.mkiv
@@ -107,5 +107,7 @@
 \definefilesynonym [pre-41]          [present-tiles]
 \definefilesynonym [fnt-33]          [math-coverage]
 \definefilesynonym [mat-20]          [math-parameters]
+\definefilesynonym [mat-10]          [math-characters]
+\definefilesynonym [mat-11]          [math-characters]
 
 \endinput
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9be65f061..56058a1bd 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.05.16 00:29}
+\newcontextversion{2013.05.16 13:51}
 
 %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 152b4c095..899723dde 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 1b457ac5e..8d68cc543 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.05.16 00:29}
+\edef\contextversion{2013.05.16 13:51}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/s-art-01.mkiv b/tex/context/base/s-art-01.mkiv
index 5ef53ebe0..34bc8c590 100644
--- a/tex/context/base/s-art-01.mkiv
+++ b/tex/context/base/s-art-01.mkiv
@@ -37,7 +37,7 @@
    \c!after=]
 
 \setuplist
- [\c!interaction=\v!all]
+  [\c!interaction=\v!all]
 
 \protect
 
diff --git a/tex/context/base/s-fonts-features.mkiv b/tex/context/base/s-fonts-features.mkiv
index 410bc13d3..7dd5f9b95 100644
--- a/tex/context/base/s-fonts-features.mkiv
+++ b/tex/context/base/s-fonts-features.mkiv
@@ -11,10 +11,14 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+\startmodule[s-fonts-features]
+
 \registerctxluafile{s-fonts-features}{}
 
 \installmodulecommandluasingle \showusedfeatures {moduledata.fonts.features.showused}
 
+\stopmodule
+
 \continueifinputfile{s-fonts-features.mkiv}
 
 \usemodule
diff --git a/tex/context/base/s-fonts-missing.mkiv b/tex/context/base/s-fonts-missing.mkiv
index a3bf33ddf..4215d2d88 100644
--- a/tex/context/base/s-fonts-missing.mkiv
+++ b/tex/context/base/s-fonts-missing.mkiv
@@ -11,11 +11,15 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+\startmodule[s-fonts-missing]
+
 \registerctxluafile{s-fonts-missing}{}
 
 \installmodulecommandluasingle \showmissingcharacterslegend {moduledata.fonts.missing.legend}
 \installmodulecommandluasingle \showmissingcharacters       {moduledata.fonts.missing.characters}
 
+\stopmodule
+
 \continueifinputfile{s-fonts-missing.mkiv}
 
 % the sooner, the more efficient, see log for details
@@ -26,13 +30,11 @@
 
 \starttext
 
-    legend: \blank
+    \page legend: \blank
 
     \showmissingcharacterslegend
 
-    \page
-
-    sample: \blank
+    \page sample: \blank
 
     ½ ⅓ ¼ ⅕ ⅙ ⅛ {\bf ½ ⅓ ¼ ⅕ ⅙ ⅛} \blank
 
@@ -46,9 +48,7 @@
         end
     \stopluacode
 
-    \page
-
-    characters: \blank
+    \page characters: \blank
 
     \showmissingcharacters
 
diff --git a/tex/context/base/s-fonts-tables.mkiv b/tex/context/base/s-fonts-tables.mkiv
index 75a422368..d991d7d81 100644
--- a/tex/context/base/s-fonts-tables.mkiv
+++ b/tex/context/base/s-fonts-tables.mkiv
@@ -13,6 +13,8 @@
 
 % todo: make a mtxrun --script font <name> option
 
+\startmodule[s-fonts-tables]
+
 \registerctxluafile{s-fonts-tables}{}
 
 \installmodulecommandluasingle \showfonttables        {moduledata.fonts.tables.all}
@@ -21,6 +23,8 @@
 \installmodulecommandluasingle \showfontpositionings  {moduledata.fonts.tables.positionings}
 \installmodulecommandluasingle \showfontsubstitutions {moduledata.fonts.tables.substitutions}
 
+\stopmodule
+
 \continueifinputfile{s-fonts-tables.mkiv}
 
 \usemodule[art-01]
diff --git a/tex/context/base/s-fonts-vectors.mkiv b/tex/context/base/s-fonts-vectors.mkiv
index 6e8b8eeea..371a30cc5 100644
--- a/tex/context/base/s-fonts-vectors.mkiv
+++ b/tex/context/base/s-fonts-vectors.mkiv
@@ -13,6 +13,8 @@
 
 %D This code is used in the \MKIV\ fonts manual.
 
+\startmodule[s-fonts-vectors]
+
 \registerctxluafile{s-fonts-vectors}{}
 
 \installmodulecommandluasingle \showprotrusionclass  {moduledata.fonts.protrusions.showclass}
@@ -20,6 +22,8 @@
 \installmodulecommandluasingle \showexpansionclass   {moduledata.fonts.expansions.showclass}
 \installmodulecommandluasingle \showexpansionvector  {moduledata.fonts.expansions.showvector}
 
+\stopmodule
+
 \continueifinputfile{s-fonts-vectors.mkiv}
 
 \usemodule[art-01]
diff --git a/tex/context/base/s-mat-10.mkiv b/tex/context/base/s-mat-10.mkiv
deleted file mode 100644
index 3eaaf688b..000000000
--- a/tex/context/base/s-mat-10.mkiv
+++ /dev/null
@@ -1,248 +0,0 @@
-%D \module
-%D   [      file=s-mat-10.mkiv, % was: s-fnt-25
-%D        version=2009.01.25,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Math Glyph Checking,
-%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.
-
-%D This base module will be cleaned up and extended.
-
-\unexpanded\def\enableshowmathfontvirtual
-  {\ctxlua{fonts.constructors.autocleanup=false}}
-
-\unexpanded\def\showmathfontcharacters
-  {\dodoubleempty\doshowmathfontcharacters}
-
-\def\doshowmathfontcharacters[#1][#2]%
-  {\begingroup
-   \dontcomplain
-   \doifelsenothing{#1}
-     {\definedfont[MathRoman*math-text]}
-     {\definedfont[#1]}%
-   \doifelsenothing{#2}
-     {\ctxlua{document.showmathfont(font.current())}}
-     {\def\dodoshowmathfontcharacters##1{\ctxlua{document.showmathfont(font.current(),##1)}}%
-      \processcommalist[#2]\dodoshowmathfontcharacters}%
-   \endgroup}
-
-% the interface might (and will) change
-
-\let\startmathfontlist                 \relax
-\let\stopmathfontlist                  \relax
-\let\mathfontlistreference             \gobbleoneargument
-\let\startmathfontlistentry            \relax
-\let\stopmathfontlistentry             \relax
-\let\mathfontlistentryhexdectit        \gobblethreearguments
-\let\mathfontlistentrywdhtdpic         \gobblefourarguments
-\let\mathfontlistentryresource         \gobbleoneargument
-\let\startmathfontlistnext             \relax
-\let\mathfontlistnextentry             \gobblethreearguments
-\let\mathfontlistnextcycle             \gobbleonearguments
-\let\stopmathfontlistnext              \relax
-\let\startmathfontlisthvariants        \relax
-\let\mathfontlisthvariantsentry        \gobblethreearguments
-\let\stopmathfontlisthvariants         \relax
-\let\startmathfontlistvvariants        \startmathfontlisthvariants
-\let\mathfontlistvvariantsentry        \mathfontlisthvariantsentry
-\let\stopmathfontlistvvariants         \stopmathfontlisthvariants
-\let\mathfontlistbetweennextandvariants\relax
-\let\startmathfontlistentryclassspec   \relax
-\let\stopmathfontlistentryclassspec    \relax
-\let\mathfontlistentryclassname        \gobbletwoarguments
-\let\mathfontlistentrysymbol           \gobbletwoarguments
-\let\startmathfontlookupvariants       \relax
-\let\stopmathfontlookupvariants        \relax
-\let\mathfontlookupvariant             \gobblefourarguments
-
-\startluacode
-local concat = table.concat
-local lower = string.lower
-local utfchar = utf.char
-local round = math.round
-
-local fontdata = fonts.hashes.identifiers
-local chardata = characters.data
-
-local no_description = "no description, private to font"
-
-local limited       = true
-local fillinthegaps = true
-local upperlimit    = 0x0007F
-local upperlimit    = 0xF0000
-
-local f_unicode     = string.formatters["%U"]
-local f_slot        = string.formatters["%s/%0X"]
-
-function document.showmathfont(id,slot)
-    local tfmdata      = fontdata[id]
-    local characters   = tfmdata.characters
-    local descriptions = tfmdata.descriptions
-    local resources    = tfmdata.resources
-    local lookuptypes  = resources.lookuptypes
-    local virtual      = tfmdata.properties.virtualized
-    local names        = { }
-    local gaps         = mathematics.gaps
-    local sorted       = { }
-    if slot then
-        sorted = { slot }
-    elseif fillinthegaps then
-        sorted = table.keys(characters)
-        for k, v in next, gaps do
-            if characters[v] then
-                sorted[#sorted+1] = k
-            end
-        end
-        table.sort(sorted)
-    else
-        sorted = table.sortedkeys(characters)
-    end
-    if virtual then
-        for k, v in ipairs(tfmdata.fonts) do
-            local id = v.id
-            local name = fontdata[id].properties.name
-            names[k] = (name and file.basename(name)) or id
-        end
-    end
-    context.startmathfontlist()
-    for _, unicode in next, sorted do
-        if not limited or unicode < upperlimit then
-            local code = gaps[unicode] or unicode
-            local char = characters[code]
-            local desc = descriptions[code]
-            local info = chardata[code]
-            if char then
-                local next_sizes  = char.next
-                local v_variants  = char.vert_variants
-                local h_variants  = char.horiz_variants
-                local commands    = char.commands
-                local slookups    = desc and desc.slookups
-                local mlookups    = desc and desc.mlookups
-                local mathclass   = info.mathclass
-                local mathspec    = info.mathspec
-                local mathsymbol  = info.mathsymbol
-                local description = info.description or no_description
-                context.startmathfontlistentry()
-                context.mathfontlistreference(f_unicode(unicode))
-                context.mathfontlistentryhexdectit(f_unicode(code),code,lower(description))
-                context.mathfontlistentrywdhtdpic(round(char.width or 0),round(char.height or 0),round(char.depth or 0),round(char.italic or 0))
-                if virtual and commands then
-                    local t = { }
-                    for i=1,#commands do
-                        local ci = commands[i]
-                        if ci[1] == "slot" then
-                            local fnt, idx = ci[2], ci[3]
-                            t[#t+1] = f_slot(names[fnt] or fnt,idx)
-                        end
-                    end
-                    if #t > 0 then
-                        context.mathfontlistentryresource(concat(t,", "))
-                    end
-                end
-                if mathclass or mathspec then
-                    context.startmathfontlistentryclassspec()
-                    if mathclass then
-                        context.mathfontlistentryclassname(mathclass,info.mathname or "no name")
-                    end
-                    if mathspec then
-                        for i=1,#mathspec do
-                            local mi = mathspec[i]
-                            context.mathfontlistentryclassname(mi.class,mi.name or "no name")
-                        end
-                    end
-                    context.stopmathfontlistentryclassspec()
-                end
-                if mathsymbol then
-                    context.mathfontlistentrysymbol(f_unicode(mathsymbol),mathsymbol)
-                end
-                if next_sizes then
-                    local n, done = 0, { }
-                    context.startmathfontlistnext()
-                    while next_sizes do
-                        n = n + 1
-                        if done[next_sizes] then
-                            context.mathfontlistnextcycle(n)
-                            break
-                        else
-                            done[next_sizes] = true
-                            context.mathfontlistnextentry(n,f_unicode(next_sizes),next_sizes)
-                            next_sizes = characters[next_sizes]
-                            v_variants = next_sizes.vert_variants  or v_variants
-                            h_variants = next_sizes.horiz_variants or h_variants
-                            if next_sizes then
-                                next_sizes = next_sizes.next
-                            end
-                        end
-                    end
-                    context.stopmathfontlistnext()
-                    if h_variants or v_variants then
-                        context.mathfontlistbetweennextandvariants()
-                    end
-                end
-                if h_variants then
-                    context.startmathfontlisthvariants()
-                    for i=1,#h_variants do -- we might go top-down in the original
-                        local vi = h_variants[i]
-                        context.mathfontlisthvariantsentry(i,f_unicode(vi.glyph),vi.glyph)
-                    end
-                    context.stopmathfontlisthvariants()
-                elseif v_variants then
-                    context.startmathfontlistvvariants()
-                    for i=1,#v_variants do
-                        local vi = v_variants[#v_variants-i+1]
-                        context.mathfontlistvvariantsentry(i,f_unicode(vi.glyph),vi.glyph)
-                    end
-                    context.stopmathfontlistvvariants()
-                end
-                if slookups or mlookups then
-                    local variants = { }
-                    if slookups then
-                        for lookupname, lookupdata in next, slookups do
-                            local lookuptype = lookuptypes[lookupname]
-                            if lookuptype == "substitution" then
-                                variants[lookupdata] = "sub"
-                            elseif lookuptype == "alternate" then
-                                for i=1,#lookupdata do
-                                    variants[lookupdata[i]] = "alt"
-                                end
-                            end
-                        end
-                    end
-                    if mlookups then
-                        for lookupname, lookuplist in next, mlookups do
-                            local lookuptype = lookuptypes[lookupname]
-                            for i=1,#lookuplist do
-                                local lookupdata = lookuplist[i]
-                                local lookuptype = lookuptypes[lookupname]
-                                if lookuptype == "substitution" then
-                                    variants[lookupdata] = "sub"
-                                elseif lookuptype == "alternate" then
-                                    for i=1,#lookupdata do
-                                        variants[lookupdata[i]] = "alt"
-                                    end
-                                end
-                            end
-                        end
-                    end
-                    context.startmathfontlookupvariants()
-                    local i = 0
-                    for variant, lookuptype in table.sortedpairs(variants) do
-                        i = i + 1
-                        context.mathfontlookupvariant(i,f_unicode(variant),variant,lookuptype)
-                    end
-                    context.stopmathfontlookupvariants()
-                end
-                context.stopmathfontlistentry()
-            end
-        end
-    end
-    context.stopmathfontlist()
-end
-\stopluacode
-
-\endinput
diff --git a/tex/context/base/s-mat-11.mkiv b/tex/context/base/s-mat-11.mkiv
deleted file mode 100644
index 862872499..000000000
--- a/tex/context/base/s-mat-11.mkiv
+++ /dev/null
@@ -1,104 +0,0 @@
-\usemodule[s][mat-10]
-
-% rendering
-
-\def\startmathfontlist
-  {}
-
-\def\stopmathfontlist
-  {}
-
-\def\startmathfontlistentry
-  {\blank
-   \begingroup}
-
-\def\stopmathfontlistentry
-  {\endgroup
-   \blank}
-
-\def\mathfontlistentryhexdectit#1#2#3%
-  {#1: \char#2\enspace\ruledhbox{\char#2}\enspace#3\par
-   \advance\leftskip 1em\relax}
-
-\def\mathfontlistentrywdhtdpic#1#2#3#4%
-  {width: #1, height: #2, depth: #3, italic: #4\par}
-
-\def\mathfontlistentryresource#1%
-  {virtual: #1\par}
-
-\def\startmathfontlistnext
-  {next: }
-
-\def\mathfontlistnextentry#1#2#3%
-  {\ifnum#1>1 \space=>\space\fi#2~\ruledhbox{\char#3}}
-
-\def\mathfontlistnextcycle#1%
-  {\ifnum#1>1 \space=>\space\fi cycle}
-
-\def\stopmathfontlistnext
-  {\par}
-
-\def\startmathfontlisthvariants
-  {variants: }
-
-\def\mathfontlisthvariantsentry#1#2#3%
-  {\ifnum#1>1 \space=>\space\fi#2~\ruledhbox{\char#3}}
-
-\def\stopmathfontlisthvariants
-  {\par}
-
-\def\startmathfontlistvvariants{\startmathfontlisthvariants}
-\def\mathfontlistvvariantsentry{\mathfontlisthvariantsentry}
-\def\stopmathfontlistvvariants {\stopmathfontlisthvariants }
-
-\def\mathfontlistbetweennextandvariants
-  {\space=>\space}
-
-\def\startmathfontlistentryclassspec
-  {}
-
-\def\stopmathfontlistentryclassspec
-  {}
-
-\def\mathfontlistentryclassname#1#2%
-  {mathclass: #1, mathname: #2\par}
-
-\def\mathfontlistentrysymbol#1#2%
-  {mathsymbol: #1~\ruledhbox{\char#2}\par}
-
-\def\startmathfontlookupvariants
-  {lookupvariants: }
-
-\def\stopmathfontlookupvariants
-  {\par}
-
-\def\mathfontlookupvariant#1#2#3#4%
-  {\ifnum#1>1 ,\space\fi#2:~\char#3 (#4)}
-
-% done
-
-\continueifinputfile{s-mat-11.mkiv}
-
-\setuplayout
-  [width=middle,
-   height=middle,
-   topspace=15mm,
-   backspace=15mm,
-   bottomspace=15mm,
-   header=1cm,
-   headerdistance=0.5cm,
-   footer=0pt]
-
-\starttext
-%     \setupbodyfont[cambria,  12pt] \showmathfontcharacters
-%     \setupbodyfont[lmvirtual,12pt] \showmathfontcharacters
-%     \setupbodyfont[pxvirtual,12pt] \showmathfontcharacters
-%     \setupbodyfont[txvirtual,12pt] \showmathfontcharacters
-    \setupbodyfont[palatino, 12pt] \showmathfontcharacters
-%     \setupbodyfont[mathtimes,12pt] \showmathfontcharacters
-%     \setupbodyfont[stix,     12pt] \showmathfontcharacters
-%     \setupbodyfont[xits,     12pt] \showmathfontcharacters
-%     \setupbodyfont[lucida,   12pt] \showmathfontcharacters
-%     \setupbodyfont[lucidanova,   12pt] \showmathfontcharacters
-\stoptext
-
diff --git a/tex/context/base/s-math-coverage.mkiv b/tex/context/base/s-math-coverage.mkiv
index cbac318ee..fd7498d2e 100644
--- a/tex/context/base/s-math-coverage.mkiv
+++ b/tex/context/base/s-math-coverage.mkiv
@@ -11,11 +11,15 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+\startmodule[math-coverage]
+
 \registerctxluafile{s-math-coverage}{}
 
 \installmodulecommandluasingle \showmathalphabets  {moduledata.math.coverage.showalphabets}
 \installmodulecommandluasingle \showmathcharacters {moduledata.math.coverage.showcharacters}
 
+\stopmodule
+
 \continueifinputfile{s-math-coverage.mkiv}
 
 \setupbodyfont
diff --git a/tex/context/base/s-math-extensibles.mkiv b/tex/context/base/s-math-extensibles.mkiv
index 7400d6564..f9ff8547a 100644
--- a/tex/context/base/s-math-extensibles.mkiv
+++ b/tex/context/base/s-math-extensibles.mkiv
@@ -19,7 +19,7 @@
 %D \showmathextensibles[alternative=a|b]
 %D \stoptyping
 
-\startmodule[mat-14]
+\startmodule[math-extensibles]
 
 \unprotect
 
diff --git a/tex/context/base/s-math-parameters.mkiv b/tex/context/base/s-math-parameters.mkiv
index 3b9089f84..f2fde5d83 100644
--- a/tex/context/base/s-math-parameters.mkiv
+++ b/tex/context/base/s-math-parameters.mkiv
@@ -11,11 +11,15 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+\startmodule[math-parameters]
+
 \registerctxluafile{s-math-parameters}{}
 
 \installmodulecommandluasingle \showmathspacing    {moduledata.math.parameters.showspacing}
 \installmodulecommandluasingle \showmathparameters {moduledata.math.parameters.showparameters}
 
+\stopmodule
+
 \continueifinputfile{s-math-parameters.mkiv}
 
 \setuplayout
diff --git a/tex/context/base/s-math-repertoire.mkiv b/tex/context/base/s-math-repertoire.mkiv
index 5c9a3e8a3..a66d7fc6d 100644
--- a/tex/context/base/s-math-repertoire.mkiv
+++ b/tex/context/base/s-math-repertoire.mkiv
@@ -11,10 +11,17 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\usemodule[s][mat-10]
+\usemodule[s][math-characters]
 
-% todo: mode for screen
-% todo: variant for HD with one menu at the right (with include menu)
+% context --jit --global --bodyfont=lucidanova --result=math-repertoire-lucidanova s-math-repertoire.mkiv
+% context --jit --global --bodyfont=cambria    --result=math-repertoire-cambria    s-math-repertoire.mkiv
+% context --jit --global --bodyfont=xits       --result=math-repertoire-xits       s-math-repertoire.mkiv
+% context --jit --global --bodyfont=modern     --result=math-repertoire-modern     s-math-repertoire.mkiv
+% context --jit --global --bodyfont=pagella    --result=math-repertoire-pagella    s-math-repertoire.mkiv
+% context --jit --global --bodyfont=termes     --result=math-repertoire-termes     s-math-repertoire.mkiv
+% context --jit --global --bodyfont=bonum      --result=math-repertoire-bonum      s-math-repertoire.mkiv
+
+\startmodule[math-repertoire]
 
 % layout
 
@@ -176,10 +183,10 @@
 
 % helpers
 
-\def\mathfontlisttxt#1%
+\unexpanded\def\showmathcharacterstxt#1%
   {{\tttf#1}}
 
-\def\mathfontlistchr#1#2%
+\unexpanded\def\showmathcharacterschr#1#2%
   {\iffontchar\font#2\relax
      \scale
        [sx=#1,sy=#1]
@@ -203,40 +210,39 @@
         \endgroup}%
    \fi}
 
-\def\mathfontlistmth#1#2%
-  {\setbox\scratchbox\hbox{\mathfontlistchr{#1}{#2}}%
+\unexpanded\def\showmathcharactersmth#1#2%
+  {\setbox\scratchbox\hbox{\showmathcharacterschr{#1}{#2}}%
    \ht\scratchbox\strutht
    \dp\scratchbox\strutdp
    \box\scratchbox}
 
-\let\mathfontlistbodyfonts\empty
+\let\showmathcharactersbodyfonts\empty
 
-\def\mathfontlistbodyfontentry#1#2%
+\unexpanded\def\showmathcharactersbodyfontentry#1#2%
   {\somedata
      [align={none,middle},background=,height=5cm]
      {\begingroup
       \switchtobodyfont[#2,12pt]%
       \definedfont[MathRoman*math-text]%
-      \mathfontlistmth{10}{#1}%
+      \showmathcharactersmth{10}{#1}%
       \endgroup
       \vfilll
       \doifmodeelse{crosslink}
-        {\goto{\strut\textcolor\mathfontlisttxt{#2}}[#2::#1]}%
-              {\strut\textcolor\mathfontlisttxt{#2}}}%
+        {\goto{\strut\textcolor\showmathcharacterstxt{#2}}[#2::#1]}%
+              {\strut\textcolor\showmathcharacterstxt{#2}}}%
    \hskip1ex}
 
-\def\setmathfontlistbodyfonts#1%
-  {\edef\mathfontlistbodyfonts{#1}%
-   \def\dosetmathfontlistbodyfonts##1%
-     {\setupbodyfont[##1,12pt]}%
-   \processcommacommand[\mathfontlistbodyfonts]\dosetmathfontlistbodyfonts}
+\unexpanded\def\showmathcharacterssetbodyfonts#1%
+  {\edef\showmathcharactersbodyfonts{#1}%
+   \def\doshowmathcharacterssetbodyfonts##1{\setupbodyfont[##1,12pt]}%
+   \processcommacommand[\showmathcharactersbodyfonts]\doshowmathcharacterssetbodyfonts}
 
-\def\mathfontlistbodyfontschars#1%
-  {\processcommacommand[\mathfontlistbodyfonts]{\mathfontlistbodyfontentry{#1}}}
+\unexpanded\def\showmathcharactersbodyfontschars#1%
+  {\processcommacommand[\showmathcharactersbodyfonts]{\showmathcharactersbodyfontentry{#1}}}
 
 % main
 
-\def\startmathfontlist
+\unexpanded\def\showmathcharactersstart
   {\starttext
    \startstandardmakeup % we use baselinecolor so that we have a transparency on page 1
      \setupalign[middle]
@@ -248,43 +254,43 @@
      \vfil
    \stopstandardmakeup}
 
-\def\stopmathfontlist
+\unexpanded\def\showmathcharactersstop
   {\stoptext}
 
 % entry
 
-\def\startmathfontlistentry
+\unexpanded\def\showmathcharactersstartentry
   {\startstandardmakeup}
 
-\def\stopmathfontlistentry
+\unexpanded\def\showmathcharactersstopentry
   {\tightlayer[page]
    \stopstandardmakeup}
 
-\def\mathfontlistreference#1%
+\unexpanded\def\showmathcharactersreference#1%
   {\setlayer[page]{\pagereference[#1]}}
 
-\def\mathfontlistentryhexdectit#1#2#3%
+\unexpanded\def\showmathcharactersentryhexdectit#1#2#3%
   {\setlayer
      [page]
      [preset=middletop,voffset=5mm]
-     {\somedata[height=1cm]{\mathfontlisttxt{#1}}}
+     {\somedata[height=1cm]{\showmathcharacterstxt{#1}}}
    \setlayer
      [page]
      [preset=middle,y=2cm]
-     {\mathfontlistmth{25}{#2}}
+     {\showmathcharactersmth{25}{#2}}
    \setlayer
      [page]
      [preset=righttop,offset=5mm]
-     {\somedata[height=1cm]{\mathfontlisttxt{#3}}}
-   \doifsomething\mathfontlistbodyfonts
+     {\somedata[height=1cm]{\showmathcharacterstxt{#3}}}
+   \doifsomething\showmathcharactersbodyfonts
      {\setlayer
         [page]
         [preset=middlebottom,voffset=5mm]
-        {\mathfontlistbodyfontschars{#2}}}}
+        {\showmathcharactersbodyfontschars{#2}}}}
 
 % dimensions
 
-\def\mathfontlistentrywdhtdpic#1#2#3#4%
+\unexpanded\def\showmathcharactersentrywdhtdpic#1#2#3#4%
   {\setlayer
      [page]
      [preset=leftbottom,offset=5mm]
@@ -294,113 +300,125 @@
          \strut depth \hfill \the\dimexpr#3sp\par
          \strut italic\hfill \the\dimexpr#4sp}}}
 
-\def\mathfontlistentryresource#1%
+\unexpanded\def\showmathcharactersentryresource#1%
   {} % {virtual: #1\par}
 
 % next
 
-\def\startmathfontlistnext
+\unexpanded\def\showmathcharactersstartnext
   {\setlayer
      [page]
      [preset=middleleft,hoffset=5mm]
      \bgroup\vbox\bgroup}
 
-\def\stopmathfontlistnext
+\unexpanded\def\showmathcharactersstopnext
   {\egroup\egroup}
 
-\def\mathfontlistnextentry#1#2#3%
+\unexpanded\def\showmathcharactersnextentry#1#2#3%
   {\ifnum#1>1 \vskip1ex \fi
    \dontleavehmode\somedata
      [align=normal,width=4cm]
-     {\strut\mathfontlisttxt{#2}\hfill\mathfontlistchr{2}{#3}}\par}
+     {\strut\showmathcharacterstxt{#2}\hfill\showmathcharacterschr{2}{#3}}\par}
 
-\def\mathfontlistnextcycle#1%
+\unexpanded\def\showmathcharactersnextcycle#1%
   {\ifnum#1>1 \vskip1ex \fi
    \dontleavehmode\somedata
      [align=normal,width=4cm]
-     {\strut\mathfontlisttxt{cycle}}\par}
+     {\strut\showmathcharacterstxt{cycle}}\par}
 
 % variants
 
-\def\startmathfontlistvvariants
+\unexpanded\def\showmathcharactersstartvvariants
   {\setlayer
      [page]
      [preset=lefttop,offset=5mm]
      \bgroup\vbox\bgroup}
 
-\def\startmathfontlisthvariants
+\unexpanded\def\showmathcharactersstarthvariants
   {\setlayer
      [page]
      [preset=lefttop,offset=5mm]
      \bgroup\hbox\bgroup}
 
-\def\mathfontlistvvariantsentry#1#2#3%
+\unexpanded\def\showmathcharactersvvariantsentry#1#2#3%
   {\ifnum#1>1 \vskip1ex \fi
    \dontleavehmode\somedata
      [align=middle,width=4cm]
-     {\strut\mathfontlisttxt{#2}\hfilll\mathfontlistchr{2}{#3}}}
+     {\strut\showmathcharacterstxt{#2}\hfilll\showmathcharacterschr{2}{#3}}}
 
-\def\mathfontlisthvariantsentry#1#2#3%
+\unexpanded\def\showmathcharactershvariantsentry#1#2#3%
   {\ifnum#1>1 \hskip1ex \else \dontleavehmode \fi
    \somedata
      [align={none,middle},height=2cm]
-     {\strut\mathfontlisttxt{#2}\vfilll\mathfontlistchr{2}{#3}}}
+     {\strut\showmathcharacterstxt{#2}\vfilll\showmathcharacterschr{2}{#3}}}
 
-\def\stopmathfontlistvvariants
+\unexpanded\def\showmathcharactersstopvvariants
   {\egroup\egroup}
 
-\def\stopmathfontlisthvariants
+\unexpanded\def\showmathcharactersstophvariants
   {\egroup\egroup}
 
-\def\mathfontlistbetweennextandvariants
+\unexpanded\def\showmathcharactersbetweennextandvariants
   {}
 
 % classes
 
-\def\startmathfontlistentryclassspec
+\unexpanded\def\showmathcharactersstartentryclassspec
   {\setlayer
      [page]
      [preset=rightbottom,offset=5mm]
      \bgroup\somedata[align=normal,width=8cm]\bgroup}
 
-\def\stopmathfontlistentryclassspec
+\unexpanded\def\showmathcharactersstopentryclassspec
   {\egroup\egroup}
 
-\def\mathfontlistentryclassname#1#2%
-  {\strut{\mathfontlisttxt#1}\hfill\mathfontlisttxt{#2}\par}
+\unexpanded\def\showmathcharactersentryclassname#1#2%
+  {\strut{\showmathcharacterstxt#1}\hfill\showmathcharacterstxt{#2}\par}
 
 % symbols
 
-\def\mathfontlistentrysymbol#1#2%
+\unexpanded\def\showmathcharactersentrysymbol#1#2%
   {\setlayer
      [page]
      [preset=leftbottom,hoffset=5mm,voffset=50mm]
      {\somedata
         [align=normal,width=5cm]
-        {\mathfontlisttxt{#1}\hfill\mathfontlistchr{4}{#2}}}}
+        {\showmathcharacterstxt{#1}\hfill\showmathcharacterschr{4}{#2}}}}
 
 % alternates
 
-\def\startmathfontlookupvariants
+\unexpanded\def\showmathcharactersstartlookupvariants
   {\setlayer
      [page]
      [preset=middleright,hoffset=5mm]
      \bgroup\vbox\bgroup}
 
-\def\stopmathfontlookupvariants
+\unexpanded\def\showmathcharactersstoplookupvariants
   {\egroup\egroup}
 
-\def\mathfontlookupvariant#1#2#3#4%
+\unexpanded\def\showmathcharacterslookupvariant#1#2#3#4%
   {\ifnum#1>1 \vskip1ex \fi
    \somedata
      [align=normal,width=7cm]
-     {\mathfontlisttxt{#4:} \mathfontlisttxt{#2}\hfill\mathfontlistchr{4}{#3}}}
+     {\showmathcharacterstxt{#4:} \showmathcharacterstxt{#2}\hfill\showmathcharacterschr{4}{#3}}}
+
+% main
+
+\unprotect
+
+\unexpanded\def\showmathfontrepertoire
+  {\dosingleempty\module_math_repertoire_show}
+
+\def\module_math_repertoire_show[#1]%           % this is a one-run style so we can forget about an alternative
+  {\showmathfontcharacters[\c!alternative=,#1]} % just assume that the previous definitions are global
+
+\protect
 
-% done
+\stopmodule
 
 \continueifinputfile{s-math-repertoire.mkiv}
 
-\setmathfontlistbodyfonts{lucidanova,cambria,xits,modern,pagella,termes,bonum}
+\showmathcharacterssetbodyfonts{lucidanova,cambria,xits,modern,pagella,termes,bonum}
 
 \starttext
 
@@ -426,7 +444,7 @@
 
     }
 
-    \showmathfontcharacters
+    \showmathfontrepertoire
 
 \stoptext
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 57208daf8..cf8a52e83 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 3be798898..8e05e1f2b 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/status-mkiv.lua
index 320ea0d17..6ee7c8da8 100644
--- a/tex/context/base/status-mkiv.lua
+++ b/tex/context/base/status-mkiv.lua
@@ -4287,7 +4287,7 @@ return {
   },
   {
    category = "lua",
-   filename = "s-math-extensibles",
+   filename = "s-math-characters",
    status   = "okay",
   },
   {
@@ -4297,6 +4297,11 @@ return {
   },
   {
    category = "lua",
+   filename = "s-math-extensibles",
+   status   = "okay",
+  },
+  {
+   category = "lua",
    filename = "s-math-parameters",
    status   = "okay",
   },
@@ -5406,17 +5411,12 @@ return {
   },
   {
    category = "mkiv",
-   filename = "s-mat-10",
-   status   = "todo",
-  },
-  {
-   category = "mkiv",
-   filename = "s-mat-11",
-   status   = "todo",
+   filename = "s-math-characters",
+   status   = "okay",
   },
   {
    category = "mkiv",
-   filename = "s-math-repertoire",
+   filename = "s-math-coverage",
    status   = "okay",
   },
   {
@@ -5426,12 +5426,12 @@ return {
   },
   {
    category = "mkiv",
-   filename = "s-math-coverage",
+   filename = "s-math-parameters",
    status   = "okay",
   },
   {
    category = "mkiv",
-   filename = "s-math-parameters",
+   filename = "s-math-repertoire",
    status   = "okay",
   },
   {
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua
index be2a954e3..1f2520130 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/trac-log.lua
@@ -14,7 +14,7 @@ if not modules then modules = { } end modules ['trac-log'] = {
 --     local texio_write_nl = texio.write_nl
 --     local texio_write    = texio.write
 --     local io_write       = io.write
---
+
 --     local write_nl = function(target,...)
 --         if not io_write then
 --             io_write = io.write
@@ -34,7 +34,7 @@ if not modules then modules = { } end modules ['trac-log'] = {
 --             io_write(target,...)
 --         end
 --     end
---
+
 --     local write = function(target,...)
 --         if not io_write then
 --             io_write = io.write
@@ -51,7 +51,7 @@ if not modules then modules = { } end modules ['trac-log'] = {
 --             io_write(target,...)
 --         end
 --     end
---
+
 --     texio.write    = write
 --     texio.write_nl = write_nl
 --
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ffb001601..fae9586a9 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  : 05/16/13 00:29:34
+-- merge date  : 05/16/13 13:51:17
 
 do -- begin closure to overcome local limits and interference