2016-10-25 10:03:00

14 files changed, 51 insertions, 40 deletions

diff --git a/tex/context/base/mkiv/cont-fil.mkiv b/tex/context/base/mkiv/cont-fil.mkiv
index 19c1c93ac..4e5075b6b 100644
--- a/tex/context/base/mkiv/cont-fil.mkiv
+++ b/tex/context/base/mkiv/cont-fil.mkiv
@@ -81,13 +81,19 @@
 %definefilesynonym [pre-more]        [pre-29]
 %definefilesynonym [pre-more]        [pre-30]
 
-\definefilesynonym [pre-tiles]       [pre-41]
-
-\definefilesynonym [pre-stepwise]    [pre-60]
-\definefilesynonym [pre-stepper]     [pre-61]
-
-\definefilesynonym [pre-punk]        [pre-70]
-\definefilesynonym [pre-random]      [pre-71]
+\definefilesynonym [pre-41]          [present-tiles]
+\definefilesynonym [pre-62]          [present-overlap]
+
+\definefilesynonym [pre-60]          [present-stepwise]
+\definefilesynonym [pre-61]          [present-stepper]
+\definefilesynonym [pre-69]          [present-wobbling]
+\definefilesynonym [pre-70]          [present-punk]
+\definefilesynonym [pre-71]          [present-random]
+
+\definefilesynonym [pre-stepwise]    [present-stepwise]
+\definefilesynonym [pre-stepper]     [present-stepper]
+\definefilesynonym [pre-random]      [present-random]
+\definefilesynonym [pre-punk]        [present-punk]
 
 \definefilesynonym [abr-pseudocaps]  [abr-01]
 \definefilesynonym [abr-smallcaps]   [abr-02]
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 980b1502b..e78789676 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.10.22 10:43}
+\newcontextversion{2016.10.25 09:57}
 
 %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 1dee0f025..8f31103a2 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.10.22 10:43}
+\edef\contextversion{2016.10.25 09:57}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/file-job.mkvi b/tex/context/base/mkiv/file-job.mkvi
index 78ec0d9a4..75362d5a9 100644
--- a/tex/context/base/mkiv/file-job.mkvi
+++ b/tex/context/base/mkiv/file-job.mkvi
@@ -325,6 +325,17 @@
 \unexpanded\def\presetdocument[#settings]%
   {\checkvariables[\s!document][#settings]}
 
+% We silently ignore missing documents. Beware: there are no begin/end setups
+% invoked as we expect the loaded document to be wrapped in \startdocument ...
+% \stopdocument. This is just a convenient variant of input.
+%
+% \unexpanded\def\document
+%   {\dosingleempty\syst_document}
+%
+% \def\syst_document[#1]#2%
+%    \startdocument[#1]
+%    \readfile{#2}{}{}}
+
 % metadata:author  metadata:title  metadata:subject
 
 \setvariables
diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua
index 0eb6955d0..8905cabc0 100644
--- a/tex/context/base/mkiv/font-ctx.lua
+++ b/tex/context/base/mkiv/font-ctx.lua
@@ -160,9 +160,10 @@ if _LUAVERSION < 5.2  then
     formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],"local sequenced = table.sequenced")
 
 else
+    -- somehow can fail:
 
     formatters.add(formatters,"font:name",    [["'"..fontname(%s).."'"]],          { fontname  = helpers.name })
-    formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],{ sequenced = table.sequenced    })
+    formatters.add(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],{ sequenced = table.sequenced })
 
 end
 
@@ -540,10 +541,11 @@ local function presetcontext(name,parent,features) -- will go to con and shared
         for p in gmatch(parent,"[^, ]+") do
             local s = setups[p]
             if s then
-                for k,v in next, s do
-                    if features[k] == nil then
+                for k, v in next, s do
+-- no, as then we cannot overload: e.g. math,mathextra
+--                     if features[k] == nil then
                         features[k] = v
-                    end
+--                     end
                 end
             else
                 -- just ignore an undefined one .. i.e. we can refer to not yet defined
@@ -1093,7 +1095,7 @@ do  -- else too many locals
         local scaledfontmode  = scaninteger() -- \scaledfontmode
 
         if trace_defining then
-            report_defining("start stage two: %s (size %s)",str,size)
+            report_defining("start stage two: %s, size %s, features %a & %a",str,size,classfeatures,fontfeatures)
         end
         -- name is now resolved and size is scaled cf sa/mo
         local lookup, name, sub, method, detail = getspecification(str or "")
diff --git a/tex/context/base/mkiv/font-pre.mkiv b/tex/context/base/mkiv/font-pre.mkiv
index 732a9e6fb..d3a4d5584 100644
--- a/tex/context/base/mkiv/font-pre.mkiv
+++ b/tex/context/base/mkiv/font-pre.mkiv
@@ -252,6 +252,7 @@
    mathnolimitsmode={0,800}, % this looks okay on the average font
    mathalternates=yes,
    mathitalics=yes, % we pass them
+   mathdimensions=all,
  % mathgaps=yes,
    language=dflt,
    script=math]
