summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
committerKarl Berry <karl@freefriends.org>2012-12-21 23:31:35 +0000
commit8bcf0c7ef3cd19666c206271cea9280846b5c7e6 (patch)
treeee538c7e2a14ad105a169fdd2e745356147577cc /Master/texmf-dist/tex/latex/l3kernel
parentef0453041a9700a2d974c3c76e3398e40c4e4aeb (diff)
l3 (21dec12)
git-svn-id: svn://tug.org/texlive/trunk@28608 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty9
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3basics.sty10
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3box.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty63
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3clist.sty10
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3file.sty7
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3fp.sty132
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3names.sty12
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3prg.sty18
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3seq.sty12
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3tl.sty36
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3token.sty60
12 files changed, 205 insertions, 168 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 268d2cd285d..653499b0ca4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -45,8 +45,8 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{l3names}[2012/07/15]
-\@ifpackagelater{l3names}{2012/07/15}
+\RequirePackage{l3names}[2012/12/07]
+\@ifpackagelater{l3names}{2012/12/07}
{}
{%
\PackageError{expl3}{Mismatched LaTeX3 packages detected.}
@@ -60,9 +60,10 @@
}
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2012/11/21}
-\def\ExplFileVersion{4332}
+\def\ExplFileDate{2012/12/21}
+\def\ExplFileVersion{4390}
\RequirePackage{etex}
+\relax
\reserveinserts{32}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index 318c7d9bcb2..bc53602f68f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3basics.dtx 4306 2012-11-10 12:57:20Z joseph $
+\GetIdInfo$Id: l3basics.dtx 4339 2012-11-24 19:16:43Z joseph $
{L3 Basic definitions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -364,14 +364,14 @@
\cs_set:Npn \__cs_split_function:NN #1
{
\exp_after:wN \exp_after:wN
- \exp_after:wN \__cs_split_function_i:w
+ \exp_after:wN \__cs_split_function_auxi:w
\cs_to_str:N #1 \q_mark \c_true_bool
@ \q_mark \c_false_bool
\q_stop
}
- \cs_set:Npn \__cs_split_function_i:w #1 @ #2 \q_mark #3#4 \q_stop #5
- { \__cs_split_function_ii:w #5 #1 \q_mark \q_stop {#2} #3 }
- \cs_set:Npn \__cs_split_function_ii:w #1#2 \q_mark #3 \q_stop
+ \cs_set:Npn \__cs_split_function_auxi:w #1 @ #2 \q_mark #3#4 \q_stop #5
+ { \__cs_split_function_auxii:w #5 #1 \q_mark \q_stop {#2} #3 }
+ \cs_set:Npn \__cs_split_function_auxii:w #1#2 \q_mark #3 \q_stop
{ #1 {#2} }
}
\cs_set:Npn \__cs_get_function_name:N #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index a9e84331634..56016c45566 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3box.dtx 4259 2012-11-04 17:15:11Z joseph $
+\GetIdInfo$Id: l3box.dtx 4347 2012-12-08 09:11:29Z joseph $
{L3 Experimental boxes}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -210,7 +210,7 @@
\cs_new_eq:NN \hbox_gset_inline_end: \hbox_gset_end:
\cs_new_protected:Npn \hbox_to_wd:nn #1#2
{ \tex_hbox:D to \__dim_eval:w #1 \__dim_eval_end: {#2} }
-\cs_new_protected:Npn \hbox_to_zero:n #1 { \tex_hbox:D to \c_zero_skip {#1} }
+\cs_new_protected:Npn \hbox_to_zero:n #1 { \tex_hbox:D to \c_zero_dim {#1} }
\cs_new_protected:Npn \hbox_overlap_left:n #1
{ \hbox_to_zero:n { \tex_hss:D #1 } }
\cs_new_protected:Npn \hbox_overlap_right:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
index cee29baf26e..65919abf3ec 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3candidates.sty
@@ -47,7 +47,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3candidates.dtx 4298 2012-11-09 13:34:43Z joseph $
+\GetIdInfo$Id: l3candidates.dtx 4383 2012-12-20 15:10:48Z bruno $
{L3 Experimental additions to l3kernel}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -502,20 +502,20 @@
{ 2 } { \exp_after:wN \__clist_use:wwn #1 , {#2} }
}
{
- \exp_after:wN \__clist_use_ii:nwwwwnwn
+ \exp_after:wN \__clist_use:nwwwwnwn
\exp_after:wN { \exp_after:wN } #1 ,
- \q_mark , { \__clist_use_ii:nwwwwnwn {#3} }
- \q_mark , { \__clist_use_iii:nwwn {#4} }
+ \q_mark , { \__clist_use:nwwwwnwn {#3} }
+ \q_mark , { \__clist_use:nwwn {#4} }
\q_stop { }
}
}
{ \__msg_kernel_expandable_error:nnn { kernel } { bad-variable } {#1} }
}
\cs_new:Npn \__clist_use:wwn #1 , #2 , #3 { \exp_not:n { #1 #3 #2 } }
-\cs_new:Npn \__clist_use_ii:nwwwwnwn
+\cs_new:Npn \__clist_use:nwwwwnwn
#1#2 , #3 , #4 , #5 \q_mark , #6#7 \q_stop #8
{ #6 {#3} , {#4} , #5 \q_mark , {#6} #7 \q_stop { #8 #1 #2 } }
-\cs_new:Npn \__clist_use_iii:nwwn #1#2 , #3 \q_stop #4
+\cs_new:Npn \__clist_use:nwwn #1#2 , #3 \q_stop #4
{ \exp_not:n { #4 #1 #2 } }
\fp_new:N \l__coffin_sin_fp
\fp_new:N \l__coffin_cos_fp
@@ -935,10 +935,10 @@
{ 2 } { \exp_after:wN \__seq_use:NnNnn #1 {#2} }
}
{
- \exp_after:wN \__seq_use_ii:nwwwwnwn
+ \exp_after:wN \__seq_use:nwwwwnwn
\exp_after:wN { \exp_after:wN } #1 \__seq_item:n
- \q_mark { \__seq_use_ii:nwwwwnwn {#3} }
- \q_mark { \__seq_use_iii:nwwn {#4} }
+ \q_mark { \__seq_use:nwwwwnwn {#3} }
+ \q_mark { \__seq_use:nwwn {#4} }
\q_stop { }
}
}
@@ -946,14 +946,14 @@
}
\cs_new:Npn \__seq_use:NnNnn \__seq_item:n #1 \__seq_item:n #2#3
{ \exp_not:n { #1 #3 #2 } }
-\cs_new:Npn \__seq_use_ii:nwwwwnwn
+\cs_new:Npn \__seq_use:nwwwwnwn
#1 \__seq_item:n #2 \__seq_item:n #3 \__seq_item:n #4#5
\q_mark #6#7 \q_stop #8
{
#6 \__seq_item:n {#3} \__seq_item:n {#4} #5
\q_mark {#6} #7 \q_stop { #8 #1 #2 }
}
-\cs_new:Npn \__seq_use_iii:nwwn #1 \__seq_item:n #2 #3 \q_stop #4
+\cs_new:Npn \__seq_use:nwwn #1 \__seq_item:n #2 #3 \q_stop #4
{ \exp_not:n { #4 #1 #2 } }
\cs_new:Npn \skip_split_finite_else_action:nnNN #1#2#3#4
{
@@ -1104,16 +1104,41 @@
\char_tmp:NN \char_set_active_eq:NN \cs_set_eq:NN
\char_tmp:NN \char_gset_active_eq:NN \cs_gset_eq:NN
\group_end:
-\cs_new_protected_nopar:Npn \__peek_execute_branches_N_type:
+\group_begin:
+ \char_set_catcode_other:N \O
+ \char_set_catcode_other:N \U
+ \char_set_catcode_other:N \T
+ \char_set_catcode_other:N \E
+ \char_set_catcode_other:N \R
+ \tl_to_lowercase:n
+ {
+ \cs_new_protected_nopar:Npn \__peek_execute_branches_N_type:
+ {
+ \if_int_odd:w
+ \if_catcode:w \exp_not:N \l_peek_token { \c_two \fi:
+ \if_catcode:w \exp_not:N \l_peek_token } \c_two \fi:
+ \if_meaning:w \l_peek_token \c_space_token \c_two \fi:
+ \c_one
+ \exp_after:wN \__peek_N_type:w
+ \token_to_meaning:N \l_peek_token
+ \q_mark \__peek_N_type_aux:nnw
+ OUTER \q_mark \use_none_delimit_by_q_stop:w
+ \q_stop
+ \exp_after:wN \__peek_true:w
+ \else:
+ \exp_after:wN \__peek_false:w
+ \fi:
+ }
+ \cs_new_protected_nopar:Npn \__peek_N_type:w #1 OUTER #2 \q_mark #3
+ { #3 {#1} {#2} }
+ }
+\group_end:
+\cs_new_protected_nopar:Npn \__peek_N_type_aux:nnw #1 #2 #3 \fi:
{
- \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 }
+ \fi:
+ \tl_if_in:noTF {#1} { \tl_to_str:n {ma} }
{ \__peek_true:w }
+ { \tl_if_empty:nTF {#2} { \__peek_true:w } { \__peek_false:w } }
}
\cs_new_protected_nopar:Npn \peek_N_type:TF
{ \__peek_token_generic:NNTF \__peek_execute_branches_N_type: \scan_stop: }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
index 284830694db..6edd2295361 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3clist.dtx 4212 2012-09-09 12:24:04Z bruno $
+\GetIdInfo$Id: l3clist.dtx 4339 2012-11-24 19:16:43Z joseph $
{L3 Comma separated lists}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -106,22 +106,22 @@
\cs_new:Npn \__clist_trim_spaces:n #1
{
\__clist_trim_spaces_generic:nw
- { \__clist_trim_spaces_ii:nn { } }
+ { \__clist_trim_spaces:nn { } }
\q_mark #1 ,
\q_recursion_tail, \q_recursion_stop
}
-\cs_new:Npn \__clist_trim_spaces_ii:nn #1 #2
+\cs_new:Npn \__clist_trim_spaces:nn #1 #2
{
\quark_if_recursion_tail_stop:n {#2}
\tl_if_empty:nTF {#2}
{
\__clist_trim_spaces_generic:nw
- { \__clist_trim_spaces_ii:nn {#1} } \q_mark
+ { \__clist_trim_spaces:nn {#1} } \q_mark
}
{
#1 \exp_not:n {#2}
\__clist_trim_spaces_generic:nw
- { \__clist_trim_spaces_ii:nn { , } } \q_mark
+ { \__clist_trim_spaces:nn { , } } \q_mark
}
}
\cs_new_protected:Npn \clist_set:Nn #1#2
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
index b3c04f68873..b1a119b7fd3 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3file.dtx 4212 2012-09-09 12:24:04Z bruno $
+\GetIdInfo$Id: l3file.dtx 4377 2012-12-20 11:13:29Z bruno $
{L3 File and I/O operations}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -131,12 +131,11 @@
}
\cs_new_protected:Npn \__file_input:n #1
{
- \quark_if_nil:oTF { \__file_input_aux:w #1 . \q_nil . \q_stop }
- { \__file_input_aux:o { \tl_to_str:n { #1 .tex } } }
+ \tl_if_in:nnTF {#1} { . }
{ \__file_input_aux:n {#1} }
+ { \__file_input_aux:o { \tl_to_str:n { #1 . tex } } }
}
\cs_generate_variant:Nn \__file_input:n { V }
-\cs_new:Npn \__file_input_aux:w #1 . #2 . #3 \q_stop { #2 }
\cs_new_protected:Npn \__file_input_aux:n #1
{
\clist_if_exist:NTF \@filelist
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index 4754b592c0c..ec67d73f5d5 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -286,8 +286,8 @@
\__fp_tmp:w {xv} {\use_none:n #2#3+#4#5} { 000{0000}0000{0000}#2 #3 #4 #5 }
\__fp_tmp:w {xvi} { #2#3+#4#5} {{0000}0000{0000}0000 #2 #3 #4 #5 }
\cs_new:Npn \__fp_decimate_pack:nnnnnnnnnnw #1#2#3#4#5
- { \__fp_decimate_pack_ii:nnnnnnw { #1#2#3#4#5 } }
-\cs_new:Npn \__fp_decimate_pack_ii:nnnnnnw #1 #2#3#4#5#6
+ { \__fp_decimate_pack:nnnnnnw { #1#2#3#4#5 } }
+\cs_new:Npn \__fp_decimate_pack:nnnnnnw #1 #2#3#4#5#6
{ {#1} {#2#3#4#5#6} }
\cs_new:Npn \__fp_case_use:nw #1#2 \fi: #3 \s__fp { \fi: #1 \s__fp }
\cs_new:Npn \__fp_case_return:nw #1#2 \fi: #3 ; { \fi: #1 }
@@ -715,11 +715,11 @@
\cs_new:Npn \__fp_round_normal:NwNNnw #1#2 \s__fp \__fp_chk:w 1#3#4#5;
{
\__fp_decimate:nNnnnn { \c_sixteen - #4 - #2 }
- \__fp_round_normal_ii:NnnwNNnn #5 #1 #3 {#4} {#2}
+ \__fp_round_normal:NnnwNNnn #5 #1 #3 {#4} {#2}
}
-\cs_new:Npn \__fp_round_normal_ii:NnnwNNnn #1#2#3#4; #5#6
+\cs_new:Npn \__fp_round_normal:NnnwNNnn #1#2#3#4; #5#6
{
- \exp_after:wN \__fp_round_normal_iii:NNwNnn
+ \exp_after:wN \__fp_round_normal:NNwNnn
\int_use:N \__int_eval:w
\if_int_compare:w #2 > \c_zero
1 \__int_value:w #2
@@ -739,7 +739,7 @@
}
\cs_new:Npn \__fp_round_pack:Nw #1
{ \if_meaning:w 2 #1 + \c_one \fi: \__int_eval_end: }
-\cs_new:Npn \__fp_round_normal_iii:NNwNnn #1 #2
+\cs_new:Npn \__fp_round_normal:NNwNnn #1 #2
{
\if_meaning:w 0 #2
\exp_after:wN \__fp_round_special:NwwNnn
@@ -1174,14 +1174,14 @@
\cs_new:Npn \__fp_parse_exponent:N #1
{
\if:w e #1
- \exp_after:wN \__fp_parse_exponent_ii:N
+ \exp_after:wN \__fp_parse_exponent_aux:N
\tex_romannumeral:D
\else:
0 \__fp_parse_return_semicolon:w #1
\fi:
\__fp_parse_expand:w
}
-\cs_new:Npn \__fp_parse_exponent_ii:N #1
+\cs_new:Npn \__fp_parse_exponent_aux:N #1
{
\if_int_compare:w \if_catcode:w \tex_relax:D #1
\c_zero \else: `#1 \fi: > `9 \exp_stop_f:
@@ -1321,7 +1321,7 @@
\cs_new:Npn \__fp_parse_large_round_after:wNN #1 ; #2 #3
{
\if:w . #3
- \exp_after:wN \__fp_parse_large_round_after_ii:wN
+ \exp_after:wN \__fp_parse_large_round_after_aux:wN
\int_use:N \__int_eval:w #1 +
\c_zero * \__int_eval:w \c_zero
\exp_after:wN \__fp_cfs_round_loop:N
@@ -1334,7 +1334,7 @@
\exp_after:wN #3
\fi:
}
-\cs_new:Npn \__fp_parse_large_round_after_ii:wN #1 ; #2
+\cs_new:Npn \__fp_parse_large_round_after_aux:wN #1 ; #2
{
+ #2
\exp_after:wN ;
@@ -1809,7 +1809,7 @@
\__msg_kernel_expandable_error:nnnn
{ kernel } { fp-missing } { ? } { ~for~?: }
\exp_after:wN @
- \exp_after:wN \__fp_ternary_ii:NwwN
+ \exp_after:wN \__fp_ternary_auxii:NwwN
\tex_romannumeral:D
\__fp_parse_until:Nw \c_two
\exp_after:wN \__fp_parse_expand:w
@@ -2079,9 +2079,9 @@
{
\if_meaning:w 3 #4
\if_meaning:w 3 #2
- \__fp_minmax_i:ww
+ \__fp_minmax_auxi:ww
\else:
- \__fp_minmax_ii:ww
+ \__fp_minmax_auxii:ww
\fi:
\else:
\if_int_compare:w
@@ -2089,18 +2089,18 @@
\s__fp \__fp_chk:w #4#5;
\s__fp \__fp_chk:w #2#3;
= #1
- \__fp_minmax_ii:ww
+ \__fp_minmax_auxii:ww
\else:
- \__fp_minmax_i:ww
+ \__fp_minmax_auxi:ww
\fi:
\fi:
\__fp_minmax_loop:Nww #1
\s__fp \__fp_chk:w #2#3;
\s__fp \__fp_chk:w #4#5;
}
-\cs_new:Npn \__fp_minmax_i:ww #1 \fi: \fi: #2 \s__fp #3 ; \s__fp #4;
+\cs_new:Npn \__fp_minmax_auxi:ww #1 \fi: \fi: #2 \s__fp #3 ; \s__fp #4;
{ \fi: \fi: #2 \s__fp #3 ; }
-\cs_new:Npn \__fp_minmax_ii:ww #1 \fi: \fi: #2 \s__fp #3 ;
+\cs_new:Npn \__fp_minmax_auxii:ww #1 \fi: \fi: #2 \s__fp #3 ;
{ \fi: \fi: #2 }
\cs_new:Npn \__fp_minmax_break_o:w #1 \fi: \fi: #2 \s__fp #3; #4;
{ \fi: \__fp_exp_after_o:w \s__fp #3; }
@@ -2131,7 +2131,7 @@
\__fp_ternary_loop:Nw
#2
\s__fp \__fp_chk:w { \__fp_ternary_loop_break:w } ;
- \__fp_ternary_break_point:n { \exp_after:wN \__fp_ternary_i:NwwN }
+ \__fp_ternary_break_point:n { \exp_after:wN \__fp_ternary_auxi:NwwN }
\exp_after:wN #1
\tex_romannumeral:D -`0
\__fp_exp_after_array_f:w #3 \s__fp_stop
@@ -2153,7 +2153,7 @@
\cs_new:Npn \__fp_ternary_loop_break:w #1 \fi: #2 \__fp_ternary_break_point:n #3
{
\c_zero = \c_zero \fi:
- \exp_after:wN \__fp_ternary_ii:NwwN
+ \exp_after:wN \__fp_ternary_auxii:NwwN
}
\cs_new:Npn \__fp_ternary_loop:Nw \s__fp \__fp_chk:w #1#2;
{
@@ -2163,7 +2163,7 @@
\__fp_ternary_loop:Nw
}
\cs_new:Npn \__fp_ternary_map_break: #1 \__fp_ternary_break_point:n #2 {#2}
-\cs_new:Npn \__fp_ternary_i:NwwN #1#2@#3@#4
+\cs_new:Npn \__fp_ternary_auxi:NwwN #1#2@#3@#4
{
\exp_after:wN \__fp_parse_until_test:NwN
\exp_after:wN #1
@@ -2171,7 +2171,7 @@
\__fp_exp_after_array_f:w #2 \s__fp_stop
#4 #1
}
-\cs_new:Npn \__fp_ternary_ii:NwwN #1#2@#3@#4
+\cs_new:Npn \__fp_ternary_auxii:NwwN #1#2@#3@#4
{
\exp_after:wN \__fp_parse_until_test:NwN
\exp_after:wN #1
@@ -2850,43 +2850,43 @@
\exp_after:wN \__fp_fixed_div_int_after:Nw
\exp_after:wN #8
\int_use:N \__int_eval:w \c_minus_one
- \__fp_fixed_div_int_i:wnN
- #1; {#7} \__fp_fixed_div_int_ii:wnn
- #2; {#7} \__fp_fixed_div_int_ii:wnn
- #3; {#7} \__fp_fixed_div_int_ii:wnn
- #4; {#7} \__fp_fixed_div_int_ii:wnn
- #5; {#7} \__fp_fixed_div_int_ii:wnn
- #6; {#7} \__fp_fixed_div_int_iii:wnn ;
+ \__fp_fixed_div_int:wnN
+ #1; {#7} \__fp_fixed_div_int_auxi:wnn
+ #2; {#7} \__fp_fixed_div_int_auxi:wnn
+ #3; {#7} \__fp_fixed_div_int_auxi:wnn
+ #4; {#7} \__fp_fixed_div_int_auxi:wnn
+ #5; {#7} \__fp_fixed_div_int_auxi:wnn
+ #6; {#7} \__fp_fixed_div_int_auxii:wnn ;
}
-\cs_new:Npn \__fp_fixed_div_int_i:wnN #1; #2 #3
+\cs_new:Npn \__fp_fixed_div_int:wnN #1; #2 #3
{
\exp_after:wN #3
\int_use:N \__int_eval:w #1 / #2 - \c_one ;
{#2}
{#1}
}
-\cs_new:Npn \__fp_fixed_div_int_ii:wnn #1; #2 #3
+\cs_new:Npn \__fp_fixed_div_int_auxi:wnn #1; #2 #3
{
+ #1
\exp_after:wN \__fp_fixed_div_int_pack:Nw
\int_use:N \__int_eval:w 9999
- \exp_after:wN \__fp_fixed_div_int_i:wnN
+ \exp_after:wN \__fp_fixed_div_int:wnN
\int_use:N \__int_eval:w #3 - #1*#2 \__int_eval_end:
}
-\cs_new:Npn \__fp_fixed_div_int_iii:wnn #1; #2 #3 { + #1 + \c_two ; }
+\cs_new:Npn \__fp_fixed_div_int_auxii:wnn #1; #2 #3 { + #1 + \c_two ; }
\cs_new:Npn \__fp_fixed_div_int_pack:Nw #1 #2; { + #1; {#2} }
\cs_new:Npn \__fp_fixed_div_int_after:Nw #1 #2; { #1 {#2} }
-\cs_new_nopar:Npn \__fp_fixed_add:wwn { \__fp_fixed_add_i:Nnnnnwnn + }
-\cs_new_nopar:Npn \__fp_fixed_sub:wwn { \__fp_fixed_add_i:Nnnnnwnn - }
-\cs_new:Npn \__fp_fixed_add_i:Nnnnnwnn #1 #2#3#4#5 #6; #7#8
+\cs_new_nopar:Npn \__fp_fixed_add:wwn { \__fp_fixed_add:Nnnnnwnn + }
+\cs_new_nopar:Npn \__fp_fixed_sub:wwn { \__fp_fixed_add:Nnnnnwnn - }
+\cs_new:Npn \__fp_fixed_add:Nnnnnwnn #1 #2#3#4#5 #6; #7#8
{
\exp_after:wN \__fp_fixed_add_after:NNNNNwn
\int_use:N \__int_eval:w 9 9999 9998 + #2#3 #1 #7#8
\exp_after:wN \__fp_fixed_add_pack:NNNNNwn
\int_use:N \__int_eval:w 1 9999 9998 + #4#5
- \__fp_fixed_add_ii:nnNnnnwn #6 #1
+ \__fp_fixed_add:nnNnnnwn #6 #1
}
-\cs_new:Npn \__fp_fixed_add_ii:nnNnnnwn #1#2 #3 #4#5 #6#7 ; #8
+\cs_new:Npn \__fp_fixed_add:nnNnnnwn #1#2 #3 #4#5 #6#7 ; #8
{
#3 #4#5
\exp_after:wN \__fp_fixed_add_pack:NNNNNwn
@@ -2916,9 +2916,9 @@
\int_use:N \__int_eval:w \c__fp_trailing_shift_int
+ #2*#9 + #3*#8 + #4*#7
+ ( #3*#9 + #4*#8
- + \__fp_fixed_mul_i:nnnnnnnwn #5 {#6}{#7} {#1}{#2}
+ + \__fp_fixed_mul:nnnnnnnwn #5 {#6}{#7} {#1}{#2}
}
-\cs_new:Npn \__fp_fixed_mul_i:nnnnnnnwn #1#2 #3#4 #5#6 #7#8 ; #9
+\cs_new:Npn \__fp_fixed_mul:nnnnnnnwn #1#2 #3#4 #5#6 #7#8 ; #9
{
#1*#4 + #2*#3 + #5*#8 + #6*#7 ) / \c_ten_thousand
+ #1*#3 + #5*#7 ;
@@ -2930,7 +2930,7 @@
\int_use:N \__int_eval:w \c__fp_big_leading_shift_int
\exp_after:wN \__fp_pack_big:NNNNNNwn
\int_use:N \__int_eval:w \c__fp_big_middle_shift_int + #3 #4
- \__fp_fixed_mul_add_i:Nwnnnwnnn +
+ \__fp_fixed_mul_add:Nwnnnwnnn +
+ #5 #6 ; #2 ; #1 ; #2 ; +
+ #7 #8 ; {#9} ;
}
@@ -2940,7 +2940,7 @@
\int_use:N \__int_eval:w \c__fp_big_leading_shift_int
\exp_after:wN \__fp_pack_big:NNNNNNwn
\int_use:N \__int_eval:w \c__fp_big_middle_shift_int + #3 #4
- \__fp_fixed_mul_add_i:Nwnnnwnnn -
+ \__fp_fixed_mul_add:Nwnnnwnnn -
+ #5 #6 ; #2 ; #1 ; #2 ; -
+ #7 #8 ; {#9} ;
}
@@ -2950,11 +2950,11 @@
\int_use:N \__int_eval:w \c__fp_big_leading_shift_int
\exp_after:wN \__fp_pack_big:NNNNNNwn
\int_use:N \__int_eval:w \c__fp_big_middle_shift_int + 1 0000 0000
- \__fp_fixed_mul_add_i:Nwnnnwnnn -
+ \__fp_fixed_mul_add:Nwnnnwnnn -
; #2 ; #1 ; #2 ; -
; {#3} ;
}
-\cs_new:Npn \__fp_fixed_mul_add_i:Nwnnnwnnn #1 #2; #3#4#5#6; #7#8#9
+\cs_new:Npn \__fp_fixed_mul_add:Nwnnnwnnn #1 #2; #3#4#5#6; #7#8#9
{
#1 #7*#3
\exp_after:wN \__fp_pack_big:NNNNNNwn
@@ -2965,20 +2965,20 @@
#1 #7*#5 #1 #8*#4 #1 #9*#3 #2
\exp_after:wN \__fp_pack_big:NNNNNNwn
\int_use:N \__int_eval:w \c__fp_big_middle_shift_int
- #1 \__fp_fixed_mul_add_ii:nnnnwnnnn {#7}{#8}{#9}
+ #1 \__fp_fixed_mul_add:nnnnwnnnn {#7}{#8}{#9}
}
-\cs_new:Npn \__fp_fixed_mul_add_ii:nnnnwnnnn #1#2#3#4#5; #6#7#8#9
+\cs_new:Npn \__fp_fixed_mul_add:nnnnwnnnn #1#2#3#4#5; #6#7#8#9
{
( #1*#9 + #2*#8 + #3*#7 + #4*#6 )
\exp_after:wN \__fp_pack_big:NNNNNNwn
\int_use:N \__int_eval:w \c__fp_big_trailing_shift_int
- \__fp_fixed_mul_add_iii:nnnnwnnwN
+ \__fp_fixed_mul_add:nnnnwnnwN
{ #6 + #4*#7 + #3*#8 + #2*#9 + #1 }
{ #7 + #4*#8 + #3*#9 + #2 }
{#1} #5;
{#6}
}
-\cs_new:Npn \__fp_fixed_mul_add_iii:nnnnwnnwN #1#2 #3#4#5; #6#7#8; #9
+\cs_new:Npn \__fp_fixed_mul_add:nnnnwnnwN #1#2 #3#4#5; #6#7#8; #9
{
#9 (#4* #1 *#7)
#9 (#5*#6+#4* #2 *#7+#3*#8) / \c_ten_thousand
@@ -3092,32 +3092,32 @@
#2 \c_two * \c__fp_max_exponent_int
\use_i_ii:nnn
\fi:
- \__fp_fixed_dtf_zeros_ii:ww
+ \__fp_fixed_dtf_zeros_auxi:ww
#1#3 0000 0000 0000 0000 0000 0000 ;
}
-\cs_new:Npn \__fp_fixed_dtf_zeros_ii:ww
+\cs_new:Npn \__fp_fixed_dtf_zeros_auxi:ww
{
\__fp_pack_twice_four:wNNNNNNNN
\__fp_pack_twice_four:wNNNNNNNN
\__fp_pack_twice_four:wNNNNNNNN
- \__fp_fixed_dtf_zeros_iii:ww
+ \__fp_fixed_dtf_zeros_auxii:ww
;
}
-\cs_new:Npn \__fp_fixed_dtf_zeros_iii:ww #1; #2; #3 { #3 #1; }
+\cs_new:Npn \__fp_fixed_dtf_zeros_auxii:ww #1; #2; #3 { #3 #1; }
\cs_new:Npn \__fp_fixed_dtf_approx:n #1
{
- \exp_after:wN \__fp_fixed_dtf_approx_ii:wnn
+ \exp_after:wN \__fp_fixed_dtf_approx:wnn
\int_use:N \__int_eval:w 10 0000 0000 / ( #1 + \c_one ) ;
{#1}
}
-\cs_new:Npn \__fp_fixed_dtf_approx_ii:wnn #1; #2#3
+\cs_new:Npn \__fp_fixed_dtf_approx:wnn #1; #2#3
{
- \exp_after:wN \__fp_fixed_dtf_approx_iii:NNNNNw
+ \exp_after:wN \__fp_fixed_dtf_approx:NNNNNw
\int_use:N \__int_eval:w 10 0000 0000 - 1750
+ #1000 + (10 0000 0000/#2-#1) * (1000-#3/10) ;
{#2}{#3}
}
-\cs_new:Npn \__fp_fixed_dtf_approx_iii:NNNNNw 1#1#2#3#4#5#6; #7; #8;
+\cs_new:Npn \__fp_fixed_dtf_approx:NNNNNw 1#1#2#3#4#5#6; #7; #8;
{
+ \c_four % because of the line below "dtf_epsilon" here.
\__fp_fixed_mul:wwn {000#1}{#2#3#4#5}{#6}{0000}{0000}{0000} ; #7;
@@ -3128,14 +3128,14 @@
}
\cs_new:Npn \__fp_fixed_dtf_epsilon:wN #1#2#3#4#5#6;
{
- \exp_after:wN \__fp_fixed_dtf_epsilon_ii:NNNNNww
+ \exp_after:wN \__fp_fixed_dtf_epsilon:NNNNNww
\int_use:N \__int_eval:w 1 9999 9998 - #3#4 +
\exp_after:wN \__fp_fixed_dtf_epsilon_pack:NNNNNw
\int_use:N \__int_eval:w 2 0000 0000 - #5#6 ; {0000} ;
}
\cs_new:Npn \__fp_fixed_dtf_epsilon_pack:NNNNNw #1#2#3#4#5#6;
{ #1 ; {#2#3#4#5} {#6} }
-\cs_new:Npn \__fp_fixed_dtf_epsilon_ii:NNNNNww #1#2#3#4#5#6; #7;
+\cs_new:Npn \__fp_fixed_dtf_epsilon:NNNNNww #1#2#3#4#5#6; #7;
{
\__fp_fixed_mul:wwn %^^A todo: optimize to use \__fp_mul_significand.
{0000} {#2#3#4#5} {#6} #7 ;
@@ -4020,19 +4020,19 @@
\prg_replicate:nn { - #1 } { 0 } #2#3#4#5 0000 0000 ;
}
\cs_new:Npn \__fp_trig_large:ww #1; #2#3;
- { \__fp_trig_large_i:www #2; #3 ; #1; }
-\cs_new:Npn \__fp_trig_large_i:www #1; #2; #3;
+ { \__fp_trig_large:www #2; #3 ; #1; }
+\cs_new:Npn \__fp_trig_large:www #1; #2; #3;
{
\if_meaning:w 0 #3 \__fp_trig_large_break:w \fi:
- \exp_after:wN \__fp_trig_large_ii_o:wnnnn
+ \exp_after:wN \__fp_trig_large_o:wnnnn
\int_use:N \__int_eval:w ( #1 - 3141 ) / 6283 ;
{#1} #2
\exp_after:wN ;
\int_use:N \__int_eval:w \c_minus_one + #3;
}
-\cs_new:Npn \__fp_trig_large_ii_o:wnnnn #1; #2#3#4#5
+\cs_new:Npn \__fp_trig_large_o:wnnnn #1; #2#3#4#5
{
- \exp_after:wN \__fp_trig_large_i:www
+ \exp_after:wN \__fp_trig_large:www
\int_use:N \__int_eval:w \c__fp_leading_shift_int + #20 - #1*62831
\exp_after:wN \__fp_pack:NNNNNw
\int_use:N \__int_eval:w \c__fp_middle_shift_int + #30 - #1*8530
@@ -4403,12 +4403,12 @@
}
\cs_new:Npn \__fp_from_dim:Nw #1 #2;
{
- \__fp_pack_twice_four:wNNNNNNNN \__fp_from_dim_ii:wNNnnnnnn ;
+ \__fp_pack_twice_four:wNNNNNNNN \__fp_from_dim:wNNnnnnnn ;
#2 000 0000 00 {10}987654321; #1
}
-\cs_new:Npn \__fp_from_dim_ii:wNNnnnnnn #1; #2#3#4#5#6#7#8#9
- { \__fp_from_dim_iii:wnnnnwN #1 {#2#300} {0000} ; }
-\cs_new:Npn \__fp_from_dim_iii:wnnnnwN #1; #2#3#4#5#6; #7
+\cs_new:Npn \__fp_from_dim:wNNnnnnnn #1; #2#3#4#5#6#7#8#9
+ { \__fp_from_dim:wnnnnwN #1 {#2#300} {0000} ; }
+\cs_new:Npn \__fp_from_dim:wnnnnwN #1; #2#3#4#5#6; #7
{
\__fp_mul_npos_o:Nww #7
\s__fp \__fp_chk:w 1 #7 {#5} #1 ;
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
index 7c12c601af2..a1cc3246ef6 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}[2012/07/15]
-\GetIdInfo$Id: l3names.dtx 4230 2012-09-24 21:44:28Z joseph $
+\GetIdInfo$Id: l3names.dtx 4346 2012-12-07 13:46:13Z joseph $
{L3 Namespace for primitives}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -475,6 +475,11 @@
\__expl_primitive:NN \latelua \luatex_latelua:D
\__expl_primitive:NN \luatexversion \luatex_luatexversion:D
\__expl_primitive:NN \savecatcodetable \luatex_savecatcodetable:D
+ \__expl_primitive:NN \bodydir \luatex_bodydir:D
+ \__expl_primitive:NN \mathdir \luatex_mathdir:D
+ \__expl_primitive:NN \pagedir \luatex_pagedir:D
+ \__expl_primitive:NN \pardir \luatex_pardir:D
+ \__expl_primitive:NN \textdir \luatex_textdir:D
\tex_endgroup:D
\tex_let:D \tex_end:D \@@end
\tex_let:D \tex_everydisplay:D \frozen@everydisplay
@@ -487,6 +492,11 @@
\tex_let:D \luatex_initcatcodetable:D \luatexinitcatcodetable
\tex_let:D \luatex_latelua:D \luatexlatelua
\tex_let:D \luatex_savecatcodetable:D \luatexsavecatcodetable
+\tex_let:D \luatex_bodydir:D \luatexbodydir
+\tex_let:D \luatex_mathdir:D \luatexmathdir
+\tex_let:D \luatex_pagedir:D \luatexpagedir
+\tex_let:D \luatex_pardir:D \luatexpardir
+\tex_let:D \luatex_textdir:D \luatextextdir
%%
%%
%% End of file `l3names.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 0b719688663..4a544ab6720 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3prg.dtx 4212 2012-09-09 12:24:04Z bruno $
+\GetIdInfo$Id: l3prg.dtx 4339 2012-11-24 19:16:43Z joseph $
{L3 Control structures}
%%
\ProvidesExplPackage
@@ -184,24 +184,24 @@
\cs_new_nopar:cpn { __bool_S_1:w } { \group_align_safe_end: \c_true_bool }
\cs_new_nopar:cpn { __bool_&_1:w } & { \__bool_get_next:NN \use_i:nn }
\cs_new_nopar:cpn { __bool_|_0:w } | { \__bool_get_next:NN \use_i:nn }
-\cs_new_nopar:cpn { __bool_&_0:w } & { \__bool_eval_skip_to_end:Nw \c_false_bool }
-\cs_new_nopar:cpn { __bool_|_1:w } | { \__bool_eval_skip_to_end:Nw \c_true_bool }
+\cs_new_nopar:cpn { __bool_&_0:w } & { \__bool_eval_skip_to_end_auxi:Nw \c_false_bool }
+\cs_new_nopar:cpn { __bool_|_1:w } | { \__bool_eval_skip_to_end_auxi:Nw \c_true_bool }
%% (
-\cs_new:Npn \__bool_eval_skip_to_end:Nw #1#2 )
+\cs_new:Npn \__bool_eval_skip_to_end_auxi:Nw #1#2 )
{
- \__bool_eval_skip_to_end_ii:Nw #1#2 ( % )
+ \__bool_eval_skip_to_end_auxii:Nw #1#2 ( % )
\q_no_value \q_stop
{#2}
}
-\cs_new:Npn \__bool_eval_skip_to_end_ii:Nw #1#2 ( #3#4 \q_stop #5 % )
+\cs_new:Npn \__bool_eval_skip_to_end_auxii:Nw #1#2 ( #3#4 \q_stop #5 % )
{
\quark_if_no_value:NTF #3
{#1}
- { \__bool_eval_skip_to_end_iii:Nw #1 #5 }
+ { \__bool_eval_skip_to_end_auxiii:Nw #1 #5 }
}
-\cs_new:Npn \__bool_eval_skip_to_end_iii:Nw #1#2 ( #3 )
+\cs_new:Npn \__bool_eval_skip_to_end_auxiii:Nw #1#2 ( #3 )
{ % (
- \__bool_eval_skip_to_end:Nw #1#3 )
+ \__bool_eval_skip_to_end_auxi:Nw #1#3 )
}
\cs_new:Npn \bool_not_p:n #1 { \bool_if_p:n { ! ( #1 ) } }
\cs_new:Npn \bool_xor_p:nn #1#2
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
index 1a59d7c4911..55cb5f18fb0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3seq.dtx 4212 2012-09-09 12:24:04Z bruno $
+\GetIdInfo$Id: l3seq.dtx 4339 2012-11-24 19:16:43Z joseph $
{L3 Sequences and stacks}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -88,26 +88,26 @@
{
\tl_set:Nn \l__seq_internal_a_tl
{
- \__seq_set_split_i:w \prg_do_nothing:
+ \__seq_set_split_auxi:w \prg_do_nothing:
#4
\__seq_set_split_end:
}
\tl_replace_all:Nnn \l__seq_internal_a_tl { #3 }
{
\__seq_set_split_end:
- \__seq_set_split_i:w \prg_do_nothing:
+ \__seq_set_split_auxi:w \prg_do_nothing:
}
\tl_set:Nx \l__seq_internal_a_tl { \l__seq_internal_a_tl }
#1 #2 { \l__seq_internal_a_tl }
}
}
-\cs_new:Npn \__seq_set_split_i:w #1 \__seq_set_split_end:
+\cs_new:Npn \__seq_set_split_auxi:w #1 \__seq_set_split_end:
{
- \exp_not:N \__seq_set_split_ii:w
+ \exp_not:N \__seq_set_split_auxii:w
\exp_args:No \tl_trim_spaces:n {#1}
\exp_not:N \__seq_set_split_end:
}
-\cs_new:Npn \__seq_set_split_ii:w #1 \__seq_set_split_end:
+\cs_new:Npn \__seq_set_split_auxii:w #1 \__seq_set_split_end:
{ \__seq_wrap_item:n {#1} }
\cs_generate_variant:Nn \seq_set_split:Nnn { NnV }
\cs_generate_variant:Nn \seq_gset_split:Nnn { NnV }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index ef644d3dfd6..6035dfe2f07 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3tl.dtx 4244 2012-09-28 22:46:36Z bruno $
+\GetIdInfo$Id: l3tl.dtx 4339 2012-11-24 19:16:43Z joseph $
{L3 Token lists}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -484,37 +484,37 @@
{
\cs_new:Npn \__tl_trim_spaces:nn ##1
{
- \__tl_trim_spaces_i:w
+ \__tl_trim_spaces_auxi:w
##1
\q_nil
\q_mark #1 { }
- \q_mark \__tl_trim_spaces_ii:w
- \__tl_trim_spaces_iii:w
+ \q_mark \__tl_trim_spaces_auxii:w
+ \__tl_trim_spaces_auxiii:w
#1 \q_nil
- \__tl_trim_spaces_iv:w
+ \__tl_trim_spaces_auxiv:w
\q_stop
}
- \cs_new:Npn \__tl_trim_spaces_i:w ##1 \q_mark #1 ##2 \q_mark ##3
+ \cs_new:Npn \__tl_trim_spaces_auxi:w ##1 \q_mark #1 ##2 \q_mark ##3
{
##3
- \__tl_trim_spaces_i:w
+ \__tl_trim_spaces_auxi:w
\q_mark
##2
\q_mark #1 {##1}
}
- \cs_new:Npn \__tl_trim_spaces_ii:w
- \__tl_trim_spaces_i:w \q_mark \q_mark ##1
+ \cs_new:Npn \__tl_trim_spaces_auxii:w
+ \__tl_trim_spaces_auxi:w \q_mark \q_mark ##1
{
- \__tl_trim_spaces_iii:w
+ \__tl_trim_spaces_auxiii:w
##1
}
- \cs_new:Npn \__tl_trim_spaces_iii:w ##1 #1 \q_nil ##2
+ \cs_new:Npn \__tl_trim_spaces_auxiii:w ##1 #1 \q_nil ##2
{
##2
##1 \q_nil
- \__tl_trim_spaces_iii:w
+ \__tl_trim_spaces_auxiii:w
}
- \cs_new:Npn \__tl_trim_spaces_iv:w ##1 \q_nil ##2 \q_stop ##3
+ \cs_new:Npn \__tl_trim_spaces_auxiv:w ##1 \q_nil ##2 \q_stop ##3
{ ##3 { \use_none:n ##1 } }
}
\__tl_tmp:w { ~ }
@@ -593,11 +593,11 @@
\cs_new:Npn \tl_head:n #1
{
\etex_unexpanded:D
- \if_false: { \fi: \__tl_head_i:nw #1 { } \q_stop }
+ \if_false: { \fi: \__tl_head_auxi:nw #1 { } \q_stop }
}
-\cs_new:Npn \__tl_head_i:nw #1#2 \q_stop
- { \exp_after:wN \__tl_head_ii:nw \exp_after:wN { \if_false: } \fi: {#1} }
-\cs_new:Npn \__tl_head_ii:nw #1
+\cs_new:Npn \__tl_head_auxi:nw #1#2 \q_stop
+ { \exp_after:wN \__tl_head_auxii:nw \exp_after:wN { \if_false: } \fi: {#1} }
+\cs_new:Npn \__tl_head_auxii:nw #1
{
\exp_after:wN \if_meaning:w \exp_after:wN \q_nil
\tl_to_str:n \exp_after:wN { \use_none:n #1 } \q_nil
@@ -606,7 +606,7 @@
\exp_after:wN \use_ii:nn
\fi:
{#1}
- { \if_false: { \fi: \__tl_head_i:nw #1 } }
+ { \if_false: { \fi: \__tl_head_auxi:nw #1 } }
}
\cs_generate_variant:Nn \tl_head:n { V , v , f }
\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 a95678f3d6c..c4b3a28e6a5 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3token.dtx 4251 2012-11-01 16:30:06Z joseph $
+\GetIdInfo$Id: l3token.dtx 4384 2012-12-20 15:47:56Z bruno $
{L3 Experimental token manipulation}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -573,54 +573,56 @@
{ \__peek_token_remove_generic:NNTF #1 #2 {#3} { } }
\cs_new_protected:Npn \__peek_token_remove_generic:NNF #1#2#3
{ \__peek_token_remove_generic:NNTF #1 #2 { } {#3} }
-\cs_new_nopar:Npn \__peek_execute_branches_catcode:
+\cs_new_nopar:Npn \__peek_execute_branches_meaning:
{
- \if_catcode:w
- \exp_not:N \l_peek_token \exp_not:N \l__peek_search_token
+ \if_meaning:w \l_peek_token \l__peek_search_token
\exp_after:wN \__peek_true:w
\else:
\exp_after:wN \__peek_false:w
\fi:
}
-\cs_new_nopar:Npn \__peek_execute_branches_meaning:
+\cs_new_nopar:Npn \__peek_execute_branches_catcode:
+ { \if_catcode:w \__peek_execute_branches_catcode_aux: }
+\cs_new_nopar:Npn \__peek_execute_branches_charcode:
+ { \if_charcode:w \__peek_execute_branches_catcode_aux: }
+\cs_new_nopar:Npn \__peek_execute_branches_catcode_aux:
{
- \if_meaning:w \l_peek_token \l__peek_search_token
+ \if_catcode:w \exp_not:N \l_peek_token \scan_stop:
+ \exp_after:wN \exp_after:wN
+ \exp_after:wN \__peek_execute_branches_catcode_auxii:N
+ \exp_after:wN \exp_not:N
+ \else:
+ \exp_after:wN \__peek_execute_branches_catcode_auxiii:
+ \fi:
+ }
+\cs_new:Npn \__peek_execute_branches_catcode_auxii:N #1
+ {
+ \exp_not:N #1
+ \exp_after:wN \exp_not:N \l__peek_search_tl
\exp_after:wN \__peek_true:w
\else:
\exp_after:wN \__peek_false:w
\fi:
+ #1
}
-\cs_new_nopar:Npn \__peek_execute_branches_charcode:
+\cs_new_nopar:Npn \__peek_execute_branches_catcode_auxiii:
{
- \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 }
- {
- \exp_after:wN \__peek_execute_branches_charcode_aux:NN
- \l__peek_search_tl
- }
- }
-\cs_new:Npn \__peek_execute_branches_charcode_aux:NN #1#2
- {
- \if:w \exp_not:N #1 \exp_not:N #2
+ \exp_not:N \l_peek_token
+ \exp_after:wN \exp_not:N \l__peek_search_tl
\exp_after:wN \__peek_true:w
\else:
\exp_after:wN \__peek_false:w
\fi:
- #2
}
\cs_new_protected_nopar:Npn \__peek_ignore_spaces_execute_branches:
{
- \token_if_eq_meaning:NNTF \l_peek_token \c_space_token
- {
- \tex_afterassignment:D \__peek_ignore_spaces_execute_branches_aux:
- \cs_set_eq:NN \__peek_tmp:w
- }
- { \__peek_execute_branches: }
+ \if_meaning:w \l_peek_token \c_space_token
+ \tex_afterassignment:D \__peek_ignore_spaces_execute_branches_aux:
+ \exp_after:wN \cs_set_eq:NN
+ \exp_after:wN \__peek_tmp:w
+ \else:
+ \exp_after:wN \__peek_execute_branches:
+ \fi:
}
\cs_new_protected_nopar:Npn \__peek_ignore_spaces_execute_branches_aux:
{ \peek_after:Nw \__peek_ignore_spaces_execute_branches: }