[latex3-commits] [git/LaTeX3-latex3-latex2e] copyedits-chris: Merge branch 'develop' into copyedits-chris (6773a531)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : copyedits-chris
Link       : https://github.com/latex3/latex2e/commit/6773a5314ec1e94f7007dcf623f6ef9e953b02e3

>---------------------------------------------------------------

commit 6773a5314ec1e94f7007dcf623f6ef9e953b02e3
Merge: 974ef939 23b9664a
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Oct 14 19:42:04 2021 +0200

    Merge branch 'develop' into copyedits-chris
    
    # Conflicts:
    #       base/doc/ltnews34.tex
    #       base/ltpara.dtx


>---------------------------------------------------------------

6773a5314ec1e94f7007dcf623f6ef9e953b02e3
 CONTRIBUTING.md                                  |   4 +-
 README.md                                        |   4 +-
 base/changes.txt                                 |   5 +
 base/classes.dtx                                 |  22 ++--
 base/doc.dtx                                     |  11 +-
 base/doc/ltnews34.tex                            |  14 +-
 base/ltoutenc.dtx                                |   4 +-
 base/ltpara.dtx                                  |   9 +-
 base/makeindx.dtx                                |   4 +-
 base/preload.dtx                                 |   4 +-
 base/slides.dtx                                  |   8 +-
 required/amsmath/README.md                       |   2 +-
 required/cyrillic/README.md                      |   2 +-
 required/graphics/README.md                      |   2 +-
 required/graphics/color.dtx                      |   8 +-
 required/graphics/graphics.dtx                   |   2 +-
 required/tools/README.md                         |   2 +-
 required/tools/array.dtx                         |   6 +-
 required/tools/changes.txt                       |   9 +-
 required/tools/multicol.dtx                      | 128 +++++++++++++------
 required/tools/testfiles/github-0682.lvt         | 155 +++++++++++++++++++++++
 required/tools/testfiles/github-0682.tlg         |  17 +++
 texmf/tex/latex/l3backend/l3backend-dvipdfmx.def |   8 +-
 texmf/tex/latex/l3backend/l3backend-dvips.def    |  19 +--
 texmf/tex/latex/l3backend/l3backend-dvisvgm.def  |   2 +-
 texmf/tex/latex/l3backend/l3backend-luatex.def   |   8 +-
 texmf/tex/latex/l3backend/l3backend-pdftex.def   |   8 +-
 texmf/tex/latex/l3backend/l3backend-xetex.def    |   8 +-
 texmf/tex/latex/l3kernel/expl3-code.tex          |  15 ++-
 texmf/tex/latex/l3kernel/expl3-generic.tex       |   2 +-
 texmf/tex/latex/l3kernel/expl3.ltx               |   2 +-
 texmf/tex/latex/l3kernel/expl3.sty               |   2 +-
 32 files changed, 373 insertions(+), 123 deletions(-)

diff --cc base/doc/ltnews34.tex
index fefed8ac,d2507f69..de10a04c
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@@ -734,23 -696,37 +734,33 @@@ a run-in heading rather than appearing 
  %
  \githubissue[s]{131 and 173}
  
- %% \subsection{???}
 +
- %% \githubissue{000}
+ \subsection{\pkg{multicol}: Better column break control}
+ 
+ From version 1.9 onwards \cs{columnbreak} accepts an optional
+ argument (just like \cs{pagebreak}) in which you can specify the
+ desirability to break the column after the current line: supported values are
+ \texttt{1} to \texttt{4} with higher numbers increasing the likelihood.
+ This version also adds \cs{newcolumn}
+ which forces a column break but runs the column short (comparible to
+ \cs{newpage} for pages). 
+ %
+ \githubissue{682}
+ 
  
 +
  \section{Changes to packages in the \pkg{amsmath} category}
 -\subsection{Improve compability with hyperref}
 +\subsection{Improved compatibility with \pkg{hyperref}}
  
 -When \pkg{hyperref} is used, incrementing a counter creates anchors and this can affect spacing.
 -For a long time \pkg{hyperref} patched the \env{equation} environment to 
 -avoid some of the side effects. This patch has now been moved directly into \pkg{amsmath}.
 -Additionally,
 -a \cs{mathopen} has been added to avoid that the anchor affects a following unary symbol.
 +This change in amsmath fixes a spacing problem caused by the
 +method used in \pkg{hyperref} to change the \env{equation} environment.
  %
 -\githubissue{652}
 -
 -\subsection{???}
 -
 +For simplicity, an explicit, low-level (hence possibly temporary) 
 +patch has been added to \pkg{amsmath}: this consists of an extra, empty (hence invisible)
 +\cs{mathopen} atom (with no mathematical meaning) at the start of the 
 +environment’s mathematical content.
  %
 -\githubissue{000}
 -
 -
 -
 +\githubissue{652}
  
  \medskip
  
diff --cc base/ltpara.dtx
index b7670dc4,a18e9fdc..1e6502fb
--- a/base/ltpara.dtx
+++ b/base/ltpara.dtx
@@@ -980,12 -966,9 +980,9 @@@
  %       { \mode_if_horizontal_p: }
  %       { \bool_not_p:n { \mode_if_inner_p: } }
  %       { ...
- %    \end{macrocode}
- %
- %    TEMP NOTE: Changed in develop
- %
+ %\end{verbatim}
  %    Since this is executed for each and every paragraph in a document
 -%    we try to stay a fast as possible, So we are aren't using the
 +%    we try to stay as fast as possible, so we do not use the
  %    above construct but two conditionals instead. Using low-level
  %    \cs{if_mode...} conditions would be even faster but has the
  %    danger to conflict with conditionals in the user hooks.