2021-12-25 00:57:00

17 files changed, 57 insertions, 18 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 648915909..f0147a089 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{2021.12.24 19:07}
+\newcontextversion{2021.12.25 00:55}
 
 %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 9d4bcc772..6632c422d 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{2021.12.24 19:07}
+\edef\contextversion{2021.12.25 00:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii
index c30105a23..a3e6285ee 100644
--- a/tex/context/base/mkii/mult-cs.mkii
+++ b/tex/context/base/mkii/mult-cs.mkii
@@ -1282,6 +1282,7 @@
 \setinterfaceconstant{tab}{tab}
 \setinterfaceconstant{text}{text}
 \setinterfaceconstant{textalign}{textalign}
+\setinterfaceconstant{textalternative}{textalternative}
 \setinterfaceconstant{textcolor}{barvatextu}
 \setinterfaceconstant{textcommand}{textovyprikaz}
 \setinterfaceconstant{textdistance}{textdistance}
diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii
index 25ba4962e..64ec3af62 100644
--- a/tex/context/base/mkii/mult-it.mkii
+++ b/tex/context/base/mkii/mult-it.mkii
@@ -1282,6 +1282,7 @@
 \setinterfaceconstant{tab}{tab}
 \setinterfaceconstant{text}{testo}
 \setinterfaceconstant{textalign}{textalign}
+\setinterfaceconstant{textalternative}{textalternative}
 \setinterfaceconstant{textcolor}{coloretesto}
 \setinterfaceconstant{textcommand}{comandotesto}
 \setinterfaceconstant{textdistance}{distanzatesto}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 98dbc868f..383351dd3 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{2021.12.24 19:07}
+\newcontextversion{2021.12.25 00:55}
 
 %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 bc37c8aab..3d9e02e03 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -49,7 +49,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.12.24 19:07}
+\edef\contextversion{2021.12.25 00:55}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 64c9917b6..94dd23ff5 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 38d788622..a9934cf42 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-lst.lua b/tex/context/base/mkiv/strc-lst.lua
index a6799d80f..96ad7c8ed 100644
--- a/tex/context/base/mkiv/strc-lst.lua
+++ b/tex/context/base/mkiv/strc-lst.lua
@@ -445,7 +445,8 @@ local function filtercollected(specification)
     elseif not wantedcriterium then
         block = documents.data.block
     else
-        block, criterium = wantedblock, wantedcriterium
+        block     = wantedblock
+        criterium = wantedcriterium
     end
     if block == "" then
         block = false
@@ -468,6 +469,10 @@ local function filtercollected(specification)
     specification.block     = block
     specification.all       = all
     --
+    if specification.atmost then
+        criterium = v_text
+    end
+    --
     if trace_lists then
         report_lists("filtering names %,t, criterium %a, block %a",sortedkeys(names), criterium, block or "*")
     end
@@ -476,6 +481,31 @@ local function filtercollected(specification)
         report_lists("criterium %a, block %a, found %a",specification.criterium, specification.block or "*", #result)
     end
     --
+    local levels = tonumber(specification.levels)
+    if levels then
+        local minlevel  = 1000
+        local found     = result
+        local nofresult = #result
+        for i=1,nofresult do
+            local v = found[i]
+            local l = v.metadata.level or 1
+            if l < minlevel then
+                minlevel = l
+            end
+        end
+        local maxlevel = minlevel + levels - 1
+        result    = { }
+        nofresult = 0
+        for i=1,#found do
+            local v = found[i]
+            local l = v.metadata.level or 1
+            if l >= minlevel and l <= maxlevel then
+                nofresult = nofresult + 1
+                result[nofresult] = v
+            end
+        end
+    end
+    --
     if sortorder then -- experiment
         local sorter = listsorters[sortorder]
         if sorter then
@@ -495,7 +525,7 @@ end
 filters[v_intro] = function(specification)
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     local all       = specification.all
     local names     = specification.names
     for i=1,#collected do
@@ -515,7 +545,7 @@ end
 filters[v_reference] = function(specification)
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     local names     = specification.names
     local sections  = sections.collected
     local reference = specification.reference
@@ -554,7 +584,7 @@ end
 filters[v_all] = function(specification)
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     local block     = specification.block
     local all       = specification.all
     local forced    = specification.forced
@@ -566,7 +596,7 @@ filters[v_all] = function(specification)
         if r and (not block or not r.block or block == r.block) then
             local metadata = v.metadata
             if metadata then
-                local name = metadata.name or false
+                local name  = metadata.name  or false
                 local sectionnumber = (r.section == 0) or sections[r.section]
                 if forced[name] or (sectionnumber and not metadata.nolist and (all or names[name])) then -- and not sectionnumber.hidenumber then
                     nofresult = nofresult + 1
@@ -588,7 +618,7 @@ filters[v_current] = function(specification)
     end
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     local depth     = specification.depth
     local block     = specification.block
     local all       = specification.all
@@ -634,7 +664,7 @@ filters[v_here] = function(specification)
     end
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     local depth     = specification.depth
     local block     = specification.block
     local all       = specification.all
@@ -679,7 +709,7 @@ filters[v_previous] = function(specification)
     end
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     local block     = specification.block
     local all       = specification.all
     local names     = specification.names
@@ -740,7 +770,7 @@ filters[v_component] = function(specification)
     -- special case, no structure yet
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     local all       = specification.all
     local names     = specification.names
     local component = resolvers.jobs.currentcomponent() or ""
@@ -766,7 +796,7 @@ end
 filters[v_default] = function(specification) -- is named
     local collected = specification.collected
     local result    = { }
-    local nofresult = #result
+    local nofresult = 0
     ----- depth     = specification.depth
     local block     = specification.block
     local criterium = specification.criterium
@@ -1111,6 +1141,7 @@ implement {
             { "reference" },
             { "extras" },
             { "order" },
+            { "levels" },
         }
     }
 }
