X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite%2FgrafiteAstPp.ml;h=44755225b57f01fbe7c12593209ef18ec16d2f82;hb=13ba137818ee06fcc9509663161651db85fde39f;hp=b74677949f5dc309e914f60b5b22317da298abd3;hpb=d17a38ddca548c784e9efa7c55e87c80203b024d;p=helm.git

diff --git a/helm/software/components/grafite/grafiteAstPp.ml b/helm/software/components/grafite/grafiteAstPp.ml
index b74677949..44755225b 100644
--- a/helm/software/components/grafite/grafiteAstPp.ml
+++ b/helm/software/components/grafite/grafiteAstPp.ml
@@ -101,6 +101,12 @@ let pp_ntactic ~map_unicode_to_tex = function
   | NId _ -> "nid"
   | NIntro (_,n) -> "#" ^ n
   | NRewrite (_,dir,n,where) -> "nrewrite" ^ assert false
+  | NAuto (_,(l,flgs)) ->
+      "nauto" ^ 
+        (if l <> [] then (" by " ^
+         (String.concat "," (List.map CicNotationPp.pp_term l))) else "") ^
+        String.concat " " (List.map (fun a,b -> a ^ "=" ^ b) flgs)
+  | NReduce _ | NGeneralize _ | NLetIn _ | NAssert _ -> assert false
 ;;
 
 let rec pp_tactic ~map_unicode_to_tex ~term_pp ~lazy_term_pp =
@@ -280,11 +286,15 @@ let pp_macro ~term_pp ~lazy_term_pp =
   let pp_inline_params l =
      let pp_param = function
         | IPPrefix prefix -> "prefix = \"" ^ prefix ^ "\""
-	| IPAs flavour -> flavour_pp flavour
-	| IPProcedural -> "procedural"
-	| IPNoDefaults -> "nodefaults"
+	| IPAs flavour  -> flavour_pp flavour
+	| IPCoercions   -> "coercions"
+	| IPDebug debug -> "debug = " ^ string_of_int debug
+	| IPProcedural  -> "procedural"
+	| IPNoDefaults  -> "nodefaults"
 	| IPDepth depth -> "depth = " ^ string_of_int depth
 	| IPLevel level -> "level = " ^ string_of_int level
+	| IPComments    -> "comments"
+	| IPCR          -> "cr"
      in
      let s = String.concat " " (List.map pp_param l) in
      if s = "" then s else " " ^ s
@@ -341,8 +351,8 @@ let pp_command ~term_pp ~obj_pp = function
       "unification hint " ^ string_of_int n ^ " " ^ term_pp t
   | Default (_,what,uris) -> pp_default what uris
   | Drop _ -> "drop"
-  | Include (_,false,path) -> "include \"" ^ path ^ "\""
-  | Include (_,true,path) -> "include source \"" ^ path ^ "\""
+  | Include (_,true,path) -> "include \"" ^ path ^ "\""
+  | Include (_,false,path) -> "include source \"" ^ path ^ "\""
   | Obj (_,obj) -> obj_pp obj
   | Qed _ -> "qed"
   | Relation (_,id,a,aeq,refl,sym,trans) ->
@@ -358,9 +368,9 @@ let pp_command ~term_pp ~obj_pp = function
        | None -> "")
   | Print (_,s) -> "print " ^ s
   | Set (_, name, value) -> Printf.sprintf "set \"%s\" \"%s\"" name value
-  | NObj (_,o) -> "not supported"
+  | NObj (_,o)
   | NUnivConstraint (_) -> "not supported"
-  | NQed (_) -> "not supported"
+  | NQed (_) -> "nqed"
   | Pump (_) -> "not supported"
 
 let pp_punctuation_tactical =
@@ -394,6 +404,9 @@ let pp_executable ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =
   | NonPunctuationTactical (_, tac, punct) ->
      pp_non_punctuation_tactical tac
      ^ pp_punctuation_tactical punct
+  | NNonPunctuationTactical (_, tac, punct) ->
+     pp_non_punctuation_tactical tac
+     ^ pp_punctuation_tactical punct
   | Command (_, cmd) -> pp_command ~term_pp ~obj_pp cmd ^ "."
                       
 let pp_comment ~map_unicode_to_tex ~term_pp ~lazy_term_pp ~obj_pp =