summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/CHANGES4
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/README4
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/datetime2.pdfbin685060 -> 685020 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-babel.pdfbin72937 -> 73269 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-calc.pdfbin28801 -> 28801 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-filedate.pdfbin17006 -> 16654 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdfbin62797 -> 62238 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-journal.pdfbin100517 -> 100536 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-styles.pdfbin53846 -> 53924 bytes
-rw-r--r--Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-xe.pdfbin7343 -> 7018 bytes
-rw-r--r--Master/texmf-dist/source/latex/datetime2/datetime2.dtx33
-rw-r--r--Master/texmf-dist/source/latex/datetime2/datetime2.ins4
-rw-r--r--Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty4
-rw-r--r--Master/texmf-dist/tex/latex/datetime2/datetime2.sty8
14 files changed, 31 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/datetime2/CHANGES b/Master/texmf-dist/doc/latex/datetime2/CHANGES
index 3435b72e1f0..e25ea544923 100644
--- a/Master/texmf-dist/doc/latex/datetime2/CHANGES
+++ b/Master/texmf-dist/doc/latex/datetime2/CHANGES
@@ -1,3 +1,7 @@
+1.5.4 (2019-10-21):
+
+ * renamed scratch variables to avoid conflict
+
1.5.3 (2018-07-20):
* Bug fix: removed unwanted \relax inserted in negative time zones
diff --git a/Master/texmf-dist/doc/latex/datetime2/README b/Master/texmf-dist/doc/latex/datetime2/README
index 5f393336d87..6e9b85f4f17 100644
--- a/Master/texmf-dist/doc/latex/datetime2/README
+++ b/Master/texmf-dist/doc/latex/datetime2/README
@@ -1,6 +1,6 @@
-LaTeX Package : datetime2 v1.5.3
+LaTeX Package : datetime2 v1.5.4
-Last Modified : 2018-07-20
+Last Modified : 2019-10-21
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf b/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf
index a15e11feb43..e356981288d 100644
--- a/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/datetime2.pdf
Binary files differ
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 578625e683e..f0c400e8088 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
Binary files differ
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 02e2ba10da7..2fb24bf61e7 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
Binary files differ
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 3e2c3e54d23..d4c34cdf2f7 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
Binary files differ
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 b26477e0e40..1236d2fc42e 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
Binary files differ
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 5fd36633352..be21e3c7acd 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
Binary files differ
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 76dbfd1e824..3ed5e296f38 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-xe.pdf b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-xe.pdf
index bcf2d0b7eab..2e485f20cae 100644
--- a/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-xe.pdf
+++ b/Master/texmf-dist/doc/latex/datetime2/samples/datetime2-sample-xe.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/datetime2/datetime2.dtx b/Master/texmf-dist/source/latex/datetime2/datetime2.dtx
index 8791e302ed5..401236b8d04 100644
--- a/Master/texmf-dist/source/latex/datetime2/datetime2.dtx
+++ b/Master/texmf-dist/source/latex/datetime2/datetime2.dtx
@@ -3,11 +3,11 @@
% Command line args:
% -src "datetime2.sty\Z=>datetime2.sty"
% -src "datetime2-calc.sty\Z=>datetime2-calc.sty"
-% -author "Nicola Talbot"
% -doc "datetime2-manual.tex"
% -section "chapter"
+% -author "Nicola Talbot"
% datetime2
-% Created on 2018/7/20 12:36
+% Created on 2019/10/21 11:37
%\fi
%\iffalse
%<*package>
@@ -30,7 +30,7 @@
%\fi
% \iffalse
% Doc-Source file to use with LaTeX2e
-% Copyright (C) 2018 Nicola Talbot, all rights reserved.
+% Copyright (C) 2019 Nicola Talbot, all rights reserved.
% \fi
% \iffalse
%<*driver>
@@ -91,11 +91,11 @@
%
%\MakeShortVerb{"}
%
-%\title{datetime2 v1.5.3:
+%\title{datetime2 v1.5.4:
%date and time formats}
%\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}}
%
-%\date{2018-07-20}
+%\date{2019-10-21}
%\maketitle
%
%\begin{abstract}
@@ -5686,7 +5686,7 @@
%\changes{1.0}{2015-03-24}{Initial release}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2}[2018/07/20 v1.5.3 (NLCT) date and time formats]
+\ProvidesPackage{datetime2}[2019/10/21 v1.5.4 (NLCT) date and time formats]
% \end{macrocode}
% Use \sty{tracklang} to find out what languages have been loaded.
% \begin{macrocode}
@@ -5985,11 +5985,12 @@
%\begin{option}{useregional}
% Setting to determine whether or not to use the regional
% settings (if any are loaded).
+%\changes{1.5.4}{2019-10-21}{renamed scratch variables}
% \begin{macrocode}
-\define@choicekey{datetime2.sty}{useregional}[\val\nr]%
+\define@choicekey{datetime2.sty}{useregional}[\@dtm@useregional@val\@dtm@useregional@nr]%
{false,text,numeric,num}[text]%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@useregional@nr\relax
\renewcommand*{\DTMifcaseregional}[3]{##1}%
\or
\renewcommand*{\DTMifcaseregional}[3]{##2}%
@@ -8861,7 +8862,7 @@
%\section{datetime2-calc.sty code}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2-calc}[2018/07/20 v1.5.3 (NLCT)]
+\ProvidesPackage{datetime2-calc}[2019/10/21 v1.5.4 (NLCT)]
% \end{macrocode}
% Load other required packages
% \begin{macrocode}
@@ -9430,49 +9431,49 @@
%These are shared with the \sty{locale} package, so they may already
%be defined.
%\begin{macro}{\dtmMondayIndex}
-%\changes{1.5.3}{??}{new}
+%\changes{1.5.3}{2018-07-20}{new}
% \begin{macrocode}
\def\dtmMondayIndex{0}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\dtmTuesdayIndex}
-%\changes{1.5.3}{??}{new}
+%\changes{1.5.3}{2018-07-20}{new}
% \begin{macrocode}
\def\dtmTuesdayIndex{1}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\dtmWednesdayIndex}
-%\changes{1.5.3}{??}{new}
+%\changes{1.5.3}{2018-07-20}{new}
% \begin{macrocode}
\def\dtmWednesdayIndex{2}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\dtmThursdayIndex}
-%\changes{1.5.3}{??}{new}
+%\changes{1.5.3}{2018-07-20}{new}
% \begin{macrocode}
\def\dtmThursdayIndex{3}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\dtmFridayIndex}
-%\changes{1.5.3}{??}{new}
+%\changes{1.5.3}{2018-07-20}{new}
% \begin{macrocode}
\def\dtmFridayIndex{4}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\dtmSaturdayIndex}
-%\changes{1.5.3}{??}{new}
+%\changes{1.5.3}{2018-07-20}{new}
% \begin{macrocode}
\def\dtmSaturdayIndex{5}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\dtmSundayIndex}
-%\changes{1.5.3}{??}{new}
+%\changes{1.5.3}{2018-07-20}{new}
% \begin{macrocode}
\def\dtmSundayIndex{6}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/datetime2/datetime2.ins b/Master/texmf-dist/source/latex/datetime2/datetime2.ins
index 91a29acb334..d839777cd70 100644
--- a/Master/texmf-dist/source/latex/datetime2/datetime2.ins
+++ b/Master/texmf-dist/source/latex/datetime2/datetime2.ins
@@ -1,10 +1,10 @@
-% datetime2.ins generated using makedtx version 1.2 2018/7/20 12:36
+% datetime2.ins generated using makedtx version 1.2 2019/10/21 11:37
\input docstrip
\preamble
datetime2.dtx
- Copyright 2018 Nicola Talbot
+ Copyright 2019 Nicola Talbot
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty b/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty
index 989794768a2..0760e5ce1f4 100644
--- a/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty
+++ b/Master/texmf-dist/tex/latex/datetime2/datetime2-calc.sty
@@ -7,7 +7,7 @@
%% datetime2.dtx (with options: `datetime2-calc.sty,package')
%%
%% datetime2.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2-calc}[2018/07/20 v1.5.3 (NLCT)]
+\ProvidesPackage{datetime2-calc}[2019/10/21 v1.5.4 (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 6d643d62467..48d95241b60 100644
--- a/Master/texmf-dist/tex/latex/datetime2/datetime2.sty
+++ b/Master/texmf-dist/tex/latex/datetime2/datetime2.sty
@@ -7,7 +7,7 @@
%% datetime2.dtx (with options: `datetime2.sty,package')
%%
%% datetime2.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2}[2018/07/20 v1.5.3 (NLCT) date and time formats]
+\ProvidesPackage{datetime2}[2019/10/21 v1.5.4 (NLCT) date and time formats]
\RequirePackage{tracklang}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}[2006/11/18]
@@ -129,10 +129,10 @@
\define@boolkey{datetime2.sty}[DTM]{showzoneminutes}[true]{}
\DTMshowzoneminutestrue
\newcommand*{\DTMifcaseregional}[3]{#1}
-\define@choicekey{datetime2.sty}{useregional}[\val\nr]%
+\define@choicekey{datetime2.sty}{useregional}[\@dtm@useregional@val\@dtm@useregional@nr]%
{false,text,numeric,num}[text]%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@useregional@nr\relax
\renewcommand*{\DTMifcaseregional}[3]{##1}%
\or
\renewcommand*{\DTMifcaseregional}[3]{##2}%