From adc43c3c243ed95215af6fe02d71e393c178da23 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Thu, 19 Nov 2015 20:15:06 +0100 Subject: 2015-11-19 19:15:00 --- tex/context/base/node-ini.lua | 52 ++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 15 deletions(-) (limited to 'tex/context/base/node-ini.lua') diff --git a/tex/context/base/node-ini.lua b/tex/context/base/node-ini.lua index 2c187b624..73f2a8add 100644 --- a/tex/context/base/node-ini.lua +++ b/tex/context/base/node-ini.lua @@ -13,6 +13,8 @@ modules.

-- this module is being reconstructed +-- todo: query names with new node.subtypes + local next, type, tostring = next, type, tostring local gsub = string.gsub local concat, remove = table.concat, table.remove @@ -80,6 +82,14 @@ local skipcodes = allocate { [ 16] = "thinmuskip", [ 17] = "medmuskip", [ 18] = "thickmuskip", + [ 19] = "mathskip", -- experiment + [100] = "leaders", + [101] = "cleaders", + [102] = "xleaders", + [103] = "gleaders", +} + +local leadercodes = allocate { [100] = "leaders", [101] = "cleaders", [102] = "xleaders", @@ -119,12 +129,14 @@ local radicalcodes = allocate { } local listcodes = allocate { - [ 0] = "unknown", - [ 1] = "line", - [ 2] = "box", - [ 3] = "indent", - [ 4] = "alignment", -- row or column - [ 5] = "cell", + [0] = "unknown", + [1] = "line", + [2] = "box", + [3] = "indent", + [4] = "alignment", -- row or column + [5] = "cell", + [6] = "equation", + [7] = "equationnumber", } local glyphcodes = allocate { @@ -183,6 +195,15 @@ local fencecodes = allocate { [3] = "right", } +local rulecodes = allocate { + [0] = "normal", + [1] = "box", + [2] = "image", + [3] = "empty", +} + +-- maybe we also need fractioncodes + local function simplified(t) local r = { } for k, v in next, t do @@ -209,6 +230,8 @@ margincodes = allocate(swapped(margincodes,margincodes)) disccodes = allocate(swapped(disccodes,disccodes)) accentcodes = allocate(swapped(accentcodes,accentcodes)) fencecodes = allocate(swapped(fencecodes,fencecodes)) +rulecodes = allocate(swapped(rulecodes,rulecodes)) +leadercodes = allocate(swapped(leadercodes,leadercodes)) nodes.skipcodes = skipcodes nodes.gluecodes = skipcodes -- more official nodes.noadcodes = noadcodes @@ -220,10 +243,13 @@ nodes.kerncodes = kerncodes nodes.penaltycodes = penaltycodes nodes.mathcodes = mathcodes nodes.fillcodes = fillcodes -nodes.margincodes = margincodes +nodes.margincodes = margincodes nodes.marginkerncodes = margincodes nodes.disccodes = disccodes nodes.discretionarycodes = disccodes nodes.accentcodes = accentcodes +nodes.radicalcodes = radicalcodes nodes.fencecodes = fencecodes +nodes.rulecodes = rulecodes +nodes.leadercodes = leadercodes listcodes.row = listcodes.alignment listcodes.column = listcodes.alignment @@ -272,11 +298,7 @@ end trackers.register("system.showcodes", nodes.showcodes) --- new: - -nodes.nativedir = nodecodes.dir and true or false - -nodecodes.dir = 98 -nodecodes[98] = "dir" -nodecodes.localpar = 99 -nodecodes[99] = "localpar" +if not nodecodes.dir then + report_codes("use a newer version of luatex") + os.exit() +end -- cgit v1.2.3