diff options
| -rw-r--r-- | Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex | 50 |
1 files changed, 17 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex index cb542301f2d..66ef335bae4 100644 --- a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex +++ b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex @@ -1,6 +1,6 @@ %D \module %D [ file=t-simplefonts, -%D version=2009.09.15, +%D version=2009.09.16, %D title=\CONTEXT\ User Module, %D subtitle=Simplefonts, %D author=Wolfgang Schuster, @@ -420,13 +420,9 @@ \presetsimplefonts[\????sf\currentsimplefont] - \iffourthargument + \getparameters[\????sf\currentsimplefont][#4] - \getparameters[\????sf\currentsimplefont][#4] - - \simplefonts@features{#4}\v!local % parse assignment list for font features - - \fi + \simplefonts@features{#4}\v!local % parse assignment list for font features \startprocesscommacommand[\simplefonts!alternative] @@ -458,13 +454,9 @@ \presetsimplefonts[\????sf\currentsimplefont] - \iffourthargument + \getparameters[\????sf\currentsimplefont][#4] - \getparameters[\????sf\currentsimplefont][#4] - - \simplefonts@features{#4}\v!local % parse assignment list for font features - - \fi + \simplefonts@features{#4}\v!local % parse assignment list for font features \startprocesscommacommand[\c!regular] @@ -496,11 +488,7 @@ \presetsimplefonts[\????sf\currentsimplefont] - \iffourthargument - - \getparameters[\????sf\currentsimplefont][#4] - - \fi + \getparameters[\????sf\currentsimplefont][#4] % no fonts are searched for the math fonts, all what happens is to normalize % the given name and save it in a macro is is later used to load a predefined @@ -528,13 +516,9 @@ \presetsimplefonts[\????sf\currentsimplefont] - \iffourthargument + \getparameters[\????sf\currentsimplefont][#4] - \getparameters[\????sf\currentsimplefont][#4] - - \simplefonts@features{#4}\v!local % parse assignment list for font features - - \fi + \simplefonts@features{#4}\v!local % parse assignment list for font features \startprocesscommacommand[\simplefonts!alternative] @@ -649,7 +633,7 @@ \def\dosimplefonttypeface[#1][#2]% {\doglobal\increment\simplefonts!fontfamily - \doquadrupleargument\simplefonts@definetextfont[\v!fontfamily][\v!fontfamily:\simplefonts!fontfamily][#1][\c!style=\v!simplefont,#2]% + \simplefonts@definetextfont[\v!fontfamily][\v!fontfamily:\simplefonts!fontfamily][#1][\c!style=\v!simplefont,#2]% \switchtobodyfont[\v!fontfamily:\simplefonts!fontfamily]} \def\definesimplefonttypeface @@ -659,14 +643,14 @@ {\getparameters[\????sf#1][\c!style=\v!serif,#3]% \processaction [\namedsimplefontparameter{#1}\c!style] - [ \v!serif=>{\doquadrupleargument\simplefonts@definetextfont [#1][#1][#2][#3]}, - \v!sans=>{\doquadrupleargument\simplefonts@definetextfont [#1][#1][#2][#3]}, - \v!mono=>{\doquadrupleargument\simplefonts@definetextfont [#1][#1][#2][#3]}, - \v!math=>{\doquadrupleargument\simplefonts@definemathfont [#1][#1][#2][#3]}, - \v!math=>{\doquadrupleargument\simplefonts@definemathfont [#1][#1][#2][#3]}, - \v!handwriting=>{\doquadrupleargument\simplefonts@definescriptfont[#1][#1][#2][#3]}, - \v!calligraphy=>{\doquadrupleargument\simplefonts@definescriptfont[#1][#1][#2][#3]}, - \s!unknown=>{\doquadrupleargument\simplefonts@definetextfont [#1][#1][#2][#3]}]} + [ \v!serif=>{\simplefonts@definetextfont [#1][#1][#2][#3]}, + \v!sans=>{\simplefonts@definetextfont [#1][#1][#2][#3]}, + \v!mono=>{\simplefonts@definetextfont [#1][#1][#2][#3]}, + \v!math=>{\simplefonts@definemathfont [#1][#1][#2][#3]}, + \v!math=>{\simplefonts@definemathfont [#1][#1][#2][#3]}, + \v!handwriting=>{\simplefonts@definescriptfont[#1][#1][#2][#3]}, + \v!calligraphy=>{\simplefonts@definescriptfont[#1][#1][#2][#3]}, + \s!unknown=>{\simplefonts@definetextfont [#1][#1][#2][#3]}]} %D Font extensions |