diff options
author | Karl Berry <karl@freefriends.org> | 2010-01-06 01:30:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-01-06 01:30:41 +0000 |
commit | f30988fcf5a859f3c9bbca97434679d6b3a33f92 (patch) | |
tree | 55092f9893f026dc124a8ebdff9f508002f1012b /Master/texmf-dist/tex/latex/isodate/norsk.idf | |
parent | 5c8a45dcb9242b82ba4ae1888fc8c2f99b518668 (diff) |
isodate update (5jan10)
git-svn-id: svn://tug.org/texlive/trunk@16613 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/isodate/norsk.idf')
-rw-r--r-- | Master/texmf-dist/tex/latex/isodate/norsk.idf | 125 |
1 files changed, 77 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/isodate/norsk.idf b/Master/texmf-dist/tex/latex/isodate/norsk.idf index e41972bb4e9..f42ab156bc0 100644 --- a/Master/texmf-dist/tex/latex/isodate/norsk.idf +++ b/Master/texmf-dist/tex/latex/isodate/norsk.idf @@ -8,7 +8,7 @@ %% %% isodate package %% -%% Copyright 2000--2005 Harald Harders +%% Copyright 2000--2010 Harald Harders %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN @@ -18,67 +18,96 @@ %% h.harders@tu-bs.de %% \ProvidesFile{norsk.idf} - [2005/04/15 v2.28 Language definitions for isodate package (HH)] + [2010/01/03 v2.30 Language definitions for isodate package (HH)] \let\iso@languageloaded\active \typeout{Define commands for Norwegian date format} \def\month@norsk{\ifcase\month\or januar\or februar\or mars\or april\or mai\or juni\or juli\or august\or september\or oktober\or november\or desember\fi} - \def\iso@printmonthday@norsk#1#2{% - \ifthenelse{\equal{\iso@dateformat}{numeric}\or% - \equal{\iso@dateformat}{short}}{% - \iso@printday{#2}/\iso@printmonth{#1}\ifiso@printyear/\fi}{% - \ifthenelse{\equal{\iso@dateformat}{iso}}{% - \ifiso@printyear\iso@isodash\fi - \iso@printmonth{#1}\iso@isodash\iso@printday{#2}}{% - \ifthenelse{\equal{\iso@dateformat}{TeX}}{% - \ifiso@printyear/\fi\iso@printmonth{#1}/\iso@printday{#2}}{% - \ifthenelse{\equal{\iso@dateformat}{orig}\or - \equal{\iso@dateformat}{shortorig}}{% - \iso@printday{#2}.~\begingroup - \edef\lmonth{#1}\def\month{\lmonth}% - \month@norsk% - \endgroup - }{}}}}% - } - \def\iso@printdate@norsk#1#2#3{% - \ifthenelse{\equal{\iso@dateformat}{iso}\or% - \equal{\iso@dateformat}{TeX}}{% - \ifiso@printyear\iso@yearfour{\number#1}\fi}{}% +\def\iso@printmonthday@norsk#1#2{% + \ifthenelse{\equal{\iso@dateformat}{iso}\OR + \equal{\iso@dateformat}{TeX}}{% + \iso@printmonthday@int{#1}{#2}% + }{% + \ifthenelse{\equal{\iso@dateformat}{numeric}\OR + \equal{\iso@dateformat}{short}}{% + \ifiso@doprintday + \iso@printday{#2}/% + \fi + \iso@printmonth{#1}% + }{% + \ifthenelse{\equal{\iso@dateformat}{orig}\OR + \equal{\iso@dateformat}{shortorig}}{% + \ifiso@doprintday + \iso@printday{#2}.\iso@monthsep + \fi + \begingroup + \edef\lmonth{#1}\def\month{\lmonth}% + \month@norsk% + \endgroup + }{}% + }% + }% +} +\def\iso@printdate@norsk#1#2#3{% + \ifthenelse{\equal{\iso@dateformat}{iso}\OR + \equal{\iso@dateformat}{TeX}}{% + \iso@printdate@int{#1}{#2}{#3}% + }{% \iso@printmonthday@norsk{\number#2}{\number#3}% \ifiso@printyear - \ifthenelse{\equal{\iso@dateformat}{numeric}}{\iso@yearfour{\number#1}}{% - \ifthenelse{\equal{\iso@dateformat}{orig}}{~\iso@yearfour{\number#1}}{% + \ifthenelse{\equal{\iso@dateformat}{orig}\OR + \equal{\iso@dateformat}{shortorig}}{% + }{% + /% + }% + \ifthenelse{\equal{\iso@dateformat}{numeric}}{% + \iso@yearfour{\number#1}% + }{% + \ifthenelse{\equal{\iso@dateformat}{orig}}{% + \iso@yearsep\iso@yearfour{\number#1}% + }{% \ifthenelse{\equal{\iso@dateformat}{shortorig}}{% - ~\iso@twodigitsign\iso@yeartwo{\number#1}}{% + \iso@yearsep\iso@twodigitsign\iso@yeartwo{\number#1}% + }{% \ifthenelse{\equal{\iso@dateformat}{short}}{% - \iso@yeartwo{\number#1}}{% - }}}}% + \iso@yeartwo{\number#1}% + }{}% + }% + }% + }% \fi - } - \def\iso@datenorsk{% - \def\today{\iso@printdate@norsk{\year}{\month}{\day}}}% - \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{% - \iso@daterange@norsk}% + }% +} +\def\iso@datenorsk{% + \def\today{\iso@printdate@norsk{\year}{\month}{\day}}}% +\expandafter\def\csname iso@daterange@\CurrentOption\endcsname{% + \iso@daterange@norsk}% \def\iso@daterange@norsk#1#2#3#4#5#6{% - \ifthenelse{\equal{\iso@dateformat}{iso}\or% + \ifthenelse{\equal{\iso@dateformat}{iso}\OR \equal{\iso@dateformat}{TeX}}{% - \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}% - \iso@rangesign% - \ifthenelse{\equal{\number#1}{\number#4}}{% - \ifthenelse{\equal{\number#2}{\number#5}}{\iso@printday{#6}% - }{\iso@printmonthday@norsk{#5}{#6}}}{% - \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}}}{% + \iso@daterange@int{#1}{#2}{#3}{#4}{#5}{#6}% + }{% \ifthenelse{\equal{\number#1}{\number#4}}{% \ifthenelse{\equal{\number#2}{\number#5}}{% - \ifthenelse{\equal{\iso@dateformat}{orig}\or - \equal{\iso@dateformat}{shortorig}}{% - \iso@printday{#3}.}{\iso@printday{#3}}% - }{\iso@printmonthday@norsk{#2}{#3}}}{% - \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}}% - \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{% - #4}{#5}{#6}% - }{% + \ifiso@doprintday + \ifthenelse{\equal{\iso@dateformat}{orig}\OR + \equal{\iso@dateformat}{shortorig}}{% + \iso@printday{#3}.% + }{% + \iso@printday{#3}% + }% + \else + \iso@printmonthday@norsk{#2}{#3}% + \fi + }{% + \iso@printmonthday@norsk{#2}{#3}% + }% + }{% + \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}% + }% + \iso@rangesign + \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}% }% } \expandafter\def\csname iso@rangesign@\CurrentOption\endcsname{~til~} |