From d716afa974239e84535924a3485ace7d2f979bb1 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Fri, 30 Jul 2021 20:14:14 +0000
Subject: macrolist (30jul21)

git-svn-id: svn://tug.org/texlive/trunk@60117 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/macrolist/macrolist.sty   | 68 +++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/macrolist/macrolist.sty')

diff --git a/Master/texmf-dist/tex/latex/macrolist/macrolist.sty b/Master/texmf-dist/tex/latex/macrolist/macrolist.sty
index 1fd3fe0f32d..6d7dd6f5b4a 100644
--- a/Master/texmf-dist/tex/latex/macrolist/macrolist.sty
+++ b/Master/texmf-dist/tex/latex/macrolist/macrolist.sty
@@ -15,11 +15,11 @@
 %% version 2005/12/01 or later.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{macrolist}[2021/07/25 v1.2.1 Create lists of macros and perform operations on them]
+\ProvidesPackage{macrolist}[2021/07/29 v2.0.0 Create lists of macros and perform operations on them]
 
 \RequirePackage{pgffor}
 
-\newcommand{\newlist}[1]{
+\newcommand{\macronewlist}[1]{
     \ifcsname c@macrolist@list@#1\endcsname
         \PackageError{macrolist}{The list '#1' is already defined}{}
     \else
@@ -27,17 +27,17 @@
         \setcounter{macrolist@list@#1}{0}
     \fi
 }
-\newcommand{\listexists}[3]{\ifcsname c@macrolist@list@#1\endcsname#2\else#3\fi}
-\newcommand{\listelement}[2]{%
+\newcommand{\macrolistexists}[3]{\ifcsname c@macrolist@list@#1\endcsname#2\else#3\fi}
+\newcommand{\macrolistelement}[2]{%
     \macrolist@inbounds{#1}{#2}%
     \csname macrolist@list@#1\the\numexpr #2\relax\endcsname%
 }
-\newcommand{\listindexof}[2]{%
+\newcommand{\macrolistindexof}[2]{%
     \def\macrolist@listindex{0}%
     \macrolist@exists{#1}%
-    \ifnum\listsize{#1}>0\relax
+    \ifnum\macrolistsize{#1}>0\relax
         \def\macrolist@el{#2}%
-        \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{%
+        \macrolistforeach{#1}{\macrolist@listindexel}[\macrolistsize{#1}][1]{%
             \ifx\macrolist@el\macrolist@listindexel
                 \xdef\macrolist@listindex{\macrolist@index}%
             \fi
@@ -46,12 +46,12 @@
     \macrolist@listindex%
     \let\macrolist@listindex\relax%
 }
-\newcommand{\listcontains}[4]{%
+\newcommand{\macrolistcontains}[4]{%
     \def\macrolist@listindex{0}%
     \macrolist@exists{#1}%
-    \ifnum\listsize{#1}>0\relax
+    \ifnum\macrolistsize{#1}>0\relax
         \def\macrolist@el{#2}%
-        \listforeach{#1}{\macrolist@listindexel}[\listsize{#1}][1]{%
+        \macrolistforeach{#1}{\macrolist@listindexel}[\macrolistsize{#1}][1]{%
             \ifx\macrolist@el\macrolist@listindexel
                 \xdef\macrolist@listindex{\macrolist@index}%
             \fi
@@ -63,66 +63,66 @@
         #4%
     \fi
 }
-\newcommand{\listadd}[1]{
+\newcommand{\macrolistadd}[1]{
     \macrolist@exists{#1}
     \def\macrolist@currlist{#1}
     \macrolist@listadd
 }
-%% We write \listadd this way such that the optional argument will be positioned correctly
+%% We write \macrolistadd this way such that the optional argument will be positioned correctly
 \newcommand{\macrolist@listadd}[2][]{
     \stepcounter{macrolist@list@\macrolist@currlist}
 
     \if\relax\detokenize{#1}\relax
-        \expandafter\gdef\csname macrolist@list@\macrolist@currlist\listsize{\macrolist@currlist}\endcsname{#2}
+        \expandafter\gdef\csname macrolist@list@\macrolist@currlist\macrolistsize{\macrolist@currlist}\endcsname{#2}
     \else
         \expandafter\ifnum\csname themacrolist@list@\macrolist@currlist\endcsname=#1
-            \expandafter\gdef\csname macrolist@list@\macrolist@currlist\listsize{\macrolist@currlist}\endcsname{#2}
+            \expandafter\gdef\csname macrolist@list@\macrolist@currlist\macrolistsize{\macrolist@currlist}\endcsname{#2}
         \else
             \macrolist@inbounds{\macrolist@currlist}{#1}
-            \foreach \macrolist@index in {\listsize{\macrolist@currlist}, ...,\the\numexpr #1+1\relax} {
+            \foreach \macrolist@index in {\macrolistsize{\macrolist@currlist}, ...,\the\numexpr #1+1\relax} {
                 \global\expandafter\let\csname macrolist@list@\macrolist@currlist\macrolist@index\expandafter\endcsname\csname macrolist@list@\macrolist@currlist\the\numexpr\macrolist@index-1\relax\endcsname
             }
             \expandafter\gdef\csname macrolist@list@\macrolist@currlist#1\endcsname{#2}
         \fi
     \fi
 }
-\newcommand{\listremove}[2]{
+\newcommand{\macrolistremove}[2]{
     \macrolist@inbounds{#1}{#2}
 
-    \ifnum\numexpr#2\relax=\listsize{#1}
+    \ifnum\numexpr#2\relax=\macrolistsize{#1}
     \else
-        \foreach \macrolist@index in {#2, ..., \the\numexpr\listsize{#1}-1\relax} {
+        \foreach \macrolist@index in {#2, ..., \the\numexpr\macrolistsize{#1}-1\relax} {
             \global\expandafter\let\csname macrolist@list@#1\macrolist@index\expandafter\endcsname\csname macrolist@list@#1\the\numexpr\macrolist@index+1\endcsname
         }
     \fi
 
-    \global\expandafter\let\csname macrolist@list@#1\listsize{#1}\endcsname\relax
+    \global\expandafter\let\csname macrolist@list@#1\macrolistsize{#1}\endcsname\relax
     \addtocounter{macrolist@list@#1}{-1}
 }
-\newcommand{\listremovelast}[1]{
+\newcommand{\macrolistremovelast}[1]{
     \macrolist@exists{#1}
-    \global\expandafter\let\csname macrolist@list@#1\listsize{#1}\endcsname\relax
+    \global\expandafter\let\csname macrolist@list@#1\macrolistsize{#1}\endcsname\relax
     \addtocounter{macrolist@list@#1}{-1}
 }
-\newcommand{\listclear}[2]{
+\newcommand{\macrolistclear}[2]{
     \macrolist@inbounds{#1}{#2}
 
-    \foreach \macrolist@index in {1, ..., \listsize{#1}} {
+    \foreach \macrolist@index in {1, ..., \macrolistsize{#1}} {
         \global\expandafter\let\csname \macrolist@list@#1\macrolist@index\endcsname\relax
     }
 
     \setcounter{macrolist@list@#1}{0}
 }
-\newcommand*{\listsize}[1]{%
+\newcommand*{\macrolistsize}[1]{%
     \macrolist@exists{#1}%
     \csname themacrolist@list@#1\endcsname
 }
-\newcommand{\listforeach}[2]
+\newcommand{\macrolistforeach}[2]
 {%
     \def\macrolist@foreachstart{0}% Reset
     % This is used to make optional arguments line up correctly
     \def\macrolist@start{1}%
-    \def\macrolist@end{\listsize{#1}}%
+    \def\macrolist@end{\macrolistsize{#1}}%
     \def\macrolist@listname{#1}%
     \def\macrolist@element{#2}%
     \macrolist@listforeachi
@@ -150,10 +150,10 @@
 
 \newcommand{\macrolist@listforeachaction}[1]{%
     \macrolist@exists{\macrolist@listname}%
-    \ifnum\numexpr\macrolist@start\relax>\listsize{\macrolist@listname}%
+    \ifnum\numexpr\macrolist@start\relax>\macrolistsize{\macrolist@listname}%
         \PackageError{macrolist}{The starting index of the loop is out of the bounds of list '\macrolist@listname'}{}
     \fi
-    \ifnum\numexpr\macrolist@end\relax>\listsize{\macrolist@listname}
+    \ifnum\numexpr\macrolist@end\relax>\macrolistsize{\macrolist@listname}
         \PackageError{macrolist}{The ending index of the loop is out of the bounds of list '\macrolist@listname'}{}
     \fi
     \foreach \macrolist@index in {\the\numexpr\macrolist@start\relax, ..., \the\numexpr\macrolist@end\relax} {%
@@ -161,12 +161,12 @@
         #1%
     }%
 }
-\newcommand{\listjoin}[2]{%
-    \ifnum\listsize{#1}>1
-        \listforeach{#1}{\macrolist@joinelement}[1][\listsize{#1}-1]{\macrolist@joinelement#2}%
+\newcommand{\macrolistjoin}[2]{%
+    \ifnum\macrolistsize{#1}>1
+        \macrolistforeach{#1}{\macrolist@joinelement}[1][\macrolistsize{#1}-1]{\macrolist@joinelement#2}%
     \fi
-    \ifnum\listsize{#1}>0
-        \listelement{#1}{\listsize{#1}}%
+    \ifnum\macrolistsize{#1}>0
+        \macrolistelement{#1}{\macrolistsize{#1}}%
     \fi
 }
 %% List: Some text
@@ -193,7 +193,7 @@
         }{Pass in a number to the second argument of your command.}
     \fi
     %
-    \ifnum\numexpr#2 \relax>\listsize{#1}
+    \ifnum\numexpr#2 \relax>\macrolistsize{#1}
         \PackageError{macrolist}
         {Index out of bounds}
         {The number you have passed in to the second argument of your command\MessageBreak
-- 
cgit v1.2.3

