diff options
Diffstat (limited to 'tex/context/base/mkxl')
-rw-r--r-- | tex/context/base/mkxl/cont-new.mkxl | 2 | ||||
-rw-r--r-- | tex/context/base/mkxl/context.mkxl | 2 | ||||
-rw-r--r-- | tex/context/base/mkxl/node-ref.lmt | 3 | ||||
-rw-r--r-- | tex/context/base/mkxl/spac-ver.lmt | 2 | ||||
-rw-r--r-- | tex/context/base/mkxl/spac-ver.mkxl | 4 | ||||
-rw-r--r-- | tex/context/base/mkxl/syst-ini.mkxl | 5 | ||||
-rw-r--r-- | tex/context/base/mkxl/typo-adj.lmt | 2 |
7 files changed, 14 insertions, 6 deletions
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index 4e2817bed..8267f0fa8 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{2023.05.28 18:55} +\newcontextversion{2023.05.29 14:13} %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 381453997..9712e28c1 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{2023.05.28 18:55} +\immutable\edef\contextversion{2023.05.29 14:13} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/node-ref.lmt b/tex/context/base/mkxl/node-ref.lmt index 0fb7836da..54e5905ec 100644 --- a/tex/context/base/mkxl/node-ref.lmt +++ b/tex/context/base/mkxl/node-ref.lmt @@ -141,6 +141,9 @@ local implement = interfaces.implement local inject_areas do + -- This one is sensitive for the fourth argument (ns) so I need to add it as option + -- instead. + local function hlist_dimensions(start,stop,parent) local last = stop and getnext(stop) if parent then diff --git a/tex/context/base/mkxl/spac-ver.lmt b/tex/context/base/mkxl/spac-ver.lmt index a2b02c34c..7dd03de9a 100644 --- a/tex/context/base/mkxl/spac-ver.lmt +++ b/tex/context/base/mkxl/spac-ver.lmt @@ -2360,7 +2360,7 @@ do end) local function ignoredepth() - return texgetdimen("ignoredepthcriterium") -- -65536000 + return texgetdimen("ignoredepthcriterion") -- -65536000 end -- A previous version analyzed the number of lines moved to the next page in diff --git a/tex/context/base/mkxl/spac-ver.mkxl b/tex/context/base/mkxl/spac-ver.mkxl index 79718cfb2..52c580f97 100644 --- a/tex/context/base/mkxl/spac-ver.mkxl +++ b/tex/context/base/mkxl/spac-ver.mkxl @@ -1197,14 +1197,14 @@ \pushoverloadmode \overloaded\permanent\protected\def\offinterlineskip % later we will overload this with a push pop - {\baselineskip \ignoredepthcriterium % -\thousandpoint + {\baselineskip \ignoredepthcriterion % -\thousandpoint \lineskip \zeropoint \lineskiplimit\maxdimen % We also need this here now; thanks to taco for figuring that out! \let\minimumlinedistance\zeropoint} \overloaded\permanent\protected\def\nointerlineskip - {\prevdepth\ignoredepthcriterium}% -\thousandpoint + {\prevdepth\ignoredepthcriterion}% -\thousandpoint \aliased\let\normaloffinterlineskip\offinterlineskip % knuth's original diff --git a/tex/context/base/mkxl/syst-ini.mkxl b/tex/context/base/mkxl/syst-ini.mkxl index bcf2bfc69..2537fbe5a 100644 --- a/tex/context/base/mkxl/syst-ini.mkxl +++ b/tex/context/base/mkxl/syst-ini.mkxl @@ -1503,4 +1503,9 @@ \ifdefined\mathpunctuation \else \let\mathpunctuation\mathpunct \fi % fixed in 2.10.06 +%D We keep this for a while (suggested correction by KB): + +\ifdefined\linebreakcriterion \aliased\let\linebreakcriterium \linebreakcriterion \fi +\ifdefined\ignoredepthcriterion \aliased\let\ignoredepthcriterium\ignoredepthcriterion \fi + \protect \endinput diff --git a/tex/context/base/mkxl/typo-adj.lmt b/tex/context/base/mkxl/typo-adj.lmt index d902187e3..204b0e387 100644 --- a/tex/context/base/mkxl/typo-adj.lmt +++ b/tex/context/base/mkxl/typo-adj.lmt @@ -40,7 +40,7 @@ end local function block_baselineskip(head,tail) -- tex.prevdepth = -1000 * 65536 -- ignoredepth - tex.prevdepth = texgetdimen("ignoredepthcriterium") + tex.prevdepth = texgetdimen("ignoredepthcriterion") return head end |