From e8a6c5f6d758797dbff323e9d5e9012da75628d3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 21 Jul 2016 21:17:50 +0000 Subject: datatool (21jul16) git-svn-id: svn://tug.org/texlive/trunk@41744 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/datatool/CHANGES | 16 ++++++ Master/texmf-dist/doc/latex/datatool/README | 4 +- .../doc/latex/datatool/datatool-code.pdf | Bin 1166199 -> 1170895 bytes .../doc/latex/datatool/datatool-user.pdf | Bin 614504 -> 613586 bytes .../doc/latex/datatool/datatool-user.tex | 57 +++++++++++++++------ .../doc/latex/datatool/samples/sample-autokeys.pdf | Bin 24911 -> 24923 bytes .../doc/latex/datatool/samples/sample-barchart.pdf | Bin 35056 -> 35068 bytes .../latex/datatool/samples/sample-datatooltk.pdf | Bin 22848 -> 22860 bytes .../doc/latex/datatool/samples/sample-dict.pdf | Bin 122578 -> 122588 bytes .../latex/datatool/samples/sample-europecv-bib.pdf | Bin 89544 -> 89557 bytes .../doc/latex/datatool/samples/sample-gidx.pdf | Bin 180112 -> 179545 bytes .../doc/latex/datatool/samples/sample-glossary.pdf | Bin 104765 -> 104200 bytes .../doc/latex/datatool/samples/sample-index.pdf | Bin 128764 -> 128779 bytes .../latex/datatool/samples/sample-mail-merge.pdf | Bin 21635 -> 21618 bytes .../doc/latex/datatool/samples/sample-piechart.pdf | Bin 33954 -> 33957 bytes .../doc/latex/datatool/samples/sample-sort.pdf | Bin 89713 -> 89724 bytes .../datatool/samples/sample-student-scores.pdf | Bin 34602 -> 34614 bytes .../latex/datatool/samples/sample-two-per-row.pdf | Bin 31739 -> 31751 bytes 18 files changed, 60 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/doc/latex/datatool') diff --git a/Master/texmf-dist/doc/latex/datatool/CHANGES b/Master/texmf-dist/doc/latex/datatool/CHANGES index 62d514e10de..04a54a35c0e 100644 --- a/Master/texmf-dist/doc/latex/datatool/CHANGES +++ b/Master/texmf-dist/doc/latex/datatool/CHANGES @@ -1,3 +1,19 @@ +v2.26: + + * datatool-base: + + - fixed bug in \dtl@insertinto + + * datatool-pgfmath: + + - fixed bug in \dtlround and \dtltrunc + + * datapie: + + - fixed bug in \DTLpiechart caused by truncation error + + - \FP... code replaced by \dtl... code + v2.25: * datatool-base: diff --git a/Master/texmf-dist/doc/latex/datatool/README b/Master/texmf-dist/doc/latex/datatool/README index cf0a98f620c..6bacaf67ec8 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.25 +LaTeX Bundle : datatool v2.26 -Last Modified : 2016-01-18 +Last Modified : 2016-07-20 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 c963f7d3914..23dcc06d45e 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 0f107ea3220..333429d92cd 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 a1bc741c631..140fe1f1282 100644 --- a/Master/texmf-dist/doc/latex/datatool/datatool-user.tex +++ b/Master/texmf-dist/doc/latex/datatool/datatool-user.tex @@ -1,5 +1,7 @@ \documentclass[report,widecs]{nlctdoc} +\DeleteShortVerb{\|} + \usepackage[T1]{fontenc} \usepackage[utf8]{inputenc} \usepackage{ifthen} @@ -46,6 +48,8 @@ \dbs\index{\string\\\actualchar\dbs\encapchar usage}% } +\setlength\marginparwidth{70pt} + %bibliography database \DTLnewdb{docbib} @@ -97,13 +101,12 @@ \setlength{\parindent}{1em}% \MakeShortVerb{"} -\DeleteShortVerb{\|} - \title{User Manual for datatool bundle version~2.25} + \title{User Manual for datatool bundle version~2.26} \author{Nicola L.C. Talbot\\ \url{http://www.dickimaw-books.com/}} - \date{2016-01-18} + \date{2016-07-20} \maketitle \pagenumbering{roman} @@ -118,7 +121,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.25} + read \qt{Documented Code for datatool v2.26} \item[INSTALL] Installation instructions. @@ -2193,7 +2196,8 @@ Second paragraph.} \end{verbatim} \begin{definition}[\DescribeMacro{\DTLaddentryforrow}]% -\cs{DTLaddentryforrow}\marg{db}\marg{assign list}\marg{condition}\marg{key}\marg{value} +\cs{DTLaddentryforrow}\marg{db}\marg{assign list}% +\marg{condition}\marg{key}\allowbreak\marg{value} \end{definition} This adds the entry with the key given by \meta{key} and value given by \meta{value} to the first row in the database @@ -2682,10 +2686,22 @@ provides an example. \end{important} In addition to the \cs{dtl}\meta{type}"align" commands above, you -can also modify the \env{tabular} column styles by redefining -\DescribeMacro{\dtlbeforecols}\cs{dtlbeforecols}, -\DescribeMacro{\dtlbetweencols}\cs{dtlbetweencols} and -\DescribeMacro{\dtlaftercols}\cs{dtlaftercols}. For example, to +can also modify the \env{tabular} column styles by redefining the +following three commands: +\begin{definition}[\DescribeMacro{\dtlbeforecols}] +\cs{dtlbeforecols} +\end{definition} +(before the first column) +\begin{definition}[\DescribeMacro{\dtlbetweencols}] +\cs{dtlbetweencols} +\end{definition} +(between each column) and +\begin{definition}[\DescribeMacro{\dtlaftercols}] +\cs{dtlaftercols} +\end{definition} +(after the last column). + +For example, to place a vertical line before the start of the first column and after the last column, do: \begin{verbatim} @@ -4039,6 +4055,8 @@ produces:\par\vskip\baselineskip\noindent \\\firstname & \surname & \emailI & \DTLifnull{\emailII}{}{\emailII} & \DTLifnull{\regnum}{}{\regnum}}\relax \end{tabular} +\medskip + Now the missing entries are simply blank instead of containing \emph{Missing}. This is because they're empty not null. In this case, you may prefer to use \cs{DTLifnullorempty} instead of @@ -4177,11 +4195,17 @@ a table: \bfseries Assign 2 & \bfseries Assign 3 & \bfseries Average Mark% -\DTLforeach{marks}{\surname=Surname,\firstname=FirstName,\average -=Average,\assignI=Assignment 1,\assignII=Assignment 2,\assignIII -=Assignment 3}{\\\surname -& \firstname & \assignI & \assignII & \assignIII & -\DTLround{\average}{\average}{2}\DTLclip{\average}\average}\relax +\DTLforeach{marks}% +{% assign variable + \surname=Surname,\firstname=FirstName,% + \average=Average,\assignI=Assignment 1,% + \assignII=Assignment 2,\assignIII=Assignment 3}% +{% start new row + \\\surname & \firstname & \assignI & \assignII & \assignIII & + \DTLround{\average}{\average}{2}% round to 2 dp + \DTLclip{\average}{average}%clip unnecessary 0s + \average +}\relax \end{tabular} \end{table} \end{verbatim} @@ -4208,7 +4232,7 @@ marks}\label{tab:meanmarks} =Average,\assignI=Assignment 1,\assignII=Assignment 2,\assignIII =Assignment 3}{\\\surname & \firstname & \assignI & \assignII & \assignIII & -\DTLround{\average}{\average}{2}\DTLclip{\average}\average}\relax +\DTLround{\average}{\average}{2}\DTLclip{\average}{\average}\average}\relax \end{tabular} \end{table} @@ -11059,6 +11083,9 @@ efficient way of storing the information in databases which has significantly improved the time it takes to \LaTeX\ documents containing large databases. +\clearpage +\phantomsection +\addcontentsline{toc}{chapter}{\indexname} \PrintIndex \end{document} 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 c70a2191333..d9f777bafbd 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 6f63f265704..85179d1124e 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 8136c89a988..adff6e25539 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 4733aadcc99..538a773ff66 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 d9dcf7af68d..87b21abc0f0 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 41ced44b248..0e6b95463da 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 1363763115f..06296653448 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 e6904d7064c..2d5038a0451 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-mail-merge.pdf b/Master/texmf-dist/doc/latex/datatool/samples/sample-mail-merge.pdf index 6a62cb9d4e1..7a68eae9c54 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 c7745fbda38..50ffa2b949b 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 f3ddb731633..6fbc9418403 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 9388c14b910..773f0373444 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 5a88b830118..2490cf7f781 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