From fe7eb475424b6da9570efd4cb2ab66f07480c614 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Sep 2017 20:55:20 +0000 Subject: datetime2-german (10sep17) git-svn-id: svn://tug.org/texlive/trunk@45264 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/datetime2-german/README | 57 --- .../doc/latex/datetime2-german/README.md | 53 +++ .../latex/datetime2-german/datetime2-german.pdf | Bin 283739 -> 236238 bytes .../latex/datetime2-german/datetime2-german.dtx | 385 +++++++++++++++++---- .../latex/datetime2-german/datetime2-german.ins | 10 +- .../datetime2-german/datetime2-german-ascii.ldf | 57 ++- .../datetime2-german/datetime2-german-utf8.ldf | 57 ++- .../latex/datetime2-german/datetime2-german.ldf | 98 ++++-- 8 files changed, 553 insertions(+), 164 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/datetime2-german/README create mode 100644 Master/texmf-dist/doc/latex/datetime2-german/README.md diff --git a/Master/texmf-dist/doc/latex/datetime2-german/README b/Master/texmf-dist/doc/latex/datetime2-german/README deleted file mode 100644 index 68376ffd2c2..00000000000 --- a/Master/texmf-dist/doc/latex/datetime2-german/README +++ /dev/null @@ -1,57 +0,0 @@ -German Language Module for datetime2 Package - -Author: Nicola L. C. Talbot (inactive) - -Licence: LPPL - -Required Packages: datetime2, tracklang - -This module is unmaintained. If you want to volunteer to take over -the maintenance contact me at www.dickimaw-books.com/contact.html - -Example usage: - -\documentclass{article} -\usepackage[german]{datetime2} -\begin{document} -\today -\end{document} - -\documentclass[german]{article} -\usepackage{babel} -\usepackage[useregional]{datetime2} -\begin{document} -\today -\end{document} - -\documentclass{article} -\usepackage{polyglossia} -\setmainlanguage{german} -\usepackage[german]{datetime2} -\begin{document} -\today -\end{document} - -INSTALLATION -============ - -latex datetime2-german.ins - -Move all *.ldf files to -TEXMF/tex/latex/datetime2-contrib/datetime2-german/ - -Documentation: - -pdflatex datetime2-german.dtx -makeindex -s gind.ist datetime2-german.idx -makeindex -s gglo.ist -o datetime2-german.gls datetime2-german.glo -pdflatex datetime2-german.dtx -pdflatex datetime2-german.dtx - -Move datetime2-german.pdf and README to -TEXMF/doc/latex/datetime2-contrib/datetime2-german/ - -This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/license/lppl1.3 for the details of that -license. - diff --git a/Master/texmf-dist/doc/latex/datetime2-german/README.md b/Master/texmf-dist/doc/latex/datetime2-german/README.md new file mode 100644 index 00000000000..f91c035f9c1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/datetime2-german/README.md @@ -0,0 +1,53 @@ +# datetime2-german +German Language Module for `datetime2` Package + +Authors: Nicola L. C. Talbot (inactive), Sebastian Friedl + +Licence: LPPL + +Required Packages: `datetime2`, `tracklang` + +This module is maintained. +Current maintainer is Sebastian Friedl. + +Example usage: + + \documentclass{article} + \usepackage[german]{datetime2} + \begin{document} + \today + \end{document} + + \documentclass[german]{article} + \usepackage{babel} + \usepackage[useregional]{datetime2} + \begin{document} + \today + \end{document} + + \documentclass{article} + \usepackage{polyglossia} + \setmainlanguage{german} + \usepackage[german]{datetime2} + \begin{document} + \today + \end{document} + + +## INSTALLATION + +`latex datetime2-german.ins` + +Move all `*.ldf` files to `TEXMF/tex/latex/datetime2-contrib/datetime2-german/` + +Documentation: + + pdflatex datetime2-german.dtx + makeindex -s gind.ist datetime2-german.idx + makeindex -s gglo.ist -o datetime2-german.gls datetime2-german.glo + pdflatex datetime2-german.dtx + pdflatex datetime2-german.dtx + +Move `datetime2-german.pdf` and `README` to `TEXMF/doc/latex/datetime2-contrib/datetime2-german/` + +This material is subject to the LaTeX Project Public License. See [http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt "Show the current version of the LPPL") or `LICENSE.txt` for the details of that license. diff --git a/Master/texmf-dist/doc/latex/datetime2-german/datetime2-german.pdf b/Master/texmf-dist/doc/latex/datetime2-german/datetime2-german.pdf index f3cd47b9c19..12c80d4c6f3 100644 Binary files a/Master/texmf-dist/doc/latex/datetime2-german/datetime2-german.pdf and b/Master/texmf-dist/doc/latex/datetime2-german/datetime2-german.pdf differ diff --git a/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.dtx b/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.dtx index 4cdf8b19e86..6a9eb802c2f 100644 --- a/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.dtx +++ b/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.dtx @@ -20,7 +20,7 @@ % \iffalse % Doc-Source file to use with LaTeX2e % Copyright (C) 2015 Nicola Talbot, all rights reserved. -% (New maintainer add relevant lines here.) +% Copyright (C) 2017 Sebastian Friedl, all rights reserved. % \fi % \iffalse %<*driver> @@ -28,16 +28,24 @@ \usepackage{alltt} \usepackage{graphicx} +\usepackage{hologo} +\usepackage{multicol} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} -\usepackage[colorlinks, - bookmarks, +\usepackage[bookmarks, hyperindex=false, - pdfauthor={Nicola L.C. Talbot}, + pdfauthor={Nicola L.C. Talbot, Sebastian Friedl}, pdftitle={datetime2.sty German Module}]{hyperref} +\usepackage{verbatim} +\usepackage[p,space]{erewhon} +\usepackage{sourcesanspro} +\usepackage{inconsolata} +\usepackage[utopia,vvarbb]{newtxmath} -\CheckSum{243} +\usepackage[left=4.50cm,right=2.75cm,top=3.25cm,bottom=2.75cm,nohead]{geometry} + +\CheckSum{343} \renewcommand*{\usage}[1]{\hyperpage{#1}} \renewcommand*{\main}[1]{\hyperpage{#1}} @@ -59,14 +67,11 @@ % %\MakeShortVerb{"} % -%\title{German Module for datetime2 Package} -%\author{Nicola L. C. Talbot (inactive)} -%\date{2017-03-09 (v1.1)} +%\title{German Module for the \sty{datetime2} Package \\ {\large\url{https://github.com/SFr682k/datetime2-german}}} +%\author{\begin{tabular}{cp{.05\textwidth}c} Nicola L. C. Talbot && Sebastian Friedl \\ (inactive) && {\normalsize\href{mailto:sfr682k@t-online.de}{\texttt{sfr682k@t-online.de}}} \end{tabular}} +%\date{2017-09-10 (v1.2)} %\maketitle % -%This module is currently unmaintained and may be subject to change. -%If you want to volunteer to take over maintanance, contact me at -%\url{http://www.dickimaw-books.com/contact.html} % %\begin{abstract} %This is the German language module for the \sty{datetime2} @@ -81,26 +86,93 @@ % depending on the value of the \opt{useregional} setting. %\end{abstract} % -%I've copied the date style from \texttt{babel-german}'s \cs{today}. % -%I don't know if these settings are correct as I can't speak German. -%In particular, I don't know if the "german" time style is -%correct. Currently this just uses the "default" time style. Please -%be aware that this may change. Whoever takes over maintanance -%of this module may can change it as appropriate. % -%The new maintainer should add the line: -%\begin{verbatim} -% The Current Maintainer of this work is Name. -%\end{verbatim} -%to the preamble part in \texttt{datetime2-german.ins} where Name -%is the name of the maintainer(s) and replace -%the `inactive' status to `maintained'. +% Currently there is only a regionless style. \par +% Actually, I think that it is not necessary to define variant styles (e.~g. "de-DE"\slash"de-DE-numeric" and "de-AT"\slash"de-AT-numeric") since there are --- as far as I know --- no differences in the \emph{format} of the date. +% \par However, I'm only capable of standard German. If there \emph{are} differences in format and/or spelling, please create a feature request on GitHub or send me an e--mail. I would be very grateful, if some examples and/or a list of the weekdays' and months' spelling is/are also provided. +% +% +% \tableofcontents +% \clearpage +% +% +% +% \section{Installation} +% Extract the language definition files first: +% \begin{enumerate} +% \item +% Run \LaTeX\ over the file \texttt{datetime2-german.ins}: \\ +% \verb|latex datetime2-german.ins| +% % +% \item +% Move all \texttt{*.ldf} files to \texttt{TEXMF/tex/latex/datetime2-contrib/datetime2-german/} +% \end{enumerate} +% Then, you can compile the documentation yourself by executing \\[\smallskipamount] +%\verb|pdflatex datetime2-german.dtx| \\ +%\verb|makeindex -s gind.ist datetime2-german.idx| \\ +%\verb|makeindex -s gglo.ist -o datetime2-german.gls datetime2-german.glo| \\ +%\verb|pdflatex datetime2-german.dtx| \\ +%\verb|pdflatex datetime2-german.dtx| \\[\medskipamount] +% or just use the precompiled documentation shipped with the sorce files. \\ +% In both cases, copy the files \texttt{datetime2-german.pdf} and \texttt{README.md} to \\ +% \texttt{TEXMF/doc/latex/datetime2-contrib/datetime2-german/} +% +% +% +% \section{Usage} +% \textit{See the \sty{datetime2} documentation for further details} \\[\smallskipamount] +% Loading the German module by passing the \texttt{german} option to the \sty{datetime2} package: \\[\smallskipamount] +%\verb|\documentclass{article}| \\ +%\verb|\usepackage[german]{datetime2}| \\ +%\verb|\begin{document}| \\ +%\verb|\today| \\ +%\verb|\end{document}| \\[\medskipamount] +% Loading the German module via \sty{babel} and passing the \texttt{german} option to the \verb|\documentclass| command (or to \sty{babel} directly): \\[\smallskipamount] +%\verb|\documentclass[german]{article}| \\ +%\verb|\usepackage{babel}| \\ +%\verb|\usepackage[useregional]{datetime2}| \\ +%\verb|\begin{document}| \\ +%\verb|\today| \\ +%\verb|\end{document}| \\[\medskipamount] +% Loading the German module when using \sty{polyglossia} by passing the \texttt{german} option to the \sty{datetime2} package: \\[\smallskipamount] +%\verb|\documentclass{article}| \\ +%\verb|\usepackage{polyglossia}| \\ +%\verb|\setmainlanguage{german}| \\ +%\verb|\usepackage[german]{datetime2}| \\ +%\verb|\begin{document}| \\ +%\verb|\today| \\ +%\verb|\end{document}| +% +% \paragraph{\opt{showdow}--option} Pass the \opt{showdow} option to the \sty{datetime2} package to show the weekday +% +% \paragraph{Abbreviated weekday and month names} Use the \verb|\DTMlangsetup[german]{abbr}| command to switch to abbreviated weekday and month names. \\ +% Switch back to the non--abbreviated version with \verb|\DTMlangsetup[german]{abbr=false}| +% +% +% +% \section{Style examples} +% \begin{itemize} +% \item Non--numeric style: \\ +% 5. September 2017, 12:51:04 MESZ \\ +% 5. Sep. '17, 12:51:04 MESZ \hfill \textit{abbreviated version} \\ +% Dienstag, 5. September 2017, 12:51:04 MESZ \hfill \textit{with \opt{showdow} option} \\ +% Di., 5. Sep. '17, 12:51:04 MESZ \hfill \textit{abbreviated version with \opt{showdow} option} +% % +% \item Numeric style: \\ +% 05.09.2017, 12:51:04 MESZ \\ +% 05.09.17, 12:51:04 MESZ \hfill \textit{abbreviated version} \\ +% Dienstag, 05.09.2017, 12:51:04 MESZ \hfill \textit{with \opt{showdow} option} \\ +% Di., 05.09.17, 12:51:04 MESZ \hfill \textit{abbreviated version with \opt{showdow} option} +% \end{itemize} +% +% +% +% \section{License} +% This material is subject to the \LaTeX\ Project Public License, Version 1.3c or later. \\ +% See the copyright headers of the single files for further details. +% % -%Currently there is only a regionless style. New maintainers may -%want to add regional variants such as "de-DE"\slash"de-DE-numeric" and -%"de-AT"\slash"de-AT-numeric". This style currently doesn't check the -%\opt{showdow} setting. % %\StopEventually{% %\clearpage @@ -117,12 +189,13 @@ %\fi %\subsection{UTF-8} %This file contains the settings that use UTF-8 characters. This -%file is loaded if XeLaTeX or LuaLaTeX are used. Please make sure +%file is loaded if \hologo{XeLaTeX} or \hologo{LuaLaTeX} are used. Please make sure %your text editor is set to UTF-8 if you want to view this code. %\changes{1.0}{2015-03-27}{Initial release} +% % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{german-utf8}[2017/03/09 v1.1] +\ProvidesDateTimeModule{german-utf8}[2017/09/10 v1.2] % \end{macrocode} %\begin{macro}{\DTMgermanordinal} % \begin{macrocode} @@ -166,11 +239,43 @@ % \end{macrocode} %\end{macro} % -%If abbreviated dates are supported, short month names should be -%likewise provided. +%\begin{macro}{\DTMgermanshortmonthname} +% Abbreviated German month names. +%\changes{1.2}{2017-09-10}{Short month names implemented} +% \begin{macrocode} +\newcommand*{\DTMgermanshortmonthname}[1]{% + \ifcase#1 + \or + Jan.% + \or + Feb.% + \or + März% + \or + Apr.% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sep.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +% \end{macrocode} +%\end{macro} % %\begin{macro}{\DTMgermanweekdayname} -%These are provided here but not currently used in the date format. +%Provides weekday names % \begin{macrocode} \newcommand*{\DTMgermanweekdayname}[1]{% \ifcase#1 @@ -192,6 +297,30 @@ % \end{macrocode} %\end{macro} % +%\begin{macro}{\DTMgermanshortweekdayname} +%Provides abbreviated weekday names +%\changes{1.2}{2017-09-10}{Short weekday names implemented} +% \begin{macrocode} +\newcommand*{\DTMgermanshortweekdayname}[1]{% + \ifcase#1 + Mo.% + \or + Di.% + \or + Mi.% + \or + Do.% + \or + Fr.% + \or + Sa.% + \or + So.% + \fi +} +% \end{macrocode} +%\end{macro} +% %\iffalse % \begin{macrocode} % @@ -204,20 +333,19 @@ %\fi %\subsection{ASCII} %This file contains the settings that use \LaTeX\ commands for -%non-ASCII characters. This should be input if neither XeLaTeX nor -%LuaLaTeX are used. Even if the user has loaded \sty{inputenc} with +%non-ASCII characters. This should be input if neither \hologo{XeLaTeX} nor +%\hologo{LuaLaTeX} are used. Even if the user has loaded \sty{inputenc} with %"utf8", this file should still be used not the %\texttt{datetime2-german-utf8.ldf} file as the non-ASCII %characters are made active in that situation and would need %protecting against expansion. %\changes{1.0}{2015-03-27}{Initial release} +% % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{german-ascii}[2017/03/09 v1.1] +\ProvidesDateTimeModule{german-ascii}[2017/09/10 v1.2] % \end{macrocode} % -%If abbreviated dates are supported, short month names should be -%likewise provided. %\begin{macro}{\DTMgermanordinal} % \begin{macrocode} \newcommand*{\DTMgermanordinal}[1]{% @@ -260,8 +388,43 @@ % \end{macrocode} %\end{macro} % +%\begin{macro}{\DTMgermanshortmonthname} +% Abbreviated German month names. +%\changes{1.2}{2017-09-10}{Short month names implemented} +% \begin{macrocode} +\newcommand*{\DTMgermanshortmonthname}[1]{% + \ifcase#1 + \or + Jan.% + \or + Feb.% + \or + M\protect\"arz% + \or + Apr.% + \or + Mai% + \or + Juni% + \or + Juli% + \or + Aug.% + \or + Sep.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\DTMgermanweekdayname} -%These are provided here but not currently used in the date format. +%Provides weekday names % \begin{macrocode} \newcommand*{\DTMgermanweekdayname}[1]{% \ifcase#1 @@ -283,6 +446,30 @@ % \end{macrocode} %\end{macro} % +%\begin{macro}{\DTMgermanshortweekdayname} +%Provides abbreviated weekday names +%\changes{1.2}{2017-09-10}{Short weekday names implemented} +% \begin{macrocode} +\newcommand*{\DTMgermanshortweekdayname}[1]{% + \ifcase#1 + Mo.% + \or + Di.% + \or + Mi.% + \or + Do.% + \or + Fr.% + \or + Sa.% + \or + So.% + \fi +} +% \end{macrocode} +%\end{macro} +% %\iffalse % \begin{macrocode} % @@ -300,13 +487,13 @@ % % Identify Module % \begin{macrocode} -\ProvidesDateTimeModule{german}[2017/03/09 v1.1] +\ProvidesDateTimeModule{german}[2017/09/10 v1.2] % \end{macrocode} -% Need to find out if XeTeX or LuaTeX are being used. +% Need to find out if \hologo{XeTeX} or \hologo{LuaTeX} are being used. % \begin{macrocode} \RequirePackage{ifxetex,ifluatex} % \end{macrocode} -% XeTeX and LuaTeX natively support UTF-8, so load +% \hologo{XeTeX} and \hologo{LuaTeX} natively support UTF-8, so load % \texttt{german-utf8} if either of those engines are used % otherwise load \texttt{german-ascii}. % \begin{macrocode} @@ -322,13 +509,19 @@ % \end{macrocode} % % Define the \texttt{german} style. -% The time style is the same as the "default" style -% provided by \sty{datetime2}. This may need correcting. % % Allow the user a way of configuring the "german" and % "german-numeric" styles. This doesn't use the package wide % separators such as % \cs{dtm@datetimesep} in case other date formats are also required. +% +%\begin{macro}{\DTMgermandowdaysep} +% The separator between weekday and day +% \begin{macrocode} +\newcommand*{\DTMgermandowdaysep}{,\space} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\DTMgermandaymonthsep} % The separator between the day and month for the text format. % \begin{macrocode} @@ -347,7 +540,7 @@ % The separator between the date and time blocks in the full format % (either text or numeric). % \begin{macrocode} -\newcommand*{\DTMgermandatetimesep}{\space} +\newcommand*{\DTMgermandatetimesep}{,\space} % \end{macrocode} %\end{macro} % @@ -362,7 +555,7 @@ %\begin{macro}{\DTMgermandatesep} % The separator for the numeric date format. % \begin{macrocode} -\newcommand*{\DTMgermandatesep}{/} +\newcommand*{\DTMgermandatesep}{.} % \end{macrocode} %\end{macro} % @@ -384,9 +577,17 @@ \DTMdefkey{german}{timesep}{\renewcommand*{\DTMgermantimesep}{#1}} % \end{macrocode} % -% TODO: provide a boolean key to switch between full and abbreviated -% formats if appropriate. (I don't know how the date should be -% abbreviated.) +% +% Define a boolean key that can switch between full and abbreviated formats for +% the month and day of week names in the text format. +% \begin{macrocode} +\DTMdefboolkey{german}{abbr}[true]{} +% \end{macrocode} +% +% The default is full name +% \begin{macrocode} +\DTMsetbool{german}{abbr}{false} +% \end{macrocode} % % Define a boolean key that determines if the time zone mappings % should be used. @@ -418,41 +619,76 @@ \DTMsetbool{german}{showyear}{true} % \end{macrocode} % -% Define the "german" style. (TODO: implement day of week?) +% Define the "german" style. %\changes{1.1}{2017-03-09}{fixed bug in \cs{DTMDisplaydate}} +%\changes{1.2}{2017-09-10}{Short month names implemented} +%\changes{1.2}{2017-09-10}{Short weekday names implemented} +%\changes{1.2}{2017-09-10}{Day of week implemented} % \begin{macrocode} \DTMnewstyle {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 @@ -493,22 +729,34 @@ % \end{macrocode} % % Define numeric style. +%\changes{1.2}{2017-09-10}{Day of week implemented} % \begin{macrocode} \DTMnewstyle {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 }% {}% }% @@ -516,7 +764,7 @@ }% {% time style \renewcommand*\DTMdisplaytime[3]{% - \number##1 + \DTMtwodigits{##1}% \DTMgermantimesep\DTMtwodigits{##2}% \ifDTMshowseconds\DTMgermantimesep\DTMtwodigits{##3}\fi }% @@ -553,10 +801,11 @@ % The time zone mappings are set through this command, which can be % redefined if extra mappings are required or mappings need to be % removed. +%\changes{1.2}{2017-09-10}{German time zone names (ME[S]Z)} % \begin{macrocode} \newcommand*{\DTMgermanzonemaps}{% - \DTMdefzonemap{01}{00}{CET}% - \DTMdefzonemap{02}{00}{CEST}% + \DTMdefzonemap{01}{00}{MEZ}% + \DTMdefzonemap{02}{00}{MESZ}% } % \end{macrocode} %\end{macro} diff --git a/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.ins b/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.ins index 825042f49e5..d824906548c 100644 --- a/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.ins +++ b/Master/texmf-dist/source/latex/datetime2-german/datetime2-german.ins @@ -4,16 +4,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 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 index 59c442035e5..3dc5798ec6d 100644 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-ascii.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-ascii.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-ascii}[2017/03/09 v1.1] +\ProvidesDateTimeModule{german-ascii}[2017/09/10 v1.2] \newcommand*{\DTMgermanordinal}[1]{% \number#1 } @@ -71,6 +73,34 @@ 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 + Sep.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} \newcommand*{\DTMgermanweekdayname}[1]{% \ifcase#1 Montag% @@ -88,6 +118,23 @@ 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-utf8.ldf b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-utf8.ldf index 46a4847a685..0c0f22f3ffc 100644 --- a/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-utf8.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-german/datetime2-german-utf8.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-utf8}[2017/03/09 v1.1] +\ProvidesDateTimeModule{german-utf8}[2017/09/10 v1.2] \newcommand*{\DTMgermanordinal}[1]{% \number#1 } @@ -71,6 +73,34 @@ 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 + Sep.% + \or + Okt.% + \or + Nov.% + \or + Dez.% + \fi +} \newcommand*{\DTMgermanweekdayname}[1]{% \ifcase#1 Montag% @@ -88,6 +118,23 @@ 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 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 -- cgit v1.2.3