[latex3-commits] [git/LaTeX3-latex3-latex2e] nfssaxes: Added \LoadFontDefinitionFile (discussion in TLC was incorrect) (3ba2db27)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : nfssaxes
Link       : https://github.com/latex3/latex2e/commit/3ba2db27d24d4dd8be3f9465b03f0c91fdb83514

>---------------------------------------------------------------

commit 3ba2db27d24d4dd8be3f9465b03f0c91fdb83514
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Nov 28 13:10:14 2019 +0100

    Added \LoadFontDefinitionFile (discussion in TLC was incorrect)


>---------------------------------------------------------------

3ba2db27d24d4dd8be3f9465b03f0c91fdb83514
 base/nfssaxes.tex | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/base/nfssaxes.tex b/base/nfssaxes.tex
index f49a0af0..473a12bb 100644
--- a/base/nfssaxes.tex
+++ b/base/nfssaxes.tex
@@ -1788,12 +1788,14 @@
 %    (re)declared the family, but this is incorrect in my eyes and it
 %    is better to handle that differently.
 %
-%    Of course the family \verb=#1#2.fd= may still needs loading at
-%    this point and so we arange for this.
-%    \begin{macrocode}
-% \DeclareFontFamily{#1}{#2}{}%
- \begingroup
-   \fontencoding{#1}\fontfamily{#2}\try at load@fontshape
+%    Of course the families  may still need loading at
+%    this point and so we arange for this. Otherwise we might run into
+%    trouble because the necessary \cs{DeclareFontFamily} has not been
+%    seen.
+%    \begin{macrocode}
+% \begingroup
+   \LoadFontDefinitionFile{#1}{#2}%
+   \LoadFontDefinitionFile{#1}{#3}%
                     \fontfamily{#3}\try at load@fontshape
 %    \end{macrocode}
 %    
@@ -1828,7 +1830,7 @@
    \DeclareFontShape{#1}{#2}{bx}{sc}{<->ssub * #3/bx/sc}{}%
    \DeclareFontShape{#1}{#2}{bx}{sl}{<->ssub * #3/bx/sl}{}%
    \DeclareFontShape{#1}{#2}{bx}{sw}{<->ssub * #3/bx/sw}{}%
- \endgroup
+% \endgroup
 }
 \endgroup
 %    \end{macrocode}
@@ -1837,6 +1839,18 @@
 
 
 
+%  \begin{macro}{\LoadFontDefinitionFile}
+%    
+%    \begin{macrocode}
+\def\LoadFontDefinitionFile#1#2{%
+  \begingroup
+    \edef\f at encoding{#1}%
+    \edef\f at family{#2}%
+    \try at load@fontshape
+  \endgroup
+}
+%    \end{macrocode}
+%  \end{macro}
 
 
 % ^^A Possible issue with tudscr.cls -- needs checking