summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-08-18 23:12:56 +0000
committerKarl Berry <karl@freefriends.org>2011-08-18 23:12:56 +0000
commiteae5d19d439ded67f5535d315a8983939733b548 (patch)
tree4a9013282bd26875540c662fbde8bd49b28b6f51 /Master/texmf-dist/tex/latex/l3kernel
parent9e6c3db576f3908b80eb70d378aca43a22c043b1 (diff)
l3kernel 2607 (17aug11)
git-svn-id: svn://tug.org/texlive/trunk@23596 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3box.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls12
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3int.sty109
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3io.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3keys.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3keyval.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3msg.sty41
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3prg.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3seq.sty34
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3tl.sty49
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3token.sty19
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3toks.sty2
13 files changed, 191 insertions, 97 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index b802a008132..117c5ca5b4f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -48,8 +48,8 @@
\RequirePackage{l3names}
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2011/08/13}
-\def\ExplFileVersion{2564}
+\def\ExplFileDate{2011/08/17}
+\def\ExplFileVersion{2607}
\RequirePackage{etex}
\reserveinserts{32}
\RequirePackage{calc}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index 2b2175e3d7c..c6bd2936aae 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3box.dtx 2526 2011-08-09 08:58:42Z joseph $
+\GetIdInfo$Id: l3box.dtx 2595 2011-08-16 00:58:34Z bruno $
{L3 Experimental boxes}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index 00ef5ad8e58..8f91c9a54f6 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -6,7 +6,6 @@
%%
%% l3doc.dtx (with options: `class')
%%
-%%
%% EXPERIMENTAL CODE
%%
%% Do not distribute this file without also distributing the
@@ -14,7 +13,6 @@
%%
%% Do not distribute a modified version of this file.
%%
-%%
%% File: l3doc.dtx Copyright (C) 1990-2011 The LaTeX3 project
%%
%% It may be distributed and/or modified under the conditions of the
@@ -52,7 +50,7 @@
\let \filedateOld \ExplFileDate
\let \fileversionOld \ExplFileVersion
\let \filedescriptionOld \ExplFileDescription
-\GetIdInfo$Id: l3doc.dtx 2540 2011-08-10 23:39:33Z bruno $
+\GetIdInfo$Id: l3doc.dtx 2601 2011-08-16 23:20:27Z bruno $
{L3 Experimental documentation class}
\ProvidesExplClass
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -335,8 +333,8 @@
$\star$
}
\tl_set:Nx \g_doc_macro_tl { \tl_to_str:N \g_doc_macro_tl }
- \exp_args:NNf \tl_replace_all_in:Nnn \g_doc_macro_tl {\token_to_str:N _} {/}
- \exp_args:NNf \tl_replace_all_in:Nnn \g_doc_macro_tl {\@backslashchar} {}
+ \exp_args:NNf \tl_replace_all:Nnn \g_doc_macro_tl {\token_to_str:N _} {/}
+ \exp_args:NNf \tl_replace_all:Nnn \g_doc_macro_tl {\@backslashchar} {}
\bool_if:NT \g_doc_full_bool {
\exp_args:Nf\label{doc/function/\g_doc_macro_tl#3#2}
}
@@ -473,8 +471,8 @@
\bool_if:NF \l_doc_macro_aux_bool {
\tl_gset:Nx \l_doc_macro_tl { \tl_to_str:n {#1} }
- \exp_args:NNf \tl_greplace_all_in:Nnn \l_doc_macro_tl {\token_to_str:N _} {/}
- \exp_args:NNf \tl_greplace_all_in:Nnn \l_doc_macro_tl {\@backslashchar} {}
+ \exp_args:NNf \tl_greplace_all:Nnn \l_doc_macro_tl {\token_to_str:N _} {/}
+ \exp_args:NNf \tl_greplace_all:Nnn \l_doc_macro_tl {\@backslashchar} {}
}
\use:x {
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
index 809ed14ab66..070c9a3a6e6 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3int.dtx 2551 2011-08-11 22:40:53Z bruno $
+\GetIdInfo$Id: l3int.dtx 2600 2011-08-16 22:31:24Z bruno $
{L3 Experimental integers}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -415,67 +415,66 @@
{ 26 } { Z }
}
}
-\cs_new:Npn \int_to_base:nn #1#2
+\cs_new:Npn \int_to_base:nn #1
+ { \exp_args:Nf \int_to_base_aux_i:nn { \int_eval:n {#1} } }
+\cs_new:Npn \int_to_base_aux_i:nn #1#2
{
\int_compare:nNnTF {#1} < \c_zero
+ { \exp_args:No \int_to_base_aux_ii:nnN { \use_none:n #1 } {#2} - }
+ { \int_to_base_aux_ii:nnN {#1} {#2} \c_empty_tl }
+ }
+\cs_new:Npn \int_to_base_aux_ii:nnN #1#2#3
+ {
+ \int_compare:nNnTF {#1} < {#2}
+ { \exp_last_unbraced:Nf #3 { \int_to_letter:n {#1} } }
{
- -
- \exp_args:Nnf \int_to_base_aux:nnn
- { } { \int_eval:n { 0 - ( #1 ) } } {#2}
+ \exp_args:Nf \int_to_base_aux_iii:nnnN
+ { \int_to_letter:n { \int_mod:nn {#1} {#2} } }
+ {#1}
+ {#2}
+ #3
}
- {
- \exp_args:Nnf \int_to_base_aux:nnn
- { } { \int_eval:n {#1} } {#2}
- }
-}
-\cs_new:Npn \int_to_base_aux:nnn #1#2#3 {
- \int_compare:nNnTF {#2} < {#3}
- {
- \int_to_letter:n {#2}
- #1
- }
- {
- \exp_args:Nff \int_to_base_aux:nnn
- {
- \int_to_letter:n { \int_mod:nn {#2} {#3} }
- #1
- }
- { \int_div_truncate:nn {#2} {#3} }
- {#3}
- }
+ }
+\cs_new:Npn \int_to_base_aux_iii:nnnN #1#2#3#4
+ {
+ \exp_args:Nf \int_to_base_aux_ii:nnN
+ { \int_div_truncate:nn {#2} {#3} }
+ {#3}
+ #4
+ #1
}
\cs_new:Npn \int_to_letter:n #1
{
- \prg_case_int:nnn { #1 - 9 }
- {
- { 1 } { A }
- { 2 } { B }
- { 3 } { C }
- { 4 } { D }
- { 5 } { E }
- { 6 } { F }
- { 7 } { G }
- { 8 } { H }
- { 9 } { I }
- { 10 } { J }
- { 11 } { K }
- { 12 } { L }
- { 13 } { M }
- { 14 } { N }
- { 15 } { O }
- { 16 } { P }
- { 17 } { Q }
- { 18 } { R }
- { 19 } { S }
- { 20 } { T }
- { 21 } { U }
- { 22 } { V }
- { 23 } { W }
- { 24 } { X }
- { 25 } { Y }
- { 26 } { Z }
- }
- {#1}
+ \exp_after:wN \exp_after:wN
+ \if_case:w \int_eval:w #1 - \c_ten \int_eval_end:
+ A
+ \or: B
+ \or: C
+ \or: D
+ \or: E
+ \or: F
+ \or: G
+ \or: H
+ \or: I
+ \or: J
+ \or: K
+ \or: L
+ \or: M
+ \or: N
+ \or: O
+ \or: P
+ \or: Q
+ \or: R
+ \or: S
+ \or: T
+ \or: U
+ \or: V
+ \or: W
+ \or: X
+ \or: Y
+ \or: Z
+ \else: #1
+ \fi:
}
\cs_new:Npn \int_to_binary:n #1
{ \int_to_base:nn {#1} { 2 } }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty
index 7239fbae288..b3ae494e9fb 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3io.dtx 2478 2011-06-19 21:34:23Z joseph $
+\GetIdInfo$Id: l3io.dtx 2595 2011-08-16 00:58:34Z bruno $
{L3 Experimental input-output operations}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
index b12add10c9c..749a5791777 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3keys.dtx 2478 2011-06-19 21:34:23Z joseph $
+\GetIdInfo$Id: l3keys.dtx 2568 2011-08-14 05:03:32Z bruno $
{L3 Experimental key-value interfaces}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keyval.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keyval.sty
index c42867b5b48..a2b5411e916 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keyval.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keyval.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3keyval.dtx 2478 2011-06-19 21:34:23Z joseph $
+\GetIdInfo$Id: l3keyval.dtx 2601 2011-08-16 23:20:27Z bruno $
{L3 Experimental key-value parsing}
%\section{Parsing key--value lists}
%\begin{function}{\keyval_parse:NNn}
@@ -71,8 +71,8 @@
\group_begin:
\tl_clear:N \l_keyval_sanitise_tl
\tl_set:Nn \l_keyval_sanitise_tl {#1}
- \tl_replace_all_in:Nnn \l_keyval_sanitise_tl { = } { 8 }
- \tl_replace_all_in:Nnn \l_keyval_sanitise_tl { , } { 9 }
+ \tl_replace_all:Nnn \l_keyval_sanitise_tl { = } { 8 }
+ \tl_replace_all:Nnn \l_keyval_sanitise_tl { , } { 9 }
\tl_clear:N \l_keyval_parse_tl
\exp_after:wN \keyval_parse_elt:w \exp_after:wN
\q_no_value \l_keyval_sanitise_tl 9 \q_nil 9
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index 43ccc081d3d..c98aad9f7c2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 2551 2011-08-11 22:40:53Z bruno $
+\GetIdInfo$Id: l3msg.dtx 2601 2011-08-16 23:20:27Z bruno $
{L3 Experimental messages}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -61,7 +61,7 @@
\msg_kernel_error:nn { msg } { message-already-defined }
{#1} {#2}
}
- \msg_set:nnnn {#1} {#2}
+ \msg_gset:nnnn {#1} {#2}
}
\cs_new_protected:Npn \msg_new:nnn #1#2#3
{ \msg_new:nnnn {#1} {#2} {#3} { } }
@@ -74,6 +74,15 @@
}
\cs_new_protected:Npn \msg_set:nnn #1#2#3
{ \msg_set:nnnn {#1} {#2} {#3} { } }
+\cs_new_protected:Npn \msg_gset:nnnn #1#2#3#4
+ {
+ \cs_gset:cpn { \c_msg_text_prefix_tl #1 / #2 }
+ ##1##2##3##4 {#3}
+ \cs_gset:cpn { \c_msg_more_text_prefix_tl #1 / #2 }
+ ##1##2##3##4 {#4}
+ }
+\cs_new_protected:Npn \msg_gset:nnn #1#2#3
+ { \msg_gset:nnnn {#1} {#2} {#3} { } }
\tl_const:Nn \c_msg_coding_error_text_tl
{
This~is~a~coding~error.
@@ -160,8 +169,8 @@
\tex_errhelp:D \exp_after:wN { \l_msg_tmp_tl }
}
\group_begin: % {
- \char_set_lccode:w `\} = `\ \scan_stop:
- \char_set_lccode:w `\& = `\! \scan_stop:
+ \char_set_lccode:nn {`\}} {`\ }
+ \char_set_lccode:nn {`\&} {`\!}
\char_set_catcode_active:N \&
\tl_to_lowercase:n
{
@@ -564,15 +573,27 @@
\c_msg_return_text_tl
}
\group_begin:
-\cs_new:Npx \msg_expandable_error:n #1
+\char_set_catcode_math_superscript:N \^
+\char_set_lccode:nn {`^} {`\ }
+\char_set_lccode:nn {`L} {`L}
+\char_set_lccode:nn {`T} {`T}
+\char_set_lccode:nn {`X} {`X}
+\tl_to_lowercase:n
{
- \exp_not:n
+ \cs_new:Npx \msg_expandable_error:n #1
{
- \exp_after:wN \exp_after:wN
- \exp_after:wN \use_none_delimit_by_q_stop:w
+ \exp_not:n
+ {
+ \tex_romannumeral:D
+ \exp_after:wN \exp_after:wN
+ \exp_after:wN \msg_expandable_error_aux:w
+ \exp_after:wN \exp_after:wN
+ \exp_after:wN \c_zero
+ }
+ \exp_not:N \use:n { \exp_not:c { LaTeX3~error: } ^ #1 }
+ \exp_not:N \q_stop
}
- \exp_not:N \use:n { \exp_not:c { LaTeX3 ~ error : } #1 }
- \exp_not:N \q_stop
+ \cs_new:Npn \msg_expandable_error_aux:w #1 ^ #2 \q_stop { #1 }
}
\group_end:
\cs_new_eq:NN \msg_class_new:nn \msg_class_set:nn
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 29ace90b700..a77391e1ec1 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3prg.dtx 2553 2011-08-11 23:55:20Z bruno $
+\GetIdInfo$Id: l3prg.dtx 2601 2011-08-16 23:20:27Z bruno $
{L3 Experimental control structures}
%%
\ProvidesExplPackage
@@ -556,8 +556,8 @@
\prg_define_quicksort:nnn {prg}{}{}
\cs_set:Npn \prg_quicksort_function:n {\ERROR}
\cs_set:Npn \prg_quicksort_compare:nnTF {\ERROR}
-\cs_new_protected:Npn \prg_new_map_functions:Nn #1#2 { \deprectiated }
-\cs_new_protected:Npn \prg_set_map_functions:Nn #1#2 { \deprectiated }
+\cs_new_protected:Npn \prg_new_map_functions:Nn #1#2 { \deprecated }
+\cs_new_protected:Npn \prg_set_map_functions:Nn #1#2 { \deprecated }
%%
%%
%% End of file `l3prg.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
index ab1ec03f467..0f3aee34e2c 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3seq.dtx 2556 2011-08-12 14:00:43Z bruno $
+\GetIdInfo$Id: l3seq.dtx 2586 2011-08-15 03:59:12Z bruno $
{L3 Experimental sequences and stacks}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -541,6 +541,38 @@
\prg_do_nothing:
\exp_not:n { \seq_item:n {#1} }
}
+\cs_new_protected_nopar:Npn \seq_set_split:Nnn
+ { \seq_set_split_aux:NNnn \tl_set:Nx }
+\cs_new_protected_nopar:Npn \seq_gset_split:Nnn
+ { \seq_set_split_aux:NNnn \tl_gset:Nx }
+\cs_new_protected_nopar:Npn \seq_set_split_aux:NNnn #1 #2 #3 #4
+ {
+ \tl_if_empty:nTF {#4}
+ { #1 #2 { } }
+ {
+ \tl_set:Nn \l_seq_tmpa_tl
+ {
+ \seq_set_split_aux_i:w \prg_do_nothing:
+ #4
+ \seq_set_split_aux_end:
+ }
+ \tl_replace_all:Nnn \l_seq_tmpa_tl { #3 }
+ {
+ \seq_set_split_aux_end:
+ \seq_set_split_aux_i:w \prg_do_nothing:
+ }
+ \tl_set:Nx \l_seq_tmpa_tl { \l_seq_tmpa_tl }
+ #1 #2 { \l_seq_tmpa_tl }
+ }
+ }
+\cs_new:Npn \seq_set_split_aux_i:w #1 \seq_set_split_aux_end:
+ {
+ \exp_not:N \seq_set_split_aux_ii:w
+ \exp_args:No \tl_trim_spaces:n {#1}
+ \exp_not:N \seq_set_split_aux_end:
+ }
+\cs_new:Npn \seq_set_split_aux_ii:w #1 \seq_set_split_aux_end:
+ { \exp_not:n { \seq_item:n {#1} } }
\cs_new_eq:NN \seq_top:NN \seq_get_left:NN
\cs_new_eq:NN \seq_top:cN \seq_get_left:cN
\cs_new_eq:NN \seq_display:N \seq_show:N
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index b37aa775085..463d9f6f6b7 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 2563 2011-08-13 12:23:59Z joseph $
+\GetIdInfo$Id: l3tl.dtx 2566 2011-08-13 22:04:42Z bruno $
{L3 Experimental token lists}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -456,22 +456,49 @@
\tl_reverse_items_aux:nw #2 \q_recursion_stop
{#1}
}
-\cs_new:Npn \tl_trim_spaces:n #1
+\cs_set:Npn \tl_tmp:w #1
{
- \etex_unexpanded:D \exp_after:wN \exp_after:wN \exp_after:wN
- { \tl_trim_spaces_exp:n {#1} }
+ \cs_new:Npn \tl_trim_spaces:n ##1
+ {
+ \etex_unexpanded:D
+ \tl_trim_spaces_aux_i:w
+ \q_mark
+ ##1
+ \q_nil
+ \q_mark #1 { }
+ \q_mark \tl_trim_spaces_aux_ii:w
+ \tl_trim_spaces_aux_iii:w
+ #1 \q_nil
+ \tl_trim_spaces_aux_iv:w
+ \q_stop
+ }
+ \cs_new:Npn \tl_trim_spaces_aux_i:w ##1 \q_mark #1 ##2 \q_mark ##3
+ {
+ ##3
+ \tl_trim_spaces_aux_i:w
+ \q_mark
+ ##2
+ \q_mark #1 {##1}
+ }
+ \cs_new:Npn \tl_trim_spaces_aux_ii:w ##1 \q_mark \q_mark ##2
+ {
+ \tl_trim_spaces_aux_iii:w
+ ##2
+ }
+ \cs_new:Npn \tl_trim_spaces_aux_iii:w ##1 #1 \q_nil ##2
+ {
+ ##2
+ ##1 \q_nil
+ \tl_trim_spaces_aux_iii:w
+ }
+ \cs_new:Npn \tl_trim_spaces_aux_iv:w ##1 \q_nil ##2 \q_stop
+ { \exp_after:wN { \use_none:n ##1 } }
}
+\tl_tmp:w { ~ }
\cs_new_protected:Npn \tl_trim_spaces:N #1
{ \tl_set:Nx #1 { \exp_after:wN \tl_trim_spaces:n \exp_after:wN {#1} } }
\cs_new_protected:Npn \tl_gtrim_spaces:N #1
{ \tl_gset:Nx #1 { \exp_after:wN \tl_trim_spaces:n \exp_after:wN {#1} } }
-\group_begin:
- \tex_catcode:D `\Q = 3 \scan_stop:
- \cs_new:Npn \tl_trim_spaces_exp:n #1
- { \tex_romannumeral:D - `0 \tl_trim_spaces_aux_i:w \exp_not:N #1 Q ~ Q }
- \cs_new:Npn \tl_trim_spaces_aux_i:w #1 ~ Q { \tl_trim_spaces_aux_ii:w #1 Q }
- \cs_new:Npn \tl_trim_spaces_aux_ii:w #1 Q #2 {#1}
-\group_end:
\cs_generate_variant:Nn \tl_trim_spaces:N { c }
\cs_generate_variant:Nn \tl_gtrim_spaces:N { c }
\cs_new:Npn \tl_head:w #1#2 \q_stop {#1}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index c4ca0549b2f..018240d7bfa 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3token.dtx 2491 2011-07-02 11:49:37Z joseph $
+\GetIdInfo$Id: l3token.dtx 2579 2011-08-14 16:22:30Z bruno $
{L3 Experimental token manipulation}
%% \begin{function}[EXP,pTF]{\token_if_protected_long_macro:N}
\ProvidesExplPackage
@@ -655,6 +655,23 @@
\char_tmp:NN \char_active_set_eq:NN \cs_set_eq:NN
\char_tmp:NN \char_active_gset_eq:NN \cs_gset_eq:NN
\group_end:
+\cs_new_protected_nopar:Npn \peek_execute_branches_N_type:
+ {
+ \bool_if:nTF
+ {
+ \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token ||
+ \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token ||
+ \token_if_eq_meaning_p:NN \l_peek_token \c_space_token
+ }
+ { \peek_false:w }
+ { \peek_true:w }
+ }
+\cs_new_protected_nopar:Npn \peek_N_type:TF
+ { \peek_token_generic:NNTF \peek_execute_branches_N_type: \scan_stop: }
+\cs_new_protected_nopar:Npn \peek_N_type:T
+ { \peek_token_generic:NNT \peek_execute_branches_N_type: \scan_stop: }
+\cs_new_protected_nopar:Npn \peek_N_type:F
+ { \peek_token_generic:NNF \peek_execute_branches_N_type: \scan_stop: }
\cs_new_eq:NN \char_set_catcode:w \tex_catcode:D
\cs_new_eq:NN \char_set_mathcode:w \tex_mathcode:D
\cs_new_eq:NN \char_set_lccode:w \tex_lccode:D
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3toks.sty b/Master/texmf-dist/tex/latex/l3kernel/l3toks.sty
index 1b1ab880687..484cdd401e8 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3toks.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3toks.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3toks.dtx 2478 2011-06-19 21:34:23Z joseph $
+\GetIdInfo$Id: l3toks.dtx 2601 2011-08-16 23:20:27Z bruno $
{L3 Experimental token registers}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}