map_unicode_to_tex is no longer optional and it always refers to the current

[helm.git] / components / binaries / transcript / grafite.ml

diff --git a/components/binaries/transcript/grafite.ml b/components/binaries/transcript/grafite.ml
index 9900b8bc87bab7f1806572b2880941dc034653a3..93bd922ef3f0294631cbbfa35cff6f8385941559 100644 (file)
--- a/components/binaries/transcript/grafite.ml
+++ b/components/binaries/transcript/grafite.ml
@@ -25,6 +25,7 @@
 
 module T = Types
 
+module UM = UriManager
 module NP = CicNotationPp
 module GP = GrafiteAstPp
 module G = GrafiteAst
@@ -36,11 +37,17 @@ let out_verbatim och s =
    Printf.fprintf och "%s" s
 
 let out_comment och s =
+   let s = if s <> "" && s.[0] = '*' then "#" ^ s else s in 
    Printf.fprintf och "%s%s%s\n\n" "(*" s "*)"
 
+let out_unexported och head s =
+   let s = Printf.sprintf " %s\n%s\n" head s in
+   out_comment och s
+
 let out_line_comment och s =
    let l = 70 - String.length s in
-   Printf.fprintf och "%s %s %s%s\n\n" "(*" s (String.make l '*') "*)"
+   let s = Printf.sprintf " %s %s" s (String.make l '*') in
+   out_comment och s
 
 let out_preamble och (path, lines) =
    let ich = open_in path in
@@ -55,30 +62,52 @@ let out_preamble och (path, lines) =
 let out_command och cmd =
    let term_pp = NP.pp_term in
    let lazy_term_pp = NP.pp_term in
-   let obj_pp = NP.pp_obj in
-   let s = GP.pp_statement ~term_pp ~lazy_term_pp ~obj_pp cmd in
+   let obj_pp = NP.pp_obj NP.pp_term in
+   let s = GP.pp_statement ~map_unicode_to_tex:false ~term_pp ~lazy_term_pp ~obj_pp cmd in
    Printf.fprintf och "%s\n\n" s
 
 let command_of_obj obj =
    G.Executable (floc, G.Command (floc, obj))
 
+let command_of_macro macro =
+   G.Executable (floc, G.Macro (floc, macro))
+
 let set key value =
    command_of_obj (G.Set (floc, key, value))
 
 let require value =
    command_of_obj (G.Include (floc, value ^ ".ma"))
 
+let coercion value =
+   command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0))
+
+let inline (uri, prefix) =
+    command_of_macro (G.Inline (floc, G.Declarative, uri, prefix))
+
+let out_alias och name uri =
+   Printf.fprintf och "alias id \"%s\" = \"%s\".\n\n" name uri
+
 let commit och items =
+   let trd (_, _, x) = x in
+   let trd_rth (_, _, x, y) = x, y in
    let commit = function
       | T.Heading heading   -> out_preamble och heading
-      | T.BaseUri baseuri   -> out_command och (set "baseuri" baseuri)
-      | T.Include inc       -> () (* *)      
-      | T.Coercion coercion -> () (* *)      
-      | T.Notation notation -> () (* *)      
-      | T.Inline iniline    -> () (* *)
-      | T.Comment comment   -> () (* out_comment och comment *)
-      | T.Unexport unexport -> () (* *)
+      | T.Line line         -> out_line_comment och line
+      | T.BaseUri uri       -> out_command och (set "baseuri" uri)
+      | T.Include script    -> out_command och (require script)
+      | T.Coercion specs    -> out_command och (coercion (snd specs))
+      | T.Notation specs    -> out_unexported och "NOTATION" (snd specs) (**)
+      | T.Inline (_, T.Var, src, _) -> out_alias och (UriManager.name_of_uri (UriManager.uri_of_string src)) src 
+      | T.Inline specs      -> out_command och (inline (trd_rth specs))
+      | T.Section specs     -> out_unexported och "UNEXPORTED" (trd specs)
+      | T.Comment comment   -> out_comment och comment
+      | T.Unexport unexport -> out_unexported och "UNEXPORTED" unexport 
       | T.Verbatim verbatim -> out_verbatim och verbatim
       | T.Discard _         -> ()
    in 
    List.iter commit (List.rev items)
+
+let string_of_inline_kind = function
+   | T.Con -> ".con"
+   | T.Var -> ".var"
+   | T.Ind -> ".ind"