let nl () = output_string och (pp_statement nl_ast) in
MatitaMisc.out_preamble och;
let grafite_parser_cb status = function
- | G.Executable (_, G.Macro (_, G.Inline (_, style, uri, prefix, flavour))) ->
+ | G.Executable (_, G.Macro (_, G.Inline (_, uri, params))) ->
let str =
- ApplyTransformation.txt_of_inline_macro style prefix uri
- ?flavour
+ ApplyTransformation.txt_of_inline_macro params uri
~map_unicode_to_tex:
(Helm_registry.get_bool "matita.paste_unicode_as_tex")
in
with MatitaEngine.EnrichedWithStatus
(GrafiteEngine.Macro (floc, f), lexicon, grafite) as exn ->
match f (get_macro_context (Some grafite)) with
- | _, GrafiteAst.Inline (_, style, suri, prefix, flavour) ->
+ | _, GrafiteAst.Inline (_, _suri, _params) ->
(*
let str =
ApplyTransformation.txt_of_inline_macro style prefix suri
let root_and_target_of opts mafile =
try
let include_paths = get_include_paths opts in
- let root,baseuri,_,_ =
+ let root,baseuri,_,relpath =
Librarian.baseuri_of_script ~include_paths mafile
in
let obj_writeable, obj_read_only =
LibraryMisc.obj_file_of_baseuri
~must_exist:false ~baseuri ~writable:false
in
- Some root, obj_writeable, obj_read_only
- with Librarian.NoRootFor x -> None, "", ""
+ Some root, relpath, obj_writeable, obj_read_only
+ with Librarian.NoRootFor x -> None, "", "", ""
;;
let mtime_of_source_object s =