diff options
| -rw-r--r-- | tex/context/base/mkii/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/mkii/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkxl | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/pack-obj.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 29264 -> 29264 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 256558 -> 256564 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/strc-sec.mkxl | 2 | ||||
| -rw-r--r-- | tex/context/modules/mkiv/s-system-macros.mkxl | 32 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 33 insertions, 14 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index b9725ecb6..419fdb272 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2020.11.06 20:23} +\newcontextversion{2020.11.07 12:43} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index d7c22dbca..dc5e73cbc 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2020.11.06 20:23} +\edef\contextversion{2020.11.07 12:43} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 346d534e2..2ba6f7b00 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.11.06 20:23} +\newcontextversion{2020.11.07 12:43} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index bab10f2c2..ddd924002 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.11.06 20:23} +\edef\contextversion{2020.11.07 12:43} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index 4de6347f5..4bf8e7ad7 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.11.06 20:23} +\edef\contextversion{2020.11.07 12:43} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkiv/pack-obj.lua b/tex/context/base/mkiv/pack-obj.lua index ea36b10de..445085776 100644 --- a/tex/context/base/mkiv/pack-obj.lua +++ b/tex/context/base/mkiv/pack-obj.lua @@ -176,6 +176,7 @@ function objects.restore(ns,id) -- why not just pass a box number here too (ok, number = index, page = getcount("realpageno"), } + -- list is a rule setlink(list,page) end setbox("objectbox",hbox) diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 9889b2d8b..a23f4712b 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 Binary files differindex 6b354d351..c6cbc4ea7 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-sec.mkxl b/tex/context/base/mkiv/strc-sec.mkxl index 445e042b2..21f057e67 100644 --- a/tex/context/base/mkiv/strc-sec.mkxl +++ b/tex/context/base/mkiv/strc-sec.mkxl @@ -1144,7 +1144,7 @@ {\ifconditional\c_strc_sectioning_empty % this needs checking \penalty\plustenthousand - \vskivskip-\lineheight + \vskip-\lineheight \kern\zeropoint \prevdepth\strutdepth \fi} diff --git a/tex/context/modules/mkiv/s-system-macros.mkxl b/tex/context/modules/mkiv/s-system-macros.mkxl index da0b4c2df..e0903f132 100644 --- a/tex/context/modules/mkiv/s-system-macros.mkxl +++ b/tex/context/modules/mkiv/s-system-macros.mkxl @@ -81,12 +81,16 @@ end) require("mtx-interface") - local data = scripts.interface.editor("data") - local files = data and data.common and data.common.filenames or { } - local okay = 0 - local list = tex.hashtokens() + + local data = scripts.interface.editor("data") + local files = data and data.common and data.common.filenames or { } + local flagged = 0 + local total = 0 + local list = tex.hashtokens() + table.sort(list) - local function show(check) + + local function show(visible, check) -- context.starttabulate { "|l|l|l|lj2|l|l|l|l|l|l|l|l|" } context.starttabulate { "|l|l|l|lj2|l|l|l|l|l|l|l|" } for i=1,#list do @@ -120,16 +124,25 @@ ctx_NC() if noaligned then context(noaligned) end ctx_NC() if filename then context(hashnames[filename]) end ctx_NC() ctx_NR() + if visible then + total = total + 1 + if dealtwith then + flagged = flagged + 1 + end + end end end context.stoptabulate() end - show(function(k) return find(k,"^[a-zA-Z]+$") end) + show(true, function(k) return find(k,"^[a-zA-Z]+$") end) context.page() - show(function(k) return not find(k,"^[a-zA-Z]+$") and not find(k,crap) end) + show(false, function(k) return not find(k,"^[a-zA-Z]+$") and not find(k,crap) end) + + tokens.setters.macro("NumberOfVisible", total) + tokens.setters.macro("NumberOfFlagged", flagged) \stopluacode \page @@ -149,6 +162,11 @@ doesn't mean that a user can change it without consequences, for instance the the core of \CONTEXT. Noaligned macros are special and dealt deep down when scanning for alignment specific primitives. +\starttabulate +\BC number of visible macros \NC \NumberOfVisible \NC \NR +\BC number of flagged macros \NC \NumberOfFlagged \NC \NR +\stoptabulate + \stoptext \stopmodule diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index ee65fb152..1928dc8de 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 2020-11-06 20:23 +-- merge date : 2020-11-07 12:43 do -- begin closure to overcome local limits and interference |