summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/datetime2-contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-22 03:01:55 +0000
committerNorbert Preining <norbert@preining.info>2019-10-22 03:01:55 +0000
commit7bf461efa5036b361e9500c4ed5c675cc819652c (patch)
tree23bb25035cc3b6e1c64748d1d5e11ce85f69fc9e /macros/latex/contrib/datetime2-contrib
parent7da4243862494d1fc7478956362f4da6d80f4f7e (diff)
CTAN sync 201910220301
Diffstat (limited to 'macros/latex/contrib/datetime2-contrib')
-rw-r--r--macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES4
-rw-r--r--macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdfbin96433 -> 95502 bytes
-rw-r--r--macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx147
-rw-r--r--macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins2
-rw-r--r--macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdfbin547119 -> 547331 bytes
5 files changed, 85 insertions, 68 deletions
diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES b/macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES
index f754b79612..6ac7abc618 100644
--- a/macros/latex/contrib/datetime2-contrib/datetime2-english/CHANGES
+++ b/macros/latex/contrib/datetime2-contrib/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/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf
index f51efa41f5..bc6176d7db 100644
--- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf
+++ b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english-sample.pdf
Binary files differ
diff --git a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx
index 0b1376ca17..a98c719196 100644
--- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.dtx
+++ b/macros/latex/contrib/datetime2-contrib/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/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins
index 6767459acc..8e4726d226 100644
--- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.ins
+++ b/macros/latex/contrib/datetime2-contrib/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/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf
index 189c2989a3..57fc0fa928 100644
--- a/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf
+++ b/macros/latex/contrib/datetime2-contrib/datetime2-english/datetime2-english.pdf
Binary files differ