[latex3-commits] [git/LaTeX3-latex3-latex2e] copyedits-chris: Merge branch 'develop' into copyedits-chris (efa9e219)
Frank Mittelbach
frank.mittelbach at latex-project.org
Tue Sep 28 10:58:56 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : copyedits-chris
Link : https://github.com/latex3/latex2e/commit/efa9e219cdaf421110c426e7ec276a1bd879b6b7
>---------------------------------------------------------------
commit efa9e219cdaf421110c426e7ec276a1bd879b6b7
Merge: 278d0703 d3601236
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Tue Sep 28 10:58:56 2021 +0200
Merge branch 'develop' into copyedits-chris
# Conflicts:
# base/lthooks.dtx
# base/ltpara.dtx
>---------------------------------------------------------------
efa9e219cdaf421110c426e7ec276a1bd879b6b7
.github/workflows/deploy.yaml | 123 +++++++++++++++++++++
base/README.md | 2 +-
base/changes.txt | 20 +++-
base/doc/ltnews34.tex | 22 +++-
base/ltcmd.dtx | 14 ++-
base/ltoutenc.dtx | 10 +-
base/ltpara.dtx | 29 +++--
base/ltvers.dtx | 2 +-
base/testfiles-legacy/github-0658.tlg | 39 ++++---
base/testfiles-ltcmd/ltcmd001.lvt | 2 +
base/testfiles-ltcmd/ltcmd001.tlg | 7 ++
required/amsmath/README.md | 4 +-
.../amsmath/testfiles-TU/tlb-utex-004.luatex.tlg | 2 -
required/amsmath/testfiles-TU/tlb-utex-004.tlg | 3 -
.../amsmath/testfiles-TU/tlb-utex-005.luatex.tlg | 2 -
required/amsmath/testfiles-TU/tlb-utex-005.tlg | 3 -
.../amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg | 1 -
required/amsmath/testfiles/amsldoc-4-fleqn.tlg | 1 -
required/amsmath/testfiles/amsldoc-4.luatex.tlg | 1 -
required/amsmath/testfiles/amsldoc-4.tlg | 1 -
required/amsmath/testfiles/amsldoc-5.luatex.tlg | 3 -
required/amsmath/testfiles/amsldoc-5.tlg | 3 -
required/amsmath/testfiles/amsldoc-5.xetex.tlg | 3 -
required/amsmath/testfiles/github-0126.luatex.tlg | 1 -
required/amsmath/testfiles/github-0126.tlg | 1 -
required/amsmath/testfiles/github-amsmath-0049.tlg | 10 --
.../amsmath/testfiles/github-amsmath-0049b.tlg | 10 --
required/amsmath/testfiles/tlb-muskip-001.tlg | 1 -
.../testfiles/tlb-overunderset01.luatex.tlg | 2 -
required/amsmath/testfiles/tlb-overunderset01.tlg | 2 -
.../firstaid/testfiles-TU/firstaid-bidi.luatex.tlg | 2 +-
required/firstaid/testfiles-TU/firstaid-bidi.tlg | 2 +-
required/graphics/README.md | 2 +-
required/graphics/changes.txt | 4 +
required/graphics/graphicx.dtx | 11 +-
required/graphics/testfiles/github-0651.lvt | 8 ++
.../graphics/testfiles/github-0651.tlg | 0
required/tools/README.md | 2 +-
required/tools/testfiles-TU/github-0212.luatex.tlg | 3 -
required/tools/testfiles-TU/github-0212.tlg | 4 -
required/tools/testfiles-TU/github-0352.tlg | 5 -
required/tools/testfiles-legacy/github-0212.tlg | 1 -
required/tools/testfiles/github-0042.tlg | 5 -
required/tools/testfiles/github-0072.tlg | 8 --
required/tools/testfiles/github-0100.luatex.tlg | 4 -
required/tools/testfiles/github-0100.tlg | 4 -
required/tools/testfiles/github-0102-tools.tlg | 1 -
required/tools/testfiles/github-0152.tlg | 2 -
required/tools/testfiles/github-0270.tlg | 4 -
required/tools/testfiles/github-0270.xetex.tlg | 4 -
required/tools/testfiles/github-0561.tlg | 2 -
required/tools/testfiles/sx121692.luatex.tlg | 1 -
required/tools/testfiles/sx121692.tlg | 1 -
required/tools/testfiles/sx138783b.luatex.tlg | 1 -
required/tools/testfiles/sx138783b.tlg | 1 -
required/tools/testfiles/sx197130.luatex.tlg | 1 -
required/tools/testfiles/sx197130.tlg | 1 -
required/tools/testfiles/sx231401.luatex.tlg | 7 --
required/tools/testfiles/sx231401.tlg | 7 --
required/tools/testfiles/sx68732.luatex.tlg | 77 -------------
required/tools/testfiles/sx68732.tlg | 77 -------------
required/tools/testfiles/tl2e1.tlg | 1 -
required/tools/testfiles/tlb-multicol-001.tlg | 1 -
required/tools/testfiles/tlb-multicol-005.tlg | 6 -
.../tools/testfiles/tlb-multicol-eisuke.luatex.tlg | 12 --
required/tools/testfiles/tlb-multicol-eisuke.tlg | 12 --
required/tools/testfiles/tlb0560.tlg | 2 -
required/tools/testfiles/tlb1465.luatex.tlg | 1 -
required/tools/testfiles/tlb1465.tlg | 1 -
required/tools/testfiles/tlb1571.tlg | 1 -
required/tools/testfiles/tlb1828.luatex.tlg | 1 -
required/tools/testfiles/tlb1828.tlg | 1 -
required/tools/testfiles/tlb2131.tlg | 1 -
required/tools/testfiles/tlb2563.tlg | 5 -
required/tools/testfiles/tlb2632.luatex.tlg | 1 -
required/tools/testfiles/tlb2632.tlg | 1 -
required/tools/testfiles/tlb2968.tlg | 6 -
required/tools/testfiles/tlb2968.xetex.tlg | 6 -
required/tools/testfiles/tlb3722.tlg | 4 -
required/tools/testfiles/tlb3747.luatex.tlg | 7 --
required/tools/testfiles/tlb3747.tlg | 7 --
required/tools/testfiles/tlb3747e.luatex.tlg | 7 --
required/tools/testfiles/tlb3747e.tlg | 7 --
required/tools/testfiles/tlb4395-2.tlg | 6 -
required/tools/testfiles/tnfss1.luatex.tlg | 1 -
required/tools/testfiles/tnfss1.tlg | 1 -
required/tools/testfiles/tub-38-02-fmi.tlg | 2 -
87 files changed, 254 insertions(+), 423 deletions(-)
diff --cc base/ltpara.dtx
index 0b2d3050,bc51e468..3309aebb
--- a/base/ltpara.dtx
+++ b/base/ltpara.dtx
@@@ -427,15 -426,9 +427,19 @@@
% builder: the process also has to add any hook code for the end of
% a paragraph. Thus
% \cs{endgraf} was changed to provide this additional functionality
-% (and so by extension \cs{par} subject to its current meaning).
-%
-% The \pkg{expl3} name for the functionality is \cs{para_end:}.
+% (along with \cs{par} remaining subject to its current meaning).
+%
+% TEMP NOTE: Maybe endgraf should not be changed by LaTeX as it is
+% essentially not at all a part of LaTeX.
+% If it is too dangerous to leave it as
+% a synonym for the primitive, then we could just disable it.
++% [FMi:]
++% not in my opinion. It is used in many places and the redefinition is safe and does the right thing.
++% disabling it just means it breaks a lot of stuff for no reason.
++% [FMi:]
+% Note that the 2e kernel has been completely purged of endgrafs.
+%
+% The \pkg{expl3} name for this functionality is \cs{para_end:}.
% \end{function}
%
% \begin{quote}
@@@ -1010,18 -1001,17 +1014,22 @@@
\mode_if_inner:F {
% \end{macrocode}
% In that case the action of the primitive would be to remove the
-% last glue (not kern) from the horizontal list constructed to form
-% a paragraph then append the a penalty of 10000 and the
-% \cs{parfillskip} at the end and pass the whole list to the
-% paragraph builder which breaks it into lines and \TeX{} then
+% last glue (but no kerns) from the horizontal list (constructed to form
+% a paragraph) and then to append a penalty of 10000 and the
+% \cs{parfillskip}; it then passes the whole list to the
+% paragraph builder, which breaks it into lines and \TeX{} then
% returns to vertical mode.
%
-% What we want to do instead is to add our hook code at the end of
-% the horizontal list before that happens and the code is passed to
-% the paragraph builder. If there was a glue item at the end then
+% What we want to do is to add this hook code at the end of
+% the horizontal list before any of the above happens.
+% If there was a glue item at the end of the list then
% it should get removed before the hook code gets added so we have
-% to arrange for its removal ourselves.
+% to arrange for this removal.
+% TEMP NOTE: maybe a ‘nobreak’ should also be added?
++% [FMi:]
++% sounds wrong to me, why?
++% [FMi:]
++%
%
% There is not much point in checking if there was really a glue
% item at the end of the horizontal list, instead we simply try to
@@@ -1042,11 -1032,13 +1050,13 @@@
\mode_if_horizontal:TF {
% \end{macrocode}
% The final action (before getting to the point where
-% \cs{tex_par:D} is called) is to add a glue item so that the
-% primitive is prevented from removing glue (if there was some). If
-% we don't do this and the
-% horizontal list ended in several glue items we would end up with
-% removing two instead of just the last one, which would be wrong.
+% \cs{tex_par:D} is called) is to add an extra glue item so that the
+% primitive is prevented from removing intended glue
+% (if there was some). If we don't do this and the
+% horizontal list ends in several glue items we would end up removing
+% two glue items instead of just the last one, which would be wrong.
+ % We use glue (rather than a kern) as that will be removed by the primitive
+ % par.
%
% There is however one other \TeX{} optimization that hurts: in a
% sequence like this \verb=$$ ... $$ \par= \TeX{} will be in
More information about the latex3-commits
mailing list.