From 1916527c4310ffc4b2517c1242af4658bfa44e06 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Jan 2016 22:14:45 +0000 Subject: datatool (13jan16) git-svn-id: svn://tug.org/texlive/trunk@39376 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/datatool/databar.sty | 4 +- Master/texmf-dist/tex/latex/datatool/databib.sty | 4 +- Master/texmf-dist/tex/latex/datatool/datagidx.sty | 4 +- Master/texmf-dist/tex/latex/datatool/datapie.sty | 4 +- Master/texmf-dist/tex/latex/datatool/dataplot.sty | 4 +- .../tex/latex/datatool/datatool-base.sty | 389 ++++++++++++++++++++- .../texmf-dist/tex/latex/datatool/datatool-fp.sty | 4 +- .../tex/latex/datatool/datatool-pgfmath.sty | 4 +- Master/texmf-dist/tex/latex/datatool/datatool.sty | 4 +- Master/texmf-dist/tex/latex/datatool/person.sty | 4 +- 10 files changed, 396 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex/latex/datatool') diff --git a/Master/texmf-dist/tex/latex/datatool/databar.sty b/Master/texmf-dist/tex/latex/datatool/databar.sty index 299ab3dcd59..c2be6c46081 100644 --- a/Master/texmf-dist/tex/latex/datatool/databar.sty +++ b/Master/texmf-dist/tex/latex/datatool/databar.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `databar.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{databar}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{databar}[2016/01/12 v2.24 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{dataplot} \newif\ifDTLcolorbarchart diff --git a/Master/texmf-dist/tex/latex/datatool/databib.sty b/Master/texmf-dist/tex/latex/datatool/databib.sty index 62f315bd24d..fa88e581ed4 100644 --- a/Master/texmf-dist/tex/latex/datatool/databib.sty +++ b/Master/texmf-dist/tex/latex/datatool/databib.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `databib.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{databib}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{databib}[2016/01/12 v2.24 (NLCT)] \RequirePackage{datatool} \newcommand*{\dtlbib@style}{plain} \define@choicekey{databib.sty}{style}{plain,abbrv,alpha}{% diff --git a/Master/texmf-dist/tex/latex/datatool/datagidx.sty b/Master/texmf-dist/tex/latex/datatool/datagidx.sty index 79800baf338..f954dfd77ed 100644 --- a/Master/texmf-dist/tex/latex/datatool/datagidx.sty +++ b/Master/texmf-dist/tex/latex/datatool/datagidx.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `datagidx.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{datagidx}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{datagidx}[2016/01/12 v2.24 (NLCT)] \RequirePackage{datatool} \RequirePackage{etoolbox} \RequirePackage{xkeyval} diff --git a/Master/texmf-dist/tex/latex/datatool/datapie.sty b/Master/texmf-dist/tex/latex/datatool/datapie.sty index fc7d158d960..60d8841780f 100644 --- a/Master/texmf-dist/tex/latex/datatool/datapie.sty +++ b/Master/texmf-dist/tex/latex/datatool/datapie.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `datapie.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{datapie}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{datapie}[2016/01/12 v2.24 (NLCT)] \RequirePackage{xkeyval} \newif\ifDTLcolorpiechart \DTLcolorpiecharttrue diff --git a/Master/texmf-dist/tex/latex/datatool/dataplot.sty b/Master/texmf-dist/tex/latex/datatool/dataplot.sty index 66614bdd404..bce7f288af8 100644 --- a/Master/texmf-dist/tex/latex/datatool/dataplot.sty +++ b/Master/texmf-dist/tex/latex/datatool/dataplot.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `dataplot.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{dataplot}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{dataplot}[2016/01/12 v2.24 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{tikz} \RequirePackage{datatool} diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty index 37df89e72d3..bff81cc7e7e 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-base.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-base.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `datatool-base.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{datatool-base}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{datatool-base}[2016/01/12 v2.24 (NLCT)] \RequirePackage{etoolbox} \RequirePackage{amsmath} \RequirePackage{xkeyval} @@ -54,6 +54,12 @@ \define@choicekey{datatool-base.sty}{math}[\val\nr]{fp,pgfmath}{% \renewcommand*\@dtl@mathprocessor{#1}% } +\define@boolkey{datatool-base.sty}[@dtl@]{utf8}[true]{} +\ifdef\UTFviii@two@octets +{\booltrue{@dtl@utf8}}% +{\boolfalse{@dtl@utf8}} +\newcommand*{\dtlenableUTFviii}{\booltrue{@dtl@utf8}} +\newcommand*{\dtldisableUTFviii}{\boolfalse{@dtl@utf8}} \providecommand*{\@dtl@mathprocessor}{fp} \ProcessOptionsX \RequirePackage{datatool-\@dtl@mathprocessor} @@ -83,6 +89,29 @@ #4% }% } +\newcommand{\dtl@ifsingleorUTFviii}[3]{% + \ifbool{@dtl@utf8} + {% + \def\@dtl@arg{#1}% + \ifdefempty{\@dtl@arg}% + {% + #3% + }% + {% + \expandafter\dtl@if@two@octets#1\relax\relax\dtl@end@if@two@octets + {% + \dtl@getfirst@UTFviii#1\@nil\end@dtl@getfirst@UTFviii + \ifdefempty\dtl@rest{#2}{#3}% + }% + {% + \@dtl@ifsingle#1\@nil{#2}{#3}% + }% + }% + }% + {% + \dtl@ifsingle{#1}{#2}{#3}% + }% +}% \newcommand{\dtlifintopenbetween}[5]{% \ifnum#1>#2\relax \ifnum#1<#3\relax @@ -1509,8 +1538,8 @@ \expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst \let\dtl@firstB=\dtl@first \let\dtl@restB=\dtl@rest - \expandafter\dtl@ifsingle\expandafter{\dtl@firstA}{% - \expandafter\dtl@ifsingle\expandafter{\dtl@firstB}{% + \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}{% + \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}{% \expandafter\dtl@setcharcode\expandafter{\dtl@firstA}{\dtl@codeA}% \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}% \ifnum\dtl@codeA=-1\relax @@ -1577,6 +1606,28 @@ }% }% } +\def\dtl@if@two@octets#1#2\dtl@end@if@two@octets#3#4{% + \ifbool{@dtl@utf8} + {% + \ifx\UTFviii@two@octets#1\relax + #3% + \else + #4% + \fi + }% + {% + #4% + }% +} +\def\dtl@getfirst@UTFviii#1#2#3\end@dtl@getfirst@UTFviii{% + \def\dtl@first{#1#2}% + \ifx\@nil#3\relax + \def\dtl@rest{}% + \else + \expandafter\def\expandafter\dtl@rest\expandafter{\@dtl@firsttonil#3}% + \fi +} +\def\@dtl@firsttonil#1\@nil{#1} \def\dtl@getfirst#1#2\end@dtl@getfirst{% \def\dtl@first{#1}% \ifdefempty{\dtl@first}% @@ -1584,9 +1635,21 @@ \def\dtl@rest{#2}% }% {% - \dtl@ifsingle{#1}{\def\dtl@rest{#2}}{\dtl@getfirst#1#2\end@dtl@getfirst}% + \ifbool{@dtl@utf8} + {% + \expandafter\dtl@if@two@octets#1#2\relax\dtl@end@if@two@octets + {% + \dtl@getfirst@UTFviii#1#2\@nil\end@dtl@getfirst@UTFviii + }% + {% + \dtl@ifsingle{#1}{\def\dtl@rest{#2}}{\dtl@getfirst#1#2\end@dtl@getfirst}% + }% + }% + {% + \dtl@ifsingle{#1}{\def\dtl@rest{#2}}{\dtl@getfirst#1#2\end@dtl@getfirst}% + }% }% -} +}% \newcount\dtl@codeA \newcount\dtl@codeB \newcommand*{\dtl@setcharcode}[2]{% @@ -1595,17 +1658,307 @@ #2=-1\relax }% {% - \ifx#1\@dtl@wordbreak\relax + \ifx\@dtl@wordbreak#1\relax #2=`\ \relax \else \ifcat\noexpand#1\relax #2=0\relax \else - #2=`#1\relax + \expandafter\dtl@if@two@octets#1\relax\relax\dtl@end@if@two@octets + {% + \dtlsetUTFviiicharcode{#1}{#2}% + }% + {% + \dtlsetcharcode{#1}{#2}% + }% \fi \fi }% } +\newcommand*{\dtlsetcharcode}[2]{#2=`#1\relax} +\newcommand*{\dtlsetlccharcode}[2]{#2=\lccode`#1\relax} +\newcommand*\dtlsetUTFviiicharcode[2]{\dtlsetdefaultUTFviiicharcode{#1}{#2}} +\newcommand*\dtlsetUTFviiilccharcode[2]{\dtlsetdefaultUTFviiilccharcode{#1}{#2}} +\newcommand*\dtlsetdefaultUTFviiicharcode[2]{% + \ifboolexpr + { + test {\ifstrequal{#1}{À}} + or test {\ifstrequal{#1}{Á}} + or test {\ifstrequal{#1}{Á}} + or test {\ifstrequal{#1}{Ã}} + or test {\ifstrequal{#1}{Ä}} + }% + {% + #2=`A\relax + }% + {% + \ifstrequal{#1}{Ç}% + {% + #2=`C\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{È}} + or test {\ifstrequal{#1}{É}} + or test {\ifstrequal{#1}{Ê}} + or test {\ifstrequal{#1}{Ë}} + }% + {% + #2=`E\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{Ì}} + or test {\ifstrequal{#1}{Í}} + or test {\ifstrequal{#1}{Î}} + or test {\ifstrequal{#1}{Ï}} + }% + {% + #2=`I\relax + }% + {% + \ifstrequal{#1}{Ñ}% + {% + #2=`N\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{Ò}} + or test {\ifstrequal{#1}{Ó}} + or test {\ifstrequal{#1}{Ô}} + or test {\ifstrequal{#1}{Õ}} + or test {\ifstrequal{#1}{Ö}} + }% + {% + #2=`O\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{Ù}} + or test {\ifstrequal{#1}{Ú}} + or test {\ifstrequal{#1}{Û}} + or test {\ifstrequal{#1}{Ü}} + }% + {% + #2=`U\relax + }% + {% + \ifstrequal{#1}{Ý}% + {% + #2=`Y\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{à}} + or test {\ifstrequal{#1}{á}} + or test {\ifstrequal{#1}{á}} + or test {\ifstrequal{#1}{ã}} + or test {\ifstrequal{#1}{ä}} + }% + {% + #2=`a\relax + }% + {% + \ifstrequal{#1}{ç}% + {% + #2=`c\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{è}} + or test {\ifstrequal{#1}{é}} + or test {\ifstrequal{#1}{ê}} + or test {\ifstrequal{#1}{ë}} + }% + {% + #2=`e\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ì}} + or test {\ifstrequal{#1}{í}} + or test {\ifstrequal{#1}{î}} + or test {\ifstrequal{#1}{ï}} + }% + {% + #2=`i\relax + }% + {% + \ifstrequal{#1}{ñ}% + {% + #2=`n\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ò}} + or test {\ifstrequal{#1}{ó}} + or test {\ifstrequal{#1}{ô}} + or test {\ifstrequal{#1}{õ}} + or test {\ifstrequal{#1}{ö}} + }% + {% + #2=`o\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ù}} + or test {\ifstrequal{#1}{ú}} + or test {\ifstrequal{#1}{û}} + or test {\ifstrequal{#1}{ü}} + }% + {% + #2=`u\relax + }% + {% + \ifstrequal{#1}{ý}% + {% + #2=`y\relax + }% + {% + #2=64\relax + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% + }% +} +\newcommand*\dtlsetdefaultUTFviiilccharcode[2]{% + \ifboolexpr + { + test {\ifstrequal{#1}{à}} + or test {\ifstrequal{#1}{á}} + or test {\ifstrequal{#1}{á}} + or test {\ifstrequal{#1}{ã}} + or test {\ifstrequal{#1}{ä}} + or test {\ifstrequal{#1}{À}} + or test {\ifstrequal{#1}{Á}} + or test {\ifstrequal{#1}{Á}} + or test {\ifstrequal{#1}{Ã}} + or test {\ifstrequal{#1}{Ä}} + }% + {% + #2=`a\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ç}} + or test {\ifstrequal{#1}{Ç}} + } + {% + #2=`c\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{è}} + or test {\ifstrequal{#1}{é}} + or test {\ifstrequal{#1}{ê}} + or test {\ifstrequal{#1}{ë}} + or test {\ifstrequal{#1}{È}} + or test {\ifstrequal{#1}{É}} + or test {\ifstrequal{#1}{Ê}} + or test {\ifstrequal{#1}{Ë}} + }% + {% + #2=`e\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ì}} + or test {\ifstrequal{#1}{í}} + or test {\ifstrequal{#1}{î}} + or test {\ifstrequal{#1}{ï}} + or test {\ifstrequal{#1}{Ì}} + or test {\ifstrequal{#1}{Í}} + or test {\ifstrequal{#1}{Î}} + or test {\ifstrequal{#1}{Ï}} + }% + {% + #2=`i\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ñ}} + or test {\ifstrequal{#1}{Ñ}} + } + {% + #2=`n\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ò}} + or test {\ifstrequal{#1}{ó}} + or test {\ifstrequal{#1}{ô}} + or test {\ifstrequal{#1}{õ}} + or test {\ifstrequal{#1}{ö}} + or test {\ifstrequal{#1}{Ò}} + or test {\ifstrequal{#1}{Ó}} + or test {\ifstrequal{#1}{Ô}} + or test {\ifstrequal{#1}{Õ}} + or test {\ifstrequal{#1}{Ö}} + }% + {% + #2=`o\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ù}} + or test {\ifstrequal{#1}{ú}} + or test {\ifstrequal{#1}{û}} + or test {\ifstrequal{#1}{ü}} + or test {\ifstrequal{#1}{Ù}} + or test {\ifstrequal{#1}{Ú}} + or test {\ifstrequal{#1}{Û}} + or test {\ifstrequal{#1}{Ü}} + }% + {% + #2=`u\relax + }% + {% + \ifboolexpr + { + test {\ifstrequal{#1}{ý}} + or test {\ifstrequal{#1}{Ý}} + }% + {% + #2=`y\relax + }% + {% + #2=96\relax + }% + }% + }% + }% + }% + }% + }% + }% +} \newcommand*{\dtl@setlccharcode}[2]{% \ifstrempty{#1}% {% @@ -1618,7 +1971,13 @@ \ifcat\noexpand#1\relax% #2=0\relax \else - #2=\lccode`#1\relax + \expandafter\dtl@if@two@octets#1\relax\relax\dtl@end@if@two@octets + {% + \dtlsetUTFviiilccharcode{#1}{#2}% + }% + {% + \dtlsetlccharcode{#1}{#2}% + }% \ifnum#2=0\relax #2=`#1\relax \fi @@ -1655,9 +2014,9 @@ \expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst \let\dtl@firstB=\dtl@first \let\dtl@restB=\dtl@rest - \expandafter\dtl@ifsingle\expandafter{\dtl@firstA}% + \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}% {% - \expandafter\dtl@ifsingle\expandafter{\dtl@firstB}% + \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}% {% \expandafter\dtl@setlccharcode\expandafter{\dtl@firstA}{\dtl@codeA}% \expandafter\dtl@setlccharcode\expandafter{\dtl@firstB}{\dtl@codeB}% @@ -1996,6 +2355,13 @@ } \newcommand*{\@dtl@wordbreak}{ } \def\dtl@ifcasechargroup#1#2\dtl@end@ifcasechargroup#3#4#5{% + \expandafter\dtl@if@two@octets#1#2\relax\relax\dtl@end@if@two@octets + {% + \dtl@getfirst@UTFviii#1#2\@nil\end@dtl@getfirst@UTFviii + \expandafter\dtlsetUTFviiilccharcode\expandafter{\dtl@first}{\count@}% + \ifnum\count@<`a\relax #5\else#3\fi + }% + {% \dtlifcasechargroup{#1}% {#3}% {% @@ -2008,6 +2374,7 @@ }% }% {#5}% + }% } \newcommand*{\dtlifcasechargroup}[4]{% \count@=`#1\relax diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty index 3d2e5a6798e..b1b27fabe8d 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-fp.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `datatool-fp.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{datatool-fp}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{datatool-fp}[2016/01/12 v2.24 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{fp} \RequirePackage{datatool-base} diff --git a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty index 82904f6cdd8..ac7e48ec5a3 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool-pgfmath.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `datatool-pgfmath.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{datatool-pgfmath}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{datatool-pgfmath}[2016/01/12 v2.24 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{pgfrcs,pgfkeys,pgfmath} \ProcessOptionsX diff --git a/Master/texmf-dist/tex/latex/datatool/datatool.sty b/Master/texmf-dist/tex/latex/datatool/datatool.sty index 46b03f234e4..4d27d477dad 100644 --- a/Master/texmf-dist/tex/latex/datatool/datatool.sty +++ b/Master/texmf-dist/tex/latex/datatool/datatool.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `datatool.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{datatool}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{datatool}[2016/01/12 v2.24 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{ifthen} \RequirePackage{xfor} diff --git a/Master/texmf-dist/tex/latex/datatool/person.sty b/Master/texmf-dist/tex/latex/datatool/person.sty index 8e5bf2590a3..7a2d31ada7e 100644 --- a/Master/texmf-dist/tex/latex/datatool/person.sty +++ b/Master/texmf-dist/tex/latex/datatool/person.sty @@ -7,7 +7,7 @@ %% datatool.dtx (with options: `person.sty,package') %% %% datatool.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 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{person}[2015/07/11 v2.23 (NLCT)] +\ProvidesPackage{person}[2016/01/12 v2.24 (NLCT)] \RequirePackage{ifthen} \RequirePackage{datatool} \newcounter{people} -- cgit v1.2.3