From 29c459636115f7de4ae9a8681927b52a1e896805 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Feb 2012 00:40:51 +0000 Subject: l3kernel 3471 (26feb12) git-svn-id: svn://tug.org/texlive/trunk@25525 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/l3kernel/l3basics.dtx | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/source/latex/l3kernel/l3basics.dtx') diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx index d16781461b0..bd3b608daf7 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3names} -\GetIdInfo$Id: l3basics.dtx 3317 2012-02-06 12:26:40Z bruno $ +\GetIdInfo$Id: l3basics.dtx 3460 2012-02-26 12:16:41Z will $ {L3 Experimental basic definitions} % %<*driver> @@ -148,7 +148,7 @@ % The name of a function can be checked at the point of definition using % the \cs{cs_new\ldots} functions: this is recommended for all % functions which are defined for the first time. -% +% % There are three ways to define new functions. % All classes define a function to expand to the substitution text. % Within the substitution text the actual parameters are substituted @@ -781,10 +781,10 @@ % % \begin{function}[EXP]{\use:n, \use:nn, \use:nnn, \use:nnnn} % \begin{syntax} -% \cs{use:n} \Arg{group1} -% \cs{use:nn} \Arg{group1} \Arg{group2} -% \cs{use:nnn} \Arg{group1} \Arg{group2} \Arg{group3} -% \cs{use:nnnn} \Arg{group1} \Arg{group2} \Arg{group3} \Arg{group4} +% \cs{use:n} \Arg{group_1} +% \cs{use:nn} \Arg{group_1} \Arg{group_2} +% \cs{use:nnn} \Arg{group_1} \Arg{group_2} \Arg{group_3} +% \cs{use:nnnn} \Arg{group_1} \Arg{group_2} \Arg{group_3} \Arg{group_4} % \end{syntax} % As illustrated, these functions will absorb between one and four % arguments, as indicated by the argument specifier. The braces @@ -805,7 +805,7 @@ % % \begin{function}[EXP]{\use_i:nn, \use_ii:nn} % \begin{syntax} -% \cs{use_i:nn} \Arg{arg1} \Arg{arg2} +% \cs{use_i:nn} \Arg{arg_1} \Arg{arg_2} % \end{syntax} % These functions absorb two arguments from the input stream. The function % \cs{use_i:nn} discards the second argument, and leaves the content @@ -820,7 +820,7 @@ % % \begin{function}[EXP]{\use_i:nnn, \use_ii:nnn, \use_iii:nnn} % \begin{syntax} -% \cs{use_i:nnn} \Arg{arg1} \Arg{arg2} \Arg{arg3} +% \cs{use_i:nnn} \Arg{arg_1} \Arg{arg_2} \Arg{arg_3} % \end{syntax} % These functions absorb three arguments from the input stream. The % function \cs{use_i:nnn} discards the second and third arguments, and @@ -836,7 +836,7 @@ % \begin{function}[EXP] % {\use_i:nnnn, \use_ii:nnnn, \use_iii:nnnn, \use_iv:nnnn} % \begin{syntax} -% \cs{use_i:nnnn} \Arg{arg1} \Arg{arg2} \Arg{arg3} \Arg{arg4} +% \cs{use_i:nnnn} \Arg{arg_1} \Arg{arg_2} \Arg{arg_3} \Arg{arg_4} % \end{syntax} % These functions absorb four arguments from the input stream. The % function \cs{use_i:nnnn} discards the second, third and fourth @@ -852,7 +852,7 @@ % % \begin{function}[EXP]{\use_i_ii:nnn} % \begin{syntax} -% \cs{use_i_ii:nnn} \Arg{arg1} \Arg{arg2} \Arg{arg3} +% \cs{use_i_ii:nnn} \Arg{arg_1} \Arg{arg_2} \Arg{arg_3} % \end{syntax} % This functions will absorb three arguments and leave the content of the % first and second in the input stream. The category code of @@ -883,7 +883,7 @@ % \use_none:nnnnnnnnn % } % \begin{syntax} -% \cs{use_none:n} \Arg{group1} +% \cs{use_none:n} \Arg{group_1} % \end{syntax} % These functions absorb between one and nine groups from the % input stream, leaving nothing on the resulting input stream. @@ -1065,8 +1065,8 @@ % % \begin{function}[EXP,pTF]{\cs_if_eq:NN} % \begin{syntax} -% \cs{cs_if_eq_p:NN} \Arg{cs1} \Arg{cs2} -% \cs{cs_if_eq:NNTF} \Arg{cs1} \Arg{cs2} \Arg{true code} \Arg{false code} +% \cs{cs_if_eq_p:NN} \Arg{cs_1} \Arg{cs_2} +% \cs{cs_if_eq:NNTF} \Arg{cs_1} \Arg{cs_2} \Arg{true code} \Arg{false code} % \end{syntax} % Compares the definition of two \meta{control sequences} and % is logically \texttt{true} the same, \emph{i.e.}~if the have exactly @@ -1103,8 +1103,8 @@ % \str_if_eq:nV, \str_if_eq:VV, \str_if_eq:xx % } % \begin{syntax} -% \cs{str_if_eq_p:nn} \Arg{tl1} \Arg{tl2} -% \cs{str_if_eq:nnTF} \Arg{tl1} \Arg{tl2} \Arg{true code} \Arg{false code} +% \cs{str_if_eq_p:nn} \Arg{tl_1} \Arg{tl_2} +% \cs{str_if_eq:nnTF} \Arg{tl_1} \Arg{tl_2} \Arg{true code} \Arg{false code} % \end{syntax} % Compares the two \meta{token lists} on a character by character % basis, and is \texttt{true} if the two lists contain the same @@ -1173,11 +1173,11 @@ % % \begin{function}[EXP]{\if_meaning:w} % \begin{syntax} -% "\if_meaning:w" "\else:" "\fi:" +% "\if_meaning:w" "\else:" "\fi:" % \end{syntax} -% "\if_meaning:w" executes when and are the same, +% "\if_meaning:w" executes when and are the same, % otherwise it executes . -% and could be functions, variables, tokens; in all cases the +% and could be functions, variables, tokens; in all cases the % \emph{unexpanded} definitions are compared. % \begin{texnote} % This is \TeX{}'s |\ifx|. @@ -1186,8 +1186,8 @@ % % \begin{function}[EXP]{\if:w, \if_charcode:w,\if_catcode:w} % \begin{syntax} -% "\if:w" "\else:" "\fi:" \\ -% "\if_catcode:w" "\else:" "\fi:" +% "\if:w" "\else:" "\fi:" \\ +% "\if_catcode:w" "\else:" "\fi:" % \end{syntax} % These conditionals will expand any following tokens until two % unexpandable tokens are left. If you wish to prevent this expansion, @@ -2359,8 +2359,8 @@ \msg_kernel_error:nnxx { kernel } { command-already-defined } { \token_to_str:N #1 } { \token_to_meaning:N #1 } } - \iow_log:x { Defining~\token_to_str:N #1~ \msg_line_context: } - } + \iow_log:x { Defining~\token_to_str:N #1~ \msg_line_context: } + } \fi: % \cs_set_protected_nopar:Npn \chk_if_free_cs:c -- cgit v1.2.3