diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base/type-ini.tex')
-rw-r--r-- | Master/texmf-dist/tex/context/base/type-ini.tex | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/context/base/type-ini.tex b/Master/texmf-dist/tex/context/base/type-ini.tex index f551c886197..16de327411e 100644 --- a/Master/texmf-dist/tex/context/base/type-ini.tex +++ b/Master/texmf-dist/tex/context/base/type-ini.tex @@ -84,7 +84,7 @@ \usetypescriptfile[\f!typeprefix exa] % some examples \usetypescriptfile[\f!typeprefix syn] % font file synonyms \usetypescriptfile[\f!typeprefix enc] % files and encodings -\usetypescriptfile[\f!typeprefix dis] % funny name remappings +%usetypescriptfile[\f!typeprefix dis] % funny name remappings, obsolete \usetypescriptfile[\f!typeprefix siz] % specific font sizes \usetypescriptfile[\f!typeprefix map] % pdftex mapping \usetypescriptfile[\f!typeprefix spe] % special macros @@ -382,7 +382,7 @@ \def\loadmapfile[#1]% {\expanded{\processcommalist[#1]}\loadthemapfile} -% too soon, no driver known, \ifproductionrun \loadallfontmapfiles \fi} +% too soon, no driver known, \ifproductionrun \loadallfontmapfiles \fi % temp hack, will become just \addto @@ -462,6 +462,9 @@ % the map directives need to end up in the right place in the stream +% hm, the timing of when pdftex needs the map file info keeps changing; +% it's really time to move to map line support + % \appendtoks \loadallfontmapfiles \to \everyPDFximage % \appendtoks \loadallfontmapfiles \to \everystarttext % \appendtoks \loadallfontmapfiles \to \everybeforepagebody @@ -535,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 @@ -621,6 +597,30 @@ \def\usetypefile[#1]% recurses on path ! {\readfile{\f!typeprefix#1}\donothing\donothing} +%D For Taco: +%D +%D \starttyping +%D \inherittypeface[palatino][rm][postscript] +%D \inherittypeface[palatino][rm][\fontclass] +%D \inherittypeface[palatino][rm] % == \fontclass +%D \inherittypeface[palatino] % == [rm,ss,tt,mm] +%D \starttyping + +\def\inherittypeface + {\dotripleempty\doinherittypeface} + +\def\doinherittypeface[#1][#2][#3]% + {\doifelsenothing{#2} + {\doinherittypeface[#1][\c!rm,\c!ss,\c!tt,\c!mm][\fontclass]} + {\doifnot{#1}{#3} + {\def\docommand##1{\setevalue{#1-##1}{#3}}% + \processcommalist[#2]\docommand}}} + +%D This hook sinto the font mechanism with: + +\def\checkfontclass#1% + {\edef\fontclass{\executeifdefined{\fontclass-#1}{\fontclass}}} + %D For backward compatibility we reimplement the font file %D loading macro. |