summaryrefslogtreecommitdiff
path: root/tex/context/base/page-mix.mkiv
diff options
context:
space:
mode:
Diffstat (limited to 'tex/context/base/page-mix.mkiv')
-rw-r--r--tex/context/base/page-mix.mkiv39
1 files changed, 34 insertions, 5 deletions
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv
index abdcced1f..2328b8678 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/page-mix.mkiv
@@ -28,6 +28,7 @@
% top and bottom inserts
% wide floats
% move floats
+% offsets (inner ones, so we change the hsize ... needed with backgrounds
% luatex buglet:
%
@@ -55,7 +56,11 @@
\setupmixedcolumns
[\c!distance=1.5\bodyfontsize,
\c!n=\plustwo,
+ %\c!align=, % inherit
+ %\c!before=,
+ %\c!after=,
%\c!rule=\v!none,
+ %\c!setups=,
\c!frame=\v!off,
\c!strut=\v!no,
\c!offset=\v!overlay,
@@ -478,7 +483,9 @@
%
\page_mix_command_set_vsize
\page_mix_command_set_hsize
- \fi}
+ \fi
+ \usealignparameter\mixedcolumnsparameter
+ \usesetupsparameter\mixedcolumnsparameter}
\setvalue{\??mixedcolumnsstop\s!otr}%
{\par
@@ -517,6 +524,28 @@
}}%
\deadcycles\zerocount}
+% \unexpanded\def\page_mix_routine_package
+% {\ctxcommand{mixfinalize()}%
+% \setbox\b_page_mix_collected\vbox \bgroup
+% \ifvoid\b_page_mix_preceding \else
+% \box\b_page_mix_preceding
+% \global\d_page_mix_preceding_height\zeropoint
+% \nointerlineskip
+% \fi
+% \hskip\d_page_mix_leftskip
+% \page_mix_hbox to \d_page_mix_max_width \bgroup
+% \letmixedcolumnsparameter\c!strut \v!no
+% \letmixedcolumnsparameter\c!align \empty % probably not needed as we could use a simple variant
+% \letmixedcolumnsparameter\c!setups\empty
+% \dorecurse\c_page_mix_n_of_columns {%
+% \inheritedmixedcolumnsframed{\page_mix_command_package_column}%
+% \ifnum\recurselevel<\c_page_mix_n_of_columns
+% \page_mix_command_inject_separator
+% \fi
+% }%
+% \egroup
+% \egroup}
+
\unexpanded\def\page_mix_routine_package
{\ctxcommand{mixfinalize()}%
\setbox\b_page_mix_collected\vbox \bgroup
@@ -527,10 +556,10 @@
\fi
\hskip\d_page_mix_leftskip
\page_mix_hbox to \d_page_mix_max_width \bgroup
- \letmixedcolumnsparameter\c!strut\v!no
- % maybe use \c_page_mix_used_of_columns
- \dorecurse\c_page_mix_n_of_columns {%
- \inheritedmixedcolumnsframed{\page_mix_command_package_column}%
+ \dorecurse\c_page_mix_n_of_columns{%
+ \setbox\scratchbox\page_mix_command_package_column % needs packaging anyway
+ \inheritedmixedcolumnsframedbox\currentmixedcolumns\scratchbox
+ % \inheritedmixedcolumnsframed{\page_mix_command_package_column}% needs reset of strut, align, setups etc
\ifnum\recurselevel<\c_page_mix_n_of_columns
\page_mix_command_inject_separator
\fi