1 files changed, 18 insertions, 13 deletions
diff --git a/tex/context/base/font-ini.mkiv b/tex/context/base/font-ini.mkiv
index 91b789204..8c797652b 100644
--- a/tex/context/base/font-ini.mkiv
+++ b/tex/context/base/font-ini.mkiv
@@ -78,6 +78,7 @@
 \registerctxluafile{font-ext}{1.001}
 \registerctxluafile{font-pat}{1.001}
 \registerctxluafile{font-chk}{1.001}
+\registerctxluafile{font-agl}{1.001}
 
 \unprotect
 
@@ -2644,6 +2645,9 @@
 \ifx\saveinterlinespace   \undefined \let\saveinterlinespace   \relax \fi
 \ifx\restoreinterlinespace\undefined \let\restoreinterlinespace\relax \fi
 
+% \newtoks \everysetupbodyfont
+% \newtoks \everyswitchtobodyfont
+
 \chardef\bodyfontsetstate=0
 
 \definecomplexorsimple\setupbodyfont
@@ -2662,7 +2666,8 @@
         \the\everybodyfont
         \the\everyglobalbodyfont
         \saveinterlinespace
-      \fi}}
+      \fi
+      \the\everysetupbodyfont}}
 
 \unexpanded\def\switchtobodyfont[#1]%
   {\doifsomething{#1}
@@ -2671,7 +2676,8 @@
       \else
         \dosetfont0{#1}%
       \fi
-      \the\everybodyfont}} % indeed needed in case nothing is executed
+      \the\everybodyfont
+      \the\everyswitchtobodyfont}}
 
 %D The following alternative is meant for math||to||text
 %D switching and will be optimized.
@@ -2718,23 +2724,22 @@
 
 \definefontfeature
   [default]
-  [%mode=node,%
+  [%mode=node,
    liga=yes,kern=yes,tlig=yes,trep=yes] % texligatures=yes,texquotes=yes
 
 \definefontfeature
   [smallcaps]
-  [%mode=node,%
-   liga=yes,kern=yes,tlig=yes,trep=yes,smcp=yes] % texligatures=yes,texquotes=yes
+  [%mode=node,liga=yes,
+   smcp=yes,kern=yes,tlig=yes,trep=yes] % texligatures=yes,texquotes=yes
 
 \definefontfeature
   [oldstyle]
-  [%mode=node,%
-   liga=yes,kern=yes,tlig=yes,trep=yes,onum=yes] % texligatures=yes,texquotes=yes
-
+  [%mode=node,
+   onum=yes,liga=yes,kern=yes,tlig=yes,trep=yes] % texligatures=yes,texquotes=yes
 
 \definefontfeature % == default unless redefined
   [ligatures]
-  [%mode=node,%
+  [%mode=node,
    liga=yes,kern=yes,tlig=yes,trep=yes]
 
 \definefontfeature % can be used for type1 fonts
@@ -3254,7 +3259,7 @@
 %D takes care of \type {\em \bf ...} sitiations.
 
 \def\setemphasisboldface
-  {\let\normalbf\bf
+  {\let\savedemphasisboldface\bf
    \let\setemphasisboldface\relax
    \unexpanded\def\bf
      {%\relax
@@ -3264,9 +3269,9 @@
       \else\ifx\fontalternative\c!sl
         \bs
       \else
-        \normalbf
+        \savedemphasisboldface
       \fi\fi
-      \let\bf\normalbf}}
+      \let\bf\savedemphasisboldface}}
 
 %D Donald's (adapted) macros take the next character into
 %D account when placing italic correction. As a bonus we also
@@ -3410,7 +3415,7 @@
 %D The implementation is rather straightforward in using
 %D \type{\halign}.
 
-\fetchruntimecommand \showbodyfont  {\f!fontprefix\s!run.mkii}
+\fetchruntimecommand \showbodyfont  {\f!fontprefix\s!run.mkiv}
 
 %D \macros
 %D   {showfontstrip, testminimalbaseline, showminimalbaseline}