diff options
Diffstat (limited to 'Master')
17 files changed, 162 insertions, 145 deletions
diff --git a/Master/texmf-dist/doc/latex/datetime2-english/CHANGES b/Master/texmf-dist/doc/latex/datetime2-english/CHANGES index f754b796122..6ac7abc6180 100644 --- a/Master/texmf-dist/doc/latex/datetime2-english/CHANGES +++ b/Master/texmf-dist/doc/latex/datetime2-english/CHANGES @@ -1,3 +1,7 @@ +v1.05 (2019-10-21): + + * Renamed scratch variables to avoid conflict + v1.04 (2016-03-09): * Added "dowdaysep" option to en-GB, en-AU, en-NZ, en-GG, diff --git a/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english-sample.pdf b/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english-sample.pdf Binary files differindex f51efa41f59..bc6176d7dbc 100644 --- a/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english-sample.pdf +++ b/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english-sample.pdf diff --git a/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf b/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf Binary files differindex 189c2989a3e..57fc0fa928d 100644 --- a/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf +++ b/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf diff --git a/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx b/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx index 0b1376ca17a..a98c7191965 100644 --- a/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx +++ b/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx @@ -19,7 +19,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2015 Nicola Talbot, all rights reserved. +% Copyright (C) 2015-2019 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -62,7 +62,7 @@ % %\title{English Module for datetime2 Package} %\author{Nicola L. C. Talbot} -%\date{2016-03-09 (v1.04)} +%\date{2019-10-21 (v1.05)} %\maketitle % %\begin{abstract} @@ -617,7 +617,7 @@ %\changes{1.0}{2015-03-24}{Initial release} % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{english-base}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{english-base}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Since the main emphasize of the \sty{datetime2} package is to % provide expandable dates where possible, the commands here need to @@ -951,7 +951,7 @@ % % Identify Module % \begin{macrocode} -\ProvidesDateTimeModule{english}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{english}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load the base English module. % \begin{macrocode} @@ -1046,7 +1046,7 @@ %\fi % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-GB}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-GB}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -1171,9 +1171,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-GB}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-GB}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenGBfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenGBfmtordsuffix}[1]{% @@ -1230,7 +1231,7 @@ \DTMifbool{en-GB}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi }% }% @@ -1288,7 +1289,7 @@ \DTMifbool{en-GB}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi }% }% @@ -1373,7 +1374,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-US}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-US}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -1497,9 +1498,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-US}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-US}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenUSfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenUSfmtordsuffix}[1]{% @@ -1515,12 +1517,13 @@ % % Define a setting to change zone mappings. %\changes{1.03}{2016-01-23}{added zone option to en-US} +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-US}{zone}[\val\nr]% +\DTMdefchoicekey{en-US}{zone}[\@dtm@val\@dtm@nr]% {std,standard,dst,daylight,atlantic,eastern,central,mountain,% pacific,alaska,hawaii-aleutian,hawaii,aleutian,samoa,charmorro,clear}% {% - \ifcase\nr\relax + \ifcase\@dtm@nr\relax % std \appto\DTMenUSzonemaps{\DTMenUSstdzonemaps}% \DTMenUSstdzonemaps @@ -1656,7 +1659,7 @@ \DTMifbool{en-US}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi }% }% @@ -1713,7 +1716,7 @@ \DTMifbool{en-US}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi }% }% @@ -1935,7 +1938,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-CA}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-CA}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -2059,9 +2062,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-CA}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-CA}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenCAfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenCAfmtordsuffix}[1]{% @@ -2077,12 +2081,13 @@ % % Define a setting to change zone mappings. %\changes{1.03}{2016-01-23}{added zone option to en-CA} +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-CA}{zone}[\val\nr]% +\DTMdefchoicekey{en-CA}{zone}[\@dtm@val\@dtm@nr]% {std,standard,dst,daylight,newfoundland,atlantic,eastern,central,mountain,% pacific,clear}% {% - \ifcase\nr\relax + \ifcase\@dtm@nr\relax % std \appto\DTMenCAzonemaps{\DTMenCAstdzonemaps}% \DTMenCAstdzonemaps @@ -2191,7 +2196,7 @@ \DTMifbool{en-CA}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi }% }% @@ -2248,7 +2253,7 @@ \DTMifbool{en-CA}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi }% }% @@ -2436,7 +2441,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-AU}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-AU}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -2561,9 +2566,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-AU}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-AU}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenAUfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenAUfmtordsuffix}[1]{% @@ -2579,12 +2585,13 @@ % % Define a setting to change zone mappings. %\changes{1.03}{2016-01-23}{added zone option to en-AU} +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-AU}{zone}[\val\nr]% +\DTMdefchoicekey{en-AU}{zone}[\@dtm@val\@dtm@nr]% {std,standard,dst,daylight,central,central-western,western% eastern,christmas,lord-howe,cocos,keeling,clear}% {% - \ifcase\nr\relax + \ifcase\@dtm@nr\relax % std \appto\DTMenAUzonemaps{\DTMenAUstdzonemaps}% \DTMenAUstdzonemaps @@ -2659,7 +2666,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenAUfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-AU}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -2694,7 +2701,7 @@ \DTMifbool{en-AU}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi }% }% @@ -2751,7 +2758,7 @@ \DTMifbool{en-AU}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi }% }% @@ -2957,7 +2964,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-NZ}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-NZ}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -3083,9 +3090,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-NZ}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-NZ}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenNZfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenNZfmtordsuffix}[1]{% @@ -3107,7 +3115,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenNZfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-NZ}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -3142,7 +3150,7 @@ \DTMifbool{en-NZ}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi }% }% @@ -3199,7 +3207,7 @@ \DTMifbool{en-NZ}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi }% }% @@ -3286,7 +3294,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-GG}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-GG}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -3411,9 +3419,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-GG}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-GG}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenGGfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenGGfmtordsuffix}[1]{% @@ -3435,7 +3444,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenGGfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-GG}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -3470,7 +3479,7 @@ \DTMifbool{en-GG}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi }% }% @@ -3527,7 +3536,7 @@ \DTMifbool{en-GG}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi }% }% @@ -3611,7 +3620,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-JE}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-JE}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -3736,9 +3745,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-JE}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-JE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenJEfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenJEfmtordsuffix}[1]{% @@ -3760,7 +3770,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenJEfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-JE}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -3795,7 +3805,7 @@ \DTMifbool{en-JE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi }% }% @@ -3852,7 +3862,7 @@ \DTMifbool{en-JE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi }% }% @@ -3936,7 +3946,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-IM}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-IM}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -4061,9 +4071,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-IM}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-IM}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenIMfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenIMfmtordsuffix}[1]{% @@ -4085,7 +4096,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIMfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-IM}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -4120,7 +4131,7 @@ \DTMifbool{en-IM}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi }% }% @@ -4177,7 +4188,7 @@ \DTMifbool{en-IM}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi }% }% @@ -4261,7 +4272,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-MT}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-MT}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -4386,9 +4397,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-MT}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-MT}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenMTfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenMTfmtordsuffix}[1]{% @@ -4410,7 +4422,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenMTfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-MT}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -4445,7 +4457,7 @@ \DTMifbool{en-MT}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi }% }% @@ -4502,7 +4514,7 @@ \DTMifbool{en-MT}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi }% }% @@ -4587,7 +4599,7 @@ % % Identify this module. % \begin{macrocode} -\ProvidesDateTimeModule{en-IE}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-IE}[2019/10/21 v1.05 (NLCT)] % \end{macrocode} % Load base English module. % \begin{macrocode} @@ -4711,9 +4723,10 @@ %\end{macro} % % Define a setting to change the ordinal suffix style. +%\changes{1.05}{2019-10-21}{renamed scratch variables} % \begin{macrocode} -\DTMdefchoicekey{en-IE}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-IE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenIEfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenIEfmtordsuffix}[1]{% @@ -4735,7 +4748,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIEfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-IE}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -4770,7 +4783,7 @@ \DTMifbool{en-IE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi }% }% @@ -4827,7 +4840,7 @@ \DTMifbool{en-IE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.ins b/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.ins index 6767459accb..8e4726d2265 100644 --- a/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.ins +++ b/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.ins @@ -3,7 +3,7 @@ \preamble datetime2-english.dtx - Copyright 2015 Nicola Talbot + Copyright 2015-2019 Nicola Talbot This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-AU.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-AU.ldf index 5bd34d9ff88..cd5deea9b0a 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-AU.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-AU.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-AU.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-AU}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-AU}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenAUdowdaysep}{\space} \newcommand*{\DTMenAUdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-AU}{showyear}[true]{} \DTMsetbool{en-AU}{showyear}{true} \newcommand*{\DTMenAUfmtordsuffix}[1]{} -\DTMdefchoicekey{en-AU}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-AU}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenAUfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenAUfmtordsuffix}[1]{% @@ -82,11 +82,11 @@ \DTMtexorpdfstring{\protect\textsc{##1}}{##1}}% \fi } -\DTMdefchoicekey{en-AU}{zone}[\val\nr]% +\DTMdefchoicekey{en-AU}{zone}[\@dtm@val\@dtm@nr]% {std,standard,dst,daylight,central,central-western,western% eastern,christmas,lord-howe,cocos,keeling,clear}% {% - \ifcase\nr\relax + \ifcase\@dtm@nr\relax % std \appto\DTMenAUzonemaps{\DTMenAUstdzonemaps}% \DTMenAUstdzonemaps @@ -158,7 +158,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenAUfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-AU}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -193,7 +193,7 @@ \DTMifbool{en-AU}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi }% }% @@ -246,7 +246,7 @@ \DTMifbool{en-AU}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-CA.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-CA.ldf index 2fa85437180..51d2578c245 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-CA.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-CA.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-CA.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-CA}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-CA}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenCAmonthdaysep}{\space} \newcommand*{\DTMenCAdowmonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-CA}{showyear}[true]{} \DTMsetbool{en-CA}{showyear}{true} \newcommand*{\DTMenCAfmtordsuffix}[1]{} -\DTMdefchoicekey{en-CA}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-CA}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenCAfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenCAfmtordsuffix}[1]{% @@ -82,11 +82,11 @@ \DTMtexorpdfstring{\protect\textsc{##1}}{##1}}% \fi } -\DTMdefchoicekey{en-CA}{zone}[\val\nr]% +\DTMdefchoicekey{en-CA}{zone}[\@dtm@val\@dtm@nr]% {std,standard,dst,daylight,newfoundland,atlantic,eastern,central,mountain,% pacific,clear}% {% - \ifcase\nr\relax + \ifcase\@dtm@nr\relax % std \appto\DTMenCAzonemaps{\DTMenCAstdzonemaps}% \DTMenCAstdzonemaps @@ -188,7 +188,7 @@ \DTMifbool{en-CA}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi }% }% @@ -241,7 +241,7 @@ \DTMifbool{en-CA}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GB.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GB.ldf index 6491b2f36df..e2bdd2d45c8 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GB.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GB.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-GB.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-GB}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-GB}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenGBdowdaysep}{\space} \newcommand*{\DTMenGBdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-GB}{showyear}[true]{} \DTMsetbool{en-GB}{showyear}{true} \newcommand*{\DTMenGBfmtordsuffix}[1]{#1} -\DTMdefchoicekey{en-GB}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-GB}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenGBfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenGBfmtordsuffix}[1]{% @@ -123,7 +123,7 @@ \DTMifbool{en-GB}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi }% }% @@ -176,7 +176,7 @@ \DTMifbool{en-GB}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GG.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GG.ldf index c5642d58bca..09956a83b81 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GG.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GG.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-GG.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-GG}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-GG}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenGGdowdaysep}{\space} \newcommand*{\DTMenGGdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-GG}{showyear}[true]{} \DTMsetbool{en-GG}{showyear}{true} \newcommand*{\DTMenGGfmtordsuffix}[1]{#1} -\DTMdefchoicekey{en-GG}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-GG}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenGGfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenGGfmtordsuffix}[1]{% @@ -88,7 +88,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenGGfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-GG}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -123,7 +123,7 @@ \DTMifbool{en-GG}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi }% }% @@ -176,7 +176,7 @@ \DTMifbool{en-GG}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IE.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IE.ldf index 6a37c4feba8..5f68fde2eca 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IE.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IE.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-IE.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-IE}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-IE}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenIEdowdaysep}{\space} \newcommand*{\DTMenIEdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-IE}{showyear}[true]{} \DTMsetbool{en-IE}{showyear}{true} \newcommand*{\DTMenIEfmtordsuffix}[1]{#1} -\DTMdefchoicekey{en-IE}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-IE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenIEfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenIEfmtordsuffix}[1]{% @@ -88,7 +88,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIEfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-IE}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -123,7 +123,7 @@ \DTMifbool{en-IE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi }% }% @@ -176,7 +176,7 @@ \DTMifbool{en-IE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IM.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IM.ldf index 737c2183e4f..8900e83480c 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IM.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IM.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-IM.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-IM}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-IM}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenIMdowdaysep}{\space} \newcommand*{\DTMenIMdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-IM}{showyear}[true]{} \DTMsetbool{en-IM}{showyear}{true} \newcommand*{\DTMenIMfmtordsuffix}[1]{#1} -\DTMdefchoicekey{en-IM}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-IM}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenIMfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenIMfmtordsuffix}[1]{% @@ -88,7 +88,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIMfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-IM}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -123,7 +123,7 @@ \DTMifbool{en-IM}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi }% }% @@ -176,7 +176,7 @@ \DTMifbool{en-IM}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-JE.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-JE.ldf index 188a5fd3f7d..96dff5a6284 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-JE.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-JE.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-JE.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-JE}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-JE}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenJEdowdaysep}{\space} \newcommand*{\DTMenJEdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-JE}{showyear}[true]{} \DTMsetbool{en-JE}{showyear}{true} \newcommand*{\DTMenJEfmtordsuffix}[1]{#1} -\DTMdefchoicekey{en-JE}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-JE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenJEfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenJEfmtordsuffix}[1]{% @@ -88,7 +88,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenJEfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-JE}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -123,7 +123,7 @@ \DTMifbool{en-JE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi }% }% @@ -176,7 +176,7 @@ \DTMifbool{en-JE}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-MT.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-MT.ldf index 81982d01595..10eb7715cb8 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-MT.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-MT.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-MT.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-MT}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-MT}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenMTdowdaysep}{\space} \newcommand*{\DTMenMTdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-MT}{showyear}[true]{} \DTMsetbool{en-MT}{showyear}{true} \newcommand*{\DTMenMTfmtordsuffix}[1]{} -\DTMdefchoicekey{en-MT}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-MT}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenMTfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenMTfmtordsuffix}[1]{% @@ -88,7 +88,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenMTfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-MT}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -123,7 +123,7 @@ \DTMifbool{en-MT}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi }% }% @@ -176,7 +176,7 @@ \DTMifbool{en-MT}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-NZ.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-NZ.ldf index 0bbb5851d11..0ae6f95cec4 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-NZ.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-NZ.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-NZ.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-NZ}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-NZ}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenNZdowdaysep}{\space} \newcommand*{\DTMenNZdaymonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-NZ}{showyear}[true]{} \DTMsetbool{en-NZ}{showyear}{true} \newcommand*{\DTMenNZfmtordsuffix}[1]{} -\DTMdefchoicekey{en-NZ}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-NZ}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenNZfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenNZfmtordsuffix}[1]{% @@ -88,7 +88,7 @@ \renewcommand*{\DTMenglishfmtordsuffix}{\DTMenNZfmtordsuffix}% \renewcommand*\DTMdisplaydate[4]{% \ifDTMshowdow - \ifnum##4>-1% + \ifnum##4>-1 % space intended \DTMifbool{en-NZ}{abbr}% {\DTMenglishshortweekdayname{##4}}% {\DTMenglishweekdayname{##4}}% @@ -123,7 +123,7 @@ \DTMifbool{en-NZ}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi }% }% @@ -176,7 +176,7 @@ \DTMifbool{en-NZ}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-US.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-US.ldf index 8e223f730d3..53d78f6583d 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-US.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-US.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-en-US.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-US}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{en-US}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenUSmonthdaysep}{\space} \newcommand*{\DTMenUSdowmonthsep}{\space} @@ -69,8 +69,8 @@ \DTMdefboolkey{en-US}{showyear}[true]{} \DTMsetbool{en-US}{showyear}{true} \newcommand*{\DTMenUSfmtordsuffix}[1]{} -\DTMdefchoicekey{en-US}{ord}[\val\nr]{level,raise,omit,sc}{% - \ifcase\nr\relax +\DTMdefchoicekey{en-US}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{% + \ifcase\@dtm@nr\relax \renewcommand*{\DTMenUSfmtordsuffix}[1]{##1}% \or \renewcommand*{\DTMenUSfmtordsuffix}[1]{% @@ -82,11 +82,11 @@ \DTMtexorpdfstring{\protect\textsc{##1}}{##1}}% \fi } -\DTMdefchoicekey{en-US}{zone}[\val\nr]% +\DTMdefchoicekey{en-US}{zone}[\@dtm@val\@dtm@nr]% {std,standard,dst,daylight,atlantic,eastern,central,mountain,% pacific,alaska,hawaii-aleutian,hawaii,aleutian,samoa,charmorro,clear}% {% - \ifcase\nr\relax + \ifcase\@dtm@nr\relax % std \appto\DTMenUSzonemaps{\DTMenUSstdzonemaps}% \DTMenUSstdzonemaps @@ -210,7 +210,7 @@ \DTMifbool{en-US}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi }% }% @@ -263,7 +263,7 @@ \DTMifbool{en-US}{mapzone}% {\DTMusezonemapordefault{##1}{##2}}% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi }% }% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english-base.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english-base.ldf index ed430eb116a..d16c7586bb5 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english-base.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english-base.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-english-base.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{english-base}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{english-base}[2019/10/21 v1.05 (NLCT)] \newcommand*{\DTMenglishordinal}[1]{% \number#1 % space intended \DTMenglishfmtordsuffix{% diff --git a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english.ldf b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english.ldf index 7f24d5e4eee..dee1be5227d 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english.ldf @@ -7,7 +7,7 @@ %% datetime2-english.dtx (with options: `datetime2-english.ldf,package') %% %% datetime2-english.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2015-2019 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{english}[2016/03/09 v1.04 (NLCT)] +\ProvidesDateTimeModule{english}[2019/10/21 v1.05 (NLCT)] \RequireDateTimeModule{english-base} \DTMnewstyle {english}% label |