diff options
Diffstat (limited to 'tex/context/base/math-tag.lua')
| -rw-r--r-- | tex/context/base/math-tag.lua | 129 |
1 files changed, 53 insertions, 76 deletions
diff --git a/tex/context/base/math-tag.lua b/tex/context/base/math-tag.lua index 3cd4cae16..ab5902dd4 100644 --- a/tex/context/base/math-tag.lua +++ b/tex/context/base/math-tag.lua @@ -11,22 +11,10 @@ if not modules then modules = { } end modules ['math-tag'] = { local find, match = string.find, string.match local insert, remove = table.insert, table.remove -local attributes = attributes -local nodes = nodes +local attributes, nodes = attributes, nodes -local nuts = nodes.nuts -local tonut = nuts.tonut - -local getnext = nuts.getnext -local getid = nuts.getid -local getchar = nuts.getchar -local getlist = nuts.getlist -local getfield = nuts.getfield -local getattr = nuts.getattr -local setattr = nuts.setattr - -local set_attributes = nuts.setattributes -local traverse_nodes = nuts.traverse +local set_attributes = nodes.setattributes +local traverse_nodes = node.traverse local nodecodes = nodes.nodecodes @@ -73,24 +61,22 @@ local function processsubsup(start) -- At some point we might need to add an attribute signaling the -- super- and subscripts because TeX and MathML use a different -- order. - local nucleus = getfield(start,"nucleus") - local sup = getfield(start,"sup") - local sub = getfield(start,"sub") + local nucleus, sup, sub = start.nucleus, start.sup, start.sub if sub then if sup then - setattr(start,a_tagged,start_tagged("msubsup")) + start[a_tagged] = start_tagged("msubsup") process(nucleus) process(sub) process(sup) stop_tagged() else - setattr(start,a_tagged,start_tagged("msub")) + start[a_tagged] = start_tagged("msub") process(nucleus) process(sub) stop_tagged() end elseif sup then - setattr(start,a_tagged,start_tagged("msup")) + start[a_tagged] = start_tagged("msup") process(nucleus) process(sup) stop_tagged() @@ -107,11 +93,11 @@ local actionstack = { } process = function(start) -- we cannot use the processor as we have no finalizers (yet) while start do - local id = getid(start) + local id = start.id if id == math_char_code then - local char = getchar(start) + local char = start.char -- check for code - local a = getattr(start,a_mathcategory) + local a = start[a_mathcategory] if a then a = { detail = a } end @@ -133,22 +119,22 @@ process = function(start) -- we cannot use the processor as we have no finalizer else tag = "mo" end - setattr(start,a_tagged,start_tagged(tag,a)) + start[a_tagged] = start_tagged(tag,a) stop_tagged() break -- okay? elseif id == math_textchar_code then -- check for code - local a = getattr(start,a_mathcategory) + local a = start[a_mathcategory] if a then - setattr(start,a_tagged,start_tagged("ms",{ detail = a })) + start[a_tagged] = start_tagged("ms",{ detail = a }) else - setattr(start,a_tagged,start_tagged("ms")) + start[a_tagged] = start_tagged("ms") end stop_tagged() break elseif id == math_delim_code then -- check for code - setattr(start,a_tagged,start_tagged("mo")) + start[a_tagged] = start_tagged("mo") stop_tagged() break elseif id == math_style_code then @@ -157,14 +143,14 @@ process = function(start) -- we cannot use the processor as we have no finalizer processsubsup(start) elseif id == math_box_code or id == hlist_code or id == vlist_code then -- keep an eye on math_box_code and see what ends up in there - local attr = getattr(start,a_tagged) + local attr = start[a_tagged] local last = attr and taglist[attr] if last and find(last[#last],"formulacaption[:%-]") then -- leave alone, will nicely move to the outer level else local text = start_tagged("mtext") - setattr(start,a_tagged,text) - local list = getfield(start,"list") + start[a_tagged] = text + local list = start.list if not list then -- empty list elseif not attr then @@ -180,8 +166,8 @@ process = function(start) -- we cannot use the processor as we have no finalizer local function runner(list) -- quite inefficient local cache = { } -- we can have nested unboxed mess so best local to runner for n in traverse_nodes(list) do - local id = getid(n) - local aa = getattr(n,a_tagged) + local id = n.id + local aa = n[a_tagged] if aa then local ac = cache[aa] if not ac then @@ -199,12 +185,12 @@ process = function(start) -- we cannot use the processor as we have no finalizer end cache[aa] = ac end - setattr(n,a_tagged,ac) + n[a_tagged] = ac else - setattr(n,a_tagged,text) + n[a_tagged] = text end if id == hlist_code or id == vlist_code then - runner(getlist(n)) + runner(n.list) end end end @@ -213,53 +199,47 @@ process = function(start) -- we cannot use the processor as we have no finalizer stop_tagged() end elseif id == math_sub_code then - local list = getfield(start,"list") + local list = start.list if list then - local attr = getattr(start,a_tagged) + local attr = start[a_tagged] local last = attr and taglist[attr] local action = last and match(last[#last],"maction:(.-)%-") if action and action ~= "" then if actionstack[#actionstack] == action then - setattr(start,a_tagged,start_tagged("mrow")) + start[a_tagged] = start_tagged("mrow") process(list) stop_tagged() else insert(actionstack,action) - setattr(start,a_tagged,start_tagged("mrow",{ detail = action })) + start[a_tagged] = start_tagged("mrow",{ detail = action }) process(list) stop_tagged() remove(actionstack) end else - setattr(start,a_tagged,start_tagged("mrow")) + start[a_tagged] = start_tagged("mrow") process(list) stop_tagged() end end elseif id == math_fraction_code then - local num = getfield(start,"num") - local denom = getfield(start,"denom") - local left = getfield(start,"left") - local right = getfield(start,"right") + local num, denom, left, right = start.num, start.denom, start.left, start.right if left then - setattr(left,a_tagged,start_tagged("mo")) + left[a_tagged] = start_tagged("mo") process(left) stop_tagged() end - setattr(start,a_tagged,start_tagged("mfrac")) + start[a_tagged] = start_tagged("mfrac") process(num) process(denom) stop_tagged() if right then - setattr(right,a_tagged,start_tagged("mo")) + right[a_tagged] = start_tagged("mo") process(right) stop_tagged() end elseif id == math_choice_code then - local display = getfield(start,"display") - local text = getfield(start,"text") - local script = getfield(start,"script") - local scriptscript = getfield(start,"scriptscript") + local display, text, script, scriptscript = start.display, start.text, start.script, start.scriptscript if display then process(display) end @@ -273,69 +253,67 @@ process = function(start) -- we cannot use the processor as we have no finalizer process(scriptscript) end elseif id == math_fence_code then - local delim = getfield(start,"delim") - local subtype = getfield(start,"subtype") - -- setattr(start,a_tagged,start_tagged("mfenced")) -- needs checking + local delim = start.delim + local subtype = start.subtype if subtype == 1 then -- left + start[a_tagged] = start_tagged("mfenced") if delim then - setattr(start,a_tagged,start_tagged("mleft")) + start[a_tagged] = start_tagged("mleft") process(delim) stop_tagged() end elseif subtype == 2 then -- middle if delim then - setattr(start,a_tagged,start_tagged("mmiddle")) + start[a_tagged] = start_tagged("mmiddle") process(delim) stop_tagged() end elseif subtype == 3 then if delim then - setattr(start,a_tagged,start_tagged("mright")) + start[a_tagged] = start_tagged("mright") process(delim) stop_tagged() end + stop_tagged() else -- can't happen end - -- stop_tagged() elseif id == math_radical_code then - local left = getfield(start,"left") - local degree = getfield(start,"degree") + local left, degree = start.left, start.degree if left then start_tagged("") process(left) -- root symbol, ignored stop_tagged() end if degree then -- not good enough, can be empty mlist - setattr(start,a_tagged,start_tagged("mroot")) + start[a_tagged] = start_tagged("mroot") processsubsup(start) process(degree) stop_tagged() else - setattr(start,a_tagged,start_tagged("msqrt")) + start[a_tagged] = start_tagged("msqrt") processsubsup(start) stop_tagged() end elseif id == math_accent_code then - local accent = getfield(start,"accent") - local bot_accent = getfield(start,"bot_accent") + local accent, bot_accent = start.accent, start.bot_accent if bot_accent then if accent then - setattr(start,a_tagged,start_tagged("munderover",{ detail = "accent" })) + start[a_tagged] = start_tagged("munderover",{ detail = "accent" }) processsubsup(start) process(bot_accent) process(accent) stop_tagged() else - setattr(start,a_tagged,start_tagged("munder",{ detail = "accent" })) + start[a_tagged] = start_tagged("munder",{ detail = "accent" }) processsubsup(start) process(bot_accent) stop_tagged() end elseif accent then - setattr(start,a_tagged,start_tagged("mover",{ detail = "accent" })) + start[a_tagged] = start_tagged("mover",{ detail = "accent" }) processsubsup(start) process(accent) stop_tagged() @@ -343,23 +321,22 @@ process = function(start) -- we cannot use the processor as we have no finalizer processsubsup(start) end elseif id == glue_code then - setattr(start,a_tagged,start_tagged("mspace")) + start[a_tagged] = start_tagged("mspace") stop_tagged() else - setattr(start,a_tagged,start_tagged("merror", { detail = nodecodes[i] })) + start[a_tagged] = start_tagged("merror", { detail = nodecodes[i] }) stop_tagged() end - start = getnext(start) + start = start.next end end function noads.handlers.tags(head,style,penalties) - head = tonut(head) local v_math = start_tagged("math") local v_mrow = start_tagged("mrow") - local v_mode = getattr(head,a_mathmode) - -- setattr(head,a_tagged,v_math) - setattr(head,a_tagged,v_mrow) + local v_mode = head[a_mathmode] + head[a_tagged] = v_math + head[a_tagged] = v_mrow tags.setattributehash(v_math,"mode",v_mode == 1 and "display" or "inline") process(head) stop_tagged() |