summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3packages
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-22 22:50:16 +0000
committerKarl Berry <karl@freefriends.org>2016-11-22 22:50:16 +0000
commitf476e2547d6f421f3f59e812adb855596f668eb5 (patch)
tree859e615afe313dc934f3ca679cd4ea760e356f98 /Master/texmf-dist/tex/latex/l3packages
parent4061b69b7a85fc322821dbfc8beb83b498542e45 (diff)
l3 (22nov16)
git-svn-id: svn://tug.org/texlive/trunk@42556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3packages')
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty8
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty209
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty8
4 files changed, 115 insertions, 118 deletions
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index f16aa19f843..5ae4be21638 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -46,8 +46,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{l3keys2e}{Support package l3kernel too old}
@@ -61,8 +61,8 @@
}
\def\ExplFileName{l3keys2e}
\def\ExplFileDescription{LaTeX2e option processing using LaTeX3 keys}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index a16df31eead..fe5d8257511 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -47,8 +47,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{xfrac}{Support package l3kernel too old}
@@ -63,8 +63,8 @@
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
\def\ExplFileName{xfrac}
\def\ExplFileDescription{L3 Experimental split-level fractions}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\keys_define:nn { xfrac }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 4777b58c255..c1ff2f604fa 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{xparse}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
}
\def\ExplFileName{xparse}
\def\ExplFileDescription{L3 Experimental document command parser}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nx \c__xparse_no_value_tl
@@ -96,7 +96,9 @@
\bool_new:N \l__xparse_processor_bool
\int_new:N \l__xparse_processor_int
\tl_new:N \l__xparse_signature_tl
-\tl_new:N \l__xparse_tmp_tl
+\prop_new:N \l__xparse_tmp_prop
+\tl_new:N \l__xparse_tmpa_tl
+\tl_new:N \l__xparse_tmpb_tl
\cs_new_protected:Npn \__xparse_declare_cmd:Nnn
{
\bool_set_false:N \l__xparse_expandable_bool
@@ -234,8 +236,8 @@
\cs_new_protected:Npn \__xparse_count_mandatory:N #1
{
\quark_if_recursion_tail_stop:N #1
- \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmp_tl
- { \exp_after:wN \__xparse_count_mandatory:N \l__xparse_tmp_tl }
+ \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmpa_tl
+ { \exp_after:wN \__xparse_count_mandatory:N \l__xparse_tmpa_tl }
{ \__xparse_count_mandatory_aux:N #1 }
}
\cs_new_protected:Npn \__xparse_count_mandatory_aux:N #1
@@ -267,23 +269,21 @@
\quark_if_recursion_tail_stop_do:nn {#3} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \__xparse_count_type_g:w
- { \__xparse_count_mandatory:N }
-\cs_new_protected:Npn \__xparse_count_type_G:w #1
+\cs_new_protected:Npn \__xparse_count_type_e:w #1
{
\quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \__xparse_count_type_k:w #1
+\cs_new_protected:Npn \__xparse_count_type_E:w #1#2
{
- \__xparse_single_token_check:n {#1}
- \quark_if_recursion_tail_stop_do:Nn #1 { \__xparse_bad_arg_spec:wn }
+ \quark_if_recursion_tail_stop_do:nn {#2} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
-\cs_new_protected:Npn \__xparse_count_type_K:w #1#2
+\cs_new_protected:Npn \__xparse_count_type_g:w
+ { \__xparse_count_mandatory:N }
+\cs_new_protected:Npn \__xparse_count_type_G:w #1
{
- \__xparse_single_token_check:n {#1}
- \quark_if_recursion_tail_stop_do:nn {#2} { \__xparse_bad_arg_spec:wn }
+ \quark_if_recursion_tail_stop_do:nn {#1} { \__xparse_bad_arg_spec:wn }
\__xparse_count_mandatory:N
}
\cs_new_protected:Npn \__xparse_count_type_m:w
@@ -350,8 +350,8 @@
\cs_new_protected:Npn \__xparse_prepare_signature_bypass:N #1
{
\quark_if_recursion_tail_stop:N #1
- \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmp_tl
- { \exp_after:wN \__xparse_prepare_signature:N \l__xparse_tmp_tl }
+ \prop_get:NnNTF \c__xparse_shorthands_prop {#1} \l__xparse_tmpa_tl
+ { \exp_after:wN \__xparse_prepare_signature:N \l__xparse_tmpa_tl }
{
\int_incr:N \l__xparse_current_arg_int
\__xparse_prepare_signature_add:N #1
@@ -397,6 +397,15 @@
\tl_put_right:Nn \l__xparse_signature_tl { #1 #2 {#3} }
\__xparse_prepare_signature:N
}
+\cs_new_protected:Npn \__xparse_add_type_e:w #1
+ { \__xparse_add_type_E:w {#1} { } }
+\cs_new_protected:Npn \__xparse_add_type_E:w #1#2
+ {
+ \__xparse_flush_m_args:
+ \__xparse_add_grabber_optional:N E
+ \tl_put_right:Nn \l__xparse_signature_tl { {#1} {#2} }
+ \__xparse_prepare_signature:N
+ }
\cs_new_protected:Npn \__xparse_add_type_g:w
{ \exp_args:No \__xparse_add_type_G:w \c__xparse_no_value_tl }
\cs_new_protected:Npn \__xparse_add_type_G:w #1
@@ -406,15 +415,6 @@
\tl_put_right:Nn \l__xparse_signature_tl { {#1} }
\__xparse_prepare_signature:N
}
-\cs_new_protected:Npn \__xparse_add_type_k:w #1
- { \exp_args:NNo \__xparse_add_type_K:w #1 \c__xparse_no_value_tl }
-\cs_new_protected:Npn \__xparse_add_type_K:w #1#2
- {
- \__xparse_flush_m_args:
- \__xparse_add_grabber_optional:N K
- \tl_put_right:Nn \l__xparse_signature_tl { #1 {#2} }
- \__xparse_prepare_signature:N
- }
\cs_new_protected:Npn \__xparse_add_type_l:w
{
\__xparse_flush_m_args:
@@ -573,27 +573,6 @@
{ G }
\__xparse_add_expandable_type_m:w
}
-\cs_new_protected:Npn \__xparse_add_expandable_type_k:w #1
- {
- \exp_args:NNo
- \__xparse_add_expandable_type_K:w #1 \c__xparse_no_value_tl
- }
-\cs_new_protected:Npn \__xparse_add_expandable_type_K:w #1#2
- {
- \__xparse_add_expandable_grabber_optional:n { K }
- \bool_if:NTF \l__xparse_all_long_bool
- { \cs_set:cpx }
- { \cs_set_nopar:cpx }
- { \l__xparse_expandable_aux_name_tl } ##1 #1 ##2
- { ##1 {##2} }
- \tl_put_right:Nx \l__xparse_signature_tl
- {
- \exp_not:c { \l__xparse_expandable_aux_name_tl }
- \exp_not:n { #1 {#2} }
- }
- \bool_set_false:N \l__xparse_long_bool
- \__xparse_prepare_signature:N
- }
\cs_new_protected:Npn \__xparse_add_expandable_type_l:w
{
\__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
@@ -753,10 +732,10 @@
{ \__xparse_grab_D_nested:w \q_nil ##2 \q_stop }
\tl_if_in:NnTF \l__xparse_nesting_b_tl {#1}
{
- \tl_set_eq:NN \l__xparse_tmp_tl \l__xparse_nesting_b_tl
+ \tl_set_eq:NN \l__xparse_tmpa_tl \l__xparse_nesting_b_tl
\tl_clear:N \l__xparse_nesting_b_tl
\exp_after:wN \l__xparse_fn_tl \exp_after:wN
- \q_nil \l__xparse_tmp_tl \q_nil \q__xparse \ERROR
+ \q_nil \l__xparse_tmpa_tl \q_nil \q__xparse \ERROR
}
{
\tl_put_right:No \l__xparse_nesting_a_tl
@@ -770,6 +749,80 @@
}
\cs_new:Npn \__xparse_grab_D_nested:w #1 \q_nil \q_stop
{ \exp_not:o { \use_none:n #1 } }
+\cs_new_protected:Npn \__xparse_grab_E:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected_nopar:Npn
+ { _ignore_spaces }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_long:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected:Npn
+ { _ignore_spaces }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_trailing:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected_nopar:Npn
+ { }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_long_trailing:w #1#2#3 \l__xparse_args_tl
+ {
+ \__xparse_grab_E:nnnNn
+ {#1} {#2} {#3}
+ \cs_set_protected:Npn
+ { }
+ }
+\cs_new_protected:Npn \__xparse_grab_E:nnnNn #1#2#3#4#5
+ {
+ \exp_after:wN #4 \l__xparse_fn_tl ##1##2##3
+ {
+ \prop_put:Nnn \l__xparse_tmp_prop {##1} {##3}
+ \__xparse_grab_E_loop:nnN {#5} { } ##2 \q_recursion_stop
+ }
+ \prop_clear:N \l__xparse_tmp_prop
+ \__xparse_grab_E_setup:Nw
+ #1 \q_recursion_tail \q_mark #2 \q_recursion_tail \q_recursion_stop
+ \cs_set_protected:Npn \__xparse_grab_E_finalise:
+ {
+ \tl_clear:N \l__xparse_tmpa_tl
+ \tl_map_inline:nn {#1}
+ {
+ \prop_get:NnNF \l__xparse_tmp_prop {####1} \l__xparse_tmpb_tl
+ { \tl_set_eq:NN \l__xparse_tmpb_tl \c__xparse_no_value_tl }
+ \tl_set:Nx \l__xparse_tmpa_tl
+ {
+ \exp_not:V \l__xparse_tmpa_tl
+ { \exp_not:V \l__xparse_tmpb_tl }
+ }
+ }
+ \__xparse_add_arg:V \l__xparse_tmpa_tl
+ #3 \l__xparse_args_tl
+ }
+ \__xparse_grab_E_loop:nnN {#5} { } #1 \q_recursion_tail \q_recursion_stop
+ }
+\cs_new_protected:Npn \__xparse_grab_E_setup:Nw #1#2 \q_mark #3
+ {
+ \quark_if_recursion_tail_stop:N #1
+ \quark_if_recursion_tail_stop:n {#3}
+ \prop_put:Nnn \l__xparse_tmp_prop {#1} {#3}
+ \__xparse_grab_E_setup:Nw #2 \q_mark
+ }
+\cs_new_protected:Npn \__xparse_grab_E_loop:nnN #1#2#3#4 \q_recursion_stop
+ {
+ \cs_if_eq:NNTF #3 \q_recursion_tail
+ { \__xparse_grab_E_finalise: }
+ {
+ \use:c { peek_meaning_remove #1 :NTF } #3
+ { \l__xparse_fn_tl #3 {#2#4} }
+ { \__xparse_grab_E_loop:nnN {#1} {#2#3} #4 \q_recursion_stop }
+ }
+ }
+\cs_new_protected:Npn \__xparse_grab_E_finalise: { }
\cs_new_protected:Npn \__xparse_grab_G:w #1#2 \l__xparse_args_tl
{
\__xparse_grab_G_aux:nnNn {#1} {#2} \cs_set_protected_nopar:Npn
@@ -797,48 +850,6 @@
#2 \l__xparse_args_tl
}
}
-\cs_new_protected:Npn \__xparse_grab_K:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected_nopar:Npn
- { _ignore_spaces }
- }
-\cs_new_protected:Npn \__xparse_grab_K_long:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected:Npn
- { _ignore_spaces }
- }
-\cs_new_protected:Npn \__xparse_grab_K_trailing:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected_nopar:Npn
- { }
- }
-\cs_new_protected:Npn \__xparse_grab_K_long_trailing:w #1#2#3 \l__xparse_args_tl
- {
- \__xparse_grab_K_aux:nnnNn
- {#1} {#2} {#3}
- \cs_set_protected:Npn
- { }
- }
-\cs_new_protected:Npn \__xparse_grab_K_aux:nnnNn #1#2#3#4#5
- {
- \exp_after:wN #4 \l__xparse_fn_tl ##1
- {
- \__xparse_add_arg:n {##1}
- #3 \l__xparse_args_tl
- }
- \use:c { peek_meaning_remove #5 :NTF } #1
- { \l__xparse_fn_tl }
- {
- \__xparse_add_arg:n {#2}
- #3 \l__xparse_args_tl
- }
- }
\cs_new_protected:Npn \__xparse_grab_l:w #1 \l__xparse_args_tl
{ \__xparse_grab_l_aux:nN {#1} \cs_set_protected_nopar:Npn }
\cs_new_protected:Npn \__xparse_grab_l_long:w #1 \l__xparse_args_tl
@@ -1255,20 +1266,6 @@
}
#2 \q__xparse #1
}
-\cs_new:Npn \__xparse_expandable_grab_K:w #1 \q__xparse #2
- { #2 { \__xparse_expandable_grab_K_aux:NNwn #1 \q__xparse #2 } }
-\cs_new:Npn \__xparse_expandable_grab_K_aux:NNwn #1#2#3#4 \q__xparse #5#6
- {
- \str_if_eq:onTF { #1 { } #6 { } #2 { } } { { } #2 { } }
- {
- #1
- { \__xparse_expandable_grab_K_aux:Nwn #5 #4 \q__xparse }
- #6
- }
- { #4 {#3} \q__xparse #5 {#6} }
- }
-\cs_new:Npn \__xparse_expandable_grab_K_aux:Nwn #1#2 \q__xparse #3
- { #2 {#3} \q__xparse #1 }
\cs_new:Npn \__xparse_expandable_grab_m:w #1 \q__xparse #2
{ #2 { \__xparse_expandable_grab_m_aux:wNn #1 \q__xparse #2 } }
\cs_new:Npn \__xparse_expandable_grab_m_aux:wNn #1 \q__xparse #2#3
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 8f389e34ab5..1303b35589d 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -50,8 +50,8 @@
%%
%% -----------------------------------------------------------------------
%%
-\RequirePackage{expl3}[2016/10/19]
-\@ifpackagelater{expl3}{2016/10/19}
+\RequirePackage{expl3}[2016/11/21]
+\@ifpackagelater{expl3}{2016/11/21}
{}
{%
\PackageError{xtemplate}{Support package l3kernel too old}
@@ -65,8 +65,8 @@
}
\def\ExplFileName{xtemplate}
\def\ExplFileDescription{L3 Experimental prototype document functions}
-\def\ExplFileDate{2016/10/19}
-\def\ExplFileVersion{6730}
+\def\ExplFileDate{2016/11/21}
+\def\ExplFileVersion{6760}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }