coqide utf8

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5222 85f007b7-540e-0410-9357-904b9bb8a0f7

4 files changed, 49 insertions, 23 deletions

diff --git a/ide/.coqide-gtk2rc b/ide/.coqide-gtk2rc
index 7a74a469d8..11c53dad29 100644
--- a/ide/.coqide-gtk2rc
+++ b/ide/.coqide-gtk2rc
@@ -17,8 +17,8 @@ binding "text" {
   bind "<ctrl>w" { "cut-clipboard" () }
 
 # For UTF-8 inputs !
-  bind "F11" {"insert-at-cursor" ("∀")}
-  bind "F12" {"insert-at-cursor" ("∃")}
+#  bind "F11" {"insert-at-cursor" ("∀")}
+#  bind "F12" {"insert-at-cursor" ("∃")}
 }
 class "GtkTextView" binding "text"
 
@@ -36,7 +36,7 @@ widget "*.*.*.*.MessageWindow" style "views"
 gtk-font-name = "Sans 12"
 
 style "location" {
-font_name = "Monospace 10"
+font_name = "Sans 10"
 }
 widget "*location*" style "location"
 
diff --git a/ide/FAQ b/ide/FAQ
index e20d113a59..2079ef6cee 100644
--- a/ide/FAQ
+++ b/ide/FAQ
@@ -17,8 +17,8 @@ Q4) How to use those Forall and Exists pretty symbols?
 R4) Thanks to the Notation features in Coq, you just need to insert these
 	lines in your Coq Buffer :
 ======================================================================
-Notation "∀ x : t | P" := (x:t)P (at level 1, x,t,P at level 10).
-Notation "∃ x : t | P" := (EXT x:t|P) (at level 1, x,t,P at level 10).
+Notation "∀ x : t, P" := (forall x:t, P) (at level 200, x ident).
+Notation "∃ x : t, P" := (exists x:t, P) (at level 200, x ident).
 ======================================================================
 Copy/Paste of these lines from this file will not work outside of CoqIde.
 You need to load a file containing these lines or to enter the "∀" 
@@ -58,9 +58,9 @@ R6) Use
 Q7) How to customize the shortcuts for menus?
 R7) Two solutions are offered:
   - Edit $HOME/.coqide.keys by hand or
-  - Add "gtk-can-change-accels = 1" in your .coqiderc.gtk2 file. Then
+  - Add "gtk-can-change-accels = 1" in your .coqide-gtk2rc file. Then
     from CoqIde, you may select a menu entry and press the desired 
-    shortcut. Do not forget to save your preferences.
+    shortcut. 
 
 Q8) What encoding should I use? What is this \x{iiii} in my file?
 R8) The encoding option is related to the way files are saved. 
diff --git a/ide/preferences.ml b/ide/preferences.ml
index ad0c19743b..309cc150e3 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -130,7 +130,7 @@ let (current:pref ref) =
     cmd_browse = "netscape -remote \"OpenURL(", ")\"";
     cmd_editor = "emacs ", "";
     
-    text_font = Pango.Font.from_string "Monospace 12";
+    text_font = Pango.Font.from_string "sans 12";
 
     doc_url = "http://coq.inria.fr/doc/";
     library_url = "http://coq.inria.fr/library/";
@@ -294,7 +294,7 @@ let configure () =
     let box = GPack.hbox () in
     let w = GMisc.font_selection () in
     w#set_preview_text
