datetime2 (15sep15)

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

2 files changed, 34 insertions, 26 deletions

diff --git a/Master/texmf-dist/source/latex/datetime2/datetime2.dtx b/Master/texmf-dist/source/latex/datetime2/datetime2.dtx
index 9910000de00..7eb33e1e000 100644
--- a/Master/texmf-dist/source/latex/datetime2/datetime2.dtx
+++ b/Master/texmf-dist/source/latex/datetime2/datetime2.dtx
@@ -1,13 +1,13 @@
 %\iffalse
 % datetime2.dtx generated using makedtx version 1.1 (c) Nicola Talbot
 % Command line args:
-%   -doc "datetime2-manual.tex"
+%   -section "chapter"
 %   -src "datetime2.sty\Z=>datetime2.sty"
 %   -src "datetime2-calc.sty\Z=>datetime2-calc.sty"
-%   -section "chapter"
+%   -doc "datetime2-manual.tex"
 %   -author "Nicola Talbot"
 %   datetime2
-% Created on 2015/3/24 13:32
+% Created on 2015/9/15 10:14
 %\fi
 %\iffalse
 %<*package>
@@ -70,11 +70,11 @@
 %
 %\MakeShortVerb{"}
 %
-%\title{datetime2 v1.0:
+%\title{datetime2 v1.1:
 %date and time formats}
 %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}}
 %
-%\date{2015-03-24}
+%\date{2015-09-15}
 %\maketitle
 %
 %\begin{abstract}
