From ccc34419a1783744295ce86fffaf9138b91d72f7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 28 Sep 2019 21:32:49 +0000 Subject: datatool (28sep19) git-svn-id: svn://tug.org/texlive/trunk@52198 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/datatool/CHANGES | 23 +++++++ Master/texmf-dist/doc/latex/datatool/README | 4 +- .../doc/latex/datatool/datatool-code.pdf | Bin 1188072 -> 1190542 bytes .../doc/latex/datatool/datatool-user.pdf | Bin 641116 -> 642674 bytes .../doc/latex/datatool/datatool-user.tex | 66 +++++++++++++++------ .../doc/latex/datatool/samples/sample-autokeys.pdf | Bin 24911 -> 24923 bytes .../doc/latex/datatool/samples/sample-barchart.pdf | Bin 35054 -> 35069 bytes .../latex/datatool/samples/sample-datatooltk.pdf | Bin 22848 -> 22860 bytes .../doc/latex/datatool/samples/sample-dict.pdf | Bin 122418 -> 122423 bytes .../latex/datatool/samples/sample-europecv-bib.pdf | Bin 89544 -> 89557 bytes .../doc/latex/datatool/samples/sample-gidx.pdf | Bin 179887 -> 180196 bytes .../doc/latex/datatool/samples/sample-glossary.pdf | Bin 104516 -> 104832 bytes .../doc/latex/datatool/samples/sample-index.pdf | Bin 128777 -> 129207 bytes .../doc/latex/datatool/samples/sample-index.tex | 11 ++-- .../latex/datatool/samples/sample-mail-merge.pdf | Bin 21655 -> 21903 bytes .../doc/latex/datatool/samples/sample-piechart.pdf | Bin 33945 -> 33959 bytes .../doc/latex/datatool/samples/sample-sort.pdf | Bin 89703 -> 89718 bytes .../datatool/samples/sample-student-scores.pdf | Bin 34602 -> 34614 bytes .../latex/datatool/samples/sample-two-per-row.pdf | Bin 31739 -> 31751 bytes 19 files changed, 77 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES index 219c569cb24..07cfaa06e69 100644 --- a/Master/texmf-dist/doc/latex/datatool/CHANGES +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README index 7e784650d6c..0e84411bf58 100644 --- a/Master/texmf-dist/doc/latex/datatool/README +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf index 08f7743eb0a..1415318c4b7 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf and b/Master/texmf-dist/doc/latex/datatool/datatool-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf b/Master/texmf-dist/doc/latex/datatool/datatool-user.pdf index 8001340d5e9..ea09d83b8fb 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-user.tex b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex index 08f01e258ff..f60a4f34485 100644 --- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf index 5bde2cc5eb3..ccb2338497c 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-autokeys.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf index 9cdf92def92..edc960eaf02 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-barchart.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf index 9c63274acfd..7eecfaa37e8 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-datatooltk.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf index cd16bc3eac1..10df32852e7 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-dict.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf index 38abdb70441..5256e20b82c 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-europecv-bib.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf index 66217482114..9e490252edb 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-gidx.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf index 59129431dd0..03132211751 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-glossary.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf index 16a363c58ba..d72c814fc8d 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.tex b/Master/texmf-dist/doc/latex/datatool/samples/sample-index.tex index 2a2673d0cc7..ce0973c20d4 100644 --- a/Master/texmf-dist/doc/latex/datatool/samples/sample-index.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf index 3e9fa499211..8aa8160e7e1 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf index 0bce7fb05c1..e4948d91fa1 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-piechart.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf index 18eb0c79b4d..bac8a64e203 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-sort.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf index 9b85095fb12..f462cf430ff 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-student-scores.pdf differ diff --git a/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf index f22fea8cc6c..3b123c90ee1 100644 Binary files a/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf and b/Master/texmf-dist/doc/latex/datatool/samples/sample-two-per-row.pdf differ -- cgit v1.2.3