From 20c23ef020fe9c84c498fda3807e85403256f199 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Jul 2021 20:30:56 +0000 Subject: macrolist (26jul21) git-svn-id: svn://tug.org/texlive/trunk@60081 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/macrolist/README.md | 2 +- .../texmf-dist/doc/latex/macrolist/macrolist.pdf | Bin 192607 -> 192674 bytes .../source/latex/macrolist/macrolist.dtx | 31 ++++++++++++--------- .../texmf-dist/tex/latex/macrolist/macrolist.sty | 30 +++++++++++--------- 4 files changed, 36 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/macrolist/README.md b/Master/texmf-dist/doc/latex/macrolist/README.md index ea16d986ea2..01a19cad01d 100644 --- a/Master/texmf-dist/doc/latex/macrolist/README.md +++ b/Master/texmf-dist/doc/latex/macrolist/README.md @@ -1,4 +1,4 @@ -# The LaTeX package macrolist - version 1.2.0 (2021/07/23) +# The LaTeX package macrolist - version 1.2.1 (2021/07/25) > Copyright (C) 2021 Dennis Chen > diff --git a/Master/texmf-dist/doc/latex/macrolist/macrolist.pdf b/Master/texmf-dist/doc/latex/macrolist/macrolist.pdf index 2ee450e2bca..204fa35c1c5 100644 Binary files a/Master/texmf-dist/doc/latex/macrolist/macrolist.pdf and b/Master/texmf-dist/doc/latex/macrolist/macrolist.pdf differ diff --git a/Master/texmf-dist/source/latex/macrolist/macrolist.dtx b/Master/texmf-dist/source/latex/macrolist/macrolist.dtx index 382faf2930e..59d3041f3f3 100644 --- a/Master/texmf-dist/source/latex/macrolist/macrolist.dtx +++ b/Master/texmf-dist/source/latex/macrolist/macrolist.dtx @@ -16,7 +16,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{macrolist}[2021/07/23 v1.2.0 Create lists of macros and perform operations on them] +\ProvidesPackage{macrolist}[2021/07/25 v1.2.1 Create lists of macros and perform operations on them] \RequirePackage{pgffor} % @@ -94,6 +94,7 @@ \csname macrolist@list@#1\the\numexpr #2\relax\endcsname% } % \fi +% \changes{v1.2.1}{2021/07/25}{Fix behavior of listindexof and listcontains for empty lists} % \changes{v1.2.0}{2021/07/23}{Add listindexof and listcontains} % \DescribeMacro{\listindexof} % @@ -106,12 +107,14 @@ \newcommand{\listindexof}[2]{% \def\macrolist@listindex{0}% \macrolist@exists{#1}% - \def\macrolist@el{#2}% - \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% - \ifx\macrolist@el\macrolist@listindexel - \xdef\macrolist@listindex{\macrolist@index}% - \fi - }% + \ifnum\listsize{#1}>0\relax + \def\macrolist@el{#2}% + \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% + \ifx\macrolist@el\macrolist@listindexel + \xdef\macrolist@listindex{\macrolist@index}% + \fi + }% + \fi \macrolist@listindex% \let\macrolist@listindex\relax% } @@ -125,12 +128,14 @@ \newcommand{\listcontains}[4]{% \def\macrolist@listindex{0}% \macrolist@exists{#1}% - \def\macrolist@el{#2}% - \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% - \ifx\macrolist@el\macrolist@listindexel - \xdef\macrolist@listindex{\macrolist@index}% - \fi - }% + \ifnum\listsize{#1}>0\relax + \def\macrolist@el{#2}% + \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% + \ifx\macrolist@el\macrolist@listindexel + \xdef\macrolist@listindex{\macrolist@index}% + \fi + }% + \fi \ifnum\macrolist@listindex>0\relax #3% \else diff --git a/Master/texmf-dist/tex/latex/macrolist/macrolist.sty b/Master/texmf-dist/tex/latex/macrolist/macrolist.sty index 36397cc9175..1fd3fe0f32d 100644 --- a/Master/texmf-dist/tex/latex/macrolist/macrolist.sty +++ b/Master/texmf-dist/tex/latex/macrolist/macrolist.sty @@ -15,7 +15,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{macrolist}[2021/07/23 v1.2.0 Create lists of macros and perform operations on them] +\ProvidesPackage{macrolist}[2021/07/25 v1.2.1 Create lists of macros and perform operations on them] \RequirePackage{pgffor} @@ -35,24 +35,28 @@ \newcommand{\listindexof}[2]{% \def\macrolist@listindex{0}% \macrolist@exists{#1}% - \def\macrolist@el{#2}% - \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% - \ifx\macrolist@el\macrolist@listindexel - \xdef\macrolist@listindex{\macrolist@index}% - \fi - }% + \ifnum\listsize{#1}>0\relax + \def\macrolist@el{#2}% + \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% + \ifx\macrolist@el\macrolist@listindexel + \xdef\macrolist@listindex{\macrolist@index}% + \fi + }% + \fi \macrolist@listindex% \let\macrolist@listindex\relax% } \newcommand{\listcontains}[4]{% \def\macrolist@listindex{0}% \macrolist@exists{#1}% - \def\macrolist@el{#2}% - \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% - \ifx\macrolist@el\macrolist@listindexel - \xdef\macrolist@listindex{\macrolist@index}% - \fi - }% + \ifnum\listsize{#1}>0\relax + \def\macrolist@el{#2}% + \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{% + \ifx\macrolist@el\macrolist@listindexel + \xdef\macrolist@listindex{\macrolist@index}% + \fi + }% + \fi \ifnum\macrolist@listindex>0\relax #3% \else -- cgit v1.2.3