diff --git a/tex/context/base/mkxl/bibl-bib.mkxl b/tex/context/base/mkxl/bibl-bib.mkxl
index 20aea7bb6..cc916b329 100644
--- a/tex/context/base/mkxl/bibl-bib.mkxl
+++ b/tex/context/base/mkxl/bibl-bib.mkxl
@@ -633,6 +633,7 @@
      {}%
      {\namedlistparameter\currentbibtexsession\c!extras}%
      {\namedlistparameter\currentbibtexsession\c!order}%
+     {}%
    \ctxlua{bibtex.hacks.flush("\bibtexpublicationsparameter\c!sorttype")}%
    \stoppacked
    \endgroup}
diff --git a/tex/context/base/mkxl/bibl-tra.mkxl b/tex/context/base/mkxl/bibl-tra.mkxl
index 536de8d31..c84d0878e 100644
--- a/tex/context/base/mkxl/bibl-tra.mkxl
+++ b/tex/context/base/mkxl/bibl-tra.mkxl
@@ -770,6 +770,7 @@
         {}%
         {\listparameter\c!extras}%
         {\listparameter\c!order}}%
+        {}%
    \ctxlua{bibtex.hacks.flush("\@@pbsorttype")}%
    \stoppacked
    \endgroup}
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index b30d8996a..c7b619601 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.12.24 19:07}
+\newcontextversion{2021.12.25 00:55}
 
 %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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 33bb1971a..91db54550 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.12.24 19:07}
+\immutable\edef\contextversion{2021.12.25 00:55}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/strc-lst.mklx b/tex/context/base/mkxl/strc-lst.mklx
index e01441875..e7c1978a9 100644
--- a/tex/context/base/mkxl/strc-lst.mklx
+++ b/tex/context/base/mkxl/strc-lst.mklx
@@ -282,6 +282,7 @@
      {\listparameter\c!reference}%
      {\listparameter\c!extras}%
      {\listparameter\c!order}%
+     {\listparameter\c!levels}%
  % \stoplistreferences
    \par % todo: only when vertical list mode
    \endgroup
@@ -450,7 +451,7 @@
 
 % TODO: pass extra tag name (contents, figures, bibliography ...)
 
-\protected\def\strc_lists_place_current#list#criterium#reference#extras#order% beware, not a user command
+\protected\def\strc_lists_place_current#list#criterium#reference#extras#order#levels% beware, not a user command
   {\dostarttaggedchained\t!list\empty\??list
    \clf_processlist
         names     {#list}
@@ -458,6 +459,7 @@
         reference {#reference}
         extras    {#extras}
         order     {#order}
+        levels    {#levels}
    \relax
    \dostoptagged}
 
diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml
index 4bb31bbb5..75f8fad3f 100644
--- a/tex/context/interface/mkii/keys-cs.xml
+++ b/tex/context/interface/mkii/keys-cs.xml
@@ -1288,6 +1288,7 @@
 		<cd:constant name='tab' value='tab'/>
 		<cd:constant name='text' value='text'/>
 		<cd:constant name='textalign' value='textalign'/>
+		<cd:constant name='textalternative' value='textalternative'/>
 		<cd:constant name='textcolor' value='barvatextu'/>
 		<cd:constant name='textcommand' value='textovyprikaz'/>
 		<cd:constant name='textdistance' value='textdistance'/>
diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml
index 041a4265a..b3e129feb 100644
--- a/tex/context/interface/mkii/keys-it.xml
+++ b/tex/context/interface/mkii/keys-it.xml
@@ -1288,6 +1288,7 @@
 		<cd:constant name='tab' value='tab'/>
 		<cd:constant name='text' value='testo'/>
 		<cd:constant name='textalign' value='textalign'/>
+		<cd:constant name='textalternative' value='textalternative'/>
 		<cd:constant name='textcolor' value='coloretesto'/>
 		<cd:constant name='textcommand' value='comandotesto'/>
 		<cd:constant name='textdistance' value='distanzatesto'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f0cd85039..c42285235 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  : 2021-12-24 19:07
+-- merge date  : 2021-12-25 00:55
 
 do -- begin closure to overcome local limits and interference