Make family mappings configurable in pdfTeX

This commit is contained in:
Marcel Fabian Krüger 2021-06-03 17:06:01 +02:00
parent e7eb77a396
commit 6da728c217
4 changed files with 35 additions and 12 deletions

View File

@ -77,6 +77,12 @@
\__luamml_pdf_showlists: \__luamml_pdf_showlists:
} }
\NewDocumentCommand \RegisterFamilyMapping {m m} {
\iow_log:x {
LUAMML_INSTRUCTION:REGISTER_MAPPING: \int_use:N #1 : #2
}
}
\endinput \endinput
\cs_new:Npn \__luamml_patch_package:nn #1 #2 { \cs_new:Npn \__luamml_patch_package:nn #1 #2 {

View File

@ -14,11 +14,18 @@ local luamml_block = l.Cg('LUAMML_FORMULA_BEGIN:' * id * l.P'\n'^1 * l.Ct(
local luamml_mark = l.Cg('LUAMML_MARK:' * id * ':' * l.Cs((1 - l.P'\n' + l.Cg('\n' * l.Cc'' - '\nLUAMML_MARK_END\n'))^0) * '\nLUAMML_MARK_END\n' * l.Cc'marks') local luamml_mark = l.Cg('LUAMML_MARK:' * id * ':' * l.Cs((1 - l.P'\n' + l.Cg('\n' * l.Cc'' - '\nLUAMML_MARK_END\n'))^0) * '\nLUAMML_MARK_END\n' * l.Cc'marks')
local luamml_instruction = l.Cg('LUAMML_INSTRUCTION:' * l.Cc(nil) * l.C((1 - l.P'\n')^0) * '\n' * l.Cc'instructions')
local function multi_table_set(t, key, value, table) local function multi_table_set(t, key, value, table)
assert(t[table])[key] = value table = t[table]
table[key or #table + 1] = value
return t return t
end end
local log_file = l.Cf(l.Ct(l.Cg(l.Ct'', 'groups') * l.Cg(l.Ct'', 'marks')) * (luamml_block + luamml_mark + line)^0, multi_table_set) local log_file = l.Cf(l.Ct(l.Cg(l.Ct'', 'groups')
* l.Cg(l.Ct'', 'marks')
* l.Cg(l.Ct'', 'instructions'))
* (luamml_block + luamml_mark + luamml_instruction + line)^0,
multi_table_set)
return function(filename) return function(filename)
local f local f

View File

@ -4,10 +4,6 @@ local convert = require'luamml-convert'
local mappings = require'luamml-legacy-mappings' local mappings = require'luamml-legacy-mappings'
local to_xml = require'luamml-xmlwriter' local to_xml = require'luamml-xmlwriter'
convert.register_family(1, mappings.oml)
convert.register_family(2, mappings.oms)
convert.register_family(3, mappings.omx)
local parse_showlists = require'pdfmml-showlists' local parse_showlists = require'pdfmml-showlists'
local parse_log = require'pdfmml-logreader' local parse_log = require'pdfmml-logreader'
@ -30,9 +26,23 @@ if #arg < 1 then
If {outname} includes {}, then a separate file is written for every formula with {} replaced by the formula id.\n', arg[0])) If {outname} includes {}, then a separate file is written for every formula with {} replaced by the formula id.\n', arg[0]))
os.exit(1) os.exit(1)
end end
local math_lists = assert(parse_log(assert(try_extensions(arg[1], '.tml', '.log'), local parsed = assert(parse_log(assert(try_extensions(arg[1], '.tml', '.log'),
"Couldn't find input file."))) "Couldn't find input file.")))
for i, inst in ipairs(parsed.instructions) do
local _, _, family, mapping_name = inst:find'^REGISTER_MAPPING:([0-9]+):(.*)$'
if family then
local mapping = mappings[mapping_name]
if mapping then
convert.register_family(tonumber(family), mapping)
else
io.stderr:write(string.format('Unknown mapping %s ignored\n', mapping_name))
end
else
io.stderr:write'Unknown instruction ignored\n'
end
end
local out_prefix, out_suffix, out_stream local out_prefix, out_suffix, out_stream
if not arg[2] or arg[2] == '-' then if not arg[2] or arg[2] == '-' then
out_stream = io.stdout out_stream = io.stdout
@ -42,10 +52,10 @@ else
out_stream = assert(io.open(arg[2], 'w')) out_stream = assert(io.open(arg[2], 'w'))
end end
end end
for i, block in ipairs(math_lists.groups) do for i, block in ipairs(parsed.groups) do
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'))
block = block[1] block = block[1]
local parsed = parse_showlists(block, nil, nil, math_lists.marks) local parsed = parse_showlists(block, nil, nil, parsed.marks)
local style = block.display and 0 or 2 local style = block.display and 0 or 2
stream:write( stream:write(
to_xml(convert.make_root(convert.process(parsed, style), style)), '\n' to_xml(convert.make_root(convert.process(parsed, style), style)), '\n'

View File

@ -1,9 +1,9 @@
\documentclass{article} \documentclass{article}
\usepackage{luamml-pdf} \usepackage{luamml-pdf}
% \RegisterFamilyMapping\symsymbols{oms} \RegisterFamilyMapping\symsymbols{oms}
% \RegisterFamilyMapping\symletters{oml} \RegisterFamilyMapping\symletters{oml}
% \RegisterFamilyMapping\symlargesymbols{omx} \RegisterFamilyMapping\symlargesymbols{omx}
\ExplSyntaxOn \ExplSyntaxOn
\cs_set_eq:NN \WriteoutFormula \luamml_pdf_write: \cs_set_eq:NN \WriteoutFormula \luamml_pdf_write: