diff options
author | Karl Berry <karl@freefriends.org> | 2024-01-05 21:44:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-01-05 21:44:47 +0000 |
commit | 6a01d0fdf35acd93acf101e457f2a7b728e31f9a (patch) | |
tree | 691ecc30cec73b12097647aab94e2a13759fbde8 /Master/texmf-dist/tex/latex | |
parent | 2e36941df7aa3a67dbb90bd5b6ba181989b959a9 (diff) |
l3 (5jan24)
git-svn-id: svn://tug.org/texlive/trunk@69310 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
40 files changed, 725 insertions, 708 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 6b4f83c5dde..afe957ed7e7 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-2023 The LaTeX Project +%% Copyright (C) 2019-2024 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}{2023-11-09}{} + {l3backend-dvipdfmx.def}{2024-01-04}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -147,9 +147,9 @@ { /Lab ~ << - /WhitePoint ~ - [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] - /Range ~ [ \c__color_model_range_CIELAB_tl ] + /WhitePoint ~ + [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] + /Range ~ [ \c__color_model_range_CIELAB_tl ] >> } } @@ -183,7 +183,7 @@ ] } { {#3} } - } + } \use:e { \pdf_object_new:n { color \int_use:N \g__color_model_int } @@ -332,10 +332,10 @@ \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~ c } - } + } \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4 { - \__draw_backend_literal:e + \__draw_backend_literal:e { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~ @@ -452,7 +452,7 @@ { \fp_eval:n { atand ( #3 , #2 ) } } { \fp_eval:n { atand ( #4 , #1 ) } } } - #5 + #5 } \cs_new_protected:Npn \__draw_backend_cm_decompose_auxii:nnnnN #1#2#3#4#5 { @@ -497,7 +497,7 @@ { \seq_set_from_clist:Nn \l_graphics_search_ext_seq { .pdf , .eps , .ps , .png , .jpg , .jpeg , .bmp } - } + } \__graphics_backend_loaded:n { \cs_new_eq:NN \__graphics_backend_getbb_eps:n \__graphics_read_bb:n @@ -549,7 +549,7 @@ \tl_if_empty:NF \l__graphics_decodearray_str { :D \l__graphics_decodearray_str } \bool_if:NT \l__graphics_interpolate_bool - { :I } + { :I } } {#1} {#2} } @@ -655,7 +655,7 @@ } \cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne } \cs_new:Npn \__pdf_backend_object_last: - { @pdf.obj \int_use:N \g__pdf_backend_object_int } + { @pdf.obj \int_use:N \g__pdf_backend_object_int } \cs_new:Npn \__pdf_backend_pageobject_ref:n #1 { @page #1 } \int_new:N \g__pdf_backend_annotation_int @@ -673,7 +673,7 @@ } } \cs_new:Npn \__pdf_backend_annotation_last: - { @pdf.obj \int_use:N \g__pdf_backend_annotation_int } + { @pdf.obj \int_use:N \g__pdf_backend_annotation_int } \int_new:N \g__pdf_backend_link_int \cs_new_protected:Npn \__pdf_backend_link_begin_goto:nnw #1#2 { \__pdf_backend_link_begin:n { #1 /Subtype /Link /A << /S /GoTo /D ( #2 ) >> } } @@ -684,14 +684,14 @@ \exp_not:N \int_gincr:N \exp_not:N \g__pdf_backend_link_int \__pdf_backend:e { - bann ~ - @pdf.lnk - \exp_not:N \int_use:N \exp_not:N \g__pdf_backend_link_int - \c_space_tl - << - /Type /Annot - #1 - >> + bann ~ + @pdf.lnk + \exp_not:N \int_use:N \exp_not:N \g__pdf_backend_link_int + \c_space_tl + << + /Type /Annot + #1 + >> } } \cs_new_protected:Npn \__pdf_backend_link_end: @@ -806,10 +806,10 @@ \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl \cs_new_protected:Npn \__opacity_backend_select:n #1 - { - \exp_args:Ne \__opacity_backend_select_aux:n - { \fp_eval:n { min(max(0,#1),1) } } - } + { + \exp_args:Ne \__opacity_backend_select_aux:n + { \fp_eval:n { min(max(0,#1),1) } } + } \cs_new_protected:Npn \__opacity_backend_select_aux:n #1 { \tl_set:Nn \l__opacity_backend_fill_tl {#1} @@ -828,10 +828,10 @@ \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } } \cs_new_protected:Npn \__opacity_backend_reset: - { - \__kernel_backend_literal_pdf:n + { + \__kernel_backend_literal_pdf:n { /opacity1 ~ gs } - } + } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { \__opacity_backend_fill_stroke:ee @@ -857,8 +857,8 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \__kernel_backend_literal_pdf:n - { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } + \__kernel_backend_literal_pdf:n + { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 3e4cfa337cd..6db01a86274 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-2023 The LaTeX Project +%% Copyright (C) 2019-2024 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}{2023-11-09}{} + {l3backend-dvips.def}{2024-01-04}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -185,9 +185,9 @@ } \cs_new:Npn \__color_backend_separation_init:nnn #1#2#3 { - \exp_args:Ne \__color_backend_separation_init:nnnn - { \__color_backend_separation_init_count:n {#2} } - {#1} {#2} {#3} + \exp_args:Ne \__color_backend_separation_init:nnnn + { \__color_backend_separation_init_count:n {#2} } + {#1} {#2} {#3} } \cs_new:Npn \__color_backend_separation_init_count:n #1 { \int_eval:n { 0 \__color_backend_separation_init_count:w #1 ~ \s__color_stop } } @@ -225,15 +225,15 @@ { \int_eval:n { #1 * 2 } ~ index ~ } \cs_new:Npn \__color_backend_separation_init:nw #1#2 ~ #3 ~ #4 \s__color_stop { - #2 ~ #3 ~ - 2 ~ index ~ 2 ~ index ~ lt ~ - { ~ pop ~ exch ~ pop ~ } ~ - { ~ - 2 ~ index ~ 1 ~ index ~ gt ~ - { ~ exch ~ pop ~ exch ~ pop ~ } ~ - { ~ pop ~ pop ~ } ~ - ifelse ~ - } + #2 ~ #3 ~ + 2 ~ index ~ 2 ~ index ~ lt ~ + { ~ pop ~ exch ~ pop ~ } ~ + { ~ + 2 ~ index ~ 1 ~ index ~ gt ~ + { ~ exch ~ pop ~ exch ~ pop ~ } ~ + { ~ pop ~ pop ~ } ~ + ifelse ~ + } ifelse ~ #1 ~ 1 ~ roll ~ \tl_if_blank:nF {#4} @@ -365,9 +365,9 @@ { \fp_eval:n { round ( -(#2) , 5 ) } } ~ rotate } - \__kernel_backend_align_end: - \box_use:N #1 - \__kernel_backend_scope_end: + \__kernel_backend_align_end: + \box_use:N #1 + \__kernel_backend_scope_end: } \cs_new_protected:Npn \__box_backend_scale:Nnn #1#2#3 { @@ -418,11 +418,11 @@ } \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4 { - \__draw_backend_literal:e - { - \dim_to_decimal_in_bp:n {#4} ~ \dim_to_decimal_in_bp:n {#3} ~ - \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ - moveto~dup~0~rlineto~exch~0~exch~rlineto~neg~0~rlineto~closepath + \__draw_backend_literal:e + { + \dim_to_decimal_in_bp:n {#4} ~ \dim_to_decimal_in_bp:n {#3} ~ + \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ + moveto~dup~0~rlineto~exch~0~exch~rlineto~neg~0~rlineto~closepath } } \cs_new_protected:Npn \__draw_backend_curveto:nnnnnn #1#2#3#4#5#6 @@ -434,7 +434,7 @@ \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~ curveto } - } + } \cs_new_protected:Npn \__draw_backend_evenodd_rule: { \bool_gset_true:N \g__draw_draw_eor_bool } \cs_new_protected:Npn \__draw_backend_nonzero_rule: @@ -787,9 +787,9 @@ \hbox_set:Nn \l__pdf_backend_model_box { Gg } \exp_args:Ne \__pdf_backend_link_outerbox:n { - \int_if_odd:nTF { \value { page } } - { \oddsidemargin } - { \evensidemargin } + \int_if_odd:nTF { \value { page } } + { \oddsidemargin } + { \evensidemargin } } \box_move_down:nn { \box_dp:N \l__pdf_backend_content_box } { \hbox:n { \__kernel_backend_postscript:n { pdf.save.linkll } } } @@ -981,7 +981,7 @@ \__kernel_backend_literal_postscript:n { /setdistillerparams ~ where - { pop << /CompressPages ~ false >> setdistillerparams } + { pop << /CompressPages ~ false >> setdistillerparams } if } } @@ -993,7 +993,7 @@ \__kernel_backend_literal_postscript:n { /setdistillerparams ~ where - { pop << /CompressStreams ~ false >> setdistillerparams } + { pop << /CompressStreams ~ false >> setdistillerparams } if } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index f129e35165f..f4b98af1bec 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-2023 The LaTeX Project +%% Copyright (C) 2019-2024 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}{2023-11-09}{} + {l3backend-dvisvgm.def}{2024-01-04}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -181,14 +181,14 @@ \__kernel_backend_scope:n { stroke = - " - rgb - ( - #1 \c_percent_str , - #2 \c_percent_str , - #3 \c_percent_str - ) - " + " + rgb + ( + #1 \c_percent_str , + #2 \c_percent_str , + #3 \c_percent_str + ) + " } } \cs_new_protected:Npn \__color_backend_fill_separation:nn #1#2 { } @@ -450,8 +450,8 @@ { \__kernel_backend_scope:n { - transform = - " matrix ( #1 , #2 , #3 , #4 , 0pt , 0pt ) " + transform = + " matrix ( #1 , #2 , #3 , #4 , 0pt , 0pt ) " } } \cs_new_protected:Npn \__draw_backend_box_use:Nnnnn #1#2#3#4#5 @@ -544,7 +544,7 @@ { \__graphics_backend_getbb_svg_auxiv:Nw #2 } { \__graphics_backend_getbb_svg_auxv:Nw #2 } } - } + } ##2 \s__graphics_stop } } @@ -553,7 +553,7 @@ \__graphics_backend_getbb_svg_auxii:w #3 \tl_to_str:n {#1} = \tl_to_str:n {#1} = \s__graphics_stop - } + } } \cs_new_protected:Npn \__graphics_backend_getbb_svg_auxii:w { } \cs_new_protected:Npn \__graphics_backend_getbb_svg_auxiii:Nw #1 ' #2 ' #3 \s__graphics_stop diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def index 9a258eedb44..7130f0ed0c6 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-2023 The LaTeX Project +%% Copyright (C) 2019-2024 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}{2023-11-09}{} + {l3backend-luatex.def}{2024-01-04}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -203,9 +203,9 @@ { /Lab ~ << - /WhitePoint ~ - [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] - /Range ~ [ \c__color_model_range_CIELAB_tl ] + /WhitePoint ~ + [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] + /Range ~ [ \c__color_model_range_CIELAB_tl ] >> } } @@ -239,7 +239,7 @@ ] } { {#3} } - } + } \use:e { \pdf_object_new:n { color \int_use:N \g__color_model_int } @@ -365,8 +365,8 @@ \c_space_tl \fp_use:N \l__box_backend_cos_fp } - \box_use:N #1 - \__kernel_backend_scope_end: + \box_use:N #1 + \__kernel_backend_scope_end: } \fp_new:N \l__box_backend_cos_fp \fp_new:N \l__box_backend_sin_fp @@ -410,10 +410,10 @@ \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~ c } - } + } \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4 { - \__draw_backend_literal:e + \__draw_backend_literal:e { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~ @@ -613,7 +613,7 @@ } } {#1} - } + } \cs_new_eq:NN \__graphics_backend_getbb_ps:n \__graphics_backend_getbb_eps:n \cs_new_protected:Npn \__graphics_backend_getbb_eps:nn #1#2 { @@ -848,10 +848,10 @@ \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl \cs_new_protected:Npn \__opacity_backend_select:n #1 - { - \exp_args:Ne \__opacity_backend_select_aux:n - { \fp_eval:n { min(max(0,#1),1) } } - } + { + \exp_args:Ne \__opacity_backend_select_aux:n + { \fp_eval:n { min(max(0,#1),1) } } + } \cs_new_protected:Npn \__opacity_backend_select_aux:n #1 { \tl_set:Nn \l__opacity_backend_fill_tl {#1} @@ -870,9 +870,9 @@ \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } } \cs_new_protected:Npn \__opacity_backend_reset: - { + { \__kernel_color_backend_stack_pop:n \c__opacity_backend_stack_int - } + } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { \__opacity_backend_fill_stroke:ee @@ -898,8 +898,8 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \__kernel_color_backend_stack_push:nn \c__opacity_backend_stack_int - { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } + \__kernel_color_backend_stack_push:nn \c__opacity_backend_stack_int + { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua index b05c93a2b53..ef34f055780 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.lua @@ -7,7 +7,7 @@ -- l3backend-color.dtx (with options: `lua') -- l3backend-opacity.dtx (with options: `lua') -- --- Copyright (C) 2023 The LaTeX Project +-- Copyright (C) 2023,2024 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/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index 8db284d7615..d53a8f49dae 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-2023 The LaTeX Project +%% Copyright (C) 2019-2024 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}{2023-11-09}{} + {l3backend-pdftex.def}{2024-01-04}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -203,9 +203,9 @@ { /Lab ~ << - /WhitePoint ~ - [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] - /Range ~ [ \c__color_model_range_CIELAB_tl ] + /WhitePoint ~ + [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] + /Range ~ [ \c__color_model_range_CIELAB_tl ] >> } } @@ -239,7 +239,7 @@ ] } { {#3} } - } + } \use:e { \pdf_object_new:n { color \int_use:N \g__color_model_int } @@ -364,8 +364,8 @@ \c_space_tl \fp_use:N \l__box_backend_cos_fp } - \box_use:N #1 - \__kernel_backend_scope_end: + \box_use:N #1 + \__kernel_backend_scope_end: } \fp_new:N \l__box_backend_cos_fp \fp_new:N \l__box_backend_sin_fp @@ -409,10 +409,10 @@ \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~ c } - } + } \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4 { - \__draw_backend_literal:e + \__draw_backend_literal:e { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~ @@ -612,7 +612,7 @@ } } {#1} - } + } \cs_new_eq:NN \__graphics_backend_getbb_ps:n \__graphics_backend_getbb_eps:n \cs_new_protected:Npn \__graphics_backend_getbb_eps:nn #1#2 { @@ -847,10 +847,10 @@ \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl \cs_new_protected:Npn \__opacity_backend_select:n #1 - { - \exp_args:Ne \__opacity_backend_select_aux:n - { \fp_eval:n { min(max(0,#1),1) } } - } + { + \exp_args:Ne \__opacity_backend_select_aux:n + { \fp_eval:n { min(max(0,#1),1) } } + } \cs_new_protected:Npn \__opacity_backend_select_aux:n #1 { \tl_set:Nn \l__opacity_backend_fill_tl {#1} @@ -869,9 +869,9 @@ \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } } \cs_new_protected:Npn \__opacity_backend_reset: - { + { \__kernel_color_backend_stack_pop:n \c__opacity_backend_stack_int - } + } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { \__opacity_backend_fill_stroke:ee @@ -897,8 +897,8 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \__kernel_color_backend_stack_push:nn \c__opacity_backend_stack_int - { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } + \__kernel_color_backend_stack_push:nn \c__opacity_backend_stack_int + { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 912f09d4248..1c208ea2c34 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-2023 The LaTeX Project +%% Copyright (C) 2019-2024 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}{2023-11-09}{} + {l3backend-xetex.def}{2024-01-04}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -147,9 +147,9 @@ { /Lab ~ << - /WhitePoint ~ - [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] - /Range ~ [ \c__color_model_range_CIELAB_tl ] + /WhitePoint ~ + [ \tl_use:c { c__color_model_whitepoint_CIELAB_ #1 _tl } ] + /Range ~ [ \c__color_model_range_CIELAB_tl ] >> } } @@ -183,7 +183,7 @@ ] } { {#3} } - } + } \use:e { \pdf_object_new:n { color \int_use:N \g__color_model_int } @@ -332,10 +332,10 @@ \dim_to_decimal_in_bp:n {#5} ~ \dim_to_decimal_in_bp:n {#6} ~ c } - } + } \cs_new_protected:Npn \__draw_backend_rectangle:nnnn #1#2#3#4 { - \__draw_backend_literal:e + \__draw_backend_literal:e { \dim_to_decimal_in_bp:n {#1} ~ \dim_to_decimal_in_bp:n {#2} ~ \dim_to_decimal_in_bp:n {#3} ~ \dim_to_decimal_in_bp:n {#4} ~ @@ -452,7 +452,7 @@ { \fp_eval:n { atand ( #3 , #2 ) } } { \fp_eval:n { atand ( #4 , #1 ) } } } - #5 + #5 } \cs_new_protected:Npn \__draw_backend_cm_decompose_auxii:nnnnN #1#2#3#4#5 { @@ -497,7 +497,7 @@ { \seq_set_from_clist:Nn \l_graphics_search_ext_seq { .pdf , .eps , .ps , .png , .jpg , .jpeg , .bmp } - } + } \__graphics_backend_loaded:n { \cs_new_eq:NN \__graphics_backend_getbb_eps:n \__graphics_read_bb:n @@ -532,7 +532,7 @@ \tl_if_empty:NF \l__graphics_decodearray_str { :D \l__graphics_decodearray_str } \bool_if:NT \l__graphics_interpolate_bool - { :I } + { :I } } {#1} {#2} } @@ -709,7 +709,7 @@ } \cs_generate_variant:Nn \__pdf_backend_object_now:nn { ne } \cs_new:Npn \__pdf_backend_object_last: - { @pdf.obj \int_use:N \g__pdf_backend_object_int } + { @pdf.obj \int_use:N \g__pdf_backend_object_int } \cs_new:Npn \__pdf_backend_pageobject_ref:n #1 { @page #1 } \int_new:N \g__pdf_backend_annotation_int @@ -727,7 +727,7 @@ } } \cs_new:Npn \__pdf_backend_annotation_last: - { @pdf.obj \int_use:N \g__pdf_backend_annotation_int } + { @pdf.obj \int_use:N \g__pdf_backend_annotation_int } \int_new:N \g__pdf_backend_link_int \cs_new_protected:Npn \__pdf_backend_link_begin_goto:nnw #1#2 { \__pdf_backend_link_begin:n { #1 /Subtype /Link /A << /S /GoTo /D ( #2 ) >> } } @@ -738,14 +738,14 @@ \exp_not:N \int_gincr:N \exp_not:N \g__pdf_backend_link_int \__pdf_backend:e { - bann ~ - @pdf.lnk - \exp_not:N \int_use:N \exp_not:N \g__pdf_backend_link_int - \c_space_tl - << - /Type /Annot - #1 - >> + bann ~ + @pdf.lnk + \exp_not:N \int_use:N \exp_not:N \g__pdf_backend_link_int + \c_space_tl + << + /Type /Annot + #1 + >> } } \cs_new_protected:Npn \__pdf_backend_link_end: @@ -853,10 +853,10 @@ \tl_new:N \l__opacity_backend_fill_tl \tl_new:N \l__opacity_backend_stroke_tl \cs_new_protected:Npn \__opacity_backend_select:n #1 - { - \exp_args:Ne \__opacity_backend_select_aux:n - { \fp_eval:n { min(max(0,#1),1) } } - } + { + \exp_args:Ne \__opacity_backend_select_aux:n + { \fp_eval:n { min(max(0,#1),1) } } + } \cs_new_protected:Npn \__opacity_backend_select_aux:n #1 { \tl_set:Nn \l__opacity_backend_fill_tl {#1} @@ -875,10 +875,10 @@ \cs_gset_protected:Npn \__opacity_backend_select_aux:n #1 { } } \cs_new_protected:Npn \__opacity_backend_reset: - { - \__kernel_backend_literal_pdf:n + { + \__kernel_backend_literal_pdf:n { /opacity1 ~ gs } - } + } \cs_new_protected:Npn \__opacity_backend_fill:n #1 { \__opacity_backend_fill_stroke:ee @@ -904,8 +904,8 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \__kernel_backend_literal_pdf:n - { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } + \__kernel_backend_literal_pdf:n + { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \__opacity_backend_reset: } } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty index 61df68cb427..433092f94e3 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty @@ -6,7 +6,7 @@ %% %% l3benchmark.dtx (with options: `package') %% -%% Copyright (C) 2018-2023 The LaTeX Project +%% Copyright (C) 2018-2024 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 @@ -20,7 +20,7 @@ %% %% File: l3benchmark.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3benchmark}{2023-12-08}{} +\ProvidesExplPackage{l3benchmark}{2024-01-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/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty index bca4f693965..15e008bfbe1 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty @@ -14,7 +14,7 @@ %% l3draw-state.dtx (with options: `package') %% l3draw-transforms.dtx (with options: `package') %% -%% Copyright (C) 2018-2023 The LaTeX Project +%% Copyright (C) 2018-2024 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 @@ -29,7 +29,7 @@ %% File: l3draw.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3draw}{2023-12-08}{} +\ProvidesExplPackage{l3draw}{2024-01-04}{} {L3 Experimental core drawing support} \scan_new:N \s__draw_mark \scan_new:N \s__draw_stop @@ -287,9 +287,9 @@ } \cs_new_protected:Npn \__draw_path_moveto:nn #1#2 { - \__draw_path_update_limits:nn {#1} {#2} - \__draw_softpath_moveto:nn {#1} {#2} - \__draw_path_update_last:nn {#1} {#2} + \__draw_path_update_limits:nn {#1} {#2} + \__draw_softpath_moveto:nn {#1} {#2} + \__draw_path_update_last:nn {#1} {#2} } \cs_new_protected:Npn \draw_path_lineto:n #1 { @@ -299,10 +299,10 @@ } \cs_new_protected:Npn \__draw_path_lineto:nn #1#2 { - \__draw_path_mark_corner: - \__draw_path_update_limits:nn {#1} {#2} - \__draw_softpath_lineto:nn {#1} {#2} - \__draw_path_update_last:nn {#1} {#2} + \__draw_path_mark_corner: + \__draw_path_update_limits:nn {#1} {#2} + \__draw_softpath_lineto:nn {#1} {#2} + \__draw_path_update_last:nn {#1} {#2} } \cs_new_protected:Npn \draw_path_curveto:nnn #1#2#3 { @@ -317,11 +317,11 @@ } \cs_new_protected:Npn \__draw_path_curveto:nnnnnn #1#2#3#4#5#6 { - \__draw_path_update_limits:nn {#1} {#2} - \__draw_path_update_limits:nn {#3} {#4} - \__draw_path_update_limits:nn {#5} {#6} - \__draw_softpath_curveto:nnnnnn {#1} {#2} {#3} {#4} {#5} {#6} - \__draw_path_update_last:nn {#5} {#6} + \__draw_path_update_limits:nn {#1} {#2} + \__draw_path_update_limits:nn {#3} {#4} + \__draw_path_update_limits:nn {#5} {#6} + \__draw_softpath_curveto:nnnnnn {#1} {#2} {#3} {#4} {#5} {#6} + \__draw_path_update_last:nn {#5} {#6} } \cs_new_protected:Npn \draw_path_close: { @@ -354,32 +354,32 @@ \fp_set:Nn \l__draw_path_tmpb_fp { \c__draw_path_curveto_b_fp * #2 } \use:e { - \__draw_path_mark_corner: - \__draw_path_curveto:nnnnnn - { - \fp_to_dim:n - { - \c__draw_path_curveto_a_fp * \g__draw_path_lastx_dim - + \l__draw_path_tmpa_fp - } - } - { - \fp_to_dim:n - { - \c__draw_path_curveto_a_fp * \g__draw_path_lasty_dim - + \l__draw_path_tmpb_fp - } - } - { - \fp_to_dim:n - { \c__draw_path_curveto_a_fp * #3 + \l__draw_path_tmpa_fp } - } - { - \fp_to_dim:n - { \c__draw_path_curveto_a_fp * #4 + \l__draw_path_tmpb_fp } - } - {#3} - {#4} + \__draw_path_mark_corner: + \__draw_path_curveto:nnnnnn + { + \fp_to_dim:n + { + \c__draw_path_curveto_a_fp * \g__draw_path_lastx_dim + + \l__draw_path_tmpa_fp + } + } + { + \fp_to_dim:n + { + \c__draw_path_curveto_a_fp * \g__draw_path_lasty_dim + + \l__draw_path_tmpb_fp + } + } + { + \fp_to_dim:n + { \c__draw_path_curveto_a_fp * #3 + \l__draw_path_tmpa_fp } + } + { + \fp_to_dim:n + { \c__draw_path_curveto_a_fp * #4 + \l__draw_path_tmpb_fp } + } + {#3} + {#4} } } \fp_const:Nn \c__draw_path_curveto_a_fp { 1 / 3 } @@ -395,7 +395,7 @@ { \fp_eval:n {#2} } { \fp_to_dim:n {#3} } { \fp_to_dim:n {#4} } - } + } } \cs_new_protected:Npn \__draw_path_arc:nnnn #1#2#3#4 { @@ -411,14 +411,14 @@ { \fp_compare:nNnTF \l__draw_path_arc_delta_fp > { 115 } { - \__draw_path_arc_auxi:ffnnNnn + \__draw_path_arc_auxi:eennNnn { \fp_to_decimal:N \l__draw_path_arc_start_fp } { \fp_eval:n { \l__draw_path_arc_start_fp #3 90 } } { 90 } {#2} #3 {#4} {#5} } { - \__draw_path_arc_auxi:ffnnNnn + \__draw_path_arc_auxi:eennNnn { \fp_to_decimal:N \l__draw_path_arc_start_fp } { \fp_eval:n { \l__draw_path_arc_start_fp #3 60 } } { 60 } {#2} @@ -426,7 +426,7 @@ } } \__draw_path_mark_corner: - \__draw_path_arc_auxi:fnfnNnn + \__draw_path_arc_auxi:enenNnn { \fp_to_decimal:N \l__draw_path_arc_start_fp } {#2} { \fp_eval:n { abs( \l__draw_path_arc_start_fp - #2 ) } } @@ -459,7 +459,7 @@ } } } -\cs_generate_variant:Nn \__draw_path_arc_auxi:nnnnNnn { fnf , ff } +\cs_generate_variant:Nn \__draw_path_arc_auxi:nnnnNnn { ene , ee } \cs_new_protected:Npn \__draw_path_arc_auxii:nnnNnnnn #1#2#3#4#5#6#7#8 { \tl_clear:N \l__draw_path_tmp_tl @@ -605,7 +605,7 @@ { \__draw_path_rectangle_rounded:nnnn } { \__draw_path_rectangle:nnnn } } - { \draw_point_transform:n {#1} } + {#1} {#2} } \cs_new_protected:Npn \__draw_path_rectangle:nnnn #1#2#3#4 @@ -636,7 +636,7 @@ { \__draw_point_process:nnn { - \__draw_path_grid_auxi:ffnnnn + \__draw_path_grid_auxi:eennnn { \dim_eval:n { \dim_abs:n {#1} } } { \dim_eval:n { \dim_abs:n {#2} } } } @@ -648,7 +648,7 @@ { \__draw_path_grid_auxii:nnnnnn {#1} {#2} {#5} {#4} {#3} {#6} } { \__draw_path_grid_auxii:nnnnnn {#1} {#2} {#3} {#4} {#5} {#6} } } -\cs_generate_variant:Nn \__draw_path_grid_auxi:nnnnnn { ff } +\cs_generate_variant:Nn \__draw_path_grid_auxi:nnnnnn { ee } \cs_new_protected:Npn \__draw_path_grid_auxii:nnnnnn #1#2#3#4#5#6 { \dim_compare:nNnTF {#4} > {#6} @@ -657,7 +657,7 @@ } \cs_new_protected:Npn \__draw_path_grid_auxiii:nnnnnn #1#2#3#4#5#6 { - \__draw_path_grid_auxiv:ffnnnnnn + \__draw_path_grid_auxiv:eennnnnn { \fp_to_dim:n { #1 * trunc(#3/(#1)) } } { \fp_to_dim:n { #2 * trunc(#4/(#2)) } } {#1} {#2} {#3} {#4} {#5} {#6} @@ -681,7 +681,7 @@ \draw_path_lineto:n { #7 , ##1 } } } -\cs_generate_variant:Nn \__draw_path_grid_auxiv:nnnnnnnn { ff } +\cs_generate_variant:Nn \__draw_path_grid_auxiv:nnnnnnnn { ee } \bool_new:N \l__draw_path_use_clip_bool \bool_new:N \l__draw_path_use_fill_bool \bool_new:N \l__draw_path_use_stroke_bool @@ -702,7 +702,7 @@ \__draw_path_reset_limits: } { \__draw_path_use:n { #1 , clear } } - } + } \cs_new_protected:Npn \__draw_path_use:n #1 { \bool_set_false:N \l__draw_path_use_clip_bool @@ -820,28 +820,30 @@ %% File: l3draw-points.dtx \cs_new:Npn \__draw_point_process:nn #1#2 { - \exp_args:Nf \__draw_point_process_auxi:nn + \__draw_point_process_auxi:en { \draw_point:n {#2} } {#1} } \cs_new:Npn \__draw_point_process_auxi:nn #1#2 { \__draw_point_process_auxii:nw {#2} #1 \s__draw_stop } +\cs_generate_variant:Nn \__draw_point_process_auxi:nn { e } \cs_new:Npn \__draw_point_process_auxii:nw #1 #2 , #3 \s__draw_stop { #1 {#2} {#3} } \cs_new:Npn \__draw_point_process:nnn #1#2#3 { - \exp_args:Nff \__draw_point_process_auxiii:nnn + \__draw_point_process_auxiii:een { \draw_point:n {#2} } { \draw_point:n {#3} } {#1} } \cs_new:Npn \__draw_point_process_auxiii:nnn #1#2#3 { \__draw_point_process_auxiv:nw {#3} #1 \s__draw_mark #2 \s__draw_stop } +\cs_generate_variant:Nn \__draw_point_process_auxiii:nnn { ee } \cs_new:Npn \__draw_point_process_auxiv:nw #1 #2 , #3 \s__draw_mark #4 , #5 \s__draw_stop { #1 {#2} {#3} {#4} {#5} } \cs_new:Npn \__draw_point_process:nnnn #1#2#3#4 { - \exp_args:Nfff \__draw_point_process_auxv:nnnn + \__draw_point_process_auxv:eeen { \draw_point:n {#2} } { \draw_point:n {#3} } { \draw_point:n {#4} } @@ -849,12 +851,13 @@ } \cs_new:Npn \__draw_point_process_auxv:nnnn #1#2#3#4 { \__draw_point_process_auxvi:nw {#4} #1 \s__draw_mark #2 \s__draw_mark #3 \s__draw_stop } +\cs_generate_variant:Nn \__draw_point_process_auxv:nnnn { eee } \cs_new:Npn \__draw_point_process_auxvi:nw #1 #2 , #3 \s__draw_mark #4 , #5 \s__draw_mark #6 , #7 \s__draw_stop { #1 {#2} {#3} {#4} {#5} {#6} {#7} } \cs_new:Npn \__draw_point_process:nnnnn #1#2#3#4#5 { - \exp_args:Nffff \__draw_point_process_auxvii:nnnnn + \__draw_point_process_auxvii:eeeen { \draw_point:n {#2} } { \draw_point:n {#3} } { \draw_point:n {#4} } @@ -866,27 +869,28 @@ \__draw_point_process_auxviii:nw {#5} #1 \s__draw_mark #2 \s__draw_mark #3 \s__draw_mark #4 \s__draw_stop } +\cs_generate_variant:Nn \__draw_point_process_auxvii:nnnnn { eeee } \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} } } + { \__draw_point_to_dim:e { \fp_eval:n {#1} } } \cs_new:Npn \__draw_point_to_dim:n #1 { \__draw_point_to_dim:w #1 } -\cs_generate_variant:Nn \__draw_point_to_dim:n { f } +\cs_generate_variant:Nn \__draw_point_to_dim:n { e } \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} } + { \__draw_draw_polar:enn { \fp_eval:n {#3} } {#1} {#2} } \cs_new:Npn \__draw_draw_polar:nnn #1#2#3 { \draw_point:n { cosd(#1) * (#2) , sind(#1) * (#3) } } -\cs_generate_variant:Nn \__draw_draw_polar:nnn { f } +\cs_generate_variant:Nn \__draw_draw_polar:nnn { e } \cs_new:Npn \draw_point_unit_vector:n #1 { \__draw_point_process:nn { \__draw_point_unit_vector:nn } {#1} } \cs_new:Npn \__draw_point_unit_vector:nn #1#2 { - \exp_args:Nf \__draw_point_unit_vector:nnn + \__draw_point_unit_vector:nnn { \fp_eval:n { (sqrt(#1 * #1 + #2 * #2)) } } {#1} {#2} } @@ -899,6 +903,7 @@ { ( #2 , #3 ) / #1 } } } +\cs_generate_variant:Nn \__draw_point_unit_vector:nnn { e } \cs_new:Npn \draw_point_intersect_lines:nnnn #1#2#3#4 { \__draw_point_process:nnnnn @@ -907,7 +912,7 @@ } \cs_new:Npn \__draw_point_intersect_lines:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_intersect_lines_aux:ffffff + \__draw_point_intersect_lines_aux:eeeeee { \fp_eval:n { #1 * #4 - #2 * #3 } } { \fp_eval:n { #5 * #8 - #6 * #7 } } { \fp_eval:n { #1 - #3 } } @@ -923,7 +928,7 @@ / ( #4 * #5 - #6 * #3 ) } } -\cs_generate_variant:Nn \__draw_point_intersect_lines_aux:nnnnnn { ffffff } +\cs_generate_variant:Nn \__draw_point_intersect_lines_aux:nnnnnn { eeeeee } \cs_new:Npn \draw_point_intersect_circles:nnnnn #1#2#3#4#5 { \__draw_point_process:nnn @@ -932,54 +937,54 @@ } \cs_new:Npn \__draw_point_intersect_circles_auxi:nnnnnnn #1#2#3#4#5#6#7 { - \__draw_point_intersect_circles_auxii:ffnnnnn + \__draw_point_intersect_circles_auxii:eennnnn { \fp_eval:n {#1} } { \fp_eval:n {#2} } {#4} {#5} {#6} {#7} {#3} } \cs_new:Npn \__draw_point_intersect_circles_auxii:nnnnnnn #1#2#3#4#5#6#7 { - \__draw_point_intersect_circles_auxiii:ffnnnnn + \__draw_point_intersect_circles_auxiii:eennnnn { \fp_eval:n { #5 - #3 } } { \fp_eval:n { #6 - #4 } } {#1} {#2} {#3} {#4} {#7} } -\cs_generate_variant:Nn \__draw_point_intersect_circles_auxii:nnnnnnn { ff } +\cs_generate_variant:Nn \__draw_point_intersect_circles_auxii:nnnnnnn { ee } \cs_new:Npn \__draw_point_intersect_circles_auxiii:nnnnnnn #1#2#3#4#5#6#7 { - \__draw_point_intersect_circles_auxiv:fnnnnnnn + \__draw_point_intersect_circles_auxiv:ennnnnnn { \fp_eval:n { sqrt( #1 * #1 + #2 * #2 ) } } {#1} {#2} {#3} {#4} {#5} {#6} {#7} } -\cs_generate_variant:Nn \__draw_point_intersect_circles_auxiii:nnnnnnn { ff } +\cs_generate_variant:Nn \__draw_point_intersect_circles_auxiii:nnnnnnn { ee } \cs_new:Npn \__draw_point_intersect_circles_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_intersect_circles_auxv:ffnnnnnnn + \__draw_point_intersect_circles_auxv:eennnnnnn { \fp_eval:n { 1 / #1 } } { \fp_eval:n { #4 * #4 } } {#1} {#2} {#3} {#5} {#6} {#7} {#8} } -\cs_generate_variant:Nn \__draw_point_intersect_circles_auxiv:nnnnnnnn { f } +\cs_generate_variant:Nn \__draw_point_intersect_circles_auxiv:nnnnnnnn { e } \cs_new:Npn \__draw_point_intersect_circles_auxv:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { - \__draw_point_intersect_circles_auxvi:fnnnnnnn + \__draw_point_intersect_circles_auxvi:ennnnnnn { \fp_eval:n { 0.5 * #1 * ( #2 + #3 * #3 - #6 * #6 ) } } {#1} {#2} {#4} {#5} {#7} {#8} {#9} } -\cs_generate_variant:Nn \__draw_point_intersect_circles_auxv:nnnnnnnnn { ff } +\cs_generate_variant:Nn \__draw_point_intersect_circles_auxv:nnnnnnnnn { ee } \cs_new:Npn \__draw_point_intersect_circles_auxvi:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_intersect_circles_auxvii:fffnnnn + \__draw_point_intersect_circles_auxvii:eeennnn { \fp_eval:n { #1 * #2 } } { \int_if_odd:nTF {#8} { 1 } { -1 } } { \fp_eval:n { sqrt ( #3 - #1 * #1 ) * #2 } } {#4} {#5} {#6} {#7} } -\cs_generate_variant:Nn \__draw_point_intersect_circles_auxvi:nnnnnnnn { f } +\cs_generate_variant:Nn \__draw_point_intersect_circles_auxvi:nnnnnnnn { e } \cs_new:Npn \__draw_point_intersect_circles_auxvii:nnnnnnn #1#2#3#4#5#6#7 { \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 } +\cs_generate_variant:Nn \__draw_point_intersect_circles_auxvii:nnnnnnn { eee } \cs_new:Npn \draw_point_intersect_line_circle:nnnnn #1#2#3#4#5 { \__draw_point_process:nnnn @@ -988,54 +993,54 @@ } \cs_new:Npn \__draw_point_intersect_line_circle_auxi:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_intersect_line_circle_auxii:fnnnnnnn + \__draw_point_intersect_line_circle_auxii:ennnnnnn { \fp_eval:n {#1} } {#3} {#4} {#5} {#6} {#7} {#8} {#2} } \cs_new:Npn \__draw_point_intersect_line_circle_auxii:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_intersect_line_circle_auxiii:fffnnnnn + \__draw_point_intersect_line_circle_auxiii:eeennnnn { \fp_eval:n { (#4-#2)*(#4-#2)+(#5-#3)*(#5-#3) } } { \fp_eval:n { 2*((#4-#2)*(#2-#6)+(#5-#3)*(#3-#7)) } } { \fp_eval:n { (#6*#6+#7*#7)+(#2*#2+#3*#3)-(2*(#6*#2+#7*#3))-(#1*#1) } } {#2} {#3} {#4} {#5} {#8} } -\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxii:nnnnnnnn { f } +\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxii:nnnnnnnn { e } \cs_new:Npn \__draw_point_intersect_line_circle_auxiii:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_intersect_line_circle_auxiv:ffnnnnnn + \__draw_point_intersect_line_circle_auxiv:eennnnnn { \fp_eval:n { #2 * #2 - 4 * #1 * #3 } } { \int_if_odd:nTF {#8} { 1 } { -1 } } {#1} {#2} {#4} {#5} {#6} {#7} } -\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxiii:nnnnnnnn { fff } +\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxiii:nnnnnnnn { eee } \cs_new:Npn \__draw_point_intersect_line_circle_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_intersect_line_circle_auxv:fnnnn + \__draw_point_intersect_line_circle_auxv:ennnn { \fp_eval:n { (-1 * #4 + #2 * sqrt(#1)) / (2 * #3) } } {#5} {#6} {#7} {#8} } -\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxiv:nnnnnnnn { ff } +\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxiv:nnnnnnnn { ee } \cs_new:Npn \__draw_point_intersect_line_circle_auxv:nnnnn #1#2#3#4#5 { \draw_point:n { #2 + #1 * (#4 - #2), #3 + #1 * (#5 - #3) } } -\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxv:nnnnn { f } +\cs_generate_variant:Nn \__draw_point_intersect_line_circle_auxv:nnnnn { e } \cs_new:Npn \draw_point_interpolate_line:nnn #1#2#3 { \__draw_point_process:nnn - { \__draw_point_interpolate_line_aux:fnnnn { \fp_eval:n {#1} } } + { \__draw_point_interpolate_line_aux:ennnn { \fp_eval:n {#1} } } {#2} {#3} } \cs_new:Npn \__draw_point_interpolate_line_aux:nnnnn #1#2#3#4#5 { - \__draw_point_interpolate_line_aux:fnnnnn { \fp_eval:n { 1 - #1 } } + \__draw_point_interpolate_line_aux:ennnnn { \fp_eval:n { 1 - #1 } } {#1} {#2} {#3} {#4} {#5} } -\cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnn { f } +\cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnn { e } \cs_new:Npn \__draw_point_interpolate_line_aux:nnnnnn #1#2#3#4#5#6 { \draw_point:n { #2 * #3 + #1 * #5 , #2 * #4 + #1 * #6 } } -\cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnnn { f } +\cs_generate_variant:Nn \__draw_point_interpolate_line_aux:nnnnnn { e } \cs_new:Npn \draw_point_interpolate_distance:nnn #1#2#3 { \__draw_point_process:nn @@ -1046,14 +1051,14 @@ { \__draw_point_process:nn { - \__draw_point_interpolate_distance:fnnnn + \__draw_point_interpolate_distance:ennnn { \fp_eval:n {#1} } {#3} {#4} } { \draw_point_unit_vector:n { ( #2 ) - ( #3 , #4 ) } } } \cs_new:Npn \__draw_point_interpolate_distance:nnnnn #1#2#3#4#5 { \draw_point:n { #2 + #1 * #4 , #3 + #1 * #5 } } -\cs_generate_variant:Nn \__draw_point_interpolate_distance:nnnnn { f } +\cs_generate_variant:Nn \__draw_point_interpolate_distance:nnnnn { e } \cs_new:Npn \draw_point_interpolate_arcaxes:nnnnnn #1#2#3#4#5#6 { \__draw_point_process:nnnn @@ -1062,30 +1067,30 @@ } \cs_new:Npn \__draw_point_interpolate_arcaxes_auxi:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { - \__draw_point_interpolate_arcaxes_auxii:fnnnnnnnn + \__draw_point_interpolate_arcaxes_auxii:ennnnnnnn { \fp_eval:n {#1} } {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} } \cs_new:Npn \__draw_point_interpolate_arcaxes_auxii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { - \__draw_point_interpolate_arcaxes_auxiii:fnnnnnn + \__draw_point_interpolate_arcaxes_auxiii:ennnnnn { \fp_eval:n { #1 * (#3) + ( 1 - #1 ) * (#2) } } {#4} {#5} {#6} {#7} {#8} {#9} } -\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxii:nnnnnnnnn { f } +\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxii:nnnnnnnnn { e } \cs_new:Npn \__draw_point_interpolate_arcaxes_auxiii:nnnnnnn #1#2#3#4#5#6#7 { - \__draw_point_interpolate_arcaxes_auxiv:ffnnnnnn + \__draw_point_interpolate_arcaxes_auxiv:eennnnnn { \fp_eval:n { cosd (#1) } } { \fp_eval:n { sind (#1) } } {#2} {#3} {#4} {#5} {#6} {#7} } -\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiii:nnnnnnn { f } +\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiii:nnnnnnn { e } \cs_new:Npn \__draw_point_interpolate_arcaxes_auxiv:nnnnnnnn #1#2#3#4#5#6#7#8 { \draw_point:n { #3 + #1 * #5 + #2 * #7 , #4 + #1 * #6 + #2 * #8 } } -\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiv:nnnnnnnn { ff } +\cs_generate_variant:Nn \__draw_point_interpolate_arcaxes_auxiv:nnnnnnnn { ee } \cs_new:Npn \draw_point_interpolate_curve:nnnnnn #1#2#3#4#5 { \__draw_point_process:nnnnn @@ -1094,19 +1099,19 @@ } \cs_new:Npn \__draw_point_interpolate_curve_auxi:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { - \__draw_point_interpolate_curve_auxii:fnnnnnnnn + \__draw_point_interpolate_curve_auxii:ennnnnnnn { \fp_eval:n {#1} } {#2} {#3} {#4} {#5} {#6} {#7} {#8} {#9} } \cs_new:Npn \__draw_point_interpolate_curve_auxii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { - \__draw_point_interpolate_curve_auxiii:fnnnnn + \__draw_point_interpolate_curve_auxiii:ennnnn { \fp_eval:n { 1 - #1 } } {#1} { {#2} {#3} } { {#4} {#5} } { {#6} {#7} } { {#8} {#9} } } -\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxii:nnnnnnnnn { f } +\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxii:nnnnnnnnn { e } \cs_new:Npn \__draw_point_interpolate_curve_auxiii:nnnnnn #1#2#3#4#5#6 { \__draw_point_interpolate_curve_auxiv:nnnnnn {#1} {#2} #3 #4 @@ -1115,10 +1120,10 @@ \prg_do_nothing: \__draw_point_interpolate_curve_auxvi:n { {#1} {#2} } } -\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxiii:nnnnnn { f } +\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxiii:nnnnnn { e } \cs_new:Npn \__draw_point_interpolate_curve_auxiv:nnnnnn #1#2#3#4#5#6 { - \__draw_point_interpolate_curve_auxv:ffw + \__draw_point_interpolate_curve_auxv:eew { \fp_eval:n { #1 * #3 + #2 * #5 } } { \fp_eval:n { #1 * #4 + #2 * #6 } } } @@ -1129,12 +1134,12 @@ \prg_do_nothing: #4 { #5 {#1} {#2} } } -\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxv:nnw { ff } +\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxv:nnw { ee } \cs_new:Npn \__draw_point_interpolate_curve_auxvi:n #1 { \__draw_point_interpolate_curve_auxvii:nnnnnnnn #1 } \cs_new:Npn \__draw_point_interpolate_curve_auxvii:nnnnnnnn #1#2#3#4#5#6#7#8 { - \__draw_point_interpolate_curve_auxviii:ffffnn + \__draw_point_interpolate_curve_auxviii:eeeenn { \fp_eval:n { #1 * #5 + #2 * #3 } } { \fp_eval:n { #1 * #6 + #2 * #4 } } { \fp_eval:n { #1 * #7 + #2 * #5 } } @@ -1146,7 +1151,7 @@ \draw_point:n { #5 * #3 + #6 * #1 , #5 * #4 + #6 * #2 } } -\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxviii:nnnnnn { ffff } +\cs_generate_variant:Nn \__draw_point_interpolate_curve_auxviii:nnnnnn { eeee } \dim_new:N \l__draw_xvec_x_dim \dim_new:N \l__draw_xvec_y_dim \dim_new:N \l__draw_yvec_x_dim @@ -1172,7 +1177,7 @@ \draw_yvec:n { 0cm , 1cm } \draw_zvec:n { -0.385cm , -0.385cm } \cs_new:Npn \draw_point_vec:nn #1#2 - { \__draw_point_vec:ff { \fp_eval:n {#1} } { \fp_eval:n {#2} } } + { \__draw_point_vec:ee { \fp_eval:n {#1} } { \fp_eval:n {#2} } } \cs_new:Npn \__draw_point_vec:nn #1#2 { \draw_point:n @@ -1181,39 +1186,39 @@ #1 * \l__draw_xvec_y_dim + #2 * \l__draw_yvec_y_dim } } -\cs_generate_variant:Nn \__draw_point_vec:nn { ff } +\cs_generate_variant:Nn \__draw_point_vec:nn { ee } \cs_new:Npn \draw_point_vec:nnn #1#2#3 { - \__draw_point_vec:fff + \__draw_point_vec:eee { \fp_eval:n {#1} } { \fp_eval:n {#2} } { \fp_eval:n {#3} } } \cs_new:Npn \__draw_point_vec:nnn #1#2#3 { \draw_point:n { - #1 * \l__draw_xvec_x_dim - + #2 * \l__draw_yvec_x_dim - + #3 * \l__draw_zvec_x_dim + #1 * \l__draw_xvec_x_dim + + #2 * \l__draw_yvec_x_dim + + #3 * \l__draw_zvec_x_dim , #1 * \l__draw_xvec_y_dim + #2 * \l__draw_yvec_y_dim + #3 * \l__draw_zvec_y_dim } } -\cs_generate_variant:Nn \__draw_point_vec:nnn { fff } +\cs_generate_variant:Nn \__draw_point_vec:nnn { eee } \cs_new:Npn \draw_point_vec_polar:nn #1#2 { \draw_point_vec_polar:nnn {#1} {#1} {#2} } \cs_new:Npn \draw_point_vec_polar:nnn #1#2#3 - { \__draw_draw_vec_polar:fnn { \fp_eval:n {#3} } {#1} {#2} } + { \__draw_draw_vec_polar:enn { \fp_eval:n {#3} } {#1} {#2} } \cs_new:Npn \__draw_draw_vec_polar:nnn #1#2#3 { \draw_point:n { cosd(#1) * (#2) * \l__draw_xvec_x_dim , sind(#1) * (#3) * \l__draw_yvec_y_dim - } + } } -\cs_generate_variant:Nn \__draw_draw_vec_polar:nnn { f } +\cs_generate_variant:Nn \__draw_draw_vec_polar:nnn { e } \cs_new:Npn \draw_point_transform:n #1 { \__draw_point_process:nn @@ -1358,7 +1363,7 @@ { 0pt } } \box_set_ht:Nn \l__draw_main_box - { \g__draw_ymax_dim + #1 } + { \g__draw_ymax_dim - #1 } } \bool_new:N \l__draw_baseline_bool \dim_new:N \l__draw_baseline_dim @@ -1440,12 +1445,10 @@ \cs_generate_variant:Nn \__draw_softpath_add:n { o, e } \cs_new_protected:Npn \__draw_softpath_use: { - \tl_build_gend:N \g__draw_softpath_main_tl - \tl_set_eq:NN \l__draw_softpath_tmp_tl \g__draw_softpath_main_tl + \tl_build_get_intermediate:NN + \g__draw_softpath_main_tl + \l__draw_softpath_tmp_tl \l__draw_softpath_tmp_tl - \tl_build_gbegin:N \g__draw_softpath_main_tl - \exp_args:NNV \tl_build_gput_right:Nn - \g__draw_softpath_main_tl \l__draw_softpath_tmp_tl } \cs_new_protected:Npn \__draw_softpath_clear: { @@ -1685,7 +1688,7 @@ \tl_put_right:Ne \l__draw_softpath_part_tl { \exp_not:N #4 - \__draw_softpath_round_calc:fVnnnn + \__draw_softpath_round_calc:eVnnnn { \draw_point_interpolate_distance:nnn \l__draw_softpath_corneri_dim @@ -1707,7 +1710,7 @@ \__draw_softpath_round_calc:nnnnw {#3} {#4} {#5} {#6} #1 \s__draw_mark #2 \s__draw_stop } -\cs_generate_variant:Nn \__draw_softpath_round_calc:nnnnnn { fV } +\cs_generate_variant:Nn \__draw_softpath_round_calc:nnnnnn { eV } \cs_new:Npn \__draw_softpath_round_calc:nnnnw #1#2#3#4 #5 , #6 \s__draw_mark #7 , #8 \s__draw_stop { @@ -1853,10 +1856,7 @@ { \__draw_transform_shift_absolute:nn } {#1} } \cs_new_protected:Npn \__draw_transform_shift_absolute:nn #1#2 - { - \dim_set:Nn \l__draw_xshift_dim {#1} - \dim_set:Nn \l__draw_yshift_dim {#2} - } + { \__draw_transform_shift:nnnn { 0pt } { 0pt } {#1} {#2} } \cs_new_protected:Npn \draw_transform_matrix:nnnn #1#2#3#4 { \use:e @@ -1886,14 +1886,35 @@ } \cs_new_protected:Npn \__draw_transform_shift:nn #1#2 { - \dim_set:Nn \l__draw_xshift_dim { \l__draw_xshift_dim + #1 } - \dim_set:Nn \l__draw_yshift_dim { \l__draw_yshift_dim + #2 } + \__draw_transform_shift:nnnn + \l__draw_xshift_dim + \l__draw_yshift_dim + {#1} {#2} + } +\cs_new_protected:Npn \__draw_transform_shift:nnnn #1#2#3#4 + { + \dim_set:Nn \l__draw_xshift_dim + { + \fp_to_dim:n + { + #1 + + ( #3 * \l__draw_matrix_a_fp + #4 * \l__draw_matrix_b_fp ) + } + } + \dim_set:Nn \l__draw_yshift_dim + { + \fp_to_dim:n + { + #2 + + ( #3 * \l__draw_matrix_c_fp + #4 * \l__draw_matrix_d_fp ) + } + } } \cs_new_protected:Npn \draw_transform_matrix_invert: { \bool_if:NT \l__draw_matrix_active_bool { - \__draw_transform_invert:f + \__draw_transform_invert:e { \fp_eval:n { @@ -1917,7 +1938,7 @@ \fp_set:Nn \l__draw_matrix_d_fp { \l__draw_matrix_a_fp * #1 } } -\cs_generate_variant:Nn \__draw_transform_invert:n { f } +\cs_generate_variant:Nn \__draw_transform_invert:n { e } \cs_new_protected:Npn \draw_transform_shift_invert: { \dim_set:Nn \l__draw_xshift_dim { -\l__draw_xshift_dim } @@ -1960,17 +1981,17 @@ \cs_new_protected:Npn \draw_transform_yslant:n #1 { \draw_transform_matrix:nnnn { 1 } { #1 } { 0 } { 1 } } \cs_new_protected:Npn \draw_transform_rotate:n #1 - { \__draw_transform_rotate:f { \fp_eval:n {#1} } } + { \__draw_transform_rotate:e { \fp_eval:n {#1} } } \cs_new_protected:Npn \__draw_transform_rotate:n #1 { - \__draw_transform_rotate:ff + \__draw_transform_rotate:ee { \fp_eval:n { cosd(#1) } } { \fp_eval:n { sind(#1) } } } -\cs_generate_variant:Nn \__draw_transform_rotate:n { f } +\cs_generate_variant:Nn \__draw_transform_rotate:n { e } \cs_new_protected:Npn \__draw_transform_rotate:nn #1#2 { \draw_transform_matrix:nnnn {#1} {#2} { -#2 } { #1 } } -\cs_generate_variant:Nn \__draw_transform_rotate:nn { ff } +\cs_generate_variant:Nn \__draw_transform_rotate:nn { ee } %% %% %% End of file `l3draw.sty'. diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty index 680dec98458..e3f59fdfb17 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty @@ -6,7 +6,7 @@ %% %% l3graphics.dtx (with options: `package') %% -%% Copyright (C) 2019-2023 The LaTeX Project +%% Copyright (C) 2019-2024 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: l3graphics.dtx -\ProvidesExplPackage{l3graphics}{2023-12-08}{} +\ProvidesExplPackage{l3graphics}{2024-01-04}{} {L3 Experimental graphics inclusion support} \dim_new:N \l__graphics_internal_dim \ior_new:N \l__graphics_internal_ior @@ -38,7 +38,7 @@ { art , bleed , crop , media , trim } { \tl_set:Ne \l__graphics_pagebox_tl - { \l_keys_choice_tl box } + { \l_keys_choice_tl box } } , pagebox .initial:n = crop , @@ -203,8 +203,8 @@ \exp_args:Ne \str_tail:n { \str_casefold:V \l__graphics_ext_str } } - } - { \__graphics_include_auxi:e { \l__graphics_type_str } } + } + { \__graphics_include_auxi:e { \l__graphics_type_str } } } \cs_new_protected:Npn \__graphics_include_auxi:n #1 { @@ -220,7 +220,7 @@ { \tl_set_eq:NN \l__graphics_final_name_str \l__graphics_full_name_str \str_set:Ne \l__graphics_full_name_str - { \exp_args:NV \__kernel_file_name_quote:n \l__graphics_full_name_str } + { \exp_args:NV \__kernel_file_name_quote:n \l__graphics_full_name_str } \exp_args:NnV \use:c { __graphics_backend_getbb_ #1 :n } \l__graphics_full_name_str \seq_gput_right:NV \g__graphics_record_seq \l__graphics_final_name_str @@ -268,7 +268,7 @@ \box_set_dp:Nn \l__graphics_internal_box { 0pt } \box_set_ht:Nn \l__graphics_internal_box { \l__graphics_ury_dim - \l__graphics_lly_dim } - \box_set_wd:Nn \l__graphics_internal_box + \box_set_wd:Nn \l__graphics_internal_box { \l__graphics_urx_dim - \l__graphics_llx_dim } \box_use_drop:N \l__graphics_internal_box } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty index d2a45de3d1d..fd33b834ec2 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty @@ -6,7 +6,7 @@ %% %% l3opacity.dtx (with options: `package') %% -%% Copyright (C) 2021-2023 The LaTeX Project +%% Copyright (C) 2021-2024 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 @@ -20,7 +20,7 @@ %% %% File: l3opacity.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3opacity}{2023-12-08}{} +\ProvidesExplPackage{l3opacity}{2024-01-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 5e53ab2beb7..e4037a20166 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty @@ -6,7 +6,7 @@ %% %% l3str-format.dtx (with options: `package') %% -%% Copyright (C) 2011-2023 The LaTeX Project +%% Copyright (C) 2011-2024 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 @@ -20,7 +20,7 @@ %% %% File: l3str-format.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3str-format}{2023-12-08}{} +\ProvidesExplPackage{l3str-format}{2024-01-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 1865433e9c2..2524684f225 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 @@ -6,7 +6,7 @@ %% %% l3sys-shell.dtx (with options: `package') %% -%% Copyright (C) 2018-2023 The LaTeX Project +%% Copyright (C) 2018-2024 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 @@ -20,7 +20,7 @@ %% %% File: l3sys-shell.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3sys-shell}{2023-12-08}{} +\ProvidesExplPackage{l3sys-shell}{2024-01-04}{} {L3 Experimental system shell functions} \scan_new:N \s__sys_stop \quark_new:N \q__sys_nil @@ -45,7 +45,7 @@ \token_if_eq_meaning:NNTF #1 / { \c_backslash_str } {#1} - \__sys_path_to_win:N + \__sys_path_to_win:N } } \cs_new_protected:Npe \sys_shell_cp:nn #1#2 diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty index 6e38dd28685..a88eff7c577 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty @@ -6,7 +6,7 @@ %% %% xcoffins.dtx (with options: `package') %% -%% Copyright (C) 2010-2023 The LaTeX Project +%% Copyright (C) 2010-2024 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: xcoffins.dtx -\ProvidesExplPackage{xcoffins}{2023-12-08}{} +\ProvidesExplPackage{xcoffins}{2024-01-04}{} {L3 Experimental design level coffins} \keys_define:nn { coffin } { @@ -132,9 +132,9 @@ } \NewDocumentCommand \TypesetCoffin { - m - > { \SplitArgument { 1 } { , } } O { H , l } - > { \SplitArgument { 1 } { , } } D ( ) { 0 pt , 0 pt } + m + > { \SplitArgument { 1 } { , } } O { H , l } + > { \SplitArgument { 1 } { , } } D ( ) { 0 pt , 0 pt } } { \coffin_typeset:Nnnnn #1 #2 #3 } \NewDocumentCommand \RotateCoffin { m m } diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index 0dc2d406ee9..b470a77a520 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -6,7 +6,7 @@ %% %% l3galley.dtx (with options: `package') %% -%% Copyright (C) 2010-2023 The LaTeX Project +%% Copyright (C) 2010-2024 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{l3galley}{2023-12-08}{} +\ProvidesExplPackage{l3galley}{2024-01-04}{} {L3 Experimental galley code} \int_new:N \l__galley_tmp_int \seq_new:N \g__galley_tmpa_seq @@ -298,27 +298,27 @@ } \cs_new_protected:Npn \__galley_display_penalty:N #1 { - \tl_if_empty:NF #1 - { - \tl_gput_right:Ne \g_galley_restore_running_tl - { - \int_gset:Nn \exp_not:N \g_galley_penalty_int - { \int_use:N \g_galley_penalty_int } - } - \int_gset:Nn \g_galley_penalty_int {#1} - } + \tl_if_empty:NF #1 + { + \tl_gput_right:Ne \g_galley_restore_running_tl + { + \int_gset:Nn \exp_not:N \g_galley_penalty_int + { \int_use:N \g_galley_penalty_int } + } + \int_gset:Nn \g_galley_penalty_int {#1} + } } \cs_new_protected:Npn \__galley_display_vspace:N #1 { - \tl_if_empty:NF #1 - { - \tl_gput_right:Ne \g_galley_restore_running_tl - { - \skip_gset:Nn \exp_not:N \g_galley_vspace_skip - { \skip_use:N \g_galley_vspace_skip } - } - \skip_gset:Nn \g_galley_vspace_int {#1} - } + \tl_if_empty:NF #1 + { + \tl_gput_right:Ne \g_galley_restore_running_tl + { + \skip_gset:Nn \exp_not:N \g_galley_vspace_skip + { \skip_use:N \g_galley_vspace_skip } + } + \skip_gset:Nn \g_galley_vspace_int {#1} + } } \cs_new_protected:Npn \galley_display_end: { @@ -605,7 +605,7 @@ \seq_get_right:NNF \g__galley_tmpb_seq \l__galley_tmp_tl { \tl_clear:N \l__galley_tmp_tl } \tl_if_empty:NT \l__galley_tmp_tl - { \tl_set:Nn \l__galley_tmp_tl { 0pt } } + { \tl_set:Nn \l__galley_tmp_tl { 0pt } } \int_set:Nn \l__galley_tmp_int { \seq_count: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 cbd2e55be0c..137eef00f13 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty @@ -6,7 +6,7 @@ %% %% xgalley.dtx (with options: `package') %% -%% Copyright (C) 2010-2023 The LaTeX Project +%% Copyright (C) 2010-2024 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: xgalley.dtx -\ProvidesExplPackage{xgalley}{2023-12-08}{} +\ProvidesExplPackage{xgalley}{2024-01-04}{} {L3 Experimental galley} \RequirePackage{xtemplate,l3galley} \clist_new:N \l__galley_tmpa_clist @@ -63,7 +63,7 @@ lines : integer = 1 } \DeclareTemplateInterface { parshape } { initial } { 0 } - { + { indent : length = 0pt , on-left-side : boolean = true , lines : integer = 2 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index df7931e4764..d94bece9e6c 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -63,7 +63,7 @@ %% l3legacy.dtx (with options: `package') %% l3deprecation.dtx (with options: `package') %% -%% Copyright (C) 1990-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 @@ -76,7 +76,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-12-11}% +\def\ExplFileDate{2024-01-04}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -1174,7 +1174,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \__kernel_primitive:NN \Umathoverbarrule \tex_Umathoverbarrule:D \__kernel_primitive:NN \Umathoverbarvgap \tex_Umathoverbarvgap:D \__kernel_primitive:NN \Umathoverdelimiterbgap - \tex_Umathoverdelimiterbgap:D + \tex_Umathoverdelimiterbgap:D \__kernel_primitive:NN \Umathoverdelimitervgap \tex_Umathoverdelimitervgap:D \__kernel_primitive:NN \Umathpunctbinspacing \tex_Umathpunctbinspacing:D @@ -1565,7 +1565,6 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_set:Npn \use_i:nnn #1#2#3 {#1} \cs_set:Npn \use_ii:nnn #1#2#3 {#2} \cs_set:Npn \use_iii:nnn #1#2#3 {#3} -\cs_set:Npn \use_i_ii:nnn #1#2#3 {#1#2} \cs_set:Npn \use_i:nnnn #1#2#3#4 {#1} \cs_set:Npn \use_ii:nnnn #1#2#3#4 {#2} \cs_set:Npn \use_iii:nnnn #1#2#3#4 {#3} @@ -1605,6 +1604,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_set:Npn \use_vii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#7} \cs_set:Npn \use_viii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#8} \cs_set:Npn \use_ix:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#9} +\cs_set:Npn \use_i_ii:nnn #1#2#3 {#1#2} \cs_set:Npn \use_ii_i:nn #1#2 { #2 #1 } \cs_set:Npn \use_none_delimit_by_q_nil:w #1 \q_nil { } \cs_set:Npn \use_none_delimit_by_q_stop:w #1 \q_stop { } @@ -1984,9 +1984,9 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_set:Npn \__cs_tmp:w #1#2 { \cs_set_protected:Npn #1 ##1 - { - \__kernel_chk_if_free_cs:N ##1 - #2 ##1 + { + \__kernel_chk_if_free_cs:N ##1 + #2 ##1 } } \__cs_tmp:w \cs_new_nopar:Npn \cs_gset_nopar:Npn @@ -2653,7 +2653,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \exp_last_two_unbraced:Noo #1#2#3 { \exp_after:wN \__exp_last_two_unbraced:noN \exp_after:wN {#3} {#2} #1 } \cs_new:Npn \__exp_last_two_unbraced:noN #1#2#3 - { \exp_after:wN #3 #2 #1 } + { \exp_after:wN #3 #2 #1 } \cs_new_eq:NN \__kernel_exp_not:w \tex_unexpanded:D \cs_new:Npn \exp_not:c #1 { \exp_after:wN \exp_not:N \cs:w #1 \cs_end: } \cs_new:Npn \exp_not:o #1 { \__kernel_exp_not:w \exp_after:wN {#1} } @@ -3840,7 +3840,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \else: \prg_return_false: \fi: - } + } \exp_args:Nno \use:n { \prg_new_conditional:Npnn \tl_if_blank:n #1 { p , T , F , TF } } { @@ -4646,6 +4646,8 @@ Type H <return> for immediate help}\def~{\errmessage{% #2 #1 \exp_args:Nc \__tl_build_end_loop:NN { \cs_to_str:N #1 ' } #2 } +\cs_new_protected:Npn \tl_build_get_intermediate:NN + { \__tl_build_get:NNN \__kernel_tl_set:Ne } \cs_new_protected:Npn \__tl_build_get:NNN #1#2#3 { #1 #3 { \if_false: { \fi: \exp_after:wN \__tl_build_get:w #2 } } } \cs_new:Npn \__tl_build_get:w #1 \__tl_build_last:NNn #2#3#4 @@ -5321,9 +5323,9 @@ Type H <return> for immediate help}\def~{\errmessage{% \int_compare:nNnTF {`#2} < { "E0 } { \__str_change_case_codepoint:nNN } { - \int_compare:nNnTF {`#2} < { "F0 } - { \__str_change_case_codepoint:nNNN } - { \__str_change_case_codepoint:nNNNNN } + \int_compare:nNnTF {`#2} < { "F0 } + { \__str_change_case_codepoint:nNNN } + { \__str_change_case_codepoint:nNNNNN } } {#1} #2 } @@ -5383,7 +5385,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { \codepoint_str_generate:n {#2} \tl_if_blank:nF {#3} - { \codepoint_str_generate:n {#3} } + { \codepoint_str_generate:n {#3} } } } } @@ -5607,10 +5609,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \if_false: { \fi: } \tl_set:Nn \l__seq_internal_b_tl {##1} #1 #2 - { \if_false: } \fi: - \exp_not:o {#2} - \tl_if_eq:NNT \l__seq_internal_a_tl \l__seq_internal_b_tl - { \use_none:nn } + { \if_false: } \fi: + \exp_not:o {#2} + \tl_if_eq:NNT \l__seq_internal_a_tl \l__seq_internal_b_tl + { \use_none:nn } } \__seq_wrap_item:n {##1} } @@ -7867,14 +7869,14 @@ Type H <return> for immediate help}\def~{\errmessage{% \sys_if_engine_xetex:TF { xetex } { - \sys_if_output_pdf:TF + \sys_if_output_pdf:TF { \sys_if_engine_pdftex:TF { pdftex } { luatex } } { dvips } - } + } } } \__sys_finalise:n @@ -9869,9 +9871,9 @@ Type H <return> for immediate help}\def~{\errmessage{% { \use:c { \c__msg_text_prefix_tl #2 / #3 } #4 } { \c__msg_continue_text_tl } { - \c__msg_no_info_text_tl - \tl_if_empty:NF #5 - { \\ \\ #5 } + \c__msg_no_info_text_tl + \tl_if_empty:NF #5 + { \\ \\ #5 } } } { @@ -9879,9 +9881,9 @@ Type H <return> for immediate help}\def~{\errmessage{% { \use:c { \c__msg_text_prefix_tl #2 / #3 } #4 } { \c__msg_help_text_tl } { - \use:c { \c__msg_more_text_prefix_tl #2 / #3 } #4 - \tl_if_empty:NF #5 - { \\ \\ #5 } + \use:c { \c__msg_more_text_prefix_tl #2 / #3 } #4 + \tl_if_empty:NF #5 + { \\ \\ #5 } } } } @@ -10023,7 +10025,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { nnVV , nnVn , nnnV , nnne , nnnx , nnee , nnxx } \cs_generate_variant:cn { msg_ #1 :nnnnn } { nnnee , nnnxx , nneee , nnxxx } - \cs_generate_variant:cn { msg_ #1 :nnnnnn } { nneeee , nnxxxx } + \cs_generate_variant:cn { msg_ #1 :nnnnnn } { nneeee , nnxxxx } } \__msg_class_new:nn { fatal } { @@ -10069,14 +10071,14 @@ Type H <return> for immediate help}\def~{\errmessage{% { ( \l__msg_name_str ) \prg_replicate:nn - { - \str_count:N \l__msg_text_str - - \str_count:N \l__msg_name_str - } + { + \str_count:N \l__msg_text_str + - \str_count:N \l__msg_name_str + } { ~ } - } - { } #1 - #1 { } + } + { } #1 + #1 { } } \__msg_class_new:nn { warning } { @@ -10390,7 +10392,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \msg_new:nnnn { kernel } { no-elapsed-time } { No~clock~detected~for~#1. } { The~current~engine~provides~no~way~to~access~the~system~time. } - } + } \msg_new:nnnn { kernel } { non-base-function } { Function~'#1'~is~not~a~base~function } { @@ -11193,12 +11195,12 @@ Type H <return> for immediate help}\def~{\errmessage{% \__kernel_tl_set:Ne \l__iow_newline_tl { \tl_to_str:N \l__iow_newline_tl } \int_set:Nn \l__iow_line_target_int { \l_iow_line_count_int - \str_count:N \l__iow_newline_tl + 1 } - \int_compare:nNnT { \l__iow_line_target_int } < 0 - { - \tl_set:Nn \l__iow_newline_tl { \iow_newline: } - \int_set:Nn \l__iow_line_target_int - { \l_iow_line_count_int + 1 } - } + \int_compare:nNnT { \l__iow_line_target_int } < 0 + { + \tl_set:Nn \l__iow_newline_tl { \iow_newline: } + \int_set:Nn \l__iow_line_target_int + { \l_iow_line_count_int + 1 } + } \__iow_wrap_do: \exp_args:NNf \group_end: #4 { \tl_to_str:N \l__iow_wrap_tl } @@ -11871,7 +11873,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { \file_full_name:n {#1} } { \file_full_name:n {#3} } #2 - } + } \prg_generate_conditional_variant:Nnn \file_compare_timestamp:nNn { nNV , V , VNV } { p , T , F , TF } \cs_new:Npn \__file_compare_timestamp:nnN #1#2#3 @@ -11887,11 +11889,11 @@ Type H <return> for immediate help}\def~{\errmessage{% { \tl_if_blank:nTF {#2} { - \if_charcode:w #3 > - \prg_return_true: - \else: - \prg_return_false: - \fi: + \if_charcode:w #3 > + \prg_return_true: + \else: + \prg_return_false: + \fi: } { \if_int_compare:w @@ -12132,8 +12134,8 @@ Type H <return> for immediate help}\def~{\errmessage{% { \exp_args:NV \__file_kernel_dependency_compare:nnn \c__kernel_expl_date_tl {#1} - } - { \__file_kernel_dependency_compare:nnn { 0000-00-00 } {#1} } + } + { \__file_kernel_dependency_compare:nnn { 0000-00-00 } {#1} } } \cs_new_protected:Npn \__file_kernel_dependency_compare:nnn #1 #2 #3 { @@ -12742,8 +12744,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \prg_new_conditional:Npnn \skip_if_eq:nn #1#2 { p , T , F , TF } { \str_if_eq:eeTF { \skip_eval:n {#1} } { \skip_eval:n {#2} } - { \prg_return_true: } - { \prg_return_false: } + { \prg_return_true: } + { \prg_return_false: } } \cs_set_protected:Npn \__skip_tmp:w #1 { @@ -12950,9 +12952,9 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new:Npn \__keyval_misplaced_equal_after_active_error:w \s__keyval_mark ##1 \s__keyval_stop \s__keyval_mark ##2 \s__keyval_nil - = \s__keyval_mark \__keyval_split_active_auxii:w - \s__keyval_mark ##3 \s__keyval_nil - #2 \s__keyval_mark \__keyval_clean_up_active:w + = \s__keyval_mark \__keyval_split_active_auxii:w + \s__keyval_mark ##3 \s__keyval_nil + #2 \s__keyval_mark \__keyval_clean_up_active:w { \msg_expandable_error:nn { keyval } { misplaced-equals-sign } @@ -13149,12 +13151,11 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \__keys_property_find:n #1 { - \cs_set_nopar:Npe \l__keys_property_str { \__keys_trim_spaces:n { #1 } } - \exp_after:wN \__keys_property_find_auxi:w \l__keys_property_str + \exp_after:wN \__keys_property_find_auxi:w \tl_to_str:n {#1} \s__keys_nil \__keys_property_find_auxii:w . \s__keys_nil \__keys_property_find_err:w } -\cs_new_protected:Npn \__keys_property_find_auxi:w #1 . #2 \s__keys_nil #3 +\cs_new:Npn \__keys_property_find_auxi:w #1 . #2 \s__keys_nil #3 { #3 #1 \s__keys_mark #2 \s__keys_nil #3 } @@ -13163,22 +13164,24 @@ Type H <return> for immediate help}\def~{\errmessage{% \__keys_property_find_err:w { \cs_set_nopar:Npe \l_keys_path_str - { \str_if_empty:NF \l__keys_module_str { \l__keys_module_str / } #1 } - \__keys_property_find_auxi:w #2 \s__keys_nil \__keys_property_find_auxiii:w . \s__keys_nil - \__keys_property_find_auxiv:w + { + \str_if_empty:NF \l__keys_module_str { \l__keys_module_str / } + \exp_after:wN \__keys_trim_spaces:n \tex_expanded:D {{ + #1 + \if_false: }}} \fi: + \__keys_property_find_auxi:w #2 \s__keys_nil \__keys_property_find_auxiii:w + . \s__keys_nil \__keys_property_find_auxiv:w } -\cs_new_protected:Npn \__keys_property_find_auxiii:w #1 \s__keys_mark +\cs_new:Npn \__keys_property_find_auxiii:w #1 \s__keys_mark #2 . #3 \s__keys_nil #4 { - \cs_set_nopar:Npe \l_keys_path_str { \l_keys_path_str . #1 } - \__keys_property_find_auxi:w + . #1 #4 #2 \s__keys_mark #3 \s__keys_nil #4 } -\cs_new_protected:Npn \__keys_property_find_auxiv:w +\cs_new:Npn \__keys_property_find_auxiv:w #1 \s__keys_nil \__keys_property_find_auxiii:w \s__keys_mark \s__keys_nil \__keys_property_find_auxiv:w { + \if_false: {{{ \fi: }}} \cs_set_nopar:Npe \l__keys_property_str { . #1 } - \cs_set_nopar:Npe \l_keys_path_str - { \exp_after:wN \__keys_trim_spaces:n \exp_after:wN { \l_keys_path_str } } \tl_set_eq:NN \l_keys_path_tl \l_keys_path_str } \cs_new_protected:Npn \__keys_property_find_err:w @@ -13365,8 +13368,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \__keys_default_set:n { true } \cs_if_exist:cF { if#1 } { - \cs:w newif \exp_after:wN \cs_end: - \cs:w if#1 \cs_end: + \cs:w newif \exp_after:wN \cs_end: + \cs:w if#1 \cs_end: } } \cs_new_protected:Npn \__keys_meta_make:n #1 @@ -14021,7 +14024,19 @@ Type H <return> for immediate help}\def~{\errmessage{% { \cs_if_exist:cTF { \c__keys_code_root_str \l__keys_module_str / unknown } - { \__keys_execute:no { \l__keys_module_str / unknown } \l_keys_value_tl } + { + \bool_if:NT \l__keys_no_value_bool + { + \cs_if_exist:cT + { \c__keys_default_root_str \l__keys_module_str / unknown } + { + \tl_set_eq:Nc + \l_keys_value_tl + { \c__keys_default_root_str \l__keys_module_str / unknown } + } + } + \__keys_execute:no { \l__keys_module_str / unknown } \l_keys_value_tl + } { \msg_error:nnee { keys } { unknown } \l_keys_path_str \l__keys_module_str @@ -14818,7 +14833,7 @@ Type H <return> for immediate help}\def~{\errmessage{% #2#3#4; {#5} ; } \cs_new:Npn \__fp_basics_pack_weird_high:NNNNNNNNw - 1 #1#2#3#4 #5#6#7#8 #9; { ; {#1#2#3#4} {#5#6#7#8} {#9} } + 1 #1#2#3#4 #5#6#7#8 #9; { ; {#1#2#3#4} {#5#6#7#8} {#9} } \cs_new:Npn \__fp_decimate:nNnnnn #1 { \cs:w @@ -20624,10 +20639,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__fp_randint_auxiv_o:ww #1#2#3#4#5 ; #6#7#8#9 { \if_int_compare:w - \if_int_compare:w #1#2 > #6#7 \exp_stop_f: 1 \else: + \if_int_compare:w #1#2 > #6#7 \exp_stop_f: 1 \else: \if_int_compare:w #1#2 < #6#7 \exp_stop_f: - \fi: \fi: - #3#4 > #8#9 \exp_stop_f: - \__fp_use_i_until_s:nw + #3#4 > #8#9 \exp_stop_f: + \__fp_use_i_until_s:nw \fi: \__fp_randint_auxv_o:w {#1}{#2}{#3}{#4}#5 } @@ -20723,8 +20738,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \exp_after:wN \__fp_randint_wide_auxii:w \int_value:w \__fp_int_eval:w #5 * #3 + #6 * #1 + (#5 * #4 + #6 * #3 + #7 * #1 + - (#5 * #2 + #7 * #3 + - (16384 * #6 + #7) * (16384 * #4 + #2) / 268435456) / 16384 + (#5 * #2 + #7 * #3 + + (16384 * #6 + #7) * (16384 * #4 + #2) / 268435456) / 16384 ) / 16384 \exp_after:wN ; \int_value:w \__fp_int_eval:w (#5 + #6) * 16384 + #7 ; #1 ; #5 ; @@ -21476,34 +21491,32 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__fp_array_item_normal:w #1 #2#3#4#5 #6 ; #7 ; #8 ; #9 { #9 \s__fp \__fp_chk:w 1 #1 {#8} #7 {#2#3#4#5} {#6} ; } %% File: l3bitset.dtx +\cs_if_exist:NT \@expl@finalise@setup@@ + { + \tl_gput_right:Nn \@expl@finalise@setup@@ + { \declare@file@substitution { l3bitset.sty } { null.tex } } + } \cs_new_protected:Npn \bitset_new:N #1 { \__kernel_chk_if_free_cs:N #1 \cs_gset_eq:NN #1 \c_zero_str \prop_new:c { g__bitset_ \cs_to_str:N #1 _name_prop } } - \cs_new_protected:Npn \bitset_new:Nn #1 #2 { \__kernel_chk_if_free_cs:N #1 \cs_gset_eq:NN #1 \c_zero_str \prop_new:c { g__bitset_ \cs_to_str:N #1 _name_prop } \prop_gset_from_keyval:cn - { g__bitset_ \cs_to_str:N #1 _name_prop } - {#2} + { g__bitset_ \cs_to_str:N #1 _name_prop } + {#2} } \cs_generate_variant:Nn \bitset_new:N { c } -\prop_new:N \l__bitset_tmp_prop +\cs_generate_variant:Nn \bitset_new:Nn { c } \cs_new_protected:Npn \bitset_addto_named_index:Nn #1#2 { - \prop_set_from_keyval:Nn \l__bitset_tmp_prop {#2} - \prop_map_inline:Nn \l__bitset_tmp_prop - { - \prop_gput:cnn - { g__bitset_ \cs_to_str:N #1 _name_prop } - {##1} - {##2} - } + \prop_gput_from_keyval:cn + { g__bitset_ \cs_to_str:N #1 _name_prop } { #2 } } \prg_new_eq_conditional:NNn \bitset_if_exist:N \str_if_exist:N { p , T , F , TF } @@ -21531,12 +21544,12 @@ Type H <return> for immediate help}\def~{\errmessage{% } } { - #1 #2 + #1 #2 { \str_range:Nnn #2 { 1 } { -1 - (#3) } #4 \str_range:Nnn #2 { 1 - (#3) } { -1 } - } + } } } } @@ -21609,13 +21622,11 @@ Type H <return> for immediate help}\def~{\errmessage{% #1 \q_recursion_tail \q_recursion_stop } } - \cs_new:Npn \__bitset_to_int:nN #1#2 { \quark_if_recursion_tail_stop_do:Nn #2 {#1} \exp_args:Nf \__bitset_to_int:nN { \fp_eval:n { #1 * 2 + #2 } } } - \cs_new:Npn \bitset_to_bin:N #1 { #1 @@ -21632,41 +21643,44 @@ Type H <return> for immediate help}\def~{\errmessage{% { 0 - ( \prop_item:cn { g__bitset_ \cs_to_str:N #1 _name_prop } {#2} ) } +0 } - } - { - 0 - } + } + { + 0 + } } \cs_generate_variant:Nn \bitset_item:Nn { c } \cs_new_protected:Npn \bitset_show:N { \__bitset_show:NN \msg_show:nneeee } \cs_generate_variant:Nn \bitset_show:N { c } \cs_new_protected:Npn \bitset_log:N { \__bitset_show:NN \msg_log:nneeee } \cs_generate_variant:Nn \bitset_log:N { c } -\cs_new_protected:Npn \bitset_show_named_index:N { \__bitset_show_named_index:NN \msg_show:nneeee } -\cs_generate_variant:Nn \bitset_show_named_index:N { c } \cs_new_protected:Npn \__bitset_show:NN #1#2 { \__kernel_chk_defined:NT #2 { #1 { bitset } { show } - { \token_to_str:N #2 } - { \bitset_to_bin:N #2 } - { \bitset_to_arabic:N #2 } - { } + { \token_to_str:N #2 } + { \bitset_to_bin:N #2 } + { \bitset_to_arabic:N #2 } + { } } } +\cs_new_protected:Npn \bitset_show_named_index:N + { \__bitset_show_named_index:NN \msg_show:nneeee } +\cs_generate_variant:Nn \bitset_show_named_index:N { c } +\cs_new_protected:Npn \bitset_log_named_index:N + { \__bitset_show_named_index:NN \msg_log:nneeee } +\cs_generate_variant:Nn \bitset_log_named_index:N { c } \cs_new_protected:Npn \__bitset_show_named_index:NN #1#2 { \__kernel_chk_defined:NT #2 { #1 { bitset } { show-names } - { \token_to_str:N #2 } - { \prop_map_function:cN { g__bitset_ \cs_to_str:N #2 _name_prop } \msg_show_item:nn } - { } - { } + { \token_to_str:N #2 } + { \prop_map_function:cN { g__bitset_ \cs_to_str:N #2 _name_prop } \msg_show_item:nn } + { } { } } } - \msg_new:nnn { bitset } { show } +\msg_new:nnn { bitset } { show } { The~bitset~#1~has~the~representation: \\ >~binary:~#2 \\ @@ -22591,14 +22605,14 @@ Type H <return> for immediate help}\def~{\errmessage{% } \group_begin: \__kernel_tl_set:Ne \l__str_internal_tl { \tl_to_str:n { 0123456789ABCDEF } } - \tl_map_inline:Nn \l__str_internal_tl - { - \tl_map_inline:Nn \l__str_internal_tl - { - \tl_const:ce { c__str_byte_ \int_eval:n {"#1##1} _tl } - { \char_generate:nn { "#1##1 } { 12 } #1 ##1 } - } - } + \tl_map_inline:Nn \l__str_internal_tl + { + \tl_map_inline:Nn \l__str_internal_tl + { + \tl_const:ce { c__str_byte_ \int_eval:n {"#1##1} _tl } + { \char_generate:nn { "#1##1 } { 12 } #1 ##1 } + } + } \group_end: \tl_const:cn { c__str_byte_-1_tl } { { } \use_none:n { } } \cs_new:Npn \__str_output_byte:n #1 @@ -24666,7 +24680,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__regex_use_none_delimit_by_q_nil:w #1 \q__regex_nil { } \__kernel_quark_new_conditional:Nn \__regex_quark_if_nil:N { F } \cs_new_protected:Npn \__regex_break_true:w - #1 \__regex_break_point:TF #2 #3 {#2} + #1 \__regex_break_point:TF #2 #3 {#2} \cs_new_protected:Npn \__regex_break_point:TF #1 #2 { #2 } \cs_new_protected:Npn \__regex_item_reverse:n #1 { @@ -26939,7 +26953,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \int_set:Nn \l__regex_curr_pos_int { \l__regex_start_pos_int - 1 } \int_set_eq:NN \l__regex_curr_char_int \l__regex_last_char_success_int - \tl_build_get:NN \l__regex_matched_analysis_tl \l__regex_internal_a_tl + \tl_build_get_intermediate:NN \l__regex_matched_analysis_tl \l__regex_internal_a_tl \exp_args:NNf \__regex_match_once_init_aux: \tl_map_inline:nn { \exp_after:wN \l__regex_internal_a_tl \l__regex_curr_analysis_tl } @@ -28563,7 +28577,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_protected:Npn \__regex_trace_push:nnN #1#2#3 { \__regex_trace:nne {#1} {#2} { entering~ \token_to_str:N #3 } } \cs_new_protected:Npn \__regex_trace_pop:nnN #1#2#3 - { \__regex_trace:nne {#1} {#2} { leaving~ \token_to_str:N #3 } } + { \__regex_trace:nne {#1} {#2} { leaving~ \token_to_str:N #3 } } \cs_new_protected:Npn \__regex_trace:nne #1#2#3 { \int_compare:nNnF @@ -28792,10 +28806,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_generate_variant:Nn \hbox_set_to_wd:Nnw { c } \cs_generate_variant:Nn \hbox_gset_to_wd:Nnw { c } \cs_new_protected:Npn \hbox_to_wd:nn #1#2 - { - \tex_hbox:D to \__box_dim_eval:n {#1} - { \color_group_begin: #2 \color_group_end: } - } + { + \tex_hbox:D to \__box_dim_eval:n {#1} + { \color_group_begin: #2 \color_group_end: } + } \cs_new_protected:Npn \hbox_to_zero:n #1 { \tex_hbox:D to \c_zero_dim @@ -29461,9 +29475,9 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__color_convert_rgb_cmyk:w #1 ~ #2 ~ #3 \s__color_stop { \exp_args:Neee \__color_convert_rgb_cmyk:nnn - { \fp_eval:n { 1 - #1 } } - { \fp_eval:n { 1 - #2 } } - { \fp_eval:n { 1 - #3 } } + { \fp_eval:n { 1 - #1 } } + { \fp_eval:n { 1 - #2 } } + { \fp_eval:n { 1 - #3 } } } \cs_new:Npn \__color_convert_rgb_cmyk:nnn #1#2#3 { @@ -29511,9 +29525,9 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_protected:Npn \__color_parse_set_eq:Nn #1#2 { \tl_if_empty:NTF \l_color_fixed_model_tl - { \exp_args:Nv \__color_parse_set_eq:nNn { l__color_named_ #2 _tl } } - { \exp_args:NV \__color_parse_set_eq:nNn \l_color_fixed_model_tl } - #1 {#2} + { \exp_args:Nv \__color_parse_set_eq:nNn { l__color_named_ #2 _tl } } + { \exp_args:NV \__color_parse_set_eq:nNn \l_color_fixed_model_tl } + #1 {#2} } \cs_new_protected:Npn \__color_parse_set_eq:nNn #1#2#3 { @@ -29525,8 +29539,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \tl_set_eq:Nc \l__color_model_tl { l__color_named_ #3 _tl } \prop_get:cVN { l__color_named_ #3 _prop } \l__color_model_tl \l__color_value_tl - \__color_convert:nnN - \l__color_model_tl {#1} \l__color_value_tl + \__color_convert:nnN + \l__color_model_tl {#1} \l__color_value_tl \tl_set:Ne #2 { {#1} @@ -29722,11 +29736,11 @@ Type H <return> for immediate help}\def~{\errmessage{% \use:e { \exp_not:N \__color_parse_model_hsb_aux:nnnnn - { \__color_parse_number:n {#4} } - { \fp_eval:n { round(#4 * (1 - #3) ,5) } } - { \fp_eval:n { round(#4 * ( 1 - #3 * #2 ) ,5) } } - { \fp_eval:n { round(#4 * ( 1 - #3 * (1 - #2) ) ,5) } } - {#1} + { \__color_parse_number:n {#4} } + { \fp_eval:n { round(#4 * (1 - #3) ,5) } } + { \fp_eval:n { round(#4 * ( 1 - #3 * #2 ) ,5) } } + { \fp_eval:n { round(#4 * ( 1 - #3 * (1 - #2) ) ,5) } } + {#1} } } \cs_new:Npn \__color_parse_model_hsb_aux:nnnnn #1#2#3#4#5 @@ -30420,10 +30434,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \tl_const:cn { c__color_fallback_ #1 _tl } { cmyk } \cs_new:cpn { __color_convert_ #1 _cmyk:w } ##1 \s__color_stop { - \fp_eval:n {##1 * #3} ~ - \fp_eval:n {##1 * #4} ~ - \fp_eval:n {##1 * #5} ~ - \fp_eval:n {##1 * #6} + \fp_eval:n {##1 * #3} ~ + \fp_eval:n {##1 * #4} ~ + \fp_eval:n {##1 * #5} ~ + \fp_eval:n {##1 * #6} } \cs_new:cpn { __color_convert_cmyk_ #1 :w } ##1 \s__color_stop { 1 } \prop_gput:Nnn \g__color_alternative_values_prop {#1} { #3 , #4 , #5 , #6 } @@ -30435,9 +30449,9 @@ Type H <return> for immediate help}\def~{\errmessage{% \tl_const:cn { c__color_fallback_ #1 _tl } { rgb } \cs_new:cpn { __color_convert_ #1 _rgb:w } ##1 \s__color_stop { - \fp_eval:n {##1 * #3} ~ - \fp_eval:n {##1 * #4} ~ - \fp_eval:n {##1 * #5} + \fp_eval:n {##1 * #3} ~ + \fp_eval:n {##1 * #4} ~ + \fp_eval:n {##1 * #5} } \cs_new:cpn { __color_convert_rgb_ #1 :w } ##1 \s__color_stop { 1 } \prop_gput:Nnn \g__color_alternative_values_prop {#1} { #3 , #4 , #5 } @@ -30522,7 +30536,7 @@ Type H <return> for immediate help}\def~{\errmessage{% {#2} \clist_map_break:n { \use_none:nnnn } } - } + } } { \str_if_eq:nnF {##1} { none } @@ -31171,37 +31185,37 @@ Type H <return> for immediate help}\def~{\errmessage{% \prg_new_conditional:Npnn \pdf_version_compare:Nn #1#2 { p , T , F , TF } { \use:c { __pdf_version_compare_ #1 :w } #2 . . \s__pdf_stop } \cs_new:cpn { __pdf_version_compare_=:w } #1 . #2 . #3 \s__pdf_stop - { - \bool_lazy_and:nnTF - { \int_compare_p:nNn \__pdf_backend_version_major: = {#1} } - { \int_compare_p:nNn \__pdf_backend_version_minor: = {#2} } - { \prg_return_true: } - { \prg_return_false: } - } + { + \bool_lazy_and:nnTF + { \int_compare_p:nNn \__pdf_backend_version_major: = {#1} } + { \int_compare_p:nNn \__pdf_backend_version_minor: = {#2} } + { \prg_return_true: } + { \prg_return_false: } + } \cs_new:cpn { __pdf_version_compare_<:w } #1 . #2 . #3 \s__pdf_stop - { - \bool_lazy_or:nnTF - { \int_compare_p:nNn \__pdf_backend_version_major: < {#1} } - { - \bool_lazy_and_p:nn - { \int_compare_p:nNn \__pdf_backend_version_major: = {#1} } - { \int_compare_p:nNn \__pdf_backend_version_minor: < {#2} } - } - { \prg_return_true: } - { \prg_return_false: } - } + { + \bool_lazy_or:nnTF + { \int_compare_p:nNn \__pdf_backend_version_major: < {#1} } + { + \bool_lazy_and_p:nn + { \int_compare_p:nNn \__pdf_backend_version_major: = {#1} } + { \int_compare_p:nNn \__pdf_backend_version_minor: < {#2} } + } + { \prg_return_true: } + { \prg_return_false: } + } \cs_new:cpn { __pdf_version_compare_>:w } #1 . #2 . #3 \s__pdf_stop - { - \bool_lazy_or:nnTF - { \int_compare_p:nNn \__pdf_backend_version_major: > {#1} } - { - \bool_lazy_and_p:nn - { \int_compare_p:nNn \__pdf_backend_version_major: = {#1} } - { \int_compare_p:nNn \__pdf_backend_version_minor: > {#2} } - } - { \prg_return_true: } - { \prg_return_false: } - } + { + \bool_lazy_or:nnTF + { \int_compare_p:nNn \__pdf_backend_version_major: > {#1} } + { + \bool_lazy_and_p:nn + { \int_compare_p:nNn \__pdf_backend_version_major: = {#1} } + { \int_compare_p:nNn \__pdf_backend_version_minor: > {#2} } + } + { \prg_return_true: } + { \prg_return_false: } + } \cs_new_protected:Npn \pdf_version_gset:n #1 { \__pdf_version_gset:w #1 . . \s__pdf_stop } \cs_new_protected:Npn \pdf_version_min_gset:n #1 @@ -31504,7 +31518,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \box_set_eq:NN #1 #2 \prop_set_eq:cc { coffin ~ \__coffin_to_value:N #1 ~ corners } { coffin ~ \__coffin_to_value:N #2 ~ corners } - \prop_set_eq:cc { coffin ~ \__coffin_to_value:N #1 ~ poles } + \prop_set_eq:cc { coffin ~ \__coffin_to_value:N #1 ~ poles } { coffin ~ \__coffin_to_value:N #2 ~ poles } } } @@ -31516,7 +31530,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \box_gset_eq:NN #1 #2 \prop_gset_eq:cc { coffin ~ \__coffin_to_value:N #1 ~ corners } { coffin ~ \__coffin_to_value:N #2 ~ corners } - \prop_gset_eq:cc { coffin ~ \__coffin_to_value:N #1 ~ poles } + \prop_gset_eq:cc { coffin ~ \__coffin_to_value:N #1 ~ poles } { coffin ~ \__coffin_to_value:N #2 ~ poles } } } @@ -31742,7 +31756,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { ( \dim_to_fp:n {#7} / \dim_to_fp:n {#8} ) * ( \dim_to_fp:n {#4} - \dim_to_fp:n {#6} ) - + \dim_to_fp:n {#5} + + \dim_to_fp:n {#5} } } } @@ -31917,13 +31931,13 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_protected:Npn \__coffin_find_corner_maxima_aux:nn #1#2 { \dim_set:Nn \l__coffin_left_corner_dim - { \dim_min:nn { \l__coffin_left_corner_dim } {#1} } + { \dim_min:nn { \l__coffin_left_corner_dim } {#1} } \dim_set:Nn \l__coffin_right_corner_dim - { \dim_max:nn { \l__coffin_right_corner_dim } {#1} } + { \dim_max:nn { \l__coffin_right_corner_dim } {#1} } \dim_set:Nn \l__coffin_bottom_corner_dim - { \dim_min:nn { \l__coffin_bottom_corner_dim } {#2} } + { \dim_min:nn { \l__coffin_bottom_corner_dim } {#2} } \dim_set:Nn \l__coffin_top_corner_dim - { \dim_max:nn { \l__coffin_top_corner_dim } {#2} } + { \dim_max:nn { \l__coffin_top_corner_dim } {#2} } } \cs_new_protected:Npn \__coffin_find_bounding_shift: { @@ -32089,13 +32103,13 @@ Type H <return> for immediate help}\def~{\errmessage{% \dim_compare:nNnT \l__coffin_internal_dim < \c_zero_dim { \__kernel_kern:n { -\l__coffin_internal_dim } } } - \__coffin_reset_structure:N \l__coffin_aligned_coffin - \prop_clear:c - { - coffin ~ \__coffin_to_value:N \l__coffin_aligned_coffin - \c_space_tl corners - } - \__coffin_update_poles:N \l__coffin_aligned_coffin + \__coffin_reset_structure:N \l__coffin_aligned_coffin + \prop_clear:c + { + coffin ~ \__coffin_to_value:N \l__coffin_aligned_coffin + \c_space_tl corners + } + \__coffin_update_poles:N \l__coffin_aligned_coffin \dim_compare:nNnTF \l__coffin_offset_x_dim < \c_zero_dim { \__coffin_offset_poles:Nnn #1 { -\l__coffin_offset_x_dim } { 0pt } @@ -32602,7 +32616,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { ~ } { \char_generate:nn {#1} { 12 } } } - \cs_new:Npn \codepoint_generate:nn #1#2 + \cs_new:Npn \codepoint_generate:nn #1#2 { \int_compare:nNnTF {#1} = { `\ } { ~ } @@ -32675,11 +32689,11 @@ Type H <return> for immediate help}\def~{\errmessage{% } } } - \cs_new:Npn \__codepoint_generate:n #1 - { - \__kernel_exp_not:w \exp_after:wN \exp_after:wN \exp_after:wN - { \char_generate:nn {#1} { 13 } } - } + \cs_new:Npn \__codepoint_generate:n #1 + { + \__kernel_exp_not:w \exp_after:wN \exp_after:wN \exp_after:wN + { \char_generate:nn {#1} { 13 } } + } } \cs_new:Npn \__kernel_codepoint_to_bytes:n #1 { @@ -32709,7 +32723,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \__codepoint_to_bytes_outputi:nw { \__codepoint_to_bytes_auxii:Nnn F - {#1} { 64 * 64 * 64 } + {#1} { 64 * 64 * 64 } } \__codepoint_to_bytes_outputii:nw { @@ -32898,18 +32912,18 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_set_protected:Npe \__codepoint_data_auxv:nnnnw #1#2#3#4#5 Last> #6 \q_stop { - \exp_not:N \tl_if_blank:nTF {#6} - { - \exp_not:N \__codepoint_range:nnn {#1} { category } - { \exp_not:V \l__codepoint_category_Cn_tl } - \exp_not:N \__codepoint_range:nnn {#1} { uppercase } { 0 } - \exp_not:N \__codepoint_range:nnn {#1} { lowercase } { 0 } - } - { - \exp_not:N \__codepoint_range:nnn {#1} { category } {#2} - \exp_not:N \__codepoint_range:nnn {#1} { uppercase } {#3} - \exp_not:N \__codepoint_range:nnn {#1} { lowercase } {#4} - } + \exp_not:N \tl_if_blank:nTF {#6} + { + \exp_not:N \__codepoint_range:nnn {#1} { category } + { \exp_not:V \l__codepoint_category_Cn_tl } + \exp_not:N \__codepoint_range:nnn {#1} { uppercase } { 0 } + \exp_not:N \__codepoint_range:nnn {#1} { lowercase } { 0 } + } + { + \exp_not:N \__codepoint_range:nnn {#1} { category } {#2} + \exp_not:N \__codepoint_range:nnn {#1} { uppercase } {#3} + \exp_not:N \__codepoint_range:nnn {#1} { lowercase } {#4} + } } \cs_set_protected:Npn \__codepoint_range:nnn #1 { @@ -32936,20 +32950,20 @@ Type H <return> for immediate help}\def~{\errmessage{% \int_compare:nNnT { \clist_count:c { l__codepoint_ #3 _block_clist } } = \c__codepoint_block_size_int { \__codepoint_save_blocks:nn {#3} { 1 } } - \int_compare:nNnF - { \int_div_truncate:nn { #2 - #1 } \c__codepoint_block_size_int } = 0 - { - \tl_set:ce { l__codepoint_ #3 _block_clist } - { - \exp_args:NNe \use:nn \use_none:n - { \prg_replicate:nn { \c__codepoint_block_size_int } { , #4 } } - } - \__codepoint_save_blocks:nn {#3} - { \int_div_truncate:nn { (#2 - #1) } \c__codepoint_block_size_int } - } - \prg_replicate:nn - { \int_mod:nn { #2 - #1 } \c__codepoint_block_size_int } - { \clist_put_right:ce { l__codepoint_ #3 _block_clist } {#4} } + \int_compare:nNnF + { \int_div_truncate:nn { #2 - #1 } \c__codepoint_block_size_int } = 0 + { + \tl_set:ce { l__codepoint_ #3 _block_clist } + { + \exp_args:NNe \use:nn \use_none:n + { \prg_replicate:nn { \c__codepoint_block_size_int } { , #4 } } + } + \__codepoint_save_blocks:nn {#3} + { \int_div_truncate:nn { (#2 - #1) } \c__codepoint_block_size_int } + } + \prg_replicate:nn + { \int_mod:nn { #2 - #1 } \c__codepoint_block_size_int } + { \clist_put_right:ce { l__codepoint_ #3 _block_clist } {#4} } } \cs_set_protected:Npn \__codepoint_save_blocks:nn #1#2 { @@ -32990,13 +33004,13 @@ Type H <return> for immediate help}\def~{\errmessage{% \__codepoint_range:nnn { 110000 } {##1} { 0 } \__codepoint_finalise_blocks:n {##1} } - } + } \cs_set_protected:Npn \__codepoint_finalise_blocks:n #1 { \cs_gset_eq:cc { c__codepoint_ #1 _index_intarray } { g__codepoint_ #1 _index_intarray } \cs_undefine:c { g__codepoint_ #1 _index_intarray } \intarray_new:cn { g__codepoint_ #1 _blocks_intarray } - { ( \tl_use:c { l__codepoint_ #1 _block_tl } - 1 ) * \c__codepoint_block_size_int } + { ( \tl_use:c { l__codepoint_ #1 _block_tl } - 1 ) * \c__codepoint_block_size_int } \int_step_inline:nn { \tl_use:c { l__codepoint_ #1 _block_tl } - 1 } { \exp_args:Nv \__codepoint_finalise_blocks:nnn @@ -33330,15 +33344,15 @@ Type H <return> for immediate help}\def~{\errmessage{% \if_catcode:w \exp_not:N #1 \c_space_token 10 \else: - \if_catcode:w \exp_not:N #1 \c_catcode_letter_token - 11 - \else: - \if_catcode:w \exp_not:N #1 \c_catcode_other_token - 12 - \else: - 13 - \fi: - \fi: + \if_catcode:w \exp_not:N #1 \c_catcode_letter_token + 11 + \else: + \if_catcode:w \exp_not:N #1 \c_catcode_other_token + 12 + \else: + 13 + \fi: + \fi: \fi: \fi: \fi: @@ -33387,9 +33401,9 @@ Type H <return> for immediate help}\def~{\errmessage{% \int_compare:nNnTF { `#2 } < { "E0 } { \__text_codepoint_process:nNN } { - \int_compare:nNnTF { `#2 } < { "F0 } - { \__text_codepoint_process:nNNN } - { \__text_codepoint_process:nNNNN } + \int_compare:nNnTF { `#2 } < { "F0 } + { \__text_codepoint_process:nNNN } + { \__text_codepoint_process:nNNNN } } {#1} #2 } @@ -33598,10 +33612,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \token_if_eq_meaning:NNTF #1 #2 { \__text_use_i_delimit_by_q_recursion_stop:nw - { - \__text_expand_store:n {#1} - \__text_expand_math_loop:Nw #3 - } + { + \__text_expand_store:n {#1} + \__text_expand_math_loop:Nw #3 + } } { \__text_expand_math_search:NNN #1 } } @@ -33912,7 +33926,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { \__text_change_case:nnnn {#1} {#1} {#2} {#3} } \cs_new:Npn \__text_change_case:nnnn #1#2#3#4 { - \__kernel_exp_not:w \exp_after:wN + \__kernel_exp_not:w \exp_after:wN { \exp:w \exp_args:Ne \__text_change_case_auxi:nnnn @@ -34052,10 +34066,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \token_if_eq_meaning:NNTF #4 #5 { \__text_use_i_delimit_by_q_recursion_stop:nw - { - \__text_change_case_store:n {#4} - \__text_change_case_math_loop:nnnNw {#1} {#2} {#3} #6 - } + { + \__text_change_case_store:n {#4} + \__text_change_case_math_loop:nnnNw {#1} {#2} {#3} #6 + } } { \__text_change_case_math_search:nnnNNN {#1} {#2} {#3} #4 } } @@ -34133,8 +34147,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__text_change_case_exclude:nnnNnn #1#2#3#4#5#6 { \tl_if_blank:nTF {#5} - { \__text_change_case_store:n { #4 {#6} } } - { + { \__text_change_case_store:n { #4 {#6} } } + { \__text_change_case_store:o { \exp_after:wN #4 @@ -34215,7 +34229,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { \__text_change_case_store:v { c__text_ #1 case_ \token_to_str:N #6 _tl } - \use:c { __text_change_case_next_ #2 :nnn } {#2} {#4} {#5} + \use:c { __text_change_case_next_ #2 :nnn } {#2} {#4} {#5} } { \__text_change_case_store:n {#6} @@ -34387,10 +34401,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \codepoint_generate:nn {#2} { \char_value_catcode:n {#2} } \tl_if_blank:nF {#3} - { - \codepoint_generate:nn {#3} - { \char_value_catcode:n {#3} } - } + { + \codepoint_generate:nn {#3} + { \char_value_catcode:n {#3} } + } } } } @@ -34472,10 +34486,10 @@ Type H <return> for immediate help}\def~{\errmessage{% \__text_codepoint_compare:nNnTF {#5} = { "00DF } { \__text_change_case_store:e - { - \codepoint_generate:nn { "1E9E } - { \__text_change_case_catcode:nn {#5} { "1E9E } } - } + { + \codepoint_generate:nn { "1E9E } + { \__text_change_case_catcode:nn {#5} { "1E9E } } + } \use:c { __text_change_case_next_ #2 :nnn } {#2} {#3} {#4} } @@ -34879,7 +34893,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \else: \if_int_compare:w #1 = "1FCF \exp_stop_f: \prg_return_true: - \else: + \else: \if_int_compare:w #1 = "1FDD \exp_stop_f: \prg_return_true: \else: @@ -35083,15 +35097,15 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__text_change_case_breathing:nnnnnnw #1#2#3#4#5#6#7 \q_mark { \tl_if_blank:nTF {#7} - { - \__text_change_case_breathing_aux:nnnnnn - {#1} {#2} {#3} {#4} {#5} {#6} - } - { - \__text_codepoint_process:nN - { \__text_change_case_breathing:nnnnnnw {#1} {#2} {#3} {#4} {#5} } - #7 \q_mark - } + { + \__text_change_case_breathing_aux:nnnnnn + {#1} {#2} {#3} {#4} {#5} {#6} + } + { + \__text_codepoint_process:nN + { \__text_change_case_breathing:nnnnnnw {#1} {#2} {#3} {#4} {#5} } + #7 \q_mark + } } \cs_new:Npn \__text_change_case_breathing_aux:nnnnnn #1#2#3#4#5#6 { @@ -35118,12 +35132,12 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new:Npn \__text_change_case_breathing_dialytika:nnnn #1#2#3#4 { - \__text_change_case_if_takes_dialytika:nTF {#4} - { - \__text_change_case_upper_el_dialytika:n {#4} - \__text_change_case_loop:nnnw {#1} {#2} {#3} - } - { \__text_change_case_loop:nnnw {#1} {#2} {#3} #4 } + \__text_change_case_if_takes_dialytika:nTF {#4} + { + \__text_change_case_upper_el_dialytika:n {#4} + \__text_change_case_loop:nnnw {#1} {#2} {#3} + } + { \__text_change_case_loop:nnnw {#1} {#2} {#3} #4 } } \cs_new:Npn \__text_change_case_title_el:nnnnn #1#2#3#4#5 { \__text_change_case_codepoint:nnnnn {#1} {#2} {#3} {#4} {#5} } @@ -35244,7 +35258,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \tl_if_head_is_N_type:nTF {#4} { \__text_change_case_lower_lt:nnnN } { \__text_change_case_loop:nnnw } - {#1} {#2} {#3} #4 \q__text_recursion_stop + {#1} {#2} {#3} #4 \q__text_recursion_stop } \cs_new:Npn \__text_change_case_lower_lt:nnnN #1#2#3#4 { @@ -35277,7 +35291,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \__text_change_case_loop:nnnw {#1} {#2} {#3} #4 } \cs_new:Npn \__text_change_case_upper_lt:nnnnn #1#2#3#4#5 - { + { \exp_args:Ne \__text_change_case_upper_lt_aux:nnnnn { \int_case:nn { \__text_codepoint_from_chars:Nw #5 } @@ -35287,7 +35301,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { "012F } { "012E } } } - {#2} {#3} {#4} {#5} + {#2} {#3} {#4} {#5} } \cs_new:Npn \__text_change_case_upper_lt_aux:nnnnn #1#2#3#4#5 { @@ -35511,11 +35525,11 @@ Type H <return> for immediate help}\def~{\errmessage{% } } \bool_lazy_or:nnF - { \sys_if_engine_luatex_p: } - { \sys_if_engine_xetex_p: } - { - \text_declare_uppercase_mapping:nn { "01F0 } { \v { J } } - } + { \sys_if_engine_luatex_p: } + { \sys_if_engine_xetex_p: } + { + \text_declare_uppercase_mapping:nn { "01F0 } { \v { J } } + } %% File: l3text-map.dtx \cs_new:Npn \text_map_function:nN #1#2 { \exp_args:Ne \__text_map_function:nN { \text_expand:n {#1} } #2 } @@ -35929,7 +35943,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \token_if_eq_meaning:NNTF #1 #2 { \__text_use_i_delimit_by_q_recursion_stop:nw - { \__text_purify_math_start:NNw #2 #3 } + { \__text_purify_math_start:NNw #2 #3 } } { \__text_purify_math_search:NNN #1 } } @@ -36448,8 +36462,6 @@ Type H <return> for immediate help}\def~{\errmessage{% #1 #2 { #3 } \__seq_pop_item_def: } -\cs_new_protected:Npn \tl_build_get:NN - { \__tl_build_get:NNN \__kernel_tl_set:Ne } %% File: l3legacy.dtx \prg_new_conditional:Npnn \legacy_if:n #1 { p , T , F , TF } { @@ -36489,9 +36501,9 @@ Type H <return> for immediate help}\def~{\errmessage{% \__kernel_deprecation_error:Nnn #4 {#2} {#1} } { \tex_let:D #4 \scan_stop: } - \cs_if_eq:NNTF #3 \cs_gset_protected:Npn - { \__deprecation_warn_once:nnNnn {#1} {#2} #4 {#5} {#6} } - { \__deprecation_patch_aux:Nn #3 { #4 #5 {#6} } } + \cs_if_eq:NNTF #3 \cs_gset_protected:Npn + { \__deprecation_warn_once:nnNnn {#1} {#2} #4 {#5} {#6} } + { \__deprecation_patch_aux:Nn #3 { #4 #5 {#6} } } } \cs_new_protected:Npn \__deprecation_warn_once:nnNnn #1#2#3#4#5 { @@ -36862,6 +36874,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_protected:Npn \tl_build_clear:N { \tl_build_begin:N } \__kernel_patch_deprecation:nnNNpn { 2023-10-18 } { \tl_build_gbegin:N } \cs_new_protected:Npn \tl_build_gclear:N { \tl_build_gbegin:N } +\__kernel_patch_deprecation:nnNNpn { 2023-10-25 } { \tl_build_get_intermediate:NN } +\cs_new_protected:Npn \tl_build_get:NN { \tl_build_get_intermediate:NN } \__kernel_patch_deprecation:nnNNpn { 2022-10-09 } { [ \codepoint_generate:nn ] } \cs_gset:Npn \char_to_utfviii_bytes:n { \__kernel_codepoint_to_bytes:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-09 } { \codepoint_to_nfd:n } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index c96edbd9b76..ea54c39293e 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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{2023-12-11}% +\def\ExplFileDate{2024-01-04}% \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 75aab50ff85..a37c8e41829 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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{2023-12-11}% +\def\ExplFileDate{2024-01-04}% \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 8310a87a26e..0ed3d56ab8c 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-2023 The LaTeX Project +-- Copyright (C) 1990-2024 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 bfe4628271b..6e2bffbc859 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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{2023-12-11}% +\def\ExplFileDate{2024-01-04}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3bitset.sty b/Master/texmf-dist/tex/latex/l3kernel/l3bitset.sty deleted file mode 100644 index 1e1631029c9..00000000000 --- a/Master/texmf-dist/tex/latex/l3kernel/l3bitset.sty +++ /dev/null @@ -1,26 +0,0 @@ -%% -%% This is file `l3bitset.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% l3bitset.dtx (with options: `stub') -%% -%% 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 -%% this license or (at your option) any later version. The latest -%% version of this license is in the file: -%% -%% https://www.latex-project.org/lppl.txt -%% -%% This file is part of the "l3kernel bundle" (The Work in LPPL) -%% and all files in that bundle must be distributed together. -%% -%% File: l3bitset.dtx -\ProvidesExplPackage{l3bitset}{2023-12-11}{} - {L3 Experimental bitset support} -%% -%% -%% End of file `l3bitset.sty'. diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def index bd49697deb4..28e21e3a6eb 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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: l3debug.dtx -\ProvidesExplFile{l3debug.def}{2023-12-11}{}{L3 Debugging support} +\ProvidesExplFile{l3debug.def}{2024-01-04}{}{L3 Debugging support} \scan_new:N \s__debug_stop \cs_new:Npn \__debug_use_i_delimit_by_s_stop:nw #1 #2 \s__debug_stop {#1} \quark_new:N \q__debug_recursion_tail @@ -28,12 +28,12 @@ #1 \q__debug_recursion_stop { } \__kernel_quark_new_test:N \__debug_if_recursion_tail_stop:N \cs_set_protected:Npn \debug_on:n #1 - { + { \exp_args:No \clist_map_inline:nn { \tl_to_str:n {#1} } - { + { \cs_if_exist_use:cF { __debug_ ##1 _on: } { \msg_error:nnn { debug } { debug } {##1} } - } + } } \cs_set_protected:Npn \debug_off:n #1 { diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index 7c9f338b9ed..c8603e6af79 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 @@ -20,7 +20,7 @@ %% %% File: l3doc.dtx \RequirePackage{calc} -\ProvidesExplClass{l3doc}{2023-12-11}{} +\ProvidesExplClass{l3doc}{2024-01-04}{} {L3 Experimental documentation class} \clist_new:N \g_docinput_clist \seq_new:N \g_doc_functions_seq @@ -386,11 +386,11 @@ \bool_gset_true:N \g__codedoc_typeset_documentation_bool \bool_gset_true:N \g__codedoc_typeset_implementation_bool } , - onlydoc .code:n = - { - \bool_gset_true:N \g__codedoc_typeset_documentation_bool - \bool_gset_false:N \g__codedoc_typeset_implementation_bool - } , + onlydoc .code:n = + { + \bool_gset_true:N \g__codedoc_typeset_documentation_bool + \bool_gset_false:N \g__codedoc_typeset_implementation_bool + } , check .bool_gset:N = \g__codedoc_checkfunc_bool , checktest .bool_gset:N = \g__codedoc_checktest_bool , kernel .bool_gset:N = \g__codedoc_kernel_bool , @@ -693,28 +693,28 @@ \@ } \bool_if:NT \l__codedoc_allow_indexing_bool - { - \bool_if:NF \l__codedoc_cmd_noindex_bool - { - \quark_if_no_value:NF \l__codedoc_cmd_index_tl - { - \__kernel_tl_set:Ne \l__codedoc_cmd_tl - { \c_backslash_str \exp_not:o { \l__codedoc_cmd_index_tl } } - } - \exp_args:No \__codedoc_key_get:n { \l__codedoc_cmd_tl } - \quark_if_no_value:NF \l__codedoc_cmd_module_tl + { + \bool_if:NF \l__codedoc_cmd_noindex_bool { - \__kernel_tl_set:Ne \l__codedoc_index_module_tl - { \tl_to_str:N \l__codedoc_cmd_module_tl } + \quark_if_no_value:NF \l__codedoc_cmd_index_tl + { + \__kernel_tl_set:Ne \l__codedoc_cmd_tl + { \c_backslash_str \exp_not:o { \l__codedoc_cmd_index_tl } } + } + \exp_args:No \__codedoc_key_get:n { \l__codedoc_cmd_tl } + \quark_if_no_value:NF \l__codedoc_cmd_module_tl + { + \__kernel_tl_set:Ne \l__codedoc_index_module_tl + { \tl_to_str:N \l__codedoc_cmd_module_tl } + } + \__codedoc_special_index_module:ooonN + { \l__codedoc_index_key_tl } + { \l__codedoc_index_macro_tl } + { \l__codedoc_index_module_tl } + { usage } + \l__codedoc_index_internal_bool } - \__codedoc_special_index_module:ooonN - { \l__codedoc_index_key_tl } - { \l__codedoc_index_macro_tl } - { \l__codedoc_index_module_tl } - { usage } - \l__codedoc_index_internal_bool - } - } + } } \cs_generate_variant:Nn \__codedoc_cmd:nn { no } \cs_new_protected:Npn \__codedoc_meta:n #1 @@ -1154,7 +1154,10 @@ \__codedoc_typeset_aux:n { \__codedoc_get_function_name:n {#1} } : \int_compare:nTF { \seq_count:N \g__codedoc_variants_seq == 1 } - { \seq_use:Nn \g__codedoc_variants_seq { } } + { + \seq_use:Nn \g__codedoc_variants_seq { } + \bool_if:NT #2 { \__codedoc_typeset_TF: } + } { \hbox_set:Nn \l_tmpa_box { \seq_use:Nn \g__codedoc_variants_seq { \textrm| \nolinebreak[2] } } @@ -1367,9 +1370,14 @@ { \__codedoc_names_block_base_map:N \__codedoc_macro_save_names_aux:n } { \seq_gput_right:Ne \g__codedoc_nested_names_seq - { \tl_to_str:N \l__codedoc_macro_documented_tl } + { + \exp_after:wN \__codedoc_macro_save_names_aux:w + \l__codedoc_macro_documented_tl \q__codedoc_stop + } } } +\cs_new:Npn \__codedoc_macro_save_names_aux:w #1#2 \q__codedoc_stop + { \token_to_str:N #1 \tl_to_str:n {#2} } \cs_new_protected:Npn \__codedoc_macro_save_names_aux:n #1 { \seq_gput_right:Nn \g__codedoc_nested_names_seq {#1} } \cs_new_protected:Npn \__codedoc_macro_exclude_index: @@ -1556,21 +1564,21 @@ \cs_new_protected:Npn \__codedoc_macro_end_check_tested: { \bool_lazy_all:nT - { - { \g__codedoc_checktest_bool } - { ! \l__codedoc_macro_var_bool } - { ! \l__codedoc_macro_tested_bool } - } - { - \seq_set_filter:NNn \l__codedoc_tmpa_seq \l__codedoc_names_seq - { ! \__codedoc_if_macro_internal_p:n {##1} } - \seq_gput_right:Ne \g__codedoc_not_tested_seq - { - \seq_use:Nn \l__codedoc_tmpa_seq { , } - \bool_if:NTF \l__codedoc_macro_pTF_bool {~(pTF)} - { \bool_if:NT \l__codedoc_macro_TF_bool {~(TF)} } - } - } + { + { \g__codedoc_checktest_bool } + { ! \l__codedoc_macro_var_bool } + { ! \l__codedoc_macro_tested_bool } + } + { + \seq_set_filter:NNn \l__codedoc_tmpa_seq \l__codedoc_names_seq + { ! \__codedoc_if_macro_internal_p:n {##1} } + \seq_gput_right:Ne \g__codedoc_not_tested_seq + { + \seq_use:Nn \l__codedoc_tmpa_seq { , } + \bool_if:NTF \l__codedoc_macro_pTF_bool {~(pTF)} + { \bool_if:NT \l__codedoc_macro_TF_bool {~(TF)} } + } + } } \cs_new_protected:Npn \__codedoc_macro_end_style:n #1 { @@ -1676,17 +1684,17 @@ \providecommand\Hy@footnote@currentHref{} \prop_new:N\g__codedoc_fnmark_prop \cs_new_protected:Npn \__codedoc_fn_store: - { - \prop_gput:Nee\g__codedoc_fnmark_prop - {fn\int_use:N\c@footnote}{{\Hy@footnote@currentHref}{\int_use:N\c@footnote}} - } + { + \prop_gput:Nee\g__codedoc_fnmark_prop + {fn\int_use:N\c@footnote}{{\Hy@footnote@currentHref}{\int_use:N\c@footnote}} + } \cs_new_protected:Npn \__codedoc_fn_restore:n #1 - { - \prop_get:NnN \g__codedoc_fnmark_prop {fn#1}\l__codedoc_tmpa_tl - \tl_gset:Ne\Hy@footnote@currentHref - {\exp_last_unbraced:NV\use_i:nn \l__codedoc_tmpa_tl } - \setcounter{footnote}{\exp_last_unbraced:NV\use_ii:nn \l__codedoc_tmpa_tl} - } + { + \prop_get:NnN \g__codedoc_fnmark_prop {fn#1}\l__codedoc_tmpa_tl + \tl_gset:Ne\Hy@footnote@currentHref + {\exp_last_unbraced:NV\use_i:nn \l__codedoc_tmpa_tl } + \setcounter{footnote}{\exp_last_unbraced:NV\use_ii:nn \l__codedoc_tmpa_tl} + } \cs_generate_variant:Nn \hook_gput_next_code:nn {ne} \cs_new_protected:Npn \__codedoc_fn_footnote:nn #1 #2 @@ -1767,7 +1775,7 @@ { #1 \endinput } } \cs_if_exist:NT \MaybeStop - { \RenewCommandCopy \MaybeStop \StopEventually } + { \RenewCommandCopy \MaybeStop \StopEventually } \DeclareDocumentCommand \Finale { } { \tl_use:N \g__codedoc_finale_tl } \tl_new:N \g__codedoc_finale_tl diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex b/Master/texmf-dist/tex/latex/l3kernel/l3docstrip.tex index 8fcf63f298b..eda3985bd07 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 54adf9feaff..485fa39a1df 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 4ab1e049fd7..a7af4567560 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 b5215733061..ec28015dd4c 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 0a8ac3617e1..b28db7deda2 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 f257fd601ac..a154a1c0cb5 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 2d58b3c24c0..ca071e99247 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 affcaa2a421..44d4a1ae608 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 1b0704ddb37..d54a4820c7d 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 66420548171..d195b703b44 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 6fe60ae6937..2249de98bcc 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 aa6ff115378..e54409a6e1d 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 108430014d0..e7c6e888cc0 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 ea4d8964a85..292b3600ee5 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 80b9ac039b5..eef8f134bb1 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 a2625b60792..cb640b641a3 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-2023 The LaTeX Project +%% Copyright (C) 1990-2024 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 |