From 57f54f6ef67c34cdabf938150262bb6920deb639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Fabian=20Kr=C3=BCger?= Date: Sun, 6 Jun 2021 17:05:06 +0200 Subject: [PATCH] Remove old table system --- luamml-tex.lua | 25 ++----------------------- luamml.sty | 6 ------ 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/luamml-tex.lua b/luamml-tex.lua index b69be9b..e306879 100644 --- a/luamml-tex.lua +++ b/luamml-tex.lua @@ -45,17 +45,12 @@ end -- 1: Like 0, result is display math -- 2: Generate MathML, but only save it for later usage in startmath node -- 3: Skip --- 4: Prepend node list from buffer before generating --- 5: Like 5, result is display math --- 6: 2+4 --- 7: Skip but save copy of node list in buffer +-- 8: Generate MathML structure elements -- -- In other words: -- Bit 1: Suppress output -- 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 undefined_cmd = token.command_id'undefined_cs' @@ -81,21 +76,9 @@ end luatexbase.add_to_callback('pre_mlist_to_hlist_filter', function(mlist, style) local flag = tex.count.l__luamml_flag_int if flag & 3 == 3 then - if flag & 4 == 4 then - assert(mlist_buffer == nil) - mlist_buffer = node.copy_list(mlist) - end return true end - local new_mlist, buffer_tail - 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) + local xml, core = process_mlist(mlist, style == 'display' and 0 or 2) if flag & 2 == 0 then save_result(xml, style == 'display' or flag & 1 == 1) end @@ -111,10 +94,6 @@ luatexbase.add_to_callback('pre_mlist_to_hlist_filter', function(mlist, style) end props.saved_mathml_table, props.saved_mathml_core = xml, core end - if buffer_tail then - mlist.prev, buffer_tail.next = nil, nil - node.flush_list(new_mlist) - end return true end, 'dump_list') diff --git a/luamml.sty b/luamml.sty index f3dec3d..19edb10 100644 --- a/luamml.sty +++ b/luamml.sty @@ -12,12 +12,6 @@ \cs_new:Npn \luamml_flag_ignore: { \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: { \int_set:Nn \l__luamml_flag_int { 8 } }