diff options
Diffstat (limited to 'tex/context/base/mkiv/strc-lst.mkvi')
| -rw-r--r-- | tex/context/base/mkiv/strc-lst.mkvi | 80 |
1 files changed, 33 insertions, 47 deletions
diff --git a/tex/context/base/mkiv/strc-lst.mkvi b/tex/context/base/mkiv/strc-lst.mkvi index 08e56a700..153d879b7 100644 --- a/tex/context/base/mkiv/strc-lst.mkvi +++ b/tex/context/base/mkiv/strc-lst.mkvi @@ -13,7 +13,7 @@ \writestatus{loading}{ConTeXt Structure Macros / Lists} -\registerctxluafile{strc-lst}{1.001} +\registerctxluafile{strc-lst}{} % clean up in progress ... % @@ -144,7 +144,8 @@ \def\strc_lists_inject_nop[#dummya][#dummyb]% {\endgroup} -\unexpanded\def\strc_lists_inject_enhance#listindex#internal% +% \unexpanded +\def\strc_lists_inject_enhance#listindex#internal% {\normalexpanded{\ctxlatecommand{enhancelist(\number#listindex)}}} \unexpanded\def\strc_lists_inject_yes[#settings][#userdata]% can be used directly @@ -740,7 +741,7 @@ % {\hskip.25\emwidth\relax} \setuplistalternative - [\c!command=\strictlistparameter\c!command, + [\c!command=\directlistparameter\c!command, \c!symbol=.] \unexpanded\def\currentlistfiller @@ -1452,40 +1453,7 @@ \strc_lists_interaction_check_nop \fi} -% \def\strc_lists_interaction_check_yes -% {\edef\p_interaction_forward{\listparameter\c!interaction}% -% \ifcsname\??listinteractions\p_interaction_forward\endcsname -% \expandafter\let\expandafter\p_interaction_forward\csname\??listinteractions\p_interaction_forward\endcsname -% \strc_references_get_simple_reference{internal(\currentlistentrylocation)}% -% \a_strc_lists_reference\currentreferenceattribute -% \else -% \a_strc_lists_reference\attributeunsetvalue -% \fi -% \ifnum\a_strc_lists_reference=\attributeunsetvalue -% \let\strc_lists_get_reference_attribute\gobbleoneargument -% \let\strc_lists_set_reference_attribute\gobbleoneargument -% \let\strc_lists_set_style_color \strc_lists_set_style_color_normal -% \else -% \let\strc_lists_get_reference_attribute\strc_lists_get_reference_attribute_indeed -% \let\strc_lists_set_reference_attribute\strc_lists_set_reference_attribute_indeed -% \let\strc_lists_set_style_color \strc_lists_set_style_color_special -% \fi -% \edef\p_interaction_backward{\namedheadparameter\currentlist\c!interaction}% \namedheadparameter ! -% \ifx\p_interaction_backward\v!list -% \strc_references_set_simple_reference{*\currentlistentrylocation}% -% \a_strc_lists_destination\currentdestinationattribute -% \else -% \a_strc_lists_destination\attributeunsetvalue -% \fi -% \ifnum\a_strc_lists_destination=\attributeunsetvalue -% \let\strc_lists_get_destination_attribute\empty -% \let\strc_lists_set_destination_attribute\empty -% \else -% \let\strc_lists_get_destination_attribute\strc_lists_get_destination_attribute_indeed -% \let\strc_lists_set_destination_attribute\strc_lists_set_destination_attribute_indeed -% \fi} - -\def\strc_lists_interaction_check_yes +\def\strc_lists_interaction_check_yes_yes {\edef\p_interaction_forward{\listparameter\c!interaction}% \ifcsname\??listinteractions\p_interaction_forward\endcsname %\expandafter\let\expandafter\p_interaction_forward\csname\??listinteractions\p_interaction_forward\endcsname @@ -1496,13 +1464,13 @@ \a_strc_lists_reference\attributeunsetvalue \fi \ifnum\a_strc_lists_reference=\attributeunsetvalue - \let\strc_lists_get_reference_attribute\gobbleoneargument - \let\strc_lists_set_reference_attribute\gobbleoneargument - \let\strc_lists_set_style_color \strc_lists_set_style_color_normal + \let\strc_lists_get_reference_attribute\gobbleoneargument + \let\strc_lists_set_reference_attribute\gobbleoneargument + \let\strc_lists_set_style_color \strc_lists_set_style_color_normal \else - \let\strc_lists_get_reference_attribute\strc_lists_get_reference_attribute_indeed - \let\strc_lists_set_reference_attribute\strc_lists_set_reference_attribute_indeed - \let\strc_lists_set_style_color \strc_lists_set_style_color_special + \let\strc_lists_get_reference_attribute\strc_lists_get_reference_attribute_indeed + \let\strc_lists_set_reference_attribute\strc_lists_set_reference_attribute_indeed + \let\strc_lists_set_style_color \strc_lists_set_style_color_special \fi \edef\p_interaction_backward{\namedheadparameter\currentlist\c!interaction}% \namedheadparameter ! \ifx\p_interaction_backward\v!list @@ -1512,13 +1480,31 @@ \a_strc_lists_destination\attributeunsetvalue \fi \ifnum\a_strc_lists_destination=\attributeunsetvalue - \let\strc_lists_get_destination_attribute\empty - \let\strc_lists_set_destination_attribute\empty + \let\strc_lists_get_destination_attribute\empty + \let\strc_lists_set_destination_attribute\empty \else - \let\strc_lists_get_destination_attribute\strc_lists_get_destination_attribute_indeed - \let\strc_lists_set_destination_attribute\strc_lists_set_destination_attribute_indeed + \let\strc_lists_get_destination_attribute\strc_lists_get_destination_attribute_indeed + \let\strc_lists_set_destination_attribute\strc_lists_set_destination_attribute_indeed \fi} +\def\strc_lists_interaction_check_yes_nop + {\a_strc_lists_reference \attributeunsetvalue + \a_strc_lists_destination\attributeunsetvalue + \let\strc_lists_get_reference_attribute\gobbleoneargument + \let\strc_lists_set_reference_attribute\gobbleoneargument + \let\strc_lists_get_destination_attribute\empty + \let\strc_lists_set_destination_attribute\empty + \let\strc_lists_set_style_color\strc_lists_set_style_color_normal} + +\def\strc_lists_interaction_check_yes + {\ifx\currentlistentrylocation\empty + \strc_lists_interaction_check_yes_nop + \else\ifnum\currentlistentrylocation=\zerocount + \strc_lists_interaction_check_yes_nop + \else + \strc_lists_interaction_check_yes_yes + \fi\fi} + \def\strc_lists_interaction_check_nop {\let\strc_lists_get_reference_attribute \gobbleoneargument \let\strc_lists_set_reference_attribute \gobbleoneargument |