summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def18
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def2
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def18
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def18
-rw-r--r--Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def18
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty123
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty4
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex10
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty2
-rw-r--r--Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty2
22 files changed, 157 insertions, 82 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
index 34c8bdbf85b..4c9e8978870 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvipdfmx.def}{2021-07-12}{}
+ {l3backend-dvipdfmx.def}{2021-08-04}{}
{L3 backend support: dvipdfmx}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -214,7 +214,9 @@
/ \str_convert_pdfname:n {#1} ~ #2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -282,7 +284,9 @@
#2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -873,7 +877,9 @@
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
%% File: l3backend-opacity.dtx
-\cs_if_exist:NT \pdfmanagement_add:nnn
+\bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int
{ page ~ direct } { /opacity 1 ~ gs }
@@ -898,7 +904,9 @@
{ /opacity #1 ~ gs }
\group_insert_after:N \__opacity_backend_reset:
}
-\cs_if_exist:NF \pdfmanagement_add:nnn
+\bool_lazy_and:nnF
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { }
}
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
index 6d5df3b0d5d..cac3f268f18 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvips.def}{2021-07-12}{}
+ {l3backend-dvips.def}{2021-08-04}{}
{L3 backend support: dvips}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
index fb5daeac366..1cfcc6bff02 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-dvisvgm.def}{2021-07-12}{}
+ {l3backend-dvisvgm.def}{2021-08-04}{}
{L3 backend support: dvisvgm}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
index 9a08ddb30d0..5de17be96e8 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-luatex.def}{2021-07-12}{}
+ {l3backend-luatex.def}{2021-08-04}{}
{L3 backend support: PDF output (LuaTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -171,7 +171,9 @@
/ \str_convert_pdfname:n {#1} ~ #2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -239,7 +241,9 @@
#2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -759,7 +763,9 @@
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
%% File: l3backend-opacity.dtx
-\cs_if_exist:NT \pdfmanagement_add:nnn
+\bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int
{ page ~ direct } { /opacity 1 ~ gs }
@@ -784,7 +790,9 @@
{ /opacity #1 ~ gs }
\group_insert_after:N \__opacity_backend_reset:
}
-\cs_if_exist:NF \pdfmanagement_add:nnn
+\bool_lazy_and:nnF
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { }
}
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
index e4723892379..23bffda8d6d 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-pdftex.def}{2021-07-12}{}
+ {l3backend-pdftex.def}{2021-08-04}{}
{L3 backend support: PDF output (pdfTeX)}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -171,7 +171,9 @@
/ \str_convert_pdfname:n {#1} ~ #2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -239,7 +241,9 @@
#2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -759,7 +763,9 @@
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
%% File: l3backend-opacity.dtx
-\cs_if_exist:NT \pdfmanagement_add:nnn
+\bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int
{ page ~ direct } { /opacity 1 ~ gs }
@@ -784,7 +790,9 @@
{ /opacity #1 ~ gs }
\group_insert_after:N \__opacity_backend_reset:
}
-\cs_if_exist:NF \pdfmanagement_add:nnn
+\bool_lazy_and:nnF
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { }
}
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
index 639eaa396fc..7a63f5c33c3 100644
--- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
+++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def
@@ -26,7 +26,7 @@
%%
%% File: l3backend-basics.dtx
\ProvidesExplFile
- {l3backend-xetex.def}{2021-07-12}{}
+ {l3backend-xetex.def}{2021-08-04}{}
{L3 backend support: XeTeX}
\cs_if_exist:NTF \__kernel_dependency_version_check:nn
{
@@ -214,7 +214,9 @@
/ \str_convert_pdfname:n {#1} ~ #2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -282,7 +284,9 @@
#2 ~
\pdf_object_ref_last:
}
- \cs_if_exist:NT \pdfmanagement_add:nnn
+ \bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\use:x
{
@@ -919,7 +923,9 @@
\cs_new_protected:Npn \__pdf_backend_emc:
{ \__kernel_backend_literal_page:n { EMC } }
%% File: l3backend-opacity.dtx
-\cs_if_exist:NT \pdfmanagement_add:nnn
+\bool_lazy_and:nnT
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\__kernel_color_backend_stack_init:Nnn \c__opacity_backend_stack_int
{ page ~ direct } { /opacity 1 ~ gs }
@@ -944,7 +950,9 @@
{ /opacity #1 ~ gs }
\group_insert_after:N \__opacity_backend_reset:
}
-\cs_if_exist:NF \pdfmanagement_add:nnn
+\bool_lazy_and:nnF
+ { \cs_if_exist_p:N \pdfmanagement_if_active_p: }
+ { \pdfmanagement_if_active_p:}
{
\cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { }
}
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
index 74ed69c9484..d4a3797f3e7 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty
@@ -20,7 +20,7 @@
%%
%% File: l3benchmark.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3benchmark}{2021-07-12}{}
+\ProvidesExplPackage{l3benchmark}{2021-08-04}{}
{L3 Experimental benchmarking}
\fp_new:N \g_benchmark_duration_target_fp
\fp_gset:Nn \g_benchmark_duration_target_fp { 1 }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty b/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty
index d5f10c331eb..48a7dd581fa 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: l3bitset.dtx
-\ProvidesExplPackage{l3bitset}{2021-07-12}{}
+\ProvidesExplPackage{l3bitset}{2021-08-04}{}
{L3 Experimental bitset support}
\cs_new_protected:Npn \bitset_new:N #1
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
index 36bc4bd402d..20decb315e3 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty
@@ -28,7 +28,7 @@
%%
%% File: l3draw.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3draw}{2021-07-12}{}
+\ProvidesExplPackage{l3draw}{2021-08-04}{}
{L3 Experimental core drawing support}
\scan_new:N \s__draw_mark
\scan_new:N \s__draw_stop
@@ -804,7 +804,7 @@
\cs_new:Npn \__draw_point_process:nn #1#2
{
\exp_args:Nf \__draw_point_process_auxi:nn
- { \__draw_point_to_dim:n {#2} }
+ { \draw_point:n {#2} }
{#1}
}
\cs_new:Npn \__draw_point_process_auxi:nn #1#2
@@ -814,8 +814,8 @@
\cs_new:Npn \__draw_point_process:nnn #1#2#3
{
\exp_args:Nff \__draw_point_process_auxiii:nnn
- { \__draw_point_to_dim:n {#2} }
- { \__draw_point_to_dim:n {#3} }
+ { \draw_point:n {#2} }
+ { \draw_point:n {#3} }
{#1}
}
\cs_new:Npn \__draw_point_process_auxiii:nnn #1#2#3
@@ -825,9 +825,9 @@
\cs_new:Npn \__draw_point_process:nnnn #1#2#3#4
{
\exp_args:Nfff \__draw_point_process_auxv:nnnn
- { \__draw_point_to_dim:n {#2} }
- { \__draw_point_to_dim:n {#3} }
- { \__draw_point_to_dim:n {#4} }
+ { \draw_point:n {#2} }
+ { \draw_point:n {#3} }
+ { \draw_point:n {#4} }
{#1}
}
\cs_new:Npn \__draw_point_process_auxv:nnnn #1#2#3#4
@@ -838,10 +838,10 @@
\cs_new:Npn \__draw_point_process:nnnnn #1#2#3#4#5
{
\exp_args:Nffff \__draw_point_process_auxvii:nnnnn
- { \__draw_point_to_dim:n {#2} }
- { \__draw_point_to_dim:n {#3} }
- { \__draw_point_to_dim:n {#4} }
- { \__draw_point_to_dim:n {#5} }
+ { \draw_point:n {#2} }
+ { \draw_point:n {#3} }
+ { \draw_point:n {#4} }
+ { \draw_point:n {#5} }
{#1}
}
\cs_new:Npn \__draw_point_process_auxvii:nnnnn #1#2#3#4#5
@@ -852,18 +852,18 @@
\cs_new:Npn \__draw_point_process_auxviii:nw
#1 #2 , #3 \s__draw_mark #4 , #5 \s__draw_mark #6 , #7 \s__draw_mark #8 , #9 \s__draw_stop
{ #1 {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} }
+\cs_new:Npn \draw_point:n #1
+ { \__draw_point_to_dim:f { \fp_eval:n {#1} } }
\cs_new:Npn \__draw_point_to_dim:n #1
- { \__draw_point_to_dim_aux:f { \fp_eval:n {#1} } }
-\cs_new:Npn \__draw_point_to_dim_aux:n #1
- { \__draw_point_to_dim_aux:w #1 }
-\cs_generate_variant:Nn \__draw_point_to_dim_aux:n { f }
-\cs_new:Npn \__draw_point_to_dim_aux:w ( #1 , ~ #2 ) { #1pt , #2pt }
+ { \__draw_point_to_dim:w #1 }
+\cs_generate_variant:Nn \__draw_point_to_dim:n { f }
+\cs_new:Npn \__draw_point_to_dim:w ( #1 , ~ #2 ) { #1pt , #2pt }
\cs_new:Npn \draw_point_polar:nn #1#2
{ \draw_point_polar:nnn {#1} {#1} {#2} }
\cs_new:Npn \draw_point_polar:nnn #1#2#3
{ \__draw_draw_polar:fnn { \fp_eval:n {#3} } {#1} {#2} }
\cs_new:Npn \__draw_draw_polar:nnn #1#2#3
- { \__draw_point_to_dim:n { cosd(#1) * (#2) , sind(#1) * (#3) } }
+ { \draw_point:n { cosd(#1) * (#2) , sind(#1) * (#3) } }
\cs_generate_variant:Nn \__draw_draw_polar:nnn { f }
\cs_new:Npn \draw_point_unit_vector:n #1
{ \__draw_point_process:nn { \__draw_point_unit_vector:nn } {#1} }
@@ -878,7 +878,7 @@
\fp_compare:nNnTF {#1} = \c_zero_fp
{ 0pt, 1pt }
{
- \__draw_point_to_dim:n
+ \draw_point:n
{ ( #2 , #3 ) / #1 }
}
}
@@ -900,7 +900,7 @@
}
\cs_new:Npn \__draw_point_intersect_lines_aux:nnnnnn #1#2#3#4#5#6
{
- \__draw_point_to_dim:n
+ \draw_point:n
{
( #2 * #3 - #1 * #4 , #2 * #5 - #1 * #6 )
/ ( #4 * #5 - #6 * #3 )
@@ -959,7 +959,7 @@
\cs_generate_variant:Nn \__draw_point_intersect_circles_auxvi:nnnnnnnn { f }
\cs_new:Npn \__draw_point_intersect_circles_auxvii:nnnnnnn #1#2#3#4#5#6#7
{
- \__draw_point_to_dim:n
+ \draw_point:n
{ #6 + #4 * #1 + #2 * #3 * #5 , #7 + #5 * #1 + -1 * #2 * #3 * #4 }
}
\cs_generate_variant:Nn \__draw_point_intersect_circles_auxvii:nnnnnnn { fff }
@@ -976,7 +976,7 @@
}
\cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnn { f }
\cs_new:Npn \__draw_point_interpolate_line_aux:nnnnnn #1#2#3#4#5#6
- { \__draw_point_to_dim:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } }
+ { \draw_point:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } }
\cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnnn { f }
\cs_new:Npn \draw_point_interpolate_distance:nnn #1#2#3
{
@@ -994,7 +994,7 @@
{ \draw_point_unit_vector:n { ( #2 ) - ( #3 , #4 ) } }
}
\cs_new:Npn \__draw_point_interpolate_distance:nnnnn #1#2#3#4#5
- { \__draw_point_to_dim:n { #2 + #1 * #4 , #3 + #1 * #5 } }
+ { \draw_point:n { #2 + #1 * #4 , #3 + #1 * #5 } }
\cs_generate_variant:Nn \__draw_point_interpolate_distance:nnnnn { f }
\cs_new:Npn \draw_point_interpolate_arcaxes:nnnnnn #1#2#3#4#5#6
{
@@ -1024,7 +1024,7 @@
\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiii:nnnnnnn { f }
\cs_new:Npn \__draw_point_interpolate_arcaxes_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8
{
- \__draw_point_to_dim:n
+ \draw_point:n
{ #3 + #1 * #5 + #2 * #7 , #4 + #1 * #6 + #2 * #8 }
}
\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiv:nnnnnnnn { ff }
@@ -1085,7 +1085,7 @@
}
\cs_new:Npn \__draw_point_interpolate_curve_auxviii:nnnnnn #1#2#3#4#5#6
{
- \__draw_point_to_dim:n
+ \draw_point:n
{ #5 * #3 + #6 * #1 , #5 * #4 + #6 * #2 }
}
\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxviii:nnnnnn { ffff }
@@ -1117,7 +1117,7 @@
{ \__draw_point_vec:ff { \fp_eval:n {#1} } { \fp_eval:n {#2} } }
\cs_new:Npn \__draw_point_vec:nn #1#2
{
- \__draw_point_to_dim:n
+ \draw_point:n
{
#1 * \l__draw_xvec_x_dim + #2 * \l__draw_yvec_x_dim ,
#1 * \l__draw_xvec_y_dim + #2 * \l__draw_yvec_y_dim
@@ -1131,7 +1131,7 @@
}
\cs_new:Npn \__draw_point_vec:nnn #1#2#3
{
- \__draw_point_to_dim:n
+ \draw_point:n
{
#1 * \l__draw_xvec_x_dim
+ #2 * \l__draw_yvec_x_dim
@@ -1149,7 +1149,7 @@
{ \__draw_draw_vec_polar:fnn { \fp_eval:n {#3} } {#1} {#2} }
\cs_new:Npn \__draw_draw_vec_polar:nnn #1#2#3
{
- \__draw_point_to_dim:n
+ \draw_point:n
{
cosd(#1) * (#2) * \l__draw_xvec_x_dim ,
sind(#1) * (#3) * \l__draw_yvec_y_dim
@@ -1165,7 +1165,7 @@
{
\bool_if:NTF \l__draw_matrix_active_bool
{
- \__draw_point_to_dim:n
+ \draw_point:n
{
(
\l__draw_matrix_a_fp * #1
@@ -1181,7 +1181,7 @@
}
}
{
- \__draw_point_to_dim:n
+ \draw_point:n
{
(#1, #2)
+ ( \l__draw_xshift_dim , \l__draw_yshift_dim )
@@ -1197,7 +1197,7 @@
{
\bool_if:NTF \l__draw_matrix_active_bool
{
- \__draw_point_to_dim:n
+ \draw_point:n
{
(
\l__draw_matrix_a_fp * #1
@@ -1210,7 +1210,7 @@
)
}
}
- { \__draw_point_to_dim:n { (#1, #2) } }
+ { \draw_point:n { (#1, #2) } }
}
%% File: l3draw-scopes.dtx
\dim_new:N \g__draw_xmax_dim
@@ -1251,6 +1251,7 @@
}
\cs_new_protected:Npn \draw_end:
{
+ \__draw_baseline_finalise:w
\exp_args:NNNV \hbox_set_end:
\clist_set:Nn \l_draw_layers_clist \l_draw_layers_clist
\__draw_layers_insert:
@@ -1263,21 +1264,63 @@
\dim_gzero:N \g__draw_ymax_dim
\dim_gzero:N \g__draw_ymin_dim
}
- \hbox_set:Nn \l__draw_main_box
- {
- \skip_horizontal:n { -\g__draw_xmin_dim }
- \box_move_down:nn { \g__draw_ymin_dim }
- { \box_use_drop:N \l__draw_main_box }
- }
- \box_set_ht:Nn \l__draw_main_box
- { \g__draw_ymax_dim - \g__draw_ymin_dim }
- \box_set_dp:Nn \l__draw_main_box { 0pt }
+ \__draw_finalise:
\box_set_wd:Nn \l__draw_main_box
{ \g__draw_xmax_dim - \g__draw_xmin_dim }
\mode_leave_vertical:
\box_use_drop:N \l__draw_main_box
\group_end:
}
+\cs_new_protected:Npn \__draw_finalise:
+ {
+ \hbox_set:Nn \l__draw_main_box
+ {
+ \skip_horizontal:n { -\g__draw_xmin_dim }
+ \box_move_down:nn
+ { \g__draw_ymin_dim }
+ { \box_use_drop:N \l__draw_main_box }
+ }
+ \box_set_dp:Nn \l__draw_main_box { 0pt }
+ \box_set_ht:Nn \l__draw_main_box
+ { \g__draw_ymax_dim - \g__draw_ymin_dim }
+ }
+\cs_new_protected:Npn \__draw_finalise_baseline:n #1
+ {
+ \hbox_set:Nn \l__draw_main_box
+ {
+ \skip_horizontal:n { -\g__draw_xmin_dim }
+ \box_move_down:nn
+ {#1}
+ { \box_use_drop:N \l__draw_main_box }
+ }
+ \box_set_dp:Nn \l__draw_main_box
+ {
+ \dim_max:nn
+ { #1 - \g__draw_ymin_dim }
+ { 0pt }
+ }
+ \box_set_ht:Nn \l__draw_main_box
+ { \g__draw_ymax_dim + #1 }
+ }
+\bool_new:N \l__draw_baseline_bool
+\dim_new:N \l__draw_baseline_dim
+\cs_new_protected:Npn \draw_baseline:n #1
+ {
+ \bool_set_true:N \l__draw_baseline_bool
+ \dim_set:Nn \l__draw_baseline_dim { \fp_to_dim:n {#1} }
+ }
+\cs_new_protected:Npn \__draw_baseline_finalise:w #1 \__draw_finalise:
+ {
+ \bool_if:NTF \l__draw_baseline_bool
+ {
+ \use:x
+ {
+ \exp_not:n {#1}
+ \__draw_finalise_baseline:n { \dim_use:N \l__draw_baseline_dim }
+ }
+ }
+ { #1 \__draw_finalise: }
+ }
\dim_new:N \l__draw_linewidth_dim
\tl_new:N \l__draw_fill_color_tl
\tl_new:N \l__draw_stroke_color_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
index 604c67894e9..f99089d60d9 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty
@@ -20,7 +20,7 @@
%%
%% File: l3graphics.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3graphics}{2021-07-12}{}
+\ProvidesExplPackage{l3graphics}{2021-08-04}{}
{L3 Experimental graphics inclusion support}
\ior_new:N \l__graphics_tmp_ior
\tl_new:N \l__graphics_tmp_tl
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty
index 589808bd034..3451a2a7c1b 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty
@@ -20,7 +20,7 @@
%%
%% File: l3opacity.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3opacity}{2021-07-12}{}
+\ProvidesExplPackage{l3opacity}{2021-08-04}{}
{L3 Experimental opacity support}
\cs_new_protected:Npn \opacity_select:n #1
{ \__opacity_select:nN {#1} \__opacity_backend_select:n }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
index 5c109269cf4..6c7a8c79cf9 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty
@@ -20,7 +20,7 @@
%%
%% File: l3str-format.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3str-format}{2021-07-12}{}
+\ProvidesExplPackage{l3str-format}{2021-08-04}{}
{L3 Experimental string formatting}
\cs_generate_variant:Nn \use:nn { nf }
\cs_generate_variant:Nn \use:nnn { fnf }
diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
index 30030b40495..b9f4c39fa9c 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty
@@ -20,7 +20,7 @@
%%
%% File: l3sys-shell.dtx
\RequirePackage{expl3}
-\ProvidesExplPackage{l3sys-shell}{2021-07-12}{}
+\ProvidesExplPackage{l3sys-shell}{2021-08-04}{}
{L3 Experimental system shell functions}
\scan_new:N \s__sys_stop
\quark_new:N \q__sys_nil
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
index b32682f96c6..1a161dfaaca 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: xcoffins.dtx
-\ProvidesExplPackage{xcoffins}{2021-07-12}{}
+\ProvidesExplPackage{xcoffins}{2021-08-04}{}
{L3 Experimental design level coffins}
\keys_define:nn { coffin }
{
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
index 8a0769c6cce..c1a9892a368 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{l3galley}{2021-07-12}{}
+\ProvidesExplPackage{l3galley}{2021-08-04}{}
{L3 Experimental galley code}
\int_new:N \l__galley_tmp_int
\seq_new:N \g__galley_tmpa_seq
diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
index b084017809e..844b38fb9a1 100644
--- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
+++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty
@@ -19,7 +19,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: xgalley.dtx
-\ProvidesExplPackage{xgalley}{2021-07-12}{}
+\ProvidesExplPackage{xgalley}{2021-08-04}{}
{L3 Experimental galley}
\RequirePackage{xtemplate,l3galley}
\clist_new:N \l__galley_tmpa_clist
diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 0be9d56c5d3..2437f0e3238 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -32,8 +32,10 @@
}%
\endinput
}
-\ProvidesExplPackage{l3keys2e}{2021-06-18}{}
+\ProvidesExplPackage{l3keys2e}{2021-08-04}{}
{LaTeX2e option processing using LaTeX3 keys}
+\cs_if_exist:NT \ProcessKeysOptions
+ { \file_input_stop: }
\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
\cs_generate_variant:Nn \keys_if_exist:nnT { nx }
\cs_generate_variant:Nn \keys_if_exist:nnTF { nx }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
index 995d576709f..b9e1e85465a 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{xfp}{2021-06-18}{}
+\ProvidesExplPackage{xfp}{2021-08-04}{}
{L3 Floating point unit}
\NewExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} }
\NewExpandableDocumentCommand \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 20ca20f2472..c95f7688ef3 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -34,7 +34,7 @@
\endinput
}
\RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\ProvidesExplPackage{xfrac}{2021-06-18}{}
+\ProvidesExplPackage{xfrac}{2021-08-04}{}
{L3 Experimental split-level fractions}
\keys_define:nn { xfrac }
{
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex
index 7263475814c..70895e12ede 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse-generic.tex
@@ -1,11 +1,9 @@
%%
-%% This is file `xparse-generic.tex',
-%% generated with the docstrip utility.
+%% This is file `xparse-generic.tex', generated from
+%% xparse.dtx (with options: `core', on 2021-01-20)
+%% then adapted and frozen for compatibility. Development of
+%% xparse.dtx will continue in the LaTeX2e kernel as ltcmd.dtx.
%%
-%% The original source files were:
-%%
-%% xparse.dtx (with options: `core')
-%%
%% Copyright (C) 2009-2021 The LaTeX Project
%%
%% It may be distributed and/or modified under the conditions of
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index b11af04ad95..040742244de 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -60,7 +60,7 @@
}
}
\ExplSyntaxOff
-\ProvidesExplPackage{xparse}{2021-06-18}{}
+\ProvidesExplPackage{xparse}{2021-08-04}{}
{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 84cf0b86dd7..db8f7a40b7e 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -32,7 +32,7 @@
}%
\endinput
}
-\ProvidesExplPackage{xtemplate}{2021-06-18}{}
+\ProvidesExplPackage{xtemplate}{2021-08-04}{}
{L3 Experimental prototype document functions}
\tl_const:Nn \c__xtemplate_code_root_tl { template~code~>~ }
\tl_const:Nn \c__xtemplate_defaults_root_tl { template~defaults~>~ }