summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-09-17 23:37:02 +0000
committerKarl Berry <karl@freefriends.org>2009-09-17 23:37:02 +0000
commit84ea92b10d85753f2d44ae4ce9b17d4338c40603 (patch)
tree8e54589db9791d35a823e3d01314202e272a851c
parent7f11d03f887e3eeebeb5eaa672d69ea047c5f143 (diff)
context-simplefonts update (17sep09)
git-svn-id: svn://tug.org/texlive/trunk@15351 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex50
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