diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/core-con.mkiv')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/core-con.mkiv | 212 |
1 files changed, 61 insertions, 151 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/core-con.mkiv b/Master/texmf-dist/tex/context/base/mkiv/core-con.mkiv index 303fb12910f..b4f247fcb28 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/core-con.mkiv +++ b/Master/texmf-dist/tex/context/base/mkiv/core-con.mkiv @@ -190,10 +190,10 @@ %D want to use as meaningful commands as possible, and because \TEX\ already %D uses up some of those, we save the original meanings. -% \savenormalmeaning\time -% \savenormalmeaning\year -% \savenormalmeaning\month -% \savenormalmeaning\day +\savenormalmeaning\time +\savenormalmeaning\year +\savenormalmeaning\month +\savenormalmeaning\day %D \macros %D {month,MONTH} @@ -218,7 +218,7 @@ %D \showsetup{month} %D \showsetup{MONTH} -\let\month\monthlong +\let\month \monthlong \unexpanded\def\MONTH #1{\WORD{\month {#1}}} \unexpanded\def\MONTHLONG #1{\WORD{\monthlong {#1}}} @@ -414,43 +414,30 @@ {\dosingleempty\syst_converters_current_date} \def\syst_converters_current_date[#1]% - {\dontleavehmode - \begingroup + {\begingroup \the\everycurrentdate - \clf_currentdate - {#1}{\currentdatespecification}{\labellanguage}% - \normalyear\normalmonth\normalday + \clf_currentdate{#1}{\currentdatespecification}{\labellanguage}% \endgroup} \unexpanded\def\date {\dodoubleempty\syst_converters_date} \def\syst_converters_date[#1][#2]% - {\dontleavehmode - \begingroup - \scratchcounterone \normalyear - \scratchcountertwo \normalmonth - \scratchcounterthree\normalday + {\begingroup \iffirstargument - \letdummyparameter\c!y\empty - \letdummyparameter\c!m\empty - \letdummyparameter\c!d\empty + \letdummyparameter\c!d\normalday + \letdummyparameter\c!m\normalmonth + \letdummyparameter\c!y\normalyear \getdummyparameters[#1]% - \edef\temp{\dummyparameter\c!y}\ifx\temp\empty\else\scratchcounterone \temp\fi - \edef\temp{\dummyparameter\c!m}\ifx\temp\empty\else\scratchcountertwo \temp\fi - \edef\temp{\dummyparameter\c!d}\ifx\temp\empty\else\scratchcounterthree\temp\fi - \relax + \normalday \directdummyparameter\c!d\relax + \normalmonth\directdummyparameter\c!m\relax + \normalyear \directdummyparameter\c!y\relax \fi - \the\everycurrentdate - \clf_currentdate - {#2}{\currentdatespecification}{\labellanguage}% - \scratchcounterone\scratchcountertwo\scratchcounterthree + \syst_converters_current_date[#2]% \endgroup} \def\rawdate[#1]% expandable and no labels - {\clf_currentdate - {#1}{\currentdatespecification}{}% - \normalyear\normalmonth\normalday} + {\clf_currentdate{#1}{\currentdatespecification}{}} %D \macros %D {currenttime} @@ -467,7 +454,7 @@ \let\currentminute\!!plusone \let\currentsecond\!!plusone -% \def\currenttimespecification{h,:,m} +\def\currenttimespecification{h,:,m} \unexpanded\def\currenttime {\doifelsenextoptional\syst_converters_current_time_yes\syst_converters_current_time_nop} @@ -818,119 +805,61 @@ \ifdefined\symbol \else \def\symbol[#1]{#1} \fi % todo -% \defineconversion -% [set 0] -% [{\symbol[bullet]}, -% {\symbol[dash]}, -% {\symbol[star]}, -% {\symbol[triangle]}, -% {\symbol[circle]}, -% {\symbol[medcircle]}, -% {\symbol[bigcircle]}, -% {\symbol[square]}, -% {\symbol[checkmark]}] - -% \defineconversion -% [set 1] -% [\mathematics{\star}, -% \mathematics{\star\star}, -% \mathematics{\star\star\star}, -% \mathematics{\ddagger}, -% \mathematics{\ddagger\ddagger}, -% \mathematics{\ddagger\ddagger\ddagger}, -% \mathematics{\ast}, -% \mathematics{\ast\ast}, -% \mathematics{\ast\ast\ast}] -% -% \defineconversion -% [set 2] -% [\mathematics{\ast}, -% \mathematics{\dag}, -% \mathematics{\ddag}, -% \mathematics{\ast\ast}, -% \mathematics{\dag\dag}, -% \mathematics{\ddag\ddag}, -% \mathematics{\ast\ast\ast}, -% \mathematics{\dag\dag\dag}, -% \mathematics{\ddag\ddag\ddag}, -% \mathematics{\ast\ast\ast\ast}, -% \mathematics{\dag\dag\dag\dag}, -% \mathematics{\ddag\ddag\ddag\ddag}] -% -% \defineconversion -% [set 3] -% [\mathematics{\star}, -% \mathematics{\star\star}, -% \mathematics{\star\star\star}, -% \mathematics{\ddagger}, -% \mathematics{\ddagger\ddagger}, -% \mathematics{\ddagger\ddagger\ddagger}, -% \mathematics{\P}, -% \mathematics{\P\P}, -% \mathematics{\P\P\P}, -% \mathematics{\S}, -% \mathematics{\S\S}, -% \mathematics{\S\S\S}, -% \mathematics{\ast}, -% \mathematics{\ast\ast}, -% \mathematics{\ast\ast\ast}] - \defineconversion [set 0] - [\symbol{bullet}, - \symbol{dash}, - \symbol{star}, - \symbol{triangle}, - \symbol{circle}, - \symbol{medcircle}, - \symbol{bigcircle}, - \symbol{square}, - \symbol{checkmark}] + [{\symbol[bullet]}, + {\symbol[dash]}, + {\symbol[star]}, + {\symbol[triangle]}, + {\symbol[circle]}, + {\symbol[medcircle]}, + {\symbol[bigcircle]}, + {\symbol[square]}] \defineconversion [set 1] - [\textormathchars{⋆}, - \textormathchars{⋆⋆}, - \textormathchars{⋆⋆⋆}, - \textormathchars{‡}, - \textormathchars{‡‡}, - \textormathchars{‡‡‡}, - \textormathchars{∗}, - \textormathchars{∗∗}, - \textormathchars{∗∗∗}] + [\mathematics{\star}, + \mathematics{\star\star}, + \mathematics{\star\star\star}, + \mathematics{\ddagger}, + \mathematics{\ddagger\ddagger}, + \mathematics{\ddagger\ddagger\ddagger}, + \mathematics{\ast}, + \mathematics{\ast\ast}, + \mathematics{\ast\ast\ast}] \defineconversion [set 2] - [\textormathchars{∗}, - \textormathchars{†}, - \textormathchars{‡}, - \textormathchars{∗∗}, - \textormathchars{††}, - \textormathchars{‡‡}, - \textormathchars{∗∗∗}, - \textormathchars{†††}, - \textormathchars{‡‡‡}, - \textormathchars{∗∗∗∗}, - \textormathchars{††††}, - \textormathchars{‡‡‡‡}] + [\mathematics{*}, + \mathematics{\dag}, + \mathematics{\ddag}, + \mathematics{**}, + \mathematics{\dag\dag}, + \mathematics{\ddag\ddag}, + \mathematics{***}, + \mathematics{\dag\dag\dag}, + \mathematics{\ddag\ddag\ddag}, + \mathematics{****}, + \mathematics{\dag\dag\dag\dag}, + \mathematics{\ddag\ddag\ddag\ddag}] \defineconversion [set 3] - [\textormathchars{⋆}, - \textormathchars{⋆⋆}, - \textormathchars{⋆⋆⋆}, - \textormathchars{‡}, - \textormathchars{‡‡}, - \textormathchars{‡‡‡}, - \textormathchars{¶}, - \textormathchars{¶¶}, - \textormathchars{¶¶¶}, - \textormathchars{§}, - \textormathchars{§§}, - \textormathchars{§§§}, - \textormathchars{∗}, - \textormathchars{∗∗}, - \textormathchars{∗∗∗}] + [\mathematics{\star}, + \mathematics{\star\star}, + \mathematics{\star\star\star}, + \mathematics{\ddagger}, + \mathematics{\ddagger\ddagger}, + \mathematics{\ddagger\ddagger\ddagger}, + \mathematics{\P}, + \mathematics{\P\P}, + \mathematics{\P\P\P}, + \mathematics{\S}, + \mathematics{\S\S}, + \mathematics{\S\S\S}, + \mathematics{\ast}, + \mathematics{\ast\ast}, + \mathematics{\ast\ast\ast}] %D Iteration of suggestion by WS on mailinglist 2010.12.22: %D @@ -959,23 +888,4 @@ data {#1}% \relax} -%D For those who sart counting at zero: -%D -%D \starttyping -%D \defineconversionset [zero] [n,zero] [n] -%D -%D \setuphead [sectionconversionset=zero] -%D -%D \starttext -%D \startchapter [title=Introduction] -%D \startsection [title=First topic] \stopsection -%D \startsection [title=Second topic] \stopsection -%D \stopchapter -%D \stoptext -%D \stoptyping - -\def\zeronumberconversion#1{\number\numexpr#1-\plusone\relax} - -\defineconversion [zero] [\zeronumberconversion] - \protect \endinput |