diff options
author | Hans Hagen <pragma@wxs.nl> | 2000-05-11 00:00:00 +0200 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2000-05-11 00:00:00 +0200 |
commit | 73000ea3b7c8225c980f40ef90b86e2d57fe4003 (patch) | |
tree | 90bf5cda9ff8d82550f402ca55e18d010cc29153 /tex/context/base/core-con.tex | |
parent | dd50c74f0702bff05e96d5d3994316405414663e (diff) | |
download | context-73000ea3b7c8225c980f40ef90b86e2d57fe4003.tar.gz |
stable 2000.05.11
Diffstat (limited to 'tex/context/base/core-con.tex')
-rw-r--r-- | tex/context/base/core-con.tex | 59 |
1 files changed, 25 insertions, 34 deletions
diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex index 7acd94912..b378db9d9 100644 --- a/tex/context/base/core-con.tex +++ b/tex/context/base/core-con.tex @@ -246,40 +246,29 @@ \def\getdayoftheweek#1#2#3% {\bgroup - \!!counta=\ifcase#2\relax - 0\or 0\or 31\or 59\or 90\or120\or151\or - 181\or212\or243\or273\or304\or334\or365\fi - \advance\!!counta by #1\relax - \ifnum\!!counta<31 - \DoMod#3by4to\!!countb - \ifnum\!!countb=0 - \!!doneafalse - \DoMod#3by100to\!!countb - \ifnum\!!countb=0 \else \!!doneatrue \fi - \DoMod#3by400to\!!countb - \ifnum\!!countb=0 \!!doneatrue \fi - \else - \!!doneafalse - \fi - \else - \!!doneafalse + \!!counta=#3\relax + \advance\!!counta -1 + \!!countb=\!!counta + \multiply\!!countb 365 + \advance\!!countb \ifcase#2\relax + 0 \or 0 \or 31 \or 59 \or 90 \or120 \or151 \or + 181 \or212 \or243 \or273 \or304 \or334 \or365 \fi + \advance\!!countb #1\relax + \ifnum#2>2 + \doifleapyearelse{#3}{\advance\!!countb 1}{}\relax \fi - \!!countb=#3\relax - \multiply\!!countb by 365 - \advance\!!counta by \!!countb - \DoDiv#3by4to\!!countb - \advance\!!counta by \!!countb - \DoDiv#3by400to\!!countb - \advance\!!counta by \!!countb - \DoDiv#3by100to\!!countb - \advance\!!counta by -\!!countb - \if!!donea - \advance\!!counta by -1 - \fi - \advance\!!counta by -1 - \DoMod\!!counta by7to\!!counta - \advance\!!counta by 1 - \@EA\egroup\@EA\normalweekday\the\!!counta\relax} + \!!countc=\!!counta + \DoDiv\!!countc by4to\!!countc + \advance\!!countb \!!countc + \!!countc=\!!counta + \DoDiv\!!countc by100to\!!countc + \advance\!!countb -\!!countc + \!!countc=\!!counta + \DoDiv\!!countc by400to\!!countc + \advance\!!countb \!!countc + \DoMod\!!countb by7to\!!countb + \advance\!!countb 1 + \@EA\egroup\@EA\normalweekday\the\!!countb\relax} \def\dayoftheweek#1#2#3% {\getdayoftheweek{#1}{#2}{#3}\doconvertday{\normalweekday}} @@ -440,6 +429,8 @@ %D \haalbuffer %D \stopregels +\def\kenmerkdatumpatroon{j,mm,dd} % jj,mm,dd changed at januari 1-1-2000 + \def\complexcurrentdate[#1]% {\bgroup \let\labellanguage=\currentlanguage @@ -455,7 +446,7 @@ j=>\the\normalyear, y=>\the\normalyear, w=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, - \v!kenmerk=>{\complexcurrentdate[jj,mm,dd]}, + \v!kenmerk=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]}, \v!dag=>\betweendates\the\normalday, \v!maand=>\betweendates\month\normalmonth, \v!MAAND=>\betweendates\MONTH\normalmonth, |