From 5c91b9f8a88e06f057a6a08b0a755a224d08e019 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 18 Nov 2006 01:37:52 +0000
Subject: context 17nov06 update

git-svn-id: svn://tug.org/texlive/trunk@2449 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/context/base/font-ini.tex | 67 +++++++++++++------------
 1 file changed, 35 insertions(+), 32 deletions(-)

(limited to 'Master/texmf-dist/tex/context/base/font-ini.tex')

diff --git a/Master/texmf-dist/tex/context/base/font-ini.tex b/Master/texmf-dist/tex/context/base/font-ini.tex
index 8e620309e67..dda16084534 100644
--- a/Master/texmf-dist/tex/context/base/font-ini.tex
+++ b/Master/texmf-dist/tex/context/base/font-ini.tex
@@ -64,14 +64,14 @@
 \def\savefont
   {\edef\savedfont{\the\font}%
    \pushmacro\savedfont
-   \pushmacro\characterregime
+   \pushmacro\currentregime
    \pushmacro\charactermapping
    \pushmacro\characterencoding}
 
 \def\restorefont
   {\popmacro\characterencoding
    \popmacro\charactermapping
-   \popmacro\characterregime
+   \popmacro\currentregime
    \popmacro\savedfont
    \savedfont}
 
@@ -734,6 +734,8 @@
 %D although for instance unboxing goes ok. Therefore we
 %D introduce:
 
+% best can go to math-ini and make \mf a hook then
+
 % better use \dowithnextboxcontent
 
 \def\normalmbox
@@ -1526,8 +1528,8 @@
 %D
 %D For special purposes, we provide a hook.
 
-\newevery \everyfont       \relax
-\newevery \everyfontswitch \relax
+% \newevery \everyfont       \relax
+% \newevery \everyfontswitch \relax
 
 %  safer but sometimes introducing newlines in the log
 %
