Merge branch 'nfssaxes' into textcomp

# Conflicts resolved:
#	base/testfiles/tlb1214.tlg
#	base/testfiles/tlb2133.luatex.tlg
#	base/testfiles/tlb2133.xetex.tlg

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

base/changes.txt

@@ -4,6 +4,42 @@ 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".
+	Part of extending the series and shape handling, see ltnews31.
+
+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 package.
+	See ltnews31 for details.
+
+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)}

base/cmfonts.fdd

@@ -26,7 +26,6 @@
 % extension .ins) which are part of the distribution.
 % 
 % \fi
-% \CheckSum{295}
 %
 %\iffalse        This is a META comment
 %
@@ -68,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}
@@ -1026,6 +1025,13 @@
 %<+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}{}
 %<+OT1cmtt>\DeclareFontShape{OT1}{cmtt}{bx}{ui}
 %<+Ucmtt>\DeclareFontShape{U}{cmtt}{bx}{ui}%
 %<-nowarn>  {<->sub*cmtt/m/it}{}

base/config-search.lua

@@ -0,0 +1,8 @@
+-- Test with search tree enabled
+
+-- checkengines = {"etex" }       -- use all engines
+
+checksearch  = true
+testfiledir  = "./testfiles-search"
+
+testsuppdir  = testfiledir .. "/support"

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,18 +1448,19 @@
 %    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
                            \ttdefault
                            \mddefault
-                           \updefault
+                           \shapedefault
                    }%
   \else
     \def\MacroFont{\fontencoding\encodingdefault
                    \fontfamily\ttdefault
                    \fontseries\mddefault
-                   \fontshape\updefault
+                   \fontshape\shapedefault
                    \small}%
   \fi
   }{}