From 721b1dbe9754ce2f222164010982be4e784f05f3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 18 Nov 2016 23:20:01 +0000 Subject: listofitems (18nov16) git-svn-id: svn://tug.org/texlive/trunk@42530 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/listofitems/listofitems.tex | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/generic/listofitems') diff --git a/Master/texmf-dist/tex/generic/listofitems/listofitems.tex b/Master/texmf-dist/tex/generic/listofitems/listofitems.tex index 558556286eb..726b75efb2e 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.2} % +\def\loiver {1.3} % % % -\def\loidate {2016/10/22} % +\def\loidate {2016/11/18} % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -188,7 +188,7 @@ \def\greadlist{% \let\loi_def\gdef \let\loi_edef\xdef \def\loi_let{\global\let}% \loi_nestcnt1 % niveau initial = 1 - \loi_argcsname\let{loi_previndex[\number\loi_nestcnt]}\empty + \loi_argcsname\loi_let{loi_previndex[\number\loi_nestcnt]}\empty \loi_ifstar{\_removeextremespacestrue\readlist_i}{\_removeextremespacesfalse\readlist_i}% } \def\readlist{% @@ -200,13 +200,13 @@ \long\def\readlist_i#1#2{% #1=macro stockant les \'el\'ements #2=liste des \'el\'ements \loi_ifcs{#2} {\loi_exparg{\readlist_i#1}{#2}} - {\edef\loi_listname{\loi_macroname#1}% - \loi_argcsname\let{\loi_listname nest}\nestdepth - \loi_argcsname\def{\loi_listname[]}{#2}% la liste enti\`ere - \loi_argcsname\def{\loi_listname sep[]}{}% s\'eparateur vide + {\loi_edef\loi_listname{\loi_macroname#1}% + \loi_argcsname\loi_let{\loi_listname nest}\nestdepth + \loi_argcsname\loi_def{\loi_listname[]}{#2}% la liste enti\`ere + \loi_argcsname\loi_def{\loi_listname sep[]}{}% s\'eparateur vide \loi_ifempty{#2} {\loi_def#1[##1]{}% - \loi_argcsname\def{\loi_listname len}{0}\loi_argcsname\loi_def{\loi_listname len[0]}{0}% + \loi_argcsname\loi_def{\loi_listname len}{0}\loi_argcsname\loi_def{\loi_listname len[0]}{0}% \loi_error{Empty list ignored, nothing to do}% } {\loi_edef#1[##1]{\unexpanded{\romannumeral\expandafter\loi_auxmacrolistitem\romannumeral\loi_normalizeindex}{\loi_listname}{##1}{\csname\loi_listname nest\endcsname}{\loi_listname}}% @@ -221,7 +221,7 @@ \romannumeral\loi_ifempty{#1}{\loi_stop}{\loi_stop\loi_error{#1}}% } \def\readlist_ii{% - \loi_argcsname\let\loi_currentsep{loi_listofsep[\number\loi_nestcnt]}% + \loi_argcsname\loi_let\loi_currentsep{loi_listofsep[\number\loi_nestcnt]}% \expandafter\readlist_iii\loi_currentsep||\_nil } \long\def\readlist_iii#1||#2\_nil#3{\readlist_iv1{#3#1}}% #1= #3=liste -> rajoute un \'el\'ement vide pour le test ifempty ci dessous @@ -372,4 +372,7 @@ v1.1 01/09/2016 - bug corrig\'e dans \loi_restorecatcode v1.2 22/10/2016 - - macros \greadlist et \gitemtomacro pour la globalit\'e \ No newline at end of file + - macros \greadlist et \gitemtomacro pour la globalit\'e + +v1.3 18/11/2016 + - bugs corrig\'es dans la gestion de la globalit\'e \ No newline at end of file -- cgit v1.2.3