From 8c264fd9af50c767be17918fc6b4d0da09167dec Mon Sep 17 00:00:00 2001 From: Marius Date: Sat, 17 Dec 2011 11:40:14 +0200 Subject: beta 2011.12.17 10:04 --- tex/context/base/font-ini.mkiv | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'tex/context/base/font-ini.mkiv') diff --git a/tex/context/base/font-ini.mkiv b/tex/context/base/font-ini.mkiv index e4c63a4c9..4f6f2927a 100644 --- a/tex/context/base/font-ini.mkiv +++ b/tex/context/base/font-ini.mkiv @@ -547,7 +547,7 @@ \csname \fontbody\c!mm\fontfamily\fontsize\currentmathsize\endcsname \else \ifcsname \fontbody\c!mm\fontfamily \currentmathsize\endcsname \autofontsizetrue \csname \fontbody\c!mm\fontfamily \currentmathsize\endcsname \else - \font\nullfont \autofontsizetrue + \nullfont \autofontsizetrue \fi\fi} \def\dosetmathfamilyindeed#1#2% \currentmathsize etc are also used later on @@ -563,23 +563,31 @@ \let\fontbody\savedfontbody \autofontsizefalse} -\def\dodosetboldmathfamily#1% - {\ifcsname\fontclass \fontbody\c!mm\fontfamily\fontsize\currentmathsize\endcsname \autofontsizefalse - \csname\fontclass \fontbody\c!mm\fontfamily\fontsize\currentmathsize\endcsname - \else\ifcsname\fontclass \fontbody\c!mm\fontfamily \currentmathsize\endcsname \autofontsizetrue - \csname\fontclass \fontbody\c!mm\fontfamily \currentmathsize\endcsname - \else - \font#1% +\def\dodosetboldmathfamily#1#2#3% + {\ifcsname\fontclass\fontbody\c!mm\fontfamily\fontsize\currentmathsize\endcsname \autofontsizefalse + \csname\fontclass\fontbody\c!mm\fontfamily\fontsize\currentmathsize\endcsname #1#2\font \else + \ifcsname\fontclass\fontbody\c!mm\fontfamily \currentmathsize\endcsname \autofontsizetrue + \csname\fontclass\fontbody\c!mm\fontfamily \currentmathsize\endcsname #1#2\font \else + #1#2#1#3% \fi\fi} -\def\dosetboldmathfamilyindeed#1#2#3% +% \def\dodosetboldmathfamily#1#2#3% +% {\ifcsname\fontclass\fontbody\c!mm\fontfamily\fontsize\currentmathsize\endcsname \autofontsizefalse +% \csname\fontclass\fontbody\c!mm\fontfamily\fontsize\currentmathsize\endcsname \else +% \ifcsname\fontclass\fontbody\c!mm\fontfamily \currentmathsize\endcsname \autofontsizetrue +% \csname\fontclass\fontbody\c!mm\fontfamily \currentmathsize\endcsname \else +% \the#1#3% +% \fi\fi +% #1#2\font} + +\def\dosetboldmathfamilyindeed#1#2#3% \mbfam \c!mb \mrfam {\let\savedfontclass\defaultfontclass \let\defaultfontclass\fontclass % else truefontname falls back on the wrong one \let\savedfontbody\fontbody \let\fontfamily#2% - \let\currentmathsize\!!plusthree\let\fontbody\scriptscriptface\dodosetboldmathfamily#3\scriptscriptfont#1\font - \let\currentmathsize\!!plustwo \let\fontbody\scriptface \dodosetboldmathfamily#3\scriptfont #1\font - \let\currentmathsize\!!plusone \let\fontbody\textface \dodosetboldmathfamily#3\textfont #1\font + \let\currentmathsize\!!plusthree\let\fontbody\scriptscriptface\dodosetboldmathfamily\scriptscriptfont#1#3% + \let\currentmathsize\!!plustwo \let\fontbody\scriptface \dodosetboldmathfamily\scriptfont #1#3% + \let\currentmathsize\!!plusone \let\fontbody\textface \dodosetboldmathfamily\textfont #1#3% \ifconditional\optimizemathfontdefinitions \dosavefontclassmathfamily#1#2% \fi -- cgit v1.2.3