diff options
| author | Hans Hagen <pragma@wxs.nl> | 2011-04-22 18:17:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2011-04-22 18:17:00 +0200 |
| commit | e959bf30768a30be6e3a2fb81222d6bea442dc45 (patch) | |
| tree | 9e965a184ff0e929c3de1d1237af38896280e393 /tex/context/base/strc-lst.mkiv | |
| parent | 1957d157cef3b1f7e37740c831daa7994791129a (diff) | |
| download | context-e959bf30768a30be6e3a2fb81222d6bea442dc45.tar.gz | |
beta 2011.04.22 18:17
Diffstat (limited to 'tex/context/base/strc-lst.mkiv')
| -rw-r--r-- | tex/context/base/strc-lst.mkiv | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/tex/context/base/strc-lst.mkiv b/tex/context/base/strc-lst.mkiv index c764b889b..26e2392bd 100644 --- a/tex/context/base/strc-lst.mkiv +++ b/tex/context/base/strc-lst.mkiv @@ -550,28 +550,34 @@ \endgroup} \def\listsymbol@default - {% prefix = no, none, yes - \strut - \doif{\listparameter\c!label}\v!yes{\leftlabeltext\currentlist}% we can use the new command that does left and right - \listparameter\c!starter - \currentlistnumber - \listparameter\c!stopper - \doif{\listparameter\c!label}\v!yes{\rightlabeltext\currentlist}} - -\def\listsymbol@default - {% todo: - % prefix=no (first gone)|none (all gone)|yes - % number=no|yes - \strut - \doifelse{\listparameter\c!label}\v!yes - {\leftlabeltext\currentlist - \listparameter\c!starter - \currentlistnumber - \listparameter\c!stopper - \rightlabeltext\currentlist} - {\listparameter\c!starter - \currentlistnumber - \listparameter\c!stopper}} + {\strut + \begingroup + \edef\currentlistlabel{\listparameter\c!label}% + \ifx\currentlistlabel\empty % default + \listparameter\c!starter + \currentlistnumber + \listparameter\c!stopper + \else\ifx\currentlistlabel\v!no % also default + \listparameter\c!starter + \currentlistnumber + \listparameter\c!stopper + \else\ifx\currentlistlabel\v!none % real minimal (as suggested by WS) + \currentlistnumber + \else\ifx\currentlistlabel\v!yes % auto (use value stored in tuc file) + \edef\currentlistlabel{\ctxlua{structures.lists.label(\currentlistindex)}}% + \leftlabeltext\currentlistlabel + \listparameter\c!starter + \currentlistnumber + \listparameter\c!stopper + \rightlabeltext\currentlistlabel + \else % use whatever is set + \leftlabeltext\currentlistlabel + \listparameter\c!starter + \currentlistnumber + \listparameter\c!stopper + \rightlabeltext\currentlistlabel + \fi\fi\fi\fi + \endgroup} \def\listsymbol@unknown {\listparameter\c!symbol} |