-      "Lemma Truth: ∀ p:Prover, `p < Coq`. Proof. Auto with *. Save."; 
+      "Goal (∃n : nat, n ≤ 0)∧(∀x,y,z, x∈y⋃z↔x∈y∨x∈z).";
     box#pack w#coerce;
     ignore (w#misc#connect#realize 
 	      ~callback:(fun () -> w#set_font_name 
diff --git a/ide/utf8.v b/ide/utf8.v
index 98c2e96381..8428d2e3c4 100644
--- a/ide/utf8.v
+++ b/ide/utf8.v
@@ -1,23 +1,49 @@
 (* Logic *)
-Notation "∀ x : t , P" := (x:t)P (at level 1, x,t,P at level 10).
-Notation "∀ x y : t , P" := (x:t)(y:t)P (at level 1, x,y,t,P at level 10).
-Notation "∀ x y z : t , P" := (x:t)(y:t)(z:t) P (at level 1, x,y,z,t,P at level 10).
-Notation "∀ x y z u : t , P" := (x:t)(y:t)(z:t)(u:t)P (at level 1, x,y,z,u,t,P at level 10).
+Notation "∀ x , P" := 
+  (forall x , P) (at level 200, x ident) : type_scope.
+Notation "∀ x y , P" := 
+  (forall x y , P) (at level 200, x ident, y ident) : type_scope.
+Notation "∀ x y z , P" := 
+  (forall x y z , P) (at level 200, x ident, y ident, z ident) : type_scope.
+Notation "∀ x y z u , P" := 
+  (forall x y z u , P) (at level 200, x ident, y ident, z ident, u ident) : type_scope.
+Notation "∀ x : t , P" := 
+  (forall x : t , P) (at level 200, x ident) : type_scope.
+Notation "∀ x y : t , P" := 
+  (forall x y : t , P) (at level 200, x ident, y ident) : type_scope.
+Notation "∀ x y z : t , P" := 
+  (forall x y z : t , P) (at level 200, x ident, y ident, z ident) : type_scope.
+Notation "∀ x y z u : t , P" := 
+  (forall x y z u : t , P) (at level 200, x ident, y ident, z ident, u ident) : type_scope.
+
+Notation "∃ x , P" := (exists x , P) (at level 200, x ident) : type_scope.
+Notation "∃ x : t , P" := (exists x : t, P) (at level 200, x ident) : type_scope.
+
+Notation "x ∨ y" := (x \/ y) (at level 85, right associativity) : type_scope.
+Notation "x ∧ y" := (x /\ y) (at level 80, right associativity) : type_scope.
+(* DOES NOT WORK 
+Notation "x → y" := (x -> y) (at level 90, right associativity): type_scope.
+*)
+Notation "x ↔ y" := (x <-> y) (at level 95, no associativity): type_scope.
+Notation "⌉ x" := (~x) (at level 75, right associativity) : type_scope.
 
-Notation "∃ x : t , P" := (EXT x:t|P) (at level 1, x,t,P at level 10).
-Notation "x ∨ y" := (x \/ y) (at level 1, y at level 10).
-Notation "x ∧ y" := (x /\ y) (at level 1, y at level 10).
-Notation "x → y" := (x -> y) (at level 1, y at level 10).
-Notation "x ↔ y" := (x <-> y) (at level 1, y at level 10).
-Notation "⌉ x" := (~x) (at level 1, x at level 10).
 
 (* Abstraction *)
+(* Not nice
 Notation  "'λ' x : T , y" := ([x:T] y) (at level 1, x,T,y at level 10).
 Notation  "'λ' x := T , y" := ([x:=T] y) (at level 1, x,T,y at level 10).
+*)
 
 (* Arithmetic *)
-Notation "x ≤ y" := (le x y) (at level 3, y at level 10).
-Notation "x ≥ y" := (ge x y) (at level 3, y at level 10).
+Notation "x ≤ y" := (le x y) (at level 70, no associativity).
+Notation "x ≥ y" := (ge x y) (at level 70, no associativity).
+
+(* test *)
+(*
+Goal ∀ x, (∃ y , x ≥ y + 1) ∨ x ≤ 0.
+*)
 
-(* Require ZArith.
-   Notation "x ≤ y" := (Zle x y) (at level 1, y at level 10).*)
+(* Integer Arithmetic *)
+(* TODO
+Notation "x ≤ y" := (Zle x y) (at level 1, y at level 10).
+*)