X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Frelocation%2Fdrops_drops.ma;h=56b39051f670f6008ef5778b58ad0ef6e9feb31c;hb=11792b819aba3f464e63cb8f7834cac1652e372a;hp=34c446f649b8d5863693a4194d2839be57dafefa;hpb=117ddc09ce7995f14af84401b2a21f17a7bc1b7a;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_drops.ma
index 34c446f64..56b39051f 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_drops.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_drops.ma
@@ -20,18 +20,18 @@ include "basic_2/relocation/drops.ma".
 (* Main properties **********************************************************)
 
 (* Basic_2A1: includes: drop_conf_ge drop_conf_be drop_conf_le *)
-theorem drops_conf: ∀L1,L,s1,t1. ⬇*[s1, t1] L1 ≡ L →
-                    ∀L2,s2,t. ⬇*[s2, t] L1 ≡ L2 →
-                    ∀t2. t1 ⊚ t2 ≡ t → ⬇*[s2, t2] L ≡ L2.
-#L1 #L #s1 #t1 #H elim H -L1 -L -t1
-[ #t1 #_ #L2 #s2 #t #H #t2 #Ht12 elim (drops_inv_atom1 … H) -s1 -H
-  #H #Ht destruct @drops_atom
-  #H elim (after_inv_isid3 … Ht12) -Ht12 /2 width=1 by/
-| #I #K1 #K #V1 #t1 #_ #IH #L2 #s2 #t #H12 #t2 #Ht elim (after_inv_false1 … Ht) -Ht
-  #u #H #Hu destruct /3 width=3 by drops_inv_drop1/
-| #I #K1 #K #V1 #V #t1 #_ #HV1 #IH #L2 #s2 #t #H #t2 #Ht elim (after_inv_true1 … Ht) -Ht
-  #u2 #u * #H1 #H2 #Hu destruct
-  [ elim (drops_inv_skip1 … H) -H /3 width=6 by drops_skip, lifts_div/
+theorem drops_conf: ∀L1,L,c1,f1. ⬇*[c1, f1] L1 ≡ L →
+                    ∀L2,c2,f. ⬇*[c2, f] L1 ≡ L2 →
+                    ∀f2. f1 ⊚ f2 ≡ f → ⬇*[c2, f2] L ≡ L2.
+#L1 #L #c1 #f1 #H elim H -L1 -L -f1
+[ #f1 #_ #L2 #c2 #f #HL2 #f2 #Hf12 elim (drops_inv_atom1 … HL2) -c1 -HL2
+  #H #Hf destruct @drops_atom
+  #H elim (after_inv_isid3 … Hf12) -Hf12 /2 width=1 by/
+| #I #K1 #K #V1 #f1 #_ #IH #L2 #c2 #f #HL2 #f2 #Hf elim (after_inv_Sxx … Hf) -Hf
+  #g #Hg #H destruct /3 width=3 by drops_inv_drop1/
+| #I #K1 #K #V1 #V #f1 #_ #HV1 #IH #L2 #c2 #f #HL2 #f2 #Hf elim (after_inv_Oxx … Hf) -Hf *
+  #g2 #g #Hf #H1 #H2 destruct
+  [ elim (drops_inv_skip1 … HL2) -HL2 /3 width=6 by drops_skip, lifts_div/
   | /4 width=3 by drops_inv_drop1, drops_drop/
   ]
 ]
@@ -41,18 +41,19 @@ qed-.
 (* Basic_2A1: includes: drop_trans_ge drop_trans_le drop_trans_ge_comm 
                         drops_drop_trans
 *)
-theorem drops_trans: ∀L1,L,s1,t1. ⬇*[s1, t1] L1 ≡ L →
-                     ∀L2,s2,t2. ⬇*[s2, t2] L ≡ L2 →
-                     ∀t. t1 ⊚ t2 ≡ t → ⬇*[s1∨s2, t] L1 ≡ L2.
-#L1 #L #s1 #t1 #H elim H -L1 -L -t1
-[ #t1 #Ht1 #L2 #s2 #t2 #H #t #Ht elim (drops_inv_atom1 … H) -H
-  #H #Ht2 destruct @drops_atom #H elim (orb_false_r … H) -H
-  #H1 #H2 >(after_isid_inv_sn … Ht) -Ht /2 width=1 by/
-| #I #K1 #K #V1 #t1 #_ #IH #L #s2 #t2 #HKL #t #Ht elim (after_inv_false1 … Ht) -Ht
+theorem drops_trans: ∀L1,L,c1,f1. ⬇*[c1, f1] L1 ≡ L →
+                     ∀L2,c2,f2. ⬇*[c2, f2] L ≡ L2 →
+                     ∀f. f1 ⊚ f2 ≡ f → ⬇*[c1∧c2, f] L1 ≡ L2.
+#L1 #L #c1 #f1 #H elim H -L1 -L -f1
+[ #f1 #Hf1 #L2 #c2 #f2 #HL2 #f #Hf elim (drops_inv_atom1 … HL2) -HL2
+  #H #Hf2 destruct @drops_atom #H elim (andb_inv_true_dx … H) -H
+  #H1 #H2 lapply (after_isid_inv_sn … Hf ?) -Hf
+  /3 width=3 by isid_eq_repl_back/
+| #I #K1 #K #V1 #f1 #_ #IH #L2 #c2 #f2 #HL2 #f #Hf elim (after_inv_Sxx … Hf) -Hf
   /3 width=3 by drops_drop/
-| #I #K1 #K #V1 #V #t1 #_ #HV1 #IH #L #s2 #t2 #H #t #Ht elim (after_inv_true1 … Ht) -Ht
-  #u2 #u * #H1 #H2 #Hu destruct
-  [ elim (drops_inv_skip1 … H) -H /3 width=6 by drops_skip, lifts_trans/
+| #I #K1 #K #V1 #V #f1 #_ #HV1 #IH #L2 #c2 #f2 #HL2 #f #Hf elim (after_inv_Oxx … Hf) -Hf *
+  #g2 #g #Hg #H1 #H2 destruct
+  [ elim (drops_inv_skip1 … HL2) -HL2 /3 width=6 by drops_skip, lifts_trans/
   | /4 width=3 by drops_inv_drop1, drops_drop/
   ]
 ]
@@ -61,29 +62,29 @@ qed-.
 (* Advanced properties ******************************************************)
 
 (* Basic_2A1: includes: drop_mono *)
-lemma drops_mono: ∀L,L1,s1,t. ⬇*[s1, t] L ≡ L1 →
-                  ∀L2,s2. ⬇*[s2, t] L ≡ L2 → L1 = L2.
-#L #L1 #s1 #t elim (isid_after_dx t)
+lemma drops_mono: ∀L,L1,c1,f. ⬇*[c1, f] L ≡ L1 →
+                  ∀L2,c2. ⬇*[c2, f] L ≡ L2 → L1 = L2.
+#L #L1 #c1 #f lapply (isid_after_dx 𝐈𝐝 f ?)
 /3 width=8 by drops_conf, drops_fwd_isid/
 qed-.
 
 (* Basic_2A1: includes: drop_conf_lt *)
-lemma drops_conf_skip1: ∀L,L2,s2,t. ⬇*[s2, t] L ≡ L2 →
-                        ∀I,K1,V1,s1,t1. ⬇*[s1, t1] L ≡ K1.ⓑ{I}V1 →
-                        ∀t2. t1 ⊚ Ⓣ@t2 ≡ t →
+lemma drops_conf_skip1: ∀L,L2,c2,f. ⬇*[c2, f] L ≡ L2 →
+                        ∀I,K1,V1,c1,f1. ⬇*[c1, f1] L ≡ K1.ⓑ{I}V1 →
+                        ∀f2. f1 ⊚ ↑f2 ≡ f →
                         ∃∃K2,V2. L2 = K2.ⓑ{I}V2 &
-                                 ⬇*[s2, t2] K1 ≡ K2 & ⬆*[t2] V2 ≡ V1.
-#L #L2 #s2 #t #H2 #I #K1 #V1 #s1 #t1 #H1 #t2 #Ht lapply (drops_conf … H1 … H2 … Ht) -L -Ht
+                                 ⬇*[c2, f2] K1 ≡ K2 & ⬆*[f2] V2 ≡ V1.
+#L #L2 #c2 #f #H2 #I #K1 #V1 #c1 #f1 #H1 #f2 #Hf lapply (drops_conf … H1 … H2 … Hf) -L -Hf
 #H elim (drops_inv_skip1 … H) -H /2 width=5 by ex3_2_intro/
 qed-.
 
 (* Basic_2A1: includes: drop_trans_lt *)
-lemma drops_trans_skip2: ∀L1,L,s1,t1. ⬇*[s1, t1] L1 ≡ L →
-                         ∀I,K2,V2,s2,t2. ⬇*[s2, t2] L ≡ K2.ⓑ{I}V2 →
-                         ∀t. t1 ⊚ t2 ≡ Ⓣ@t →
+lemma drops_trans_skip2: ∀L1,L,c1,f1. ⬇*[c1, f1] L1 ≡ L →
+                         ∀I,K2,V2,c2,f2. ⬇*[c2, f2] L ≡ K2.ⓑ{I}V2 →
+                         ∀f. f1 ⊚ f2 ≡ ↑f →
                          ∃∃K1,V1. L1 = K1.ⓑ{I}V1 &
-                                  ⬇*[s1∨s2, t] K1 ≡ K2 & ⬆*[t] V2 ≡ V1.
-#L1 #L #s1 #t1 #H1 #I #K2 #V2 #s2 #t2 #H2 #t #Ht
-lapply (drops_trans … H1 … H2 … Ht) -L -Ht
+                                  ⬇*[c1∧c2, f] K1 ≡ K2 & ⬆*[f] V2 ≡ V1.
+#L1 #L #c1 #f1 #H1 #I #K2 #V2 #c2 #f2 #H2 #f #Hf
+lapply (drops_trans … H1 … H2 … Hf) -L -Hf
 #H elim (drops_inv_skip2 … H) -H /2 width=5 by ex3_2_intro/
 qed-.