diff options
author | Karl Berry <karl@freefriends.org> | 2019-07-26 20:49:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-07-26 20:49:26 +0000 |
commit | 74fa963e66ff62baef03b36472b23b04a6747f11 (patch) | |
tree | d54eb8ac1a894db3056a48f37011ba04a3b71210 /Master/texmf-dist/tex/latex/l3kernel | |
parent | c6b7d46ff1b9b5e7edbed8ee6f65a00d8376222f (diff) |
l3kernel (26jul19)
git-svn-id: svn://tug.org/texlive/trunk@51745 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex | 126 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3doc.cls | 34 |
4 files changed, 62 insertions, 104 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index d4f199159cc..2b4a79cce64 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -65,7 +65,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2019-07-01}% +\def\ExplFileDate{2019-07-25}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -29303,14 +29303,30 @@ \__kernel_patch_deprecation:nnNNpn {#3} {#2} \cs_new:Npn #1 { } } +\__deprecation_old:Nnn \box_resize:Nnn + { \box_resize_to_wd_and_ht_plus_dp:Nnn } { 2019-01-01 } +\__deprecation_old:Nnn \box_use_clear:N + { \box_use_drop:N } { 2019-01-01 } \__deprecation_old:Nnn \c_job_name_tl { \c_sys_jobname_str } { 2017-01-01 } +\__deprecation_old:Nnn \c_minus_one + { -1 } { 2019-01-01 } \__deprecation_old:Nnn \dim_case:nnn { \dim_case:nnF } { 2015-07-14 } +\__deprecation_old:Nnn \file_add_path:nN + { \file_get_full_name:nN } { 2019-01-01 } \__deprecation_old_protected:Nnn \file_if_exist_input:nT { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 } \__deprecation_old_protected:Nnn \file_if_exist_input:nTF { \file_if_exist:nT and~ \file_input:n } { 2018-03-05 } +\__deprecation_old:Nnn \file_list: + { \file_log_list: } { 2019-01-01 } +\__deprecation_old:Nnn \file_path_include:n + { \seq_put_right:Nn \l_file_search_path_seq } { 2019-01-01 } +\__deprecation_old:Nnn \file_path_remove:n + { \seq_remove_all:Nn \l_file_search_path_seq } { 2019-01-01 } +\__deprecation_old:Nnn \g_file_current_name_tl + { \g_file_curr_name_str } { 2019-01-01 } \__deprecation_old:Nnn \int_case:nnn { \int_case:nnF } { 2015-07-14 } \__deprecation_old:Nnn \int_from_binary:n @@ -29327,6 +29343,14 @@ { \int_to_oct:n } { 2016-01-05 } \__deprecation_old_protected:Nnn \ior_get_str:NN { \ior_str_get:NN } { 2018-03-05 } +\__deprecation_old:Nnn \ior_list_streams: + { \ior_show_list: } { 2019-01-01 } +\__deprecation_old:Nnn \ior_log_streams: + { \ior_log_list: } { 2019-01-01 } +\__deprecation_old:Nnn \iow_list_streams: + { \iow_show_list: } { 2019-01-01 } +\__deprecation_old:Nnn \iow_log_streams: + { \iow_log_list: } { 2019-01-01 } \__deprecation_old:Nnn \luatex_if_engine_p: { \sys_if_engine_luatex_p: } { 2017-01-01 } \__deprecation_old:Nnn \luatex_if_engine:F @@ -29353,6 +29377,10 @@ { } { 2015-07-14 } \__deprecation_old:Nnn \scan_align_safe_stop: { protected~commands } { 2017-01-01 } +\__deprecation_old:Nnn \sort_ordered: + { \sort_return_same: } { 2019-01-01 } +\__deprecation_old:Nnn \sort_reversed: + { \sort_return_swapped: } { 2019-01-01 } \__deprecation_old:Nnn \str_case:nnn { \str_case:nnF } { 2015-07-14 } \__deprecation_old:Nnn \str_case:onn @@ -29367,6 +29395,8 @@ { \tex_lowercase:D } { 2018-03-05 } \__deprecation_old_protected:Nnn \tl_to_uppercase:n { \tex_uppercase:D } { 2018-03-05 } +\__deprecation_old:Nnn \token_new:Nn + { \cs_new_eq:NN } { 2019-01-01 } \__deprecation_old:Nnn \xetex_if_engine_p: { \sys_if_engine_xetex_p: } { 2017-01-01 } \__deprecation_old:Nnn \xetex_if_engine:F @@ -29419,18 +29449,6 @@ } \__kernel_primitives: } -\__kernel_patch_deprecation:nnNNpn - { 2019-01-01 } { \box_resize_to_wd_and_ht_plus_dp:Nnn } -\cs_new_protected:Npn \box_resize:Nnn - { \box_resize_to_wd_and_ht_plus_dp:Nnn } -\__kernel_patch_deprecation:nnNNpn - { 2019-01-01 } { \box_resize_to_wd_and_ht_plus_dp:cnn } -\cs_new_protected:Npn \box_resize:cnn - { \box_resize_to_wd_and_ht_plus_dp:cnn } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \box_use_drop:N } -\cs_new_protected:Npn \box_use_clear:N { \box_use_drop:N } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \box_use_drop:c } -\cs_new_protected:Npn \box_use_clear:c { \box_use_drop:c } \__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \box_set_eq_drop:N } \cs_new_protected:Npn \box_set_eq_clear:NN #1#2 { \tex_setbox:D #1 \tex_box:D #2 } @@ -29447,82 +29465,6 @@ \cs_new_protected:Npn \vbox_unpack_clear:N { \vbox_unpack_drop:N } \cs_generate_variant:Nn \vbox_unpack_clear:N { c } -\__kernel_deprecation_code:nn - { - \tex_let:D \g_file_current_name_tl \scan_stop: - \__kernel_deprecation_error:Nnn \g_file_current_name_tl - { \g_file_curr_name_str } { 2019-01-01 } - } - { - \tex_let:D \g_file_current_name_tl \scan_stop: - \cs_set_nopar:Npn \g_file_current_name_tl { \g_file_curr_name_str } - } -\__deprecation_not_yet_deprecated:nTF { 2019-01-01 } - { - \tl_new:N \g_file_current_name_tl - \tl_gset:Nn \g_file_current_name_tl { \g_file_curr_name_str } - } - { - \cs_gset_nopar:Npn \g_file_current_name_tl - { - \__kernel_msg_expandable_error:nnnnn - { kernel } { deprecated-command } - { 2019-01-01 } { \g_file_current_name_tl } { \g_file_curr_name_str } - } - } -\__kernel_patch_deprecation:nnNNpn - { 2019-01-01 } { \seq_put_right:Nn \l_file_search_path_seq } -\cs_new_protected:Npn \file_path_include:n #1 - { - \__kernel_file_name_sanitize:nN {#1} \l__file_full_name_str - \seq_if_in:NVF \l_file_search_path_seq \l__file_full_name_str - { \seq_put_right:NV \l_file_search_path_seq \l__file_full_name_str } - } -\__kernel_patch_deprecation:nnNNpn - { 2019-01-01 } { \seq_remove_all:Nn \l_file_search_path_seq } -\cs_new_protected:Npn \file_path_remove:n #1 - { - \__kernel_file_name_sanitize:nN {#1} \l__file_full_name_str - \seq_remove_all:NV \l_file_search_path_seq \l__file_full_name_str - } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \file_get_full_name:nN } -\cs_new_protected:Npn \file_add_path:nN #1#2 - { - \file_get_full_name:nN {#1} #2 - \str_if_empty:NT #2 - { \tl_set:Nn #2 { \q_no_value } } - } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \file_log_list: } -\cs_new_protected:Npn \file_list: { \file_log_list: } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \ior_show_list: } -\cs_new_protected:Npn \ior_list_streams: { \ior_show_list: } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \ior_log_list: } -\cs_new_protected:Npn \ior_log_streams: { \ior_log_list: } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \iow_show_list: } -\cs_new_protected:Npn \iow_list_streams: { \iow_show_list: } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \iow_log_list: } -\cs_new_protected:Npn \iow_log_streams: { \iow_log_list: } -\int_const:Nn \c__deprecation_minus_one { -1 } -\__kernel_deprecation_code:nn - { - \tex_let:D \c_minus_one \scan_stop: - \__kernel_deprecation_error:Nnn \c_minus_one { -1 } { 2019-01-01 } - } - { - \tex_let:D \c_minus_one \scan_stop: - \cs_set_eq:NN \c_minus_one \c__deprecation_minus_one - } -\__deprecation_not_yet_deprecated:nTF { 2019-01-01 } - { \cs_new_eq:NN \c_minus_one \c__deprecation_minus_one } - { - \cs_gset_nopar:Npn \c_minus_one - { - \__kernel_msg_expandable_error:nnnnn - { kernel } { deprecated-command } - { 2019-01-01 } { \c_minus_one } { -1 } - \c__deprecation_minus_one - } - } \cs_new_protected:Npn \__int_deprecated_constants:nn #1#2 { #1 \c_zero { 0 } #2 @@ -29661,10 +29603,6 @@ \cs_new:Npn \__prg_break: #1 \__prg_break_point: { } \__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \prg_break:n } \cs_new:Npn \__prg_break:n #1#2 \__prg_break_point: {#1} -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \sort_return_same: } -\cs_new_protected:Npn \sort_ordered: { \sort_return_same: } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \sort_return_swapped: } -\cs_new_protected:Npn \sort_reversed: { \sort_return_swapped: } \__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_case_e:nn } \cs_new:Npn \str_case_x:nn { \str_case_e:nn } \__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \str_case_e:nnT } @@ -29719,8 +29657,6 @@ \cs_new_protected:Npn \tl_show_analysis:N { \tl_analysis_show:N } \__kernel_patch_deprecation:nnNNpn { 2020-01-01 } { \tl_analysis_show:n } \cs_new_protected:Npn \tl_show_analysis:n { \tl_analysis_show:n } -\__kernel_patch_deprecation:nnNNpn { 2019-01-01 } { \cs_new_eq:NN } -\cs_new_protected:Npn \token_new:Nn #1#2 { \cs_new_eq:NN #1 #2 } \__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_prefix_spec:N } \cs_new:Npn \token_get_prefix_spec:N { \cs_prefix_spec:N } \__kernel_patch_deprecation:nnNNpn { 2021-01-01 } { \cs_argument_spec:N } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index ee6b0cfdad3..757dba9cd39 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{2019-07-01}% +\def\ExplFileDate{2019-07-25}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \def\tempa{LaTeX2e}% @@ -86,7 +86,7 @@ \iow_log:x { File:~#1~#2~v#3~#4 } } \tex_input:D - l3backend + l3backend- \sys_if_engine_xetex:TF { xdvipdfmx } { diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index f08739aaacd..fb6ac8f87c3 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{2019-07-01}% +\def\ExplFileDate{2019-07-25}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index e1f1aad315d..111e14befe9 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -72,6 +72,7 @@ \tl_new:N \l__codedoc_index_macro_tl \tl_new:N \l__codedoc_index_key_tl \tl_new:N \l__codedoc_index_module_tl +\tl_new:N \l__codedoc_macro_do_not_index_tl \bool_new:N \l__codedoc_index_internal_bool \tl_new:N \g__codedoc_module_name_tl \tl_const:Nn \c__codedoc_iow_rule_tl @@ -117,6 +118,7 @@ \cs_generate_variant:Nn \tl_remove_all:Nn { Nx } \cs_generate_variant:Nn \tl_replace_all:Nnn { Nx , Nnx, No , Nno } \cs_generate_variant:Nn \tl_replace_once:Nnn { Noo } +\cs_generate_variant:Nn \tl_set_rescan:Nnn { NnV } \cs_generate_variant:Nn \tl_to_str:n { f , o } \cs_generate_variant:Nn \prop_get:NnNTF { Nx } \cs_generate_variant:Nn \prop_put:Nnn { Nx } @@ -1345,6 +1347,9 @@ verb .bool_set:N = \l__codedoc_names_verb_bool , module .tl_set:N = \l__codedoc_override_module_tl , documented-as .tl_set:N = \l__codedoc_macro_documented_tl , + do-not-index .value_required:n = true , + do-not-index .tl_set:N = \l__codedoc_macro_do_not_index_tl , + % do-not-index .default:n = \q_no_value , } \cs_new_protected:Npn \__codedoc_macro:nnw #1#2 { @@ -1353,6 +1358,7 @@ \keys_set:nn { l3doc/macro } {#1} \__codedoc_names_get_seq:nN {#2} \l__codedoc_names_seq \__codedoc_names_parse: + \__codedoc_macro_exclude_index: \__codedoc_macro_save_names: \__codedoc_names_typeset: \__codedoc_macro_dump: @@ -1401,6 +1407,20 @@ } \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: + { + \tl_if_empty:NF \l__codedoc_macro_do_not_index_tl + { + \tl_set_rescan:NnV \l__codedoc_macro_do_not_index_tl + { \MakePrivateLetters \catcode`\\12 } + \l__codedoc_macro_do_not_index_tl + \exp_args:NNV \seq_set_from_clist:Nn + \l__codedoc_tmpa_seq \l__codedoc_macro_do_not_index_tl + \tl_set:Nx \l__codedoc_macro_do_not_index_tl + { \seq_use:Nn \l__codedoc_tmpa_seq { , } } + \exp_args:NV \DoNotIndex \l__codedoc_macro_do_not_index_tl + } + } \cs_new_protected:Npn \__codedoc_macro_dump: { \topsep\MacroTopsep @@ -1822,10 +1842,12 @@ \@tempswatrue \if@partsw \@tempswafalse - \cs_set:Npx \@tempb{#1} - \@for\@tempa:=\@partlist\do + \cs_set:Npx \@tempb {#1} + \clist_map_inline:Nn \@partlist { - \ifx\@tempa\@tempb\@tempswatrue\fi + \if_meaning:w \@tempa \@tempb + \@tempswatrue + \fi: } \fi \if@tempswa @@ -1933,7 +1955,7 @@ } \cs_new_protected:Npn \__codedoc_xmacro_code:w #1 < @ @ = #2 > { - % Add code before <__codedoc=...> + % Add code before <@@=...> \tl_set:Nn \l__codedoc_tmpb_tl {#1} \__codedoc_detect_internals:N \l__codedoc_tmpb_tl \__codedoc_replace_at_at:N \l__codedoc_tmpb_tl @@ -1941,7 +1963,7 @@ % Check for \q_recursion_tail \quark_if_recursion_tail_stop_do:nn {#2} { \tl_use:N \l__codedoc_tmpa_tl } - % Change module name and add <__codedoc=#2> to typeset output + % Change module name and add <@@=#2> to typeset output \tl_gset:Nn \g__codedoc_module_name_tl {#2} \tl_put_right:Nn \l__codedoc_tmpa_tl { < \text { \verbatim@font @ @ = #2 } > } % Loop @@ -2215,7 +2237,7 @@ } \cs_new_protected:Npn \__codedoc_quote_special_char:N #1 { - \tl_map_inline:nn { \quotechar \actualchar \encapchar \levelchar } + \tl_map_inline:nn { \quotechar \actualchar \encapchar \levelchar \bslash } { \tl_replace_all:Nxn #1 { \tl_to_str:N ##1 } { \quotechar \tl_to_str:N ##1 } |