datetime2 (5jun16)

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

13 files changed, 78 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/datetime2/CHANGES b/Master/texmf-dist/doc/latex/datetime2/CHANGES
index 408b3ac5b5d..e0567a81a79 100644
--- a/Master/texmf-dist/doc/latex/datetime2/CHANGES
+++ b/Master/texmf-dist/doc/latex/datetime2/CHANGES
@@ -1,3 +1,12 @@
+1.5.1 (2016-06-05) :
+
+  * Added check for \pdffeedback
+
+1.5 (2016-06-04) :
+
+  * Bug fix www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=109
+    (added \dtm@pdfcreationdate)
+
 1.4 (2016-02-11) :
 
   * datetime2-calc.sty:
diff --git a/Master/texmf-dist/doc/latex/datetime2/README b/Master/texmf-dist/doc/latex/datetime2/README
index eca11c74cca..6fe011e31fc 100644
--- a/Master/texmf-dist/doc/latex/datetime2/README
+++ b/Master/texmf-dist/doc/latex/datetime2/README
@@ -1,9 +1,13 @@
-LaTeX Package : datetime2 v1.4 
+LaTeX Package : datetime2 v1.5.1 
 
-Last Modified : 2016-02-11
+Last Modified : 2016-06-05
 
 Author        : Nicola Talbot
 
+Provides commands for formatting dates, times and time zones.
+Language and regional support is provided by independently
+maintained and installed modules.
+
 The datetime2 package replaces the datetime package, which is now
 obsolete.
 
diff --git a/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf b/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf
index ac93b840459..15774a44e2b 100644
--- a/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf
diff --git a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-babel.pdf b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-babel.pdf
index 845c271bb64..c7d72b53b1c 100644
--- a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-babel.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-babel.pdf
diff --git a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-calc.pdf b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-calc.pdf
index 0743c36da31..598da278131 100644
--- a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-calc.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-calc.pdf
diff --git a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf
index 4c8eab73628..aba9beab75c 100644
--- a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf
diff --git a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf
index 21efd33fbe3..8952e1cfff8 100644
--- a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf
diff --git a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-journal.pdf b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-journal.pdf
index 0dedb3a78e8..25ce35778c9 100644
--- a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-journal.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-journal.pdf
diff --git a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-styles.pdf b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-styles.pdf
index 90c9464e440..c67aff4c1e7 100644
--- a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-styles.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-styles.pdf
diff --git a/Master/texmf-dist/source/latex/datetime2/datetime2.dtx b/Master/texmf-dist/source/latex/datetime2/datetime2.dtx
index 6cb24135673..1382798c026 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"
 %   -author "Nicola Talbot"
-%   -doc "datetime2-manual.tex"
 %   -src "datetime2.sty\Z=>datetime2.sty"
 %   -src "datetime2-calc.sty\Z=>datetime2-calc.sty"
 %   datetime2
-% Created on 2016/2/11 12:54
+% Created on 2016/6/5 13:21
 %\fi
 %\iffalse
 %<*package>
@@ -47,8 +47,7 @@
             pdfauthor={Nicola L.C. Talbot},
             pdftitle={datetime2: date and time formats}]{hyperref}
 
-
-\CheckSum{2364}
+\CheckSum{2374}
 \RecordChanges
 \DisableCrossrefs
 
@@ -92,11 +91,11 @@
 %
 %\MakeShortVerb{"}
 %
-%\title{datetime2 v1.4:
+%\title{datetime2 v1.5.1:
 %date and time formats}
 %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}}
 %
-%\date{2016-02-11}
+%\date{2016-06-05}
 %\maketitle
 %
 %\begin{abstract}
@@ -5549,7 +5548,7 @@
 %\changes{1.0}{2015-03-24}{Initial release}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2}[2016/02/11 v1.4 (NLCT) date and time formats]
+\ProvidesPackage{datetime2}[2016/06/05 v1.5.1 (NLCT) date and time formats]
 %    \end{macrocode}
 % Use \sty{tracklang} to find out what languages have been loaded.
 %    \begin{macrocode}
