X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitaMisc.ml;h=73fdd4c54e2ef6a2c5bcc605ea593410f64549fa;hb=bbe7741f3bbaacb93f2876c018dace82f5e929b8;hp=58fa388091e7c165ff76783141c82e6d55efd798;hpb=de9a83f286eee12117fb478ea2db18f7faebac9a;p=helm.git

diff --git a/helm/matita/matitaMisc.ml b/helm/matita/matitaMisc.ml
index 58fa38809..73fdd4c54 100644
--- a/helm/matita/matitaMisc.ml
+++ b/helm/matita/matitaMisc.ml
@@ -58,11 +58,11 @@ let strip_trailing_blanks =
   fun s -> Pcre.replace ~rex s
 
 let empty_mathml () =
-  Misc.domImpl#createDocument ~namespaceURI:(Some Misc.mathml_ns)
+  DomMisc.domImpl#createDocument ~namespaceURI:(Some DomMisc.mathml_ns)
     ~qualifiedName:(Gdome.domString "math") ~doctype:None
 
 let empty_boxml () =
-  Misc.domImpl#createDocument ~namespaceURI:(Some Misc.boxml_ns) 
+  DomMisc.domImpl#createDocument ~namespaceURI:(Some DomMisc.boxml_ns) 
     ~qualifiedName:(Gdome.domString "box") ~doctype:None
 
 exception History_failure
@@ -76,17 +76,30 @@ class type ['a] history =
     method previous : 'a
     method load: 'a memento -> unit
     method save: 'a memento
+    method is_begin: bool
+    method is_end: bool
   end
 
+class basic_history (head, tail, cur) =
+  object
+    val mutable hd = head  (* insertion point *)
+    val mutable tl = tail (* oldest inserted item *)
+    val mutable cur = cur  (* current item for the history *)
+    
+    method is_begin = cur <= tl
+    method is_end = cur >= hd
+  end
+  
+  
 class shell_history size =
   let size = size + 1 in
   let decr x = let x' = x - 1 in if x' < 0 then size + x' else x' in
   let incr x = (x + 1) mod size in
   object (self)
     val data = Array.create size ""
-    val mutable hd = 0  (* insertion point *)
-    val mutable tl = -1 (* oldest inserted item *)
-    val mutable cur = -1  (* current item for the history *)
+
+    inherit basic_history (0, -1 , -1)
+    
     method add s =
       data.(hd) <- s;
       if tl = -1 then tl <- hd;
@@ -112,9 +125,9 @@ class ['a] browser_history ?memento size init =
   object (self)
     initializer match memento with Some m -> self#load m | _ -> ()
     val data = Array.create size init
-    val mutable hd = 0
-    val mutable tl = 0
-    val mutable cur = 0
+
+    inherit basic_history (0, 0, 0)
+    
     method previous =
       if cur = tl then raise History_failure;
       cur <- cur - 1;
@@ -126,12 +139,15 @@ class ['a] browser_history ?memento size init =
       if cur = size then cur <- 0;
       data.(cur)
     method add (e:'a) =
-      cur <- cur + 1;
-      if cur = size then cur <- 0;
-      if cur = tl then tl <- tl + 1;
-      if tl = size then tl <- 0;
-      hd <- cur;
-      data.(cur) <- e
+      if e <> data.(cur) then
+        begin
+          cur <- cur + 1;
+          if cur = size then cur <- 0;
+          if cur = tl then tl <- tl + 1;
+          if tl = size then tl <- 0;
+          hd <- cur;
+          data.(cur) <- e
+        end
     method load (data', hd', tl', cur') =
       assert (Array.length data = Array.length data');
       hd <- hd'; tl <- tl'; cur <- cur';
@@ -169,8 +185,12 @@ let get_proof_context status =
       let (_, context, _) = CicUtil.lookup_meta goal metasenv in
       context
   | _ -> []
+ 
+let get_proof_aliases status = status.aliases
   
 let qualify status name = get_string_option status "baseuri" ^ "/" ^ name
 
 let unopt = function None -> failwith "unopt: None" | Some v -> v
 
+let image_path n = sprintf "%s/%s" BuildTimeConf.images_dir n
+