diff --git a/tex/context/base/mkiv/font-sel.mkvi b/tex/context/base/mkiv/font-sel.mkvi
index 83b7a6b25..a78742928 100644
--- a/tex/context/base/mkiv/font-sel.mkvi
+++ b/tex/context/base/mkiv/font-sel.mkvi
@@ -176,7 +176,7 @@
 %D The \tex{definefontfamily} creates like \tex{definetypeface} a collection of font
 %D with different styles which can be later called with the \tex{setupbodyfont} command.
 %D
-%D The command takes three mendatory commands which are (a) the name of the fontclass,
+%D The command takes three mandatory commands which are (a) the name of the fontclass,
 %D (b) the styles of the font and (c) the name of the font.
 %D
 %D \starttyping
@@ -290,4 +290,4 @@
        \s!rscale=\selectfontparameter\c!scale,
         \c!scale=1]
 
-\protect
\ No newline at end of file
+\protect
diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua
index c36f629c5..b4c8be7b1 100644
--- a/tex/context/base/mkiv/lpdf-ini.lua
+++ b/tex/context/base/mkiv/lpdf-ini.lua
@@ -1188,23 +1188,13 @@ end
 
 do
 
- -- local f_actual_text_one   = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ %s EMC ET"]
- -- local f_actual_text_two   = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ %s EMC ET"]
- -- local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ "]
- -- local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ "]
- -- local f_actual_text_b     = formatters["BT /Span << /ActualText <feff%s> >> BDC [<feff>] TJ "]
- -- local s_actual_text_e     = "EMC ET"
- -- local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> BDC [<feff>] TJ "]
- -- local s_actual_text_e_not = "EMC"
- -- local f_actual_text       = formatters["/Span <</ActualText %s >> BDC"]
-
-    local f_actual_text_one   = formatters["BT /Span << /ActualText <feff%04x> >> %s EMC ET"]
-    local f_actual_text_two   = formatters["BT /Span << /ActualText <feff%04x%04x> >> %s EMC ET"]
-    local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> "]
-    local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> "]
-    local f_actual_text_b     = formatters["BT /Span << /ActualText <feff%s> >> "]
+    local f_actual_text_one   = formatters["BT /Span << /ActualText <feff%04x> >> BDC %s EMC ET"]
+    local f_actual_text_two   = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC %s EMC ET"]
+    local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> BDC"]
+    local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC"]
+    local f_actual_text_b     = formatters["BT /Span << /ActualText <feff%s> >> BDC"]
     local s_actual_text_e     = "EMC ET"
-    local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> "]
+    local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> BDC"]
     local s_actual_text_e_not = "EMC"
     local f_actual_text       = formatters["/Span <</ActualText %s >> BDC"]
 
diff --git a/tex/context/base/mkiv/math-act.lua b/tex/context/base/mkiv/math-act.lua
index 83ea0996b..602c3dc89 100644
--- a/tex/context/base/mkiv/math-act.lua
+++ b/tex/context/base/mkiv/math-act.lua
@@ -301,7 +301,9 @@ function mathematics.overloaddimensions(target,original,set)
     end
 end
 
