From 11d73f40315808cfcaa8823606fa692da7fc3137 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 6 Dec 2020 22:18:55 +0000 Subject: l3kernel (6dec20) git-svn-id: svn://tug.org/texlive/trunk@57085 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 57 ++++++++++++---------- .../tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- 4 files changed, 34 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 616bc6dddff..c08d517c9ad 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -69,7 +69,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2020-12-03}% +\def\ExplFileDate{2020-12-05}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -27373,10 +27373,13 @@ } \cs_new_protected:Npx \__coffin_set_vertical_aux: { - \cs_if_exist:NT \linewidth - { \dim_set_eq:NN \linewidth \tex_hsize:D } - \cs_if_exist:NT \columnwidth - { \dim_set_eq:NN \columnwidth \tex_hsize:D } + \bool_lazy_and:nnT + { \cs_if_exist_p:N \fmtname } + { \str_if_eq_p:Vn \fmtname { LaTeX2e } } + { + \dim_set_eq:NN \exp_not:N \linewidth \tex_hsize:D + \dim_set_eq:NN \exp_not:N \columnwidth \tex_hsize:D + } } \cs_new_protected:Npn \hcoffin_set:Nw #1 { @@ -28255,36 +28258,38 @@ \dim_new:N \l__coffin_display_x_dim \dim_new:N \l__coffin_display_y_dim \prop_new:N \l__coffin_display_poles_prop -\tl_new:N \l__coffin_display_font_tl -\cs_if_exist:NTF \AtBeginDocument - { \AtBeginDocument } - { \use:n } +\tl_new:N \l__coffin_display_font_tl +\bool_lazy_and:nnT + { \cs_if_exist_p:N \fmtname } + { \str_if_eq_p:Vn \fmtname { LaTeX2e } } { - \__kernel_tl_set:Nx \l__coffin_display_font_tl - { - \cs_if_exist:NT \sffamily { \exp_not:N \sffamily } - \cs_if_exist:NT \tiny { \exp_not:N \tiny } - } + \tl_set:Nn \l__coffin_display_font_tl + { \sffamily \tiny } } -\cs_if_exist:NTF \AtBeginDocument - { \AtBeginDocument } - { \use:n } +\cs_new_protected:Npn \__coffin_color:n #1 {#1} +\bool_lazy_and:nnT + { \cs_if_exist_p:N \fmtname } + { \str_if_eq_p:Vn \fmtname { LaTeX2e } } { - \cs_new_protected:Npx \__coffin_color:n #1 + \cs_gset_protected:Npn \__coffin_color:n { - \cs_if_exist:NTF \color_select:n - { \color_select:n {#1} } + \cs_gset_protected:Npx \__coffin_color:n { - \cs_if_exist:NT \color - { \exp_not:N \color {#1} } + \cs_if_exist:NTF \color_select:n + { \color_select:n } + { + \cs_if_exist:NTF \color + { \exp_not:N \color } + { \exp_not:N \use_none:n } + } } + \__coffin_color:n } } -\cs_new_protected:Npx \__coffin_rule:nn #1#2 +\cs_new_protected:Npn \__coffin_rule:nn #1#2 { - \cs_if_exist:NTF \rule - { \exp_not:N \rule {#1} {#2} } - { \hbox:n { \tex_vrule:D width #1 height #2 \scan_stop: } } + \mode_leave_vertical: + \hbox:n { \tex_vrule:D width #1 height #2 \scan_stop: } } \cs_new_protected:Npn \coffin_mark_handle:Nnnn #1#2#3#4 { diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 9c3bef2d7a8..99bdb02bb8a 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{2020-12-03}% +\def\ExplFileDate{2020-12-05}% \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 475abcb68b7..f69b6fe0f8d 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{2020-12-03}% +\def\ExplFileDate{2020-12-05}% \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 a825a362e44..2acf7757c4b 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{2020-12-03}% +\def\ExplFileDate{2020-12-05}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% -- cgit v1.2.3