summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-09-28 03:00:42 +0000
committerNorbert Preining <norbert@preining.info>2019-09-28 03:00:42 +0000
commitf41a5d46017f730e9586332f28744912872326f5 (patch)
tree0e7ebb355adbdb56ac9d1e236dd5cde0b71e1520 /macros/latex/contrib
parent5827a950592f8a91468bcd0b5963d1df8d3518d8 (diff)
CTAN sync 201909280300
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.history4
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex5
-rw-r--r--macros/latex/contrib/chemmacros/chemmacros.sty4
-rw-r--r--macros/latex/contrib/datatool/CHANGES23
-rw-r--r--macros/latex/contrib/datatool/README4
-rw-r--r--macros/latex/contrib/datatool/datatool-code.pdfbin1188072 -> 1190542 bytes
-rw-r--r--macros/latex/contrib/datatool/datatool-user.pdfbin641116 -> 642674 bytes
-rw-r--r--macros/latex/contrib/datatool/datatool-user.tex66
-rw-r--r--macros/latex/contrib/datatool/datatool.dtx523
-rw-r--r--macros/latex/contrib/datatool/datatool.ins4
-rw-r--r--macros/latex/contrib/datatool/samples/sample-autokeys.pdfbin24911 -> 24923 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-barchart.pdfbin35054 -> 35069 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-datatooltk.pdfbin22848 -> 22860 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-dict.pdfbin122418 -> 122423 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-europecv-bib.pdfbin89544 -> 89557 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-gidx.pdfbin179887 -> 180196 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-glossary.pdfbin104516 -> 104832 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-index.pdfbin128777 -> 129207 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-index.tex11
-rw-r--r--macros/latex/contrib/datatool/samples/sample-mail-merge.pdfbin21655 -> 21903 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-piechart.pdfbin33945 -> 33959 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-sort.pdfbin89703 -> 89718 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-student-scores.pdfbin34602 -> 34614 bytes
-rw-r--r--macros/latex/contrib/datatool/samples/sample-two-per-row.pdfbin31739 -> 31751 bytes
-rw-r--r--macros/latex/contrib/exsheets/README4
-rw-r--r--macros/latex/contrib/exsheets/exsheets-listings.sty4
-rw-r--r--macros/latex/contrib/exsheets/exsheets.sty23
-rw-r--r--macros/latex/contrib/exsheets/exsheets_configurations.cfg4
-rw-r--r--macros/latex/contrib/exsheets/exsheets_en.pdfbin665754 -> 658582 bytes
-rw-r--r--macros/latex/contrib/exsheets/exsheets_en.tex4
-rw-r--r--macros/latex/contrib/exsheets/exsheets_headings.cfg4
-rw-r--r--macros/latex/contrib/exsheets/exsheets_headings.def4
32 files changed, 453 insertions, 238 deletions
diff --git a/macros/latex/contrib/chemmacros/chemmacros.history b/macros/latex/contrib/chemmacros/chemmacros.history
index bebe40163e..2b2429f9f8 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.history
+++ b/macros/latex/contrib/chemmacros/chemmacros.history
@@ -378,4 +378,6 @@ Version history
2018/03/02 - version 5.8c - fix bug in \chemmacros_p:n (acid/base)
- smash sub- and superscripts of polymer delimiters
(polymers)
-2019/09/23 - version 5.8d - add some Norwegian translations
+2019/09/23 - version 5.8d - add some Norwegian translations (reactions, scheme)
+2019/09/27 - version 5.8e - change `O{}' argument of reactions into `!O{}'
+ (reactions)
diff --git a/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex b/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex
index 6512123897..629d3f89ca 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex
+++ b/macros/latex/contrib/chemmacros/chemmacros.module.reactions.code.tex
@@ -25,7 +25,7 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\ChemModule{reactions}{2019/09/23 reaction environments}
+\ChemModule{reactions}{2019/09/27 reaction environments}
\chemmacros_load_module:n {chemformula}
@@ -278,7 +278,7 @@
% #4: argument list ({#2}{#3}...)
\cs_new_protected:Npn \chemmacros_declare_reaction_env:nnnn #1#2#3#4
{
- \exp_args:Nnx \DeclareDocumentEnvironment {#1} { O{} \prg_replicate:nn {#3+0} {m} }
+ \exp_args:Nnx \DeclareDocumentEnvironment {#1} { !O{} \prg_replicate:nn {#3+0} {m} }
{
\chemmacros_add_reaction_description:n {##1}
\__chemmacros_begin_reaction:
@@ -442,3 +442,4 @@
- moved translations from lang module to reactions module
2016/05/04 - options `tag-open', `tag-close' and `before-tag'
2019/09/23 - added Norwegian translations
+2019/09/27 - change `O{}' argument of reactions into `!O{}'
diff --git a/macros/latex/contrib/chemmacros/chemmacros.sty b/macros/latex/contrib/chemmacros/chemmacros.sty
index badf8ddb9a..84915c9f55 100644
--- a/macros/latex/contrib/chemmacros/chemmacros.sty
+++ b/macros/latex/contrib/chemmacros/chemmacros.sty
@@ -31,10 +31,10 @@
% --------------------------------------------------------------------------
% package information:
-\tl_const:Nn \c_chemmacros_date_tl {2019/09/24}
+\tl_const:Nn \c_chemmacros_date_tl {2019/09/27}
\tl_const:Nn \c_chemmacros_version_major_number_tl {5}
\tl_const:Nn \c_chemmacros_version_minor_number_tl {8}
-\tl_const:Nn \c_chemmacros_version_subrelease_tl {d}
+\tl_const:Nn \c_chemmacros_version_subrelease_tl {e}
\tl_const:Nx \c_chemmacros_version_number_tl
{
\c_chemmacros_version_major_number_tl .
diff --git a/macros/latex/contrib/datatool/CHANGES b/macros/latex/contrib/datatool/CHANGES
index 219c569cb2..07cfaa06e6 100644
--- a/macros/latex/contrib/datatool/CHANGES
+++ b/macros/latex/contrib/datatool/CHANGES
@@ -1,3 +1,26 @@
+v2.32 (2019-09-27):
+
+ * datagidx.sty:
+
+ - added check for new 2019/10/01 LaTeX kernel when defining
+ \datagidxstripaccents.
+
+ ** Pre version 2.32 accent stripping in \newterm won't work with new LaTeX kernel. **
+
+ * datatool-base.sty:
+
+ - added \ifdtlcompareskipcs
+ (see https://www.dickimaw-books.com/bugtracker.php?action=view&key=99)
+
+ - bug fix (\dtlcompare not finding word breaks)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=100)
+
+ - bug fix (error if first command in assignment list is equal to \relax)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=106)
+
+ - bug fix (removed \relax from definitions of \DTLiffirstrow and \DTLiflastrow)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=130)
+
v2.31 (2018-12-07):
* datatool-base.sty:
diff --git a/macros/latex/contrib/datatool/README b/macros/latex/contrib/datatool/README
index 7e784650d6..0e84411bf5 100644
--- a/macros/latex/contrib/datatool/README
+++ b/macros/latex/contrib/datatool/README
@@ -1,6 +1,6 @@
-LaTeX Bundle : datatool v2.31
+LaTeX Bundle : datatool v2.32
-Last Modified : 2018-12-07
+Last Modified : 2019-09-27
Author : Nicola Talbot
diff --git a/macros/latex/contrib/datatool/datatool-code.pdf b/macros/latex/contrib/datatool/datatool-code.pdf
index 08f7743eb0..1415318c4b 100644
--- a/macros/latex/contrib/datatool/datatool-code.pdf
+++ b/macros/latex/contrib/datatool/datatool-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/datatool-user.pdf b/macros/latex/contrib/datatool/datatool-user.pdf
index 8001340d5e..ea09d83b8f 100644
--- a/macros/latex/contrib/datatool/datatool-user.pdf
+++ b/macros/latex/contrib/datatool/datatool-user.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/datatool-user.tex b/macros/latex/contrib/datatool/datatool-user.tex
index 08f01e258f..f60a4f3448 100644
--- a/macros/latex/contrib/datatool/datatool-user.tex
+++ b/macros/latex/contrib/datatool/datatool-user.tex
@@ -103,11 +103,11 @@
\MakeShortVerb{"}
- \title{User Manual for datatool bundle version~2.31}
+ \title{User Manual for datatool bundle version~2.32}
\author{Nicola L.C. Talbot\\
\url{http://www.dickimaw-books.com/}}
- \date{2018-12-07}
+ \date{2019-09-27}
\maketitle
\pagenumbering{roman}
@@ -122,7 +122,7 @@ The \styfmt{datatool} bundle comes with the following documentation:
\item[\url{datatool-code.pdf}]
Advanced users wishing to know more about the inner workings of
all the packages provided in the \styfmt{datatool} bundle should
- read \qt{Documented Code for datatool v2.31}
+ read \qt{Documented Code for datatool v2.32}
\item[INSTALL] Installation instructions.
@@ -130,6 +130,13 @@ The \styfmt{datatool} bundle comes with the following documentation:
\item[README] Package summary.
\end{description}
+Additional online resources:
+\begin{itemize}
+\item \styfmt{datatool} FAQ:
+\href{https://www.dickimaw-books.com/faqs/datatoolfaq.html}{dickimaw-books.com/faqs/datatoolfaq.html}
+\item Bug tracker: \href{https://www.dickimaw-books.com/bugtracker.php}{dickimaw-books.com/bugtracker.php}
+\item \styfmt{datatool} performance: \href{https://www.dickimaw-books.com/gallery/datatool-performance.shtml}{dickimaw-books.com/gallery/datatool-performance.shtml}
+\end{itemize}
\begin{important}
There's an old adage, ``use the right tool for the right job.''
@@ -2266,7 +2273,26 @@ A case-sensitive comparison.
\begin{definition}[\DescribeMacro\dtlicompare]
\cs{dtlicompare}\marg{register}\marg{A}\marg{B}
\end{definition}
-A case-insensitive comparison.
+A case-insensitive comparison. The two above commands work in much
+the same way except that the first compares character codes and the
+second compares the lowercase character codes. If control sequences
+are found then the comparison is determined by the conditional:
+\begin{definition}[\DescribeMacro\ifdtlcompareskipcs]
+\cs{ifdtlcompareskipcs}
+\end{definition}
+This is switched on with:
+\begin{definition}[\DescribeMacro\dtlcompareskipcstrue]
+\cs{dtlcompareskipcstrue}
+\end{definition}
+and switched off with:
+\begin{definition}[\DescribeMacro\dtlcompareskipcsfalse]
+\cs{dtlcompareskipcsfalse}
+\end{definition}
+The default setting is false (off). If true control sequences will
+be skipped. If false control sequences will considered as having the
+code 0.
+
+There are also two comparison commands designed for indexes:
\begin{definition}[\DescribeMacro\dtlwordindexcompare]
\cs{dtlwordindexcompare}\marg{register}\marg{A}\marg{B}
\end{definition}
@@ -2276,7 +2302,7 @@ the Oxford Style Manual.
\cs{dtlletterindexcompare}\marg{register}\marg{A}\marg{B}
\end{definition}
English letter-ordering comparison for indexes.
-Those last two commands are described in more detail in
+These last two commands are described in more detail in
\sectionref{sec:sort}.
For example:
@@ -6782,9 +6808,8 @@ sets both the label and sort fields to \texttt{macedoine} but the
name and text fields are set to \verb|mac\'edoine|.
\begin{important}
-The first letter must be grouped if it's an accent or ligature or a
-character outside the range \texttt{a}\ldots\texttt{z} or
-\texttt{A}\ldots\texttt{Z}.
+The first letter must be grouped if it's an accent or ligature
+command.
\end{important}
\item This example must have the sort and label fields set manually
@@ -6793,29 +6818,32 @@ because the first letter has an accent:
\newterm[label=elite,sort=elite]{{\'e}lite}
\end{verbatim}
-\item The same applies if you are using the \sty{inputenc} package:
+\item This used to also apply when using the \sty{inputenc} package
+with older versions of \styfmt{datatool-base} and \styfmt{mfirstuc}.
+However now it's no longer necessary for accents:
+\begin{verbatim}
+\newterm{élite}
+\end{verbatim}
+
+\item Commands such as \ics{oe} aren't dealt with, so you must
+manually set the label and sort key:
\begin{verbatim}
-\newterm[label=elite,sort=elite]{{é}lite}
+\newterm[label=manoeuvre,sort=manoeuvre]{man\oe uvre}
\end{verbatim}
\item The same applies to plural terms set explicitly:
\begin{verbatim}
\newterm
[%
- plural={{œ}sophagi},%
+ plural={{\oe}sophagi},%
label={oesophagus},%
sort={oesophagus}%
]
- {{œ}sophagus}
-\end{verbatim}
-
-\item Commands such as \ics{oe} aren't dealt with, so you must
-manually set the label and sort key:
-\begin{verbatim}
-\newterm[label=manoeuvre,sort=manoeuvre]{man\oe uvre}
+ {{\oe}sophagus}
\end{verbatim}
-\item The same applies if you are using the \sty{inputenc} package:
+\item The same applies if you are using the \sty{inputenc} package
+to enter ligatures:
\begin{verbatim}
\newterm[label=manoeuvre,sort=manoeuvre]{manœuvre}
\end{verbatim}
diff --git a/macros/latex/contrib/datatool/datatool.dtx b/macros/latex/contrib/datatool/datatool.dtx
index 9115c37a69..14a45e55f0 100644
--- a/macros/latex/contrib/datatool/datatool.dtx
+++ b/macros/latex/contrib/datatool/datatool.dtx
@@ -1,9 +1,12 @@
%\iffalse
% datatool.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
-% -macrocode "databib\.bst"
+% -author "Nicola Talbot"
% -codetitle ""
+% -macrocode "databib\.bst"
% -setambles "databib\.bst=>\nopreamble\nopostamble"
+% -doc "datatool-manual.tex"
+% -comment "databib\.bst"
% -src "datatool-base.sty\Z=>datatool-base.sty"
% -src "datatool-fp.sty\Z=>datatool-fp.sty"
% -src "datatool-pgfmath.sty\Z=>datatool-pgfmath.sty"
@@ -15,11 +18,8 @@
% -src "dataplot.sty\Z=>dataplot.sty"
% -src "person.sty\Z=>person.sty"
% -src "databib.bst\Z=>databib.bst"
-% -doc "datatool-manual.tex"
-% -author "Nicola Talbot"
-% -comment "databib\.bst"
% datatool
-% Created on 2018/12/7 15:44
+% Created on 2019/9/27 19:53
%\fi
%\iffalse
%<*package>
@@ -42,7 +42,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>
@@ -68,7 +68,7 @@ datatool.dtx
\doxitem{Counter}{counter}{counters}
\doxitem{Option}{option}{package options}
-\CheckSum{24081}
+\CheckSum{24235}
\RecordChanges
\PageIndex
@@ -81,11 +81,11 @@ datatool.dtx
%\fi
%\MakeShortVerb{"}
%
-%\title{Documented Code for datatool v2.31}
+%\title{Documented Code for datatool v2.32}
%\author{Nicola L. C. Talbot\\
%\url{http://www.dickimaw-books.com/}}
%
-%\date{2018-12-07}
+%\date{2019-09-27}
%\maketitle
%
%\pagenumbering{roman}
@@ -100,8 +100,6 @@ datatool.dtx
%\pagenumbering{arabic}
%
%\StopEventually{%
-% \clearpage\phantomsection
-% \addcontentsline{toc}{chapter}{Index}%
% \PrintIndex
% \clearpage\phantomsection
% \addcontentsline{toc}{chapter}{History}\PrintChanges
@@ -121,7 +119,7 @@ datatool.dtx
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-base}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -2626,8 +2624,7 @@ datatool.dtx
\dtl@split@str##2\@nil
}%
}%
- \def\dtl@split@str##1#2\@nil{%
- \def#4{##1}}%
+ \def\dtl@split@str##1#2\@nil{\def#4{##1}}%
\dtl@splitstr#1#2\@nil
}
% \end{macrocode}
@@ -3102,6 +3099,15 @@ datatool.dtx
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\ifdtlcompareskipcs}
+%\changes{2.32}{2019-09-27}{new}
+%If true, \cs{dtlcompare} should skip control sequences.
+% \begin{macrocode}
+\newif\ifdtlcompareskipcs
+\dtlcompareskipcsfalse
+% \end{macrocode}
+%\end{macro}
+%
%\label{src:dtlcompare}
%\begin{macro}{\dtlcompare}
%\begin{definition}
@@ -3155,8 +3161,16 @@ datatool.dtx
%\dtlcompare{\mycount}{foo}{\uppercase{f}oo}\number\mycount, since
%the \cs{uppercase} command is ignored.
%
-%\item You can ``trick'' \cs{dtlcompare} using a command which doesn't
-%output any text. Suppose you have defined the following command:
+%\item A control sequence is treated as having the character code
+%value of 0. Pre version 2.32, \cs{dtlcompare} was advertised here
+%as skipping control sequences when actually it was treating a
+%control sequence as character 0. To avoid breaking
+%backward-compatibility where a control sequence is expected to have
+%this behaviour, we now have a switch to determine whether to treat
+%control sequences as 0 or to skip them.
+%
+%So you can now ``trick'' \cs{dtlcompare} using a command which doesn't
+%output any text if switch this conditional on. Suppose you have defined the following command:
%\begin{verbatim}
%\newcommand*{\noopsort}[1]{}
%\end{verbatim}
@@ -3234,100 +3248,159 @@ datatool.dtx
#1=1\relax
}%
{%
- \DTLsubstituteall{\@dtl@argA}{ }{\space }%
- \DTLsubstituteall{\@dtl@argB}{ }{\space }%
+% \end{macrocode}
+% Identify all word breaks.
+%\changes{2.32}{2019-09-27}{now using \cs{dtl@setwordbreaksnohyphens} to
+%deal with spaces}
+% \begin{macrocode}
+ \dtl@setwordbreaksnohyphens{\@dtl@argA}{\@dtl@wordbreak}%
+ \let\@dtl@argA\dtl@string
+ \dtl@setwordbreaksnohyphens{\@dtl@argB}{\@dtl@wordbreak}%
+ \let\@dtl@argB\dtl@string
\expandafter\dtl@getfirst\@dtl@argA\end@dtl@getfirst
\let\dtl@firstA=\dtl@first
\let\dtl@restA=\dtl@rest
\expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst
\let\dtl@firstB=\dtl@first
\let\dtl@restB=\dtl@rest
- \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
- \ifnum\dtl@codeB=-1\relax
+ \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}%
+% \end{macrocode}
+%\changes{2.32}{2019-09-27}{added check to determine if control sequences
+%should be skipped}
+% If control sequences should be skipped, check if either is a
+% control sequence (the character code will be 0).
+% \begin{macrocode}
+ \let\dtl@donextcompare\@firstofone
+ \ifdtlcompareskipcs
+ \ifnum\dtl@codeA=0\relax
+ \ifnum\dtl@codeB=0\relax
+% \end{macrocode}
+%Skip both.
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \else
+% \end{macrocode}
+%Skip A.
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
+ \else
+ \ifnum\dtl@codeB=0\relax
+% \end{macrocode}
+%Skip B.
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
+ \fi
+ \fi
+ \dtl@donextcompare
+ {%
+ \ifnum\dtl@codeA=-1\relax
+ \ifnum\dtl@codeB=-1\relax
% \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
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
- \fi
- \else
- \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ \fi
+ \else
+ \ifnum\dtl@codeB=-1\relax
% \end{macrocode}
%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
%expanded.
% \begin{macrocode}
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
- \else
- \ifnum\dtl@codeA<\dtl@codeB
- #1=-1\relax
- \else
- \ifnum\dtl@codeA>\dtl@codeB
- #1=1\relax
- \else
- \ifdefempty{\dtl@restA}%
- {%
- \ifdefempty{\dtl@restB}%
- {%
- #1=0\relax
- }%
- {%
- #1=-1\relax
- }%
- }%
- {%
- \ifdefempty{\restB}%
- {%
- #1=1\relax
- }%
- {%
- \protected@edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
- \dtl@donext
- }%
- }%
- \fi
- \fi
- \fi
- \fi
- }{%
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \ifnum\dtl@codeA<\dtl@codeB
+ #1=-1\relax
+ \else
+ \ifnum\dtl@codeA>\dtl@codeB
+ #1=1\relax
+ \else
+ \ifdefempty{\dtl@restA}%
+ {%
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=0\relax
+ }%
+ {%
+ #1=-1\relax
+ }%
+ }%
+ {%
+% \end{macrocode}
+%\changes{2.32}{2019-09-27}{corrected misspelt command}
+% \begin{macrocode}
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=1\relax
+ }%
+ {%
+ \protected@edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+ \dtl@donext
+ }%
+ }%
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ }%
+ {%
% \end{macrocode}
%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
%expanded.
% \begin{macrocode}
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
- }}{%
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ }%
+ }%
+ {%
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
}%
}%
}%
@@ -3414,8 +3487,9 @@ datatool.dtx
%\begin{definition}
%\cs{dtl@setcharcode}\marg{c}\marg{count register}
%\end{definition}
-% Sets \meta{count register} to the character code of \meta{c}, or to
-% -1 if \meta{c} is a control sequence, unless \meta{c} is either
+% Sets \meta{count register} to the character code of \meta{c}, or
+% to $-1$ if \meta{c} is empty, or to
+% 0 if \meta{c} is a control sequence, unless \meta{c} is either
% \cs{space} or |~| in which case it sets \meta{count register}
% to the character code of the space character.
% \begin{macrocode}
@@ -3923,76 +3997,123 @@ datatool.dtx
% \begin{macrocode}
\expandafter\dtl@setlccharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
\expandafter\dtl@setlccharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
- \ifnum\dtl@codeA=-1\relax
- \ifnum\dtl@codeB=-1\relax
+% \end{macrocode}
+%\changes{2.32}{2019-09-27}{added check to determine if control sequences
+%should be skipped}
+% If control sequences should be skipped, check if either is a
+% control sequence (the character code will be 0).
+% \begin{macrocode}
+ \let\dtl@donextcompare\@firstofone
+ \ifdtlcompareskipcs
+ \ifnum\dtl@codeA=0\relax
+ \ifnum\dtl@codeB=0\relax
+% \end{macrocode}
+%Skip both.
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \else
+% \end{macrocode}
+%Skip A.
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
+ \else
+ \ifnum\dtl@codeB=0\relax
+% \end{macrocode}
+%Skip B.
+% \begin{macrocode}
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
+ \fi
+ \fi
+ \dtl@donextcompare
+ {%
+ \ifnum\dtl@codeA=-1\relax
+ \ifnum\dtl@codeB=-1\relax
% \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
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare{\noexpand#1}%
+ {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ \fi
\else
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
- \fi
- \else
- \ifnum\dtl@codeB=-1\relax
+ \ifnum\dtl@codeB=-1\relax
% \end{macrocode}
%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
%expanded.
% \begin{macrocode}
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
- \else
- \ifnum\dtl@codeA<\dtl@codeB
- #1=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
\else
- \ifnum\dtl@codeA>\dtl@codeB
- #1=1\relax
+ \ifnum\dtl@codeA<\dtl@codeB
+ #1=-1\relax
\else
- \ifdefempty{\dtl@restA}%
- {%
- \ifdefempty{\dtl@restB}%
- {%
- #1=0\relax
- }%
+ \ifnum\dtl@codeA>\dtl@codeB
+ #1=1\relax
+ \else
+ \ifdefempty{\dtl@restA}%
{%
- #1=-1\relax
- }%
- }%
- {%
- \ifdefempty{\restB}%
- {%
- #1=1\relax
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=0\relax
+ }%
+ {%
+ #1=-1\relax
+ }%
}%
{%
% \end{macrocode}
+%\changes{2.32}{2019-09-27}{corrected misspelt command}
+% \begin{macrocode}
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=1\relax
+ }%
+ {%
+% \end{macrocode}
%v2.25: added \cs{expandonce} to prevent non-ASCII characters from being
%expanded.
% \begin{macrocode}
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
+ }%
}%
- }%
+ \fi
\fi
\fi
\fi
- \fi
+ }%
}%
{%
% \end{macrocode}
@@ -6138,7 +6259,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{fp} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-fp}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6427,7 +6548,7 @@ datatool.dtx
% Definitions of fixed-point commands that use the \sty{pgfmath} package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -6768,7 +6889,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -8267,7 +8388,7 @@ datatool.dtx
% \begin{macrocode}
{%
\dtlgetrow{#1}{#2}%
- \@dtl@assign{#3}{#1}%
+ \@dtl@assign{#3}{#1}%
}%
}%
{%
@@ -9878,11 +9999,12 @@ datatool.dtx
\DTLiffirstrow
% \end{macrocode}
% Define current \cs{DTLiffirstrow}
+%\changes{2.32}{2019-09-27}{removed \cs{relax}}
% \begin{macrocode}
\gdef\DTLiffirstrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =1\relax
+ =1 %space intended
##1%
\else
##2%
@@ -9896,11 +10018,12 @@ datatool.dtx
% \end{macrocode}
% Define current \cs{DTLiflastrow}
%\changes{2.12}{2012-11-30}{fixed bug in \cs{DTLiflastrow}}
+%\changes{2.32}{2019-09-27}{removed \cs{relax}}
% \begin{macrocode}
\gdef\DTLiflastrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =\csname dtlrows@#2\endcsname\relax
+ =\csname dtlrows@#2\endcsname
##1%
\else
##2%
@@ -9969,11 +10092,9 @@ datatool.dtx
= \dtlafterrow
% \end{macrocode}
% Assign commands to the required entries
+%\changes{2.32}{2019-09-27}{changed \cs{ifx} test to \cs{ifblank}}
% \begin{macrocode}
- \ifx\relax#3\relax
- \else
- \@dtl@assign{#3}{#2}%
- \fi
+ \ifblank{#3}{}{\@dtl@assign{#3}{#2}}%
% \end{macrocode}
% Do the main body of text if condition is satisfied
% \begin{macrocode}
@@ -10153,11 +10274,12 @@ datatool.dtx
\DTLiffirstrow
% \end{macrocode}
% Define current \cs{DTLiffirstrow}
+%\changes{2.32}{2019-09-27}{removed \cs{relax}}
% \begin{macrocode}
\gdef\DTLiffirstrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =1\relax
+ =1 % space intended
##1%
\else
##2%
@@ -10171,11 +10293,12 @@ datatool.dtx
% \end{macrocode}
% Define current \cs{DTLiflastrow}
%\changes{2.12}{2012-11-30}{fixed bug in \cs{DTLiflastrow}}
+%\changes{2.32}{2019-09-27}{removed \cs{relax}}
% \begin{macrocode}
\gdef\DTLiflastrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =\csname dtlrows@#2\endcsname\relax
+ =\csname dtlrows@#2\endcsname
##1%
\else
##2%
@@ -10225,15 +10348,16 @@ datatool.dtx
= \expandafter{\dtl@thisrow}%
% \end{macrocode}
% Assign commands to the required entries
+%\changes{2.32}{2019-09-27}{changed \cs{ifx} test to \cs{ifblank}}
% \begin{macrocode}
- \ifx\relax#3\relax
- \else
+ \ifblank{#3}{}
+ {%
% \end{macrocode}
% Need to set \cs{dtlcurrentrow} for \cs{@dtl@assign}
% \begin{macrocode}
\dtlcurrentrow=\expandafter{\dtl@thisrow}%
\@dtl@assign{#3}{#2}%
- \fi
+ }%
% \end{macrocode}
% Do the main body of text if condition is satisfied
% \begin{macrocode}
@@ -14363,7 +14487,7 @@ datatool.dtx
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datagidx}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -18332,22 +18456,48 @@ datatool.dtx
% need to redefine this if you want accented letters to be sorted
% differently from the unaccented version. This command should
% only be used within a scope.
-% \begin{macrocode}
-\newcommand*{\datagidxstripaccents}{%
+%\changes{2.32}{2019-09-27}{added test for kernel version}
+% Need to test kernel version. The new 2019/10/01 version has a
+% different definition of \cs{UTFviii@two@octets} which won't expand
+% UTF-8 characters to \cs{IeC} in the required context. (This is
+% really useful if you want extended characters in labels but not if
+% they need to be stripped.) If you don't want accents stripped then
+% redefine \cs{datagidxstripaccents} to do nothing.
+% \begin{macrocode}
+\@ifl@t@r\fmtversion{2019/10/01}
+{%
+ \newcommand*{\datagidxstripaccents}{%
% \end{macrocode}
% These redefinitions will only work with \cs{edef} or \cs{xdef}:
% \begin{macrocode}
- \let\add@accent@\@secondoftwo
- \let\@text@composite@x\@secondoftwo
- \let\@tabacckludge\@secondoftwo
+ \let\add@accent@\@secondoftwo
+ \let\@text@composite@x\@secondoftwo
+ \let\@tabacckludge\@secondoftwo
% \end{macrocode}
% The following are need with \cs{protected@edef} or \cs{protected@xdef}:
% \begin{macrocode}
- \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
- \def\IeC##1{\@gobbletwo##1}%
+ \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
+ \def\IeC##1{\@gobbletwo##1}%
+ \let\UTFviii@two@octets\UTFviii@two@octets@combine
+ }%
+}
+{%
+% \end{macrocode}
+% Older kernels:
+% \begin{macrocode}
+ \newcommand*{\datagidxstripaccents}{%
+ \let\add@accent@\@secondoftwo
+ \let\@text@composite@x\@secondoftwo
+ \let\@tabacckludge\@secondoftwo
+ \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
+ \def\IeC##1{\@gobbletwo##1}%
+ }%
}
% \end{macrocode}
%\end{macro}
@@ -20290,17 +20440,10 @@ datatool.dtx
% Current location was saved in the previous run. Has it changed?
%\changes{2.15}{2013-07-10}{expanded and sanitize locations before
%comparing them}%
+%This may cause a problem on page boundaries so this code block may
+%be removed in future versions.
% \begin{macrocode}
- \protected@edef\@prev@location{%
- \csname datagidx@prev@loc@\Label\endcsname}%
- \@onelevel@sanitize\@prev@location
- \protected@edef\@cur@location{\CurrentLocation}%
- \@onelevel@sanitize\@cur@location
- \ifdefequal{\@prev@location}{\@cur@location}%
- {}%
- {%
- \global\let\@datagidx@dorerun@warn\@data@rerun@warn
- }%
+ \dtlgidx@checklocationchange
}%
{%
% \end{macrocode}
@@ -20338,6 +20481,24 @@ datatool.dtx
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\dtlgidx@checklocationchange}
+%\changes{2.32}{??}{new}
+% \begin{macrocode}
+\newcommand*{\dtlgidx@checklocationchange}{%
+ \protected@edef\@prev@location{%
+ \csname datagidx@prev@loc@\Label\endcsname}%
+ \@onelevel@sanitize\@prev@location
+ \protected@edef\@cur@location{\CurrentLocation}%
+ \@onelevel@sanitize\@cur@location
+ \ifdefequal{\@prev@location}{\@cur@location}%
+ {}%
+ {%
+ \global\let\@datagidx@dorerun@warn\@data@rerun@warn
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\datagidx@doifdisplayed}
%\begin{definition}
%\cs{datagidx@doifdisplayed}\marg{body}
@@ -20413,7 +20574,7 @@ datatool.dtx
%\section{Package Declaration}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databib}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Load required packages:
% \begin{macrocode}
@@ -23336,7 +23497,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databar}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -24643,7 +24804,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datapie}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Require \sty{xkeyval} package
% \begin{macrocode}
@@ -25445,7 +25606,7 @@ already exists}{}}}}
% Declare package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{dataplot}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Required packages
% \begin{macrocode}
@@ -27067,7 +27228,7 @@ east,southeast,south,southwest,west,northwest}[northeast]{%
% Package identification:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{person}[2019/09/27 v2.32 (NLCT)]
% \end{macrocode}
% Requires the \sty{ifthen} package.
% \begin{macrocode}
diff --git a/macros/latex/contrib/datatool/datatool.ins b/macros/latex/contrib/datatool/datatool.ins
index 512f5a07a6..3b163f9b8c 100644
--- a/macros/latex/contrib/datatool/datatool.ins
+++ b/macros/latex/contrib/datatool/datatool.ins
@@ -1,10 +1,10 @@
-% datatool.ins generated using makedtx version 1.2 2018/12/7 15:44
+% datatool.ins generated using makedtx version 1.2 2019/9/27 19:53
\input docstrip
\preamble
datatool.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/macros/latex/contrib/datatool/samples/sample-autokeys.pdf b/macros/latex/contrib/datatool/samples/sample-autokeys.pdf
index 5bde2cc5eb..ccb2338497 100644
--- a/macros/latex/contrib/datatool/samples/sample-autokeys.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-autokeys.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-barchart.pdf b/macros/latex/contrib/datatool/samples/sample-barchart.pdf
index 9cdf92def9..edc960eaf0 100644
--- a/macros/latex/contrib/datatool/samples/sample-barchart.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-barchart.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-datatooltk.pdf b/macros/latex/contrib/datatool/samples/sample-datatooltk.pdf
index 9c63274acf..7eecfaa37e 100644
--- a/macros/latex/contrib/datatool/samples/sample-datatooltk.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-datatooltk.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-dict.pdf b/macros/latex/contrib/datatool/samples/sample-dict.pdf
index cd16bc3eac..10df32852e 100644
--- a/macros/latex/contrib/datatool/samples/sample-dict.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-dict.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-europecv-bib.pdf b/macros/latex/contrib/datatool/samples/sample-europecv-bib.pdf
index 38abdb7044..5256e20b82 100644
--- a/macros/latex/contrib/datatool/samples/sample-europecv-bib.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-europecv-bib.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-gidx.pdf b/macros/latex/contrib/datatool/samples/sample-gidx.pdf
index 6621748211..9e490252ed 100644
--- a/macros/latex/contrib/datatool/samples/sample-gidx.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-gidx.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-glossary.pdf b/macros/latex/contrib/datatool/samples/sample-glossary.pdf
index 59129431dd..0313221175 100644
--- a/macros/latex/contrib/datatool/samples/sample-glossary.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-glossary.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-index.pdf b/macros/latex/contrib/datatool/samples/sample-index.pdf
index 16a363c58b..d72c814fc8 100644
--- a/macros/latex/contrib/datatool/samples/sample-index.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-index.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-index.tex b/macros/latex/contrib/datatool/samples/sample-index.tex
index 2a2673d0cc..ce0973c20d 100644
--- a/macros/latex/contrib/datatool/samples/sample-index.tex
+++ b/macros/latex/contrib/datatool/samples/sample-index.tex
@@ -70,12 +70,10 @@
% other encodings.)
\newterm{macramé}
- % Take care if the first letter starts with an accent.
- % The initial accented letter must be grouped to ensure it works
- % with \makefirstuc, but this will make the default label '{e}lite'
- % rather than 'elite', so let's override the default:
+\newterm{élite}
-\newterm[label=elite]{{é}lite}
+ % Terms with ligatures need to have the label set explicitly:
+\newterm[label=manoeuvre]{manœuvre}
% Sometimes the default sort may not suit your requirements. In
% which case you can override it:
@@ -676,7 +674,8 @@ Switching to small caps Roman page numbering.
\gls{ma},
\gls{macabre},
\gls{macrame},
-\gls{macedoine}.
+\gls{macedoine},
+\gls{manoeuvre}.
\Gls{elite},
\gls{deem},
diff --git a/macros/latex/contrib/datatool/samples/sample-mail-merge.pdf b/macros/latex/contrib/datatool/samples/sample-mail-merge.pdf
index 3e9fa49921..8aa8160e7e 100644
--- a/macros/latex/contrib/datatool/samples/sample-mail-merge.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-mail-merge.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-piechart.pdf b/macros/latex/contrib/datatool/samples/sample-piechart.pdf
index 0bce7fb05c..e4948d91fa 100644
--- a/macros/latex/contrib/datatool/samples/sample-piechart.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-piechart.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-sort.pdf b/macros/latex/contrib/datatool/samples/sample-sort.pdf
index 18eb0c79b4..bac8a64e20 100644
--- a/macros/latex/contrib/datatool/samples/sample-sort.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-sort.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-student-scores.pdf b/macros/latex/contrib/datatool/samples/sample-student-scores.pdf
index 9b85095fb1..f462cf430f 100644
--- a/macros/latex/contrib/datatool/samples/sample-student-scores.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-student-scores.pdf
Binary files differ
diff --git a/macros/latex/contrib/datatool/samples/sample-two-per-row.pdf b/macros/latex/contrib/datatool/samples/sample-two-per-row.pdf
index f22fea8cc6..3b123c90ee 100644
--- a/macros/latex/contrib/datatool/samples/sample-two-per-row.pdf
+++ b/macros/latex/contrib/datatool/samples/sample-two-per-row.pdf
Binary files differ
diff --git a/macros/latex/contrib/exsheets/README b/macros/latex/contrib/exsheets/README
index d6ca6030ca..d300a96c27 100644
--- a/macros/latex/contrib/exsheets/README
+++ b/macros/latex/contrib/exsheets/README
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-EXSHEETS 2017/02/08 v0.21i
+EXSHEETS 2019/09/27 v0.21j
bundled packages:
the EXSHEETS package
Yet another package for the creation of exercise sheets
@@ -11,7 +11,7 @@ Clemens Niederberger
Web: https://bitbucket.org/cgnieder/exsheets/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2011-2017 Clemens Niederberger
+Copyright 2011-2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/exsheets/exsheets-listings.sty b/macros/latex/contrib/exsheets/exsheets-listings.sty
index 8e77c4aff4..40d20de90c 100644
--- a/macros/latex/contrib/exsheets/exsheets-listings.sty
+++ b/macros/latex/contrib/exsheets/exsheets-listings.sty
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact@mychemistry.eu
% ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -138,7 +138,7 @@
\NewLstQuSolPair{lstquestion}{question}{lstsolution}{solution}
-\tex_endinput:D
+\file_input_stop:
HISTORY
2013/09/18 - first draft, see http://tex.stackexchange.com/a/133969/5049
diff --git a/macros/latex/contrib/exsheets/exsheets.sty b/macros/latex/contrib/exsheets/exsheets.sty
index 73136dadac..b323a8cc4e 100644
--- a/macros/latex/contrib/exsheets/exsheets.sty
+++ b/macros/latex/contrib/exsheets/exsheets.sty
@@ -8,7 +8,7 @@
% Web: http://www.mychemistry.eu/forums/forum/exsheets
% E-Mail: contact@mychemistry.eu
% ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,8 +28,8 @@
\RequirePackage { expl3 , xparse }
\ExplSyntaxOn
-\tl_const:Nn \c_exsheets_date_tl {2017/02/08}
-\tl_const:Nn \c_exsheets_version_tl {0.21i}
+\tl_const:Nn \c_exsheets_date_tl {2019/09/27}
+\tl_const:Nn \c_exsheets_version_tl {0.21j}
\tl_const:Nn \c_exsheets_info_tl
{Yet~ another~ package~ for~ the~ creation~ of~ exercise~ sheets~ and~ exams.}
@@ -118,7 +118,7 @@
}
\msg_new:nnn {exsheets} {loading-configurations}
- { Loading~ custom~ configurations~ file~ `exsheets_configurations.cgf'. }
+ { Loading~ custom~ configurations~ file~ `exsheets_configurations.cfg'. }
\msg_new:nnn {exsheets} {deprecated-command}
{
@@ -2489,9 +2489,9 @@
=
\use:c { l__exsheets_counter_#1_int }
}
- &&
- !\int_compare_p:n
- { \use:c { l__exsheets_counter_#1_int } = 0 }
+ % &&
+ % !\int_compare_p:n
+ % { \use:c { l__exsheets_counter_#1_int } = 0 }
}
{#2}
}
@@ -2752,7 +2752,7 @@
{ \exsheets_write_blank:n {#1} }
{
\bool_if:NTF \l__exsheets_blank_width_bool
- { \__exsheets_blank_skip:N \l__exsheets_blank_dim }
+ { \__exsheets_blank_skip:V \l__exsheets_blank_dim }
{
\__exsheets_blank_skip:n
{ \box_wd:N \l__exsheets_blank_box }
@@ -2760,7 +2760,7 @@
}
}
-\cs_new_protected:Npn \__exsheets_blank_skip:N #1
+\cs_new_protected:Npn \__exsheets_blank_skip:n #1
{
\bool_if:NTF \l__exsheets_blank_width_bool
{ \dim_set:Nn \l__exsheets_tmpa_dim {#1} }
@@ -2791,7 +2791,7 @@
}
{ \exsheets_write_blank:n { \skip_horizontal:N \l__exsheets_tmpa_dim } }
}
-\cs_generate_variant:Nn \__exsheets_blank_skip:N { n }
+\cs_generate_variant:Nn \__exsheets_blank_skip:n { V }
% the following code from Heiko Oberdieck in d.c.t.t served as inspiration
% and basis for the \blank command:
@@ -2965,7 +2965,7 @@
}
}
-\tex_endinput:D
+\file_input_stop:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
HISTORY:
@@ -3224,6 +3224,7 @@ HISTORY:
2016/10/25 v0.21g - smaller steps when creating the blank lines
2016/11/28 v0.21h - bug in \exsheets@used@id fixed
2017/02/08 v0.21i - adapt to l3sort integration into l3kernel
+2019/09/27 v0.21j - fix bug #44
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO:
diff --git a/macros/latex/contrib/exsheets/exsheets_configurations.cfg b/macros/latex/contrib/exsheets/exsheets_configurations.cfg
index e5f7eb0046..9af630de96 100644
--- a/macros/latex/contrib/exsheets/exsheets_configurations.cfg
+++ b/macros/latex/contrib/exsheets/exsheets_configurations.cfg
@@ -5,10 +5,10 @@
%
% ----------------------------------------------------------------------------
% Clemens Niederberger
-% Web: http://www.mychemistry.eu/forums/forum/exsheets
+% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact@mychemistry.eu
% ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/exsheets/exsheets_en.pdf b/macros/latex/contrib/exsheets/exsheets_en.pdf
index 56e3247c0d..33b2e9a4d7 100644
--- a/macros/latex/contrib/exsheets/exsheets_en.pdf
+++ b/macros/latex/contrib/exsheets/exsheets_en.pdf
Binary files differ
diff --git a/macros/latex/contrib/exsheets/exsheets_en.tex b/macros/latex/contrib/exsheets/exsheets_en.tex
index d79c5de063..73c477afb5 100644
--- a/macros/latex/contrib/exsheets/exsheets_en.tex
+++ b/macros/latex/contrib/exsheets/exsheets_en.tex
@@ -10,10 +10,10 @@
%
% --------------------------------------------------------------------------
% Clemens Niederberger
-% Web: http://www.mychemistry.eu/forums/forum/exsheets/
+% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/exsheets/exsheets_headings.cfg b/macros/latex/contrib/exsheets/exsheets_headings.cfg
index 3badcdbbf4..856601f095 100644
--- a/macros/latex/contrib/exsheets/exsheets_headings.cfg
+++ b/macros/latex/contrib/exsheets/exsheets_headings.cfg
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -358,4 +358,4 @@
attach = { main[hc,vc] number[hc,vc] (0pt,0pt) }
}
-\tex_endinput:D
+\file_input_stop:
diff --git a/macros/latex/contrib/exsheets/exsheets_headings.def b/macros/latex/contrib/exsheets/exsheets_headings.def
index e7100ce4d6..a003c96687 100644
--- a/macros/latex/contrib/exsheets/exsheets_headings.def
+++ b/macros/latex/contrib/exsheets/exsheets_headings.def
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -471,4 +471,4 @@
}
}
-\tex_endinput:D
+\file_input_stop: