From 250316e74df7a2fe9544318ed39fd2f6621e8dbb Mon Sep 17 00:00:00 2001 From: Marius Date: Wed, 2 Jan 2013 19:40:16 +0200 Subject: beta 2013.01.02 18:19 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4141 -> 4137 bytes tex/context/base/context-version.png | Bin 39746 -> 39751 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/math-ini.mkiv | 38 +++++++++++++++++++++ tex/context/base/mult-low.lua | 4 ++- tex/context/base/status-files.pdf | Bin 24705 -> 24711 bytes tex/context/base/status-lua.pdf | Bin 208436 -> 208419 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 46 insertions(+), 6 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 715248cf8..1c7abf47e 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2013.01.02 17:15} +\newcontextversion{2013.01.02 18:19} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 7ba158ebe..612d225e2 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2013.01.02 17:15} +\newcontextversion{2013.01.02 18:19} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 2f9457faa..db3542344 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 1096ae7fe..db1256efe 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 5b0a96ea7..f052759f8 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2013.01.02 17:15} +\edef\contextversion{2013.01.02 18:19} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 381f0e07b..8b3bed1c1 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.01.02 17:15} +\edef\contextversion{2013.01.02 18:19} %D For those who want to use this: diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv index 58650595f..a1f747a79 100644 --- a/tex/context/base/math-ini.mkiv +++ b/tex/context/base/math-ini.mkiv @@ -1069,6 +1069,19 @@ \textfont \fi\zerocount} % hm, can ie other value as well +\def\mathsmallstylefont#1% #1 is number (\normalmathstyle) + {\ifcase#1\relax + \scriptfont \or + \scriptfont \or + \scriptfont \or + \scriptfont \or + \scriptscriptfont \or + \scriptscriptfont \or + \scriptscriptfont \or + \scriptscriptfont \else + \scriptfont + \fi\zerocount} % hm, can ie other value as well + \def\mathstyleface#1% #1 is number (\normalmathstyle) {\ifcase#1 \textface \or @@ -1082,6 +1095,19 @@ \textface \fi} +\def\mathsmallstyleface#1% #1 is number (\normalmathstyle) + {\ifcase#1 + \scriptface \or + \scriptface \or + \scriptface \or + \scriptface \or + \scriptscriptface \or + \scriptscriptface \or + \scriptscriptface \or + \scriptscriptface \else + \scriptface + \fi} + \def\mathstylecommand#1#2#3% {\ifcase\normalmathstyle \expandafter#1\or @@ -1131,6 +1157,18 @@ {\normalexpanded{\vcenter\bgroup\vbox\bgroup $\triggermathstyle\normalmathstyle}\mathsurround\zeropoint#1$\egroup\egroup} +\unexpanded\def\setmathsmalltextbox#1#2#% + {\normalizebodyfontsize\m_math_text_choice_face{\mathsmallstyleface\normalmathstyle}% + \setbox#1#2\bgroup + \font_basics_switchtobodyfont\m_math_text_choice_face + \let\next} + +\unexpanded\def\setmathtextbox#1#2#% + {\normalizebodyfontsize\m_math_text_choice_face{\mathstyleface\normalmathstyle}% + \setbox#1#2\bgroup + \font_basics_switchtobodyfont\m_math_text_choice_face + \let\next} + %D Something similar can be used in the (re|)|definition of \type {\text}. This %D version is a variation on the one in the math module (see \type{m-math} and|/|or %D \type {m-newmat}). diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua index 287e2c9c1..921a3062d 100644 --- a/tex/context/base/mult-low.lua +++ b/tex/context/base/mult-low.lua @@ -312,7 +312,9 @@ return { "startimath", "stopimath", "normalstartimath", "normalstopimath", "startdmath", "stopdmath", "normalstartdmath", "normalstopdmath", -- - "uncramped", "cramped", "triggermathstyle", "mathstylefont", "mathstyleface", "mathstylecommand", + "uncramped", "cramped", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette", + "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox", + "mathtext", "setmathsmalltextbox", "setmathtextbox", -- "luaexpr", "expdoifelse", "expdoif", "expdoifnot", "expdoifcommonelse", "expdoifinsetelse", -- diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 1b49714f1..7f3f8b150 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 8f3f83604..f59856803 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 37f88cce1..000b7fae9 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 01/02/13 17:15:54 +-- merge date : 01/02/13 18:19:13 do -- begin closure to overcome local limits and interference -- cgit v1.2.3