beta 2014.05.12 16:53

30 files changed, 436 insertions, 280 deletions

diff --git a/tex/context/base/char-ini.lua b/tex/context/base/char-ini.lua
index d6e8d18a9..1cfeb0596 100644
--- a/tex/context/base/char-ini.lua
+++ b/tex/context/base/char-ini.lua
@@ -776,6 +776,17 @@ function characters.lower (str) return lpegmatch(tolower,str) end
 function characters.upper (str) return lpegmatch(toupper,str) end
 function characters.shaped(str) return lpegmatch(toshape,str) end
 
+-- maybe: (twice as fast when much ascii)
+--
+-- local tolower  = lpeg.patterns.tolower
+-- local lower    = string.lower
+--
+-- local allascii = R("\000\127")^1 * P(-1)
+--
+-- function characters.checkedlower(str)
+--     return lpegmatch(allascii,str) and lower(str) or lpegmatch(tolower,str) or str
+-- end
+
 function characters.lettered(str,spacing)
     local new, n = { }, 0
     if spacing then
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 3e525f0d5..e0c78f53f 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.05.06 10:06}
+\newcontextversion{2014.05.12 16:53}
 
 %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 ecd9899ad..6b0f52399 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 9856e620e..247c79ad7 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.05.06 10:06}
+\edef\contextversion{2014.05.12 16:53}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-con.lua b/tex/context/base/font-con.lua
index b43961ec6..a34044f0b 100644
--- a/tex/context/base/font-con.lua
+++ b/tex/context/base/font-con.lua
@@ -599,6 +599,7 @@ function constructors.scale(tfmdata,specification)
             -- basemode hack (we try to catch missing tounicodes, e.g. needed for ssty in math cambria)
             local c = changed[unicode]
             if c then
+local ligatures = character.ligatures
                 description = descriptions[c] or descriptions[unicode] or character
                 character = characters[c] or character
                 index = description.index or c
@@ -610,6 +611,9 @@ function constructors.scale(tfmdata,specification)
                         touni = tounicode[i] -- nb: index!
                     end
                 end
+if ligatures and not character.ligatures then
+    character.ligatures = ligatures
+end
             else
                 description = descriptions[unicode] or character
                 index = description.index or unicode
@@ -780,7 +784,7 @@ function constructors.scale(tfmdata,specification)
                     chr.ligatures = vl -- shared
                 else
                     local tt = { }
-                    for i,l in next, vl do
+                    for i, l in next, vl do
                         tt[i] = l
                     end
                     chr.ligatures = tt
@@ -963,7 +967,6 @@ function constructors.finalize(tfmdata)
     --
     properties.finalized   = true
     --
-    --
     return tfmdata
 end
 
diff --git a/tex/context/base/font-otb.lua b/tex/context/base/font-otb.lua
index 946d552e4..2e98d3ecb 100644
--- a/tex/context/base/font-otb.lua
+++ b/tex/context/base/font-otb.lua
@@ -47,13 +47,14 @@ local function gref(descriptions,n)
             return f_unicode(n)
         end
     elseif n then
-        local num, nam = { }, { }
-        for i=2,#n do
+        local num, nam, j = { }, { }, 0
+        for i=1,#n do
             local ni = n[i]
             if tonumber(ni) then -- first is likely a key
+                j = j + 1
                 local di = descriptions[ni]
-                num[i] = f_unicode(ni)
-                nam[i] = di and di.name or "-"
+                num[j] = f_unicode(ni)
+                nam[j] = di and di.name or "-"
             end
         end
         return f_unilist(num,nam)
@@ -169,7 +170,8 @@ end
 -- pseudo names like hyphen_hyphen to endash so in practice we end
 -- up with a bit too many definitions but the overhead is neglectable.
 --
--- Todo: if changed[first] or changed[second] then ... end
+-- We can have changed[first] or changed[second] but it quickly becomes
+-- messy if we need to take that into account.
 
 local trace = false
 
@@ -188,8 +190,8 @@ local function finalize_ligatures(tfmdata,ligatures)
                 local ligature = ligatures[i]
                 if ligature then
                     local unicode, lookupdata = ligature[1], ligature[2]
-                    if trace then
-                        trace_ligatures_detail("building % a into %a",lookupdata,unicode)
+                    if trace_ligatures_detail then
+                        report_prepare("building % a into %a",lookupdata,unicode)
                     end
                     local size = #lookupdata
                     local firstcode = lookupdata[1] -- [2]
@@ -201,8 +203,8 @@ local function finalize_ligatures(tfmdata,ligatures)
                             local firstdata = characters[firstcode]
                             if not firstdata then
                                 firstcode = private
-                                if trace then
-                                    trace_ligatures_detail("defining %a as %a",firstname,firstcode)
+                                if trace_ligatures_detail then
+                                    report_prepare("defining %a as %a",firstname,firstcode)
                                 end
                                 unicodes[firstname] = firstcode
                                 firstdata = { intermediate = true, ligatures = { } }
@@ -225,8 +227,8 @@ local function finalize_ligatures(tfmdata,ligatures)
                                     break
                                 end
                             end
-                            if trace then
-                                trace_ligatures_detail("codes (%a,%a) + (%a,%a) -> %a",firstname,firstcode,secondname,secondcode,target)
+                            if trace_ligatures_detail then
+                                report_prepare("codes (%a,%a) + (%a,%a) -> %a",firstname,firstcode,secondname,secondcode,target)
                             end
                             local firstligs = firstdata.ligatures
                             if firstligs then
@@ -237,6 +239,8 @@ local function finalize_ligatures(tfmdata,ligatures)
                             firstcode = target
                             firstname = secondname
                         end
+                    elseif trace_ligatures_detail then
+                        report_prepare("no glyph (%a,%a) for building %a",firstname,firstcode,target)
                     end
                     if okay then
                         ligatures[i] = false
@@ -246,12 +250,14 @@ local function finalize_ligatures(tfmdata,ligatures)
             end
             alldone = done == 0
         end
-        if trace then
-            for k, v in next, characters do
-                if v.ligatures then table.print(v,k) end
+        if trace_ligatures_detail then
+            for k, v in table.sortedhash(characters) do
+                if v.ligatures then
+                    table.print(v,k)
+                end
             end
         end
-        tfmdata.resources.private = private
+        resources.private = private
     end
 end
 
