texlive[71274] Master/texmf-dist: csvsimple (16may24)

commits+karl at tug.org commits+karl at tug.org
Thu May 16 22:26:46 CEST 2024


Revision: 71274
          https://tug.org/svn/texlive?view=revision&revision=71274
Author:   karl
Date:     2024-05-16 22:26:46 +0200 (Thu, 16 May 2024)
Log Message:
-----------
csvsimple (16may24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
    trunk/Master/texmf-dist/doc/latex/csvsimple/README.md
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
    trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
    trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
    trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
    trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md	2024-05-16 20:26:46 UTC (rev 71274)
@@ -17,6 +17,18 @@
 
 
 
+## [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

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csvsimple/README.md	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/doc/latex/csvsimple/README.md	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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>

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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{}
 

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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
 %%
 %% -------------------------------------------------------------------------------------------

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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 @@
 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 @@
 \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 @@
 
 
 \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 @@
   }
   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 @@
 \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 @@
 
 
 \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}
 

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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
 %%
 %% -------------------------------------------------------------------------------------------

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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
 %%
 %% -------------------------------------------------------------------------------------------

Modified: trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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-l3.sty: Simple LaTeX CSV file processing (LaTeX3)
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README.md
 %%
 \NeedsTeXFormat{LaTeX2e}[2023-11-01]
-\ProvidesExplPackage{csvsimple-l3}{2024/01/19}{2.6.0}
+\ProvidesExplPackage{csvsimple-l3}{2024/05/16}{2.6.1}
   {LaTeX3 CSV file processing}
 
 
@@ -1037,13 +1037,6 @@
   }
 
 
-\keys_set:nn { csvsim }
-  {
-    data~collection = \csvdatacollection,
-  }
-
-
-
 %---- catcodes
 
 \cs_new_protected_nopar:Npn \__csvsim_setup_catcode_list:
@@ -1606,6 +1599,7 @@
         check~column~count,
         head~to~column~names~prefix = ,
         head~to~column~names        = false,
+        data~collection             = \csvdatacollection,
         collect~data                = false,
         consume~collected~data      = false,
         column~count                = 0,

Modified: trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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-legacy.sty: Simple LaTeX CSV file processing (LaTeX2e)
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README.md
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csvsimple-legacy}[2024/01/19 version 2.6.0 LaTeX2e CSV file processing]
+\ProvidesPackage{csvsimple-legacy}[2024/05/16 version 2.6.1 LaTeX2e CSV file processing]
 
 
 %---- check package

Modified: trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty	2024-05-15 23:41:48 UTC (rev 71273)
+++ trunk/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty	2024-05-16 20:26:46 UTC (rev 71274)
@@ -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.sty: Simple LaTeX CSV file processing
 %%
 %% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
 %% This work consists of all files listed in README.md
 %%
 \NeedsTeXFormat{LaTeX2e}[2022-06-01]
-\ProvidesExplPackage{csvsimple}{2024/01/19}{2.6.0}
+\ProvidesExplPackage{csvsimple}{2024/05/16}{2.6.1}
   {LaTeX CSV file processing}
 
 \cs_if_exist:NT \c__csvsim_package_expl_bool



More information about the tex-live-commits mailing list.