From e8169884e77e6dcd54ccde7d4af1141f4a674dec Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 7 Feb 2021 21:58:12 +0000 Subject: l3 (7feb21) git-svn-id: svn://tug.org/texlive/trunk@57669 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 34 +++++++++++----------- .../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 +- Master/texmf-dist/tex/latex/l3kernel/l3doc.cls | 2 +- 5 files changed, 21 insertions(+), 21 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 2c9202d9d08..12b32317d6f 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{2021-02-02}% +\def\ExplFileDate{2021-02-06}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -26544,6 +26544,8 @@ \cs_new_eq:NN \__box_dim_eval:w \tex_dimexpr:D \cs_new:Npn \__box_dim_eval:n #1 { \__box_dim_eval:w #1 \scan_stop: } +\cs_new_protected:Npn \__kernel_kern:n #1 + { \tex_kern:D \__box_dim_eval:n {#1} } \cs_new_protected:Npn \box_new:N #1 { \__kernel_chk_if_free_cs:N #1 @@ -26911,7 +26913,7 @@ \hbox_set:Nn \l__box_internal_box { \box_use:N #1 } \hbox_set:Nn \l__box_internal_box { - \tex_kern:D -\l__box_left_new_dim + \__kernel_kern:n { -\l__box_left_new_dim } \hbox:n { \__box_backend_rotate:Nn @@ -27201,7 +27203,7 @@ { \hbox_to_wd:nn { \l__box_right_new_dim } { - \tex_kern:D \l__box_right_new_dim + \__kernel_kern:n { \l__box_right_new_dim } \box_use_drop:N \l__box_internal_box \tex_hss:D } @@ -27210,7 +27212,7 @@ \box_set_wd:Nn \l__box_internal_box { \l__box_right_new_dim } \hbox:n { - \tex_kern:D \c_zero_dim + \__kernel_kern:n { 0pt } \box_use_drop:N \l__box_internal_box \tex_hss:D } @@ -27788,10 +27790,8 @@ #3 #1 {#2} \hbox_set:Nn \l__coffin_internal_box { - \tex_kern:D - \dim_eval:n + \__kernel_kern:n { \l__coffin_bounding_shift_dim - \l__coffin_left_corner_dim } - \exp_stop_f: \box_move_down:nn { \l__coffin_bottom_corner_dim } { \box_use:N #1 } } @@ -28048,12 +28048,12 @@ \hbox_set:Nn \l__coffin_aligned_coffin { \dim_compare:nNnT { \l__coffin_offset_x_dim } < \c_zero_dim - { \tex_kern:D -\l__coffin_offset_x_dim } + { \__kernel_kern:n { -\l__coffin_offset_x_dim } } \hbox_unpack:N \l__coffin_aligned_coffin \dim_set:Nn \l__coffin_internal_dim { \l__coffin_offset_x_dim - \box_wd:N #1 + \box_wd:N #4 } \dim_compare:nNnT \l__coffin_internal_dim < \c_zero_dim - { \tex_kern:D -\l__coffin_internal_dim } + { \__kernel_kern:n { -\l__coffin_internal_dim } } } \__coffin_reset_structure:N \l__coffin_aligned_coffin \prop_clear:c @@ -28135,8 +28135,8 @@ \hbox_set:Nn \l__coffin_aligned_internal_coffin { \box_use:N #1 - \tex_kern:D -\box_wd:N #1 - \tex_kern:D \l__coffin_offset_x_dim + \__kernel_kern:n { -\box_wd:N #1 } + \__kernel_kern:n { \l__coffin_offset_x_dim } \box_move_up:nn { \l__coffin_offset_y_dim } { \box_use:N #4 } } \coffin_set_eq:NN #9 \l__coffin_aligned_internal_coffin @@ -28434,8 +28434,8 @@ \hbox_set:Nn \l__coffin_aligned_coffin { \box_use:N \l__coffin_display_coffin - \tex_kern:D -\box_wd:N \l__coffin_display_coffin - \tex_kern:D \l__coffin_offset_x_dim + \__kernel_kern:n { -\box_wd:N \l__coffin_display_coffin } + \__kernel_kern:n { \l__coffin_offset_x_dim } \box_move_up:nn { \l__coffin_offset_y_dim } { \box_use:N #1 } } \box_set_ht:Nn \l__coffin_aligned_coffin @@ -31357,9 +31357,9 @@ { \hbox_set:Nn \l__box_internal_box { - \tex_kern:D - \__box_dim_eval:n {#2} + \__kernel_kern:n { -#2 } \box_use:N #1 - \tex_kern:D - \__box_dim_eval:n {#4} + \__kernel_kern:n { -#4 } } \dim_compare:nNnTF { \box_dp:N #1 } > {#3} { @@ -31408,9 +31408,9 @@ { \hbox_set:Nn \l__box_internal_box { - \tex_kern:D - \__box_dim_eval:n {#2} + \__kernel_kern:n { -#2 } \box_use:N #1 - \tex_kern:D \__box_dim_eval:n { #4 - \box_wd:N #1 } + \__kernel_kern:n { #4 - \box_wd:N #1 } } \dim_compare:nNnTF {#3} < \c_zero_dim { diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index fd4cd8ea7f7..70187f40fed 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{2021-02-02}% +\def\ExplFileDate{2021-02-06}% \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 f4017138156..a48a7176333 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{2021-02-02}% +\def\ExplFileDate{2021-02-06}% \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 ced6d17a7cf..a02edb0c28c 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{2021-02-02}% +\def\ExplFileDate{2021-02-06}% \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 597ba427fc0..a7cc29a9ef8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: l3doc.dtx -\RequirePackage{expl3,xparse,calc} +\RequirePackage{expl3,calc} \ProvidesExplClass{l3doc}{2018-04-30}{} {L3 Experimental documentation class} \clist_new:N \g_docinput_clist -- cgit v1.2.3