From ee1c809d23ce322e7946f941545f7e0fa27ae5c6 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Wed, 7 Oct 2015 14:15:06 +0200 Subject: 2015-10-07 12:05:00 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4190 -> 4182 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/math-noa.lua | 2 ++ tex/context/base/math-stc.mkvi | 2 +- tex/context/base/node-ini.lua | 11 +++++++++++ tex/context/base/status-files.pdf | Bin 24390 -> 24398 bytes tex/context/base/status-lua.pdf | Bin 255896 -> 256085 bytes tex/context/base/syst-ini.mkiv | 3 +-- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 18 insertions(+), 6 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 85019650e..9d763b448 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{2015.10.06 12:49} +\newcontextversion{2015.10.07 12:03} %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 9c67c56ea..4968bcbbe 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.mkiv b/tex/context/base/context.mkiv index f529eec31..0fcb7ba97 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.10.06 12:49} +\edef\contextversion{2015.10.07 12:03} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/math-noa.lua b/tex/context/base/math-noa.lua index cf4db6f02..39c56c59f 100644 --- a/tex/context/base/math-noa.lua +++ b/tex/context/base/math-noa.lua @@ -27,6 +27,8 @@ if not modules then modules = { } end modules ['math-noa'] = { -- todo: most is math_char so we can have simple dedicated loops +-- nota bene: uunderdelimiter uoverdelimiter etc are radicals (we have 5 types) + local utfchar, utfbyte = utf.char, utf.byte local formatters = string.formatters local sortedhash = table.sortedhash diff --git a/tex/context/base/math-stc.mkvi b/tex/context/base/math-stc.mkvi index 80d698c77..164508f05 100644 --- a/tex/context/base/math-stc.mkvi +++ b/tex/context/base/math-stc.mkvi @@ -1288,8 +1288,8 @@ % \limits\normalsuperscript{\box0}\normalsubscript{\box2}}% % $\Uoverdelimiter \defaultmathfamily "2194 {xxxx}$ -% $\Udelimiterover \defaultmathfamily "2194 {xxxx}$ % $\Uunderdelimiter\defaultmathfamily "2194 {xxxx}$ +% $\Udelimiterover \defaultmathfamily "2194 {xxxx}$ % $\Udelimiterunder\defaultmathfamily "2194 {xxxx}$ % $\Udelimiterover \defaultmathfamily "219A {\Udelimiterunder \defaultmathfamily "219B {xxxx}}$ diff --git a/tex/context/base/node-ini.lua b/tex/context/base/node-ini.lua index 02d4c7a3f..87d97c648 100644 --- a/tex/context/base/node-ini.lua +++ b/tex/context/base/node-ini.lua @@ -108,6 +108,16 @@ local noadcodes = allocate { -- simple nodes [12] = "vcenter", } +local radicalcodes = allocate { + [0] = "radical", + [1] = "uradical", + [2] = "uroot", + [3] = "uunderdelimiter", + [4] = "uoverdelimiter", + [5] = "udelimiterunder", + [6] = "udelimiterover", +} + local listcodes = allocate { [ 0] = "unknown", [ 1] = "line", @@ -186,6 +196,7 @@ local whatcodes = simplified(node.whatsits()) skipcodes = allocate(swapped(skipcodes,skipcodes)) noadcodes = allocate(swapped(noadcodes,noadcodes)) +radicalcodes = allocate(swapped(radicalcodes,radicalcodes)) nodecodes = allocate(swapped(nodecodes,nodecodes)) whatcodes = allocate(swapped(whatcodes,whatcodes)) listcodes = allocate(swapped(listcodes,listcodes)) diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 2609ba4d4..ce81d5ce7 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 d7249ac2d..23f2f42b0 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/syst-ini.mkiv b/tex/context/base/syst-ini.mkiv index 8633e3272..eef4387cb 100644 --- a/tex/context/base/syst-ini.mkiv +++ b/tex/context/base/syst-ini.mkiv @@ -1084,10 +1084,9 @@ \matheqnogapstep \zerocount \fi -%D New primitives: +%D New primitive: \ifdefined\hyphenationmin \else \newcount\hyphenationmin \fi -\ifdefined\discpenalty \else \newcount\discpenalty \fi %D While cleaning this code up a bit I was listening to Heather Nova's \CD\ Redbird. %D The first song on that \CD\ ends with a few lines suitable for ending this diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index ddbfffb17..118fde56b 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/06/15 12:49:17 +-- merge date : 10/07/15 12:03:10 do -- begin closure to overcome local limits and interference -- cgit v1.2.3