From f9dc65246f5d46583d00db93761929b6c6b5bf20 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 29 May 2023 14:53:42 +0200 Subject: 2023-05-29 14:15:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/mult-prm.lua | 4 ++-- tex/context/base/mkiv/status-files.pdf | Bin 24649 -> 24639 bytes tex/context/base/mkiv/status-lua.pdf | Bin 264536 -> 270724 bytes tex/context/base/mkiv/util-soc-imp-http.lua | 1 + tex/context/base/mkxl/cont-new.mkxl | 2 +- tex/context/base/mkxl/context.mkxl | 2 +- tex/context/base/mkxl/node-ref.lmt | 3 +++ tex/context/base/mkxl/spac-ver.lmt | 2 +- tex/context/base/mkxl/spac-ver.mkxl | 4 ++-- tex/context/base/mkxl/syst-ini.mkxl | 5 +++++ tex/context/base/mkxl/typo-adj.lmt | 2 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 16 files changed, 22 insertions(+), 13 deletions(-) (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index f46b8e473..34c07df79 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{2023.05.28 18:55} +\newcontextversion{2023.05.29 14:13} %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 50f3e71b3..c37563b0c 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{2023.05.28 18:55} +\edef\contextversion{2023.05.29 14:13} %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 6c34ef17a..a3e2d79a8 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{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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index d5f5241b4..df5e61459 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{2023.05.28 18:55} +\edef\contextversion{2023.05.29 14:13} %D Kind of special: diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index 260a61949..3523a1762 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -448,7 +448,7 @@ return { "ifzerofloat", "ifzeronum", "ignorearguments", - "ignoredepthcriterium", + "ignoredepthcriterion", "ignorepars", "immediate", "immutable", @@ -496,7 +496,7 @@ return { "letmathspacing", "letprotected", "lettonothing", - "linebreakcriterium", + "linebreakcriterion", "linedirection", "localbrokenpenalty", "localcontrol", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 852d7997a..e18daff1b 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index 6d9904ad2..02cdf5c3a 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/base/mkiv/util-soc-imp-http.lua b/tex/context/base/mkiv/util-soc-imp-http.lua index d8f45880e..ff858b313 100644 --- a/tex/context/base/mkiv/util-soc-imp-http.lua +++ b/tex/context/base/mkiv/util-soc-imp-http.lua @@ -377,6 +377,7 @@ trequest = function(originalrequest) local code, status = connection:receivestatusline() if not code then connection:receive09body(status, request.sink, request.step) + connection:close() return 1, 200 end while code == 100 do 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 diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 6df432862..a0cde4d80 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 : 2023-05-28 18:55 +-- merge date : 2023-05-29 14:13 do -- begin closure to overcome local limits and interference -- cgit v1.2.3