X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambda_delta%2FBasic_2%2Fnotation.ma;h=a9fca999c050e096e09b2b90f9e619d5dfcc01c0;hb=011cf6478141e69822a5b40933f2444d0522532f;hp=813630daeb3de517628ad924399c79268594825a;hpb=5c213ad3e00d815eca11b65ee50d71af82873d6e;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 813630dae..a9fca999c 100644
--- a/matita/matita/contribs/lambda_delta/Basic_2/notation.ma
+++ b/matita/matita/contribs/lambda_delta/Basic_2/notation.ma
@@ -16,6 +16,14 @@
 
 (* Grammar ******************************************************************)
 
+notation "hvbox( ⓪ )"
+ non associative with precedence 90
+ for @{ 'Item0 }.
+
+notation "hvbox( ⓪ { I } )"
+ non associative with precedence 90
+ for @{ 'Item0 $I }.
+
 notation "hvbox( ⋆ )"
  non associative with precedence 90
  for @{ 'Star }.
@@ -32,45 +40,61 @@ notation "hvbox( § term 90 p )"
  non associative with precedence 90
  for @{ 'GRef $p }.
 
-notation "hvbox( 𝕒 )"
+notation "hvbox( ② term 90 T1 . break term 90 T )"
+ non associative with precedence 90
+ for @{ 'SnItem2 $T1 $T }.
+
+notation "hvbox( ② { I } break term 90 T1 . break term 90 T )"
+ non associative with precedence 90
+ for @{ 'SnItem2 $I $T1 $T }.
+
+notation "hvbox( ⓑ { I } break term 90 T1 . break term 90 T )"
  non associative with precedence 90
- for @{ 'SItem }.
+ for @{ 'SnBind2 $I $T1 $T }.
 
-notation "hvbox( 𝕒 { I } )"
+notation "hvbox( ⓕ { I } break term 90 T1 . break term 90 T )"
  non associative with precedence 90
- for @{ 'SItem $I }.
+ for @{ 'SnFlat2 $I $T1 $T }.
 
-notation "hvbox( 𝕔 term 90 T1 . break term 90 T )"
+notation "hvbox( ⓓ  term 90 T1 . break term 90 T2 )"
  non associative with precedence 90
- for @{ 'SItem $T1 $T }.
+ for @{ 'SnAbbr $T1 $T2 }.
 
-notation "hvbox( 𝕔 { I } break term 90 T1 . break term 90 T )"
+notation "hvbox( ⓛ  term 90 T1 . break term 90 T2 )"
  non associative with precedence 90
- for @{ 'SItem $I $T1 $T }.
+ for @{ 'SnAbst $T1 $T2 }.
 
-notation "hvbox( 𝕓 { I } break term 90 T1 . break term 90 T )"
+notation "hvbox( ⓐ  term 90 T1 . break term 90 T2 )"
  non associative with precedence 90
- for @{ 'SBind $I $T1 $T }.
+ for @{ 'SnAppl $T1 $T2 }.
 
-notation "hvbox( 𝕗 { I } break term 90 T1 . break term 90 T )"
+notation "hvbox( ⓣ  term 90 T1 . break term 90 T2 )"
  non associative with precedence 90
- for @{ 'SFlat $I $T1 $T }.
+ for @{ 'SnCast $T1 $T2 }.
 
 notation "hvbox( Ⓐ term 90 T1 . break term 90 T )"
  non associative with precedence 90
- for @{ 'ApplV $T1 $T }.
+ for @{ 'SnApplV $T1 $T }.
 
-notation "hvbox( T . break 𝕓 { I } break term 90 T1 )"
- non associative with precedence 89
- for @{ 'DBind $T $I $T1 }.
-(*
-notation > "hvbox( T . break 𝕔 { I } break term 90 T1 )"
+notation > "hvbox( T . break ②{ I } break term 47 T1 )"
+ non associative with precedence 46
+ for @{ 'DxBind2 $T $I $T1 }.
+
+notation "hvbox( T . break ⓑ { I } break term 90 T1 )"
  non associative with precedence 89
- for @{ 'DBind $T $I $T1 }.
-*) (**) (* this breaks all parsing *)
+ for @{ 'DxBind2 $T $I $T1 }.
+
+notation "hvbox( T1 . break ⓓ T2 )"
+ left associative with precedence 48
+ for @{ 'DxAbbr $T1 $T2 }.
+
+notation "hvbox( T1 . break ⓛ T2 )"
+ left associative with precedence 49
+ for @{ 'DxAbst $T1 $T2 }.
+
 notation "hvbox( T . break ④ { I } break { T1 , break T2 , break T3 } )"
  non associative with precedence 47
- for @{ 'DBind $T $I $T1 $T2 $T3 }.
+ for @{ 'DxItem4 $T $I $T1 $T2 $T3 }.
 
 notation "hvbox( # [ x ] )"
  non associative with precedence 90
@@ -80,16 +104,36 @@ notation "hvbox( # [ x , break y ] )"
  non associative with precedence 90
  for @{ 'Weight $x $y }.
 
-notation "hvbox( 𝕊 [ T ] )"
+notation "hvbox( 𝐒 [ T ] )"
    non associative with precedence 45
    for @{ 'Simple $T }.
 
+notation "hvbox( L ⊢ break term 90 T1 ≈ break T2 )"
+   non associative with precedence 45
+   for @{ 'Hom $L $T1 $T2 }.
+
+notation "hvbox( T1 ≃ break T2 )"
+   non associative with precedence 45
+   for @{ 'Iso $T1 $T2 }.
+
 notation "hvbox( T1 break [ d , break e ] ≼ break T2 )"
    non associative with precedence 45
    for @{ 'SubEq $T1 $d $e $T2 }.
 
 (* Substitution *************************************************************)
 
+notation "hvbox( L ⊢ break [ d , break e ] break 𝐑 [ T ] )"
+   non associative with precedence 45
+   for @{ 'Reducible $L $d $e $T }.
+
+notation "hvbox( L ⊢ break [ d , break e ] break 𝐈 [ T ] )"
+   non associative with precedence 45
+   for @{ 'NotReducible $L $d $e $T }.
+
+notation "hvbox( L ⊢ break [ d , break e ] break 𝐍 [ T ] )"
+   non associative with precedence 45
+   for @{ 'Normal $L $d $e $T }.
+
 notation "hvbox( ⇧ [ d , break e ] break T1 ≡ break T2 )"
    non associative with precedence 45
    for @{ 'RLift $d $e $T1 $T2 }.
@@ -150,53 +194,57 @@ notation "hvbox( L ⊢ break term 90 T ÷ break A )"
    non associative with precedence 45
    for @{ 'AtomicArity $L $T $A }.
 
+notation "hvbox( T1 ÷ ⊑ break T2 )"
+   non associative with precedence 45
+   for @{ 'CrSubEqA $T1 $T2 }.
+
 (* Reducibility *************************************************************)
 
-notation "hvbox( ℝ [ T ] )"
+notation "hvbox( 𝐑 [ T ] )"
    non associative with precedence 45
    for @{ 'Reducible $T }.
 
-notation "hvbox( L ⊢ ℝ [ T ] )"
+notation "hvbox( L ⊢ break 𝐑 [ T ] )"
    non associative with precedence 45
    for @{ 'Reducible $L $T }.
 
-notation "hvbox( 𝕀 [ T ] )"
+notation "hvbox( 𝐈 [ T ] )"
    non associative with precedence 45
    for @{ 'NotReducible $T }.
 
-notation "hvbox( L ⊢ 𝕀 [ T ] )"
+notation "hvbox( L ⊢ break 𝐈 [ T ] )"
    non associative with precedence 45
    for @{ 'NotReducible $L $T }.
 
-notation "hvbox( ℕ [ T ] )"
+notation "hvbox( 𝐍 [ T ] )"
    non associative with precedence 45
    for @{ 'Normal $T }.
 
-notation "hvbox( L ⊢ ℕ [ T ] )"
+notation "hvbox( L ⊢ break 𝐍 [ T ] )"
    non associative with precedence 45
    for @{ 'Normal $L $T }.
 
-notation "hvbox( 𝕎ℍℝ [ T ] )"
+notation "hvbox( 𝐖𝐇𝐑 [ T ] )"
    non associative with precedence 45
    for @{ 'WHdReducible $T }.
 
-notation "hvbox( L ⊢ 𝕎ℍℝ [ T ] )"
+notation "hvbox( L ⊢ break 𝐖𝐇𝐑 [ T ] )"
    non associative with precedence 45
    for @{ 'WHdReducible $L $T }.
 
-notation "hvbox( 𝕎ℍ𝕀 [ T ] )"
+notation "hvbox( 𝐖𝐇𝐈 [ T ] )"
    non associative with precedence 45
    for @{ 'NotWHdReducible $T }.
 
-notation "hvbox( L ⊢ 𝕎ℍ𝕀 [ T ] )"
+notation "hvbox( L ⊢ break 𝐖𝐇𝐈 [ T ] )"
    non associative with precedence 45
    for @{ 'NotWHdReducible $L $T }.
 
-notation "hvbox( 𝕎ℍℕ [ T ] )"
+notation "hvbox( 𝐖𝐇𝐍 [ T ] )"
    non associative with precedence 45
    for @{ 'WHdNormal $T }.
 
-notation "hvbox( L ⊢ 𝕎ℍℕ [ T ] )"
+notation "hvbox( L ⊢ break 𝐖𝐇𝐍 [ T ] )"
    non associative with precedence 45
    for @{ 'WHdNormal $L $T }.
 
@@ -234,6 +282,10 @@ notation "hvbox( L ⊢ ⬇ * T )"
    non associative with precedence 45
    for @{ 'SN $L $T }.
 
+notation "hvbox( L ⊢ ⬇ * * T )"
+   non associative with precedence 45
+   for @{ 'SNStar $L $T }.
+
 notation "hvbox( ⦃ L, break T ⦄ break [ R ] ϵ break 〚 A 〛 )"
    non associative with precedence 45
    for @{ 'InEInt $R $L $T $A }.
@@ -242,16 +294,14 @@ notation "hvbox( T1 break [ R ] ⊑ break T2 )"
    non associative with precedence 45
    for @{ 'CrSubEq $T1 $R $T2 }.
 
-(* Functional ***************************************************************)
+(* Conversion ***************************************************************)
 
-notation "hvbox( ↑ [ d , break e ] break T )"
-   non associative with precedence 55
-   for @{ 'Lift $d $e $T }.
+notation "hvbox( L ⊢ break term 90 T1 ⬌ break T2 )"
+   non associative with precedence 45
+   for @{ 'PConv $L $T1 $T2 }.
 
-notation "hvbox( [ d ← break V ] break T )"
-   non associative with precedence 55
-   for @{ 'Subst $V $d $T }.
+(* Equivalence **************************************************************)
 
-notation "hvbox( T1 ⇨ break T2 )"
+notation "hvbox( L ⊢ break term 90 T1 ⬌* break T2 )"
    non associative with precedence 45
-   for @{ 'SRed $T1 $T2 }.
+   for @{ 'PConvStar $L $T1 $T2 }.