summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/datetime2-english
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-01-18 23:37:25 +0000
committerKarl Berry <karl@freefriends.org>2016-01-18 23:37:25 +0000
commitf0b77116cd5193379982d429f353a92a07c417f6 (patch)
treed2b6320b155e6590af0a67875ecb5a9b00865050 /Master/texmf-dist/source/latex/datetime2-english
parent1992dc297aa0c1fd0db744a805a79e763c84ccd4 (diff)
datetime2-english (18jan16)
git-svn-id: svn://tug.org/texlive/trunk@39422 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/datetime2-english')
-rw-r--r--Master/texmf-dist/source/latex/datetime2-english/datetime2-english.dtx84
1 files changed, 65 insertions, 19 deletions
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 a643cb7d8bd..e934e911a45 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{2270}
+\CheckSum{2298}
\renewcommand*{\usage}[1]{\hyperpage{#1}}
\renewcommand*{\main}[1]{\hyperpage{#1}}
@@ -60,7 +60,7 @@
%
%\title{English Module for datetime2 Package}
%\author{Nicola L. C. Talbot}
-%\date{2015-04-09 (v1.01)}
+%\date{2016-01-18 (v1.02)}
%\maketitle
%
%\begin{abstract}
@@ -298,6 +298,11 @@
%\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
+%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.
+%
%\item[\opt{datesep}] The separator between the date numbers in the
%"en-US-numeric" format.
%
@@ -339,8 +344,6 @@
%
%\end{description}
%
-%The "en-US" style doesn't use the \opt{showdow} setting.
-%
%The "en-US" time style uses the "englishampm". The "en-US-numeric"
%uses a 24 hour style. The time zone checks the \opt{mapzone}
%setting (described above). If it's set, then
@@ -359,7 +362,7 @@
% This module provides the "en-CA" and "en-CA-numeric" styles
% 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.
+% 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.
%
@@ -472,7 +475,7 @@
%\changes{1.0}{2015-03-24}{Initial release}
% Identify module
% \begin{macrocode}
-\ProvidesDateTimeModule{english-base}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{english-base}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Since the main emphasize of the \sty{datetime2} package is to
% provide expandable dates where possible, the commands here need to
@@ -798,7 +801,7 @@
%
% Identify Module
% \begin{macrocode}
-\ProvidesDateTimeModule{english}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{english}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load the base English module.
% \begin{macrocode}
@@ -893,7 +896,7 @@
%\fi
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-GB}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-GB}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -1209,7 +1212,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-US}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-US}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -1226,6 +1229,15 @@
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\DTMenUSdowmonthsep}
+% The separator between the day of week name and the month for the text format.
+% (New to version 1.02.)
+%\changes{1.02}{2016-01-18}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenUSdowmonthsep}{\space}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\DTMenUSdayyearsep}
% The separator between the day and year for the text format.
% \begin{macrocode}
@@ -1267,6 +1279,7 @@
%separators.
% \begin{macrocode}
\DTMdefkey{en-US}{monthdaysep}{\renewcommand*{\DTMenUSmonthdaysep}{#1}}
+\DTMdefkey{en-US}{dowmonthsep}{\renewcommand*{\DTMenUSdowmonthsep}{#1}}
\DTMdefkey{en-US}{dayyearsep}{\renewcommand*{\DTMenUSdayyearsep}{#1}}
\DTMdefkey{en-US}{datetimesep}{\renewcommand*{\DTMenUSdatetimesep}{#1}}
\DTMdefkey{en-US}{timezonesep}{\renewcommand*{\DTMenUStimezonesep}{#1}}
@@ -1343,12 +1356,24 @@
% as the default day-year separator has a comma that should
% disappear if the day number is missing so the month-day separator
% is used as the month-year separator if the day is missing.
+%\changes{1.02}{2016-01-18}{added support for showdow option}
% \begin{macrocode}
\DTMnewstyle
{en-US}% label
{% date style
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenUSfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
+% \end{macrocode}
+% Support for \opt{showdow} added in v1.02 (thanks to Alan Munn).
+% \begin{macrocode}
+ \ifDTMshowdow
+ \ifnum##4>-1 % space intended
+ \DTMifbool{en-US}{abbr}%
+ {\DTMenglishshortweekdayname{##4}}%
+ {\DTMenglishweekdayname{##4}}%
+ \DTMenUSdowmonthsep
+ \fi
+ \fi
\DTMifbool{en-US}{abbr}%
{\DTMenglishshortmonthname{##2}}%
{\DTMenglishmonthname{##2}}%
@@ -1359,7 +1384,7 @@
\DTMifbool{en-US}{showyear}%
{%
\DTMenUSdayyearsep
- \number##1 % intended
+ \number##1 % space intended
}%
{}%
}%
@@ -1367,7 +1392,7 @@
\DTMifbool{en-US}{showyear}%
{%
\DTMenUSmonthdaysep
- \number##1 % intended
+ \number##1 % space intended
}%
{}%
}%
@@ -1533,7 +1558,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-CA}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-CA}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -1550,6 +1575,15 @@
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\DTMenCAdowmonthsep}
+% The separator between the day of week name and the month for the text format.
+% (New to version 1.02.)
+%\changes{1.02}{2016-01-18}{new}
+% \begin{macrocode}
+\newcommand*{\DTMenCAdowmonthsep}{\space}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\DTMenCAdayyearsep}
% The separator between the day and year for the text format.
% \begin{macrocode}
@@ -1591,6 +1625,7 @@
%separators.
% \begin{macrocode}
\DTMdefkey{en-CA}{monthdaysep}{\renewcommand*{\DTMenCAmonthdaysep}{#1}}
+\DTMdefkey{en-CA}{dowmonthsep}{\renewcommand*{\DTMenCAdowmonthsep}{#1}}
\DTMdefkey{en-CA}{dayyearsep}{\renewcommand*{\DTMenCAdayyearsep}{#1}}
\DTMdefkey{en-CA}{datetimesep}{\renewcommand*{\DTMenCAdatetimesep}{#1}}
\DTMdefkey{en-CA}{timezonesep}{\renewcommand*{\DTMenCAtimezonesep}{#1}}
@@ -1670,6 +1705,17 @@
{% date style
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenCAfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
+% \end{macrocode}
+% Support for \opt{showdow} added in v1.02 (thanks to Alan Munn).
+% \begin{macrocode}
+ \ifDTMshowdow
+ \ifnum##4>-1 % space intended
+ \DTMifbool{en-CA}{abbr}%
+ {\DTMenglishshortweekdayname{##4}}%
+ {\DTMenglishweekdayname{##4}}%
+ \DTMenCAdowmonthsep
+ \fi
+ \fi
\DTMifbool{en-CA}{abbr}%
{\DTMenglishshortmonthname{##2}}%
{\DTMenglishmonthname{##2}}%
@@ -1855,7 +1901,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-AU}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-AU}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -2178,7 +2224,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-NZ}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-NZ}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -2496,7 +2542,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-GG}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-GG}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -2810,7 +2856,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-JE}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-JE}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -3124,7 +3170,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-IM}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-IM}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -3438,7 +3484,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-MT}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-MT}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}
@@ -3753,7 +3799,7 @@
%
% Identify this module.
% \begin{macrocode}
-\ProvidesDateTimeModule{en-IE}[2015/04/09 v1.01 (NLCT)]
+\ProvidesDateTimeModule{en-IE}[2015/01/18 v1.02 (NLCT)]
% \end{macrocode}
% Load base English module.
% \begin{macrocode}