X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_content%2FcicNotationPp.ml;h=f94891375fa7adddf8be10dc2d817692ae594270;hb=a0b7db9844126ebcdf4b5dbb586514854cef5d93;hp=c82919f4d693640891588165a30ee9e1662c1ad7;hpb=2d3d1750a0012ebc45f97d0000c01141623fc634;p=helm.git

diff --git a/helm/software/components/acic_content/cicNotationPp.ml b/helm/software/components/acic_content/cicNotationPp.ml
index c82919f4d..f94891375 100644
--- a/helm/software/components/acic_content/cicNotationPp.ml
+++ b/helm/software/components/acic_content/cicNotationPp.ml
@@ -140,11 +140,13 @@ let rec pp_term ?(pp_parens = true) t =
     | Ast.Ident (name, Some []) | Ast.Ident (name, None)
     | Ast.Uri (name, Some []) | Ast.Uri (name, None) -> name
     | Ast.NRef nref -> NReference.string_of_reference nref
+    | Ast.NCic cic -> NCicPp.ppterm ~metasenv:[] ~context:[] ~subst:[] cic
     | Ast.Ident (name, Some substs)
     | Ast.Uri (name, Some substs) ->
         sprintf "%s \\subst [%s]" name (pp_substs substs)
-    | Ast.Implicit `Vector -> "?"
-    | Ast.Implicit `JustOne -> "…"
+    | Ast.Implicit `Vector -> "…"
+    | Ast.Implicit `JustOne -> "?"
+    | Ast.Implicit (`Tagged name) -> "?"^name
     | Ast.Meta (index, substs) ->
         sprintf "%d[%s]" index
           (String.concat "; "
@@ -158,7 +160,7 @@ let rec pp_term ?(pp_parens = true) t =
     | Ast.Sort (`NCProp s)-> "CProp[" ^ s ^ "]"
     | Ast.Symbol (name, _) -> "'" ^ name
 
-    | Ast.UserInput -> ""
+    | Ast.UserInput -> "%"
 
     | Ast.Literal l -> pp_literal l
     | Ast.Layout l -> pp_layout l
@@ -168,6 +170,7 @@ let rec pp_term ?(pp_parens = true) t =
   match pp_parens, t with
     | false, _ 
     | true, Ast.Implicit _
+    | true, Ast.UserInput
     | true, Ast.Sort _
     | true, Ast.Ident (_, Some []) 
     | true, Ast.Ident (_, None)    -> t_pp
@@ -321,9 +324,9 @@ let pp_obj pp_term = function
             (pp_term typ) (pp_constructors constructors)
         in
         fst_typ_pp ^ String.concat "" (List.map pp_type tl))
- | Ast.Theorem (`MutualDefinition, name, typ, body) ->
+ | Ast.Theorem (`MutualDefinition, name, typ, body,_) ->
     sprintf "<<pretty printing of mutual definitions not implemented yet>>"
- | Ast.Theorem (flavour, name, typ, body) ->
+ | Ast.Theorem (flavour, name, typ, body,_) ->
     sprintf "%s %s:\n %s\n%s"
       (pp_flavour flavour)
       name