1 files changed, 3 insertions, 30 deletions
diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex
index 8c988acd3..16de32741 100644
--- a/tex/context/base/type-ini.tex
+++ b/tex/context/base/type-ini.tex
@@ -538,48 +538,21 @@
 
 \def\typefaceencoding{\defaultencoding}
 
-% \def\dodefinetypeface[#1][#2][#3][#4][#5][#6]%
-%   {\dododefinetypeface[#1][#2]%
-%    \iffifthargument % sixth is optional
-%      % \getparameters[\??ts][rscale=1,\s!encoding=\defaultencoding,#6]
-%      % we need to expand since in #6 there can be a \typescripttwo
-%      \expanded{\getparameters[\??ts][\s!rscale=1,\s!encoding=\defaultencoding,#6]}%
-%      % toch niet \expanded{\getparameters[\??ts][\s!rscale=1,\s!encoding=\s!default,#6]}%
-%      \pushmacro\relativefontsize
-%      \pushmacro\typefaceencoding
-%      \pushmacro\fontclass
-%      \let\relativefontsize\@@tsrscale
-%      \let\typefaceencoding\@@tsencoding
-%      \setcurrentfontclass{#1}
-%      \saverelativefontsize{#2}{\relativefontsize}% fall back
-%     %\writestatus{typeface}{[#1] [#2] [#3] [#4]}
-%      \writestatus\m!fonts{[#1] [#2] [#3] [#4] / \typefaceencoding}%
-%      %\usetypescript[map][\typefaceencoding]% latest versions of pdftex can load after first page
-%      \usetypescript[#3,map][#4][name,default,\typefaceencoding,special]% is default needed
-%      \usetypescript[#3][#5][size]%
-%      \popmacro\fontclass
-%      \popmacro\typefaceencoding
-%      \popmacro\relativefontsize
-%    \else\iffourthargument
-%      \definetypeface[#1][#2][#3][#4][\s!default]%
-%    \else\ifthirdargument
-%      \getparameters[\??tf#1#2][#3]%
-%    \fi\fi\fi}
-
 % we can use \rawgetparameters or \rawgeteparameters
 
 \def\dodefinetypeface[#1][#2][#3][#4][#5][#6]%
   {\dododefinetypeface[#1][#2]%
    \iffifthargument % sixth is optional
      % we need to expand since in #6 there can be a \typescripttwo
-     \expanded{\getparameters[\??ts][\s!rscale=\plusone,\s!encoding=\defaultencoding,#6]}% \geteparameters
+     \expanded{\getparameters[\??ts][\s!rscale=\plusone,\s!encoding=\defaultencoding,\s!text=,#6]}% \geteparameters
      \pushmacro\relativefontsize
      \pushmacro\typefaceencoding
      \pushmacro\fontclass
      \let\relativefontsize\@@tsrscale
      \let\typefaceencoding\@@tsencoding
      \setcurrentfontclass{#1}%
-     \saverelativefontsize{#2}{\relativefontsize}% fall back
+     \saverelativefontsize{#2}\relativefontsize % fall back
+     \savemathtextstyle\@@tstext % math text style (new per 28/4/2006)
      \iftracetypescripts\writestatus\m!fonts{define: [#1] [#2] [#3] [#4] / \typefaceencoding}\fi
      %\usetypescript[map][\typefaceencoding]% latest versions of pdftex can load after first page
      \usetypescript[#3,\t!map][#4][\t!name,\t!default,\typefaceencoding,\t!special]% is default needed