X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Ftranscript%2Fgrafite.ml;h=ef2105afb17756217de25c55437f3285d18b458d;hb=298868e07163c21863d542136733d24bfbec2482;hp=374d3bda6c077cb3fe8e49f84c22f818e03c9315;hpb=438a29376390222b94c1fe9772917c3aad50d42e;p=helm.git

diff --git a/helm/software/components/binaries/transcript/grafite.ml b/helm/software/components/binaries/transcript/grafite.ml
index 374d3bda6..ef2105afb 100644
--- a/helm/software/components/binaries/transcript/grafite.ml
+++ b/helm/software/components/binaries/transcript/grafite.ml
@@ -25,6 +25,7 @@
 
 module T = Types
 
+module UM = UriManager
 module NP = CicNotationPp
 module GP = GrafiteAstPp
 module G = GrafiteAst
@@ -61,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 =
@@ -77,18 +78,32 @@ let set key value =
 let require value =
    command_of_obj (G.Include (floc, value ^ ".ma"))
 
-let inline value =
-    command_of_macro (G.Inline (floc, value))
+let coercion value =
+   command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0, 0))
 
-let commit och items =
+let inline (kind, uri, prefix) =
+    let kind = match kind with
+       | T.Declarative -> G.Declarative
+       | T.Procedural  -> G.Procedural None 
+    in
+    command_of_macro (G.Inline (floc, kind, uri, prefix))
+
+let out_alias och name uri =
+   Printf.fprintf och "alias id \"%s\" = \"%s\".\n\n" name uri
+
+let commit kind och items =
+   let trd (_, _, x) = x in
+   let trd_rth kind (_, _, x, y) = kind, x, y in
    let commit = function
       | T.Heading heading   -> out_preamble och heading
       | T.Line line         -> out_line_comment och line
-      | T.BaseUri baseuri   -> out_command och (set "baseuri" baseuri)
-      | T.Include inc       -> out_unexported och "INCLUDE" inc (**)
-      | T.Coercion coercion -> out_unexported och "COERCION" coercion (**)
-      | T.Notation notation -> out_unexported och "NOTATION" notation (**)
-      | T.Inline (_, uri)   -> out_command och (inline uri)  
+      | T.BaseUri uri       -> out_command och (set "baseuri" uri)
+      | T.Include script    -> out_command och (require script)
+      | T.Coercion specs    -> out_unexported 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 kind 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