12 files changed, 41 insertions, 13 deletions
diff --git a/tex/context/base/mkiv/char-def.lua b/tex/context/base/mkiv/char-def.lua
index 276d0f700..1aea51318 100644
--- a/tex/context/base/mkiv/char-def.lua
+++ b/tex/context/base/mkiv/char-def.lua
@@ -64045,6 +64045,7 @@ characters.data={
   linebreak="cm",
   mathclass="topaccent",
   mathname="vec",
+  mathstretch="h",
   synonyms={ "vector" },
   unicodeslot=0x20D7,
  },
diff --git a/tex/context/base/mkiv/colo-ini.lua b/tex/context/base/mkiv/colo-ini.lua
index 5bfe4635c..de319be46 100644
--- a/tex/context/base/mkiv/colo-ini.lua
+++ b/tex/context/base/mkiv/colo-ini.lua
@@ -43,6 +43,7 @@ local texsetattribute     = tex.setattribute
 local texgetattribute     = tex.getattribute
 local texgetcount         = tex.getcount
 local texgettoks          = tex.gettoks
+local texiscount          = tex.iscount
 local texgetmacro         = tokens.getters.macro
 
 local a_color             = attributes.private('color')
@@ -82,8 +83,19 @@ local function synccolorclone(name,clone)
     valid[name] = clone
 end
 
-local function synccolorcount(name,n)
-    counts[name] = n
+local synccolorcount  if CONTEXTLMTXMODE > 0 then
+--     local prefix = texgetmacro("??colornumber")
+--     for k, v in next, counts do
+--         counts[k] = texiscount(prefix..k)
+--         print(k,v,counts[k])
+--     end
+    synccolorcount = function(name,n)
+        counts[name] = texiscount(n)
+    end
+else
+    synccolorcount = function(name,n)
+        counts[name] = n
+    end
 end
 
 local stack = { }
