2021-08-04 17:50:00

5 files changed, 75 insertions, 54 deletions

diff --git a/tex/context/modules/mkiv/s-fonts-charts.mkiv b/tex/context/modules/mkiv/s-fonts-charts.mkiv
index 3123cc0d0..36fec22f0 100644
--- a/tex/context/modules/mkiv/s-fonts-charts.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-charts.mkiv
@@ -54,6 +54,7 @@
 
 \starttexdefinition unexpanded FontChartSetLegend #1
     \dontleavehmode
+%     \kern .5mm
     \setbox\scratchbox\hbox to 1cm \bgroup
         \infofont\hss#1\hss
     \egroup
@@ -89,7 +90,8 @@
 
         local filename = settings.filename or settings.name or ""
         local fontid   = true
-        local newpage  = settings.page == interfaces.variables.yes
+        local newpage  = settings.page   == interfaces.variables.yes
+        local all      = settings.option == interfaces.variables.all
 
         if filename ~= "" then
             fontid = fonts.definers.internal({ name = filename, size = "10pt" },"chartfont")
@@ -101,7 +103,7 @@
         local chars    = data.characters
 
         for u in table.sortedhash(chars) do
-            if u >= private then
+            if not all and u >= private then
                 break
             else
                 ranges[div(u,0xFF)] = true
@@ -127,6 +129,7 @@
                 context.offinterlineskip()
                 ctx_noslot()
                 for i=0,0xF do
+                    ctx_gap()
                     ctx_setlegend(formatters["%03X"](r*0x10+i))
                 end
                 r = r * 0xFF
@@ -169,7 +172,9 @@
 
 \starttext
 
-    \showfontchart[filename=aegean,page=yes]
+    \showfontchart[filename=texgyredejavu-math.otf,page=yes,option=all]
+
+%     \showfontchart[filename=aegean,page=yes]
 %     \showfontchart[filename=veramono.ttf,page=yes]
 %     \showfontchart[filename=CoelacanthSubhdHeavy.otf,page=yes]
 
