From 9f536ae74be656fcaffd73428023c8084f372fea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 28 Oct 2019 20:56:57 +0000 Subject: datetime2-welsh (28oct19) git-svn-id: svn://tug.org/texlive/trunk@52553 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/datetime2-welsh/datetime2-welsh.pdf | Bin 285782 -> 285605 bytes .../latex/datetime2-welsh/datetime2-welsh.dtx | 35 +++++++++++---------- .../latex/datetime2-welsh/datetime2-welsh.ins | 2 +- .../datetime2-welsh/datetime2-welsh-ascii.ldf | 8 ++--- .../latex/datetime2-welsh/datetime2-welsh-utf8.ldf | 8 ++--- .../tex/latex/datetime2-welsh/datetime2-welsh.ldf | 14 ++++----- 6 files changed, 34 insertions(+), 33 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/datetime2-welsh/datetime2-welsh.pdf b/Master/texmf-dist/doc/latex/datetime2-welsh/datetime2-welsh.pdf index 9fd3f409f06..c172eaf10e0 100644 Binary files a/Master/texmf-dist/doc/latex/datetime2-welsh/datetime2-welsh.pdf and b/Master/texmf-dist/doc/latex/datetime2-welsh/datetime2-welsh.pdf differ 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 diff --git a/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf b/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf index 8082a4d49c9..7c7a7294764 100644 --- a/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf @@ -7,7 +7,7 @@ %% datetime2-welsh.dtx (with options: `datetime2-welsh-ascii.ldf,package') %% %% 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 @@ -39,10 +39,10 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{welsh-ascii}[2015/03/26 v1.0] +\ProvidesDateTimeModule{welsh-ascii}[2019/10/28 v1.1] \newcommand*{\DTMwelshordinal}[1]{% - \number#1 - \ifnum#1=1 + \number#1 % space intended + \ifnum#1=1 % space intended \DTMwelshfmtordsuffix{a\protect\~{n}}% \fi } diff --git a/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf b/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf index 387f1688f16..dd6b44e27e9 100644 --- a/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf @@ -7,7 +7,7 @@ %% datetime2-welsh.dtx (with options: `datetime2-welsh-utf8.ldf,package') %% %% 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 @@ -39,10 +39,10 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{welsh-utf8}[2015/03/26 v1.0] +\ProvidesDateTimeModule{welsh-utf8}[2019/10/28 v1.1] \newcommand*{\DTMwelshordinal}[1]{% - \number#1 - \ifnum#1=1 + \number#1 % space intended + \ifnum#1=1 % space intended \DTMwelshfmtordinal{añ}% \fi } diff --git a/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh.ldf b/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh.ldf index 6e67004478d..9d2d2227761 100644 --- a/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-welsh/datetime2-welsh.ldf @@ -7,7 +7,7 @@ %% datetime2-welsh.dtx (with options: `datetime2-welsh.ldf,package') %% %% 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 @@ -39,7 +39,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{welsh}[2015/03/26 v1.0] +\ProvidesDateTimeModule{welsh}[2019/10/28 v1.1] \RequirePackage{ifxetex,ifluatex} \ifxetex \RequireDateTimeModule{welsh-utf8} @@ -62,8 +62,8 @@ \DTMdefkey{welsh}{timezonesep}{\renewcommand*{\DTMwelshtimezonesep}{#1}} \DTMdefkey{welsh}{datesep}{\renewcommand*{\DTMwelshdatesep}{#1}} \DTMdefkey{welsh}{timesep}{\renewcommand*{\DTMwelshtimesep}{#1}} -\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]{% @@ -121,7 +121,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 }% }% @@ -184,7 +184,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 }% }% @@ -231,7 +231,7 @@ \DTMifcaseregional {}% do nothing {\DTMsetstyle{welsh}}% - {\DTMsetstyle{welsh-numeric}} + {\DTMsetstyle{welsh-numeric}}% }% }% \endinput -- cgit v1.2.3