From 60239bee8781bf85829bc6d9a159ebc630657960 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 14 May 2010 15:26:00 +0200 Subject: beta 2010.05.14 15:26 --- tex/context/base/bibl-tra.mkiv | 8 ++- tex/context/base/cont-new.tex | 2 +- tex/context/base/context.tex | 2 +- tex/context/base/enco-ini.mkiv | 28 ++++++--- tex/context/base/m-narrowtt.tex | 2 +- tex/context/base/math-ini.mkiv | 27 ++++++++ tex/context/base/math-pln.mkiv | 2 +- tex/context/base/meta-ini.mkii | 9 ++- tex/context/base/meta-tex.mkii | 11 ++-- tex/context/base/mlib-pps.mkiv | 3 +- tex/context/base/syst-aux.mkiv | 1 + tex/context/base/type-otf.mkiv | 97 +++++++++++++++++++++-------- tex/generic/context/luatex-fonts-merged.lua | 2 +- 13 files changed, 148 insertions(+), 46 deletions(-) diff --git a/tex/context/base/bibl-tra.mkiv b/tex/context/base/bibl-tra.mkiv index 1fc9089e7..2d539da5f 100644 --- a/tex/context/base/bibl-tra.mkiv +++ b/tex/context/base/bibl-tra.mkiv @@ -287,6 +287,7 @@ {\showmessage\m!publications{6}{bibl-\@@pbalternative}} {\showmessage\m!publications{1}{bibl-\@@pbalternative}}% \let\@@pbalternative\empty}% + \let\setuppublicationlayout\normalsetuppublicationlayout % overloaded in bibl-num ... vadjust needs to be done with option \getparameters[\??pb][#1]% as bibl-* can have set things back \the\everysetuppublications \ignorespaces} @@ -389,7 +390,9 @@ \setuplist[pubs][\c!samplesize={AA99},\c!alternative=a,\c!interaction=,\c!pagenumber=\v!no,#1,\c!command=]} \def\setuppublicationlayout[#1]#2% - {\setvalue{\??pv:l:#1}{#2\unskip}} + {\setvalue{\??pv:l:#1}{#2}} + +\let\normalsetuppublicationlayout\setuppublicationlayout \setuppublicationlist[\c!title=,\c!command=\dospecialbibinsert,\c!maybeyear=\v!on] @@ -937,7 +940,10 @@ \let\biblanguage\empty \ignorespaces \bibgetvard{#1}% + \removeunwantedspaces + \ignorespaces \bibalternative{\bibgetvart{#1}}% + \removeunwantedspaces \egroup} %D An few afterthoughts: diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index d63bf27c5..62cfaab81 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2010.05.13 23:36} +\newcontextversion{2010.05.14 15:26} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index a8b1afd7c..20abc1967 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2010.05.13 23:36} +\edef\contextversion{2010.05.14 15:26} %D For those who want to use this: diff --git a/tex/context/base/enco-ini.mkiv b/tex/context/base/enco-ini.mkiv index 5b6de5fa9..2cb647726 100644 --- a/tex/context/base/enco-ini.mkiv +++ b/tex/context/base/enco-ini.mkiv @@ -497,15 +497,27 @@ %D A smaller and bolder variant, more like the math and monospaced ones. +% \def\fakeunderscore +% {\dontleavehmode\hbox % was \leavevmode +% {\setbox\scratchbox\hbox{(}% +% \scratchdimen.2\dp\scratchbox +% \setbox\scratchbox\hbox{\space}% +% \vrule +% \!!depth \scratchdimen +% \!!width \wd\scratchbox +% \!!height\zeropoint}} + +% \startTEXpage +% \ruledhbox{\strut$1\fakeunderscore^{1\fakeunderscore}$} +% \ruledhbox{\strut$1\xfakeunderscore^{1\xfakeunderscore}$} +% \stopTEXpage + \def\fakeunderscore - {\leavevmode\hbox - {\setbox\scratchbox\hbox{(}% - \scratchdimen.2\dp\scratchbox - \setbox\scratchbox\hbox{\space}% - \vrule - \!!depth \scratchdimen - \!!width \wd\scratchbox - \!!height\zeropoint}} + {\relax\ifmmode + \vrule\!!depth .12\fontexheight\mathstylefont\normalmathstyle\!!width \fontinterwordspace\mathstylefont\normalmathstyle\!!height\zeropoint\relax + \else + \dontleavehmode\hbox{\vrule\!!depth .12\fontexheight\font\!!width \fontinterwordspace\font\!!height\zeropoint}% + \fi} \def\fakeunderscores{\let\_\fakeunderscore} \def\textunderscores{\let\_\textunderscore} diff --git a/tex/context/base/m-narrowtt.tex b/tex/context/base/m-narrowtt.tex index 6c14c97c5..2e11b99ad 100644 --- a/tex/context/base/m-narrowtt.tex +++ b/tex/context/base/m-narrowtt.tex @@ -31,7 +31,7 @@ \definetypeface [narrowtt] [tt] - [mono] [modern-cond] [default] [encoding=\defaultencoding] + [mono] [modern-condensed] [default] [encoding=\defaultencoding] \definetyping[n\v!typing] \setuptyping[n\v!typing][style=\narrowtt] \definetype [n\v!type] \setuptype [n\v!type] [style=\narrowtt] diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv index c8518dc3a..bda849ed6 100644 --- a/tex/context/base/math-ini.mkiv +++ b/tex/context/base/math-ini.mkiv @@ -350,15 +350,18 @@ \ifdefined\normalsuber\else \def\normalsuber{_} \fi \ifdefined\normalsuper\else \def\normalsuper{^} \fi +\ifdefined\normalaltab\else \def\normalaltab{&} \fi \bgroup \catcode`_=\active \catcode`^=\active + \catcode`&=\active \global \everynonknuthmode {\appendtoks \let_\normalsuber \let^\normalsuper + \let&\normalaltab \to \everymathematics} \egroup @@ -366,19 +369,23 @@ \appendtoks \mathcode`_="8000 \mathcode`^="8000 + \mathcode`&="8000 \catcode`_=\@@other \catcode`^=\@@other + \catcode`&=\@@other \to \everynonknuthmode \appendtoks \catcode`_=\@@subscript \catcode`^=\@@superscript + \catcode`&=\@@alignment \to \everydonknuthmode \appendtoks \startextendcatcodetable\ctxcatcodes \catcode`_=\@@other \catcode`^=\@@other + \catcode`&=\@@other \stopextendcatcodetable \to \everynonknuthmode @@ -386,6 +393,7 @@ \startextendcatcodetable\ctxcatcodes \catcode`_=\@@subscript \catcode`^=\@@superscript + \catcode`&=\@@alignment \stopextendcatcodetable \to \everydonknuthmode @@ -559,6 +567,19 @@ \crampedscriptscriptstyle \fi % 6 -> 7 #1}} +\def\mathstylefont#1% #1 is number (\normalmathstyle) + {\ifcase#1\relax + \textfont \or + \textfont \or + \textfont \or + \textfont \or + \scriptfont \or + \scriptfont \or + \scriptscriptfont \or + \scriptscriptfont \else + \textfont + \fi\zerocount} + %D Something similar can be used in the (re|)|definition %D of \type {\text}. This version is a variation on the one %D in the math module (see \type{m-math} and|/|or \type @@ -578,6 +599,12 @@ %{\hbox{\everymath{#1}\switchtobodyfont [#2]#3}} % 15 sec {\hbox{\everymath{#1}\setcurrentfontbody{#2}#3}} % 3 sec (no math) +%D Safeguard against redefinitions: + +\appendtoks + \let\_\normalunderscore % is textunderscore or fakeunderscore +\to \everymathematics + %D Because we may overload \type {\text} in other (structuring) %D macros, we say: diff --git a/tex/context/base/math-pln.mkiv b/tex/context/base/math-pln.mkiv index 40d73b228..ab584f10a 100644 --- a/tex/context/base/math-pln.mkiv +++ b/tex/context/base/math-pln.mkiv @@ -269,7 +269,7 @@ &\kern-\displaywidth\rlap{$\@lign##$}\tabskip\displaywidth\crcr #1\crcr}} -% temporary here +% temporary here (weird code) % \startcatcodetable \mthcatcodes % \setcatcodetable\ctxcatcodes diff --git a/tex/context/base/meta-ini.mkii b/tex/context/base/meta-ini.mkii index e4fb2e14e..e7c6d218e 100644 --- a/tex/context/base/meta-ini.mkii +++ b/tex/context/base/meta-ini.mkii @@ -715,7 +715,14 @@ \appendtoks \disablediscretionaries \disablecompoundcharacters - \chardef\activecharactermode\zerocount % new, experimental (if complaints than only in enco-ffr.mkii) +\to\everyMPgraphic + +% New, experimental (if complaints than only in enco-ffr.mkii), well +% Mojca complained that it does not work with utf-8 and textext, see +% ** in meta-tex. + +\appendtoks + \chardef\activecharactermode\zerocount \to\everyMPgraphic \appendtoks diff --git a/tex/context/base/meta-tex.mkii b/tex/context/base/meta-tex.mkii index bf733d550..190a694d9 100644 --- a/tex/context/base/meta-tex.mkii +++ b/tex/context/base/meta-tex.mkii @@ -103,12 +103,13 @@ \long\def\doTeXtext[#1]#2#3% {\begingroup + \setnormalcatcodes + \chardef\activecharactermode\plusone % compensates ** in meta-ini.mkii + \endlinechar\minusone + \everyeof\emptytoks + %\def\ascii{#3}\scantokens\expandafter{\ascii}}% \setbox\nextbox\hbox - {\setnormalcatcodes - \endlinechar\minusone - \everyeof\emptytoks - %\def\ascii{#3}\scantokens\expandafter{\ascii}}% - \ifcase\TeXtextcolormode + {\ifcase\TeXtextcolormode \scantokens{\executeifdefined{textext@@#1}\firstofoneargument{#3}}% \else \localcolortrue diff --git a/tex/context/base/mlib-pps.mkiv b/tex/context/base/mlib-pps.mkiv index 72a3c0bb0..0a78a8704 100644 --- a/tex/context/base/mlib-pps.mkiv +++ b/tex/context/base/mlib-pps.mkiv @@ -30,7 +30,8 @@ % have no limitation. Typically an example of a next version solution % due to \LUATEX\ evolving. -\newbox\MPtextbox +\newbox \MPtextbox +\newtoks\everyMPLIBsettext \def\MPLIBfigure#1#2#3#4#5#6#7% todo: move Q q to lua {\setbox\scratchbox\hbox{\externalfigure[#7]}% diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv index af1b2634e..bcf525f78 100644 --- a/tex/context/base/syst-aux.mkiv +++ b/tex/context/base/syst-aux.mkiv @@ -1793,6 +1793,7 @@ \def\getparameters {\dogetparameters\dosetvalue} \def\geteparameters {\dogetparameters\dosetevalue} \def\getgparameters {\dogetparameters\dosetgvalue} +\def\getxparameters {\dogetparameters\dosetxvalue} \def\forgetparameters{\dogetparameters\doignorevalue} \let\getexpandedparameters=\geteparameters diff --git a/tex/context/base/type-otf.mkiv b/tex/context/base/type-otf.mkiv index 05864c2a4..f5d237213 100644 --- a/tex/context/base/type-otf.mkiv +++ b/tex/context/base/type-otf.mkiv @@ -76,7 +76,7 @@ %D any more. Filename changes will be catched in luatex (fallbacks) but not in %D other tex's. - \starttypescript [serif] [modern,latin-modern] + \starttypescript [serif] [modern,latin-modern,computer-modern] \definefontsynonym [LMRoman5-Regular] [\s!file:lmroman5-regular] [\s!features=\s!default] \definefontsynonym [LMRoman6-Regular] [\s!file:lmroman6-regular] [\s!features=\s!default] \definefontsynonym [LMRoman7-Regular] [\s!file:lmroman7-regular] [\s!features=\s!default] @@ -114,7 +114,7 @@ \definefontsynonym [LMRoman10-Unslanted] [\s!file:lmromanunsl10-regular] [\s!features=\s!default] \stoptypescript - \starttypescript [sans] [modern,latin-modern] + \starttypescript [sans] [modern,latin-modern,computer-modern] \definefontsynonym [LMSans8-Regular] [\s!file:lmsans8-regular] [\s!features=\s!default] \definefontsynonym [LMSans9-Regular] [\s!file:lmsans9-regular] [\s!features=\s!default] \definefontsynonym [LMSans10-Regular] [\s!file:lmsans10-regular] [\s!features=\s!default] @@ -137,7 +137,8 @@ \definefontsynonym [LMSansQuotation8-BoldOblique] [\s!file:lmsansquot8-boldoblique] [\s!features=\s!default] \stoptypescript - \starttypescript [mono] [modern,latin-modern,modern-vari,latin-modern-vari,modern-cond,latin-modern-cond] + \starttypescript [mono] [modern,modern-variable,modern-condensed,latin-modern,latin-modern-variable,latin-modern-condensed,computer-modern] + \definefontsynonym [LMTypewriter8-Regular] [\s!file:lmmono8-regular] [\s!features=\s!none] \definefontsynonym [LMTypewriter9-Regular] [\s!file:lmmono9-regular] [\s!features=\s!none] \definefontsynonym [LMTypewriter10-Regular] [\s!file:lmmono10-regular] [\s!features=\s!none] @@ -190,7 +191,7 @@ \loadfontgoodies[lm-math] \stoptypescript - \starttypescript [serif] [modern,computer-modern,latin-modern] [name] + \starttypescript [serif] [modern,latin-modern,computer-modern] [name] \definefontsynonym [Serif] [LMRoman-Regular] \definefontsynonym [SerifBold] [LMRoman-Bold] \definefontsynonym [SerifItalic] [LMRoman-Italic] @@ -201,7 +202,7 @@ \definefontsynonym [SerifCapsSlanted] [LMRoman-CapsOblique] \stoptypescript - \starttypescript [sans] [modern,computer-modern,latin-modern] [name] + \starttypescript [sans] [modern,latin-modern,computer-modern] [name] \definefontsynonym [Sans] [LMSans-Regular] \definefontsynonym [SansBold] [LMSans-Bold] \definefontsynonym [SansItalic] [LMSans-Oblique] @@ -212,7 +213,7 @@ \definefontsynonym [SansCapsSlanted] [LMSans-Oblique] \stoptypescript - \starttypescript [mono] [modern,computer-modern,latin-modern] [name] + \starttypescript [mono] [modern,latin-modern,computer-modern] [name] \definefontsynonym [Mono] [LMTypewriter-Regular] \definefontsynonym [MonoBold] [LMTypewriter-Dark] \definefontsynonym [MonoItalic] [LMTypewriter-Italic] @@ -224,14 +225,14 @@ \definefontsynonym [MonoVariable] [LMTypewriterVarWd-Regular] \stoptypescript - \starttypescript [math] [modern,computer-modern,latin-modern] [name] + \starttypescript [math] [modern,latin-modern,computer-modern] [name] \definefontsynonym [MathRoman] [LMMathRoman-Regular] %definefontsynonym [MathExtension] [LMMathExtension-Regular] %definefontsynonym [MathItalic] [LMMathItalic-Italic] %definefontsynonym [MathSymbol] [LMMathSymbols-Italic] \stoptypescript - \starttypescript [serif] [modern-vari,computer-modern-vari,latin-modern-vari] [name] + \starttypescript [serif] [modern-variable,latin-modern-variable] [name] \definefontsynonym [Serif] [LMTypewriterVarWd-Regular] \definefontsynonym [SerifBold] [LMTypewriterVarWd-Oblique] \definefontsynonym [SerifItalic] [LMTypewriterVarWd-Oblique] @@ -242,7 +243,7 @@ \definefontsynonym [SerifCapsSlanted] [LMTypewriterVarWd-Oblique] \stoptypescript - \starttypescript [mono] [modern-cond,computer-modern-cond,latin-modern-cond,modern-lightcond,computer-modern-lightcond,latin-modern-lightcond] [name] + \starttypescript [mono] [modern-condensed,latin-modern-condensed,modern-light-condensed,latin-modern-light-condensed] [name] \definefontsynonym [Mono] [LMTypewriter-LightCondensed] \definefontsynonym [MonoBold] [LMTypewriter-LightCondensed] \definefontsynonym [MonoItalic] [LMTypewriter-LightCondensedOblique] @@ -253,7 +254,7 @@ \definefontsynonym [MonoCapsSlanted] [LMTypewriter-LightCondensed] \stoptypescript - \starttypescript [mono] [modern-light,computer-modern-light,latin-modern-light] [name] + \starttypescript [mono] [modern-light,latin-modern-light] [name] \definefontsynonym [Mono] [LMTypewriter-Light] \definefontsynonym [MonoBold] [LMTypewriter-Light] \definefontsynonym [MonoItalic] [LMTypewriter-LightOblique] @@ -266,7 +267,7 @@ % Later we will map the real fonts, here we just map synonyms. - \starttypescript [serif] [modern,latin-modern] + \starttypescript [serif] [modern,latin-modern,computer-modern] \definefontsynonym [LMRoman-DemiOblique] [LMRoman10-DemiOblique] \definefontsynonym [LMRoman-Bold] [LMRoman10-Bold] \definefontsynonym [LMRoman-BoldItalic] [LMRoman10-BoldItalic] @@ -278,7 +279,7 @@ \definefontsynonym [LMRoman-Oblique] [LMRoman10-Oblique] \stoptypescript - \starttypescript [sans] [modern,latin-modern] + \starttypescript [sans] [modern,latin-modern,computer-modern] \definefontsynonym [LMSans-Regular] [LMSans10-Regular] \definefontsynonym [LMSans-BoldOblique] [LMSans10-BoldOblique] \definefontsynonym [LMSans-Bold] [LMSans10-Bold] @@ -287,7 +288,7 @@ \definefontsynonym [LMSans-Oblique] [LMSans10-Oblique] \stoptypescript - \starttypescript [mono] [modern,latin-modern,modern-vari,latin-modern-vari,modern-cond,latin-modern-cond] + \starttypescript [mono] [modern,latin-modern,modern-variable,latin-modern-variable,modern-condensed,latin-modern-condensed] \definefontsynonym [LMTypewriter-CapsRegular] [LMTypewriter10-CapsRegular] \definefontsynonym [LMTypewriter-CapsOblique] [LMTypewriter10-CapsOblique] \definefontsynonym [LMTypewriter-Light] [LMTypewriter10-Light] @@ -307,7 +308,7 @@ \definefontsynonym [LMTypewriterVarWd-DarkOblique] [LMTypewriterVarWd10-DarkOblique] \stoptypescript - \starttypescript [serif] [modern,computer-modern,latin-modern] + \starttypescript [serif] [modern,latin-modern,computer-modern] \definefontsynonym [ComputerModern] [LMRoman-Regular] \definefontsynonym [ComputerModern-Italic] [LMRoman-Italic] \definefontsynonym [ComputerModern-Slanted] [LMRoman-Oblique] @@ -318,30 +319,42 @@ \definefontsynonym [ComputerModern-CapsSlanted] [LMRoman-CapsOblique] \stoptypescript - \starttypescript [sans] [modern,computer-modern,latin-modern] + \starttypescript [sans] [modern,latin-modern,computer-modern] \definefontsynonym [ComputerModernSans] [LMSans-Regular] \definefontsynonym [ComputerModernSans-Italic] [LMSans-Oblique] \definefontsynonym [ComputerModernSans-Slanted] [LMSans-Oblique] \definefontsynonym [ComputerModernSans-Bold] [LMSans-Bold] \definefontsynonym [ComputerModernSans-BoldItalic] [LMSans-BoldOblique] \definefontsynonym [ComputerModernSans-BoldSlanted] [LMSans-BoldOblique] - \definefontsynonym [ComputerModernSans-Caps] [LMSans-Regular] % [LMSans-CapsRegular] - \definefontsynonym [ComputerModernSans-CapsSlanted] [LMSans-Oblique] % [LMSans-CapsOblique] + \definefontsynonym [ComputerModernSans-Caps] [LMSans-Regular]% [LMSans-CapsRegular] + \definefontsynonym [ComputerModernSans-CapsSlanted] [LMSans-Oblique]% [LMSans-CapsOblique] \stoptypescript - \starttypescript [mono] [modern,computer-modern,latin-modern] + \starttypescript [mono] [modern,latin-modern,computer-modern] \definefontsynonym [ComputerModernMono] [LMTypewriter-Regular] \definefontsynonym [ComputerModernMono-Italic] [LMTypewriter-Italic] \definefontsynonym [ComputerModernMono-Slanted] [LMTypewriter-Oblique] \definefontsynonym [ComputerModernMono-Bold] [LMTypewriter-Dark] - \definefontsynonym [ComputerModernMono-BoldItalic] [LMTypewriter-DarkOblique] % ! + \definefontsynonym [ComputerModernMono-BoldItalic] [LMTypewriter-DarkOblique] \definefontsynonym [ComputerModernMono-BoldSlanted] [LMTypewriter-DarkOblique] \definefontsynonym [ComputerModernMono-Caps] [LMTypewriter-CapsRegular] \definefontsynonym [ComputerModernMono-CapsSlanted] [LMTypewriter-CapsOblique] \definefontsynonym [ComputerModernMono-Variable] [LMTypewriterVarWd-Regular] \stoptypescript - \starttypescript [serif] [modern-vari,computer-modern-vari,latin-modern-vari] + \starttypescript [mono] [modern-light,latin-modern-light] + \definefontsynonym [ComputerModernMono] [LMTypewriter-Light] + \definefontsynonym [ComputerModernMono-Italic] [LMTypewriter-LightOblique] + \definefontsynonym [ComputerModernMono-Slanted] [LMTypewriter-LightOblique] + \definefontsynonym [ComputerModernMono-Bold] [LMTypewriter-Dark] + \definefontsynonym [ComputerModernMono-BoldItalic] [LMTypewriter-DarkOblique] + \definefontsynonym [ComputerModernMono-BoldSlanted] [LMTypewriter-DarkOblique] + \definefontsynonym [ComputerModernMono-Caps] [LMTypewriter-Light] + \definefontsynonym [ComputerModernMono-CapsSlanted] [LMTypewriter-LightOblique] + \definefontsynonym [ComputerModernMono-Variable] [LMTypewriterVarWd-Light] + \stoptypescript + + \starttypescript [serif] [modern-variable,latin-modern-variable] \definefontsynonym [ComputerModernVariable] [LMTypewriterVarWd-Regular] \definefontsynonym [ComputerModernVariable-Italic] [LMTypewriterVarWd-Oblique] \definefontsynonym [ComputerModernVariable-Slanted] [LMTypewriterVarWd-Oblique] @@ -352,7 +365,19 @@ \definefontsynonym [ComputerModernVariable-CapsSlanted] [LMTypewriterVarWd-Oblique] \stoptypescript + \starttypescript [serif] [modern-variable-light,latin-modern-variable-light] + \definefontsynonym [ComputerModernVariable] [LMTypewriterVarWd-Light] + \definefontsynonym [ComputerModernVariable-Italic] [LMTypewriterVarWd-LightOblique] + \definefontsynonym [ComputerModernVariable-Slanted] [LMTypewriterVarWd-LightOblique] + \definefontsynonym [ComputerModernVariable-Bold] [LMTypewriterVarWd-Dark] + \definefontsynonym [ComputerModernVariable-BoldItalic] [LMTypewriterVarWd-DarkOblique] + \definefontsynonym [ComputerModernVariable-BoldSlanted] [LMTypewriterVarWd-DarkOblique] + \definefontsynonym [ComputerModernVariable-Caps] [LMTypewriterVarWd-Light] + \definefontsynonym [ComputerModernVariable-CapsSlanted] [LMTypewriterVarWd-LightOblique] + \stoptypescript + \starttypescript [math] [modern,latin-modern] + % isn't this obsolete now? \definefontsynonym [LMMathRoman-Regular] [LMMathRoman10-Regular] \definefontsynonym [LMMathRoman-Bold] [LMMathRoman10-Bold] %definefontsynonym [LMMathSymbols-BoldItalic] [LMMathSymbols10-BoldItalic] @@ -378,11 +403,33 @@ \quittypescriptscanning \stoptypescript - \starttypescript [modernvariable] - \definetypeface [modernvariable] [rm] [serif] [simple] [default] - \definetypeface [modernvariable] [ss] [sans] [modern] [default] - \definetypeface [modernvariable] [tt] [mono] [modern] [default] - \definetypeface [modernvariable] [mm] [math] [modern] [default] + \starttypescript [modernvariable,modern-variable] + \definetypeface [modernvariable] [rm] [serif] [modern-variable] [default] + \definetypeface [modernvariable] [tt] [mono] [modern-variable] [default] + \definetypeface [modernvariable] [mm] [math] [modern] [default] + \quittypescriptscanning + \stoptypescript + + \starttypescript [modernvariablelight,modern-variable-light] + \definetypeface [modernvariable] [rm] [serif] [modern-variable-light] [default] + \definetypeface [modernvariable] [tt] [mono] [modern-variable-light] [default] + \definetypeface [modernvariable] [mm] [math] [modern] [default] + \quittypescriptscanning + \stoptypescript + + \starttypescript [modern-mono] + \definetypeface [modern] [rm] [serif] [modern] [computer-modern] + \definetypeface [modern] [ss] [sans] [modern] [computer-modern] + \definetypeface [modern] [tt] [mono] [modern-light] [computer-modern] + \definetypeface [modern] [mm] [math] [modern] [computer-modern] + \quittypescriptscanning + \stoptypescript + + \starttypescript [modern-base-mono] + \definetypeface [modern] [rm] [serif] [modern] [computer-modern] [default] + \definetypeface [modern] [ss] [sans] [modern] [computer-modern] [default] + \definetypeface [modern] [tt] [mono] [modern-light] [computer-modern] [default] + \definetypeface [modern] [mm] [math] [modern] [computer-modern] [default] \quittypescriptscanning \stoptypescript diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index 32b2fb9e0..b765a7cf6 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 05/13/10 23:36:33 +-- merge date : 05/14/10 15:26:38 do -- begin closure to overcome local limits and interference -- cgit v1.2.3