@@ -5564,6 +5563,34 @@
 \RequirePackage{xkeyval}[2006/11/18]
 %    \end{macrocode}
 %
+%\begin{macro}{\dtm@pdfcreationdate}
+%\changes{1.5}{2016-06-04}{new}
+%The \sty{luatex85} package defines \ics{pdfcreationdate} in terms of
+%\cs{pdffeedback}, but the parsing commands need a command whose
+%replacement text is directly in the PDF date time format, so define a command
+%with the full replacement text that can be used instead. This will allow
+%for any possible future changes of \cs{pdfcreationdate} that 
+%require deeper levels of expansion.
+%    \begin{macrocode}
+\ifdef\pdfcreationdate
+{%
+  \edef\dtm@pdfcreationdate{\pdfcreationdate}%
+}%
+{%
+%    \end{macrocode} 
+%\changes{1.5.1}{2016-06-05}{added check for \cs{pdffeedback}}
+% Check if newer version of Lua\TeX\ is being used but
+% \sty{luatex85} hasn't been loaded.
+%    \begin{macrocode}
+  \ifdef\pdffeedback
+  {%
+     \edef\dtm@pdfcreationdate{\pdffeedback creationdate}%
+  }%
+  {}%
+}
+%    \end{macrocode} 
+%\end{macro}
+%
 %\begin{macro}{\dtm@yearmonthsep}
 % Separator between year and month for numeric dates.
 %    \begin{macrocode}
@@ -5733,10 +5760,10 @@
 %    \end{macrocode}
 %\end{option}
 %
-% Switch off seconds and time zone if \cs{pdfcreationdate}
+% Switch off seconds and time zone if \cs{dtm@pdfcreationdate}
 % isn't defined, otherwise switch on.
 %    \begin{macrocode}
-\ifdef\pdfcreationdate
+\ifdef\dtm@pdfcreationdate
 {%
   \DTMshowsecondstrue
   \DTMshowzonetrue
@@ -6038,13 +6065,13 @@
 %    \end{macrocode}
 %\end{macro}
 %
-% Find out the current time. If PDF\LaTeX\ is being used, then it
-% can be fetched from \cs{pdfcreationdate}
+% Find out the current time. If \cs{dtm@pdfcreationdate} is defined,
+% it can be fetched from that.
 %    \begin{macrocode}
-\ifdef\pdfcreationdate
+\ifdef\dtm@pdfcreationdate
 {%
 %    \end{macrocode}
-% Define commands to parse \cs{pdfcreationdate}
+% Define commands to parse \cs{dtm@pdfcreationdate}
 %    \begin{macrocode}
   \def\@dtm@parsepdfdatetime#1:#2#3#4#5#6#7#8#9{%
     \def\@dtm@year{#2#3#4#5}%
@@ -6070,9 +6097,9 @@
     \def\@dtm@timezoneminute{#2}%
   }%
 %    \end{macrocode}
-% Now parse \cs{pdfcreationdate}
+% Now parse \cs{dtm@pdfcreationdate}
 %    \begin{macrocode}
-  \expandafter\@dtm@parsepdfdatetime\pdfcreationdate\@dtm@endparsepdfdatetime
+  \expandafter\@dtm@parsepdfdatetime\dtm@pdfcreationdate\@dtm@endparsepdfdatetime
 %    \end{macrocode}
 % Save the values.
 %    \begin{macrocode}
@@ -6086,8 +6113,7 @@
   \let\@dtm@currenttimezoneminute\@dtm@timezoneminute
 %
 %    \end{macrocode}
-% Lua\TeX\ doesn't provide \cs{pdffilemoddate} (but it does provide
-% \cs{pdfcreationdate}).
+% Lua\TeX\ doesn't provide \cs{pdffilemoddate}.
 %    \begin{macrocode}
   \ifdef\pdffilemoddate
   {%
@@ -6197,8 +6223,8 @@
 {%
 %    \end{macrocode}
 % \cs{pdfcreationdate} not defined. By a process of elimination, the
-% \TeX\ engine is either \XeTeX\ or it's very old. (Lua\TeX\
-% recognises \cs{pdfcreationdate}.) In this case, the
+% \TeX\ engine is either \XeTeX\ or it's very old. (Or it may be a
+% new version of Lua\TeX\ without \sty{luatex85}.) In this case, the
 % seconds and time zone can't be obtained. The hour and minute need
 % to be calculated from \TeX's \cs{time} primitive.
 %    \begin{macrocode}
@@ -8306,7 +8332,7 @@
 %\section{datetime2-calc.sty code}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2-calc}[2016/02/11 v1.4 (NLCT)]
+\ProvidesPackage{datetime2-calc}[2016/06/05 v1.5.1 (NLCT)]
 %    \end{macrocode}
 % Load other required packages
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/datetime2/datetime2.ins b/Master/texmf-dist/source/latex/datetime2/datetime2.ins
index 6173c6ca026..a6aab154480 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 2016/2/11 12:54
+% datetime2.ins generated using makedtx version 1.1 2016/6/5 13:21
 \input docstrip
 
 \preamble
diff --git a/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty b/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty
index 4beb8e0c841..2973c635a22 100644
--- a/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty
+++ b/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2-calc}[2016/02/11 v1.4 (NLCT)]
+\ProvidesPackage{datetime2-calc}[2016/06/05 v1.5.1 (NLCT)]
 \RequirePackage{pgfkeys}
 \RequirePackage{pgfcalendar}
 \newcount\@dtm@julianday
diff --git a/Master/texmf-dist/tex/latex/datetime2/datetime2.sty b/Master/texmf-dist/tex/latex/datetime2/datetime2.sty
index 525675ebf6b..dc0356f7fb5 100644
--- a/Master/texmf-dist/tex/latex/datetime2/datetime2.sty
+++ b/Master/texmf-dist/tex/latex/datetime2/datetime2.sty
@@ -39,10 +39,21 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2}[2016/02/11 v1.4 (NLCT) date and time formats]
+\ProvidesPackage{datetime2}[2016/06/05 v1.5.1 (NLCT) date and time formats]
 \RequirePackage{tracklang}
 \RequirePackage{etoolbox}
 \RequirePackage{xkeyval}[2006/11/18]
