diff options
Diffstat (limited to 'tex/context/base/core-con.mkiv')
-rw-r--r-- | tex/context/base/core-con.mkiv | 96 |
1 files changed, 40 insertions, 56 deletions
diff --git a/tex/context/base/core-con.mkiv b/tex/context/base/core-con.mkiv index 08384a76b..67c378b6d 100644 --- a/tex/context/base/core-con.mkiv +++ b/tex/context/base/core-con.mkiv @@ -74,41 +74,41 @@ %D \showsetup{romannumerals} %D \showsetup{Romannumerals} -\def\romannumerals#1{\ctxlua{converters.romannumerals(\number#1)}} -\def\Romannumerals#1{\ctxlua{converters.Romannumerals(\number#1)}} +\def\romannumerals#1{\ctxcommands{romannumerals(\number#1)}} +\def\Romannumerals#1{\ctxcommands{Romannumerals(\number#1)}} %D Arabic etc: -\def\abjadnumerals #1{\ctxlua{converters.abjadnumerals (\number#1)}} -\def\abjadnodotnumerals#1{\ctxlua{converters.abjadnodotnumerals(\number#1)}} -\def\abjadnaivenumerals#1{\ctxlua{converters.arabicnumerals (\number#1)}} +\def\abjadnumerals #1{\ctxcommands{abjadnumerals (\number#1)}} +\def\abjadnodotnumerals#1{\ctxcommands{abjadnodotnumerals(\number#1)}} +\def\abjadnaivenumerals#1{\ctxcommands{arabicnumerals (\number#1)}} -\def\languagecharacters#1{\ctxlua{converters.alphabetic(\number#1,"\currentlanguage")}} % new -\def\languageCharacters#1{\ctxlua{converters.Alphabetic(\number#1,"\currentlanguage")}} % new +\def\languagecharacters#1{\ctxcommand{alphabetic(\number#1,"\currentlanguage")}} % new +\def\languageCharacters#1{\ctxcommand{Alphabetic(\number#1,"\currentlanguage")}} % new % we could use an auxiliary macro to save some bytes in the format % -% \def\dolanguagecharacters#1#2{\ctxlua{converters.alphabetic(\number#2,"#1")}} +% \def\dolanguagecharacters#1#2{\ctxcommand{alphabetic(\number#2,"#1")}} -\def\thainumerals #1{\ctxlua{converters.alphabetic(\number#1,"thai")}} -\def\devanagarinumerals#1{\ctxlua{converters.alphabetic(\number#1,"devanagari")}} -\def\gurmurkhinumerals #1{\ctxlua{converters.alphabetic(\number#1,"gurmurkhi")}} -\def\gujaratinumerals #1{\ctxlua{converters.alphabetic(\number#1,"gujarati")}} -\def\tibetannumerals #1{\ctxlua{converters.alphabetic(\number#1,"tibetan")}} -\def\greeknumerals #1{\ctxlua{converters.alphabetic(\number#1,"greek")}} -\def\Greeknumerals #1{\ctxlua{converters.Alphabetic(\number#1,"greek")}} -\def\arabicnumerals #1{\ctxlua{converters.alphabetic(\number#1,"arabic")}} -\def\persiannumerals #1{\ctxlua{converters.alphabetic(\number#1,"persian")}} +\def\thainumerals #1{\ctxcommand{alphabetic(\number#1,"thai")}} +\def\devanagarinumerals#1{\ctxcommand{alphabetic(\number#1,"devanagari")}} +\def\gurmurkhinumerals #1{\ctxcommand{alphabetic(\number#1,"gurmurkhi")}} +\def\gujaratinumerals #1{\ctxcommand{alphabetic(\number#1,"gujarati")}} +\def\tibetannumerals #1{\ctxcommand{alphabetic(\number#1,"tibetan")}} +\def\greeknumerals #1{\ctxcommand{alphabetic(\number#1,"greek")}} +\def\Greeknumerals #1{\ctxcommand{Alphabetic(\number#1,"greek")}} +\def\arabicnumerals #1{\ctxcommand{alphabetic(\number#1,"arabic")}} +\def\persiannumerals #1{\ctxcommand{alphabetic(\number#1,"persian")}} -\let\arabicexnumerals \persiannumerals +\let\arabicexnumerals \persiannumerals -\def\koreannumerals #1{\ctxlua{converters.alphabetic(\number#1,"korean")}} -\def\koreannumeralsp#1{\ctxlua{converters.alphabetic(\number#1,"korean-parent")}} -\def\koreannumeralsc#1{\ctxlua{converters.alphabetic(\number#1,"korean-circle")}} +\def\koreannumerals #1{\ctxcommand{alphabetic(\number#1,"korean")}} +\def\koreannumeralsp #1{\ctxcommand{alphabetic(\number#1,"korean-parent")}} +\def\koreannumeralsc #1{\ctxcommand{alphabetic(\number#1,"korean-circle")}} -\def\chinesenumerals #1{\ctxlua{converters.chinesenumerals (\number#1)}} -\def\chinesecapnumerals#1{\ctxlua{converters.chinesecapnumerals(\number#1,"cap")}} -\def\chineseallnumerals#1{\ctxlua{converters.chineseallnumerals(\number#1,"all")}} +\def\chinesenumerals #1{\ctxcommand{chinesenumerals (\number#1)}} +\def\chinesecapnumerals#1{\ctxcommand{chinesecapnumerals(\number#1,"cap")}} +\def\chineseallnumerals#1{\ctxcommand{chineseallnumerals(\number#1,"all")}} %D \macros %D {character,Character} @@ -128,8 +128,8 @@ \def\unknowncharacter{-} % else in lists \relax -\def\character#1{\ctxlua{converters.character (\number#1)}} -\def\Character#1{\ctxlua{converters.Character (\number#1)}} +\def\character#1{\ctxcommand{character(\number#1)}} +\def\Character#1{\ctxcommand{Character(\number#1)}} %D \macros %D {characters,Characters} @@ -141,8 +141,8 @@ %D \showsetup{characters} %D \showsetup{Characters} -\def\characters#1{\ctxlua{converters.characters(\number#1)}} -\def\Characters#1{\ctxlua{converters.Characters(\number#1)}} +\def\characters#1{\ctxcommand{characters(\number#1)}} +\def\Characters#1{\ctxcommand{Characters(\number#1)}} %D \macros %D {greeknumerals,Greeknumerals} @@ -262,8 +262,8 @@ \newcount\normalweekday -\def\getdayoftheweek#1#2#3{\normalweekday\ctxlua{converters.weekday(\number#1,\number#2,\number#3)}} -\def\dayoftheweek #1#2#3{\doconvertday{\ctxlua{converters.weekday(\number#1,\number#2,\number#3)}}} +\def\getdayoftheweek#1#2#3{\normalweekday\ctxcommand{weekday(\number#1,\number#2,\number#3)}} +\def\dayoftheweek #1#2#3{\doconvertday{\ctxcommand{weekday(\number#1,\number#2,\number#3)}}} %D Using this macro in %D @@ -337,24 +337,13 @@ %D {\numberofdays}. \def\doifleapyearelse#1% - {\ifcase\ctxlua{converters.leapyear(\number#1)} - \@EA\secondoftwoarguments - \else - \@EA\firstoftwoarguments - \fi} + {\ctxcommand{doifleapyearelse(\number#1)}} \def\getdayspermonth#1#2% - {\edef\numberofdays{\ctxlua{converters.nofdays(\number#1,\number#2)}}} + {\edef\numberofdays{\ctxcommand{nofdays(\number#1,\number#2)}}} \def\dayspermonth#1#2% - {\ctxlua{converters.nofdays(\number#1,\number#2)}} - -% problem is that we calculate with those numbers -% -% \def\time {\numexpr\ctxlua{converters.textime()}\relax} -% \def\year {\numexpr\ctxlua{converters.year ()}\relax} -% \def\month{\numexpr\ctxlua{converters.month ()}\relax} -% \def\day {\numexpr\ctxlua{converters.day ()}\relax} + {\ctxcommand{nofdays(\number#1,\number#2)}} % \dayoftheweek{2006}{9}{15} % \doifleapyearelse{2000}{OK}{NOT OK} @@ -439,9 +428,7 @@ {\bgroup \the\everycurrentdate \def\betweendates{\let\betweendates\dobetweendates}% - % was \processcommacommandp[#1]\docomplexcurrentdate - \safeedef\ascii{\empty#1}% keep encoded chars - \@EA\processcommalist\@EA[\ascii]\docomplexcurrentdate + \processcommacommand[\ascii]\docomplexcurrentdate \ifdim\lastskip=\datesignal\relax \unskip \fi @@ -451,21 +438,18 @@ {\lowercase{\edef\!!stringa{#1}}% permits usage in \smallcapped \expanded{\processaction[\!!stringa]}% [#1] [ \v!day=>\betweendates\the\normalday, - %\v!day+=>\betweendates\ordinaldaynumber\normalday, \v!day+=>\betweendates\convertnumber{\v!day+}\normalday, \v!month=>\betweendates\month\normalmonth, \v!year=>\betweendates\the\normalyear, \v!space=>\unskip\ \hskip\datesignal,% optimization -) \ =>\unskip\ \hskip\datesignal,% optimization -) d=>\convertnumber\v!day\normalday, - %d+=>\ordinaldaynumber\normalday, d+=>\convertnumber{\v!day+}\normalday, m=>\convertnumber\v!month\normalmonth, j=>\convertnumber\v!year\normalyear, y=>\convertnumber\v!year\normalyear, w=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, dd=>\ifnum\normalday >9 \else0\fi\the\normalday, - %dd+=>\ordinaldaynumber{\ifnum\normalday >9 \else0\fi\the\normalday}, dd+=>\convertnumber{\v!day+}{\ifnum\normalday >9 \else0\fi\the\normalday}, mm=>\ifnum\normalmonth>9 \else0\fi\the\normalmonth, jj=>\expandafter\gobbletwoarguments\the\normalyear, @@ -512,9 +496,9 @@ %D keys \type {h}, \type {m} and a separator. \def\calculatecurrenttime - {\edef\currenthour {\ctxlua{converters.hour ()}}% - \edef\currentminute{\ctxlua{converters.minute()}}% - \edef\currentsecond{\ctxlua{converters.second()}}} + {\edef\currenthour {\ctxcommand{hour ()}}% + \edef\currentminute{\ctxcommand{minute()}}% + \edef\currentsecond{\ctxcommand{second()}}} \let\currenthour \!!plusone \let\currentminute\!!plusone @@ -635,12 +619,12 @@ \def\dododefineconversion#1#2#3% {\ConvertConstantAfter\doifinstringelse{,}{#3} - {\ctxlua{converters.define("#2",\!!bs\detokenize{#3}\!!es)}% + {\ctxcommand{defineconversion("#2",\!!bs\detokenize{#3}\!!es)}% \setgvalue{\??cv#1}{\docheckedconversion{#2}}} {\setgvalue{\??cv#1}{#3}}} -\def\docheckedconversion#1#2% - {\ctxlua{converters.convert("#1",#2)}} +\def\checkedconversion#1#2% + {\ctxcommand{checkedconversion("#1",#2)}} %D If a conversion is just a font switch then we need to make sure %D that the number is indeed end up as number in the input, so we |