@@ -163,7 +163,7 @@
 %\end{display}
 %\emph{unless} you are using \XeLaTeX\ in which case the seconds and
 %time zone are omitted. (\XeLaTeX\ doesn't provide this information.)
-%If you're not using \XeLaTeX\ you can hide the seconds and zone
+%Alternatively you can hide the seconds and zone
 %using the package options \pkgopt[false]{showseconds} and
 %\pkgopt[false]{showzone}. If you want UTC+0 to be displayed
 %numerically instead of using a Z you can use the
@@ -171,17 +171,22 @@
 %
 %\begin{verbatim}
 %\documentclass[british]{article}
-%\usepackage[babel]
+%\usepackage{babel}
 %\usepackage{datetime2}
 %\begin{document}
 %This PDF was created on \DTMnow.
 %\end{document}
 %\end{verbatim}
-%This has the same output as the previous example.
+%This has the same default numerical output as the previous example,
+%but there are now two additional styles available: \style{en-GB} and
+%\style{en-GB-numeric}. The \cs{datebritish} command provided by
+%\sty{babel} is redefined to prevent \sty{babel} from overriding your
+%preferred date style. The regional style can be enabled with the
+%\pkgopt{useregional} option.
 %
 %\begin{verbatim}
 %\documentclass[british]{article}
-%\usepackage[babel]
+%\usepackage{babel}
 %\usepackage[useregional]{datetime2}
 %\begin{document}
 %This PDF was created on \DTMnow.
@@ -198,7 +203,7 @@
 %
 %\begin{verbatim}
 %\documentclass[british]{article}
-%\usepackage[babel]
+%\usepackage{babel}
 %\usepackage[useregional=numeric]{datetime2}
 %\begin{document}
 %This PDF was created on \DTMnow.
@@ -215,7 +220,7 @@
 %
 %\begin{verbatim}
 %\documentclass[english]{article}
-%\usepackage[babel]
+%\usepackage{babel}
 %\usepackage[useregional=numeric]{datetime2}
 %\begin{document}
 %This PDF was created on \DTMnow.
@@ -225,12 +230,13 @@
 %\begin{display}
 %\DTMsetstyle{default}\DTMuse{gmt}
 %\end{display}
-%This is because no region has been specified. The language name is
+%This is because no \emph{regional dialect} has been specified. The
+%language name \texttt{english} is
 %ambiguous, so the \style{default} style is used.
 %
 %\begin{verbatim}
 %\documentclass[english]{article}
-%\usepackage[babel]
+%\usepackage{babel}
 %\usepackage[useregional]{datetime2}
 %\begin{document}
 %This PDF was created on \today.
@@ -247,7 +253,7 @@
 %
 %\begin{verbatim}
 %\documentclass[british]{article}
-%\usepackage[babel]
+%\usepackage{babel}
 %\usepackage[useregional,showdow]{datetime2}
 %
 %\DTMlangsetup[en-GB]{abbr}
@@ -591,7 +597,7 @@
 %All date, time and zone information can be saved at the same time
 %using:
 %\begin{definition}[\DescribeMacro\DTMsavetimestamp]
-%\cs{DTMsavetimestamp}\marg{data}
+%\cs{DTMsavetimestamp}\marg{name}\marg{data}
 %\end{definition}
 %where \meta{data} is in the format:
 %\begin{display}
@@ -1036,7 +1042,7 @@
 %these commands should be placed in \meta{definition}.
 %
 %A new \term{time style} can be defined using:
-%\begin{definition}[\DescribeMacro\DTMnewdatestyle]
+%\begin{definition}[\DescribeMacro\DTMnewtimestyle]
 %\cs{DTMnewtimestyle}\marg{name}\marg{definition}
 %\end{definition}
 %This defines a \term{partial style} that should only modify 
@@ -1234,7 +1240,7 @@
 %\url{http://www.ctan.org/file/help/ctan/CTAN-upload-addendum}. The upload location
 %for additions to the \styfmt{datetime2} package (either for
 %packages defining new styles or for language modules) should be
-%\texttt{/macros\slash latex\slash datetime2-contrib\slash mystylename} (remember to
+%\texttt{/macros\slash latex\slash contrib\slash datetime2-contrib\slash mystylename} (remember to
 %replace \texttt{mystylename} as appropriate).
 %
 %\chapter{Multi-Lingual Support}
@@ -1527,7 +1533,7 @@
 %take over the maintenance (\href{http://www.dickimaw-books.com/contact.html}{send me a
 %message}). If there's no module for your language
 %you can create your own module and upload it to CTAN in the 
-%\texttt{/macros\slash latex\slash datetime2-contrib\slash
+%\texttt{/macros\slash latex\slash contrib\slash datetime2-contrib\slash
 %datetime2-\meta{language}} directory.
 %
 %You can use the English or Irish modules as a template for a
@@ -2116,7 +2122,7 @@
 %\changes{1.0}{2015-03-24}{Initial release}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2}[2015/03/24 v1.0 (NLCT) date and time formats]
+\ProvidesPackage{datetime2}[2015/09/15 v1.1 (NLCT) date and time formats]
 %    \end{macrocode}
 % Use \sty{tracklang} to find out what languages have been loaded.
 %    \begin{macrocode}
@@ -4475,7 +4481,7 @@
 %\section{datetime2-calc.sty code}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2-calc}[2015/03/24 v1.0 (NLCT)]
+\ProvidesPackage{datetime2-calc}[2015/09/15 v1.1 (NLCT)]
 %    \end{macrocode}
 % Load other required packages
 %    \begin{macrocode}
@@ -4656,6 +4662,7 @@
 %\begin{macro}{\DTMsaveaszulutime}
 % Converts the given datetime into Zulu (+00:00) and saves
 % the result.
+%\changes{1.1}{2015-09-15}{fixed bug in incorrect conversion}
 %\begin{definition}
 %\cs{DTMsavetozulutime}\marg{name}\marg{year}\marg{month}\marg{day}\marg{hour}\newline\marg{minute}\marg{second}\marg{tzh}\marg{tzm}
 %\end{definition}
@@ -4680,9 +4687,9 @@
 % Add or subtract the offset minute
 %    \begin{macrocode}
     \ifnum\@dtm@TZhour<0\relax
-      \advance\count@ by -\@dtm@TZminute\relax
-    \else
       \advance\count@ by \@dtm@TZminute\relax
+    \else
+      \advance\count@ by -\@dtm@TZminute\relax
     \fi
     \edef\@dtm@minute{\number\count@}%
 %    \end{macrocode}
@@ -4724,9 +4731,10 @@
         \edef\@dtm@hour{\number\count@}%
 %    \end{macrocode}
 % Does the day need adjusting?
+%\changes{1.1}{2015-09-15}{fixed bug in misnamed \cs{@dtm@hour}}
 %    \begin{macrocode}
-        \ifnum\thehour=24\relax
-          \def\thehour{00}%
+        \ifnum\@dtm@hour=24\relax
+          \def\@dtm@hour{00}%
           \advance\@dtm@julianday by 1\relax
         \fi
       \fi
@@ -4738,7 +4746,7 @@
   \ifnum\@dtm@TZhour=0\relax
   \else
     \count@=\@dtm@hour\relax
-    \advance\count@ by \@dtm@TZhour\relax
+    \advance\count@ by -\@dtm@TZhour\relax
 %    \end{macrocode}
 % Does the day need adjusting?
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/datetime2/datetime2.ins b/Master/texmf-dist/source/latex/datetime2/datetime2.ins
index 4130721ff28..0c998c6c059 100644
--- a/Master/texmf-dist/source/latex/datetime2/datetime2.ins
+++ b/Master/texmf-dist/source/latex/datetime2/datetime2.ins
@@ -1,4 +1,4 @@
-% datetime2.ins generated using makedtx version 1.1 2015/3/24 13:32
+% datetime2.ins generated using makedtx version 1.1 2015/9/15 10:14
 \input docstrip
 
 \preamble