diff options
author | Karl Berry <karl@freefriends.org> | 2022-08-23 20:22:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-08-23 20:22:01 +0000 |
commit | 62e619401727918687f8b03611ed1d6fbd6c3263 (patch) | |
tree | 558ad8fa09ac83b171bc939330510c4ff93e94cf /Master/texmf-dist/tex | |
parent | 19134724fc15820a593c71186e4e4541b6abc034 (diff) |
l3kernel (23aug22)
git-svn-id: svn://tug.org/texlive/trunk@64177 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
4 files changed, 130 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 3ef89d63db9..e23ee371e13 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -70,7 +70,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2022-08-05}% +\def\ExplFileDate{2022-08-23}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -10156,7 +10156,6 @@ Type H <return> for immediate help}\def~{\errmessage{% { #1 ~ } } \prop_new:N \g_msg_module_name_prop -\prop_gput:Nnn \g_msg_module_name_prop { LaTeX } { LaTeX3 } \prop_new:N \g_msg_module_type_prop \prop_gput:Nnn \g_msg_module_type_prop { LaTeX } { } \cs_new:Npn \msg_module_type:n #1 @@ -10808,7 +10807,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { Backend~request~inconsistent~with~engine:~using~'#2'~backend. } { You~have~requested~backend~'#1',~but~this~is~not~suitable~for~use~with~the~ - active~engine.~LaTeX3~will~use~the~'#2'~backend~instead. + active~engine.~LaTeX~will~use~the~'#2'~backend~instead. } \cs_set_protected:Npn \__msg_tmp:w #1 { @@ -10847,7 +10846,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_generate_variant:Nn \msg_expandable_error:nnnnn { nnfff } \cs_generate_variant:Nn \msg_expandable_error:nnnn { nnff } \cs_generate_variant:Nn \msg_expandable_error:nnn { nnf } -\prop_gput:Nnn \g_msg_module_name_prop { kernel } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { kernel } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { kernel } { } \clist_map_inline:nn { @@ -10855,12 +10854,12 @@ Type H <return> for immediate help}\def~{\errmessage{% quark , prg , prop , scanmark , seq , sys } { - \prop_gput:Nnn \g_msg_module_name_prop {#1} { LaTeX3 } + \prop_gput:Nnn \g_msg_module_name_prop {#1} { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop {#1} { } } -\prop_gput:Nnn \g_msg_module_name_prop { LaTeX / cmd } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { LaTeX / cmd } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { LaTeX / cmd } { } -\prop_gput:Nnn \g_msg_module_name_prop { LaTeX / ltcmd } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { LaTeX / ltcmd } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { LaTeX / ltcmd } { } %% File: l3file.dtx \tl_new:N \l__ior_internal_tl @@ -13081,7 +13080,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { Misplaced~'='~in~key-value~input~\msg_line_context: } \msg_new:nnn { keyval } { blank-key-name } { Blank~key~name~in~key-value~input~\msg_line_context: } -\prop_gput:Nnn \g_msg_module_name_prop { keyval } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { keyval } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { keyval } { } \group_begin: \cs_set_protected:Npn \__keyval_tmp:w #1 @@ -14314,7 +14313,7 @@ Type H <return> for immediate help}\def~{\errmessage{% { is~undefined. } { has~the~properties: #2 . } } -\prop_gput:Nnn \g_msg_module_name_prop { keys } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { keys } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { keys } { } %% File: l3intarray.dtx \msg_new:nnn { kernel } { negative-array-size } @@ -15056,7 +15055,7 @@ Type H <return> for immediate help}\def~{\errmessage{% '\token_to_str:N \fp_to_tl:N',~or~other~ conversion~functions. } -\prop_gput:Nnn \g_msg_module_name_prop { fp } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { fp } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { fp } { } %% File: l3fp-traps.dtx \flag_new:n { fp_invalid_operation } @@ -21394,7 +21393,7 @@ Type H <return> for immediate help}\def~{\errmessage{% you~tried~to~interleave~them.~LaTeX~will~try~to~proceed,~ but~results~may~be~unexpected. } -\prop_gput:Nnn \g_msg_module_name_prop { cctab } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { cctab } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { cctab } { } %% File l3sort.dtx \seq_new:N \g__sort_internal_seq @@ -21814,7 +21813,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \iow_char:N\\sort_return_swapped: ~multiple~times.~ Exactly~one~of~these~should~be~called. } -\prop_gput:Nnn \g_msg_module_name_prop { sort } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { sort } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { sort } { } %% File: l3str-convert.dtx \cs_new_protected:Npn \__str_tmp:w { } @@ -22594,10 +22593,10 @@ Type H <return> for immediate help}\def~{\errmessage{% } \prg_new_conditional:Npnn \__str_if_escape_string:N #1 { TF } { - \if_int_compare:w `#1 < "21 \exp_stop_f: + \if_int_compare:w `#1 < "27 \exp_stop_f: \prg_return_false: \else: - \if_int_compare:w `#1 > "7E \exp_stop_f: + \if_int_compare:w `#1 > "7A \exp_stop_f: \prg_return_false: \else: \prg_return_true: @@ -22698,7 +22697,7 @@ Type H <return> for immediate help}\def~{\errmessage{% Unicode~limits~code~points~to~the~range~[0,1114111]. } } -\prop_gput:Nnn \g_msg_module_name_prop { str } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { str } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { str } { } \cs_new_protected:cpn { __str_convert_decode_utf8: } { @@ -27767,7 +27766,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \tl_if_empty:nTF {#1} { variable~ #2 } { {#1} } : #3 } -\prop_gput:Nnn \g_msg_module_name_prop { regex } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { regex } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { regex } { } \cs_new:Npn \__regex_msg_repeated:nnN #1#2#3 { @@ -28491,10 +28490,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new_eq:NN \color_group_begin: \group_begin: \cs_new_eq:NN \color_group_end: \group_end: \cs_new_protected:Npn \color_ensure_current: - { - \__color_backend_pickup:N \l__color_current_tl - \__color_select:N \l__color_current_tl - } + { \__color_select:N \l__color_current_tl } \scan_new:N \s__color_stop \cs_new_protected:Npn \__color_select:N #1 { @@ -28511,7 +28507,7 @@ Type H <return> for immediate help}\def~{\errmessage{% \int_new:N \l__color_internal_int \tl_new:N \l__color_internal_tl \scan_new:N \s__color_mark -\prg_new_conditional:Npnn \__color_if_defined:n #1 { T, F, TF } +\prg_new_conditional:Npnn \color_if_exist:n #1 { p , T, F, TF } { \prop_if_exist:cTF { l__color_named_ #1 _prop } { @@ -28578,14 +28574,21 @@ Type H <return> for immediate help}\def~{\errmessage{% { #1 } \cs_new:Npn \__color_convert_rgb_cmyk:w #1 ~ #2 ~ #3 \s__color_stop { - \exp_args:Nf \__color_convert_rgb_cmyk:nnnn - { \fp_eval:n { min ( 1 - #1 , 1 - #2 , 1 - #3 ) } } {#1} {#2} {#3} + \exp_args:Neee \__color_convert_rgb_cmyk:nnn + { \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 + { + \exp_args:Ne \__color_convert_rgb_cmyk:nnnn + { \fp_eval:n { min( #1, #2 , #3 ) } } {#1} {#2} {#3} } \cs_new:Npn \__color_convert_rgb_cmyk:nnnn #1#2#3#4 { - \fp_eval:n { min ( 1 , max ( 0 , 1 - #2 - #1 ) ) } \c_space_tl - \fp_eval:n { min ( 1 , max ( 0 , 1 - #3 - #1 ) ) } \c_space_tl - \fp_eval:n { min ( 1 , max ( 0 , 1 - #4 - #1 ) ) } \c_space_tl + \fp_eval:n { min ( 1 , max ( 0 , #2 - #1 ) ) } \c_space_tl + \fp_eval:n { min ( 1 , max ( 0 , #3 - #1 ) ) } \c_space_tl + \fp_eval:n { min ( 1 , max ( 0 , #4 - #1 ) ) } \c_space_tl #1 } \cs_new:Npn \__color_convert_cmyk_gray:w #1 ~ #2 ~ #3 ~ #4 \s__color_stop @@ -28604,7 +28607,6 @@ Type H <return> for immediate help}\def~{\errmessage{% \tl_new:N \l__color_next_value_tl \cs_new_protected:Npx \__color_parse:nN #1#2 { - \exp_not:N \__color_backend_pickup:N \exp_not:N \l__color_current_tl \tl_set:Nx \exp_not:c { l__color_named_ . _tl } { \exp_not:N \__color_model:N \exp_not:N \l__color_current_tl } \prop_put:NVx \exp_not:c { l__color_named_ . _prop } @@ -28615,7 +28617,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \__color_parse_aux:nN #1#2 { - \__color_if_defined:nTF {#1} + \color_if_exist:nTF {#1} { \__color_parse_set_eq:Nn #2 {#1} } { \__color_parse:Nw #2#1 ! \s__color_stop } \__color_check_model:N #2 @@ -28648,7 +28650,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \__color_parse:Nw #1#2 ! #3 \s__color_stop { - \__color_if_defined:nTF {#2} + \color_if_exist:nTF {#2} { \tl_if_blank:nTF {#3} { \__color_parse_set_eq:Nn #1 {#2} } @@ -28696,7 +28698,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \__color_parse_loop:nn #1#2 { - \__color_if_defined:nTF {#2} + \color_if_exist:nTF {#2} { \__color_extract:nNN {#2} \l__color_next_model_tl \l__color_next_value_tl \tl_if_eq:NNF \l__color_model_tl \l__color_next_model_tl @@ -28930,6 +28932,41 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new:Npn \__color_parse_model_wave_rho:n #1 { \fp_eval:n { min(1, max(0,#1) ) } } +\cs_new:Npn \__color_parse_model_cmy:w #1 , #2 , #3 , #4 \s__color_stop + { + { cmyk } + { \__color_convert_rgb_cmyk:nnn {#1} {#2} {#3} } + } +\cs_new:Npn \__color_parse_model_tHsb:w #1 , #2 , #3 , #4 \s__color_stop + { + \exp_args:Ne \__color_parse_model_hsb:nnn + { \__color_parse_model_tHsb:n {#1} } {#2} {#3} + } +\cs_new:Npn \__color_parse_model_tHsb:n #1 + { + \__color_parse_model_tHsb:nw {#1} + 0 , 0 ; + 60 , 30 ; + 120 , 60 ; + 180 , 120 ; + 210 , 180 ; + 240 , 240 ; + 360 , 360 ; + \q_recursion_tail , ; + \q_recursion_stop + } +\cs_new:Npn \__color_parse_model_tHsb:nw #1 #2 , #3 ; #4 , #5 ; + { + \quark_if_recursion_tail_stop_do:nn {#4} { 0 } + \fp_compare:nNnTF {#1} > {#4} + { \__color_parse_model_tHsb:nw {#1} #4 , #5 ; } + { + \use_i_delimit_by_q_recursion_stop:nw + { \fp_eval:n { ((#1 - #2) / (#4 - #2) * (#5 - #3) + #3) / 360 } } + } + } +\cs_new:cpn { __color_parse_model_&spot:w } #1 , #2 \s__color_stop + { { gray } { #1 } } \tl_new:N \l_color_fixed_model_tl \cs_new_protected:Npn \__color_check_model:N #1 { @@ -29223,7 +29260,7 @@ Type H <return> for immediate help}\def~{\errmessage{% } \cs_new_protected:Npn \color_set_eq:nn #1#2 { - \__color_if_defined:nTF {#2} + \color_if_exist:nTF {#2} { \tl_clear_new:c { l__color_named_ #1 _tl } \prop_clear_new:c { l__color_named_ #1 _prop } @@ -30012,7 +30049,7 @@ Type H <return> for immediate help}\def~{\errmessage{% #1 { color } { show } {#2} { - \__color_if_defined:nT {#2} + \color_if_exist:nT {#2} { \exp_args:Nv \__color_show:n { l__color_named_ #2 _tl } \prop_map_function:cN @@ -30121,6 +30158,12 @@ Type H <return> for immediate help}\def~{\errmessage{% \\ \\ key~was~given~with~the~correct~information. } +\msg_new:nnn { color } { unhandled-model } + { + Unhandled~color~model~in~LaTeX2e~value~"#1": + \\ \\ + falling~back~on~grayscale. + } \msg_new:nnnn { color } { unknown-color } { Unknown~color~'#1'. } { @@ -30160,7 +30203,7 @@ Type H <return> for immediate help}\def~{\errmessage{% LaTeX~has~been~asked~to~create~a~new~color~model~called~'#1',~ but~this~type~of~model~was~never~set~up. } -\prop_gput:Nnn \g_msg_module_name_prop { color } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { color } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { color } { } \msg_new:nnn { color } { show } { @@ -31597,7 +31640,7 @@ Type H <return> for immediate help}\def~{\errmessage{% #2 } -\prop_gput:Nnn \g_msg_module_name_prop { luatex } { LaTeX3 } +\prop_gput:Nnn \g_msg_module_name_prop { luatex } { LaTeX } \prop_gput:Nnn \g_msg_module_type_prop { luatex } { } %% File: l3unicode.dtx \ior_new:N \g__char_data_ior @@ -33741,6 +33784,8 @@ Type H <return> for immediate help}\def~{\errmessage{% { 0179 } { 017A } { 017B } { 017C } { 017D } { 017E } + { 01A0 } { 01A1 } + { 01AF } { 01B0 } { 01CD } { 01CE } { 01CF } { 01D0 } { 01D1 } { 01D2 } @@ -33975,6 +34020,54 @@ Type H <return> for immediate help}\def~{\errmessage{% \__text_tmp:nnnnnn { title } {#5} {#6} {#7} {#1} {#2} {#3} } \__text_loop:nn + { 1EA0 } { 1EA1 } + { 1EA2 } { 1EA3 } + { 1EA4 } { 1EA5 } + { 1EA6 } { 1EA7 } + { 1EA8 } { 1EA9 } + { 1EAA } { 1EAB } + { 1EAC } { 1EAD } + { 1EAE } { 1EAF } + { 1EB0 } { 1EB1 } + { 1EB2 } { 1EB3 } + { 1EB4 } { 1EB5 } + { 1EB6 } { 1EB7 } + { 1EB8 } { 1EB9 } + { 1EBA } { 1EBB } + { 1EBC } { 1EBD } + { 1EBE } { 1EBF } + { 1EC0 } { 1EC1 } + { 1EC2 } { 1EC3 } + { 1EC4 } { 1EC5 } + { 1EC6 } { 1EC7 } + { 1EC8 } { 1EC9 } + { 1ECA } { 1ECB } + { 1ECC } { 1ECD } + { 1ECE } { 1ECF } + { 1ED0 } { 1ED1 } + { 1ED2 } { 1ED3 } + { 1ED4 } { 1ED5 } + { 1ED6 } { 1ED7 } + { 1ED8 } { 1ED9 } + { 1EDA } { 1EDB } + { 1EDC } { 1EDD } + { 1EDE } { 1EDF } + { 1EE0 } { 1EE1 } + { 1EE2 } { 1EE3 } + { 1EE4 } { 1EE5 } + { 1EE6 } { 1EE7 } + { 1EE8 } { 1EE9 } + { 1EEA } { 1EEB } + { 1EEC } { 1EED } + { 1EEE } { 1EEF } + { 1EF0 } { 1EF1 } + { 1EF2 } { 1EF3 } + { 1EF4 } { 1EF5 } + { 1EF6 } { 1EF7 } + { 1EF8 } { 1EF9 } + \q_recursion_tail ? + \q_recursion_stop + \__text_loop:nn { 1F08 } { 1F00 } { 1F09 } { 1F01 } { 1F0A } { 1F02 } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 88cd00c7caf..2bb475c14fc 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{2022-08-05}% +\def\ExplFileDate{2022-08-23}% \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 98aeaab7b7f..9e63d6fa6f1 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{2022-08-05}% +\def\ExplFileDate{2022-08-23}% \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 bb4e1763559..24372534835 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{2022-08-05}% +\def\ExplFileDate{2022-08-23}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% |