X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Ftranscript%2Fgrafite.ml;h=f5c4a49f8ccabe1f2f95f89554904a2c9f2440be;hb=418b1f26ab67b824c79d1146fdb50ca29b34c1f6;hp=dcc6b9fb10ca398bf98d7aaa3f2e08f19ab33950;hpb=876f16ec4e9080bad4e39bd9c203d6529dcf4f56;p=helm.git

diff --git a/helm/software/components/binaries/transcript/grafite.ml b/helm/software/components/binaries/transcript/grafite.ml
index dcc6b9fb1..f5c4a49f8 100644
--- a/helm/software/components/binaries/transcript/grafite.ml
+++ b/helm/software/components/binaries/transcript/grafite.ml
@@ -24,6 +24,7 @@
  *)
 
 module T = Types
+module O = Options
 
 module UM = UriManager
 module NP = CicNotationPp
@@ -62,8 +63,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 =
@@ -72,29 +73,47 @@ let command_of_obj 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))
+   command_of_obj (G.Coercion (floc, UM.uri_of_string value, true, 0, 0))
+
+let inline (kind, uri, prefix, flavour) =
+    let kind = match kind with
+       | T.Declarative -> G.Declarative
+       | T.Procedural  -> G.Procedural None 
+    in
+    command_of_macro (G.Inline (floc, kind, uri, prefix, flavour))
 
-let inline value =
-    command_of_macro (G.Inline (floc, value))
+let out_alias och name uri =
+   Printf.fprintf och "alias id \"%s\" = \"%s\".\n\n" name uri
 
-let commit och items =
+let commit kind och items =
+   let trd (_, _, x) = x in
+   let trd_rth kind (_, _, x, y, z) = kind, x, y, z 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.Line line         ->
+         if !O.comments then out_line_comment och line
       | 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 specs      -> out_command och (inline (snd specs))  
-      | T.Comment comment   -> out_comment och comment
-      | T.Unexport unexport -> out_unexported och "UNEXPORTED" unexport 
+      | T.Coercion specs    -> 
+         if !O.comments then out_unexported och "COERCION" (snd specs)
+      | T.Notation specs    -> 
+         if !O.comments then out_unexported och "NOTATION" (snd specs) (**)
+      | T.Inline (_, T.Var, src, _, _) ->
+         if !O.comments then out_unexported och "UNEXPORTED" src
+(* FG: we do not export variables because we cook the other object         
+ *	 let name = UriManager.name_of_uri (UriManager.uri_of_string src) in
+ *       out_alias och name src
+ *)
+      | T.Inline specs      -> out_command och (inline (trd_rth kind specs))
+      | T.Section specs     -> 
+         if !O.comments then out_unexported och "UNEXPORTED" (trd specs)
+      | T.Comment comment   -> 
+         if !O.comments then out_comment och comment
+      | T.Unexport unexport -> 
+         if !O.comments then out_unexported och "UNEXPORTED" unexport 
       | T.Verbatim verbatim -> out_verbatim och verbatim
       | T.Discard _         -> ()
    in