beta 2014.04.15 09:51

14 files changed, 97 insertions, 28 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 104973b46..845147ccf 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2014.04.07 13:00}
+\newcontextversion{2014.04.15 09: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 e76e28122..cce0f4d2c 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 058d99f98..f75fc118c 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.04.07 13:00}
+\edef\contextversion{2014.04.15 09:51}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/core-ini.mkiv b/tex/context/base/core-ini.mkiv
index 1682bed1b..711c43f94 100644
--- a/tex/context/base/core-ini.mkiv
+++ b/tex/context/base/core-ini.mkiv
@@ -58,14 +58,21 @@
 \newtoks \everyforgetall
 \newtoks \everycleanupfeatures
 \newtoks \everysimplifycommands
+\newtoks \everypreroll
 
 \let\simplifiedcommands\everysimplifycommands % backward compatible, will stay as it's used in styles
 
+\newconditional\simplifyingcommands % public
+
 \unexpanded\def\forgetall       {\the\everyforgetall}
 \unexpanded\def\cleanupfeatures {\the\everycleanupfeatures}
 \unexpanded\def\simplifycommands{\the\everysimplifycommands}
 
 \appendtoks
+    \settrue\simplifyingcommands
+\to \everysimplifycommands
+
+\appendtoks
     \everypar\emptytoks % pretty important
 \to \everyforgetall
 
diff --git a/tex/context/base/mlib-ctx.lua b/tex/context/base/mlib-ctx.lua
index a1a4e645a..fe5218771 100644
--- a/tex/context/base/mlib-ctx.lua
+++ b/tex/context/base/mlib-ctx.lua
@@ -146,9 +146,11 @@ statistics.register("metapost processing time", function()
         local nofconverted = metapost.makempy.nofconverted
         local elapsedtime = statistics.elapsedtime
         local elapsed = statistics.elapsed
-        local str = format("%s seconds, loading: %s, execution: %s, n: %s, average: %s",
+        local instances, memory = metapost.getstatistics(true)
+        local str = format("%s seconds, loading: %s, execution: %s, n: %s, average: %s, instances: %i, memory: %0.3f M",
             elapsedtime(metapost), elapsedtime(mplib), elapsedtime(metapost.exectime), n,
-            elapsedtime((elapsed(metapost) + elapsed(mplib) + elapsed(metapost.exectime)) / n))
+            elapsedtime((elapsed(metapost) + elapsed(mplib) + elapsed(metapost.exectime)) / n),
+            instances, memory/(1024*1024))
         if nofconverted > 0 then
             return format("%s, external: %s (%s calls)",
                 str, elapsedtime(metapost.makempy), nofconverted)
diff --git a/tex/context/base/mlib-run.lua b/tex/context/base/mlib-run.lua
index f30ed0c9f..19af4fbdd 100644
--- a/tex/context/base/mlib-run.lua
+++ b/tex/context/base/mlib-run.lua
@@ -121,7 +121,7 @@ local function o_finder(name,mode,ftype)
     return name
 end
 
-local function finder(name, mode, ftype)
+local function finder(name,mode,ftype)
     if mode == "w" then
         return o_finder(name,mode,ftype)
     else
@@ -295,8 +295,9 @@ else
     local methods = {
         double  = "double",
         scaled  = "scaled",
+        binary  = "binary",
+        decimal = "decimal",
         default = "scaled",
-        decimal = false, -- for the moment
     }
 
     function metapost.load(name,method)
@@ -306,6 +307,7 @@ else
             ini_version = true,
             find_file   = finder,
             math_mode   = method,
+
         }
         report_metapost("initializing number mode %a",method)
         local result
@@ -625,3 +627,20 @@ function metapost.quickanddirty(mpxformat,data)
         report_metapost("invalid quick and dirty run")
     end
 end
+
+function metapost.getstatistics(memonly)
+    if memonly then
+        local n, m = 0, 0
+        for name, mpx in next, mpxformats do
+            n = n + 1
+            m = m + mpx:statistics().memory
+        end
+        return n, m
+    else
+        local t = { }
+        for name, mpx in next, mpxformats do
+            t[name] = mpx:statistics()
+        end
+        return t
+    end
+end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 144e7cbc6..2fa0a20ca 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 2a573e315..60b31aff2 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi
index 48ef6b631..60ab66c98 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -760,7 +760,9 @@
 
 %appendtoks \notesenabledfalse \to \everymarking
 \appendtoks \notesenabledfalse \to \everybeforepagebody
-\appendtoks \notesenabledfalse \to \everystructurelist % quick hack
+\appendtoks \notesenabledfalse \to \everystructurelist    % quick hack
+\appendtoks \notesenabledfalse \to \everysimplifycommands % quick hack
+\appendtoks \notesenabledfalse \to \everypreroll          % quick hack
 
 %D Often we need to process the whole set of notes and to make that
 %D fast, we use a token register:
