summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/font-mat.mkvi
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/font-mat.mkvi')
-rw-r--r--Master/texmf-dist/tex/context/base/font-mat.mkvi15
1 files changed, 10 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/context/base/font-mat.mkvi b/Master/texmf-dist/tex/context/base/font-mat.mkvi
index c8ab45b7582..165b644d2a6 100644
--- a/Master/texmf-dist/tex/context/base/font-mat.mkvi
+++ b/Master/texmf-dist/tex/context/base/font-mat.mkvi
@@ -100,12 +100,13 @@
\csname\??fontinstanceready \fontbody-\s!mm-\fontfamily-\fontsize\endcsname \else
\ifcsname\??fontinstanceready \fontbody-\s!mm-\fontfamily \endcsname \settrue \c_font_auto_size
\csname\??fontinstanceready \fontbody-\s!mm-\fontfamily \endcsname \else
- \nullfont \settrue \c_font_auto_size
+ \settrue \c_font_auto_size
\fi\fi}
\def\font_helpers_set_math_family_indeed#mrtag#family% \fontface etc are also used later on
{\let\savedfontbody\fontbody
\let\fontfamily#family%
+ % the order is important as we depend on known id's when completing fonts
\let\fontface\!!plusthree\font_helpers_set_math_family_a\scriptscriptfont#mrtag\font
\let\fontface\!!plustwo \font_helpers_set_math_family_a\scriptfont #mrtag\font
\let\fontface\!!plusone \font_helpers_set_math_family_a\textfont #mrtag\font
@@ -377,19 +378,23 @@
% and inline text bold) so we will need explicit switches as well as
% an automatic one. (We will use lucida as an example.)
-\unexpanded\def\mr
+\ifdefined\mathdefault \else \let\mathdefault\relax \fi
+
+\unexpanded\def\mr % math regular
{\ifmmode
\font_helpers_synchronize_math_family_mr
\else
\font_helpers_set_current_font_alternative\s!mr
- \fi}
+ \fi
+ \mathdefault}
-\unexpanded\def\mb
+\unexpanded\def\mb % math bold
{\ifmmode
\font_helpers_synchronize_math_family_mb
\else
\font_helpers_set_current_font_alternative\s!mb
- \fi}
+ \fi
+ \mathdefault}
\appendtoks
\font_helpers_synchronize_math_family % auto bold