@@ -487,7 +493,7 @@ local function preparesubstitutions(tfmdata,feature,value,validlookups,lookuplis
                 end
                 changed[unicode] = data
             elseif lookuptype == "alternate" then
-                local replacement = data[alternate]
+                 local replacement = data[alternate]
                 if replacement then
                     changed[unicode] = replacement
                     if trace_alternatives then
diff --git a/tex/context/base/font-otc.lua b/tex/context/base/font-otc.lua
index 92775270d..f7f8e9ce2 100644
--- a/tex/context/base/font-otc.lua
+++ b/tex/context/base/font-otc.lua
@@ -134,7 +134,7 @@ local function addfeature(data,feature,specifications)
                             askedfeatures[k] = table.tohash(v)
                         end
                     end
-                    sequences[#sequences+1] = {
+                    local sequence = {
                         chain     = 0,
                         features  = { [feature] = askedfeatures },
                         flags     = featureflags,
@@ -143,6 +143,11 @@ local function addfeature(data,feature,specifications)
                         subtables = st,
                         type      = featuretype,
                     }
+                    if specification.prepend then
+                        insert(sequences,1,sequence)
+                    else
+                        insert(sequences,sequence)
+                    end
                     -- register in metadata (merge as there can be a few)
                     if not gsubfeatures then
                         gsubfeatures  = { }
@@ -208,6 +213,7 @@ local tlig_specification = {
     data     = tlig,
     order    = { "tlig" },
     flags    = noflags,
+    prepend  = true,
 }
 
 otf.addfeature("tlig",tlig_specification)
@@ -231,6 +237,7 @@ local trep_specification = {
     data      = trep,
     order     = { "trep" },
     flags     = noflags,
+    prepend   = true,
 }
 
 otf.addfeature("trep",trep_specification)
diff --git a/tex/context/base/math-frc.mkiv b/tex/context/base/math-frc.mkiv
index f4f3f2b84..7032c665b 100644
--- a/tex/context/base/math-frc.mkiv
+++ b/tex/context/base/math-frc.mkiv
@@ -106,12 +106,57 @@
    \c!rulethickness=.25\exheight,
    \c!left=0x2E,
    \c!right=0x2E,
+   \c!topdistance=,
+   \c!bottomdistance=,
    \c!rule=\v!auto]
 
 \appendtoks
     \setuevalue{\currentmathfraction}{\math_frac{\currentmathfraction}}%
 \to \everydefinemathfraction
 
+% Sometimes users want control over the distances:
+
+\let\math_fraction_set_distance\relax
+
+\appendtoks
+    \math_fraction_set_distance
+\to \everymathematics
+
+\unexpanded\def\math_fraction_set_distance_top
+  {\Umathfractionnumup    \displaystyle\m_math_fraction_distance_top
+   \relax}
+
+\unexpanded\def\math_fraction_set_distance_bot
+  {\Umathfractiondenomdown\displaystyle\m_math_fraction_distance_bot
+   \relax}
+
+\unexpanded\def\math_fraction_set_distance_all
+  {\Umathfractionnumup    \displaystyle\m_math_fraction_distance_top
+   \Umathfractiondenomdown\displaystyle\m_math_fraction_distance_bot
+   \relax}
+
+\appendtoks
+    \ifx\currentmathfraction\empty
+      \edef\m_math_fraction_distance_top{\mathfractionparameter\c!topdistance}%
+      \edef\m_math_fraction_distance_bot{\mathfractionparameter\c!bottomdistance}%
+      \ifx\m_math_fraction_distance_top\empty
+        \ifx\m_math_fraction_distance_bot\empty
+          \let\math_fraction_set_distance\relax
+        \else
+          \let\math_fraction_set_distance\math_fraction_set_distance_bot
+        \fi
+      \else
+        \ifx\m_math_fraction_distance_bot\empty
+          \let\math_fraction_set_distance\math_fraction_set_distance_top
+        \else
+          \let\math_fraction_set_distance\math_fraction_set_distance_all
+        \fi
+      \fi
+    \fi
+\to \everysetupmathfraction
+
+% So far for control.
+
 \newdimen\d_math_fraction_margin
 
 \unexpanded\def\math_frac#1%
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index dcd2a5c33..adf252d95 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -230,6 +230,12 @@
 \ifdefined\mr \else \let\mr\relax \fi
 \ifdefined\mb \else \let\mb\relax \fi
 
+% 1: $\setmathattribute{ss}{bf}3$
+% 2: $\setmathattribute{ss}{bf}\setmathfontstylealterternate{bf}3$
+% 3: $\setmathattribute{ss}{bf}\setmathfontstyle{bf}3$
+% 4: $\setmathattribute{ss}{bf}\setmathfontstyle{bf}\setmathfontstylealterternate{bf}3$
+% 5: $e=mc^2 \quad \mb e=mc^2$
+
 \prependtoks
     \mathdefault
 \to \everymathematics
diff --git a/tex/context/base/math-map.lua b/tex/context/base/math-map.lua
index 2ebcdfc86..f2a588fc7 100644
--- a/tex/context/base/math-map.lua
+++ b/tex/context/base/math-map.lua
@@ -44,8 +44,8 @@ local registerotffeature  = otffeatures.register
 
 local setmetatableindex   = table.setmetatableindex
 
-local texgetattribute        = tex.getattribute
-local texsetattribute        = tex.setattribute
+local texgetattribute     = tex.getattribute
+local texsetattribute     = tex.setattribute
 
 local trace_greek         = false  trackers.register("math.greek",  function(v) trace_greek = v end)
 local report_remapping    = logs.reporter("mathematics","remapping")
@@ -59,7 +59,52 @@ local mathematics         = mathematics
 -- diagnostics and quick and dirty alphabet tracing (s-mat-10.mkiv) as we deal with
 -- it otherwise.
 
-mathematics.gaps = {
+-- todo: allocate
+
+mathematics.styles       = allocate { "regular", "sansserif", "monospaced", "fraktur", "script", "blackboard" }
+mathematics.alternatives = allocate { "normal", "bold", "italic", "bolditalic" }
+mathematics.sets         = allocate { "ucletters", "lcletters", "digits", "ucgreek", "lcgreek", "symbols" }
+
+mathematics.charactersets = allocate {
+    ucletters = {
+        0x00041, 0x00042, 0x00043, 0x00044, 0x00045,
+        0x00046, 0x00047, 0x00048, 0x00049, 0x0004A,
+        0x0004B, 0x0004C, 0x0004D, 0x0004E, 0x0004F,
+        0x00050, 0x00051, 0x00052, 0x00053, 0x00054,
+        0x00055, 0x00056, 0x00057, 0x00058, 0x00059,
+        0x0005A,
+    },
+    lcletters = {
+        0x00061, 0x00062, 0x00063, 0x00064, 0x00065,
+        0x00066, 0x00067, 0x00068, 0x00069, 0x0006A,
+        0x0006B, 0x0006C, 0x0006D, 0x0006E, 0x0006F,
+        0x00070, 0x00071, 0x00072, 0x00073, 0x00074,
+        0x00075, 0x00076, 0x00077, 0x00078, 0x00079,
+        0x0007A,
+    },
+    digits = {
+        0x00030, 0x00031, 0x00032, 0x00033, 0x00034,
+        0x00035, 0x00036, 0x00037, 0x00038, 0x00039,
+    },
+    ucgreek = {
+        0x0391, 0x0392, 0x0393, 0x0394, 0x0395,
+        0x0396, 0x0397, 0x0398, 0x0399, 0x039A,
+        0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+        0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5,
+        0x03A6, 0x03A7, 0x03A8, 0x03A9
+    },
+    lcgreek = {
+        0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5,
+        0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA,
+        0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+        0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4,
+        0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9,
+        0x03D1, 0x03D5, 0x03D6, 0x03F0, 0x03F1,
+        0x03F4, 0x03F5
+    },
+}
+
+mathematics.gaps = allocate {
     [0x1D455] = 0x0210E, -- ℎ h
     [0x1D49D] = 0x0212C, -- ℬ script B
     [0x1D4A0] = 0x02130, -- ℰ script E
@@ -112,9 +157,10 @@ registerotffeature {
 -- following approach permits easier remapping of a-a, A-Z and 0-9 to
 -- fallbacks; symbols is currently mostly greek
 
-local function todigit(n) local t = { } for i=0, 9 do t[0x00030+i] = n+i end return t end
-local function toupper(n) local t = { } for i=0,25 do t[0x00041+i] = n+i end return t end
-local function tolower(n) local t = { } for i=0,25 do t[0x00061+i] = n+i end return t end
+local function todigit (n) local t = { } for i=0, 9 do t[0x00030+i] = n+i end return t end
+local function toupper (n) local t = { } for i=0,25 do t[0x00041+i] = n+i end return t end
+local function tolower (n) local t = { } for i=0,25 do t[0x00061+i] = n+i end return t end
+local function tovector(t)                                                    return t end
 
 local regular_tf = {
     digits    = todigit(0x00030),
@@ -143,7 +189,7 @@ local regular_tf = {
 }
 
 local regular_it = {
-    digits    = regular_tf.digits,
+    digits    = tovector(regular_tf.digits),
     ucletters = toupper(0x1D434),
     lcletters = { -- H
         [0x00061]=0x1D44E, [0x00062]=0x1D44F, [0x00063]=0x1D450, [0x00064]=0x1D451, [0x00065]=0x1D452,
@@ -202,7 +248,7 @@ local regular_bf= {
 }
 
 local regular_bi = {
-    digits    = regular_bf.digits,
+    digits    = tovector(regular_bf.digits),
     ucletters = toupper(0x1D468),
     lcletters = tolower(0x1D482),
     ucgreek   = {
@@ -238,18 +284,18 @@ local sansserif_tf = {
     digits    = todigit(0x1D7E2),
     ucletters = toupper(0x1D5A0),
     lcletters = tolower(0x1D5BA),
-    lcgreek   = regular_tf.lcgreek,
-    ucgreek   = regular_tf.ucgreek,
-    symbols   = regular_tf.symbols,
+    lcgreek   = tovector(regular_tf.lcgreek),
+    ucgreek   = tovector(regular_tf.ucgreek),
+    symbols   = tovector(regular_tf.symbols),
 }
 
 local sansserif_it = {
-    digits    = regular_tf.digits,
+    digits    = tovector(regular_tf.digits),
     ucletters = toupper(0x1D608),
     lcletters = tolower(0x1D622),
-    lcgreek   = regular_tf.lcgreek,
-    ucgreek   = regular_tf.ucgreek,
-    symbols   = regular_tf.symbols,
+    lcgreek   = tovector(regular_tf.lcgreek),
+    ucgreek   = tovector(regular_tf.ucgreek),
+    symbols   = tovector(regular_tf.symbols),
 }
 
 local sansserif_bf = {
@@ -279,7 +325,7 @@ local sansserif_bf = {
 }
 
 local sansserif_bi = {
-    digits    = sansserif_bf.digits,
+    digits    = tovector(sansserif_bf.digits),
     ucletters = toupper(0x1D63C),
     lcletters = tolower(0x1D656),
     ucgreek   = {
@@ -315,16 +361,20 @@ local monospaced_tf = {
     digits    = todigit(0x1D7F6),
     ucletters = toupper(0x1D670),
     lcletters = tolower(0x1D68A),
-    lcgreek   = sansserif_tf.lcgreek,
-    ucgreek   = sansserif_tf.ucgreek,
-    symbols   = sansserif_tf.symbols,
+    lcgreek   = tovector(sansserif_tf.lcgreek),
+    ucgreek   = tovector(sansserif_tf.ucgreek),
+    symbols   = tovector(sansserif_tf.symbols),
 }
 
+local monospaced_it = tovector(sansserif_it)
+local monospaced_bf = tovector(sansserif_bf)
+local monospaced_bi = tovector(sansserif_bi)
+
 local monospaced = {
     tf = monospaced_tf,
-    it = sansserif_tf,
-    bf = sansserif_tf,
-    bi = sansserif_bf,
+    it = monospaced_tf,
+    bf = monospaced_tf,
+    bi = monospaced_bf,
 }
 
 local blackboard_tf = {
@@ -362,7 +412,7 @@ local blackboard = {
 }
 
 local fraktur_tf= {
-    digits    = regular_tf.digits,
+    digits    = tovector(regular_tf.digits),
     ucletters = { -- C H I R Z
         [0x00041]=0x1D504, [0x00042]=0x1D505, [0x00043]=0x0212D, [0x00044]=0x1D507, [0x00045]=0x1D508,
         [0x00046]=0x1D509, [0x00047]=0x1D50A, [0x00048]=0x0210C, [0x00049]=0x02111, [0x0004A]=0x1D50D,
@@ -372,18 +422,18 @@ local fraktur_tf= {
         [0x0005A]=0x02128,
     },
     lcletters = tolower(0x1D51E),
-    lcgreek   = regular_tf.lcgreek,
-    ucgreek   = regular_tf.ucgreek,
-    symbols   = regular_tf.symbols,
+    lcgreek   = tovector(regular_tf.lcgreek),
+    ucgreek   = tovector(regular_tf.ucgreek),
+    symbols   = tovector(regular_tf.symbols),
 }
 
 local fraktur_bf = {
-    digits    = regular_bf.digits,
+    digits    = tovector(regular_bf.digits),
     ucletters = toupper(0x1D56C),
     lcletters = tolower(0x1D586),
-    lcgreek   = regular_bf.lcgreek,
-    ucgreek   = regular_bf.ucgreek,
-    symbols   = regular_bf.symbols,
+    lcgreek   = tovector(regular_bf.lcgreek),
+    ucgreek   = tovector(regular_bf.ucgreek),
+    symbols   = tovector(regular_bf.symbols),
 }
 
 local fraktur = { -- ok
@@ -394,7 +444,7 @@ local fraktur = { -- ok
 }
 
 local script_tf = {
-    digits    = regular_tf.digits,
+    digits    = tovector(regular_tf.digits),
     ucletters = { -- B E F H I L M R -- P 2118
         [0x00041]=0x1D49C, [0x00042]=0x0212C, [0x00043]=0x1D49E, [0x00044]=0x1D49F, [0x00045]=0x02130,
         [0x00046]=0x02131, [0x00047]=0x1D4A2, [0x00048]=0x0210B, [0x00049]=0x02110, [0x0004A]=0x1D4A5,
@@ -411,18 +461,18 @@ local script_tf = {
         [0x00075]=0x1D4CA, [0x00076]=0x1D4CB, [0x00077]=0x1D4CC, [0x00078]=0x1D4CD, [0x00079]=0x1D4CE,
         [0x0007A]=0x1D4CF,
     },
-    lcgreek = regular_tf.lcgreek,
-    ucgreek = regular_tf.ucgreek,
-    symbols = regular_tf.symbols,
+    lcgreek = tovector(regular_tf.lcgreek),
+    ucgreek = tovector(regular_tf.ucgreek),
+    symbols = tovector(regular_tf.symbols),
 }
 
 local script_bf = {
-    digits    = regular_bf.digits,
+    digits    = tovector(regular_bf.digits),
     ucletters = toupper(0x1D4D0),
     lcletters = tolower(0x1D4EA),
-    lcgreek   = regular_bf.lcgreek,
-    ucgreek   = regular_bf.ucgreek,
-    symbols   = regular_bf.symbols,
+    lcgreek   = tovector(regular_bf.lcgreek),
+    ucgreek   = tovector(regular_bf.ucgreek),
+    symbols   = tovector(regular_bf.symbols),
 }
 
 local script = {
@@ -441,82 +491,83 @@ local alphabets = allocate {
     script     = script,
 }
 
-mathematics.alphabets = alphabets
+alphabets.tt          = tovector(monospaced)
+alphabets.ss          = tovector(sansserif)
+alphabets.rm          = tovector(regular)
+alphabets.bb          = tovector(blackboard)
+alphabets.fr          = tovector(fraktur)
+alphabets.sr          = tovector(script)
 
-local boldmap = { }
-
--- ["blackboard"] = { ["bf"] = { ["digits"] = {
-
-local function remap(tf,bf)
-    for _, alphabet in next, alphabets do
-        local tfdata = alphabet[tf]
-        local bfdata = alphabet[bf]
-        if tfdata then
-            for k, tfd in next, tfdata do
-                if type(tfd) == "table" then
-                    local bfd = bfdata[k]
-                    if bfd then
-                        for n, u in next, tfd do
-                            local bn = bfd[n]
-                            if bn then
-                                boldmap[u] = bn
-                            end
-                        end
-                    end
-                end
-            end
-        end
-    end
-end
+monospaced.normal     = tovector(monospaced_tf)
+monospaced.italic     = tovector(monospaced_it)
+monospaced.bold       = tovector(monospaced_bf)
+monospaced.bolditalic = tovector(monospaced_bi)
+
+sansserif.normal      = tovector(sansserif_tf)
+sansserif.italic      = tovector(sansserif_it)
+sansserif.bold        = tovector(sansserif_bf)
+sansserif.bolditalic  = tovector(sansserif_bi)
+
+regular.normal        = tovector(regular_tf)
+regular.italic        = tovector(regular_it)
+regular.bold          = tovector(regular_bf)
+regular.bolditalic    = tovector(regular_bi)
+
+alphabets.serif       = tovector(regular)
+alphabets.type        = tovector(monospaced)
+alphabets.teletype    = tovector(monospaced)
 
-remap("tf","bf")
-remap("it","bi")
+mathematics.alphabets = alphabets
+
+local mathremap       = allocate { }
+mathematics.mapremap  = mathremap
 
-mathematics.boldmap = boldmap
+local boldmap         = allocate { }
+mathematics.boldmap   = boldmap
 
-local mathremap = allocate { }
+-- all math (a bit of redundancy here)
 
 for alphabet, styles in next, alphabets do -- per 9/6/2011 we also have attr for missing
     for style, data in next, styles do
      -- let's keep the long names (for tracing)
         local n = #mathremap + 1
-        data.attribute = n
-        data.alphabet = alphabet
-        data.style = style
-        mathremap[n] = data
+        local d = {
+            attribute = n,
+            alphabet  = alphabet,
+            style     = style,
+        }
+        styles[style] = d
+        setmetatableindex(d,data) -- we could use a alphadata table
+        mathremap[n] = d
     end
 end
 
-mathematics.mapremap = mathremap
-
--- beware, these are shared tables (no problem since they're not
--- in unicode)
-
-alphabets.tt          = monospaced
-alphabets.ss          = sansserif
-alphabets.rm          = regular
-alphabets.bb          = blackboard
-alphabets.fr          = fraktur
-alphabets.sr          = script
-
-alphabets.serif       = regular
-alphabets.type        = monospaced
-alphabets.teletype    = monospaced
-
-regular.normal        = regular_tf
-regular.italic        = regular_it
-regular.bold          = regular_bf
-regular.bolditalic    = regular_bi
+-- bold math
+
+local function remapbold(tf,bf)
+    local styles = mathematics.styles
+    local sets   = mathematics.sets
+    for i=1,#styles do
+        for j=1,#sets do
+            local one = styles[i]
+            local two = sets[j]
+            local a  = alphabets[one]
+            local tf = a[tf][two]
+            local bf = a[bf][two]
+            if tf and bf then
+                for k, v in next, tf do
+                    boldmap[v] = bf[k]
+                end
+            end
+        end
+    end
+end
 
-sansserif.normal      = sansserif_tf
-sansserif.italic      = sansserif_it
-sansserif.bold        = sansserif_bf
-sansserif.bolditalic  = sansserif_bi
+remapbold("tf","bf")
+remapbold("it","bi")
 
-monospaced.normal     = monospaced_tf
-monospaced.italic     = monospaced_it
-monospaced.bold       = monospaced_bf
-monospaced.bolditalic = monospaced_bi
+-- table.save("e:/tmp/a.lua",alphabets)
+-- table.save("e:/tmp/b.lua",boldmap)
 
 function mathematics.tostyle(attribute)
     local r = mathremap[attribute]
diff --git a/tex/context/base/math-noa.lua b/tex/context/base/math-noa.lua
index a7f0fcf55..3a0af01cc 100644
--- a/tex/context/base/math-noa.lua
+++ b/tex/context/base/math-noa.lua
@@ -251,40 +251,6 @@ local familymap = { [0] =
     "pseudobold",
 }
 
--- families[math_char] = function(pointer)
---     if getfield(pointer,"fam") == 0 then
---         local a = getattr(pointer,a_mathfamily)
---         if a and a > 0 then
---             setattr(pointer,a_mathfamily,0)
---             if a > 5 then
---                 local char = getchar(pointer)
---                 local bold = boldmap[char]
---                 local newa = a - 3
---                 if bold then
---                     setattr(pointer,a_exportstatus,char)
---                     setfield(pointer,"char",bold)
---                     if trace_families then
---                         report_families("replacing %C by bold %C, family %s with remap %s becomes %s with remap %s",char,bold,a,familymap[a],newa,familymap[newa])
---                     end
---                 else
---                     if trace_families then
---                         report_families("no bold replacement for %C, family %s with remap %s becomes %s with remap %s",char,a,familymap[a],newa,familymap[newa])
---                     end
---                 end
---                 setfield(pointer,"fam",newa)
---             else
---                 if trace_families then
---                     local char = getchar(pointer)
---                     report_families("family of %C becomes %s with remap %s",char,a,familymap[a])
---                 end
---                 setfield(pointer,"fam",a)
---             end
---         else
---          -- pointer.fam = 0
---         end
---     end
--- end
-
 families[math_char] = function(pointer)
     if getfield(pointer,"fam") == 0 then
         local a = getattr(pointer,a_mathfamily)
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua
index f41104986..a52fd1ddc 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -307,6 +307,8 @@ return {
         --
         "leftorright",
         --
+        "offinterlineskip", "oninterlineskip", "nointerlineskip",
+        --
         "strut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "begstrut", "endstrut", "lineheight",
         --
         "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing",
diff --git a/tex/context/base/mult-mps.lua b/tex/context/base/mult-mps.lua
index 104b9d42e..717536fbf 100644
--- a/tex/context/base/mult-mps.lua
+++ b/tex/context/base/mult-mps.lua
@@ -60,6 +60,8 @@ return {
         "expandafter",
         "minute", "hour", "outputformat", "outputtemplate", "filenametemplate", "fontmapfile", "fontmapline",
         "fontpart", "fontsize", "glyph", "restoreclipcolor", "troffmode",
+        --
+        "runscript",
     },
     commands = {
         "beginfig", "endfig",
diff --git a/tex/context/base/pack-mrl.mkiv b/tex/context/base/pack-mrl.mkiv
index 3e81a4d69..c0097cb5f 100644
--- a/tex/context/base/pack-mrl.mkiv
+++ b/tex/context/base/pack-mrl.mkiv
@@ -614,7 +614,7 @@
       \fi
       \doifelse{\directtextrulesparameter\c!depthcorrection}\v!on\pack_textrule_correct_depth_yes\pack_textrule_correct_depth_nop
       \nointerlineskip
-      \dontleavehmode\vbox
+      \noindent\vbox % was \dontleavehmode
         {\color[\directtextrulesparameter\c!rulecolor]
            {\hrule\s!depth\directtextrulesparameter\c!rulethickness\s!height\zeropoint\s!width\availablehsize}}}
      {\pack_textrule_with_text{#1}}%
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv
index 41897f6dd..57de14b88 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/page-mix.mkiv
@@ -29,6 +29,7 @@
 % wide floats
 % move floats
 % offsets (inner ones, so we change the hsize  ... needed with backgrounds
+% when no content we currently loose the page
 
 % luatex buglet:
 %
@@ -208,7 +209,7 @@
    \fi
    \global\setbox\b_page_mix_preceding\vbox
      {\page_otr_command_flush_top_insertions
-      \ifdim\ht\b_page_mix_preceding=\zeropoint \else
+      \ifdim\htdp\b_page_mix_preceding=\zeropoint \else
         \writestatus\m!columns{preceding error}%
         \unvbox\b_page_mix_preceding
       \fi
diff --git a/tex/context/base/s-math-coverage.lua b/tex/context/base/s-math-coverage.lua
index 5f1c7cc5a..56880f76d 100644
--- a/tex/context/base/s-math-coverage.lua
+++ b/tex/context/base/s-math-coverage.lua
@@ -6,76 +6,37 @@ if not modules then modules = { } end modules ['s-math-coverage'] = {
     license   = "see context related readme files"
 }
 
-moduledata.math          = moduledata.math          or { }
-moduledata.math.coverage = moduledata.math.coverage or { }
-
 local utfchar, utfbyte = utf.char, utf.byte
 local formatters, lower = string.formatters, string.lower
 local concat = table.concat
 
-local context = context
-local NC, NR, HL = context.NC, context.NR, context.HL
-local char, getglyph, bold = context.char, context.getglyph, context.bold
+moduledata.math            = moduledata.math          or { }
+moduledata.math.coverage   = moduledata.math.coverage or { }
 
-local ucgreek = {
-    0x0391, 0x0392, 0x0393, 0x0394, 0x0395,
-    0x0396, 0x0397, 0x0398, 0x0399, 0x039A,
-    0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
-    0x03A0, 0x03A1, 0x03A3, 0x03A4, 0x03A5,
-    0x03A6, 0x03A7, 0x03A8, 0x03A9
-}
+local context              = context
 
-local lcgreek = {
-    0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5,
-    0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA,
-    0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
-    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4,
-    0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9,
-    0x03D1, 0x03D5, 0x03D6, 0x03F0, 0x03F1,
-    0x03F4, 0x03F5
-}
+local ctx_NC               = context.NC
+local ctx_NR               = context.NR
+local ctx_HL               = context.HL
 
-local ucletters = {
-    0x00041, 0x00042, 0x00043, 0x00044, 0x00045,
-    0x00046, 0x00047, 0x00048, 0x00049, 0x0004A,
-    0x0004B, 0x0004C, 0x0004D, 0x0004E, 0x0004F,
-    0x00050, 0x00051, 0x00052, 0x00053, 0x00054,
-    0x00055, 0x00056, 0x00057, 0x00058, 0x00059,
-    0x0005A,
-}
+local ctx_rawmathematics   = context.formatted.rawmathematics
+local ctx_mathematics      = context.formatted.mathematics
+local ctx_startimath       = context.startimath
+local ctx_stopimath        = context.stopimath
+local ctx_setmathattribute = context.setmathattribute
+local ctx_underbar         = context.underbar
+local ctx_getglyph         = context.getglyph
 
-local lcletters = {
-    0x00061, 0x00062, 0x00063, 0x00064, 0x00065,
-    0x00066, 0x00067, 0x00068, 0x00069, 0x0006A,
-    0x0006B, 0x0006C, 0x0006D, 0x0006E, 0x0006F,
-    0x00070, 0x00071, 0x00072, 0x00073, 0x00074,
-    0x00075, 0x00076, 0x00077, 0x00078, 0x00079,
-    0x0007A,
-}
+local styles               = mathematics.styles
+local alternatives         = mathematics.alternatives
+local charactersets        = mathematics.charactersets
 
-local digits = {
-    0x00030, 0x00031, 0x00032, 0x00033, 0x00034,
-    0x00035, 0x00036, 0x00037, 0x00038, 0x00039,
-}
-
-local styles = {
-    "regular", "sansserif", "monospaced", "fraktur", "script", "blackboard"
-}
+local getboth              = mathematics.getboth
+local remapalphabets       = mathematics.remapalphabets
 
-local alternatives = {
-    "normal", "bold", "italic", "bolditalic"
-}
-
-local alphabets = {
-    ucletters, lcletters, ucgreek, lcgreek, digits,
-}
-
-local getboth        = mathematics.getboth
-local remapalphabets = mathematics.remapalphabets
-
-local chardata     = characters.data
-local superscripts = characters.superscripts
-local subscripts   = characters.subscripts
+local chardata             = characters.data
+local superscripts         = characters.superscripts
+local subscripts           = characters.subscripts
 
 context.writestatus("math coverage","underline: not remapped")
 
@@ -85,37 +46,37 @@ function moduledata.math.coverage.showalphabets()
         local style = styles[i]
         for i=1,#alternatives do
             local alternative = alternatives[i]
-            for i=1,#alphabets do
-                local alphabet = alphabets[i]
-                NC()
+            for i=1,#charactersets do
+                local alphabet = charactersets[i]
+                ctx_NC()
                     if i == 1 then
                         context("%s %s",style,alternative)
                     end
-                NC()
-                    context.startimath()
-                    context.setmathattribute(style,alternative)
+                ctx_NC()
+                    ctx_startimath()
+                    ctx_setmathattribute(style,alternative)
                     for i=1,#alphabet do
                         local letter = alphabet[i]
                         local id = getboth(style,alternative)
                         local unicode = remapalphabets(letter,id)
                         if not unicode then
-                            context.underbar(utfchar(letter))
+                            ctx_underbar(utfchar(letter))
                         elseif unicode == letter then
                             context(utfchar(unicode))
                         else
                             context(utfchar(unicode))
                         end
                     end
-                    context.stopimath()
-                NC()
+                    ctx_stopimath()
+                ctx_NC()
                     local first = alphabet[1]
                     local last = alphabet[#alphabet]
                     local id = getboth(style,alternative)
                     local f_unicode = remapalphabets(first,id) or utfbyte(first)
                     local l_unicode = remapalphabets(last,id) or utfbyte(last)
                     context("%05X - %05X",f_unicode,l_unicode)
-                NC()
-                NR()
+                ctx_NC()
+                ctx_NR()
             end
         end
     end
@@ -126,15 +87,15 @@ function moduledata.math.coverage.showcharacters()
     context.startmixedcolumns()
     context.setupalign { "nothyphenated" }
     context.starttabulate { "|T|i2|Tpl|" }
-    for u, d in table.sortedpairs(chardata) do
+    for u, d in table.sortedhash(chardata) do
         local mathclass = d.mathclass
         local mathspec = d.mathspec
         if mathclass or mathspec then
-            NC()
+            ctx_NC()
                 context("%05X",u)
-            NC()
-                getglyph("MathRoman",u)
-            NC()
+            ctx_NC()
+                ctx_getglyph("MathRoman",u)
+            ctx_NC()
                 if mathspec then
                     local t = { }
                     for i=1,#mathspec do
@@ -145,8 +106,8 @@ function moduledata.math.coverage.showcharacters()
                 else
                     context(mathclass)
                 end
-            NC()
-            NR()
+            ctx_NC()
+            ctx_NR()
         end
     end
     context.stoptabulate()
@@ -157,26 +118,33 @@ end
 
 function moduledata.math.coverage.showscripts()
     context.starttabulate { "|cT|c|cT|c|c|c|l|" }
-    for k, v in table.sortedpairs(table.merged(superscripts,subscripts)) do
+    for k, v in table.sortedhash(table.merged(superscripts,subscripts)) do
         local ck = utfchar(k)
         local cv = utfchar(v)
         local ss = superscripts[k] and "^" or "_"
-        NC()
-            context("%05X",k)
-        NC()
-            context(ck)
-        NC()
-            context("%05X",v)
-        NC()
-            context(cv)
-        NC()
-            context.formatted.rawmathematics("x%s = x%s%s",ck,ss,cv)
-        NC()
-            context.formatted.mathematics("x%s = x%s%s",ck,ss,cv)
-        NC()
-            context(lower(chardata[k].description))
-        NC()
-        NR()
+        ctx_NC() context("%05X",k)
+        ctx_NC() context(ck)
+        ctx_NC() context("%05X",v)
+        ctx_NC() context(cv)
+        ctx_NC() ctx_rawmathematics("x%s = x%s%s",ck,ss,cv)
+        ctx_NC() ctx_mathematics("x%s = x%s%s",ck,ss,cv)
+        ctx_NC() context(lower(chardata[k].description))
+        ctx_NC() ctx_NR()
+    end
+    context.stoptabulate()
+end
+
+-- Handy too.
+
+function moduledata.math.coverage.showbold()
+    context.starttabulate { "|lT|cm|lT|cm|lT|" }
+    for k, v in table.sortedhash(mathematics.boldmap) do
+        ctx_NC() context("%U",k)
+        ctx_NC() context("%c",k)
+        ctx_NC() context("%U",v)
+        ctx_NC() context("%c",v)
+        ctx_NC() context(chardata[k].description)
+        ctx_NC() ctx_NR()
     end
     context.stoptabulate()
 end
diff --git a/tex/context/base/s-math-coverage.mkiv b/tex/context/base/s-math-coverage.mkiv
index d68ffe587..9f084b284 100644
--- a/tex/context/base/s-math-coverage.mkiv
+++ b/tex/context/base/s-math-coverage.mkiv
@@ -18,6 +18,7 @@
 \installmodulecommandluasingle \showmathalphabets  {moduledata.math.coverage.showalphabets}
 \installmodulecommandluasingle \showmathcharacters {moduledata.math.coverage.showcharacters}
 \installmodulecommandluasingle \showmathscripts    {moduledata.math.coverage.showscripts}
+\installmodulecommandluasingle \showmathbold       {moduledata.math.coverage.showbold}
 
 \stopmodule
 
@@ -30,5 +31,6 @@
     \showmathalphabets  \page
     \showmathcharacters \page
     \showmathscripts    \page
+    \showmathbold       \page
 
 \stoptext
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 431eaa2ab..3c137a92d 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 d19e15513..321d4eef7 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/tabl-tbl.mkiv
index d4d22af97..c25d61741 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/tabl-tbl.mkiv
@@ -1066,6 +1066,9 @@
 
 \def\tabl_tabulate_insert_content
   {\tabl_tabulate_insert_head
+   \ifcase\c_tabl_tabulate_repeathead \else
+     \tabulatenoalign{\penalty\zerocount}% added 7/5/2014 WS mail
+   \fi
    \tabl_tabulate_insert_body
    \tabl_tabulate_insert_foot
    \tabl_tabulate_remove_funny_line}
diff --git a/tex/context/base/type-imp-lato.mkiv b/tex/context/base/type-imp-lato.mkiv
new file mode 100644
index 000000000..8fb8647fc
--- /dev/null
+++ b/tex/context/base/type-imp-lato.mkiv
@@ -0,0 +1,56 @@
+%D \module
+%D   [       file=type-imp-lato,
+%D        version=2014.05.02,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Lato fonts,
+%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.
+
+% hai : hair    / lta : italic
+% lig : light   / lta : italic
+% reg : regular / lta : italic
+% bol : bold    / lta : italic
+% bla : black   / lta : italic
+
+\loadtypescriptfile[dejavu]
+\loadtypescriptfile[xits]
+
+\starttypescriptcollection[lato]
+
+    \starttypescript [\s!sans] [lato] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:lato-reg]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:lato-bol]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:lato-reglta] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:lato-bollta] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [lato-light] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:lato-lig]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:lato-reg]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:lato-liglta] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:lato-reglta] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript [\s!sans] [lato-dark] [\s!name]
+        \setups[\s!font:\s!fallback:\s!sans]
+        \definefontsynonym [\s!Sans]           [\s!file:lato-bol]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansBold]       [\s!file:lato-bla]    [\s!features=\s!default]
+        \definefontsynonym [\s!SansItalic]     [\s!file:lato-bollta] [\s!features=\s!default]
+        \definefontsynonym [\s!SansBoldItalic] [\s!file:lato-blalta] [\s!features=\s!default]
+    \stoptypescript
+
+    \starttypescript[lato,lato-light,lato-dark]
+        \definetypeface [\typescriptone] [\s!ss] [\s!sans]  [\typescriptone] [\s!default]
+        \definetypeface [\typescriptone] [\s!rm] [\s!serif] [dejavu]         [\s!default]
+        \definetypeface [\typescriptone] [\s!tt] [\s!mono]  [dejavu]         [\s!default]
+        \definetypeface [\typescriptone] [\s!mm] [\s!math]  [xits]           [\s!default] [\s!rscale=1.2]
+    \stoptypescript
+
+\stoptypescriptcollection
diff --git a/tex/context/base/type-imp-texgyre.mkiv b/tex/context/base/type-imp-texgyre.mkiv
index 2484066cc..b2aaa3629 100644
--- a/tex/context/base/type-imp-texgyre.mkiv
+++ b/tex/context/base/type-imp-texgyre.mkiv
@@ -262,7 +262,7 @@
 
         \starttypescript [\s!math][palatino,pagella][\s!all]
             \loadfontgoodies[texgyre]
-            \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][goodies=texgyre-math,\s!features=\s!math\mathsizesuffix]
+            \definefontsynonym[\s!MathRoman][file:texgyre-pagella-math-regular.otf][\s!features=\s!math\mathsizesuffix]
         \stoptypescript
 
     \stoptypescriptcollection
diff --git a/tex/context/base/x-asciimath.lua b/tex/context/base/x-asciimath.lua
index 992c37eae..87f04b5ff 100644
--- a/tex/context/base/x-asciimath.lua
+++ b/tex/context/base/x-asciimath.lua
@@ -268,5 +268,7 @@ parser = Cs { "main",
 
 }
 
-asciimath.reserved   = reserved
-asciimath.convert    = converted
+asciimath.reserved = reserved
+asciimath.convert  = converted
+
+commands.convert = converted
diff --git a/tex/context/base/x-asciimath.mkiv b/tex/context/base/x-asciimath.mkiv
index b555115ff..fd385671a 100644
--- a/tex/context/base/x-asciimath.mkiv
+++ b/tex/context/base/x-asciimath.mkiv
@@ -64,7 +64,8 @@
 
 \writestatus{asciimath}{beware, this is an experimental (m4all only) module}
 
-\unexpanded\def\asciimath#1{\ctxmoduleasciimath{convert(\!!bs\detokenize{#1}\!!es,true)}}
+%unexpanded\def\asciimath#1{\ctxmoduleasciimath{convert(\!!bs\detokenize{#1}\!!es,true)}}
+\unexpanded\def\asciimath#1{\ctxcommand{convert(\!!bs\detokenize\expandafter{\normalexpanded{#1}}\!!es,true)}}
 
 \protect
 
@@ -82,6 +83,7 @@
 \asciimath{int_0^1 f(x)dx}
 \asciimath{int^1_0 f(x)dx}
 \asciimath{a//b}
+\asciimath{a//\alpha}
 \asciimath{(a/b)/(d/c)}
 \asciimath{((a*b))/(d/c)}
 \asciimath{[[a,b],[c,d]]((n),(k))}
diff --git a/tex/context/base/x-mathml.lua b/tex/context/base/x-mathml.lua
index baf839ad8..15739eec7 100644
--- a/tex/context/base/x-mathml.lua
+++ b/tex/context/base/x-mathml.lua
@@ -758,7 +758,7 @@ function mathml.mtable(root)
     local framespacing = at.framespacing or "0pt"
     local framespacing = at.framespacing or "-\\ruledlinewidth" -- make this an option
 
-    context.bTABLE { frame = frametypes[frame or "none"] or "off", offset = framespacing }
+    context.bTABLE { frame = frametypes[frame or "none"] or "off", offset = framespacing, background = "" } -- todo: use xtables and definextable
     for e in lxml.collected(root,"/(mml:mtr|mml:mlabeledtr)") do
         context.bTR()
         local at = e.at
diff --git a/tex/context/fonts/lm-math.lfg b/tex/context/fonts/lm-math.lfg
index 87c37cd78..b8c996979 100644
--- a/tex/context/fonts/lm-math.lfg
+++ b/tex/context/fonts/lm-math.lfg
@@ -231,7 +231,7 @@ local seventeen = {
 return {
     name = "lm-math",
     version = "1.00",
-    comment = "Goodies that complement latin modern math.",
+    comment = "Goodies that complement latin modern math (virtual).",
     author = "Hans Hagen",
     copyright = "ConTeXt development team",
     mathematics = {
diff --git a/tex/context/fonts/lm.lfg b/tex/context/fonts/lm.lfg
index 8d7614718..546d18def 100644
--- a/tex/context/fonts/lm.lfg
+++ b/tex/context/fonts/lm.lfg
@@ -34,8 +34,19 @@ return {
                 [0x2213] = { -- ∓
                     yoffset = -100,
                 },
-            }
-        }
+            },
+        },
+--         parameters = {
+--             FractionNumeratorDisplayStyleShiftUp = function(value,target,original)
+--                 local o = original.mathparameters.FractionNumeratorDisplayStyleShiftUp
+--                 if o > 675 then
+--                     o = 600
+--                 else
+--                     -- probably tuned
+--                 end
+--                 return o * target.parameters.factor
+--             end,
+--         }
     },
     filenames = {
         ["latinmodern-math-regular.otf"] = {
diff --git a/tex/generic/context/luatex/luatex-fonts-enc.lua b/tex/generic/context/luatex/luatex-fonts-enc.lua
index e20c3a03b..2e1c6a466 100644
--- a/tex/generic/context/luatex/luatex-fonts-enc.lua
+++ b/tex/generic/context/luatex/luatex-fonts-enc.lua
@@ -11,9 +11,10 @@ if context then
     os.exit()
 end
 
-local fonts         = fonts
-fonts.encodings     = { }
-fonts.encodings.agl = { }
+local fonts           = fonts
+fonts.encodings       = { }
+fonts.encodings.agl   = { }
+fonts.encodings.known = { }
 
 setmetatable(fonts.encodings.agl, { __index = function(t,k)
     if k == "unicodes" then
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 511198a58..381c5ca8d 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/06/14 10:06:39
+-- merge date  : 05/12/14 16:53:28
 
 do -- begin closure to overcome local limits and interference
 
@@ -4170,6 +4170,7 @@ function constructors.scale(tfmdata,specification)
     if changed then
       local c=changed[unicode]
       if c then
+local ligatures=character.ligatures
         description=descriptions[c] or descriptions[unicode] or character
         character=characters[c] or character
         index=description.index or c
@@ -4181,6 +4182,9 @@ function constructors.scale(tfmdata,specification)
             touni=tounicode[i] 
           end
         end
+if ligatures and not character.ligatures then
+  character.ligatures=ligatures
+end
       else
         description=descriptions[unicode] or character
         index=description.index or unicode
@@ -4858,6 +4862,7 @@ end
 local fonts=fonts
 fonts.encodings={}
 fonts.encodings.agl={}
+fonts.encodings.known={}
 setmetatable(fonts.encodings.agl,{ __index=function(t,k)
   if k=="unicodes" then
     texio.write(" <loading (extended) adobe glyph list>")
@@ -8542,13 +8547,14 @@ local function gref(descriptions,n)
       return f_unicode(n)
     end
   elseif n then
-    local num,nam={},{}
-    for i=2,#n do
+    local num,nam,j={},{},0
+    for i=1,#n do
       local ni=n[i]
       if tonumber(ni) then 
+        j=j+1
         local di=descriptions[ni]
-        num[i]=f_unicode(ni)
-        nam[i]=di and di.name or "-"
+        num[j]=f_unicode(ni)
+        nam[j]=di and di.name or "-"
       end
     end
     return f_unilist(num,nam)
@@ -8631,8 +8637,8 @@ local function finalize_ligatures(tfmdata,ligatures)
         local ligature=ligatures[i]
         if ligature then
           local unicode,lookupdata=ligature[1],ligature[2]
-          if trace then
-            trace_ligatures_detail("building % a into %a",lookupdata,unicode)
+          if trace_ligatures_detail then
+            report_prepare("building % a into %a",lookupdata,unicode)
           end
           local size=#lookupdata
           local firstcode=lookupdata[1] 
@@ -8644,8 +8650,8 @@ local function finalize_ligatures(tfmdata,ligatures)
               local firstdata=characters[firstcode]
               if not firstdata then
                 firstcode=private
-                if trace then
-                  trace_ligatures_detail("defining %a as %a",firstname,firstcode)
+                if trace_ligatures_detail then
+                  report_prepare("defining %a as %a",firstname,firstcode)
                 end
                 unicodes[firstname]=firstcode
                 firstdata={ intermediate=true,ligatures={} }
@@ -8668,8 +8674,8 @@ local function finalize_ligatures(tfmdata,ligatures)
                   break
                 end
               end
-              if trace then
-                trace_ligatures_detail("codes (%a,%a) + (%a,%a) -> %a",firstname,firstcode,secondname,secondcode,target)
+              if trace_ligatures_detail then
+                report_prepare("codes (%a,%a) + (%a,%a) -> %a",firstname,firstcode,secondname,secondcode,target)
               end
               local firstligs=firstdata.ligatures
               if firstligs then
@@ -8680,6 +8686,8 @@ local function finalize_ligatures(tfmdata,ligatures)
               firstcode=target
               firstname=secondname
             end
+          elseif trace_ligatures_detail then
+            report_prepare("no glyph (%a,%a) for building %a",firstname,firstcode,target)
           end
           if okay then
             ligatures[i]=false
@@ -8689,12 +8697,14 @@ local function finalize_ligatures(tfmdata,ligatures)
       end
       alldone=done==0
     end
-    if trace then
-      for k,v in next,characters do
-        if v.ligatures then table.print(v,k) end
+    if trace_ligatures_detail then
+      for k,v in table.sortedhash(characters) do
+        if v.ligatures then
+          table.print(v,k)
+        end
       end
     end
-    tfmdata.resources.private=private
+    resources.private=private
   end
 end
 local function preparesubstitutions(tfmdata,feature,value,validlookups,lookuplist)
@@ -8913,7 +8923,7 @@ local function preparesubstitutions(tfmdata,feature,value,validlookups,lookuplis
         end
         changed[unicode]=data
       elseif lookuptype=="alternate" then
-        local replacement=data[alternate]
+         local replacement=data[alternate]
         if replacement then
           changed[unicode]=replacement
           if trace_alternatives then
diff --git a/tex/generic/context/luatex/luatex-math.tex b/tex/generic/context/luatex/luatex-math.tex
index ab304b974..c8210c2b5 100644
--- a/tex/generic/context/luatex/luatex-math.tex
+++ b/tex/generic/context/luatex/luatex-math.tex
@@ -1799,7 +1799,8 @@
 
 % a few definitions:
 
-\def\sqrt{\Uroot "0 "221A }
+\def\sqrt     {\Uroot "0 "221A{}}
+\def\root#1\of{\Uroot "0 "221A{#1}}
 
 % \skewchar\teni='177 \skewchar\seveni='177 \skewchar\fivei='177
 % \skewchar\tensy='60 \skewchar\sevensy='60 \skewchar\fivesy='60