zauguin/mathml
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove old table system

Browse Source
This commit is contained in:
Marcel Fabian Krüger 2021-06-06 17:05:06 +02:00
parent dfee31b4b8
commit 57f54f6ef6
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
luamml-tex.lua
View File

@ -45,17 +45,12 @@ end
-- 1: Like 0, result is display math -- 1: Like 0, result is display math
-- 2: Generate MathML, but only save it for later usage in startmath node -- 2: Generate MathML, but only save it for later usage in startmath node
-- 3: Skip -- 3: Skip
-- 4: Prepend node list from buffer before generating -- 8: Generate MathML structure elements
-- 5: Like 5, result is display math
-- 6: 2+4
-- 7: Skip but save copy of node list in buffer
-- --
-- In other words: -- In other words:
-- Bit 1: Suppress output -- Bit 1: Suppress output
-- Bit 0: Force display if 1 isn't set, if it is then skip MathML generation -- Bit 0: Force display if 1 isn't set, if it is then skip MathML generation
-- Bit 2: Integrate with table mechanism
local mlist_buffer
local mlist_result, mlist_display local mlist_result, mlist_display
local undefined_cmd = token.command_id'undefined_cs' local undefined_cmd = token.command_id'undefined_cs'
@ -81,21 +76,9 @@ end
luatexbase.add_to_callback('pre_mlist_to_hlist_filter', function(mlist, style) luatexbase.add_to_callback('pre_mlist_to_hlist_filter', function(mlist, style)
local flag = tex.count.l__luamml_flag_int local flag = tex.count.l__luamml_flag_int
if flag & 3 == 3 then if flag & 3 == 3 then
if flag & 4 == 4 then
assert(mlist_buffer == nil)
mlist_buffer = node.copy_list(mlist)
end
return true return true
end end
local new_mlist, buffer_tail local xml, core = process_mlist(mlist, style == 'display' and 0 or 2)
if flag & 4 == 4 then
new_mlist, buffer_tail = assert(mlist_buffer), node.tail(mlist_buffer)
mlist.prev, buffer_tail.next = buffer_tail, mlist
mlist_buffer = nil
else
new_mlist = mlist
end
local xml, core = process_mlist(new_mlist, style == 'display' and 0 or 2)
if flag & 2 == 0 then if flag & 2 == 0 then
save_result(xml, style == 'display' or flag & 1 == 1) save_result(xml, style == 'display' or flag & 1 == 1)
end end
@ -111,10 +94,6 @@ luatexbase.add_to_callback('pre_mlist_to_hlist_filter', function(mlist, style)
end end
props.saved_mathml_table, props.saved_mathml_core = xml, core props.saved_mathml_table, props.saved_mathml_core = xml, core
end end
if buffer_tail then
mlist.prev, buffer_tail.next = nil, nil
node.flush_list(new_mlist)
end
return true return true
end, 'dump_list') end, 'dump_list')

6
luamml.sty
View File

@ -12,12 +12,6 @@
\cs_new:Npn \luamml_flag_ignore: { \cs_new:Npn \luamml_flag_ignore: {
\int_set:Nn \l__luamml_flag_int { 3 } \int_set:Nn \l__luamml_flag_int { 3 }
} }
\cs_new:Npn \luamml_flag_alignment_left: {
\int_set:Nn \l__luamml_flag_int { 7 }
}
\cs_new:Npn \luamml_flag_alignment_right: {
\int_set:Nn \l__luamml_flag_int { 6 }
}
\cs_new:Npn \luamml_flag_structelem: { \cs_new:Npn \luamml_flag_structelem: {
\int_set:Nn \l__luamml_flag_int { 8 } \int_set:Nn \l__luamml_flag_int { 8 }
} }