2023-05-30 22:24:00

14 files changed, 70 insertions, 15 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 736c98195..8a2516e33 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.30 22:18}
+\newcontextversion{2023.06.01 09:35}
 
 %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 b31c3e50c..c72b946a0 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.30 22:18}
+\edef\contextversion{2023.06.01 09:35}
 
 %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 b2edbb806..a74ceb409 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.30 22:18}
+\newcontextversion{2023.06.01 09:35}
 
 %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 621dbf2fc..29963c6b7 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.30 22:18}
+\edef\contextversion{2023.06.01 09:35}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index d57c686a2..e707527fa 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -220,6 +220,7 @@ return {
         "carryoverlefttopkernclassoptioncode", "carryoverleftbottomkernclassoptioncode", "carryoverrighttopkernclassoptioncode", "carryoverrightbottomkernclassoptioncode",
         "preferdelimiterdimensionsclassoptioncode", "autoinjectclassoptioncode", "removeitaliccorrectionclassoptioncode",
         "operatoritaliccorrectionclassoptioncode", "shortinlineclassoptioncode",
+        "pushnestingclassoptioncode", "popnestingclassoptioncode", "obeynestingclassoptioncode",
         --
         "noligaturingglyphoptioncode", "nokerningglyphoptioncode", "noleftligatureglyphoptioncode",
         "noleftkernglyphoptioncode", "norightligatureglyphoptioncode", "norightkernglyphoptioncode",
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 3523a1762..b4535a94e 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -527,12 +527,14 @@ return {
   "mathbackwardpenalties",
   "mathbeginclass",
   "mathbinary",
+  "mathboundary",
   "mathcheckfencesmode",
   "mathclose",
   "mathdictgroup",
   "mathdictproperties",
   "mathdirection",
   "mathdisplaymode",
+  "mathdisplaypenaltyfactor",
   "mathdisplayskipmode",
   "mathdoublescriptmode",
   "mathendclass",
@@ -544,6 +546,7 @@ return {
   "mathghost",
   "mathgluemode",
   "mathgroupingmode",
+  "mathinlinepenaltyfactor",
   "mathinner",
   "mathleftclass",
   "mathlimitsmode",
@@ -660,6 +663,7 @@ return {
   "shapingpenaltiesmode",
   "shapingpenalty",
   "shortinlinemaththreshold",
+  "shortinlineorphanpenalty",
   "snapshotpar",
   "srule",
   "supmarkmode",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index ea03d6007..e5cc011e5 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 efa1d8a31..617922f2d 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/util-soc-imp-http.lua b/tex/context/base/mkiv/util-soc-imp-http.lua
index ff858b313..dccfc0cf2 100644
--- a/tex/context/base/mkiv/util-soc-imp-http.lua
+++ b/tex/context/base/mkiv/util-soc-imp-http.lua
@@ -200,6 +200,15 @@ function methods.receiveheaders(self)
     return self.try(receiveheaders(self.c))
 end
 
+-- part of request:
+--
+-- Accept-Encoding: gzip
+
+-- part if body:
+--
+-- Content-Encoding: gzip
+-- Vary: Accept-Encoding
+
 function methods.receivebody(self, headers, sink, step)
     if not sink then
         sink = sinknull()
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index fd8513ae7..ca65e70f3 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.30 22:18}
+\newcontextversion{2023.06.01 09:35}
 
 %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 261dd6e8d..a3ace100b 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.30 22:18}
+\immutable\edef\contextversion{2023.06.01 09:35}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/math-ini.mkxl b/tex/context/base/mkxl/math-ini.mkxl
index b8c69b78c..e269ed535 100644
--- a/tex/context/base/mkxl/math-ini.mkxl
+++ b/tex/context/base/mkxl/math-ini.mkxl
@@ -577,6 +577,7 @@
  % +\checkligatureclassoptioncode
    +\checkkernpairclassoptioncode
  % +\flattenclassoptioncode
+   +\obeynestingclassoptioncode
 \relax
 
 \setmathoptions\mathrelationcode\numexpr
@@ -586,6 +587,7 @@
    +\checkkernpairclassoptioncode
  % +\flattenclassoptioncode
  % +\omitpenaltyclassoptioncode
+   +\obeynestingclassoptioncode
 \relax
 
 \setmathoptions\mathopencode\numexpr
@@ -594,6 +596,7 @@
  % +\openfenceclassoptioncode
  % +\checkligatureclassoptioncode
    +\checkkernpairclassoptioncode
+   +\pushnestingclassoptioncode
 \relax
 
 \setmathoptions\mathclosecode\numexpr
@@ -603,6 +606,7 @@
  % +\checkligatureclassoptioncode
    +\checkkernpairclassoptioncode
    +\raiseprimeclassoptioncode
+   +\popnestingclassoptioncode
 \relax
 
 \setmathoptions\mathpunctuationcode\numexpr
@@ -612,6 +616,7 @@
  % +\flattenclassoptioncode
    +\checkkernpairclassoptioncode
    +\removeitaliccorrectionclassoptioncode
+   +\obeynestingclassoptioncode
 \relax
 
 \setmathoptions\mathvariablecode\numexpr
@@ -4666,6 +4671,42 @@
 \permanent\protected\def\mathscriptbelow{\math_axis_inject\plustwo\plusone}
 \permanent\protected\def\mathscriptontop{\math_axis_inject\plustwo\plustwo}
 
+%D \macros{kt}
+%D
+%D Bonus (keep together):
+%D
+%D \startbuffer
+%D test $a + b + c +                    d + x + x + e + f  + g = h$ test
+%D test $a + b + c + \keeptogether{\red d + x + x + e + f} + g = h$ test
+%D \stopbuffer
+%D
+%D \typebuffer
+%D
+%D \startlines \getbuffer \stoplines
+
+\mathinlinepenaltyfactor  = 1500 % a reasonable default
+\mathdisplaypenaltyfactor = 1000
+
+\permanent\tolerant\protected\def\definemathnesting[#1]#*[#2]#*[#3]%
+  {\frozen\protected\edefcsname#1\endcsname{\math_nesting{#2}{#3}}}
+
+\protected\def\math_nesting#1#2%
+  {\groupedcommand
+     {\mathboundary\plustwo
+        \ifconditional\indisplaymath
+          \ifchknum#2\or#2\else\mathdisplaypenaltyfactor\fi
+        \else
+          \ifchknum#1\or#1\else\mathinlinepenaltyfactor\fi
+        \fi
+        \relax}%
+     {\mathboundary\plusone}}
+
+\permanent\tolerant\protected\def\mathnesting[#1]#*[#2]%
+  {\math_nesting{#1}{#2}}
+
+\definemathnesting[mathtogether][1500][1000]
+\definemathnesting[mathloose]    [500][1000]
+
 \protect \endinput
 
 % % not used (yet)
diff --git a/tex/context/base/mkxl/spac-ali.mkxl b/tex/context/base/mkxl/spac-ali.mkxl
index ec8bffbc5..3c13643e9 100644
--- a/tex/context/base/mkxl/spac-ali.mkxl
+++ b/tex/context/base/mkxl/spac-ali.mkxl
@@ -327,7 +327,7 @@
    \parinitleftskip  \zeropoint
    \parinitrightskip \zeropoint
    \parfillleftskip  \zeropoint
-   \parfillrightskip \zeropoint % \s_zero_plus_zero
+   \parfillrightskip \s_zero_plus_zero
    \parindent        \zeropoint
    \relax}
 
@@ -342,7 +342,7 @@
    \parinitleftskip  \zeropoint
    \parinitrightskip \zeropoint
    \parfillleftskip  \zeropoint
-   \parfillrightskip \zeropoint % \s_zero_plus_zero
+   \parfillrightskip \s_zero_plus_zero
    \parindent        \zeropoint
    \relax}
 
@@ -357,7 +357,7 @@
    \parinitleftskip  \zeropoint
    \parinitrightskip \zeropoint
    \parfillleftskip  \zeropoint
-   \parfillrightskip \zeropoint % \s_zero_plus_one_fil
+   \parfillrightskip \s_zero_plus_one_fil
   %\parindent        \parindent
    \relax}
 
@@ -371,7 +371,7 @@
    \parinitleftskip  \zeropoint
    \parinitrightskip \zeropoint
    \parfillleftskip  \zeropoint
-   \parfillrightskip \zeropoint % \s_zero_plus_zero
+   \parfillrightskip \s_zero_plus_zero
    \parindent        \zeropoint
    \relax}
 
@@ -385,7 +385,7 @@
    \parinitleftskip  \zeropoint
    \parinitrightskip \zeropoint
    \parfillleftskip  \zeropoint
-   \parfillrightskip \zeropoint % \s_zero_plus_zero
+   \parfillrightskip \s_zero_plus_zero
    \parindent        \zeropoint
    \relax}
 
@@ -399,7 +399,7 @@
    \parinitleftskip  \zeropoint
    \parinitrightskip \zeropoint
    \parfillleftskip  \zeropoint
-   \parfillrightskip \zeropoint % \s_zero_plus_zero
+   \parfillrightskip \s_zero_plus_zero
   %\parindent        \parindent
    \relax}
 
@@ -414,7 +414,7 @@
    \parinitleftskip  \zeropoint
    \parinitrightskip \zeropoint
    \parfillleftskip  \zeropoint
-   \parfillrightskip \zeropoint % \s_zero_plus_zero
+   \parfillrightskip \s_zero_plus_zero
    \parindent        \zeropoint
    \relax}
 
@@ -818,7 +818,7 @@
 \defcsname\??aligncommand        1*\v!more\endcsname{\toksapp\t_spac_align_collected{\looseness\plusone}}
 \defcsname\??aligncommand        2*\v!more\endcsname{\toksapp\t_spac_align_collected{\looseness\plustwo}}
 
-\defcsname\??aligncommand          \v!fit\endcsname{\toksapp\t_spac_align_collected{\lastlinefit\plusone}}
+\defcsname\??aligncommand          \v!fit\endcsname{\toksapp\t_spac_align_collected{\lastlinefit\plusthousand}}
 
 %defcsname\??aligncommand ...\endcsname{\toksapp\t_spac_align_collected{\nopenalties}}
 %defcsname\??aligncommand ...\endcsname{\toksapp\t_spac_align_collected{\setdefaultpenalties}}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 28412da6d..b6b76bd5b 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-30 22:18
+-- merge date  : 2023-06-01 09:35
 
 do -- begin closure to overcome local limits and interference