diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-02-20 15:15:08 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-02-20 15:15:08 +0100 |
| commit | 93dce457ab8769ef45a56b2e0f7ad447d7a47a83 (patch) | |
| tree | 2374ca50eceb2aab1a5d0af0ba26dc129eb19ab6 /tex/context/base/mkiv/core-con.mkiv | |
| parent | b13dd166ce8563c60c10affc97ab28940d6a7776 (diff) | |
| download | context-93dce457ab8769ef45a56b2e0f7ad447d7a47a83.tar.gz | |
2016-02-20 14:58:00
Diffstat (limited to 'tex/context/base/mkiv/core-con.mkiv')
| -rw-r--r-- | tex/context/base/mkiv/core-con.mkiv | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tex/context/base/mkiv/core-con.mkiv b/tex/context/base/mkiv/core-con.mkiv index afd3f34c4..b440672bb 100644 --- a/tex/context/base/mkiv/core-con.mkiv +++ b/tex/context/base/mkiv/core-con.mkiv @@ -242,8 +242,8 @@ %D \showsetup{weekday} %D \showsetup{WEEKDAY} -\unexpanded\def\weekday#1{\clf_day\numexpr#1\relax} -\unexpanded\def\WEEKDAY#1{\WORD{\clf_day\numexpr#1\relax}} +\unexpanded\def\weekday#1{\clf_dayname\numexpr#1\relax} +\unexpanded\def\WEEKDAY#1{\WORD{\clf_dayname\numexpr#1\relax}} %D \macros %D {getdayoftheweek, dayoftheweek} @@ -325,8 +325,8 @@ %D This macro takes care of proper spacing and delivers for instance: %D %D \startbuffer -%D \currentdate[weekday,day,month,year] % still dutch example -%D \currentdate[WEEKDAY,day,MONTH,year] % still dutch example +%D \currentdate[weekday,day,month,year] +%D \currentdate[WEEKDAY,day,MONTH,year] %D \stopbuffer %D %D \startlines @@ -467,7 +467,6 @@ \unexpanded\def\syst_converters_current_time_nop {\normalexpanded{\syst_converters_current_time_yes[\currenttimespecification]}} - %D Because we're dealing with dates, we also introduce a few day loops: %D %D \starttyping @@ -607,14 +606,15 @@ % \doloop{\doifelseconversionnumber{ctx}{\recurselevel}{[\recurselevel]}{\exitloop}} %D \macros -%D {ordinaldaynumber, highordinalstr, ordinalstr} +%D {ordinalnumber, highordinalstr, ordinalstr} %D %D Efficient general ordinal number converters are sometimes difficult to %D implement. Fortunately dates never exceed the number~31. \def\highordinalstr #1{\high{\notsmallcapped{#1}}} \def\ordinalstr #1{\notsmallcapped{#1}} -\def\ordinaldaynumber #1{\clf_ordinal\numexpr#1\relax{\currentlanguage}} +\def\ordinalnumber #1{\clf_ordinal\numexpr#1\relax{\currentlanguage}} +\def\Ordinalnumber #1{\Words{\clf_ordinal\numexpr#1\relax{\currentlanguage}}} \def\verbosenumber #1{\clf_verbose\numexpr#1\relax{\currentlanguage}} \def\VerboseNumber #1{\Words{\clf_verbose\numexpr#1\relax{\currentlanguage}}} @@ -660,6 +660,9 @@ \defineconversion [\v!Word] [\VerboseNumber] \defineconversion [\v!Words] [\VerboseNumber] +\defineconversion[\v!ordinal] [\ordinalnumber] +\defineconversion[\v!Ordinal] [\Ordinalnumber] + \defineconversion [n] [\numbers] \defineconversion [N] [\Numbers] \defineconversion [m] [\mediaeval] |