diff options
| author | Hans Hagen <pragma@wxs.nl> | 2002-04-17 00:00:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2002-04-17 00:00:00 +0200 |
| commit | 64f02e3e5cbd20af19a0089553db5ee5c7d5eca1 (patch) | |
| tree | eb1ec97588f7ba468d649d8ca57812860e88618d /tex/context/base/core-con.tex | |
| parent | 953aec80be6e084ee21459d3618af2221fc5df08 (diff) | |
| download | context-64f02e3e5cbd20af19a0089553db5ee5c7d5eca1.tar.gz | |
stable 2002.04.17
Diffstat (limited to 'tex/context/base/core-con.tex')
| -rw-r--r-- | tex/context/base/core-con.tex | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex index 927a94f0f..165701a24 100644 --- a/tex/context/base/core-con.tex +++ b/tex/context/base/core-con.tex @@ -471,17 +471,26 @@ \def\kenmerkdatumpatroon{j,mm,dd} % jj,mm,dd changed at januari 1-1-2000 +\newsignal\datesignal + +\def\dobetweendates% + {\ifdim\lastskip=\datesignal\relax\else + \unskip\space + \hskip\datesignal\relax + \fi} + % \def\complexcurrentdate[#1]% % {\bgroup % \let\labellanguage\currentlanguage -% \def\betweendates{\let\betweendates\space}% +% \def\betweendates{\let\betweendates\dobetweendates}% % \lowercase{\edef\!!stringa{#1}}% permits usage in \kap % \@EA\processallactionsinset\@EA % [\!!stringa] % [ \v!dag=>\betweendates\the\normalday, % \v!maand=>\betweendates\month\normalmonth, % \v!jaar=>\betweendates\the\normalyear, -% \ =>\ , % optimization -) +% \space=>\unskip\ \hskip\datesignal,% optimization -) +% \ =>\unskip\ \hskip\datesignal,% optimization -) % d=>\the\normalday, % m=>\the\normalmonth, % j=>\the\normalyear, @@ -492,25 +501,16 @@ % jj=>\expandafter\gobbletwoarguments\the\normalyear, % yy=>\expandafter\gobbletwoarguments\the\normalyear, % \v!weekdag=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, -% % \v!MAAND=>\betweendates\MONTH\normalmonth, -% % \v!WEEKDAG=>\betweendates -% % \bgroup -% % \let\labeltext=\LABELTEXT -% % \dayoftheweek\normalday\normalmonth\normalyear -% % \egroup, % \v!kenmerk=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]}, -% \s!unknown=>\commalistelement -% \def\betweendates{\let\betweendates\space}]% +% \s!unknown=>\unskip +% \commalistelement +% \hskip\datesignal +% \def\betweendates{\let\betweendates\dobetweendates}]% +% \ifdim\lastskip=\datesignal\relax +% \unskip +% \fi % \egroup} -\newsignal\datesignal - -\def\dobetweendates% - {\ifdim\lastskip=\datesignal\relax\else - \unskip\space - \hskip\datesignal\relax - \fi} - \def\complexcurrentdate[#1]% {\bgroup \let\labellanguage\currentlanguage @@ -519,15 +519,19 @@ \@EA\processallactionsinset\@EA [\!!stringa] [ \v!dag=>\betweendates\the\normalday, + \v!dag+=>\betweendates\ordinaldaynumber\normalday, \v!maand=>\betweendates\month\normalmonth, \v!jaar=>\betweendates\the\normalyear, + \v!spatie=>\unskip\ \hskip\datesignal,% optimization -) \ =>\unskip\ \hskip\datesignal,% optimization -) d=>\the\normalday, + d+=>\ordinaldaynumber\normalday, m=>\the\normalmonth, j=>\the\normalyear, y=>\the\normalyear, w=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, dd=>\ifnum\normalday >9 \else0\fi\the\normalday, + dd+=>\ordinaldaynumber{\ifnum\normalday >9 \else0\fi\the\normalday}, mm=>\ifnum\normalmonth>9 \else0\fi\the\normalmonth, jj=>\expandafter\gobbletwoarguments\the\normalyear, yy=>\expandafter\gobbletwoarguments\the\normalyear, @@ -769,6 +773,4 @@ \mathematics{\ast\ast}, \mathematics{\ast\ast\ast}] -\protect - -\endinput +\protect \endinput |