From 01651bbd8c05e990ab60754f83cca88670045846 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 7 Dec 2018 22:52:08 +0000 Subject: l3kernel (7dec18) git-svn-id: svn://tug.org/texlive/trunk@49348 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 84 +++++++++++----------- .../tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- .../texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def | 2 +- Master/texmf-dist/tex/latex/l3kernel/l3dvips.def | 2 +- Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def | 2 +- Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def | 2 +- .../texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def | 2 +- 8 files changed, 48 insertions(+), 50 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3kernel') diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 8bf3a432a01..44f46d069e8 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 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx Copyright (C) 1990-2018 The LaTeX3 Project -\def\ExplFileDate{2018-11-19}% +\def\ExplFileDate{2018-12-06}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -4981,6 +4981,13 @@ } \cs_new:Npn \tl_item:Nn { \exp_args:No \tl_item:nn } \cs_generate_variant:Nn \tl_item:Nn { c } +\cs_new:Npn \tl_rand_item:n #1 + { + \tl_if_blank:nF {#1} + { \tl_item:nn {#1} { \int_rand:nn { 1 } { \tl_count:n {#1} } } } + } +\cs_new:Npn \tl_rand_item:N { \exp_args:No \tl_rand_item:n } +\cs_generate_variant:Nn \tl_rand_item:N { c } \cs_new_protected:Npn \tl_show:N { \__tl_show:NN \tl_show:n } \cs_generate_variant:Nn \tl_show:N { c } \cs_new_protected:Npn \tl_log:N { \__tl_show:NN \tl_log:n } @@ -6148,6 +6155,12 @@ { \exp_args:Nf \__seq_item:nwn { \int_eval:n { #1 - 1 } } } } \cs_generate_variant:Nn \seq_item:Nn { c } +\cs_new:Npn \seq_rand_item:N #1 + { + \seq_if_empty:NF #1 + { \seq_item:Nn #1 { \int_rand:nn { 1 } { \seq_count:N #1 } } } + } +\cs_generate_variant:Nn \seq_rand_item:N { c } \cs_new:Npn \seq_map_break: { \prg_map_break:Nn \seq_map_break: { } } \cs_new:Npn \seq_map_break:n @@ -8224,6 +8237,19 @@ { \tl_trim_spaces_apply:nN {#1} \__clist_item_n_strip:n } \cs_new:Npn \__clist_item_n_strip:n #1 { \__clist_item_n_strip:w #1 , } \cs_new:Npn \__clist_item_n_strip:w #1 , { \exp_not:n {#1} } +\cs_new:Npn \clist_rand_item:n #1 + { \exp_args:Nf \__clist_rand_item:nn { \clist_count:n {#1} } {#1} } +\cs_new:Npn \__clist_rand_item:nn #1#2 + { + \int_compare:nNnF {#1} = 0 + { \clist_item:nn {#2} { \int_rand:nn { 1 } {#1} } } + } +\cs_new:Npn \clist_rand_item:N #1 + { + \clist_if_empty:NF #1 + { \clist_item:Nn #1 { \int_rand:nn { 1 } { \clist_count:N #1 } } } + } +\cs_generate_variant:Nn \clist_rand_item:N { c } \cs_new_protected:Npn \clist_show:N { \__clist_show:NN \msg_show:nnxxxx } \cs_generate_variant:Nn \clist_show:N { c } \cs_new_protected:Npn \clist_log:N { \__clist_show:NN \msg_log:nnxxxx } @@ -23476,30 +23502,30 @@ \cs_generate_variant:Nn \hbox_unpack:N { c } \cs_generate_variant:Nn \hbox_unpack_clear:N { c } \cs_new_protected:Npn \vbox:n #1 - { \tex_vbox:D { \color_group_begin: #1 \color_group_end: } } + { \tex_vbox:D { \color_group_begin: #1 \par \color_group_end: } } \cs_new_protected:Npn \vbox_top:n #1 - { \tex_vtop:D { \color_group_begin: #1 \color_group_end: } } + { \tex_vtop:D { \color_group_begin: #1 \par \color_group_end: } } \cs_new_protected:Npn \vbox_to_ht:nn #1#2 { \tex_vbox:D to \__box_dim_eval:n {#1} - { \color_group_begin: #2 \color_group_end: } + { \color_group_begin: #2 \par \color_group_end: } } \cs_new_protected:Npn \vbox_to_zero:n #1 { \tex_vbox:D to \c_zero_dim - { \color_group_begin: #1 \color_group_end: } + { \color_group_begin: #1 \par \color_group_end: } } \__kernel_patch:nnNNpn { \__kernel_chk_var_local:N #1 } { } \cs_new_protected:Npn \vbox_set:Nn #1#2 { \tex_setbox:D #1 \tex_vbox:D - { \color_group_begin: #2 \color_group_end: } + { \color_group_begin: #2 \par \color_group_end: } } \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { } \cs_new_protected:Npn \vbox_gset:Nn #1#2 { \tex_global:D \tex_setbox:D #1 \tex_vbox:D - { \color_group_begin: #2 \color_group_end: } + { \color_group_begin: #2 \par \color_group_end: } } \cs_generate_variant:Nn \vbox_set:Nn { c } \cs_generate_variant:Nn \vbox_gset:Nn { c } @@ -23507,13 +23533,13 @@ \cs_new_protected:Npn \vbox_set_top:Nn #1#2 { \tex_setbox:D #1 \tex_vtop:D - { \color_group_begin: #2 \color_group_end: } + { \color_group_begin: #2 \par \color_group_end: } } \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { } \cs_new_protected:Npn \vbox_gset_top:Nn #1#2 { \tex_global:D \tex_setbox:D #1 \tex_vtop:D - { \color_group_begin: #2 \color_group_end: } + { \color_group_begin: #2 \par \color_group_end: } } \cs_generate_variant:Nn \vbox_set_top:Nn { c } \cs_generate_variant:Nn \vbox_gset_top:Nn { c } @@ -23521,13 +23547,13 @@ \cs_new_protected:Npn \vbox_set_to_ht:Nnn #1#2#3 { \tex_setbox:D #1 \tex_vbox:D to \__box_dim_eval:n {#2} - { \color_group_begin: #3 \color_group_end: } + { \color_group_begin: #3 \par \color_group_end: } } \__kernel_patch:nnNNpn { \__kernel_chk_var_global:N #1 } { } \cs_new_protected:Npn \vbox_gset_to_ht:Nnn #1#2#3 { \tex_global:D \tex_setbox:D #1 \tex_vbox:D to \__box_dim_eval:n {#2} - { \color_group_begin: #3 \color_group_end: } + { \color_group_begin: #3 \par \color_group_end: } } \cs_generate_variant:Nn \vbox_set_to_ht:Nnn { c } \cs_generate_variant:Nn \vbox_gset_to_ht:Nnn { c } @@ -23549,6 +23575,7 @@ \cs_generate_variant:Nn \vbox_gset:Nw { c } \cs_new_protected:Npn \vbox_set_end: { + \par \color_group_end: \c_group_end_token } @@ -23891,11 +23918,7 @@ \cs_new_protected:Npn \box_use_clear:c { \box_use_drop:c } %% File: l3color-base.dtx Copyright(C) 2011,2012,2014,2016-2018 The LaTeX3 Project \cs_new_eq:NN \color_group_begin: \group_begin: -\cs_new_protected:Npn \color_group_end: - { - \par - \group_end: - } +\cs_new_eq:NN \color_group_end: \group_end: \cs_new_protected:Npn \color_ensure_current: { \driver_color_pickup:N \l__color_current_tl @@ -24751,7 +24774,7 @@ \cs_undefine:N \lua_now:e \cs_new:Npn \lua_now:e #1 { \__lua_now:n {#1} } \cs_new:Npn \lua_now:n #1 { \lua_now:e { \exp_not:n {#1} } } -\cs_new_protected:Npn \lua_shipout_e:n #1 { \__lua_shiphout:n {#1} } +\cs_new_protected:Npn \lua_shipout_e:n #1 { \__lua_shipout:n {#1} } \cs_new_protected:Npn \lua_shipout:n #1 { \lua_shipout_e:n { \exp_not:n {#1} } } \cs_new:Npn \lua_escape:e #1 { \__lua_escape:n {#1} } @@ -24932,6 +24955,7 @@ \group_end: } %% File: l3candidates.dtx Copyright (C) 2012-2018 The LaTeX3 Project + \cs_new_protected:Npn \mode_leave_vertical: { \if_mode_vertical: @@ -25034,19 +25058,6 @@ \box_set_eq:NN #1 \l__box_internal_box } \cs_generate_variant:Nn \box_viewport:Nnnnn { c } -\cs_new:Npn \clist_rand_item:n #1 - { \exp_args:Nf \__clist_rand_item:nn { \clist_count:n {#1} } {#1} } -\cs_new:Npn \__clist_rand_item:nn #1#2 - { - \int_compare:nNnF {#1} = 0 - { \clist_item:nn {#2} { \int_rand:nn { 1 } {#1} } } - } -\cs_new:Npn \clist_rand_item:N #1 - { - \clist_if_empty:NF #1 - { \clist_item:Nn #1 { \int_rand:nn { 1 } { \clist_count:N #1 } } } - } -\cs_generate_variant:Nn \clist_rand_item:N { c } \fp_new:N \l__coffin_sin_fp \fp_new:N \l__coffin_cos_fp \prop_new:N \l__coffin_bounding_prop @@ -25541,12 +25552,6 @@ { \seq_set_from_inline_x:Nnn #1 {#2} { #3 {##1} } } \cs_new_protected:Npn \seq_gset_from_function:NnN #1#2#3 { \seq_gset_from_inline_x:Nnn #1 {#2} { #3 {##1} } } -\cs_new:Npn \seq_rand_item:N #1 - { - \seq_if_empty:NF #1 - { \seq_item:Nn #1 { \int_rand:nn { 1 } { \seq_count:N #1 } } } - } -\cs_generate_variant:Nn \seq_rand_item:N { c } \cs_new_protected:Npn \seq_const_from_clist:Nn #1#2 { \tl_const:Nx #1 @@ -27061,13 +27066,6 @@ #2 #1 \exp_args:Nc \__tl_build_end_loop:NN { \cs_to_str:N #1 ' } #2 } -\cs_new:Npn \tl_rand_item:n #1 - { - \tl_if_blank:nF {#1} - { \tl_item:nn {#1} { \int_rand:nn { 1 } { \tl_count:n {#1} } } } - } -\cs_new:Npn \tl_rand_item:N { \exp_args:No \tl_rand_item:n } -\cs_generate_variant:Nn \tl_rand_item:N { c } \cs_new:Npn \tl_range:Nnn { \exp_args:No \tl_range:nnn } \cs_generate_variant:Nn \tl_range:Nnn { c } \cs_new:Npn \tl_range:nnn { \__tl_range:Nnnn \__tl_range:w } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 8ce266d05a8..92ee95480c4 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 Copyright (C) 1990-2018 The LaTeX3 Project -\def\ExplFileDate{2018-11-19}% +\def\ExplFileDate{2018-12-06}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \def\tempa{LaTeX2e}% diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index a774f4a9048..ba4e5f2785a 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 Copyright (C) 1990-2018 The LaTeX3 Project -\def\ExplFileDate{2018-11-19}% +\def\ExplFileDate{2018-12-06}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def index a242b6eea3c..b741b3c8dee 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvipdfmx.def @@ -20,7 +20,7 @@ %% %% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project \ProvidesExplFile - {l3dvidpfmx.def}{2018-11-19}{} + {l3dvidpfmx.def}{2018-12-06}{} {L3 Experimental driver: dvipdfmx} \cs_new_eq:NN \__driver_literal:e \tex_special:D \cs_new_protected:Npn \__driver_literal:n #1 diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def index a2d5fd5ab52..1565f12a567 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvips.def @@ -20,7 +20,7 @@ %% %% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project \ProvidesExplFile - {l3dvips.def}{2018-11-19}{} + {l3dvips.def}{2018-12-06}{} {L3 Experimental driver: dvips} \cs_new_eq:NN \__driver_literal:e \tex_special:D \cs_new_protected:Npn \__driver_literal:n #1 diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def index 39ee76c2b9f..e412a3ad2bd 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3dvisvgm.def @@ -20,7 +20,7 @@ %% %% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project \ProvidesExplFile - {l3dvisvgm.def}{2018-11-19}{} + {l3dvisvgm.def}{2018-12-06}{} {L3 Experimental driver: dvisvgm} \cs_new_eq:NN \__driver_literal:e \tex_special:D \cs_new_protected:Npn \__driver_literal:n #1 diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def index afac364e67f..43bfffd81bc 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3pdfmode.def @@ -20,7 +20,7 @@ %% %% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project \ProvidesExplFile - {l3pdfmode.def}{2018-11-19}{} + {l3pdfmode.def}{2018-12-06}{} {L3 Experimental driver: PDF mode} \cs_new_eq:NN \__driver_literal:e \tex_special:D \cs_new_protected:Npn \__driver_literal:n #1 diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def index 69e0bb4e3da..91ea88ecd66 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3xdvipdfmx.def @@ -20,7 +20,7 @@ %% %% File: l3drivers.dtx Copyright(C) 2011-2018 The LaTeX3 Project \ProvidesExplFile - {l3xdvidpfmx.def}{2018-11-19}{} + {l3xdvidpfmx.def}{2018-12-06}{} {L3 Experimental driver: xdvipdfmx} \cs_new_eq:NN \__driver_literal:e \tex_special:D \cs_new_protected:Npn \__driver_literal:n #1 -- cgit v1.2.3