diff options
author | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
commit | 1314fbe93790c501dc436a5cf99f106b9e5c0f63 (patch) | |
tree | 04dc7734c8be8ffe385d41f4388826ef5857b6f9 /Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv | |
parent | eb80ce7b34f59896a1dfee5ca422495394d6677f (diff) |
Revert "ConTeXt version 2019.02.22 19:35"
This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.
git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv b/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv index 436c4a1dcf6..684ebc5854a 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/page-mix.mkiv @@ -371,9 +371,6 @@ \let\currentmixedcolumnsmethod\empty -\installmacrostack\currentmixedcolumns -\installmacrostack\currentmixedcolumnsmethod - \unexpanded\def\startmixedcolumns {\dodoubleempty\page_mix_start_columns} @@ -388,8 +385,8 @@ \fi\fi} \unexpanded\def\page_mix_start_columns - {\push_macro_currentmixedcolumns - \push_macro_currentmixedcolumnsmethod + {\pushmacro\currentmixedcolumns + \pushmacro\currentmixedcolumnsmethod \ifsecondargument \singleexpandafter\page_mix_start_columns_a \else\iffirstargument @@ -465,8 +462,8 @@ \let\stopmixedcolumns\page_mix_columns_stop_nop} \unexpanded\def\page_mix_fast_columns_start#1% - {\push_macro_currentmixedcolumns - \push_macro_currentmixedcolumnsmethod + {\pushmacro\currentmixedcolumns + \pushmacro\currentmixedcolumnsmethod \edef\currentmixedcolumns{#1}% \edef\currentmixedcolumnsmethod{\mixedcolumnsparameter\c!method}% \mixedcolumnsparameter\c!before\relax % so, it doesn't listen to local settings ! @@ -495,15 +492,15 @@ \endgroup \begincsname\??mixedcolumnsafter\currentmixedcolumnsmethod\endcsname\relax \mixedcolumnsparameter\c!after\relax - \pop_macro_currentmixedcolumnsmethod - \pop_macro_currentmixedcolumns + \popmacro\currentmixedcolumnsmethod + \popmacro\currentmixedcolumns \the\t_page_mix_at_the_end\global\t_page_mix_at_the_end\emptytoks} \unexpanded\def\page_mix_columns_stop_nop {\page_mix_finalize_columns \endgroup - \pop_macro_currentmixedcolumnsmethod - \pop_macro_currentmixedcolumns + \popmacro\currentmixedcolumnsmethod + \popmacro\currentmixedcolumns \the\t_page_mix_at_the_end\global\t_page_mix_at_the_end\emptytoks} % \unexpanded\def\page_mix_columns_stop_yes @@ -512,12 +509,12 @@ % \begincsname\??mixedcolumnsafter\currentmixedcolumnsmethod\endcsname\relax % \mixedcolumnsparameter\c!after\relax % \ifx\currentmixedcolumnsmethod\s!otr -% \pop_macro_currentmixedcolumnsmethod -% \pop_macro_currentmixedcolumns +% \popmacro\currentmixedcolumnsmethod +% \popmacro\currentmixedcolumns % \synchronizeoutput % brrr, otherwise sometimes issues in itemize % \else -% \pop_macro_currentmixedcolumnsmethod -% \pop_macro_currentmixedcolumns +% \popmacro\currentmixedcolumnsmethod +% \popmacro\currentmixedcolumns % \fi % } |