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

Make text_families more dynamic

Browse Source
This commit is contained in:
Marcel Fabian Krüger 2023-12-27 13:30:40 +01:00
parent 9b85cdb610
commit e6d7b73beb
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
luamml-convert.lua
View File

@ -112,8 +112,6 @@ local always_mo = {["%"] = true, ["&"] = true, ["."] = true, ["/"] = true,
-- Marker tables replacing the core operator for space like elements -- Marker tables replacing the core operator for space like elements
local space_like = {} local space_like = {}
local text_families = {}
local nodes_to_table local nodes_to_table
local function sub_style(s) return s//4*2+5 end local function sub_style(s) return s//4*2+5 end
@ -179,7 +177,7 @@ local function acc_to_table(acc, cur_style, stretch)
end end
end end
local function kernel_to_table(kernel, cur_style) local function kernel_to_table(kernel, cur_style, text_families)
if not kernel then return end if not kernel then return end
local props = properties[kernel] local props = properties[kernel]
local mathml_core = props and props.mathml_core local mathml_core = props and props.mathml_core
@ -216,18 +214,18 @@ local function kernel_to_table(kernel, cur_style)
end end
elseif id == sub_mlist_t then elseif id == sub_mlist_t then
if mathml_filter then if mathml_filter then
return mathml_filter(nodes_to_table(kernel.list, cur_style)) return mathml_filter(nodes_to_table(kernel.list, cur_style, text_families))
else else
return nodes_to_table(kernel.list, cur_style) return nodes_to_table(kernel.list, cur_style, text_families)
end end
else else
error'confusion' error'confusion'
end end
end end
local function do_sub_sup(t, core, n, cur_style) local function do_sub_sup(t, core, n, cur_style, text_families)
local sub = kernel_to_table(n.sub, sub_style(cur_style)) local sub = kernel_to_table(n.sub, sub_style(cur_style), text_families)
local sup = kernel_to_table(n.sup, sup_style(cur_style)) local sup = kernel_to_table(n.sup, sup_style(cur_style), text_families)
if sub then if sub then
if sup then if sup then
return {[0] = 'msubsup', t, sub, sup}, core return {[0] = 'msubsup', t, sub, sup}, core
@ -256,8 +254,8 @@ local function maybe_to_mn(noad, core)
core[0] = 'mn' core[0] = 'mn'
end end
local function noad_to_table(noad, sub, cur_style, joining, bin_replacements) local function noad_to_table(noad, sub, cur_style, joining, bin_replacements, text_families)
local nucleus, core = kernel_to_table(noad.nucleus, sub == noad_over and cur_style//2*2+1 or cur_style) local nucleus, core = kernel_to_table(noad.nucleus, sub == noad_over and cur_style//2*2+1 or cur_style, text_families)
if not nucleus then return end if not nucleus then return end
if core and core[0] == 'mo' and core.minsize and not core.maxsize then if core and core[0] == 'mo' and core.minsize and not core.maxsize then
core.maxsize = core.minsize -- This happens when a half-specified delimiter appears alone in a list. core.maxsize = core.minsize -- This happens when a half-specified delimiter appears alone in a list.
@ -287,7 +285,7 @@ local function noad_to_table(noad, sub, cur_style, joining, bin_replacements)
joining[':nodes'] = cnodes joining[':nodes'] = cnodes
end end
end end
nucleus = do_sub_sup(joining, joining, noad, cur_style) nucleus = do_sub_sup(joining, joining, noad, cur_style, text_families)
if nucleus == joining then if nucleus == joining then
return nil, joining, joining return nil, joining, joining
else else
@ -314,8 +312,8 @@ local function noad_to_table(noad, sub, cur_style, joining, bin_replacements)
if (noad.sup or noad.sub) and (sub == noad_op or sub == noad_oplimits) then if (noad.sup or noad.sub) and (sub == noad_op or sub == noad_oplimits) then
if core and core[0] == 'mo' then core.movablelimits = sub == noad_op end if core and core[0] == 'mo' then core.movablelimits = sub == noad_op end
local sub = kernel_to_table(noad.sub, sub_style(cur_style)) local sub = kernel_to_table(noad.sub, sub_style(cur_style), text_families)
local sup = kernel_to_table(noad.sup, sup_style(cur_style)) local sup = kernel_to_table(noad.sup, sup_style(cur_style), text_families)
return {[0] = sup and (sub and 'munderover' or 'mover') or 'munder', return {[0] = sup and (sub and 'munderover' or 'mover') or 'munder',
nucleus, nucleus,
sub or sup, sub or sup,
@ -336,11 +334,11 @@ local function noad_to_table(noad, sub, cur_style, joining, bin_replacements)
else else
error[[confusion]] error[[confusion]]
end end
return do_sub_sup(nucleus, core, noad, cur_style) return do_sub_sup(nucleus, core, noad, cur_style, text_families)
end end
local function accent_to_table(accent, sub, cur_style) local function accent_to_table(accent, sub, cur_style, text_families)
local nucleus, core = kernel_to_table(accent.nucleus, cur_style//2*2+1) local nucleus, core = kernel_to_table(accent.nucleus, cur_style//2*2+1, text_families)
local top_acc = acc_to_table(accent.accent, cur_style, sub & 1 == 1) local top_acc = acc_to_table(accent.accent, cur_style, sub & 1 == 1)
local bot_acc = acc_to_table(accent.bot_accent, cur_style, sub & 2 == 2) local bot_acc = acc_to_table(accent.bot_accent, cur_style, sub & 2 == 2)
return {[0] = top_acc and (bot_acc and 'munderover' or 'mover') or 'munder', return {[0] = top_acc and (bot_acc and 'munderover' or 'mover') or 'munder',
@ -362,9 +360,9 @@ style_table.crampedscript, style_table.crampedscriptscript =
style_table.display, style_table.text, style_table.display, style_table.text,
style_table.script, style_table.scriptscript style_table.script, style_table.scriptscript
local function radical_to_table(radical, sub, cur_style) local function radical_to_table(radical, sub, cur_style, text_families)
local kind = radical_sub[sub] local kind = radical_sub[sub]
local nucleus, core = kernel_to_table(radical.nucleus, cur_style//2*2+1) local nucleus, core = kernel_to_table(radical.nucleus, cur_style//2*2+1, text_families)
local left = delim_to_table(radical.left) local left = delim_to_table(radical.left)
local elem local elem
if kind == 'radical' or kind == 'uradical' then if kind == 'radical' or kind == 'uradical' then
@ -372,7 +370,7 @@ local function radical_to_table(radical, sub, cur_style)
elem, core = {[0] = 'msqrt', nucleus, }, nil elem, core = {[0] = 'msqrt', nucleus, }, nil
elseif kind == 'uroot' then elseif kind == 'uroot' then
-- FIXME: Check that this is really a root -- FIXME: Check that this is really a root
elem, core = {[0] = 'msqrt', nucleus, kernel_to_table(radical.degree)}, nil elem, core = {[0] = 'msqrt', nucleus, kernel_to_table(radical.degree, 7, text_families)}, nil
elseif kind == 'uunderdelimiter' then elseif kind == 'uunderdelimiter' then
elem, core = {[0] = 'munder', left, nucleus}, left elem, core = {[0] = 'munder', left, nucleus}, left
elseif kind == 'uoverdelimiter' then elseif kind == 'uoverdelimiter' then
@ -384,12 +382,12 @@ local function radical_to_table(radical, sub, cur_style)
else else
error[[confusion]] error[[confusion]]
end end
return do_sub_sup(elem, core, radical, cur_style) return do_sub_sup(elem, core, radical, cur_style, text_families)
end end
local function fraction_to_table(fraction, sub, cur_style) local function fraction_to_table(fraction, sub, cur_style, text_families)
local num, core = kernel_to_table(fraction.num, cur_style + 2 - cur_style//6*2) local num, core = kernel_to_table(fraction.num, cur_style + 2 - cur_style//6*2, text_families)
local denom = kernel_to_table(fraction.denom, cur_style//2*2 + 3 - cur_style//6*2) local denom = kernel_to_table(fraction.denom, cur_style//2*2 + 3 - cur_style//6*2, text_families)
local left = delim_to_table(fraction.left) local left = delim_to_table(fraction.left)
local right = delim_to_table(fraction.right) local right = delim_to_table(fraction.right)
local mfrac = {[0] = 'mfrac', local mfrac = {[0] = 'mfrac',
@ -519,7 +517,7 @@ local function cleanup_mathbin(head)
return replacements return replacements
end end
function nodes_to_table(head, cur_style) function nodes_to_table(head, cur_style, text_families)
local bin_replacements = cleanup_mathbin(head) local bin_replacements = cleanup_mathbin(head)
local t = {[0] = 'mrow'} local t = {[0] = 'mrow'}
local result = t local result = t
@ -534,7 +532,7 @@ function nodes_to_table(head, cur_style)
new_node, new_core = mathml_table, mathml_core new_node, new_core = mathml_table, mathml_core
elseif id == noad_t then elseif id == noad_t then
local new_n local new_n
new_n, new_core, new_joining = noad_to_table(n, sub, cur_style, joining, bin_replacements) new_n, new_core, new_joining = noad_to_table(n, sub, cur_style, joining, bin_replacements, text_families)
if new_joining == false then if new_joining == false then
t[#t], new_joining = new_n, nil t[#t], new_joining = new_n, nil
else else
@ -542,7 +540,7 @@ function nodes_to_table(head, cur_style)
end end
new_noad = sub new_noad = sub
elseif id == accent_t then elseif id == accent_t then
new_node, new_core = accent_to_table(n, sub, cur_style) new_node, new_core = accent_to_table(n, sub, cur_style, text_families)
new_noad = noad_ord new_noad = noad_ord
elseif id == style_t then elseif id == style_t then
if sub ~= cur_style then if sub ~= cur_style then
@ -567,12 +565,12 @@ function nodes_to_table(head, cur_style)
or size == 1 and 'text' or size == 1 and 'text'
or size == 2 and 'script' or size == 2 and 'script'
or size == 3 and 'scriptscript' or size == 3 and 'scriptscript'
or assert(false)], 2*size), space_like or assert(false)], 2*size, text_families), space_like
elseif id == radical_t then elseif id == radical_t then
new_node, new_core = radical_to_table(n, sub, cur_style) new_node, new_core = radical_to_table(n, sub, cur_style, text_families)
new_noad = noad_ord new_noad = noad_ord
elseif id == fraction_t then elseif id == fraction_t then
new_node, new_core = fraction_to_table(n, sub, cur_style) new_node, new_core = fraction_to_table(n, sub, cur_style, text_families)
new_noad = noad_inner new_noad = noad_inner
elseif id == fence_t then elseif id == fence_t then
new_node, new_core = fence_to_table(n, sub, cur_style) new_node, new_core = fence_to_table(n, sub, cur_style)
@ -658,7 +656,6 @@ end
return { return {
register_family = register_remap, register_family = register_remap,
register_text_family = function(fam) text_families[fam] = true end, process = function(head, style, families) return nodes_to_table(head, style or 2, families) end,
process = function(head, style) return nodes_to_table(head, style or 2) end,
make_root = to_math, make_root = to_math,
} }

8
luamml-tex.lua
View File

@ -2,7 +2,6 @@ local mlist_to_mml = require'luamml-convert'
local process_mlist = mlist_to_mml.process local process_mlist = mlist_to_mml.process
local make_root = mlist_to_mml.make_root local make_root = mlist_to_mml.make_root
local register_family = mlist_to_mml.register_family local register_family = mlist_to_mml.register_family
local register_text_family = mlist_to_mml.register_text_family
local mappings = require'luamml-legacy-mappings' local mappings = require'luamml-legacy-mappings'
local write_xml = require'luamml-xmlwriter' local write_xml = require'luamml-xmlwriter'
@ -14,6 +13,7 @@ local left_brace = token.new(string.byte'{', 1)
local right_brace = token.new(string.byte'}', 2) local right_brace = token.new(string.byte'}', 2)
local output_hook_token local output_hook_token
local text_families = {}
local properties = node.get_properties_table() local properties = node.get_properties_table()
local mmode, hmode, vmode do local mmode, hmode, vmode do
@ -44,8 +44,8 @@ local funcid = luatexbase.new_luafunction'RegisterFamilyMapping'
token.set_lua('RegisterTextFamily', funcid, 'protected') token.set_lua('RegisterTextFamily', funcid, 'protected')
lua.get_functions_table()[funcid] = function() lua.get_functions_table()[funcid] = function()
local fam = token.scan_int() local fam = token.scan_int()
local kind = token.scan_string() local _kind = token.scan_string()
register_text_family(fam, kind) text_families[fam] = true
end end
local function shallow_copy(t) local function shallow_copy(t)
@ -118,7 +118,7 @@ luatexbase.add_to_callback('pre_mlist_to_hlist_filter', function(mlist, style)
local display = style == 'display' local display = style == 'display'
local startmath = tex.nest.top.tail -- Must come before any write_struct calls which adds nodes local startmath = tex.nest.top.tail -- Must come before any write_struct calls which adds nodes
style = flag & 16 == 16 and flag>>5 & 0x7 or display and 0 or 2 style = flag & 16 == 16 and flag>>5 & 0x7 or display and 0 or 2
local xml, core = process_mlist(mlist, style) local xml, core = process_mlist(mlist, style, text_families)
if flag & 2 == 2 then if flag & 2 == 2 then
xml = save_result(shallow_copy(xml), display) xml = save_result(shallow_copy(xml), display)
end end

4
pdfmml.lua
View File

@ -7,6 +7,8 @@ local to_xml = require'luamml-xmlwriter'
local parse_showlists = require'pdfmml-showlists' local parse_showlists = require'pdfmml-showlists'
local parse_log = require'pdfmml-logreader' local parse_log = require'pdfmml-logreader'
local text_families = {}
local attributes = lfs.attributes local attributes = lfs.attributes
local function try_extensions_(base, extension, ...) local function try_extensions_(base, extension, ...)
if extension == nil then return end if extension == nil then return end
@ -71,7 +73,7 @@ for i, block in ipairs(parsed.groups) do
block = block[1] block = block[1]
if flag & 3 ~= 0 then if flag & 3 ~= 0 then
local style = flag & 16 == 16 and flag>>5 & 0x7 or block.display and 0 or 2 local style = flag & 16 == 16 and flag>>5 & 0x7 or block.display and 0 or 2
local xml = convert.process(parse_showlists(block, nil, nil, parsed), style) local xml = convert.process(parse_showlists(block, nil, nil, parsed), style, text_families)
if flag & 2 == 2 then if flag & 2 == 2 then
local stream = out_stream or assert(io.open(out_prefix .. tostring(i) .. out_suffix, 'w')) local stream = out_stream or assert(io.open(out_prefix .. tostring(i) .. out_suffix, 'w'))
stream:write(to_xml(convert.make_root(shallow_copy(xml), style)), '\n') stream:write(to_xml(convert.make_root(shallow_copy(xml), style)), '\n')