summaryrefslogtreecommitdiff
path: root/macros/latex/base/classes.dtx
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
committerNorbert Preining <norbert@preining.info>2020-02-03 03:02:01 +0000
commit34897eebd22c3de968b64f09bb4a371d96cb0b89 (patch)
tree19a50e54fca63f1f6482d6cb4c2fdee676fd97b1 /macros/latex/base/classes.dtx
parente05dc0bb38b16bfb9ba35591285e40af0adaadc4 (diff)
CTAN sync 202002030302
Diffstat (limited to 'macros/latex/base/classes.dtx')
-rw-r--r--macros/latex/base/classes.dtx51
1 files changed, 34 insertions, 17 deletions
diff --git a/macros/latex/base/classes.dtx b/macros/latex/base/classes.dtx
index 1de8095a6e..ea3b014c89 100644
--- a/macros/latex/base/classes.dtx
+++ b/macros/latex/base/classes.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 1993-2019
+% Copyright (C) 1993-2020
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -53,7 +53,7 @@
%<*driver>
\ProvidesFile{classes.drv}
%</driver>
- [2019/10/25 v1.4k
+ [2019/12/20 v1.4l
%<article|report|book> Standard LaTeX document class]
%<10pt|11pt|12pt> Standard LaTeX file (size option)]
% \end{macrocode}
@@ -213,7 +213,7 @@
% \changes{v1.3l}{1995/10/20}{Disabled in compatibility mode all
% options that are new in \LaTeXe.}
% \changes{v1.3v}{1997/06/16}{Documentation fixes.}
-% \changes{v1.4j}{2019/08/27}{Various commands made robust}
+% \changes{v1.4j}{2019/08/27}{Various commands made robust}
%
%
% \title{Standard Document Classes for \LaTeX{} version 2e\thanks{This
@@ -611,11 +611,11 @@
\normalsize
% \end{macrocode}
% We use |\MakeRobust| instead of |\DeclareRobustCommand| above to avoid a log
-% entry for the redefinition. But if we are running in in a rollback situation
+% entry for the redefinition. But if we are running in a rollback situation
% (prior to 2015) we don't touch it.
-% \changes{v1.4k}{2019/10/25}{Roll back handling (gh/201)}
+% \changes{v1.4k}{2019/10/25}{Roll back handling (gh/201)}
% \begin{macrocode}
-\ifx\MakeRobust\@undefined \else
+\ifx\MakeRobust\@undefined \else
\MakeRobust\normalsize
\fi
% \end{macrocode}
@@ -2949,15 +2949,33 @@
% \begin{macro}{\labelitemiv}
% Itemization is controlled by four commands: |\labelitemi|,
% |\labelitemii|, |\labelitemiii|, and |\labelitemiv|, which define
-% the labels of thevarious itemization levels: the symbols used are
+% the labels of the various itemization levels: the symbols used are
% bullet, bold en-dash, centered asterisk and centred dot.
%
% \begin{macrocode}
-\newcommand\labelitemi{\textbullet}
-\newcommand\labelitemii{\normalfont\bfseries \textendash}
-\newcommand\labelitemiii{\textasteriskcentered}
-\newcommand\labelitemiv{\textperiodcentered}
+\newcommand\labelitemi {\labelitemfont \textbullet}
+\newcommand\labelitemii {\labelitemfont \bfseries \textendash}
+\newcommand\labelitemiii{\labelitemfont \textasteriskcentered}
+\newcommand\labelitemiv{ \labelitemfont \textperiodcentered}
% \end{macrocode}
+%
+% \begin{macro}{\labelitemfont}
+% The default definition for \cs{labelitemfont} is to reset the
+% font to \cs{normalfont} so that always the same symbol is
+% produced regardless of surrounding conditions.
+%
+% \changes{v1.4l}{2019/12/20}{Normalize label fonts}
+% A possible alternative would be
+%\begin{verbatim}
+%\renewcommand\labelitemfont{%
+% \fontseries\seriesdefault
+% \fontshape\shapedefault\selectfont}
+%\end{verbatim}
+% which resets series and shape doesn't touch the family.
+% \begin{macrocode}
+\newcommand\labelitemfont{\normalfont}
+% \end{macrocode}
+% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
@@ -3758,7 +3776,7 @@
\@mkboth{%
\MakeUppercase\contentsname}{\MakeUppercase\contentsname}}%
% \end{macrocode}
-% The the actual table of contents is made by calling
+% The actual table of contents is made by calling
% |\@starttoc{toc}|. After that we restore twocolumn mode if
% necessary.
% \begin{macrocode}
@@ -3826,7 +3844,7 @@
\large \bfseries #1\hfil
\hb@xt@\@pnumwidth{\hss #2%
% \end{macrocode}
-%
+%
% \changes{v1.4i}{2018/09/03}{Prevent protrusion
% (\url{https://tex.stackexchange.com/q/172785/10109})}
% \begin{macrocode}
@@ -3894,7 +3912,7 @@
#1\nobreak\hfil
\nobreak\hb@xt@\@pnumwidth{\hss #2%
% \end{macrocode}
-%
+%
% \changes{v1.4i}{2018/09/03}{Prevent protrusion
% (\url{https://tex.stackexchange.com/q/172785/10109})}
% \begin{macrocode}
@@ -3951,7 +3969,7 @@
#1\nobreak\hfil
\nobreak\hb@xt@\@pnumwidth{\hss #2%
% \end{macrocode}
-%
+%
% \changes{v1.4i}{2018/09/03}{Prevent protrusion
% (\url{https://tex.stackexchange.com/q/172785/10109})}
% \begin{macrocode}
@@ -4343,7 +4361,7 @@
% defined below in command names. These commands may be redefined in
% any class or package that is customising \LaTeX\ for use with
% non-English languages.
-% \changes{v1.3h}{1995/07/20}{Split up to save save stack /1742}
+% \changes{v1.3h}{1995/07/20}{Split up to save on save stack /1742}
%
% \begin{macro}{\contentsname}
% \begin{macro}{\listfigurename}
@@ -4478,4 +4496,3 @@
% \Finale
%
\endinput
-