X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambda_delta%2Fbasic_2%2Fnotation.ma;h=42f62ca150ece12d772be435e13308a9ec37bbc3;hb=85a42e4a2a4c62818b6a98eff545e58ceb8770a4;hp=d6d38ef61ab87616203e0d6e7deb3a5ca59d5596;hpb=a2144f09d1bd7022c1f2dfd4909a1fb9772c8d56;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 d6d38ef61..42f62ca15 100644
--- a/matita/matita/contribs/lambda_delta/basic_2/notation.ma
+++ b/matita/matita/contribs/lambda_delta/basic_2/notation.ma
@@ -120,11 +120,11 @@ notation "hvbox( T . break ④ { I } break { T1 , break T2 , break T3 } )"
  non associative with precedence 50
  for @{ 'DxItem4 $T $I $T1 $T2 $T3 }.
 
-notation "hvbox( # [ x ] )"
+notation "hvbox( # { x } )"
  non associative with precedence 90
  for @{ 'Weight $x }.
 
-notation "hvbox( # [ x , break y ] )"
+notation "hvbox( # { x , break y } )"
  non associative with precedence 90
  for @{ 'Weight $x $y }.
 
@@ -142,18 +142,6 @@ notation "hvbox( T1 ≃ break term 46 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 term 46 T1 ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'RLift $d $e $T1 $T2 }.
@@ -184,7 +172,7 @@ notation "hvbox( L ⊢ break term 46 T1 break ▶ [ d , break e ] break term 46
 
 (* Unfold *******************************************************************)
 
-notation "hvbox( @ [ T1 ] break term 46 f ≡ break term 46 T2 )"
+notation "hvbox( @ ⦃ T1 , break f ⦄ ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'RAt $T1 $f $T2 }.
 
@@ -212,6 +200,14 @@ notation "hvbox( L ⊢ break term 46 T1 break ▶ ▶ * [ d , break e ] break te
    non associative with precedence 45
    for @{ 'PSubstStarAlt $L $T1 $d $e $T2 }.
 
+notation "hvbox( T1 break ⊢ ▶ * [ d , break e ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'PSubstStarSn $T1 $d $e $T2 }.
+
+notation "hvbox( T1 break ⊢ ▶ ▶ * [ d , break e ] break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'PSubstStarSnAlt $T1 $d $e $T2 }.
+
 notation "hvbox( ▼ * [ d , break e ] break term 46 T1 ≡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'TSubst $T1 $d $e $T2 }.
@@ -256,59 +252,53 @@ notation "hvbox( h ⊢ break term 46 L1 • ⊑ [ g ] break term 46 L2 )"
 
 (* Unwind *******************************************************************)
 
-notation "hvbox( L1 ⊢ ⧫* break term 46 T ≡ break term 46 L2 )"
+notation "hvbox( L1 ⊢ ⧫ * break term 46 T ≡ break term 46 L2 )"
    non associative with precedence 45
    for @{ 'Unwind $L1 $T $L2 }.
 
 (* Reducibility *************************************************************)
 
-notation "hvbox( 𝐑  ⦃ T ⦄ )"
-   non associative with precedence 45
-   for @{ 'Reducible $T }.
-
 notation "hvbox( L ⊢ break 𝐑 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Reducible $L $T }.
 
-notation "hvbox( 𝐈  ⦃ T ⦄ )"
-   non associative with precedence 45
-   for @{ 'NotReducible $T }.
-
 notation "hvbox( L ⊢ break 𝐈 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'NotReducible $L $T }.
 
-notation "hvbox( 𝐍  ⦃ T ⦄ )"
-   non associative with precedence 45
-   for @{ 'Normal $T }.
-
 notation "hvbox( L ⊢ break 𝐍 ⦃ T ⦄ )"
    non associative with precedence 45
    for @{ 'Normal $L $T }.
 
-notation "hvbox( 𝐖𝐇𝐑 ⦃ T ⦄ )"
+(* this might be removed *)
+notation "hvbox( 𝐇𝐑 ⦃ T ⦄ )"
    non associative with precedence 45
-   for @{ 'WHdReducible $T }.
+   for @{ 'HdReducible $T }.
 
-notation "hvbox( L ⊢ break 𝐖𝐇𝐑  ⦃ T ⦄ )"
+(* this might be removed *)
+notation "hvbox( L ⊢ break 𝐇𝐑  ⦃ T ⦄ )"
    non associative with precedence 45
-   for @{ 'WHdReducible $L $T }.
+   for @{ 'HdReducible $L $T }.
 
-notation "hvbox( 𝐖𝐇𝐈  ⦃ T ⦄ )"
+(* this might be removed *)
+notation "hvbox( 𝐇𝐈  ⦃ T ⦄ )"
    non associative with precedence 45
-   for @{ 'NotWHdReducible $T }.
+   for @{ 'NotHdReducible $T }.
 
-notation "hvbox( L ⊢ break 𝐖𝐇𝐈 ⦃ T ⦄ )"
+(* this might be removed *)
+notation "hvbox( L ⊢ break 𝐇𝐈 ⦃ T ⦄ )"
    non associative with precedence 45
-   for @{ 'NotWHdReducible $L $T }.
+   for @{ 'NotHdReducible $L $T }.
 
-notation "hvbox( 𝐖𝐇𝐍 ⦃ T ⦄ )"
+(* this might be removed *)
+notation "hvbox( 𝐇𝐍 ⦃ T ⦄ )"
    non associative with precedence 45
-   for @{ 'WHdNormal $T }.
+   for @{ 'HdNormal $T }.
 
-notation "hvbox( L ⊢ break 𝐖𝐇𝐍 ⦃ T ⦄ )"
+(* this might be removed *)
+notation "hvbox( L ⊢ break 𝐇𝐍 ⦃ T ⦄ )"
    non associative with precedence 45
-   for @{ 'WHdNormal $L $T }.
+   for @{ 'HdNormal $L $T }.
 
 notation "hvbox( T1 ➡ break term 46 T2 )"
    non associative with precedence 45
@@ -318,10 +308,6 @@ notation "hvbox( L ⊢ break term 46 T1 ➡ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PRed $L $T1 $T2 }.
 
-notation "hvbox( L1 ⊢ ➡ break term 46 L2 )"
-   non associative with precedence 45
-   for @{ 'CPRed $L1 $L2 }.
-
 notation "hvbox( ⦃ L1 ⦄ ➡ break ⦃ L2 ⦄ )"
    non associative with precedence 45
    for @{ 'FocalizedPRed $L1 $L2 }.
@@ -330,29 +316,41 @@ notation "hvbox( ⦃ L1, break T1 ⦄ ➡ break ⦃ L2 , break T2 ⦄ )"
    non associative with precedence 45
    for @{ 'FocalizedPRed $L1 $T1 $L2 $T2 }.
 
+notation "hvbox( L ⊢ break ⦃ L1, break T1 ⦄ ➡ break ⦃ L2 , break T2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'FocalizedPRed $L $L1 $T1 $L2 $T2 }.
+
+notation "hvbox( ⦃ L1 ⦄ ➡ ➡ break ⦃ L2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'FocalizedPRedAlt $L1 $L2 }.
+
 notation "hvbox( ⦃ h , break L ⦄ ⊢ break term 46 T1 ➸ break [ g ] break term 46 T2 )"
    non associative with precedence 45
    for @{ 'XPRed $h $g $L $T1 $T2 }.
 
 (* Computation **************************************************************)
 
-notation "hvbox( T1 ➡* break term 46 T2 )"
+notation "hvbox( T1 ➡ * break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PRedStar $T1 $T2 }.
 
-notation "hvbox( L ⊢ break term 46 T1 ➡* break term 46 T2 )"
+notation "hvbox( L ⊢ break term 46 T1 ➡ * break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PRedStar $L $T1 $T2 }.
 
-notation "hvbox( L1 ⊢ ➡* break term 46 L2 )"
+notation "hvbox( T1 ➡ ➡ * break term 46 T2 )"
+   non associative with precedence 45
+   for @{ 'PRedStarAlt $T1 $T2 }.
+
+notation "hvbox( ⦃ L1 ⦄ ➡ * ⦃ L2 ⦄ )"
    non associative with precedence 45
-   for @{ 'CPRedStar $L1 $L2 }.
+   for @{ 'FocalizedPRedStar $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 }.
 
-notation "hvbox( ⬊ * term 46 T  )"
+notation "hvbox( ⬊ * term 46 T )"
    non associative with precedence 45
    for @{ 'SN $T }.
 
@@ -386,9 +384,9 @@ notation "hvbox( L ⊢ break term 46 T1 ⬌ break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PConv $L $T1 $T2 }.
 
-notation "hvbox( T1 ⊢ ⬌ break term 46 T2 )"
+notation "hvbox( ⦃ L1 ⦄ ⬌ ⦃ L2 ⦄ )"
    non associative with precedence 45
-   for @{ 'CPConv $T1 $T2 }.
+   for @{ 'FocalizedPConv $L1 $L2 }.
 
 (* Equivalence **************************************************************)
 
@@ -396,9 +394,13 @@ notation "hvbox( L ⊢ break term 46 T1 ⬌* break term 46 T2 )"
    non associative with precedence 45
    for @{ 'PConvStar $L $T1 $T2 }.
 
-notation "hvbox( T1 ⊢ ⬌* break term 46 T2 )"
+notation "hvbox( ⦃ L1 ⦄ ⬌ * ⦃ L2 ⦄ )"
+   non associative with precedence 45
+   for @{ 'FocalizedPConvStar $L1 $L2 }.
+
+notation "hvbox( L1 ⊢ ⬌* break term 46 L2 )"
    non associative with precedence 45
-   for @{ 'CPConvStar $T1 $T2 }.
+   for @{ 'CPConvStar $L1 $L2 }.
 
 (* Dynamic typing ***********************************************************)