Coercions are now generalized to the general form

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

diff --git a/helm/software/components/binaries/transcript/grafite.ml b/helm/software/components/binaries/transcript/grafite.ml
index 86a95270ae53f52395c49cbaefe46a89baa1a743..e88406b5801bcddde3f43923a867ee534cb23a5d 100644 (file)
--- a/helm/software/components/binaries/transcript/grafite.ml
+++ b/helm/software/components/binaries/transcript/grafite.ml
@@ -62,8 +62,8 @@ 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 =
@@ -79,20 +79,27 @@ 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))
+   command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0, 0))
 
-let inline value =
-    command_of_macro (G.Inline (floc, value))
+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.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 uri      -> out_command och (coercion uri)
-      | T.Notation notation -> out_unexported och "NOTATION" notation (**)
-      | T.Inline specs      -> out_command och (inline (snd specs))  
+      | 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