summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base/ltmath.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-13 13:48:08 +0000
committerKarl Berry <karl@freefriends.org>2015-04-13 13:48:08 +0000
commit013bf3bc293cf08e4b4167cb42180bc355f399c0 (patch)
tree5235dfbae8830590c7fc6a0c70ecd3c84d22c677 /Master/texmf-dist/source/latex/base/ltmath.dtx
parentbacfc70aefdbc2ec3496c976ad12fe9ef26604e1 (diff)
latex2e 2015/01/01
git-svn-id: svn://tug.org/texlive/trunk@36834 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base/ltmath.dtx')
-rw-r--r--Master/texmf-dist/source/latex/base/ltmath.dtx144
1 files changed, 115 insertions, 29 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltmath.dtx b/Master/texmf-dist/source/latex/base/ltmath.dtx
index 8f776d71c9a..4453b4809c9 100644
--- a/Master/texmf-dist/source/latex/base/ltmath.dtx
+++ b/Master/texmf-dist/source/latex/base/ltmath.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009
+% Copyright 1993-2015
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -31,14 +31,14 @@
%
%<leqno>\ProvidesFile{leqno.clo}
%<fleqn>\ProvidesFile{fleqn.clo}
-%<leqno,fleqn> [1998/08/17 v1.1c Standard LaTeX option
+%<leqno,fleqn> [2015/03/31 v1.1i Standard LaTeX option
%<leqno> (left equation numbers)]
%<fleqn> (flush left equations)]
%
%<*driver>
% \fi
\ProvidesFile{ltmath.dtx}
- [2005/11/10 v1.1g LaTeX Kernel (Math Setup)]
+ [2015/03/11 v1.1i LaTeX Kernel (Math Setup)]
% \iffalse
%</driver>
%
@@ -56,13 +56,14 @@
Chris Rowley\and
Rainer Sch\"opf}
\begin{document}
- \maketitle
- \DocInput{\filename}
+ \MaintainedByLaTeXTeam{latex}
+ \maketitle
+ \DocInput{\filename}
\end{document}
%</driver>
% \fi
%
-% \CheckSum{1101}
+% \CheckSum{1208}
%
% \changes{v1.1b}{1996/07/26}{Removed \cs{global} before
% \cs{@ignoretrue} in various places.}
@@ -82,22 +83,22 @@
% \end{macrocode}
%
%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
+% \CharacterTable
+% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
%
% \subsection{Math commands based on plain \TeX}
%
@@ -539,9 +540,24 @@
% \begin{macro}{\)}
% Produces |$...$| with checks that |\(| isn't used in math mode, and
% that |\)| is only used in math mode begun with |\(|.
+% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)}
% \begin{macrocode}
-\def\({\relax\ifmmode\@badmath\else$\fi}
-\def\){\relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2015/01/01}{\(}{Make \( robust}%
+%<*2ekernel|latexrelease>
+\DeclareRobustCommand\({%
+ \relax\ifmmode\@badmath\else$\fi}%
+\DeclareRobustCommand\){%
+ \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}%
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}{\(}{Make \( robust}%
+%<latexrelease>\def\({%
+%<latexrelease> \relax\ifmmode\@badmath\else$\fi}%
+%<latexrelease>\def\){%
+%<latexrelease> \relax\ifmmode\ifinner$\else\@badmath\fi\else \@badmath\fi}%
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -551,9 +567,14 @@
% {(MH) Fixed potential problem in \cs{[} (pr/3399).}
% \begin{macro}{\]}
% Produces |$$...$$| with checks that |\[| isn't used in math mode,
-% and that |\]| is only used in math mode begun with |\]|.
+% and that |\]| is only used in display math mode (though there is no
+% real test that this display math started with |\[| and not with |$$|).
+% \changes{v1.1h}{2015/01/08}{Make Robust (latexrelease)}
% \begin{macrocode}
-\def\[{%
+%</2ekernel>
+%<latexrelease>\IncludeInRelease{2015/01/01}{\[}{Make \[ robust}%
+%<*2ekernel|latexrelease>
+\DeclareRobustCommand\[{%
\relax\ifmmode
\@badmath
\else
@@ -563,11 +584,11 @@
\fi
$$%%$$ BRACE MATCH HACK
\fi
-}
+}%
% \end{macrocode}
%
% \begin{macrocode}
-\def\]{%
+\DeclareRobustCommand\]{%
\relax\ifmmode
\ifinner
\@badmath
@@ -578,7 +599,41 @@
\@badmath
\fi
\ignorespaces
-}
+}%
+% \end{macrocode}
+%
+% \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}{\[}{Make \[ robust}%
+%<latexrelease>\def\[{%
+%<latexrelease> \relax\ifmmode
+%<latexrelease> \@badmath
+%<latexrelease> \else
+%<latexrelease> \ifvmode
+%<latexrelease> \nointerlineskip
+%<latexrelease> \makebox[.6\linewidth]{}%
+%<latexrelease> \fi
+%<latexrelease> $$%%$$ BRACE MATCH HACK
+%<latexrelease> \fi
+%<latexrelease>}%
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<latexrelease>\def\]{%
+%<latexrelease> \relax\ifmmode
+%<latexrelease> \ifinner
+%<latexrelease> \@badmath
+%<latexrelease> \else
+%<latexrelease> $$%%$$ BRACE MATCH HACK
+%<latexrelease> \fi
+%<latexrelease> \else
+%<latexrelease> \@badmath
+%<latexrelease> \fi
+%<latexrelease> \ignorespaces
+%<latexrelease>}%
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -906,6 +961,22 @@
% \begin{macro}{\[}
% Begin display math;
% \begin{macrocode}
+\IncludeInRelease{2015/01/01}{\[}{Make \[ robust}%
+\DeclareRobustCommand\[{\relax
+ \ifmmode\@badmath
+ \else
+ \begin{trivlist}%
+ \@beginparpenalty\predisplaypenalty
+ \@endparpenalty\postdisplaypenalty
+ \item[]\leavevmode
+ \hb@xt@\linewidth\bgroup $\m@th\displaystyle %$
+ \hskip\mathindent\bgroup
+ \fi}
+\EndIncludeInRelease
+% \end{macrocode}
+%
+% \begin{macrocode}
+\IncludeInRelease{0000/00/00}{\[}{Make \[ robust}%
\renewcommand\[{\relax
\ifmmode\@badmath
\else
@@ -916,12 +987,26 @@
\hb@xt@\linewidth\bgroup $\m@th\displaystyle %$
\hskip\mathindent\bgroup
\fi}
+\EndIncludeInRelease
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\]}
% end display math;
% \begin{macrocode}
+\IncludeInRelease{2015/01/01}{\]}{Make \] robust}%
+\DeclareRobustCommand\]{\relax
+ \ifmmode
+ \egroup $\hfil% $
+ \egroup
+ \end{trivlist}%
+ \else \@badmath
+ \fi}
+\EndIncludeInRelease
+% \end{macrocode}
+%
+% \begin{macrocode}
+\IncludeInRelease{0000/00/00}{\]}{Make \] robust}%
\renewcommand\]{\relax
\ifmmode
\egroup $\hfil% $
@@ -929,6 +1014,7 @@
\end{trivlist}%
\else \@badmath
\fi}
+\EndIncludeInRelease
% \end{macrocode}
% \end{macro}
%