diff --git a/tex/context/modules/mkiv/s-fonts-missing.lua b/tex/context/modules/mkiv/s-fonts-missing.lua
index 7db5c2fb8..a8e2ca21a 100644
--- a/tex/context/modules/mkiv/s-fonts-missing.lua
+++ b/tex/context/modules/mkiv/s-fonts-missing.lua
@@ -9,35 +9,53 @@ if not modules then modules = { } end modules ['s-fonts-missing'] = {
 moduledata.fonts         = moduledata.fonts         or { }
 moduledata.fonts.missing = moduledata.fonts.missing or { }
 
-local function legend(id)
-    local privates = fonts.helpers.getprivates(id)
-    if privates then
-        local categories = table.swapped(fonts.loggers.category_to_placeholder)
-        context.starttabulate { "|c|l|" }
+local legend = fonts.loggers.category_to_placeholder and
+
+    function(id)
+        local privates = fonts.helpers.getprivates(id)
+        if privates then
+            local categories = table.swapped(fonts.loggers.category_to_placeholder)
+            context.starttabulate { "|c|l|" }
+                context.HL()
+                context.NC() context.bold("symbol")
+                context.NC() context.bold("name")
+                context.NC() context.NR()
+                context.HL()
+                for k, v in table.sortedhash(privates) do
+                    local tag = characters.categorytags[categories[k]]
+                    if tag and tag ~= "" then
+                        context.NC() context.dontleavehmode() context.char(v)
+                        context.NC() context(k)
+                        context.NC() context.NR()
+                    end
+                end
+                context.HL()
+            context.stoptabulate()
+        end
+    end
+
+or
+
+    function(id)
+        local mapping = fonts.checkers.mapping
+        context.starttabulate { "|c|c|l|l|" }
             context.HL()
-            context.NC()
-            context.bold("symbol")
-            context.NC()
-            context.bold("name")
-            context.NC()
-            context.NR()
+            context.NC() context.bold("symbol")
+            context.NC() context.bold("tag")
+            context.NC() context.bold("name")
+            context.NC() context.NR()
             context.HL()
-            for k, v in table.sortedhash(privates) do
-                local tag = characters.categorytags[categories[k]]
-                if tag and tag ~= "" then
-                    context.NC()
-                    context.dontleavehmode()
-                    context.char(v)
-                    context.NC()
-                    context(k)
-                    context.NC()
-                    context.NR()
-                end
+            for k, v in table.sortedhash(mapping) do
+                local p = fonts.helpers.newprivateslot(v[1] .. "-" .. v[2])
+                fonts.checkers.placeholder(font.current(),p,k)
+                context.NC() context.char(p)
+                context.NC() context(k)
+                context.NC() context(v[1])
+                context.NC() context.NR()
             end
             context.HL()
         context.stoptabulate()
     end
-end
 
 function moduledata.fonts.missing.showlegend(specification)
     specification = interfaces.checkedspecification(specification)
@@ -52,30 +70,20 @@ local function missings()
     for filename, list in table.sortedhash(collected) do
         if #list > 0 then
             context.starttabulate { "|l|l|" }
-                context.NC()
-                context.bold("filename")
-                context.NC()
-                context(file.basename(filename))
-                context.NC()
-                context.NR()
-                context.NC()
-                context.bold("missing")
-                context.NC()
-                context(#list)
-                context.NC()
-                context.NR()
+                context.NC() context.bold("filename")
+                context.NC() context(file.basename(filename))
+                context.NC() context.NR()
+                context.NC() context.bold("missing")
+                context.NC() context(#list)
+                context.NC() context.NR()
             context.stoptabulate()
             context.starttabulate { "|l|c|l|" }
                 for i=1,#list do
                     local u = list[i]
-                    context.NC()
-                    context("%U",u)
-                    context.NC()
-                    context.char(u)
-                    context.NC()
-                    context(characters.data[u].description)
-                    context.NC()
-                    context.NR()
+                    context.NC() context("%U",u)
+                    context.NC() context.char(u)
+                    context.NC() context(characters.data[u].description)
+                    context.NC() context.NR()
                 end
             context.stoptabulate()
         end
diff --git a/tex/context/modules/mkiv/s-fonts-tables.lua b/tex/context/modules/mkiv/s-fonts-tables.lua
index 8673ef398..c9aa7b801 100644
--- a/tex/context/modules/mkiv/s-fonts-tables.lua
+++ b/tex/context/modules/mkiv/s-fonts-tables.lua
@@ -9,6 +9,8 @@ if not modules then modules = { } end modules ['s-fonts-tables'] = {
 moduledata.fonts          = moduledata.fonts        or { }
 moduledata.fonts.tables   = moduledata.fonts.tables or { }
 
+require("font-cft")
+
 local rawget, type = rawget, type
 
 local setmetatableindex   = table.setmetatableindex
diff --git a/tex/context/modules/mkiv/s-present-stepper.mkiv b/tex/context/modules/mkiv/s-present-stepper.mkiv
index c2f3c018a..3f5918d5b 100644
--- a/tex/context/modules/mkiv/s-present-stepper.mkiv
+++ b/tex/context/modules/mkiv/s-present-stepper.mkiv
@@ -13,9 +13,11 @@
 
 %D Optima
 
+% \overloadmode\zerocount % for now (me)
+
 \startmodule[present-stepper]
 
-\usemodule[pre-60]
+\usemodule[present-stepwise]
 
 \doifmodeelse {atpragma,asintended} {
     \usetypescriptfile[ghz]
@@ -74,12 +76,12 @@
    frame=off]
 
 \startinteractionmenu[bottom]
-  \but [firstpage]               \symbol[firstpage]      \\
-  \but [previouspage]            \symbol[previouspage]   \\
-  \but [InvokeStepper] \StartBusy\symbol[PauseRendering]\StopBusy \\
-  \but [nextpage]                \symbol[nextpage]       \\
-  \but [lastpage]                \symbol[lastpage]       \\
-  \but [CloseDocument]           \symbol[CloseDocument]  \\
+  \startbut [firstpage]               \symbol[firstpage]      \stopbut
+  \startbut [previouspage]            \symbol[previouspage]   \stopbut
+  \startbut [InvokeStepper] \StartBusy\symbol[PauseRendering]\StopBusy \stopbut
+  \startbut [nextpage]                \symbol[nextpage]       \stopbut
+  \startbut [lastpage]                \symbol[lastpage]       \stopbut
+  \startbut [CloseDocument]           \symbol[CloseDocument]  \stopbut
 \stopinteractionmenu
 
 % maybe in colo-sjk : \setupcolor[sjk]
@@ -189,7 +191,7 @@
   {\setups[fonts:normalize]
    \resetsetups[fonts:normalize]
    \startstandardmakeup[headerstate=high]
-     \enforced\protected\def\\{\enforced\protected\def\\{\endgraf\quad\quad}\endgraf\quad\ignorespaces#2}%
+     \protected\def\\{\protected\def\\{\endgraf\quad\quad}\endgraf\quad\ignorespaces#2}%
      #1\setstrut\setupinterlinespace\vfil#3\vfil\vfil
    \stopstandardmakeup}
 
diff --git a/tex/context/modules/mkiv/s-present-steps.mkiv b/tex/context/modules/mkiv/s-present-steps.mkiv
index 432650a5e..c588a0d16 100644
--- a/tex/context/modules/mkiv/s-present-steps.mkiv
+++ b/tex/context/modules/mkiv/s-present-steps.mkiv
@@ -16,6 +16,8 @@
 
 \startmodule[present-steps]
 
+\pushoverloadmode
+
 \startluacode
 
 moduledata.steps = moduledata.steps or { }
@@ -168,6 +170,8 @@ end
    \fi
    \ctxlua{moduledata.steps.stopsubstep()}}
 
+\popoverloadmode
+
 \stopmodule
 
 \continueifinputfile{s-present-steps.mkiv}