11 files changed, 39 insertions, 44 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index bd9a2e71a..523e792c6 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{2020.09.18 20:28}
+\newcontextversion{2020.09.20 22:59}
 
 %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 02f157eb2..5588e40d7 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{2020.09.18 20:28}
+\edef\contextversion{2020.09.20 22:59}
 
 %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 29fd6f332..ca98de02e 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{2020.09.18 20:28}
+\newcontextversion{2020.09.20 22:59}
 
 %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 ce1458089..45f52a9c5 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.09.18 20:28}
+\edef\contextversion{2020.09.20 22:59}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index ef58cc903..dcf733d2e 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.09.18 20:28}
+\edef\contextversion{2020.09.20 22:59}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/hand-ini.mkxl b/tex/context/base/mkiv/hand-ini.mkxl
index ca6922ddd..9c291fed8 100644
--- a/tex/context/base/mkiv/hand-ini.mkxl
+++ b/tex/context/base/mkiv/hand-ini.mkxl
@@ -92,7 +92,7 @@
        \adjustspacingshrink \expansionparameter\c!shrink\relax}%
 \to \everydefineexpansion
 
-\defineexpansion
+\setupexpansion
   [\c!step=1,
    \c!stretch=40,
    \c!shrink=20]
diff --git a/tex/context/base/mkiv/pack-com.mkiv b/tex/context/base/mkiv/pack-com.mkiv
index b806361df..17675fa7a 100644
--- a/tex/context/base/mkiv/pack-com.mkiv
+++ b/tex/context/base/mkiv/pack-com.mkiv
@@ -517,7 +517,7 @@
 \installcorenamespace{combinationcaption}
 
 \def\pack_combinations_save_caption
-  {\ifdim\htdp\b_pack_combinations_caption>\zeropoint
+  {\ifdim\htdp\b_pack_combinations_caption>\d_pack_combinations_ht
      \global\d_pack_combinations_ht\htdp\b_pack_combinations_caption
    \fi
    \savebox{\??combinationcaption:\number\c_pack_combinations_nesting}{\number\c_pack_combinations_x}{\box\b_pack_combinations_caption}}
@@ -536,7 +536,10 @@
    \crcr}
 
 \def\pack_combinations_flush_captions_yes
-  {\foundbox{\??combinationcaption:\number\c_pack_combinations_nesting}{\number\c_pack_combinations_x}%
+  {\vpack to \d_pack_combinations_ht\bgroup
+     \foundbox{\??combinationcaption:\number\c_pack_combinations_nesting}{\number\c_pack_combinations_x}%
+     \vss
+   \egroup
    \global\advance\c_pack_combinations_x\minusone
    \ifnum\c_pack_combinations_x>\zerocount % \c_pack_combinations_max
      \expandafter\pack_combinations_flush_captions_yes_followup
@@ -545,6 +548,7 @@
      \initializeboxstack{\??combinationcaption:\number-\c_pack_combinations_nesting}%
    \fi}
 
+
 \let\pack_combinations_flush_captions_nop\donothing
 
 \def\pack_combinations_flush_captions_yes_followup
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 1d6c21209..d3e36d330 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 a88eadca5..e449f1238 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-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index b1b119dc1..f29cb38ba 100644
--- a/tex/context/base/mkiv/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
@@ -929,31 +929,6 @@
 \letvalue{\??notepenalty\v!verystrict}\notepenaltyverystrict
 \letvalue{\??notepenalty             }\notepenaltytolerant
 
-% \def\strc_notes_set_width
-%   {\edef\p_width{\noteparameter\c!width}%
-%    \ifx\p_width\empty
-%      \setnoteparameter\c!width{\hsize}%
-%    \fi}
-
-\setupnotes
-  [\c!width=\v!auto]
-
-\def\strc_notes_set_width
-  {\ifinsidemulticolumns
-     \setnoteparameter\c!width{\makeupwidth}%
-   \else
-     \edef\p_width{\noteparameter\c!width}%
-     \ifx\p_width\v!auto
-       \setnoteparameter\c!width{\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi}%
-     \else\ifx\p_width\empty
-       \setnoteparameter\c!width{\hsize}%
-     \fi\fi
-  \fi}
-
-\appendtoks
-    \strc_notes_set_width
-\to \everysynchronizenote
-
 %D The following switch can be used to disable limiting the height of the footnote
 %D area, something that is needed in multi column balancing. Use this switch with
 %D care.
@@ -1216,12 +1191,6 @@
      \kern\strutdepth
    \fi}
 
-\ifdefined\setnotehsize \else
-
-  \unexpanded\def\setnotehsize{\hsize\noteparameter\c!width\relax} % can be overloaded
-
-\fi
-
 %D The formatting depends on the width of the table, so we have to set \type {n} to
 %D zero.
 %D
@@ -1407,13 +1376,32 @@
 %     \setfalse\inhibitmargindata
 % \to \everyinsidenoteinsert
 
+\setupnotes
+  [\c!width=\v!auto]
+
+\unexpanded\def\setnotehsize
+  {\ifinsidemulticolumns
+     \setnoteparameter\c!width{\makeupwidth}%
+   \else
+     \edef\p_width{\noteparameter\c!width}%
+     \ifx\p_width\v!auto
+     % \ifinsidecolumns
+         \setnoteparameter\c!width{\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi}%
+     % \else
+     %   \setnoteparameter\c!width{\makeupwidth}%
+     % \fi
+     \else\ifx\p_width\empty
+       \setnoteparameter\c!width{\hsize}%
+     \fi\fi
+  \fi
+  \hsize\noteparameter\c!width\relax}
+
 \appendtoks
     % only needed when columns (could be three \set...)
+    \setnotehsize
     \setsimplecolumnshsize[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\noteparameter\c!width]%
 \to \everyinsidenoteinsert
 
-% not: \appendtoks \setnotehsize \to \everyinsidenoteinsert (spoils columns)
-
 %D Normally footnotes are saved as inserts that are called upon as soon as the
 %D pagebody is constructed. The footnote insertion routine looks just like the
 %D \PLAIN\ \TEX\ one, except that we check for the end note state.
@@ -1502,9 +1490,12 @@
    \obeydepth} % (a) added , since split footnotes will not align properly
 
 \def\strc_notes_flush_inserts_columns
-  {\startsimplecolumns[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\noteparameter\c!width]%
+  {\begingroup
+   \setnotehsize % probably still not ok for columns
+   \startsimplecolumns[\c!distance=\noteparameter\c!columndistance,\c!n=\noteparameter\c!n,\c!width=\noteparameter\c!width]%
      \strc_notes_flush_global
-   \stopsimplecolumns}
+   \stopsimplecolumns
+   \endgroup}
 
 % idea: tag with attr and then just flush them again
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 09391be3f..85ff57d00 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  : 2020-09-18 20:28
+-- merge date  : 2020-09-20 22:59
 
 do -- begin closure to overcome local limits and interference