From 21d19604dc80efef1747f4a048c9dae5e8e810b1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 23 Jan 2016 22:24:03 +0000 Subject: datetime2-english (22jan16) git-svn-id: svn://tug.org/texlive/trunk@39469 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/datetime2-english/datetime2-en-AU.ldf | 117 +++++++++++++++++- .../latex/datetime2-english/datetime2-en-CA.ldf | 99 ++++++++++++++- .../latex/datetime2-english/datetime2-en-GB.ldf | 2 +- .../latex/datetime2-english/datetime2-en-GG.ldf | 2 +- .../latex/datetime2-english/datetime2-en-IE.ldf | 2 +- .../latex/datetime2-english/datetime2-en-IM.ldf | 2 +- .../latex/datetime2-english/datetime2-en-JE.ldf | 2 +- .../latex/datetime2-english/datetime2-en-MT.ldf | 2 +- .../latex/datetime2-english/datetime2-en-NZ.ldf | 2 +- .../latex/datetime2-english/datetime2-en-US.ldf | 135 ++++++++++++++++++++- .../datetime2-english/datetime2-english-base.ldf | 6 +- .../latex/datetime2-english/datetime2-english.ldf | 2 +- 12 files changed, 358 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/datetime2-english') 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 62dc040b6fb..c38d70fb33e 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-AU}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-AU}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenAUdaymonthsep}{\space} \newcommand*{\DTMenAUmonthyearsep}{\space} @@ -80,6 +80,76 @@ \DTMtexorpdfstring{\protect\textsc{##1}}{##1}}% \fi } +\DTMdefchoicekey{en-AU}{zone}[\val\nr]% + {std,standard,dst,daylight,central,central-western,western% + eastern,christmas,lord-howe,cocos,keeling,clear}% +{% + \ifcase\nr\relax + % std + \appto\DTMenAUzonemaps{\DTMenAUstdzonemaps}% + \DTMenAUstdzonemaps + \or + % standard + \appto\DTMenAUzonemaps{\DTMenAUstdzonemaps}% + \DTMenAUstdzonemaps + \or + % dst + \appto\DTMenAUzonemaps{\DTMenAUdstzonemaps}% + \DTMenAUdstzonemaps + \or + % daylight + \appto\DTMenAUzonemaps{\DTMenAUdstzonemaps}% + \DTMenAUdstzonemaps + \or + % central + \appto\DTMenAUzonemaps{\DTMenAUcentralzonemaps}% + \DTMenAUcentralzonemaps + \or + % central-western + \appto\DTMenAUzonemaps{\DTMenAUcentralwesternzonemaps}% + \DTMenAUcentralwesternzonemaps + \or + % western + \appto\DTMenAUzonemaps{\DTMenAUwesternzonemaps}% + \DTMenAUwesternzonemaps + \or + % eastern + \appto\DTMenAUzonemaps{\DTMenAUeasternzonemaps}% + \DTMenAUeasternzonemaps + \or + % christmas + \appto\DTMenAUzonemaps{\DTMenAUchristmaszonemaps}% + \DTMenAUchristmaszonemaps + \or + % lord-howe + \appto\DTMenAUzonemaps{\DTMenAUlordhowezonemaps}% + \DTMenAUlordhowezonemaps + \or + % norfolk + \appto\DTMenAUzonemaps{\DTMenAUnorfolkzonemaps}% + \DTMenAUnorfolkzonemaps + \or + % cocos + \appto\DTMenAUzonemaps{\DTMenAUcocoszonemaps}% + \DTMenAUcocoszonemaps + \or + % keeling + \appto\DTMenAUzonemaps{\DTMenAUcocoszonemaps}% + \DTMenAUcocoszonemaps + \or + % clear + \renewcommand*{\DTMenAUzonemaps}{}% + \DTMclearmap{6}{30}% + \DTMclearmap{7}{00}% + \DTMclearmap{8}{00}% + \DTMclearmap{8}{45}% + \DTMclearmap{9}{00}% + \DTMclearmap{9}{30}% + \DTMclearmap{10}{00}% + \DTMclearmap{10}{30}% + \DTMclearmap{11}{00}% + \fi +} \DTMnewstyle {en-AU}% label {% date style @@ -196,14 +266,57 @@ \newcommand*{\DTMenAUzonemaps}{% \DTMdefzonemap{10}{30}{ACDT}% Australian Central Daylight Time \DTMdefzonemap{11}{00}{AEDT}% Australian Eastern Daylight Time - \DTMdefzonemap{9}{00}{AWDT}% Australian Western Daylight Time \DTMdefzonemap{9}{30}{ACST}% Australian Central Standard Time \DTMdefzonemap{8}{45}{ACWST}% Australian Central Western Standard Time + \DTMdefzonemap{9}{00}{ACWDT}% Australian Central Western Daylight Time \DTMdefzonemap{10}{00}{AEDT}% Australian Eastern Standard Time \DTMdefzonemap{8}{00}{AWDT}% Australian Western Standard Time \DTMdefzonemap{7}{00}{CXT}% Christmas Island Time \DTMdefzonemap{11}{30}{NFT}% Norfolk Island Time } +\newcommand*{\DTMenAUstdzonemaps}{% + \DTMdefzonemap{6}{30}{CCT}% + \DTMdefzonemap{7}{00}{CXT}% + \DTMdefzonemap{9}{30}{ACST}% + \DTMdefzonemap{8}{00}{AWST}% + \DTMdefzonemap{8}{45}{ACWST}% + \DTMdefzonemap{10}{00}{AEST}% + \DTMdefzonemap{10}{30}{LHST}% + \DTMdefzonemap{11}{00}{NFT}% +} +\newcommand*{\DTMenAUdstzonemaps}{% + \DTMdefzonemap{9}{00}{AWDT}% + \DTMdefzonemap{10}{30}{ACDT}% + \DTMdefzonemap{11}{00}{AEDT}% +} +\newcommand*{\DTMenAUcentralzonemaps}{% + \DTMdefzonemap{9}{30}{ACST}% + \DTMdefzonemap{10}{30}{ACDT}% +} +\newcommand*{\DTMenAUcentralwesternzonemaps}{% + \DTMdefzonemap{8}{45}{ACWST}% +} +\newcommand*{\DTMenAUwesternzonemaps}{% + \DTMdefzonemap{8}{00}{AWST}% + \DTMdefzonemap{9}{00}{AWDT}% +} +\newcommand*{\DTMenAUeasternzonemaps}{% + \DTMdefzonemap{10}{00}{AEST}% + \DTMdefzonemap{11}{00}{AEDT}% +} +\newcommand*{\DTMenAUchristmaszonemaps}{% + \DTMdefzonemap{7}{00}{CXT}% +} +\newcommand*{\DTMenAUlordhowezonemaps}{% + \DTMdefzonemap{10}{30}{LHST}% + \DTMdefzonemap{11}{00}{LHDT}% +} +\newcommand*{\DTMenAUnorfolkzonemaps}{% + \DTMdefzonemap{11}{00}{NFT}% +} +\newcommand*{\DTMenAUcocoszonemaps}{% + \DTMdefzonemap{6}{30}{CCT}% +} \DTMifcaseregional {}% do nothing {\DTMsetstyle{en-AU}}% 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 484de9605d8..029fcd4e692 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-CA}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-CA}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenCAmonthdaysep}{\space} \newcommand*{\DTMenCAdowmonthsep}{\space} @@ -82,6 +82,63 @@ \DTMtexorpdfstring{\protect\textsc{##1}}{##1}}% \fi } +\DTMdefchoicekey{en-CA}{zone}[\val\nr]% + {std,standard,dst,daylight,newfoundland,atlantic,eastern,central,mountain,% + pacific,clear}% +{% + \ifcase\nr\relax + % std + \appto\DTMenCAzonemaps{\DTMenCAstdzonemaps}% + \DTMenCAstdzonemaps + \or + % standard + \appto\DTMenCAzonemaps{\DTMenCAstdzonemaps}% + \DTMenCAstdzonemaps + \or + % dst + \appto\DTMenCAzonemaps{\DTMenCAdstzonemaps}% + \DTMenCAdstzonemaps + \or + % daylight + \appto\DTMenCAzonemaps{\DTMenCAdstzonemaps}% + \DTMenCAdstzonemaps + \or + % newfoundland + \appto\DTMenCAzonemaps{\DTMenCAnewfoundlandzonemaps}% + \DTMenCAnewfoundlandzonemaps + \or + % atlantic + \appto\DTMenCAzonemaps{\DTMenCAatlanticzonemaps}% + \DTMenCAatlanticzonemaps + \or + % eastern + \appto\DTMenCAzonemaps{\DTMenCAeasternzonemaps}% + \DTMenCAeasternzonemaps + \or + % central + \appto\DTMenCAzonemaps{\DTMenCAcentralzonemaps}% + \DTMenCAcentralzonemaps + \or + % mountain + \appto\DTMenCAzonemaps{\DTMenCAmountainzonemaps}% + \DTMenCAmountainzonemaps + \or + % pacific + \appto\DTMenCAzonemaps{\DTMenCApacificzonemaps}% + \DTMenCApacificzonemaps + \or + % clear + \renewcommand*{\DTMenCAzonemaps}{}% + \DTMclearmap{-2}{30}% + \DTMclearmap{-3}{30}% + \DTMclearmap{-3}{0}% + \DTMclearmap{-4}{0}% + \DTMclearmap{-5}{0}% + \DTMclearmap{-6}{0}% + \DTMclearmap{-7}{0}% + \DTMclearmap{-8}{0}% + \fi +} \DTMnewstyle {en-CA}% label {% date style @@ -212,6 +269,46 @@ \DTMdefzonemap{-7}{00}{MST}% \DTMdefzonemap{-8}{00}{PST}% } +\newcommand*{\DTMenCAstdzonemaps}{% + \DTMdefzonemap{-3}{30}{NST}% + \DTMdefzonemap{-4}{00}{AST}% + \DTMdefzonemap{-5}{00}{EST}% + \DTMdefzonemap{-6}{00}{CST}% + \DTMdefzonemap{-7}{00}{MST}% + \DTMdefzonemap{-8}{00}{PST}% +} +\newcommand*{\DTMenCAdstzonemaps}{% + \DTMdefzonemap{-2}{30}{NDT}% + \DTMdefzonemap{-3}{00}{ADT}% + \DTMdefzonemap{-4}{00}{EDT}% + \DTMdefzonemap{-5}{00}{CDT}% + \DTMdefzonemap{-6}{00}{MDT}% + \DTMdefzonemap{-7}{00}{PDT}% +} +\newcommand*{\DTMenCAnewfoundlandzonemaps}{% + \DTMdefzonemap{-3}{30}{NST}% + \DTMdefzonemap{-2}{30}{NDT}% +} +\newcommand*{\DTMenCAatlanticzonemaps}{% + \DTMdefzonemap{-4}{00}{AST}% + \DTMdefzonemap{-3}{00}{ADT}% +} +\newcommand*{\DTMenCAeasternzonemaps}{% + \DTMdefzonemap{-5}{00}{EST}% + \DTMdefzonemap{-4}{00}{EDT}% +} +\newcommand*{\DTMenCAcentralzonemaps}{% + \DTMdefzonemap{-6}{00}{CST}% + \DTMdefzonemap{-5}{00}{CDT}% +} +\newcommand*{\DTMenCAmountainzonemaps}{% + \DTMdefzonemap{-7}{00}{MST}% + \DTMdefzonemap{-6}{00}{MDT}% +} +\newcommand*{\DTMenCApacificzonemaps}{% + \DTMdefzonemap{-8}{00}{PST}% + \DTMdefzonemap{-7}{00}{PDT}% +} \DTMifcaseregional {}% do nothing {\DTMsetstyle{en-CA}}% 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 9556e28ab25..cd64816ea0e 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-GB}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-GB}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenGBdaymonthsep}{\space} \newcommand*{\DTMenGBmonthyearsep}{\space} 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 a0ee440124b..3c257987f5d 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-GG}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-GG}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenGGdaymonthsep}{\space} \newcommand*{\DTMenGGmonthyearsep}{\space} 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 2a7b4a2c0db..c3014865de3 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-IE}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-IE}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenIEdaymonthsep}{\space} \newcommand*{\DTMenIEmonthyearsep}{\space} 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 99c2e7a932f..d284f7531ca 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-IM}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-IM}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenIMdaymonthsep}{\space} \newcommand*{\DTMenIMmonthyearsep}{\space} 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 6e26e9be2c6..4b6580fcc1d 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-JE}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-JE}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenJEdaymonthsep}{\space} \newcommand*{\DTMenJEmonthyearsep}{\space} 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 762d4f094df..6263ccfde7c 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-MT}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-MT}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenMTdaymonthsep}{\space} \newcommand*{\DTMenMTmonthyearsep}{\space} 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 64018c02b81..b50ba697223 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-NZ}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-NZ}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenNZdaymonthsep}{\space} \newcommand*{\DTMenNZmonthyearsep}{\space} 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 d23be9d4738..935e83ff30c 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{en-US}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{en-US}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \newcommand*{\DTMenUSmonthdaysep}{\space} \newcommand*{\DTMenUSdowmonthsep}{\space} @@ -82,6 +82,85 @@ \DTMtexorpdfstring{\protect\textsc{##1}}{##1}}% \fi } +\DTMdefchoicekey{en-US}{zone}[\val\nr]% + {std,standard,dst,daylight,atlantic,eastern,central,mountain,% + pacific,alaska,hawaii-aleutian,hawaii,aleutian,samoa,charmorro,clear}% +{% + \ifcase\nr\relax + % std + \appto\DTMenUSzonemaps{\DTMenUSstdzonemaps}% + \DTMenUSstdzonemaps + \or + % standard + \appto\DTMenUSzonemaps{\DTMenUSstdzonemaps}% + \DTMenUSstdzonemaps + \or + % dst + \appto\DTMenUSzonemaps{\DTMenUSdstzonemaps}% + \DTMenUSdstzonemaps + \or + % daylight + \appto\DTMenUSzonemaps{\DTMenUSdstzonemaps}% + \DTMenUSdstzonemaps + \or + % atlantic + \appto\DTMenUSzonemaps{\DTMenUSatlanticzonemaps}% + \DTMenUSatlanticzonemaps + \or + % eastern + \appto\DTMenUSzonemaps{\DTMenUSeasternzonemaps}% + \DTMenUSeasternzonemaps + \or + % central + \appto\DTMenUSzonemaps{\DTMenUScentralzonemaps}% + \DTMenUScentralzonemaps + \or + % mountain + \appto\DTMenUSzonemaps{\DTMenUSmountainzonemaps}% + \DTMenUSmountainzonemaps + \or + % pacific + \appto\DTMenUSzonemaps{\DTMenUSpacificzonemaps}% + \DTMenUSpacificzonemaps + \or + % alaska + \appto\DTMenUSzonemaps{\DTMenUSalaskazonemaps}% + \DTMenUSalaskazonemaps + \or + % hawaii-aleutian + \appto\DTMenUSzonemaps{\DTMenUShawaiialeutianzonemaps}% + \DTMenUShawaiialeutianzonemaps + \or + % hawaii + \appto\DTMenUSzonemaps{\DTMenUShawaiialeutianzonemaps}% + \DTMenUShawaiialeutianzonemaps + \or + % aleutian + \appto\DTMenUSzonemaps{\DTMenUShawaiialeutianzonemaps}% + \DTMenUShawaiialeutianzonemaps + \or + % samoa + \appto\DTMenUSzonemaps{\DTMenUSsamoazonemaps}% + \DTMenUSsamoazonemaps + \or + % chamorro + \appto\DTMenUSzonemaps{\DTMenUSchamorrozonemaps}% + \DTMenUSchamorrozonemaps + \or + % clear + \renewcommand*{\DTMenUSzonemaps}{}% + \DTMclearmap{-3}{0}% + \DTMclearmap{-4}{0}% + \DTMclearmap{-5}{0}% + \DTMclearmap{-6}{0}% + \DTMclearmap{-7}{0}% + \DTMclearmap{-8}{0}% + \DTMclearmap{-9}{0}% + \DTMclearmap{-10}{0}% + \DTMclearmap{-11}{0}% + \DTMclearmap{10}{0}% + \fi +} \DTMnewstyle {en-US}% label {% date style @@ -211,6 +290,60 @@ \DTMdefzonemap{-7}{00}{MST}% \DTMdefzonemap{-8}{00}{PST}% } +\newcommand*{\DTMenUSstdzonemaps}{% + \DTMdefzonemap{-4}{00}{AST}% + \DTMdefzonemap{-5}{00}{EST}% + \DTMdefzonemap{-6}{00}{CST}% + \DTMdefzonemap{-7}{00}{MST}% + \DTMdefzonemap{-8}{00}{PST}% + \DTMdefzonemap{-9}{00}{AKST}% + \DTMdefzonemap{-10}{00}{HAST}% + \DTMdefzonemap{-11}{00}{SST}% + \DTMdefzonemap{10}{00}{ChST}% +} +\newcommand*{\DTMenUSdstzonemaps}{% + \DTMdefzonemap{-3}{00}{ADT}% + \DTMdefzonemap{-4}{00}{EDT}% + \DTMdefzonemap{-5}{00}{CDT}% + \DTMdefzonemap{-6}{00}{MDT}% + \DTMdefzonemap{-7}{00}{PDT}% + \DTMdefzonemap{-8}{00}{AKDT}% + \DTMdefzonemap{-9}{00}{HADT}% +} +\newcommand*{\DTMenUSatlanticzonemaps}{% + \DTMdefzonemap{-4}{00}{AST}% + \DTMdefzonemap{-3}{00}{ADT}% +} +\newcommand*{\DTMenUSeasternzonemaps}{% + \DTMdefzonemap{-5}{00}{EST}% + \DTMdefzonemap{-4}{00}{EDT}% +} +\newcommand*{\DTMenUScentralzonemaps}{% + \DTMdefzonemap{-6}{00}{CST}% + \DTMdefzonemap{-5}{00}{CDT}% +} +\newcommand*{\DTMenUSmountainzonemaps}{% + \DTMdefzonemap{-7}{00}{MST}% + \DTMdefzonemap{-6}{00}{MDT}% +} +\newcommand*{\DTMenUSpacificzonemaps}{% + \DTMdefzonemap{-8}{00}{PST}% + \DTMdefzonemap{-7}{00}{PDT}% +} +\newcommand*{\DTMenUSalaskazonemaps}{% + \DTMdefzonemap{-9}{00}{AKST}% + \DTMdefzonemap{-8}{00}{AKDT}% +} +\newcommand*{\DTMenUShawaiialeutianzonemaps}{% + \DTMdefzonemap{-10}{00}{HAST}% + \DTMdefzonemap{-9}{00}{HADT}% +} +\newcommand*{\DTMenUSsamoazonemaps}{% + \DTMdefzonemap{-11}{00}{SST}% +} +\newcommand*{\DTMenUSchamorrozonemaps}{% + \DTMdefzonemap{10}{00}{ChST}% +} \DTMifcaseregional {}% do nothing {\DTMsetstyle{en-US}}% 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 cecaae5b441..b1ef49683d1 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 @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{english-base}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{english-base}[2016/01/23 v1.03 (NLCT)] \newcommand*{\DTMenglishordinal}[1]{% \number#1 % space intended \DTMenglishfmtordsuffix{% @@ -228,7 +228,7 @@ \DTMenglishtimesep\DTMtwodigits{##2}% \ifnum##1=12 \DTMtexorpdfstring - {\DTMenglishampmfmt{\DTMenglisham}}% + {\DTMenglishampmfmt{\DTMenglishpm}}% {\DTMenglishpm}% \else \DTMtexorpdfstring @@ -240,7 +240,7 @@ \DTMenglishtimesep\DTMtwodigits{##2}% \ifnum##1=24 \DTMtexorpdfstring - {\DTMenglishampmfmt{\DTMenglishpm}}% + {\DTMenglishampmfmt{\DTMenglisham}}% {\DTMenglisham}% \else \DTMtexorpdfstring 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 91203eb6d1f..3fb46c1fa2d 100644 --- a/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-english/datetime2-english.ldf @@ -44,7 +44,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{english}[2015/01/18 v1.02 (NLCT)] +\ProvidesDateTimeModule{english}[2016/01/23 v1.03 (NLCT)] \RequireDateTimeModule{english-base} \DTMnewstyle {english}% label -- cgit v1.2.3