From ae375264381ae74f70415b2351bdbf209248e1af Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 5 Dec 2016 15:15:35 +0100 Subject: 2016-12-05 14:50:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/char-def.lua | 40 ++++++++++++- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/math-fen.mkiv | 23 ++++++++ tex/context/base/mkiv/status-files.pdf | Bin 25618 -> 25603 bytes tex/context/base/mkiv/status-lua.pdf | Bin 368575 -> 368575 bytes tex/context/fonts/mkiv/type-imp-stix.mkiv | 64 +++++++++++++++++++++ tex/context/interface/mkiv/i-context.pdf | Bin 803574 -> 803714 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60766 -> 60767 bytes tex/context/modules/mkiv/x-mathml.mkiv | 6 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 13 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 tex/context/fonts/mkiv/type-imp-stix.mkiv (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index aadba04f8..a439529d3 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{2016.12.02 10:13} +\newcontextversion{2016.12.05 14:44} %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 6a800c93c..14b60ec69 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{2016.12.02 10:13} +\edef\contextversion{2016.12.05 14:44} %D For those who want to use this: diff --git a/tex/context/base/mkiv/char-def.lua b/tex/context/base/mkiv/char-def.lua index 72c868105..6a1b04e01 100644 --- a/tex/context/base/mkiv/char-def.lua +++ b/tex/context/base/mkiv/char-def.lua @@ -78926,16 +78926,54 @@ characters.data={ description="LEFT BLACK TORTOISE SHELL BRACKET", direction="on", linebreak="op", + mathspec={ + { + class="open", + name="linterval", + }, + { + class="close", + name="rointerval", + }, + { + class="open", + name="rlointerval", + }, + { + class="close", + name="rlointerval", + }, + }, mirror=0x2998, unicodeslot=0x2997, + textclass="open", }, [0x2998]={ category="pe", description="RIGHT BLACK TORTOISE SHELL BRACKET", direction="on", linebreak="cl", + mathspec={ + { + class="close", + name="rinterval", + }, + { + class="open", + name="lointerval", + }, + { + class="open", + name="lrointerval", + }, + { + class="close", + name="rrointerval", + }, + }, mirror=0x2997, unicodeslot=0x2998, + textclass="close", }, [0x2999]={ category="sm", @@ -238342,4 +238380,4 @@ characters.data={ linebreak="cm", unicodeslot=0xE007F, }, -} \ No newline at end of file +} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 6b1defa95..5751a60da 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.12.02 10:13} +\newcontextversion{2016.12.05 14:44} %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 554d63830..b338d3c43 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.12.02 10:13} +\edef\contextversion{2016.12.05 14:44} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/math-fen.mkiv b/tex/context/base/mkiv/math-fen.mkiv index 3dfaa7f33..c26827cf1 100644 --- a/tex/context/base/mkiv/math-fen.mkiv +++ b/tex/context/base/mkiv/math-fen.mkiv @@ -223,6 +223,21 @@ \unexpanded\def\Lopenbracketmirrored {\math_fenced_fenced_stop {mirroredopenbracket}} \unexpanded\def\Ropenbracketmirrored {\math_fenced_fenced_start{mirroredopenbracket}} \unexpanded\def\Lnothingmirrored {\math_fenced_fenced_stop {mirrorednothing}} \unexpanded\def\Rnothingmirrored {\math_fenced_fenced_start{mirrorednothing}} +\definemathfence [interval] [\c!left="2997,\c!right="2998] +\definemathfence [openinterval] [interval] [\c!left="2998,\c!right="2998] +\definemathfence [leftopeninterval] [interval] [\c!left="2997,\c!right="2997] +\definemathfence [rightopeninterval] [interval] [\c!left="2998,\c!right="2998] + +\unexpanded\def\Linterval {\math_fenced_fenced_start{interval}} +\unexpanded\def\Lointerval {\math_fenced_fenced_start{openinterval}} +\unexpanded\def\Llointerval {\math_fenced_fenced_start{leftopeninterval}} +\unexpanded\def\Lrointerval {\math_fenced_fenced_start{rightopeninterval}} + +\unexpanded\def\Rinterval {\math_fenced_fenced_stop {interval}} +\unexpanded\def\Rointerval {\math_fenced_fenced_stop {openinterval}} +\unexpanded\def\Rlointerval {\math_fenced_fenced_stop {leftopeninterval}} +\unexpanded\def\Rrointerval {\math_fenced_fenced_stop {rightopeninterval}} + % \startformula % \left{ \frac{1}{a} \right} % \left[ \frac{1}{b} \right] @@ -392,6 +407,8 @@ % \installmathfencepair { \Lbrace } \Rbrace % \installmathfencepair } \Rbracemirrored { \Lbracemirrored +\installmathfencepair ⦗ \Linterv ⦘ \Rinterv + \appendtoks \ignorediscretionaries % so $\mtext{a|b}$ works, this is ok because it's an \hbox \to \everymathematics @@ -440,6 +457,12 @@ \installmathfencepair \llbracket \Lopenbracket \rrbracket \Ropenbracket \installmathfencepair \lgroup \Lgroup \rgroup \Rgroup +\installmathfencepair \linterval \Linterval \rinterval \Rinterval +%installmathfencepair \linterv \Linterval \rinterv \Rinterval +\installmathfencepair \lointerval \Linterval \rointerval \Rinterval +\installmathfencepair \llointerval \Llointerval \rlointerval \Rlointerval +\installmathfencepair \lrointerval \Lrointerval \rrointerval \Rrointerval + \let\textlbar\lbar \let\mathlbar\Lbar \let\textrbar\lbar \let\mathrbar\Rbar diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index e53b08be3..8f0dca563 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 ecc21a8c9..79290af72 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/fonts/mkiv/type-imp-stix.mkiv b/tex/context/fonts/mkiv/type-imp-stix.mkiv new file mode 100644 index 000000000..697037b43 --- /dev/null +++ b/tex/context/fonts/mkiv/type-imp-stix.mkiv @@ -0,0 +1,64 @@ +%D \module +%D [ file=type-otf, +%D version=2007.07.30, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Stix, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D We provide typescripts for version one and two of the stix fonts. There is a +%D xits variant based on the first (not opentype) release that also provides +%D bidirectional math. + +\definefontfeature + [stixtwomath] + [ss02=yes] % otherwise weird (non italic) g + +\starttypescriptcollection[stix] + + % version one + + \starttypescript [\s!math] [stix] [\s!name] + \definefontsynonym[MathRoman][\s!file:stixmath-regular.otf] [\s!features={\s!math\mathsizesuffix,mathextra}] + \stoptypescript + + \starttypescript [\s!serif] [stix] [\s!name] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym[\s!Serif] [\s!file:stix-regular.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBold] [\s!file:stix-bold.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifItalic] [\s!file:stix-italic.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBoldItalic][\s!file:stix-bolditalic.otf][\s!features=\s!default] + \stoptypescript + + \starttypescript[stix] + \definetypeface [stix] [\s!rm] [\s!serif] [stix] [\s!default] + \definetypeface [stix] [\s!mm] [\s!math] [stix] [\s!default] + \stoptypescript + + % version two + + \starttypescript [\s!math] [stixtwo] [\s!name] + \definefontsynonym[MathRoman][\s!file:stix2math.otf] [\s!features={\s!math\mathsizesuffix,stixtwomath,mathextra},\s!goodies=stix-two-math] + \stoptypescript + + \starttypescript [\s!serif] [stixtwo] [\s!name] + \setups[\s!font:\s!fallback:\s!serif] + \definefontsynonym[\s!Serif] [\s!file:stix2text-regular.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBold] [\s!file:stix2text-bold.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifItalic] [\s!file:stix2text-italic.otf] [\s!features=\s!default] + \definefontsynonym[\s!SerifBoldItalic][\s!file:stix2text-bolditalic.otf][\s!features=\s!default] + \stoptypescript + + \starttypescript[stixtwo] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [stixtwo] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!serif] [stixtwo] [\s!default] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.895] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [stixtwo] [\s!default] + \stoptypescript + +\stoptypescriptcollection diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index f915404b9..e3dd2d9ed 100644 Binary files a/tex/context/interface/mkiv/i-context.pdf and b/tex/context/interface/mkiv/i-context.pdf differ diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index d67885e35..4d81dd35b 100644 Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ diff --git a/tex/context/modules/mkiv/x-mathml.mkiv b/tex/context/modules/mkiv/x-mathml.mkiv index 5a9c4fdd2..7ed1b4322 100644 --- a/tex/context/modules/mkiv/x-mathml.mkiv +++ b/tex/context/modules/mkiv/x-mathml.mkiv @@ -2036,7 +2036,11 @@ \expanded{\doifelseinset {mml:enclose:radical} {\mmlmenclosenotation}} { \sqrt{\xmlflush{#1}} } { - \xmlflush{#1} + \expanded{\doifelseinset {mml:enclose:rule} {\mmlmenclosenotation}} { + \overline{\strut\xmlflush{#1}} + } { + \xmlflush{#1} + } } } } diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f6060cfce..9ce686896 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 : 12/02/16 10:13:47 +-- merge date : 12/05/16 14:44:50 do -- begin closure to overcome local limits and interference -- cgit v1.2.3