From 508092db4c6970ec4149a2d3e78db1777858e542 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 20 Jul 2018 22:07:31 +0000 Subject: datetime2 (20jul18) git-svn-id: svn://tug.org/texlive/trunk@48236 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/datetime2/datetime2-calc.sty | 13 +++- .../texmf-dist/tex/latex/datetime2/datetime2.sty | 76 ++++++++++++++++------ 2 files changed, 65 insertions(+), 24 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty b/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty index a3cc47301d5..989794768a2 100644 --- a/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty +++ b/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty @@ -7,11 +7,11 @@ %% datetime2.dtx (with options: `datetime2-calc.sty,package') %% %% datetime2.dtx -%% Copyright 2016 Nicola Talbot +%% Copyright 2018 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (at your option) any later version. +%% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datetime2-calc}[2016/07/12 v1.5.2 (NLCT)] +\ProvidesPackage{datetime2-calc}[2018/07/20 v1.5.3 (NLCT)] \RequirePackage{pgfkeys} \RequirePackage{pgfcalendar} \newcount\@dtm@julianday @@ -340,6 +340,13 @@ \pgfcalendarjuliantoweekday{\@dtm@julianday}{\count@}% \edef#2{\number\count@}% } +\def\dtmMondayIndex{0} +\def\dtmTuesdayIndex{1} +\def\dtmWednesdayIndex{2} +\def\dtmThursdayIndex{3} +\def\dtmFridayIndex{4} +\def\dtmSaturdayIndex{5} +\def\dtmSundayIndex{6} \newrobustcmd{\DTMweekdayname}[1]{% \ifcsdef{DTM\languagename weekdayname}% {% diff --git a/Master/texmf-dist/tex/latex/datetime2/datetime2.sty b/Master/texmf-dist/tex/latex/datetime2/datetime2.sty index 8e0881bcda4..6d643d62467 100644 --- a/Master/texmf-dist/tex/latex/datetime2/datetime2.sty +++ b/Master/texmf-dist/tex/latex/datetime2/datetime2.sty @@ -7,11 +7,11 @@ %% datetime2.dtx (with options: `datetime2.sty,package') %% %% datetime2.dtx -%% Copyright 2016 Nicola Talbot +%% Copyright 2018 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (at your option) any later version. +%% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datetime2}[2016/07/12 v1.5.2 (NLCT) date and time formats] +\ProvidesPackage{datetime2}[2018/07/20 v1.5.3 (NLCT) date and time formats] \RequirePackage{tracklang} \RequirePackage{etoolbox} \RequirePackage{xkeyval}[2006/11/18] @@ -53,16 +53,25 @@ \edef\dtm@pdfcreationdate{\pdffeedback creationdate}% }% {% - \ifdef\TeXOSQueryNow + \ifdef\LocaleNowStamp {% - \TeXOSQueryNow{\dtm@pdfcreationdate}% - \ifdefempty\dtm@pdfcreationdate + \ifx\LocaleNowStamp\empty + \else + \let\dtm@pdfcreationdate\LocaleNowStamp + \fi + }% + {% + \ifdef\TeXOSQueryNow {% - \undef\dtm@pdfcreationdate + \TeXOSQueryNow{\dtm@pdfcreationdate}% + \ifdefempty\dtm@pdfcreationdate + {% + \undef\dtm@pdfcreationdate + }% + {}% }% {}% }% - {}% }% } \newcommand*{\dtm@yearmonthsep}{-} @@ -961,7 +970,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1010,7 +1019,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes:\DTMtwodigits{##2}\fi }% }% @@ -1058,7 +1067,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}'\DTMtwodigits{##2}'% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}'\DTMtwodigits{##2}'% }% }% }% @@ -1099,7 +1108,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1150,7 +1159,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1203,7 +1212,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1256,7 +1265,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1307,7 +1316,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1358,7 +1367,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1411,7 +1420,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1464,7 +1473,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1515,7 +1524,7 @@ Z% }% {% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% }% @@ -1559,7 +1568,7 @@ {hhmm}% label {% \renewcommand*\DTMdisplaytime[3]{% - \ifnum##1<0\else+\fi\DTMtwodigits{##1}% + \ifnum##1<0 \else+\fi\DTMtwodigits{##1}% \ifDTMshowzoneminutes\DTMsep{hourmin}\DTMtwodigits{##2}\fi }% } @@ -1622,6 +1631,31 @@ \cslet{@dtm@#1@TZhour}{\@dtm@timezonehour}% \cslet{@dtm@#1@TZminute}{\@dtm@timezoneminute}% } +\newrobustcmd*{\DTMsavepdftimestamp}[2]{% + \edef\@dtm@tmp{#2}% + \ifx\@dtm@tmp\empty + \cslet{@dtm@#1@year}{0}% + \cslet{@dtm@#1@month}{0}% + \cslet{@dtm@#1@day}{0}% + \cslet{@dtm@#1@dow}{0}% + \cslet{@dtm@#1@hour}{0}% + \cslet{@dtm@#1@minute}{0}% + \cslet{@dtm@#1@second}{0}% + \cslet{@dtm@#1@TZhour}{0}% + \cslet{@dtm@#1@TZminute}{0}% + \else + \expandafter\@dtm@parsepdfdatetime\@dtm@tmp\@dtm@endparsepdfdatetime + \cslet{@dtm@#1@year}{\@dtm@year}% + \cslet{@dtm@#1@month}{\@dtm@month}% + \cslet{@dtm@#1@day}{\@dtm@day}% + \cslet{@dtm@#1@dow}{\@dtm@dow}% + \cslet{@dtm@#1@hour}{\@dtm@hour}% + \cslet{@dtm@#1@minute}{\@dtm@minute}% + \cslet{@dtm@#1@second}{\@dtm@second}% + \cslet{@dtm@#1@TZhour}{\@dtm@timezonehour}% + \cslet{@dtm@#1@TZminute}{\@dtm@timezoneminute}% + \fi +} \newrobustcmd{\DTMsavenow}[1]{% \cslet{@dtm@#1@year}{\@dtm@currentyear}% \cslet{@dtm@#1@month}{\@dtm@currentmonth}% -- cgit v1.2.3