From 4b45b0373a2f9835cf284999e108e5ba408733f7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Oct 2010 23:36:39 +0000 Subject: context-simplefonts update (14oct10) git-svn-id: svn://tug.org/texlive/trunk@20103 c570f23f-e606-0410-a88d-b1316a301751 --- .../context/third/simplefonts/t-simplefonts.tex | 62 ++++++---------------- 1 file changed, 17 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex/context/third/simplefonts') 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 8c5c2a1cafb..f1f3479dea8 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=2010.02.02, +%D version=2010.10.13, %D title=\CONTEXT\ User Module, %D subtitle=Simplefonts, %D author=Wolfgang Schuster, @@ -627,57 +627,29 @@ {\dodoubleempty\dosimplefont} \def\dosimplefont[#1][#2]% - {\getparameters[\????sf\v!default][\c!features=\v!default,\c!alternative=\v!regular,\c!weight=\v!normal,#2]% - \ctxlua{fonts.define.command_1("\luaescapestring{#1}")}% taken from font-ini.mkiv - \ifcase\scaledfontmode\relax - % none - \scaledfontsize-1000\scaledpoint - \or - % at - \scaledfontsize\somefontsize - \or - % sa - \scaledfontsize\localabsolutefontsize\relax - \scaledfontsize\currentfontbodysize\scaledfontsize - \or - % mo - \scaledfontsize\setmappedfontsize\localabsolutefontsize - \scaledfontsize\currentfontbodysize\scaledfontsize - \or - % scaled - \scaledfontsize-\somefontsize\scaledpoint + {\getparameters[\????sf\v!default][\c!features=\v!default,\c!alternative=\v!regular,\c!weight=\v!normal,\c!size=,#2]% + \edef\simplefontsize{\namedsimplefontparameter\v!default\c!size}% + \ifx\simplefontsize\empty\else + \doifdimenstringelse\simplefontsize + {\edef\simplefontsize{ at \simplefontsize}} + {\edef\simplefontsize{ \simplefontsize}}% \fi - \scaledfontsize\localrelativefontsize\scaledfontsize - \ctxlua{thirddata.simplefonts.selectfont("\v!default","\truefontname\somefontname","","\@@@@sfdefaultalternative","\@@@@sfdefaultweight")}% - \definedfont[\csname\????sf\v!default\@@@@sfdefaultalternative\endcsname*\@@@@sfdefaultfeatures\space at \number\scaledfontsize sp]} + \ctxlua{thirddata.simplefonts.selectfont("\v!default","#2","","\@@@@sfdefaultalternative","\@@@@sfdefaultweight")}% + \expanded{\definedfont[\csname\????sf\v!default\@@@@sfdefaultalternative\endcsname*\@@@@sfdefaultfeatures\simplefontsize]}} \def\definesimplefont {\dotripleempty\dodefinesimplefont} \def\dodefinesimplefont[#1][#2][#3]% - {\getparameters[\????sf\v!default][\c!features=\v!default,\c!alternative=\v!regular,\c!weight=\v!normal,#3]% - \ctxlua{fonts.define.command_1("\luaescapestring{#2}")}% taken from font-ini.mkiv - \ifcase\scaledfontmode\relax - % none - \scaledfontsize-1000\scaledpoint - \or - % at - \scaledfontsize\somefontsize - \or - % sa - \scaledfontsize\localabsolutefontsize\relax - \scaledfontsize\currentfontbodysize\scaledfontsize - \or - % mo - \scaledfontsize\setmappedfontsize\localabsolutefontsize - \scaledfontsize\currentfontbodysize\scaledfontsize - \or - % scaled - \scaledfontsize-\somefontsize\scaledpoint + {\getparameters[\????sf\v!default][\c!features=\v!default,\c!alternative=\v!regular,\c!weight=\v!normal,\c!size=,#3]% + \edef\simplefontsize{\namedsimplefontparameter\v!default\c!size}% + \ifx\simplefontsize\empty\else + \doifdimenstringelse\simplefontsize + {\edef\simplefontsize{ at \simplefontsize}} + {\edef\simplefontsize{ \simplefontsize}}% \fi - \scaledfontsize\localrelativefontsize\scaledfontsize - \ctxlua{thirddata.simplefonts.selectfont("\v!default","\truefontname\somefontname","","\@@@@sfdefaultalternative","\@@@@sfdefaultweight")}% - \definefont[#1][\csname\????sf\v!default\@@@@sfdefaultalternative\endcsname*\@@@@sfdefaultfeatures\space at \number\scaledfontsize sp][#3]} + \ctxlua{thirddata.simplefonts.selectfont("\v!default","#2","","\@@@@sfdefaultalternative","\@@@@sfdefaultweight")}% + \expanded{\definefont[#1][\csname\????sf\v!default\@@@@sfdefaultalternative\endcsname*\@@@@sfdefaultfeatures\simplefontsize][#3]}} %D \macros %D {simplefonttypeface,definesimplefonttypeface} -- cgit v1.2.3