@@ -2038,14 +2040,14 @@
 
 \def\definefontsize[#1]% sneller met toks
   {\addtocommalist{#1}\sizelist
-   \def\docommando##1%
-     {\def\dodocommando####1%
-        {\def\dododocommando########1%
+   \def\docommand##1%
+     {\def\dodocommand####1%
+        {\def\dododocommand########1%
           %{\checkbodyfont{}{########1}{####1}{##1}}%
            {\checkbodyfont{########1}{####1}{##1}}%
-         \processcommacommand[\stylelist]\dododocommando}%
-      \processcommacommand[\alternativelist]\dodocommando}%
-   \processcommacommand[\sizelist]\docommando}
+         \processcommacommand[\stylelist]\dododocommand}%
+      \processcommacommand[\alternativelist]\dodocommand}%
+   \processcommacommand[\sizelist]\docommand}
 
 \def\alternativetextlist{\c!tf,\c!bf,\c!it,\c!sl,\c!bs,\c!bi,\c!sc}
 \def\alternativemathlist{\c!mr,\c!mi,\c!sy,\c!ex,\c!ma,\c!mb}
@@ -2218,12 +2220,12 @@
 \def\dododefinebodyfontenvironment[#1][#2][#3]% size class settings
   {\@@beginfontdef
    \doifundefined{\??ft#2#1\c!em} % \s!text goes wrong in testing because
-     {\def\docommando##1%         % the 12pt alternative will called when
+     {\def\docommand##1%         % the 12pt alternative will called when
         {\scratchdimen#1\relax    % typesetting the test (or so)
          \scratchdimen\csname\??ft\s!default##1\endcsname\scratchdimen
          \normalizebodyfontsize\scratchdimen\to\tempbodyfontsize
          \setevalue{\??ft#2#1##1}{\tempbodyfontsize}}%
-     \processcommacommand[\fontsizelist]\docommando
+     \processcommacommand[\fontsizelist]\docommand
      \copyparameters
        [\??ft#2#1][\??ft\s!default]
        [\c!interlinespace,\c!em]}%
@@ -2554,14 +2556,14 @@
 %   {\let\c!savedtext\c!text
 %    \let\c!text\s!text
 %    \donefalse
-%    \def\docommando##1%
+%    \def\docommand##1%
 %      {\doifdefined{\??ft\s!default##1}
 %         {\donetrue
 %          \scratchdimen#1\relax
 %          \scratchdimen\csname\??ft\s!default##1\endcsname\scratchdimen
 %          \normalizebodyfontsize\scratchdimen\to\!!stringa
 %          \letvalue{\??ft#1##1}\!!stringa}}%
-%    \processcommacommand[\fontsizelist]\docommando
+%    \processcommacommand[\fontsizelist]\docommand
 %    \let\c!text\c!savedtext
 %    \ifdone
 %      \donefalse
@@ -2680,9 +2682,9 @@
 %D in other modules. Here we only provide the hooks that
 %D garantees their handling.
 
-\ifx\everybodyfont\undefined % permits reloading
-  \newevery \everybodyfont \EveryBodyFont
-\fi
+% \ifx\everybodyfont\undefined % permits reloading
+%   \newevery \everybodyfont \EveryBodyFont
+% \fi
 
 %D At the system level one can initialize thing like:
 %D
@@ -3083,6 +3085,8 @@
 %
 % For Taco: optional fall backs:
 
+\ifx\checkfontclass\undefined \let\checkfontclass\gobbleoneargument \fi % implemented in type-ini
+
 \def\setcurrentfontstyle#1%
   {%\message{[3 #1]}%
    \checkfontclass{#1}%
@@ -3090,8 +3094,6 @@
    \ifmmode\mr\fi % otherwise \rm not downward compatible
    \synchronizefont}
 
-\let\checkfontclass\gobbleoneargument % implemented in type-ini
-
 \def\setcurrentfontbodyalternative#1#2%
   {%\message{[4 #1 #2]}%
    \edef\fontbody{#1}%
@@ -3351,10 +3353,10 @@
      {\addtocommalist{#2}\stylelist
       \showmessage\m!fonts8{#2 (#1)}}%
    % check kan hier
-   \def\docommando##1%
+   \def\docommand##1%
      {\setvalue{\@shortstyle@##1}{#2}%
       \setvalue{\@style@##1}{\csname#2\endcsname}}%
-   \processcommalist[#1]\docommando}
+   \processcommalist[#1]\docommand}
 
 \def\definefontstyle
   {\dodoubleargument\dodefinefontstyle}
@@ -3706,8 +3708,8 @@
 %D because \PLAIN\ \TEX\ is english anyway.
 
 \def\dodefinebodyfontswitch[#1][#2]%
-  {\def\docommando##1{\setvalue{##1}{\switchtobodyfont[#2]}}%
-   \processcommalist[#1]\docommando}
+  {\def\docommand##1{\setvalue{##1}{\switchtobodyfont[#2]}}%
+   \processcommalist[#1]\docommand}
 
 \def\definebodyfontswitch
   {\dodoubleargument\dodefinebodyfontswitch}
@@ -3811,8 +3813,9 @@
 
 % old mechanism
 %
-% \def\infofont%
-%   {\getvalue{\!!sixpoint\c!tt\c!tf}\the\everybodyfont}
+% \def\infofont{\getvalue{\!!sixpoint\c!tt\c!tf}\the\everybodyfont}
+
+\let\infofont\relax % satisfy dep checker
 
 \definefont [infofont] [Mono at 6pt] % todo \the\everybodyfont
 
@@ -3847,11 +3850,11 @@
 %D arguments.
 
 \def\dodefinealternativestyle[#1][#2][#3]%
-  {\def\docommando##1%
+  {\def\docommand##1%
      {\doifundefined{##1}{\setvalue{##1}{\groupedcommand{#2}{}}}%
       \setvalue{\@letter@  ##1}{#2}%
       \setvalue{\@noletter@##1}{#3}}%
-   \processcommalist[#1]\docommando}
+   \processcommalist[#1]\docommand}
 
 \def\definealternativestyle
   {\dotripleempty\dodefinealternativestyle}
@@ -3920,7 +3923,7 @@
      {\doifdefinedelse{#1}\getvalue         \firstofoneargument}%
    {#1}} % {#2}}
 
-\let\doconvertfont=\dodoconvertfont
+\let\doconvertfont\dodoconvertfont
 
 \def\noconvertfont#1% #2%
   {\doifdefinedelse{\@noletter@#1}
@@ -3978,7 +3981,7 @@
 
 \unexpanded\def\em
   {\relax
-   \ifdim\fontdimen1\font>\zeropoint
+   \ifdim\slantperpoint>\zeropoint
      \settrue\emneeded
    \else
      \setfalse\emneeded
@@ -4514,12 +4517,12 @@
 
 \unexpanded\def\moveaccent#1#2%
   {\smashaccent
-     {\dimen0\fontdimen5\font
+     {\dimen0\exheight
       \dimen2\dimen0
       \advance\dimen2 -#1%
-      \fontdimen5\font\dimen2
+      \exheight\dimen2
       #2\relax
-      \fontdimen5\font\dimen0}}
+      \exheight\dimen0}}
 
 %D Personally I think that using \TEX\ is complicated by the
 %D way fonts are handled. Apart from the many encodings, we
-- 
cgit v1.2.3

