diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3prg.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3prg.dtx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx index 08cd5acc89d..abe03c06261 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: l3prg.dtx Copyright (C) 2005-2015 The LaTeX3 Project +%% File: l3prg.dtx Copyright (C) 2005-2016 The LaTeX3 Project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -37,7 +37,7 @@ \documentclass[full]{l3doc} %</driver> %<*driver|package> -\GetIdInfo$Id: l3prg.dtx 6216 2015-11-01 23:32:43Z bruno $ +\GetIdInfo$Id: l3prg.dtx 6679 2016-08-18 20:54:06Z bruno $ {L3 Control structures} %</driver|package> %<*driver> @@ -101,8 +101,8 @@ % \prg_new_conditional:Nnn, \prg_set_conditional:Nnn % } % \begin{syntax} -% \cs{prg_new_conditional:Npnn} \cs{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\ -% \cs{prg_new_conditional:Nnn} \cs{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code} +% \cs{prg_new_conditional:Npnn} \cs[no-index]{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\ +% \cs{prg_new_conditional:Nnn} \cs[no-index]{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code} % \end{syntax} % These functions create a family of conditionals using the same % \Arg{code} to perform the test created. Those conditionals are @@ -121,8 +121,8 @@ % \prg_new_protected_conditional:Nnn, \prg_set_protected_conditional:Nnn % } % \begin{syntax} -% \cs{prg_new_protected_conditional:Npnn} \cs{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\ -% \cs{prg_new_protected_conditional:Nnn} \cs{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code} +% \cs{prg_new_protected_conditional:Npnn} \cs[no-index]{\meta{name}:\meta{arg spec}} \meta{parameters} \Arg{conditions} \Arg{code} \\ +% \cs{prg_new_protected_conditional:Nnn} \cs[no-index]{\meta{name}:\meta{arg spec}} \Arg{conditions} \Arg{code} % \end{syntax} % These functions create a family of protected conditionals using the % same \Arg{code} to perform the test created. The \meta{code} does @@ -138,21 +138,21 @@ % The conditionals are defined by \cs{prg_new_conditional:Npnn} and % friends as: % \begin{itemize} -% \item \cs{\meta{name}_p:\meta{arg spec}} --- a predicate function +% \item \cs[no-index]{\meta{name}_p:\meta{arg spec}} --- a predicate function % which will supply either a logical \texttt{true} or logical % \texttt{false}. This function is intended for use in cases where % one or more logical tests are combined to lead to a final outcome. % This function cannot be defined for \texttt{protected} % conditionals. -% \item \cs{\meta{name}:\meta{arg spec}T} --- a function with one more +% \item \cs[no-index]{\meta{name}:\meta{arg spec}T} --- a function with one more % argument than the original \meta{arg spec} demands. The \meta{true % branch} code in this additional argument will be left on the % input stream only if the test is \texttt{true}. -% \item \cs{\meta{name}:\meta{arg spec}F} --- a function with one more +% \item \cs[no-index]{\meta{name}:\meta{arg spec}F} --- a function with one more % argument than the original \meta{arg spec} demands. The % \meta{false branch} code in this additional argument will be left % on the input stream only if the test is \texttt{false}. -% \item \cs{\meta{name}:\meta{arg spec}TF} --- a function with two +% \item \cs[no-index]{\meta{name}:\meta{arg spec}TF} --- a function with two % more argument than the original \meta{arg spec} demands. The % \meta{true branch} code in the first additional argument will be % left on the input stream if the test is \texttt{true}, while the @@ -192,7 +192,7 @@ % % \begin{function}{\prg_new_eq_conditional:NNn, \prg_set_eq_conditional:NNn} % \begin{syntax} -% \cs{prg_new_eq_conditional:NNn} \cs{\meta{name_1}:\meta{arg spec_1}} \cs{\meta{name_2}:\meta{arg spec_2}} \Arg{conditions} +% \cs{prg_new_eq_conditional:NNn} \cs[no-index]{\meta{name_1}:\meta{arg spec_1}} \cs[no-index]{\meta{name_2}:\meta{arg spec_2}} \Arg{conditions} % \end{syntax} % These functions copy a family of conditionals. The \texttt{new} version % will check for existing definitions (\emph{cf.}~\cs{cs_new:Npn}) whereas @@ -297,7 +297,7 @@ % \cs{bool_set:Nn} \meta{boolean} \Arg{boolexpr} % \end{syntax} % Evaluates the \meta{boolean expression} as described for -% \cs{bool_if:n(TF)}, and sets the \meta{boolean} variable to +% \cs{bool_if:nTF}, and sets the \meta{boolean} variable to % the logical truth of this evaluation. % \end{function} % @@ -594,10 +594,10 @@ % % \begin{function}[EXP]{\__prg_break_point:Nn} % \begin{syntax} -% \cs{__prg_break_point:Nn} \cs{\meta{type}_map_break:} \meta{tokens} +% \cs{__prg_break_point:Nn} \cs[no-index]{\meta{type}_map_break:} \meta{tokens} % \end{syntax} % Used to mark the end of a recursion or mapping: the functions -% \cs{\meta{type}_map_break:} and \cs{\meta{type}_map_break:n} use +% \cs[no-index]{\meta{type}_map_break:} and \cs[no-index]{\meta{type}_map_break:n} use % this to break out of the loop. After the loop ends, the % \meta{tokens} are inserted into the input stream. This occurs even % if the break functions are \emph{not} applied: @@ -607,15 +607,15 @@ % % \begin{function}[EXP]{\__prg_map_break:Nn} % \begin{syntax} -% \cs{__prg_map_break:Nn} \cs{\meta{type}_map_break:} \Arg{user code} +% \cs{__prg_map_break:Nn} \cs[no-index]{\meta{type}_map_break:} \Arg{user code} % \ldots{} -% \cs{__prg_break_point:Nn} \cs{\meta{type}_map_break:} \Arg{ending code} +% \cs{__prg_break_point:Nn} \cs[no-index]{\meta{type}_map_break:} \Arg{ending code} % \end{syntax} % Breaks a recursion in mapping contexts, inserting in the input % stream the \meta{user code} after the \meta{ending code} for the % loop. The function breaks loops, inserting their \meta{ending % code}, until reaching a loop with the same \meta{type} as its -% first argument. This \cs{\meta{type}_map_break:} argument is simply +% first argument. This \cs[no-index]{\meta{type}_map_break:} argument is simply % used as a recognizable marker for the \meta{type}. % \end{function} % @@ -853,7 +853,7 @@ \__msg_show_variable:NNNnn #1 \bool_if_exist:NTF ? { } { > ~ \token_to_str:N #1 = \@@_to_str:n {#1} } } -\cs_new_protected_nopar:Npn \bool_show:n +\cs_new_protected:Npn \bool_show:n { \__msg_show_wrap:Nn \@@_to_str:n } \cs_new:Npn \@@_to_str:n #1 { \bool_if:nTF {#1} { true } { false } } @@ -1103,10 +1103,10 @@ % operation is similar except it closes the special alignment group % before returning the boolean. % \begin{macrocode} -\cs_new_nopar:cpn { @@_)_0:w } { \c_false_bool } -\cs_new_nopar:cpn { @@_)_1:w } { \c_true_bool } -\cs_new_nopar:cpn { @@_S_0:w } { \group_align_safe_end: \c_false_bool } -\cs_new_nopar:cpn { @@_S_1:w } { \group_align_safe_end: \c_true_bool } +\cs_new:cpn { @@_)_0:w } { \c_false_bool } +\cs_new:cpn { @@_)_1:w } { \c_true_bool } +\cs_new:cpn { @@_S_0:w } { \group_align_safe_end: \c_false_bool } +\cs_new:cpn { @@_S_1:w } { \group_align_safe_end: \c_true_bool } % \end{macrocode} % \end{macro} % @@ -1115,8 +1115,8 @@ % Two cases where we simply continue scanning. We must remove the % second |&| or \verb"|". % \begin{macrocode} -\cs_new_nopar:cpn { @@_&_1:w } & { \@@_get_next:NN \use_i:nn } -\cs_new_nopar:cpn { @@_|_0:w } | { \@@_get_next:NN \use_i:nn } +\cs_new:cpn { @@_&_1:w } & { \@@_get_next:NN \use_i:nn } +\cs_new:cpn { @@_|_0:w } | { \@@_get_next:NN \use_i:nn } % \end{macrocode} % \end{macro} % \end{macro} @@ -1134,9 +1134,9 @@ % evaluation. This is slightly tricky as there are no braces so we % have to play match the |()| manually. % \begin{macrocode} -\cs_new_nopar:cpn { @@_&_0:w } & +\cs_new:cpn { @@_&_0:w } & { \@@_eval_skip_to_end_auxi:Nw \c_false_bool } -\cs_new_nopar:cpn { @@_|_1:w } | +\cs_new:cpn { @@_|_1:w } | { \@@_eval_skip_to_end_auxi:Nw \c_true_bool } % \end{macrocode} % There is always at least one |)| waiting, namely the outer @@ -1521,9 +1521,9 @@ % that the successive expansions of \cs{group_align_safe_begin/end:} % are always brace balanced. % \begin{macrocode} -\cs_new_nopar:Npn \group_align_safe_begin: +\cs_new:Npn \group_align_safe_begin: { \if_int_compare:w \if_false: { \fi: `} = \c_zero \fi: } -\cs_new_nopar:Npn \group_align_safe_end: +\cs_new:Npn \group_align_safe_end: { \if_int_compare:w `{ = \c_zero } \fi: } % \end{macrocode} % \end{macro} @@ -1558,7 +1558,7 @@ % \begin{macro}[int]{\scan_align_safe_stop:} % Deprecated 2015-08-01 for removal after 2016-12-31. % \begin{macrocode} -\cs_new_protected_nopar:Npn \scan_align_safe_stop: { } +\cs_new_protected:Npn \scan_align_safe_stop: { } % \end{macrocode} % \end{macro} % |