-sequencers.appendaction("aftercopyingcharacters", "system","mathematics.overloaddimensions")
+-- no, it's a feature now (see good-mth):
+--
+-- sequencers.appendaction("aftercopyingcharacters", "system","mathematics.overloaddimensions")
 
 -- a couple of predefined tweaks:
 
diff --git a/tex/context/base/mkiv/mlib-int.lua b/tex/context/base/mkiv/mlib-int.lua
index 91ac970ba..13124807d 100644
--- a/tex/context/base/mkiv/mlib-int.lua
+++ b/tex/context/base/mkiv/mlib-int.lua
@@ -68,11 +68,11 @@ function mp.NOfPages            () mpprint(getcount("lastpageno"))
 function mp.CurrentColumn       () mpprint(getcount("mofcolumns"))                  end
 function mp.NOfColumns          () mpprint(getcount("nofcolumns"))                  end
 
-function mp.BaseLineSkip        () mpprint(getdimen("baselineskip")        *factor) end
+function mp.BaseLineSkip        () mpprint(get     ("baselineskip").width  *factor) end
 function mp.LineHeight          () mpprint(getdimen("lineheight")          *factor) end
 function mp.BodyFontSize        () mpprint(getdimen("bodyfontsize")        *factor) end
 
-function mp.TopSkip             () mpprint(getdimen("topskip")             *factor) end
+function mp.TopSkip             () mpprint(get     ("topskip").width       *factor) end
 function mp.StrutHeight         () mpprint(getdimen("strutht")             *factor) end
 function mp.StrutDepth          () mpprint(getdimen("strutdp")             *factor) end
 
@@ -80,8 +80,8 @@ function mp.PageNumber          () mpprint(getcount("pageno"))
 function mp.RealPageNumber      () mpprint(getcount("realpageno"))                  end
 function mp.NOfPages            () mpprint(getcount("lastpageno"))                  end
 
-function mp.CurrentWidth        () mpprint(get("hsize")                    *factor) end
-function mp.CurrentHeight       () mpprint(get("vsize")                    *factor) end
+function mp.CurrentWidth        () mpprint(get     ("hsize")               *factor) end
+function mp.CurrentHeight       () mpprint(get     ("vsize")               *factor) end
 
 function mp.EmWidth             () mpprint(emwidths [false]*factor) end
 function mp.ExHeight            () mpprint(exheights[false]*factor) end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 1b3bf27bf..3e2ac5f8c 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 8d45cf09a..f98279189 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-tag.lua b/tex/context/base/mkiv/strc-tag.lua
index 8f2e18978..9d1fec33e 100644
--- a/tex/context/base/mkiv/strc-tag.lua
+++ b/tex/context/base/mkiv/strc-tag.lua
@@ -315,7 +315,7 @@ function tags.start(tag,specification)
             metadata = nil
         end
         local userdata = specification.userdata
-        if user ~= "" and type(userdata) == "string"  then
+        if userdata ~= "" and type(userdata) == "string"  then
             specification.userdata = settings_to_hash(userdata)
         end
         local detail = specification.detail
diff --git a/tex/context/base/mkiv/util-tab.lua b/tex/context/base/mkiv/util-tab.lua
index 9266598db..0ebe1b5b1 100644
--- a/tex/context/base/mkiv/util-tab.lua
+++ b/tex/context/base/mkiv/util-tab.lua
@@ -491,7 +491,7 @@ function table.twowaymapper(t)
         t = { }
     else
         local zero = rawget(t,0)
-        for i=zero or 1,#t do
+        for i=zero and 0 or 1,#t do
             local ti = t[i]       -- t[1]     = "one"
             if ti then
                 local i = tostring(i)
@@ -499,7 +499,6 @@ function table.twowaymapper(t)
                 t[ti]   = i       -- t["one"] = "1"
             end
         end
-        t[""] = zero or ""
     end
  -- setmetatableindex(t,"key")
     setmetatable(t,selfmapper)