diff options
Diffstat (limited to 'tex/context/base/mkiv')
| -rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-dsp.lua | 31 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-osd.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-ota.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-otj.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/font-ots.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/mkiv/node-nut.lua | 12 | ||||
| -rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 26605 -> 26594 bytes | |||
| -rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 268743 -> 268703 bytes |
10 files changed, 32 insertions, 23 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 5565f1eaf..a7f700bb0 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{2019.04.12 17:43} +\newcontextversion{2019.04.13 17:01} %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 a3e237f20..9f6cf4f4d 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -42,7 +42,7 @@ %D has to match \type {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2019.04.12 17:43} +\edef\contextversion{2019.04.13 17:01} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua index 3285c689c..0645e7c8a 100644 --- a/tex/context/base/mkiv/font-dsp.lua +++ b/tex/context/base/mkiv/font-dsp.lua @@ -1525,7 +1525,9 @@ function gposhandlers.pair(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofgly classdef1 = readclassdef(f,tableoffset+classdef1,coverage) classdef2 = readclassdef(f,tableoffset+classdef2,nofglyphs) local usedcoverage = { } -local shared = { } -- partial sparse + -- + local shared = { } -- partial sparse + -- for g1, c1 in next, classdef1 do if coverage[g1] then local l1 = classlist[c1] @@ -1537,18 +1539,21 @@ local shared = { } -- partial sparse local first = offsets[1] local second = offsets[2] if first or second then -local s1 = shared[first] -if not s1 then - s1 = { } - shared[first] = s1 -end -local s2 = s1[second] -if not s2 then - s2 = { first, second or nil } - s1[second] = s2 -end -hash[paired] = s2 --- hash[paired] = { first, second or nil } + -- + local s1 = shared[first] + if not s1 then + s1 = { } + shared[first] = s1 + end + local s2 = s1[second] + if not s2 then + s2 = { first, second or nil } + s1[second] = s2 + end + hash[paired] = s2 + -- + -- hash[paired] = { first, second or nil } + -- else -- upto the next lookup for this combination end diff --git a/tex/context/base/mkiv/font-osd.lua b/tex/context/base/mkiv/font-osd.lua index f51ae7bf7..91cf1522c 100644 --- a/tex/context/base/mkiv/font-osd.lua +++ b/tex/context/base/mkiv/font-osd.lua @@ -114,7 +114,7 @@ local setchar = nuts.setchar local getprop = nuts.getprop local setprop = nuts.setprop -local ischar = nuts.is_char +local ischar = nuts.ischar local insert_node_after = nuts.insert_after local copy_node = nuts.copy diff --git a/tex/context/base/mkiv/font-ota.lua b/tex/context/base/mkiv/font-ota.lua index 76c267a81..3d217b3f4 100644 --- a/tex/context/base/mkiv/font-ota.lua +++ b/tex/context/base/mkiv/font-ota.lua @@ -39,7 +39,7 @@ local getprop = nuts.getprop local setprop = nuts.setprop local getsubtype = nuts.getsubtype local getchar = nuts.getchar -local ischar = nuts.is_char +local ischar = nuts.ischar local end_of_math = nuts.end_of_math diff --git a/tex/context/base/mkiv/font-otj.lua b/tex/context/base/mkiv/font-otj.lua index bb3038935..b8be2ec75 100644 --- a/tex/context/base/mkiv/font-otj.lua +++ b/tex/context/base/mkiv/font-otj.lua @@ -90,7 +90,7 @@ local getboth = nuts.getboth local getdisc = nuts.getdisc local setdisc = nuts.setdisc local setoffsets = nuts.setoffsets -local ischar = nuts.is_char +local ischar = nuts.ischar local getkern = nuts.getkern local setkern = nuts.setkern local setlink = nuts.setlink diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua index 09351b1f1..24a868887 100644 --- a/tex/context/base/mkiv/font-ots.lua +++ b/tex/context/base/mkiv/font-ots.lua @@ -201,7 +201,7 @@ local getattr = nuts.getattr local getglyphdata = nuts.getglyphdata -local ischar = nuts.is_char +local ischar = nuts.ischar local isglyph = nuts.isglyph local usesfont = nuts.uses_font diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua index 124f64301..d6f5a34e4 100644 --- a/tex/context/base/mkiv/node-nut.lua +++ b/tex/context/base/mkiv/node-nut.lua @@ -218,8 +218,11 @@ if not nuts.mlist_to_hlist then end -nuts.getfield = direct.getfield -nuts.setfield = direct.setfield +local getfield = direct.getfield +local setfield = direct.setfield + +nuts.getfield = getfield +nuts.setfield = setfield nuts.getnext = direct.getnext nuts.setnext = direct.setnext @@ -342,11 +345,12 @@ nuts.setpenalty = direct.setpenalty nuts.getbox = direct.getbox nuts.setbox = direct.setbox -nuts.is_char = direct.is_char nuts.ischar = direct.is_char -nuts.is_glyph = direct.is_glyph nuts.isglyph = direct.is_glyph +----.is_char = nuts.ischar +----.is_glyph = nuts.isglyph + local d_remove_node = direct.remove local d_flush_node = direct.flush_node local d_getnext = direct.getnext diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex bf34fe167..3855acd13 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex bab191ca1..4804fb6ae 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf |