diff options
author | Karl Berry <karl@freefriends.org> | 2011-10-10 21:53:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-10-10 21:53:05 +0000 |
commit | d2d088ff389655c2c3aad324760138895af2a9d3 (patch) | |
tree | 4ecc58534aba97bdfccadd451ead5c5c9289bb23 /Master/texmf-dist/source | |
parent | 26a0070af35fa5652128c74fa1f126ec51def209 (diff) |
l3packages 2900 (10oct11)
git-svn-id: svn://tug.org/texlive/trunk@24257 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
4 files changed, 200 insertions, 82 deletions
diff --git a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx index a716713b8e4..781758faed7 100644 --- a/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx +++ b/Master/texmf-dist/source/latex/l3packages/l3keys2e/l3keys2e.dtx @@ -36,7 +36,7 @@ % %<*driver|package> \RequirePackage{xparse} -\GetIdInfo$Id: l3keys2e.dtx 2828 2011-09-15 20:04:53Z joseph $ +\GetIdInfo$Id: l3keys2e.dtx 2900 2011-10-09 21:22:46Z joseph $ {LaTeX2e option processing using LaTeX3 keys} %</driver|package> %<*driver> @@ -137,7 +137,7 @@ % % A check to make sure that \pkg{expl3} is not too old % \begin{macrocode} -\@ifpackagelater { expl3 } { 2011/09/15 } +\@ifpackagelater { expl3 } { 2011/10/06 } { } { \PackageError { l3keys2e } { Support~package~l3kernel~too~old. } diff --git a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx index fa930a4d16e..9875bd8f030 100644 --- a/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xfrac/xfrac.dtx @@ -37,7 +37,7 @@ % %<*driver|package> \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate} -\GetIdInfo$Id: xfrac.dtx 2349 2011-05-11 18:44:37Z joseph $ +\GetIdInfo$Id: xfrac.dtx 2896 2011-10-09 20:36:50Z joseph $ {L3 Experimental split-level fractions} %</driver|package> %<*driver> diff --git a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx index 8ed92661c17..fd928f9f612 100644 --- a/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xparse/xparse.dtx @@ -40,7 +40,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: xparse.dtx 2828 2011-09-15 20:04:53Z joseph $ +\GetIdInfo$Id: xparse.dtx 2900 2011-10-09 21:22:46Z joseph $ {L3 Experimental document command parser} %</driver|package> %<*driver> @@ -140,6 +140,7 @@ % of the \LaTeXe{} command \cs{verb}. Thus a \texttt{v}-type argument % is read between two matching tokens, which cannot be any of |%|, |\|, % |#|, |{|, |}|, |^| or \verb*| |. +% The verbatim argument can also be enclosed between braces, |{| and |}|. % A command with a verbatim % argument will not work when it appears within an argument of % another function. @@ -485,6 +486,30 @@ % Any category code $13$ (active) \meta{tokens} will be replaced % before the split takes place. % \end{function} +% +% \begin{function}{\TrimSpaces} +% \begin{syntax} +% \cs{TrimSpaces} +% \end{syntax} +% Removes any leading and trailing spaces (tokens with character code~$32$ +% and category code~$10$) for the ends of the argument. Thus for example +% declaring a function +% \begin{verbatim} +% \DeclareDocumentCommand \foo +% { > { \TrimSpaces } } +% { \showtokens {#1} } +% \end{verbatim} +% and using it in a document as +% \begin{verbatim} +% \foo{ hello world } +% \end{verbatim} +% will show \texttt{hello world} at the terminal, with the space at each +% end removed. \cs{TrimSpaces} will remove multiple spaces from the ends of +% the input in cases where these have been included such that the standard +% \TeX{} conversion of multiple spaces to a single space does not apply. +% +% \textbf{This function is experimental.} +% \end{function} % % \subsection{Separating interface and implementation} % @@ -623,7 +648,7 @@ % % A check to make sure that \pkg{expl3} is not too old % \begin{macrocode} -\@ifpackagelater { expl3 } { 2011/09/15 } +\@ifpackagelater { expl3 } { 2011/10/09 } { } { \PackageError { xparse } { Support~package~l3kernel~too~old. } @@ -1821,46 +1846,24 @@ % % \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}{\xparse_grab_v_aux:nw, \xparse_grab_v_aux_test:nN} -% \begin{macro} -% { -% \xparse_grab_v_aux_loop:N, -% \xparse_grab_v_aux_loop_ii:NN, -% \xparse_grab_v_aux_loop_end:, -% \xparse_grab_v_group_end: -% } -% \begin{macro}{\xparse_grab_v_aux_abort:, \xparse_grab_v_aux_abort_ii:w} -% The opening delimiter is never read verbatim: if the preceeding -% argument was optional and absent, then \TeX{} has already read +% 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 -% to check is that this delimiter is a character. -% Then change category codes, and start reading tokens one by one. -% If the verbatim was not nested, we will be grabbing one character -% at each step. Unfortunately, it can happen that what follows the -% verbatim argument is already tokenized. Thus, we check at each step -% that the next token is indeed a \enquote{nice} -% character, \emph{i.e.}, is not a character with -% category code $1$ (begin-group), $2$ (end-group) -% 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{g_xparse_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 -% character matching the delimiter. +% to check is that this delimiter is a character, and distinguish the +% 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:}. % % 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. -% -% 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. +% It is ended by \cs{xparse_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 @@ -1876,33 +1879,72 @@ } \cs_new_protected:Npn \xparse_grab_v_aux:w #1 \l_xparse_args_tl { + \tl_set:Nn \l_xparse_v_rest_of_signature_tl {#1} \group_begin: \group_align_safe_begin: \tex_escapechar:D = 92 \scan_stop: - \tl_set:Nn \l_xparse_v_rest_of_signature_tl {#1} \tl_clear:N \l_xparse_v_arg_tl \peek_N_type:TF { \xparse_grab_v_aux_test:N } - { \xparse_grab_v_aux_abort: } + { + \peek_meaning_remove:NTF \c_group_begin_token + { + \group_align_safe_end: + \xparse_grab_v_bgroup: + } + { \xparse_grab_v_aux_abort: } + } } +\cs_new_protected_nopar:Npn \xparse_grab_v_group_end: + { + \tl_set:Nx \l_xparse_tmp_tl + { + \tl_set:Nn \exp_not:N \l_xparse_v_arg_tl + { \exp_not:o \l_xparse_v_arg_tl } + } + \exp_after:wN \group_align_safe_end: + \exp_after:wN \group_end: + \l_xparse_tmp_tl + } +% \end{macrocode} +% \end{variable} +% \end{variable} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\xparse_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: +% } +% Check that the opening delimiter is a character, setup category codes, +% then start reading tokens one by one, keeping the delimiter as an argument. +% If the verbatim was not nested, we will be grabbing one character +% at each step. Unfortunately, it can happen that what follows the +% verbatim argument is already tokenized. Thus, we check at each step +% that the next token is indeed a \enquote{nice} +% character, \emph{i.e.}, is not a character with +% category code $1$ (begin-group), $2$ (end-group) +% 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}. +% 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 +% character matching the delimiter. +% \begin{macrocode} \cs_new_protected:Npn \xparse_grab_v_aux_test:N #1 { \tl_put_right:Nn \l_xparse_v_arg_tl {#1} \xparse_grab_v_token_if_char:NTF #1 { -%<*initex> - \seq_map_function:NN - \c_xparse_special_chars_seq - \char_set_catcode_other:N -%</initex> -%<*package> - \cs_set_eq:NN \do \char_set_catcode_other:N - \dospecials -%</package> - \tex_endlinechar:D = `\^^M \scan_stop: - \bool_if:NTF \l_xparse_long_bool - { \char_set_catcode_other:n { \tex_endlinechar:D } } - { \char_set_catcode_parameter:n { \tex_endlinechar:D } } + \xparse_grab_v_aux_catcodes: \xparse_grab_v_aux_loop:N #1 } { \xparse_grab_v_aux_abort: } @@ -1933,6 +1975,97 @@ { \exp_args:No \str_tail:n { \l_xparse_v_arg_tl } } \l_xparse_v_rest_of_signature_tl \l_xparse_args_tl } +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\xparse_grab_v_bgroup:} +% \begin{macro} +% { +% \xparse_grab_v_bgroup_loop:, +% \xparse_grab_v_bgroup_loop_ii:N +% } +% \begin{variable}{\l_xparse_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 +% 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} +% 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:Npn \xparse_grab_v_bgroup: + { + \xparse_grab_v_aux_catcodes: + \int_set_eq:NN \l_xparse_v_nesting_int \c_one + \tl_set:Nx \l_xparse_v_arg_tl { \iow_char:N \{ } + \xparse_grab_v_bgroup_loop: + } +\cs_new_protected:Npn \xparse_grab_v_bgroup_loop: + { + \peek_N_type:TF + { \xparse_grab_v_bgroup_loop_ii:N } + { \xparse_grab_v_aux_abort: } + } +\cs_new_protected:Npn \xparse_grab_v_bgroup_loop_ii:N #1 + { + \xparse_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 + { + \tl_put_right:Nn \l_xparse_v_arg_tl { #1 } + \xparse_grab_v_bgroup_loop: + } + { \xparse_grab_v_aux_loop_end: } + } + { + \token_if_eq_charcode:NNT \c_group_begin_token #1 + { \int_incr:N \l_xparse_v_nesting_int } + \tl_put_right:Nn \l_xparse_v_arg_tl { #1 } + \xparse_grab_v_bgroup_loop: + } + } + { \xparse_grab_v_aux_abort: #1 } + } +% \end{macrocode} +% \end{variable} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\xparse_grab_v_aux_catcodes:} +% \begin{macro}{\xparse_grab_v_aux_abort:, \xparse_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 +% \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: + { +%<*initex> + \seq_map_function:NN + \c_xparse_special_chars_seq + \char_set_catcode_other:N +%</initex> +%<*package> + \cs_set_eq:NN \do \char_set_catcode_other:N + \dospecials +%</package> + \tex_endlinechar:D = `\^^M \scan_stop: + \bool_if:NTF \l_xparse_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: { \xparse_grab_v_group_end: @@ -1959,28 +2092,6 @@ } } % \end{macrocode} -% Two items need to be smuggled out of the group used by the code. -% \begin{macrocode} -\cs_new_protected_nopar:Npn \xparse_grab_v_group_end: - { - \tl_set:Nx \l_xparse_tmp_tl - { - \tl_set:Nn \exp_not:N \l_xparse_v_rest_of_signature_tl - { \exp_not:o \l_xparse_v_rest_of_signature_tl } - \tl_set:Nn \exp_not:N \l_xparse_v_arg_tl - { \exp_not:o \l_xparse_v_arg_tl } - } - \exp_after:wN \group_align_safe_end: - \exp_after:wN \group_end: - \l_xparse_tmp_tl - } -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{variable} -% \end{variable} % \end{macro} % \end{macro} % @@ -2125,6 +2236,14 @@ % \end{macro} % \end{macro} % \end{macro} +% +% \begin{macro}{\xparse_trim_spaces:n} +% This one is almost trivial. +% \begin{macrocode} +\cs_new_protected:Npn \xparse_trim_spaces:n #1 + { \tl_set:Nx \ProcessedArgument { \tl_trim_spaces:n {#1} } } +% \end{macrocode} +% \end{macro} % % \subsection{Creating expandable functions} % @@ -2866,15 +2985,14 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\SplitArgument} -% \begin{macro}{\SplitList} -% Another simple copy. +% \begin{macro}{\SplitArgument, \SplitList, \TrimSpaces} +% Simple copies % \begin{macrocode} \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 % \end{macrocode} % \end{macro} -% \end{macro} % % \begin{macro}{\GetDocumentCommandArgSpec} % \begin{macro}{\GetDocumentEnvironmentArgSpec} diff --git a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx index 4f97e93aba4..f5ebf79de5e 100644 --- a/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx +++ b/Master/texmf-dist/source/latex/l3packages/xtemplate/xtemplate.dtx @@ -40,7 +40,7 @@ % %<*driver|package> \RequirePackage{expl3} -\GetIdInfo$Id: xtemplate.dtx 2828 2011-09-15 20:04:53Z joseph $ +\GetIdInfo$Id: xtemplate.dtx 2900 2011-10-09 21:22:46Z joseph $ {L3 Experimental prototype document functions} %</driver|package> %<*driver> @@ -661,7 +661,7 @@ % % A check to make sure that \pkg{expl3} is not too old % \begin{macrocode} -\@ifpackagelater { expl3 } { 2011/09/15 } +\@ifpackagelater { expl3 } { 2011/10/09 } { } { \PackageError { xtemplate } { Support~package~l3kernel~too~old. } @@ -2550,7 +2550,7 @@ You~asked~to~use~#2~arguments:~this~is~not~supported. } \msg_new:nnnn { xtemplate } { bad-variable } - { Incorrect~variable~description. } + { Incorrect~variable~description~'#1'. } { The~argument~'#1'~is~not~of~the~form \\ ~~'<variable>'\\ |