diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/pack-com.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/pack-com.mkiv | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/context/base/pack-com.mkiv b/Master/texmf-dist/tex/context/base/pack-com.mkiv index 4d50bf7c70c..d12c0d90aef 100644 --- a/Master/texmf-dist/tex/context/base/pack-com.mkiv +++ b/Master/texmf-dist/tex/context/base/pack-com.mkiv @@ -152,6 +152,11 @@ % % faster +\unexpanded\def\pack_common_content_start{\bgroup\ignorespaces} +\unexpanded\def\pack_common_content_stop {\removeunwantedspaces\egroup} +\unexpanded\def\pack_common_caption_start{\bgroup\ignorespaces} +\unexpanded\def\pack_common_caption_stop {\removeunwantedspaces\egroup} + \unexpanded\def\stopcombination {\bgroup\normalexpanded{\egroup{}\ctxcommand{ntimes("{}{}",\number\c_pack_combinations_n)}}% \dostoptagged @@ -177,10 +182,10 @@ % \forgetall % - \let\startcontent\bgroup - \let\stopcontent \egroup - \let\startcaption\bgroup - \let\stopcaption \egroup + \let\startcontent\pack_common_content_start + \let\stopcontent \pack_common_content_stop + \let\startcaption\pack_common_caption_start + \let\stopcaption \pack_common_caption_stop % \edef\p_height {\combinationparameter\c!height}% \edef\p_width {\combinationparameter\c!width}% @@ -210,7 +215,7 @@ \alignmark\alignmark \m_pack_combinations_rightfiller \aligntab - \tabskip\zeropoint \!!plus 1fill + \tabskip\zeropoint \s!plus 1fill \alignmark\alignmark \cr \pack_combinations_pickup} @@ -286,7 +291,7 @@ {\aligntab \aligntab \aligntab - \hskip\p_distance + \kern\p_distance \aligntab \pack_combinations_pickup} @@ -562,18 +567,26 @@ \edef\p_location{\pairedboxparameter\c!location}% \edef\p_n {\pairedboxparameter\c!n}% % - \let\startcontent\bgroup - \let\stopcontent \egroup - \let\startcaption\bgroup - \let\stopcaption \egroup + \let\startcontent\pack_common_content_start + \let\stopcontent \pack_common_content_stop + \let\startcaption\pack_common_caption_start + \let\stopcaption \pack_common_caption_stop % \global\setsystemmode{pairedbox}% \pack_pairedboxes_before - \dowithnextboxcs\pack_pairedboxes_first\hbox} + \dogotopar\pack_pairedboxes_first_pickup} + +\def\pack_pairedboxes_first_pickup + {\dowithnextboxcs\pack_pairedboxes_first\hbox + \bgroup + \let\next=} \def\pack_pairedboxes_first {\pack_pairedboxes_between - \dowithnextboxcs\pack_pairedboxes_second\vbox + \dogotopar\pack_pairedboxes_second_pickup} + +\def\pack_pairedboxes_second_pickup + {\dowithnextboxcs\pack_pairedboxes_second\vbox \bgroup \pack_pairedboxes_inside_second \let\next=} @@ -614,12 +627,12 @@ \def\pack_pairedboxes_flush_left {\box\b_pack_pairedboxes_second - \hskip\pairedboxparameter\c!distance + \kern\pairedboxparameter\c!distance \box\b_pack_pairedboxes_first} \def\pack_pairedboxes_flush_right {\box\b_pack_pairedboxes_first - \hskip\pairedboxparameter\c!distance + \kern\pairedboxparameter\c!distance \box\b_pack_pairedboxes_second} \def\pack_pairedboxes_flush_top @@ -663,8 +676,8 @@ \setvalue{\??pairedboxalign\v!middle}% 4 {\let\pack_pairedboxes_align_l\hss \let\pack_pairedboxes_align_r\hss - \let\pack_pairedboxes_align_t\hss - \let\pack_pairedboxes_align_b\hss} + \let\pack_pairedboxes_align_t\vss + \let\pack_pairedboxes_align_b\vss} \setvalue{\??pairedboxalign\v!bottom}{\getvalue{\??pairedboxalign\v!low }} \setvalue{\??pairedboxalign \v!top}{\getvalue{\??pairedboxalign\v!high}} @@ -789,10 +802,10 @@ \unexpanded\def\placeontopofeachother{\bgroup\dowithnextboxcs\pack_topofeachother_one\hbox} \unexpanded\def\placesidebyside {\bgroup\dowithnextboxcs\pack_sidebyside_one \hbox} -\def\pack_topofeachother_one{\bgroup\setbox0\box\nextbox\dowithnextboxcs\pack_topofeach_two \hbox} -\def\pack_sidebyside_one {\bgroup\setbox0\box\nextbox\dowithnextboxcs\pack_sidebyside_two\hbox} +\def\pack_topofeachother_one{\bgroup\setbox0\box\nextbox\dowithnextboxcs\pack_topofeachother_two\hbox} +\def\pack_sidebyside_one {\bgroup\setbox0\box\nextbox\dowithnextboxcs\pack_sidebyside_two \hbox} -\def\pack_topofeachother_two{\setbox2\box\nextbox\halign{\hss####\hss\cr\box0\cr\box2\cr}\egroup\egroup} -\def\pack_sidebyside_two {\setbox2\box\nextbox\valign{\vss####\vss\cr\box0\cr\box2\cr}\egroup\egroup} +\def\pack_topofeachother_two{\setbox2\box\nextbox\halign{\hss##\hss\cr\box0\cr\box2\cr}\egroup\egroup} +\def\pack_sidebyside_two {\setbox2\box\nextbox\valign{\vss##\vss\cr\box0\cr\box2\cr}\egroup\egroup} \protect \endinput |