code moved into the kernel (and rollback provided)

latex3 · Dec 18, 2019 · 69f6705 · mrpiggi · Jan 22, 2020 · FrankMittelbach
1 parent 0c9bcf3
commit 69f6705
Show file tree

Hide file tree

Showing 19 changed files with 1,452 additions and 967 deletions.
diff --git a/base/00-TODO-nfssaxes.tex b/base/00-TODO-nfssaxes.tex
@@ -0,0 +1,58 @@
+
+
+
+
+%    By the way, fontspec uses \cs{itscdefault} etc.\ whereas in the
+%    \texttt{.fd} files it is always called \texttt{scit}. I
+%    personally kind of think ``\texttt{itsc}'' reads better than
+%    ``\texttt{scit}'' but with more than 700 fonts (in T1 encoding)
+%    having \texttt{scit} and none the other I think the name is now
+%    given.
+%
+
+
+
+% The \textsf{fontaxes} package also implements two further shapes,
+% namely \cs{swshape} and \cs{sscshape}. They could now easily be
+% integrated by specifying a few further table entries such as
+%    \begin{macrocode}
+%\DeclareFontShapeChangeRule {n}{sw}   {sw}     {n}
+%\DeclareFontShapeChangeRule {it}{sw}  {sw}     {it}
+%\DeclareFontShapeChangeRule {sc}{sw}  {scsw}   {sc}
+%   ...
+%    \end{macrocode}
+% For \cs{swshape} I have already done that above (even though there are
+% currently only a few fonts
+% that support swash letters). For  ``spaced small capitals'' there a
+% none among the free fonts. Nevertheless, perhaps that should also be integrated
+% in the kernel so that the existing \textsf{fontaxes} support continues to
+% work in full.
+%
+%    
+%    
+%
+% \subsubsection{Packages that need checking or updating}
+%
+% These package use \cs{fontprimaryshape}
+%\begin{verbatim}
+%./baskervaldx/Baskervaldx.sty
+%./baskervillef/baskervillef.sty
+%./ebgaramond/ebgaramond.sty
+%./fontaxes/fontaxes.sty
+%\end{verbatim}
+%
+%
+% These package use \cs{fontsecondaryshape}
+%\begin{verbatim}
+%./baskervaldx/Baskervaldx.sty
+%./inriafonts/InriaSans.sty
+%./inriafonts/InriaSerif.sty
+%./baskervillef/baskervillef.sty
+%./ebgaramond/ebgaramond.sty
+%./fontaxes/fontaxes.sty
+%\end{verbatim}
+
+
+
+
+% ^^A Possible issue with tudscr.cls -- needs checking
diff --git a/base/build.lua b/base/build.lua
@@ -36,7 +36,6 @@ installfiles   =
     "sample2e.tex",
     "small2e.tex",
     "testpage.tex",
