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/pack-com.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/pack-com.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/pack-com.mkiv | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/pack-com.mkiv b/Master/texmf-dist/tex/context/base/mkiv/pack-com.mkiv index 1c6f2de7361..59354208e13 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/pack-com.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/pack-com.mkiv @@ -73,7 +73,7 @@ \newsystemmode{combination} \appendtoks - \globalresetsystemmode{combination}% + \global\resetsystemmode{combination}% \to \everyinsidefloat \newcount\c_pack_combinations_nesting % local @@ -113,7 +113,7 @@ \setbox\b_pack_combinations_content_saved \box\b_pack_combinations_content \setbox\b_pack_combinations_caption_saved \box\b_pack_combinations_caption \else - \globalsetsystemmode{combination}% why global + \global\setsystemmode{combination}% why global \fi} \def\pack_combinations_pop @@ -126,7 +126,7 @@ \setbox\b_pack_combinations_content \box\b_pack_combinations_content_saved \setbox\b_pack_combinations_caption \box\b_pack_combinations_caption_saved \else - \globalresetsystemmode{combination}% why global + \global\resetsystemmode{combination}% why global \fi \advance\c_pack_combinations_nesting\minusone} @@ -205,7 +205,7 @@ % {\bgroup % \scratchtoks{{}}% % \dorecurse\c_pack_combinations_y -% {\toksapp{{}{}}}% +% {\scratchtoks\expandafter{\the\scratchtoks{}{}}}% % \expandafter\egroup\the\scratchtoks % \egroup % \dostoptagged @@ -290,7 +290,7 @@ \alignmark\alignmark \m_pack_combinations_rightfiller \aligntab - \tabskip\zeropoint \s!plus 1fill % \fillskip + \tabskip\zeropoint \s!plus 1fill \alignmark\alignmark \cr \pack_combinations_pickup} @@ -437,10 +437,10 @@ \nointerlineskip % indeed \combinationparameter\c!inbetween \global\c_pack_combinations_x\c_pack_combinations_max - \glet\pack_combinations_flush_captions_indeed\pack_combinations_flush_captions_yes + \globallet\pack_combinations_flush_captions_indeed\pack_combinations_flush_captions_yes \else \global\setbox\b_pack_combinations_captions\emptybox - \glet\pack_combinations_flush_captions_indeed\pack_combinations_flush_captions_nop + \globallet\pack_combinations_flush_captions_indeed\pack_combinations_flush_captions_nop \fi}% \pack_combinations_flush_captions_indeed \crcr} @@ -656,7 +656,7 @@ \newsystemmode{pairedbox} \appendtoks - \globalresetsystemmode{pairedbox}% + \global\resetsystemmode{pairedbox}% \to \everyinsidefloat \installcorenamespace {pairedbox} @@ -720,7 +720,7 @@ \let\startcaption\pack_common_caption_start \let\stopcaption \pack_common_caption_stop % - \globalsetsystemmode{pairedbox}% + \global\setsystemmode{pairedbox}% \pack_pairedboxes_before \assumelongusagecs\pack_pairedboxes_first_pickup} |