texlive[51923] Master: listofitems (21aug19)
commits+karl at tug.org
commits+karl at tug.org
Wed Aug 21 22:38:53 CEST 2019
Revision: 51923
http://tug.org/svn/texlive?view=revision&revision=51923
Author: karl
Date: 2019-08-21 22:38:52 +0200 (Wed, 21 Aug 2019)
Log Message:
-----------
listofitems (21aug19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/listofitems/README
trunk/Master/texmf-dist/doc/generic/listofitems/listofitems-en.pdf
trunk/Master/texmf-dist/doc/generic/listofitems/listofitems-fr.pdf
trunk/Master/texmf-dist/tex/generic/listofitems/listofitems.tex
trunk/Master/tlpkg/libexec/ctan2tds
Modified: trunk/Master/texmf-dist/doc/generic/listofitems/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/listofitems/README 2019-08-20 23:53:23 UTC (rev 51922)
+++ trunk/Master/texmf-dist/doc/generic/listofitems/README 2019-08-21 20:38:52 UTC (rev 51923)
@@ -4,9 +4,9 @@
listofitems
package
- v1.62
+ v1.63
- 18/05/2019
+ 21/08/2019
___________________________________
Authors : Christian Tellechea, Steven B. Segletes
Modified: trunk/Master/texmf-dist/doc/generic/listofitems/listofitems-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/listofitems/listofitems-fr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/generic/listofitems/listofitems.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/listofitems/listofitems.tex 2019-08-20 23:53:23 UTC (rev 51922)
+++ trunk/Master/texmf-dist/tex/generic/listofitems/listofitems.tex 2019-08-21 20:38:52 UTC (rev 51923)
@@ -4,13 +4,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\loiname {listofitems} %
-\def\loiver {1.62} %
+\def\loiver {1.63} %
% %
-\def\loidate {2019/05/18} %
+\def\loidate {2019/08/21} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
-% Author : Christian Tellechea, Steven B. Segletes %
+% Author : Christian Tellechea, Steven B. Segletes (contributor) %
% Status : Maintained %
% Maintainer : Christian Tellechea %
% Email : unbonpetit at netc.fr %
@@ -114,9 +114,9 @@
}%
}
\def\loi_ifinrange#1[[#2:#3]]{\expandafter\unless\loi_ifnum{\numexpr(#1-#2)*(#1-#3)>0 }}
-\def\loi_ifstring#1\in#2{% si la chaine #1 est contenue dans #2
+\def\loi_ifstring#1#2{% si la chaine #1 est contenue dans #2
\def\loi_ifstring_a##1#1##2\_nil{\loi_ifempty{##2}\loi_second\loi_first}%
- \loi_ifstring_a#2#1\@nil% appel de la macro auxiliaire
+ \loi_ifstring_a#2#1\_nil% appel de la macro auxiliaire
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -244,8 +244,11 @@
{\def\insidepair_a##1#1##2\_nil{\insidepair_b##2\_nil{#1}}%
\def\insidepair_b##1#2##2\_nil##3{%
\loi_check_pair#1#2\in{##3##1#2}
- {\loi_exparg{\def#4}{\loi_gobarg##3##1}}%
- {\insidepair_b##2\_nil{##3##1#2}}%
+ {\loi_exparg{\def#4}{\loi_gobarg##3##1}%
+ \def\loi_remainafterparen{##2}%
+ }%
+ {\insidepair_b##2\_nil{##3##1#2}%
+ }%
}%
\insidepair_a#3\_nil
}
@@ -283,12 +286,12 @@
\long\def\loi_ifspacefirst#1{\expandafter\loi_ifspacefirst_a\detokenize{#10} \_nil}
\long\def\loi_ifspacefirst_a#1 #2\_nil{\loi_ifempty{#1}}
\loi_expafter{\def\loi_gobspace}\space{}
-\def\loi_removefirstspaces#1{\loi_ifspacefirst{#1}{\loi_exparg\loi_removefirstspaces{\loi_gobspace#1}}{\unexpanded{#1}}}
+\long\def\loi_removefirstspaces#1{\loi_ifspacefirst{#1}{\loi_exparg\loi_removefirstspaces{\loi_gobspace#1}}{\unexpanded{#1}}}%##BUGFIX v1.63
\begingroup
-\catcode0 12
-\long\gdef\loi_removelastspaces#1{\loi_removelastspaces_a#1^^00 ^^00\_nil}
-\long\gdef\loi_removelastspaces_a#1 ^^00{\loi_removelastspaces_b#1^^00}
-\long\gdef\loi_removelastspaces_b#1^^00#2\_nil{\loi_ifspacefirst{#2}{\loi_removelastspaces_a#1^^00 ^^00\_nil}{\unexpanded{#1}}}
+ \catcode0 12
+ \long\gdef\loi_removelastspaces#1{\loi_removelastspaces_a#1^^00 ^^00\_nil}
+ \long\gdef\loi_removelastspaces_a#1 ^^00{\loi_removelastspaces_b#1^^00}
+ \long\gdef\loi_removelastspaces_b#1^^00#2\_nil{\loi_ifspacefirst{#2}{\loi_removelastspaces_a#1^^00 ^^00\_nil}{\unexpanded{#1}}}
\endgroup
\long\def\loi_removeextremespaces#1{\expanded{\loi_exparg\loi_removelastspaces{\expanded{\loi_removefirstspaces{#1}}}}}
@@ -413,7 +416,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\xE9limit\xE9
@@ -425,8 +428,10 @@
{\loi_ifx{\loi_listofpair\empty}% si pas de paires d\xE9finies
{\loi_exparg\readlist_h{\loi_gobarg##1#3}{#3}% raccourcir <liste restante> et <sep courant>:=<sep utile>% ##BUGFIX v1.53
}%
- {\loi_exparg\loi_grabpaired_expr\loi_listofpair{#1}{#3}\loi_grabpaired_result\loi_grabpaired_remain
- \loi_exparg\readlist_h{\loi_grabpaired_result#3}{#3}%
+ {\loi_exparg\loi_grabpaired_expr\loi_listofpair{#1#3}{#3}\loi_grabpaired_result\loi_grabpaired_remain
+ \loi_ifx{\loi_grabpaired_remain\empty}% si liste non raccourcie #BUGFIX 1.63
+ {\loi_exparg\readlist_h{\loi_grabpaired_result}{#2}}% garder le pr\xE9c\xE9dent <sep>
+ {\loi_exparg\readlist_h{\loi_grabpaired_result}{#3}}%
}%
}%
}%
@@ -442,7 +447,7 @@
\loi_ifnum{0\if_ignoreemptyitems1\fi\loi_ifempty{#3}1{}=11 }
{\readlist_g{#1}{#2}% si l'on n'ignore pas les \xE9l\xE9ments vides
}%
- {\loi_argcsname\loi_def{\loi_listname[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#3}% assignation de l'item ctuel \xE0 la macro
+ {\loi_argcsname\loi_def{\loi_listname[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#3}% assignation
\loi_argcsname\loi_def{\loi_listname sep[\csname loi_previndex[\number\loi_nestcnt]\endcsname#1]}{#4}% assignation du <sep> actuel \xE0 la macro \<macrolist>sep
\loi_ifnum{\loi_nestcnt<\nestdepth\relax}% si imbrication max non atteinte
{\advance\loi_nestcnt1
@@ -585,13 +590,17 @@
- possibilit\xE9 d'appariement de tokens dans les items
----------------------------------------------------------------------
v1.61 03/03/2019
- - la macro \loi_ifcs contient une erreur de conception. Il faut
- tester si le token est un sc && s'il est d\xE9veloppable pour
- renvoyer vrai car il existe des sc non d\xE9veloppables && qui ne
- sont _pas_ des primitives.
- Macro rebaptis\xE9e \loi_ifcsexpandable
+ - la macro \loi_ifcs contient une erreur de conception. Il faut
+ tester si le token est un sc && s'il est d\xE9veloppable pour
+ renvoyer vrai car il existe des sc non d\xE9veloppables && qui ne
+ sont _pas_ des primitives.
+ Macro rebaptis\xE9e \loi_ifcsexpandable
----------------------------------------------------------------------
v1.62 18/05/2019
- - utilisation de la nouvelle primitive \expanded au lieu du
- d\xE9sormais obsol\xE8te \romannumeral
- - bug corrig\xE9 dans \loi_ifcsexpandable
\ No newline at end of file
+ - utilisation de la nouvelle primitive \expanded au lieu du
+ d\xE9sormais obsol\xE8te \romannumeral
+ - bug corrig\xE9 dans \loi_ifcsexpandable
+----------------------------------------------------------------------
+v1.63 21/08/2019
+ - bug corrig\xE9 dans \readlist_h avec les tokens appari\xE9s
+ - bug corrig\xE9 \loi_removefirstspaces est d\xE9sormais \long
\ No newline at end of file
Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds 2019-08-20 23:53:23 UTC (rev 51922)
+++ trunk/Master/tlpkg/libexec/ctan2tds 2019-08-21 20:38:52 UTC (rev 51923)
@@ -1347,6 +1347,7 @@
'ytex', "die 'skipping, noinfo license'",
'zapfchan', "die 'skipping, part of urw-base35, frozen'",
'zapfding', "die 'skipping, part of urw-base35, frozen'",
+ 'zblbuild', "die 'skipping, await request, zenity?'",
'zefonts', "die 'skipping, noinfo license'", #&MAKEflatten",
'zhmakeindex', "die 'skipping, go seems too much to ask'",
'zhmcjk', "die 'skipping, sorry, 8000 tfm files, (7feb12)'",
@@ -1854,7 +1855,7 @@
'listbib', 'listbib.tex|' . $standardtex,
'listings', '\.prf|' . $standardtex,
'listings-ext','\.sty', # not .cfg
- 'listofitems', 'listofitems.*.tex|' . $standardtex,
+ 'listofitems', 'listofitems(old)?.tex|' . $standardtex,
'logic', 'milstd\.tex|' . $standardtex,
'lollipop', '\.ini|lollipop\.tex|lollipop-.*tex|lollipop.tex',
'ltxkeys', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$', # not cfg
More information about the tex-live-commits
mailing list