diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/font-fil.mkvi')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/font-fil.mkvi | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/font-fil.mkvi b/Master/texmf-dist/tex/context/base/mkiv/font-fil.mkvi index 16ce57f8ad9..01fa4a3380e 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/font-fil.mkvi +++ b/Master/texmf-dist/tex/context/base/mkiv/font-fil.mkvi @@ -42,17 +42,19 @@ % % \setupbodyfont[palatino] +\let\fontclass\empty + \unexpanded\def\startfontclass {\dosingleempty\font_basics_start_font_class} \def\font_basics_start_font_class[#class]% - {\push_macro_fontclass + {\pushmacro\fontclass \doifelse{#class}\v!each {\let\fontclass\empty} {\doifsomething{#class}{\def\fontclass{#class}}}} \unexpanded\def\stopfontclass - {\pop_macro_fontclass} + {\popmacro\fontclass} \def\classfont#class#name{#class#name} % \definefont[whatever][\classfont{xx}{yy} at 10pt] @@ -107,14 +109,11 @@ \let\p_designsize\undefined \expandafter\font_basics_get_font_parameter_yes#specification,]=,} -% todo: check if we can use \edef but then we need to protect \mathsizesuffix .. in fact that -% can be default then: \let\mathsizesuffix\relax .. i need to play with it first - \def\font_basics_get_font_parameter_nop#key=#value,% {\if]#key% \font_basics_get_font_parameter_nop_finish \else - \expandafter\normaldef\csname p_#key\endcsname{#value}% % no edef as we need to keep \mathsizesuffix + \expandafter\normaldef\csname p_#key\endcsname{#value}% \expandafter\font_basics_get_font_parameter_nop \fi} @@ -122,13 +121,13 @@ {\if]#key% \font_basics_get_font_parameter_yes_finish \else - \expandafter\normaldef\csname p_#key\endcsname{#value}% % no edef as we need to keep \mathsizesuffix + \expandafter\normaldef\csname p_#key\endcsname{#value}% \expandafter\font_basics_get_font_parameter_yes \fi} % helpers, some day these will be toks and counts -% \def\fntsetdefname {\glet\somefontname\defaultfontfile} +% \def\fntsetdefname {\global\let\somefontname\defaultfontfile} % \def\fntsetsomename{\gdef\somefontname} % takes argument % \def\fntsetnopsize {\let\somefontsize\empty} % \def\fntsetsomesize{\def\somefontsize} % takes argument @@ -146,10 +145,10 @@ \expandafter\let\csname\??fontfile\m_font_name\s!designsize\endcsname\undefined} \def\font_basics_define_font_synonym_yes_nil - {\expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!features \endcsname\undefined - \expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!fallbacks \endcsname\undefined - \expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!goodies \endcsname\undefined - \expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!designsize\endcsname\undefined} + {\global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!features \endcsname\undefined + \global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!fallbacks \endcsname\undefined + \global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!goodies \endcsname\undefined + \global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!designsize\endcsname\undefined} \def\font_basics_get_font_parameter_nop_finish {\expandafter\let\csname\??fontfile\m_font_name\s!features \endcsname\p_features @@ -158,10 +157,10 @@ \expandafter\let\csname\??fontfile\m_font_name\s!designsize\endcsname\p_designsize} \def\font_basics_get_font_parameter_yes_finish - {\expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!features \endcsname\p_features - \expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!fallbacks \endcsname\p_fallbacks - \expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!goodies \endcsname\p_goodies - \expandafter\glet\csname\??fontfile\fontclass\m_font_name\s!designsize\endcsname\p_designsize} + {\global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!features \endcsname\p_features + \global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!fallbacks \endcsname\p_fallbacks + \global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!goodies \endcsname\p_goodies + \global\expandafter\let\csname\??fontfile\fontclass\m_font_name\s!designsize\endcsname\p_designsize} %\definefontsynonym [KopFont] [\fontclassname{officina}{SerifBold}] % @@ -307,8 +306,6 @@ #2% \fi\fi} -\installmacrostack\fontclass - %D Files or names can have properties and these need to be consulted %D at some point. They can inherit them. |