-    "nfssaxes.tex",
   }
 sourcefiles    =
   {
@@ -52,7 +51,6 @@ sourcefiles    =
     "sample2e.tex",
     "small2e.tex",
     "testpage.tex",
-    "nfssaxes.tex",
   }
 textfiles =
   {

diff --git a/base/changes.txt b/base/changes.txt
@@ -4,6 +4,40 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2019-12-18  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* ltoutenc.dtx: improve \add@accent
+
+2019-12-17  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* fontdef.dtx (subsection{Defaults}): Set
+	\shapedefault explicitly to "n" not \updefault
+	\bfdefault set to to "b" not "bx" (but bx for CM fonts)
+	\updefault set to to "up" not "n"
+
+2019-12-17  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* ltfssini.dtx (section{Supporting nested emphasis}):
+	Support nested \emph sequences a generalization \eminnershape.
+	See ltnews31 for details.
+	* ltfssini.dtx (section{Custom series settings for main document families}):
+	Provide custom series settings a la mweights
+
+
+2019-12-17  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* ltfssaxes.dtx: Code for additional series and shape axes added
+	See ltnews31 for details.
+
+2019-12-16  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* doc.dtx (subsection{Macros surrounding the `definition parts'}):
+	Use \shapedefault not \updefault for extended NFSS
+
+2019-12-16  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* cmfonts.fdd:  Provide substitutions for cmtt/bx/sl
+
 2019-12-02  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 
 	* cmfonts.fdd: Silent warning for cmss/it substitution (gh/172)}

diff --git a/base/cmfonts.fdd b/base/cmfonts.fdd
@@ -67,7 +67,7 @@
 %<*driver,  >
              \ProvidesFile{cmfonts.drv}
 %</driver,  >
-        [2019/12/02 v2.5i Standard LaTeX font definitions]
+        [2019/12/16 v2.5j Standard LaTeX font definitions]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -1025,6 +1025,10 @@
 %<+Ucmtt>\DeclareFontShape{U}{cmtt}{bx}{it}%
 %<-nowarn>  {<->sub*cmtt/m/it}{}
 %<+nowarn>  {<->ssub*cmtt/m/it}{}
+%    \end{macrocode}
+%    
+% \changes{v2.5j}{2019/12/16}{Provide substitutions for cmtt/bx/sl}
+%    \begin{macrocode}
 %<+OT1cmtt>\DeclareFontShape{OT1}{cmtt}{bx}{sl}
 %<-nowarn>  {<->sub*cmtt/m/n}{}
 %<+nowarn>  {<->ssub*cmtt/m/n}{}

diff --git a/base/doc.dtx b/base/doc.dtx
@@ -35,7 +35,7 @@
 %<+package|shortvrb>\NeedsTeXFormat{LaTeX2e}[1994/12/01]
 %<+package> \ProvidesPackage{doc}
 %<+shortvrb>\ProvidesPackage{shortvrb}
-%<+package|shortvrb>  [2019/11/10 v2.1k
+%<+package|shortvrb>  [2019/12/16 v2.1l
 %<+package|shortvrb>   Standard LaTeX documentation package (FMi)]
 %\catcode`\<=12
 %
@@ -1448,6 +1448,7 @@
 %    bothered since doc-sources should be up-to-date but since the
 %    request came from someone called David Carlisle \ldots :-)
 % \changes{v1.9y}{1996/01/26}{Support compat mode}
+%  \changes{v2.1l}{2019/12/16}{Use \cs{shapedefault} not \cs{updefault} for extended NFSS}
 %    \begin{macrocode}
     \def\MacroFont{\small
                    \usefont\encodingdefault

diff --git a/base/doc/source2e.tex b/base/doc/source2e.tex
@@ -266,6 +266,8 @@
 
  \DocInclude{ltfssbas} % NFSS Base macros
 
+ \DocInclude{ltfssbas} % NFSS Axes handling (new in 2020)
+
  \DocInclude{ltfsstrc} % NFSS Tracing (and tracefnt.sty)
 
  \DocInclude{ltfsscmp} % NFSS1 Compatibility

diff --git a/base/fontdef.dtx b/base/fontdef.dtx
@@ -39,7 +39,7 @@
 %<driver, >\ProvidesFile{fontdef.drv}
 % \fi
 %          \ProvidesFile{fontdef.dtx}
-%<-latexrelease>           [2019/09/21 v3.0d LaTeX Kernel
+%<-latexrelease>           [2019/12/17 v3.0e LaTeX Kernel
 % \iftrue  (\else
 %<text,   >(Text
 %<math,   >(Math
@@ -442,8 +442,9 @@
 % \begin{macro}{\bfdefault}
 % \begin{macro}{\mddefault}
 %    Series changing commands are influenced by the following hooks.
+% \changes{v3.0e}{2019/12/17}{Set \cs{bfdefault} to ``b''}
 %    \begin{macrocode}
-\newcommand\bfdefault{bx}
+\newcommand\bfdefault{b}  % overwritten below
 \newcommand\mddefault{m}
 %    \end{macrocode}
 % \end{macro}
@@ -453,18 +454,39 @@
 % \begin{macro}{\sldefault}
 % \begin{macro}{\scdefault}
 % \begin{macro}{\updefault}
+%    
 %    Shape changing commands use the following hooks.
+% \changes{v3.0e}{2019/12/17}{Set \cs{updefault} to ``up''}
 %    \begin{macrocode}
 \newcommand\itdefault{it}
 \newcommand\sldefault{sl}
 \newcommand\scdefault{sc}
-\newcommand\updefault{n}
+\newcommand\updefault{up}  % overwritten below
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 % \end{macro}
 %
+
+%    \begin{macrocode}
+%</text>
+%<*text|latexrelease>
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease>                 {\updefault}{font defaults change}%
+\renewcommand\updefault{up}
+\renewcommand\bfdefault{b}
+%</text|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\updefault}{font defaults change}%
+%<latexrelease>
+%<latexrelease>\renewcommand\updefault{n}
+%<latexrelease>\renewcommand\bfdefault{bx}
+%<latexrelease>\EndIncludeInRelease
+%<*text>
+%    \end{macrocode}
+%
 % \begin{macro}{\familydefault}
 % \begin{macro}{\seriesdefault}
 % \begin{macro}{\shapedefault}
@@ -477,7 +499,14 @@
 %    \begin{macrocode}
 \newcommand\familydefault{\rmdefault}
 \newcommand\seriesdefault{\mddefault}
-\newcommand\shapedefault{\updefault}
+%    \end{macrocode}
+%    In previous releases \cs{shapedefault} pointed to \cs{updefault}
+%    which resolved to \texttt{n}, but these days that is no longer
+%    the case (and \texttt{up} is wrong when you want to do a
+%    reset. So we now use \texttt{n} explicitly.
+%    \begin{macrocode}
+% \changes{v3.0e}{2019/12/17}{Set \cs{shapedefault} explicitly to ``n''}
+\newcommand\shapedefault{n}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}

diff --git a/base/format.ins b/base/format.ins
@@ -173,6 +173,7 @@ the system are in the document `cfgguide.tex'.
           \from{ltcounts.dtx}{2ekernel}
           \from{ltlength.dtx}{2ekernel}
           \from{ltfssbas.dtx}{2ekernel}
+          \from{ltfssaxes.dtx}{2ekernel}
           \from{ltfsstrc.dtx}{2ekernel}
 %          \from{ltfsscmp.dtx}{compat,2ekernel}
           \from{ltfssdcl.dtx}{compat,2ekernel}

diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
@@ -1124,12 +1124,22 @@
 % \end{macro}
 % \end{macro}
 %
+%    \subsection{Some last minute initializations \ldots}
+%
+%    This initializes the 2020/02/02 extensions to NFSS after any changes
+%    in the preamble.
+%    \begin{macrocode}
+\AtBeginDocument{\reinstall@nfss@defs\init@series@setup}
+%    \end{macrocode}
+%
+%
+%
 % \subsection{Do some temporary work for pre-release}
 %
 %    This is a good place to load code that hasn't yet been
 %    integrated into the other files \ldots
 %    \begin{macrocode}
-\input nfssaxes.tex
+%\input ...
 %    \end{macrocode}
 %
 % \subsection{Dumping the format}

diff --git a/base/ltfntcmd.dtx b/base/ltfntcmd.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfntcmd.dtx}
-             [2019/01/27 v3.4b LaTeX Kernel (Font commands)]
+             [2019/12/17 v3.4c LaTeX Kernel (Font commands)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfntcmd.dtx}
@@ -391,6 +391,39 @@
 %  \end{macro}
 %  \end{macro}
 %  \end{macro}
+
+
+%  \begin{macro}{textulc}
+%  \begin{macro}{textsw}
+%  \begin{macro}{textssc}
+%  \begin{macro}{textnormalshape}
+%    
+% \changes{v3.4c}{2019/12/17}{Macro added}
+%    \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease>                 {\textulc}{Additional text commands}%
+\DeclareTextFontCommand{\textulc}{\ulcshape} 
+\DeclareTextFontCommand{\textsw}{\swshape}
+\DeclareTextFontCommand{\textssc}{\sscshape}
+\DeclareTextFontCommand{\textnormalshape}{\normalshape}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease>                 {\textulc}{Additional text commands}%
+%<latexrelease>
+%<latexrelease>\let\textulc\@undefined
+%<latexrelease>\let\textsw\@undefined
+%<latexrelease>\let\textssc\@undefined
+%<latexrelease>\let\textnormalshape\@undefined
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+%    \end{macrocode}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
+%  \end{macro}
 %
 %  \begin{macro}{\emph}
 % \changes{v3.0a}{1993/12/11}{Macro changed}