diff options
author | Karl Berry <karl@freefriends.org> | 2021-07-01 21:37:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-07-01 21:37:09 +0000 |
commit | f8391a3145093d79784652099de7fddebbfc9a1a (patch) | |
tree | 9c7701c2a22e36e97adb22a666c947af45effac6 /Master/texmf-dist | |
parent | 25b9b4a44ec5c9b59661fdf1786015e62a311c1b (diff) |
firstaid (1jul21)
git-svn-id: svn://tug.org/texlive/trunk@59798 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/firstaid/changes.txt | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf | bin | 243739 -> 245736 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx | 34 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/firstaid/latex2e-first-aid-for-external-files.ltx | 29 |
4 files changed, 65 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/latex/firstaid/changes.txt b/Master/texmf-dist/doc/latex/firstaid/changes.txt index 908452783e0..f84c9dbc5b7 100644 --- a/Master/texmf-dist/doc/latex/firstaid/changes.txt +++ b/Master/texmf-dist/doc/latex/firstaid/changes.txt @@ -1,3 +1,9 @@ +2021-06-28 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * latex2e-first-aid-for-external-files.dtx: + Add first aid for strange bogus para/end error due to listings's + redefinition of \vskip. + 2021-06-24 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * latex2e-first-aid-for-external-files.dtx (subsection{\footref first aid}): diff --git a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf Binary files differindex 8a1df733248..5b395e4e100 100644 --- a/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf +++ b/Master/texmf-dist/doc/latex/firstaid/latex2e-first-aid-for-external-files.pdf diff --git a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx index da630423c29..b15a63d7ec3 100644 --- a/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx +++ b/Master/texmf-dist/source/latex/firstaid/latex2e-first-aid-for-external-files.dtx @@ -111,8 +111,8 @@ % \end{macrocode} % % \begin{macrocode} -\def\LaTeXFirstAidDate{2021/06/24} -\def\LaTeXFirstAidVersion{v1.0n} +\def\LaTeXFirstAidDate{2021/06/28} +\def\LaTeXFirstAidVersion{v1.0o} % \end{macrocode} % % \begin{macrocode} @@ -679,6 +679,36 @@ \ExplSyntaxOff % \end{macrocode} % +% The next fixes Github issue 605 (by inserting a \cs{scan\_stop:} +% before doing the check for hmode). +% \begin{macrocode} +\ExplSyntaxOn +\cs_set_protected:Npn \para_end: { + \scan_stop: + \mode_if_horizontal:TF { + \mode_if_inner:F { + \tex_unskip:D + \hook_use:n{para/end} + \@kernel@after@para@end + \mode_if_horizontal:TF { + \if_int_compare:w 0 < \tex_lastnodetype:D + \tex_kern:D \c_zero_dim + \fi: + \tex_par:D + \hook_use:n{para/after} + \@kernel@after@para@after + } + { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} } + } + } + \tex_par:D +} +\cs_set_eq:NN \par \para_end: +\cs_set_eq:NN \@@par \para_end: +\cs_set_eq:NN \endgraf \para_end: +\ExplSyntaxOff +% \end{macrocode} +% % \begin{macrocode} %</kernel> % \end{macrocode} 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 cf884a7f316..249c312b517 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/06/24} -\def\LaTeXFirstAidVersion{v1.0n} +\def\LaTeXFirstAidDate{2021/06/28} +\def\LaTeXFirstAidVersion{v1.0o} \ProvidesFile{latex2e-first-aid-for-external-files.ltx} [\LaTeXFirstAidDate\space \LaTeXFirstAidVersion\space LaTeX kernel fixes to external files and packages] @@ -191,6 +191,31 @@ \group_end: } \ExplSyntaxOff +\ExplSyntaxOn +\cs_set_protected:Npn \para_end: { + \scan_stop: + \mode_if_horizontal:TF { + \mode_if_inner:F { + \tex_unskip:D + \hook_use:n{para/end} + \@kernel@after@para@end + \mode_if_horizontal:TF { + \if_int_compare:w 0 < \tex_lastnodetype:D + \tex_kern:D \c_zero_dim + \fi: + \tex_par:D + \hook_use:n{para/after} + \@kernel@after@para@after + } + { \msg_error:nnnn { hooks }{ para-mode }{end}{horizontal} } + } + } + \tex_par:D +} +\cs_set_eq:NN \par \para_end: +\cs_set_eq:NN \@@par \para_end: +\cs_set_eq:NN \endgraf \para_end: +\ExplSyntaxOff \endinput %% %% End of file `latex2e-first-aid-for-external-files.ltx'. |