X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambda_delta%2Fbasic_2%2Fnotation.ma;h=8a947e683f9ffadc53cf479ca0b796f65d5269d5;hb=ea83c19f4cac864dd87eb059d8aeb2343eba480f;hp=ae40690e7d1c5244358bff126bab163720f4d6fb;hpb=eaaea3c18083de3e442e939768ff450d3b093911;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 ae40690e7..8a947e683 100644
--- a/matita/matita/contribs/lambda_delta/basic_2/notation.ma
+++ b/matita/matita/contribs/lambda_delta/basic_2/notation.ma
@@ -16,7 +16,7 @@
 
 (* Grammar ******************************************************************)
 
-notation "hvbox( ⓪ )"
+notation "⓪"
  non associative with precedence 90
  for @{ 'Item0 }.
 
@@ -24,7 +24,7 @@ notation "hvbox( ⓪ { I } )"
  non associative with precedence 90
  for @{ 'Item0 $I }.
 
-notation "hvbox( ⋆ )"
+notation "⋆"
  non associative with precedence 90
  for @{ 'Star }.
 
@@ -68,7 +68,7 @@ notation "hvbox( ⓐ  term 55 T1 . break term 55 T2 )"
  non associative with precedence 55
  for @{ 'SnAppl $T1 $T2 }.
 
-notation "hvbox( ⓣ  term 55 T1 . break term 55 T2 )"
+notation "hvbox( ⓝ  term 55 T1 . break term 55 T2 )"
  non associative with precedence 55
  for @{ 'SnCast $T1 $T2 }.
 
@@ -104,7 +104,7 @@ 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 }.
 
@@ -116,21 +116,17 @@ notation "hvbox( T1 ≃ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'Iso $T1 $T2 }.
 
-notation "hvbox( T1 break [ d , break e ] ≼ break term 46 T2 )"
-   non associative with precedence 45
-   for @{ 'SubEq $T1 $d $e $T2 }.
-
 (* Substitution *************************************************************)
 
-notation "hvbox( L ⊢ break [ d , break e ] break 𝐑 [ T ] )"
+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 ] )"
+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 ] )"
+notation "hvbox( L ⊢ break 𝐍 [ d , break e ] break ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Normal $L $d $e $T }.
 
@@ -138,6 +134,14 @@ notation "hvbox( ⇧ [ d , break e ] break term 46 T1 ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'RLift $d $e $T1 $T2 }.
 
+notation "hvbox( T1 break ≼ [ d , break e ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'SubEq $T1 $d $e $T2 }.
+
+notation "hvbox( ≽ [ d , break e ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'SubEqBottom $d $e $T2 }.
+
 notation "hvbox( ⇩ [ e ] break term 46 L1 ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'RDrop $e $L1 $L2 }.
@@ -146,11 +150,11 @@ 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( L ⊢ break ⌘ [ T ] ≡ break term 46 k )"
+notation "hvbox( L ⊢ break ⌘ ⦃ T ⦄ ≡ break term 46 k )"
    non associative with precedence 45
    for @{ 'ICM $L $T $k }.
 
-notation "hvbox( L ⊢ break term 46 T1 break [ d , break e ] ▶ break term 46 T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▶ [ d , break e ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PSubst $L $T1 $d $e $T2 }.
 
@@ -172,44 +176,52 @@ notation "hvbox( ⇩ * [ e ] break term 46 L1 ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'RDropStar $e $L1 $L2 }.
 
-notation "hvbox( T1 break [ d , break e ] ▶* break term 46 T2 )"
+notation "hvbox( T1 break ▶* [ d , break e ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PSubstStar $T1 $d $e $T2 }.
 
-notation "hvbox( L ⊢ break term 46 T1 break [ d , break e ] ▶* break term 46 T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▶* [ d , break e ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PSubstStar $L $T1 $d $e $T2 }.
 
-notation "hvbox( L ⊢ break term 46 T1 break [ d , break e ] ▶▶* break term 46 T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▶▶* [ d , break e ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PSubstStarAlt $L $T1 $d $e $T2 }.
 
-notation "hvbox( T1 break [ d , break e ] ≡ break term 46 T2 )"
+notation "hvbox( T1 break ▼* [ d , break e ] ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'TSubst $T1 $d $e $T2 }.
 
-notation "hvbox( L ⊢ break term 46 T1 break [ d , break e ] ≡ break term 46 T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▼* [ d , break e ] ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'TSubst $L $T1 $d $e $T2 }.
 
-notation "hvbox( T1 break [ d , break e ] ≡≡ break term 46 T2 )"
+notation "hvbox( T1 break ▼▼* [ d , break e ] ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'TSubstAlt $T1 $d $e $T2 }.
 
-notation "hvbox( L ⊢ break term 46 T1 break [ d , break e ] ≡≡ break term 46 T2 )"
+notation "hvbox( L ⊢ break term 46 T1 break ▼▼* [ d , break e ] ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'TSubstAlt $L $T1 $d $e $T2 }.
 
 (* Static typing ************************************************************)
 
-notation "hvbox( L ⊢ break term 46 T ÷ break term 46 A )"
+notation "hvbox( L ⊢ break term 46 T ⁝ break term 46 A )"
    non associative with precedence 45
    for @{ 'AtomicArity $L $T $A }.
 
-notation "hvbox( T1 ÷ ⊑ break term 46 T2 )"
+notation "hvbox( T1 ⁝ ⊑ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'CrSubEqA $T1 $T2 }.
 
+notation "hvbox( L ⊢ break term 46 T ÷ break term 46 A )"
+   non associative with precedence 45
+   for @{ 'BinaryArity $L $T $A }.
+
+notation "hvbox( T1 ÷ ⊑ break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'CrSubEqB $T1 $T2 }.
+
 notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 • break term 46 T2 )"
    non associative with precedence 45
    for @{ 'StaticType $h $L $T1 $T2 }.
@@ -222,51 +234,51 @@ notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 •* break term 46 T2
 
 (* Reducibility *************************************************************)
 
-notation "hvbox( 𝐑 [ T ] )"
+notation "hvbox( 𝐑  ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Reducible $T }.
 
-notation "hvbox( L ⊢ break 𝐑 [ 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 ⊢ break 𝐈 [ 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 ⊢ break 𝐍 [ 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 ⊢ break 𝐖𝐇𝐑 [ 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 ⊢ break 𝐖𝐇𝐈 [ 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 ⊢ break 𝐖𝐇𝐍 [ T ] )"
+notation "hvbox( L ⊢ break 𝐖𝐇𝐍 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'WHdNormal $L $T }.
 
@@ -296,7 +308,7 @@ notation "hvbox( L1 ⊢ ➡* break term 46 L2 )"
    non associative with precedence 45
    for @{ 'CPRedStar $L1 $L2 }.
 
-notation "hvbox( L ⊢ break term 46 T1 ➡* break 𝐍 [ T2 ] )"
+notation "hvbox( L ⊢ break term 46 T1 ➡* break 𝐍 ⦃ T2 ⦄ )"
    non associative with precedence 45
    for @{ 'PEval $L $T1 $T2 }.
 
@@ -304,19 +316,19 @@ notation "hvbox( ⬇ * term 46 T  )"
    non associative with precedence 45
    for @{ 'SN $T }.
 
-notation "hvbox( L ⊢ ⬇ * term 46 T )"
+notation "hvbox( L ⊢ break ⬇ * term 46 T )"
    non associative with precedence 45
    for @{ 'SN $L $T }.
 
-notation "hvbox( L ⊢ ⬇ * * term 46 T )"
+notation "hvbox( L ⊢ break ⬇ ⬇ * term 46 T )"
    non associative with precedence 45
-   for @{ 'SNStar $L $T }.
+   for @{ 'SNAlt $L $T }.
 
-notation "hvbox( ⦃ L, break T ⦄ break [ R ] ϵ break 〚 A 〛 )"
+notation "hvbox( ⦃ L, break T ⦄ ϵ break [ R ] break 〚 A 〛 )"
    non associative with precedence 45
    for @{ 'InEInt $R $L $T $A }.
 
-notation "hvbox( T1 break [ R ] ⊑ break term 46 T2 )"
+notation "hvbox( T1 ⊑ break [ R ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'CrSubEq $T1 $R $T2 }.
 
@@ -346,6 +358,10 @@ notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 : break term 46 T2 )"
    non associative with precedence 45
    for @{ 'NativeType $h $L $T1 $T2 }.
 
+notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 :: break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'NativeTypeAlt $h $L $T1 $T2 }.
+
 notation "hvbox( h ⊢ break term 46 L1 : ⊑ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'CrSubEqN $h $L1 $L2 }.