@@ -1784,19 +1786,19 @@
   {\dodoubleempty\strc_notes_symbol}
 
 \def\strc_notes_symbol[#tag][#reference]%
-  {\dontleavehmode
-   \begingroup
-   \edef\currentnote{#tag}%
-   \usenotestyleandcolor\c!textstyle\c!textcolor
-   \ifnotesenabled
+  {\ifnotesenabled
+     \dontleavehmode
+     \begingroup
+     \edef\currentnote{#tag}%
+     \usenotestyleandcolor\c!textstyle\c!textcolor
      \ifsecondargument
        \unskip
        \noteparameter\c!textcommand{\in[#reference]}% command here?
      \else
        \noteparameter\c!textcommand\lastnotesymbol % check if command double
      \fi
-   \fi
-   \endgroup}
+     \endgroup
+   \fi}
 
 \unexpanded\def\note
   {\dodoubleempty\strc_notes_note}
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv
index d55b80574..122892104 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/strc-sec.mkiv
@@ -103,8 +103,11 @@
   {\setfalse\c_strc_bookmarks_preroll}
 
 \def\strc_sectioning_autobookmark#1%
-  {\nodestostring\tempstring{#1}%
-   \globallet\currentstructurebookmark\tempstring}
+  {\begingroup
+   \the\everypreroll
+   \nodestostring\tempstring{#1}%
+   \globallet\currentstructurebookmark\tempstring
+   \endgroup}
 
 % so it's an experiment
 
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv
index 42c61f16c..3734e5647 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -1500,7 +1500,6 @@
      \fi
    \fi}
 
-
 \def\tabl_ntb_check_heights_one
   {\dorecurse\c_tabl_ntb_maximum_row
      {\c_tabl_ntb_current_row_three\recurselevel\relax
diff --git a/tex/context/base/tabl-xtb.lua b/tex/context/base/tabl-xtb.lua
index d18719a89..d9daefe69 100644
--- a/tex/context/base/tabl-xtb.lua
+++ b/tex/context/base/tabl-xtb.lua
@@ -572,8 +572,8 @@ function xtables.reflow_height()
         local total = totalheight + totaldepth
         local leftover = settings.textheight - total
         if leftover > 0 then
-            local leftheight = (totalheight / total ) * leftover / #heights
-            local leftdepth  = (totaldepth  / total ) * leftover / #depths
+            local leftheight = (totalheight / total) * leftover / #heights
+            local leftdepth  = (totaldepth  / total) * leftover / #depths
             for i=1,nofrows do
                 heights[i] = heights[i] + leftheight
                 depths [i] = depths [i] + leftdepth
diff --git a/tex/context/base/trac-vis.lua b/tex/context/base/trac-vis.lua
index 7e2413051..eb5373ee3 100644
--- a/tex/context/base/trac-vis.lua
+++ b/tex/context/base/trac-vis.lua
@@ -32,6 +32,7 @@ local formatters = string.formatters
 -- todo: global switch (so no attributes)
 -- todo: maybe also xoffset, yoffset of glyph
 -- todo: inline concat (more efficient)
+-- todo: tags can also be numbers (just add to hash)
 
 local nodecodes           = nodes.nodecodes
 local disc_code           = nodecodes.disc
@@ -43,6 +44,7 @@ local glue_code           = nodecodes.glue
 local penalty_code        = nodecodes.penalty
 local whatsit_code        = nodecodes.whatsit
 local user_code           = nodecodes.user
+local math_code           = nodecodes.math
 local gluespec_code       = nodecodes.gluespec
 
 local kerncodes           = nodes.kerncodes
@@ -58,6 +60,7 @@ local leftskip_code       = gluecodes.leftskip
 local rightskip_code      = gluecodes.rightskip
 
 local whatsitcodes        = nodes.whatsitcodes
+local mathcodes           = nodes.mathcodes
 
 local nuts                = nodes.nuts
 local tonut               = nuts.tonut
@@ -140,6 +143,7 @@ local trace_fontkern
 local trace_strut
 local trace_whatsit
 local trace_user
+local trace_math
 
 local report_visualize = logs.reporter("visualize")
 
@@ -159,21 +163,22 @@ local modes = {
     simplevbox = 1024 + 2,
     simplevtop = 1024 + 4,
     user       = 2048,
+    math       = 4096,
 }
 
 local modes_makeup = { "hbox", "vbox", "kern", "glue", "penalty" }
 local modes_boxes  = { "hbox", "vbox"  }
-local modes_all    = { "hbox", "vbox", "kern", "glue", "penalty", "fontkern", "whatsit", "glyph", "user" }
+local modes_all    = { "hbox", "vbox", "kern", "glue", "penalty", "fontkern", "whatsit", "glyph", "user", "math" }
 
 local usedfont, exheight, emwidth
-local l_penalty, l_glue, l_kern, l_fontkern, l_hbox, l_vbox, l_vtop, l_strut, l_whatsit, l_glyph, l_user
+local l_penalty, l_glue, l_kern, l_fontkern, l_hbox, l_vbox, l_vtop, l_strut, l_whatsit, l_glyph, l_user, l_math
 
 local enabled = false
 local layers  = { }
 
 local preset_boxes  = modes.hbox + modes.vbox
 local preset_makeup = preset_boxes + modes.kern + modes.glue + modes.penalty
-local preset_all    = preset_makeup + modes.fontkern + modes.whatsit + modes.glyph + modes.user
+local preset_all    = preset_makeup + modes.fontkern + modes.whatsit + modes.glyph + modes.user + modes.math
 
 function visualizers.setfont(id)
     usedfont = id or current_font()
@@ -210,6 +215,7 @@ local function enable()
     l_whatsit  = layers.whatsit
     l_glyph    = layers.glyph
     l_user     = layers.user
+    l_math     = layers.math
     nodes.tasks.enableaction("shipouts","nodes.visualizers.handler")
     report_visualize("enabled")
     enabled = true
@@ -303,6 +309,7 @@ local c_skip_a     = "trace:c"
 local c_skip_b     = "trace:m"
 local c_glyph      = "trace:o"
 local c_white      = "trace:w"
+local c_math       = "trace:r"
 
 local c_positive_d = "trace:db"
 local c_negative_d = "trace:dr"
@@ -313,6 +320,7 @@ local c_skip_a_d   = "trace:dc"
 local c_skip_b_d   = "trace:dm"
 local c_glyph_d    = "trace:do"
 local c_white_d    = "trace:dw"
+local c_math_d     = "trace:dr"
 
 local function sometext(str,layer,color,textcolor) -- we can just paste verbatim together .. no typesteting needed
     local text = fast_hpack_string(str,usedfont)
@@ -371,8 +379,7 @@ local function fontkern(head,current)
 end
 
 local w_cache = { }
-
-local tags = {
+local tags    = {
     open           = "FIC",
     write          = "FIW",
     close          = "FIC",
@@ -419,15 +426,38 @@ local function whatsit(head,current)
     return head, current
 end
 
+local u_cache = { }
+
 local function user(head,current)
     local what = getsubtype(current)
-    local info = w_cache[what]
+    local info = u_cache[what]
     if info then
         -- print("hit user")
     else
         info = sometext(formatters["U:%s"](what),usedfont)
         setattr(info,a_layer,l_user)
-        w_cache[what] = info
+        u_cache[what] = info
+    end
+    head, current = insert_node_after(head,current,copy_list(info))
+    return head, current
+end
+
+local m_cache = { }
+local tags    = {
+    beginmath = "B",
+    endmath   = "E",
+}
+
+local function math(head,current)
+    local what = getsubtype(current)
+    local info = m_cache[what]
+    if info then
+        -- print("hit math")
+    else
+        local tag = mathcodes[what]
+        info = sometext(formatters["M:%s"](tag and tags[tag] or what),usedfont,nil,c_math_d)
+        setattr(info,a_layer,l_math)
+        m_cache[what] = info
     end
     head, current = insert_node_after(head,current,copy_list(info))
     return head, current
@@ -723,6 +753,7 @@ local function visualize(head,vertical)
     local trace_glyph    = false
     local trace_simple   = false
     local trace_user     = false
+    local trace_math     = false
     local current        = head
     local previous       = nil
     local attr           = unsetvalue
@@ -745,6 +776,7 @@ local function visualize(head,vertical)
                 trace_glyph    = false
                 trace_simple   = false
                 trace_user     = false
+                trace_math     = false
             else -- dead slow:
                 trace_hbox     = hasbit(a,   1)
                 trace_vbox     = hasbit(a,   2)
@@ -758,6 +790,7 @@ local function visualize(head,vertical)
                 trace_glyph    = hasbit(a, 512)
                 trace_simple   = hasbit(a,1024)
                 trace_user     = hasbit(a,2048)
+                trace_math     = hasbit(a,4096)
             end
             attr = a
         end
@@ -832,9 +865,13 @@ local function visualize(head,vertical)
                 head, current = whatsit(head,current)
             end
         elseif id == user_code then
-            if trace_whatsit then
+            if trace_user then
                 head, current = user(head,current)
             end
+        elseif id == math_code then
+            if trace_math then
+                head, current = math(head,current)
+            end
         end
         previous = current
         current  = getnext(current)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 466e7b1a4..d4311b238 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 04/07/14 13:00:17
+-- merge date  : 04/15/14 09:51:32
 
 do -- begin closure to overcome local limits and interference