X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcore_notation.moo;h=6f5d78d033bcbd223e2ba1e36f759e0451289ab2;hb=647b419e96770d90a82d7a9e5e8843566a9f93ee;hp=9970c9cfb6d6d331dd4847490f399e6e197ca9fb;hpb=970430a378f27d4e5cc2a45dc2fa3d79bc9bf088;p=helm.git

diff --git a/helm/software/matita/core_notation.moo b/helm/software/matita/core_notation.moo
index 9970c9cfb..6f5d78d03 100644
--- a/helm/software/matita/core_notation.moo
+++ b/helm/software/matita/core_notation.moo
@@ -1,8 +1,24 @@
+(* exists *******************************************************************)
+
+notation "hvbox(∃ _ break . p)"
+ with precedence 20
+for @{'exists $p }.
+
+notation < "hvbox(\exists ident i : ty break . p)"
+ right associative with precedence 20
+for @{'exists (\lambda ${ident i} : $ty. $p) }.
+
+notation < "hvbox(\exists ident i break . p)"
+  with precedence 20
+for @{'exists (\lambda ${ident i}. $p) }.
+
+(*
 notation < "hvbox(\exists ident i opt (: ty) break . p)"
   right associative with precedence 20
 for @{ 'exists ${default
   @{\lambda ${ident i} : $ty. $p}
   @{\lambda ${ident i} . $p}}}.
+*)
 
 notation > "\exists list1 ident x sep , opt (: T). term 19 Px"
   with precedence 20
@@ -11,11 +27,23 @@ notation > "\exists list1 ident x sep , opt (: T). term 19 Px"
           @{ ${ fold right @{$Px} rec acc @{'exists (λ${ident x}.$acc)} } }
        }.
 
+(* sigma ********************************************************************)
+
+notation < "hvbox(\Sigma ident i : ty break . p)"
+ left associative with precedence 20
+for @{'sigma (\lambda ${ident i} : $ty. $p) }.
+
+notation < "hvbox(\Sigma ident i break . p)"
+ with precedence 20
+for @{'sigma (\lambda ${ident i}. $p) }.
+
+(*
 notation < "hvbox(\Sigma ident i opt (: ty) break . p)"
   right associative with precedence 20
 for @{ 'sigma ${default
   @{\lambda ${ident i} : $ty. $p}
   @{\lambda ${ident i} . $p}}}.
+*)
 
 notation > "\Sigma list1 ident x sep , opt (: T). term 19 Px"
   with precedence 20
@@ -24,6 +52,26 @@ notation > "\Sigma list1 ident x sep , opt (: T). term 19 Px"
           @{ ${ fold right @{$Px} rec acc @{'sigma (λ${ident x}.$acc)} } }
        }.
 
+(* equality, conguence ******************************************************)
+
+notation > "hvbox(a break = b)" 
+  non associative with precedence 45
+for @{ 'eq ? $a $b }.
+
+notation < "hvbox(term 46 a break maction (=) (=\sub t) term 46 b)" 
+  non associative with precedence 45
+for @{ 'eq $t $a $b }.
+
+notation > "hvbox(n break (≅ \sub term 90 p) m)"
+  non associative with precedence 45
+for @{ 'congruent $n $m $p }.
+
+notation < "hvbox(term 46 n break ≅ \sub p term 46 m)"
+  non associative with precedence 45
+for @{ 'congruent $n $m $p }.
+
+(* other notations **********************************************************)
+
 notation "hvbox(\langle term 19 a, break term 19 b\rangle)" 
 with precedence 90 for @{ 'pair $a $b}.
 
@@ -47,10 +95,6 @@ notation < "hvbox(a break \to b)"
   right associative with precedence 20
 for @{ \Pi $_:$a.$b }.
 
-notation "hvbox(a break = b)" 
-  non associative with precedence 45
-for @{ 'eq $a $b }.
-
 notation "hvbox(a break \leq b)" 
   non associative with precedence 45
 for @{ 'leq $a $b }.
@@ -67,9 +111,13 @@ notation "hvbox(a break \gt b)"
   non associative with precedence 45
 for @{ 'gt $a $b }.
 
-notation "hvbox(a break \neq b)" 
+notation > "hvbox(a break \neq b)" 
   non associative with precedence 45
-for @{ 'neq $a $b }.
+for @{ 'neq ? $a $b }.
+
+notation < "hvbox(a break maction (\neq) (\neq\sub t) b)" 
+  non associative with precedence 45
+for @{ 'neq $t $a $b }.
 
 notation "hvbox(a break \nleq b)" 
   non associative with precedence 45
@@ -159,7 +207,9 @@ notation "hvbox(a break \leftrightarrow b)"
 for @{ 'iff $a $b }.
 
 
-notation "hvbox(\Omega \sup term 90 A)" non associative with precedence 70
+notation "hvbox(\Omega \sup term 90 A)" non associative with precedence 90
+for @{ 'powerset $A }.
+notation > "hvbox(\Omega ^ term 90 A)" non associative with precedence 90
 for @{ 'powerset $A }.
 
 notation < "hvbox({ ident i | term 19 p })" with precedence 90
@@ -183,10 +233,10 @@ for @{ 'overlaps $a $b }. (* \between *)
 notation "hvbox(a break ⊆ b)" non associative with precedence 45
 for @{ 'subseteq $a $b }. (* \subseteq *)
 
-notation "hvbox(a break ∩ b)" non associative with precedence 55
+notation "hvbox(a break ∩ b)" left associative with precedence 55
 for @{ 'intersects $a $b }. (* \cap *)
 
-notation "hvbox(a break ∪ b)" non associative with precedence 50
+notation "hvbox(a break ∪ b)" left associative with precedence 50
 for @{ 'union $a $b }. (* \cup *)
 
 notation "hvbox({ term 19 a })" with precedence 90 for @{ 'singl $a}.
@@ -210,13 +260,14 @@ notation "↑a" with precedence 55 for @{ 'uparrow $a }.
 
 notation "hvbox(a break ↑ b)" with precedence 55 for @{ 'funion $a $b }.
 
-notation "a \sup term 89 b" with precedence 90 for @{ 'exp $a $b}.
-notation > "a ^ term 89 b"  with precedence 90 for @{ 'exp $a $b}.
-notation "s \sup (-1)" with precedence 90 for @{ 'invert $s }.
-notation > "s ^ (-1)" with precedence 90 for @{ 'invert $s }.
-notation < "s \sup (-1) x" with precedence 90 for @{ 'invert_appl $s $x}. 
+notation < "term 76 a \sup term 90 b" non associative with precedence 75 for @{ 'exp $a $b}.
+notation > "a \sup term 90 b" non associative with precedence 75 for @{ 'exp $a $b}.
+notation > "a ^ term 90 b"  non associative with precedence 75 for @{ 'exp $a $b}.
+notation "s \sup (-1)" non associative with precedence 75 for @{ 'invert $s }.
+notation > "s ^ (-1)" non associative with precedence 75 for @{ 'invert $s }.
+notation < "s \sup (-1) x" non associative with precedence 90 for @{ 'invert_appl $s $x}. 
 
-notation "hvbox(|term 90 C|)" with precedence 69 for @{ 'card $C }.
+notation "| term 19 C |" with precedence 70 for @{ 'card $C }.
 
 notation "\naturals" non associative with precedence 90 for @{'N}.
 notation "\rationals" non associative with precedence 90 for @{'Q}.
@@ -225,3 +276,13 @@ notation "\integers" non associative with precedence 90 for @{'Z}.
 notation "\complexes" non associative with precedence 90 for @{'C}.
 
 notation "\ee" with precedence 90 for @{ 'neutral }. (* ⅇ *)
+
+notation > "x ⊩ y" with precedence 45 for @{'Vdash2 $x $y ?}.
+notation > "x ⊩⎽ term 90 c y" with precedence 45 for @{'Vdash2 $x $y $c}.
+notation "x (⊩ \sub term 90 c) y" with precedence 45 for @{'Vdash2 $x $y $c}.
+notation > "⊩ " with precedence 60 for @{'Vdash ?}.
+notation "(⊩ \sub term 90 c) " with precedence 60 for @{'Vdash $c}.
+
+notation < "maction (mstyle color #ff0000 (­…­)) (t)" 
+non associative with precedence 90 for @{'hide $t}.
+