From 924914d6830838e5b8191c6996c66fbfe50cd70d Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 8 May 2020 21:09:12 +0200 Subject: 2020-05-08 20:49:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkii/mult-pe.mkii | 3 ++ tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/context.mkxl | 2 +- tex/context/base/mkiv/font-con.lua | 3 ++ tex/context/base/mkiv/math-act.lua | 6 ++- tex/context/base/mkiv/math-dim.lua | 1 + tex/context/base/mkiv/math-ini.mkiv | 4 +- tex/context/base/mkiv/math-ini.mkxl | 53 +++++++-------------- tex/context/base/mkiv/mult-prm.lua | 2 + tex/context/base/mkiv/status-files.pdf | Bin 27779 -> 27803 bytes tex/context/base/mkiv/status-lua.pdf | Bin 251584 -> 251593 bytes tex/context/interface/mkii/keys-pe.xml | 3 ++ tex/generic/context/luatex/luatex-fonts-merged.lua | 5 +- 16 files changed, 44 insertions(+), 46 deletions(-) (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 81679f527..39423bd25 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2020.05.08 13:24} +\newcontextversion{2020.05.08 20:46} %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/mkii/context.mkii b/tex/context/base/mkii/context.mkii index c9ff11ec2..9dd4c03e5 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2020.05.08 13:24} +\edef\contextversion{2020.05.08 20:46} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii index b9d71fe33..119b1f58d 100644 --- a/tex/context/base/mkii/mult-pe.mkii +++ b/tex/context/base/mkii/mult-pe.mkii @@ -907,7 +907,10 @@ \setinterfaceconstant{keys}{keys} \setinterfaceconstant{keyword}{کلید‌واژه} \setinterfaceconstant{label}{برچسب} +\setinterfaceconstant{labelalternative}{labelalternative} +\setinterfaceconstant{labelcolor}{labelcolor} \setinterfaceconstant{labeloffset}{labeloffset} +\setinterfaceconstant{labelstyle}{labelstyle} \setinterfaceconstant{language}{language} \setinterfaceconstant{last}{last} \setinterfaceconstant{lastnamesep}{lastnamesep} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 607e8e377..01f0e472f 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2020.05.08 13:24} +\newcontextversion{2020.05.08 20:46} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 915b59644..af6b5780d 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.05.08 13:24} +\edef\contextversion{2020.05.08 20:46} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index edb888fe6..f79fc0980 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2020.05.08 13:24} +\edef\contextversion{2020.05.08 20:46} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/font-con.lua b/tex/context/base/mkiv/font-con.lua index 04c42061e..6f4abe111 100644 --- a/tex/context/base/mkiv/font-con.lua +++ b/tex/context/base/mkiv/font-con.lua @@ -191,6 +191,9 @@ function constructors.assignmathparameters(target,original) -- simple variant, n if not mathparameters.FractionDelimiterDisplayStyleSize then targetmathparameters.FractionDelimiterDisplayStyleSize = 2.40 * targetparameters.size end + if not targetmathparameters.SpaceBeforeScript then + targetmathparameters.SpaceBeforeScript = targetmathparameters.SpaceAfterScript + end target.mathparameters = targetmathparameters end end diff --git a/tex/context/base/mkiv/math-act.lua b/tex/context/base/mkiv/math-act.lua index 1f0140960..03f44dd1c 100644 --- a/tex/context/base/mkiv/math-act.lua +++ b/tex/context/base/mkiv/math-act.lua @@ -55,7 +55,11 @@ end function mathematics.initializeparameters(target,original) local mathparameters = original.mathparameters if mathparameters and next(mathparameters) then - target.mathparameters = mathematics.dimensions(mathparameters) + mathparameters = mathematics.dimensions(mathparameters) + if not mathparameters.SpaceBeforeScript then + mathparameters.SpaceBeforeScript = mathparameters.SpaceAfterScript + end + target.mathparameters = mathparameters end end diff --git a/tex/context/base/mkiv/math-dim.lua b/tex/context/base/mkiv/math-dim.lua index eb7adb53f..06b4bbd97 100644 --- a/tex/context/base/mkiv/math-dim.lua +++ b/tex/context/base/mkiv/math-dim.lua @@ -62,6 +62,7 @@ local defaults = { radical_vgap = { default = { "RadicalVerticalGap", "default_rule_thickness+(abs(default_rule_thickness)/4)" }, display_style = { "RadicalDisplayStyleVerticalGap", "default_rule_thickness+(abs(math_x_height)/4)" }, }, space_after_script = { default = { "SpaceAfterScript", "script_space" }, }, + space_before_script = { default = { "SpaceAfterScript", "script_space" }, }, stack_denom_down = { default = { "StackBottomShiftDown", "denom2" }, cramped_display_style = { "StackBottomDisplayStyleShiftDown", "denom1" }, display_style = { "StackBottomDisplayStyleShiftDown", "denom1" }, }, diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv index bea13ce0d..5b3b0e41e 100644 --- a/tex/context/base/mkiv/math-ini.mkiv +++ b/tex/context/base/mkiv/math-ini.mkiv @@ -1982,7 +1982,7 @@ \scriptscriptfont \else \textfont \fi - \zeropoint} + \zerocount} \def\mathemwidth {\fontdimen @@ -1998,7 +1998,7 @@ \scriptscriptfont \else \textfont \fi - \zeropoint} + \zerocount} %D A plain inheritance: diff --git a/tex/context/base/mkiv/math-ini.mkxl b/tex/context/base/mkiv/math-ini.mkxl index 2298fc6ea..92fea4ce1 100644 --- a/tex/context/base/mkiv/math-ini.mkxl +++ b/tex/context/base/mkiv/math-ini.mkxl @@ -1957,37 +1957,8 @@ %D Some dimension fun: -\def\mathexheight - {\fontdimen - \plusfive - \ifcase\numexpr\normalmathstyle\relax - \textfont \or % 0 - \textfont \or % 1 - \textfont \or % 2 - \textfont \or % 3 - \scriptfont \or % 4 - \scriptfont \or % 5 - \scriptscriptfont \or % 6 - \scriptscriptfont \else - \textfont - \fi - \zeropoint} - -\def\mathemwidth - {\fontdimen - \plussix - \ifcase\numexpr\normalmathstyle\relax - \textfont \or % 0 - \textfont \or % 1 - \textfont \or % 2 - \textfont \or % 3 - \scriptfont \or % 4 - \scriptfont \or % 5 - \scriptscriptfont \or % 6 - \scriptscriptfont \else - \textfont - \fi - \zeropoint} +\let\mathexheight \exheight % also in math-ini.mkiv +\def\mathemwidth {\Umathquad\normalmathstyle} % also in math-ini.mkiv %D A plain inheritance: @@ -2941,7 +2912,7 @@ %D $\mathopenupparameter\Umathradicalvgap{10.5}\sqrt[3]{x}$ %D \stoptyping -\def\math_openup_parameter#1#2% +\unexpanded\def\mathopenupparameter#1#2% {\ifcase\Umathparameter#1\displaystyle \or\frozen#1\displaystyle #2#1\displaystyle \fi \ifcase\Umathparameter#1\crampeddisplaystyle \or\frozen#1\crampeddisplaystyle #2#1\crampeddisplaystyle \fi \ifcase\Umathparameter#1\textstyle \or\frozen#1\textstyle #2#1\textstyle \fi @@ -2951,11 +2922,6 @@ \ifcase\Umathparameter#1\scriptscriptstyle \or\frozen#1\scriptscriptstyle #2#1\scriptscriptstyle \fi \ifcase\Umathparameter#1\crampedscriptscriptstyle\or\frozen#1\crampedscriptscriptstyle#2#1\crampedscriptscriptstyle\fi} -\unexpanded\def\mathopenupparameter#1#2% - {\ifdim#2\points=\zeropoint\else - \math_openup_parameter#1{#2}% - \fi} - %D New stuff: %D %D \startbuffer @@ -2980,6 +2946,19 @@ \unexpanded\def\tomathclose{\Umathclass\plusfive } % \mathsuffix \unexpanded\def\tomathpunct{\Umathclass\plussix } +%D Prescripts. These work in \CONTEXT\ because we have the super- and subscript +%D triggers enabled as active characters but when we would have +%D +%D \starttyping +%D \catcode\underscoreasciicode\subscriptcatcode +%D \catcode\circumflexasciicode\superscriptcatcode +%D \stoptyping +%D +%D we also need the next line to disable character escaping via \type {^} in +%D math mode: + +\normalsupmarkmode\plusone % 2 also disable ^[^+] in text mode + \protect \endinput % % not used (yet) diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index 0d2475d93..bd772bbe8 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -187,6 +187,7 @@ return { "Umathskewedfractionhgap", "Umathskewedfractionvgap", "Umathspaceafterscript", + "Umathspacebeforescript", "Umathspacingmode", "Umathstackdenomdown", "Umathstacknumup", @@ -379,6 +380,7 @@ return { "scantextokens", "setfontid", "shapemode", + "supmarkmode", "textdirection", "toksapp", "tokspre", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 220f51ac1..36d0aefae 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index 526fde211..75a0e6ac8 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml index 9f18d633d..98340b1d0 100644 --- a/tex/context/interface/mkii/keys-pe.xml +++ b/tex/context/interface/mkii/keys-pe.xml @@ -913,7 +913,10 @@ + + + diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 80083a5ab..ee6621f44 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 2020-05-08 13:24 +-- merge date : 2020-05-08 20:46 do -- begin closure to overcome local limits and interference @@ -8916,6 +8916,9 @@ function constructors.assignmathparameters(target,original) if not mathparameters.FractionDelimiterDisplayStyleSize then targetmathparameters.FractionDelimiterDisplayStyleSize=2.40*targetparameters.size end + if not targetmathparameters.SpaceBeforeScript then + targetmathparameters.SpaceBeforeScript=targetmathparameters.SpaceAfterScript + end target.mathparameters=targetmathparameters end end -- cgit v1.2.3