datetime2-welsh (28oct19)

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

2 files changed, 19 insertions, 18 deletions

diff --git a/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.dtx b/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.dtx
index 3ee74c95af5..42c17a863e7 100644
--- a/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.dtx
+++ b/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.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.
 % (New maintainer add relevant lines here.)
 % \fi
 % \iffalse
@@ -61,11 +61,11 @@
 %
 %\title{Welsh Module for datetime2 Package}
 %\author{Nicola L. C. Talbot (inactive)}
-%\date{2015-03-26 (v1.0)}
+%\date{2019-10-28 (v1.1)}
 %\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}
@@ -99,8 +99,7 @@
 %
 %Currently there is only a regionless style. New maintainers may
 %want to add regional variants "cy-GB"\slash"cy-GB-numeric" and
-%"cy-AR"\slash"cy-AR-numeric" once "cy-GB" and "cy-AR" have been added 
-%to \sty{tracklang}. This style currently doesn't check the
+%"cy-AR"\slash"cy-AR-numeric". This style currently doesn't check the
 %\opt{showdow} setting.
 %
 %\StopEventually{%
@@ -123,13 +122,13 @@
 %\changes{1.0}{2015-03-26}{Initial release}
 % Identify module
 %    \begin{macrocode}
-\ProvidesDateTimeModule{welsh-utf8}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh-utf8}[2019/10/28 v1.1]
 %    \end{macrocode}
 %\begin{macro}{\DTMwelshordinal}
 %    \begin{macrocode}
 \newcommand*{\DTMwelshordinal}[1]{%
-  \number#1
-  \ifnum#1=1 
+  \number#1 % space intended
+  \ifnum#1=1 % space intended
    \DTMwelshfmtordinal{añ}%
   \fi
 }
@@ -202,7 +201,7 @@
 %\changes{1.0}{2015-03-26}{Initial release}
 % Identify module
 %    \begin{macrocode}
-\ProvidesDateTimeModule{welsh-ascii}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh-ascii}[2019/10/28 v1.1]
 %    \end{macrocode}
 %
 %If abbreviated dates are supported, short month names should be
@@ -210,8 +209,8 @@
 %\begin{macro}{\DTMwelshordinal}
 %    \begin{macrocode}
 \newcommand*{\DTMwelshordinal}[1]{%
-  \number#1
-  \ifnum#1=1 
+  \number#1 % space intended
+  \ifnum#1=1 % space intended
    \DTMwelshfmtordsuffix{a\protect\~{n}}%
   \fi
 }
@@ -277,7 +276,7 @@
 %
 % Identify Module
 %    \begin{macrocode}
-\ProvidesDateTimeModule{welsh}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh}[2019/10/28 v1.1]
 %    \end{macrocode}
 % Need to find out if XeTeX or LuaTeX are being used.
 %    \begin{macrocode}
@@ -364,9 +363,10 @@
 %    \end{macrocode}
 %
 % Define a setting to change the ordinal suffix style.
+%\changes{1.1}{2019-10-28}{renamed scratch variables}
 %    \begin{macrocode}
-\DTMdefchoicekey{welsh}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{welsh}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
    \renewcommand*{\DTMwelshfmtordsuffix}[1]{##1}%
  \or
    \renewcommand*{\DTMwelshfmtordsuffix}[1]{%
@@ -456,7 +456,7 @@
      \DTMifbool{welsh}{mapzone}%
      {\DTMusezonemapordefault{##1}{##2}}%
      {%
-       \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+       \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
        \ifDTMshowzoneminutes\DTMwelshtimesep\DTMtwodigits{##2}\fi
      }%
    }%
@@ -523,7 +523,7 @@
      \DTMifbool{welsh}{mapzone}%
      {\DTMusezonemapordefault{##1}{##2}}%
      {%
-       \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+       \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
        \ifDTMshowzoneminutes\DTMwelshtimesep\DTMtwodigits{##2}\fi
      }%
    }%
@@ -567,6 +567,7 @@
 % Redefine \cs{datewelsh} (or \cs{date}\meta{dialect}) to prevent
 % \sty{babel} from resetting \cs{today}. (For this to work,
 % \sty{babel} must already have been loaded if it's required.)
+%\changes{1.1}{2019-10-28}{removed unwanted space}
 %    \begin{macrocode}
 \ifcsundef{date\CurrentTrackedDialect}
 {%
@@ -587,7 +588,7 @@
     \DTMifcaseregional
     {}% do nothing
     {\DTMsetstyle{welsh}}%
-    {\DTMsetstyle{welsh-numeric}}
+    {\DTMsetstyle{welsh-numeric}}%
   }%
 }%
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.ins b/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.ins
index c014c97b9f0..7ed201f81be 100644
--- a/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.ins
+++ b/Master/texmf-dist/source/latex/datetime2-welsh/datetime2-welsh.ins
@@ -3,7 +3,7 @@
 \preamble
 
  datetime2-welsh.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