diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2015-12-17 16:15:07 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2015-12-17 16:15:07 +0100 |
| commit | d1faffcd5d92925a6c5e66ebb72b4c8dcfae236f (patch) | |
| tree | c1663d54da8573c0541015e5a307a28e22215a8b /tex/context/base/strc-ref.mkvi | |
| parent | adc43c3c243ed95215af6fe02d71e393c178da23 (diff) | |
| download | context-d1faffcd5d92925a6c5e66ebb72b4c8dcfae236f.tar.gz | |
2015-12-17 15:59:00
Diffstat (limited to 'tex/context/base/strc-ref.mkvi')
| -rw-r--r-- | tex/context/base/strc-ref.mkvi | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi index f5d0d1d78..1f2c91404 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -438,7 +438,7 @@ {\ifsecondargument \expandafter\strc_references_content_pickup_yes \else - \expandafter\strc_references_content_pickup_yes + \expandafter\strc_references_content_pickup_nop \fi} \def\strc_references_content_pickup_yes[#1][#2]% @@ -1187,7 +1187,7 @@ \installcorenamespace{referencinginteraction} -\setvalue{\??referencinginteraction\v!all}% +\def\strc_references_interaction_all {\the\leftreferencetoks \doifelsesometoks\leftreferencetoks \leftofreferencecontent \donothing \leftofreference @@ -1196,6 +1196,8 @@ \doifelsesometoks\rightreferencetoks\rightofreferencecontent\donothing \the\rightreferencetoks} +\letvalue{\??referencinginteraction\v!all}\strc_references_interaction_all + \setvalue{\??referencinginteraction\v!label}% {\leftofreference \the\leftreferencetoks @@ -1210,14 +1212,21 @@ \setvalue{\??referencinginteraction\v!symbol}% {\referencesymbol} +% \def\referencesequence +% {\csname\??referencinginteraction +% \ifcsname\??referencinginteraction\referencingparameter\c!interaction\endcsname +% \referencingparameter\c!interaction +% \else +% \v!all +% \fi +% \endcsname} + \def\referencesequence - {\csname\??referencinginteraction - \ifcsname\??referencinginteraction\referencingparameter\c!interaction\endcsname - \referencingparameter\c!interaction - \else - \v!all - \fi - \endcsname} + {\ifcsname\??referencinginteraction\referencingparameter\c!interaction\endcsname + \expandafter\lastnamedcs + \else + \expandafter\strc_references_interaction_all + \fi} \newtoks\everyresetinatreference @@ -2121,11 +2130,14 @@ \def\referencestructureprefixparameter#kind#name#category#parameter% {\ifcsname\??referencingprefix#name:#category#parameter\endcsname - \csname\??referencingprefix#name:#category#parameter\endcsname + %\csname\??referencingprefix#name:#category#parameter\endcsname + \lastnamedcs \else\ifcsname\??referencingprefix#kind:#category#parameter\endcsname - \csname \??referencingprefix#kind:#category#parameter\endcsname + %\csname \??referencingprefix#kind:#category#parameter\endcsname + \lastnamedcs \else\ifcsname\??referencingprefix:#category#parameter\endcsname - \csname \??referencingprefix:#category#parameter\endcsname + %\csname \??referencingprefix:#category#parameter\endcsname + \lastnamedcs \fi\fi\fi} \def\currentreferencedefault % for some reason we need to explicitly expand |