@@ -1139,7 +1151,7 @@ local setcolormodel = colors.setmodel
 implement {
     name      = "synccolorcount",
     actions   = synccolorcount,
-    arguments = { "string", "integer" }
+    arguments = { "string", CONTEXTLMTXMODE > 0 and "string" or "integer" }
 }
 
 implement {
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index ac24c71a5..e8c7f0e07 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{2022.12.15 17:49}
+\newcontextversion{2022.12.21 17:10}
 
 %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 2e915c2a4..6d7353656 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{2022.12.15 17:49}
+\edef\contextversion{2022.12.21 17:10}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua
index 6ed0c04d1..f0f8e50cf 100644
--- a/tex/context/base/mkiv/font-dsp.lua
+++ b/tex/context/base/mkiv/font-dsp.lua
@@ -378,7 +378,7 @@ local function getaxisscale(segments,minimum,default,maximum,user)
     for i=1,#segments do
         local s = segments[i]
         if type(s) ~= "number" then
-            report("using default axis scale")
+         -- report("using default axis scale")
             return default
         elseif s[1] >= default then
             if s[2] == default then
@@ -3843,7 +3843,7 @@ function readers.hvar(f,fontdata,specification)
     end
     local tableoffset = gotodatatable(f,fontdata,"hvar",specification.variable)
     if not tableoffset then
-        report("no hvar table, expect problems due to messy widths")
+     -- report("no hvar table, expect problems due to messy widths")
         return
     end
 
diff --git a/tex/context/base/mkiv/meta-imp-dum.mkiv b/tex/context/base/mkiv/meta-imp-dum.mkiv
index 74a2de875..50a07f415 100644
--- a/tex/context/base/mkiv/meta-imp-dum.mkiv
+++ b/tex/context/base/mkiv/meta-imp-dum.mkiv
@@ -98,7 +98,7 @@
   [placeholder]
   [1=red,2=green,3=blue,4=cyan,5=magenta,6=yellow]
 
-\newcount\c_grph_replacement_n
+\newinteger\c_grph_replacement_n
 
 \setupexternalfigures
   [\c!reduction=0,
@@ -111,8 +111,8 @@
 %    \setuppalet[placeholder]%
    \getpaletsize[placeholder]%
    \ifnum\c_grph_replacement_n=\zerocount
-     \getrandomnumber \m_grph_replacement_n\plusone\paletsize
-     \global\c_grph_replacement_n \m_grph_replacement_n\relax
+     \getrandomnumber\m_grph_replacement_n\plusone\paletsize
+     \global\c_grph_replacement_n\m_grph_replacement_n\relax
    \else
      \global\advance\c_grph_replacement_n\plusone
    \fi
diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index 6a6c41a4c..87e325c41 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -19193,6 +19193,9 @@ return {
    ["pe"]="متن",
    ["ro"]="text",
   },
+  ["textdisplay"]={
+   ["en"]="textdisplay",
+  },
   ["textnote"]={
    ["en"]="textnote",
    ["fr"]="notetexte",
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index d213bf7d7..ac4ce2e91 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -14,7 +14,7 @@ return {
         "zerocount", "minusone", "minustwo", "plusone", "plustwo", "plusthree", "plusfour", "plusfive",
         "plussix", "plusseven", "pluseight", "plusnine", "plusten", "pluseleven", "plustwelve", "plussixteen",
         "plusfifty", "plushundred", "plusonehundred", "plustwohundred", "plusfivehundred",
-        "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone",
+        "plusthousand", "plustenthousand", "plustwentythousand", "medcard", "maxcard", "maxcardminusone", "maxiterator",
         "zeropoint", "onepoint", "halfapoint", "onebasepoint", "maxcount", "maxdimen", "scaledpoint", "thousandpoint",
         "points", "halfpoint",
         "zeroskip", "centeringskip", "stretchingskip", "shrinkingskip",
@@ -262,6 +262,9 @@ return {
         "newcount", "newdimen", "newskip", "newmuskip", "newbox", "newtoks", "newread", "newwrite", "newmarks", "newinsert", "newattribute", "newif",
         "newlanguage", "newfamily", "newfam", "newhelp", -- not used
         --
+        "newinteger", "newdimension", "newgluespec", "newmugluespec",
+        "aliasinteger", "aliasdimension",
+        --
         "then",
         "begcsname",
         --
@@ -307,8 +310,8 @@ return {
         --
         "ruledhss", "ruledhfil", "ruledhfill", "ruledhfilll", "ruledhfilneg", "ruledhfillneg", "normalhfillneg",  "normalhfilllneg",
         "ruledvss", "ruledvfil", "ruledvfill", "ruledvfilll", "ruledvfilneg", "ruledvfillneg", "normalvfillneg",  "normalvfilllneg",
-        "ruledhbox", "ruledvbox", "ruledvtop", "ruledvcenter", "ruledmbox",
-        "ruledhpack", "ruledvpack", "ruledtpack",
+        "ruledhbox", "ruledvbox", "ruledvtop", "ruleddbox", "ruledvcenter", "ruledmbox",
+        "ruledhpack", "ruledvpack", "ruledtpack", "ruleddpack",
         "ruledhskip", "ruledvskip", "ruledkern", "ruledmskip", "ruledmkern",
         "ruledhglue", "ruledvglue", "normalhglue", "normalvglue",
         "ruledpenalty",
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 2a73d765b..8285b26be 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -315,11 +315,13 @@ return {
   "currentloopiterator",
   "currentloopnesting",
   "currentmarks",
+  "dbox",
   "defcsname",
   "detokenized",
   "dimensiondef",
   "dimexpression",
   "directlua",
+  "dpack",
   "edefcsname",
   "efcode",
   "endlocalcontrol",
@@ -796,6 +798,7 @@ return {
   "accent",
   "adjdemerits",
   "advance",
+  "advanceby",
   "afterassignment",
   "aftergroup",
   "atop",
@@ -840,6 +843,7 @@ return {
   "displaywidowpenalty",
   "displaywidth",
   "divide",
+  "divideby",
   "doublehyphendemerits",
   "dp",
   "dump",
@@ -968,6 +972,7 @@ return {
   "moveright",
   "mskip",
   "multiply",
+  "multiplyby",
   "muskip",
   "muskipdef",
   "newlinechar",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 8f7009b07..fe10b5bff 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 36e22cc39..bd12d076b 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv
index dd3e7c822..ae1978eb6 100644
--- a/tex/context/base/mkiv/syst-ini.mkiv
+++ b/tex/context/base/mkiv/syst-ini.mkiv
@@ -1257,4 +1257,8 @@
     \newcount\autoparagraphmode
 \fi
 
+\let\advanceby \advance
+\let\multiplyby\multiply
+\let\divideby  \divide
+
 \protect \endinput