summaryrefslogtreecommitdiff
path: root/tex/context/base/page-mul.mkiv
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/base/page-mul.mkiv')
-rw-r--r--tex/context/base/page-mul.mkiv28
1 files changed, 13 insertions, 15 deletions
diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv
index 24286106a..9e0861af9 100644
--- a/tex/context/base/page-mul.mkiv
+++ b/tex/context/base/page-mul.mkiv
@@ -1158,28 +1158,26 @@
\def\setlocalcolumnfloats
{\settrue\onlylocalcolumnfloats
\everypar\everylocalcolumnfloatspar
- \let\page_mul_flush_float \doflushcolumnfloat
+ \let\page_mul_flush_float\doflushcolumnfloat
\let\page_mul_flush_floats\doflushcolumnfloats}
\def\setglobalcolumnfloats
{\setfalse\onlylocalcolumnfloats
\reseteverypar
- \let\page_mul_flush_float \relax
+ \let\page_mul_flush_float\relax
\let\page_mul_flush_floats\noflushcolumnfloats}
- % \def\noflushcolumnfloats
- % {\bgroup
- % \xdef\localsavednoffloats{\the\savednoffloats}%
- % \global\savednoffloats\globalsavednoffloats
- % \page_otr_command_flush_top_insertions
- % \xdef\globalsavenoffloats{\the\savednoffloats}%
- % \ifnum\globalsavednoffloats=\zerocount
- % \setlocalcolumnfloats
- % \fi
- % \global\savednoffloats\localsavednoffloats
- % \egroup}
- %
- \def\noflushcolumnfloats{\doflushcolumnfloats} % not yet redone
+ \def\noflushcolumnfloats
+ {\bgroup
+ \xdef\localsavednoffloats{\the\savednoffloats}%
+ \global\savednoffloats\globalsavednoffloats
+ \page_otr_command_flush_top_insertions
+ \xdef\globalsavenoffloats{\the\savednoffloats}%
+ \ifnum\globalsavednoffloats=\zerocount
+ \setlocalcolumnfloats
+ \fi
+ \global\savednoffloats\localsavednoffloats
+ \egroup}
%D We need to calculate the amount of free space in a columns. When there is not
%D enough room, we migrate the float to the next column. These macro's are