summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-01-17 21:08:34 +0000
committerKarl Berry <karl@freefriends.org>2023-01-17 21:08:34 +0000
commitf8b1993f28ed85af42a3809ff0fd179f19ffb777 (patch)
tree26078a2a26a7c09ea9fd950543e0a37b30adaac4 /Master/texmf-dist/tex/latex
parentcc2ad09a1062656737be065ea1559fc5d715a94e (diff)
l3 (17jan23)
git-svn-id: svn://tug.org/texlive/trunk@65573 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def6
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def6
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def6
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def10
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def10
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def10
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex86
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.ltx4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.lua2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3debug.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3doc.cls2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88591.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885910.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885911.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885913.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885914.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885915.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885916.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88592.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88593.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88594.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88595.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88596.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88597.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88598.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88599.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty42
35 files changed, 110 insertions, 134 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
index 4abeab389e6..36a61dece26 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
@@ -12,7 +12,7 @@
%% l3backend-pdf.dtx (with options: `package,dvipdfmx')
%% l3backend-opacity.dtx (with options: `package,dvipdfmx')
%%
-%% Copyright (C) 2019-2022 The LaTeX Project
+%% Copyright (C) 2019-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvipdfmx.def}{2022-10-26}{}
+ {l3backend-dvipdfmx.def}{2023-01-16}{}
{L3 backend support: dvipdfmx}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -799,7 +799,7 @@
{ \__kernel_backend_literal_page:n { /#1 ~ #2 ~ BDC } }
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
-\cs_new_protected:Npn \__pdf_backend_pagesize_set:nn #1#2
+\cs_new_protected:Npn \__pdf_backend_pagesize_gset:nn #1#2
{
\__kernel_backend_first_shipout:n
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
index 656d07d07b6..ff1c6cd599c 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
@@ -12,7 +12,7 @@
%% l3backend-pdf.dtx (with options: `package,dvips')
%% l3backend-opacity.dtx (with options: `package,dvips')
%%
-%% Copyright (C) 2019-2022 The LaTeX Project
+%% Copyright (C) 2019-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvips.def}{2022-10-26}{}
+ {l3backend-dvips.def}{2023-01-16}{}
{L3 backend support: dvips}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -1028,7 +1028,7 @@
{ \__pdf_backend_pdfmark:n { /#1 ~ #2 /BDC } }
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__pdf_backend_pdfmark:n { /EMC } }
-\cs_new_protected:Npn \__pdf_backend_pagesize_set:nn #1#2
+\cs_new_protected:Npn \__pdf_backend_pagesize_gset:nn #1#2
{
\__kernel_backend_first_shipout:n
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
index 7fcb631bea4..4d83257e203 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
@@ -12,7 +12,7 @@
%% l3backend-pdf.dtx (with options: `package,dvisvgm')
%% l3backend-opacity.dtx (with options: `package,dvisvgm')
%%
-%% Copyright (C) 2019-2022 The LaTeX Project
+%% Copyright (C) 2019-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvisvgm.def}{2022-10-26}{}
+ {l3backend-dvisvgm.def}{2023-01-16}{}
{L3 backend support: dvisvgm}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -673,7 +673,7 @@
\cs_new:Npn \__pdf_backend_version_minor: { -1 }
\cs_new_protected:Npn \__pdf_backend_bdc:nn #1#2 { }
\cs_new_protected:Npn \__pdf_backend_emc: { }
-\cs_new_protected:Npn \__pdf_backend_pagesize_set:nn #1#2 { }
+\cs_new_protected:Npn \__pdf_backend_pagesize_gset:nn #1#2 { }
%% File: l3backend-opacity.dtx
\cs_new_protected:Npn \__opacity_backend_select:n #1
{ \__opacity_backend:nn {#1} { } }
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
index 71ddaedd890..e5b6258642b 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
@@ -12,7 +12,7 @@
%% l3backend-pdf.dtx (with options: `package,luatex')
%% l3backend-opacity.dtx (with options: `package,luatex')
%%
-%% Copyright (C) 2019-2022 The LaTeX Project
+%% Copyright (C) 2019-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-luatex.def}{2022-10-26}{}
+ {l3backend-luatex.def}{2023-01-16}{}
{L3 backend support: PDF output (LuaTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -840,10 +840,10 @@
{ \__kernel_backend_literal_page:n { /#1 ~ #2 ~ BDC } }
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
-\cs_new_protected:Npn \__pdf_backend_pagesize_set:nn #1#2
+\cs_new_protected:Npn \__pdf_backend_pagesize_gset:nn #1#2
{
- \dim_set:Nn \tex_pagewidth:D {#1}
- \dim_set:Nn \tex_pageheight:D {#2}
+ \dim_gset:Nn \tex_pagewidth:D {#1}
+ \dim_gset:Nn \tex_pageheight:D {#2}
}
%% File: l3backend-opacity.dtx
\bool_lazy_and:nnT
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
index c87dd52828e..174146e288e 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
@@ -12,7 +12,7 @@
%% l3backend-pdf.dtx (with options: `package,pdftex')
%% l3backend-opacity.dtx (with options: `package,pdftex')
%%
-%% Copyright (C) 2019-2022 The LaTeX Project
+%% Copyright (C) 2019-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-pdftex.def}{2022-10-26}{}
+ {l3backend-pdftex.def}{2023-01-16}{}
{L3 backend support: PDF output (pdfTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -840,10 +840,10 @@
{ \__kernel_backend_literal_page:n { /#1 ~ #2 ~ BDC } }
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
-\cs_new_protected:Npn \__pdf_backend_pagesize_set:nn #1#2
+\cs_new_protected:Npn \__pdf_backend_pagesize_gset:nn #1#2
{
- \dim_set:Nn \tex_pagewidth:D {#1}
- \dim_set:Nn \tex_pageheight:D {#2}
+ \dim_gset:Nn \tex_pagewidth:D {#1}
+ \dim_gset:Nn \tex_pageheight:D {#2}
}
%% File: l3backend-opacity.dtx
\bool_lazy_and:nnT
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
index 346b6650df0..3a37d457409 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
@@ -12,7 +12,7 @@
%% l3backend-pdf.dtx (with options: `package,xetex')
%% l3backend-opacity.dtx (with options: `package,xetex')
%%
-%% Copyright (C) 2019-2022 The LaTeX Project
+%% Copyright (C) 2019-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-xetex.def}{2022-10-26}{}
+ {l3backend-xetex.def}{2023-01-16}{}
{L3 backend support: XeTeX}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -853,10 +853,10 @@
{ \__kernel_backend_literal_page:n { /#1 ~ #2 ~ BDC } }
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
-\cs_new_protected:Npn \__pdf_backend_pagesize_set:nn #1#2
+\cs_new_protected:Npn \__pdf_backend_pagesize_gset:nn #1#2
{
- \dim_set:Nn \tex_pagewidth:D {#1}
- \dim_set:Nn \tex_pageheight:D {#2}
+ \dim_gset:Nn \tex_pagewidth:D {#1}
+ \dim_gset:Nn \tex_pageheight:D {#2}
}
%% File: l3backend-opacity.dtx
\bool_lazy_and:nnT
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 3cea4855ffb..dfab5a60c5d 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -58,7 +58,7 @@
%% l3legacy.dtx (with options: `package')
%% l3deprecation.dtx (with options: `package')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -71,7 +71,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2022-12-17}%
+\def\ExplFileDate{2023-01-16}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -8729,9 +8729,6 @@ Type H <return> for immediate help}\def~{\errmessage{%
}
\tl_new:N \l__char_tmp_tl
\group_begin:
- \char_set_catcode_active:N \^^L
- \cs_set:Npn ^^L { }
- \char_set_catcode_other:n { 0 }
\if_int_odd:w 0
\sys_if_engine_luatex:T { 1 }
\sys_if_engine_xetex:T { 1 } \exp_stop_f:
@@ -8756,60 +8753,55 @@ Type H <return> for immediate help}\def~{\errmessage{%
}
}
\else:
- \tl_set:Nn \l__char_tmp_tl { \exp_not:N \or: }
- \char_set_catcode_group_begin:n { 0 } % {
- \tl_put_right:Nn \l__char_tmp_tl { ^^@ \if_false: } }
- \char_set_catcode_group_end:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { { \fi: \exp_not:N \or: ^^@ } % }
- \__kernel_tl_set:Nx \l__char_tmp_tl { \l__char_tmp_tl }
- \char_set_catcode_math_toggle:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
- \char_set_catcode_alignment:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
- \tl_put_right:Nn \l__char_tmp_tl { \or: }
- \char_set_catcode_parameter:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
- \char_set_catcode_math_superscript:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
- \char_set_catcode_math_subscript:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
- \tl_put_right:Nn \l__char_tmp_tl { \or: }
- \char_set_catcode_space:n { 0 }
- \tl_put_right:No \l__char_tmp_tl { \use:n { \or: } ^^@ }
- \char_set_catcode_letter:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
- \char_set_catcode_other:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
- \char_set_catcode_active:n { 0 }
- \tl_put_right:Nn \l__char_tmp_tl { \or: ^^@ }
+ \char_set_catcode_active:N \^^L
+ \cs_set:Npn ^^L { }
+ \char_set_catcode_active:n { 0 }
+ \tl_set:Nn \l__char_tmp_tl { \exp_not:N ^^@ \exp_not:N \or: }
+ \char_set_catcode_other:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
+ \char_set_catcode_letter:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
+ \tl_put_right:Nn \l__char_tmp_tl { \use:n { ~ } \exp_not:N \or: }
+ \tl_put_right:Nn \l__char_tmp_tl { \exp_not:N \or: }
+ \char_set_catcode_math_subscript:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
+ \char_set_catcode_math_superscript:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
+ \char_set_catcode_parameter:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@^^@ \exp_not:N \or: }
+ \tl_put_right:Nn \l__char_tmp_tl { { \if_false: } \fi: \exp_not:N \or: }
+ \char_set_catcode_alignment:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
+ \char_set_catcode_math_toggle:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: }
+ \char_set_catcode_group_end:n { 0 }
+ \tl_put_right:Nn \l__char_tmp_tl { \if_false: { \fi: ^^@ \exp_not:N \or: } % }
+ \char_set_catcode_group_begin:n { 0 } % {
+ \tl_put_right:Nn \l__char_tmp_tl { ^^@ \exp_not:N \or: } }
\cs_set_protected:Npn \__char_tmp:n #1
{
\char_set_lccode:nn { 0 } {#1}
\char_set_lccode:nn { 32 } {#1}
\exp_args:Nx \tex_lowercase:D
{
- \tl_const:Nn
+ \tl_const:Nx
\exp_not:c { c__char_ \__char_int_to_roman:w #1 _tl }
{ \exp_not:o \l__char_tmp_tl }
}
}
- \int_step_function:nnN { 0 } { 11 } \__char_tmp:n
- \group_begin:
- \tl_replace_once:Nnn \l__char_tmp_tl { ^^@ } { \ERROR }
- \__char_tmp:n { 12 }
- \group_end:
- \int_step_function:nnN { 13 } { 255 } \__char_tmp:n
+ \int_step_function:nnN { 0 } { 255 } \__char_tmp:n
\cs_new:Npn \__char_generate_aux:nnw #1#2#3 \exp_end:
{
#3
\if_false: { \fi:
+ \exp_after:wN \exp_after:wN \exp_after:wN \exp_end:
\exp_after:wN \exp_after:wN
- \exp_after:wN \exp_end:
- \exp_after:wN \exp_after:wN
- \if_case:w #2
- \exp_last_unbraced:Nv \exp_stop_f:
- { c__char_ \__char_int_to_roman:w #1 _tl }
- \or: }
+ \if_case:w \tex_numexpr:D 13 - #2
+ \exp_after:wN \exp_after:wN \exp_after:wN \exp_after:wN
+ \exp_after:wN \exp_after:wN \exp_after:wN \scan_stop:
+ \exp_after:wN \exp_after:wN \exp_after:wN \exp_not:N
+ \cs:w c__char_ \__char_int_to_roman:w #1 _tl \cs_end:
+ }
\fi:
}
\fi:
@@ -30267,6 +30259,8 @@ Type H <return> for immediate help}\def~{\errmessage{%
{ \__pdf_backend_version_major: . \__pdf_backend_version_minor: }
\cs_new:Npn \pdf_version_major: { \__pdf_backend_version_major: }
\cs_new:Npn \pdf_version_minor: { \__pdf_backend_version_minor: }
+\cs_new_protected:Npn \pdf_pagesize_gset:nn #1#2
+ { \__pdf_pagesize_gset:nn {#1} {#2} }
\cs_new_protected:Npn \pdf_destination:nn #1#2
{ \__pdf_backend_destination:nn {#1} {#2} }
\cs_new_protected:Npn \pdf_destination:nnnn #1#2#3#4
@@ -30291,7 +30285,7 @@ Type H <return> for immediate help}\def~{\errmessage{%
{ \dim_compare_p:nNn \stockheight > { 0pt } }
{ \dim_compare_p:nNn \stockwidth > { 0pt } }
{
- \__pdf_backend_pagesize_set:nn
+ \__pdf_backend_pagesize_gset:nn
\stockwidth \stockheight
}
{
@@ -30303,7 +30297,7 @@ Type H <return> for immediate help}\def~{\errmessage{%
{ \dim_compare_p:nNn \paperheight > { 0pt } }
{ \dim_compare_p:nNn \paperwidth > { 0pt } }
{
- \__pdf_backend_pagesize_set:nn
+ \__pdf_backend_pagesize_gset:nn
\paperwidth \paperheight
}
}
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index a64d4fe0897..d7fb01c2d0b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -6,7 +6,7 @@
%%
%% expl3.dtx (with options: `generic,loader')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2022-12-17}%
+\def\ExplFileDate{2023-01-16}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
index 0e63ffcda5d..5ef19334bec 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
@@ -6,7 +6,7 @@
%%
%% expl3.dtx (with options: `2ekernel,loader')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2022-12-17}%
+\def\ExplFileDate{2023-01-16}%
\let\ExplLoaderFileDate\ExplFileDate
\begingroup
\catcode`\_=11
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
index f965f88979c..8310a87a26e 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua
@@ -10,7 +10,7 @@
-- l3token.dtx (with options: `package,lua')
-- l3intarray.dtx (with options: `package,lua')
--
--- Copyright (C) 1990-2022 The LaTeX Project
+-- Copyright (C) 1990-2023 The LaTeX Project
--
-- It may be distributed and/or modified under the conditions of
-- the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 64661e4a3cf..a7a9efe5fe0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -6,7 +6,7 @@
%%
%% expl3.dtx (with options: `package,loader')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2022-12-17}%
+\def\ExplFileDate{2023-01-16}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
index f649cde7bdd..7177bac2ea9 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def
@@ -6,7 +6,7 @@
%%
%% l3debug.dtx (with options: `package')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
index d40ac939a74..6fa637596d2 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls
@@ -6,7 +6,7 @@
%%
%% l3doc.dtx (with options: `class')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
index 419a58c568c..8fcf63f298b 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex
@@ -6,7 +6,7 @@
%%
%% l3docstrip.dtx (with options: `program')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88591.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88591.def
index 42aa02b2c55..54adf9feaff 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88591.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88591.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88591')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885910.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885910.def
index 3a74e0457f7..4ab1e049fd7 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885910.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885910.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso885910')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885911.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885911.def
index 9c4417bf63a..b5215733061 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885911.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885911.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso885911')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885913.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885913.def
index a8870a90492..0a8ac3617e1 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885913.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885913.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso885913')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885914.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885914.def
index 4ad1f3e05c6..f257fd601ac 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885914.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885914.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso885914')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885915.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885915.def
index 80ce842bafe..2d58b3c24c0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885915.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885915.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso885915')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885916.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885916.def
index 070d2d1f94e..affcaa2a421 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885916.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso885916.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso885916')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88592.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88592.def
index d0f192f3801..1b0704ddb37 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88592.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88592.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88592')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88593.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88593.def
index 70973513537..66420548171 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88593.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88593.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88593')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88594.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88594.def
index 52bb84cc1a1..6fe60ae6937 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88594.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88594.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88594')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88595.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88595.def
index 9db33ca709b..aa6ff115378 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88595.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88595.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88595')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88596.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88596.def
index 6466a509da4..108430014d0 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88596.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88596.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88596')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88597.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88597.def
index f474644f477..ea4d8964a85 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88597.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88597.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88597')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88598.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88598.def
index c6e5f1cbdcc..80b9ac039b5 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88598.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88598.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88598')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88599.def b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88599.def
index 3d93181619b..a2625b60792 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88599.def
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3str-enc-iso88599.def
@@ -6,7 +6,7 @@
%%
%% l3str-convert.dtx (with options: `iso88599')
%%
-%% Copyright (C) 1990-2022 The LaTeX Project
+%% Copyright (C) 1990-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 1c1b8bd8c2a..6ea77e80273 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -6,7 +6,7 @@
%%
%% l3keys2e.dtx (with options: `package')
%%
-%% Copyright (C) 2009-2022 The LaTeX Project
+%% Copyright (C) 2009-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{l3keys2e}{2022-12-17}{}
+\ProvidesExplPackage{l3keys2e}{2023-01-16}{}
{LaTeX2e option processing using LaTeX3 keys}
\cs_if_exist:NT \ProcessKeysOptions
{ \file_input_stop: }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index 7f37c23f0e2..1794c3b0331 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
@@ -6,7 +6,7 @@
%%
%% xfp.dtx (with options: `package')
%%
-%% Copyright (C) 2017-2022 The LaTeX Project
+%% Copyright (C) 2017-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{xfp}{2022-12-17}{}
+\ProvidesExplPackage{xfp}{2023-01-16}{}
{L3 Floating point unit}
\ProvideExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
\ProvideExpandableDocumentCommand \inteval { m } { \int_eval:n {#1} }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index 4b8d3453384..dfe754be795 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -7,7 +7,7 @@
%% xfrac.dtx (with options: `package')
%%
%% Copyright (C) 2004,2008-2010 Morten Hoegholm
-%% (C) 2011-2022 The LaTeX Project
+%% (C) 2011-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -34,7 +34,7 @@
\endinput
}
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\ProvidesExplPackage{xfrac}{2022-12-17}{}
+\ProvidesExplPackage{xfrac}{2023-01-16}{}
{L3 Experimental split-level fractions}
\keys_define:nn { xfrac }
{
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx
index b6ad354870f..f7bf6c7be35 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.ltx
@@ -6,7 +6,7 @@
%%
%% xparse.dtx (with options: `2ekernel')
%%
-%% Copyright (C) 2009-2022 The LaTeX Project
+%% Copyright (C) 2009-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 32d92a199e7..ab903b316cd 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -6,7 +6,7 @@
%%
%% xparse.dtx (with options: `package')
%%
-%% Copyright (C) 2009-2022 The LaTeX Project
+%% Copyright (C) 2009-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -60,7 +60,7 @@
}
}
\ExplSyntaxOff
-\ProvidesExplPackage{xparse}{2022-12-17}{}
+\ProvidesExplPackage{xparse}{2023-01-16}{}
{L3 Experimental document command parser}
\clist_new:N \l__cmd_options_clist
\DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 87548085c87..519f8af04a4 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -6,7 +6,7 @@
%%
%% xtemplate.dtx (with options: `package')
%%
-%% Copyright (C) 2011-2022 The LaTeX Project
+%% Copyright (C) 2011-2023 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{xtemplate}{2022-12-17}{}
+\ProvidesExplPackage{xtemplate}{2023-01-16}{}
{L3 Experimental prototype document functions}
\cs_generate_variant:Nn \keys_define:nn { nx }
\cs_generate_variant:Nn \tl_trim_spaces:n { e }
@@ -397,11 +397,11 @@
\cs_new:Npn \__xtemplate_split_keytype_arg_aux:w #1 \s__xtemplate_stop { }
\cs_new_protected:Npn \__xtemplate_store_value_boolean:n #1
{ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1} }
-\cs_new_protected:Npn \__xtemplate_store_value_code:n #1
+\cs_new_protected:Npn \__xtemplate_store_value:n #1
{ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#1} }
-\cs_new_eq:NN \__xtemplate_store_value_choice:n \__xtemplate_store_value_code:n
-\cs_new_eq:NN \__xtemplate_store_value_function:n \__xtemplate_store_value_code:n
-\cs_new_eq:NN \__xtemplate_store_value_instance:n \__xtemplate_store_value_code:n
+\cs_new_eq:NN \__xtemplate_store_value_choice:n \__xtemplate_store_value:n
+\cs_new_eq:NN \__xtemplate_store_value_function:n \__xtemplate_store_value:n
+\cs_new_eq:NN \__xtemplate_store_value_instance:n \__xtemplate_store_value:n
\cs_new_protected:Npn \__xtemplate_store_value_aux:Nn #1#2
{ \prop_put:Non \l__xtemplate_values_prop \l__xtemplate_key_name_tl {#2} }
\cs_new_protected:Npn \__xtemplate_store_value_integer:n
@@ -498,16 +498,6 @@
\str_case:VnF \l__xtemplate_keytype_tl
{
{ choice } { \__xtemplate_implement_choices:nn {#1} {#3} }
- { code }
- {
- \__xtemplate_parse_vars_elt_key:nn {#1}
- {
- .cs_ \str_if_eq:nnT {#1} { global } { g }
- set_protected:Np = \exp_not:N #3
- }
- \prop_put:Non \l__xtemplate_vars_prop
- \l__xtemplate_key_name_tl {#2#3}
- }
{ function }
{
\cs_if_exist:NF #3
@@ -516,9 +506,12 @@
{
.code:n =
{
- \exp_not:c
- { cs_ \str_if_eq:nnT {#1} { global } { g } seq_eq:NN }
- \exp_not:N #3 ####1
+ \cs_generate_from_arg_count:NNnn
+ \exp_not:N #3
+ \exp_not:c
+ { cs_ \str_if_eq:nnT {#1} { global } { g } set:Npn }
+ { \exp_not:o \l__xtemplate_keytype_arg_tl }
+ {####1}
}
}
\prop_put:Non \l__xtemplate_vars_prop
@@ -900,16 +893,6 @@
{ \tl_put_right:No \l__xtemplate_assignments_tl \l__xtemplate_tmp_tl }
}
\cs_generate_variant:Nn \__xtemplate_assign_choice_aux:nF { x }
-\cs_new_protected:Npn \__xtemplate_assign_code:
- {
- \tl_put_right:Nx \l__xtemplate_assignments_tl
- {
- \cs_set_protected:Npn \__xtemplate_assign_code:n \exp_not:n {##1}
- { \exp_not:o \l__xtemplate_var_tl }
- \__xtemplate_assign_code:n { \exp_not:o \l__xtemplate_value_tl }
- }
- }
-\cs_new_protected:Npn \__xtemplate_assign_code:n #1 { }
\cs_new_protected:Npn \__xtemplate_assign_function:
{
\bool_if:NTF \l__xtemplate_global_bool
@@ -1279,7 +1262,6 @@
Valid~key-types~are:\\
-~boolean;\\
-~choice;\\
- -~code;\\
-~commalist;\\
-~function;\\
-~instance;\\