diff options
author | Hans Hagen <pragma@wxs.nl> | 2011-02-20 20:34:00 +0100 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2011-02-20 20:34:00 +0100 |
commit | 15ee46403d36de6f29b4e45171e061708ec69193 (patch) | |
tree | d067341bae6f8f10633bc71c1f91a85ea94ca33c /tex/context/base/font-ini.mkiv | |
parent | 18e7114e3c95f724407c6698181e6f1002ad589b (diff) | |
download | context-15ee46403d36de6f29b4e45171e061708ec69193.tar.gz |
beta 2011.02.20 20:34
Diffstat (limited to 'tex/context/base/font-ini.mkiv')
-rw-r--r-- | tex/context/base/font-ini.mkiv | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/tex/context/base/font-ini.mkiv b/tex/context/base/font-ini.mkiv index 0c5a3b9f2..a4e406d47 100644 --- a/tex/context/base/font-ini.mkiv +++ b/tex/context/base/font-ini.mkiv @@ -938,6 +938,8 @@ % We could use an indirect method ... store in 'array' and refer to % slot. +% +% or nicer .. use parent chain \unexpanded\def\definefontsynonym[#1]#2[#3]% {\edef\@@fontname{#1}% @@ -2113,17 +2115,22 @@ \def\resetpreloadfonts {\glet\preloaddefaultfonts \relax - \glet\preloaddefaultfontstt \relax - \glet\preloaddefaultfontsmm \relax + %\glet\preloaddefaultfontstt \relax + %\glet\preloaddefaultfontsmm \relax \glet\zerostagepreloadfonts \relax \glet\firststagepreloadfonts \relax \glet\secondstagepreloadfonts\relax - \glet\thirdstagepreloadfonts \relax + %\glet\thirdstagepreloadfonts \relax \glet\fourthstagepreloadfonts\relax \global\everyhbox\emptytoks \global\everyvbox\emptytoks \resetnullfont} +\def\resetcheckedfonts + {\glet\preloaddefaultfontstt \relax + \glet\preloaddefaultfontsmm \relax + \glet\thirdstagepreloadfonts \relax} + \def\dozerostagepreloadfonts {\definedfont[\s!file:lmmono10-regular sa 1]} @@ -2147,7 +2154,7 @@ {\writestatus\m!fonts{preloading latin modern fonts (second stage)}% \preloaddefaultfonts} -\def\thirdstagepreloadfonts +\def\thirdstagepreloadfonts % always {\ifx\fontclass\empty \writestatus\m!fonts{preloading latin modern fonts (third stage)}% \preloaddefaultfonts @@ -2161,6 +2168,7 @@ \preloaddefaultfontstt \fi \popmacro\fontstyle + \resetcheckedfonts % reset third, mm and tt \setupbodyfont[\fontstyle]% \fi} @@ -2892,6 +2900,17 @@ %D: We cannot yet inherit because no colors are predefined. +\definecolor[trace:0][s=.6] +\definecolor[trace:1][r=.6] +\definecolor[trace:2][g=.6] +\definecolor[trace:3][b=.6] +\definecolor[trace:4][r=.6,g=.6] +\definecolor[trace:5][r=.6,b=.6] +\definecolor[trace:6][g=.6,b=.6] +\definecolor[trace:7][r=.8,g=.4] +\definecolor[trace:8][r=.8,b=.4] +\definecolor[trace:9][g=.4,b=.8] + \definecolor[font:init][r=.75] \definecolor[font:medi][g=.75] \definecolor[font:fina][b=.75] |