From 3e2ebbeec9a05ccd43d56108aa16ed48b432709c Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 20 Oct 2011 13:40:15 +0300 Subject: beta 2011.10.20 12:24 --- tex/context/base/char-def.lua | 6 +++++- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4112 -> 4108 bytes tex/context/base/context-version.png | Bin 105750 -> 105689 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/math-ini.lua | 3 ++- tex/context/base/math-pln.mkiv | 12 ++++++++++++ tex/context/base/status-files.pdf | Bin 24113 -> 24088 bytes tex/context/base/status-lua.pdf | Bin 163916 -> 163916 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 24 insertions(+), 7 deletions(-) diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua index 97d48c316..ec9a7b134 100644 --- a/tex/context/base/char-def.lua +++ b/tex/context/base/char-def.lua @@ -56717,6 +56717,8 @@ characters.data={ description="DOUBLE PRIME", direction="et", linebreak="po", + mathclass="nothing", + mathname="doubleprime", specials={ "compat", 0x2032, 0x2032 }, unicodeslot=0x2033, }, @@ -56725,6 +56727,8 @@ characters.data={ description="TRIPLE PRIME", direction="et", linebreak="po", + mathclass="nothing", + mathname="tripleprime", specials={ "compat", 0x2032, 0x2032, 0x2032 }, unicodeslot=0x2034, }, @@ -187423,4 +187427,4 @@ characters.data={ linebreak="cm", unicodeslot=0xE01EF, }, -} \ No newline at end of file +} diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 9ac76e424..7acf1051a 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{2011.10.20 11:44} +\newcontextversion{2011.10.20 12:24} %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 438df663c..63e2e56b1 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{2011.10.20 11:44} +\newcontextversion{2011.10.20 12:24} %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-version.pdf b/tex/context/base/context-version.pdf index 86bb8863b..33f27ab90 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 6463ff5a7..8a165ab0f 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 03e9469dd..547eb59d6 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{2011.10.20 11:44} +\edef\contextversion{2011.10.20 12:24} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index d5e4549ec..b37330032 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.20 11:44} +\edef\contextversion{2011.10.20 12:24} %D For those who want to use this: diff --git a/tex/context/base/math-ini.lua b/tex/context/base/math-ini.lua index 9d63cff5b..cb1a72926 100644 --- a/tex/context/base/math-ini.lua +++ b/tex/context/base/math-ini.lua @@ -168,7 +168,8 @@ if setmathcode then contextsprint(format([[\unexpanded\gdef\%s{\Uradical "%X "%X }]],name,family,slot)) else -- beware, open/close and other specials should not end up here - contextsprint(format([[\unexpanded\gdef\%s{\Umathchar "%X "%X "%X }]],name,class,family,slot)) +-- contextsprint(format([[\unexpanded\gdef\%s{\Umathchar "%X "%X "%X }]],name,class,family,slot)) + contextsprint(format([[\Umathchardef\%s "%X "%X "%X ]],name,class,family,slot)) end end diff --git a/tex/context/base/math-pln.mkiv b/tex/context/base/math-pln.mkiv index 295c58d48..cdbc400a1 100644 --- a/tex/context/base/math-pln.mkiv +++ b/tex/context/base/math-pln.mkiv @@ -106,8 +106,20 @@ % collapsing to 0x2033 and 0x2034 happens elsewhere +\ifdefined \prime \else + \Umathchardef\prime "0 "0 "2032 +\fi + \let\normalprime\prime +% The \let\prime\domathprime might become an obsolete as we have \doubleprime and \tripleprime +% and collapsing can nicely handle the script then + +\appendtoks + \let\normalprime\prime % gets defined later + \let\prime\domathprime % so this is needed +\to \everydump + \unexpanded\def\domathprime {\iffontchar\textfont\zerocount"FE325\relax ^\bgroup\expandafter\dodomathprime % virtual mess (using funny signal) diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index f73987ff8..5db5f3b9f 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 1022b300b..fbfb62e2d 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 1a110f706..4fc509cd6 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 : 10/20/11 11:44:39 +-- merge date : 10/20/11 12:24:42 do -- begin closure to overcome local limits and interference -- cgit v1.2.3