diff options
author | Karl Berry <karl@freefriends.org> | 2023-04-19 20:13:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-04-19 20:13:27 +0000 |
commit | 7205df83f0e5aba8062fbe04f85f9a5db4ddf04c (patch) | |
tree | 2ab0d6a7b7816c7b0bda554fc20bf68935d06778 /Master/texmf-dist/tex/latex | |
parent | d529e97b80a83d8a5b94a1e551c8ecaf931164d6 (diff) |
l3 (19apr23)
git-svn-id: svn://tug.org/texlive/trunk@66896 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
20 files changed, 257 insertions, 168 deletions
diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def index 1605e579e34..4f3eb45eb97 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvipdfmx.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvipdfmx.def}{2023-03-30}{} + {l3backend-dvipdfmx.def}{2023-04-19}{} {L3 backend support: dvipdfmx} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -488,7 +488,7 @@ \cs_if_exist:NTF \hook_gput_code:nnn { \hook_gput_code:nnn - { file / l3graphics.sty / after } + { package / l3graphics / after } { backend } {#1} } @@ -592,7 +592,7 @@ \tl_if_empty:NF \l__graphics_decodearray_str { /Decode~[ \l__graphics_decodearray_str ] } \bool_if:NT \l__graphics_interpolate_bool - { /Interpolate~true> } + { /Interpolate~true } >> } } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def index 330811ca4e6..62287189df8 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvips.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvips.def}{2023-03-30}{} + {l3backend-dvips.def}{2023-04-19}{} {L3 backend support: dvips} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -584,7 +584,7 @@ \cs_if_exist:NTF \hook_gput_code:nnn { \hook_gput_code:nnn - { file / l3graphics.sty / after } + { package / l3graphics / after } { backend } {#1} } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def index 07a699aa05b..def201f4e9d 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-dvisvgm.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-dvisvgm.def}{2023-03-30}{} + {l3backend-dvisvgm.def}{2023-04-19}{} {L3 backend support: dvisvgm} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -479,7 +479,7 @@ \cs_if_exist:NTF \hook_gput_code:nnn { \hook_gput_code:nnn - { file / l3graphics.sty / after } + { package / l3graphics / after } { backend } {#1} } @@ -629,7 +629,6 @@ \__graphics_backend_loaded:n { \cs_new_eq:NN \__graphics_backend_get_pagecount:n \__graphics_get_pagecount:n } %% File: l3backend-pdf.dtx -\box_new:N \l__pdf_internal_box \cs_new_protected:Npn \__pdf_backend_annotation:nnnn #1#2#3#4 { } \cs_new:Npn \__pdf_backend_annotation_last: { } \cs_new_protected:Npn \__pdf_backend_link_begin_goto:nnw #1#2 { } diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def index 6ca51746e32..040c5415daf 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-luatex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-luatex.def}{2023-03-30}{} + {l3backend-luatex.def}{2023-04-19}{} {L3 backend support: PDF output (LuaTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -493,7 +493,7 @@ \cs_if_exist:NTF \hook_gput_code:nnn { \hook_gput_code:nnn - { file / l3graphics.sty / after } + { package / l3graphics / after } { backend } {#1} } @@ -505,19 +505,20 @@ \l_graphics_search_ext_seq { .pdf , .eps , .ps , .png , .jpg , .jpeg } } -\tl_new:N \l__graphics_graphics_attr_tl +\tl_new:N \l__graphics_attr_tl \cs_new_protected:Npn \__graphics_backend_getbb_jpg:n #1 { \int_zero:N \l__graphics_page_int \tl_clear:N \l__graphics_pagebox_tl - \tl_set:Nx \l__graphics_graphics_attr_tl + \tl_set:Nx \l__graphics_attr_tl { \tl_if_empty:NF \l__graphics_decodearray_str { :D \l__graphics_decodearray_str } \bool_if:NT \l__graphics_interpolate_bool { :I } + \str_if_empty:NF \l__graphics_pdf_str + { :X \l__graphics_pdf_str } } - \tl_clear:N \l__graphics_graphics_attr_tl \__graphics_backend_getbb_auxi:n {#1} } \cs_new_eq:NN \__graphics_backend_getbb_jpeg:n \__graphics_backend_getbb_jpg:n @@ -526,33 +527,38 @@ { \tl_clear:N \l__graphics_decodearray_str \bool_set_false:N \l__graphics_interpolate_bool - \tl_set:Nx \l__graphics_graphics_attr_tl + \tl_set:Nx \l__graphics_attr_tl { : \l__graphics_pagebox_tl \int_compare:nNnT \l__graphics_page_int > 1 { :P \int_use:N \l__graphics_page_int } + \str_if_empty:NF \l__graphics_pdf_str + { :X \l__graphics_pdf_str } } \__graphics_backend_getbb_auxi:n {#1} } \cs_new_protected:Npn \__graphics_backend_getbb_auxi:n #1 { - \__graphics_bb_restore:xF { #1 \l__graphics_graphics_attr_tl } + \__graphics_bb_restore:xF { #1 \l__graphics_attr_tl } { \__graphics_backend_getbb_auxii:n {#1} } } \cs_new_protected:Npn \__graphics_backend_getbb_auxii:n #1 { \exp_args:Ne \__graphics_backend_getbb_auxiii:n { \__graphics_backend_dequote:w #1 " #1 " \s__graphics_stop } - \int_const:cn { c__graphics_ #1 \l__graphics_graphics_attr_tl _int } + \int_const:cn { c__graphics_ #1 \l__graphics_attr_tl _int } { \tex_the:D \tex_pdflastximage:D } - \__graphics_bb_save:x { #1 \l__graphics_graphics_attr_tl } + \__graphics_bb_save:x { #1 \l__graphics_attr_tl } } \cs_new_protected:Npn \__graphics_backend_getbb_auxiii:n #1 { \tex_immediate:D \tex_pdfximage:D - \bool_lazy_or:nnT - { \l__graphics_interpolate_bool } - { ! \tl_if_empty_p:N \l__graphics_decodearray_str } + \bool_lazy_any:nT + { + { \l__graphics_interpolate_bool } + { ! \tl_if_empty_p:N \l__graphics_decodearray_str } + { ! \str_if_empty_p:N \l__graphics_pdf_str } + } { attr ~ { @@ -560,6 +566,7 @@ { /Decode~[ \l__graphics_decodearray_str ] } \bool_if:NT \l__graphics_interpolate_bool { /Interpolate~true } + \l__graphics_pdf_str } } \int_compare:nNnT \l__graphics_page_int > 0 @@ -576,7 +583,7 @@ \cs_new_protected:Npn \__graphics_backend_include_jpg:n #1 { \tex_pdfrefximage:D - \int_use:c { c__graphics_ #1 \l__graphics_graphics_attr_tl _int } + \int_use:c { c__graphics_ #1 \l__graphics_attr_tl _int } } \cs_new_eq:NN \__graphics_backend_include_jpeg:n \__graphics_backend_include_jpg:n \cs_new_eq:NN \__graphics_backend_include_pdf:n \__graphics_backend_include_jpg:n diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def index 4e63907755c..1592155c3c0 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-pdftex.def}{2023-03-30}{} + {l3backend-pdftex.def}{2023-04-19}{} {L3 backend support: PDF output (pdfTeX)} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -492,7 +492,7 @@ \cs_if_exist:NTF \hook_gput_code:nnn { \hook_gput_code:nnn - { file / l3graphics.sty / after } + { package / l3graphics / after } { backend } {#1} } @@ -504,19 +504,20 @@ \l_graphics_search_ext_seq { .pdf , .eps , .ps , .png , .jpg , .jpeg } } -\tl_new:N \l__graphics_graphics_attr_tl +\tl_new:N \l__graphics_attr_tl \cs_new_protected:Npn \__graphics_backend_getbb_jpg:n #1 { \int_zero:N \l__graphics_page_int \tl_clear:N \l__graphics_pagebox_tl - \tl_set:Nx \l__graphics_graphics_attr_tl + \tl_set:Nx \l__graphics_attr_tl { \tl_if_empty:NF \l__graphics_decodearray_str { :D \l__graphics_decodearray_str } \bool_if:NT \l__graphics_interpolate_bool { :I } + \str_if_empty:NF \l__graphics_pdf_str + { :X \l__graphics_pdf_str } } - \tl_clear:N \l__graphics_graphics_attr_tl \__graphics_backend_getbb_auxi:n {#1} } \cs_new_eq:NN \__graphics_backend_getbb_jpeg:n \__graphics_backend_getbb_jpg:n @@ -525,33 +526,38 @@ { \tl_clear:N \l__graphics_decodearray_str \bool_set_false:N \l__graphics_interpolate_bool - \tl_set:Nx \l__graphics_graphics_attr_tl + \tl_set:Nx \l__graphics_attr_tl { : \l__graphics_pagebox_tl \int_compare:nNnT \l__graphics_page_int > 1 { :P \int_use:N \l__graphics_page_int } + \str_if_empty:NF \l__graphics_pdf_str + { :X \l__graphics_pdf_str } } \__graphics_backend_getbb_auxi:n {#1} } \cs_new_protected:Npn \__graphics_backend_getbb_auxi:n #1 { - \__graphics_bb_restore:xF { #1 \l__graphics_graphics_attr_tl } + \__graphics_bb_restore:xF { #1 \l__graphics_attr_tl } { \__graphics_backend_getbb_auxii:n {#1} } } \cs_new_protected:Npn \__graphics_backend_getbb_auxii:n #1 { \exp_args:Ne \__graphics_backend_getbb_auxiii:n { \__graphics_backend_dequote:w #1 " #1 " \s__graphics_stop } - \int_const:cn { c__graphics_ #1 \l__graphics_graphics_attr_tl _int } + \int_const:cn { c__graphics_ #1 \l__graphics_attr_tl _int } { \tex_the:D \tex_pdflastximage:D } - \__graphics_bb_save:x { #1 \l__graphics_graphics_attr_tl } + \__graphics_bb_save:x { #1 \l__graphics_attr_tl } } \cs_new_protected:Npn \__graphics_backend_getbb_auxiii:n #1 { \tex_immediate:D \tex_pdfximage:D - \bool_lazy_or:nnT - { \l__graphics_interpolate_bool } - { ! \tl_if_empty_p:N \l__graphics_decodearray_str } + \bool_lazy_any:nT + { + { \l__graphics_interpolate_bool } + { ! \tl_if_empty_p:N \l__graphics_decodearray_str } + { ! \str_if_empty_p:N \l__graphics_pdf_str } + } { attr ~ { @@ -559,6 +565,7 @@ { /Decode~[ \l__graphics_decodearray_str ] } \bool_if:NT \l__graphics_interpolate_bool { /Interpolate~true } + \l__graphics_pdf_str } } \int_compare:nNnT \l__graphics_page_int > 0 @@ -575,7 +582,7 @@ \cs_new_protected:Npn \__graphics_backend_include_jpg:n #1 { \tex_pdfrefximage:D - \int_use:c { c__graphics_ #1 \l__graphics_graphics_attr_tl _int } + \int_use:c { c__graphics_ #1 \l__graphics_attr_tl _int } } \cs_new_eq:NN \__graphics_backend_include_jpeg:n \__graphics_backend_include_jpg:n \cs_new_eq:NN \__graphics_backend_include_pdf:n \__graphics_backend_include_jpg:n diff --git a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def index 8948cec19de..1f9966125c4 100644 --- a/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def +++ b/Master/texmf-dist/tex/latex/l3backend/l3backend-xetex.def @@ -26,7 +26,7 @@ %% %% File: l3backend-basics.dtx \ProvidesExplFile - {l3backend-xetex.def}{2023-03-30}{} + {l3backend-xetex.def}{2023-04-19}{} {L3 backend support: XeTeX} \cs_if_exist:NTF \__kernel_dependency_version_check:nn { @@ -488,7 +488,7 @@ \cs_if_exist:NTF \hook_gput_code:nnn { \hook_gput_code:nnn - { file / l3graphics.sty / after } + { package / l3graphics / after } { backend } {#1} } @@ -575,7 +575,7 @@ \tl_if_empty:NF \l__graphics_decodearray_str { /Decode~[ \l__graphics_decodearray_str ] } \bool_if:NT \l__graphics_interpolate_bool - { /Interpolate~true> } + { /Interpolate~true } >> } } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty index 6134995a38c..96a289f4917 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3benchmark/l3benchmark.sty @@ -20,7 +20,7 @@ %% %% File: l3benchmark.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3benchmark}{2023-03-30}{} +\ProvidesExplPackage{l3benchmark}{2023-04-19}{} {L3 Experimental benchmarking} \fp_new:N \g_benchmark_duration_target_fp \fp_gset:Nn \g_benchmark_duration_target_fp { 1 } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty b/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty index 20e5ef0b314..d976fc26022 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3bitset/l3bitset.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: l3bitset.dtx -\ProvidesExplPackage{l3bitset}{2023-03-30}{} +\ProvidesExplPackage{l3bitset}{2023-04-19}{} {L3 Experimental bitset support} \cs_new_protected:Npn \bitset_new:N #1 { diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty index b5038dbf77d..f1c94331d30 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3draw/l3draw.sty @@ -28,7 +28,7 @@ %% %% File: l3draw.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3draw}{2023-03-30}{} +\ProvidesExplPackage{l3draw}{2023-04-19}{} {L3 Experimental core drawing support} \scan_new:N \s__draw_mark \scan_new:N \s__draw_stop @@ -502,8 +502,10 @@ \fp_const:cn { c__draw_path_arc_60_fp } { 4/3 * tand(15) } \cs_new_protected:Npn \draw_path_arc_axes:nnnn #1#2#3#4 { - \draw_transform_triangle:nnn { 0cm , 0cm } {#3} {#4} - \draw_path_arc:nnn {#1} {#2} { 1pt } + \group_begin: + \draw_transform_triangle:nnn { 0cm , 0cm } {#3} {#4} + \draw_path_arc:nnn {#1} {#2} { 1pt } + \group_end: } \cs_new_protected:Npn \draw_path_ellipse:nnn #1#2#3 { @@ -1888,12 +1890,12 @@ \__draw_point_process:nnn { \__draw_point_process:nn - { \__draw_tranform_triangle:nnnnnn } + { \__draw_transform_triangle:nnnnnn } {#1} } {#2} {#3} } -\cs_new_protected:Npn \__draw_tranform_triangle:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \__draw_transform_triangle:nnnnnn #1#2#3#4#5#6 { \use:x { diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty index 6fc957e3890..86eb457ab5a 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3graphics/l3graphics.sty @@ -19,8 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: l3graphics.dtx -\RequirePackage{expl3} -\ProvidesExplPackage{l3graphics}{2023-03-30}{} +\ProvidesExplPackage{l3graphics}{2023-04-19}{} {L3 Experimental graphics inclusion support} \dim_new:N \l__graphics_internal_dim \ior_new:N \l__graphics_internal_ior @@ -45,6 +44,8 @@ crop , page .int_set:N = \l__graphics_page_int , + pdf-attr .str_set:N = + \l__graphics_pdf_str , type . str_set:N = \l__graphics_type_str } diff --git a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty index ec9ddace1aa..39b151f59da 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3opacity/l3opacity.sty @@ -20,7 +20,7 @@ %% %% File: l3opacity.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3opacity}{2023-03-30}{} +\ProvidesExplPackage{l3opacity}{2023-04-19}{} {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 6f58e2c75ec..ec5d0375665 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3str/l3str-format.sty @@ -20,7 +20,7 @@ %% %% File: l3str-format.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3str-format}{2023-03-30}{} +\ProvidesExplPackage{l3str-format}{2023-04-19}{} {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 83bc04ad27c..dd0f6e97317 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/l3sys-shell/l3sys-shell.sty @@ -20,7 +20,7 @@ %% %% File: l3sys-shell.dtx \RequirePackage{expl3} -\ProvidesExplPackage{l3sys-shell}{2023-03-30}{} +\ProvidesExplPackage{l3sys-shell}{2023-04-19}{} {L3 Experimental system shell functions} \scan_new:N \s__sys_stop \quark_new:N \q__sys_nil diff --git a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty index 431af7ba1f7..631f8b2b305 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xcoffins/xcoffins.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: xcoffins.dtx -\ProvidesExplPackage{xcoffins}{2023-03-30}{} +\ProvidesExplPackage{xcoffins}{2023-04-19}{} {L3 Experimental design level coffins} \keys_define:nn { coffin } { diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty index 80b7911e9d2..730873f94fe 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/l3galley.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{l3galley}{2023-03-30}{} +\ProvidesExplPackage{l3galley}{2023-04-19}{} {L3 Experimental galley code} \int_new:N \l__galley_tmp_int \seq_new:N \g__galley_tmpa_seq diff --git a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty index 0153d1d876b..16d9f0ee0da 100644 --- a/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty +++ b/Master/texmf-dist/tex/latex/l3experimental/xgalley/xgalley.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: xgalley.dtx -\ProvidesExplPackage{xgalley}{2023-03-30}{} +\ProvidesExplPackage{xgalley}{2023-04-19}{} {L3 Experimental galley} \RequirePackage{xtemplate,l3galley} \clist_new:N \l__galley_tmpa_clist diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index a163950e5ff..58d68175ece 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -71,7 +71,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-03-30}% +\def\ExplFileDate{2023-04-19}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -28466,6 +28466,116 @@ Type H <return> for immediate help}\def~{\errmessage{% } } } +\cs_new_protected:Npn \box_set_clipped:N #1 + { \hbox_set:Nn #1 { \__box_backend_clip:N #1 } } +\cs_generate_variant:Nn \box_set_clipped:N { c } +\cs_new_protected:Npn \box_gset_clipped:N #1 + { \hbox_gset:Nn #1 { \__box_backend_clip:N #1 } } +\cs_generate_variant:Nn \box_gset_clipped:N { c } +\cs_new_protected:Npn \box_set_trim:Nnnnn #1#2#3#4#5 + { \__box_set_trim:NnnnnN #1 {#2} {#3} {#4} {#5} \box_set_eq:NN } +\cs_generate_variant:Nn \box_set_trim:Nnnnn { c } +\cs_new_protected:Npn \box_gset_trim:Nnnnn #1#2#3#4#5 + { \__box_set_trim:NnnnnN #1 {#2} {#3} {#4} {#5} \box_gset_eq:NN } +\cs_generate_variant:Nn \box_gset_trim:Nnnnn { c } +\cs_new_protected:Npn \__box_set_trim:NnnnnN #1#2#3#4#5#6 + { + \hbox_set:Nn \l__box_internal_box + { + \__kernel_kern:n { -#2 } + \box_use:N #1 + \__kernel_kern:n { -#4 } + } + \dim_compare:nNnTF { \box_dp:N #1 } > {#3} + { + \hbox_set:Nn \l__box_internal_box + { + \box_move_down:nn \c_zero_dim + { \box_use_drop:N \l__box_internal_box } + } + \box_set_dp:Nn \l__box_internal_box { \box_dp:N #1 - (#3) } + } + { + \hbox_set:Nn \l__box_internal_box + { + \box_move_down:nn { (#3) - \box_dp:N #1 } + { \box_use_drop:N \l__box_internal_box } + } + \box_set_dp:Nn \l__box_internal_box \c_zero_dim + } + \dim_compare:nNnTF { \box_ht:N \l__box_internal_box } > {#5} + { + \hbox_set:Nn \l__box_internal_box + { + \box_move_up:nn \c_zero_dim + { \box_use_drop:N \l__box_internal_box } + } + \box_set_ht:Nn \l__box_internal_box + { \box_ht:N \l__box_internal_box - (#5) } + } + { + \hbox_set:Nn \l__box_internal_box + { + \box_move_up:nn { (#5) - \box_ht:N \l__box_internal_box } + { \box_use_drop:N \l__box_internal_box } + } + \box_set_ht:Nn \l__box_internal_box \c_zero_dim + } + #6 #1 \l__box_internal_box + } +\cs_new_protected:Npn \box_set_viewport:Nnnnn #1#2#3#4#5 + { \__box_set_viewport:NnnnnN #1 {#2} {#3} {#4} {#5} \box_set_eq:NN } +\cs_generate_variant:Nn \box_set_viewport:Nnnnn { c } +\cs_new_protected:Npn \box_gset_viewport:Nnnnn #1#2#3#4#5 + { \__box_set_viewport:NnnnnN #1 {#2} {#3} {#4} {#5} \box_gset_eq:NN } +\cs_generate_variant:Nn \box_gset_viewport:Nnnnn { c } +\cs_new_protected:Npn \__box_set_viewport:NnnnnN #1#2#3#4#5#6 + { + \hbox_set:Nn \l__box_internal_box + { + \__kernel_kern:n { -#2 } + \box_use:N #1 + \__kernel_kern:n { #4 - \box_wd:N #1 } + } + \dim_compare:nNnTF {#3} < \c_zero_dim + { + \hbox_set:Nn \l__box_internal_box + { + \box_move_down:nn \c_zero_dim + { \box_use_drop:N \l__box_internal_box } + } + \box_set_dp:Nn \l__box_internal_box { - \__box_dim_eval:n {#3} } + } + { + \hbox_set:Nn \l__box_internal_box + { \box_move_down:nn {#3} { \box_use_drop:N \l__box_internal_box } } + \box_set_dp:Nn \l__box_internal_box \c_zero_dim + } + \dim_compare:nNnTF {#5} > \c_zero_dim + { + \hbox_set:Nn \l__box_internal_box + { + \box_move_up:nn \c_zero_dim + { \box_use_drop:N \l__box_internal_box } + } + \box_set_ht:Nn \l__box_internal_box + { + (#5) + \dim_compare:nNnT {#3} > \c_zero_dim + { - (#3) } + } + } + { + \hbox_set:Nn \l__box_internal_box + { + \box_move_up:nn { - \__box_dim_eval:n {#5} } + { \box_use_drop:N \l__box_internal_box } + } + \box_set_ht:Nn \l__box_internal_box \c_zero_dim + } + #6 #1 \l__box_internal_box + } + %% File: l3color.dtx \cs_new_eq:NN \color_group_begin: \group_begin: \cs_new_eq:NN \color_group_end: \group_end: @@ -30316,7 +30426,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \pdf_version_major: { \__pdf_backend_version_major: } \cs_new:Npn \pdf_version_minor: { \__pdf_backend_version_minor: } \cs_new_protected:Npn \pdf_pagesize_gset:nn #1#2 - { \__pdf_pagesize_gset:nn {#1} {#2} } + { \__pdf_backend_pagesize_gset:nn {#1} {#2} } \cs_new_protected:Npn \pdf_destination:nn #1#2 { \__pdf_backend_destination:nn {#1} {#2} } \cs_new_protected:Npn \pdf_destination:nnnn #1#2#3#4 @@ -33215,7 +33325,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { \__text_change_case_exclude:nnN {#1} {#2} } { \__text_codepoint_process:nN - { \use:c { __text_change_case_codepoint_ #1 :nnn } {#1} {#2} } + { \use:c { __text_change_case_custom_ #1 :nnn } {#1} {#2} } } #3 } @@ -33264,13 +33374,14 @@ Type H <return> for immediate help}\def~{\errmessage{% { \cs_if_exist:cTF { l__text_case_ \token_to_str:N #3 _tl } { - \exp_args:Nv \__text_change_case_replace:nnn + \__text_change_case_replace:vnn { l__text_case_ \token_to_str:N #3 _tl } {#1} {#2} } { \__text_change_case_switch:nnN {#1} {#2} #3 } } \cs_new:Npn \__text_change_case_replace:nnn #1#2#3 { \__text_change_case_loop:nnw {#2} {#3} #1 } +\cs_generate_variant:Nn \__text_change_case_replace:nnn { v } \cs_new:Npn \__text_change_case_switch:nnN #1#2#3 { \cs_if_eq:NNTF #3 \text_case_switch:nnnn @@ -33326,6 +33437,39 @@ Type H <return> for immediate help}\def~{\errmessage{% { \__text_change_case_loop:nnw {#3} {#4} } } } +\cs_new:Npn \__text_change_case_custom_lower:nnn #1#2#3 + { + \__text_change_case_custom:nnnnn {#1} {#2} {#3} {#1} + { \use:c { __text_change_case_codepoint_ #1 :nnn } {#1} {#2} {#3} } + } +\cs_new_eq:NN \__text_change_case_custom_upper:nnn + \__text_change_case_custom_lower:nnn +\cs_new:Npn \__text_change_case_custom_title:nnn #1#2#3 + { + \__text_change_case_custom:nnnnn { title } {#2} {#3} {#1} + { + \__text_change_case_custom:nnnnn { upper } {#2} {#3} {#1} + { \use:c { __text_change_case_codepoint_ #1 :nnn } {#1} {#2} {#3} } + } + } +\cs_new_eq:NN \__text_change_case_custom_titleonly:nnn + \__text_change_case_custom_title:nnn +\cs_new:Npn \__text_change_case_custom:nnnnn #1#2#3#4#5 + { + \tl_if_exist:cTF { l__text_ #1 case _ \tl_to_str:n {#3} _ #2 _tl } + { + \__text_change_case_replace:vnn + { l__text_ #1 case _ \tl_to_str:n {#3} _ #2 _tl } {#4} {#2} + } + { + \tl_if_exist:cTF { l__text_ #1 case _ \tl_to_str:n {#3} _tl } + { + \__text_change_case_replace:vnn + { l__text_ #1 case _ \tl_to_str:n {#3} _tl } {#4} {#2} + } + {#5} + } + } \cs_new:Npn \__text_change_case_codepoint_lower:nnn #1#2#3 { \cs_if_exist_use:cF { __text_change_case_lower_ #2 :nnnn } @@ -33499,6 +33643,38 @@ Type H <return> for immediate help}\def~{\errmessage{% \tl_clear_new:c { l__text_case_ \token_to_str:N #1 _tl } \tl_set:cn { l__text_case_ \token_to_str:N #1 _tl } {#2} } +\cs_new_protected:Npn \text_declare_lowercase_mapping:nn #1#2 + { \__text_declare_case_mapping:nnn { lower } {#1} {#2} } +\cs_new_protected:Npn \text_declare_titlecase_mapping:nn #1#2 + { \__text_declare_case_mapping:nnn { title } {#1} {#2} } +\cs_new_protected:Npn \text_declare_uppercase_mapping:nn #1#2 + { \__text_declare_case_mapping:nnn { upper } {#1} {#2} } +\cs_new_protected:Npn \__text_declare_case_mapping:nnn #1#2#3 + { + \exp_args:Ne \__text_declare_case_mapping_aux:nnn + { \codepoint_str_generate:n {#2} } {#1} {#3} + } +\cs_new_protected:Npn \__text_declare_case_mapping_aux:nnn #1#2#3 + { + \tl_clear_new:c { l__text_ #2 case _ #1 _tl } + \tl_set:cn { l__text_ #2 case _ #1 _ tl } {#3} + } +\cs_new_protected:Npn \text_declare_lowercase_mapping:nnn #1#2#3 + { \__text_declare_case_mapping:nnnn { lower } {#1} {#2} {#3} } +\cs_new_protected:Npn \text_declare_titlecase_mapping:nnn #1#2#3 + { \__text_declare_case_mapping:nnnn { title } {#1} {#2} {#3} } +\cs_new_protected:Npn \text_declare_uppercase_mapping:nnn #1#2#3 + { \__text_declare_case_mapping:nnnn { upper } {#1} {#2} {#3} } +\cs_new_protected:Npn \__text_declare_case_mapping:nnnn #1#2#3#4 + { + \exp_args:Ne \__text_declare_case_mapping_aux:nnnn + { \codepoint_str_generate:n {#2} } {#1} {#3} {#4} + } +\cs_new_protected:Npn \__text_declare_case_mapping_aux:nnnn #1#2#3#4 + { + \tl_clear_new:c { l__text_ #2 case _ #1 _ #3 _tl } + \tl_set:cn { l__text_ #2 case _ #1 _ #3 _ tl } {#4} + } \cs_new:Npn \text_case_switch:nnnn #1#2#3#4 { \__text_case_switch_marker: @@ -34440,6 +34616,12 @@ 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 } } + } %% 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 } @@ -35358,115 +35540,6 @@ Type H <return> for immediate help}\def~{\errmessage{% \q_recursion_stop \group_end: %% File: l3candidates.dtx -\cs_new_protected:Npn \box_clip:N #1 - { \hbox_set:Nn #1 { \__box_backend_clip:N #1 } } -\cs_generate_variant:Nn \box_clip:N { c } -\cs_new_protected:Npn \box_gclip:N #1 - { \hbox_gset:Nn #1 { \__box_backend_clip:N #1 } } -\cs_generate_variant:Nn \box_gclip:N { c } -\cs_new_protected:Npn \box_set_trim:Nnnnn #1#2#3#4#5 - { \__box_set_trim:NnnnnN #1 {#2} {#3} {#4} {#5} \box_set_eq:NN } -\cs_generate_variant:Nn \box_set_trim:Nnnnn { c } -\cs_new_protected:Npn \box_gset_trim:Nnnnn #1#2#3#4#5 - { \__box_set_trim:NnnnnN #1 {#2} {#3} {#4} {#5} \box_gset_eq:NN } -\cs_generate_variant:Nn \box_gset_trim:Nnnnn { c } -\cs_new_protected:Npn \__box_set_trim:NnnnnN #1#2#3#4#5#6 - { - \hbox_set:Nn \l__box_internal_box - { - \__kernel_kern:n { -#2 } - \box_use:N #1 - \__kernel_kern:n { -#4 } - } - \dim_compare:nNnTF { \box_dp:N #1 } > {#3} - { - \hbox_set:Nn \l__box_internal_box - { - \box_move_down:nn \c_zero_dim - { \box_use_drop:N \l__box_internal_box } - } - \box_set_dp:Nn \l__box_internal_box { \box_dp:N #1 - (#3) } - } - { - \hbox_set:Nn \l__box_internal_box - { - \box_move_down:nn { (#3) - \box_dp:N #1 } - { \box_use_drop:N \l__box_internal_box } - } - \box_set_dp:Nn \l__box_internal_box \c_zero_dim - } - \dim_compare:nNnTF { \box_ht:N \l__box_internal_box } > {#5} - { - \hbox_set:Nn \l__box_internal_box - { - \box_move_up:nn \c_zero_dim - { \box_use_drop:N \l__box_internal_box } - } - \box_set_ht:Nn \l__box_internal_box - { \box_ht:N \l__box_internal_box - (#5) } - } - { - \hbox_set:Nn \l__box_internal_box - { - \box_move_up:nn { (#5) - \box_ht:N \l__box_internal_box } - { \box_use_drop:N \l__box_internal_box } - } - \box_set_ht:Nn \l__box_internal_box \c_zero_dim - } - #6 #1 \l__box_internal_box - } -\cs_new_protected:Npn \box_set_viewport:Nnnnn #1#2#3#4#5 - { \__box_set_viewport:NnnnnN #1 {#2} {#3} {#4} {#5} \box_set_eq:NN } -\cs_generate_variant:Nn \box_set_viewport:Nnnnn { c } -\cs_new_protected:Npn \box_gset_viewport:Nnnnn #1#2#3#4#5 - { \__box_set_viewport:NnnnnN #1 {#2} {#3} {#4} {#5} \box_gset_eq:NN } -\cs_generate_variant:Nn \box_gset_viewport:Nnnnn { c } -\cs_new_protected:Npn \__box_set_viewport:NnnnnN #1#2#3#4#5#6 - { - \hbox_set:Nn \l__box_internal_box - { - \__kernel_kern:n { -#2 } - \box_use:N #1 - \__kernel_kern:n { #4 - \box_wd:N #1 } - } - \dim_compare:nNnTF {#3} < \c_zero_dim - { - \hbox_set:Nn \l__box_internal_box - { - \box_move_down:nn \c_zero_dim - { \box_use_drop:N \l__box_internal_box } - } - \box_set_dp:Nn \l__box_internal_box { - \__box_dim_eval:n {#3} } - } - { - \hbox_set:Nn \l__box_internal_box - { \box_move_down:nn {#3} { \box_use_drop:N \l__box_internal_box } } - \box_set_dp:Nn \l__box_internal_box \c_zero_dim - } - \dim_compare:nNnTF {#5} > \c_zero_dim - { - \hbox_set:Nn \l__box_internal_box - { - \box_move_up:nn \c_zero_dim - { \box_use_drop:N \l__box_internal_box } - } - \box_set_ht:Nn \l__box_internal_box - { - (#5) - \dim_compare:nNnT {#3} > \c_zero_dim - { - (#3) } - } - } - { - \hbox_set:Nn \l__box_internal_box - { - \box_move_up:nn { - \__box_dim_eval:n {#5} } - { \box_use_drop:N \l__box_internal_box } - } - \box_set_ht:Nn \l__box_internal_box \c_zero_dim - } - #6 #1 \l__box_internal_box - } \cs_new:Npn \flag_raise_if_clear:n #1 { \if_cs_exist:w flag~#1~0 \cs_end: diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 198d834f086..21e73fab842 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-03-30}% +\def\ExplFileDate{2023-04-19}% \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 2dd58eebb4f..294451fd986 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-03-30}% +\def\ExplFileDate{2023-04-19}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index 787ffb3187b..b5e40bc17d8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-03-30}% +\def\ExplFileDate{2023-04-19}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% |