X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2FmatitaTypes.ml;h=30e64892cc2ede541a3313994e52325c170a4fbf;hb=2b4ed41c3d8a105f1f9921b37e7f11160001bbe7;hp=791713e56a4b5e13f2fa302cf7c87dac52796c6d;hpb=894c3e4038c93b484896e81132eae55046e47605;p=helm.git

diff --git a/helm/software/matita/matitaTypes.ml b/helm/software/matita/matitaTypes.ml
index 791713e56..30e64892c 100644
--- a/helm/software/matita/matitaTypes.ml
+++ b/helm/software/matita/matitaTypes.ml
@@ -36,28 +36,38 @@ type abouts =
   | `Current_proof
   | `Us
   | `Coercions
+  | `CoercionsFull
+  | `TeX
+  | `Grammar
+  | `Hints
   ]
   
 type mathViewer_entry =
   [ `About of abouts  (* current proof *)
   | `Check of string  (* term *)
   | `Cic of Cic.term * Cic.metasenv
-  | `Development of string
+  | `NCic of NCic.term * NCic.context * NCic.metasenv * NCic.substitution
   | `Dir of string  (* "directory" in cic uris namespace *)
   | `HBugs of [ `Tutors ] (* list of available HBugs tutors *)
   | `Metadata of [ `Deps of [`Fwd | `Back] * UriManager.uri ]
   | `Uri of UriManager.uri (* cic object uri *)
+  | `NRef of NReference.reference (* cic object uri *)
   | `Whelp of string * UriManager.uri list (* query and results *)
+  | `Univs of UriManager.uri
   ]
 
 let string_of_entry = function
   | `About `Blank -> "about:blank"
   | `About `Current_proof -> "about:proof"
   | `About `Us -> "about:us"
-  | `About `Coercions -> "about:coercions"
+  | `About `Coercions -> "about:coercions?tred=true"
+  | `About `CoercionsFull -> "about:coercions"
+  | `About `TeX -> "about:tex"
+  | `About `Grammar -> "about:grammar"
+  | `About `Hints -> "about:hints"
   | `Check _ -> "check:"
   | `Cic (_, _) -> "term:"
-  | `Development d -> "devel:/" ^ d
+  | `NCic (_, _, _, _) -> "nterm:"
   | `Dir uri -> uri
   | `HBugs `Tutors -> "hbugs:/tutors/"
   | `Metadata meta ->
@@ -71,13 +81,19 @@ let string_of_entry = function
             String.sub suri 4 (len - 4) in (* strip "cic:" prefix *)
           (match dir with | `Fwd -> "forward" | `Back -> "backward") ^ suri)
   | `Uri uri -> UriManager.string_of_uri uri
+  | `NRef nref -> NReference.string_of_reference nref
   | `Whelp (query, _) -> query
+  | `Univs uri -> "univs:" ^ UriManager.string_of_uri uri
 
 let entry_of_string = function
   | "about:blank" -> `About `Blank
   | "about:proof" -> `About `Current_proof
   | "about:us"    -> `About `Us
-  | "about:coercions"    -> `About `Coercions
+  | "about:hints"    -> `About `Hints
+  | "about:coercions?tred=true"    -> `About `Coercions
+  | "about:coercions"    -> `About `CoercionsFull
+  | "about:tex"    -> `About `TeX
+  | "about:grammar"    -> `About `Grammar
   | _ ->  (* only about entries supported ATM *)
       raise (Invalid_argument "entry_of_string")
 
@@ -89,4 +105,7 @@ class type mathViewer =
     method show_entry: ?reuse:bool -> mathViewer_entry -> unit
     method show_uri_list:
       ?reuse:bool -> entry:mathViewer_entry -> UriManager.uri list -> unit
+    method screenshot: 
+      GrafiteTypes.status -> NCic.metasenv -> NCic.metasenv ->
+        NCic.substitution -> string -> unit
   end