coqide utf8

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

1 files changed, 40 insertions, 14 deletions

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).
+*)