diff options
author | Karl Berry <karl@freefriends.org> | 2023-05-26 21:08:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-05-26 21:08:11 +0000 |
commit | 152a3cf94e39934458f3817271258eb45155782a (patch) | |
tree | f06dd337c3bb5a072c6945c4a5ce9d52a264b0ce /Master/texmf-dist | |
parent | 417c107cc8950314c389d035a6d5a3ed08cdf658 (diff) |
latex-firstaid-dev (26may23)
git-svn-id: svn://tug.org/texlive/trunk@67225 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
6 files changed, 80 insertions, 114 deletions
diff --git a/Master/texmf-dist/doc/latex-dev/firstaid/changes.txt b/Master/texmf-dist/doc/latex-dev/firstaid/changes.txt index 31e24397341..e326957807f 100644 --- a/Master/texmf-dist/doc/latex-dev/firstaid/changes.txt +++ b/Master/texmf-dist/doc/latex-dev/firstaid/changes.txt @@ -1,3 +1,14 @@ +2023-05-20 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + + * latex2e-first-aid-for-external-files.dtx: removed temporary fix for + GitHub issue 591, unneeded now and it breaks for luatex the fix for gh 989 + (minipage/list spacing) + +2022-12-06 Ulrike Fischer <Ulrike.Fischer@latex-project.org> + + * latex2e-first-aid-for-external-files.dtx (subsection{the crop package first aid}): + A first aid for crop after changes to \rlap and \stockwidth/\stockheight + 2022-11-28 Ulrike Fischer <Ulrike.Fischer@latex-project.org> * latex2e-first-aid-for-external-files.dtx (subsection{the songs package first aid}): diff --git a/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf b/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf Binary files differindex b525f8eea8f..991a11ec54c 100644 --- a/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf +++ b/Master/texmf-dist/doc/latex-dev/firstaid/latex2e-first-aid-for-external-files.pdf diff --git a/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx b/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx index 0d9ce67bcad..90958ed7776 100644 --- a/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx +++ b/Master/texmf-dist/source/latex-dev/firstaid/latex2e-first-aid-for-external-files.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. @@ -65,7 +65,7 @@ % % For that reason, it is put into a separate bundle so that we can % update it easily without requiring the CTAN maintainers to -% install a new full LaTeX system just because we take out (or add) +% install a new full \LaTeX{} system just because we take out (or add) % a fix for a package here. % % In the best case scenario the file documented here should be @@ -111,8 +111,8 @@ % \end{macrocode} % % \begin{macrocode} -\def\LaTeXFirstAidDate{2022/11/28} -\def\LaTeXFirstAidVersion{v1.0w} +\def\LaTeXFirstAidDate{2023/05/20} +\def\LaTeXFirstAidVersion{v1.0z} % \end{macrocode} % % \begin{macrocode} @@ -429,7 +429,7 @@ % \subsection{The \pkg{songs} package first aid} % % The songs package uses \cs{obeylines} and redefines \cs{par} for special effect. -% this no longer works in LaTeX 2022-06-01 (gh issue 367). The following +% this no longer works in \LaTeX{} 2022-06-01 (gh issue 367). The following % fixes at least one failure. % \begin{macrocode} \AddToHook{file/songs.sty/after}[firstaid]{% @@ -443,6 +443,41 @@ } % \end{macrocode} % +% \subsection{The \pkg{crop} package first aid} +% +% The crop packages fails currently due to two \LaTeX{} changes: +% It doesn't know that \cs{stockheight} and \cs{stockwidth} +% are now defined, and doesn't take into account that \cs{rlap} +% is robust (https://github.com/rrthomas/crop/issues/2). +% The first is addressed by setting the dimension if they are zero or +% negative. For the second we locally change the meaning of \cs{protect} +% +% \begin{macrocode} +\AddToHook{file/crop.sty/after}[firstaid]{% + \FirstAidNeededT{crop}{sty}{2017/11/19 1.10 crop marks (mf)}% + {% + \ifdim\stockwidth > 0pt \else \stockwidth\paperwidth \fi + \ifdim\stockheight > 0pt \else \stockheight\paperheight \fi + \renewcommand*\CROP@genreflect[1]{% + \leavevmode + \dimen0\CROP@horigin + \kern2\dimen0 + \begingroup + \set@typeset@protect %change protect + \reflectbox{% + \hb@xt@\paperwidth{% + \vbox to\paperheight{% + #1% + \vss + }% + \hss + }% + }% + \endgroup + } + }% +} +% \end{macrocode} % \begin{macrocode} %</kernel> % \end{macrocode} @@ -640,63 +675,6 @@ % \end{macrocode} % % -% \subsection[Temporary fixes for the kernel (until the next -% patch-level release)] -% {Temporary fixes for the kernel \\ -% (until the next patch-level release)} -% -% This fixes GitHub issue 591. It is only needed in Lua\TeX\ and replaces just one -% instance of \cs{tex\_par:D} with the following version which removes -% other nodes in the current list first. -% \begin{macrocode} -\ExplSyntaxOn -\sys_if_engine_luatex:T - { - \newluafunction \g__para_end_empty_par_id_int - \exp_args:Nx \everyjob { - \exp_not:V \everyjob - \exp_not:N \lua_now:n { - local~texnest, flush_list, par_token = tex.nest, node.flush_list, token.create'tex_par:D'~ - lua.get_functions_table()[\int_use:N \g__para_end_empty_par_id_int] = function() - local~nest_level = texnest.top~ - local~cur_head = nest_level.head~ - flush_list(cur_head.next) - nest_level.tail, cur_head.next = cur_head, nil~ - token.put_next(par_token) - end - } - } - \protected \luadef \__para_end_empty_par: \g__para_end_empty_par_id_int - \group_begin: - \cs_set:Npn \__para_extract_everypar:w #1 \the \toks #2 \s_stop - { - \tl_gset:Nn \g__para_standard_everypar_tl { - \box_gset_to_last:N \g_para_indent_box - \group_begin: - \__para_end_empty_par: - \group_end: - \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} } - \@kernel@before@para@before - \hook_use:n {para/before} - \group_begin: - \tex_everypar:D {} - \skip_zero:N \tex_parskip:D - \tex_noindent:D - \group_end: - \tex_everypar:D{\g__para_standard_everypar_tl} - \@kernel@before@para@begin - \hook_use:n {para/begin} - \if_mode_horizontal: \else: - \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: - \__para_handle_indent: - \the \toks #2 - } - } - \exp_last_unbraced:No \__para_extract_everypar:w \g__para_standard_everypar_tl \s_stop - \group_end: - } -\ExplSyntaxOff -% \end{macrocode} % % % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty index d2f2d8d2d96..c7e7e6e06ca 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/firstaid/everysel-ltx.sty @@ -30,7 +30,7 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty index 2dfa89985a5..2415a38f1c8 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty +++ b/Master/texmf-dist/tex/latex-dev/firstaid/filehook-ltx.sty @@ -30,7 +30,7 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. diff --git a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx index 0c905e9b814..df4b77ed714 100644 --- a/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx +++ b/Master/texmf-dist/tex/latex-dev/firstaid/latex2e-first-aid-for-external-files.ltx @@ -30,12 +30,12 @@ %% `First Aid Bundle'. You may however distribute the LaTeX `First Aid Bundle' %% without such generated files. %% -%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2022 +%% File: latex2e-first-aid-for-external-files.dtx (C) Copyright 2020-2023 %% %% The LaTeX Project and any individual authors listed elsewhere %% in this file. -\def\LaTeXFirstAidDate{2022/11/28} -\def\LaTeXFirstAidVersion{v1.0w} +\def\LaTeXFirstAidDate{2023/05/20} +\def\LaTeXFirstAidVersion{v1.0z} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -83,6 +83,30 @@ \let\@par\SB@@par% }}% } +\AddToHook{file/crop.sty/after}[firstaid]{% + \FirstAidNeededT{crop}{sty}{2017/11/19 1.10 crop marks (mf)}% + {% + \ifdim\stockwidth > 0pt \else \stockwidth\paperwidth \fi + \ifdim\stockheight > 0pt \else \stockheight\paperheight \fi + \renewcommand*\CROP@genreflect[1]{% + \leavevmode + \dimen0\CROP@horigin + \kern2\dimen0 + \begingroup + \set@typeset@protect %change protect + \reflectbox{% + \hb@xt@\paperwidth{% + \vbox to\paperheight{% + #1% + \vss + }% + \hss + }% + }% + \endgroup + } + }% +} \AddToHook{file/bigfoot.sty/after}{% \ifnum\count10<\insc@unt \global\count10=\insc@unt @@ -156,53 +180,6 @@ \dimendef\stockheight=\kernel@stockheight \dimendef\stockwidth=\kernel@stockwidth } -\ExplSyntaxOn -\sys_if_engine_luatex:T - { - \newluafunction \g__para_end_empty_par_id_int - \exp_args:Nx \everyjob { - \exp_not:V \everyjob - \exp_not:N \lua_now:n { - local~texnest, flush_list, par_token = tex.nest, node.flush_list, token.create'tex_par:D'~ - lua.get_functions_table()[\int_use:N \g__para_end_empty_par_id_int] = function() - local~nest_level = texnest.top~ - local~cur_head = nest_level.head~ - flush_list(cur_head.next) - nest_level.tail, cur_head.next = cur_head, nil~ - token.put_next(par_token) - end - } - } - \protected \luadef \__para_end_empty_par: \g__para_end_empty_par_id_int - \group_begin: - \cs_set:Npn \__para_extract_everypar:w #1 \the \toks #2 \s_stop - { - \tl_gset:Nn \g__para_standard_everypar_tl { - \box_gset_to_last:N \g_para_indent_box - \group_begin: - \__para_end_empty_par: - \group_end: - \tex_everypar:D { \msg_error:nnnn { hooks }{ para-mode }{before}{vertical} } - \@kernel@before@para@before - \hook_use:n {para/before} - \group_begin: - \tex_everypar:D {} - \skip_zero:N \tex_parskip:D - \tex_noindent:D - \group_end: - \tex_everypar:D{\g__para_standard_everypar_tl} - \@kernel@before@para@begin - \hook_use:n {para/begin} - \if_mode_horizontal: \else: - \msg_error:nnnn { hooks }{ para-mode }{begin}{vertical} \fi: - \__para_handle_indent: - \the \toks #2 - } - } - \exp_last_unbraced:No \__para_extract_everypar:w \g__para_standard_everypar_tl \s_stop - \group_end: - } -\ExplSyntaxOff \endinput %% %% End of file `latex2e-first-aid-for-external-files.ltx'. |