diff options
author | Karl Berry <karl@freefriends.org> | 2018-12-29 22:49:59 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-12-29 22:49:59 +0000 |
commit | bc7aa0d51e3d33e22443fbc7eda7b5c63d58afbf (patch) | |
tree | d07a739ddf56414fd54ba6d800570afe79e812f0 /Master/texmf-dist/source/generic/gtl | |
parent | 508fb1b0c8bbf30c4327536e3559f42315dc0ab1 (diff) |
gtl (29dec18)
git-svn-id: svn://tug.org/texlive/trunk@49527 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/gtl')
-rw-r--r-- | Master/texmf-dist/source/generic/gtl/gtl.dtx | 58 | ||||
-rw-r--r-- | Master/texmf-dist/source/generic/gtl/gtl.ins | 2 |
2 files changed, 30 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/generic/gtl/gtl.dtx b/Master/texmf-dist/source/generic/gtl/gtl.dtx index 7ead2edc409..2f42e6b5351 100644 --- a/Master/texmf-dist/source/generic/gtl/gtl.dtx +++ b/Master/texmf-dist/source/generic/gtl/gtl.dtx @@ -2,7 +2,7 @@ %% File: gtl.dtx Copyright (C) 2013,2015,2017,2018 Bruno Le Floch %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt @@ -27,9 +27,9 @@ % % \title{The \textsf{gtl} package: \\ % manipulate unbalanced lists of tokens\thanks{This -% file has version number 0.4, last revised 2018/04/04.}} +% file has version number 0.5, last revised 2018/12/28.}} % \author{Bruno Le Floch} -% \date{2018/04/04} +% \date{2018/12/28} % % \maketitle % \tableofcontents @@ -95,7 +95,7 @@ % \cs_new_protected:Npn \__gtldoc_get_fn_aux:nnn #1#2#3 % { % \cs_gset_protected:Npn \__gtldoc_test:w ##1 #1 ##2 #2 { } -% \cs_gset_protected_nopar:Npn \__gtldoc_skip:w ##1 #1 ##2 #2 +% \cs_gset_protected:Npn \__gtldoc_skip:w ##1 #1 ##2 #2 % { % \tl_clear:N \l__gtldoc_arg_tl % \str_clear:N \l__gtldoc_TF_str @@ -163,7 +163,7 @@ % } % \__gtldoc_aux:N % } -% \cs_new_protected_nopar:Npn \__gtldoc_arg:w +% \cs_new_protected:Npn \__gtldoc_arg:w % { \exp_after:wN \__gtldoc_varg:N \c_right_brace_str } % \cs_new_protected:Npn \__gtldoc_varg:N #1 % { \exp_args:No \__gtldoc_varg_aux:n { \token_to_str:N #1 } } @@ -263,7 +263,7 @@ % \use_none_delimit_by_q_recursion_stop:w % } % } -% \cs_new_protected_nopar:Npn \__gtldoc_test_arg:w +% \cs_new_protected:Npn \__gtldoc_test_arg:w % { % \tl_clear:N \l__gtldoc_arg_tl % \exp_args:No \__gtldoc_test_arg_aux:N \c_right_brace_str @@ -303,14 +303,14 @@ % \gtldoc_get_fn:n { gtl.dtx } % \gtldoc_get_tests:n % { -% ../../latextests/testfiles/gtl000.lvt , -% ../../latextests/testfiles/gtl001.lvt , -% ../../latextests/testfiles/gtl002.lvt , -% ../../latextests/testfiles/gtl003.lvt , -% ../../latextests/testfiles/gtl004.lvt , -% ../../latextests/testfiles/gtl005.lvt , -% ../../latextests/testfiles/gtl006.lvt , -% ../../plaintests/testfiles/gtl007.lvt +% ../../testfiles/gtl000.lvt , +% ../../testfiles/gtl001.lvt , +% ../../testfiles/gtl002.lvt , +% ../../testfiles/gtl003.lvt , +% ../../testfiles/gtl004.lvt , +% ../../testfiles/gtl005.lvt , +% ../../testfiles/gtl006.lvt , +% ../../testfiles-plain/gtl007.lvt % } % \group_begin: % \seq_set_eq:NN \l__gtldoc_internal_seq \l__gtldoc_fn_seq @@ -791,7 +791,7 @@ } \@@_tmp:w } - {gtl} {2018/04/04} {0.4} {Manipulate unbalanced lists of tokens} + {gtl} {2018/12/28} {0.5} {Manipulate unbalanced lists of tokens} % \end{macrocode} % % \subsection{Helpers} @@ -800,7 +800,7 @@ \cs_generate_variant:Nn \use:nn { no } % \end{macrocode} % -% \begin{macro}[EXP, int]{\@@_exp_not_n:N} +% \begin{macro}[EXP]{\@@_exp_not_n:N} % Used in one case where we need to prevent expansion of a token % within an |x|-expanding definition. Using \cs{exp_not:N} there % would fail when the argument is a macro parameter character. @@ -809,7 +809,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[EXP, int]{\@@_brace:nn, \@@_brace_swap:nn} +% \begin{macro}[EXP]{\@@_brace:nn, \@@_brace_swap:nn} % Those functions are used to add some tokens, |#1|, to an item |#2| % in an extended token list: \cs{@@_brace:nn} adds tokens on the left, % while \cs{@@_brace_swap:nn} adds them on the right. @@ -824,7 +824,7 @@ % Removes the following \cs{q_nil} \cs{q_mark} without losing any % braces, and places the result into \cs{exp_not:n}. % \begin{macrocode} -\cs_new_nopar:Npn \@@_strip_nil_mark:w +\cs_new:Npn \@@_strip_nil_mark:w { \@@_strip_nil_mark_aux:w \prg_do_nothing: } \cs_new:Npn \@@_strip_nil_mark_aux:w #1 \q_nil \q_mark { \exp_not:o {#1} } @@ -887,12 +887,12 @@ % simply means adding \cs{s_@@} and two empty brace % groups: there are no leading nor trailing chunks. % \begin{macrocode} -\cs_new_protected_nopar:Npn \gtl_set:Nn { \@@_set:NNn \tl_set:Nn } -\cs_new_protected_nopar:Npn \gtl_gset:Nn { \@@_set:NNn \tl_gset:Nn } -\cs_new_protected_nopar:Npn \gtl_const:Nn { \@@_set:NNn \tl_const:Nn } -\cs_new_protected_nopar:Npn \gtl_set:Nx { \@@_set:NNn \tl_set:Nx } -\cs_new_protected_nopar:Npn \gtl_gset:Nx { \@@_set:NNn \tl_gset:Nx } -\cs_new_protected_nopar:Npn \gtl_const:Nx { \@@_set:NNn \tl_const:Nx } +\cs_new_protected:Npn \gtl_set:Nn { \@@_set:NNn \tl_set:Nn } +\cs_new_protected:Npn \gtl_gset:Nn { \@@_set:NNn \tl_gset:Nn } +\cs_new_protected:Npn \gtl_const:Nn { \@@_set:NNn \tl_const:Nn } +\cs_new_protected:Npn \gtl_set:Nx { \@@_set:NNn \tl_set:Nx } +\cs_new_protected:Npn \gtl_gset:Nx { \@@_set:NNn \tl_gset:Nx } +\cs_new_protected:Npn \gtl_const:Nx { \@@_set:NNn \tl_const:Nx } \cs_new_protected:Npn \@@_set:NNn #1#2#3 { #1 #2 { \s_@@ { } {#3} { } } } % \end{macrocode} @@ -1167,9 +1167,9 @@ % throw an error message by sending the undefined variable to % \cs{tl_show:N} or \cs{tl_log:N}. % \begin{macrocode} -\cs_new_protected_nopar:Npn \gtl_show:N +\cs_new_protected:Npn \gtl_show:N { \@@_show:NNN \tl_show:n \tl_show:N } -\cs_new_protected_nopar:Npn \gtl_log:N +\cs_new_protected:Npn \gtl_log:N { \@@_show:NNN \tl_log:n \tl_log:N } \cs_new_protected:Npn \@@_show:NNN #1#2#3 { @@ -1385,7 +1385,7 @@ % % \subsection{First token of an extended token list} % -% \begin{macro}[EXP, int]{\@@_head:wnnnnn} +% \begin{macro}[EXP]{\@@_head:wnnnnn} % \begin{macro}[EXP]{\@@_head_aux:nwnnnn} % \begin{macro}[EXP]{\@@_head_auxii:N, \@@_head_auxiii:Nnn} % This function performs |#4|~if the \texttt{gtl} is empty, |#5|~if it @@ -1801,7 +1801,7 @@ % % \subsection{Counting tokens} % -% \begin{macro}[EXP, int]{\@@_tl_count:n} +% \begin{macro}[EXP]{\@@_tl_count:n} % \begin{macro}[EXP]{\@@_tl_count_loop:n, \@@_tl_count_test:w} % A more robust version of \cs{tl_count:n}, which will however break % if the token list contains \cs{q_stop} at the outer brace level. @@ -1810,7 +1810,7 @@ % \cs{q_mark}, make sure that this is really the end of the list. % \begin{macrocode} \cs_new:Npn \@@_tl_count:n #1 - { \int_eval:n { \c_zero \@@_tl_count_loop:n #1 \q_nil \q_stop } } + { \int_eval:n { 0 \@@_tl_count_loop:n #1 \q_nil \q_stop } } \cs_new:Npn \@@_tl_count_loop:n #1 { \quark_if_nil:nTF {#1} diff --git a/Master/texmf-dist/source/generic/gtl/gtl.ins b/Master/texmf-dist/source/generic/gtl/gtl.ins index 0f77d88503a..82595bd04fe 100644 --- a/Master/texmf-dist/source/generic/gtl/gtl.ins +++ b/Master/texmf-dist/source/generic/gtl/gtl.ins @@ -6,7 +6,7 @@ Do not distribute a modified version of this file. Communicate any suggestions for changing this package -to Bruno Le Floch (blflatex@gmail.com). +to Bruno Le Floch (blflatex+gtl@gmail.com). \endpreamble % stop docstrip adding \endinput |