1 files changed, 25 insertions, 11 deletions
diff --git a/tex/context/base/mkiv/page-mul.mkiv b/tex/context/base/mkiv/page-mul.mkiv
index 51af24b6a..957981703 100644
--- a/tex/context/base/mkiv/page-mul.mkiv
+++ b/tex/context/base/mkiv/page-mul.mkiv
@@ -471,7 +471,7 @@
    \page_mul_postprocess_lines
    \page_mul_postprocess_columns
    \dohandleallcolumns
-     {\global\setbox\currentcolumnbox\hbox to \d_page_mul_used_width
+     {\global\setbox\currentcolumnbox\hpack to \d_page_mul_used_width
         {\box\currentcolumnbox}%
       \wd\currentcolumnbox\d_page_mul_used_width
       \ifheightencolumns
@@ -479,12 +479,12 @@
       \fi}%
    \page_mul_calculate_column_result_dimensions
    \overlaycolumnfootnotes
-   \setbox\columnpagebox\vbox
-     {\hbox \ifconditional\c_page_mul_reverse dir TRT \fi to \makeupwidth
+   \setbox\columnpagebox\vpack % \vbox
+     {\ifconditional\c_page_mul_reverse\reversehpack\else\naturalhpack\fi to \makeupwidth
         {\hskip\ifconditional\c_page_mul_reverse\d_page_mul_rightskip\else\d_page_mul_leftskip\fi\relax
          \dohandleallcolumns
            {\finishcolumnbox
-               {\setbox\scratchbox\hbox
+               {\setbox\scratchbox\hpack
                    {\ifx\finishcolumnbox\relax\else\strut\fi
                    \box\currentcolumnbox}% hm, why strut
                \anch_mark_column_box\scratchbox
@@ -499,13 +499,13 @@
       \fi
       \global\setbox\currenttopcolumnbox\emptybox}%
    \advance\scratchdimen \ht\columnpagebox
-   \setbox\scratchbox\hbox to \makeupwidth
+   \setbox\scratchbox\hbox to \makeupwidth % between can be something so no \hpack
      {\vrule
         \s!width \zeropoint
         \s!height\scratchdimen
         \s!depth \dp\columnpagebox
       \dostepwiserecurse\plustwo\nofcolumns\plusone{\hfil\page_mul_between_columns}\hfil}%
-   \setbox\columnpagebox\hbox
+   \setbox\columnpagebox\hpack
      {\box\columnpagebox
       \hskip-\makeupwidth
       \box\scratchbox}%
@@ -761,7 +761,7 @@
          \page_mul_set_n_of_lines
          \advance\c_page_mul_n_of_lines \minustwo
          \scratchdimen\dimexpr\c_page_mul_n_of_lines\lineheight+\topskip\relax
-         \setbox\b_page_mul_notes\hbox{\lower\scratchdimen\box\b_page_mul_notes}%
+         \setbox\b_page_mul_notes\hpack{\lower\scratchdimen\box\b_page_mul_notes}%
          \ht\b_page_mul_notes\openstrutheight
          \dp\b_page_mul_notes\openstrutdepth
          \wd\b_page_mul_notes\zeropoint
@@ -784,7 +784,7 @@
          \getnoflines\scratchdimen
          \advance\noflines \minustwo
          \scratchdimen\dimexpr\noflines\lineheight+\topskip\relax
-         \setbox\b_page_mul_notes\hbox{\lower\scratchdimen\box\b_page_mul_notes}%
+         \setbox\b_page_mul_notes\hpack{\lower\scratchdimen\box\b_page_mul_notes}%
          \ht\b_page_mul_notes\openstrutheight
          \dp\b_page_mul_notes\openstrutdepth
          \wd\b_page_mul_notes\zeropoint
@@ -890,6 +890,7 @@
 
 \def\page_mul_routine_balance
   {\bgroup
+   % why no \forgetall here
    \page_mul_initialize_variables
    \widowpenalty\zerocount
    \setbox\b_page_mul_balance_content\vbox{\unvbox\normalpagebox}%
@@ -1135,7 +1136,7 @@
 %      \global\savednoffloats\zerocount
 %      \global\setfalse\c_page_floats_some_waiting
 %    \else
-%      \global\let\page_floats_column_pop_saved\relax
+%      \glet\page_floats_column_pop_saved\relax
 %    \fi}
 %
 % \let\page_floats_column_pop_saved\relax
@@ -1249,7 +1250,7 @@
          \xdef\insertionheight{\the\dimen0}%
          \egroup
        \else
-         \global\let\insertionheight\zeropoint
+         \glet\insertionheight\zeropoint
        \fi}
 
     \def\docolumnroomfloat
@@ -1364,7 +1365,7 @@
                 \global\setbox\currenttopcolumnbox\vbox
                   {\snaptogrid\vbox
                      {\copy\currenttopcolumnbox
-                      \hbox{\vphantom{\vskip\floatheight}}}% known from previous
+                      \hpack{\vphantom{\vskip\floatheight}}}% known from previous
                       \whitespace % nodig ?
                       \blank[\rootfloatparameter\c!spaceafter]}%
               \else
@@ -1848,4 +1849,17 @@
    \s!page_otr_command_test_column            =\page_mul_command_test_column
   ]
 
+\installfloatmethod \s!multicolumn  \v!here   \page_mul_place_float_here
+\installfloatmethod \s!multicolumn  \v!force  \page_mul_place_float_force
+\installfloatmethod \s!multicolumn  \v!top    \page_mul_place_float_top
+\installfloatmethod \s!multicolumn  \v!bottom \page_mul_place_float_bottom
+
+\appendtoks
+    \flushingcolumnfloatsfalse
+\to \everybeforesectionheadhandle
+
+\appendtoks
+   \flushingcolumnfloatstrue
+\to \everyaftersectionheadhandle
+
 \protect \endinput