diff options
| author | Hans Hagen <pragma@wxs.nl> | 2020-09-18 21:00:53 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2020-09-18 21:00:53 +0200 |
| commit | 1970df23942ba9c944ea62ff51012f4e46a32974 (patch) | |
| tree | 9ab77bdd4a58619f514823a574f30aca291afc58 /tex/context/base/mkiv/strc-flt.mkvi | |
| parent | e7dc9c1fc474fa15a2cbc34d8f543518f5853361 (diff) | |
| download | context-1970df23942ba9c944ea62ff51012f4e46a32974.tar.gz | |
2020-09-18 20:31:00
Diffstat (limited to 'tex/context/base/mkiv/strc-flt.mkvi')
| -rw-r--r-- | tex/context/base/mkiv/strc-flt.mkvi | 69 |
1 files changed, 39 insertions, 30 deletions
diff --git a/tex/context/base/mkiv/strc-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi index 3e57a857b..91cc3f666 100644 --- a/tex/context/base/mkiv/strc-flt.mkvi +++ b/tex/context/base/mkiv/strc-flt.mkvi @@ -2203,6 +2203,8 @@ {\box\floatbox}}} % special purpose: used in floatcombinations +% +% todo : keep float content and caption separated in local \newbox\b_strc_floats_separate_content \newbox\b_strc_floats_separate_caption @@ -2211,37 +2213,44 @@ {\settrue\c_floats_adapt_to_caption_width \settrue\c_floats_store_minimal_package} +% \def\strc_floats_build_box_separate_make +% {\offinterlineskip +% \vpack to \onepoint{\box\b_strc_floats_content}\break +% \vpack to \onepoint{\box\b_strc_floats_caption}} + +%D Remark for \LMTX: we don't want to migrate inserts here so we unpack +%D (could be a flag). When migrated, the inserts end up in the vertical +%D list and we no longer have just a box (but inserts and lines again). + +% \def\strc_floats_build_box_separate_split#1% +% {\setbox\scratchbox\vpack{#1}% +% \setbox\scratchbox\vbox\bgroup +% \unvpack\scratchbox +% \setbox\scratchbox\lastbox % can have (unmigrated) inserts +% \unvpack\scratchbox +% \setbox\scratchbox\lastbox % can have (unmigrated) inserts +% \unvpack\scratchbox +% \setbox\scratchbox\lastbox % can have (unmigrated) inserts +% \splittopskip\zeropoint +% \global\setbox\b_strc_floats_separate_content\vsplit\scratchbox to \onepoint +% \global\setbox\b_strc_floats_separate_caption\vsplit\scratchbox to \onepoint +% \egroup +% \global\setbox\b_strc_floats_separate_content\vpack +% {\unvbox\b_strc_floats_separate_content +% \setbox\scratchbox\lastbox +% \unvbox\scratchbox}% +% \global\setbox\b_strc_floats_separate_caption\tpack +% {\unvbox\b_strc_floats_separate_caption +% \setbox\scratchbox\lastbox +% \unvbox\scratchbox}} + \def\strc_floats_build_box_separate_make - {\offinterlineskip - \vpack to \onepoint{\box\b_strc_floats_content}\break - \vpack to \onepoint{\box\b_strc_floats_caption}} - -\def\strc_floats_build_box_separate_split#1% - {\setbox\scratchbox\vbox\bgroup - \setbox\scratchbox\vpack{#1}% - \unvbox\scratchbox\relax - \setbox\scratchbox\lastbox - %\doloop{% - \unvbox\scratchbox - \setbox\scratchbox\lastbox - % \ifdim\ht\scratchbox=2\onepoint - \unvbox\scratchbox - \setbox\scratchbox\lastbox - % \exitloop - % \fi - %}% - \splittopskip\zeropoint - \global\setbox\b_strc_floats_separate_content\vsplit\scratchbox to \onepoint - \global\setbox\b_strc_floats_separate_caption\vsplit\scratchbox to \onepoint - \egroup - \global\setbox\b_strc_floats_separate_content\vpack - {\unvbox\b_strc_floats_separate_content - \setbox\scratchbox\lastbox - \unvbox\scratchbox}% - \global\setbox\b_strc_floats_separate_caption\tpack - {\unvbox\b_strc_floats_separate_caption - \setbox\scratchbox\lastbox - \unvbox\scratchbox}} + {\savebox\??localfloatstack{\number\numexpr\c_strc_localfloats_n+1\relax:a}{\box\b_strc_floats_content}% + \savebox\??localfloatstack{\number\numexpr\c_strc_localfloats_n+1\relax:b}{\box\b_strc_floats_caption}} + +\unexpanded\def\strc_floats_build_box_separate_split#1% + {\global\setbox\b_strc_floats_separate_content\vpack{\foundbox\??localfloatstack{\number#1:a}}% + \global\setbox\b_strc_floats_separate_caption\tpack{\foundbox\??localfloatstack{\number#1:b}}} % \def\strc_floats_build_box_step#1% % {\doifdefined{\??floatbuilder#1}{\def\floatcaptionarrangement{#1}\quitcommalist}} |