summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/datatool
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-01-18 23:37:13 +0000
committerKarl Berry <karl@freefriends.org>2016-01-18 23:37:13 +0000
commit1992dc297aa0c1fd0db744a805a79e763c84ccd4 (patch)
tree696de9e86edbf0b9fc30a2d5408af843e9e02fa0 /Master/texmf-dist/source/latex/datatool
parent45d9445143cb4f5cf2040e705818c502978067aa (diff)
datatool (18jan16)
git-svn-id: svn://tug.org/texlive/trunk@39421 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/datatool')
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.dtx139
-rw-r--r--Master/texmf-dist/source/latex/datatool/datatool.ins2
2 files changed, 98 insertions, 43 deletions
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.dtx b/Master/texmf-dist/source/latex/datatool/datatool.dtx
index 34fd38d4f8a..9998682babb 100644
--- a/Master/texmf-dist/source/latex/datatool/datatool.dtx
+++ b/Master/texmf-dist/source/latex/datatool/datatool.dtx
@@ -1,7 +1,9 @@
%\iffalse
% datatool.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
-% -doc "datatool-manual.tex"
+% -macrocode "databib\.bst"
+% -codetitle ""
+% -author "Nicola Talbot"
% -src "datatool-base.sty\Z=>datatool-base.sty"
% -src "datatool-fp.sty\Z=>datatool-fp.sty"
% -src "datatool-pgfmath.sty\Z=>datatool-pgfmath.sty"
@@ -13,13 +15,11 @@
% -src "dataplot.sty\Z=>dataplot.sty"
% -src "person.sty\Z=>person.sty"
% -src "databib.bst\Z=>databib.bst"
-% -author "Nicola Talbot"
-% -codetitle ""
-% -macrocode "databib\.bst"
% -comment "databib\.bst"
% -setambles "databib\.bst=>\nopreamble\nopostamble"
+% -doc "datatool-manual.tex"
% datatool
-% Created on 2016/1/13 11:57
+% Created on 2016/1/18 9:48
%\fi
%\iffalse
%<*package>
@@ -66,7 +66,7 @@ datatool.dtx
\doxitem{Counter}{counter}{counters}
\doxitem{Option}{option}{package options}
-\CheckSum{23425}
+\CheckSum{23461}
\RecordChanges
\PageIndex
@@ -79,11 +79,11 @@ datatool.dtx
%\fi
%\MakeShortVerb{"}
%
-%\title{Documented Code for datatool v2.24}
+%\title{Documented Code for datatool v2.25}
%\author{Nicola L. C. Talbot\\
%\url{http://www.dickimaw-books.com/}}
%
-%\date{2016-01-12}
+%\date{2016-01-18}
%\maketitle
%
%\pagenumbering{roman}
@@ -117,7 +117,7 @@ datatool.dtx
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{datatool-base}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -2871,20 +2871,34 @@ datatool.dtx
\expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
\ifnum\dtl@codeA=-1\relax
\ifnum\dtl@codeB=-1\relax
- \protected@edef\dtl@donext{%
- \noexpand\dtlcompare{\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+% \end{macrocode}
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
+%\changes{2.25}{2016-01-18}{added \cs{expandonce}}
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
\dtl@donext
\else
- \protected@edef\dtl@donext{%
+ \edef\dtl@donext{%
\noexpand\dtlcompare
- {\noexpand#1}{\dtl@restA}{\dtl@firstB\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
\dtl@donext
\fi
\else
\ifnum\dtl@codeB=-1\relax
- \protected@edef\dtl@donext{%
+% \end{macrocode}
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
+% \begin{macrocode}
+ \edef\dtl@donext{%
\noexpand\dtlcompare
- {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
\dtl@donext
\else
\ifnum\dtl@codeA<\dtl@codeB
@@ -2920,14 +2934,22 @@ datatool.dtx
\fi
\fi
}{%
- \protected@edef\dtl@donext{%
+% \end{macrocode}
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
+% \begin{macrocode}
+ \edef\dtl@donext{%
\noexpand\dtlcompare
- {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
\dtl@donext
}}{%
- \protected@edef\dtl@donext{%
+ \edef\dtl@donext{%
\noexpand\dtlcompare
- {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
\dtl@donext
}%
}%
@@ -3526,20 +3548,34 @@ datatool.dtx
\expandafter\dtl@setlccharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
\ifnum\dtl@codeA=-1\relax
\ifnum\dtl@codeB=-1\relax
- \protected@edef\dtl@donext{%
- \noexpand\dtlicompare{\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+% \end{macrocode}
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
+%\changes{2.25}{2016-01-18}{added \cs{expandonce}}
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare{\noexpand#1}%
+ {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
\dtl@donext
\else
- \protected@edef\dtl@donext{%
+ \edef\dtl@donext{%
\noexpand\dtlicompare
- {\noexpand#1}{\dtl@restA}{\dtl@firstB\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
\dtl@donext
\fi
\else
\ifnum\dtl@codeB=-1\relax
- \protected@edef\dtl@donext{%
+% \end{macrocode}
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
+% \begin{macrocode}
+ \edef\dtl@donext{%
\noexpand\dtlicompare
- {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
\dtl@donext
\else
\ifnum\dtl@codeA<\dtl@codeB
@@ -3564,9 +3600,15 @@ datatool.dtx
#1=1\relax
}%
{%
- \protected@edef\dtl@donext{%
+% \end{macrocode}
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
+% \begin{macrocode}
+ \edef\dtl@donext{%
\noexpand\dtlicompare
- {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
\dtl@donext
}%
}%
@@ -3579,20 +3621,28 @@ datatool.dtx
% \end{macrocode}
% The first object in \meta{string1} is a single character, but the
% first object in \meta{string2} isn't a single character.
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
% \begin{macrocode}
- \protected@edef\dtl@donext{%
+ \edef\dtl@donext{%
\noexpand\dtlicompare
- {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
\dtl@donext
}%
}%
{%
% \end{macrocode}
% Neither object is a single character.
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
% \begin{macrocode}
- \protected@edef\dtl@donext{%
+ \edef\dtl@donext{%
\noexpand\dtlicompare
- {\noexpand#1}{\dtl@firstA\dtl@restA}{\dtl@firstB\dtl@restB}}%
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
\dtl@donext
}%
}%
@@ -3768,10 +3818,15 @@ datatool.dtx
\ifcase\@dtl@A@chargroup
% \end{macrocode}
% Symbol group
+%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
+%expanded.
+%\changes{2.25}{2016-01-18}{added \cs{expandonce}}
% \begin{macrocode}
- \protected@edef\dtl@donext{%
+ \edef\dtl@donext{%
\noexpand\dtlcompare
- {\noexpand#1}{\@dtl@A@before}{\@dtl@B@before}}%
+ {\noexpand#1}%
+ {\expandonce\@dtl@A@before}%
+ {\expandonce\@dtl@B@before}}%
\dtl@donext
% \end{macrocode}
% Number.
@@ -5706,7 +5761,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{fp} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{datatool-fp}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -5995,7 +6050,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{pgfmath} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6252,7 +6307,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{datatool}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -13845,7 +13900,7 @@ datatool.dtx
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{datagidx}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -19754,7 +19809,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{databib}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -22677,7 +22732,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{databar}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -23984,7 +24039,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{datapie}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -24689,7 +24744,7 @@ Try #2-#1 instead of #1-#2}%
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{dataplot}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Required packages
% \begin{macrocode}
@@ -26311,7 +26366,7 @@ east,southeast,south,southwest,west,northwest}[northeast]{%
% Package identification:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2016/01/12 v2.24 (NLCT)]
+\ProvidesPackage{person}[2016/01/18 v2.25 (NLCT)]
% \end{macrocode}
% Requires the \sty{ifthen} package.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/datatool/datatool.ins b/Master/texmf-dist/source/latex/datatool/datatool.ins
index 653f1e5da7f..08b21f870ab 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 1.1 2016/1/13 11:57
+% datatool.ins generated using makedtx version 1.1 2016/1/18 9:48
\input docstrip
\preamble