diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-10 20:55:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-10 20:55:20 +0000 |
commit | fe7eb475424b6da9570efd4cb2ab66f07480c614 (patch) | |
tree | cabab0a5a5833efbb5e1c02fcd14fd227c3e6e51 /Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf | |
parent | c5e51871b0822153231509ed07f5654fb8c08164 (diff) |
datetime2-german (10sep17)
git-svn-id: svn://tug.org/texlive/trunk@45264 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf')
-rw-r--r-- | Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf | 98 |
1 files changed, 73 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf index 8488d83e056..c44dcad0764 100644 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf @@ -8,16 +8,18 @@ %% %% datetime2-german.dtx %% Copyright 2015 Nicola Talbot +%% Copyright 2017 Sebastian Friedl %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license of (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2008/05/04 or later. %% -%% This work has the LPPL maintenance status `inactive'. +%% This work has the LPPL maintenance status `maintained'. +%% Current maintainer of the work is Sebastian Friedl %% %% This work consists of the files datetime2-german.dtx and %% datetime2-german.ins and the derived files @@ -39,7 +41,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{german}[2017/03/09 v1.1] +\ProvidesDateTimeModule{german}[2017/09/10 v1.2] \RequirePackage{ifxetex,ifluatex} \ifxetex \RequireDateTimeModule{german-utf8} @@ -50,11 +52,12 @@ \RequireDateTimeModule{german-ascii} \fi \fi +\newcommand*{\DTMgermandowdaysep}{,\space} \newcommand*{\DTMgermandaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}} \newcommand*{\DTMgermanmonthyearsep}{\space} -\newcommand*{\DTMgermandatetimesep}{\space} +\newcommand*{\DTMgermandatetimesep}{,\space} \newcommand*{\DTMgermantimezonesep}{\space} -\newcommand*{\DTMgermandatesep}{/} +\newcommand*{\DTMgermandatesep}{.} \newcommand*{\DTMgermantimesep}{:} \DTMdefkey{german}{daymonthsep}{\renewcommand*{\DTMgermandaymonthsep}{#1}} \DTMdefkey{german}{monthyearsep}{\renewcommand*{\DTMgermanmonthyearsep}{#1}} @@ -62,6 +65,8 @@ \DTMdefkey{german}{timezonesep}{\renewcommand*{\DTMgermantimezonesep}{#1}} \DTMdefkey{german}{datesep}{\renewcommand*{\DTMgermandatesep}{#1}} \DTMdefkey{german}{timesep}{\renewcommand*{\DTMgermantimesep}{#1}} +\DTMdefboolkey{german}{abbr}[true]{} +\DTMsetbool{german}{abbr}{false} \DTMdefboolkey{german}{mapzone}[true]{} \DTMsetbool{german}{mapzone}{true} \DTMdefboolkey{german}{showdayofmonth}[true]{} @@ -72,34 +77,66 @@ {german}% label {% date style \renewcommand*\DTMdisplaydate[4]{% + \ifDTMshowdow + \ifnum##4>-1 + \DTMifbool{german}{abbr}% + {\DTMgermanshortweekdayname{##4}}% + {\DTMgermanweekdayname{##4}}% + \DTMgermandowdaysep + \fi + \fi + % \DTMifbool{german}{showdayofmonth}% {\DTMgermanordinal{##3}\DTMgermandaymonthsep}% {}% - \DTMgermanmonthname{##2}% + % + \DTMifbool{german}{abbr}% + {\DTMgermanshortmonthname{##2}}% + {\DTMgermanmonthname{##2}}% + % \DTMifbool{german}{showyear}% {% - \DTMgermanmonthyearsep - \number##1 % space intended + \DTMgermanmonthyearsep% + \DTMifbool{german}{abbr}% + {'\DTMtwodigits{##1}}% + {\number##1 }% space intended }% {}% }% \renewcommand*\DTMDisplaydate[4]{% + \ifDTMshowdow + \ifnum##4>-1 + \DTMifbool{german}{abbr}% + {\DTMgermanshortweekdayname{##4}}% + {\DTMgermanweekdayname{##4}}% + \DTMgermandowdaysep + \fi + \fi + % \DTMifbool{german}{showdayofmonth}% - {% - \DTMgermanordinal{##3}\DTMgermandaymonthsep - \DTMgermanmonthname{##2}% - }% + {\DTMgermanordinal{##3}\DTMgermandaymonthsep}% + {}% + % + \DTMifbool{german}{abbr}% + {\DTMgermanshortmonthname{##2}}% {\DTMgermanmonthname{##2}}% + % \DTMifbool{german}{showyear}% {% - \DTMgermanmonthyearsep - \number##1 % space intended + \DTMgermanmonthyearsep% + \DTMifbool{german}{abbr}% + {'\DTMtwodigits{##1}}% + {\number##1 }% space intended }% {}% + } }% - }% {% time style (use default) - \DTMsettimestyle{default}% + \renewcommand*\DTMdisplaytime[3]{% + \DTMtwodigits{##1}% + \DTMgermantimesep\DTMtwodigits{##2}% + \ifDTMshowseconds\DTMgermantimesep\DTMtwodigits{##3}\fi + }% }% {% zone style \DTMresetzones @@ -141,17 +178,28 @@ {german-numeric}% label {% date style \renewcommand*\DTMdisplaydate[4]{% + \ifDTMshowdow + \ifnum##4>-1 + \DTMifbool{german}{abbr}% + {\DTMgermanshortweekdayname{##4}}% + {\DTMgermanweekdayname{##4}}% + \DTMgermandowdaysep + \fi + \fi + % \DTMifbool{german}{showdayofmonth}% {% - \number##3 % space intended + \DTMtwodigits{##3}% \DTMgermandatesep }% {}% - \number##2 % space intended + \DTMtwodigits{##2}% \DTMifbool{german}{showyear}% {% - \DTMgermandatesep - \number##1 % space intended + \DTMgermandatesep% + \DTMifbool{german}{abbr}% + {\DTMtwodigits{##1}}% + {\number##1 }% space intended }% {}% }% @@ -159,7 +207,7 @@ }% {% time style \renewcommand*\DTMdisplaytime[3]{% - \number##1 + \DTMtwodigits{##1}% \DTMgermantimesep\DTMtwodigits{##2}% \ifDTMshowseconds\DTMgermantimesep\DTMtwodigits{##3}\fi }% @@ -191,8 +239,8 @@ \renewcommand*{\DTMDisplay}{\DTMdisplay}% } \newcommand*{\DTMgermanzonemaps}{% - \DTMdefzonemap{01}{00}{CET}% - \DTMdefzonemap{02}{00}{CEST}% + \DTMdefzonemap{01}{00}{MEZ}% + \DTMdefzonemap{02}{00}{MESZ}% } \DTMifcaseregional |