From 8e498d680934e32b062c538a8359521fa428b6a4 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Mon, 8 Oct 2012 09:18:20 +0000 Subject: datatool update git-svn-id: svn://tug.org/texlive/trunk@27917 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/datatool/CHANGES | 6 +++ .../doc/latex/datatool/datatool-user.pdf | Bin 498420 -> 498420 bytes Master/texmf-dist/doc/latex/datatool/datatool.pdf | Bin 731663 -> 732089 bytes .../texmf-dist/source/latex/datatool/datatool.dtx | 44 +++++++++++++++------ .../texmf-dist/source/latex/datatool/datatool.ins | 2 +- .../tex/latex/datatool/datatool-base.sty | 10 +++-- .../tex/latex/datatool/datatool-pgfmath.sty | 24 ++++++++--- 7 files changed, 63 insertions(+), 23 deletions(-) diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES index 018d5368546..10191efabdc 100644 --- a/Master/texmf-dist/doc/latex/datatool/CHANGES +++ b/Master/texmf-dist/doc/latex/datatool/CHANGES @@ -1,3 +1,9 @@ +v2.12: + + * datatool-pgfmath.sty: + + - fixed bug in conditionals. + v2.11: * datatool.sty: diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf index ce9ffcf3c5e..96450e7b940 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf and b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/datatool.pdf b/Master/texmf-dist/doc/latex/datatool/datatool.pdf index d55c219c3ad..480ffef9ddf 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/datatool.pdf and b/Master/texmf-dist/doc/latex/datatool/datatool.pdf differ diff --git a/Master/texmf-dist/source/latex/datatool/datatool.dtx b/Master/texmf-dist/source/latex/datatool/datatool.dtx index 45457a7cdf2..32bb1dc4705 100644 --- a/Master/texmf-dist/source/latex/datatool/datatool.dtx +++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx @@ -16,7 +16,7 @@ % -author "Nicola Talbot" % -codetitle "" % datatool -% Created on 2012/9/25 22:56 +% Created on 2012/10/6 20:31 %\fi %\iffalse %<*package> @@ -63,7 +63,7 @@ datatool.dtx \doxitem{Counter}{counter}{counters} \doxitem{Option}{option}{package options} -\CheckSum{17022} +\CheckSum{17056} \RecordChanges \PageIndex @@ -115,7 +115,7 @@ datatool.dtx % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-base}[2012/09/25 v2.11 (NLCT)] +\ProvidesPackage{datatool-base}[2012/10/06 v2.12 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -602,17 +602,20 @@ datatool.dtx % number is stored in \meta{cmd}. This command has to be redefined % whenever the decimal and number group characters are changed % as they form part of the command definitions. +%\changes{2.12}{2012-10-06}{switched to \cs{ifdefempty}} % \begin{macrocode} \edef\@dtl@construct@getintfrac#1{% \noexpand\def\noexpand\@dtl@getintfrac##1#1##2\noexpand\relax{% \noexpand\@dtl@get@intpart{##1}% \noexpand\def\noexpand\@dtl@fracpart{##2}% - \noexpand\ifx\noexpand\@empty\noexpand\@dtl@fracpart + \noexpand\ifdefempty{\noexpand\@dtl@fracpart} + {% \noexpand\def\noexpand\@dtl@fracpart{0}% - \noexpand\else + }% + {% \noexpand\@dtl@getfracpart##2\noexpand\relax \noexpand\@dtl@choptrailingzeroes{\noexpand\@dtl@fracpart}% - \noexpand\fi + }% }% \noexpand\def\noexpand\@dtl@getfracpart##1#1\noexpand\relax{% \noexpand\def\noexpand\@dtl@fracpart{##1}% @@ -4666,7 +4669,7 @@ datatool.dtx % Definitions of fixed-point commands that use the \sty{pgfmath} package. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-pgfmath}[2012/09/25 v2.11 (NLCT)] +\ProvidesPackage{datatool-pgfmath}[2012/10/06 v2.12 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -4692,9 +4695,12 @@ datatool.dtx % Does \meta{true part} if \meta{num1}=\meta{num2}, otherwise does % \meta{false part}. The numbers must use a full stop as the decimal % character and no number group separator. +%\changes{2.12}{2012/10/06}{fixed bug causing premature expansion} % \begin{macrocode} \newcommand*{\dtlifnumeq}[4]{% - \pgfmathifthenelse{#1==#2}{"#3"}{"#4"}% + \def\@dtl@truepart{#3}% + \def\@dtl@falsepart{#4}% + \pgfmathifthenelse{0#1==0#2}{"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } % \end{macrocode} @@ -4714,9 +4720,12 @@ datatool.dtx % Does \meta{true part} if \meta{num1} \textless \meta{num2}, otherwise does % \meta{false part}. The numbers must use a full stop as the decimal % character and no number group separator. +%\changes{2.12}{2012/10/06}{fixed bug causing premature expansion} % \begin{macrocode} \newcommand*{\dtlifnumlt}[4]{% - \pgfmathifthenelse{#1 < #2}{"#3"}{"#4"}% + \def\@dtl@truepart{#3}% + \def\@dtl@falsepart{#4}% + \pgfmathifthenelse{0#1 < 0#2}{"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } % \end{macrocode} @@ -4730,9 +4739,12 @@ datatool.dtx % Does \meta{true part} if \meta{num1} \textgreater \meta{num2}, otherwise does % \meta{false part}. The numbers must use a full stop as the decimal % character and no number group separator. +%\changes{2.12}{2012/10/06}{fixed bug causing premature expansion} % \begin{macrocode} \newcommand*{\dtlifnumgt}[4]{% - \pgfmathifthenelse{#1 > #2}{"#3"}{"#4"}% + \def\@dtl@truepart{#3}% + \def\@dtl@falsepart{#4}% + \pgfmathifthenelse{0#1 > 0#2}{"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } % \end{macrocode} @@ -4744,9 +4756,13 @@ datatool.dtx %\end{definition} % Determines if \meta{min} $<$ \meta{num} $<$ \meta{max} where % all numerical arguments are in standard fixed point notation. +%\changes{2.12}{2012/10/06}{fixed bug causing premature expansion} % \begin{macrocode} \newcommand*{\dtlifnumopenbetween}[5]{% - \pgfmathifthenelse{(#2 < #1) && (#1 < #3)}{"#4"}{"#5"}% + \def\@dtl@truepart{#4}% + \def\@dtl@falsepart{#5}% + \pgfmathifthenelse{(0#2 < 0#1) && (0#1 < 0#3)} + {"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } % \end{macrocode} @@ -4758,9 +4774,13 @@ datatool.dtx %\end{definition} % Determines if \meta{min} $\leq$ \meta{num} $\leq$ \meta{max} where % all numerical arguments are in standard fixed point notation. +%\changes{2.12}{2012/10/06}{fixed bug causing premature expansion} % \begin{macrocode} \newcommand*{\dtlifnumclosedbetween}[5]{% - \pgfmathifthenelse{(#2 <= #1) && (#1 <= #3)}{"#4"}{"#5"}% + \def\@dtl@truepart{#4}% + \def\@dtl@falsepart{#5}% + \pgfmathifthenelse{(0#2 <= #1) && (0#1 <= 0#3)} + {"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins index 8b90d4d9259..54ea5c65490 100644 --- a/Master/texmf-dist/source/latex/datatool/datatool.ins +++ b/Master/texmf-dist/source/latex/datatool/datatool.ins @@ -1,4 +1,4 @@ -% datatool.ins generated using makedtx version 0.94b 2012/9/25 22:56 +% datatool.ins generated using makedtx version 0.94b 2012/10/6 20:31 \input docstrip \preamble diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty index 005b6acd55a..097ed15e5f1 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-base}[2012/09/25 v2.11 (NLCT)] +\ProvidesPackage{datatool-base}[2012/10/06 v2.12 (NLCT)] \RequirePackage{etoolbox} \RequirePackage{amsmath} \RequirePackage{xkeyval} @@ -254,12 +254,14 @@ \noexpand\def\noexpand\@dtl@getintfrac##1#1##2\noexpand\relax{% \noexpand\@dtl@get@intpart{##1}% \noexpand\def\noexpand\@dtl@fracpart{##2}% - \noexpand\ifx\noexpand\@empty\noexpand\@dtl@fracpart + \noexpand\ifdefempty{\noexpand\@dtl@fracpart} + {% \noexpand\def\noexpand\@dtl@fracpart{0}% - \noexpand\else + }% + {% \noexpand\@dtl@getfracpart##2\noexpand\relax \noexpand\@dtl@choptrailingzeroes{\noexpand\@dtl@fracpart}% - \noexpand\fi + }% }% \noexpand\def\noexpand\@dtl@getfracpart##1#1\noexpand\relax{% \noexpand\def\noexpand\@dtl@fracpart{##1}% diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty index b6a593d36eb..39e8597e71a 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty @@ -39,30 +39,42 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{datatool-pgfmath}[2012/09/25 v2.11 (NLCT)] +\ProvidesPackage{datatool-pgfmath}[2012/10/06 v2.12 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{pgfrcs,pgfkeys,pgfmath} \ProcessOptionsX \providecommand*{\@dtl@mathprocessor}{pgfmath} \newcommand*{\dtlifnumeq}[4]{% - \pgfmathifthenelse{#1==#2}{"#3"}{"#4"}% + \def\@dtl@truepart{#3}% + \def\@dtl@falsepart{#4}% + \pgfmathifthenelse{0#1==0#2}{"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } \RequirePackage{datatool-base} \newcommand*{\dtlifnumlt}[4]{% - \pgfmathifthenelse{#1 < #2}{"#3"}{"#4"}% + \def\@dtl@truepart{#3}% + \def\@dtl@falsepart{#4}% + \pgfmathifthenelse{0#1 < 0#2}{"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } \newcommand*{\dtlifnumgt}[4]{% - \pgfmathifthenelse{#1 > #2}{"#3"}{"#4"}% + \def\@dtl@truepart{#3}% + \def\@dtl@falsepart{#4}% + \pgfmathifthenelse{0#1 > 0#2}{"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } \newcommand*{\dtlifnumopenbetween}[5]{% - \pgfmathifthenelse{(#2 < #1) && (#1 < #3)}{"#4"}{"#5"}% + \def\@dtl@truepart{#4}% + \def\@dtl@falsepart{#5}% + \pgfmathifthenelse{(0#2 < 0#1) && (0#1 < 0#3)} + {"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } \newcommand*{\dtlifnumclosedbetween}[5]{% - \pgfmathifthenelse{(#2 <= #1) && (#1 <= #3)}{"#4"}{"#5"}% + \def\@dtl@truepart{#4}% + \def\@dtl@falsepart{#5}% + \pgfmathifthenelse{(0#2 <= #1) && (0#1 <= 0#3)} + {"\noexpand\@dtl@truepart"}{"\noexpand\@dtl@falsepart"}% \pgfmathresult } \newcommand*{\dtladd}[3]{% -- cgit v1.2.3