From 628eea3f8781ad62db9ab791bf8dc7887cb3c682 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Mar 2024 20:06:19 +0000 Subject: listofitems (10mar24) git-svn-id: svn://tug.org/texlive/trunk@70556 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/listofitems/README | 4 ++-- .../doc/generic/listofitems/listofitems-en.pdf | Bin 165367 -> 166455 bytes .../doc/generic/listofitems/listofitems-fr.pdf | Bin 165788 -> 166182 bytes .../listofitems/test/listofitems-test-latex.pdf | Bin 22162 -> 22162 bytes .../listofitems/test/listofitems-test-tex.pdf | Bin 70779 -> 70779 bytes .../tex/generic/listofitems/listofitems.tex | 21 +++++++++++++-------- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Master/texmf-dist/doc/generic/listofitems/README b/Master/texmf-dist/doc/generic/listofitems/README index 8fb8ec787b8..b3a9c3fbaf7 100644 --- a/Master/texmf-dist/doc/generic/listofitems/README +++ b/Master/texmf-dist/doc/generic/listofitems/README @@ -4,9 +4,9 @@ ___________________________________ listofitems package - v1.64 + v1.65 - 10/02/2024 + 09/03/2024 ___________________________________ Maintainer : Christian Tellechea diff --git a/Master/texmf-dist/doc/generic/listofitems/listofitems-en.pdf b/Master/texmf-dist/doc/generic/listofitems/listofitems-en.pdf index cbb6fd89eda..2d657e0ca36 100644 Binary files a/Master/texmf-dist/doc/generic/listofitems/listofitems-en.pdf and b/Master/texmf-dist/doc/generic/listofitems/listofitems-en.pdf differ diff --git a/Master/texmf-dist/doc/generic/listofitems/listofitems-fr.pdf b/Master/texmf-dist/doc/generic/listofitems/listofitems-fr.pdf index eb10a5e933c..447ab413a96 100644 Binary files a/Master/texmf-dist/doc/generic/listofitems/listofitems-fr.pdf and b/Master/texmf-dist/doc/generic/listofitems/listofitems-fr.pdf differ diff --git a/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-latex.pdf b/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-latex.pdf index 34fe82b0260..38abee21f88 100644 Binary files a/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-latex.pdf and b/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-latex.pdf differ diff --git a/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-tex.pdf b/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-tex.pdf index 0fa54394a12..0409eb6bba6 100644 Binary files a/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-tex.pdf and b/Master/texmf-dist/doc/generic/listofitems/test/listofitems-test-tex.pdf differ diff --git a/Master/texmf-dist/tex/generic/listofitems/listofitems.tex b/Master/texmf-dist/tex/generic/listofitems/listofitems.tex index 419bb233bfa..13008a3f75b 100644 --- a/Master/texmf-dist/tex/generic/listofitems/listofitems.tex +++ b/Master/texmf-dist/tex/generic/listofitems/listofitems.tex @@ -3,9 +3,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \def\loiname {listofitems} % -\def\loiver {1.64} % +\def\loiver {1.65} % % % -\def\loidate {2024/02/10} % +\def\loidate {2024/03/09} % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -95,7 +95,8 @@ } {% }% - \string} + \string +} \def\loi_argcsname#1#{\loi_argcsname_a{#1}} \def\loi_argcsname_a#1#2{\loi_expafter{#1}{\csname#2\endcsname}} \long\def\loi_addtomacro#1#2{\loi_exparg{\def#1}{#1#2}} @@ -263,7 +264,7 @@ }% }% } -\long\def\loi_count_occur#1\in#2:#3{% compte le nombre d'occurrences de #1 dans #2 et met le résultat dans la macro #3 +\long\def\loi_count_occur#1\in#2\_nil#3{% compte le nombre d'occurrences de #1 dans #2 et met le résultat dans la macro #3 ##BUGFIX v1.65 \long\def\loi_count_occur_a##1##2#1##3\_nil{% \loi_ifempty{##3} {% @@ -281,8 +282,8 @@ \loi_second } {% - \loi_count_occur#1\in#3:\loi_tempa - \loi_count_occur#2\in#3:\loi_tempb + \loi_count_occur#1\in#3\_nil\loi_tempa + \loi_count_occur#2\in#3\_nil\loi_tempb \loi_ifnum{\loi_tempa=\loi_tempb\relax}% }% } @@ -601,7 +602,7 @@ {% \long\def\readlist_i##1\_nil##2{% \loi_exparg{\loi_exparg\loi_grabpaired_expr\loi_listofpair}{\loi_gobarg##1}{#2}\loi_grabpaired_result\loi_grabpaired_remain - \loi_exparg{\loi_exparg{\readlist_j{##2}}{\loi_grabpaired_remain}}{\loi_grabpaired_result}{#2}}%{#} + \loi_exparg{\loi_exparg{\readlist_j{##2}}{\loi_grabpaired_remain}}{\loi_grabpaired_result}{#2}}% }% }% \readlist_i\relax% le \relax meuble l'argument délimité @@ -877,4 +878,8 @@ v1.64 10/02/2024 \listlen) - la primitive \expanded est désormais obligatoire - code source UFT8, manuel compilé avec luaLaTeX - - code plus lisiblement formaté \ No newline at end of file + - code plus lisiblement formaté + ---------------------------------------------------------------------- +v1.65 09/03/2024 + - bug corrigé dans la définition de \loi_count_occur, l'argument ne + doit _pas_ être délimité par ":" \ No newline at end of file -- cgit v1.2.3