1 files changed, 214 insertions, 56 deletions
diff --git a/tex/context/base/font-ini.mkvi b/tex/context/base/font-ini.mkvi
index 521901e05..c04952a9e 100644
--- a/tex/context/base/font-ini.mkvi
+++ b/tex/context/base/font-ini.mkvi
@@ -363,7 +363,7 @@
 \let\thedefinedfont\relax % not to be confused with \everydefinefont
 
 \unexpanded\def\definedfont
-  {\doifnextoptionalelse\font_basics_defined_font_yes\font_basics_defined_font_nop}
+  {\doifelsenextoptionalcs\font_basics_defined_font_yes\font_basics_defined_font_nop}
 
 \def\font_basics_defined_font_yes[#specification]%
   {\c_font_feature_inheritance_mode\c_font_feature_inheritance_fontonly
@@ -419,24 +419,39 @@
 %D When we assign for instance 12pt to a \DIMENSION\ register the \type
 %D {\the}'d value comes out as 12.0pt, which is often not the way users
 %D specify the bodyfont size. Therefore we use normalized values. They
-%D are caches to save overhead in \LUA\ calls.
+%D are cached to save overhead in \LUA\ calls.
 
-\setnewconstant\fontdigits\plustwo
+% \setnewconstant\fontdigits\plustwo % from now on always 2
 
 \installcorenamespace{fontnormalizedbody}
 
+% \def\normalizebodyfontsize#macro#body%
+%   {\expandafter\let\expandafter#macro\csname\??fontnormalizedbody\number\fontdigits:\number\dimexpr#body\endcsname
+%    \ifx#macro\relax
+%       \normalizebodyfontsize_indeed#macro{#body}%
+%    \fi}
+%
+% \def\normalizebodyfontsize_indeed#macro#body%
+%   {\edef#macro{\ctxcommand{nbfs(\number\dimexpr#body,\number\fontdigits)}}%
+%    \global\expandafter\let\csname\??fontnormalizedbody\number\fontdigits:\number\dimexpr#body\endcsname#macro}
+%
+% \def\thenormalizedbodyfontsize#body%
+%   {\ctxcommand{nbfs(\number\dimexpr#body\relax,\number\fontdigits)}}
+%
+% caching is less relevant now
+
 \def\normalizebodyfontsize#macro#body%
-  {\expandafter\let\expandafter#macro\csname\??fontnormalizedbody\number\fontdigits:\number\dimexpr#body\endcsname
+  {\expandafter\let\expandafter#macro\csname\??fontnormalizedbody\number\dimexpr#body\endcsname
    \ifx#macro\relax
       \normalizebodyfontsize_indeed#macro{#body}%
    \fi}
 
 \def\normalizebodyfontsize_indeed#macro#body%
-  {\edef#macro{\ctxcommand{nbfs(\number\dimexpr#body,\number\fontdigits)}}%
-   \global\expandafter\let\csname\??fontnormalizedbody\number\fontdigits:\number\dimexpr#body\endcsname#macro}
+  {\edef#macro{\clf_nbfs\dimexpr#body\relax}%
+   \global\expandafter\let\csname\??fontnormalizedbody\number\dimexpr#body\endcsname#macro}
 
 \def\thenormalizedbodyfontsize#body%
-  {\ctxcommand{nbfs(\number\dimexpr#body\relax,\number\fontdigits)}}
+  {\clf_nbfs\dimexpr#body\relax}
 
 \edef\normalizedglobalbodyfontsize{\thenormalizedbodyfontsize\bodyfontsize}
 \edef\normalizedlocalbodyfontsize {\thenormalizedbodyfontsize\bodyfontsize}
@@ -723,7 +738,9 @@
 
 \unexpanded\def\font_helpers_low_level_define#specification#csname%
   {% we can now set more at the lua end
-   \ctxcommand{definefont_one(\!!bs\luaescapestring{#specification}\!!es)}% the escapestring catches at \somedimen
+   \global\let\somefontname\defaultfontfile
+   \let\somefontsize\empty
+   \clf_definefont_one{\detokenize\expandafter{\normalexpanded{#specification}}}% the escapestring catches at \somedimen
    % sets \scaledfontmode and \somefontname and \somefontsize
    \ifcase\fontface\relax
    % \let\v_font_size_absolute\textface % fontbody
@@ -774,39 +791,43 @@
    \else
      \d_font_scaled_text_face\textface
    \fi
-   \edef\somefontspec{at \number\d_font_scaled_font_size sp}% probably no longer used, needs checking
+   \edef\somefontspec{at \number\d_font_scaled_font_size sp}%
    \edef\somefontfile{\truefontname\somefontname}%
    \ifx\somefontfile\s!unknown
      \edef\somefontfile{\defaultfontfile}%
    \fi
-   \ifx\somefontfile\s!unknown
-     \edef\somefontfile{\defaultfontfile}%
-   \fi
    \font_helpers_update_font_parameters
    \font_helpers_update_font_class_parameters
    % \writestatus{fonts}{low level define: #csname/\somefontfile/\number\d_font_scaled_font_size/\fontface/\number\d_font_scaled_text_face}%
-   \ctxcommand{definefont_two(
-      \ifx\fontclass\empty false\else true\fi,
-      "#csname",
-      \!!bs\somefontfile\!!es,
-      \number\d_font_scaled_font_size,
-      \number\c_font_feature_inheritance_mode,
-      "\m_font_class_features",
-      "\m_font_features",
-      "\m_font_class_fallbacks",
-      "\m_font_fallbacks",
-      \fontface, % 1/2/3: text script scriptscript 0/4/5: body x xx
-      \number\d_font_scaled_text_face,
-      "\number\relativefontid",           % experiment
-      "\m_font_class_goodies",            % experiment (not yet used)
-      "\m_font_goodies",
-      "\m_font_class_designsize",
-      "\m_font_designsize",
-      \number\scaledfontmode
-   )}%
-   \edef\somefontspec{at \number\scaledfontsize sp}% we need the resolved designsize (for fallbacks)
-   \expandafter\let\expandafter\lastrawfontcall\csname#csname\endcsname
-   \the\everydefinefont
+   \clf_definefont_two
+      \ifx\fontclass\empty\s!false\else\s!true\fi
+      {#csname}%
+      {\somefontfile}%
+      \d_font_scaled_font_size
+      \c_font_feature_inheritance_mode
+      {\m_font_class_features}%
+      {\m_font_features}%
+      {\m_font_class_fallbacks}%
+      {\m_font_fallbacks}%
+      \fontface
+      \d_font_scaled_text_face
+      \relativefontid
+      {\m_font_class_goodies}%
+      {\m_font_goodies}%
+      {\m_font_class_designsize}%
+      {\m_font_designsize}%
+      \scaledfontmode
+   \relax
+   \ifcase\scaledfontsize
+    %\scaledfontsize\plusone
+     \let\somefontspec\empty
+     \let\lastrawfontcall\relax
+     \expandafter\let\csname#csname\endcsname\relax
+   \else
+     \edef\somefontspec{at \number\scaledfontsize sp}% we need the resolved designsize (for fallbacks)
+     \expandafter\let\expandafter\lastrawfontcall\csname#csname\endcsname
+     \the\everydefinefont
+   \fi
    \c_font_feature_inheritance_mode\c_font_feature_inheritance_default}
 
 \def\font_helpers_check_body_scale#fontsize%  gets character (x xx a etc)
@@ -830,10 +851,10 @@
 %D The following macros are used at the \LUA\ end. Watch the \type {\normal}
 %D hackery: this makes the mkvi parser happy.
 
-\normaldef\fntsetdefname {\global\let\somefontname\defaultfontfile}    % do before calling
-\normaldef\fntsetsomename{\normalgdef\somefontname} % takes argument
-\normaldef\fntsetnopsize {\let\somefontsize\empty}                     % do before calling
-\normaldef\fntsetsomesize{\normaldef\somefontsize}  % takes argument
+% \normaldef\fntsetdefname {\global\let\somefontname\defaultfontfile}    % do before calling
+% \normaldef\fntsetnopsize {\let\somefontsize\empty}                     % do before calling
+% \normaldef\fntsetsomename{\normalgdef\somefontname} % takes argument
+% \normaldef\fntsetsomesize{\normaldef\somefontsize}  % takes argument
 
 \newif\ifskipfontcharacteristics \skipfontcharacteristicstrue
 
@@ -878,7 +899,7 @@
    \fi}
 
 \def\font_basics_define_font_a[#name][#specification][#settings]% [name][spec][1.6 | line=10pt | setup_id]
-  {\doifsetupselse{#settings}%
+  {\doifelsesetups{#settings}%
      {\setuvalue{#name}{\font_basics_define_font_with_setups    {#name}{#specification}{#settings}}}
      {\setuvalue{#name}{\font_basics_define_font_with_parameters{#name}{#specification}{#settings}}}}
 
@@ -900,11 +921,19 @@
 \unexpanded\def\definefrozenfont
   {\dotripleempty\font_basics_define_frozen_font}
 
+% \def\font_basics_define_frozen_font[#name][#specification][#settings]%
+%   {\begingroup
+%    \font_basics_define_font[#name][#specification][#settings]%
+%    \csname#name\endcsname
+%    \expandafter\expandafter\expandafter\endgroup\expandafter\let\csname#name\endcsname\lastrawfontcall}
+
 \def\font_basics_define_frozen_font[#name][#specification][#settings]%
   {\begingroup
    \font_basics_define_font[#name][#specification][#settings]%
    \csname#name\endcsname
-   \expandafter\endgroup\expandafter\let\csname#name\endcsname\lastrawfontcall}
+   \global\let\lastglobalrawfontcall\lastrawfontcall
+   \endgroup
+   \expandafter\let\csname#name\endcsname\lastglobalrawfontcall}
 
 %D The instance namespace protection makes the switch local so that we can redefine a
 %D logical name and/or change the size in between.
@@ -1158,7 +1187,9 @@
 
 \installcorenamespace{fontenvironmentknown}
 
-\let\bodyfontenvironmentlist\empty % used in font-run (might change)
+% \let\bodyfontenvironmentlist\empty % used in font-run (might change)
+
+\newtoks\bodyfontenvironmentlist
 
 \def\font_helpers_register_environment#class#body%
   {\expandafter\let\csname\??fontenvironmentknown#class#body\endcsname\empty}
@@ -1179,6 +1210,12 @@
 %D a bodyfont is loaded but changing them afterwards can be sort of tricky as
 %D values are not consulted afterwards.
 
+\def\processbodyfontenvironmentlist#1% no \unexpanded as then we cannot use it in alignments
+  {\clf_processbodyfontsizes{\strippedcsname#1}}
+
+\def\bodyfontenvironmentlist
+  {\clf_getbodyfontsizes}
+
 \def\font_basics_define_body_font_environment_class[#class][#body][#settings]%
   {\edef\m_font_body{#body}%
    \ifx\m_font_body\s!default
@@ -1187,7 +1224,8 @@
    \else
      \normalizebodyfontsize\m_font_body_normalized\m_font_body
      \font_basics_define_body_font_environment_size[#class][\m_font_body_normalized][#settings]%
-     \addtocommalist\m_font_body_normalized\bodyfontenvironmentlist
+    %\addtocommalist\m_font_body_normalized\bodyfontenvironmentlist
+     \clf_registerbodyfontsize{\m_font_body_normalized}%
    \fi}
 
 %D The empty case uses the same code but needs to ignore the current class
@@ -1367,19 +1405,19 @@
   {\font_basics_define_body_font_a[bwhatever][\s!rm][]}
 
 \unexpanded\def\font_basics_define_body_font_a[#whatever]%
-  {\doifnumberelse{#whatever}%
+  {\doifelsenumber{#whatever}%
      \font_basics_define_body_font_body
      \font_basics_define_body_font_name
      [#whatever]}
 
 \unexpanded\def\font_basics_define_body_font_body[#body][#style][#specification]%
-  {\doifassignmentelse{#specification}
+  {\doifelseassignment{#specification}
      \font_basics_define_body_font_body_assignment
      \font_basics_define_body_font_body_identifier
      [#body][#style][#specification]}%
 
 \unexpanded\def\font_basics_define_body_font_name[#name][#style][#specification]%
-  {\doifassignmentelse{#specification}
+  {\doifelseassignment{#specification}
      \font_basics_define_body_font_name_assignment
      \font_basics_define_body_font_name_identifier
      [#name][#style][#specification]}%
@@ -1640,13 +1678,13 @@
    \fi}
 
 \def\font_helpers_set_font_check_size#option%
-  {\doifnumberelse{#option}{\font_helpers_check_bodyfont_environment{#option}{#option}}\donothing}
+  {\doifelsenumber{#option}{\font_helpers_check_bodyfont_environment{#option}{#option}}\donothing}
 
 \def\font_helpers_set_font_set_font#method#option% method=1: set, method=2: switch
   {\doifsomething{#option}{\font_helpers_set_font_set_font_option{#method}{#option}}}
 
 \def\font_helpers_set_font_set_font_option#method#option%
-  {\doifnumberelse{#option}%
+  {\doifelsenumber{#option}%
      \font_helpers_set_font_set_font_option_body
      \font_helpers_set_font_set_font_option_keyword
      {#method}{#option}{#option}}
@@ -1988,8 +2026,29 @@
 %D takes a bit more time. Keep in mind that the fontsize is
 %D represented by a character or empty.
 
-\unexpanded\def\tx {\font_helpers_set_current_font_x_alternative \fontalternative}
-\unexpanded\def\txx{\font_helpers_set_current_font_xx_alternative\fontalternative}
+% \unexpanded\def\tx {\font_helpers_set_current_font_x_alternative \fontalternative}
+% \unexpanded\def\txx{\font_helpers_set_current_font_xx_alternative\fontalternative}
+
+\unexpanded\def\tx
+  {\ifmmode
+     \scriptstyle
+   \else
+     \let\fontface\!!plusfour
+     \let\fontalternative\fontalternative
+     \font_helpers_synchronize_font
+   \fi
+   \currentxfontsize\plusone
+   \let\tx\txx}
+
+\unexpanded\def\txx
+  {\ifmmode
+     \scriptscriptstyle
+   \else
+     \let\fontface\!!plusfive
+     \let\fontalternative\fontalternative
+     \font_helpers_synchronize_font
+   \fi
+   \currentxfontsize\plustwo}
 
 \let\normaltx \tx
 \let\normaltxx\txx
@@ -2082,7 +2141,7 @@
 % \newtoks \everyswitchtobodyfont
 
 \unexpanded\def\setupbodyfont
-  {\doifnextoptionalelse\font_basics_setupbodyfont_yes\font_basics_setupbodyfont_nop}
+  {\doifelsenextoptionalcs\font_basics_setupbodyfont_yes\font_basics_setupbodyfont_nop}
 
 \def\font_basics_setupbodyfont_nop
   {\restoreglobalbodyfont
@@ -2114,6 +2173,13 @@
 \unexpanded\def\switchtobodyfont[#specification]% could become an ifx
   {\doifsomething{#specification}{\font_basics_switchtobodyfont{#specification}}}
 
+
+\unexpanded\def\usebodyfontparameter#1%
+  {\edef\m_font_bodyfont_asked{#1\c!bodyfont}%
+   \ifx\m_font_bodyfont_asked\empty\else
+     \font_basics_switchtobodyfont\m_font_bodyfont_asked
+   \fi}
+
 \def\font_helpers_switch_bodyfont_step
   {\font_basics_switch_points\m_font_step
    \font_basics_switch_style \fontstyle}
@@ -2169,13 +2235,28 @@
 
 %D Handy for manuals:
 
-\unexpanded\def\fontchar#character%
-  {\ctxcommand{fontchar("#character")}}
 
-%D The next auxilliary macro is an alternative to \type
-%D {\fontname}.
+%D The \type {\tochar} commmand takes a specification:
+%D
+%D \starttabulate[|l|l|l|]
+%D \NC e \NC entity                   \NC e:eacute \NC \NR
+%D \NC x \NC hexadecimal unicode      \NC x:013D   \NC \NR
+%D \NC d \NC decimal unicode          \NC d:123    \NC \NR
+%D \NC s \NC hexadecimal index (slot) \NC s:210D   \NC \NR
+%D \NC i \NC decimal index            \NC i:456    \NC \NR
+%D \NC n \NC name                     \NC n:eight  \NC \NR
+%D \NC c \NC name                     \NC c:x      \NC \NR
+%D \stoptabulate
+%D
+%D This is an expandable command!
+
+\unexpanded\def\fontchar       #character{\clf_fontchar{#character}}
+\unexpanded\def\fontcharbyindex    #index{\clf_fontcharbyindex#index\relax}
+           \def\tochar    #specifications{\clf_tochar{#specifications}} % expanded (also used in edef)
+
+%D The next auxilliary macro is an alternative to \type {\fontname}.
 
-\def\purefontname#font{\ctxlua{file.basename("\fontname#font"}} % will be function using id
+\def\purefontname#font{\clf_purefontname{\fontname#font}}
 
 %D \macros
 %D   {switchstyleonly}
@@ -2190,7 +2271,7 @@
 %D \stoptyping
 
 \unexpanded\def\switchstyleonly
-  {\doifnextoptionalelse\font_basics_switch_style_only_opt\font_basics_switch_style_only_arg}
+  {\doifelsenextoptionalcs\font_basics_switch_style_only_opt\font_basics_switch_style_only_arg}
 
 \def\font_basics_switch_style_only_arg#name% stupid version
   {\font_helpers_set_current_font_style{\csname\??fontshortstyle\checkedstrippedcsname#name\endcsname}%
@@ -2348,6 +2429,83 @@
 \def\saveddefinedfontid  {\number\fontid\font}
 \def\saveddefinedfontname{\fontname\font}
 
+% yes or no:
 
+% \let\font_basics_check_text_bodyfont_slow\font_basics_check_text_bodyfont
+%
+% \unexpanded\def\font_basics_check_text_bodyfont
+%   {\ifproductionrun
+%      % not per se \s!..'s
+%      \glet\font_basics_check_text_bodyfont     \font_basics_check_text_bodyfont_slow
+%      \glet\font_basics_check_text_bodyfont_fast\relax
+%      \expandafter\font_basics_check_text_bodyfont
+%    \else
+%      \expandafter\font_basics_check_text_bodyfont_fast
+%    \fi}
+%
+% \def\font_basics_check_text_bodyfont_fast#style#alternative#size% size can be empty (checking needed as \bf is already defined)
+%   {\setugvalue{#style#size}% \rma
+%      {\let\fontstyle#style%
+%       \let\fontsize #size%
+%       \font_helpers_check_big_math_synchronization % double? better in everymath?
+%       \font_helpers_synchronize_font}%
+%    \setugvalue{#alternative#size}% \sla
+%      {\let\fontalternative#alternative%
+%       \let\fontsize       #size%
+%       \font_helpers_check_big_math_synchronization % double? better in everymath?
+%       \font_helpers_synchronize_font}%
+%    \setugvalue{#style#alternative#size}% \rmsla
+%      {\let\fontstyle      #style%
+%       \let\fontalternative#alternative%
+%       \let\fontsize       #size%
+%       \font_helpers_check_big_math_synchronization % double? better in everymath?
+%       \font_helpers_synchronize_font}%
+%    \ifcsname\s!normal#style\endcsname % text/math check
+%      \expandafter\let\csname#style\expandafter\endcsname\csname\s!normal#style\endcsname
+%    \else
+%      \setugvalue{#style}% \rm
+%        {\let\fontstyle#style%
+%         \font_typescripts_inherit_check\fontstyle
+%         \ifmmode\mr\fi % otherwise \rm not downward compatible ... not adapted yet
+%         \font_helpers_synchronize_font}%
+%    \fi
+%    \ifcsname\s!normal#alternative\endcsname % text/math check
+%      \expandafter\let\csname#alternative\expandafter\endcsname\csname\s!normal#alternative\endcsname
+%    \else
+%      \setugvalue{#alternative}% \sl
+%        {\let\fontalternative#alternative%
+%         \font_helpers_synchronize_font}%
+%    \fi
+%    \setugvalue{#style\s!x}% \rmx
+%      {\csname#style\endcsname\tx}%
+%    \setugvalue{#style\s!xx}% \rmxx
+%      {\csname#style\endcsname\txx}%
+%    \setugvalue{#alternative\s!x}% \slx
+%      {\font_helpers_check_nested_x_fontsize
+%       \ifmmode
+%          \scriptstyle
+%       \else
+%         \let\fontface\!!plusfour
+%         \let\fontalternative#alternative%
+%         \font_helpers_synchronize_font
+%       \fi
+%       \currentxfontsize\plusone
+%       \let\tx\txx}%
+%    \setugvalue{#alternative\s!xx}% \slxx
+%      {\font_helpers_check_nested_x_fontsize
+%       \ifmmode
+%          \scriptscriptstyle
+%       \else
+%         \let\fontface\!!plusfive
+%         \let\fontalternative#alternative%
+%         \font_helpers_synchronize_font
+%       \fi
+%       \currentxfontsize\plustwo
+%       \let\tx\empty
+%       \let\txx\empty}%
+%    \setugvalue{#style#alternative}% \rmsl
+%      {\let\fontstyle      #style%
+%       \let\fontalternative#alternative%
+%       \font_helpers_synchronize_font}}
 
 \protect \endinput