summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-16 20:26:46 +0000
committerKarl Berry <karl@freefriends.org>2024-05-16 20:26:46 +0000
commit62a64f2876dcb4879126929c9f88e821382571b1 (patch)
tree74d73d88854c21ff53df07039ea34349430e4719 /Master/texmf-dist/doc/latex
parent6199c37d8e725db6c6e97de43900bd49ccd7f54f (diff)
csvsimple (16may24)
git-svn-id: svn://tug.org/texlive/trunk@71274 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex')
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/CHANGES.md12
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty6
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdfbin72044 -> 72044 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdfbin937516 -> 951198 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex53
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdfbin690987 -> 690985 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdfbin295559 -> 295659 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex2
11 files changed, 58 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md b/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
index 768f8f65cb5..3178395f766 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
@@ -17,6 +17,18 @@ and this project adheres to
+## [2.6.1] - 2024-05-16
+
+### Changed
+- Documentation of `csvsim/filter fp`, `csvsim/and filter fp`, `\IfCsvsimFpCompareTF`,
+ and `\IfCsvsimIntCompareTF` clarified (issue #37)
+- Reset `data collection` to `\csvdatacollection` for every csv reader (issue #39)
+
+### Fixed
+- Documentation typos fixed (issue #38)
+
+
+
## [2.6.0] - 2024-01-19
### Added
diff --git a/Master/texmf-dist/doc/latex/csvsimple/README.md b/Master/texmf-dist/doc/latex/csvsimple/README.md
index d3e0860104e..29196c03e9b 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/README.md
+++ b/Master/texmf-dist/doc/latex/csvsimple/README.md
@@ -1,4 +1,4 @@
-# The LaTeX package csvsimple - version 2.6.0 (2024/01/19)
+# The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
> Copyright (c) 2008-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
index 2f507037fb1..c8d933c684d 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
@@ -1,5 +1,5 @@
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.6.0 (2024/01/19)
+%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
%% csvsimple-doc.sty: style file for the documentation
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%%
%% This work consists of all files listed in README.md
%%
-\def\version{2.6.0}%
-\def\datum{2024/01/19}%
+\def\version{2.6.1}%
+\def\datum{2024/05/16}%
\IfFileExists{csvsimple-doc.cfg}{\input{csvsimple-doc.cfg}}{}\providecommand\csvpkgprefix{}
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
index 5485a99c1ed..f85684f6d10 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
index 364596562aa..0baf2183c7b 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.6.0 (2024/01/19)
+%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
%% csvsimple-example.tex: an example for csvsimple
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
index bbef5c75a9b..f17b9183c38 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
index 9fad48644d9..6c70fa30036 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
@@ -1,7 +1,7 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
% !TeX spellcheck=en_US
-%% The LaTeX package csvsimple - version 2.6.0 (2024/01/19)
+%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -214,7 +214,7 @@ way.
An even more comfortable and preferable way to create a table is setting
appropriate option keys. Note, that this gives you the possibility to create a
meta key (called style here) which contains the whole table creation
-using \refCom{csvstyle} or |keys_define:nn| from |l3keys|.
+using \refCom{csvstyle} or |\keys_define:nn| from |l3keys|.
\begin{dispExample}
\csvreader[
@@ -1182,9 +1182,10 @@ The following string compare filters \refKey{csvsim/filter strcmp} and
\end{docCsvKey}
-\begin{docCsvKey}[][doc new and updated={2021-06-25}{2022-10-21}]{filter fp}{=\marg{floating point expression}}{no default}
- Only data lines which fulfill a \LaTeX3 \meta{floating point expression}
- (|l3fp|, \ctanpkg{xfp}) are accepted.
+\enlargethispage*{1cm}
+\begin{docCsvKey}[][doc new and updated={2021-06-25}{2022-10-21}]{filter fp}{=\marg{floating point comparison}}{no default}
+ Only data lines which fulfill a \LaTeX3 \meta{floating point comparison}
+ are accepted. The evaluation is done using \docAuxCommand*{fp_compare_p:n}.
\begin{dispExample}
% \usepackage{booktabs}
\csvreader[
@@ -1316,7 +1317,7 @@ filter options:
\begin{docCsvKeys}[
- doc parameter = {=\marg{floating point expression}},
+ doc parameter = {=\marg{floating point comparison}},
doc description = {style, no default},
doc new = {2022-10-21}
]
@@ -1326,9 +1327,23 @@ filter options:
}
Like \refKey{csvsim/filter fp}, but appended to a required existing
expl3 based filter with \emph{and} (|&&|) resp. \emph{or} (\texttt{\textbar\textbar}).
+\begin{dispExample}
+% \usepackage{booktabs}
+\csvreader[
+ head to column names,
+ tabular = llll,
+ table head = \toprule & \bfseries Name & \bfseries Matr & \bfseries Grade\\\midrule,
+ table foot = \bottomrule,
+ %>> list only matriculation numbers greater than 20000 and grade less than 4.0 <<
+ filter fp = { \matriculation > 20000 },
+ and filter fp = { \grade < 4.0 },
+ ]{grade.csv}{}{%
+ \thecsvrow & \slshape\name, \givenname & \matriculation & \grade
+ }
+\end{dispExample}
\end{docCsvKeys}
-
+\enlargethispage*{1cm}
\begin{docCsvKeys}[
doc parameter = {=\marg{boolean expression}},
doc description = {style, no default},
@@ -2304,14 +2319,18 @@ If set to |false|, the collected data of a CSV file processed with
\refKey{csvsim/collect data} is saved into \refCom{csvdatacollection}.\par
Otherwise, if set to |true|, the collected data is not saved, but directly used
after reading the CSV file, see \refKey{csvsim/generic collected table}.
+After usage, the collected data is cleared, i.e. \refCom{csvdatacollection} is emptied.
\end{docCsvKey}
-\begin{docCsvKey}[][doc new=2021-07-06]{data collection}{=\meta{macro}}{no default, initially \refCom{csvdatacollection}}
+\begin{docCsvKey}[][doc new and updated={2021-07-06}{2024-05-16}]{data collection}{=\meta{macro}}{no default, initially \refCom{csvdatacollection}}
Sets the collection macro to an alternative for \refCom{csvdatacollection}.
\begin{dispListing}
data collection = \myData, % instead of \csvdatacollection
\end{dispListing}
+Note that until version 2.6.0 (2024/01/19), \refKey{csvsim/data collection} was
+not reset to the default \refCom{csvdatacollection} for following CSV files,
+but it is now.
\end{docCsvKey}
@@ -2432,29 +2451,35 @@ for backward compatibility.
\begin{docCommands}[
- doc parameter = \marg{floating point expression}\marg{token list B}\marg{true}\marg{false}
+ doc parameter = \marg{floating point comparison}\marg{true}\marg{false}
]
{
{ doc name = IfCsvsimFpCompareTF, doc new and updated = {2021-06-28}{2023-12-19} },
{ doc name = ifcsvfpcmp, color command=black }
}
- Evaluates the given \meta{floating point expression}
+ Evaluates the given \meta{floating point comparison}
and executes \meta{true} or \meta{false} appropriately.
- The evaluation is done using |\fp_compare:nTF|.
+ The evaluation is done using \docAuxCommand*{fp_compare:nTF}.\\
+ Basically, a \meta{floating point comparison} consists of
+ \mbox{\meta{fp expr\textsubscript{1}} \meta{relation} \meta{fp expr\textsubscript{2}}},
+ like \mbox{$x<y$}, but \docAuxCommand*{fp_compare:nTF} even allows a chain of comparisons.
\refCom{IfCsvsimFpCompareTF} is expandable.
\end{docCommands}
\begin{docCommands}[
- doc parameter = \marg{integer expression}\marg{token list B}\marg{true}\marg{false}
+ doc parameter = \marg{integer comparison}\marg{true}\marg{false}
]
{
{ doc name = IfCsvsimIntCompareTF, doc new and updated = {2021-06-28}{2023-12-19} },
{ doc name = ifcsvintcmp, color command=black }
}
- Evaluates the given \meta{integer expression}
+ Evaluates the given \meta{integer comparison}
and executes \meta{true} or \meta{false} appropriately.
- The evaluation is done using |\int_compare:nTF|.
+ The evaluation is done using \docAuxCommand*{int_compare:nTF}.\\
+ Basically, a \meta{integer comparison} consists of
+ \mbox{\meta{int expr\textsubscript{1}} \meta{relation} \meta{int expr\textsubscript{2}}},
+ like \mbox{$x<y$}, but \docAuxCommand*{int_compare:nTF} even allows a chain of comparisons.
\refCom{IfCsvsimIntCompareTF} is expandable.
\end{docCommands}
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
index 7079052a747..6138c507e32 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
index caa65712ec0..ae40e8563dc 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
@@ -1,6 +1,6 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.6.0 (2024/01/19)
+%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
index 7f4023fd076..8d148b5a6fd 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
index 7d34586a429..73d34f4c34c 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
@@ -1,6 +1,6 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.6.0 (2024/01/19)
+%% The LaTeX package csvsimple - version 2.6.1 (2024/05/16)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------