[latex3-commits] [git/LaTeX3-latex3-latex2e] everymath: combine Ulrike's and my implementations (8390c6c7)
Frank Mittelbach
frank.mittelbach at latex-project.org
Sat Jan 7 11:02:14 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : everymath
Link : https://github.com/latex3/latex2e/commit/8390c6c7e77da7c8556a115296889bc1ec84f3b4
>---------------------------------------------------------------
commit 8390c6c7e77da7c8556a115296889bc1ec84f3b4
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Sat Jan 7 11:02:14 2023 +0100
combine Ulrike's and my implementations
>---------------------------------------------------------------
8390c6c7e77da7c8556a115296889bc1ec84f3b4
required/latex-lab/latex-lab-math.dtx | 171 -----------------------------
required/latex-lab/latex-lab-mathpkg.dtx | 21 ++++
required/latex-lab/latex-lab-testphase.dtx | 9 --
required/latex-lab/latex-lab.ins | 4 -
4 files changed, 21 insertions(+), 184 deletions(-)
diff --git a/required/latex-lab/latex-lab-math.dtx b/required/latex-lab/latex-lab-math.dtx
deleted file mode 100644
index fba98108..00000000
--- a/required/latex-lab/latex-lab-math.dtx
+++ /dev/null
@@ -1,171 +0,0 @@
-% \iffalse meta-comment
-%
-%% File: latex-lab-math.dtx
-% Copyright (C) 2023 The LaTeX Project
-%
-% It may be distributed and/or modified under the conditions of the
-% LaTeX Project Public License (LPPL), either version 1.3c of this
-% license or (at your option) any later version. The latest version
-% of this license is in the file
-%
-% https://www.latex-project.org/lppl.txt
-%
-%
-% The development version of the bundle can be found below
-%
-% https://github.com/latex3/latex2e/required/latex-lab
-%
-% for those people who are interested or want to report an issue.
-%
-%<*driver>
-\documentclass{l3doc}
-\EnableCrossrefs
-\CodelineIndex
-\begin{document}
- \DocInput{latex-lab-math.dtx}
-\end{document}
-%</driver>
-%
-% \fi
-%
-%
-% \title{The \texttt{latex-lab-math} code\thanks{}}
-% \author{Ulrike Fischer, Frank Mittelbach, Joseph Wright \LaTeX{} Project}
-%
-% \maketitle
-%
-% \newcommand\fmi[1]{\begin{quote} TODO: \itshape #1\end{quote}}
-% \newcommand\NEW[1]{\marginpar{\mbox{}\hfill\fbox{New: #1}}}
-% \providecommand\pkg[1]{\texttt{#1}}
-%
-% \begin{abstract}
-% \end{abstract}
-%
-% \section{Introduction}
-%
-% This code implements changes to commands and environments for math
-% from the kernel, \pkg{amsmath}, etc.
-%
-%
-%
-%
-% \StopEventually{\setlength\IndexMin{200pt} \PrintIndex }
-%
-%
-% \section{The Implementation}
-%
-% \begin{macrocode}
-%<*code>
-% \end{macrocode}
-%
-% \subsection{File declaration}
-% \begin{macrocode}
-\ProvidesFile{latex-lab-math.ltx}
- [2023-01-07 v0.1a changes to math cmds and envs]
-% \end{macrocode}
-%
-%
-% \begin{macrocode}
-\ExplSyntaxOn
-% \end{macrocode}
-%
-%
-% \begin{macrocode}
-\AddToHook{package/amsmath/after}{%
- \def\intertext@{%
- \def\intertext##1{%
- \ifvmode\else\\\@empty\fi
- \noalign{%
- \penalty\postdisplaypenalty\vskip\belowdisplayskip
- \vbox{
- %don't tag during measuring:
- \ifmeasuring@\tag_stop:\fi
- \normalbaselines
- \ifdim\linewidth=\columnwidth
- \else \parshape\@ne \@totalleftmargin \linewidth
- \fi
- % end previous mc
- \tag_mc_end_push:
- % change to span as we are in a par:
- \tagpdfsetup{paratag=Span}%
- \noindent\ignorespaces##1\par
- % restart MC
- \tag_mc_begin_pop:n{}}%
- \penalty\predisplaypenalty\vskip\abovedisplayskip%
- }%
- }}
-}
-% \end{macrocode}
-%
-%
-% The following is incomplete and only covers one case of \cs{shortintertext}:
-% \begin{macrocode}
-%\MHInternalSyntaxOn
-\AddToHook{package/mathtools/after}{%
- \def\MT_shortintertext:n #1{%
- \ifvmode\else\\\@empty\fi
- \noalign{%
- \penalty\postdisplaypenalty\vskip\abovedisplayshortskip
- \vskip-\lineskiplimit
- \vskip\normallineskiplimit
- \vskip\l_MT_above_shortintertext_sep
- \vbox{%
- \ifmeasuring@\tag_stop:\fi
- \normalbaselines
- \MH_if_dim:w
- \MH_if_dim:w \@totalleftmargin=\z@
- \linewidth
- \MH_else:
- -\maxdimen
- \MH_fi:
- =\columnwidth
- \MH_else:
- \parshape\@ne \@totalleftmargin \linewidth
- \MH_fi:
- % end previous mc
- \tag_mc_end_push:
- % change to span as we are in a par:
- \tagpdfsetup{paratag=Span}%
- \noindent\ignorespaces#1\par
- % restart MC
- \tag_mc_begin_pop:n{}%
- }%
- \penalty\predisplaypenalty\vskip\abovedisplayshortskip%
- \vskip-\lineskiplimit
- \vskip\normallineskiplimit
- \vskip\l_MT_below_shortintertext_sep
- }%
- }
- \MT_orig_shortintertext_false: %activate
-}
-%\MHInternalSyntaxOff
-% \end{macrocode}
-%
-%
-% \begin{macrocode}
-\AddToHook{package/breqn/after}{
- \RegisterMathEnvironment{dmath}
- \RegisterMathEnvironment{dgroup*}
-}
-% \end{macrocode}
-%
-% Not sure why that was set in a test file, mistake?
-% \begin{macrocode}
-%\AddToHook{package/amsmath/after}{
-% \RegisterMathEnvironment{smallmatrix}
-%}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\AddToHook{package/cases/after}{
- \RegisterMathEnvironment{subnumcases}
-}
-% \end{macrocode}
-%
-% \begin{macrocode}
-\ExplSyntaxOff
-%</code>
-% \end{macrocode}
-%
-% \Finale
-%
diff --git a/required/latex-lab/latex-lab-mathpkg.dtx b/required/latex-lab/latex-lab-mathpkg.dtx
index 36c6ed87..f9f6291f 100644
--- a/required/latex-lab/latex-lab-mathpkg.dtx
+++ b/required/latex-lab/latex-lab-mathpkg.dtx
@@ -76,6 +76,27 @@
\RequirePackage{tagpdf-base}
% \end{macrocode}
%
+%
+% \begin{macrocode}
+\AddToHook{package/breqn/after}{
+ \RegisterMathEnvironment{dmath}
+ \RegisterMathEnvironment{dgroup*}
+}
+% \end{macrocode}
+%
+% Not sure why that was set in a test file, mistake?
+% \begin{macrocode}
+%\AddToHook{package/amsmath/after}{
+% \RegisterMathEnvironment{smallmatrix}
+%}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\AddToHook{package/cases/after}{
+ \RegisterMathEnvironment{subnumcases}
+}
+% \end{macrocode}
+%
% \begin{macrocode}
%</kernel>
% \end{macrocode}
diff --git a/required/latex-lab/latex-lab-testphase.dtx b/required/latex-lab/latex-lab-testphase.dtx
index 9963a51b..dc4b0b06 100644
--- a/required/latex-lab/latex-lab-testphase.dtx
+++ b/required/latex-lab/latex-lab-testphase.dtx
@@ -80,14 +80,5 @@
% \begin{macrocode}
%</tagpdf|phase-I|phase-II>
% \end{macrocode}
-%
-% \begin{macrocode}
-%<*math>
-\AddToHook{class/after}{%
- \input{latex-lab-mathcapture.ltx}%
- \input{latex-lab-math.ltx}%
- }
-%</math>
-% \end{macrocode}
% \Finale
%
diff --git a/required/latex-lab/latex-lab.ins b/required/latex-lab/latex-lab.ins
index 7890fd60..bbc71ff4 100644
--- a/required/latex-lab/latex-lab.ins
+++ b/required/latex-lab/latex-lab.ins
@@ -72,16 +72,12 @@ where one can also log issues in case there are any.
\generate{\file{tagpdf-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{tagpdf}}}
\generate{\file{new-or-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{new-or}}}
-
-\generate{\file{math-latex-lab-testphase.ltx}{\from{latex-lab-testphase.dtx}{math}}}
-
% support files (the new-or code is a private package to make life easier)
\generate{\file{latex-lab-testphase-new-or.sty}{\from{latex-lab-new-or.dtx}{code}}}
\generate{\file{latex-lab-footmisc.ltx}{\from{latex-lab-footnotes.dtx}{footmisc}}}
\generate{\file{latex-lab-footnotes.ltx}{\from{latex-lab-footnotes.dtx}{kernel}}}
\generate{\file{latex-lab-mathcapture.ltx}{\from{latex-lab-mathcapture.dtx}{kernel}}}
-\generate{\file{latex-lab-math.ltx}{\from{latex-lab-math.dtx}{code}}}
\generate{\file{latex-lab-amsmath.ltx}{\from{latex-lab-amsmath.dtx}{kernel}}}
\generate{\file{latex-lab-mathtools.ltx}{\from{latex-lab-mathtools.dtx}{kernel}}}
More information about the latex3-commits
mailing list.