summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-01-23 22:24:03 +0000
committerKarl Berry <karl@freefriends.org>2016-01-23 22:24:03 +0000
commit21d19604dc80efef1747f4a048c9dae5e8e810b1 (patch)
tree799709dd6c3e450d8dd396cb7eb6c524067c3890
parent38203e642e358a19a7cfc36864af651c0384068b (diff)
datetime2-english (22jan16)
git-svn-id: svn://tug.org/texlive/trunk@39469 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/datetime2-english/CHANGES6
-rw-r--r--Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdfbin513919 -> 544753 bytes
-rw-r--r--Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx787
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-AU.ldf117
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-CA.ldf99
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GB.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-GG.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IE.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-IM.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-JE.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-MT.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-NZ.ldf2
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-en-US.ldf135
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-english-base.ldf6
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-english/datetime2-english.ldf2
15 files changed, 1111 insertions, 55 deletions
diff --git a/Master/texmf-dist/doc/latex/datetime2-english/CHANGES b/Master/texmf-dist/doc/latex/datetime2-english/CHANGES
index 30b95a8a76f..e0cb8a49fa5 100644
--- a/Master/texmf-dist/doc/latex/datetime2-english/CHANGES
+++ b/Master/texmf-dist/doc/latex/datetime2-english/CHANGES
@@ -1,3 +1,9 @@
+v1.03 (2016-01-23):
+
+ * Added "zone" option to en-US, en-CA and en-AU modules.
+
+ * Bug fix in englishampm time style
+
v1.02 (2016-01-18):
* Added support for "showdow" to the en-US and en-CA styles.
diff --git a/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf b/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf
index dd8fc4479b1..9b0c6a83329 100644
--- a/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2-english/datetime2-english.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx b/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx
index e934e911a45..9116cadc19f 100644
--- a/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx
+++ b/Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx
@@ -36,7 +36,7 @@
pdftitle={datetime2.sty English Module}]{hyperref}
-\CheckSum{2298}
+\CheckSum{2679}
\renewcommand*{\usage}[1]{\hyperpage{#1}}
\renewcommand*{\main}[1]{\hyperpage{#1}}
@@ -45,6 +45,8 @@
\newcommand*{\sty}[1]{\textsf{#1}}
\newcommand*{\opt}[1]{\texttt{#1}\index{#1=\texttt{#1}|main}}
+\newcommand*{\utc}[2]{\textsc{utc}\ifnum#1<0 $-$\number-#1\else $+$\number#1\fi
+ \ifnum#2>0 :\number#2 \fi\relax}
\RecordChanges
\PageIndex
@@ -60,7 +62,7 @@
%
%\title{English Module for datetime2 Package}
%\author{Nicola L. C. Talbot}
-%\date{2016-01-18 (v1.02)}
+%\date{2016-01-23 (v1.03)}
%\maketitle
%
%\begin{abstract}
@@ -89,7 +91,7 @@
% passed as a document class option or passed to \sty{tracklang}.
% See the \sty{tracklang} documentation for further details.
%
-% Here are some example usage for British English with
+% Here are some examples for British English with
% \sty{polyglossia}:
%
%\begin{enumerate}
@@ -99,14 +101,14 @@
%
%\usepackage{fontspec}
%\usepackage{polyglossia}
+%\setmainlanguage[variant=uk]{english}
%\usepackage{datetime2}
%\end{verbatim}
%(You need to set the \opt{useregional} option to either
%\texttt{text} or \texttt{numeric} to enable the "en-GB" or
%"en-GB-numeric" styles.)
%
-%\item Pass "en-GB" in the document class option list and use
-% \sty{polyglossia}'s language interface:
+%\item Pass "en-GB" in the document class option list:
%\begin{verbatim}
%\documentclass[en-GB]{article}
%
@@ -156,6 +158,14 @@
%\end{document}
%\end{verbatim}
%
+% If you want to change the settings for a particular module, you
+% must use the module's name (such as "en-GB") rather than a
+% \sty{babel} or \sty{polyglossia} synonym (such as "british" or "uk").
+% For example:
+%\begin{verbatim}
+%\DTMlangsetup[en-GB]{ord=raise}
+%\end{verbatim}
+%
%\section{Base module}
%\label{sec:base}
%The "english-base" module is loaded by all the English modules. It
@@ -204,7 +214,7 @@
% The "en-GB" time style uses the base "englishampm" style.
%
% There are a number of settings provided that can be used in
-% \cs{DTMlangsetup} to modify the date style. These are:
+% \cs{DTMlangsetup} to modify the date-time style. These are:
%
%\begin{description}
%\item[\opt{daymonthsep}] The separator between the day and the month
@@ -235,7 +245,7 @@
%\item[\opt{mapzone}] This is a~boolean key. If "true" the time zone
%mappings are applied. (The default is \texttt{true}.) The "en-GB"
% and "en-GB-numeric" styles set the mappings GMT
-%(UTC+00:00) and BST (UTC+01:00).
+%(\utc{00}{00}) and BST (\utc{01}{00}).
%Other time zone mappings that have previously been set
%(for example, by another regional style) will remain unchanged
%unless you redefine \cs{DTMresetzones} to reset or unset them.
@@ -298,7 +308,7 @@
%\item[\opt{dayyearsep}] The separator between the day and the year
%in the "en-US" style. The default is ",\space"
%
-%\item[\opt{dowmonthsep}] The separator between the day of week
+%\item[\opt{dowmonthsep}] The separator between the day-of-week
%name and the month name in the "en-US" style. The default is
%\cs{space}. This is new to version 1.02, which now supports the
%\opt{showdow} package option.
@@ -320,16 +330,6 @@
%\item[\opt{abbr}] This is a~boolean key. If "true", the month
%is abbreviated. The default is "false".
%
-%\item[\opt{mapzone}] This is a~boolean key. If "true" the time zone
-%mappings are applied. (The default is \texttt{false}.) The "en-US" style sets the mappings ADT
-%(UTC$-$03:00), AST (UTC$-$04:00), EST (UTC$-$05:00), CST
-%(UTC$-$06:00),
-%MST (UTC$-$07:00) and PST (UTC$-$08:00). If your want to use different
-%mappings, you can redefine \cs{DTMuszonemaps}.
-%Other time zone mappings that have previously been set
-%(for example, by another regional style) will remain unchanged
-%unless you redefine \cs{DTMresetzones} to reset or unset them.
-%
%\item[\opt{ord}] The same as the "en-GB" style except that the default
%value is "omit".
%
@@ -342,9 +342,78 @@
%the day-year separator is also omitted if the day of the month is
%shown otherwise both the day-year and month-day separators are omitted.
%
+%\item[\opt{mapzone}] This is a~boolean key. If "true" the time zone
+%mappings are applied. (The default is \texttt{false}.) The "en-US" style sets the mappings ADT
+%(\utc{-03}{00}), AST (\utc{-04}{00}), EST (\utc{-05}{00}), CST
+%(\utc{-06}{00}),
+%MST (\utc{-07}{00}) and PST (\utc{-08}{00}). If your want to use different
+%mappings, you can redefine \cs{DTMenUSzonemaps}.
+%Other time zone mappings that have previously been set
+%(for example, by another regional style) will remain unchanged
+%unless you redefine \cs{DTMresetzones} to reset or unset them.
+%
+%\item[\opt{zone}] (new to v1.03) As mentioned above, if the \opt{mapzone}
+% option is set, the time zone mappings are set using \cs{DTMenUSzonemaps}.
+% This option can be used to both append to \cs{DTMenUSzonemaps} and
+% set the new mappings. The \opt{zone} option may take one of the
+% following values:
+% \begin{itemize}
+% \item \opt{std} or \opt{standard}: set the standard time zone
+% mappings AST (\utc{-4}{00}), EST (\utc{-5}{00}), CST (\utc{-6}{00}), MST
+% (\utc{-7}{00}), PST (\utc{-8}{00}), AKST (\utc{-9}{00}), HAST (\utc{-10}{00}), SST
+% (\utc{-10}{00}), ChST (\utc{10}{00}).
+% \item \opt{dst} or \opt{daylight}: set the daylight savings time
+% zone mappings ADT (\utc{-3}{00}), EDT (\utc{-4}{00}), CDT (\utc{-6}{00}), MDT
+% (\utc{-6}{00}), PDT (\utc{-7}{00}), AKDT (\utc{-8}{00}), HADT (\utc{-9}{00}).
+% \item \opt{atlantic}: set the Atlantic standard and daylight
+% saving mappings AST (\utc{-4}{00}) and ADT (\utc{-3}{00}).
+% \item \opt{eastern}: set the Eastern standard and daylight
+% saving mappings EST (\utc{-5}{00}) and EDT (\utc{-4}{00}).
+% \item \opt{central}: set the Central standard and daylight
+% saving mappings CST (\utc{-6}{00}) and CDT (\utc{-5}{00}).
+% \item \opt{mountain}: set the Mountain standard and daylight
+% saving mappings MST (\utc{-7}{00}) and MDT (\utc{-6}{00}).
+% \item \opt{pacific}: set the Pacific standard and daylight
+% saving mappings PST (\utc{-8}{00}) and PDT (\utc{-7}{00}).
+% \item \opt{alaska}: set the Alaska standard and daylight
+% saving mappings AKST (\utc{-9}{00}) and AKDT (\utc{-8}{00}).
+% \item \opt{hawaii-aleutian} or \opt{hawaii} or \opt{aleutian}:
+% set the Hawaii-Aleutian standard and daylight
+% saving mappings HAST (\utc{-10}{00}) and HADT (\utc{-9}{00}).
+% \item \opt{samoa}: set the Samoa Standard Time mapping SST (\utc{-11}{00}).
+% \item \opt{chamorro}: set the Chamorro Standard Time mapping ChST (\utc{-10}{00}).
+% \item \opt{clear}: redefines \cs{DTMenUSzonemaps} to empty and
+% clears the mappings (using \cs{DTMclearmap}) for \utc{-3}{00}, \utc{-4}{00},
+% \utc{-5}{00}, \utc{-6}{00}, \utc{-7}{00}, \utc{-8}{00}, \utc{-9}{00}, \utc{-10}{00},
+% \utc{-11}{00} and \utc{10}{00}.
+% \end{itemize}
+% Other existing mappings are unchanged. For example,
+%\begin{verbatim}
+%\DTMlangsetup[en-US]{zone=atlantic,zone=pacific}
+%\end{verbatim}
+% will set the mappings AST (\utc{-4}{00}), ADT (\utc{-3}{00}), PST (\utc{-8}{00})
+% and PDT (\utc{-7}{00}). Any other time zone offset mappings that were
+% previously set will remain the same. However:
+%\begin{verbatim}
+%\DTMlangsetup[en-US]{zone=atlantic,zone=eastern}
+%\end{verbatim}
+% will result in the mappings ADT (\utc{-3}{00}), EST (\utc{-5}{00}) and EDT
+% (\utc{-4}{00}), since the EDT mapping will overwrite the AST mapping.
+% Again, any other time zone offset mappings that were previously
+% set remain the same.
+%
+% Another example:
+%\begin{verbatim}
+%\DTMlangsetup[en-US]{zone=dst,zone=atlantic,zone=pacific}
+%\end{verbatim}
+% This will first set the daylight saving mappings and then set the
+% Atlantic mappings, which means that \utc{-4}{00} will now be mapped to
+% AST instead of EDT, and then it will set the Pacific mappings,
+% which means that \utc{-8}{00} will now be mapped to PST instead of
+% AKDT.
%\end{description}
%
-%The "en-US" time style uses the "englishampm". The "en-US-numeric"
+%The "en-US" time style uses the "englishampm" style. The "en-US-numeric"
%uses a 24 hour style. The time zone checks the \opt{mapzone}
%setting (described above). If it's set, then
%\cs{DTMusezonemapordefault} is used otherwise a numeric
@@ -363,8 +432,38 @@
% that are virtually identical to the "en-US" and "en-US-numeric" style.
% These have the same options as for the US styles but the zone maps
% are provided by \cs{DTMenCAzonemaps}, which can be redefined as required.
-% This has the additional time zones NDT and NST. Note that other than NDT,
-%daylight saving isn't taken into account.
+% As from v1.03, there's also a \opt{zone} setting that works in a
+% similar manner to the \opt{zone} setting for the "en-US" module
+% described above. For "en-CA", the
+% available values are:
+% \begin{itemize}
+% \item \opt{std} or \opt{standard}: set the standard time zone
+% mappings NST (\utc{-3}{30}), AST (\utc{-4}{00}), EST (\utc{-5}{00}), CST (\utc{-6}{00}), MST
+% (\utc{-7}{00}), PST (\utc{-8}{00}).
+% \item \opt{dst} or \opt{daylight}: set the daylight savings time
+% zone mappings NDT (\utc{-2}{30}), ADT (\utc{-3}{00}), EDT (\utc{-4}{00}), CDT (\utc{-6}{00}),
+% MDT (\utc{-6}{00}), PDT (\utc{-7}{00}).
+% \item \opt{newfoundland}: set the Newfoundland standard and daylight
+% saving mappings NST (\utc{-3}{30}) and NDT (\utc{-2}{30}).
+% \item \opt{atlantic}: set the Atlantic standard and daylight
+% saving mappings AST (\utc{-4}{00}) and ADT (\utc{-3}{00}).
+% \item \opt{eastern}: set the Eastern standard and daylight
+% saving mappings EST (\utc{-5}{00}) and EDT (\utc{-4}{00}).
+% \item \opt{central}: set the Central standard and daylight
+% saving mappings CST (\utc{-6}{00}) and CDT (\utc{-5}{00}).
+% \item \opt{mountain}: set the Mountain standard and daylight
+% saving mappings MST (\utc{-7}{00}) and MDT (\utc{-6}{00}).
+% \item \opt{pacific}: set the Pacific standard and daylight
+% saving mappings PST (\utc{-8}{00}) and PDT (\utc{-7}{00}).
+% \item \opt{clear}: redefines \cs{DTMenCAzonemaps} to empty and
+% clears the mappings (using \cs{DTMclearmap}) for \utc{-2}{30},
+% \utc{-3}{30}, \utc{-3}{00}, \utc{-4}{00}, \utc{-5}{00}, \utc{-6}{00}, \utc{-7}{00} and \utc{-8}{00}.
+% \end{itemize}
+% For example, if you live in a region that doesn't implement
+% daylight saving:
+%\begin{verbatim}
+%\DTMlangsetup[en-CA]{zone=std}
+%\end{verbatim}
%
%\section{English (AU)}
%\label{sec:en-AU}
@@ -378,8 +477,45 @@
% These have the same options as the GB styles (except that the default value of
% \opt{ord} is "omit" rather than "level" and the default value of
% "mapzone" is false) but the zone maps are provided by
-%\cs{DTMenAUzonemaps}, which can be redefined as required. Note that
-%daylight saving isn't taken into account.
+%\cs{DTMenAUzonemaps}, which can be redefined as required. This
+%doesn't take all zones into account, but as from v1.03, there is
+%now the \opt{zone} option, which modifies \cs{DTMenAUzonemaps}.
+%This works in much the same way as for the "en-US" and "en-CA"
+%options of the same name, described above. Available values for the "en-AU" module:
+% \begin{itemize}
+% \item \opt{std} or \opt{standard}: set the standard time zone
+% mappings CCT (\utc{6}{30}), CXT (\utc{7}{00}), AWST (\utc{8}{00}), ACWST (\utc{8}{45}),
+% ACST (\utc{9}{30}), AEST (\utc{10}{00}), LHST (\utc{10}{30}),
+% NFT (\utc{11}{00}).
+% \item \opt{dst} or \opt{daylight}: set the daylight savings time
+% zone mappings AWDT (\utc{9}{00}), ACDT (\utc{10}{30}), AEDT (\utc{11}{00}).
+% Note that conflicting zones are missing, such as LHDT (\utc{11}{00})
+% which coincides with AEDT.
+% \item \opt{central}: set the Australian Central standard and daylight
+% saving mappings ACST (\utc{9}{30}) and ACDT (\utc{10}{30}).
+% \item \opt{central-western}: set the Australian Central Western
+% Standard Time mapping ACWST (\utc{8}{45}).
+% \item \opt{western}: set the Australian Western standard and daylight
+% saving mappings AWST (\utc{8}{0}) and AWDT (\utc{9}{0}).
+% \item \opt{eastern}: set the Australian Eastern standard and daylight
+% saving mappings AEST (\utc{10}{0}) and AEDT (\utc{11}{0}).
+% \item \opt{christmas}: set the Christmas Island Time mapping CXT
+% (\utc{7}{0}).
+% \item \opt{lord-howe}: set the Lord Howe Island standard and daylight
+% saving mappings LHST (\utc{10}{30}) and LHDT (\utc{11}{0}).
+% \item \opt{norfolk}: set the Norfolk Island
+% time mapping NFT (\utc{11}{0}).
+% \item \opt{cocos} or \opt{keeling}: set the Cocos (Keeling) island
+% time mapping CCT (\utc{6}{30}).
+% \item \opt{clear}: redefines \cs{DTMenAUzonemaps} to empty and
+% clears the mappings (using \cs{DTMclearmap}) for \utc{6}{30},
+% \utc{7}{00}, \utc{8}{00}, \utc{8}{45}, \utc{9}{00}, \utc{9}{30}, \utc{10}{00},
+% \utc{10}{30}, \utc{11}{00}.
+% \end{itemize}
+%Example:
+%\begin{verbatim}
+%\DTMlangsetup[en-AU]{zone=cocos,zone=christmas}
+%\end{verbatim}
%
%\section{English (NZ)}
%\label{sec:en-NZ}
@@ -391,6 +527,8 @@
% This module provides the "en-NZ" and "en-NZ-numeric" styles that
% are virtually identical to the "AU" styles but the zone maps are provided by
%\cs{DTMenNZzonemaps}, which can be redefined as required.
+% The default NZ mappings are NZST (\utc{12}{00}), CHAST (\utc{12}{45}),
+% NZDT (\utc{13}{00}), CHADT (\utc{13}{45}).
%
%\section{English (GG)}
%\label{sec:en-GG}
@@ -429,7 +567,7 @@
% \texttt{en-GB}\slash\texttt{en-GB-numeric} and
% \texttt{en-MT}\slash\texttt{en-MT-numeric} styles: the \opt{ord} option
% (for the text styles) defaults to
-% \texttt{omit} and the CET (+01:00) and CEST (+02:00) time zone
+% \texttt{omit} and the CET (\utc{1}{0}) and CEST (\utc{2}{0}) time zone
% mappings are added (for both the text and numeric styles).
%
%\section{English (IE)}
@@ -445,7 +583,7 @@
% The only difference in the
% \texttt{en-GB}\slash\texttt{en-GB-numeric} and
% \texttt{en-IE}\slash\texttt{en-IE-numeric} styles is that
-% the +01:00 time zone is mapped to IST instead of
+% the \utc{1}{0} time zone is mapped to IST instead of
% BST. If you prefer WET/WEST time zones, you can do:
%\begin{verbatim}
%\renewcommand*{\DTMenIEzonemaps}{%
@@ -475,7 +613,7 @@
%\changes{1.0}{2015-03-24}{Initial release}
% Identify module
% \begin{macrocode}
-\ProvidesDateTimeModule{english-base}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{english-base}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Since the main emphasize of the \sty{datetime2} package is to
% provide expandable dates where possible, the commands here need to
@@ -755,8 +893,12 @@
\fi
\DTMenglishtimesep\DTMtwodigits{##2}%
\ifnum##1=12
+% \end{macrocode}
+% v1.03 bug fixed replaced \cs{DTMenglisham} with \cs{DTMenglishpm}
+%\changes{1.03}{2016-01-23}{fixed bug that displayed am instead of pm}
+% \begin{macrocode}
\DTMtexorpdfstring
- {\DTMenglishampmfmt{\DTMenglisham}}%
+ {\DTMenglishampmfmt{\DTMenglishpm}}%
{\DTMenglishpm}%
\else
\DTMtexorpdfstring
@@ -767,8 +909,12 @@
\number\numexpr##1-12\relax
\DTMenglishtimesep\DTMtwodigits{##2}%
\ifnum##1=24
+% \end{macrocode}
+% v1.03 bug fixed replaced \cs{DTMenglishpm} with \cs{DTMenglisham}
+%\changes{1.03}{2016-01-23}{fixed bug that displayed am instead of pm}
+% \begin{macrocode}
\DTMtexorpdfstring
- {\DTMenglishampmfmt{\DTMenglishpm}}%
+ {\DTMenglishampmfmt{\DTMenglisham}}%
{\DTMenglisham}%
\else
\DTMtexorpdfstring
@@ -801,7 +947,7 @@
%
% Identify Module
% \begin{macrocode}
-\ProvidesDateTimeModule{english}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{english}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load the base English module.
% \begin{macrocode}
@@ -896,7 +1042,7 @@
%\fi
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-GB}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-GB}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -1212,7 +1358,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-US}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-US}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -1352,6 +1498,91 @@
}
% \end{macrocode}
%
+% Define a setting to change zone mappings.
+%\changes{1.03}{2016-01-23}{added zone option to en-US}
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
+%
+%
% Define the "en-US" style. Hiding the day of month is a bit awkward
% as the default day-year separator has a comma that should
% disappear if the day number is missing so the month-day separator
@@ -1504,6 +1735,137 @@
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\DTMenUSstdzonemaps}
+% Just the standard time zone mappings.
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\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}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSdstzonemaps}
+% Just daylight saving mappings.
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\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}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSatlanticzonemaps}
+% Just the Atlantic zone mappings (AST and ADT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSatlanticzonemaps}{%
+ \DTMdefzonemap{-4}{00}{AST}%
+ \DTMdefzonemap{-3}{00}{ADT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSeasternzonemaps}
+% Just the Eastern zone mappings (EST and EDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSeasternzonemaps}{%
+ \DTMdefzonemap{-5}{00}{EST}%
+ \DTMdefzonemap{-4}{00}{EDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUScentralzonemaps}
+% Just the Central zone mappings (CST and CDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUScentralzonemaps}{%
+ \DTMdefzonemap{-6}{00}{CST}%
+ \DTMdefzonemap{-5}{00}{CDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSmountainzonemaps}
+% Just the Mountain zone mappings (MST and MDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSmountainzonemaps}{%
+ \DTMdefzonemap{-7}{00}{MST}%
+ \DTMdefzonemap{-6}{00}{MDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSpacificzonemaps}
+% Just the Pacific zone mappings (PST and PDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSpacificzonemaps}{%
+ \DTMdefzonemap{-8}{00}{PST}%
+ \DTMdefzonemap{-7}{00}{PDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSalaskazonemaps}
+% Just the Alaska zone mappings (AKST and AKDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSalaskazonemaps}{%
+ \DTMdefzonemap{-9}{00}{AKST}%
+ \DTMdefzonemap{-8}{00}{AKDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUShawaiialeutianzonemaps}
+% Just the Hawaii-Aleutian zone mappings (HAST and HADT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUShawaiialeutianzonemaps}{%
+ \DTMdefzonemap{-10}{00}{HAST}%
+ \DTMdefzonemap{-9}{00}{HADT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSsamoazonemaps}
+% Just the Samoa standard time (SST).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSsamoazonemaps}{%
+ \DTMdefzonemap{-11}{00}{SST}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenUSchamorrozonemaps}
+% Just the Chamorro standard time (ChST).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSchamorrozonemaps}{%
+ \DTMdefzonemap{10}{00}{ChST}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%
% Switch style according to the \opt{useregional} setting.
% \begin{macrocode}
@@ -1558,7 +1920,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-CA}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-CA}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -1698,6 +2060,68 @@
}
% \end{macrocode}
%
+% Define a setting to change zone mappings.
+%\changes{1.03}{2016-01-23}{added zone option to en-CA}
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
+%
% Define the "en-CA" style (similar to "en-US").
% \begin{macrocode}
\DTMnewstyle
@@ -1848,6 +2272,102 @@
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\DTMenCAstdzonemaps}
+% Just the standard time zone mappings.
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\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}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenCAdstzonemaps}
+% Just daylight saving mappings.
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\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}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenCAnewfoundlandzonemaps}
+% Just the Newfoundland zone mappings (NST and NDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenCAnewfoundlandzonemaps}{%
+ \DTMdefzonemap{-3}{30}{NST}%
+ \DTMdefzonemap{-2}{30}{NDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenCAatlanticzonemaps}
+% Just the Atlantic zone mappings (AST and ADT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenCAatlanticzonemaps}{%
+ \DTMdefzonemap{-4}{00}{AST}%
+ \DTMdefzonemap{-3}{00}{ADT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenCAeasternzonemaps}
+% Just the Eastern zone mappings (EST and EDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenCAeasternzonemaps}{%
+ \DTMdefzonemap{-5}{00}{EST}%
+ \DTMdefzonemap{-4}{00}{EDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenCAcentralzonemaps}
+% Just the Central zone mappings (CST and CDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenCAcentralzonemaps}{%
+ \DTMdefzonemap{-6}{00}{CST}%
+ \DTMdefzonemap{-5}{00}{CDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenCAmountainzonemaps}
+% Just the Mountain zone mappings (MST and MDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenCAmountainzonemaps}{%
+ \DTMdefzonemap{-7}{00}{MST}%
+ \DTMdefzonemap{-6}{00}{MDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenCApacificzonemaps}
+% Just the Pacific zone mappings (PST and PDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenCApacificzonemaps}{%
+ \DTMdefzonemap{-8}{00}{PST}%
+ \DTMdefzonemap{-7}{00}{PDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%
% Switch style according to the \opt{useregional} setting.
% \begin{macrocode}
@@ -1901,7 +2421,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-AU}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-AU}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -2031,6 +2551,80 @@
}
% \end{macrocode}
%
+% Define a setting to change zone mappings.
+%\changes{1.03}{2016-01-23}{added zone option to en-AU}
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
% Define the "en-AU" style.
% \begin{macrocode}
\DTMnewstyle
@@ -2160,9 +2754,9 @@
\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
@@ -2171,6 +2765,119 @@
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\DTMenAUstdzonemaps}
+% Just the standard time zone mappings.
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\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}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUdstzonemaps}
+% Just daylight saving mappings. (Conflicts omitted.)
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUdstzonemaps}{%
+ \DTMdefzonemap{9}{00}{AWDT}%
+ \DTMdefzonemap{10}{30}{ACDT}%
+ \DTMdefzonemap{11}{00}{AEDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUcentralzonemaps}
+% Just the Australian Central zone mappings (ACST and ACDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUcentralzonemaps}{%
+ \DTMdefzonemap{9}{30}{ACST}%
+ \DTMdefzonemap{10}{30}{ACDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUcentralwesternzonemaps}
+% Just the Australian Central Western zone mapping (ACWST).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUcentralwesternzonemaps}{%
+ \DTMdefzonemap{8}{45}{ACWST}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUwesternzonemaps}
+% Just the Australian Western zone mappings (AWST and AWDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUwesternzonemaps}{%
+ \DTMdefzonemap{8}{00}{AWST}%
+ \DTMdefzonemap{9}{00}{AWDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUeasternzonemaps}
+% Just the Australian Eastern zone mappings (AEST and AEDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUeasternzonemaps}{%
+ \DTMdefzonemap{10}{00}{AEST}%
+ \DTMdefzonemap{11}{00}{AEDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUchrismaszonemaps}
+% Just the Christmas Island zone mapping (CXT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUchristmaszonemaps}{%
+ \DTMdefzonemap{7}{00}{CXT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUlordhowezonemaps}
+% Just the Lord Howe Island zone mappings (LHST and LHDT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUlordhowezonemaps}{%
+ \DTMdefzonemap{10}{30}{LHST}%
+ \DTMdefzonemap{11}{00}{LHDT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUnorfolkzonemaps}
+% Just the Norfolk Island zone mapping (NFT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUnorfolkzonemaps}{%
+ \DTMdefzonemap{11}{00}{NFT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\DTMenAUcocoszonemaps}
+% Just the Cocos (Keeling) Island zone mapping (CCT).
+%\changes{1.03}{2016-01-23}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenAUcocoszonemaps}{%
+ \DTMdefzonemap{6}{30}{CCT}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%
% Switch style according to the \opt{useregional} setting.
% \begin{macrocode}
@@ -2224,7 +2931,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-NZ}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-NZ}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -2542,7 +3249,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-GG}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-GG}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -2856,7 +3563,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-JE}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-JE}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -3170,7 +3877,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-IM}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-IM}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -3484,7 +4191,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-MT}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-MT}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -3799,7 +4506,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-IE}[2015/01/18 v1.02 (NLCT)]
+\ProvidesDateTimeModule{en-IE}[2016/01/23 v1.03 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
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