From 3d9c8e58c87e743f0f0b12dc32c8213bcdf4ed27 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 14 Dec 2019 22:26:29 +0000 Subject: datetime2-german (14dec19) git-svn-id: svn://tug.org/texlive/trunk@53125 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/datetime2-german/datetime2-de-AT.ldf | 64 +++--- .../tex/latex/datetime2-german/datetime2-de-CH.ldf | 43 ++-- .../tex/latex/datetime2-german/datetime2-de-DE.ldf | 43 ++-- .../datetime2-german/datetime2-german-ascii.ldf | 225 --------------------- .../datetime2-german-base-ascii.ldf | 192 ++++++++++++++++++ .../datetime2-german-base-utf8.ldf | 192 ++++++++++++++++++ .../datetime2-german/datetime2-german-base.ldf | 103 ++++++++++ .../datetime2-german/datetime2-german-utf8.ldf | 225 --------------------- .../latex/datetime2-german/datetime2-german.ldf | 44 ++-- 9 files changed, 585 insertions(+), 546 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-ascii.ldf create mode 100644 Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf create mode 100644 Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf create mode 100644 Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base.ldf delete mode 100644 Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-utf8.ldf (limited to 'Master/texmf-dist/tex/latex/datetime2-german') diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-AT.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-AT.ldf index 9b4116be517..d0019d0f7f1 100644 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-AT.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-AT.ldf @@ -4,11 +4,11 @@ %% %% The original source files were: %% -%% datetime2-german.dtx (with options: `datetime2-de-AT.ldf,package') +%% datetime2-de-AT.dtx (with options: `datetime2-de-AT.ldf,package') %% %% datetime2-german.dtx %% Copyright 2015 Nicola Talbot -%% Copyright 2017 Sebastian Friedl +%% Copyright 2017-19 Sebastian Friedl %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -21,12 +21,16 @@ %% 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 -%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf, -%% datetime2-german.ldf, datetime2-de-DE.ldf, -%% datetime2-de-AT.ldf and datetime2-de-CH.ldf -%% +%% This work consists of the files and the derived files: +%% - datetime2-german.ins, - datetime2-german-base.ldf, +%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf, +%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf, +%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf, +%% - datetime2-german.ldf, - datetime2-de-DE.ldf, +%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and +%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf +%% - datetime2-de-CH.ldf and +%% - datetime2-german-doc.dtx %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -42,14 +46,14 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{de-AT}[2017/11/13 v2.1] -\RequireDateTimeModule{german} +\ProvidesDateTimeModule{de-AT}[2019/12/13 v3.0] +\RequireDateTimeModule{german-base} \newcommand*{\DTMdeATdowdaysep}{,\space} \newcommand*{\DTMdeATdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}} \newcommand*{\DTMdeATmonthyearsep}{\space} \newcommand*{\DTMdeATdatetimesep}{,\space} \newcommand*{\DTMdeATtimezonesep}{\space} -\newcommand*{\DTMdeATdatesep}{-} +\newcommand*{\DTMdeATdatesep}{.} \newcommand*{\DTMdeATtimesep}{:} \DTMdefkey{de-AT}{dowdaysep}{\renewcommand*{\DTMdeATdowdaysep}{#1}} \DTMdefkey{de-AT}{daymonthsep}{\renewcommand*{\DTMdeATdaymonthsep}{#1}} @@ -167,19 +171,28 @@ {de-AT-numeric}% label {% date style \renewcommand*\DTMdisplaydate[4]{% - \DTMifbool{de-AT}{showyear}% + \ifDTMshowdow + \ifnum##4>-1 + \DTMifbool{de-AT}{abbr}% + {\DTMgermanshortweekdayname{##4}}% + {\DTMgermanweekdayname{##4}}% + \DTMdeATdowdaysep + \fi + \fi + % + \DTMifbool{de-AT}{showdayofmonth}% {% - \number##1 % space intended - \DTMdeATdatesep% + \DTMtwodigits{##3}% + \DTMdeATdatesep }% {}% - % \DTMtwodigits{##2}% - % - \DTMifbool{de-AT}{showdayofmonth}% + \DTMdeATdatesep% + \DTMifbool{de-AT}{showyear}% {% - \DTMdeATdatesep% - \DTMtwodigits{##3}% + \DTMifbool{de-AT}{abbr}% + {\DTMtwodigits{##1}}% + {\number##1 }% space intended }% {}% }% @@ -219,20 +232,19 @@ \renewcommand*{\DTMDisplay}{\DTMdisplay}% } \DTMifcaseregional -{}% do nothing -{\DTMsetstyle{de-AT}}% -{\DTMsetstyle{de-AT-numeric}}% + {}% do nothing + {\DTMsetstyle{de-AT}}% + {\DTMsetstyle{de-AT-numeric}}% \ifcsundef{date\CurrentTrackedDialect} {% \ifundef\dategerman - {% do nothing - }% + {}% do nothing {% \def\dategerman{% \DTMifcaseregional {}% do nothing - {\DTMsetstyle{german}}% - {\DTMsetstyle{german-numeric}}% + {\DTMsetstyle{de-AT}}% + {\DTMsetstyle{de-AT-numeric}}% }% }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-CH.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-CH.ldf index 849a016dbc9..ddd27456981 100644 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-CH.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-CH.ldf @@ -4,11 +4,11 @@ %% %% The original source files were: %% -%% datetime2-german.dtx (with options: `datetime2-de-CH.ldf,package') +%% datetime2-de-CH.dtx (with options: `datetime2-de-CH.ldf,package') %% %% datetime2-german.dtx %% Copyright 2015 Nicola Talbot -%% Copyright 2017 Sebastian Friedl +%% Copyright 2017-19 Sebastian Friedl %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -21,12 +21,16 @@ %% 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 -%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf, -%% datetime2-german.ldf, datetime2-de-DE.ldf, -%% datetime2-de-AT.ldf and datetime2-de-CH.ldf -%% +%% This work consists of the files and the derived files: +%% - datetime2-german.ins, - datetime2-german-base.ldf, +%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf, +%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf, +%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf, +%% - datetime2-german.ldf, - datetime2-de-DE.ldf, +%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and +%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf +%% - datetime2-de-CH.ldf and +%% - datetime2-german-doc.dtx %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -42,8 +46,8 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{de-CH}[2017/11/13 v2.1] -\RequireDateTimeModule{german} +\ProvidesDateTimeModule{de-CH}[2019/12/13 v3.0] +\RequireDateTimeModule{german-base} \newcommand*{\DTMdeCHdowdaysep}{,\space} \newcommand*{\DTMdeCHdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}} \newcommand*{\DTMdeCHmonthyearsep}{\space} @@ -173,7 +177,7 @@ \DTMifbool{de-CH}{abbr}% {\DTMgermanshortweekdayname{##4}}% {\DTMgermanweekdayname{##4}}% -\DTMdeCHdowdaysep + \DTMdeCHdowdaysep \fi \fi % @@ -187,7 +191,9 @@ \DTMdeCHdatesep% \DTMifbool{de-CH}{showyear}% {% - \number##1 % space intended + \DTMifbool{de-CH}{abbr}% + {\DTMtwodigits{##1}}% + {\number##1 }% space intended }% {}% }% @@ -228,20 +234,19 @@ \renewcommand*{\DTMDisplay}{\DTMdisplay}% } \DTMifcaseregional -{}% do nothing -{\DTMsetstyle{de-CH}}% -{\DTMsetstyle{de-CH-numeric}}% + {}% do nothing + {\DTMsetstyle{de-CH}}% + {\DTMsetstyle{de-CH-numeric}}% \ifcsundef{date\CurrentTrackedDialect} {% \ifundef\dategerman - {% do nothing - }% + {}% do nothing {% \def\dategerman{% \DTMifcaseregional {}% do nothing - {\DTMsetstyle{german}}% - {\DTMsetstyle{german-numeric}}% + {\DTMsetstyle{de-CH}}% + {\DTMsetstyle{de-CH-numeric}}% }% }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-DE.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-DE.ldf index c044c92bb59..371db83314f 100644 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-DE.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-de-DE.ldf @@ -4,11 +4,11 @@ %% %% The original source files were: %% -%% datetime2-german.dtx (with options: `datetime2-de-DE.ldf,package') +%% datetime2-de-DE.dtx (with options: `datetime2-de-DE.ldf,package') %% %% datetime2-german.dtx %% Copyright 2015 Nicola Talbot -%% Copyright 2017 Sebastian Friedl +%% Copyright 2017-19 Sebastian Friedl %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -21,12 +21,16 @@ %% 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 -%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf, -%% datetime2-german.ldf, datetime2-de-DE.ldf, -%% datetime2-de-AT.ldf and datetime2-de-CH.ldf -%% +%% This work consists of the files and the derived files: +%% - datetime2-german.ins, - datetime2-german-base.ldf, +%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf, +%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf, +%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf, +%% - datetime2-german.ldf, - datetime2-de-DE.ldf, +%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and +%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf +%% - datetime2-de-CH.ldf and +%% - datetime2-german-doc.dtx %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -42,8 +46,8 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{de-DE}[2017/11/13 v2.1] -\RequireDateTimeModule{german} +\ProvidesDateTimeModule{de-DE}[2019/12/13 v3.0] +\RequireDateTimeModule{german-base} \newcommand*{\DTMdeDEdowdaysep}{,\space} \newcommand*{\DTMdeDEdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}} \newcommand*{\DTMdeDEmonthyearsep}{\space} @@ -90,9 +94,7 @@ \DTMifbool{de-DE}{showyear}% {% \DTMdeDEmonthyearsep% - \DTMifbool{de-DE}{abbr}% - {'\DTMtwodigits{##1}}% - {\number##1 }% space intended + \number##1 % space intended }% {}% }% @@ -117,9 +119,7 @@ \DTMifbool{de-DE}{showyear}% {% \DTMdeDEmonthyearsep% - \DTMifbool{de-DE}{abbr}% - {'\DTMtwodigits{##1}}% - {\number##1 }% space intended + \number##1 % space intended }% {}% } @@ -233,19 +233,18 @@ } \DTMifcaseregional {}% do nothing - {\DTMsetstyle{de-DE}} - {\DTMsetstyle{de-DE-numeric}} + {\DTMsetstyle{de-DE}}% + {\DTMsetstyle{de-DE-numeric}}% \ifcsundef{date\CurrentTrackedDialect} {% \ifundef\dategerman - {% do nothing - }% + {}% do nothing {% \def\dategerman{% \DTMifcaseregional {}% do nothing - {\DTMsetstyle{german}}% - {\DTMsetstyle{german-numeric}}% + {\DTMsetstyle{de-DE}}% + {\DTMsetstyle{de-DE-numeric}}% }% }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-ascii.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-ascii.ldf deleted file mode 100644 index 458f9e11d1e..00000000000 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-ascii.ldf +++ /dev/null @@ -1,225 +0,0 @@ -%% -%% This is file `datetime2-german-ascii.ldf', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% datetime2-german.dtx (with options: `datetime2-german-ascii.ldf,package') -%% -%% 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.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.3c or later is part of all distributions of LaTeX -%% version 2008/05/04 or later. -%% -%% 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 -%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf, -%% datetime2-german.ldf, datetime2-de-DE.ldf, -%% datetime2-de-AT.ldf and datetime2-de-CH.ldf -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -\ProvidesDateTimeModule{german-ascii}[2017/11/13 v2.1] -\newcommand*{\DTMgermanordinal}[1]{% - \number#1 -} -\newcommand*{\DTMgermanmonthname}[1]{% - \ifcase#1 - \or - Januar% - \or - Februar% - \or - M\protect\"arz% - \or - April% - \or - Mai% - \or - Juni% - \or - Juli% - \or - August% - \or - September% - \or - Oktober% - \or - November% - \or - Dezember% - \fi -} -\newcommand*{\DTMdeATmonthname}[1]{% - \ifcase#1 - \or - J\protect\"anner% - \or - Februar% - \or - M\protect\"arz% - \or - April% - \or - Mai% - \or - Juni% - \or - Juli% - \or - August% - \or - September% - \or - Oktober% - \or - November% - \or - Dezember% - \fi -} -\newcommand*{\DTMgermanshortmonthname}[1]{% - \ifcase#1 - \or - Jan.% - \or - Feb.% - \or - M\protect\"arz% - \or - Apr.% - \or - Mai% - \or - Juni% - \or - Juli% - \or - Aug.% - \or - Sept.% - \or - Okt.% - \or - Nov.% - \or - Dez.% - \fi -} -\newcommand*{\DTMdeATshortmonthname}[1]{% - \ifcase#1 - \or - J\protect\"an.% - \or - Feb.% - \or - M\protect\"arz% - \or - Apr.% - \or - Mai% - \or - Juni% - \or - Juli% - \or - Aug.% - \or - Sept.% - \or - Okt.% - \or - Nov.% - \or - Dez.% - \fi -} -\newcommand*{\DTMdeCHshortmonthname}[1]{% -\ifcase#1 -\or -Jan.% -\or -Febr.% -\or -M\protect\"arz% -\or -April% -\or -Mai% -\or -Juni% -\or -Juli% -\or -Aug.% -\or -Sept.% -\or -Okt.% -\or -Nov.% -\or -Dez.% -\fi -} -\newcommand*{\DTMgermanweekdayname}[1]{% - \ifcase#1 - Montag% - \or - Dienstag% - \or - Mittwoch% - \or - Donnerstag% - \or - Freitag% - \or - Samstag% - \or - Sonntag% - \fi -} -\newcommand*{\DTMgermanshortweekdayname}[1]{% - \ifcase#1 - Mo% - \or - Di% - \or - Mi% - \or - Do% - \or - Fr% - \or - Sa% - \or - So% - \fi -} -\endinput -%% -%% End of file `datetime2-german-ascii.ldf'. diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf new file mode 100644 index 00000000000..966a54aee68 --- /dev/null +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf @@ -0,0 +1,192 @@ +%% +%% This is file `datetime2-german-base-ascii.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% datetime2-german-base-ascii.dtx (with options: `datetime2-german-base-ascii.ldf,package') +%% +%% datetime2-german.dtx +%% Copyright 2015 Nicola Talbot +%% Copyright 2017-19 Sebastian Friedl +%% +%% This work may be distributed and/or modified under the +%% 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.3c or later is part of all distributions of LaTeX +%% version 2008/05/04 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% Current maintainer of the work is Sebastian Friedl +%% +%% This work consists of the files and the derived files: +%% - datetime2-german.ins, - datetime2-german-base.ldf, +%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf, +%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf, +%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf, +%% - datetime2-german.ldf, - datetime2-de-DE.ldf, +%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and +%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf +%% - datetime2-de-CH.ldf and +%% - datetime2-german-doc.dtx +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\ProvidesDateTimeModule{german-base-ascii}[2019/12/13 v3.0] +\newcommand*{\DTMgermanmonthname}[1]{% + \ifcase#1 + \or + Januar% + \or + Februar% + \or + M\protect\"arz% + \or + April% + \or + Mai% + \or + Juni% + \or + Juli% + \or + August% + \or + September% + \or + Oktober% + \or + November% + \or + Dezember% + \fi +} +\newcommand*{\DTMdeATmonthname}[1]{% + \ifcase#1 + \or + J\protect\"anner% + \or + Februar% + \or + M\protect\"arz% + \or + April% + \or + Mai% + \or + Juni% + \or + Juli% + \or + August% + \or + September% + \or + Oktober% + \or + November% + \or + Dezember% + \fi +} +\newcommand*{\DTMgermanshortmonthname}[1]{% + \ifcase#1 + \or + Jan.% + \or + Feb.% + \or + M\protect\"arz% + \or + Apr.% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sept.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +\newcommand*{\DTMdeATshortmonthname}[1]{% + \ifcase#1 + \or + J\protect\"an.% + \or + Feb.% + \or + M\protect\"arz% + \or + Apr.% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sept.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +\newcommand*{\DTMdeCHshortmonthname}[1]{% + \ifcase#1 + \or + Jan.% + \or + Febr.% + \or + M\protect\"arz% + \or + April% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sept.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +\endinput +%% +%% End of file `datetime2-german-base-ascii.ldf'. diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf new file mode 100644 index 00000000000..b571b46d9ae --- /dev/null +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf @@ -0,0 +1,192 @@ +%% +%% This is file `datetime2-german-base-utf8.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% datetime2-german-base-utf8.dtx (with options: `datetime2-german-base-utf8.ldf,package') +%% +%% datetime2-german.dtx +%% Copyright 2015 Nicola Talbot +%% Copyright 2017-19 Sebastian Friedl +%% +%% This work may be distributed and/or modified under the +%% 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.3c or later is part of all distributions of LaTeX +%% version 2008/05/04 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% Current maintainer of the work is Sebastian Friedl +%% +%% This work consists of the files and the derived files: +%% - datetime2-german.ins, - datetime2-german-base.ldf, +%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf, +%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf, +%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf, +%% - datetime2-german.ldf, - datetime2-de-DE.ldf, +%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and +%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf +%% - datetime2-de-CH.ldf and +%% - datetime2-german-doc.dtx +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\ProvidesDateTimeModule{german-base-utf8}[2019/12/13 v3.0] +\newcommand*{\DTMgermanmonthname}[1]{% + \ifcase#1 + \or + Januar% + \or + Februar% + \or + März% + \or + April% + \or + Mai% + \or + Juni% + \or + Juli% + \or + August% + \or + September% + \or + Oktober% + \or + November% + \or + Dezember% + \fi +} +\newcommand*{\DTMdeATmonthname}[1]{% + \ifcase#1 + \or + Jänner% + \or + Februar% + \or + März% + \or + April% + \or + Mai% + \or + Juni% + \or + Juli% + \or + August% + \or + September% + \or + Oktober% + \or + November% + \or + Dezember% + \fi +} +\newcommand*{\DTMgermanshortmonthname}[1]{% + \ifcase#1 + \or + Jan.% + \or + Feb.% + \or + März% + \or + Apr.% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sept.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +\newcommand*{\DTMdeATshortmonthname}[1]{% + \ifcase#1 + \or + Jän.% + \or + Feb.% + \or + März% + \or + Apr.% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sept.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +\newcommand*{\DTMdeCHshortmonthname}[1]{% + \ifcase#1 + \or + Jan.% + \or + Febr.% + \or + März% + \or + April% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sept.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +\endinput +%% +%% End of file `datetime2-german-base-utf8.ldf'. diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base.ldf new file mode 100644 index 00000000000..3e7d6e0f17c --- /dev/null +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-base.ldf @@ -0,0 +1,103 @@ +%% +%% This is file `datetime2-german-base.ldf', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% datetime2-german-base.dtx (with options: `datetime2-german-base.ldf,package') +%% +%% datetime2-german.dtx +%% Copyright 2015 Nicola Talbot +%% Copyright 2017-19 Sebastian Friedl +%% +%% This work may be distributed and/or modified under the +%% 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.3c or later is part of all distributions of LaTeX +%% version 2008/05/04 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% Current maintainer of the work is Sebastian Friedl +%% +%% This work consists of the files and the derived files: +%% - datetime2-german.ins, - datetime2-german-base.ldf, +%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf, +%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf, +%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf, +%% - datetime2-german.ldf, - datetime2-de-DE.ldf, +%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and +%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf +%% - datetime2-de-CH.ldf and +%% - datetime2-german-doc.dtx +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\ProvidesDateTimeModule{german-base}[2019/12/13 v3.0] +\newcommand*{\DTMgermanordinal}[1]{% + \number#1 +} +\newcommand*{\DTMgermanweekdayname}[1]{% + \ifcase#1 + Montag% + \or + Dienstag% + \or + Mittwoch% + \or + Donnerstag% + \or + Freitag% + \or + Samstag% + \or + Sonntag% + \fi +} +\newcommand*{\DTMgermanshortweekdayname}[1]{% + \ifcase#1 + Mo% + \or + Di% + \or + Mi% + \or + Do% + \or + Fr% + \or + Sa% + \or + So% + \fi +} +\newcommand*{\DTMgermanzonemaps}{% + \DTMdefzonemap{01}{00}{MEZ}% + \DTMdefzonemap{02}{00}{MESZ}% +} +\RequirePackage{ifxetex, ifluatex} +\ifxetex + \RequireDateTimeModule{german-base-utf8} +\else + \ifluatex + \RequireDateTimeModule{german-base-utf8} + \else + \RequireDateTimeModule{german-base-ascii} + \fi +\fi +\endinput +%% +%% End of file `datetime2-german-base.ldf'. diff --git a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-utf8.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-utf8.ldf deleted file mode 100644 index 2382cac4286..00000000000 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-utf8.ldf +++ /dev/null @@ -1,225 +0,0 @@ -%% -%% This is file `datetime2-german-utf8.ldf', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% datetime2-german.dtx (with options: `datetime2-german-utf8.ldf,package') -%% -%% 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.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.3c or later is part of all distributions of LaTeX -%% version 2008/05/04 or later. -%% -%% 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 -%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf, -%% datetime2-german.ldf, datetime2-de-DE.ldf, -%% datetime2-de-AT.ldf and datetime2-de-CH.ldf -%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -\ProvidesDateTimeModule{german-utf8}[2017/11/13 v2.1] -\newcommand*{\DTMgermanordinal}[1]{% - \number#1 -} -\newcommand*{\DTMgermanmonthname}[1]{% - \ifcase#1 - \or - Januar% - \or - Februar% - \or - März% - \or - April% - \or - Mai% - \or - Juni% - \or - Juli% - \or - August% - \or - September% - \or - Oktober% - \or - November% - \or - Dezember% - \fi -} -\newcommand*{\DTMdeATmonthname}[1]{% - \ifcase#1 - \or - Jänner% - \or - Februar% - \or - März% - \or - April% - \or - Mai% - \or - Juni% - \or - Juli% - \or - August% - \or - September% - \or - Oktober% - \or - November% - \or - Dezember% - \fi -} -\newcommand*{\DTMgermanshortmonthname}[1]{% - \ifcase#1 - \or - Jan.% - \or - Feb.% - \or - März% - \or - Apr.% - \or - Mai% - \or - Juni% - \or - Juli% - \or - Aug.% - \or - Sept.% - \or - Okt.% - \or - Nov.% - \or - Dez.% - \fi -} -\newcommand*{\DTMdeATshortmonthname}[1]{% - \ifcase#1 - \or - Jän.% - \or - Feb.% - \or - März% - \or - Apr.% - \or - Mai% - \or - Juni% - \or - Juli% - \or - Aug.% - \or - Sept.% - \or - Okt.% - \or - Nov.% - \or - Dez.% - \fi -} -\newcommand*{\DTMdeCHshortmonthname}[1]{% - \ifcase#1 - \or - Jan.% - \or - Febr.% - \or - März% - \or - April% - \or - Mai% - \or - Juni% - \or - Juli% - \or - Aug.% - \or - Sept.% - \or - Okt.% - \or - Nov.% - \or - Dez.% - \fi -} -\newcommand*{\DTMgermanweekdayname}[1]{% - \ifcase#1 - Montag% - \or - Dienstag% - \or - Mittwoch% - \or - Donnerstag% - \or - Freitag% - \or - Samstag% - \or - Sonntag% - \fi -} -\newcommand*{\DTMgermanshortweekdayname}[1]{% - \ifcase#1 - Mo% - \or - Di% - \or - Mi% - \or - Do% - \or - Fr% - \or - Sa% - \or - So% - \fi -} -\endinput -%% -%% End of file `datetime2-german-utf8.ldf'. 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 9662d11f46c..70d2684336c 100644 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german.ldf @@ -8,7 +8,7 @@ %% %% datetime2-german.dtx %% Copyright 2015 Nicola Talbot -%% Copyright 2017 Sebastian Friedl +%% Copyright 2017-19 Sebastian Friedl %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -21,12 +21,16 @@ %% 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 -%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf, -%% datetime2-german.ldf, datetime2-de-DE.ldf, -%% datetime2-de-AT.ldf and datetime2-de-CH.ldf -%% +%% This work consists of the files and the derived files: +%% - datetime2-german.ins, - datetime2-german-base.ldf, +%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf, +%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf, +%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf, +%% - datetime2-german.ldf, - datetime2-de-DE.ldf, +%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and +%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf +%% - datetime2-de-CH.ldf and +%% - datetime2-german-doc.dtx %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -42,17 +46,8 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{german}[2017/11/13 v2.1] -\RequirePackage{ifxetex,ifluatex} -\ifxetex - \RequireDateTimeModule{german-utf8} -\else - \ifluatex - \RequireDateTimeModule{german-utf8} - \else - \RequireDateTimeModule{german-ascii} - \fi -\fi +\ProvidesDateTimeModule{german}[2019/12/13 v3.0] +\RequireDateTimeModule{german-base} \newcommand*{\DTMgermandowdaysep}{,\space} \newcommand*{\DTMgermandaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}} \newcommand*{\DTMgermanmonthyearsep}{\space} @@ -99,9 +94,7 @@ \DTMifbool{german}{showyear}% {% \DTMgermanmonthyearsep% - \DTMifbool{german}{abbr}% - {'\DTMtwodigits{##1}}% - {\number##1 }% space intended + \number##1 % space intended }% {}% }% @@ -126,9 +119,7 @@ \DTMifbool{german}{showyear}% {% \DTMgermanmonthyearsep% - \DTMifbool{german}{abbr}% - {'\DTMtwodigits{##1}}% - {\number##1 }% space intended + \number##1 % space intended }% {}% }% @@ -240,11 +231,6 @@ }% \renewcommand*{\DTMDisplay}{\DTMdisplay}% } -\newcommand*{\DTMgermanzonemaps}{% - \DTMdefzonemap{01}{00}{MEZ}% - \DTMdefzonemap{02}{00}{MESZ}% -} - \DTMifcaseregional {}% do nothing {\DTMsetstyle{german}} -- cgit v1.2.3