summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty7
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3basics.sty229
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3box.sty60
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3clist.sty230
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty66
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3color.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls451
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3expan.sty5
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3file.sty16
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3fp.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3int.sty21
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3io.sty18
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3keys.sty59
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty6
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3msg.sty17
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3names.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3prg.sty81
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3prop.sty27
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3quark.sty33
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3seq.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3skip.sty34
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3tl.sty53
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3token.sty85
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3toks.sty163
25 files changed, 759 insertions, 924 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index dd8e487b69e..507e7decc28 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -48,8 +48,8 @@
\RequirePackage{l3names}
\def\ExplFileName{expl3}
\def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2011/09/05}
-\def\ExplFileVersion{2729}
+\def\ExplFileDate{2011/09/15}
+\def\ExplFileVersion{2828}
\RequirePackage{etex}
\reserveinserts{32}
\RequirePackage{calc}
@@ -125,7 +125,6 @@
l3color,
l3luatex
}
-\RequirePackage{l3toks}
\bool_if:nT { \@l@expl@check@declarations@bool }
{
\msg_kernel_new:nnnn { check } { non-declared-variable }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
index 8034a2ff274..ea2bafefc9e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3basics.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,82 +46,80 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3basics.dtx 2689 2011-08-29 19:50:38Z joseph $
+\GetIdInfo$Id: l3basics.dtx 2817 2011-09-12 14:16:56Z joseph $
{L3 Experimental basic definitions}
-
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\package_check_loaded_expl:
-\tex_let:D \cs_set_eq:NwN \tex_let:D
-\cs_set_eq:NwN \if_true: \tex_iftrue:D
-\cs_set_eq:NwN \if_false: \tex_iffalse:D
-\cs_set_eq:NwN \or: \tex_or:D
-\cs_set_eq:NwN \else: \tex_else:D
-\cs_set_eq:NwN \fi: \tex_fi:D
-\cs_set_eq:NwN \reverse_if:N \etex_unless:D
-\cs_set_eq:NwN \if:w \tex_if:D
-\cs_set_eq:NwN \if_bool:N \tex_ifodd:D
-\cs_set_eq:NwN \if_predicate:w \tex_ifodd:D
-\cs_set_eq:NwN \if_charcode:w \tex_if:D
-\cs_set_eq:NwN \if_catcode:w \tex_ifcat:D
-\cs_set_eq:NwN \if_meaning:w \tex_ifx:D
-\cs_set_eq:NwN \if_mode_math: \tex_ifmmode:D
-\cs_set_eq:NwN \if_mode_horizontal: \tex_ifhmode:D
-\cs_set_eq:NwN \if_mode_vertical: \tex_ifvmode:D
-\cs_set_eq:NwN \if_mode_inner: \tex_ifinner:D
-\cs_set_eq:NwN \if_cs_exist:N \etex_ifdefined:D
-\cs_set_eq:NwN \if_cs_exist:w \etex_ifcsname:D
-\cs_set_eq:NwN \exp_after:wN \tex_expandafter:D
-\cs_set_eq:NwN \exp_not:N \tex_noexpand:D
-\cs_set_eq:NwN \exp_not:n \etex_unexpanded:D
-\cs_set_eq:NwN \token_to_meaning:N \tex_meaning:D
-\cs_set_eq:NwN \token_to_str:N \tex_string:D
-\cs_set_eq:NwN \cs:w \tex_csname:D
-\cs_set_eq:NwN \cs_end: \tex_endcsname:D
-\cs_set_eq:NwN \cs_meaning:N \tex_meaning:D
-\cs_set_eq:NwN \cs_show:N \tex_show:D
-\cs_set_eq:NwN \scan_stop: \tex_relax:D
-\cs_set_eq:NwN \group_begin: \tex_begingroup:D
-\cs_set_eq:NwN \group_end: \tex_endgroup:D
-\cs_set_eq:NwN \if_int_compare:w \tex_ifnum:D
-\cs_set_eq:NwN \int_to_roman:w \tex_romannumeral:D
-\cs_set_eq:NwN \group_insert_after:N \tex_aftergroup:D
-\cs_set_eq:NwN \pref_global:D \tex_global:D
-\cs_set_eq:NwN \pref_long:D \tex_long:D
-\cs_set_eq:NwN \pref_protected:D \etex_protected:D
+\tex_let:D \if_true: \tex_iftrue:D
+\tex_let:D \if_false: \tex_iffalse:D
+\tex_let:D \or: \tex_or:D
+\tex_let:D \else: \tex_else:D
+\tex_let:D \fi: \tex_fi:D
+\tex_let:D \reverse_if:N \etex_unless:D
+\tex_let:D \if:w \tex_if:D
+\tex_let:D \if_bool:N \tex_ifodd:D
+\tex_let:D \if_predicate:w \tex_ifodd:D
+\tex_let:D \if_charcode:w \tex_if:D
+\tex_let:D \if_catcode:w \tex_ifcat:D
+\tex_let:D \if_meaning:w \tex_ifx:D
+\tex_let:D \if_mode_math: \tex_ifmmode:D
+\tex_let:D \if_mode_horizontal: \tex_ifhmode:D
+\tex_let:D \if_mode_vertical: \tex_ifvmode:D
+\tex_let:D \if_mode_inner: \tex_ifinner:D
+\tex_let:D \if_cs_exist:N \etex_ifdefined:D
+\tex_let:D \if_cs_exist:w \etex_ifcsname:D
+\tex_let:D \exp_after:wN \tex_expandafter:D
+\tex_let:D \exp_not:N \tex_noexpand:D
+\tex_let:D \exp_not:n \etex_unexpanded:D
+\tex_let:D \token_to_meaning:N \tex_meaning:D
+\tex_let:D \token_to_str:N \tex_string:D
+\tex_let:D \cs:w \tex_csname:D
+\tex_let:D \cs_end: \tex_endcsname:D
+\tex_let:D \cs_meaning:N \tex_meaning:D
+\tex_let:D \cs_show:N \tex_show:D
+\tex_let:D \scan_stop: \tex_relax:D
+\tex_let:D \group_begin: \tex_begingroup:D
+\tex_let:D \group_end: \tex_endgroup:D
+\tex_let:D \if_int_compare:w \tex_ifnum:D
+\tex_let:D \int_to_roman:w \tex_romannumeral:D
+\tex_let:D \group_insert_after:N \tex_aftergroup:D
+\tex_let:D \tex_global:D \tex_global:D
+\tex_let:D \tex_long:D \tex_long:D
+\tex_let:D \tex_protected:D \etex_protected:D
\tex_long:D \tex_def:D \exp_args:Nc #1#2 { \exp_after:wN #1 \cs:w #2 \cs_end: }
%% A small number of variants by hand.
\tex_def:D \cs_meaning:c { \exp_args:Nc \cs_meaning:N }
\tex_def:D \token_to_str:c { \exp_args:Nc \token_to_str:N }
\tex_def:D \cs_show:c { \exp_args:Nc \cs_show:N }
-\cs_set_eq:NwN \cs_set_nopar:Npn \tex_def:D
-\cs_set_eq:NwN \cs_set_nopar:Npx \tex_edef:D
-\pref_protected:D \cs_set_nopar:Npn \cs_set:Npn
- { \pref_long:D \cs_set_nopar:Npn }
-\pref_protected:D \cs_set_nopar:Npn \cs_set:Npx
- { \pref_long:D \cs_set_nopar:Npx }
-\pref_protected:D \cs_set_nopar:Npn \cs_set_protected_nopar:Npn
- { \pref_protected:D \cs_set_nopar:Npn }
-\pref_protected:D \cs_set_nopar:Npn \cs_set_protected_nopar:Npx
- { \pref_protected:D \cs_set_nopar:Npx }
+\tex_let:D \cs_set_nopar:Npn \tex_def:D
+\tex_let:D \cs_set_nopar:Npx \tex_edef:D
+\tex_protected:D \cs_set_nopar:Npn \cs_set:Npn
+ { \tex_long:D \cs_set_nopar:Npn }
+\tex_protected:D \cs_set_nopar:Npn \cs_set:Npx
+ { \tex_long:D \cs_set_nopar:Npx }
+\tex_protected:D \cs_set_nopar:Npn \cs_set_protected_nopar:Npn
+ { \tex_protected:D \cs_set_nopar:Npn }
+\tex_protected:D \cs_set_nopar:Npn \cs_set_protected_nopar:Npx
+ { \tex_protected:D \cs_set_nopar:Npx }
\cs_set_protected_nopar:Npn \cs_set_protected:Npn
- { \pref_protected:D \pref_long:D \cs_set_nopar:Npn }
+ { \tex_protected:D \tex_long:D \cs_set_nopar:Npn }
\cs_set_protected_nopar:Npn \cs_set_protected:Npx
- { \pref_protected:D \pref_long:D \cs_set_nopar:Npx }
-\cs_set_eq:NwN \cs_gset_nopar:Npn \tex_gdef:D
-\cs_set_eq:NwN \cs_gset_nopar:Npx \tex_xdef:D
+ { \tex_protected:D \tex_long:D \cs_set_nopar:Npx }
+\tex_let:D \cs_gset_nopar:Npn \tex_gdef:D
+\tex_let:D \cs_gset_nopar:Npx \tex_xdef:D
\cs_set_protected_nopar:Npn \cs_gset:Npn
- { \pref_long:D \cs_gset_nopar:Npn }
+ { \tex_long:D \cs_gset_nopar:Npn }
\cs_set_protected_nopar:Npn \cs_gset:Npx
- { \pref_long:D \cs_gset_nopar:Npx }
+ { \tex_long:D \cs_gset_nopar:Npx }
\cs_set_protected_nopar:Npn \cs_gset_protected_nopar:Npn
- { \pref_protected:D \cs_gset_nopar:Npn }
+ { \tex_protected:D \cs_gset_nopar:Npn }
\cs_set_protected_nopar:Npn \cs_gset_protected_nopar:Npx
- { \pref_protected:D \cs_gset_nopar:Npx }
+ { \tex_protected:D \cs_gset_nopar:Npx }
\cs_set_protected_nopar:Npn \cs_gset_protected:Npn
- { \pref_protected:D \pref_long:D \cs_gset_nopar:Npn }
+ { \tex_protected:D \tex_long:D \cs_gset_nopar:Npn }
\cs_set_protected_nopar:Npn \cs_gset_protected:Npx
- { \pref_protected:D \pref_long:D \cs_gset_nopar:Npx }
+ { \tex_protected:D \tex_long:D \cs_gset_nopar:Npx }
\cs_set:Npn \use:c #1 { \cs:w #1 \cs_end: }
\cs_set_protected:Npn \use:x #1
{
@@ -152,10 +150,6 @@
\cs_set:Npn \use_i_delimit_by_q_nil:nw #1#2 \q_nil {#1}
\cs_set:Npn \use_i_delimit_by_q_stop:nw #1#2 \q_stop {#1}
\cs_set:Npn \use_i_delimit_by_q_recursion_stop:nw #1#2 \q_recursion_stop {#1}
-\cs_set:Npn \use_i_after_fi:nw #1 \fi: { \fi: #1 }
-\cs_set:Npn \use_i_after_else:nw #1 \else: #2 \fi: { \fi: #1 }
-\cs_set:Npn \use_i_after_or:nw #1 \or: #2 \fi: { \fi: #1 }
-\cs_set:Npn \use_i_after_orelse:nw #1#2#3 \fi: { \fi: #1 }
\cs_set:Npn \use_none:n #1 { }
\cs_set:Npn \use_none:nn #1#2 { }
\cs_set:Npn \use_none:nnn #1#2#3 { }
@@ -426,7 +420,7 @@
}
{ \prg_return_true: }
}
-\cs_set_eq:NwN \c_minus_one \m@ne
+\tex_let:D \c_minus_one \m@ne
\tex_chardef:D \c_sixteen = 16~
\tex_chardef:D \c_zero = 0~
\tex_chardef:D \c_six = 6~
@@ -455,7 +449,6 @@
{ \msg_kernel_error:nnxx {#1} {#2} { } { } }
\cs_set_nopar:Npn \msg_line_context:
{ on~line~\tex_the:D \tex_inputlineno:D }
-\cs_set:Npn \cs_record_meaning:N #1 { }
\cs_set_protected_nopar:Npn \chk_if_free_cs:N #1
{
\cs_if_free:NF #1
@@ -529,32 +522,19 @@
\cs_tmp:w \cs_gset_protected:cpx \cs_gset_protected:Npx
\cs_tmp:w \cs_new_protected:cpn \cs_new_protected:Npn
\cs_tmp:w \cs_new_protected:cpx \cs_new_protected:Npx
-\cs_new_nopar:cpn { use_0_parameter: } { }
-\cs_new_nopar:cpn { use_1_parameter: } { {##1} }
-\cs_new_nopar:cpn { use_2_parameter: } { {##1} {##2} }
-\cs_new_nopar:cpn { use_3_parameter: } { {##1} {##2} {##3} }
-\cs_new_nopar:cpn { use_4_parameter: } { {##1} {##2} {##3} {##4} }
-\cs_new_nopar:cpn { use_5_parameter: } { {##1} {##2} {##3} {##4} {##5} }
-\cs_new_nopar:cpn { use_6_parameter: } { {##1} {##2} {##3} {##4} {##5} {##6} }
-\cs_new_nopar:cpn { use_7_parameter: }
- { {##1} {##2} {##3} {##4} {##5}{##6} {##7} }
-\cs_new_nopar:cpn { use_8_parameter: }
- { {##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8} }
-\cs_new_nopar:cpn{ use_9_parameter: }
- { {##1} {##2} {##3} {##4} {##5} {##6} {##7} {##8} {##9} }
-\cs_new_protected:Npn \cs_set_eq:NN #1 { \cs_set_eq:NwN #1 =~ }
+\cs_new_protected:Npn \cs_set_eq:NN #1 { \tex_let:D #1 =~ }
\cs_new_protected_nopar:Npn \cs_set_eq:cN { \exp_args:Nc \cs_set_eq:NN }
\cs_new_protected_nopar:Npn \cs_set_eq:Nc { \exp_args:NNc \cs_set_eq:NN }
\cs_new_protected_nopar:Npn \cs_set_eq:cc { \exp_args:Ncc \cs_set_eq:NN }
\cs_new_protected:Npn \cs_new_eq:NN #1
{
\chk_if_free_cs:N #1
- \pref_global:D \cs_set_eq:NN #1
+ \tex_global:D \cs_set_eq:NN #1
}
\cs_new_protected_nopar:Npn \cs_new_eq:cN { \exp_args:Nc \cs_new_eq:NN }
\cs_new_protected_nopar:Npn \cs_new_eq:Nc { \exp_args:NNc \cs_new_eq:NN }
\cs_new_protected_nopar:Npn \cs_new_eq:cc { \exp_args:Ncc \cs_new_eq:NN }
-\cs_new_protected_nopar:Npn \cs_gset_eq:NN { \pref_global:D \cs_set_eq:NN }
+\cs_new_protected_nopar:Npn \cs_gset_eq:NN { \tex_global:D \cs_set_eq:NN }
\cs_new_protected_nopar:Npn \cs_gset_eq:Nc { \exp_args:NNc \cs_gset_eq:NN }
\cs_new_protected_nopar:Npn \cs_gset_eq:cN { \exp_args:Nc \cs_gset_eq:NN }
\cs_new_protected_nopar:Npn \cs_gset_eq:cc { \exp_args:Ncc \cs_gset_eq:NN }
@@ -583,34 +563,26 @@
\cs_new_protected:Npn \cs_generate_from_arg_count:NNnn #1#2#3#4
{
\if_case:w \int_eval:w #3 \int_eval_end:
- \use_i_after_orelse:nw {#2#1}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2##3}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2##3##4}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2##3##4##5}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2##3##4##5##6}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2##3##4##5##6##7}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2##3##4##5##6##7##8}
- \or:
- \use_i_after_orelse:nw {#2#1 ##1##2##3##4##5##6##7##8##9}
+ \cs_generate_from_arg_count_aux:nwn {}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2##3}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2##3##4}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2##3##4##5}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2##3##4##5##6}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2##3##4##5##6##7}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2##3##4##5##6##7##8}
+ \or: \cs_generate_from_arg_count_aux:nwn {##1##2##3##4##5##6##7##8##9}
\else:
- \use_i_after_fi:nw
- {
- \cs_generate_from_arg_count_error_msg:Nn #1 {#3}
- \use_none:n
- }
+ \cs_generate_from_arg_count_error_msg:Nn #1 {#3}
+ \use_i:nnn
\fi:
+ {#2#1}
{#4}
}
+\cs_new_protected_nopar:Npn
+ \cs_generate_from_arg_count_aux:nwn #1 #2 \fi: #3
+ { \fi: #3 #1 }
\cs_new_nopar:Npn \cs_generate_from_arg_count:cNnn
{ \exp_args:Nc \cs_generate_from_arg_count:NNnn }
\cs_new:Npn \cs_generate_from_arg_count_error_msg:Nn #1#2
@@ -719,9 +691,9 @@
\cs_new_eq:NN \xetex_if_engine:T \use_none:n
\cs_new_eq:NN \xetex_if_engine:F \use:n
\cs_new_eq:NN \xetex_if_engine:TF \use_ii:nn
-\cs_new_eq:NN \c_luatex_is_engine_bool \c_false_bool
-\cs_new_eq:NN \c_pdftex_is_engine_bool \c_true_bool
-\cs_new_eq:NN \c_xetex_is_engine_bool \c_false_bool
+\cs_new_eq:NN \luatex_if_engine_p: \c_false_bool
+\cs_new_eq:NN \pdftex_if_engine_p: \c_true_bool
+\cs_new_eq:NN \xetex_if_engine_p: \c_false_bool
\cs_if_exist:NT \xetex_XeTeXversion:D
{
\cs_set_eq:NN \pdftex_if_engine:T \use_none:n
@@ -730,8 +702,8 @@
\cs_set_eq:NN \xetex_if_engine:T \use:n
\cs_set_eq:NN \xetex_if_engine:F \use_none:n
\cs_set_eq:NN \xetex_if_engine:TF \use_i:nn
- \cs_set_eq:NN \c_pdftex_is_engine_bool \c_false_bool
- \cs_set_eq:NN \c_xetex_is_engine_bool \c_true_bool
+ \cs_set_eq:NN \pdftex_if_engine_p: \c_false_bool
+ \cs_set_eq:NN \xetex_if_engine_p: \c_true_bool
}
\cs_if_exist:NT \luatex_directlua:D
{
@@ -741,8 +713,8 @@
\cs_set_eq:NN \pdftex_if_engine:T \use_none:n
\cs_set_eq:NN \pdftex_if_engine:F \use:n
\cs_set_eq:NN \pdftex_if_engine:TF \use_ii:nn
- \cs_set_eq:NN \c_luatex_is_engine_bool \c_true_bool
- \cs_set_eq:NN \c_pdftex_is_engine_bool \c_false_bool
+ \cs_set_eq:NN \luatex_if_engine_p: \c_true_bool
+ \cs_set_eq:NN \pdftex_if_engine_p: \c_false_bool
}
\cs_new_nopar:Npn \prg_do_nothing: { }
\prg_new_conditional:Npnn \str_if_eq:nn #1#2 { p , T , F , TF }
@@ -756,29 +728,14 @@
\if_int_compare:w \pdftex_strcmp:D {#1} {#2} = \c_zero
\prg_return_true: \else: \prg_return_false: \fi:
}
-\cs_new_eq:NN \cs_gnew_nopar:Npn \cs_new_nopar:Npn
-\cs_new_eq:NN \cs_gnew:Npn \cs_new:Npn
-\cs_new_eq:NN \cs_gnew_protected_nopar:Npn \cs_new_protected_nopar:Npn
-\cs_new_eq:NN \cs_gnew_protected:Npn \cs_new_protected:Npn
-\cs_new_eq:NN \cs_gnew_nopar:Npx \cs_new_nopar:Npx
-\cs_new_eq:NN \cs_gnew:Npx \cs_new:Npx
-\cs_new_eq:NN \cs_gnew_protected_nopar:Npx \cs_new_protected_nopar:Npx
-\cs_new_eq:NN \cs_gnew_protected:Npx \cs_new_protected:Npx
-\cs_new_eq:NN \cs_gnew_nopar:cpn \cs_new_nopar:cpn
-\cs_new_eq:NN \cs_gnew:cpn \cs_new:cpn
-\cs_new_eq:NN \cs_gnew_protected_nopar:cpn \cs_new_protected_nopar:cpn
-\cs_new_eq:NN \cs_gnew_protected:cpn \cs_new_protected:cpn
-\cs_new_eq:NN \cs_gnew_nopar:cpx \cs_new_nopar:cpx
-\cs_new_eq:NN \cs_gnew:cpx \cs_new:cpx
-\cs_new_eq:NN \cs_gnew_protected_nopar:cpx \cs_new_protected_nopar:cpx
-\cs_new_eq:NN \cs_gnew_protected:cpx \cs_new_protected:cpx
-\cs_new_eq:NN \cs_gnew_eq:NN \cs_new_eq:NN
-\cs_new_eq:NN \cs_gnew_eq:cN \cs_new_eq:cN
-\cs_new_eq:NN \cs_gnew_eq:Nc \cs_new_eq:Nc
-\cs_new_eq:NN \cs_gnew_eq:cc \cs_new_eq:cc
-\cs_new_eq:NN \cs_gundefine:N \cs_undefine:N
-\cs_new_eq:NN \cs_gundefine:c \cs_undefine:c
-\cs_new_eq:NN \group_execute_after:N \group_insert_after:N
+\cs_new_eq:NN \c_luatex_is_engine_bool \luatex_if_engine_p:
+\cs_new_eq:NN \c_pdftex_is_engine_bool \pdftex_if_engine_p:
+\cs_new_eq:NN \c_xetex_is_engine_bool \xetex_if_engine_p:
+\cs_set:Npn \use_i_after_fi:nw #1 \fi: { \fi: #1 }
+\cs_set:Npn \use_i_after_else:nw #1 \else: #2 \fi: { \fi: #1 }
+\cs_set:Npn \use_i_after_or:nw #1 \or: #2 \fi: { \fi: #1 }
+\cs_set:Npn \use_i_after_orelse:nw #1#2#3 \fi: { \fi: #1 }
+\tex_let:D \cs_set_eq:NwN \tex_let:D
%%
%%
%% End of file `l3basics.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
index ee4c4decd6f..e00b99f0852 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3bootstrap.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -94,7 +94,7 @@
{\def\ExplFileDate{#2}}
\protected\def\GetIdInfoAuxSVN#1\relax#2-#3-#4\relax#5Z\relax
{\def\ExplFileDate{#2/#3/#4}}
-\GetIdInfo$Id: l3bootstrap.dtx 2687 2011-08-29 19:48:45Z joseph $
+\GetIdInfo$Id: l3bootstrap.dtx 2798 2011-09-10 15:42:13Z will $
{L3 experimental bootstrap code}
\ProvidesPackage{l3bootstrap}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
index cb83228019a..c0e5ce553b8 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3box.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3box.dtx 2711 2011-09-02 12:15:53Z joseph $
+\GetIdInfo$Id: l3box.dtx 2799 2011-09-10 15:46:33Z will $
{L3 Experimental boxes}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -80,13 +80,13 @@
\cs_new_protected_nopar:Npn \box_set_eq:NN #1#2
{ \tex_setbox:D #1 \tex_copy:D #2 }
\cs_new_protected_nopar:Npn \box_gset_eq:NN
- { \pref_global:D \box_set_eq:NN }
+ { \tex_global:D \box_set_eq:NN }
\cs_generate_variant:Nn \box_set_eq:NN { cN , Nc , cc }
\cs_generate_variant:Nn \box_gset_eq:NN { cN , Nc , cc }
\cs_new_protected_nopar:Npn \box_set_eq_clear:NN #1#2
{ \tex_setbox:D #1 \tex_box:D #2 }
\cs_new_protected_nopar:Npn \box_gset_eq_clear:NN
- { \pref_global:D \box_set_eq_clear:NN }
+ { \tex_global:D \box_set_eq_clear:NN }
\cs_generate_variant:Nn \box_set_eq_clear:NN { cN , Nc , cc }
\cs_generate_variant:Nn \box_gset_eq_clear:NN { cN , Nc , cc }
\cs_new_eq:NN \box_ht:N \tex_ht:D
@@ -141,7 +141,7 @@
\cs_new_protected_nopar:Npn \box_set_to_last:N #1
{ \tex_setbox:D #1 \l_last_box }
\cs_new_protected_nopar:Npn \box_gset_to_last:N
- { \pref_global:D \box_set_to_last:N }
+ { \tex_global:D \box_set_to_last:N }
\cs_generate_variant:Nn \box_set_to_last:N { c }
\cs_generate_variant:Nn \box_gset_to_last:N { c }
\cs_new_eq:NN \c_empty_box \voidb@x
@@ -151,23 +151,29 @@
\cs_generate_variant:Nn \box_show:N { c }
\cs_new_protected_nopar:Npn \hbox:n { \tex_hbox:D \scan_stop: }
\cs_new_protected:Npn \hbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_hbox:D {#2} }
-\cs_new_protected_nopar:Npn \hbox_gset:Nn { \pref_global:D \hbox_set:Nn }
+\cs_new_protected_nopar:Npn \hbox_gset:Nn { \tex_global:D \hbox_set:Nn }
\cs_generate_variant:Nn \hbox_set:Nn { c }
\cs_generate_variant:Nn \hbox_gset:Nn { c }
\cs_new_protected:Npn \hbox_set_to_wd:Nnn #1#2#3
{ \tex_setbox:D #1 \tex_hbox:D to \dim_eval:w #2 \dim_eval_end: {#3} }
\cs_new_protected_nopar:Npn \hbox_gset_to_wd:Nnn
- { \pref_global:D \hbox_set_to_wd:Nnn }
+ { \tex_global:D \hbox_set_to_wd:Nnn }
\cs_generate_variant:Nn \hbox_set_to_wd:Nnn { c }
\cs_generate_variant:Nn \hbox_gset_to_wd:Nnn {cnn}
-\cs_new_protected_nopar:Npn \hbox_set_inline_begin:N #1
+\cs_new_protected_nopar:Npn \hbox_set:Nw #1
{ \tex_setbox:D #1 \tex_hbox:D \c_group_begin_token }
-\cs_new_protected_nopar:Npn \hbox_gset_inline_begin:N
- { \pref_global:D \hbox_set_inline_begin:N }
-\cs_generate_variant:Nn \hbox_set_inline_begin:N { c }
-\cs_generate_variant:Nn \hbox_gset_inline_begin:N { c }
-\cs_new_eq:NN \hbox_set_inline_end: \c_group_end_token
-\cs_new_eq:NN \hbox_gset_inline_end: \c_group_end_token
+\cs_new_protected_nopar:Npn \hbox_gset:Nw
+ { \tex_global:D \hbox_set:Nw }
+\cs_generate_variant:Nn \hbox_set:Nw { c }
+\cs_generate_variant:Nn \hbox_gset:Nw { c }
+\cs_new_eq:NN \hbox_set_end: \c_group_end_token
+\cs_new_eq:NN \hbox_gset_end: \c_group_end_token
+\cs_new_eq:NN \hbox_set_inline_begin:N \hbox_set:Nw
+\cs_new_eq:NN \hbox_set_inline_begin:c \hbox_set:cw
+\cs_new_eq:NN \hbox_set_inline_end: \hbox_set_end:
+\cs_new_eq:NN \hbox_gset_inline_begin:N \hbox_gset:Nw
+\cs_new_eq:NN \hbox_gset_inline_begin:c \hbox_gset:cw
+\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} }
@@ -185,29 +191,35 @@
{ \tex_vbox:D to \dim_eval:w #1 \dim_eval_end: {#2} }
\cs_new_protected:Npn \vbox_to_zero:n #1 { \tex_vbox:D to \c_zero_dim {#1} }
\cs_new_protected:Npn \vbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_vbox:D {#2} }
-\cs_new_protected_nopar:Npn \vbox_gset:Nn { \pref_global:D \vbox_set:Nn }
+\cs_new_protected_nopar:Npn \vbox_gset:Nn { \tex_global:D \vbox_set:Nn }
\cs_generate_variant:Nn \vbox_set:Nn { c }
\cs_generate_variant:Nn \vbox_gset:Nn { c }
\cs_new_protected:Npn \vbox_set_top:Nn #1#2
{ \tex_setbox:D #1 \tex_vtop:D {#2} }
\cs_new_protected_nopar:Npn \vbox_gset_top:Nn
- { \pref_global:D \vbox_set_top:Nn }
+ { \tex_global:D \vbox_set_top:Nn }
\cs_generate_variant:Nn \vbox_set_top:Nn { c }
\cs_generate_variant:Nn \vbox_gset_top:Nn { c }
\cs_new_protected:Npn \vbox_set_to_ht:Nnn #1#2#3
{ \tex_setbox:D #1 \tex_vbox:D to \dim_eval:w #2 \dim_eval_end: {#3} }
\cs_new_protected_nopar:Npn \vbox_gset_to_ht:Nnn
- { \pref_global:D \vbox_set_to_ht:Nnn }
+ { \tex_global:D \vbox_set_to_ht:Nnn }
\cs_generate_variant:Nn \vbox_set_to_ht:Nnn { c }
\cs_generate_variant:Nn \vbox_gset_to_ht:Nnn { c }
-\cs_new_nopar:Npn \vbox_set_inline_begin:N #1
+\cs_new_nopar:Npn \vbox_set:Nw #1
{ \tex_setbox:D #1 \tex_vbox:D \c_group_begin_token }
-\cs_new_protected_nopar:Npn \vbox_gset_inline_begin:N
- { \pref_global:D \vbox_set_inline_begin:N }
-\cs_generate_variant:Nn \vbox_set_inline_begin:N { c }
-\cs_generate_variant:Nn \vbox_gset_inline_begin:N { c }
-\cs_new_eq:NN \vbox_set_inline_end: \c_group_end_token
-\cs_new_eq:NN \vbox_gset_inline_end: \c_group_end_token
+\cs_new_protected_nopar:Npn \vbox_gset:Nw
+ { \tex_global:D \vbox_set:Nw }
+\cs_generate_variant:Nn \vbox_set:Nw { c }
+\cs_generate_variant:Nn \vbox_gset:Nw { c }
+\cs_new_eq:NN \vbox_set_end: \c_group_end_token
+\cs_new_eq:NN \vbox_gset_end: \c_group_end_token
+\cs_new_eq:NN \vbox_set_inline_begin:N \vbox_set:Nw
+\cs_new_eq:NN \vbox_set_inline_begin:c \vbox_set:cw
+\cs_new_eq:NN \vbox_set_inline_end: \vbox_set_end:
+\cs_new_eq:NN \vbox_gset_inline_begin:N \vbox_gset:Nw
+\cs_new_eq:NN \vbox_gset_inline_begin:c \vbox_gset:cw
+\cs_new_eq:NN \vbox_gset_inline_end: \vbox_gset_end:
\cs_new_eq:NN \vbox_unpack:N \tex_unvcopy:D
\cs_new_eq:NN \vbox_unpack_clear:N \tex_unvbox:D
\cs_generate_variant:Nn \vbox_unpack:N { c }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
index fa86133edb0..5f6330b6b77 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3clist.sty
@@ -23,7 +23,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -47,13 +47,13 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3clist.dtx 2725 2011-09-05 18:53:03Z bruno $
+\GetIdInfo$Id: l3clist.dtx 2798 2011-09-10 15:42:13Z will $
{L3 Experimental comma separated lists}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\package_check_loaded_expl:
\tl_new:N \l_clist_tmpa_tl
-\tl_new:N \l_clist_tmpb_tl
+\cs_new_protected:Npn \clist_tmp:w { }
\cs_new_eq:NN \clist_new:N \tl_new:N
\cs_new_eq:NN \clist_new:c \tl_new:c
\cs_new_eq:NN \clist_clear:N \tl_clear:N
@@ -80,21 +80,13 @@
{
#1 #2
{
- \clist_if_empty:NTF #3
- { \exp_not:o #4 }
- {
- \exp_not:o #3
- \clist_if_empty:NF #4
- {
- ,
- \exp_not:o #4
- }
- }
+ \exp_not:o #3
+ \clist_if_empty:NF #3 { \clist_if_empty:NF #4 { , } }
+ \exp_not:o #4
}
}
\cs_generate_variant:Nn \clist_concat:NNN { ccc }
\cs_generate_variant:Nn \clist_gconcat:NNN { ccc }
-\cs_new_protected:Npn \clist_tmp:w { }
\cs_set:Npn \clist_tmp:w #1
{
\cs_new:Npn \clist_trim_spaces_generic:nw ##1 ##2 ,
@@ -137,6 +129,12 @@
\clist_trim_spaces_aux:n { , } \q_mark
}
}
+\cs_new_protected:Npn \clist_set:Nn #1#2
+ { \tl_set:Nx #1 { \clist_trim_spaces:n {#2} } }
+\cs_new_protected:Npn \clist_gset:Nn #1#2
+ { \tl_gset:Nx #1 { \clist_trim_spaces:n {#2} } }
+\cs_generate_variant:Nn \clist_set:Nn { NV , No , Nx , c , cV , co , cx }
+\cs_generate_variant:Nn \clist_gset:Nn { NV , No , Nx , c , cV , co , cx }
\cs_new_protected_nopar:Npn \clist_put_left:Nn
{ \clist_put_aux:NNnnNn \tl_set_eq:NN \tl_put_left:Nx { } , }
\cs_new_protected_nopar:Npn \clist_gput_left:Nn
@@ -169,18 +167,21 @@
{ \tl_set:Nn #3 {#1} }
\cs_generate_variant:Nn \clist_get:NN { c }
\cs_new_protected_nopar:Npn \clist_pop:NN
- { \clist_pop_aux:NNN \tl_set:Nn }
+ { \clist_pop_aux:NNN \tl_set:Nf }
\cs_new_protected_nopar:Npn \clist_gpop:NN
- { \clist_pop_aux:NNN \tl_gset:Nn }
+ { \clist_pop_aux:NNN \tl_gset:Nf }
\cs_new_protected_nopar:Npn \clist_pop_aux:NNN #1#2#3
- { \exp_after:wN \clist_pop_aux:wNNN #2 , \q_nil , \q_nil , \q_stop #1#2#3 }
-\cs_new_protected:Npn \clist_pop_aux:wNNN #1 , #2 , \q_nil , #3 \q_stop #4#5#6
{
+ \exp_after:wN \clist_pop_aux:wNNN #2 , \q_nil \q_stop #1#2#3
+ }
+\cs_new_protected:Npn \clist_pop_aux:wNNN #1 , #2 \q_stop #3#4#5
+ {
+ \tl_set:Nn #5 {#1}
\quark_if_nil:nTF {#2}
- { #4 #5 { } }
- { #4 #5 {#2} }
- \tl_set:Nn #6 {#1}
+ { #3 #4 { } }
+ { #3 #4 { \clist_pop_aux:w \exp_stop_f: #2 } }
}
+\cs_new_protected:Npn \clist_pop_aux:w #1 , \q_nil {#1}
\cs_generate_variant:Nn \clist_pop:NN { c }
\cs_generate_variant:Nn \clist_gpop:NN { c }
\cs_new_eq:NN \clist_push:Nn \clist_put_left:Nn
@@ -219,66 +220,58 @@
\cs_generate_variant:Nn \clist_remove_duplicates:N { c }
\cs_generate_variant:Nn \clist_gremove_duplicates:N { c }
\cs_new_protected:Npn \clist_remove_all:Nn
- { \clist_remove_all_aux:NNn \clist_set_eq:NN }
+ { \clist_remove_all_aux:NNn \tl_set:Nx }
\cs_new_protected:Npn \clist_gremove_all:Nn
- { \clist_remove_all_aux:NNn \clist_gset_eq:NN }
+ { \clist_remove_all_aux:NNn \tl_gset:Nx }
\cs_new_protected:Npn \clist_remove_all_aux:NNn #1#2#3
{
+ \cs_set:Npn \clist_tmp:w ##1 , #3 ,
+ {
+ ##1
+ , \q_mark , \use_none_delimit_by_q_stop:w ,
+ \clist_remove_all_aux:
+ }
+ #1 #2
+ {
+ \exp_after:wN \clist_remove_all_aux:
+ #2 , \q_mark , #3 , \q_stop
+ }
\clist_if_empty:NF #2
{
- \clist_clear:N \l_clist_remove_clist
- \cs_set_protected:Npn \clist_remove_all_aux:w
- ##1 , #3 , ##2 \q_stop
- {
- \tl_put_right:Nn \l_clist_remove_clist {##1}
- \quark_if_no_value:nF {##2}
- { \clist_remove_all_aux:w , ##2 \q_stop }
- }
- \exp_after:wN \clist_remove_all_aux:w
- \exp_after:wN , #2 , #3 , \q_no_value \q_stop
- \tl_if_empty:NF \l_clist_remove_clist
+ #1 #2
{
- \exp_after:wN \tl_set:No \exp_after:wN
- \l_clist_remove_clist \exp_after:wN
- { \exp_after:wN \use_none:n \l_clist_remove_clist }
+ \exp_args:No \exp_not:o
+ { \exp_after:wN \use_none:n #2 }
}
- #1 #2 \l_clist_remove_clist
}
}
-\cs_new_protected:Npn \clist_remove_all_aux:w { }
+\cs_new:Npn \clist_remove_all_aux:
+ { \exp_after:wN \clist_remove_all_aux:w \clist_tmp:w , }
+\cs_new:Npn \clist_remove_all_aux:w #1 , \q_mark , #2 , { \exp_not:n {#1} }
\cs_generate_variant:Nn \clist_remove_all:Nn { c }
\cs_generate_variant:Nn \clist_gremove_all:Nn { c }
+\clist_new:N \l_clist_if_in_clist
\prg_new_eq_conditional:NNn \clist_if_empty:N \tl_if_empty:N { p , T , F , TF }
\prg_new_eq_conditional:NNn \clist_if_empty:c \tl_if_empty:c { p , T , F , TF }
\prg_new_eq_conditional:NNn \clist_if_eq:NN \tl_if_eq:NN { p , T , F , TF }
\prg_new_eq_conditional:NNn \clist_if_eq:Nc \tl_if_eq:Nc { p , T , F , TF }
\prg_new_eq_conditional:NNn \clist_if_eq:cN \tl_if_eq:cN { p , T , F , TF }
\prg_new_eq_conditional:NNn \clist_if_eq:cc \tl_if_eq:cc { p , T , F , TF }
-\prg_new_protected_conditional:Npnn \clist_if_in:Nn #1#2
- { T , F , TF }
+\prg_new_protected_conditional:Npnn \clist_if_in:Nn #1#2 { T , F , TF }
{
- \cs_set_protected:Npn \clist_tmp:w ##1 , #2 , ##2##3 \q_stop
- {
- \if_meaning:w \q_no_value ##2
- \prg_return_false:
- \else:
- \prg_return_true:
- \fi:
- }
- \exp_last_unbraced:NNo \clist_tmp:w , #1 , #2 , \q_no_value \q_stop
+ \exp_args:No \clist_if_in_return:nn #1 {#2}
}
-\prg_new_protected_conditional:Npnn \clist_if_in:nn #1#2
- { T , F , TF }
+\prg_new_protected_conditional:Npnn \clist_if_in:nn #1#2 { T , F , TF }
{
- \cs_set_protected:Npn \clist_tmp:w ##1 , #2 , ##2##3 \q_stop
- {
- \if_meaning:w \q_no_value ##2
- \prg_return_false:
- \else:
- \prg_return_true:
- \fi:
- }
- \clist_tmp:w , #1 , #2 , \q_no_value \q_stop
+ \clist_set:Nn \l_clist_if_in_clist {#1}
+ \exp_args:No \clist_if_in_return:nn \l_clist_if_in_clist {#2}
+ }
+\cs_new_protected:Npn \clist_if_in_return:nn #1#2
+ {
+ \cs_set:Npn \clist_tmp:w ##1 ,#2, { }
+ \tl_if_empty:oTF
+ { \clist_tmp:w ,#1, {} {} ,#2, }
+ { \prg_return_false: } { \prg_return_true: }
}
\cs_generate_variant:Nn \clist_if_in:NnT { NV , No }
\cs_generate_variant:Nn \clist_if_in:NnT { c , cV , co }
@@ -390,6 +383,10 @@
}
\cs_new:Npn \clist_show_aux:w #1 > ~ { }
\cs_generate_variant:Nn \clist_show:N { c }
+\clist_new:N \l_tmpa_clist
+\clist_new:N \l_tmpb_clist
+\clist_new:N \g_tmpa_clist
+\clist_new:N \g_tmpb_clist
\cs_new:Npn \clist_length:N #1
{
\int_eval:n
@@ -398,76 +395,105 @@
\clist_map_function:NN #1 \clist_length_aux:n
}
}
+\cs_new:Npn \clist_length_aux:n #1 { +1 }
\cs_new:Npn \clist_length:n #1
{
\int_eval:n
{
0
- \clist_map_function:nN {#1} \clist_length_aux:n
+ \clist_map_function_aux:Nw \clist_length_n_aux:n #1
+ , \q_recursion_tail , \q_recursion_stop
}
}
-\cs_new:Npn \clist_length_aux:n #1 { +1 }
+\cs_new:Npn \clist_length_n_aux:n #1 { \tl_if_blank:nF {#1} {+1} }
\cs_generate_variant:Nn \clist_length:N { c }
-\cs_set_nopar:Npn \clist_item:Nn #1#2
- { \exp_args:No \clist_item:nn #1 {#2} }
-\cs_set:Npn \clist_item:nn #1#2
+\cs_new:Npn \clist_item:Nn #1#2
+ {
+ \exp_args:Nfo \clist_item_aux:nnNn
+ { \clist_length:N #1 }
+ #1
+ \clist_item_N_loop:nw
+ {#2}
+ }
+\cs_new:Npn \clist_item_aux:nnNn #1#2#3#4
{
- \int_compare:nNnTF {#2} < \c_zero
+ \int_compare:nNnTF {#4} < \c_zero
{
- \exp_args:Nf \clist_item_aux:nw
- { \int_eval:n { \clist_length:n {#1} + #2 } }
- #1 , \q_recursion_tail \q_recursion_stop
+ \int_compare:nNnTF {#4} < { - #1 }
+ { \use_none_delimit_by_q_stop:w }
+ { \exp_args:Nf #3 { \int_eval:n { #4 + #1 } } }
}
- { \clist_item_aux:nw {#2} #1 , \q_recursion_tail \q_recursion_stop }
+ {
+ \int_compare:nNnTF {#4} < {#1}
+ { #3 {#4} }
+ { \use_none_delimit_by_q_stop:w }
+ }
+ #2, \q_stop
}
-\cs_set:Npn \clist_item_aux:nw #1#2 , #3
+\cs_new:Npn \clist_item_N_loop:nw #1 #2,
{
\int_compare:nNnTF {#1} = \c_zero
- { \use_i_delimit_by_q_recursion_stop:nw {#2} }
- {
- \quark_if_recursion_tail_stop:n {#3}
- \exp_args:Nf \clist_item_aux:nw
- { \int_eval:n { #1 - 1 } }
- #3
- }
+ { \use_i_delimit_by_q_stop:nw {#2} }
+ { \exp_args:Nf \clist_item_N_loop:nw { \int_eval:n { #1 - 1 } } }
}
\cs_generate_variant:Nn \clist_item:Nn { c }
-\cs_new_protected:Npn \clist_set_from_seq:NN #1#2
+\cs_new:Npn \clist_item:nn #1#2
{
- \seq_if_empty:NTF #2
- { \clist_clear:N #1 }
+ \exp_args:Nf \clist_item_aux:nnNn
+ { \clist_length:n {#1} }
+ {#1}
+ \clist_item_n_aux:nw
+ {#2}
+ }
+\cs_new:Npn \clist_item_n_aux:nw #1
+ { \clist_item_n_loop:nw {#1} \prg_do_nothing: }
+\cs_new:Npn \clist_item_n_loop:nw #1 #2,
+ {
+ \exp_args:No \tl_if_blank:nTF {#2}
+ { \clist_item_n_loop:nw {#1} \prg_do_nothing: }
{
- \seq_push_item_def:n { , \exp_not:n {{##1}} }
- \tl_set:Nx #1
- { \exp_after:wN \use_none:n \tex_romannumeral:D -`\0 #2 }
- \seq_pop_item_def:
+ \int_compare:nNnTF {#1} = \c_zero
+ { \exp_args:No \clist_item_n_end:n {#2} }
+ {
+ \exp_args:Nf \clist_item_n_loop:nw
+ { \int_eval:n { #1 - 1 } }
+ \prg_do_nothing:
+ }
}
}
-\cs_new_protected:Npn \clist_gset_from_seq:NN #1#2
+\cs_new:Npn \clist_item_n_end:n #1 #2 \q_stop
{
- \seq_if_empty:NTF #2
- { \clist_gclear:N #1 }
+ \exp_after:wN \exp_after:wN \exp_after:wN \clist_item_n_strip:w
+ \tl_trim_spaces:n {#1} ,
+ }
+\cs_new:Npn \clist_item_n_strip:w #1 , {#1}
+\cs_new_protected:Npn \clist_set_from_seq:NN
+ { \clist_set_from_seq_aux:NNNN \clist_clear:N \tl_set:Nx }
+\cs_new_protected:Npn \clist_gset_from_seq:NN
+ { \clist_set_from_seq_aux:NNNN \clist_gclear:N \tl_gset:Nx }
+\cs_new_protected:Npn \clist_set_from_seq_aux:NNNN #1#2#3#4
+ {
+ \seq_if_empty:NTF #4
+ { #1 #3 }
{
- \seq_push_item_def:n { , \exp_not:n {{##1}} }
- \tl_gset:Nx #1
- { \exp_after:wN \use_none:n \tex_romannumeral:D -`\0 #2 }
+ \seq_push_item_def:n
+ {
+ ,
+ \tl_if_empty:oTF { \clist_set_from_seq_aux:w ##1 ~ , ##1 ~ }
+ { \exp_not:n {##1} }
+ { \exp_not:n { {##1} } }
+ }
+ #2 #3 { \exp_last_unbraced:Nf \use_none:n #4 }
\seq_pop_item_def:
}
}
+\cs_new:Npn \clist_set_from_seq_aux:w #1 , #2 ~ { }
\cs_generate_variant:Nn \clist_set_from_seq:NN { Nc }
\cs_generate_variant:Nn \clist_set_from_seq:NN { c , cc }
\cs_generate_variant:Nn \clist_gset_from_seq:NN { Nc }
\cs_generate_variant:Nn \clist_gset_from_seq:NN { c , cc }
-\cs_new_eq:NN \clist_top:NN \clist_get:NN
-\cs_new_eq:NN \clist_top:cN \clist_get:cN
-\cs_new_eq:NN \clist_remove_element:Nn \clist_remove_all:Nn
-\cs_new_eq:NN \clist_gremove_element:Nn \clist_gremove_all:Nn
-\cs_new_eq:NN \clist_display:N \clist_show:N
-\cs_new_eq:NN \clist_display:c \clist_show:c
-\cs_new_protected:Npn \clist_trim_spaces:N #1
- { \tl_set:Nx #1 { \exp_args:No \clist_trim_spaces:n #1 } }
-\cs_new_protected:Npn \clist_gtrim_spaces:N #1
- { \tl_gset:Nx #1 { \exp_args:No \clist_trim_spaces:n #1 } }
+\cs_new_protected:Npn \clist_trim_spaces:N #1 { \clist_set:No #1 {#1} }
+\cs_new_protected:Npn \clist_gtrim_spaces:N #1 { \clist_gset:No #1 {#1} }
\cs_generate_variant:Nn \clist_trim_spaces:N { c }
\cs_generate_variant:Nn \clist_gtrim_spaces:N { c }
%%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
index 02c53d2a03c..b3266a06681 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3coffins.sty
@@ -47,7 +47,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{l3names}
-\GetIdInfo$Id: l3coffins.dtx 2717 2011-09-03 13:40:31Z joseph $
+\GetIdInfo$Id: l3coffins.dtx 2814 2011-09-12 12:56:08Z joseph $
{L3 Experimental coffin code layer}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -181,6 +181,53 @@
}
}
\cs_generate_variant:Nn \vcoffin_set:Nnn { c }
+\cs_new_protected_nopar:Npn \hcoffin_set:Nw #1
+ {
+ \coffin_if_exist:NT #1
+ {
+ \hbox_set:Nw #1 \color_group_begin: \color_ensure_current:
+ \cs_set_protected_nopar:Npn \hcoffin_set_end:
+ {
+ \color_group_end:
+ \hbox_set_end:
+ \coffin_reset_structure:N #1
+ \coffin_update_poles:N #1
+ \coffin_update_corners:N #1
+ }
+ }
+ }
+\cs_new_protected_nopar:Npn \hcoffin_set_end: { }
+\cs_generate_variant:Nn \hcoffin_set:Nw { c }
+\cs_new_protected_nopar:Npn \vcoffin_set:Nnw #1#2
+ {
+ \coffin_if_exist:NT #1
+ {
+ \vbox_set:Nw #1
+ \dim_set:Nn \tex_hsize:D {#2}
+ \color_group_begin: \color_ensure_current:
+ \cs_set_protected:Npn \vcoffin_set_end:
+ {
+ \color_group_end:
+ \vbox_set_end:
+ \coffin_reset_structure:N #1
+ \coffin_update_poles:N #1
+ \coffin_update_corners:N #1
+ \vbox_set_top:Nn \l_coffin_tmp_box { \vbox_unpack:N #1 }
+ \coffin_set_pole:Nnx #1 { T }
+ {
+ { 0 pt }
+ {
+ \dim_eval:n { \box_ht:N #1 - \box_ht:N \l_coffin_tmp_box }
+ }
+ { 1000 pt }
+ { 0 pt }
+ }
+ \box_clear:N \l_coffin_tmp_box
+ }
+ }
+ }
+\cs_new_protected_nopar:Npn \vcoffin_set_end: { }
+\cs_generate_variant:Nn \vcoffin_set:Nnw { c }
\cs_new_protected_nopar:Npn \coffin_set_eq:NN #1#2
{
\coffin_if_exist:NT #1
@@ -218,6 +265,13 @@
\prop_set_eq:cc { l_coffin_poles_ \int_value:w #1 _prop }
{ l_coffin_poles_ \int_value:w #2 _prop }
}
+\cs_new_protected_nopar:Npn \coffin_gset_eq_structure:NN #1#2
+ {
+ \prop_gset_eq:cc { l_coffin_corners_ \int_value:w #1 _prop }
+ { l_coffin_corners_ \int_value:w #2 _prop }
+ \prop_gset_eq:cc { l_coffin_poles_ \int_value:w #1 _prop }
+ { l_coffin_poles_ \int_value:w #2 _prop }
+ }
\cs_new_protected_nopar:Npn \coffin_set_user_dimensions:N #1
{
\cs_set_eq:NN \coffin_saved_Height: \Height
@@ -588,16 +642,6 @@
{
\coffin_align:NnnNnnnnN \c_empty_coffin { H } { l }
#1 {#2} {#3} {#4} {#5} \l_coffin_aligned_coffin
- \hbox_set:Nn \l_coffin_aligned_coffin
- {
- \dim_compare:nNnT { \l_coffin_offset_x_dim } < \c_zero_dim
- { \tex_kern:D -\l_coffin_offset_x_dim }
- \hbox_unpack:N \l_coffin_aligned_coffin
- \dim_set:Nn \l_coffin_tmp_dim
- { \l_coffin_offset_x_dim + \box_wd:N #1 }
- \dim_compare:nNnT { \l_coffin_tmp_dim } < \c_zero_dim
- { \tex_kern:D -\l_coffin_tmp_dim }
- }
\hbox_unpack:N \c_empty_box
\box_use:N \l_coffin_aligned_coffin
}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
index 20de4534b8b..989061981f4 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3color.sty
@@ -47,7 +47,7 @@
%% -----------------------------------------------------------------------
%%
\RequirePackage{l3names}
-\GetIdInfo$Id: l3color.dtx 2717 2011-09-03 13:40:31Z joseph $
+\GetIdInfo$Id: l3color.dtx 2776 2011-09-07 18:33:19Z joseph $
{L3 Experimental colour support}
\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 bc296c6ccde..b4d84b0f52a 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -24,7 +24,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -47,16 +47,15 @@
%% prior consultation with the LaTeX3 Project.
%%
%% -----------------------------------------------------------------------
-\RequirePackage{l3names}
+\RequirePackage{expl3,xparse}
\let \filenameOld \ExplFileName
\let \filedateOld \ExplFileDate
\let \fileversionOld \ExplFileVersion
\let \filedescriptionOld \ExplFileDescription
-\GetIdInfo$Id: l3doc.dtx 2719 2011-09-04 13:40:25Z will $
+\GetIdInfo$Id: l3doc.dtx 2819 2011-09-12 17:26:47Z will $
{L3 Experimental documentation class}
\ProvidesExplClass
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\RequirePackage{expl3,xparse}
\let \ExplFileName \filenameOld
\let \ExplFileDate \filedateOld
\let \ExplFileVersion \fileversionOld
@@ -67,11 +66,44 @@
Rainer~Sch\"opf,~Johannes~Braams,~Michael~Downes,~
David~Carlisle,~Alan~Jeffrey,~Morten~H\o{}gholm,~Thomas~Lotze,~
Javier~Bezos,~Will~Robertson,~Joseph~Wright,~Bruno~Le~Floch}}
-\DeclareOption{a5paper}{\@latexerr{Option not supported}{}}
+\coffin_new:N \l_doc_output_box
+\coffin_new:N \l_doc_names_coffin
+\coffin_new:N \l_doc_descr_coffin
+\coffin_new:N \l_doc_syntax_coffin
+\bool_new:N \l_doc_long_name_bool
+\bool_new:N \g_doc_implementation_bool
+\dim_new:N \l_doc_trial_width_dim
+\int_new:N \l_doc_macro_int
+\int_new:N \g_doc_nested_macro_int
+\prop_new:N \g_doc_missing_tests_prop
+\clist_new:N \g_docinput_clist
+\seq_new:N \g_doc_testfiles_seq
+\seq_new:N \g_doc_functions_seq
+\seq_new:N \g_doc_macros_seq
+\seq_new:N \g_doc_not_tested_seq
+\bool_new:N \l_doc_meta_TF_bool
+\bool_new:N \l_doc_meta_pTF_bool
+\bool_new:N \l_doc_meta_EXP_bool
+\bool_new:N \l_doc_meta_rEXP_bool
+\bool_new:N \l_doc_macro_internal_bool
+\bool_new:N \l_doc_macro_aux_bool
+\bool_new:N \l_doc_macro_TF_bool
+\bool_new:N \l_doc_macro_pTF_bool
+\bool_new:N \l_doc_macro_var_bool
\bool_new:N \g_doc_full_bool
\bool_new:N \g_doc_lmodern_bool
\bool_new:N \g_doc_checkfunc_bool
\bool_new:N \g_doc_checktest_bool
+\cs_set_protected_nopar:Npn \coffin_gset_eq:NN #1#2
+ {
+ \coffin_if_exist:NT #1
+ {
+ \box_gset_eq:NN #1 #2
+ \coffin_gset_eq_structure:NN #1 #2
+ }
+ }
+\cs_generate_variant:Nn \coffin_gset_eq:NN { c , Nc , cc }
+\DeclareOption{a5paper}{\@latexerr{Option not supported}{}}
\DeclareOption{full}{ \bool_set_true:N \g_doc_full_bool }
\DeclareOption{onlydoc}{ \bool_set_false:N \g_doc_full_bool }
\DeclareOption{check}{ \bool_set_true:N \g_doc_checkfunc_bool }
@@ -92,7 +124,11 @@
\ProcessOptions
\LoadClass{article}
\RequirePackage{doc}
-\RequirePackage{array,alphalph,booktabs,color,fixltx2e,enumitem,pifont,textcomp,trace,underscore,csquotes}
+\RequirePackage{array,alphalph,booktabs,color,colortbl,fixltx2e,enumitem,pifont,textcomp,trace,underscore,csquotes,fancyvrb}
+\raggedbottom
+\fvset{gobble=2}
+\cs_set_eq:NN \verbatim \Verbatim
+\cs_set_eq:NN \endverbatim \endVerbatim
\bool_if:NT \g_doc_lmodern_bool {
\RequirePackage[T1]{fontenc}
\RequirePackage{lmodern}
@@ -139,9 +175,9 @@
\addtolength \evensidemargin { 20pt }
\cs_set_eq:NN \@@oldlist\list
\cs_set_nopar:Npn \list#1#2{\@@oldlist{#1}{#2\listparindent\z@}}
-\setlength \parindent { 0pt }
+\setlength \parindent { 2em }
\setlength \itemindent { 0pt }
-\setlength \parskip { \medskipamount }
+\setlength \parskip { 0pt plus 3pt minus 0pt }
\cs_set_nopar:Npn \l@section #1#2 {
\ifnum \c@tocdepth >\z@
\addpenalty\@secpenalty
@@ -157,7 +193,6 @@
\endgroup
\fi}
\cs_set_nopar:Npn\l@subsection{\@dottedtocline{2}{2.5em}{2.3em}} % #2 = 1.5em
-
\AtBeginDocument {
\MakeShortVerb \"
\MakeShortVerb \|
@@ -181,7 +216,6 @@
\providecommand\marg[1]{ \texttt{\char`\{} \meta{#1} \texttt{\char`\}} }
\providecommand\oarg[1]{ \texttt[ \meta{#1} \texttt] }
\providecommand\parg[1]{ \texttt( \meta{#1} \texttt) }
-\cs_set_eq:NN \m \meta
\cs_set_eq:NN \file \nolinkurl
\DeclareRobustCommand \env {\texttt}
\DeclareRobustCommand \pkg {\textsf}
@@ -194,15 +228,17 @@
\vspace{3mm}
}
\newcommand\tn[1]{
- \texttt{\bslash #1}
+ \texttt { \char`\\ #1 }
\index{TeX~and~LaTeX2e~commands\actualchar
\string\TeX{}~and~\string\LaTeXe{}~commands:\levelchar
#1\actualchar{\string\ttfamily\string\bslash{}#1}}}
\cs_new:Npn \doc_implementation: {
\cs_set:Npn \variable {\macro[var]}
+ \cs_set_eq:NN \endvariable \endmacro
}
\cs_new:Npn \doc_docu: {
\cs_set_eq:NN \variable \variabledoc
+ \cs_set_eq:NN \endvariable \endvariabledoc
}
\AtEndOfPackage{\doc_docu:}
\newenvironment{documentation}{\doc_docu:}{}
@@ -230,18 +266,47 @@
}{
\endenumerate
}
+\keys_define:nn { l3doc/function }
+ {
+ TF .code:n =
+ {
+ \bool_gset_true:N \l_doc_meta_TF_bool
+ } ,
+ EXP .code:n =
+ {
+ \bool_gset_true:N \l_doc_meta_EXP_bool
+ \bool_gset_false:N \l_doc_meta_rEXP_bool
+ } ,
+ rEXP .code:n =
+ {
+ \bool_gset_false:N \l_doc_meta_EXP_bool
+ \bool_gset_true:N \l_doc_meta_rEXP_bool
+ } ,
+ pTF .code:n =
+ {
+ \bool_gset_true:N \l_doc_meta_pTF_bool
+ \bool_gset_true:N \l_doc_meta_TF_bool
+ \bool_gset_true:N \l_doc_meta_EXP_bool
+ } ,
+ added .tl_set:N = \l_doc_date_added_tl ,
+ updated .tl_set:N = \l_doc_date_updated_tl ,
+ }
\char_set_catcode_active:N \<
-\DeclareDocumentCommand \function { O{} } {
+\DeclareDocumentEnvironment {function} { O{} } {
+ \par\bigskip\noindent
\phantomsection
+ \coffin_clear:N \l_doc_descr_coffin
+ \coffin_clear:N \l_doc_syntax_coffin
+ \coffin_clear:N \l_doc_names_coffin
+
\bool_gset_false:N \l_doc_meta_TF_bool
\bool_gset_false:N \l_doc_meta_pTF_bool
\bool_gset_false:N \l_doc_meta_EXP_bool
\bool_gset_false:N \l_doc_meta_rEXP_bool
- \cs_set_nopar:Npn \KV_key_no_value_elt:n ##1 { \use:c {doc_meta_opt_##1:} }
- \keyval_parse:NNn \KV_key_no_value_elt:n \use_none:nn {#1}
+ \keys_set:nn { l3doc/function } {#1}
\char_set_catcode_active:N \<
\cs_set_eq:NN < \doc_open_meta:n
@@ -249,155 +314,279 @@
\group_begin:
\MakePrivateLetters
\char_set_catcode_other:N \|
- \char_set_catcode_other:N \\
\char_set_catcode_space:N \~
\char_set_catcode_ignore:N \ % space
\char_set_catcode_ignore:N \^^M
\char_set_catcode_ignore:N \^^I
+
\function_aux:n
-}
+ }
+ {
+ \vcoffin_set_end:
+ \hcoffin_set:Nn \l_doc_names_coffin
+ {
+ \exp_args:NV \function_typeset:n \l_doc_function_input_tl
+ }
+ \bool_if:NTF \l_doc_long_name_bool
+ {
+ \coffin_join:NnnNnnnn
+ \l_doc_output_box {hc} {vc}
+ \l_doc_syntax_coffin {l} {T}
+ {0pt} {0pt}
+ \coffin_join:NnnNnnnn
+ \l_doc_output_box {l} {t}
+ \l_doc_names_coffin {r} {t}
+ {-\marginparsep} {0pt}
+ \coffin_join:NnnNnnnn
+ \l_doc_output_box {l} {b}
+ \l_doc_descr_coffin {l} {t}
+ {0.75\marginparwidth + \marginparsep} {-\medskipamount}
+
+ \coffin_typeset:Nnnnn \l_doc_output_box {\l_doc_descr_coffin-l} {\l_doc_descr_coffin-t} {0pt} {0pt}
+ }
+ {
+ \coffin_join:NnnNnnnn
+ \l_doc_output_box {hc} {vc}
+ \l_doc_syntax_coffin {l} {t}
+ {0pt} {0pt}
+ \coffin_join:NnnNnnnn
+ \l_doc_output_box {l} {b}
+ \l_doc_descr_coffin {l} {t}
+ {0pt} {-\medskipamount}
+ \coffin_join:NnnNnnnn
+ \l_doc_output_box {l} {t}
+ \l_doc_names_coffin {r} {t}
+ {-\marginparsep} {0pt}
+
+ \coffin_typeset:Nnnnn
+ \l_doc_output_box {\l_doc_syntax_coffin-l} {\l_doc_syntax_coffin-T}
+ {0pt} {0pt}
+ }
+ \par
+ \allowbreak
+ }
\char_set_catcode_other:N \<
\cs_set_eq:NN \variabledoc \function
-\cs_set:Nn \doc_meta_opt_TF: {
- \bool_gset_true:N \l_doc_meta_TF_bool
-}
-\cs_set:Nn \doc_meta_opt_EXP: {
- \bool_gset_true:N \l_doc_meta_EXP_bool
- \bool_gset_false:N \l_doc_meta_rEXP_bool
-}
-\cs_set:Nn \doc_meta_opt_rEXP: {
- \bool_gset_false:N \l_doc_meta_EXP_bool
- \bool_gset_true:N \l_doc_meta_rEXP_bool
-}
-\cs_set:Nn \doc_meta_opt_pTF: {
- \bool_gset_true:N \l_doc_meta_pTF_bool
- \bool_gset_true:N \l_doc_meta_TF_bool
- \bool_gset_true:N \l_doc_meta_EXP_bool
-}
-\group_begin:
-\char_set_catcode_other:N \|
-\cs_gset_nopar:Npn \function_aux:n #1 {
- \cs_set_nopar:Npn \nextnewline{\cs_gset_nopar:Npn\nextnewline{\\}}
- \tl_gset_eq:NN \g_doc_macro_tl \c_empty_tl
- \bigskip\endgraf\noindent\ttfamily
- \tabular[b]{ | l @{} c | }
- \hline
- \clist_map_inline:nn {#1} {\doc_showmacro:w ##1 | \q_stop} \\
- \hline
- \endtabular
+\cs_set_eq:NN \endvariabledoc \endfunction
+\cs_set_nopar:Npn \function_aux:n #1 {
+
\group_end:
+
+ \tl_set:Nn \l_doc_function_input_tl {#1}
+
+ \dim_zero:N \l_doc_trial_width_dim
+ \hcoffin_set:Nn \l_doc_names_coffin { \function_typeset:n {#1} }
+ \dim_set:Nn \l_doc_trial_width_dim { \box_wd:N \l_doc_names_coffin }
+
+ \bool_set:Nn \l_doc_long_name_bool
+ { \dim_compare_p:nNn \l_doc_trial_width_dim > \marginparwidth }
+
+ \vcoffin_set:Nnw \l_doc_descr_coffin {\textwidth}
+ \noindent\ignorespaces
}
-\group_end:
-\group_begin:
-\char_set_catcode_other:N \|
-\cs_gset_nopar:Npn \doc_showmacro:w #1 | {
- \tl_if_blank:nTF {#1} {
- \use_none:n
- }{
- \doc_showmacro_aux:w #1 / \q_stop
- \peek_meaning:NTF \q_stop { \use_none:n } { \doc_showmacro:w }
- }
-}
-\group_end:
-\bool_new:N \l_doc_meta_TF_bool
-\bool_new:N \l_doc_meta_pTF_bool
-\bool_new:N \l_doc_meta_EXP_bool
-\bool_new:N \l_doc_meta_rEXP_bool
-\cs_new_nopar:Npn \doc_showmacro_aux:w #1 / #2 \q_stop {
+\cs_gset_nopar:Npn \function_typeset:n #1
+ {
- \tl_if_in:nnT {#2} { (TF) } {
- \bool_gset_true:N \l_doc_meta_TF_bool
- }
+ \cs_set_nopar:Npn \nextnewline{\cs_gset_nopar:Npn\nextnewline{\\}}
+ \tl_gclear:N \g_doc_macro_tl
+
+ \prop_clear:N \l_doc_functions_block_prop
+
+ \clist_map_function:nN {#1} \doc_parse_functions:n
+
+ \small\ttfamily
+ \begin{tabular}{ @{} l @{} r @{} }
+ \toprule
+ \prop_map_function:NN \l_doc_functions_block_prop \doc_show_functions:nn
+ \\
+
+ \bool_if:nF { \tl_if_empty_p:N \l_doc_date_added_tl &&
+ \tl_if_empty_p:N \l_doc_date_updated_tl }
+ { \midrule }
+
+ \tl_if_empty:NF \l_doc_date_added_tl
+ {
+ \multicolumn{2}{@{}r@{}}
+ { \scriptsize New:\,\l_doc_date_added_tl } \\
+ }
- \tl_if_in:nnT {#2} { (EXP) } {
- \bool_gset_true:N \l_doc_meta_EXP_bool
+ \tl_if_empty:NF \l_doc_date_updated_tl
+ {
+ \multicolumn{2}{@{}r@{}}
+ { \scriptsize Updated:\,\l_doc_date_updated_tl } \\
+ }
+ \bottomrule
+ \end{tabular}
+ \normalfont\normalsize
}
- \tl_if_in:nnT {#2} { (rEXP) } {
- \bool_gset_true:N \l_doc_meta_rEXP_bool
+
+\prop_new:N \l_doc_functions_block_prop
+\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
+\cs_new:Nn \doc_parse_functions:n
+ {
+ \exp_args:Nxx \tl_if_head_eq_charcode:nNTF { \token_to_str:N #1 } {\cs_to_str:N \\}
+ {
+ \tl_gset_eq:NN \l_doc_function_name_prefix_tl \@backslashchar
+ % for the weird functions named "\::N" and so on:
+\exp_args:Nx \tl_if_head_eq_charcode:nNTF { \cs_to_str:N #1 } {:}
+{
+ % again, no variants:
+\prop_put:Nxx \l_doc_functions_block_prop { \cs_to_str:N #1 } { }
+}
+{
+ % finally, for regular old csnames:
+\exp_args:NNf \prop_get:NnNTF
+ \l_doc_functions_block_prop
+ { \cs_get_function_name:N #1 } \l_doc_tmp_tl
+{
+\prop_put:Nxx \l_doc_functions_block_prop
+{ \cs_get_function_name:N #1 }
+{ \l_doc_tmp_tl , \cs_get_function_signature:N #1 }
+}
+{
+\prop_put:Nxx \l_doc_functions_block_prop
+{ \cs_get_function_name:N #1 }
+{ \cs_get_function_signature:N #1 }
+}
+}
+ }
+ % for keys and things that aren't actually csnames:
+ {
+ % for now don't bother splitting into variants:
+ \tl_gclear:N \l_doc_function_name_prefix_tl
+\prop_put:Nxx \l_doc_functions_block_prop { #1 } { }
+ }
}
- \tl_if_in:nnT {#2} { (pTF) } {
- \bool_gset_true:N \l_doc_meta_TF_bool
- \bool_gset_true:N \l_doc_meta_pTF_bool
- \bool_gset_true:N \l_doc_meta_EXP_bool
+\cs_new:Nn \doc_show_functions:nn
+ {
+ \clist_gset:Nn \l_doc_variants_clist {#2}
+ \clist_gpop:NN \l_doc_variants_clist \l_doc_tmp_tl
+ \exp_args:Nx \doc_showmacro:n
+ { \exp_not:c {#1 \tl_if_empty:NF \l_doc_tmp_tl { : \l_doc_tmp_tl } } }
}
+\cs_new_nopar:Nn \doc_showmacro:n {
\bool_if:NT \l_doc_meta_pTF_bool {
- \tl_set:Nx \l_doc_pTF_name_tl { \doc_predicate_from_base:w #1 \q_nil }
- \doc_special_main_index:o { \l_doc_pTF_name_tl }
+ \tl_set:Nx \l_doc_pTF_name_tl { \doc_predicate_from_base:N #1 }
+ \doc_special_main_index:o { \token_to_str:N \l_doc_pTF_name_tl }
\seq_gput_right:Nx \g_doc_functions_seq { \tl_to_str:N \l_doc_pTF_name_tl }
}
\bool_if:NTF \l_doc_meta_TF_bool {
- \doc_special_main_index:o { #1 TF }
+ \doc_special_main_index:o { \token_to_str:N #1 TF }
\seq_gput_right:Nx \g_doc_functions_seq { \tl_to_str:n { #1 TF } }
\seq_gput_right:Nx \g_doc_functions_seq { \tl_to_str:n { #1 T } }
\seq_gput_right:Nx \g_doc_functions_seq { \tl_to_str:n { #1 F } }
}{
- \doc_special_main_index:o { #1 }
+ \doc_special_main_index:o { \token_to_str:N #1 }
\seq_gput_right:Nx \g_doc_functions_seq { \tl_to_str:n { #1 } }
}
\bool_if:NTF \l_doc_meta_pTF_bool {
\bool_gset_false:N \l_doc_meta_TF_bool
- \exp_after:wN \doc_showmacro_aux_ii:w \l_doc_pTF_name_tl ::\q_stop
+ \exp_args:Nc \doc_showmacro_aux_ii:N \l_doc_pTF_name_tl
\bool_gset_true:N \l_doc_meta_TF_bool
- \doc_showmacro_aux_ii:w #1::\q_stop
+ \exp_args:Nc \doc_showmacro_aux_ii:N { \cs_to_str:N #1 }
}{
- \exp_args:Nf \tl_if_head_eq_charcode:nNTF { \use_none:n #1 } {:}
- { \doc_showmacro_aux_iii:n {#1} }
- { \doc_showmacro_aux_ii:w #1::\q_stop }
+ \exp_args:Nx \tl_if_head_eq_charcode:nNTF { \exp_after:wN \use_none:n \token_to_str:N #1 } {:}
+ { \doc_showmacro_aux_iii:N #1 }
+ { \doc_showmacro_aux_ii:N #1 }
}
}
-\cs_set_nopar:Npn \doc_showmacro_aux_ii:w #1:#2:#3 \q_stop {
+\cs_set_nopar:Nn \doc_showmacro_aux_ii:N {
\nextnewline
- \str_if_eq:xxTF {#1} {\g_doc_macro_tl} {
- \doc_typeset_aux:n
- }{
- \tl_gset:Nn \g_doc_macro_tl {#1}
- \use:n
- }
- { \g_doc_macro_tl }
- #3
- #2
+ \tl_gset:Nx \l_doc_function_name_tl { \cs_get_function_name:N #1 }
+ \tl_gset:Nx \l_doc_function_sig_tl { \cs_get_function_signature:N #1 }
+ \tl_gset:Nx \g_doc_macro_tl { \l_doc_function_name_prefix_tl \l_doc_function_name_tl }
+
+ \g_doc_macro_tl
+ \tl_if_empty:NF \l_doc_function_sig_tl { : \l_doc_function_sig_tl }
\bool_if:NT \l_doc_meta_TF_bool { \doc_typeset_TF: }
+
&
\bool_if:NT \l_doc_meta_EXP_bool {
\hspace{\tabcolsep}
- \hyperlink{expstar}{$\star$}
+ \hyperlink{expstar} {$\star$}
}
\bool_if:NT \l_doc_meta_rEXP_bool {
\hspace{\tabcolsep}
- \hyperlink{rexpstar}{\ding{73}}% hollow star
+ \hyperlink{rexpstar} {\ding{73}} % hollow star
}
- \tl_set:Nx \g_doc_macro_tl { \tl_to_str:N \g_doc_macro_tl }
+
+ \clist_if_empty:NF \l_doc_variants_clist
+ {
+ \\
+ \doc_typeset_aux:n \g_doc_macro_tl :
+ \int_compare:nTF { \clist_length:N \l_doc_variants_clist == 1 }
+ { \l_doc_variants_clist }
+ {
+ \textrm(
+ \clist_pop:NN \l_doc_variants_clist \l_doc_tmp_tl
+ \l_doc_tmp_tl
+ \clist_map_inline:Nn \l_doc_variants_clist {\textrm|##1}
+ \textrm)
+ }
+ \bool_if:NT \l_doc_meta_TF_bool { \doc_typeset_TF: }
+ &
+ \bool_if:NT \l_doc_meta_EXP_bool {
+ \hspace{\tabcolsep}
+ \hyperlink{expstar} {$\star$}
+ }
+ \bool_if:NT \l_doc_meta_rEXP_bool {
+ \hspace{\tabcolsep}
+ \hyperlink{rexpstar} {\ding{73}} % hollow star
+ }
+ }
+
\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}
+ \exp_args:Nx \label
+ {
+ doc/function//\g_doc_macro_tl
+ \tl_if_empty:NF \l_doc_function_sig_tl { : \l_doc_function_sig_tl }
+ }
}
}
-\cs_set_nopar:Nn \doc_showmacro_aux_iii:n {
+\cs_set_nopar:Nn \doc_showmacro_aux_iii:N {
\nextnewline
- \tl_gset:Nx \g_doc_macro_tl {#1}
- #1 &
- \tl_set:Nx \g_doc_macro_tl { \tl_to_str:N \g_doc_macro_tl }
+ \tl_gset:Nx \g_doc_macro_tl { \token_to_str:N #1}
+ \token_to_str:N #1 &
+
\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}
+ \exp_args:Nx \label { doc/function//\g_doc_macro_tl }
}
}
-\dim_new:N \g_doc_syntax_dim
-\dim_set:Nn \g_doc_syntax_dim {0.7\textwidth}
\newenvironment{syntax}{
- \minipage[b]{\g_doc_syntax_dim}
- \small\ttfamily\raggedright
- \obeyspaces\obeylines
+ \small\ttfamily
+ \bool_if:NTF \l_doc_long_name_bool
+ {
+ \hcoffin_set:Nw \l_doc_syntax_coffin
+ \arrayrulecolor{white}
+ \begin{tabular}{@{}l@{}}
+ \toprule
+ \begin{minipage}
+ { \textwidth+0.75\marginparwidth-\l_doc_trial_width_dim }
+ }
+ {
+ \hcoffin_set:Nw \l_doc_syntax_coffin
+ \arrayrulecolor{white}
+ \begin{tabular}{@{}l@{}}
+ \toprule
+ \begin{minipage}{ \textwidth }
+ }
+ \raggedright
+ \obeyspaces\obeylines
}{
- \endminipage
- \hfil\break
- \global\@ignoretrue
+ \end{minipage}
+ \end{tabular}
+ \arrayrulecolor{black}
+ \hcoffin_set_end:
+ \coffin_gset_eq:NN \l_doc_syntax_coffin \l_doc_syntax_coffin
+ \ignorespacesafterend
}
\tl_map_inline:nn {0123456789} { \cs_gset_eq:cN {char_other_#1} #1 }
\group_begin:
@@ -441,8 +630,7 @@
\cs_set_eq:NN \doc_macroname_prefix:n \use:n
\cs_set_eq:NN \doc_macroname_suffix: \c_empty_tl
- \cs_set_nopar:Npn \KV_key_no_value_elt:n ##1 { \use:c {doc_macro_opt_##1:} }
- \keyval_parse:NNn \KV_key_no_value_elt:n \use_none:nn {#1}
+ \keys_set:nn { l3doc/macro } {#1}
\cs_set_eq:NN \testfile \doc_print_testfile:n
@@ -454,6 +642,10 @@
\char_set_catcode_ignore:N \^^I
\doc_macro_aux:n
}
+\keys_define:nn { l3doc/macro }
+ {
+ unknown .code:n = { \use:c{doc_macro_opt_#1:} }
+ }
\cs_new_nopar:Npn \doc_macro_aux:n #1 {
\group_end:
\cs_set:Npn \l_doc_macro_input_clist {#1}
@@ -461,34 +653,23 @@
{
\clist_map_inline:nn {#1}
{
- \tl_if_blank:nF {##1}
- {
- \exp_args:Nf \doc_macro_single
- { \doc_predicate_from_base:w ##1 \q_nil }
- }
+ \exp_args:Nf \doc_macro_single { \doc_predicate_from_base:w ##1 }
}
\bool_set_true:N \l_doc_macro_TF_bool
- \clist_map_inline:nn {#1}
- { \tl_if_blank:nF {##1} { \doc_macro_single {##1} } }
+ \clist_map_function:nN {#1} \doc_macro_single
\bool_set_false:N \l_doc_macro_TF_bool
}
- {
- \clist_map_inline:nn {#1}
- { \tl_if_blank:nF {##1} { \doc_macro_single {##1} } }
- }
+ { \clist_map_function:nN {#1} \doc_macro_single }
}
-\bool_new:N \l_doc_macro_internal_bool
-\bool_new:N \l_doc_macro_aux_bool
-\bool_new:N \l_doc_macro_TF_bool
-\bool_new:N \l_doc_macro_pTF_bool
-\bool_new:N \l_doc_macro_var_bool
\cs_set_nopar:Npn \doc_macro_opt_aux: { \bool_set_true:N \l_doc_macro_aux_bool }
\cs_set_nopar:Npn \doc_macro_opt_internal: { \bool_set_true:N \l_doc_macro_internal_bool }
\cs_set_nopar:Npn \doc_macro_opt_TF: { \bool_set_true:N \l_doc_macro_TF_bool }
\cs_set_nopar:Npn \doc_macro_opt_pTF: { \bool_set_true:N \l_doc_macro_pTF_bool }
\cs_set_nopar:Npn \doc_macro_opt_var: { \bool_set_true:N \l_doc_macro_var_bool }
-\cs_set:Npn \doc_predicate_from_base:w #1:#2 \q_nil {#1_p:#2}
-\int_new:N \l_doc_macro_int
+\cs_set:Nn \doc_predicate_from_base:N
+ {
+ \cs_get_function_name:N #1 _p: \cs_get_function_signature:N #1
+ }
\cs_set_nopar:Npn \doc_macro_single #1 {
\int_incr:N \l_doc_macro_int
\tl_set:Nx \saved@macroname { \token_to_str:N #1 }
@@ -553,14 +734,14 @@
\tl_clear:N \l_doc_macro_tl
\cs_set_nopar:Npn \doc_print_macroname:n #1 {
\strut
- \int_compare:nTF { \tl_elt_count:n {#1} <= 28 }
+ \int_compare:nTF { \tl_length:n {#1} <= 28 }
{ \MacroFont } { \MacroLongFont }
% INEFFICIENT: (!)
\exp_args:NNx \seq_if_in:NnTF \g_doc_functions_seq
{ #1 \bool_if:NT \l_doc_macro_TF_bool { \tl_to_str:n {TF} } }
{
- \hyperref [doc/function/\l_doc_macro_tl]
+ \hyperref [doc/function//\l_doc_macro_tl]
}
{ \use:n }
{
@@ -581,7 +762,7 @@
}
}
\cs_set_nopar:Npn \doc_typeset_aux:n #1 {
- {\color[gray]{0.5} #1}
+ {\color[gray]{0.7} #1}
}
\DeclareDocumentCommand \doc_print_testfile:n {m} {
\bool_set_true:N \l_doc_tested_bool
@@ -595,7 +776,6 @@
}
}
}
-\seq_new:N \g_doc_testfiles_seq
\DeclareDocumentCommand \TestFiles {m} {
\par
{\itshape
@@ -607,7 +787,6 @@
\testfile*
}
\cs_generate_variant:Nn \prop_gput:Nnn {NVx}
-\prop_new:N \g_doc_missing_tests_prop
\DeclareDocumentCommand \TestMissing {m} {
\prop_if_in:NVTF \g_doc_missing_tests_prop \l_doc_macro_input_clist
{
@@ -621,7 +800,6 @@
}
{ \prop_gput:NVn \g_doc_missing_tests_prop \l_doc_macro_input_clist {#1} }
}
-\int_new:N \g_doc_nested_macro_int
\cs_set:Nn \doc_texttt_comma:n {\,,~\texttt{#1}}
\cs_set:Npn \endmacro {
\int_compare:nT {\g_doc_nested_macro_int<1}
@@ -661,7 +839,7 @@
\bool_if:NTF \l_doc_macro_var_bool{variable}{function}
\int_compare:nNnTF \l_doc_macro_int=1 {~is~}{s~are~}
documented~on~page~
- \exp_args:Nx\pageref{doc/function/\l_doc_macro_tl}.
+ \exp_args:Nx\pageref{doc/function//\l_doc_macro_tl}.
}
})\par}
}
@@ -772,7 +950,6 @@
xxxx\=#1\=\kill
}
{\par\bigskip}
-\bool_new:N \g_doc_implementation_bool
\cs_set_nopar:Npn \AlsoImplementation {
\bool_set_true:N \g_doc_implementation_bool
\cs_set:Npn \StopEventually ##1 {
@@ -791,7 +968,6 @@
}
\cs_set_eq:NN \Finale \relax
\cs_set_nopar:Npn \partname{File}
-\clist_new:N \g_docinput_clist
\cs_set:Npn \DocInput #1 {
\clist_map_inline:nn {#1} {
\clist_put_right:Nn \g_docinput_clist {##1}
@@ -895,9 +1071,6 @@
}
\cs_set_eq:NN \@evenfoot \@oddfoot
}
-\seq_new:N \g_doc_functions_seq
-\seq_new:N \g_doc_macros_seq
-\seq_new:N \g_doc_not_tested_seq
\iow_open:Nn \g_write_func_stream { \jobname.cmds }
\cs_new_nopar:Npn \doc_show_functions_defined: {
\bool_if:nT { \g_doc_implementation_bool && \g_doc_checkfunc_bool } {
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
index a818956cd5b..9e513253e40 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3expan.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3expan.dtx 2545 2011-08-11 13:47:19Z bruno $
+\GetIdInfo$Id: l3expan.dtx 2812 2011-09-12 09:19:26Z bruno $
{L3 Experimental argument expansion}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -266,6 +266,7 @@
}
\cs_new:Npn \exp_last_unbraced:NNo #1#2#3
{ \exp_after:wN #1 \exp_after:wN #2 #3 }
+\cs_new_nopar:Npn \exp_last_unbraced:Nno { \::n \::o_unbraced \::: }
\cs_new_nopar:Npn \exp_last_unbraced:Noo { \::o \::o_unbraced \::: }
\cs_new_nopar:Npn \exp_last_unbraced:Nfo { \::f \::o_unbraced \::: }
\cs_new:Npn \exp_last_unbraced:NNNV #1#2#3#4
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
index a0c3041c822..6019110f675 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3file.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3file.dtx 2665 2011-08-25 22:15:27Z joseph $
+\GetIdInfo$Id: l3file.dtx 2776 2011-09-07 18:33:19Z joseph $
{L3 Experimental file operations}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -58,6 +58,7 @@
\tl_new:N \l_file_name_tl
\seq_new:N \l_file_search_path_seq
\seq_new:N \l_file_search_path_saved_seq
+\seq_new:N \l_file_tmpa_seq
\cs_new_protected_nopar:Npn \file_add_path:nN #1#2
{
\ior_open:Nn \g_file_test_stream {#1}
@@ -74,8 +75,9 @@
\cs_if_exist:NT \input@path
{
\seq_set_eq:NN \l_file_search_path_saved_seq \l_file_search_path_seq
- \clist_map_inline:Nn \input@path
- { \seq_put_right:Nn \l_file_search_path_seq {##1} }
+ \seq_set_from_clist:NN \l_file_tmpa_seq \input@path
+ \seq_concat:NNN \l_file_search_path_seq
+ \l_file_search_path_seq \l_file_tmpa_seq
}
\seq_map_inline:Nn \l_file_search_path_seq
{
@@ -105,7 +107,7 @@
\@addtofilelist {#1}
\seq_gpush:NV \g_file_stack_seq \g_file_current_name_tl
\tl_gset:Nn \g_file_current_name_tl {#1}
- \exp_after:wN \tex_input:D \l_file_name_tl ~
+ \exp_after:wN \tex_input:D \l_file_name_tl \c_space_tl
\seq_gpop:NN \g_file_stack_seq \g_file_current_name_tl
}
}
@@ -125,8 +127,8 @@
}
\AtBeginDocument
{
- \clist_map_inline:Nn \@filelist
- { \seq_put_right:Nn \g_file_record_seq {#1} }
+ \seq_set_from_clist:NN \l_file_tmpa_seq \@filelist
+ \seq_gconcat:NNN \g_file_record_seq \g_file_record_seq \l_file_tmpa_seq
}
%%
%%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
index ae8c42f0e1e..9d3f1943a09 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3fp.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3fp.dtx 2665 2011-08-25 22:15:27Z joseph $
+\GetIdInfo$Id: l3fp.dtx 2812 2011-09-12 09:19:26Z bruno $
{L3 Experimental floating-point operations}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
index 26c0e19a66b..af6b2abb1a8 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3int.dtx 2666 2011-08-26 06:10:09Z joseph $
+\GetIdInfo$Id: l3int.dtx 2812 2011-09-12 09:19:26Z bruno $
{L3 Experimental integers}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -137,7 +137,7 @@
}
{
\chk_if_free_cs:N #1
- \pref_global:D \tex_mathchardef:D #1 =
+ \tex_global:D \tex_mathchardef:D #1 =
\int_eval:w #2 \int_eval_end:
}
}
@@ -148,13 +148,13 @@
}
\cs_generate_variant:Nn \int_const:Nn { c }
\cs_new_protected_nopar:Npn \int_zero:N #1 { #1 = \c_zero }
-\cs_new_protected_nopar:Npn \int_gzero:N #1 { \pref_global:D #1 = \c_zero }
+\cs_new_protected_nopar:Npn \int_gzero:N #1 { \tex_global:D #1 = \c_zero }
\cs_generate_variant:Nn \int_zero:N { c }
\cs_generate_variant:Nn \int_gzero:N { c }
\cs_new_protected_nopar:Npn \int_set_eq:NN #1#2 { #1 = #2 }
\cs_generate_variant:Nn \int_set_eq:NN { c }
\cs_generate_variant:Nn \int_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \int_gset_eq:NN #1#2 { \pref_global:D #1 = #2 }
+\cs_new_protected_nopar:Npn \int_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \int_gset_eq:NN { c }
\cs_generate_variant:Nn \int_gset_eq:NN { Nc , cc }
\cs_new_protected_nopar:Npn \int_add:Nn #1#2
@@ -162,9 +162,9 @@
\cs_new_nopar:Npn \int_sub:Nn #1#2
{ \tex_advance:D #1 by - \int_eval:w #2 \int_eval_end: }
\cs_new_protected_nopar:Npn \int_gadd:Nn
- { \pref_global:D \int_add:Nn }
+ { \tex_global:D \int_add:Nn }
\cs_new_protected_nopar:Npn \int_gsub:Nn
- { \pref_global:D \int_sub:Nn }
+ { \tex_global:D \int_sub:Nn }
\cs_generate_variant:Nn \int_add:Nn { c }
\cs_generate_variant:Nn \int_gadd:Nn { c }
\cs_generate_variant:Nn \int_sub:Nn { c }
@@ -174,16 +174,16 @@
\cs_new_protected_nopar:Npn \int_decr:N #1
{ \tex_advance:D #1 \c_minus_one }
\cs_new_protected_nopar:Npn \int_gincr:N
- { \pref_global:D \int_incr:N }
+ { \tex_global:D \int_incr:N }
\cs_new_protected_nopar:Npn \int_gdecr:N
- { \pref_global:D \int_decr:N }
+ { \tex_global:D \int_decr:N }
\cs_generate_variant:Nn \int_incr:N { c }
\cs_generate_variant:Nn \int_decr:N { c }
\cs_generate_variant:Nn \int_gincr:N { c }
\cs_generate_variant:Nn \int_gdecr:N { c }
\cs_new_protected_nopar:Npn \int_set:Nn #1#2
{ #1 ~ \int_eval:w #2\int_eval_end: }
-\cs_new_protected_nopar:Npn \int_gset:Nn { \pref_global:D \int_set:Nn }
+\cs_new_protected_nopar:Npn \int_gset:Nn { \tex_global:D \int_set:Nn }
\cs_generate_variant:Nn \int_set:Nn { c }
\cs_generate_variant:Nn \int_gset:Nn { c }
\cs_new_eq:NN \int_use:N \tex_the:D
@@ -702,6 +702,7 @@
\cs_new_eq:NN \int_convert_to_base_ten:nn \int_from_base:nn
\cs_new_nopar:Npn \int_to_symbol:n
{
+ \scan_align_safe_stop:
\mode_if_math:TF
{ \int_to_symbol_math:n }
{ \int_to_symbol_text:n }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty
index 348ad546d9f..971e8944ca7 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3io.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3io.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3io.dtx 2724 2011-09-05 18:51:51Z bruno $
+\GetIdInfo$Id: l3io.dtx 2799 2011-09-10 15:46:33Z will $
{L3 Experimental input-output operations}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -414,21 +414,11 @@
\cs_new_protected_nopar:Npn \ior_to:NN #1#2
{ \tex_read:D #1 to #2 }
\cs_new_protected_nopar:Npn \ior_gto:NN #1#2
- { \pref_global:D \tex_read:D #1 to #2 }
+ { \tex_global:D \tex_read:D #1 to #2 }
\cs_new_protected_nopar:Npn \ior_str_to:NN #1#2
{ \etex_readline:D #1 to #2 }
\cs_new_protected_nopar:Npn \ior_str_gto:NN #1#2
- { \pref_global:D \etex_readline:D #1 to #2 }
-\cs_new_protected:Npn \iow_now_buffer_safe:Nn #1#2
- { \iow_wrap:xnnnN { \exp_not:n {#2} } { } \c_zero { } \iow_now:Nn #1 }
-\cs_new_protected:Npn \iow_now_buffer_safe:Nx #1#2
- { \iow_wrap:xnnnN {#2} { } \c_zero { } \iow_now:Nn #1 }
-\cs_new_eq:NN \ior_new:N \use_none:n
-\cs_new_eq:NN \ior_new:c \use_none:n
-\cs_new_eq:NN \iow_new:N \use_none:n
-\cs_new_eq:NN \iow_new:c \use_none:n
-\cs_new_eq:NN \ior_open_streams: \ior_list_streams:
-\cs_new_eq:NN \iow_open_streams: \iow_list_streams:
+ { \tex_global:D \etex_readline:D #1 to #2 }
%%
%%
%% End of file `l3io.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
index 8a34a4c8331..721a7ecc09d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3keys.sty
@@ -13,7 +13,7 @@
%%
%% Do not distribute a modified version of this file.
%%
-%% File: l3keys.dtx Copyright (C) 2009-2011 The LaTeX3 Project
+%% File: l3keys.dtx Copyright (C) 2006-2011 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
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3keys.dtx 2722 2011-09-05 08:49:40Z joseph $
+\GetIdInfo$Id: l3keys.dtx 2800 2011-09-10 16:54:36Z will $
{L3 Experimental key-value interfaces}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -110,23 +110,11 @@
}
\cs_new:Npn \keyval_split_key_value_aux:wTF #1 = #2#3 \q_stop
{ \tl_if_head_eq_meaning:nNTF {#3} \q_no_value }
-\group_begin:
- \char_set_catcode_math_toggle:n { `\Q }
- \cs_new_protected:Npn \keyval_split_key:w #1 \q_stop
- {
- \exp_args:NNf \tl_set:Nn \l_keyval_key_tl
- {
- \exp_after:wN \keyval_remove_spaces:w \exp_after:wN
- \exp_not:N \use_none:n #1 Q ~ Q
- }
- \tl_set:Nx \l_keyval_key_tl
- { \exp_after:wN \keyval_split_key_aux:w \l_keyval_key_tl \q_stop }
- }
- \cs_gset:Npn \keyval_split_key_aux:w #1 \q_stop { \exp_not:n {#1} }
- \cs_gset:Npn \keyval_remove_spaces:w #1 ~ Q
- { \keyval_remove_spaces_aux:w #1 Q }
- \cs_gset:Npn \keyval_remove_spaces_aux:w #1 Q #2 {#1}
-\group_end:
+\cs_new_protected:Npn \keyval_split_key:w #1 \q_stop
+ {
+ \tl_set:Nx \l_keyval_key_tl
+ { \exp_after:wN \tl_trim_spaces:n \exp_after:wN { \use_none:n #1 } }
+ }
\cs_new_protected:Npn \keyval_split_value:w #1 = =
{
\tl_put_right:Nx \l_keyval_parse_tl
@@ -148,16 +136,12 @@
{ \keyval_split_value_aux:w #1 \q_stop }
}
}
-\group_begin:
- \char_set_catcode_math_toggle:n { `\Q }
- \cs_new_protected:Npn \keyval_split_value_aux:w \q_nil #1 \q_stop
- {
- \exp_args:NNf \tl_set:Nn \l_keyval_value_tl
- { \keyval_remove_spaces:w \exp_not:N #1 Q ~ Q }
- \tl_put_right:Nx \l_keyval_parse_tl
- { { \exp_not:o \l_keyval_value_tl } }
- }
-\group_end:
+\cs_new_protected:Npn \keyval_split_value_aux:w \q_nil #1 \q_stop
+ {
+ \tl_set:Nx \l_keyval_value_tl { \tl_trim_spaces:n {#1} }
+ \tl_put_right:Nx \l_keyval_parse_tl
+ { { \exp_not:o \l_keyval_value_tl } }
+ }
\cs_new_protected:Npn \keyval_parse:NNn #1#2#3
{
\int_gincr:N \g_keyval_level_int
@@ -436,6 +420,14 @@
{ \keys_choice_code_store:x { \exp_not:n {#1} } }
\cs_new_protected:cpn { \c_keys_props_root_tl .choice_code:x } #1
{ \keys_choice_code_store:x {#1} }
+\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_set:N } #1
+ { \keys_variable_set:NnN #1 { clist } n }
+\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_set:c } #1
+ { \keys_variable_set:cnN {#1} { clist } n }
+\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_gset:N } #1
+ { \keys_variable_set:NnNN #1 { clist } g n }
+\cs_new_protected_nopar:cpn { \c_keys_props_root_tl .clist_gset:c } #1
+ { \keys_variable_set:cnNN {#1} { clist } g n }
\cs_new_protected:cpn { \c_keys_props_root_tl .default:n } #1
{ \keys_default_set:n {#1} }
\cs_new_protected:cpn { \c_keys_props_root_tl .default:V } #1
@@ -506,7 +498,7 @@
{ \keys_set_aux:onn { \l_keys_module_tl } }
\cs_new_protected:Npn \keys_set_aux:nnn #1#2#3
{
- \tl_set:Nn \l_keys_module_tl {#2}
+ \tl_set:Nx \l_keys_module_tl { \tl_to_str:n {#2} }
\keyval_parse:NNn \keys_set_elt:n \keys_set_elt:nn {#3}
\tl_set:Nn \l_keys_module_tl {#1}
}
@@ -516,7 +508,7 @@
{ \keys_set_known_aux:onnN { \l_keys_module_tl } }
\cs_new_protected:Npn \keys_set_known_aux:nnnN #1#2#3#4
{
- \tl_set:Nn \l_keys_module_tl {#2}
+ \tl_set:Nx \l_keys_module_tl { \tl_to_str:n {#2} }
\clist_clear:N \l_keys_unknown_clist
\cs_set_eq:NN \keys_execute_unknown: \keys_execute_unknown_alt:
\keyval_parse:NNn \keys_set_elt:n \keys_set_elt:nn {#3}
@@ -696,9 +688,6 @@
The~key~'#1'~must~have~a~value.\\
No~value~was~present:~the~key~will~be~ignored.
}
-\cs_new_eq:NN \KV_process_space_removal_sanitize:NNn \keyval_parse:NNn
-\cs_new_eq:NN \KV_process_space_removal_no_sanitize:NNn \keyval_parse:NNn
-\cs_new_eq:NN \KV_process_no_space_removal_no_sanitize:NNn \keyval_parse:NNn
%%
%%
%% End of file `l3keys.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
index c9db7919b6b..cbecb20c036 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3luatex.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3luatex.dtx 2617 2011-08-18 08:13:44Z joseph $
+\GetIdInfo$Id: l3luatex.dtx 2798 2011-09-10 15:42:13Z will $
{L3 Experimental LuaTeX-specific functions}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -86,7 +86,7 @@
\int_compare:nNnTF
{ \g_cctab_allocate_int } < { \c_max_register_int + 1 }
{
- \pref_global:D \tex_mathchardef:D #1 \g_cctab_allocate_int
+ \tex_global:D \tex_mathchardef:D #1 \g_cctab_allocate_int
\luatex_initcatcodetable:D #1
}
{ \msg_kernel_fatal:nnx { alloc } { out-of-registers } { cctab } }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
index eca399c5b79..d9e55670d4b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3msg.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3msg.dtx 2728 2011-09-05 19:13:18Z joseph $
+\GetIdInfo$Id: l3msg.dtx 2812 2011-09-12 09:19:26Z bruno $
{L3 Experimental messages}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -596,19 +596,6 @@
\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
-\cs_new_eq:NN \msg_trace:nnxxxx \msg_log:nnxxxx
-\cs_new_eq:NN \msg_trace:nnxxx \msg_log:nnxxx
-\cs_new_eq:NN \msg_trace:nnxx \msg_log:nnxx
-\cs_new_eq:NN \msg_trace:nnx \msg_log:nnx
-\cs_new_eq:NN \msg_trace:nn \msg_log:nn
-\cs_new_protected:Npn \msg_generic_new:nnn #1#2#3 { \deprecated }
-\cs_new_protected:Npn \msg_generic_new:nn #1#2 { \deprecated }
-\cs_new_protected:Npn \msg_generic_set:nnn #1#2#3 { \deprecated }
-\cs_new_protected:Npn \msg_generic_set:nn #1#2 { \deprecated }
-\cs_new_protected:Npn \msg_direct_interrupt:xxxxx #1#2#3#4#5 { \deprecated }
-\cs_new_protected:Npn \msg_direct_log:xx #1#2 { \deprecated }
-\cs_new_protected:Npn \msg_direct_term:xx #1#2 { \deprecated }
%%
%%
%% End of file `l3msg.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
index 498af47ed47..1c7d9568557 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3names.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3names.dtx 2538 2011-08-10 19:37:10Z joseph $
+\GetIdInfo$Id: l3names.dtx 2776 2011-09-07 18:33:19Z joseph $
{L3 Experimental namespace for primitives}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
index 67ee78ebee3..250d46a77af 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prg.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3prg.dtx 2720 2011-09-05 08:12:39Z bruno $
+\GetIdInfo$Id: l3prg.dtx 2827 2011-09-15 19:37:32Z joseph $
{L3 Experimental control structures}
%%
\ProvidesExplPackage
@@ -358,12 +358,16 @@
\cs_new:cpn { prg_replicate_first_7:n } #1 { \c_zero #1#1#1#1#1#1#1 }
\cs_new:cpn { prg_replicate_first_8:n } #1 { \c_zero #1#1#1#1#1#1#1#1 }
\cs_new:cpn { prg_replicate_first_9:n } #1 { \c_zero #1#1#1#1#1#1#1#1#1 }
-\cs_new:Npn \prg_stepwise_function:nnnN #1#2
+\cs_new:Npn \prg_stepwise_function:nnnN #1#2#3#4
{
- \int_compare:nNnTF {#2} > { 0 }
- { \exp_args:Nf \prg_stepwise_function_incr:nnnN }
- { \exp_args:Nf \prg_stepwise_function_decr:nnnN }
- { \int_eval:n {#1} } {#2}
+ \int_compare:nNnTF {#2} = \c_zero
+ { \msg_expandable_error:n { Zero~step~size~for~stepwise~function. } }
+ {
+ \int_compare:nNnTF {#2} > \c_zero
+ { \exp_args:Nf \prg_stepwise_function_incr:nnnN }
+ { \exp_args:Nf \prg_stepwise_function_decr:nnnN }
+ { \int_eval:n {#1} } {#2} {#3} #4
+ }
}
\cs_new:Npn \prg_stepwise_function_incr:nnnN #1#2#3#4
{
@@ -376,7 +380,7 @@
}
\cs_new:Npn \prg_stepwise_function_decr:nnnN #1#2#3#4
{
- \int_compare:nNnF {#1} < {#3}
+ \int_compare:nNnF {#1} < {#3}
{
#4 {#1}
\exp_args:Nf \prg_stepwise_function_decr:nnnN
@@ -384,44 +388,29 @@
}
}
\int_new:N \g_prg_stepwise_level_int
-\cs_new_protected:Npn \prg_stepwise_inline:nnnn #1#2#3#4
+\cs_new_protected:Npn \prg_stepwise_inline:nnnn
{
- \int_gincr:N \g_prg_stepwise_level_int
- \cs_gset_nopar:cpn
+ \exp_args:NNc \prg_stepwise_aux:NNnnnn
+ \cs_gset_nopar:Npn
{ g_prg_stepwise_ \int_use:N \g_prg_stepwise_level_int :n }
- ##1 {#4}
- \int_compare:nNnTF {#2} > { 0 }
- { \exp_args:Ncf \prg_stepwise_inline_incr:Nnnn }
- { \exp_args:Ncf \prg_stepwise_inline_decr:Nnnn }
- { g_prg_stepwise_ \int_use:N \g_prg_stepwise_level_int :n }
- { \int_eval:n {#1} } {#2} {#3}
- \int_gdecr:N \g_prg_stepwise_level_int
}
-\cs_new_protected:Npn \prg_stepwise_inline_incr:Nnnn #1#2#3#4
- {
- \int_compare:nNnF {#2} > {#4}
- {
- #1 {#2}
- \exp_args:NNf \prg_stepwise_inline_incr:Nnnn #1
- { \int_eval:n { #2 + #3 } } {#3} {#4}
- }
- }
-\cs_new_protected:Npn \prg_stepwise_inline_decr:Nnnn #1#2#3#4
+\cs_new_protected:Npn \prg_stepwise_variable:nnnNn #1#2#3#4#5
{
- \int_compare:nNnF {#2} < {#4}
+ \exp_args:NNc \prg_stepwise_aux:NNnnnn
+ \cs_gset_nopar:Npx
+ { g_prg_stepwise_ \int_use:N \g_prg_stepwise_level_int :n }
+ {#1}{#2}{#3}
{
- #1 {#2}
- \exp_args:NNf \prg_stepwise_inline_decr:Nnnn #1
- { \int_eval:n { #2 + #3 } } {#3} {#4}
+ \tl_set:Nn \exp_not:N #4 {##1}
+ \exp_not:n {#5}
}
}
-\cs_new_protected:Npn \prg_stepwise_variable:nnnNn #1#2#3#4#5
+\cs_new_protected:Npn \prg_stepwise_aux:NNnnnn #1#2#3#4#5#6
{
- \prg_stepwise_inline:nnnn {#1} {#2} {#3}
- {
- \tl_set:Nn #4 {##1}
- #5
- }
+ #1 #2 ##1 {#6}
+ \int_gincr:N \g_prg_stepwise_level_int
+ \prg_stepwise_function:nnnN {#3}{#4}{#5} #2
+ \int_gdecr:N \g_prg_stepwise_level_int
}
\prg_new_conditional:Npnn \mode_if_vertical: { p , T , F , TF }
{ \if_mode_vertical: \prg_return_true: \else: \prg_return_false: \fi: }
@@ -430,22 +419,12 @@
\prg_new_conditional:Npnn \mode_if_inner: { p , T , F , TF }
{ \if_mode_inner: \prg_return_true: \else: \prg_return_false: \fi: }
\prg_new_conditional:Npnn \mode_if_math: { p , T , F , TF }
- {
- \scan_align_safe_stop:
- \if_mode_math: \prg_return_true: \else: \prg_return_false: \fi:
- }
+ { \if_mode_math: \prg_return_true: \else: \prg_return_false: \fi: }
\cs_new_nopar:Npn \group_align_safe_begin:
{ \if_int_compare:w \if_false: { \fi: `} = \c_zero \fi: }
\cs_new_nopar:Npn \group_align_safe_end:
{ \if_int_compare:w `{ = \c_zero } \fi: }
-\cs_new_nopar:Npn \scan_align_safe_stop:
- {
- \int_compare:nNnT \etex_currentgrouptype:D = \c_six
- {
- \int_compare:nNnF \etex_lastnodetype:D = \c_zero
- { \int_compare:nNnF \etex_lastnodetype:D = \c_seven { \scan_stop: } }
- }
- }
+\cs_new_protected_nopar:Npn \scan_align_safe_stop: { }
\group_begin:
\tex_lccode:D `\& = `\g \scan_stop:
\tex_catcode:D `\& = \c_twelve
@@ -556,8 +535,6 @@
\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 { \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/l3prop.sty b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
index 5bda2318bec..b7941873865 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3prop.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3prop.dtx 2725 2011-09-05 18:53:03Z bruno $
+\GetIdInfo$Id: l3prop.dtx 2820 2011-09-12 18:56:29Z bruno $
{L3 Experimental property lists}
%%
\ProvidesExplPackage
@@ -190,7 +190,7 @@
}
\cs_new:Npn \prop_if_in_aux:nwn #1 \q_prop #2 \q_prop #3
{
- \if_catcode:w A #2
+ \if_meaning:w A #2
\prg_return_false:
\exp_after:wN \use_none_delimit_by_q_stop:w
\fi:
@@ -233,7 +233,7 @@
}
\cs_new:Npn \prop_map_function_aux:Nwn #1 \q_prop #2 \q_prop #3
{
- \if_catcode:w A #2
+ \if_meaning:w A #2
\exp_after:wN \prop_map_break:
\fi:
#1 {#2} {#3}
@@ -314,7 +314,7 @@
}
\cs_new:Npn \prop_map_tokens_aux:nwn #1 \q_prop #2 \q_prop #3
{
- \if_catcode:w A #2
+ \if_meaning:w A #2
\exp_after:wN \prop_map_break:
\fi:
\use:n {#1} {#2} {#3}
@@ -326,23 +326,6 @@
\cs_new:Npn \prop_get_aux:nnn #1#2#3
{ \str_if_eq:nnT {#1} {#2} { \prop_map_break:n {#3} } }
\cs_generate_variant:Nn \prop_get:Nn { c }
-\cs_new_eq:NN \prop_display:N \prop_show:N
-\cs_new_eq:NN \prop_display:c \prop_show:c
-\cs_new_protected:Npn \prop_gget:NnN #1#2#3
- { \prop_split:Nnn #1 {#2} { \prop_gget_aux:Nnnn #3 } }
-\cs_new_protected:Npn \prop_gget_aux:Nnnn #1#2#3#4
- { \tl_gset:Nn #1 {#3} }
-\cs_generate_variant:Nn \prop_gget:NnN { NV }
-\cs_generate_variant:Nn \prop_gget:NnN { c , cV }
-\cs_new_eq:NN \prop_get_gdel:NnN \prop_gpop:NnN
-\cs_generate_variant:Nn \prop_if_in:NnT { cc }
-\cs_generate_variant:Nn \prop_if_in:NnF { cc }
-\cs_generate_variant:Nn \prop_if_in:NnTF { cc }
-\cs_generate_variant:Nn \prop_gput:Nnn { ccx }
-\prg_new_eq_conditional:NNn \prop_if_eq:NN \tl_if_eq:NN { p , T , F , TF }
-\prg_new_eq_conditional:NNn \prop_if_eq:cN \tl_if_eq:cN { p , T , F , TF }
-\prg_new_eq_conditional:NNn \prop_if_eq:Nc \tl_if_eq:Nc { p , T , F , TF }
-\prg_new_eq_conditional:NNn \prop_if_eq:cc \tl_if_eq:cc { p , T , F , TF }
%%
%%
%% End of file `l3prop.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
index d95b117b5f8..8cc8cbc1a73 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3quark.dtx 2665 2011-08-25 22:15:27Z joseph $
+\GetIdInfo$Id: l3quark.dtx 2798 2011-09-10 15:42:13Z will $
{L3 Experimental quarks}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -64,47 +64,30 @@
\exp_after:wN \use_none_delimit_by_q_recursion_stop:w
\fi:
}
-\cs_new:Npn \quark_if_recursion_tail_stop_do:Nn #1#2
+\cs_new:Npn \quark_if_recursion_tail_stop_do:Nn #1
{
\if_meaning:w #1 \q_recursion_tail
\exp_after:wN \use_i_delimit_by_q_recursion_stop:nw
\else:
\exp_after:wN \use_none:n
\fi:
- {#2}
}
\cs_new:Npn \quark_if_recursion_tail_stop:n #1
{
- \if_catcode:w
- A
- \etex_detokenize:D \exp_after:wN
- {
- \quark_if_recursion_tail_aux:w #1 \q_recursion_stop
- \q_recursion_tail \q_recursion_stop \q_stop
- }
- A
+ \if_int_compare:w \pdftex_strcmp:D
+ { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero
\exp_after:wN \use_none_delimit_by_q_recursion_stop:w
\fi:
}
-\cs_new:Npn \quark_if_recursion_tail_stop_do:nn #1#2
+\cs_new:Npn \quark_if_recursion_tail_stop_do:nn #1
{
- \if_catcode:w
- A
- \etex_detokenize:D \exp_after:wN
- {
- \quark_if_recursion_tail_aux:w #1 \q_recursion_stop
- \q_recursion_tail \q_recursion_stop \q_stop
- }
- A
+ \if_int_compare:w \pdftex_strcmp:D
+ { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero
\exp_after:wN \use_i_delimit_by_q_recursion_stop:nw
\else:
\exp_after:wN \use_none:n
\fi:
- {#2}
}
-\cs_new:Npn \quark_if_recursion_tail_aux:w
- #1 \q_recursion_tail #2 \q_recursion_stop #3 \q_stop
- { #1 #2 }
\cs_generate_variant:Nn \quark_if_recursion_tail_stop:n { o }
\cs_generate_variant:Nn \quark_if_recursion_tail_stop_do:nn { o }
\prg_new_conditional:Nnn \quark_if_nil:N { p, T , F , TF }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
index 7bfc1f31ae2..5231aea2d2e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3seq.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3seq.dtx 2725 2011-09-05 18:53:03Z bruno $
+\GetIdInfo$Id: l3seq.dtx 2812 2011-09-12 09:19:26Z bruno $
{L3 Experimental sequences and stacks}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -573,10 +573,6 @@
}
\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
-\cs_new_eq:NN \seq_display:c \seq_show:c
%%
%%
%% End of file `l3seq.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
index 2e85a330dae..8a0dc60614f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3skip.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3skip.dtx 2665 2011-08-25 22:15:27Z joseph $
+\GetIdInfo$Id: l3skip.dtx 2818 2011-09-12 14:47:38Z will $
{L3 Experimental dimensions and skips}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -61,18 +61,18 @@
}
\cs_generate_variant:Nn \dim_new:N { c }
\cs_new_protected_nopar:Npn \dim_zero:N #1 { #1 \c_zero_dim }
-\cs_new_protected_nopar:Npn \dim_gzero:N { \pref_global:D \dim_zero:N }
+\cs_new_protected_nopar:Npn \dim_gzero:N { \tex_global:D \dim_zero:N }
\cs_generate_variant:Nn \dim_zero:N { c }
\cs_generate_variant:Nn \dim_gzero:N { c }
\cs_new_protected_nopar:Npn \dim_set:Nn #1#2
{ #1 ~ \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gset:Nn { \pref_global:D \dim_set:Nn }
+\cs_new_protected_nopar:Npn \dim_gset:Nn { \tex_global:D \dim_set:Nn }
\cs_generate_variant:Nn \dim_set:Nn { c }
\cs_generate_variant:Nn \dim_gset:Nn { c }
\cs_new_protected_nopar:Npn \dim_set_eq:NN #1#2 { #1 = #2 }
\cs_generate_variant:Nn \dim_set_eq:NN { c }
\cs_generate_variant:Nn \dim_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \dim_gset_eq:NN #1#2 { \pref_global:D #1 = #2 }
+\cs_new_protected_nopar:Npn \dim_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \dim_gset_eq:NN { c }
\cs_generate_variant:Nn \dim_gset_eq:NN { Nc , cc }
\cs_new_protected_nopar:Npn \dim_set_max:Nn #1#2
@@ -89,12 +89,12 @@
\cs_generate_variant:Nn \dim_gset_min:Nn { c }
\cs_new_protected_nopar:Npn \dim_add:Nn #1#2
{ \tex_advance:D #1 by \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gadd:Nn { \pref_global:D \dim_add:Nn }
+\cs_new_protected_nopar:Npn \dim_gadd:Nn { \tex_global:D \dim_add:Nn }
\cs_generate_variant:Nn \dim_add:Nn { c }
\cs_generate_variant:Nn \dim_gadd:Nn { c }
\cs_new_protected_nopar:Npn \dim_sub:Nn #1#2
{ \tex_advance:D #1 by - \dim_eval:w #2 \dim_eval_end: }
-\cs_new_protected_nopar:Npn \dim_gsub:Nn { \pref_global:D \dim_sub:Nn }
+\cs_new_protected_nopar:Npn \dim_gsub:Nn { \tex_global:D \dim_sub:Nn }
\cs_generate_variant:Nn \dim_sub:Nn { c }
\cs_generate_variant:Nn \dim_gsub:Nn { c }
\cs_new_nopar:Npn \dim_ratio:nn #1#2
@@ -211,28 +211,28 @@
}
\cs_generate_variant:Nn \skip_new:N { c }
\cs_new_protected_nopar:Npn \skip_zero:N #1 { #1 \c_zero_skip }
-\cs_new_protected_nopar:Npn \skip_gzero:N { \pref_global:D \skip_zero:N }
+\cs_new_protected_nopar:Npn \skip_gzero:N { \tex_global:D \skip_zero:N }
\cs_generate_variant:Nn \skip_zero:N { c }
\cs_generate_variant:Nn \skip_gzero:N { c }
\cs_new_protected_nopar:Npn \skip_set:Nn #1#2
{ #1 ~ \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gset:Nn { \pref_global:D \skip_set:Nn }
+\cs_new_protected_nopar:Npn \skip_gset:Nn { \tex_global:D \skip_set:Nn }
\cs_generate_variant:Nn \skip_set:Nn { c }
\cs_generate_variant:Nn \skip_gset:Nn { c }
\cs_new_protected_nopar:Npn \skip_set_eq:NN #1#2 { #1 = #2 }
\cs_generate_variant:Nn \skip_set_eq:NN { c }
\cs_generate_variant:Nn \skip_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \skip_gset_eq:NN #1#2 { \pref_global:D #1 = #2 }
+\cs_new_protected_nopar:Npn \skip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \skip_gset_eq:NN { c }
\cs_generate_variant:Nn \skip_gset_eq:NN { Nc , cc }
\cs_new_protected_nopar:Npn \skip_add:Nn #1#2
{ \tex_advance:D #1 by \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gadd:Nn { \pref_global:D \skip_add:Nn }
+\cs_new_protected_nopar:Npn \skip_gadd:Nn { \tex_global:D \skip_add:Nn }
\cs_generate_variant:Nn \skip_add:Nn { c }
\cs_generate_variant:Nn \skip_gadd:Nn { c }
\cs_new_protected_nopar:Npn \skip_sub:Nn #1#2
{ \tex_advance:D #1 by - \etex_glueexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \skip_gsub:Nn { \pref_global:D \skip_sub:Nn }
+\cs_new_protected_nopar:Npn \skip_gsub:Nn { \tex_global:D \skip_sub:Nn }
\cs_generate_variant:Nn \skip_sub:Nn { c }
\cs_generate_variant:Nn \skip_gsub:Nn { c }
\prg_new_conditional:Npnn \skip_if_eq:nn #1#2 { p , T , F , TF }
@@ -284,28 +284,28 @@
\cs_generate_variant:Nn \muskip_new:N { c }
\cs_new_protected_nopar:Npn \muskip_zero:N #1
{ #1 \c_zero_muskip }
-\cs_new_protected_nopar:Npn \muskip_gzero:N { \pref_global:D \muskip_zero:N }
+\cs_new_protected_nopar:Npn \muskip_gzero:N { \tex_global:D \muskip_zero:N }
\cs_generate_variant:Nn \muskip_zero:N { c }
\cs_generate_variant:Nn \muskip_gzero:N { c }
\cs_new_protected_nopar:Npn \muskip_set:Nn #1#2
{ #1 ~ \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gset:Nn { \pref_global:D \muskip_set:Nn }
+\cs_new_protected_nopar:Npn \muskip_gset:Nn { \tex_global:D \muskip_set:Nn }
\cs_generate_variant:Nn \muskip_set:Nn { c }
\cs_generate_variant:Nn \muskip_gset:Nn { c }
\cs_new_protected_nopar:Npn \muskip_set_eq:NN #1#2 { #1 = #2 }
\cs_generate_variant:Nn \muskip_set_eq:NN { c }
\cs_generate_variant:Nn \muskip_set_eq:NN { Nc , cc }
-\cs_new_protected_nopar:Npn \muskip_gset_eq:NN #1#2 { \pref_global:D #1 = #2 }
+\cs_new_protected_nopar:Npn \muskip_gset_eq:NN #1#2 { \tex_global:D #1 = #2 }
\cs_generate_variant:Nn \muskip_gset_eq:NN { c }
\cs_generate_variant:Nn \muskip_gset_eq:NN { Nc , cc }
\cs_new_protected_nopar:Npn \muskip_add:Nn #1#2
{ \tex_advance:D #1 by \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gadd:Nn { \pref_global:D \muskip_add:Nn }
+\cs_new_protected_nopar:Npn \muskip_gadd:Nn { \tex_global:D \muskip_add:Nn }
\cs_generate_variant:Nn \muskip_add:Nn { c }
\cs_generate_variant:Nn \muskip_gadd:Nn { c }
\cs_new_protected_nopar:Npn \muskip_sub:Nn #1#2
{ \tex_advance:D #1 by - \etex_muexpr:D #2 \scan_stop: }
-\cs_new_protected_nopar:Npn \muskip_gsub:Nn { \pref_global:D \muskip_sub:Nn }
+\cs_new_protected_nopar:Npn \muskip_gsub:Nn { \tex_global:D \muskip_sub:Nn }
\cs_generate_variant:Nn \muskip_sub:Nn { c }
\cs_generate_variant:Nn \muskip_gsub:Nn { c }
\cs_new_nopar:Npn \muskip_eval:n #1
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index f77fb545024..8d4798c1306 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3tl.dtx 2686 2011-08-29 19:41:06Z joseph $
+\GetIdInfo$Id: l3tl.dtx 2812 2011-09-12 09:19:26Z bruno $
{L3 Experimental token lists}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -368,15 +368,9 @@
\tl_if_empty:oTF { \tl_tmp:w #1 {} {} #2 }
{ \prg_return_false: } { \prg_return_true: }
}
-\cs_generate_variant:Nn \tl_if_in:nnT { V }
-\cs_generate_variant:Nn \tl_if_in:nnF { V }
-\cs_generate_variant:Nn \tl_if_in:nnTF { V }
-\cs_generate_variant:Nn \tl_if_in:nnT { o }
-\cs_generate_variant:Nn \tl_if_in:nnF { o }
-\cs_generate_variant:Nn \tl_if_in:nnTF { o }
-\cs_generate_variant:Nn \tl_if_in:nnT { no }
-\cs_generate_variant:Nn \tl_if_in:nnF { no }
-\cs_generate_variant:Nn \tl_if_in:nnTF { no }
+\cs_generate_variant:Nn \tl_if_in:nnT { V , o , no }
+\cs_generate_variant:Nn \tl_if_in:nnF { V , o , no }
+\cs_generate_variant:Nn \tl_if_in:nnTF { V , o , no }
\cs_new:Npn \tl_map_function:nN #1#2
{ \tl_map_function_aux:Nn #2 #1 \q_recursion_tail \q_recursion_stop }
\cs_new_nopar:Npn \tl_map_function:NN #1#2
@@ -794,43 +788,6 @@
\exp_after:wN \tl_act_output:n \exp_after:wN
{ \exp_after:wN { \tex_romannumeral:D \tl_act_case_aux:nn {#1} {#2} } }
}
-\cs_new_protected:Npn \tl_new:Nn #1#2
- {
- \tl_new:N #1
- \tl_gset:Nn #1 {#2}
- }
-\cs_generate_variant:Nn \tl_new:Nn { c }
-\cs_generate_variant:Nn \tl_new:Nn { Nx }
-\cs_new_protected_nopar:Npn \tl_gset:Nc
- { \pref_global:D \tl_set:Nc }
-\cs_new_protected_nopar:Npn \tl_set:Nc #1#2
- { \tl_set:No #1 { \cs:w #2 \cs_end: } }
-\cs_new_eq:NN \tl_replace_in:Nnn \tl_replace_once:Nnn
-\cs_new_eq:NN \tl_replace_in:cnn \tl_replace_once:cnn
-\cs_new_eq:NN \tl_greplace_in:Nnn \tl_greplace_once:Nnn
-\cs_new_eq:NN \tl_greplace_in:cnn \tl_greplace_once:cnn
-\cs_new_eq:NN \tl_replace_all_in:Nnn \tl_replace_all:Nnn
-\cs_new_eq:NN \tl_replace_all_in:cnn \tl_replace_all:cnn
-\cs_new_eq:NN \tl_greplace_all_in:Nnn \tl_greplace_all:Nnn
-\cs_new_eq:NN \tl_greplace_all_in:cnn \tl_greplace_all:cnn
-\cs_new_eq:NN \tl_remove_in:Nn \tl_remove_once:Nn
-\cs_new_eq:NN \tl_remove_in:cn \tl_remove_once:cn
-\cs_new_eq:NN \tl_gremove_in:Nn \tl_gremove_once:Nn
-\cs_new_eq:NN \tl_gremove_in:cn \tl_gremove_once:cn
-\cs_new_eq:NN \tl_remove_all_in:Nn \tl_remove_all:Nn
-\cs_new_eq:NN \tl_remove_all_in:cn \tl_remove_all:cn
-\cs_new_eq:NN \tl_gremove_all_in:Nn \tl_gremove_all:Nn
-\cs_new_eq:NN \tl_gremove_all_in:cn \tl_gremove_all:cn
-\cs_new_eq:NN \tl_elt_count:n \tl_length:n
-\cs_new_eq:NN \tl_elt_count:V \tl_length:V
-\cs_new_eq:NN \tl_elt_count:o \tl_length:o
-\cs_new_eq:NN \tl_elt_count:N \tl_length:N
-\cs_new_eq:NN \tl_elt_count:c \tl_length:c
-\cs_new_eq:NN \tl_head_i:n \tl_head:n
-\cs_new_eq:NN \tl_head_i:w \tl_head:w
-\cs_new:Npn \tl_head_iii:n #1 { \tl_head_iii:w #1 \q_stop }
-\cs_generate_variant:Nn \tl_head_iii:n { f }
-\cs_new:Npn \tl_head_iii:w #1#2#3#4 \q_stop {#1#2#3}
%%
%%
%% End of file `l3tl.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
index 274bbdd2bd9..57140f31380 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3token.sty
@@ -22,7 +22,7 @@
%%
%% http://www.latex-project.org/lppl.txt
%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
+%% This file is part of the "l3kernel bundle" (The Work in LPPL)
%% and all files in that bundle must be distributed together.
%%
%% The released version of this bundle is available from CTAN.
@@ -46,7 +46,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3token.dtx 2691 2011-08-29 20:08:46Z joseph $
+\GetIdInfo$Id: l3token.dtx 2819 2011-09-12 17:26:47Z will $
{L3 Experimental token manipulation}
%% \begin{function}[EXP,pTF]{\token_if_protected_long_macro:N}
\ProvidesExplPackage
@@ -442,7 +442,7 @@
\cs_new_protected_nopar:Npn \peek_after:Nw
{ \tex_futurelet:D \l_peek_token }
\cs_new_protected_nopar:Npn \peek_gafter:Nw
- { \pref_global:D \tex_futurelet:D \g_peek_token }
+ { \tex_global:D \tex_futurelet:D \g_peek_token }
\cs_new_protected:Npn \peek_true_remove:w
{
\group_align_safe_end:
@@ -672,85 +672,6 @@
{ \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
-\cs_new_eq:NN \char_set_uccode:w \tex_uccode:D
-\cs_new_eq:NN \char_set_sfcode:w \tex_sfcode:D
-\cs_new_nopar:Npn \char_value_catcode:w { \tex_the:D \char_set_catcode:w }
-\cs_new_nopar:Npn \char_show_value_catcode:w
- { \tex_showthe:D \char_set_catcode:w }
-\cs_new_nopar:Npn \char_value_mathcode:w { \tex_the:D \char_set_mathcode:w }
-\cs_new_nopar:Npn \char_show_value_mathcode:w
- { \tex_showthe:D \char_set_mathcode:w }
-\cs_new_nopar:Npn \char_value_lccode:w { \tex_the:D \char_set_lccode:w }
-\cs_new_nopar:Npn \char_show_value_lccode:w
- { \tex_showthe:D \char_set_lccode:w }
-\cs_new_nopar:Npn \char_value_uccode:w { \tex_the:D \char_set_uccode:w }
-\cs_new_nopar:Npn \char_show_value_uccode:w
- { \tex_showthe:D \char_set_uccode:w }
-\cs_new_nopar:Npn \char_value_sfcode:w { \tex_the:D \char_set_sfcode:w }
-\cs_new_nopar:Npn \char_show_value_sfcode:w
- { \tex_showthe:D \char_set_sfcode:w }
-\cs_new_eq:NN \peek_after:NN \peek_after:Nw
-\cs_new_eq:NN \peek_gafter:NN \peek_gafter:Nw
-\cs_new_eq:NN \c_alignment_tab_token \c_alignment_token
-\cs_new_eq:NN \c_math_shift_token \c_math_toggle_token
-\cs_new_eq:NN \c_letter_token \c_catcode_letter_token
-\cs_new_eq:NN \c_other_char_token \c_catcode_other_token
-\cs_new_eq:NN \c_active_char_token \c_catcode_active_tl
-\cs_new_eq:NN \char_make_escape:N \char_set_catcode_escape:N
-\cs_new_eq:NN \char_make_begin_group:N \char_set_catcode_group_begin:N
-\cs_new_eq:NN \char_make_end_group:N \char_set_catcode_group_end:N
-\cs_new_eq:NN \char_make_math_shift:N \char_set_catcode_math_toggle:N
-\cs_new_eq:NN \char_make_alignment_tab:N \char_set_catcode_alignment:N
-\cs_new_eq:NN \char_make_end_line:N \char_set_catcode_end_line:N
-\cs_new_eq:NN \char_make_parameter:N \char_set_catcode_parameter:N
-\cs_new_eq:NN \char_make_math_superscript:N
- \char_set_catcode_math_superscript:N
-\cs_new_eq:NN \char_make_math_subscript:N
- \char_set_catcode_math_subscript:N
-\cs_new_eq:NN \char_make_ignore:N \char_set_catcode_ignore:N
-\cs_new_eq:NN \char_make_space:N \char_set_catcode_space:N
-\cs_new_eq:NN \char_make_letter:N \char_set_catcode_letter:N
-\cs_new_eq:NN \char_make_other:N \char_set_catcode_other:N
-\cs_new_eq:NN \char_make_active:N \char_set_catcode_active:N
-\cs_new_eq:NN \char_make_comment:N \char_set_catcode_comment:N
-\cs_new_eq:NN \char_make_invalid:N \char_set_catcode_invalid:N
-\cs_new_eq:NN \char_make_escape:n \char_set_catcode_escape:n
-\cs_new_eq:NN \char_make_begin_group:n \char_set_catcode_group_begin:n
-\cs_new_eq:NN \char_make_end_group:n \char_set_catcode_group_end:n
-\cs_new_eq:NN \char_make_math_shift:n \char_set_catcode_math_toggle:n
-\cs_new_eq:NN \char_make_alignment_tab:n \char_set_catcode_alignment:n
-\cs_new_eq:NN \char_make_end_line:n \char_set_catcode_end_line:n
-\cs_new_eq:NN \char_make_parameter:n \char_set_catcode_parameter:n
-\cs_new_eq:NN \char_make_math_superscript:n
- \char_set_catcode_math_superscript:n
-\cs_new_eq:NN \char_make_math_subscript:n
- \char_set_catcode_math_subscript:n
-\cs_new_eq:NN \char_make_ignore:n \char_set_catcode_ignore:n
-\cs_new_eq:NN \char_make_space:n \char_set_catcode_space:n
-\cs_new_eq:NN \char_make_letter:n \char_set_catcode_letter:n
-\cs_new_eq:NN \char_make_other:n \char_set_catcode_other:n
-\cs_new_eq:NN \char_make_active:n \char_set_catcode_active:n
-\cs_new_eq:NN \char_make_comment:n \char_set_catcode_comment:n
-\cs_new_eq:NN \char_make_invalid:n \char_set_catcode_invalid:n
-\cs_new_eq:NN \token_if_alignment_tab_p:N \token_if_alignment_p:N
-\cs_new_eq:NN \token_if_alignment_tab:NT \token_if_alignment:NT
-\cs_new_eq:NN \token_if_alignment_tab:NF \token_if_alignment:NF
-\cs_new_eq:NN \token_if_alignment_tab:NTF \token_if_alignment:NTF
-\cs_new_eq:NN \token_if_math_shift_p:N \token_if_math_toggle_p:N
-\cs_new_eq:NN \token_if_math_shift:NT \token_if_math_toggle:NT
-\cs_new_eq:NN \token_if_math_shift:NF \token_if_math_toggle:NF
-\cs_new_eq:NN \token_if_math_shift:NTF \token_if_math_toggle:NTF
-\cs_new_eq:NN \token_if_other_char_p:N \token_if_other_p:N
-\cs_new_eq:NN \token_if_other_char:NT \token_if_other:NT
-\cs_new_eq:NN \token_if_other_char:NF \token_if_other:NF
-\cs_new_eq:NN \token_if_other_char:NTF \token_if_other:NTF
-\cs_new_eq:NN \token_if_active_char_p:N \token_if_active_p:N
-\cs_new_eq:NN \token_if_active_char:NT \token_if_active:NT
-\cs_new_eq:NN \token_if_active_char:NF \token_if_active:NF
-\cs_new_eq:NN \token_if_active_char:NTF \token_if_active:NTF
%%
%%
%% End of file `l3token.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3toks.sty b/Master/texmf-dist/tex/latex/l3kernel/l3toks.sty
deleted file mode 100644
index 5867a1f8e38..00000000000
--- a/Master/texmf-dist/tex/latex/l3kernel/l3toks.sty
+++ /dev/null
@@ -1,163 +0,0 @@
-%%
-%% This is file `l3toks.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% l3toks.dtx (with options: `package')
-%%
-%% EXPERIMENTAL CODE
-%%
-%% Do not distribute this file without also distributing the
-%% source files specified above.
-%%
-%% Do not distribute a modified version of this file.
-%%
-%% File: l3toks.dtx Copyright (C) 1990-2011 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
-%% license or (at your option) any later version. The latest version
-%% of this license is in the file
-%%
-%% http://www.latex-project.org/lppl.txt
-%%
-%% This file is part of the "expl3 bundle" (The Work in LPPL)
-%% and all files in that bundle must be distributed together.
-%%
-%% The released version of this bundle is available from CTAN.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%% http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%% Snapshots taken from the repository represent work in progress and may
-%% not work or may contain conflicting material! We therefore ask
-%% people _not_ to put them into distributions, archives, etc. without
-%% prior consultation with the LaTeX3 Project.
-%%
-%% -----------------------------------------------------------------------
-\RequirePackage{l3names}
-\GetIdInfo$Id: l3toks.dtx 2670 2011-08-27 09:58:02Z will $
- {L3 Experimental token registers}
-\ProvidesExplPackage
- {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\package_check_loaded_expl:
-\cs_new_protected_nopar:Npn \toks_new:N #1 {
- \chk_if_free_cs:N #1
- \newtoks #1
-}
-\cs_generate_variant:Nn \toks_new:N {c}
-\cs_new_eq:NN \toks_use:N \tex_the:D
-\cs_generate_variant:Nn \toks_use:N {c}
-\cs_new_eq:NN \toks_set:Nn \prg_do_nothing:
-\cs_new_protected:Npn \toks_set:NV #1#2 {
- #1 \exp_after:wN { \int_to_roman:w -`0 \exp_eval_register:N #2 }
-}
-\cs_new_protected:Npn \toks_set:Nv #1#2 {
- #1 \exp_after:wN { \int_to_roman:w -`0 \exp_eval_register:c {#2} }
-}
-\cs_new_protected:Npn \toks_set:No #1#2 { #1 \exp_after:wN {#2} }
-\cs_new_protected:Npn \toks_set:Nf #1#2 {
- #1 \exp_after:wN { \int_to_roman:w -`0#2 }
-}
-\cs_generate_variant:Nn \toks_set:Nn {Nx,cn,cV,cv,co,cx,cf}
-\cs_new_eq:NN \toks_gset:Nn \pref_global:D
-\cs_generate_variant:Nn \toks_gset:Nn {NV,No,Nx,cn,cV,co,cx}
-\cs_new_eq:NN \toks_set_eq:NN \prg_do_nothing:
-\cs_new_eq:NN \toks_gset_eq:NN \pref_global:D
-\cs_generate_variant:Nn \toks_set_eq:NN {Nc,cN,cc}
-\cs_generate_variant:Nn \toks_gset_eq:NN {Nc,cN,cc}
-\cs_new_protected_nopar:Npn \toks_clear:N #1 {
- #1\c_empty_toks
-}
-\cs_new_protected_nopar:Npn \toks_gclear:N {
- \pref_global:D
- \toks_clear:N
-}
-\cs_generate_variant:Nn \toks_clear:N {c}
-\cs_generate_variant:Nn \toks_gclear:N {c}
-\cs_new_protected_nopar:Npn \toks_use_clear:N #1 {
- \exp_last_unbraced:NNV \toks_clear:N #1 #1
-}
-\cs_new_protected_nopar:Npn \toks_use_gclear:N {
- \pref_global:D
- \toks_use_clear:N
-}
-\cs_generate_variant:Nn \toks_use_clear:N {c}
-\cs_generate_variant:Nn \toks_use_gclear:N {c}
-\cs_new_eq:NN \toks_show:N \kernel_register_show:N
-\cs_generate_variant:Nn \toks_show:N {c}
-\cs_new_protected_nopar:Npn \toks_put_left:Nn #1 {
- \exp_after:wN \toks_put_left_aux:w \exp_after:wN \q_nil
- \toks_use:N #1 \q_stop #1
-}
-\cs_generate_variant:Nn \toks_put_left:Nn {NV,No,Nx,cn,co,cV}
-\cs_new_protected_nopar:Npn \toks_gput_left:Nn {
- \pref_global:D
- \toks_put_left:Nn
-}
-\cs_generate_variant:Nn \toks_gput_left:Nn {NV,No,Nx,cn,cV,co}
-\cs_new:Npn \toks_put_left_aux:w #1\q_stop #2#3 {
- #2 \exp_after:wN { \use_i:nn {#3} #1 }
-}
-\cs_new_protected:Npn \toks_put_right:Nn #1#2 {
- #1 \exp_after:wN { \toks_use:N #1 #2 }
-}
-\cs_new_protected_nopar:Npn \toks_gput_right:Nn {
- \pref_global:D
- \toks_put_right:Nn
-}
-\cs_new_protected:Npn \toks_put_right:NV #1#2 {
- #1 \exp_after:wN \exp_after:wN \exp_after:wN {
- \exp_after:wN \toks_use:N \exp_after:wN #1
- \int_to_roman:w -`0 \exp_eval_register:N #2
- }
-}
-\cs_new_protected:Npn \toks_put_right:No #1#2 {
- #1 \exp_after:wN \exp_after:wN \exp_after:wN {
- \exp_after:wN \toks_use:N \exp_after:wN #1 #2
- }
-}
-\cs_generate_variant:Nn \toks_put_right:Nn {Nx,cn,cV,co}
-\cs_generate_variant:Nn \toks_gput_right:Nn {NV,No,Nx,cn,cV,co}
-\cs_new_protected:Npn \toks_put_right:Nf #1#2 {
- #1 \exp_after:wN \exp_after:wN \exp_after:wN {
- \exp_after:wN \toks_use:N \exp_after:wN #1 \int_to_roman:w -`0#2
- }
-}
-\prg_new_conditional:Nnn \toks_if_empty:N {p,TF,T,F} {
- \tl_if_empty:VTF #1 {\prg_return_true:} {\prg_return_false:}
-}
-\cs_generate_variant:Nn \toks_if_empty_p:N {c}
-\cs_generate_variant:Nn \toks_if_empty:NTF {c}
-\cs_generate_variant:Nn \toks_if_empty:NT {c}
-\cs_generate_variant:Nn \toks_if_empty:NF {c}
-\prg_new_conditional:Nnn \toks_if_eq:NN {p,TF,T,F} {
- \str_if_eq:xxTF {\toks_use:N #1} {\toks_use:N #2}
- {\prg_return_true:} {\prg_return_false:}
-}
-\cs_generate_variant:Nn \toks_if_eq_p:NN {Nc,c,cc}
-\cs_generate_variant:Nn \toks_if_eq:NNTF {Nc,c,cc}
-\cs_generate_variant:Nn \toks_if_eq:NNT {Nc,c,cc}
-\cs_generate_variant:Nn \toks_if_eq:NNF {Nc,c,cc}
-\tex_toksdef:D \l_tmpa_toks = 255\scan_stop:
-\toks_new:N \l_tmpb_toks
-\toks_new:N \l_tmpc_toks
-\toks_new:N \g_tmpa_toks
-\toks_new:N \g_tmpb_toks
-\toks_new:N \g_tmpc_toks
-\toks_new:N \c_empty_toks
-\toks_new:N \l_tl_replace_toks
-
-%%
-%%
-%% End of file `l3toks.sty'.