summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex-dev
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-24 14:24:44 +0000
committerKarl Berry <karl@freefriends.org>2020-02-24 14:24:44 +0000
commit294bedbdf9c5683f570db4670f5b5d54e4b3fbcb (patch)
treea090ea734880e8726c54c8d42d3fc5b7b5fd203e /Master/texmf-dist/source/latex-dev
parent06b48ae1e077c886a68fba11d3b936eea1760303 (diff)
latex-base-dev (23feb20)
git-svn-id: svn://tug.org/texlive/trunk@53885 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex-dev')
-rw-r--r--Master/texmf-dist/source/latex-dev/base/doc.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltclass.dtx5
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx18
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltfssini.dtx107
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltmath.dtx14
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltpictur.dtx5
-rw-r--r--Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx4
-rw-r--r--Master/texmf-dist/source/latex-dev/base/ltvers.dtx2
-rw-r--r--Master/texmf-dist/source/latex-dev/base/slides.dtx8
9 files changed, 125 insertions, 40 deletions
diff --git a/Master/texmf-dist/source/latex-dev/base/doc.dtx b/Master/texmf-dist/source/latex-dev/base/doc.dtx
index 1341f56b8b2..3011994d9d1 100644
--- a/Master/texmf-dist/source/latex-dev/base/doc.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/doc.dtx
@@ -132,7 +132,7 @@
% \setcounter{StandardModuleDepth}{1}
%
% {\catcode`\p=12 \catcode`\t=12 ^^A hack used later on to print
-% \gdef\dimenvalue#1pt{$#1$pt}} ^^A a register value with a - sign
+% \gdef\dimenvalue#1pt{$#1$pt}} ^^A register values with a - sign
%
% \newcommand{\DOC}{\texttt{doc}}
%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltclass.dtx b/Master/texmf-dist/source/latex-dev/base/ltclass.dtx
index 96daa3aa30f..578443921b8 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2020/02/05 v1.3i LaTeX Kernel (Class & Package Interface)]
+ [2020/02/20 v1.3j LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -1911,6 +1911,7 @@
% (hopefully) safe. If not opened that means we are going to write
% on the terminal.
% \changes{v1.3g}{2020/01/27}{Fix typo in error message}
+% \changes{v1.3j}{2020/02/20}{Fix missing quotes around file name (gh/284)}
% \begin{macrocode}
\ch@ck7\reserved@c\write\relax%
\if@filesw% % Foul ... trying to overwrite \jobname!
@@ -1920,7 +1921,7 @@
\else%
\@latex@warning@no@line%
{Writing or overwriting file `\@currdir\@curr@file'}%
- \immediate\openout\reserved@c#1\relax%
+ \immediate\openout\reserved@c\q@curr@file\relax%
\fi%
\fi%
\fi%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx
index fcf304d1fa9..1a8dbd9cfba 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfssaxes.dtx
@@ -35,7 +35,7 @@
%
%
\ProvidesFile{ltfssaxes.dtx}
- [2020/02/05 v1.0b LaTeX Kernel (NFSS Axes handing)]
+ [2020/02/18 v1.0c LaTeX Kernel (NFSS Axes handing)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -682,14 +682,25 @@
% \subsection{Changing to a new series}
%
+%
+% \begin{macro}{\if@forced@series}
+% If the series gets forced we need to know that fact later on.
+% \changes{v1.0c}{2020/02/10}{Switch \cs{if@forced@series} added}
+% \begin{macrocode}
+\newif\if@forced@series
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\fontseriesforce}
% To change unconditionally to a new series you can use
% \cs{fontseriesforce}. If course, if the series doesn't exist for
% the current family substitution still happens, but there is not
% dependency on the current series.
+% \changes{v1.0c}{2020/02/10}{Switch \cs{if@forced@series} added}
% \begin{macrocode}
-\DeclareRobustCommand\fontseriesforce[1]{\edef\f@series{#1}}
+\DeclareRobustCommand\fontseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
% \end{macrocode}
% \end{macro}
%
@@ -700,8 +711,9 @@
% expanded value in \cs{f@series}. Now we do a bit more processing
% and look up the final value in the font series data base. This is
% done by \cs{merge@font@series}.
+% \changes{v1.0c}{2020/02/10}{Switch \cs{if@forced@series} added}
% \begin{macrocode}
-\DeclareRobustCommand\fontseries[1]{\merge@font@series{#1}}
+\DeclareRobustCommand\fontseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx b/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx
index 71aae0dcfa1..bdf5f5e6e91 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfssini.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfssini.dtx}
- [2020/02/11 v3.1h LaTeX Kernel (NFSS Initialisation)]
+ [2020/02/18 v3.1i LaTeX Kernel (NFSS Initialisation)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -414,18 +414,18 @@
% alternatives and therefore check if the current family
% (\cs{f@family}) is the current \cs{rmdef@ult}, \cs{sfdef@ult} or
% \cs{ttdef@ult} and the select the correct family default in that case.
+% \changes{v3.1i}{2020/02/18}{Make the \cs{ifx} selection outside
+% of \cs{fontseries} argument so that it is not done several times}
% \begin{macrocode}
\expand@font@defaults
- \fontseries{%
- \ifx\f@family\rmdef@ult \bfseries@rm
- \else\ifx\f@family\sfdef@ult \bfseries@sf
- \else\ifx\f@family\ttdef@ult \bfseries@tt
+ \ifx\f@family\rmdef@ult \fontseries\bfseries@rm
+ \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf
+ \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt
% \end{macrocode}
% If not \cs{bfdefault} is used.
% \begin{macrocode}
- \else \bfdefault
+ \else \fontseries\bfdefault
\fi\fi\fi
- }%
\selectfont
}
% \end{macrocode}
@@ -435,17 +435,17 @@
% \begin{macro}{\mdseries}
% This document command switches to the medium series.
+% \changes{v3.1i}{2020/02/18}{Make the \cs{ifx} selection outside
+% of \cs{fontseries} argument so that it is not done several times}
% \begin{macrocode}
\DeclareRobustCommand\mdseries{%
\not@math@alphabet\mdseries\relax
\expand@font@defaults
- \fontseries{%
- \ifx\f@family\rmdef@ult \mdseries@rm
- \else\ifx\f@family\sfdef@ult \mdseries@sf
- \else\ifx\f@family\ttdef@ult \mdseries@tt
- \else \mddefault
+ \ifx\f@family\rmdef@ult \fontseries\mdseries@rm
+ \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf
+ \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt
+ \else \fontseries\mddefault
\fi\fi\fi
- }%
\selectfont
}
% \end{macrocode}
@@ -615,9 +615,25 @@
% \end{macro}
% \end{macro}
% \end{macro}
-
-
-
+%
+%
+%
+%
+% \begin{macro}{\series@change@debug}
+% For debugging, but right now none of this code is extracted. The
+% idea is to have a separate package with debugging code
+% one day.
+% \begin{macrocode}
+%<*debug>
+\let\series@change@debug\typeout
+\let\series@change@debug\@gobble
+%</debug>
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+%
% \begin{macro}{\prepare@family@series@update}
% This is core command that prepares for the family update. The big
% difference to the documented code above is that the nested
@@ -635,6 +651,15 @@
%
% \begin{macrocode}
\def\prepare@family@series@update#1#2{%
+% \end{macrocode}
+%
+% \changes{v3.1i}{2020/02/18}{No series auto-update when forced (gh/277)}
+% \begin{macrocode}
+ \if@forced@series
+%<+debug> \series@change@debug{No series preparation (forced \f@series)\on@line}%
+ \fontfamily#2%
+ \else
+%<+debug> \series@change@debug{Prepearing for switching to #1 (#2)\on@line}%
\expand@font@defaults
% \end{macrocode}
% We prepare for changing the current series. We have to find it
@@ -643,11 +668,36 @@
\let\target@series@value\@empty
\def\target@meta@family@value{#1}%
% \end{macrocode}
+% As the very last item in the meta family list we add
+% \verb=\@elt{??}= and define this pseudo meta family to be the
+% current font family. So if none of the real meta families matched then
+% this will match. This will cover the following case:
+% \begin{itemize}
+% \item \cs{bfseries} is called for a family using \texttt{bx}
+% (e.g., CMR)
+% \item Switch to a font family that is none of the the meta
+% families, e.g., via \verb=\fontfamily{ptm}\selectfont=
+% \item Then none of the real meta families, match but the final
+% \verb=\@elt{??}= will.
+% \item Therefore if the current series is \cs{mddefault} or
+% \cs{bfdefault} it will be detected and the corresponding target
+% series selected.
+% \end{itemize}
+% \changes{v3.1i}{2020/02/18}{Recognize current family if it is not a
+% ``meta'' family and auto-update series using \cs{bfdefault} (gh/277)}
+% \begin{macrocode}
+ \expandafter\edef\csname ??def@ult\endcsname{\f@family}%
+% \end{macrocode}
% To find it we loop over the meta family list with a suitable
% definition of \cs{@elt}.
% \begin{macrocode}
\let\@elt\update@series@target@value
\@meta@family@list
+% \end{macrocode}
+% Last resort pseudo meta family. Will only be looked at f none of
+% the real ones have matched.
+% \begin{macrocode}
+ \@elt{??}%
\let\@elt\relax
% \end{macrocode}
% That will figure out the correct series value to use without updating
@@ -659,10 +709,19 @@
% above.
% \begin{macrocode}
\ifx\target@series@value\@empty
+%<+debug> \series@change@debug{Target series still empty ...}%
\else
- \maybe@load@fontshape
- \let\f@series\target@series@value
+ \ifx \f@series\target@series@value
+%<+debug> \series@change@debug{Target series unchanged:
+%<+debug> \f@series \space = \target@series@value}%
+ \else
+ \maybe@load@fontshape
+%<+debug> \series@change@debug{Target series:
+%<+debug> \f@series \space -> \target@series@value}%
+ \let\f@series\target@series@value
+ \fi
\fi
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -686,6 +745,8 @@
\def\reserved@a{#1}%
\ifx\target@meta@family@value\reserved@a % rm -> rm do nothing
\else
+%<+debug> \series@change@debug{Trying to match #1: \csname#1def@ult\endcsname
+%<+debug> \space = \f@family\space ?}%
% \end{macrocode}
% We only ``do'' something if the current font family matches the
% current meta family.
@@ -707,6 +768,8 @@
\csname mdseries@\target@meta@family@value\endcsname
\expandafter\let\expandafter\reserved@c
\csname bfseries@\target@meta@family@value\endcsname
+%<+debug>\series@change@debug{Targets for mdseries and bfseries:
+%<+debug> \reserved@b\space and \reserved@c}%
% \end{macrocode}
% This here is now identical to the nested \cs{ifx} block from the
% outline, except that it there appeared twice in
@@ -714,11 +777,15 @@
% loop when a match was found.
% \begin{macrocode}
\expandafter\ifx\csname mdseries@#1\endcsname\f@series
+%<+debug> \series@change@debug{mdseries@#1 matched -> \reserved@b}%
\let\target@series@value\reserved@b
\else\expandafter\ifx\csname bfseries@#1\endcsname\f@series
+%<+debug> \series@change@debug{bfseries@#1 matched -> \reserved@c}%
\let\target@series@value\reserved@c
\else\ifx\f@series\mddef@ult \let\target@series@value\reserved@b
+%<+debug> \series@change@debug{mddef@ult matched -> \reserved@b}%
\else\ifx\f@series\bfdef@ult \let\target@series@value\reserved@c
+%<+debug> \series@change@debug{bfdef@ult matched -> \reserved@c}%
\fi\fi\fi\fi
\fi
\fi
@@ -730,10 +797,6 @@
%
%
%
-%
-%
-%
-%
% \begin{macro}{\init@series@setup}
% This is code to be run at begin document \ldots
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltmath.dtx b/Master/texmf-dist/source/latex-dev/base/ltmath.dtx
index 18688068b04..86e62e7bf52 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltmath.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltmath.dtx
@@ -38,7 +38,7 @@
%<*driver>
% \fi
\ProvidesFile{ltmath.dtx}
- [2019/08/27 v1.2c LaTeX Kernel (Math Setup)]
+ [2020/02/18 v1.2d LaTeX Kernel (Math Setup)]
% \iffalse
%</driver>
%
@@ -1009,9 +1009,11 @@
%
% \begin{macro}{\mathindent}
% The amount of indentation of the equations is stored in a register.
+% \changes{v1.2d}{2020/02/18}{Make \cs{mathindent} a skip register to match
+% amsmath (gh/252)}
% \begin{macrocode}
%<*fleqn>
-\newdimen\mathindent
+\newskip\mathindent
% \end{macrocode}
% The setting of |\mathindent| has to be deferred until the class
% file has been processed, because |\leftmargini| is still 0pt
@@ -1097,7 +1099,13 @@
\hb@xt@\linewidth\bgroup $\m@th% $
\displaystyle
\hskip\mathindent}%
- {$\hfil % $
+% \end{macrocode}
+% Ensure that there is at least a space between formula and
+% equation number so that they don't bump in each other.
+% \changes{v1.2d}{2020/02/18}{Separate formula and eqn number by at
+% least a space in fleqn option}
+% \begin{macrocode}
+ {$\hskip .3em minus.3em\hfil % $
\displaywidth\linewidth\hbox{\@eqnnum}%
\egroup
\endtrivlist}
diff --git a/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx b/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx
index 9440fc783ad..4018adba596 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltpictur.dtx
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltpictur.dtx}
- [2019/08/27 v1.1m LaTeX Kernel (Picture Mode)]
+ [2020/02/14 v1.1n LaTeX Kernel (Picture Mode)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltpictur.dtx}
@@ -284,9 +284,10 @@
% \end{macro}
%
% \begin{macro}{\linethickness}
+% \changes{v1.1n}{2020/02/14}{Suppress spaces following the declaration (gh/274)}
% \begin{macrocode}
\DeclareRobustCommand\linethickness[1]
- {\@wholewidth #1\relax \@halfwidth .5\@wholewidth}
+ {\@wholewidth #1\relax \@halfwidth .5\@wholewidth \ignorespaces}
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx b/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx
index ed37b9d9957..dc2c2c49c7c 100644
--- a/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/lttextcomp.dtx
@@ -33,7 +33,7 @@
%
%
\ProvidesFile{lttextcomp.dtx}
- [2020/02/10 v1.0c LaTeX Kernel (text companion symbols)]
+ [2020/02/20 v1.0c LaTeX Kernel (text companion symbols)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -445,7 +445,7 @@
% Using \cs{UndeclareTextCommand} above is enough only if the
% encoding definition files are not reloaded afterwards. In the
% past that happened if \texttt{fontenc} was used in the document
-% preamble (not not any longer). So in some sense it is better to fully remove
+% preamble (not any longer). So in some sense it is better to fully remove
% them from the encoding files, but for rollbacks it is easier to
% keep them in for now.
%
diff --git a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
index 470da0bf293..2b54638bc42 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
@@ -115,7 +115,7 @@
{2020-10-01}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{-2}
+\def\patch@level{-4}
% \end{macrocode}
%
% \begin{macro}{\development@branch@name}
diff --git a/Master/texmf-dist/source/latex-dev/base/slides.dtx b/Master/texmf-dist/source/latex-dev/base/slides.dtx
index a0dbdabe5f0..8b7276f492d 100644
--- a/Master/texmf-dist/source/latex-dev/base/slides.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/slides.dtx
@@ -53,7 +53,7 @@
%<*driver>
\ProvidesFile{slides.drv}
%</driver>
- [2019/11/04 v2.4b
+ [2020/02/20 v2.4b
%<+class> Standard LaTeX document class]
%<+cmd> SLiTeX definitions]
% \end{macrocode}
@@ -162,7 +162,7 @@
%
% \section{Fonts}
%
-% Note, that that with NFSS you can easily produce slides with special
+% Note, that with NFSS you can easily produce slides with special
% fonts just by calling an appropriate style file (like |times|) in a
% |\usepackage| command. This works, for example, with all
% fonts that are defined to be scaleable (e.g., PostScript fonts) since
@@ -2536,14 +2536,14 @@ COLOR LAYER\\[.75in]%
% \overline, \underline, \frac and \sqrt
%
% \@mathbox{STYLE}{BOX}{MTEXT} : Called in math mode, typesets MTEXT and
-% stores result in BOX, using style STYLE.
+% stores result in BOX, using STYLE.
%
% \@bphant{BOX} : Creates a phantom with dimensions BOX.
% \@vbphant{BOX} : Creates a phantom with ht of BOX and zero width.
% \@hbphant{BOX} : Creates a phantom with width of BOX
% and zero ht & dp.
% \@hvsmash{STYLE}{MTEXT} : Creates a copy of MTEXT with zero height and
-% width in style STYLE.
+% width in STYLE.
%\end{verbatim}
% \begin{macrocode}
\def\@mathbox#1#2#3{\setbox#2\hbox{$\m@th#1{#3}$}}