+\ifdef\pdfcreationdate
+{%
+  \edef\dtm@pdfcreationdate{\pdfcreationdate}%
+}%
+{%
+  \ifdef\pdffeedback
+  {%
+     \edef\dtm@pdfcreationdate{\pdffeedback creationdate}%
+  }%
+  {}%
+}
 \newcommand*{\dtm@yearmonthsep}{-}
 \newcommand*{\dtm@monthdaysep}{-}
 \newcommand*{\dtm@dayyearsep}{-}
@@ -86,7 +97,7 @@
 \define@boolkey{datetime2.sty}[DTM]{showzone}[true]{}
 \define@boolkey{datetime2.sty}[DTM]{showisoZ}[true]{}
 \DTMshowisoZtrue
-\ifdef\pdfcreationdate
+\ifdef\dtm@pdfcreationdate
 {%
   \DTMshowsecondstrue
   \DTMshowzonetrue
@@ -221,7 +232,7 @@
   \cslet{@dtm@#1@TZhour}{0}%
   \cslet{@dtm@#1@TZminute}{0}%
 }
-\ifdef\pdfcreationdate
+\ifdef\dtm@pdfcreationdate
 {%
   \def\@dtm@parsepdfdatetime#1:#2#3#4#5#6#7#8#9{%
     \def\@dtm@year{#2#3#4#5}%
@@ -246,7 +257,7 @@
     \def\@dtm@timezonehour{#1}%
     \def\@dtm@timezoneminute{#2}%
   }%
-  \expandafter\@dtm@parsepdfdatetime\pdfcreationdate\@dtm@endparsepdfdatetime
+  \expandafter\@dtm@parsepdfdatetime\dtm@pdfcreationdate\@dtm@endparsepdfdatetime
   \let\@dtm@currentyear\@dtm@year
   \let\@dtm@currentmonth\@dtm@month
   \let\@dtm@currentday\@dtm@day