summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3packages/xparse
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-23 17:15:15 +0000
committerKarl Berry <karl@freefriends.org>2012-07-23 17:15:15 +0000
commitdadf86ec2d90ed4529037604a8dcea9f660045b8 (patch)
tree819b3708bda1e2a087ebd5fb0f0f55ebe0b4d157 /Master/texmf-dist/source/latex/l3packages/xparse
parent134349701bddf7cbbacf6030c6b9f9838aff96fa (diff)
l3packages 3990 (17jul12)
git-svn-id: svn://tug.org/texlive/trunk@27109 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3packages/xparse')
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx1964
-rw-r--r--Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins4
2 files changed, 1012 insertions, 956 deletions
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
index a0b627b5e46..b003f5d012c 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx
@@ -41,19 +41,19 @@
%<*driver|package>
% The version of expl3 required is tested as early as possible, as
% some really old versions do not define \ProvidesExplPackage.
-\RequirePackage{expl3}[2012/04/23]
-%<package>\@ifpackagelater{expl3}{2012/04/23}
+\RequirePackage{expl3}[2012/07/16]
+%<package>\@ifpackagelater{expl3}{2012/07/16}
%<package> {}
-%<package> {
+%<package> {%
%<package> \PackageError{xparse}{Support package l3kernel too old.}
-%<package> {
+%<package> {%
%<package> Please install an up to date version of l3kernel
%<package> using your TeX package manager or from CTAN.\\ \\
-%<package> Loading xparse will abort!
-%<package> }
+%<package> Loading xparse will abort!%
+%<package> }%
%<package> \endinput
%<package> }
-\GetIdInfo$Id: xparse.dtx 3570 2012-04-23 13:24:55Z joseph $
+\GetIdInfo$Id: xparse.dtx 3990 2012-07-16 07:46:03Z joseph $
{L3 Experimental document command parser}
%</driver|package>
%<*driver>
@@ -148,7 +148,7 @@
% \item[r] Reads a \enquote{required} delimited argument, where the
% delimiters are given as \meta{token1} and \meta{token2}:
% \texttt{r}\meta{token1}\meta{token2}. If the opening \meta{token}
-% is missing, the default value \cs{NoValue} will be inserted after
+% is missing, the default marker |-NoValue-| will be inserted after
% a suitable error.
% \item[R] As for \texttt{r}, this is a \enquote{required} delimited
% argument but has a user-definable recovery \meta{default}, given
@@ -170,11 +170,11 @@
% \begin{itemize}[font=\ttfamily]
% \item[o] A standard \LaTeX{} optional argument, surrounded with square
% brackets, which will supply
-% the special \cs{NoValue} token if not given (as described later).
+% the special |-NoValue-| marker if not given (as described later).
% \item[d] An optional argument which is delimited by \meta{token1}
% and \meta{token2}, which are given as arguments:
% \texttt{d}\meta{token1}\meta{token2}. As with \texttt{o}, if no
-% value is given the special token \cs{NoValue} is returned.
+% value is given the special marker |-NoValue-| is returned.
% \item[O] As for \texttt{o}, but returns \meta{default} if no
% value is given. Should be given as \texttt{O}\marg{default}.
% \item[D] As for \texttt{d}, but returns \meta{default} if no
@@ -189,7 +189,7 @@
% otherwise. Given as \texttt{t}\meta{token}.
% \item[g] An optional argument given inside a pair of \TeX{} group
% tokens (in standard \LaTeX, |{| \ldots |}|), which returns
-% \cs{NoValue} if not present.
+% |-NoValue-| if not present.
% \item[G] As for \texttt{g} but returns \meta{default} if no value
% is given: \texttt{G}\marg{default}.
% \end{itemize}
@@ -200,7 +200,7 @@
% \begin{itemize}[nolistsep]
% \item |#1| = |\BooleanTrue|
% \item |#2| = |{Foo}|
-% \item |#3| = |\NoValue|
+% \item |#3| = |-NoValue-|
% \item |#4| = |{Bar}|
% \item |#5| = |{default}|
% \end{itemize}
@@ -217,6 +217,18 @@
% in the argument specifier. The \cs{BooleanTrue} and \cs{BooleanFalse}
% tokens are passed without braces; all other arguments are passed as
% brace groups.
+%
+% Delimited argument types (\texttt{d}, \texttt{o} and \texttt{r}) are
+% defined such that they require matched pairs of delimiters when collecting
+% an argument. For example
+% \begin{verbatim}
+% \DeclareDocumentCommand{\foo}{o}{#1}
+% \foo[[content]] % #1 = "[content]"
+% \foo[[] % Error: missing closing "]"
+% \end{verbatim}
+% Also note that |{| and |}| cannot be used as delimiters as they are used
+% by \TeX{} as grouping tokens. Arguments to be grabbed inside these tokens
+% must be created as either \texttt{m}- or \texttt{g}-type arguments.
%
% Two more tokens have a special meaning when creating an argument
% specifier. First, \texttt{+} is used to make an argument long (to
@@ -267,7 +279,7 @@
% \DeclareDocumentCommand\foo{r()m}
% \foo{oops}
% \end{verbatim}
-% will lead to an error message being issued. The marker \cs{NoValue}
+% will lead to an error message being issued. The marker |-NoValue-|
% (\texttt{r}-type) or user-specified default (for \texttt{R}-type) will be
% inserted to allow error recovery.
%
@@ -331,7 +343,7 @@
% essentially behave like the current \LaTeXe{} command (except that it
% would accept an optional argument even when a \texttt{*} was parsed).
% The \cs{typesetnormalchapter} could test its first argument for being
-% \cs{NoValue} to see if an optional argument was present.
+% |-NoValue-| to see if an optional argument was present.
%
% The difference between the \cs{Declare\ldots}, \cs{New\ldots}
% \cs{Renew\ldots} and \cs{Provide\ldots} versions is the behaviour
@@ -379,18 +391,12 @@
% variables to return information about the nature of the argument
% received.
%
-% \begin{variable}{\NoValue}
-% \cs{NoValue} is a special marker returned by \pkg{xparse} if no
-% value is given for an optional argument. If typeset (which should
-% not happen), it will print the value \texttt{-NoValue-}.
-% \end{variable}
-%
% \begin{function}[EXP,TF]{\IfNoValue}
% \begin{syntax}
% \cs{IfNoValueTF} \Arg{argument} \Arg{true code} \Arg{false code}
% \end{syntax}
-% The \cs{IfNoValue} tests are used to check if <argument> (|#1|,
-% |#2|, \emph{etc.}) is the special \cs{NoValue} token. For example
+% The \cs{IfNoValue} tests are used to check if \meta{argument} (|#1|,
+% |#2|, \emph{etc.}) is the special |-NoValue-| marker For example
% \begin{verbatim}
% \DeclareDocumentCommand \foo { o m }
% {
@@ -405,6 +411,14 @@
% As the \cs{IfNoValue(TF)} tests are expandable, it is possible to
% test these values later, for example at the point of typesetting or
% in an expansion context.
+%
+% It is important to note that |-NoValue-| is constructed such that it
+% will \emph{not} match the simple text input |-NoValue-|, \emph{i.e.}
+% that
+% \begin{verbatim}
+% \IfNoValueTF{-NoValue-}
+% \end{verbatim}
+% will be logically \texttt{false}.
% \end{function}
%
% \begin{function}[EXP,TF]{\IfValue}
@@ -668,6 +682,10 @@
% \begin{macrocode}
%<*package>
% \end{macrocode}
+%
+% \begin{macrocode}
+%<@@=xparse>
+% \end{macrocode}
%
% \begin{macrocode}
\ProvidesExplPackage
@@ -675,327 +693,344 @@
% \end{macrocode}
%
% \subsection{Variables and constants}
+%
+% \begin{variable}{\c_@@_no_value_tl}
+% A special \enquote{awkward} token list: it contains two |-|~tokens with
+% different category codes. This is used as the marker for nothing being
+% returned when no optional argument is given.
+% \begin{macrocode}
+\group_begin:
+\char_set_lccode:nn { `\Q } { `\- }
+\char_set_lccode:nn { `\N } { `\N }
+\char_set_lccode:nn { `\V } { `\V }
+\tl_to_lowercase:n
+ {
+ \group_end:
+ \tl_const:Nn \c_@@_no_value_tl { QNoValue- }
+ }
+% \end{macrocode}
+% \end{variable}
%
-% \begin{variable}{\c_xparse_shorthands_prop}
+% \begin{variable}{\c_@@_shorthands_prop}
% Shorthands are stored as a property list: this is set up here as it
% is a constant.
% \begin{macrocode}
-\prop_new:N \c_xparse_shorthands_prop
-\prop_put:Nnn \c_xparse_shorthands_prop { o } { d[] }
-\prop_put:Nnn \c_xparse_shorthands_prop { O } { D[] }
-\prop_put:Nnn \c_xparse_shorthands_prop { s } { t* }
+\prop_new:N \c_@@_shorthands_prop
+\prop_put:Nnn \c_@@_shorthands_prop { o } { d[] }
+\prop_put:Nnn \c_@@_shorthands_prop { O } { D[] }
+\prop_put:Nnn \c_@@_shorthands_prop { s } { t* }
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\c_xparse_special_chars_seq}
+% \begin{variable}{\c_@@_special_chars_seq}
% In \IniTeX{} mode, we store special characters in a sequence.
% Maybe |$| or |&| will have to be added later.
% \begin{macrocode}
%<*initex>
-\seq_new:N \c_xparse_special_chars_seq
-\seq_set_from_clist:Nn \c_xparse_special_chars_seq
- { \ , \\ , \{ , \} , \# , \^ , \_ , \% , \~ }
+\seq_new:N \c_@@_special_chars_seq
+\seq_set_split:Nnn \c_@@_special_chars_seq { }
+ { \ \\ \{ \} \# \^ \_ \% \~ }
%</initex>
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_all_long_bool}
+% \begin{variable}{\l_@@_all_long_bool}
% For expandable commands, all arguments have the same long status, but this
% needs to be checked. A flag is therefore needed to track whether arguments
% are long at all.
% \begin{macrocode}
-\bool_new:N \l_xparse_all_long_bool
+\bool_new:N \l_@@_all_long_bool
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_args_tl}
+% \begin{variable}{\l_@@_args_tl}
% Token list variable for grabbed arguments.
% \begin{macrocode}
-\tl_new:N \l_xparse_args_tl
+\tl_new:N \l_@@_args_tl
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_command_arg_specs_prop}
+% \begin{variable}{\l_@@_command_arg_specs_prop}
% Used to record all document commands created, and the argument
% specifications that go with these.
% \begin{macrocode}
-\prop_new:N \l_xparse_command_arg_specs_prop
+\prop_new:N \l_@@_command_arg_specs_prop
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_current_arg_int}
+% \begin{variable}{\l_@@_current_arg_int}
% The number of the current argument being set up: this is used for creating
% the expandable auxiliary functions, and also to indicate if all arguments
% are \texttt{m}-type.
% \begin{macrocode}
-\int_new:N \l_xparse_current_arg_int
+\int_new:N \l_@@_current_arg_int
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_environment_bool}
+% \begin{variable}{\l_@@_environment_bool}
% Generating environments uses the same mechanism as generating functions.
% However, full processing of arguments is always needed for environments,
% and so the function-generating code needs to know this.
% \begin{macrocode}
-\bool_new:N \l_xparse_environment_bool
+\bool_new:N \l_@@_environment_bool
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_environment_arg_specs_prop}
+% \begin{variable}{\l_@@_environment_arg_specs_prop}
% Used to record all document environment created, and the argument
% specifications that go with these.
% \begin{macrocode}
-\prop_new:N \l_xparse_environment_arg_specs_prop
+\prop_new:N \l_@@_environment_arg_specs_prop
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_expandable_bool}
+% \begin{variable}{\l_@@_expandable_bool}
% Used to indicate if an expandable command is begin generated, as this
% affects both the acceptable argument types and how they are implemented.
% \begin{macrocode}
-\bool_new:N \l_xparse_expandable_bool
+\bool_new:N \l_@@_expandable_bool
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_expandable_aux_name_tl}
+% \begin{variable}{\l_@@_expandable_aux_name_tl}
% Used to create pretty-printing names for the auxiliaries: although the
% immediate definition does not vary, the full expansion does and so it
% does not count as a constant.
% \begin{macrocode}
-\tl_new:N \l_xparse_expandable_aux_name_tl
-\tl_set:Nn \l_xparse_expandable_aux_name_tl
+\tl_new:N \l_@@_expandable_aux_name_tl
+\tl_set:Nn \l_@@_expandable_aux_name_tl
{
- \l_xparse_function_tl \c_space_tl
- ( arg~ \int_use:N \l_xparse_current_arg_int )
+ \l_@@_function_tl \c_space_tl
+ ( arg~ \int_use:N \l_@@_current_arg_int )
}
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_fn_tl}
+% \begin{variable}{\l_@@_fn_tl}
% For passing the pre-formed name of the auxiliary to be used as the
% parsing function.
% \begin{macrocode}
-\tl_new:N \l_xparse_fn_tl
+\tl_new:N \l_@@_fn_tl
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_function_tl}
+% \begin{variable}{\l_@@_function_tl}
% Holds the control sequence name of the function currently being
% defined: used to avoid passing this as an argument and to avoid repeated
% use of \cs{cs_to_str:N}.
% \begin{macrocode}
-\tl_new:N \l_xparse_function_tl
+\tl_new:N \l_@@_function_tl
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_long_bool}
+% \begin{variable}{\l_@@_long_bool}
% Used to indicate that an argument is long: this is used on a per-argument
% basis for non-expandable functions, or for the entire set of arguments
% when working expandably.
% \begin{macrocode}
-\bool_new:N \l_xparse_long_bool
+\bool_new:N \l_@@_long_bool
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_m_args_int}
+% \begin{variable}{\l_@@_m_args_int}
% The number of \texttt{m} arguments: if this is the same as the total
% number of arguments, then a short-cut can be taken in the creation of
% the grabber code.
% \begin{macrocode}
-\int_new:N \l_xparse_m_args_int
+\int_new:N \l_@@_m_args_int
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_mandatory_args_int}
+% \begin{variable}{\l_@@_mandatory_args_int}
% Holds the total number of mandatory arguments for a function, which is
% needed to tell whether further mandatory arguments follow an optional
% one.
% \begin{macrocode}
-\int_new:N \l_xparse_mandatory_args_int
+\int_new:N \l_@@_mandatory_args_int
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_processor_bool}
+% \begin{variable}{\l_@@_processor_bool}
% Indicates that the current argument will be followed by one or more
% processors.
% \begin{macrocode}
-\bool_new:N \l_xparse_processor_bool
+\bool_new:N \l_@@_processor_bool
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_processor_int}
+% \begin{variable}{\l_@@_processor_int}
% In the grabber routine, each processor is saved with a number
% recording the order it was found in. The total is then used to work
% back through the grabbers so they apply to the argument right to left.
% \begin{macrocode}
-\int_new:N \l_xparse_processor_int
+\int_new:N \l_@@_processor_int
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_signature_tl}
+% \begin{variable}{\l_@@_signature_tl}
% Used when constructing the signature (code for argument grabbing) to
% hold what will become the implementation of the main function.
% \begin{macrocode}
-\tl_new:N \l_xparse_signature_tl
+\tl_new:N \l_@@_signature_tl
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{\l_xparse_tmp_tl}
+% \begin{variable}{\l_@@_tmp_tl}
% Scratch space.
% \begin{macrocode}
-\tl_new:N \l_xparse_tmp_tl
+\tl_new:N \l_@@_tmp_tl
% \end{macrocode}
% \end{variable}
%
% \subsection{Declaring commands and environments}
%
-% \begin{macro}{\xparse_declare_cmd:Nnn, \xparse_declare_expandable_cmd:Nnn}
-% \begin{macro}[aux]{\xparse_declare_cmd_aux:Nnn}
+% \begin{macro}{\@@_declare_cmd:Nnn, \@@_declare_expandable_cmd:Nnn}
+% \begin{macro}[aux]{\@@_declare_cmd_aux:Nnn}
% \begin{macro}[int]
-% {\xparse_declare_cmd_internal:Nnn, \xparse_declare_cmd_internal:cnx}
+% {\@@_declare_cmd_internal:Nnn, \@@_declare_cmd_internal:cnx}
% The main functions for creating commands set the appropriate flag then
% use the same internal code to do the definition.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_declare_cmd:Nnn
+\cs_new_protected_nopar:Npn \@@_declare_cmd:Nnn
{
- \bool_set_false:N \l_xparse_expandable_bool
- \xparse_declare_cmd_aux:Nnn
+ \bool_set_false:N \l_@@_expandable_bool
+ \@@_declare_cmd_aux:Nnn
}
-\cs_new_protected_nopar:Npn \xparse_declare_expandable_cmd:Nnn
+\cs_new_protected_nopar:Npn \@@_declare_expandable_cmd:Nnn
{
- \bool_set_true:N \l_xparse_expandable_bool
- \xparse_declare_cmd_aux:Nnn
+ \bool_set_true:N \l_@@_expandable_bool
+ \@@_declare_cmd_aux:Nnn
}
% \end{macrocode}
% The first stage is to log information, both for the user in the log and
% for programmatic use in a property list of all declared commands.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_declare_cmd_aux:Nnn #1#2
+\cs_new_protected:Npn \@@_declare_cmd_aux:Nnn #1#2
{
\cs_if_exist:NTF #1
{
- \msg_kernel_warning:nnxx { xparse } { redefine-command }
+ \__msg_kernel_warning:nnxx { xparse } { redefine-command }
{ \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
{
- \msg_kernel_info:nnxx { xparse } { define-command }
+ \__msg_kernel_info:nnxx { xparse } { define-command }
{ \token_to_str:N #1 } { \tl_to_str:n {#2} }
}
- \prop_put:Nnn \l_xparse_command_arg_specs_prop {#1} {#2}
- \bool_set_false:N \l_xparse_environment_bool
- \xparse_declare_cmd_internal:Nnn #1 {#2}
+ \prop_put:Nnn \l_@@_command_arg_specs_prop {#1} {#2}
+ \bool_set_false:N \l_@@_environment_bool
+ \@@_declare_cmd_internal:Nnn #1 {#2}
}
% \end{macrocode}
% The real business of defining a document command starts with setting up
% the appropriate name, then counting up the number of mandatory arguments.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_declare_cmd_internal:Nnn #1#2#3
+\cs_new_protected:Npn \@@_declare_cmd_internal:Nnn #1#2#3
{
- \tl_set:Nx \l_xparse_function_tl { \cs_to_str:N #1 }
- \xparse_count_mandatory:n {#2}
- \xparse_prepare_signature:n {#2}
- \int_compare:nNnTF \l_xparse_current_arg_int = \l_xparse_m_args_int
+ \tl_set:Nx \l_@@_function_tl { \cs_to_str:N #1 }
+ \@@_count_mandatory:n {#2}
+ \@@_prepare_signature:n {#2}
+ \int_compare:nNnTF \l_@@_current_arg_int = \l_@@_m_args_int
{
- \bool_if:NTF \l_xparse_environment_bool
- { \xparse_declare_cmd_mixed:Nn #1 {#3} }
- { \xparse_declare_cmd_all_m:Nn #1 {#3} }
+ \bool_if:NTF \l_@@_environment_bool
+ { \@@_declare_cmd_mixed:Nn #1 {#3} }
+ { \@@_declare_cmd_all_m:Nn #1 {#3} }
}
- { \xparse_declare_cmd_mixed:Nn #1 {#3} }
- \xparse_break_point:n {#2}
+ { \@@_declare_cmd_mixed:Nn #1 {#3} }
+ \@@_break_point:n {#2}
}
-\cs_generate_variant:Nn \xparse_declare_cmd_internal:Nnn { cnx }
+\cs_generate_variant:Nn \@@_declare_cmd_internal:Nnn { cnx }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_break_point:n}
+% \begin{macro}{\@@_break_point:n}
% A marker used to escape from creating a definition if necessary.
% \begin{macrocode}
-\cs_new_eq:NN \xparse_break_point:n \use_none:n
+\cs_new_eq:NN \@@_break_point:n \use_none:n
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_declare_cmd_all_m:Nn, \xparse_declare_cmd_mixed:Nn}
+% \begin{macro}{\@@_declare_cmd_all_m:Nn, \@@_declare_cmd_mixed:Nn}
% \begin{macro}[aux]
-% {\xparse_declare_cmd_mixed_aux:Nn, \xparse_declare_cmd_mixed_expandable:Nn}
+% {\@@_declare_cmd_mixed_aux:Nn, \@@_declare_cmd_mixed_expandable:Nn}
% When all of the arguments to grab are simple \texttt{m}-type, a short
% cut can be taken to provide only a single function. In the case of
% expandable commands, this can also happen for \texttt{+m} (as all arguments
% in this case must be long).
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_declare_cmd_all_m:Nn #1#2
+\cs_new_protected:Npn \@@_declare_cmd_all_m:Nn #1#2
{
\cs_generate_from_arg_count:Ncnn #1
{
cs_set
- \bool_if:NF \l_xparse_expandable_bool { _protected }
- \bool_if:NF \l_xparse_all_long_bool { _nopar }
+ \bool_if:NF \l_@@_expandable_bool { _protected }
+ \bool_if:NF \l_@@_all_long_bool { _nopar }
:Npn
}
- \l_xparse_current_arg_int {#2}
+ \l_@@_current_arg_int {#2}
}
% \end{macrocode}
% In the case of mixed arguments, any remaining \texttt{m}-type ones are
% first added to the signature, then the appropriate auxiliary is called.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_declare_cmd_mixed:Nn
+\cs_new_protected:Npn \@@_declare_cmd_mixed:Nn
{
- \bool_if:NTF \l_xparse_expandable_bool
- { \xparse_declare_cmd_mixed_expandable:Nn }
- { \xparse_declare_cmd_mixed_aux:Nn }
+ \bool_if:NTF \l_@@_expandable_bool
+ { \@@_declare_cmd_mixed_expandable:Nn }
+ { \@@_declare_cmd_mixed_aux:Nn }
}
% \end{macrocode}
% Creating standard functions with mixed arg.~specs sets up the main function
% to zero the number of processors, set the name of the function (for the
% grabber) and clears the list of grabbed arguments.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_declare_cmd_mixed_aux:Nn #1#2
+\cs_new_protected:Npn \@@_declare_cmd_mixed_aux:Nn #1#2
{
- \xparse_flush_m_args:
+ \@@_flush_m_args:
\cs_generate_from_arg_count:cNnn
- { \l_xparse_function_tl \c_space_tl code }
- \cs_set_protected:Npn \l_xparse_current_arg_int {#2}
+ { \l_@@_function_tl \c_space_tl code }
+ \cs_set_protected:Npn \l_@@_current_arg_int {#2}
\cs_set_protected_nopar:Npx #1
{
- \int_zero:N \l_xparse_processor_int
- \tl_set:Nn \exp_not:N \l_xparse_args_tl
- { \exp_not:c { \l_xparse_function_tl \c_space_tl code } }
- \tl_set:Nn \exp_not:N \l_xparse_fn_tl
- { \exp_not:c { \l_xparse_function_tl \c_space_tl } }
- \exp_not:o \l_xparse_signature_tl
- \exp_not:N \l_xparse_args_tl
+ \int_zero:N \l_@@_processor_int
+ \tl_set:Nn \exp_not:N \l_@@_args_tl
+ { \exp_not:c { \l_@@_function_tl \c_space_tl code } }
+ \tl_set:Nn \exp_not:N \l_@@_fn_tl
+ { \exp_not:c { \l_@@_function_tl \c_space_tl } }
+ \exp_not:o \l_@@_signature_tl
+ \exp_not:N \l_@@_args_tl
}
}
-\cs_new_protected:Npn \xparse_declare_cmd_mixed_expandable:Nn #1#2
+\cs_new_protected:Npn \@@_declare_cmd_mixed_expandable:Nn #1#2
{
\cs_generate_from_arg_count:cNnn
- { \l_xparse_function_tl \c_space_tl code }
- \cs_set:Npn \l_xparse_current_arg_int {#2}
+ { \l_@@_function_tl \c_space_tl code }
+ \cs_set:Npn \l_@@_current_arg_int {#2}
\cs_set_nopar:Npx #1
{
- \exp_not:o \l_xparse_signature_tl
- \exp_not:N \xparse_grab_expandable_end:wN
- \exp_not:c { \l_xparse_function_tl \c_space_tl code }
- \exp_not:N \q_xparse
- \exp_not:c { \l_xparse_function_tl \c_space_tl }
+ \exp_not:o \l_@@_signature_tl
+ \exp_not:N \@@_grab_expandable_end:wN
+ \exp_not:c { \l_@@_function_tl \c_space_tl code }
+ \exp_not:N \q_@@
+ \exp_not:c { \l_@@_function_tl \c_space_tl }
}
- \bool_if:NTF \l_xparse_long_bool
+ \bool_if:NTF \l_@@_all_long_bool
{ \cs_set:cpx }
{ \cs_set_nopar:cpx }
- { \l_xparse_function_tl \c_space_tl } ##1##2 { ##1 {##2} }
+ { \l_@@_function_tl \c_space_tl } ##1##2 { ##1 {##2} }
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_declare_env:nnnn}
-% \begin{macro}[int]{\xparse_declare_env_internal:nnnn}
+% \begin{macro}{\@@_declare_env:nnnn}
+% \begin{macro}[int]{\@@_declare_env_internal:nnnn}
% The lead-off to creating an environment is much the same as that for
% creating a command: issue the appropriate message, store the argument
% specification then hand off to an internal function.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_declare_env:nnnn #1#2
+\cs_new_protected:Npn \@@_declare_env:nnnn #1#2
{
%<*initex>
\cs_if_exist:cTF { environment~ #1 }
@@ -1004,16 +1039,16 @@
\cs_if_exist:cTF {#1}
%</package>
{
- \msg_kernel_warning:nnxx { xparse } { redefine-environment }
+ \__msg_kernel_warning:nnxx { xparse } { redefine-environment }
{#1} { \tl_to_str:n {#2} }
}
{
- \msg_kernel_info:nnxx { xparse } { define-environment }
+ \__msg_kernel_info:nnxx { xparse } { define-environment }
{#1} { \tl_to_str:n {#2} }
}
- \prop_put:Nnn \l_xparse_environment_arg_specs_prop {#1} {#2}
- \bool_set_true:N \l_xparse_environment_bool
- \xparse_declare_env_internal:nnnn {#1} {#2}
+ \prop_put:Nnn \l_@@_environment_arg_specs_prop {#1} {#2}
+ \bool_set_true:N \l_@@_environment_bool
+ \@@_declare_env_internal:nnnn {#1} {#2}
}
% \end{macrocode}
% Creating a document environment requires a few more steps than creating
@@ -1024,9 +1059,9 @@
% of expansion at point of use, the code here is expanded now as well as
% when used.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_declare_env_internal:nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_declare_env_internal:nnnn #1#2#3#4
{
- \xparse_declare_cmd_internal:cnx { environment~ #1 } {#2}
+ \@@_declare_cmd_internal:cnx { environment~ #1 } {#2}
{
\group_begin:
\cs_set_protected_nopar:Npx \exp_not:c { environment_ #1 _end_aux: }
@@ -1035,7 +1070,11 @@
\exp_not:n
{
\exp_args:No \exp_not:o
- { \exp_after:wN \use_none:n \l_xparse_args_tl }
+ { \exp_after:wN \use_none:n \l_@@_args_tl }
+%<*initex>
+ \group_end:
+%</initex>
+%<*package>
\exp_not:n
{
\if@endpe
@@ -1045,6 +1084,7 @@
\exp_after:wN \group_end:
\fi
}
+%</package>
}
}
\exp_not:n {#3}
@@ -1053,7 +1093,7 @@
{ \exp_not:c { environment_ #1 _end_aux: } }
\cs_generate_from_arg_count:cNnn
{ environment_ #1 _end_aux:w } \cs_set_protected:Npn
- \l_xparse_current_arg_int {#4}
+ \l_@@_current_arg_int {#4}
%<*package>
\cs_set_eq:cc {#1} { environment~ #1 }
\cs_set_eq:cc { end #1 } { environment~ #1 ~end }
@@ -1065,33 +1105,33 @@
%
% \subsection{Counting mandatory arguments}
%
-% \begin{macro}{\xparse_count_mandatory:n}
-% \begin{macro}{\xparse_count_mandatory:N}
-% \begin{macro}[aux]{\xparse_count_mandatory:N}
+% \begin{macro}{\@@_count_mandatory:n}
+% \begin{macro}{\@@_count_mandatory:N}
+% \begin{macro}[aux]{\@@_count_mandatory:N}
% To count up mandatory arguments before the main parsing run, the same
% approach is used. First, check if the current token is a short-cut for
% another argument type. If it is, expand it and loop again. If not, then
% look for a \enquote{counting} function to check the argument type. No error
% is raised here if one is not found as one will be raised by later code.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_count_mandatory:n #1
+\cs_new_protected:Npn \@@_count_mandatory:n #1
{
- \int_zero:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N #1
+ \int_zero:N \l_@@_mandatory_args_int
+ \@@_count_mandatory:N #1
\q_recursion_tail \q_recursion_tail \q_recursion_tail \q_recursion_stop
}
-\cs_new_protected:Npn \xparse_count_mandatory:N #1
+\cs_new_protected:Npn \@@_count_mandatory:N #1
{
\quark_if_recursion_tail_stop:N #1
- \prop_get:NnNTF \c_xparse_shorthands_prop {#1} \l_xparse_tmp_tl
- { \exp_after:wN \xparse_count_mandatory:N \l_xparse_tmp_tl }
- { \xparse_count_mandatory_aux:N #1 }
+ \prop_get:NnNTF \c_@@_shorthands_prop {#1} \l_@@_tmp_tl
+ { \exp_after:wN \@@_count_mandatory:N \l_@@_tmp_tl }
+ { \@@_count_mandatory_aux:N #1 }
}
-\cs_new_protected:Npn \xparse_count_mandatory_aux:N #1
+\cs_new_protected:Npn \@@_count_mandatory_aux:N #1
{
- \cs_if_free:cTF { xparse_count_type_ \token_to_str:N #1 :w }
- { \xparse_count_type_m:w }
- { \use:c { xparse_count_type_ \token_to_str:N #1 :w } }
+ \cs_if_free:cTF { @@_count_type_ \token_to_str:N #1 :w }
+ { \@@_count_type_m:w }
+ { \use:c { @@_count_type_ \token_to_str:N #1 :w } }
}
% \end{macrocode}
% \end{macro}
@@ -1100,15 +1140,15 @@
%
% \begin{macro}
% {
-% \xparse_count_type_>:w,
-% \xparse_count_type_+:w,
-% \xparse_count_type_d:w,
-% \xparse_count_type_D:w,
-% \xparse_count_type_g:w,
-% \xparse_count_type_G:w,
-% \xparse_count_type_m:w,
-% \xparse_count_type_t:w,
-% \xparse_count_type_u:w
+% \@@_count_type_>:w,
+% \@@_count_type_+:w,
+% \@@_count_type_d:w,
+% \@@_count_type_D:w,
+% \@@_count_type_g:w,
+% \@@_count_type_G:w,
+% \@@_count_type_m:w,
+% \@@_count_type_t:w,
+% \@@_count_type_u:w
% }
% For counting the mandatory arguments, a function is provided for each
% argument type that will mop any extra arguments and call the loop function.
@@ -1124,118 +1164,118 @@
% errors. The opportunity is also taken to make sure that where a single
% token is required, one has actually been supplied.
% \begin{macrocode}
-\cs_new_protected:cpn { xparse_count_type_>:w } #1
+\cs_new_protected:cpn { @@_count_type_>:w } #1
{
- \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \quark_if_recursion_tail_stop_do:nn {#1} { \@@_bad_arg_spec:wn }
+ \@@_count_mandatory:N
}
-\cs_new_protected_nopar:cpn { xparse_count_type_+:w }
- { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_d:w #1#2
+\cs_new_protected_nopar:cpn { @@_count_type_+:w }
+ { \@@_count_mandatory:N }
+\cs_new_protected:Npn \@@_count_type_d:w #1#2
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:Nn #2 { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \@@_single_token_check:n {#1}
+ \@@_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:Nn #2 { \@@_bad_arg_spec:wn }
+ \@@_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_D:w #1#2#3
+\cs_new_protected:Npn \@@_count_type_D:w #1#2#3
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:nn {#3} { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \@@_single_token_check:n {#1}
+ \@@_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:nn {#3} { \@@_bad_arg_spec:wn }
+ \@@_count_mandatory:N
}
-\cs_new_protected_nopar:Npn \xparse_count_type_g:w
- { \xparse_count_mandatory:N }
-\cs_new_protected:Npn \xparse_count_type_G:w #1
+\cs_new_protected_nopar:Npn \@@_count_type_g:w
+ { \@@_count_mandatory:N }
+\cs_new_protected:Npn \@@_count_type_G:w #1
{
- \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \quark_if_recursion_tail_stop_do:nn {#1} { \@@_bad_arg_spec:wn }
+ \@@_count_mandatory:N
}
-\cs_new_protected_nopar:Npn \xparse_count_type_m:w
+\cs_new_protected_nopar:Npn \@@_count_type_m:w
{
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \int_incr:N \l_@@_mandatory_args_int
+ \@@_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_r:w #1#2
+\cs_new_protected:Npn \@@_count_type_r:w #1#2
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:Nn #2 { \xparse_bad_arg_spec:wn }
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \@@_single_token_check:n {#1}
+ \@@_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:Nn #2 { \@@_bad_arg_spec:wn }
+ \int_incr:N \l_@@_mandatory_args_int
+ \@@_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_R:w #1#2#3
+\cs_new_protected:Npn \@@_count_type_R:w #1#2#3
{
- \xparse_single_token_check:n {#1}
- \xparse_single_token_check:n {#2}
- \quark_if_recursion_tail_stop_do:nn {#3} { \xparse_bad_arg_spec:wn }
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \@@_single_token_check:n {#1}
+ \@@_single_token_check:n {#2}
+ \quark_if_recursion_tail_stop_do:nn {#3} { \@@_bad_arg_spec:wn }
+ \int_incr:N \l_@@_mandatory_args_int
+ \@@_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_t:w #1
+\cs_new_protected:Npn \@@_count_type_t:w #1
{
- \xparse_single_token_check:n {#1}
- \quark_if_recursion_tail_stop_do:Nn #1 { \xparse_bad_arg_spec:wn }
- \xparse_count_mandatory:N
+ \@@_single_token_check:n {#1}
+ \quark_if_recursion_tail_stop_do:Nn #1 { \@@_bad_arg_spec:wn }
+ \@@_count_mandatory:N
}
-\cs_new_protected:Npn \xparse_count_type_u:w #1
+\cs_new_protected:Npn \@@_count_type_u:w #1
{
- \quark_if_recursion_tail_stop_do:nn {#1} { \xparse_bad_arg_spec:wn }
- \int_incr:N \l_xparse_mandatory_args_int
- \xparse_count_mandatory:N
+ \quark_if_recursion_tail_stop_do:nn {#1} { \@@_bad_arg_spec:wn }
+ \int_incr:N \l_@@_mandatory_args_int
+ \@@_count_mandatory:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_single_token_check:n}
-% \begin{macro}[aux]{\xparse_single_token_check_aux:nwn}
+% \begin{macro}{\@@_single_token_check:n}
+% \begin{macro}[aux]{\@@_single_token_check_aux:nwn}
% A spin-out function to check that what should be single tokens really
% are single tokens.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_single_token_check:n #1
+\cs_new_protected:Npn \@@_single_token_check:n #1
{
\tl_if_single:nF {#1}
- { \xparse_single_token_check_aux:nwn {#1} }
+ { \@@_single_token_check_aux:nwn {#1} }
}
-\cs_new_protected:Npn \xparse_single_token_check_aux:nwn
- #1#2 \xparse_break_point:n #3
+\cs_new_protected:Npn \@@_single_token_check_aux:nwn
+ #1#2 \@@_break_point:n #3
{
- \msg_kernel_error:nnx { xparse } { not-single-token }
+ \__msg_kernel_error:nnx { xparse } { not-single-token }
{ \tl_to_str:n {#1} } { \tl_to_str:n {#3} }
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_bad_arg_spec:wn}
+% \begin{macro}{\@@_bad_arg_spec:wn}
% If the signature is wrong, this provides an escape from the entire
% definition process.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_bad_arg_spec:wn #1 \xparse_break_point:n #2
- { \msg_kernel_error:nnx { xparse } { bad-arg-spec } { \tl_to_str:n {#2} } }
+\cs_new_protected:Npn \@@_bad_arg_spec:wn #1 \@@_break_point:n #2
+ { \__msg_kernel_error:nnx { xparse } { bad-arg-spec } { \tl_to_str:n {#2} } }
% \end{macrocode}
% \end{macro}
%
% \subsection{Preparing the signature: general mechanism}
%
-% \begin{macro}{\xparse_prepare_signature:n}
-% \begin{macro}{\xparse_prepare_signature:N}
-% \begin{macro}{\xparse_prepare_signature_bypass:N}
-% \begin{macro}[aux]{\xparse_prepare_signature_add:N}
+% \begin{macro}{\@@_prepare_signature:n}
+% \begin{macro}{\@@_prepare_signature:N}
+% \begin{macro}{\@@_prepare_signature_bypass:N}
+% \begin{macro}[aux]{\@@_prepare_signature_add:N}
% Actually creating the signature uses the same loop approach as counting
% up mandatory arguments. There are first a number of variables which need
% to be set to track what is going on.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_prepare_signature:n #1
+\cs_new_protected:Npn \@@_prepare_signature:n #1
{
- \bool_set_false:N \l_xparse_all_long_bool
- \int_zero:N \l_xparse_current_arg_int
- \bool_set_false:N \l_xparse_long_bool
- \int_zero:N \l_xparse_m_args_int
- \bool_set_false:N \l_xparse_processor_bool
- \tl_clear:N \l_xparse_signature_tl
- \xparse_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
+ \bool_set_false:N \l_@@_all_long_bool
+ \int_zero:N \l_@@_current_arg_int
+ \bool_set_false:N \l_@@_long_bool
+ \int_zero:N \l_@@_m_args_int
+ \bool_set_false:N \l_@@_processor_bool
+ \tl_clear:N \l_@@_signature_tl
+ \@@_prepare_signature:N #1 \q_recursion_tail \q_recursion_stop
}
% \end{macrocode}
% The main looping function does not take an argument,but carries out the
@@ -1243,19 +1283,19 @@
% process so that when actually setting up processors the flag-reset can
% be bypassed.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_prepare_signature:N
+\cs_new_protected_nopar:Npn \@@_prepare_signature:N
{
- \bool_set_false:N \l_xparse_processor_bool
- \xparse_prepare_signature_bypass:N
+ \bool_set_false:N \l_@@_processor_bool
+ \@@_prepare_signature_bypass:N
}
-\cs_new_protected:Npn \xparse_prepare_signature_bypass:N #1
+\cs_new_protected:Npn \@@_prepare_signature_bypass:N #1
{
\quark_if_recursion_tail_stop:N #1
- \prop_get:NnNTF \c_xparse_shorthands_prop {#1} \l_xparse_tmp_tl
- { \exp_after:wN \xparse_prepare_signature:N \l_xparse_tmp_tl }
+ \prop_get:NnNTF \c_@@_shorthands_prop {#1} \l_@@_tmp_tl
+ { \exp_after:wN \@@_prepare_signature:N \l_@@_tmp_tl }
{
- \int_incr:N \l_xparse_current_arg_int
- \xparse_prepare_signature_add:N #1
+ \int_incr:N \l_@@_current_arg_int
+ \@@_prepare_signature_add:N #1
}
}
% \end{macrocode}
@@ -1264,20 +1304,20 @@
% standard functions, as the approaches are different. Of course, if the type
% is not known at all then a fall-back is needed.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_prepare_signature_add:N #1
+\cs_new_protected:Npn \@@_prepare_signature_add:N #1
{
\cs_if_exist_use:cF
{
- xparse_add
- \bool_if:NT \l_xparse_expandable_bool { _expandable }
+ @@_add
+ \bool_if:NT \l_@@_expandable_bool { _expandable }
_type_ \token_to_str:N #1 :w
}
{
- \msg_kernel_error:nnx { xparse } { unknown-argument-type }
+ \__msg_kernel_error:nnx { xparse } { unknown-argument-type }
{ \token_to_str:N #1 }
- \bool_if:NTF \l_xparse_expandable_bool
- { \xparse_add_expandable_type_m:w }
- { \xparse_add_type_m:w }
+ \bool_if:NTF \l_@@_expandable_bool
+ { \@@_add_expandable_type_m:w }
+ { \@@_add_type_m:w }
}
}
% \end{macrocode}
@@ -1293,195 +1333,195 @@
% arguments are added to the signature, then the appropriate grabber
% is added to the signature. Some of the adding functions also pick up
% one or more arguments, and are also added to the signature. All of the
-% functions then call the loop function \cs{xparse_prepare_signature:N}.
+% functions then call the loop function \cs{@@_prepare_signature:N}.
%
-% \begin{macro}{\xparse_add_type_+:w}
+% \begin{macro}{\@@_add_type_+:w}
% Making the next argument long means setting the flag and knocking one back
% off the total argument count. The \texttt{m} arguments are recorded here as
% this has to be done for every case where there is then a long argument.
% \begin{macrocode}
-\cs_new_protected_nopar:cpn { xparse_add_type_+:w }
+\cs_new_protected_nopar:cpn { @@_add_type_+:w }
{
- \xparse_flush_m_args:
- \bool_set_true:N \l_xparse_long_bool
- \int_decr:N \l_xparse_current_arg_int
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \bool_set_true:N \l_@@_long_bool
+ \int_decr:N \l_@@_current_arg_int
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_>:w}
-% When a processor is found, the function \cs{xparse_process_arg:n} is added
+% \begin{macro}{\@@_add_type_>:w}
+% When a processor is found, the function \cs{@@_process_arg:n} is added
% to the signature along with the processor code itself. When the signature
% is used, the code will be added to an execution list by
-% \cs{xparse_process_arg:n}. Here, the loop calls
-% \cs{xparse_prepare_signature_bypass:N} rather than
-% \cs{xparse_prepare_signature:N} so that the flag is not reset.
+% \cs{@@_process_arg:n}. Here, the loop calls
+% \cs{@@_prepare_signature_bypass:N} rather than
+% \cs{@@_prepare_signature:N} so that the flag is not reset.
% \begin{macrocode}
-\cs_new_protected:cpn { xparse_add_type_>:w } #1
+\cs_new_protected:cpn { @@_add_type_>:w } #1
{
- \bool_set_true:N \l_xparse_processor_bool
- \xparse_flush_m_args:
- \int_decr:N \l_xparse_current_arg_int
- \tl_put_right:Nn \l_xparse_signature_tl { \xparse_process_arg:n {#1} }
- \xparse_prepare_signature_bypass:N
+ \bool_set_true:N \l_@@_processor_bool
+ \@@_flush_m_args:
+ \int_decr:N \l_@@_current_arg_int
+ \tl_put_right:Nn \l_@@_signature_tl { \@@_process_arg:n {#1} }
+ \@@_prepare_signature_bypass:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_d:w, \xparse_add_type_D:w}
+% \begin{macro}{\@@_add_type_d:w, \@@_add_type_D:w}
% To save on repeated code, \texttt{d} is actually turned into the same
-% grabber as is used by \texttt{D}, by putting the \cs{NoValue} default in
+% grabber as is used by \texttt{D}, by putting the |-NoValue-| default in
% the correct place.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_type_d:w #1#2
- { \xparse_add_type_D:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_type_D:w #1#2#3
+\cs_new_protected:Npn \@@_add_type_d:w #1#2
+ { \exp_args:NNNo \@@_add_type_D:w #1 #2 \c_@@_no_value_tl }
+\cs_new_protected:Npn \@@_add_type_D:w #1#2#3
{
- \xparse_flush_m_args:
- \xparse_add_grabber_optional:N D
- \tl_put_right:Nn \l_xparse_signature_tl { #1 #2 {#3} }
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \@@_add_grabber_optional:N D
+ \tl_put_right:Nn \l_@@_signature_tl { #1 #2 {#3} }
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_g:w}
+% \begin{macro}{\@@_add_type_g:w}
% The \texttt{g} type is simply an alias for \texttt{G} with the correct
% default built-in.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_type_g:w
- { \xparse_add_type_G:w { \NoValue } }
+\cs_new_protected_nopar:Npn \@@_add_type_g:w
+ { \exp_args:No \@@_add_type_G:w \c_@@_no_value_tl }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_G:w}
+% \begin{macro}{\@@_add_type_G:w}
% For the \texttt{G} type, the grabber and the default are added to the
% signature.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_type_G:w #1
+\cs_new_protected:Npn \@@_add_type_G:w #1
{
- \xparse_flush_m_args:
- \xparse_add_grabber_optional:N G
- \tl_put_right:Nn \l_xparse_signature_tl { {#1} }
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \@@_add_grabber_optional:N G
+ \tl_put_right:Nn \l_@@_signature_tl { {#1} }
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_l:w}
+% \begin{macro}{\@@_add_type_l:w}
% Finding \texttt{l} arguments is very simple: there is nothing to do
% other than add the grabber.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_type_l:w
+\cs_new_protected_nopar:Npn \@@_add_type_l:w
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N l
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \@@_add_grabber_mandatory:N l
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_m:w}
+% \begin{macro}{\@@_add_type_m:w}
% The \texttt{m} type is special as short arguments which are not
% post-processed are simply counted at this stage. Thus there is a check
% to see if either of these cases apply. If so, a one-argument grabber
% is added to the signature. On the other hand, if a standard short
% argument is required it is simply counted at this stage, to be
-% added later using \cs{xparse_flush_m_args:}.
+% added later using \cs{@@_flush_m_args:}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_type_m:w
+\cs_new_protected_nopar:Npn \@@_add_type_m:w
{
- \bool_if:nTF { \l_xparse_long_bool || \l_xparse_processor_bool }
+ \bool_if:nTF { \l_@@_long_bool || \l_@@_processor_bool }
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N m
+ \@@_flush_m_args:
+ \@@_add_grabber_mandatory:N m
}
- { \int_incr:N \l_xparse_m_args_int }
- \xparse_prepare_signature:N
+ { \int_incr:N \l_@@_m_args_int }
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_r:w, \xparse_add_type_R:w}
+% \begin{macro}{\@@_add_type_r:w, \@@_add_type_R:w}
% The \texttt{r}- and \texttt{R}-type arguments are very similar to the
% \texttt{d}- and \texttt{D}-types.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_type_r:w #1#2
- { \xparse_add_type_R:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_type_R:w #1#2#3
+\cs_new_protected:Npn \@@_add_type_r:w #1#2
+ { \exp_args:NNNo \@@_add_type_R:w #1 #2 \c_@@_no_value_tl }
+\cs_new_protected:Npn \@@_add_type_R:w #1#2#3
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N R
- \tl_put_right:Nn \l_xparse_signature_tl { #1 #2 {#3} }
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \@@_add_grabber_mandatory:N R
+ \tl_put_right:Nn \l_@@_signature_tl { #1 #2 {#3} }
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_t:w}
+% \begin{macro}{\@@_add_type_t:w}
% Setting up a \texttt{t} argument means collecting one token for the test,
% and adding it along with the grabber to the signature.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_type_t:w #1
+\cs_new_protected:Npn \@@_add_type_t:w #1
{
- \xparse_flush_m_args:
- \xparse_add_grabber_optional:N t
- \tl_put_right:Nn \l_xparse_signature_tl { #1 }
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \@@_add_grabber_optional:N t
+ \tl_put_right:Nn \l_@@_signature_tl { #1 }
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_u:w}
+% \begin{macro}{\@@_add_type_u:w}
% At the set up stage, the \texttt{u} type argument is identical to the
% \texttt{G} type except for the name of the grabber function.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_type_u:w #1
+\cs_new_protected:Npn \@@_add_type_u:w #1
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N u
- \tl_put_right:Nn \l_xparse_signature_tl { {#1} }
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \@@_add_grabber_mandatory:N u
+ \tl_put_right:Nn \l_@@_signature_tl { {#1} }
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_type_v:w}
+% \begin{macro}{\@@_add_type_v:w}
% At this stage, the \texttt{v} argument is identical to \texttt{l}.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_type_v:w
+\cs_new_protected_nopar:Npn \@@_add_type_v:w
{
- \xparse_flush_m_args:
- \xparse_add_grabber_mandatory:N v
- \xparse_prepare_signature:N
+ \@@_flush_m_args:
+ \@@_add_grabber_mandatory:N v
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_flush_m_args:}
+% \begin{macro}{\@@_flush_m_args:}
% As \texttt{m} arguments are simply counted, there is a need to add
% them to the token register in a block. As this function can only
% be called if something other than \texttt{m} turns up, the flag can
% be switched here. The total number of mandatory arguments added to
% the signature is also decreased by the appropriate amount.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_flush_m_args:
+\cs_new_protected_nopar:Npn \@@_flush_m_args:
{
- \int_compare:nNnT \l_xparse_m_args_int > \c_zero
+ \int_compare:nNnT \l_@@_m_args_int > \c_zero
{
- \tl_put_right:Nx \l_xparse_signature_tl
- { \exp_not:c { xparse_grab_m_ \int_use:N \l_xparse_m_args_int :w } }
- \int_set:Nn \l_xparse_mandatory_args_int
- { \l_xparse_mandatory_args_int - \l_xparse_m_args_int }
+ \tl_put_right:Nx \l_@@_signature_tl
+ { \exp_not:c { @@_grab_m_ \int_use:N \l_@@_m_args_int :w } }
+ \int_set:Nn \l_@@_mandatory_args_int
+ { \l_@@_mandatory_args_int - \l_@@_m_args_int }
}
- \int_zero:N \l_xparse_m_args_int
+ \int_zero:N \l_@@_m_args_int
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_grabber_mandatory:N}
-% \begin{macro}{\xparse_add_grabber_optional:N}
+% \begin{macro}{\@@_add_grabber_mandatory:N}
+% \begin{macro}{\@@_add_grabber_optional:N}
% To keep the various checks needed in one place, adding the grabber to
% the signature is done here. For mandatory arguments, the only question
% is whether to add a long grabber. For optional arguments, there is
@@ -1489,30 +1529,30 @@
% This is used to determine whether to skip spaces or not where
% searching for the argument.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_grabber_mandatory:N #1
+\cs_new_protected_nopar:Npn \@@_add_grabber_mandatory:N #1
{
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l_@@_signature_tl
{
\exp_not:c
- { xparse_grab_ #1 \bool_if:NT \l_xparse_long_bool { _long } :w }
+ { @@_grab_ #1 \bool_if:NT \l_@@_long_bool { _long } :w }
}
- \bool_set_false:N \l_xparse_long_bool
- \int_decr:N \l_xparse_mandatory_args_int
+ \bool_set_false:N \l_@@_long_bool
+ \int_decr:N \l_@@_mandatory_args_int
}
-\cs_new_protected_nopar:Npn \xparse_add_grabber_optional:N #1
+\cs_new_protected_nopar:Npn \@@_add_grabber_optional:N #1
{
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l_@@_signature_tl
{
\exp_not:c
{
- xparse_grab_ #1
- \bool_if:NT \l_xparse_long_bool { _long }
- \int_compare:nNnF \l_xparse_mandatory_args_int > \c_zero
+ @@_grab_ #1
+ \bool_if:NT \l_@@_long_bool { _long }
+ \int_compare:nNnF \l_@@_mandatory_args_int > \c_zero
{ _trailing }
:w
}
}
- \bool_set_false:N \l_xparse_long_bool
+ \bool_set_false:N \l_@@_long_bool
}
% \end{macrocode}
% \end{macro}
@@ -1525,94 +1565,97 @@
% also a need to define the per-function auxiliaries: this is done here, while
% the general grabbers are dealt with later.
%
-% \begin{macro}{\xparse_add_expandable_type_+:w}
+% \begin{macro}{\@@_add_expandable_type_+:w}
% Check that a plus is given only if it occurs for every argument.
% \begin{macrocode}
-\cs_new_protected_nopar:cpn { xparse_add_expandable_type_+:w }
+\cs_new_protected_nopar:cpn { @@_add_expandable_type_+:w }
{
- \bool_set_true:N \l_xparse_long_bool
- \int_compare:nNnTF \l_xparse_current_arg_int = \c_one
- { \bool_set_true:N \l_xparse_all_long_bool }
+ \bool_set_true:N \l_@@_long_bool
+ \int_compare:nNnTF \l_@@_current_arg_int = \c_one
+ { \bool_set_true:N \l_@@_all_long_bool }
{
- \bool_if:NF \l_xparse_all_long_bool
- { \msg_kernel_error:nn { xparse } { inconsistent-long } }
+ \bool_if:NF \l_@@_all_long_bool
+ { \__msg_kernel_error:nn { xparse } { inconsistent-long } }
}
- \int_decr:N \l_xparse_current_arg_int
- \xparse_prepare_signature:N
+ \int_decr:N \l_@@_current_arg_int
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_>:w}
+% \begin{macro}{\@@_add_expandable_type_>:w}
% No processors in expandable arguments, so this issues an error.
% \begin{macrocode}
-\cs_new_protected:cpn { xparse_add_expandable_type_>:w } #1
+\cs_new_protected:cpn { @@_add_expandable_type_>:w } #1
{
- \msg_kernel_error:nnx { xparse } { processor-in-expandable }
- { \token_to_str:c { \l_xparse_function_tl } }
- \int_decr:N \l_xparse_current_arg_int
- \xparse_prepare_signature:N
+ \__msg_kernel_error:nnx { xparse } { processor-in-expandable }
+ { \token_to_str:c { \l_@@_function_tl } }
+ \int_decr:N \l_@@_current_arg_int
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_d:w}
-% \begin{macro}{\xparse_add_expandable_type_D:w}
-% \begin{macro}{\xparse_add_expandable_type_D_aux:NNn}
-% \begin{macro}{\xparse_add_expandable_type_D_aux:Nn}
+% \begin{macro}{\@@_add_expandable_type_d:w}
+% \begin{macro}{\@@_add_expandable_type_D:w}
+% \begin{macro}{\@@_add_expandable_type_D_aux:NNn}
+% \begin{macro}{\@@_add_expandable_type_D_aux:Nn}
% The set up for \texttt{d}- and \texttt{D}-type arguments is the same,
% and involves constructing a rather complex auxiliary which is used
% repeatedly when grabbing. There is an auxiliary here so that the
% \texttt{R}-type can share code readily.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_expandable_type_d:w #1#2
- { \xparse_add_expandable_type_D:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_expandable_type_D:w #1#2
+\cs_new_protected:Npn \@@_add_expandable_type_d:w #1#2
+ {
+ \exp_args:NNNo
+ \@@_add_expandable_type_D:w #1 #2 \c_@@_no_value_tl
+ }
+\cs_new_protected:Npn \@@_add_expandable_type_D:w #1#2
{
\token_if_eq_meaning:NNTF #1 #2
{
- \xparse_add_expandable_grabber_optional:n { D_alt }
- \xparse_add_expandable_type_D_aux:Nn #1
+ \@@_add_expandable_grabber_optional:n { D_alt }
+ \@@_add_expandable_type_D_aux:Nn #1
}
{
- \xparse_add_expandable_grabber_optional:n { D }
- \xparse_add_expandable_type_D_aux:NNn #1#2
+ \@@_add_expandable_grabber_optional:n { D }
+ \@@_add_expandable_type_D_aux:NNn #1#2
}
}
-\cs_new_protected:Npn \xparse_add_expandable_type_D_aux:NNn #1#2#3
+\cs_new_protected:Npn \@@_add_expandable_type_D_aux:NNn #1#2#3
{
- \bool_if:NTF \l_xparse_long_bool
+ \bool_if:NTF \l_@@_all_long_bool
{ \cs_set:cpx }
{ \cs_set_nopar:cpx }
- { \l_xparse_expandable_aux_name_tl } ##1 ##2 #1 ##3 \q_xparse ##4 #2
+ { \l_@@_expandable_aux_name_tl } ##1 ##2 #1 ##3 \q_@@ ##4 #2
{ ##1 {##2} {##3} {##4} }
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l_@@_signature_tl
{
- \exp_not:c { \l_xparse_expandable_aux_name_tl }
+ \exp_not:c { \l_@@_expandable_aux_name_tl }
\exp_not:n { #1 #2 {#3} }
}
- \bool_set_false:N \l_xparse_long_bool
- \xparse_prepare_signature:N
+ \bool_set_false:N \l_@@_long_bool
+ \@@_prepare_signature:N
}
% \end{macrocode}
% This route is needed if the two delimiting tokens are identical: in
% contrast to the non-expandable route, the grabber here has to act
% differently for this case.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_expandable_type_D_aux:Nn #1#2
+\cs_new_protected:Npn \@@_add_expandable_type_D_aux:Nn #1#2
{
- \bool_if:NTF \l_xparse_long_bool
+ \bool_if:NTF \l_@@_all_long_bool
{ \cs_set:cpx }
{ \cs_set_nopar:cpx }
- { \l_xparse_expandable_aux_name_tl } ##1 #1 ##2 #1
+ { \l_@@_expandable_aux_name_tl } ##1 #1 ##2 #1
{ ##1 {##2} }
- \tl_put_right:Nx \l_xparse_signature_tl
+ \tl_put_right:Nx \l_@@_signature_tl
{
- \exp_not:c { \l_xparse_expandable_aux_name_tl }
+ \exp_not:c { \l_@@_expandable_aux_name_tl }
\exp_not:n { #1 {#2} }
}
- \bool_set_false:N \l_xparse_long_bool
- \xparse_prepare_signature:N
+ \bool_set_false:N \l_@@_long_bool
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
@@ -1620,150 +1663,153 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_g:w}
-% \begin{macro}{\xparse_add_expandable_type_G:w}
+% \begin{macro}{\@@_add_expandable_type_g:w}
+% \begin{macro}{\@@_add_expandable_type_G:w}
% These are not allowed at all, so there is a complaint and a fall-back.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_g:w
+\cs_new_protected_nopar:Npn \@@_add_expandable_type_g:w
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
+ \@@_add_expandable_type_m:w
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_G:w #1
+\cs_new_protected_nopar:Npn \@@_add_expandable_type_G:w #1
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
+ \@@_add_expandable_type_m:w
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_l:w}
+% \begin{macro}{\@@_add_expandable_type_l:w}
% Invalid in expandable contexts (as the next left brace may have been
% inserted by \pkg{xparse} due to a failed search for an optional argument).
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_l:w
+\cs_new_protected_nopar:Npn \@@_add_expandable_type_l:w
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
+ \@@_add_expandable_type_m:w
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_m:w}
+% \begin{macro}{\@@_add_expandable_type_m:w}
% Unlike the standard case, when working expandably each argument is always
% grabbed separately unless the function takes only \texttt{m}-type
% arguments. To deal with the latter case, the value of
-% \cs{l_xparse_m_args_int} needs to be increased appropriately.
+% \cs{l_@@_m_args_int} needs to be increased appropriately.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_m:w
+\cs_new_protected_nopar:Npn \@@_add_expandable_type_m:w
{
- \int_incr:N \l_xparse_m_args_int
- \xparse_add_expandable_grabber_mandatory:n { m }
- \bool_set_false:N \l_xparse_long_bool
- \xparse_prepare_signature:N
+ \int_incr:N \l_@@_m_args_int
+ \@@_add_expandable_grabber_mandatory:n { m }
+ \bool_set_false:N \l_@@_long_bool
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_r:w}
-% \begin{macro}{\xparse_add_expandable_type_R:w}
+% \begin{macro}{\@@_add_expandable_type_r:w}
+% \begin{macro}{\@@_add_expandable_type_R:w}
% The \texttt{r}- and \texttt{R}-types are very similar to \texttt{D}-type
% arguments, and so the same internals are used.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_expandable_type_r:w #1#2
- { \xparse_add_expandable_type_R:w #1 #2 { \NoValue } }
-\cs_new_protected:Npn \xparse_add_expandable_type_R:w #1#2
+\cs_new_protected:Npn \@@_add_expandable_type_r:w #1#2
+ {
+ \exp_args:NNNo
+ \@@_add_expandable_type_R:w #1 #2 \c_@@_no_value_tl
+ }
+\cs_new_protected:Npn \@@_add_expandable_type_R:w #1#2
{
\token_if_eq_meaning:NNTF #1 #2
{
- \xparse_add_expandable_grabber_optional:n { R_alt }
- \xparse_add_expandable_type_D_aux:Nn #1
+ \@@_add_expandable_grabber_optional:n { R_alt }
+ \@@_add_expandable_type_D_aux:Nn #1
}
{
- \xparse_add_expandable_grabber_optional:n { R }
- \xparse_add_expandable_type_D_aux:NNn #1#2
+ \@@_add_expandable_grabber_optional:n { R }
+ \@@_add_expandable_type_D_aux:NNn #1#2
}
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_t:w}
+% \begin{macro}{\@@_add_expandable_type_t:w}
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_t:w #1
+\cs_new_protected_nopar:Npn \@@_add_expandable_type_t:w #1
{
- \xparse_add_expandable_grabber_optional:n { t }
- \bool_if:NTF \l_xparse_long_bool
+ \@@_add_expandable_grabber_optional:n { t }
+ \bool_if:NTF \l_@@_all_long_bool
{ \cs_set:cpn }
{ \cs_set_nopar:cpn }
- { \l_xparse_expandable_aux_name_tl } ##1 #1 {##1}
- \tl_put_right:Nx \l_xparse_signature_tl
+ { \l_@@_expandable_aux_name_tl } ##1 #1 {##1}
+ \tl_put_right:Nx \l_@@_signature_tl
{
- \exp_not:c { \l_xparse_expandable_aux_name_tl }
+ \exp_not:c { \l_@@_expandable_aux_name_tl }
\exp_not:N #1
}
- \bool_set_false:N \l_xparse_long_bool
- \xparse_prepare_signature:N
+ \bool_set_false:N \l_@@_long_bool
+ \@@_prepare_signature:N
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_u:w}
+% \begin{macro}{\@@_add_expandable_type_u:w}
% Invalid in an expandable context as any preceding optional argument may
% wrap part of the delimiter up in braces.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_u:w #1
+\cs_new_protected_nopar:Npn \@@_add_expandable_type_u:w #1
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
+ \@@_add_expandable_type_m:w
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_expandable_type_v:w}
+% \begin{macro}{\@@_add_expandable_type_v:w}
% Another forbidden type.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_type_v:w
+\cs_new_protected_nopar:Npn \@@_add_expandable_type_v:w
{
- \msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
- \xparse_add_expandable_type_m:w
+ \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
+ \@@_add_expandable_type_m:w
}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}
% {
-% \xparse_add_expandable_grabber_mandatory:n,
-% \xparse_add_expandable_grabber_optional:n
+% \@@_add_expandable_grabber_mandatory:n,
+% \@@_add_expandable_grabber_optional:n
% }
-% \begin{macro}[aux]{\xparse_add_expandable_long_check:}
+% \begin{macro}[aux]{\@@_add_expandable_long_check:}
% Adding a grabber to the signature is very simple here, with only a test to
% ensure that optional arguments still have mandatory ones to follow. This
% is also a good place to check on the consistency of the long status of
% arguments.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_grabber_mandatory:n #1
+\cs_new_protected_nopar:Npn \@@_add_expandable_grabber_mandatory:n #1
{
- \xparse_add_expandable_long_check:
- \tl_put_right:Nx \l_xparse_signature_tl
- { \exp_not:c { xparse_expandable_grab_ #1 :w } }
- \bool_set_false:N \l_xparse_long_bool
- \int_decr:N \l_xparse_mandatory_args_int
+ \@@_add_expandable_long_check:
+ \tl_put_right:Nx \l_@@_signature_tl
+ { \exp_not:c { @@_expandable_grab_ #1 :w } }
+ \bool_set_false:N \l_@@_long_bool
+ \int_decr:N \l_@@_mandatory_args_int
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_grabber_optional:n #1
+\cs_new_protected_nopar:Npn \@@_add_expandable_grabber_optional:n #1
{
- \xparse_add_expandable_long_check:
- \int_compare:nNnF \l_xparse_mandatory_args_int > \c_zero
- { \msg_kernel_error:nn { xparse } { expandable-ending-optional } }
- \tl_put_right:Nx \l_xparse_signature_tl
- { \exp_not:c { xparse_expandable_grab_ #1 :w } }
- \bool_set_false:N \l_xparse_long_bool
+ \@@_add_expandable_long_check:
+ \int_compare:nNnF \l_@@_mandatory_args_int > \c_zero
+ { \__msg_kernel_error:nn { xparse } { expandable-ending-optional } }
+ \tl_put_right:Nx \l_@@_signature_tl
+ { \exp_not:c { @@_expandable_grab_ #1 :w } }
+ \bool_set_false:N \l_@@_long_bool
}
-\cs_new_protected_nopar:Npn \xparse_add_expandable_long_check:
+\cs_new_protected_nopar:Npn \@@_add_expandable_long_check:
{
- \bool_if:nT { \l_xparse_all_long_bool && ! ( \l_xparse_long_bool ) }
- { \msg_kernel_error:nn { xparse } { inconsistent-long } }
+ \bool_if:nT { \l_@@_all_long_bool && ! ( \l_@@_long_bool ) }
+ { \__msg_kernel_error:nn { xparse } { inconsistent-long } }
}
% \end{macrocode}
% \end{macro}
@@ -1776,11 +1822,11 @@
% \cs{parse_grab_arg:w} to grab the argument. This means determining
% whether to use \cs{cs_set:Npn} or \cs{cs_set_nopar:Npn}, and for
% optional arguments whether to skip spaces. In all cases,
-% \cs{xparse_grab_arg:w} is then called to actually do the grabbing.
+% \cs{@@_grab_arg:w} is then called to actually do the grabbing.
%
-% \begin{macro}{\xparse_grab_arg:w}
-% \begin{macro}[aux]{\xparse_grab_arg_aux_i:w}
-% \begin{macro}[aux]{\xparse_grab_arg_aux_ii:w}
+% \begin{macro}{\@@_grab_arg:w}
+% \begin{macro}[aux]{\@@_grab_arg_aux_i:w}
+% \begin{macro}[aux]{\@@_grab_arg_aux_ii:w}
% Each time an argument is actually grabbed, \pkg{xparse} defines a
% function to do it. In that way, long arguments from previous functions
% can be included in the definition of the grabber function, so that
@@ -1788,39 +1834,39 @@
% for this is reserved here. A couple of auxiliary functions are also
% needed in various places.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_arg:w { }
-\cs_new_protected:Npn \xparse_grab_arg_aux_i:w { }
-\cs_new_protected:Npn \xparse_grab_arg_aux_ii:w { }
+\cs_new_protected:Npn \@@_grab_arg:w { }
+\cs_new_protected:Npn \@@_grab_arg_aux_i:w { }
+\cs_new_protected:Npn \@@_grab_arg_aux_ii:w { }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_D:w}
-% \begin{macro}{\xparse_grab_D_long:w}
-% \begin{macro}{\xparse_grab_D_trailing:w}
-% \begin{macro}{\xparse_grab_D_long_trailing:w}
+% \begin{macro}{\@@_grab_D:w}
+% \begin{macro}{\@@_grab_D_long:w}
+% \begin{macro}{\@@_grab_D_trailing:w}
+% \begin{macro}{\@@_grab_D_long_trailing:w}
% The generic delimited argument grabber. The auxiliary function does
-% a peek test before calling \cs{xparse_grab_arg:w}, so that the
+% a peek test before calling \cs{@@_grab_arg:w}, so that the
% optional nature of the argument works as expected.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_D:w #1#2#3#4 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_D:w #1#2#3#4 \l_@@_args_tl
{
- \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn
+ \@@_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_D_long:w #1#2#3#4 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_D_long:w #1#2#3#4 \l_@@_args_tl
{
- \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn
+ \@@_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_D_trailing:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn { } }
-\cs_new_protected:Npn \xparse_grab_D_long_trailing:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn { } }
+\cs_new_protected:Npn \@@_grab_D_trailing:w #1#2#3#4 \l_@@_args_tl
+ { \@@_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn { } }
+\cs_new_protected:Npn \@@_grab_D_long_trailing:w #1#2#3#4 \l_@@_args_tl
+ { \@@_grab_D_aux:NNnnNn #1 #2 {#3} {#4} \cs_set_protected:Npn { } }
% \end{macrocode}
-% \begin{macro}[aux]{\xparse_grab_D_aux:NNnnNn}
-% \begin{macro}[aux]{\xparse_grab_D_aux:NNnN}
+% \begin{macro}[aux]{\@@_grab_D_aux:NNnnNn}
+% \begin{macro}[aux]{\@@_grab_D_aux:NNnN}
% This is a bit complicated. The idea is that, in order to check for
% nested optional argument tokens (\texttt{[[...]]} and so on) the
% argument needs to be grabbed without removing any braces at all. If
@@ -1829,27 +1875,27 @@
% prevents loss of braces, and there is then a test to see if there are
% nested delimiters to handle.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_D_aux:NNnnNn #1#2#3#4#5#6
+\cs_new_protected:Npn \@@_grab_D_aux:NNnnNn #1#2#3#4#5#6
{
- \xparse_grab_D_aux:NNnN #1#2 {#4} #5
+ \@@_grab_D_aux:NNnN #1#2 {#4} #5
\use:c { peek_meaning_remove #6 :NTF } #1
- { \xparse_grab_arg:w }
+ { \@@_grab_arg:w }
{
- \xparse_add_arg:n {#3}
- #4 \l_xparse_args_tl
+ \@@_add_arg:n {#3}
+ #4 \l_@@_args_tl
}
}
-\cs_new_protected:Npn \xparse_grab_D_aux:NNnN #1#2#3#4
+\cs_new_protected:Npn \@@_grab_D_aux:NNnN #1#2#3#4
{
- \cs_set_protected_nopar:Npn \xparse_grab_arg:w
+ \cs_set_protected_nopar:Npn \@@_grab_arg:w
{
- \exp_after:wN #4 \l_xparse_fn_tl ####1 #2
+ \exp_after:wN #4 \l_@@_fn_tl ####1 #2
{
\tl_if_in:nnTF {####1} {#1}
- { \xparse_grab_D_nested:NNnnN #1 #2 {####1} {#3} #4 }
+ { \@@_grab_D_nested:NNnnN #1 #2 {####1} {#3} #4 }
{
- \xparse_add_arg:o { \use_none:n ####1 }
- #3 \l_xparse_args_tl
+ \@@_add_arg:o { \use_none:n ####1 }
+ #3 \l_@@_args_tl
}
}
% \end{macrocode}
@@ -1873,7 +1919,7 @@
\tl_to_lowercase:n
{
\group_end:
- \l_xparse_fn_tl A
+ \l_@@_fn_tl A
}
}
{
@@ -1881,7 +1927,7 @@
\tl_to_lowercase:n
{
\group_end:
- \l_xparse_fn_tl ^
+ \l_@@_fn_tl ^
}
}
}
@@ -1893,11 +1939,11 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \begin{macro}[aux]{\xparse_grab_D_nested:NNnnN}
-% \begin{macro}[aux]{\xparse_grab_D_nested:w}
-% \begin{macro}{\l_xparse_nesting_a_tl}
-% \begin{macro}{\l_xparse_nesting_b_tl}
-% \begin{macro}{\q_xparse}
+% \begin{macro}[aux]{\@@_grab_D_nested:NNnnN}
+% \begin{macro}[aux]{\@@_grab_D_nested:w}
+% \begin{macro}{\l_@@_nesting_a_tl}
+% \begin{macro}{\l_@@_nesting_b_tl}
+% \begin{macro}{\q_@@}
% Catching nested optional arguments means more work. The aim here is
% to collect up each pair of optional tokens without \TeX{} helping out,
% and without counting anything. The code above will already have
@@ -1915,43 +1961,43 @@
% loss of any braces, hence the insertion and removal of quarks along the
% way.
% \begin{macrocode}
-\tl_new:N \l_xparse_nesting_a_tl
-\tl_new:N \l_xparse_nesting_b_tl
-\quark_new:N \q_xparse
-\cs_new_protected:Npn \xparse_grab_D_nested:NNnnN #1#2#3#4#5
+\tl_new:N \l_@@_nesting_a_tl
+\tl_new:N \l_@@_nesting_b_tl
+\quark_new:N \q_@@
+\cs_new_protected:Npn \@@_grab_D_nested:NNnnN #1#2#3#4#5
{
- \tl_clear:N \l_xparse_nesting_a_tl
- \tl_clear:N \l_xparse_nesting_b_tl
- \exp_after:wN #5 \l_xparse_fn_tl ##1 #1 ##2 \q_xparse ##3 #2
+ \tl_clear:N \l_@@_nesting_a_tl
+ \tl_clear:N \l_@@_nesting_b_tl
+ \exp_after:wN #5 \l_@@_fn_tl ##1 #1 ##2 \q_@@ ##3 #2
{
- \tl_put_right:No \l_xparse_nesting_a_tl { \use_none:n ##1 #1 }
- \tl_put_right:No \l_xparse_nesting_b_tl { \use_i:nn #2 ##3 }
+ \tl_put_right:No \l_@@_nesting_a_tl { \use_none:n ##1 #1 }
+ \tl_put_right:No \l_@@_nesting_b_tl { \use_i:nn #2 ##3 }
\tl_if_in:nnTF {##2} {#1}
{
- \l_xparse_fn_tl
- \q_nil ##2 \q_xparse \ERROR
+ \l_@@_fn_tl
+ \q_nil ##2 \q_@@ \ERROR
}
{
- \tl_put_right:Nx \l_xparse_nesting_a_tl
- { \xparse_grab_D_nested:w \q_nil ##2 \q_stop }
- \tl_if_in:NnTF \l_xparse_nesting_b_tl {#1}
+ \tl_put_right:Nx \l_@@_nesting_a_tl
+ { \@@_grab_D_nested:w \q_nil ##2 \q_stop }
+ \tl_if_in:NnTF \l_@@_nesting_b_tl {#1}
{
- \tl_set_eq:NN \l_xparse_tmp_tl \l_xparse_nesting_b_tl
- \tl_clear:N \l_xparse_nesting_b_tl
- \exp_after:wN \l_xparse_fn_tl \exp_after:wN
- \q_nil \l_xparse_tmp_tl \q_nil \q_xparse \ERROR
+ \tl_set_eq:NN \l_@@_tmp_tl \l_@@_nesting_b_tl
+ \tl_clear:N \l_@@_nesting_b_tl
+ \exp_after:wN \l_@@_fn_tl \exp_after:wN
+ \q_nil \l_@@_tmp_tl \q_nil \q_@@ \ERROR
}
{
- \tl_put_right:No \l_xparse_nesting_a_tl
- \l_xparse_nesting_b_tl
- \xparse_add_arg:V \l_xparse_nesting_a_tl
- #4 \l_xparse_args_tl
+ \tl_put_right:No \l_@@_nesting_a_tl
+ \l_@@_nesting_b_tl
+ \@@_add_arg:V \l_@@_nesting_a_tl
+ #4 \l_@@_args_tl
}
}
}
- \l_xparse_fn_tl #3 \q_nil \q_xparse \ERROR
+ \l_@@_fn_tl #3 \q_nil \q_@@ \ERROR
}
-\cs_new:Npn \xparse_grab_D_nested:w #1 \q_nil \q_stop
+\cs_new:Npn \@@_grab_D_nested:w #1 \q_nil \q_stop
{ \exp_not:o { \use_none:n #1 } }
% \end{macrocode}
% \end{macro}
@@ -1960,39 +2006,39 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_G:w}
-% \begin{macro}{\xparse_grab_G_long:w}
-% \begin{macro}{\xparse_grab_G_trailing:w}
-% \begin{macro}{\xparse_grab_G_long_trailing:w}
-% \begin{macro}[aux]{\xparse_grab_G_aux:nnNn}
+% \begin{macro}{\@@_grab_G:w}
+% \begin{macro}{\@@_grab_G_long:w}
+% \begin{macro}{\@@_grab_G_trailing:w}
+% \begin{macro}{\@@_grab_G_long_trailing:w}
+% \begin{macro}[aux]{\@@_grab_G_aux:nnNn}
% Optional groups are checked by meaning, so that the same code will
% work with, for example, Con\TeX{}t-like input.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_G:w #1#2 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_G:w #1#2 \l_@@_args_tl
{
- \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn
+ \@@_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_G_long:w #1#2 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_G_long:w #1#2 \l_@@_args_tl
{
- \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { _ignore_spaces }
+ \@@_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_G_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn { } }
-\cs_new_protected:Npn \xparse_grab_G_long_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { } }
-\cs_new_protected:Npn \xparse_grab_G_aux:nnNn #1#2#3#4
+\cs_new_protected:Npn \@@_grab_G_trailing:w #1#2 \l_@@_args_tl
+ { \@@_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn { } }
+\cs_new_protected:Npn \@@_grab_G_long_trailing:w #1#2 \l_@@_args_tl
+ { \@@_grab_G_aux:nnNn {#1} {#2} \cs_set_protected:Npn { } }
+\cs_new_protected:Npn \@@_grab_G_aux:nnNn #1#2#3#4
{
- \exp_after:wN #3 \l_xparse_fn_tl ##1
+ \exp_after:wN #3 \l_@@_fn_tl ##1
{
- \xparse_add_arg:n {##1}
- #2 \l_xparse_args_tl
+ \@@_add_arg:n {##1}
+ #2 \l_@@_args_tl
}
\use:c { peek_meaning #4 :NTF } \c_group_begin_token
- { \l_xparse_fn_tl }
+ { \l_@@_fn_tl }
{
- \xparse_add_arg:n {#1}
- #2 \l_xparse_args_tl
+ \@@_add_arg:n {#1}
+ #2 \l_@@_args_tl
}
}
% \end{macrocode}
@@ -2002,149 +2048,149 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_l:w}
-% \begin{macro}{\xparse_grab_l_long:w}
-% \begin{macro}[aux]{\xparse_grab_l_aux:nN}
+% \begin{macro}{\@@_grab_l:w}
+% \begin{macro}{\@@_grab_l_long:w}
+% \begin{macro}[aux]{\@@_grab_l_aux:nN}
% Argument grabbers for mandatory \TeX{} arguments are pretty simple.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_l:w #1 \l_xparse_args_tl
- { \xparse_grab_l_aux:nN {#1} \cs_set_protected_nopar:Npn }
-\cs_new_protected:Npn \xparse_grab_l_long:w #1 \l_xparse_args_tl
- { \xparse_grab_l_aux:nN {#1} \cs_set_protected:Npn }
-\cs_new_protected:Npn \xparse_grab_l_aux:nN #1#2
+\cs_new_protected:Npn \@@_grab_l:w #1 \l_@@_args_tl
+ { \@@_grab_l_aux:nN {#1} \cs_set_protected_nopar:Npn }
+\cs_new_protected:Npn \@@_grab_l_long:w #1 \l_@@_args_tl
+ { \@@_grab_l_aux:nN {#1} \cs_set_protected:Npn }
+\cs_new_protected:Npn \@@_grab_l_aux:nN #1#2
{
- \exp_after:wN #2 \l_xparse_fn_tl ##1##
+ \exp_after:wN #2 \l_@@_fn_tl ##1##
{
- \xparse_add_arg:n {##1}
- #1 \l_xparse_args_tl
+ \@@_add_arg:n {##1}
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_m:w}
-% \begin{macro}{\xparse_grab_m_long:w}
+% \begin{macro}{\@@_grab_m:w}
+% \begin{macro}{\@@_grab_m_long:w}
% Collecting a single mandatory argument is quite easy.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_m:w #1 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_m:w #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl ##1
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl ##1
{
- \xparse_add_arg:n {##1}
- #1 \l_xparse_args_tl
+ \@@_add_arg:n {##1}
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:Npn \xparse_grab_m_long:w #1 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_m_long:w #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected:Npn \l_xparse_fn_tl ##1
+ \exp_after:wN \cs_set_protected:Npn \l_@@_fn_tl ##1
{
- \xparse_add_arg:n {##1}
- #1 \l_xparse_args_tl
+ \@@_add_arg:n {##1}
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_m_1:w}
-% \begin{macro}{\xparse_grab_m_2:w}
-% \begin{macro}{\xparse_grab_m_3:w}
-% \begin{macro}{\xparse_grab_m_4:w}
-% \begin{macro}{\xparse_grab_m_5:w}
-% \begin{macro}{\xparse_grab_m_6:w}
-% \begin{macro}{\xparse_grab_m_7:w}
-% \begin{macro}{\xparse_grab_m_8:w}
+% \begin{macro}{\@@_grab_m_1:w}
+% \begin{macro}{\@@_grab_m_2:w}
+% \begin{macro}{\@@_grab_m_3:w}
+% \begin{macro}{\@@_grab_m_4:w}
+% \begin{macro}{\@@_grab_m_5:w}
+% \begin{macro}{\@@_grab_m_6:w}
+% \begin{macro}{\@@_grab_m_7:w}
+% \begin{macro}{\@@_grab_m_8:w}
% Grabbing 1--8 mandatory arguments. We don't need to worry about
% nine arguments as this is only possible if everything is
% mandatory. Each function has an auxiliary so that \cs{par} tokens
% from other arguments still work.
% \begin{macrocode}
-\cs_new_protected:cpn { xparse_grab_m_1:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_1:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl ##1
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl ##1
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl { {##1} }
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_2:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_2:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl
##1##2
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl { {##1} {##2} }
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_3:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_3:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl
##1##2##3
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl { {##1} {##2} {##3} }
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_4:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_4:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl
##1##2##3##4
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} {##4} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl { {##1} {##2} {##3} {##4} }
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_5:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_5:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl
##1##2##3##4##5
{
- \tl_put_right:Nn \l_xparse_args_tl { {##1} {##2} {##3} {##4} {##5} }
- #1 \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl { {##1} {##2} {##3} {##4} {##5} }
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_6:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_6:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl
##1##2##3##4##5##6
{
- \tl_put_right:Nn \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl
{ {##1} {##2} {##3} {##4} {##5} {##6} }
- #1 \l_xparse_args_tl
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_7:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_7:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl
##1##2##3##4##5##6##7
{
- \tl_put_right:Nn \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl
{ {##1} {##2} {##3} {##4} {##5} {##6} {##7} }
- #1 \l_xparse_args_tl
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
-\cs_new_protected:cpn { xparse_grab_m_8:w } #1 \l_xparse_args_tl
+\cs_new_protected:cpn { @@_grab_m_8:w } #1 \l_@@_args_tl
{
- \exp_after:wN \cs_set_protected_nopar:Npn \l_xparse_fn_tl
+ \exp_after:wN \cs_set_protected_nopar:Npn \l_@@_fn_tl
##1##2##3##4##5##6##7##8
{
- \tl_put_right:Nn \l_xparse_args_tl
+ \tl_put_right:Nn \l_@@_args_tl
{ {##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8} }
- #1 \l_xparse_args_tl
+ #1 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
% \end{macrocode}
% \end{macro}
@@ -2156,66 +2202,66 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_R:w, \xparse_grab_R_long:w}
-% \begin{macro}[aux]{\xparse_grab_R_aux:NNnnN}
+% \begin{macro}{\@@_grab_R:w, \@@_grab_R_long:w}
+% \begin{macro}[aux]{\@@_grab_R_aux:NNnnN}
% The grabber for \texttt{R}-type arguments is basically the same as
% that for \texttt{D}-type ones, but always skips spaces (as it is mandatory)
% and has a hard-coded error message.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_R:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn }
-\cs_new_protected:Npn \xparse_grab_R_long:w #1#2#3#4 \l_xparse_args_tl
- { \xparse_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected:Npn }
-\cs_new_protected:Npn \xparse_grab_R_aux:NNnnN #1#2#3#4#5
+\cs_new_protected:Npn \@@_grab_R:w #1#2#3#4 \l_@@_args_tl
+ { \@@_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected_nopar:Npn }
+\cs_new_protected:Npn \@@_grab_R_long:w #1#2#3#4 \l_@@_args_tl
+ { \@@_grab_R_aux:NNnnN #1 #2 {#3} {#4} \cs_set_protected:Npn }
+\cs_new_protected:Npn \@@_grab_R_aux:NNnnN #1#2#3#4#5
{
- \xparse_grab_D_aux:NNnN #1 #2 {#4} #5
+ \@@_grab_D_aux:NNnN #1 #2 {#4} #5
\peek_meaning_remove_ignore_spaces:NTF #1
- { \xparse_grab_arg:w }
+ { \@@_grab_arg:w }
{
- \msg_kernel_error:nnxx { xparse } { missing-required }
+ \__msg_kernel_error:nnxx { xparse } { missing-required }
{ \token_to_str:N #1 } { \tl_to_str:n {#3} }
- \xparse_add_arg:n {#3}
- #4 \l_xparse_args_tl
+ \@@_add_arg:n {#3}
+ #4 \l_@@_args_tl
}
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_t:w}
-% \begin{macro}{\xparse_grab_t_long:w}
-% \begin{macro}{\xparse_grab_t_trailing:w}
-% \begin{macro}{\xparse_grab_t_long_trailing:w}
-% \begin{macro}[aux]{\xparse_grab_t_aux:NnNn}
+% \begin{macro}{\@@_grab_t:w}
+% \begin{macro}{\@@_grab_t_long:w}
+% \begin{macro}{\@@_grab_t_trailing:w}
+% \begin{macro}{\@@_grab_t_long_trailing:w}
+% \begin{macro}[aux]{\@@_grab_t_aux:NnNn}
% Dealing with a token is quite easy. Check the match, remove the
% token if needed and add a flag to the output.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_t:w #1#2 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_t:w #1#2 \l_@@_args_tl
{
- \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn
+ \@@_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn
{ _ignore_spaces }
}
-\cs_new_protected:Npn \xparse_grab_t_long:w #1#2 \l_xparse_args_tl
- { \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { _ignore_spaces } }
-\cs_new_protected:Npn \xparse_grab_t_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn { } }
-\cs_new_protected:Npn \xparse_grab_t_long_trailing:w #1#2 \l_xparse_args_tl
- { \xparse_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { } }
-\cs_new_protected:Npn \xparse_grab_t_aux:NnNn #1#2#3#4
+\cs_new_protected:Npn \@@_grab_t_long:w #1#2 \l_@@_args_tl
+ { \@@_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { _ignore_spaces } }
+\cs_new_protected:Npn \@@_grab_t_trailing:w #1#2 \l_@@_args_tl
+ { \@@_grab_t_aux:NnNn #1 {#2} \cs_set_protected_nopar:Npn { } }
+\cs_new_protected:Npn \@@_grab_t_long_trailing:w #1#2 \l_@@_args_tl
+ { \@@_grab_t_aux:NnNn #1 {#2} \cs_set_protected:Npn { } }
+\cs_new_protected:Npn \@@_grab_t_aux:NnNn #1#2#3#4
{
- \exp_after:wN #3 \l_xparse_fn_tl
+ \exp_after:wN #3 \l_@@_fn_tl
{
\use:c { peek_meaning_remove #4 :NTF } #1
{
- \xparse_add_arg:n { \BooleanTrue }
- #2 \l_xparse_args_tl
+ \@@_add_arg:n { \BooleanTrue }
+ #2 \l_@@_args_tl
}
{
- \xparse_add_arg:n { \BooleanFalse }
- #2 \l_xparse_args_tl
+ \@@_add_arg:n { \BooleanFalse }
+ #2 \l_@@_args_tl
}
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
% \end{macrocode}
% \end{macro}
@@ -2224,36 +2270,36 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_u:w}
-% \begin{macro}{\xparse_grab_u_long:w}
-% \begin{macro}[aux]{\xparse_grab_u_aux:nnN}
+% \begin{macro}{\@@_grab_u:w}
+% \begin{macro}{\@@_grab_u_long:w}
+% \begin{macro}[aux]{\@@_grab_u_aux:nnN}
% Grabbing up to a list of tokens is quite easy: define the grabber,
% and then collect.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_u:w #1#2 \l_xparse_args_tl
- { \xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
-\cs_new_protected:Npn \xparse_grab_u_long:w #1#2 \l_xparse_args_tl
- { \xparse_grab_u_aux:nnN {#1} {#2} \cs_set_protected:Npn }
-\cs_new_protected:Npn \xparse_grab_u_aux:nnN #1#2#3
+\cs_new_protected:Npn \@@_grab_u:w #1#2 \l_@@_args_tl
+ { \@@_grab_u_aux:nnN {#1} {#2} \cs_set_protected_nopar:Npn }
+\cs_new_protected:Npn \@@_grab_u_long:w #1#2 \l_@@_args_tl
+ { \@@_grab_u_aux:nnN {#1} {#2} \cs_set_protected:Npn }
+\cs_new_protected:Npn \@@_grab_u_aux:nnN #1#2#3
{
- \exp_after:wN #3 \l_xparse_fn_tl ##1 #1
+ \exp_after:wN #3 \l_@@_fn_tl ##1 #1
{
- \xparse_add_arg:n {##1}
- #2 \l_xparse_args_tl
+ \@@_add_arg:n {##1}
+ #2 \l_@@_args_tl
}
- \l_xparse_fn_tl
+ \l_@@_fn_tl
}
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_v:w}
-% \begin{macro}{\xparse_grab_v_long:w}
-% \begin{macro}{\xparse_grab_v_aux:w}
-% \begin{macro}{\xparse_grab_v_group_end:}
-% \begin{variable}{\l_xparse_v_rest_of_signature_tl}
-% \begin{variable}{\l_xparse_v_arg_tl}
+% \begin{macro}{\@@_grab_v:w}
+% \begin{macro}{\@@_grab_v_long:w}
+% \begin{macro}{\@@_grab_v_aux:w}
+% \begin{macro}{\@@_grab_v_group_end:}
+% \begin{variable}{\l_@@_v_rest_of_signature_tl}
+% \begin{variable}{\l_@@_v_arg_tl}
% The opening delimiter is never read verbatim, for consistency: if the
% preceeding argument was optional and absent, then \TeX{} has already read
% that token when looking for the optional argument. The first thing
@@ -2261,50 +2307,50 @@
% case of a left brace (in that case, \cs{group_align_safe_end:}
% is needed to compensate for the begin-group character that was
% just seen).
-% Then set verbatim catcodes with \cs{xparse_grab_v_aux_catcodes:}.
+% Then set verbatim catcodes with \cs{@@_grab_v_aux_catcodes:}.
%
% The group keep catcode changes local, and
% \cs{group_align_safe_begin/end:} allow to use a character
% with category code $4$ (normally |&|) as the delimiter.
-% It is ended by \cs{xparse_grab_v_group_end:}, which smuggles
+% It is ended by \cs{@@_grab_v_group_end:}, which smuggles
% the collected argument out of the group.
% \begin{macrocode}
-\tl_new:N \l_xparse_v_rest_of_signature_tl
-\tl_new:N \l_xparse_v_arg_tl
-\cs_new_protected_nopar:Npn \xparse_grab_v:w
+\tl_new:N \l_@@_v_rest_of_signature_tl
+\tl_new:N \l_@@_v_arg_tl
+\cs_new_protected_nopar:Npn \@@_grab_v:w
{
- \bool_set_false:N \l_xparse_long_bool
- \xparse_grab_v_aux:w
+ \bool_set_false:N \l_@@_long_bool
+ \@@_grab_v_aux:w
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_long:w
+\cs_new_protected_nopar:Npn \@@_grab_v_long:w
{
- \bool_set_true:N \l_xparse_long_bool
- \xparse_grab_v_aux:w
+ \bool_set_true:N \l_@@_long_bool
+ \@@_grab_v_aux:w
}
-\cs_new_protected:Npn \xparse_grab_v_aux:w #1 \l_xparse_args_tl
+\cs_new_protected:Npn \@@_grab_v_aux:w #1 \l_@@_args_tl
{
- \tl_set:Nn \l_xparse_v_rest_of_signature_tl {#1}
+ \tl_set:Nn \l_@@_v_rest_of_signature_tl {#1}
\group_begin:
\group_align_safe_begin:
\tex_escapechar:D = 92 \scan_stop:
- \tl_clear:N \l_xparse_v_arg_tl
+ \tl_clear:N \l_@@_v_arg_tl
\peek_N_type:TF
- { \xparse_grab_v_aux_test:N }
+ { \@@_grab_v_aux_test:N }
{
\peek_meaning_remove:NTF \c_group_begin_token
{
\group_align_safe_end:
- \xparse_grab_v_bgroup:
+ \@@_grab_v_bgroup:
}
- { \xparse_grab_v_aux_abort: }
+ { \@@_grab_v_aux_abort: }
}
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_group_end:
+\cs_new_protected_nopar:Npn \@@_grab_v_group_end:
{
\group_align_safe_end:
\exp_args:NNNo
\group_end:
- \tl_set:Nn \l_xparse_v_arg_tl { \l_xparse_v_arg_tl }
+ \tl_set:Nn \l_@@_v_arg_tl { \l_@@_v_arg_tl }
}
% \end{macrocode}
% \end{variable}
@@ -2314,12 +2360,12 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_v_aux_test:N}
+% \begin{macro}{\@@_grab_v_aux_test:N}
% \begin{macro}
% {
-% \xparse_grab_v_aux_loop:N,
-% \xparse_grab_v_aux_loop_ii:NN,
-% \xparse_grab_v_aux_loop_end:
+% \@@_grab_v_aux_loop:N,
+% \@@_grab_v_aux_loop_ii:NN,
+% \@@_grab_v_aux_loop_end:
% }
% Check that the opening delimiter is a character, setup category codes,
% then start reading tokens one by one, keeping the delimiter as an argument.
@@ -2332,104 +2378,104 @@
% or $6$ (macro parameter), nor the space character,
% with category code~$10$ and character code~$32$,
% nor a control sequence.
-% The partially built argument is stored in \cs{l_xparse_v_arg_tl}.
+% The partially built argument is stored in \cs{l_@@_v_arg_tl}.
% If we ever meet a token which we cannot grab (non-N-type),
% or which is not a character according to
-% \cs{xparse_grab_v_token_if_char:NTF}, then we bail out with
-% \cs{xparse_grab_v_aux_abort:}. Otherwise, we stop at the first
+% \cs{@@_grab_v_token_if_char:NTF}, then we bail out with
+% \cs{@@_grab_v_aux_abort:}. Otherwise, we stop at the first
% character matching the delimiter.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_v_aux_test:N #1
+\cs_new_protected:Npn \@@_grab_v_aux_test:N #1
{
- \xparse_grab_v_aux_put:N #1
- \xparse_grab_v_token_if_char:NTF #1
+ \@@_grab_v_aux_put:N #1
+ \@@_grab_v_token_if_char:NTF #1
{
- \xparse_grab_v_aux_catcodes:
- \xparse_grab_v_aux_loop:N #1
+ \@@_grab_v_aux_catcodes:
+ \@@_grab_v_aux_loop:N #1
}
- { \xparse_grab_v_aux_abort: }
+ { \@@_grab_v_aux_abort: }
}
-\cs_new_protected:Npn \xparse_grab_v_aux_loop:N #1
+\cs_new_protected:Npn \@@_grab_v_aux_loop:N #1
{
\peek_N_type:TF
- { \xparse_grab_v_aux_loop_ii:NN #1 }
- { \xparse_grab_v_aux_abort: }
+ { \@@_grab_v_aux_loop_ii:NN #1 }
+ { \@@_grab_v_aux_abort: }
}
-\cs_new_protected:Npn \xparse_grab_v_aux_loop_ii:NN #1 #2
+\cs_new_protected:Npn \@@_grab_v_aux_loop_ii:NN #1 #2
{
- \xparse_grab_v_token_if_char:NTF #2
+ \@@_grab_v_token_if_char:NTF #2
{
\token_if_eq_charcode:NNTF #1 #2
- { \xparse_grab_v_aux_loop_end: }
+ { \@@_grab_v_aux_loop_end: }
{
- \xparse_grab_v_aux_put:N #2
- \xparse_grab_v_aux_loop:N #1
+ \@@_grab_v_aux_put:N #2
+ \@@_grab_v_aux_loop:N #1
}
}
- { \xparse_grab_v_aux_abort: #2 }
+ { \@@_grab_v_aux_abort: #2 }
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_aux_loop_end:
+\cs_new_protected_nopar:Npn \@@_grab_v_aux_loop_end:
{
- \xparse_grab_v_group_end:
- \exp_args:Nx \xparse_add_arg:n { \tl_tail:N \l_xparse_v_arg_tl }
- \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
+ \@@_grab_v_group_end:
+ \exp_args:Nx \@@_add_arg:n { \tl_tail:N \l_@@_v_arg_tl }
+ \l_@@_v_rest_of_signature_tl \l_@@_args_tl
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_v_bgroup:}
-% \begin{macro}{\xparse_grab_v_bgroup_loop:}
-% \begin{macro}{\xparse_grab_v_bgroup_loop_ii:N}
-% \begin{variable}{\l_xparse_v_nesting_int}
+% \begin{macro}{\@@_grab_v_bgroup:}
+% \begin{macro}{\@@_grab_v_bgroup_loop:}
+% \begin{macro}{\@@_grab_v_bgroup_loop_ii:N}
+% \begin{variable}{\l_@@_v_nesting_int}
% If the opening delimiter is a left brace, we keep track of
% how many left and right braces were encountered so far in
-% \cs{l_xparse_v_nesting_int} (the methods used for optional
+% \cs{l_@@_v_nesting_int} (the methods used for optional
% arguments cannot apply here), and stop as soon as it reaches~$0$.
%
% Some care was needed when removing the opening delimiter, which
% has already been assigned category code~$1$: using
-% \cs{peek_meaning_remove:NTF} in the \cs{xparse_grab_v_aux:w}
+% \cs{peek_meaning_remove:NTF} in the \cs{@@_grab_v_aux:w}
% function would break within alignments. Instead, we first
% convert that token to a string, and remove the result as a
% normal undelimited argument.
% \begin{macrocode}
-\int_new:N \l_xparse_v_nesting_int
-\cs_new_protected_nopar:Npx \xparse_grab_v_bgroup:
+\int_new:N \l_@@_v_nesting_int
+\cs_new_protected_nopar:Npx \@@_grab_v_bgroup:
{
- \exp_not:N \xparse_grab_v_aux_catcodes:
- \exp_not:n { \int_set_eq:NN \l_xparse_v_nesting_int \c_one }
- \exp_not:N \xparse_grab_v_aux_put:N \iow_char:N \{
- \exp_not:N \xparse_grab_v_bgroup_loop:
+ \exp_not:N \@@_grab_v_aux_catcodes:
+ \exp_not:n { \int_set_eq:NN \l_@@_v_nesting_int \c_one }
+ \exp_not:N \@@_grab_v_aux_put:N \iow_char:N \{
+ \exp_not:N \@@_grab_v_bgroup_loop:
}
-\cs_new_protected:Npn \xparse_grab_v_bgroup_loop:
+\cs_new_protected:Npn \@@_grab_v_bgroup_loop:
{
\peek_N_type:TF
- { \xparse_grab_v_bgroup_loop_ii:N }
- { \xparse_grab_v_aux_abort: }
+ { \@@_grab_v_bgroup_loop_ii:N }
+ { \@@_grab_v_aux_abort: }
}
-\cs_new_protected:Npn \xparse_grab_v_bgroup_loop_ii:N #1
+\cs_new_protected:Npn \@@_grab_v_bgroup_loop_ii:N #1
{
- \xparse_grab_v_token_if_char:NTF #1
+ \@@_grab_v_token_if_char:NTF #1
{
\token_if_eq_charcode:NNTF \c_group_end_token #1
{
- \int_decr:N \l_xparse_v_nesting_int
- \int_compare:nNnTF \l_xparse_v_nesting_int > \c_zero
+ \int_decr:N \l_@@_v_nesting_int
+ \int_compare:nNnTF \l_@@_v_nesting_int > \c_zero
{
- \xparse_grab_v_aux_put:N #1
- \xparse_grab_v_bgroup_loop:
+ \@@_grab_v_aux_put:N #1
+ \@@_grab_v_bgroup_loop:
}
- { \xparse_grab_v_aux_loop_end: }
+ { \@@_grab_v_aux_loop_end: }
}
{
\token_if_eq_charcode:NNT \c_group_begin_token #1
- { \int_incr:N \l_xparse_v_nesting_int }
- \xparse_grab_v_aux_put:N #1
- \xparse_grab_v_bgroup_loop:
+ { \int_incr:N \l_@@_v_nesting_int }
+ \@@_grab_v_aux_put:N #1
+ \@@_grab_v_bgroup_loop:
}
}
- { \xparse_grab_v_aux_abort: #1 }
+ { \@@_grab_v_aux_abort: #1 }
}
% \end{macrocode}
% \end{variable}
@@ -2437,22 +2483,22 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_v_aux_catcodes:}
-% \begin{macro}{\xparse_grab_v_aux_abort:}
-% \begin{macro}{\xparse_grab_v_aux_abort_ii:w}
+% \begin{macro}{\@@_grab_v_aux_catcodes:}
+% \begin{macro}{\@@_grab_v_aux_abort:}
+% \begin{macro}{\@@_grab_v_aux_abort_ii:w}
% In a standalone format, the list of special characters is kept
-% as a sequence, \cs{c_xparse_special_chars_seq}, and we use
+% as a sequence, \cs{c_@@_special_chars_seq}, and we use
% \tn{dospecials} in package mode.
% The approach for short verbatim arguments is to make the end-line
% character a macro parameter character: this is forbidden by the
% rest of the code. Then the error branch can check what caused the
% bail out and give the appropriate error message.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \xparse_grab_v_aux_catcodes:
+\cs_new_protected_nopar:Npn \@@_grab_v_aux_catcodes:
{
%<*initex>
\seq_map_function:NN
- \c_xparse_special_chars_seq
+ \c_@@_special_chars_seq
\char_set_catcode_other:N
%</initex>
%<*package>
@@ -2460,33 +2506,33 @@
\dospecials
%</package>
\tex_endlinechar:D = `\^^M \scan_stop:
- \bool_if:NTF \l_xparse_long_bool
+ \bool_if:NTF \l_@@_long_bool
{ \char_set_catcode_other:n { \tex_endlinechar:D } }
{ \char_set_catcode_parameter:n { \tex_endlinechar:D } }
}
-\cs_new_protected_nopar:Npn \xparse_grab_v_aux_abort:
+\cs_new_protected_nopar:Npn \@@_grab_v_aux_abort:
{
- \xparse_grab_v_group_end:
- \xparse_add_arg:n { \NoValue }
- \exp_after:wN \xparse_grab_v_aux_abort_ii:w \l_xparse_args_tl \q_stop
+ \@@_grab_v_group_end:
+ \@@_add_arg:o \c_@@_no_value_tl
+ \exp_after:wN \@@_grab_v_aux_abort_ii:w \l_@@_args_tl \q_stop
}
-\cs_new_protected:Npn \xparse_grab_v_aux_abort_ii:w #1 #2 \q_stop
+\cs_new_protected:Npn \@@_grab_v_aux_abort_ii:w #1 #2 \q_stop
{
\group_begin:
\char_set_lccode:nn { `\# } { \tex_endlinechar:D }
\tl_to_lowercase:n
{ \group_end: \peek_meaning_remove:NTF ## }
{
- \msg_kernel_error:nnxx { xparse } { verbatim-newline }
+ \__msg_kernel_error:nnxx { xparse } { verbatim-newline }
{ \token_to_str:N #1 }
- { \tl_to_str:N \l_xparse_v_arg_tl }
- \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
+ { \tl_to_str:N \l_@@_v_arg_tl }
+ \l_@@_v_rest_of_signature_tl \l_@@_args_tl
}
{
- \msg_kernel_error:nnxx { xparse } { verbatim-already-tokenized }
+ \__msg_kernel_error:nnxx { xparse } { verbatim-already-tokenized }
{ \token_to_str:N #1 }
- { \tl_to_str:N \l_xparse_v_arg_tl }
- \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl
+ { \tl_to_str:N \l_@@_v_arg_tl }
+ \l_@@_v_rest_of_signature_tl \l_@@_args_tl
}
}
% \end{macrocode}
@@ -2494,14 +2540,14 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_v_aux_put:N}
+% \begin{macro}{\@@_grab_v_aux_put:N}
% Storing one token in the collected argument. Most tokens are
% converted to category code $12$, with the exception of active
% characters, and spaces (not sure what should be done for those).
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_v_aux_put:N #1
+\cs_new_protected:Npn \@@_grab_v_aux_put:N #1
{
- \tl_put_right:Nx \l_xparse_v_arg_tl
+ \tl_put_right:Nx \l_@@_v_arg_tl
{
\token_if_active:NTF #1
{ \exp_not:N #1 } { \token_to_str:N #1 }
@@ -2510,7 +2556,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_grab_v_token_if_char:NTF}
+% \begin{macro}{\@@_grab_v_token_if_char:NTF}
% This function assumes that the escape character is printable.
% Then the string representation of control sequences is at least
% two characters, and \cs{str_tail:n} only removes the escape
@@ -2518,13 +2564,13 @@
% \cs{tl_to_str:n}, and will also yield a non-empty result,
% hence are not considered as characters.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_grab_v_token_if_char:NTF #1
- { \str_if_eq:xxTF { } { \str_tail:n {#1} } }
+\cs_new_protected:Npn \@@_grab_v_token_if_char:NTF #1
+ { \str_if_eq_x:nnTF { } { \str_tail:n {#1} } }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_add_arg:n, \xparse_add_arg:V, \xparse_add_arg:o}
-% \begin{macro}[aux]{\xparse_add_arg_aux:n, \xparse_add_arg_aux:V}
+% \begin{macro}{\@@_add_arg:n, \@@_add_arg:V, \@@_add_arg:o}
+% \begin{macro}[aux]{\@@_add_arg_aux:n, \@@_add_arg_aux:V}
% The argument-storing system provides a single point for interfacing
% with processors. They are done in a loop, counting downward. In this
% way, the processor which was found last is executed first. The result
@@ -2533,50 +2579,50 @@
% the internal function will correctly pick up one argument for each
% input argument.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_add_arg:n #1
+\cs_new_protected:Npn \@@_add_arg:n #1
{
- \int_compare:nNnTF \l_xparse_processor_int = \c_zero
- { \tl_put_right:Nn \l_xparse_args_tl { {#1} } }
+ \int_compare:nNnTF \l_@@_processor_int = \c_zero
+ { \tl_put_right:Nn \l_@@_args_tl { {#1} } }
{
\tl_clear:N \ProcessedArgument
- \xparse_if_no_value:nTF {#1}
+ \@@_if_no_value:nTF {#1}
{
- \int_zero:N \l_xparse_processor_int
- \tl_put_right:Nn \l_xparse_args_tl { {#1} }
+ \int_zero:N \l_@@_processor_int
+ \tl_put_right:Nn \l_@@_args_tl { {#1} }
}
- { \xparse_add_arg_aux:n {#1} }
+ { \@@_add_arg_aux:n {#1} }
}
}
-\cs_generate_variant:Nn \xparse_add_arg:n { V , o }
-\cs_new_protected:Npn \xparse_add_arg_aux:n #1
+\cs_generate_variant:Nn \@@_add_arg:n { V , o }
+\cs_new_protected:Npn \@@_add_arg_aux:n #1
{
- \use:c { xparse_processor_ \int_use:N \l_xparse_processor_int :n } {#1}
- \int_decr:N \l_xparse_processor_int
- \int_compare:nNnTF \l_xparse_processor_int = \c_zero
+ \use:c { @@_processor_ \int_use:N \l_@@_processor_int :n } {#1}
+ \int_decr:N \l_@@_processor_int
+ \int_compare:nNnTF \l_@@_processor_int = \c_zero
{
- \tl_put_right:Nx \l_xparse_args_tl
+ \tl_put_right:Nx \l_@@_args_tl
{ { \exp_not:V \ProcessedArgument } }
}
- { \xparse_add_arg_aux:V \ProcessedArgument }
+ { \@@_add_arg_aux:V \ProcessedArgument }
}
-\cs_generate_variant:Nn \xparse_add_arg_aux:n { V }
+\cs_generate_variant:Nn \@@_add_arg_aux:n { V }
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \subsection{Grabbing arguments expandably}
%
-% \begin{macro}[EXP]{\xparse_expandable_grab_D:w}
-% \begin{macro}[EXP, aux]{\xparse_expandable_grab_D_i:NNNnwN}
-% \begin{macro}[EXP, aux]{\xparse_expandable_grab_D_ii:NNNwNnnn}
-% \begin{macro}[EXP, aux]{\xparse_expandable_grab_D_iii:Nw}
-% \begin{macro}[EXP, aux]{\xparse_expandable_grab_D_iv:nnNNNwN}
+% \begin{macro}[EXP]{\@@_expandable_grab_D:w}
+% \begin{macro}[EXP, aux]{\@@_expandable_grab_D_i:NNNnwN}
+% \begin{macro}[EXP, aux]{\@@_expandable_grab_D_ii:NNNwNnnn}
+% \begin{macro}[EXP, aux]{\@@_expandable_grab_D_iii:Nw}
+% \begin{macro}[EXP, aux]{\@@_expandable_grab_D_iv:nnNNNwN}
% The first step is to grab the first token or group. The generic grabber
-% \cs{\meta{function}}\verb*| | is just after \cs{q_xparse}, we go and find
+% \cs{\meta{function}}\verb*| | is just after \cs{q_@@}, we go and find
% it.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_D:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_D_i:NNNnwNn #1 \q_xparse #2 } }
+\cs_new:Npn \@@_expandable_grab_D:w #1 \q_@@ #2
+ { #2 { \@@_expandable_grab_D_i:NNNnwNn #1 \q_@@ #2 } }
% \end{macrocode}
% We then wish to test whether |#7|, which we just grabbed, is exactly |#2|.
% Expand the only grabber function we have, |#1|, once: the two strings below
@@ -2587,7 +2633,7 @@
% everything as its arguments. The first brace group can only be empty if
% \texttt{\#7} starts with \texttt{\#2}, otherwise the brace group preceding
% \texttt{\#7} would not vanish. The third brace group is empty, thus the
-% \cs{q_xparse} that was used by our grabber \texttt{\#1} must be the one
+% \cs{q_@@} that was used by our grabber \texttt{\#1} must be the one
% that we inserted (not some token in \texttt{\#7}), hence the second brace
% group contains the end of \texttt{\#7} followed by \texttt{\#2}. Since this
% is \texttt{\#2} on the right-hand-side, and no brace can be lost there,
@@ -2600,11 +2646,11 @@
% argument piece by piece, with the following pattern:
% \begin{quote}
% \meta{grabber} \Arg{tokens} \\
-% ~~\cs{q_nil} \Arg{piece 1} \meta{piece 2} \cs{ERROR} \cs{q_xparse}\\
+% ~~\cs{q_nil} \Arg{piece 1} \meta{piece 2} \cs{ERROR} \cs{q_@@}\\
% ~~\cs{q_nil} \meta{input stream}
% \end{quote}
% The \meta{grabber} will find an opening delimiter in \meta{piece 2}, take
-% the \cs{q_xparse} as a second delimiter, and find more material delimited
+% the \cs{q_@@} as a second delimiter, and find more material delimited
% by the closing delimiter in the \meta{input stream}. We then move the part
% before the opening delimiter from \meta{piece 2} to \meta{piece 1}, and the
% material taken from the \meta{input stream} to the \meta{piece 2}. Thus,
@@ -2617,17 +2663,17 @@
% no opening delimiter any more, hence the balance is reached, and the final
% argument is \meta{piece 1} \meta{piece 2}.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_D_i:NNNnwNn #1#2#3#4#5 \q_xparse #6#7
+\cs_new:Npn \@@_expandable_grab_D_i:NNNnwNn #1#2#3#4#5 \q_@@ #6#7
{
\str_if_eq:onTF
- { #1 { } { } #7 #2 \q_xparse #3 }
+ { #1 { } { } #7 #2 \q_@@ #3 }
{ { } { #2 } { } }
{
#1
- { \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_xparse #6 }
- \q_nil { } #2 \ERROR \q_xparse \ERROR
+ { \@@_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_@@ #6 }
+ \q_nil { } #2 \ERROR \q_@@ \ERROR
}
- { #5 {#4} \q_xparse #6 {#7} }
+ { #5 {#4} \q_@@ #6 {#7} }
}
% \end{macrocode}
% At this stage, |#6| is \cs{q_nil} \Arg{piece 1} \meta{more for piece 1},
@@ -2637,14 +2683,14 @@
% for piece 2}. We concatenate those, replacing the two \cs{ERROR} by the
% closing delimiter |#3|.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#4 \q_xparse #5#6#7#8
+\cs_new:Npn \@@_expandable_grab_D_ii:NNNwNnnn #1#2#3#4 \q_@@ #5#6#7#8
{
- \exp_args:Nof \xparse_expandable_grab_D_iv:nnNNNwN
+ \exp_args:Nof \@@_expandable_grab_D_iv:nnNNNwN
{ \use_ii:nn #6 #2 }
- { \xparse_expandable_grab_D_iii:Nw #3 \exp_stop_f: #7 #8 }
- #1#2#3 #4 \q_xparse #5
+ { \@@_expandable_grab_D_iii:Nw #3 \exp_stop_f: #7 #8 }
+ #1#2#3 #4 \q_@@ #5
}
-\cs_new:Npn \xparse_expandable_grab_D_iii:Nw #1#2 \ERROR \ERROR { #2 #1 }
+\cs_new:Npn \@@_expandable_grab_D_iii:Nw #1#2 \ERROR \ERROR { #2 #1 }
% \end{macrocode}
% Armed with our two new \meta{pieces}, we are ready to loop. However, we
% must first see if \meta{piece 2} (here |#2|) contains any opening
@@ -2654,20 +2700,20 @@
% delimiter. In that case, we are done, and put the argument (from which we
% remove a spurious pair of delimiters coming from how we started the loop).
% Otherwise, we go back to looping with
-% \cs{xparse_expandable_grab_D_ii:NNNwNnnn}.
+% \cs{@@_expandable_grab_D_ii:NNNwNnnn}.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_D_iv:nnNNNwN #1#2#3#4#5#6 \q_xparse #7
+\cs_new:Npn \@@_expandable_grab_D_iv:nnNNNwN #1#2#3#4#5#6 \q_@@ #7
{
\exp_args:No \tl_if_empty:oTF
- { #3 { \use_none:nnn } #2 \q_xparse #5 #4 \q_xparse #5 }
+ { #3 { \use_none:nnn } #2 \q_@@ #5 #4 \q_@@ #5 }
{
- \xparse_put_arg_expandable:ow { \use_none:nn #1#2 }
- #6 \q_xparse #7
+ \@@_put_arg_expandable:ow { \use_none:nn #1#2 }
+ #6 \q_@@ #7
}
{
#3
- { \xparse_expandable_grab_D_ii:NNNwNnnn #3#4#5#6 \q_xparse #7 }
- \q_nil {#1} #2 \ERROR \q_xparse \ERROR
+ { \@@_expandable_grab_D_ii:NNNwNnnn #3#4#5#6 \q_@@ #7 }
+ \q_nil {#1} #2 \ERROR \q_@@ \ERROR
}
}
% \end{macrocode}
@@ -2677,163 +2723,163 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\xparse_expandable_grab_D_alt:w}
-% \begin{macro}[EXP]{\xparse_expandable_grab_D_alt_i:NNnwNn}
-% \begin{macro}[EXP]{\xparse_expandable_grab_D_alt_ii:Nw}
+% \begin{macro}[EXP]{\@@_expandable_grab_D_alt:w}
+% \begin{macro}[EXP]{\@@_expandable_grab_D_alt_i:NNnwNn}
+% \begin{macro}[EXP]{\@@_expandable_grab_D_alt_ii:Nw}
% When the delimiters are identical, nesting is not possble and a simplified
% approach is used. The test concept here is the same as for the case where
% the delimiters are different.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_D_alt:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_D_alt_i:NNnwNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_D_alt_i:NNnwNn #1#2#3#4 \q_xparse #5#6
+\cs_new:Npn \@@_expandable_grab_D_alt:w #1 \q_@@ #2
+ { #2 { \@@_expandable_grab_D_alt_i:NNnwNn #1 \q_@@ #2 } }
+\cs_new:Npn \@@_expandable_grab_D_alt_i:NNnwNn #1#2#3#4 \q_@@ #5#6
{
\str_if_eq:onTF
{ #1 { } #6 #2 #2 }
{ { } #2 }
{
#1
- { \xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q_xparse }
+ { \@@_expandable_grab_D_alt_ii:Nwn #5 #4 \q_@@ }
#6 \ERROR
}
- { #4 {#3} \q_xparse #5 {#6} }
+ { #4 {#3} \q_@@ #5 {#6} }
}
-\cs_new:Npn \xparse_expandable_grab_D_alt_ii:Nwn #1#2 \q_xparse #3
- { \xparse_put_arg_expandable:ow { \use_none:n #3 } #2 \q_xparse #1 }
+\cs_new:Npn \@@_expandable_grab_D_alt_ii:Nwn #1#2 \q_@@ #3
+ { \@@_put_arg_expandable:ow { \use_none:n #3 } #2 \q_@@ #1 }
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\xparse_expandable_grab_m:w}
-% \begin{macro}[EXP, aux]{\xparse_expandable_grab_m_aux:wNn}
-% The mandatory case is easy: find the auxiliary after the \cs{q_xparse}, and
+% \begin{macro}[EXP]{\@@_expandable_grab_m:w}
+% \begin{macro}[EXP, aux]{\@@_expandable_grab_m_aux:wNn}
+% The mandatory case is easy: find the auxiliary after the \cs{q_@@}, and
% use it directly to grab the argument.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_m:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_m_aux:wNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_m_aux:wNn #1 \q_xparse #2#3
- { #1 {#3} \q_xparse #2 }
+\cs_new:Npn \@@_expandable_grab_m:w #1 \q_@@ #2
+ { #2 { \@@_expandable_grab_m_aux:wNn #1 \q_@@ #2 } }
+\cs_new:Npn \@@_expandable_grab_m_aux:wNn #1 \q_@@ #2#3
+ { #1 {#3} \q_@@ #2 }
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\xparse_expandable_grab_R:w}
-% \begin{macro}[EXP, aux]{\xparse_expandable_grab_R_aux:NNwn}
+% \begin{macro}[EXP]{\@@_expandable_grab_R:w}
+% \begin{macro}[EXP, aux]{\@@_expandable_grab_R_aux:NNwn}
% Much the same as for the \texttt{D}-type argument, with only the lead-off
% function varying.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_R:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_R_aux:NNNnwNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_R_aux:NNNnwNn #1#2#3#4#5 \q_xparse #6#7
+\cs_new:Npn \@@_expandable_grab_R:w #1 \q_@@ #2
+ { #2 { \@@_expandable_grab_R_aux:NNNnwNn #1 \q_@@ #2 } }
+\cs_new:Npn \@@_expandable_grab_R_aux:NNNnwNn #1#2#3#4#5 \q_@@ #6#7
{
\str_if_eq:onTF
- { #1 { } { } #7 #2 \q_xparse #3 }
+ { #1 { } { } #7 #2 \q_@@ #3 }
{ { } { #2 } { } }
{
#1
- { \xparse_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_xparse #6 }
- \q_nil { } #2 \ERROR \q_xparse \ERROR
+ { \@@_expandable_grab_D_ii:NNNwNnnn #1#2#3#5 \q_@@ #6 }
+ \q_nil { } #2 \ERROR \q_@@ \ERROR
}
{
- \msg_expandable_kernel_error:nnn
+ \__msg_kernel_expandable_error:nnn
{ xparse } { missing-required } {#2}
- #5 {#4} \q_xparse #6 {#7}
+ #5 {#4} \q_@@ #6 {#7}
}
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\xparse_expandable_grab_R_alt:w}
-% \begin{macro}[EXP]{\xparse_expandable_grab_R_alt_aux:NNnwNn}
+% \begin{macro}[EXP]{\@@_expandable_grab_R_alt:w}
+% \begin{macro}[EXP]{\@@_expandable_grab_R_alt_aux:NNnwNn}
% When the delimiters are identical, nesting is not possble and a simplified
% approach is used. The test concept here is the same as for the case where
% the delimiters are different.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_R_alt:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_R_alt_aux:NNnwNn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_R_alt_aux:NNnwNn #1#2#3#4 \q_xparse #5#6
+\cs_new:Npn \@@_expandable_grab_R_alt:w #1 \q_@@ #2
+ { #2 { \@@_expandable_grab_R_alt_aux:NNnwNn #1 \q_@@ #2 } }
+\cs_new:Npn \@@_expandable_grab_R_alt_aux:NNnwNn #1#2#3#4 \q_@@ #5#6
{
\str_if_eq:onTF
{ #1 { } #6 #2 #2 }
{ { } #2 }
{
#1
- { \xparse_expandable_grab_D_alt_ii:Nwn #5 #4 \q_xparse }
+ { \@@_expandable_grab_D_alt_ii:Nwn #5 #4 \q_@@ }
#6 \ERROR
}
{
- \msg_expandable_kernel_error:nnn
+ \__msg_kernel_expandable_error:nnn
{ xparse } { missing-required } {#2}
- #4 {#3} \q_xparse #5 {#6}
+ #4 {#3} \q_@@ #5 {#6}
}
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-% \begin{macro}[EXP]{\xparse_expandable_grab_t:w}
-% \begin{macro}[EXP, aux]{\xparse_expandable_grab_t_aux:NNwn}
+% \begin{macro}[EXP]{\@@_expandable_grab_t:w}
+% \begin{macro}[EXP, aux]{\@@_expandable_grab_t_aux:NNwn}
% As for a \texttt{D}-type argument, here we compare the grabbed tokens using
% the only parser we have in order to work out if |#2| is exactly equal to
% the output of the grabber.
% \begin{macrocode}
-\cs_new:Npn \xparse_expandable_grab_t:w #1 \q_xparse #2
- { #2 { \xparse_expandable_grab_t_aux:NNwn #1 \q_xparse #2 } }
-\cs_new:Npn \xparse_expandable_grab_t_aux:NNwn #1#2#3 \q_xparse #4#5
+\cs_new:Npn \@@_expandable_grab_t:w #1 \q_@@ #2
+ { #2 { \@@_expandable_grab_t_aux:NNwn #1 \q_@@ #2 } }
+\cs_new:Npn \@@_expandable_grab_t_aux:NNwn #1#2#3 \q_@@ #4#5
{
\str_if_eq:onTF { #1 { } #5 #2 } { #2 }
- { #3 { \BooleanTrue } \q_xparse #4 }
- { #3 { \BooleanFalse } \q_xparse #4 {#5} }
+ { #3 { \BooleanTrue } \q_@@ #4 }
+ { #3 { \BooleanFalse } \q_@@ #4 {#5} }
}
% \end{macrocode}
% \end{macro}
% \end{macro}
%
% \begin{macro}[EXP]
-% {\xparse_put_arg_expandable:nw, \xparse_put_arg_expandable:ow}
+% {\@@_put_arg_expandable:nw, \@@_put_arg_expandable:ow}
% A useful helper, to store arguments when they are ready.
% \begin{macrocode}
-\cs_new:Npn \xparse_put_arg_expandable:nw #1#2 \q_xparse { #2 {#1} \q_xparse }
-\cs_generate_variant:Nn \xparse_put_arg_expandable:nw { o }
+\cs_new:Npn \@@_put_arg_expandable:nw #1#2 \q_@@ { #2 {#1} \q_@@ }
+\cs_generate_variant:Nn \@@_put_arg_expandable:nw { o }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[EXP]{\xparse_grab_expandable_end:wN}
+% \begin{macro}[EXP]{\@@_grab_expandable_end:wN}
% For the end of the grabbing sequence: get rid of the generic grabber and
% insert the code function followed by its arguments.
% \begin{macrocode}
-\cs_new:Npn \xparse_grab_expandable_end:wN #1 \q_xparse #2 {#1}
+\cs_new:Npn \@@_grab_expandable_end:wN #1 \q_@@ #2 {#1}
% \end{macrocode}
% \end{macro}
%
% \subsection{Argument processors}
%
-% \begin{macro}{\xparse_process_arg:n}
+% \begin{macro}{\@@_process_arg:n}
% Processors are saved for use later during the grabbing process.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_process_arg:n #1
+\cs_new_protected:Npn \@@_process_arg:n #1
{
- \int_incr:N \l_xparse_processor_int
- \cs_set:cpn { xparse_processor_ \int_use:N \l_xparse_processor_int :n } ##1
+ \int_incr:N \l_@@_processor_int
+ \cs_set:cpn { @@_processor_ \int_use:N \l_@@_processor_int :n } ##1
{ #1 {##1} }
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_process_to_str:n}
+% \begin{macro}{\@@_process_to_str:n}
% A basic argument processor: as much an example as anything else.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_process_to_str:n #1
+\cs_new_protected:Npn \@@_process_to_str:n #1
{ \tl_set:Nx \ProcessedArgument { \tl_to_str:n {#1} } }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\xparse_bool_reverse:N}
+% \begin{macro}{\@@_bool_reverse:N}
% A simple reversal.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_bool_reverse:N #1
+\cs_new_protected:Npn \@@_bool_reverse:N #1
{
\bool_if:NTF #1
{ \tl_set:Nn \ProcessedArgument { \c_false_bool } }
@@ -2842,47 +2888,47 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\l_xparse_split_list_seq, \l_xparse_split_list_tl}
-% \begin{macro}{\xparse_split_list:nn}
-% \begin{macro}[aux]{\xparse_split_list_multi:nn, \xparse_split_list_multi:nV}
-% \begin{macro}[aux]{\xparse_split_list_single:Nn}
+% \begin{variable}{\l_@@_split_list_seq, \l_@@_split_list_tl}
+% \begin{macro}{\@@_split_list:nn}
+% \begin{macro}[aux]{\@@_split_list_multi:nn, \@@_split_list_multi:nV}
+% \begin{macro}[aux]{\@@_split_list_single:Nn}
% Splitting can take place either at a single token or at a longer
% identifier. To deal with single active tokens, a two-part procedure is
% needed.
% \begin{macrocode}
-\seq_new:N \l_xparse_split_list_seq
-\tl_new:N \l_xparse_split_list_tl
-\cs_new_protected:Npn \xparse_split_list:nn #1#2
+\seq_new:N \l_@@_split_list_seq
+\tl_new:N \l_@@_split_list_tl
+\cs_new_protected:Npn \@@_split_list:nn #1#2
{
\bool_if:nTF
{
\tl_if_single_p:n {#1} &&
! ( \token_if_cs_p:N #1 )
}
- { \xparse_split_list_single:Nn #1 {#2} }
- { \xparse_split_list_multi:nn {#1} {#2} }
+ { \@@_split_list_single:Nn #1 {#2} }
+ { \@@_split_list_multi:nn {#1} {#2} }
}
-\cs_set_protected:Npn \xparse_split_list_multi:nn #1#2
+\cs_set_protected:Npn \@@_split_list_multi:nn #1#2
{
- \seq_set_split:Nnn \l_xparse_split_list_seq {#1} {#2}
+ \seq_set_split:Nnn \l_@@_split_list_seq {#1} {#2}
\tl_clear:N \ProcessedArgument
- \seq_map_inline:Nn \l_xparse_split_list_seq
+ \seq_map_inline:Nn \l_@@_split_list_seq
{ \tl_put_right:Nn \ProcessedArgument { {##1} } }
}
-\cs_generate_variant:Nn \xparse_split_list_multi:nn { nV }
+\cs_generate_variant:Nn \@@_split_list_multi:nn { nV }
\group_begin:
\char_set_catcode_active:N \@
-\cs_new_protected:Npn \xparse_split_list_single:Nn #1#2
+\cs_new_protected:Npn \@@_split_list_single:Nn #1#2
{
- \tl_set:Nn \l_xparse_split_list_tl {#2}
+ \tl_set:Nn \l_@@_split_list_tl {#2}
\group_begin:
\char_set_lccode:nn { `\@ } { `#1 }
\tl_to_lowercase:n
{
\group_end:
- \tl_replace_all:Nnn \l_xparse_split_list_tl { @ } {#1}
+ \tl_replace_all:Nnn \l_@@_split_list_tl { @ } {#1}
}
- \xparse_split_list_multi:nV {#1} \l_xparse_split_list_tl
+ \@@_split_list_multi:nV {#1} \l_@@_split_list_tl
}
\group_end:
% \end{macrocode}
@@ -2891,23 +2937,23 @@
% \end{macro}
% \end{variable}
%
-% \begin{macro}{\xparse_split_argument:nnn}
-% \begin{macro}[aux]{\xparse_split_argument_aux:nnnn}
-% \begin{macro}[aux, EXP]{\xparse_split_argument_aux:n}
-% \begin{macro}[aux, EXP]{\xparse_split_argument_aux:wn}
+% \begin{macro}{\@@_split_argument:nnn}
+% \begin{macro}[aux]{\@@_split_argument_aux:nnnn}
+% \begin{macro}[aux, EXP]{\@@_split_argument_aux:n}
+% \begin{macro}[aux, EXP]{\@@_split_argument_aux:wn}
% Splitting to a known number of items is a special version of splitting
% a list, in which the limit is hard-coded and where there will always be
% exactly the correct number of output items. An auxiliary function is
% used to save on working out the token list length several times.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_split_argument:nnn #1#2#3
+\cs_new_protected:Npn \@@_split_argument:nnn #1#2#3
{
- \xparse_split_list:nn {#2} {#3}
- \exp_args:Nf \xparse_split_argument_aux:nnnn
- { \tl_length:N \ProcessedArgument }
+ \@@_split_list:nn {#2} {#3}
+ \exp_args:Nf \@@_split_argument_aux:nnnn
+ { \tl_count:N \ProcessedArgument }
{#1} {#2} {#3}
}
-\cs_new_protected:Npn \xparse_split_argument_aux:nnnn #1#2#3#4
+\cs_new_protected:Npn \@@_split_argument_aux:nnnn #1#2#3#4
{
\int_compare:nNnF {#1} = { #2 + \c_one }
{
@@ -2916,13 +2962,13 @@
\tl_set:Nx \ProcessedArgument
{
\exp_last_unbraced:NnNo
- \xparse_split_argument_aux:n
+ \@@_split_argument_aux:n
{ #2 + \c_one }
\use_none_delimit_by_q_stop:w
\ProcessedArgument
\q_stop
}
- \msg_kernel_error:nnxxx { xparse } { split-excess-tokens }
+ \__msg_kernel_error:nnxxx { xparse } { split-excess-tokens }
{ \tl_to_str:n {#3} } { \int_eval:n { #2 + \c_one } }
{ \tl_to_str:n {#4} }
}
@@ -2930,7 +2976,7 @@
\tl_put_right:Nx \ProcessedArgument
{
\prg_replicate:nn { #2 + \c_one - (#1) }
- { { \exp_not:n { \NoValue } } }
+ { { \exp_not:V \c_@@_no_value_tl } }
}
}
}
@@ -2939,9 +2985,9 @@
% Auxiliaries to leave exactly the correct number of arguments in
% \cs{ProcessedArgument}.
% \begin{macrocode}
-\cs_new:Npn \xparse_split_argument_aux:n #1
- { \prg_replicate:nn {#1} { \xparse_split_argument_aux:wn } }
-\cs_new:Npn \xparse_split_argument_aux:wn #1 \use_none_delimit_by_q_stop:w #2
+\cs_new:Npn \@@_split_argument_aux:n #1
+ { \prg_replicate:nn {#1} { \@@_split_argument_aux:wn } }
+\cs_new:Npn \@@_split_argument_aux:wn #1 \use_none_delimit_by_q_stop:w #2
{
\exp_not:n { {#2} }
#1
@@ -2953,37 +2999,37 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_trim_spaces:n}
+% \begin{macro}{\@@_trim_spaces:n}
% This one is almost trivial.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_trim_spaces:n #1
+\cs_new_protected:Npn \@@_trim_spaces:n #1
{ \tl_set:Nx \ProcessedArgument { \tl_trim_spaces:n {#1} } }
% \end{macrocode}
% \end{macro}
%
% \subsection{Access to the argument specification}
%
-% \begin{macro}{\xparse_get_arg_spec:N}
-% \begin{macro}{\xparse_get_arg_spec:n}
+% \begin{macro}{\@@_get_arg_spec:N}
+% \begin{macro}{\@@_get_arg_spec:n}
% \begin{macro}{\ArgumentSpecification}
% Recovering the argument specification is also trivial, using the
% \cs{tl_set_eq:cN} function.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_get_arg_spec:N #1
+\cs_new_protected:Npn \@@_get_arg_spec:N #1
{
- \prop_get:NnNF \l_xparse_command_arg_specs_prop {#1}
+ \prop_get:NnNF \l_@@_command_arg_specs_prop {#1}
\ArgumentSpecification
{
- \msg_kernel_error:nnx { xparse } { unknown-document-command }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-command }
{ \token_to_str:N #1 }
}
}
-\cs_new_protected:Npn \xparse_get_arg_spec:n #1
+\cs_new_protected:Npn \@@_get_arg_spec:n #1
{
- \prop_get:NnNF \l_xparse_environment_arg_specs_prop {#1}
+ \prop_get:NnNF \l_@@_environment_arg_specs_prop {#1}
\ArgumentSpecification
{
- \msg_kernel_error:nnx { xparse } { unknown-document-environment }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-environment }
{ \tl_to_str:n {#1} }
}
}
@@ -2993,28 +3039,28 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\xparse_show_arg_spec:N}
-% \begin{macro}{\xparse_show_arg_spec:n}
+% \begin{macro}{\@@_show_arg_spec:N}
+% \begin{macro}{\@@_show_arg_spec:n}
% Showing the argument specification simply means finding it and then
% calling the \cs{tl_show:N} function.
% \begin{macrocode}
-\cs_new_protected:Npn \xparse_show_arg_spec:N #1
+\cs_new_protected:Npn \@@_show_arg_spec:N #1
{
- \prop_get:NnNTF \l_xparse_command_arg_specs_prop {#1}
+ \prop_get:NnNTF \l_@@_command_arg_specs_prop {#1}
\ArgumentSpecification
{ \tl_show:N \ArgumentSpecification }
{
- \msg_kernel_error:nnx { xparse } { unknown-document-command }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-command }
{ \token_to_str:N #1 }
}
}
-\cs_new_protected:Npn \xparse_show_arg_spec:n #1
+\cs_new_protected:Npn \@@_show_arg_spec:n #1
{
- \prop_get:NnNTF \l_xparse_environment_arg_specs_prop {#1}
+ \prop_get:NnNTF \l_@@_environment_arg_specs_prop {#1}
\ArgumentSpecification
{ \tl_show:N \ArgumentSpecification }
{
- \msg_kernel_error:nnx { xparse } { unknown-document-environment }
+ \__msg_kernel_error:nnx { xparse } { unknown-document-environment }
{ \tl_to_str:n {#1} }
}
}
@@ -3024,11 +3070,30 @@
%
% \subsection{Utilities}
%
-% \begin{macro}[TF]{\xparse_if_no_value:n}
-% Tests for \cs{NoValue}.
+% \begin{macro}[TF]{\@@_if_no_value:n}
+% Tests for |-NoValue-|: this is similar to \cs{tl_if_in:nn} but set
+% up to be expandable. The question mark prevents the auxiliary from
+% losing braces.
% \begin{macrocode}
-\prg_new_conditional:Npnn \xparse_if_no_value:n #1 { T , F , TF }
- { \str_if_eq:nnTF {#1} { \NoValue } \prg_return_true: \prg_return_false: }
+\group_begin:
+\char_set_lccode:nn { `\Q } { `\- }
+\char_set_lccode:nn { `\F } { `\F }
+\char_set_lccode:nn { `\N } { `\N }
+\char_set_lccode:nn { `\T } { `\T }
+\char_set_lccode:nn { `\V } { `\V }
+\tl_to_lowercase:n
+ {
+ \group_end:
+ \prg_new_conditional:Npnn \@@_if_no_value:n #1 { T , F , TF }
+ {
+ \str_if_eq:onTF
+ { \@@_if_value_aux:w ? #1 { } QNoValue- }
+ { ? { } QNoValue- }
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+ \cs_new:Npn \@@_if_value_aux:w #1 QNoValue- { #1 }
+ }
% \end{macrocode}
% \end{macro}
%
@@ -3038,7 +3103,7 @@
%
% Some messages intended as errors.
% \begin{macrocode}
-\msg_kernel_new:nnnn { xparse } { bad-arg-spec }
+\__msg_kernel_new:nnnn { xparse } { bad-arg-spec }
{ Bad~argument~specification~'#1'. }
{
\c_msg_coding_error_text_tl
@@ -3046,48 +3111,48 @@
one~or~more~mandatory~pieces~of~information~were~missing. \\ \\
LaTeX~will~ignore~this~entire~definition.
}
-\msg_kernel_new:nnnn { xparse } { command-already-defined }
+\__msg_kernel_new:nnnn { xparse } { command-already-defined }
{ Command~'#1'~already~defined! }
{
You~have~used~\NewDocumentCommand
with~a~command~that~already~has~a~definition. \\
The~existing~definition~of~'#1'~will~be~overwritten.
}
-\msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
+\__msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
{ Command ~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentCommand
with~a~command~that~was~never~defined.\\
A~new~command~'#1'~will~be~created.
}
-\msg_kernel_new:nnnn { xparse } { environment-already-defined }
+\__msg_kernel_new:nnnn { xparse } { environment-already-defined }
{ Environment~'#1'~already~defined! }
{
You~have~used~\NewDocumentEnvironment
with~an~environment~that~already~has~a~definition.\\
The~existing~definition~of~'#1'~will~be~overwritten.
}
-\msg_kernel_new:nnnn { xparse } { environment-mismatch }
+\__msg_kernel_new:nnnn { xparse } { environment-mismatch }
{ Mismatch~between~start~and~end~of~environment. }
{
The~current~environment~is~called~'#1',~but~you~have~tried~to~
end~one~called~'#2'.~Environments~have~to~be~properly~nested.
}
-\msg_kernel_new:nnnn { xparse } { environment-not-yet-defined }
+\__msg_kernel_new:nnnn { xparse } { environment-not-yet-defined }
{ Environment~'#1'~not~yet~defined! }
{
You~have~used~\RenewDocumentEnvironment
with~an~environment~that~was~never~defined.\\
A~new~environment~'#1'~will~be~created.
}
-\msg_kernel_new:nnnn { xparse } { environment-unknown }
+\__msg_kernel_new:nnnn { xparse } { environment-unknown }
{ Environment~'#1'~undefined. }
{
You~have~tried~to~start~an~environment~called~'#1',~
but~this~has~never~been~defined.\\
The~command~will~be~ignored.
}
-\msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
+\__msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
{ Argument~specification~for~expandable~command~ends~with~optional~argument. }
{
\c_msg_coding_error_text_tl
@@ -3095,14 +3160,14 @@
(or~no~arguments~at~all).~You~cannot~have~a~terminal~optional~
argument~with~expandable~commands.
}
-\msg_kernel_new:nnnn { xparse } { inconsistent-long }
+\__msg_kernel_new:nnnn { xparse } { inconsistent-long }
{ Inconsistent~long~arguments~for~expandable~command. }
{
\c_msg_coding_error_text_tl
The~arguments~for~an~expandable~command~must~either~all~be~
short~or~all~be~long.~You~have~tried~to~mix~the~two~types.
}
-\msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type }
+\__msg_kernel_new:nnnn { xparse } { invalid-expandable-argument-type }
{ Argument~type~'#1'~not~available~for~an~expandable~function. }
{
\c_msg_coding_error_text_tl
@@ -3111,14 +3176,14 @@
\\ \\
LaTeX~will~assume~you~want~a~standard~mandatory~argument~(type~'m').
}
-\msg_kernel_new:nnnn { xparse } { missing-required }
+\__msg_kernel_new:nnnn { xparse } { missing-required }
{ Failed~to~find~required~argument~starting~with~'#1'. }
{
There~is~supposed~to~be~an~argument~to~the~current~function~starting~with~
'#1'.~LaTeX~did~not~find~it,~and~will~insert~'#2'~as~the~value~to~be~
processed.
}
-\msg_kernel_new:nnnn { xparse } { not-single-token }
+\__msg_kernel_new:nnnn { xparse } { not-single-token }
{ Argument~delimiter~should~be~a~single~token:~'#1'. }
{
\c_msg_coding_error_text_tl
@@ -3126,40 +3191,40 @@
in~a~place~where~a~single~token~is~required,~LaTeX~found~'#1'. \\ \\
LaTeX~will~ignore~this~entire~definition.
}
-\msg_kernel_new:nnnn { xparse } { processor-in-expandable }
+\__msg_kernel_new:nnnn { xparse } { processor-in-expandable }
{ Argument~processors~cannot~be~used~with~expandable~functions. }
{
\c_msg_coding_error_text_tl
The~argument~specification~for~#1~contains~a~processor~function:~
this~is~only~supported~for~standard~robust~functions.
}
-\msg_kernel_new:nnnn { xparse } { split-excess-tokens }
+\__msg_kernel_new:nnnn { xparse } { split-excess-tokens }
{ Too~many~'#1'~tokens~when~trying~to~split~argument. }
{
LaTeX~was~asked~to~split~the~input~'#3'~
at~each~occurrence~of~the~token~'#1',~up~to~a~maximum~of~#2~parts.~
There~were~too~many~'#1'~tokens.
}
-\msg_kernel_new:nnnn { xparse } { unknown-argument-type }
+\__msg_kernel_new:nnnn { xparse } { unknown-argument-type }
{ Unknown~argument~type~'#1'~replaced~by~'m'. }
{
\c_msg_coding_error_text_tl
The~letter~'#1'~does~not~specify~a~known~argument~type.~
LaTeX~will~assume~you~want~a~standard~mandatory~argument~(type~'m').
}
-\msg_kernel_new:nnnn { xparse } { unknown-document-command }
+\__msg_kernel_new:nnnn { xparse } { unknown-document-command }
{ Unknown~document~command~'#1'. }
{
You~have~asked~for~the~argument~specification~for~a~command~'#1',~
but~this~is~not~a~document~command.
}
-\msg_kernel_new:nnnn { xparse } { unknown-document-environment }
+\__msg_kernel_new:nnnn { xparse } { unknown-document-environment }
{ Unknown~document~environment~'#1'. }
{
You~have~asked~for~the~argument~specification~for~a~command~'#1',~
but~this~is~not~a~document~environment.
}
-\msg_kernel_new:nnnn { xparse } { verbatim-newline }
+\__msg_kernel_new:nnnn { xparse } { verbatim-newline }
{ Verbatim~argument~of~#1~ended~by~end~of~line. }
{
The~verbatim~argument~of~#1~cannot~contain~more~than~one~line,~but~the~end~
@@ -3168,7 +3233,7 @@
\\ \\
LaTeX~will~ignored~'#2'.
}
-\msg_kernel_new:nnnn { xparse } { verbatim-already-tokenized }
+\__msg_kernel_new:nnnn { xparse } { verbatim-already-tokenized }
{ Verbatim~command~#1~illegal~in~command~argument. }
{
The~command~#1~takes~a~verbatim~argument.~It~may~not~appear~within~
@@ -3180,22 +3245,22 @@
%
% Intended more for information.
% \begin{macrocode}
-\msg_kernel_new:nnn { xparse } { define-command }
+\__msg_kernel_new:nnn { xparse } { define-command }
{
Defining~document~command~#1~
with~arg.~spec.~'#2'~\msg_line_context:.
}
-\msg_kernel_new:nnn { xparse } { define-environment }
+\__msg_kernel_new:nnn { xparse } { define-environment }
{
Defining~document~environment~'#1'~
with~arg.~spec.~'#2'~\msg_line_context:.
}
-\msg_kernel_new:nnn { xparse } { redefine-command }
+\__msg_kernel_new:nnn { xparse } { redefine-command }
{
Redefining~document~command~#1~
with~arg.~spec.~'#2'~\msg_line_context:.
}
-\msg_kernel_new:nnn { xparse } { redefine-environment }
+\__msg_kernel_new:nnn { xparse } { redefine-environment }
{
Redefining~document~environment~'#1'~
with~arg.~spec.~'#2'~\msg_line_context:.
@@ -3224,27 +3289,27 @@
% The user macros are pretty simple wrappers around the internal ones.
% \begin{macrocode}
\cs_new_protected:Npn \DeclareDocumentCommand #1#2#3
- { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
+ { \@@_declare_cmd:Nnn #1 {#2} {#3} }
\cs_new_protected:Npn \NewDocumentCommand #1#2#3
{
\cs_if_exist:NTF #1
{
- \msg_kernel_error:nnx { xparse } { command-already-defined }
+ \__msg_kernel_error:nnx { xparse } { command-already-defined }
{ \token_to_str:N #1 }
}
- { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
+ { \@@_declare_cmd:Nnn #1 {#2} {#3} }
}
\cs_new_protected:Npn \RenewDocumentCommand #1#2#3
{
\cs_if_exist:NTF #1
- { \xparse_declare_cmd:Nnn #1 {#2} {#3} }
+ { \@@_declare_cmd:Nnn #1 {#2} {#3} }
{
- \msg_kernel_error:nnx { xparse } { command-not-yet-defined }
+ \__msg_kernel_error:nnx { xparse } { command-not-yet-defined }
{ \token_to_str:N #1 }
}
}
\cs_new_protected:Npn \ProvideDocumentCommand #1#2#3
- { \cs_if_exist:NF #1 { \xparse_declare_cmd:Nnn #1 {#2} {#3} } }
+ { \cs_if_exist:NF #1 { \@@_declare_cmd:Nnn #1 {#2} {#3} } }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3258,21 +3323,21 @@
% Very similar for environments.
% \begin{macrocode}
\cs_new_protected:Npn \DeclareDocumentEnvironment #1#2#3#4
- { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
+ { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} }
\cs_new_protected:Npn \NewDocumentEnvironment #1#2#3#4
{
\cs_if_exist:cTF {#1}
- { \msg_kernel_error:nnx { xparse } { environment-already-defined } {#1} }
- { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
+ { \__msg_kernel_error:nnx { xparse } { environment-already-defined } {#1} }
+ { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} }
}
\cs_new_protected:Npn \RenewDocumentEnvironment #1#2#3#4
{
\cs_if_exist:cTF {#1}
- { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} }
- { \msg_kernel_error:nnx { xparse } { environment-not-yet-defined } {#1} }
+ { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} }
+ { \__msg_kernel_error:nnx { xparse } { environment-not-yet-defined } {#1} }
}
\cs_new_protected:Npn \ProvideDocumentEnvironment #1#2#3#4
- { \cs_if_exist:cF { #1 } { \xparse_declare_env:nnnn {#1} {#2} {#3} {#4} } }
+ { \cs_if_exist:cF { #1 } { \@@_declare_env:nnnn {#1} {#2} {#3} {#4} } }
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3283,7 +3348,7 @@
% The expandable version of the basic function is essentially the same.
% \begin{macrocode}
\cs_new_protected:Npn \DeclareExpandableDocumentCommand #1#2#3
- { \xparse_declare_expandable_cmd:Nnn #1 {#2} {#3} }
+ { \@@_declare_expandable_cmd:Nnn #1 {#2} {#3} }
% \end{macrocode}
% \end{macro}
%
@@ -3301,29 +3366,20 @@
% \begin{macro}[TF]{\IfNoValue}
% Simple re-naming.
% \begin{macrocode}
-\cs_new_eq:NN \IfNoValueF \xparse_if_no_value:nF
-\cs_new_eq:NN \IfNoValueT \xparse_if_no_value:nT
-\cs_new_eq:NN \IfNoValueTF \xparse_if_no_value:nTF
+\cs_new_eq:NN \IfNoValueF \@@_if_no_value:nF
+\cs_new_eq:NN \IfNoValueT \@@_if_no_value:nT
+\cs_new_eq:NN \IfNoValueTF \@@_if_no_value:nTF
% \end{macrocode}
% \end{macro}
% \begin{macro}[TF]{\IfValue}
% Inverted logic.
% \begin{macrocode}
-\cs_set:Npn \IfValueF { \xparse_if_no_value:nT }
-\cs_set:Npn \IfValueT { \xparse_if_no_value:nF }
-\cs_set:Npn \IfValueTF #1#2#3 { \xparse_if_no_value:nTF {#1} {#3} {#2} }
+\cs_set:Npn \IfValueF { \@@_if_no_value:nT }
+\cs_set:Npn \IfValueT { \@@_if_no_value:nF }
+\cs_set:Npn \IfValueTF #1#2#3 { \@@_if_no_value:nTF {#1} {#3} {#2} }
% \end{macrocode}
% \end{macro}
%
-% \begin{variable}{\NoValue}
-% The marker for no value being give: this can be typeset safely.
-% This is coded by hand as making it \cs{protected} ensures that it
-% will not turn into anything else by accident.
-% \begin{macrocode}
-\cs_new_protected:Npn \NoValue { -NoValue- }
-% \end{macrocode}
-% \end{variable}
-%
% \begin{macro}{\ProcessedArgument}
% Processed arguments are returned using this name, which is reserved
% here although the definition will change.
@@ -3335,10 +3391,10 @@
% \begin{macro}{\ReverseBoolean, \SplitArgument, \SplitList, \TrimSpaces}
% Simple copies.
% \begin{macrocode}
-\cs_new_eq:NN \ReverseBoolean \xparse_bool_reverse:N
-\cs_new_eq:NN \SplitArgument \xparse_split_argument:nnn
-\cs_new_eq:NN \SplitList \xparse_split_list:nn
-\cs_new_eq:NN \TrimSpaces \xparse_trim_spaces:n
+\cs_new_eq:NN \ReverseBoolean \@@_bool_reverse:N
+\cs_new_eq:NN \SplitArgument \@@_split_argument:nnn
+\cs_new_eq:NN \SplitList \@@_split_list:nn
+\cs_new_eq:NN \TrimSpaces \@@_trim_spaces:n
% \end{macrocode}
% \end{macro}
%
@@ -3355,10 +3411,10 @@
% \begin{macro}{\ShowDocumentEnvironmentArgSpec}
% More simple mappings.
% \begin{macrocode}
-\cs_new_eq:NN \GetDocumentCommandArgSpec \xparse_get_arg_spec:N
-\cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \xparse_get_arg_spec:n
-\cs_new_eq:NN \ShowDocumentCommandArgSpec \xparse_show_arg_spec:N
-\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \xparse_show_arg_spec:n
+\cs_new_eq:NN \GetDocumentCommandArgSpec \@@_get_arg_spec:N
+\cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \@@_get_arg_spec:n
+\cs_new_eq:NN \ShowDocumentCommandArgSpec \@@_show_arg_spec:N
+\cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \@@_show_arg_spec:n
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins
index 995ddbb8ff0..bec43149679 100644
--- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins
+++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.ins
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File xparse.ins Copyright (C) 2000-2011 The LaTeX3 Project
+File xparse.ins Copyright (C) 2000-2012 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
@@ -16,7 +16,7 @@ The released version of this bundle is available from CTAN.
\fi
-\input docstrip.tex
+\input l3docstrip.tex
\askforoverwritefalse
\preamble