X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=matita%2Fmatita%2Fcontribs%2Flambda_delta%2Fbasic_2%2Fnotation.ma;h=eb59a9d8f9bbc2bd55953ca26839913ad5c4db4f;hb=4bea40e6589ce21c15ecf99bdd5bd2a1c62f6809;hp=f53dcf86710a2615e9d3a8acebda1f0e334b60a4;hpb=f7386d0b74f935f07ede4be46d0489a233d68b85;p=helm.git

diff --git a/matita/matita/contribs/lambda_delta/basic_2/notation.ma b/matita/matita/contribs/lambda_delta/basic_2/notation.ma
index f53dcf867..eb59a9d8f 100644
--- a/matita/matita/contribs/lambda_delta/basic_2/notation.ma
+++ b/matita/matita/contribs/lambda_delta/basic_2/notation.ma
@@ -162,9 +162,9 @@ notation "hvbox( ⇩ [ d , break e ] break term 46 L1 ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'RDrop $d $e $L1 $L2 }.
 
-notation "hvbox( ⦃ L1, break T1 ⦄ > break ⦃ L2 , break T2 ⦄ )"
+notation "hvbox( ⦃ L1, break T1 ⦄ ⧁ break ⦃ L2 , break T2 ⦄ )"
    non associative with precedence 45
-   for @{ 'SupTerm $L1 $T1 $L2 $T2 }.
+   for @{ 'RestSupTerm $L1 $T1 $L2 $T2 }.
 
 notation "hvbox( L ⊢ break ⌘ ⦃ T ⦄ ≡ break term 46 k )"
    non associative with precedence 45
@@ -192,9 +192,13 @@ notation "hvbox( ⇩ * [ e ] break term 46 L1 ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'RDropStar $e $L1 $L2 }.
 
-notation "hvbox( ⦃ L1, break T1 ⦄ > * break ⦃ L2 , break T2 ⦄ )"
+notation "hvbox( ⦃ L1, break T1 ⦄ ⧁ + break ⦃ L2 , break T2 ⦄ )"
    non associative with precedence 45
-   for @{ 'SupTermStar $L1 $T1 $L2 $T2 }.
+   for @{ 'RestSupTermPlus $L1 $T1 $L2 $T2 }.
+
+notation "hvbox( ⦃ L1, break T1 ⦄ ⧁ * break ⦃ L2 , break T2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'RestSupTermStar $L1 $T1 $L2 $T2 }.
 
 notation "hvbox( T1 break ▶ * [ d , break e ] break term 46 T2 )"
    non associative with precedence 45
@@ -254,10 +258,6 @@ notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 • break [ g , break
    non associative with precedence 45
    for @{ 'StaticType $h $g $l $L $T1 $T2 }.
 
-notation "hvbox( h ⊢ break term 46 L1 • ≃ [ g ] break term 46 L2 )"
-   non associative with precedence 45
-   for @{ 'CCongS $h $g $L1 $L2 }.
-
 notation "hvbox( h ⊢ break term 46 L1 • ⊑ [ g ] break term 46 L2 )"
    non associative with precedence 45
    for @{ 'CrSubEqS $h $g $L1 $L2 }.
@@ -340,10 +340,6 @@ notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 • ➡ break [ g ] br
    non associative with precedence 45
    for @{ 'XPRed $h $g $L $T1 $T2 }.
 
-notation "hvbox( h ⊢ break ⦃ L1, break T1 ⦄ • ⥸ break [ g ] break ⦃ L2 , break T2 ⦄ )"
-   non associative with precedence 45
-   for @{ 'YPRed $h $g $L1 $T1 $L2 $T2 }.
-
 (* Computation **************************************************************)
 
 notation "hvbox( T1 ➡ * break term 46 T2 )"
@@ -406,14 +402,6 @@ notation "hvbox( ⦃ h , break L ⦄ ⊢ • ⬊ * break [ g ] break term 46 T2
    non associative with precedence 45
    for @{ 'XSN $h $g $L $T }.
 
-notation "hvbox( h ⊢ break ⦃ L1, break T1 ⦄ • ⥸  * break [ g ] break ⦃ L2 , break T2 ⦄ )"
-   non associative with precedence 45
-   for @{ 'YPRedStar $h $g $L1 $T1 $L2 $T2 }.
-
-notation "hvbox( h ⊢ break ⦃ L1, break T1 ⦄ • ⭃ * break [ g ] break ⦃ L2 , break T2 ⦄ )"
-   non associative with precedence 45
-   for @{ 'YPRedStepStar $h $g $L1 $T1 $L2 $T2 }.
-
 (* Conversion ***************************************************************)
 
 notation "hvbox( L ⊢ break term 46 T1 ⬌ break term 46 T2 )"
@@ -442,6 +430,10 @@ notation "hvbox( L ⊢ break term 46 T1 ⬌* break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PConvStar $L $T1 $T2 }.
 
+notation "hvbox( h ⊢ break term 46 L1 ⊢ • ⊑ [ g ] break term 46 L2 )"
+   non associative with precedence 45
+   for @{ 'CrSubEqSE $h $g $L1 $L2 }.
+
 notation "hvbox( ⦃ L1 ⦄ ⬌ * break ⦃ L2 ⦄ )"
    non associative with precedence 45
    for @{ 'FocalizedPConvStar $L1 $L2 }.
@@ -464,6 +456,10 @@ notation "hvbox( ⦃ h , break L ⦄ ⊩ break term 46 T : break [ g ] )"
    non associative with precedence 45
    for @{ 'NativeValid $h $g $L $T }.
 
+notation "hvbox( h ⊢ break term 46 L1 ⊩ : ⊑ [ g ] break term 46 L2 )"
+   non associative with precedence 45
+   for @{ 'CrSubEqV $h $g $L1 $L2 }.
+
 notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 : break term 46 T2 )"
    non associative with precedence 45
    for @{ 'NativeType $h $L $T1 $T2 }.