diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/tabl-xtb.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/tabl-xtb.mkvi | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/context/base/tabl-xtb.mkvi b/Master/texmf-dist/tex/context/base/tabl-xtb.mkvi index 03c68e60332..aba4e502718 100644 --- a/Master/texmf-dist/tex/context/base/tabl-xtb.mkvi +++ b/Master/texmf-dist/tex/context/base/tabl-xtb.mkvi @@ -168,17 +168,17 @@ % really need them and use the embeddedxtable command when nesting them. % Implementing nesting would be slower than not using direct buffers. -\def\tabl_x_process_buffer_directly[#name]% +\unexpanded\def\tabl_x_process_buffer_directly[#name]% {\bgroup \let\tabl_x_start_table\tabl_x_process_buffer \edef\tabl_x_current_buffer{#name}% \tabl_x_get_buffer % pickup settings \tabl_x_process} -\def\tabl_x_start_ignore[#settings]% +\unexpanded\def\tabl_x_start_ignore[#settings]% {} -\def\tabl_x_process_buffer[#settings]% +\unexpanded\def\tabl_x_process_buffer[#settings]% {\tabl_x_prepare{#settings}% \let\tabl_x_start_table\tabl_x_start_ignore \gobbleuntil\stopxtable} % nested xtables are not supported, @@ -189,7 +189,7 @@ \unexpanded\def\startembeddedxtable {\dosingleempty\tabl_x_embedded_start} -\def\tabl_x_embedded_start[#settings]#content\stopembeddedxtable +\unexpanded\def\tabl_x_embedded_start[#settings]#content\stopembeddedxtable {\tabl_x_prepare{#settings}% \ctxcommand{assignbuffer("embedded_x_table",\!!bs\detokenize{#content}\!!es)}% \bgroup @@ -227,7 +227,7 @@ %D Now we come to processing: -\def\tabl_x_check_textwidth +\unexpanded\def\tabl_x_check_textwidth {\edef\p_textwidth{\xtableparameter\c!textwidth}% \ifx\p_textwidth\v!local \d_tabl_x_textwidth\availablehsize @@ -235,7 +235,7 @@ \d_tabl_x_textwidth\p_textwidth \fi} -\def\tabl_x_prepare#settings% assumes \iffirstargument to be set +\unexpanded\def\tabl_x_prepare#settings% assumes \iffirstargument to be set {\advance\c_tabl_x_nesting\plusone \dostarttagged\t!table\empty \iffirstargument @@ -247,7 +247,12 @@ \def\tabl_x_get_buffer {\ctxcommand{gettexbuffer("\tabl_x_current_buffer")}} -\let\tabl_x_stop_cell\relax +\let\tabl_x_start_row_yes \relax +\let\tabl_x_start_row_nop \relax +\let\tabl_x_stop_row \relax +\let\tabl_x_start_cell_yes\relax +\let\tabl_x_start_cell_nop\relax +\let\tabl_x_stop_cell \relax \unexpanded\def\tabl_x_process {\begingroup % * @@ -322,7 +327,7 @@ \installcorenamespace{xtableflushsplit} -\def\tabl_x_flush_text_checked +\unexpanded\def\tabl_x_flush_text_checked {\expandnamespaceparameter\??xtableflushsplit\xtableparameter\c!split\v!no} % in text flow: headers and footers only once @@ -371,10 +376,10 @@ \let\extratxtablesplitheight\zeropoint % might disappear so don't depend on it -\def\tabl_x_flush_float_normal +\unexpanded\def\tabl_x_flush_float_normal {\ctxcommand{x_table_flush{ method = "\v!normal" }}} -\def\tabl_x_flush_float_split +\unexpanded\def\tabl_x_flush_float_split {\resetdirecttsplit \edef\extrasplitfloatlines {\xtableparameter\c!split}% \edef\tsplitminimumfreespace{\the\dimexpr\extratxtablesplitheight+\xtableparameter\c!splitoffset\relax}% @@ -383,7 +388,7 @@ \let\tsplitdirectwidth \d_tabl_x_final_width \handledirecttsplit} -\def\tabl_x_split_splitter#vsize% +\unexpanded\def\tabl_x_split_splitter#vsize% {\setbox\tsplitresult\vbox {\ctxcommand{x_table_flush{ method = "\v!split", vsize = \number\dimexpr#vsize }}}% \ifcase\c_tabl_x_state @@ -396,30 +401,30 @@ {\begingroup \doifnextoptionalelse\tabl_x_start_row_yes\tabl_x_start_row_nop} -\def\tabl_x_start_row_reflow_width_yes[#settings]% +\unexpanded\def\tabl_x_start_row_reflow_width_yes[#settings]% {\setupcurrentxtable[#settings]% \ctxcommand{x_table_next_row()}} -\def\tabl_x_start_row_reflow_width_nop +\unexpanded\def\tabl_x_start_row_reflow_width_nop {\ctxcommand{x_table_next_row()}} -\def\tabl_x_stop_row_reflow_width +\unexpanded\def\tabl_x_stop_row_reflow_width {} \let\tabl_x_start_row_reflow_height_yes\tabl_x_start_row_reflow_width_yes \let\tabl_x_start_row_reflow_height_nop\tabl_x_start_row_reflow_width_nop \let\tabl_x_stop_row_reflow_height \tabl_x_stop_row_reflow_width -\def\tabl_x_start_row_construct_yes[#settings]% +\unexpanded\def\tabl_x_start_row_construct_yes[#settings]% {\setupcurrentxtable[#settings]% \dostarttagged\t!tablerow\empty \ctxcommand{x_table_next_row()}} -\def\tabl_x_start_row_construct_nop +\unexpanded\def\tabl_x_start_row_construct_nop {\dostarttagged\t!tablerow\empty \ctxcommand{x_table_next_row()}} -\def\tabl_x_stop_row_construct +\unexpanded\def\tabl_x_stop_row_construct {\dostoptagged} \unexpanded\def\stopxrow @@ -432,11 +437,11 @@ \unexpanded\def\stopxcell {\tabl_x_stop_cell} -\def\tabl_x_begin_of_cell +\unexpanded\def\tabl_x_begin_of_cell {\inhibitblank \everypar{\delayedbegstrut}} -\def\tabl_x_end_of_cell +\unexpanded\def\tabl_x_end_of_cell {\ifhmode \delayedendstrut \par @@ -674,7 +679,7 @@ \unexpanded\def\stopxgroup {\endgroup} -\def\tabl_x_start_group_delayed_one[#tag]% +\unexpanded\def\tabl_x_start_group_delayed_one[#tag]% % {\ifcsname\namedxtablehash{#tag}\s!parent\endcsname {\ifcsname\??xtablecheck#tag\endcsname \expandafter\tabl_x_start_group_delayed_two @@ -682,7 +687,7 @@ \expandafter\setupcurrentxtable \fi[#tag]} -\def\tabl_x_start_group_delayed_two[#tag]% +\unexpanded\def\tabl_x_start_group_delayed_two[#tag]% {\ifx\currentxtable\empty \else \chaintocurrentxtable{#tag}% \fi @@ -700,7 +705,7 @@ {\begingroup \doifnextoptionalelse\tabl_x_start_cell_delayed_one\tabl_x_start_cell_nop} -\def\tabl_x_start_cell_delayed_one[#tag]% +\unexpanded\def\tabl_x_start_cell_delayed_one[#tag]% % {\ifcsname\namedxtablehash{#tag}\s!parent\endcsname {\ifcsname\??xtablecheck#tag\endcsname \expandafter\tabl_x_start_cell_delayed_two @@ -708,7 +713,7 @@ \expandafter\tabl_x_start_cell_yes \fi[#tag]} -\def\tabl_x_start_cell_delayed_two[#tag]% +\unexpanded\def\tabl_x_start_cell_delayed_two[#tag]% {\ifx\currentxtable\empty \else \chaintocurrentxtable{#tag}% \fi @@ -725,7 +730,7 @@ {\begingroup \doifnextoptionalelse\tabl_x_start_row_delayed_one\tabl_x_start_row_nop} -\def\tabl_x_start_row_delayed_one[#tag]% +\unexpanded\def\tabl_x_start_row_delayed_one[#tag]% % {\ifcsname\namedxtablehash{#tag}\s!parent\endcsname {\ifcsname\??xtablecheck#tag\endcsname \expandafter\tabl_x_start_row_delayed_two @@ -733,7 +738,7 @@ \expandafter\tabl_x_start_row_yes \fi[#tag]} -\def\tabl_x_start_row_delayed_two[#tag]% +\unexpanded\def\tabl_x_start_row_delayed_two[#tag]% {\ifx\currentxtable\empty \else \chaintocurrentxtable{#tag}% \fi |