X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Flib%2Fbasics%2Fcore_notation.ma;h=dd672ee842ba699f8556bd9b09ba80fb21ea278d;hb=ea368a02a071bb99eeb84bf24ab4000acb314d60;hp=4eae6c6c34467f679a90cafa4f8d6fe15e601798;hpb=c9c6cae5121a25b05450ea42578f14f74569cfbf;p=helm.git diff --git a/matita/matita/lib/basics/core_notation.ma b/matita/matita/lib/basics/core_notation.ma index 4eae6c6c3..dd672ee84 100644 --- a/matita/matita/lib/basics/core_notation.ma +++ b/matita/matita/lib/basics/core_notation.ma @@ -27,6 +27,14 @@ notation > "\exists list1 ident x sep , opt (: T). term 19 Px" @{ ${ fold right @{$Px} rec acc @{'exists (λ${ident x}.$acc)} } } }. +notation > "hvbox(∃∃ ident x0 break . term 19 P0 break & term 19 P1)" + non associative with precedence 20 + for @{ 'exists2 (λ${ident x0}.$P0) (λ${ident x0}.$P1) }. + +notation < "hvbox(∃∃ ident x0 break . term 19 P0 break & term 19 P1)" + non associative with precedence 20 + for @{ 'exists2 (λ${ident x0}:$T0.$P0) (λ${ident x0}:$T0.$P1) }. + (* sigma ********************************************************************) notation < "hvbox(\Sigma ident i : ty break . p)" @@ -175,23 +183,23 @@ notation "hvbox(a break \ndivides b)" for @{ 'ndivides $a $b }. notation "hvbox(a break + b)" - left associative with precedence 50 + left associative with precedence 55 for @{ 'plus $a $b }. notation "hvbox(a break - b)" - left associative with precedence 50 + left associative with precedence 55 for @{ 'minus $a $b }. notation "hvbox(a break * b)" - left associative with precedence 55 + left associative with precedence 60 for @{ 'times $a $b }. notation "hvbox(a break \middot b)" - left associative with precedence 55 + left associative with precedence 60 for @{ 'middot $a $b }. notation "hvbox(a break \mod b)" - left associative with precedence 55 + left associative with precedence 60 for @{ 'module $a $b }. notation < "a \frac b" @@ -199,14 +207,14 @@ notation < "a \frac b" for @{ 'divide $a $b }. notation "a \over b" - left associative with precedence 55 + left associative with precedence 60 for @{ 'divide $a $b }. notation "hvbox(a break / b)" - left associative with precedence 55 + left associative with precedence 60 for @{ 'divide $a $b }. -notation "- term 60 a" with precedence 60 +notation "- term 65 a" with precedence 65 for @{ 'uminus $a }. notation "a !" @@ -214,7 +222,7 @@ notation "a !" for @{ 'fact $a }. notation "\sqrt a" - non associative with precedence 60 + non associative with precedence 65 for @{ 'sqrt $a }. notation "hvbox(a break \lor b)" @@ -249,25 +257,28 @@ for @{ 'subset (\lambda ${ident i} : $nonexistent . $p)}. notation > "hvbox({ ident i | term 19 p })" with precedence 90 for @{ 'subset (\lambda ${ident i}. $p)}. -notation < "hvbox({ ident i ∈ s | term 19 p })" with precedence 90 +notation < "hvbox({ ident i ∈ term 19 s | term 19 p })" with precedence 90 for @{ 'comprehension $s (\lambda ${ident i} : $nonexistent . $p)}. -notation > "hvbox({ ident i ∈ s | term 19 p })" with precedence 90 +notation > "hvbox({ ident i ∈ term 19 s | term 19 p })" with precedence 90 for @{ 'comprehension $s (\lambda ${ident i}. $p)}. notation "hvbox(a break ∈ b)" non associative with precedence 45 for @{ 'mem $a $b }. +notation "hvbox(a break ∉ b)" non associative with precedence 45 +for @{ 'notmem $a $b }. + notation "hvbox(a break ≬ b)" non associative with precedence 45 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)" left associative with precedence 55 +notation "hvbox(a break ∩ b)" left associative with precedence 60 for @{ 'intersects $a $b }. (* \cap *) -notation "hvbox(a break ∪ b)" left associative with precedence 50 +notation "hvbox(a break ∪ b)" left associative with precedence 55 for @{ 'union $a $b }. (* \cup *) notation "hvbox({ term 19 a })" with precedence 90 for @{ 'singl $a}. @@ -279,17 +290,17 @@ notation "hvbox(a break # b)" non associative with precedence 45 for @{ 'apart $a $b}. notation "hvbox(a break \circ b)" - left associative with precedence 55 + left associative with precedence 60 for @{ 'compose $a $b }. -notation < "↓ \ensp a" with precedence 55 for @{ 'downarrow $a }. -notation > "↓ a" with precedence 55 for @{ 'downarrow $a }. +notation < "↓ \ensp a" with precedence 60 for @{ 'downarrow $a }. +notation > "↓ a" with precedence 60 for @{ 'downarrow $a }. -notation "hvbox(U break ↓ V)" non associative with precedence 55 for @{ 'fintersects $U $V }. +notation "hvbox(U break ↓ V)" non associative with precedence 60 for @{ 'fintersects $U $V }. -notation "↑a" with precedence 55 for @{ 'uparrow $a }. +notation "↑a" with precedence 60 for @{ 'uparrow $a }. -notation "hvbox(a break ↑ b)" with precedence 55 for @{ 'funion $a $b }. +notation "hvbox(a break ↑ b)" with precedence 60 for @{ 'funion $a $b }. 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}. @@ -311,8 +322,8 @@ 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 > "⊩ " with precedence 65 for @{'Vdash ?}. +notation "(⊩ \sub term 90 c) " with precedence 65 for @{'Vdash $c}. notation < "maction (mstyle color #ff0000 (­…­)) (t)" non associative with precedence 90 for @{'hide $t}.