From 82d0ca2dd271cc83f881e604772b3e026c8358f1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 Jun 2021 20:07:47 +0000 Subject: firstaid (15jun21) git-svn-id: svn://tug.org/texlive/trunk@59601 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex2e-first-aid-for-external-files.ltx | 43 ++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/latex/firstaid') diff --git a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx index 101edc715d0..e3d58b7a8ca 100644 --- a/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx +++ b/Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx @@ -34,8 +34,8 @@ %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. -\def\LaTeXFirstAidDate{2021/03/15} -\def\LaTeXFirstAidVersion{v1.0l} +\def\LaTeXFirstAidDate{2021/06/08} +\def\LaTeXFirstAidVersion{v1.0m} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -43,7 +43,9 @@ \ExplSyntaxOn \cs_new:Npn\FirstAidNeededT#1#2#3{ - \exp_args:Nc\str_if_eq:onT{ver@#1.#2}{#3} + \exp_args:Ncx\str_if_eq:onF{ver@#1.#2}{#3} + { \typeout{==>~ First~ Aid~ for~ #1.#2~ no~ longer~ applied!} } + \exp_args:Ncx\str_if_eq:onT{ver@#1.#2}{#3} } \ExplSyntaxOff \AddToHook{file/after/biditools.sty}[firstaid]{% @@ -112,6 +114,41 @@ \expandafter\FN@allmarks\expandafter{\number\numexpr#1+\@ne}% \fi}% } +\AddToHook{file/after/ulem.sty}[firstaid]{% + \def\@hspace#1{\begingroup\setlength\skip@{#1}% + \edef\x{\endgroup\hskip\the\skip@\relax}\x}% + } +\AddToHook{file/after/varwidth.sty}[firstaid]{% + \FirstAidNeededT{varwidth}{sty}% + {2009/03/30 ver 0.92; \space Variable-width minipages}% + {% +\def\@vwid@sift{% + \skip@\lastskip\unskip + \unskip % <---- the first aid here + \dimen@\lastkern\unkern + \count@\lastpenalty\unpenalty + \setbox\z@\lastbox + \ifvoid\z@ \advance\sift@deathcycles\@ne \else \sift@deathcycles\z@ \fi + \ifnum\sift@deathcycles>33 + \let\@vwid@sift\relax + \PackageWarning{varwidth}{Failed to reprocess entire contents}% + \fi + \ifnum\count@=\@vwid@preeqp \@vwid@eqmodefalse\fi + \ifnum\count@=\@vwid@posteqp \@vwid@eqmodetrue\fi + \ifnum\count@=\@vwid@toppen % finished + \let\@vwid@sift\relax + \else\ifnum\count@=\@vwid@offsets + \@vwid@setoffsets + \else + \ifnum\count@=\@vwid@postw + \else + \@vwid@resetb % reset box \z@ or measure it + \fi + \@vwid@append + \fi\fi + \@vwid@sift}% + }% + } \endinput %% %% End of file `latex2e-first-aid-for-external-files.ltx'. -- cgit v1.2.3