datetime2-breton (5nov19)

git-svn-id: svn://tug.org/texlive/trunk@52647 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 26 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/datetime2-breton/datetime2-breton.pdf b/Master/texmf-dist/doc/latex/datetime2-breton/datetime2-breton.pdf
index 55340962c1a..3942e3f91cd 100644
--- a/Master/texmf-dist/doc/latex/datetime2-breton/datetime2-breton.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2-breton/datetime2-breton.pdf
diff --git a/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.dtx b/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.dtx
index 5af0e7b515d..8aefd689ddc 100644
--- a/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.dtx
+++ b/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.dtx
@@ -19,7 +19,7 @@
 %\fi
 % \iffalse
 % Doc-Source file to use with LaTeX2e
-% Copyright (C) 2018 Nicola Talbot, all rights reserved.
+% Copyright (C) 2015-2019 Nicola Talbot, all rights reserved.
 % (New maintainer add relevant lines here.)
 % \fi
 % \iffalse
@@ -61,11 +61,11 @@
 %
 %\title{Breton Module for datetime2 Package}
 %\author{Nicola L. C. Talbot (inactive)}
-%\date{2018-03-19 (v1.1)}
+%\date{2019-11-05 (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
+%If you want to volunteer to take over maintenance, contact me at
 %\url{http://www.dickimaw-books.com/contact.html}
 %
 %\begin{abstract}
@@ -86,8 +86,8 @@
 %I don't know if these settings are correct as I can't speak Breton.
 %In particular, I don't know if the "breton" 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.
+%be aware that this may change. Whoever takes over maintenance
+%of this module may change it as appropriate.
 %
 %The new maintainer should add the line:
 %\begin{verbatim}
@@ -119,7 +119,7 @@
 %\changes{1.0}{2015-03-29}{Initial release}
 % Identify module
 %    \begin{macrocode}
-\ProvidesDateTimeModule{breton-utf8}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-utf8}[2019/11/05 v1.2]
 %    \end{macrocode}
 %\begin{macro}{\DTMbretonordinal}
 %    \begin{macrocode}
@@ -198,7 +198,7 @@
 %\changes{1.0}{2015-03-29}{Initial release}
 % Identify module
 %    \begin{macrocode}
-\ProvidesDateTimeModule{breton-ascii}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-ascii}[2019/11/05 v1.2]
 %    \end{macrocode}
 %
 %If abbreviated dates are supported, short month names should be
@@ -273,7 +273,7 @@
 %
 % Identify Module
 %    \begin{macrocode}
-\ProvidesDateTimeModule{breton}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton}[2019/11/05 v1.2]
 %    \end{macrocode}
 % Need to find out if XeTeX or LuaTeX are being used.
 %    \begin{macrocode}
@@ -360,9 +360,10 @@
 %    \end{macrocode}
 %
 % Define a setting to change the ordinal suffix style.
+%\changes{1.2}{2019-11-05}{renamed scratch variables to avoid conflict}
 %    \begin{macrocode}
-\DTMdefchoicekey{breton}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{breton}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
    \renewcommand*{\DTMbretonfmtordsuffix}[1]{##1}%
  \or
    \renewcommand*{\DTMbretonfmtordsuffix}[1]{%
@@ -439,7 +440,7 @@
      \DTMifbool{breton}{mapzone}%
      {\DTMusezonemapordefault{##1}{##2}}%
      {%
-       \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+       \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
        \ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
      }%
    }%
@@ -484,7 +485,7 @@
  }%
  {% time style
     \renewcommand*\DTMdisplaytime[3]{%
-      \number##1
+      \number##1 % space intended
       \DTMbretontimesep\DTMtwodigits{##2}%
       \ifDTMshowseconds\DTMbretontimesep\DTMtwodigits{##3}\fi
     }%
@@ -496,7 +497,7 @@
      \DTMifbool{breton}{mapzone}%
      {\DTMusezonemapordefault{##1}{##2}}%
      {%
-       \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+       \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
        \ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
      }%
    }%
diff --git a/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.ins b/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.ins
index 93da959d284..9ca510ba20d 100644
--- a/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.ins
+++ b/Master/texmf-dist/source/latex/datetime2-breton/datetime2-breton.ins
@@ -3,7 +3,7 @@
 \preamble
 
  datetime2-breton.dtx
- Copyright 2018 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-breton/datetime2-breton-ascii.ldf b/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf
index 92b66eb3cb7..2b179543560 100644
--- a/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf
+++ b/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf
@@ -7,7 +7,7 @@
 %% datetime2-breton.dtx  (with options: `datetime2-breton-ascii.ldf,package')
 %% 
 %%  datetime2-breton.dtx
-%%  Copyright 2018 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
@@ -39,7 +39,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesDateTimeModule{breton-ascii}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-ascii}[2019/11/05 v1.2]
 \newcommand*{\DTMbretonordinal}[1]{%
   \number#1
   \ifnum#1=1
diff --git a/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf b/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf
index 257be938753..637173c752b 100644
--- a/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf
+++ b/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf
@@ -7,7 +7,7 @@
 %% datetime2-breton.dtx  (with options: `datetime2-breton-utf8.ldf,package')
 %% 
 %%  datetime2-breton.dtx
-%%  Copyright 2018 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
@@ -39,7 +39,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesDateTimeModule{breton-utf8}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-utf8}[2019/11/05 v1.2]
 \newcommand*{\DTMbretonordinal}[1]{%
   \number#1
   \ifnum#1=1
diff --git a/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton.ldf b/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton.ldf
index aee5e2807cc..3dc1c672703 100644
--- a/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton.ldf
+++ b/Master/texmf-dist/tex/latex/datetime2-breton/datetime2-breton.ldf
@@ -7,7 +7,7 @@
 %% datetime2-breton.dtx  (with options: `datetime2-breton.ldf,package')
 %% 
 %%  datetime2-breton.dtx
-%%  Copyright 2018 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
@@ -39,7 +39,7 @@
 %%   Right bracket \]     Circumflex    \^     Underscore    \_
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
-\ProvidesDateTimeModule{breton}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton}[2019/11/05 v1.2]
 \RequirePackage{ifxetex,ifluatex}
 \ifxetex
  \RequireDateTimeModule{breton-utf8}
@@ -62,8 +62,8 @@
 \DTMdefkey{breton}{timezonesep}{\renewcommand*{\DTMbretontimezonesep}{#1}}
 \DTMdefkey{breton}{datesep}{\renewcommand*{\DTMbretondatesep}{#1}}
 \DTMdefkey{breton}{timesep}{\renewcommand*{\DTMbretontimesep}{#1}}
-\DTMdefchoicekey{breton}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{breton}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
    \renewcommand*{\DTMbretonfmtordsuffix}[1]{##1}%
  \or
    \renewcommand*{\DTMbretonfmtordsuffix}[1]{%
@@ -108,7 +108,7 @@
      \DTMifbool{breton}{mapzone}%
      {\DTMusezonemapordefault{##1}{##2}}%
      {%
-       \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+       \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
        \ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
      }%
    }%
@@ -149,7 +149,7 @@
  }%
  {% time style
     \renewcommand*\DTMdisplaytime[3]{%
-      \number##1
+      \number##1 % space intended
       \DTMbretontimesep\DTMtwodigits{##2}%
       \ifDTMshowseconds\DTMbretontimesep\DTMtwodigits{##3}\fi
     }%
@@ -161,7 +161,7 @@
      \DTMifbool{breton}{mapzone}%
      {\DTMusezonemapordefault{##1}{##2}}%
      {%
-       \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+       \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
        \ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
      }%
    }%