summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/datatool
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2012-10-08 09:18:20 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2012-10-08 09:18:20 +0000
commit8e498d680934e32b062c538a8359521fa428b6a4 (patch)
tree68d1e81fbdea28acfb62a58d78eca2417fc195bc /Master/texmf-dist/tex/latex/datatool
parent3f3d6cf80f3b3bc90544f0c51f4d4aa8bfb410ad (diff)
datatool update
git-svn-id: svn://tug.org/texlive/trunk@27917 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/datatool')
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-base.sty10
-rw-r--r--Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty24
2 files changed, 24 insertions, 10 deletions
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]{%