diff options
Diffstat (limited to 'tex/context/base/page-mix.mkiv')
-rw-r--r-- | tex/context/base/page-mix.mkiv | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv index a40418d58..abdcced1f 100644 --- a/tex/context/base/page-mix.mkiv +++ b/tex/context/base/page-mix.mkiv @@ -28,7 +28,6 @@ % top and bottom inserts % wide floats % move floats -% offsets (inner ones, so we change the hsize ... needed with backgrounds % luatex buglet: % @@ -56,11 +55,7 @@ \setupmixedcolumns [\c!distance=1.5\bodyfontsize, \c!n=\plustwo, - %\c!align=, % inherit - %\c!before=, - %\c!after=, - %\c!separator=\v!none, - %\c!setups=, + %\c!rule=\v!none, \c!frame=\v!off, \c!strut=\v!no, \c!offset=\v!overlay, @@ -69,7 +64,6 @@ \c!maxwidth=\makeupwidth, \c!grid=\v!tolerant, \c!step=.25\lineheight, % needs some experimenting - %\c!splitmethod=\v!fixed, % will be default \c!method=\ifinner\s!box\else\s!otr\fi] % automatic as suggested by WS \let\startmixedcolumns\relax % defined later @@ -164,8 +158,7 @@ \definemixedcolumns [\s!itemgroupcolumns] [\c!n=\itemgroupparameter\c!n, - \c!separator=\v!none, - \c!splitmethod=\v!none, + \c!rule=\v!off, \c!balance=\v!yes] \unexpanded\def\strc_itemgroups_start_columns @@ -226,7 +219,7 @@ \unexpanded\def\page_mix_command_set_hsize {\hsize\d_page_mix_column_width - \textwidth\d_page_mix_column_width} + \textwidth\d_page_mul_used_width} % needs thinking ... grouping etc %D When setting the vsize we make sure that we collect a few more lines than needed %D so that we have enough to split over the columns. Collecting too much is somewhat @@ -296,7 +289,7 @@ \unexpanded\def\page_mix_command_inject_separator {\bgroup \hss - \csname\??mixedcolumnsseparator\mixedcolumnsparameter\c!separator\endcsname % was \c!rule + \csname\??mixedcolumnsseparator\mixedcolumnsparameter\c!separator\endcsname \hss \egroup} @@ -485,21 +478,12 @@ % \page_mix_command_set_vsize \page_mix_command_set_hsize - \fi - \usealignparameter\mixedcolumnsparameter - \usesetupsparameter\mixedcolumnsparameter} - -% \setvalue{\??mixedcolumnsstop\s!otr}% -% {\par -% \ifcase\c_page_mix_otr_nesting\or -% \c_page_mix_routine\c_page_mix_routine_balance -% \page_otr_trigger_output_routine -% \fi} + \fi} \setvalue{\??mixedcolumnsstop\s!otr}% {\par \ifcase\c_page_mix_otr_nesting\or - \doif{\mixedcolumnsparameter\c!balance}\v!yes{\c_page_mix_routine\c_page_mix_routine_balance}% + \c_page_mix_routine\c_page_mix_routine_balance \page_otr_trigger_output_routine \fi} @@ -527,7 +511,6 @@ strutht = \number\strutht, strutdp = \number\strutdp, threshold = \number\d_page_mix_threshold, - splitmethod = "\mixedcolumnsparameter\c!splitmethod", balance = "#1", alternative = "\mixedcolumnsparameter\c!alternative", grid = \ifgridsnapping true\else false\fi, @@ -544,14 +527,10 @@ \fi \hskip\d_page_mix_leftskip \page_mix_hbox to \d_page_mix_max_width \bgroup - \dorecurse\c_page_mix_n_of_columns{% - % needs packaging anyway - \setbox\scratchbox\page_mix_command_package_column - % for the moment a quick and dirty patch .. we need to go into the box (hence the \plusone) .. a slowdowner - \page_lines_add_numbers_to_box\scratchbox\recurselevel\c_page_mix_n_of_columns\plusone - % the framed needs a reset of strut, align, setups etc - \inheritedmixedcolumnsframedbox\currentmixedcolumns\scratchbox - % optional + \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}% \ifnum\recurselevel<\c_page_mix_n_of_columns \page_mix_command_inject_separator \fi |