From 09b4420070d6a71990e16211e499b51dbb0742cb Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Sun, 22 Jan 2017 19:56:34 +0000 Subject: [PATCH] - degree-based equivalene for terms - improved matitadep allows to find more top files in the reference graph - refactoring and bug fix --- .../binaries/matitadep/matitadep.ml | 4 +- matita/matita/contribs/lambdadelta/Makefile | 5 +- .../alpha_1/{grammar => syntax}/item.ma | 0 .../alpha_1/{grammar => syntax}/term.ma | 2 +- .../{grammar => syntax}/term_append.ma | 2 +- .../lambdadelta/apps_2/functional/rtm.ma | 4 +- .../{etc => etc_2A1}/append/cir_append.etc | 0 .../{etc => etc_2A1}/append/cix_append.etc | 0 .../{etc => etc_2A1}/append/cl_shift.etc | 0 .../basic_2/{etc => etc_2A1}/append/cpr.etc | 0 .../basic_2/{etc => etc_2A1}/append/cpx.etc | 0 .../basic_2/{etc => etc_2A1}/append/cpy2.etc | 0 .../basic_2/{etc => etc_2A1}/append/cpys0.etc | 0 .../basic_2/{etc => etc_2A1}/append/cpys2.etc | 0 .../{etc => etc_2A1}/append/crr_append.etc | 0 .../{etc => etc_2A1}/append/crx_append.etc | 0 .../basic_2/{etc => etc_2A1}/append/lpr.etc | 0 .../basic_2/{etc => etc_2A1}/append/lpx.etc | 0 .../{etc => etc_2A1}/append/lpx_sn.etc | 0 .../basic_2/{etc => etc_2A1}/append/lpys0.etc | 0 .../basic_2/{etc => etc_2A1}/cny/cny.etc | 0 .../basic_2/{etc => etc_2A1}/cny/cny_lift.etc | 0 .../basic_2/{etc => etc_2A1}/cny/cpx_cpzs.etc | 0 .../basic_2/{etc => etc_2A1}/cny/cpye.etc | 0 .../basic_2/{etc => etc_2A1}/cny/cpye_alt.etc | 0 .../{etc => etc_2A1}/cny/cpye_cpye.etc | 0 .../{etc => etc_2A1}/cny/cpye_lift.etc | 0 .../basic_2/{etc => etc_2A1}/cny/cpys_cny.etc | 0 .../basic_2/{etc => etc_2A1}/cny/cpzs.etc | 0 .../{etc => etc_2A1}/cny/lleq_cpye.etc | 0 .../basic_2/{etc => etc_2A1}/cny/lpx_cpye.etc | 0 .../{etc => etc_2A1}/cny/lpxs_cpye.etc | 0 .../{etc => etc_2A1}/cny/pdeltaconvstar_6.etc | 0 .../{etc => etc_2A1}/cny/psubsteval_6.etc | 0 .../{etc => etc_2A1}/cny/psubstevalalt_6.etc | 0 .../{etc => etc_2A1}/cny/psubstnormal_5.etc | 0 .../{etc => etc_2A1}/cofrees/cofrees.etc | 0 .../{etc => etc_2A1}/cofrees/cofrees_alt.etc | 0 .../{etc => etc_2A1}/cofrees/cofrees_lift.etc | 0 .../{etc => etc_2A1}/cofrees/cofreestar_4.etc | 0 .../{etc => etc_2A1}/cpcs/cpcs_cpcs.etc | 0 .../basic_2/{etc => etc_2A1}/cpes.etc | 0 .../{etc => etc_2A1}/cpr/aaa_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/aaa_ltpss_sn.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/cnf_cif.etc | 0 .../{etc => etc_2A1}/cpr/cpcs_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/cpcs_ltpss_sn.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/cpr.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/cpr_aaa.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/cpr_cpr.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/cpr_lift.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/cpr_ltpr.etc | 0 .../{etc => etc_2A1}/cpr/cpr_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/cpr_ltpss_sn.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/cpr_tpss.etc | 0 .../{etc => etc_2A1}/cpr/cprs_ltpr.etc | 0 .../{etc => etc_2A1}/cpr/cprs_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/cprs_ltpss_sn.etc | 0 .../{etc => etc_2A1}/cpr/cprs_tpss.etc | 0 .../{etc => etc_2A1}/cpr/dxprs_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/dxprs_ltpss_sn.etc | 0 .../{etc => etc_2A1}/cpr/ldrop_lbotr.etc | 0 .../{etc => etc_2A1}/cpr/ldrop_lpx.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/lenv_px.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/lenv_top.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/lfpr.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/lfpr_aaa.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/lfpr_cpr.etc | 0 .../{etc => etc_2A1}/cpr/lfpr_lfpr.etc | 0 .../{etc => etc_2A1}/cpr/lfprs_ltprs.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/lift.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/lsubr.etc | 0 .../{etc => etc_2A1}/cpr/lsubr_lbotr.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/ltpr.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/ltpr_aaa.etc | 0 .../{etc => etc_2A1}/cpr/ltpr_ldrop.etc | 0 .../{etc => etc_2A1}/cpr/ltpr_ltpr.etc | 0 .../{etc => etc_2A1}/cpr/ltpr_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/ltpr_ltpss_sn.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/ltpr_tps.etc | 0 .../{etc => etc_2A1}/cpr/ltpr_tpss.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/ltprs.etc | 0 .../{etc => etc_2A1}/cpr/ltprs_alt.etc | 0 .../{etc => etc_2A1}/cpr/ltprs_ldrop.etc | 0 .../{etc => etc_2A1}/cpr/ltprs_ltprs.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/ltpss_dx_ldrop.etc | 0 .../cpr/ltpss_dx_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/ltpss_dx_tps.etc | 0 .../{etc => etc_2A1}/cpr/ltpss_dx_tpss.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/ltpss_sn.etc | 0 .../{etc => etc_2A1}/cpr/ltpss_sn_alt.etc | 0 .../{etc => etc_2A1}/cpr/ltpss_sn_ldrop.etc | 0 .../cpr/ltpss_sn_ltpss_sn.etc | 0 .../{etc => etc_2A1}/cpr/ltpss_sn_tps.etc | 0 .../{etc => etc_2A1}/cpr/ltpss_sn_tpss.etc | 0 .../{etc => etc_2A1}/cpr/snv_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/snv_ltpss_sn.etc | 0 .../{etc => etc_2A1}/cpr/ssta_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/ssta_ltpss_sn.etc | 0 .../{etc => etc_2A1}/cpr/sstas_ltpss.etc | 0 .../{etc => etc_2A1}/cpr/sstas_ltpss_dx.etc | 0 .../{etc => etc_2A1}/cpr/sstas_ltpss_sn.etc | 0 .../{etc => etc_2A1}/cpr/sta_ltpss.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tpr.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tpr_lift.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tpr_tpr.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tprs.etc | 0 .../{etc => etc_2A1}/cpr/tprs_lift.etc | 0 .../{etc => etc_2A1}/cpr/tprs_tprs.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tps.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tps_lift.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tps_tps.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tpss.etc | 0 .../basic_2/{etc => etc_2A1}/cpr/tpss_alt.etc | 0 .../{etc => etc_2A1}/cpr/tpss_lift.etc | 0 .../{etc => etc_2A1}/cpr/tpss_tpss.etc | 0 .../basic_2/{etc => etc_2A1}/cpys0/cpys.etc | 0 .../{etc => etc_2A1}/cpys0/cpys_cpys.etc | 0 .../{etc => etc_2A1}/cpys0/cpys_lift.etc | 0 .../basic_2/{etc => etc_2A1}/cpys0/lpys.etc | 0 .../{etc => etc_2A1}/cpys0/lpys_ldrop.etc | 0 .../{etc => etc_2A1}/cpys0/lpys_lpys.etc | 0 .../{etc => etc_2A1}/cpys0/lrsubeq_2.etc | 0 .../basic_2/{etc => etc_2A1}/cpys0/lsuby.etc | 0 .../{etc => etc_2A1}/cpys0/lsuby_lsuby.etc | 0 .../{etc => etc_2A1}/cpys0/psubstsnstar_3.etc | 0 .../{etc => etc_2A1}/cpys0/psubststar_4.etc | 0 .../{etc => etc_2A1}/cpys2/cpx_cpys.etc | 0 .../{etc => etc_2A1}/cpys2/cpx_cpys2.etc | 0 .../{etc => etc_2A1}/cpys2/cpxs_cpys.etc | 0 .../{etc => etc_2A1}/cpys2/lpx_cpys.etc | 0 .../basic_2/{etc => etc_2A1}/cpys2/lsuby.etc | 0 .../basic_2/{etc => etc_2A1}/csup/csup.etc | 0 .../{etc => etc_2A1}/csup/csup_csup.etc | 0 .../{etc => etc_2A1}/csup/csups_csups.etc | 0 .../{etc => etc_2A1}/delift/cpcs_delift.etc | 0 .../{etc => etc_2A1}/delift/cpr_delift.etc | 0 .../{etc => etc_2A1}/delift/cprs_delift.etc | 0 .../{etc => etc_2A1}/delift/delift.etc | 0 .../{etc => etc_2A1}/delift/delift_alt.etc | 0 .../{etc => etc_2A1}/delift/delift_delift.etc | 0 .../{etc => etc_2A1}/delift/delift_lift.etc | 0 .../{etc => etc_2A1}/delift/delift_ltpss.etc | 0 .../{etc => etc_2A1}/delift/delift_tpss.etc | 0 .../basic_2/{etc => etc_2A1}/delift/thin.etc | 0 .../{etc => etc_2A1}/delift/thin_delift.etc | 0 .../{etc => etc_2A1}/delift/thin_ldrop.etc | 0 .../{etc => etc_2A1}/delift/tpr_delift.etc | 0 .../basic_2/{etc => etc_2A1}/etc/cpr_conj.etc | 0 .../basic_2/{etc => etc_2A1}/etc/ldrop.etc | 0 .../{etc => etc_2A1}/fleq/fpbc_lift.etc | 0 .../basic_2/{etc => etc_2A1}/fleq/fpbs.etc | 0 .../basic_2/{etc => etc_2A1}/fpa/fpa.etc | 0 .../basic_2/{etc => etc_2A1}/fpa/fpa_fpa.etc | 0 .../basic_2/{etc => etc_2A1}/fpa/fpas.etc | 0 .../{etc => etc_2A1}/fpa/fpas_fpas.etc | 0 .../{etc => etc_2A1}/fpa/fpas_vector.etc | 0 .../basic_2/{etc => etc_2A1}/fpa/gcp.etc | 0 .../basic_2/{etc => etc_2A1}/fpa/gcp_cr.etc | 0 .../basic_2/{etc => etc_2A1}/fpa/rajust_5.etc | 0 .../{etc => etc_2A1}/fpa/rajuststar_5.etc | 0 .../basic_2/{etc => etc_2A1}/fpbc/fpbc.etc | 0 .../{etc => etc_2A1}/fpbc/fpbc_fleq.etc | 0 .../basic_2/{etc => etc_2A1}/fpbc/fpbg.etc | 0 .../{etc => etc_2A1}/fpbc/fpbg_fleq.etc | 0 .../{etc => etc_2A1}/fpbc/fpbg_fpbg.etc | 0 .../{etc => etc_2A1}/fpbc/fpbg_fpbs.etc | 0 .../{etc => etc_2A1}/fpbc/fpbg_lift.etc | 0 .../{etc => etc_2A1}/fpbc/fpbs_fpbc.etc | 0 .../fpbc/lazybtpredproper_8.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/bteq.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/bteq_6.etc | 0 .../{etc => etc_2A1}/fpn/bteq_bteq.etc | 0 .../{etc => etc_2A1}/fpn/btpredsn_8.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fpb.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fpbc.etc | 0 .../{etc => etc_2A1}/fpn/fpbs_conj.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fpn.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fpn_fpn.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fpns.etc | 0 .../{etc => etc_2A1}/fpn/fpns_fpns.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fqu.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fsb.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/fsb_alt.etc | 0 .../basic_2/{etc => etc_2A1}/fpn/lazyeq_6.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/cfpr.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/cfpr_aaa.etc | 0 .../{etc => etc_2A1}/fpr/cfpr_cfpr.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/cfpr_cpr.etc | 0 .../{etc => etc_2A1}/fpr/cfpr_ltpss.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fpc.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fpc_fpc.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fpcs.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fpcs_aaa.etc | 0 .../{etc => etc_2A1}/fpr/fpcs_cpcs.etc | 0 .../{etc => etc_2A1}/fpr/fpcs_fpcs.etc | 0 .../{etc => etc_2A1}/fpr/fpcs_fprs.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fpr.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fpr_cpr.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fpr_fpr.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fprs.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/fprs_aaa.etc | 0 .../{etc => etc_2A1}/fpr/fprs_cprs.etc | 0 .../{etc => etc_2A1}/fpr/fprs_fprs.etc | 0 .../{etc => etc_2A1}/fpr/lenv_px_bi.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/lfpr_alt.etc | 0 .../basic_2/{etc => etc_2A1}/fpr/lfpr_fpr.etc | 0 .../{etc => etc_2A1}/fpr/lfprs_fprs.etc | 0 .../basic_2/{etc => etc_2A1}/frsup/frsup.etc | 0 .../basic_2/{etc => etc_2A1}/frsup/frsupp.etc | 0 .../{etc => etc_2A1}/frsup/frsupp_frsupp.etc | 0 .../basic_2/{etc => etc_2A1}/frsup/frsups.etc | 0 .../{etc => etc_2A1}/frsup/frsups_frsups.etc | 0 .../{etc => etc_2A1}/frsup/ssta_frsups.etc | 0 .../basic_2/{etc => etc_2A1}/fsup/fsup.etc | 0 .../basic_2/{etc => etc_2A1}/fsup/fsups.etc | 0 .../{etc => etc_2A1}/fsup/ldrop_fsup.etc | 0 .../{etc => etc_2A1}/fsup/ldrop_fsups.etc | 0 .../basic_2/{etc => etc_2A1}/gcp/gcp_aaa.etc | 0 .../basic_2/{etc => etc_2A1}/gcp/gcp_cr.etc | 0 .../basic_2/{etc => etc_2A1}/hod/ntas.etc | 0 .../{etc => etc_2A1}/hod/ntas_lift.etc | 0 .../basic_2/{etc => etc_2A1}/lcoeq/coeq_4.etc | 0 .../basic_2/{etc => etc_2A1}/lcoeq/lcoeq.etc | 0 .../{etc => etc_2A1}/lcoeq/lcoeq_lcoeq.etc | 0 .../{etc => etc_2A1}/lcoeq/ldrop_lcoeq.etc | 0 .../basic_2/{etc => etc_2A1}/lcpcs/lcpcs.etc | 0 .../{etc => etc_2A1}/lcpcs/lcpcs_ltpr.etc | 0 .../{etc => etc_2A1}/lleq_alt/lazyeqalt_4.etc | 0 .../{etc => etc_2A1}/lleq_alt/lleq.etc | 0 .../{etc => etc_2A1}/lleq_alt/lleq_alt.etc | 0 .../{etc => etc_2A1}/lleq_alt/lleq_ext.etc | 0 .../{etc => etc_2A1}/lleq_alt/lleq_fqus.etc | 0 .../{etc => etc_2A1}/lleq_alt/lleq_ldrop.etc | 0 .../{etc => etc_2A1}/lleq_alt/lleq_lleq.etc | 0 .../llneq/lazynegatedeq_4.etc | 0 .../llneq/lazynegatedeqalt_4.etc | 0 .../basic_2/{etc => etc_2A1}/llneq/llneq.etc | 0 .../{etc => etc_2A1}/llneq/llneq_alt.etc | 0 .../{etc => etc_2A1}/llneq/llneq_ext.etc | 0 .../{etc => etc_2A1}/llneq/lpxs_llneq.etc | 0 .../{etc => etc_2A1}/llpr/cpcs_cpcs.etc | 0 .../{etc => etc_2A1}/llpr/cprs_cprs.etc | 0 .../{etc => etc_2A1}/llpr/cprs_lift.etc | 0 .../{etc => etc_2A1}/llpr/lazypredsn_5.etc | 0 .../llpr/lazypredsnstar_5.etc | 0 .../basic_2/{etc => etc_2A1}/llpr/llpr.etc | 0 .../{etc => etc_2A1}/llpr/llpr_ldrop.etc | 0 .../{etc => etc_2A1}/llpr/llpr_llpr.etc | 0 .../basic_2/{etc => etc_2A1}/llpr/llprs.etc | 0 .../{etc => etc_2A1}/llpr/llprs_cprs.etc | 0 .../{etc => etc_2A1}/llpr/llprs_llprs.etc | 0 .../{etc => etc_2A1}/llpr/llpx_sn_llpx_sn.etc | 0 .../{etc => etc_2A1}/llpx/cpxs_llpx.etc | 0 .../{etc => etc_2A1}/llpx/csx_llpx.etc | 0 .../{etc => etc_2A1}/llpx/csx_llpxs.etc | 0 .../{etc => etc_2A1}/llpx/fpbs_lpr.etc | 0 .../{etc => etc_2A1}/llpx/lazypredsn_7.etc | 0 .../llpx/lazypredsnstar_7.etc | 0 .../{etc => etc_2A1}/llpx/lazysn_6.etc | 0 .../{etc => etc_2A1}/llpx/lazysnalt_6.etc | 0 .../basic_2/{etc => etc_2A1}/llpx/llpx.etc | 0 .../{etc => etc_2A1}/llpx/llpx_aaa.etc | 0 .../{etc => etc_2A1}/llpx/llpx_ldrop.etc | 0 .../{etc => etc_2A1}/llpx/llpx_lleq.etc | 0 .../{etc => etc_2A1}/llpx/llpx_lpr.etc | 0 .../basic_2/{etc => etc_2A1}/llpx/llpxs.etc | 0 .../{etc => etc_2A1}/llpx/llpxs_aaa.etc | 0 .../{etc => etc_2A1}/llpx/llpxs_cpxs.etc | 0 .../{etc => etc_2A1}/llpx/llpxs_lleq.etc | 0 .../{etc => etc_2A1}/llpx/llpxs_llpxs.etc | 0 .../{etc => etc_2A1}/llpx/llpxs_lprs.etc | 0 .../basic_2/{etc => etc_2A1}/llpx/llsx.etc | 0 .../{etc => etc_2A1}/llpx/llsx_alt.etc | 0 .../{etc => etc_2A1}/llpx/llsx_csx.etc | 0 .../{etc => etc_2A1}/llpx/llsx_ldrop.etc | 0 .../{etc => etc_2A1}/llpx/llsx_llpx.etc | 0 .../{etc => etc_2A1}/llpx/llsx_llpxs.etc | 0 .../{etc => etc_2A1}/llpx_sn/llpx_sn_tc.etc | 0 .../{etc => etc_2A1}/llpx_sn/lpx_conj.etc | 0 .../basic_2/{etc => etc_2A1}/lpc/lfpc.etc | 0 .../{etc => etc_2A1}/lpc/lfpc_lfpc.etc | 0 .../basic_2/{etc => etc_2A1}/lpc/lfpcs.etc | 0 .../{etc => etc_2A1}/lpc/lfpcs_aaa.etc | 0 .../{etc => etc_2A1}/lpc/lfpcs_fpcs.etc | 0 .../{etc => etc_2A1}/lpc/lfpcs_lfpcs.etc | 0 .../{etc => etc_2A1}/lpc/lfpcs_lfprs.etc | 0 .../{etc => etc_2A1}/lpx_sn/cpr_llpx_sn.etc | 0 .../{etc => etc_2A1}/lpx_sn/cpx_llpx_sn.etc | 0 .../basic_2/{etc => etc_2A1}/lpx_sn/lleq.etc | 0 .../{etc => etc_2A1}/lpx_sn/llpx_sn.etc | 0 .../{etc => etc_2A1}/lpx_sn/llpx_sn_alt.etc | 0 .../lpx_sn/llpx_sn_alt_rec.etc | 0 .../{etc => etc_2A1}/lpx_sn/llpx_sn_ldrop.etc | 0 .../lpx_sn/llpx_sn_lpx_sn.etc | 0 .../{etc => etc_2A1}/lpx_sn/llpx_sn_tc.etc | 0 .../basic_2/{etc => etc_2A1}/lpx_sn/lpr.etc | 0 .../basic_2/{etc => etc_2A1}/lpx_sn/lpx.etc | 0 .../{etc => etc_2A1}/lpx_sn/lpx_sn.etc | 0 .../{etc => etc_2A1}/lpx_sn/lpx_sn_alt.etc | 0 .../{etc => etc_2A1}/lpx_sn/lpx_sn_ldrop.etc | 0 .../{etc => etc_2A1}/lpx_sn/lpx_sn_lpx_sn.etc | 0 .../{etc => etc_2A1}/lpx_sn/lpx_sn_tc.etc | 0 .../{etc => etc_2A1}/lpx_sn/ssta_llpx_sn.etc | 0 .../{etc => etc_2A1}/lsubn/lsubn_lsubn.etc | 0 .../{etc => etc_2A1}/lsubr/aaa_lpss.etc | 0 .../{etc => etc_2A1}/lsubr/cpcs_lpss.etc | 0 .../basic_2/{etc => etc_2A1}/lsubr/cpqs.etc | 0 .../{etc => etc_2A1}/lsubr/cpqs_lift.etc | 0 .../{etc => etc_2A1}/lsubr/cprs_lpss.etc | 0 .../basic_2/{etc => etc_2A1}/lsubr/cpss.etc | 0 .../{etc => etc_2A1}/lsubr/cpss_lift.etc | 0 .../{etc => etc_2A1}/lsubr/dxprs_lpss.etc | 0 .../basic_2/{etc => etc_2A1}/lsubr/lpqs.etc | 0 .../{etc => etc_2A1}/lsubr/lpqs_cpqs.etc | 0 .../{etc => etc_2A1}/lsubr/lpqs_ldrop.etc | 0 .../{etc => etc_2A1}/lsubr/lpqs_lpqs.etc | 0 .../{etc => etc_2A1}/lsubr/lpr_lpss.etc | 0 .../{etc => etc_2A1}/lsubr/lprs_lpss.etc | 0 .../basic_2/{etc => etc_2A1}/lsubr/lpss.etc | 0 .../{etc => etc_2A1}/lsubr/lpss_cpss.etc | 0 .../{etc => etc_2A1}/lsubr/lpss_ldrop.etc | 0 .../{etc => etc_2A1}/lsubr/lpss_lpss.etc | 0 .../basic_2/{etc => etc_2A1}/lsubr/lsubr.etc | 0 .../{etc => etc_2A1}/lsubr/lsubr_etc.etc | 0 .../{etc => etc_2A1}/lsubr/lsubr_lsubr.etc | 0 .../{etc => etc_2A1}/lsubr/snv_lpss.etc | 0 .../{etc => etc_2A1}/lsubr/ssta_lpss.etc | 0 .../{etc => etc_2A1}/lsubr/sstas_lpss.etc | 0 .../basic_2/{etc => etc_2A1}/nta/lsubn.etc | 0 .../{etc => etc_2A1}/nta/lsubn_cpcs.etc | 0 .../{etc => etc_2A1}/nta/lsubn_ldrop.etc | 0 .../{etc => etc_2A1}/nta/lsubn_nta.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta_aaa.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta_alt.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta_lift.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta_ltpr.etc | 0 .../{etc => etc_2A1}/nta/nta_ltpss.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta_nta.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta_sta.etc | 0 .../basic_2/{etc => etc_2A1}/nta/nta_thin.etc | 0 .../basic_2/{etc => etc_2A1}/snta/lsubsn.etc | 0 .../{etc => etc_2A1}/snta/lsubsn_cpcs.etc | 0 .../{etc => etc_2A1}/snta/lsubsn_ldrop.etc | 0 .../{etc => etc_2A1}/snta/lsubsn_snta.etc | 0 .../basic_2/{etc => etc_2A1}/snta/snta.etc | 0 .../{etc => etc_2A1}/snta/snta_lift.etc | 0 .../{etc => etc_2A1}/snta/snta_ltpr.etc | 0 .../{etc => etc_2A1}/snta/snta_ltpss.etc | 0 .../{etc => etc_2A1}/snta/snta_snta.etc | 0 .../{etc => etc_2A1}/snta/snta_thin.etc | 0 .../basic_2/{etc => etc_2A1}/snv/snv_cpcs.etc | 0 .../{etc => etc_2A1}/snv/snv_da_lpr.etc | 0 .../basic_2/{etc => etc_2A1}/snv/snv_lpx.etc | 0 .../{etc => etc_2A1}/snv/snv_lstas_lpr.etc | 0 .../basic_2/{etc => etc_2A1}/snv_preserve.etc | 0 .../basic_2/{etc => etc_2A1}/sta/da_aaa.etc | 0 .../basic_2/{etc => etc_2A1}/sta/da_sta.etc | 0 .../basic_2/{etc => etc_2A1}/sta/lstas.etc | 0 .../{etc => etc_2A1}/sta/lstas_aaa.etc | 0 .../{etc => etc_2A1}/sta/lstas_alt.etc | 0 .../basic_2/{etc => etc_2A1}/sta/lstas_da.etc | 0 .../{etc => etc_2A1}/sta/lstas_lift.etc | 0 .../{etc => etc_2A1}/sta/lstas_lstas.etc | 0 .../basic_2/{etc => etc_2A1}/sta/sta.etc | 0 .../basic_2/{etc => etc_2A1}/sta/sta_aaa.etc | 0 .../basic_2/{etc => etc_2A1}/sta/sta_lift.etc | 0 .../{etc => etc_2A1}/sta/sta_llpx_sn.etc | 0 .../basic_2/{etc => etc_2A1}/sta/sta_sta.etc | 0 .../{etc => etc_2A1}/sta/statictype_5.etc | 0 .../sta/statictypestaralt_6.etc | 0 .../basic_2/{etc => etc_2A1}/tshf/chnf.etc | 0 .../{etc => etc_2A1}/tshf/cpr_tshf.etc | 0 .../basic_2/{etc => etc_2A1}/tshf/tshf.etc | 0 .../basic_2/{etc => etc_2A1}/xpr/xpr_aaa.etc | 0 .../basic_2/{etc => etc_2A1}/xpr/xpr_lift.etc | 0 .../{etc => etc_2A1}/xpr/xpr_lsubss.etc | 0 .../basic_2/{etc => etc_2A1}/xpr/xprs.etc | 0 .../basic_2/{etc => etc_2A1}/xpr/xprs_aaa.etc | 0 .../{etc => etc_2A1}/xpr/xprs_cprs.etc | 0 .../{etc => etc_2A1}/xpr/xprs_lift.etc | 0 .../{etc => etc_2A1}/xpr/xprs_lsubss.etc | 0 .../{etc => etc_2A1}/xpr/xprs_xprs.etc | 0 .../{grammar/ceq.ma => etc_new/ceq.etc} | 2 +- .../ceq_ceq.ma => etc_new/ceq_ceq.etc} | 2 +- .../etc_new/cpr/{cpr_cir.ma => cpr_cir.etc} | 0 .../lazyor_5.ma => etc_new/lazyor_5.etc} | 0 .../lrsubeq_4.ma => etc_new/lrsubeq_4.etc} | 0 .../psubst_6.ma => etc_new/psubst_6.etc} | 0 .../psubststar_6.etc} | 0 .../psubststaralt_6.etc} | 0 .../contribs/lambdadelta/basic_2/names.txt | 4 +- .../basic_2/notation/constructors/dxabbr_2.ma | 4 +- .../basic_2/notation/constructors/dxabst_2.ma | 4 +- .../notation/constructors/dxbind2_3.ma | 8 +- .../basic_2/notation/relations/btpred_8.ma | 2 +- .../basic_2/notation/relations/btpredalt_8.ma | 2 +- .../notation/relations/btpredproper_8.ma | 2 +- .../notation/relations/btpredstar_8.ma | 2 +- .../notation/relations/btpredstaralt_8.ma | 2 +- .../basic_2/notation/relations/btsn_5.ma | 2 +- .../basic_2/notation/relations/btsnalt_5.ma | 2 +- .../basic_2/notation/relations/cosn_5.ma | 2 +- .../notation/relations/dpconvstar_8.ma | 2 +- .../basic_2/notation/relations/dpredstar_7.ma | 2 +- .../relations/lazybtpredstarproper_8.ma | 2 +- .../basic_2/notation/relations/lazyeq_4.ma | 19 ++++ .../basic_2/notation/relations/lrsubeqv_5.ma | 2 +- .../notation/relations/nativevalid_5.ma | 2 +- .../notation/relations/nativevalid_6.ma | 2 +- .../basic_2/notation/relations/predeval_6.ma | 2 +- .../notation/relations/predsnstar_5.ma | 2 +- .../basic_2/notation/relations/predstar_6.ma | 2 +- .../basic_2/notation/relations/sn_5.ma | 2 +- .../basic_2/notation/relations/sn_6.ma | 2 +- .../basic_2/notation/relations/snalt_5.ma | 2 +- .../basic_2/notation/relations/snalt_6.ma | 2 +- .../basic_2/relocation/drops_length.ma | 14 +-- .../basic_2/relocation/drops_lreq.ma | 6 +- .../basic_2/relocation/drops_weight.ma | 2 +- .../lambdadelta/basic_2/relocation/lexs.ma | 2 +- .../basic_2/relocation/lexs_length.ma | 3 +- .../lambdadelta/basic_2/relocation/lifts.ma | 2 +- .../basic_2/relocation/lifts_simple.ma | 2 +- .../basic_2/relocation/lifts_vector.ma | 2 +- .../basic_2/relocation/lifts_weight.ma | 2 +- .../lambdadelta/basic_2/relocation/lreq.ma | 1 - .../basic_2/rt_computation/cpxs_tsts.ma | 2 +- .../rt_computation/cpxs_tsts_vector.ma | 2 +- .../basic_2/rt_computation/csx_lpx.ma | 2 +- .../basic_2/rt_computation/csx_vector.ma | 2 +- .../lambdadelta/basic_2/rt_computation/gcp.ma | 2 +- .../basic_2/rt_computation/gcp_cr.ma | 2 +- .../lambdadelta/basic_2/rt_transition/cpg.ma | 6 +- .../basic_2/rt_transition/cpg_simple.ma | 2 +- .../lambdadelta/basic_2/rt_transition/cpm.ma | 16 +-- .../basic_2/rt_transition/cpm_drops.ma | 8 +- .../basic_2/rt_transition/cpr_drops.ma | 4 +- .../lambdadelta/basic_2/s_transition/fqu.ma | 4 +- .../basic_2/s_transition/fqu_length.ma | 2 +- .../basic_2/s_transition/fqu_weight.ma | 2 +- .../lambdadelta/basic_2/static/aaa.ma | 6 +- .../lambdadelta/basic_2/static/frees.ma | 2 +- .../lambdadelta/basic_2/static/lfxs.ma | 1 - .../lambdadelta/basic_2/static/lsubr.ma | 2 +- .../basic_2/static/lsubr_length.ma | 2 +- .../basic_2/{grammar => syntax}/aarity.ma | 0 .../basic_2/{grammar => syntax}/append.ma | 2 +- .../{grammar => syntax}/append_length.ma | 12 +- .../cl_restricted_weight.ma | 2 +- .../basic_2/{grammar => syntax}/cl_weight.ma | 4 +- .../lambdadelta/basic_2/syntax/deq.ma | 104 ++++++++++++++++++ .../lambdadelta/basic_2/syntax/deq_deq.ma | 30 +++++ .../basic_2/{grammar => syntax}/genv.ma | 2 +- .../basic_2/{grammar => syntax}/item.ma | 0 .../{static/sd.ma => syntax/item_sd.ma} | 2 +- .../{static/sh.ma => syntax/item_sh.ma} | 0 .../basic_2/{grammar => syntax}/lenv.ma | 6 +- .../{grammar => syntax}/lenv_length.ma | 6 +- .../{grammar => syntax}/lenv_weight.ma | 4 +- .../basic_2/{grammar => syntax}/term.ma | 2 +- .../{grammar => syntax}/term_simple.ma | 2 +- .../{grammar => syntax}/term_vector.ma | 2 +- .../{grammar => syntax}/term_weight.ma | 2 +- .../basic_2/{grammar => syntax}/tsts.ma | 2 +- .../basic_2/{grammar => syntax}/tsts_tsts.ma | 2 +- .../{grammar => syntax}/tsts_vector.ma | 4 +- .../lambdadelta/basic_2/web/basic_2_src.tbl | 37 +++++-- matita/matita/contribs/lambdadelta/replace.sh | 4 +- 471 files changed, 305 insertions(+), 133 deletions(-) rename matita/matita/contribs/lambdadelta/alpha_1/{grammar => syntax}/item.ma (100%) rename matita/matita/contribs/lambdadelta/alpha_1/{grammar => syntax}/term.ma (98%) rename matita/matita/contribs/lambdadelta/alpha_1/{grammar => syntax}/term_append.ma (97%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cir_append.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cix_append.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cl_shift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cpy2.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cpys0.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/cpys2.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/crr_append.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/crx_append.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/lpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/lpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/lpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/append/lpys0.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cny.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cny_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cpx_cpzs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cpye.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cpye_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cpye_cpye.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cpye_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cpys_cny.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/cpzs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/lleq_cpye.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/lpx_cpye.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/lpxs_cpye.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/pdeltaconvstar_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/psubsteval_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/psubstevalalt_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cny/psubstnormal_5.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cofrees/cofrees.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cofrees/cofrees_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cofrees/cofrees_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cofrees/cofreestar_4.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpcs/cpcs_cpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpes.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/aaa_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/aaa_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cnf_cif.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpcs_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpcs_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr_cpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr_ltpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cpr_tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cprs_ltpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cprs_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cprs_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/cprs_tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/dxprs_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/dxprs_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ldrop_lbotr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ldrop_lpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lenv_px.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lenv_top.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lfpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lfpr_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lfpr_cpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lfpr_lfpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lfprs_ltprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lsubr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/lsubr_lbotr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr_ltpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr_tps.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpr_tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltprs_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltprs_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltprs_ltprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_dx_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_dx_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_dx_tps.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_dx_tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_sn_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_sn_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_sn_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_sn_tps.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ltpss_sn_tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/snv_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/snv_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ssta_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/ssta_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/sstas_ltpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/sstas_ltpss_dx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/sstas_ltpss_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/sta_ltpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tpr_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tpr_tpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tprs_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tprs_tprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tps.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tps_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tps_tps.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tpss_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tpss_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpr/tpss_tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/cpys.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/cpys_cpys.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/cpys_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/lpys.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/lpys_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/lpys_lpys.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/lrsubeq_2.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/lsuby.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/lsuby_lsuby.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/psubstsnstar_3.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys0/psubststar_4.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys2/cpx_cpys.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys2/cpx_cpys2.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys2/cpxs_cpys.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys2/lpx_cpys.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/cpys2/lsuby.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/csup/csup.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/csup/csup_csup.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/csup/csups_csups.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/cpcs_delift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/cpr_delift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/cprs_delift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/delift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/delift_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/delift_delift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/delift_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/delift_ltpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/delift_tpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/thin.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/thin_delift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/thin_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/delift/tpr_delift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/etc/cpr_conj.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/etc/ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fleq/fpbc_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fleq/fpbs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/fpa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/fpa_fpa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/fpas.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/fpas_fpas.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/fpas_vector.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/gcp.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/gcp_cr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/rajust_5.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpa/rajuststar_5.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbc_fleq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbg.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbg_fleq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbg_fpbg.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbg_fpbs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbg_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/fpbs_fpbc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpbc/lazybtpredproper_8.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/bteq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/bteq_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/bteq_bteq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/btpredsn_8.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fpb.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fpbc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fpbs_conj.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fpn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fpn_fpn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fpns.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fpns_fpns.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fqu.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fsb.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/fsb_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpn/lazyeq_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/cfpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/cfpr_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/cfpr_cfpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/cfpr_cpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/cfpr_ltpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpc_fpc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpcs_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpcs_cpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpcs_fpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpcs_fprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpr_cpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fpr_fpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fprs_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fprs_cprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/fprs_fprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/lenv_px_bi.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/lfpr_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/lfpr_fpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fpr/lfprs_fprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/frsup/frsup.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/frsup/frsupp.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/frsup/frsupp_frsupp.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/frsup/frsups.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/frsup/frsups_frsups.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/frsup/ssta_frsups.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fsup/fsup.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fsup/fsups.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fsup/ldrop_fsup.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/fsup/ldrop_fsups.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/gcp/gcp_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/gcp/gcp_cr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/hod/ntas.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/hod/ntas_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lcoeq/coeq_4.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lcoeq/lcoeq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lcoeq/lcoeq_lcoeq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lcoeq/ldrop_lcoeq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lcpcs/lcpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lcpcs/lcpcs_ltpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lleq_alt/lazyeqalt_4.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lleq_alt/lleq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lleq_alt/lleq_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lleq_alt/lleq_ext.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lleq_alt/lleq_fqus.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lleq_alt/lleq_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lleq_alt/lleq_lleq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llneq/lazynegatedeq_4.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llneq/lazynegatedeqalt_4.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llneq/llneq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llneq/llneq_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llneq/llneq_ext.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llneq/lpxs_llneq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/cpcs_cpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/cprs_cprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/cprs_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/lazypredsn_5.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/lazypredsnstar_5.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/llpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/llpr_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/llpr_llpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/llprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/llprs_cprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/llprs_llprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpr/llpx_sn_llpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/cpxs_llpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/csx_llpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/csx_llpxs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/fpbs_lpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/lazypredsn_7.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/lazypredsnstar_7.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/lazysn_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/lazysnalt_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpx_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpx_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpx_lleq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpx_lpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpxs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpxs_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpxs_cpxs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpxs_lleq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpxs_llpxs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llpxs_lprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llsx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llsx_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llsx_csx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llsx_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llsx_llpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx/llsx_llpxs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx_sn/llpx_sn_tc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/llpx_sn/lpx_conj.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpc/lfpc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpc/lfpc_lfpc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpc/lfpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpc/lfpcs_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpc/lfpcs_fpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpc/lfpcs_lfpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpc/lfpcs_lfprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/cpr_llpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/cpx_llpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lleq.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/llpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/llpx_sn_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/llpx_sn_alt_rec.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/llpx_sn_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/llpx_sn_lpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/llpx_sn_tc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lpx_sn_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lpx_sn_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lpx_sn_lpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/lpx_sn_tc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lpx_sn/ssta_llpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubn/lsubn_lsubn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/aaa_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/cpcs_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/cpqs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/cpqs_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/cprs_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/cpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/cpss_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/dxprs_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpqs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpqs_cpqs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpqs_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpqs_lpqs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpr_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lprs_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpss_cpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpss_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lpss_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lsubr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lsubr_etc.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/lsubr_lsubr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/snv_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/ssta_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/lsubr/sstas_lpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/lsubn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/lsubn_cpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/lsubn_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/lsubn_nta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_ltpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_ltpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_nta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_sta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/nta/nta_thin.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/lsubsn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/lsubsn_cpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/lsubsn_ldrop.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/lsubsn_snta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/snta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/snta_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/snta_ltpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/snta_ltpss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/snta_snta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snta/snta_thin.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snv/snv_cpcs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snv/snv_da_lpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snv/snv_lpx.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snv/snv_lstas_lpr.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/snv_preserve.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/da_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/da_sta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/lstas.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/lstas_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/lstas_alt.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/lstas_da.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/lstas_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/lstas_lstas.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/sta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/sta_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/sta_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/sta_llpx_sn.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/sta_sta.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/statictype_5.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/sta/statictypestaralt_6.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/tshf/chnf.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/tshf/cpr_tshf.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/tshf/tshf.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xpr_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xpr_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xpr_lsubss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xprs_aaa.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xprs_cprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xprs_lift.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xprs_lsubss.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{etc => etc_2A1}/xpr/xprs_xprs.etc (100%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar/ceq.ma => etc_new/ceq.etc} (97%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar/ceq_ceq.ma => etc_new/ceq_ceq.etc} (97%) rename matita/matita/contribs/lambdadelta/basic_2/etc_new/cpr/{cpr_cir.ma => cpr_cir.etc} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{notation/relations/lazyor_5.ma => etc_new/lazyor_5.etc} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{notation/relations/lrsubeq_4.ma => etc_new/lrsubeq_4.etc} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{notation/relations/psubst_6.ma => etc_new/psubst_6.etc} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{notation/relations/psubststar_6.ma => etc_new/psubststar_6.etc} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{notation/relations/psubststaralt_6.ma => etc_new/psubststaralt_6.etc} (100%) create mode 100644 matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazyeq_4.ma rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/aarity.ma (100%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/append.ma (98%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/append_length.ma (93%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/cl_restricted_weight.ma (98%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/cl_weight.ma (96%) create mode 100644 matita/matita/contribs/lambdadelta/basic_2/syntax/deq.ma create mode 100644 matita/matita/contribs/lambdadelta/basic_2/syntax/deq_deq.ma rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/genv.ma (98%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/item.ma (100%) rename matita/matita/contribs/lambdadelta/basic_2/{static/sd.ma => syntax/item_sd.ma} (99%) rename matita/matita/contribs/lambdadelta/basic_2/{static/sh.ma => syntax/item_sh.ma} (100%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/lenv.ma (94%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/lenv_length.ma (94%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/lenv_weight.ma (95%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/term.ma (99%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/term_simple.ma (98%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/term_vector.ma (97%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/term_weight.ma (97%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/tsts.ma (98%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/tsts_tsts.ma (97%) rename matita/matita/contribs/lambdadelta/basic_2/{grammar => syntax}/tsts_vector.ma (95%) diff --git a/matita/components/binaries/matitadep/matitadep.ml b/matita/components/binaries/matitadep/matitadep.ml index 00a2f9268..054f90f4a 100644 --- a/matita/components/binaries/matitadep/matitadep.ml +++ b/matita/components/binaries/matitadep/matitadep.ml @@ -14,10 +14,12 @@ let rec purge dname vdeps = match vdeps with | hd :: tl -> if hd = dname then tl else hd :: purge dname tl let add fname = + if fname = "" then () else if Hashtbl.mem graph fname then () else Hashtbl.add graph fname {ddeps = []; rdeps = None} let add_ddep fname dname = + if dname = "" then () else let file = Hashtbl.find graph fname in Hashtbl.replace graph fname {file with ddeps = dname :: file.ddeps} @@ -104,7 +106,7 @@ let _ = if !show_top then top (); if !show_leaf then leaf () in - let help = "" in + let help = "matitadep [-clt | -d ] < " in let help_c = " Print the redundant and looping arcs of the dependences graph" in let help_d = " Set these debug options" in let help_l = " Print the leaf nodes of the dependences graph" in diff --git a/matita/matita/contribs/lambdadelta/Makefile b/matita/matita/contribs/lambdadelta/Makefile index 9de41db0c..cd6bcea17 100644 --- a/matita/matita/contribs/lambdadelta/Makefile +++ b/matita/matita/contribs/lambdadelta/Makefile @@ -91,9 +91,12 @@ orig: $(ORIGS) # dep input ################################################################## -$(DEP_INPUT): $(MAS) +$(DEP_INPUT): LINE = $(MAS:%=%:include \"\".) + +$(DEP_INPUT): $(MAS) Makefile @echo " GREP include" $(H)grep "include \"" $^ > $(DEP_INPUT) + $(H)echo "$(LINE)" | sed -e 's/\"\. /\"\.\n/g' >> $(DEP_INPUT) # dep ######################################################################## diff --git a/matita/matita/contribs/lambdadelta/alpha_1/grammar/item.ma b/matita/matita/contribs/lambdadelta/alpha_1/syntax/item.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/alpha_1/grammar/item.ma rename to matita/matita/contribs/lambdadelta/alpha_1/syntax/item.ma diff --git a/matita/matita/contribs/lambdadelta/alpha_1/grammar/term.ma b/matita/matita/contribs/lambdadelta/alpha_1/syntax/term.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/alpha_1/grammar/term.ma rename to matita/matita/contribs/lambdadelta/alpha_1/syntax/term.ma index 9562d4c40..674e618a8 100644 --- a/matita/matita/contribs/lambdadelta/alpha_1/grammar/term.ma +++ b/matita/matita/contribs/lambdadelta/alpha_1/syntax/term.ma @@ -26,7 +26,7 @@ include "alpha_1/notation/constructors/snabstneg_1.ma". include "alpha_1/notation/constructors/snproj_3.ma". include "alpha_1/notation/constructors/snprojpos_2.ma". include "alpha_1/notation/constructors/snprojneg_2.ma". -include "alpha_1/grammar/item.ma". +include "alpha_1/syntax/item.ma". (* TERMS ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/alpha_1/grammar/term_append.ma b/matita/matita/contribs/lambdadelta/alpha_1/syntax/term_append.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/alpha_1/grammar/term_append.ma rename to matita/matita/contribs/lambdadelta/alpha_1/syntax/term_append.ma index 98ce3bafd..4ea795a68 100644 --- a/matita/matita/contribs/lambdadelta/alpha_1/grammar/term_append.ma +++ b/matita/matita/contribs/lambdadelta/alpha_1/syntax/term_append.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "alpha_1/grammar/term.ma". +include "alpha_1/syntax/term.ma". (* TERMS ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/apps_2/functional/rtm.ma b/matita/matita/contribs/lambdadelta/apps_2/functional/rtm.ma index 2e92ea0cc..66b481290 100644 --- a/matita/matita/contribs/lambdadelta/apps_2/functional/rtm.ma +++ b/matita/matita/contribs/lambdadelta/apps_2/functional/rtm.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_vector.ma". -include "basic_2/grammar/genv.ma". +include "basic_2/syntax/term_vector.ma". +include "basic_2/syntax/genv.ma". include "apps_2/functional/notation.ma". (* REDUCTION AND TYPE MACHINE ***********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cir_append.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cir_append.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cir_append.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cir_append.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cix_append.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cix_append.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cix_append.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cix_append.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cl_shift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cl_shift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cl_shift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cl_shift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cpy2.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpy2.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cpy2.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpy2.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cpys0.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpys0.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cpys0.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpys0.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/cpys2.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpys2.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/cpys2.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/cpys2.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/crr_append.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/crr_append.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/crr_append.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/crr_append.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/crx_append.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/crx_append.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/crx_append.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/crx_append.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/lpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/lpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/lpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/lpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/lpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/lpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/append/lpys0.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpys0.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/append/lpys0.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/append/lpys0.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cny.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cny.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cny.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cny.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cny_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cny_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cny_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cny_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpx_cpzs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpx_cpzs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpx_cpzs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpx_cpzs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye_cpye.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye_cpye.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye_cpye.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye_cpye.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpye_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpye_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpys_cny.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpys_cny.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpys_cny.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpys_cny.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpzs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpzs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/cpzs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/cpzs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/lleq_cpye.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/lleq_cpye.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/lleq_cpye.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/lleq_cpye.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/lpx_cpye.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/lpx_cpye.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/lpx_cpye.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/lpx_cpye.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/lpxs_cpye.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/lpxs_cpye.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/lpxs_cpye.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/lpxs_cpye.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/pdeltaconvstar_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/pdeltaconvstar_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/pdeltaconvstar_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/pdeltaconvstar_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/psubsteval_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/psubsteval_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/psubsteval_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/psubsteval_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/psubstevalalt_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/psubstevalalt_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/psubstevalalt_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/psubstevalalt_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cny/psubstnormal_5.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/psubstnormal_5.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cny/psubstnormal_5.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cny/psubstnormal_5.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofrees.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofrees.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofrees.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofrees.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofrees_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofrees_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofrees_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofrees_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofrees_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofrees_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofrees_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofrees_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofreestar_4.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofreestar_4.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cofrees/cofreestar_4.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cofrees/cofreestar_4.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpcs/cpcs_cpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpcs/cpcs_cpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpcs/cpcs_cpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpcs/cpcs_cpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpes.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpes.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpes.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpes.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/aaa_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/aaa_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/aaa_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/aaa_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/aaa_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/aaa_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/aaa_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/aaa_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cnf_cif.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cnf_cif.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cnf_cif.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cnf_cif.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpcs_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpcs_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpcs_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpcs_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpcs_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpcs_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpcs_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpcs_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_cpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_cpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_cpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_cpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_ltpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_ltpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_ltpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_ltpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cpr_tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cpr_tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_ltpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_ltpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_ltpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_ltpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/cprs_tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/cprs_tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/dxprs_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/dxprs_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/dxprs_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/dxprs_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/dxprs_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/dxprs_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/dxprs_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/dxprs_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ldrop_lbotr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ldrop_lbotr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ldrop_lbotr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ldrop_lbotr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ldrop_lpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ldrop_lpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ldrop_lpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ldrop_lpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lenv_px.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lenv_px.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lenv_px.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lenv_px.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lenv_top.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lenv_top.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lenv_top.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lenv_top.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr_cpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr_cpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr_cpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr_cpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr_lfpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr_lfpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfpr_lfpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfpr_lfpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfprs_ltprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfprs_ltprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lfprs_ltprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lfprs_ltprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lsubr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lsubr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lsubr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lsubr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lsubr_lbotr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lsubr_lbotr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/lsubr_lbotr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/lsubr_lbotr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ltpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ltpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ltpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ltpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_tps.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_tps.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_tps.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_tps.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpr_tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpr_tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs_ltprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs_ltprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltprs_ltprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltprs_ltprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_tps.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_tps.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_tps.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_tps.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_dx_tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_dx_tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_tps.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_tps.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_tps.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_tps.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ltpss_sn_tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ltpss_sn_tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/snv_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/snv_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/snv_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/snv_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/snv_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/snv_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/snv_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/snv_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ssta_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ssta_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ssta_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ssta_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ssta_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ssta_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/ssta_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/ssta_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sstas_ltpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sstas_ltpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sstas_ltpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sstas_ltpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sstas_ltpss_dx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sstas_ltpss_dx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sstas_ltpss_dx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sstas_ltpss_dx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sstas_ltpss_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sstas_ltpss_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sstas_ltpss_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sstas_ltpss_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sta_ltpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sta_ltpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/sta_ltpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/sta_ltpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpr_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpr_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpr_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpr_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpr_tpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpr_tpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpr_tpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpr_tpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tprs_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tprs_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tprs_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tprs_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tprs_tprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tprs_tprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tprs_tprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tprs_tprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tps.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tps.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tps.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tps.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tps_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tps_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tps_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tps_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tps_tps.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tps_tps.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tps_tps.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tps_tps.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss_tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss_tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpr/tpss_tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpr/tpss_tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/cpys.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/cpys.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/cpys.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/cpys.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/cpys_cpys.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/cpys_cpys.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/cpys_cpys.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/cpys_cpys.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/cpys_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/cpys_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/cpys_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/cpys_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lpys.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lpys.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lpys.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lpys.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lpys_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lpys_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lpys_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lpys_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lpys_lpys.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lpys_lpys.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lpys_lpys.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lpys_lpys.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lrsubeq_2.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lrsubeq_2.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lrsubeq_2.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lrsubeq_2.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lsuby.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lsuby.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lsuby.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lsuby.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lsuby_lsuby.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lsuby_lsuby.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/lsuby_lsuby.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/lsuby_lsuby.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/psubstsnstar_3.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/psubstsnstar_3.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/psubstsnstar_3.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/psubstsnstar_3.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/psubststar_4.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/psubststar_4.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys0/psubststar_4.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys0/psubststar_4.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/cpx_cpys.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/cpx_cpys.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/cpx_cpys.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/cpx_cpys.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/cpx_cpys2.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/cpx_cpys2.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/cpx_cpys2.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/cpx_cpys2.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/cpxs_cpys.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/cpxs_cpys.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/cpxs_cpys.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/cpxs_cpys.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/lpx_cpys.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/lpx_cpys.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/lpx_cpys.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/lpx_cpys.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/lsuby.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/lsuby.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/cpys2/lsuby.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/cpys2/lsuby.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/csup/csup.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/csup/csup.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/csup/csup.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/csup/csup.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/csup/csup_csup.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/csup/csup_csup.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/csup/csup_csup.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/csup/csup_csup.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/csup/csups_csups.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/csup/csups_csups.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/csup/csups_csups.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/csup/csups_csups.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/cpcs_delift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/cpcs_delift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/cpcs_delift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/cpcs_delift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/cpr_delift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/cpr_delift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/cpr_delift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/cpr_delift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/cprs_delift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/cprs_delift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/cprs_delift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/cprs_delift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_delift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_delift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_delift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_delift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_ltpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_ltpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_ltpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_ltpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_tpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_tpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/delift_tpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/delift_tpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/thin.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/thin.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/thin.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/thin.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/thin_delift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/thin_delift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/thin_delift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/thin_delift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/thin_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/thin_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/thin_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/thin_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/delift/tpr_delift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/tpr_delift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/delift/tpr_delift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/delift/tpr_delift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/etc/cpr_conj.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/etc/cpr_conj.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/etc/cpr_conj.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/etc/cpr_conj.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/etc/ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/etc/ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/etc/ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/etc/ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fleq/fpbc_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fleq/fpbc_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fleq/fpbc_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fleq/fpbc_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fleq/fpbs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fleq/fpbs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fleq/fpbs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fleq/fpbs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpa_fpa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpa_fpa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpa_fpa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpa_fpa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpas.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpas.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpas.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpas.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpas_fpas.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpas_fpas.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpas_fpas.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpas_fpas.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpas_vector.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpas_vector.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/fpas_vector.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/fpas_vector.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/gcp.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/gcp.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/gcp.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/gcp.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/gcp_cr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/gcp_cr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/gcp_cr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/gcp_cr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/rajust_5.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/rajust_5.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/rajust_5.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/rajust_5.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpa/rajuststar_5.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/rajuststar_5.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpa/rajuststar_5.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpa/rajuststar_5.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbc_fleq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbc_fleq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbc_fleq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbc_fleq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_fleq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_fleq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_fleq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_fleq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_fpbg.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_fpbg.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_fpbg.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_fpbg.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_fpbs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_fpbs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_fpbs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_fpbs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbg_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbg_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbs_fpbc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbs_fpbc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/fpbs_fpbc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/fpbs_fpbc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/lazybtpredproper_8.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/lazybtpredproper_8.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpbc/lazybtpredproper_8.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpbc/lazybtpredproper_8.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/bteq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/bteq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/bteq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/bteq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/bteq_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/bteq_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/bteq_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/bteq_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/bteq_bteq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/bteq_bteq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/bteq_bteq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/bteq_bteq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/btpredsn_8.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/btpredsn_8.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/btpredsn_8.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/btpredsn_8.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpb.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpb.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpb.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpb.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpbc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpbc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpbc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpbc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpbs_conj.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpbs_conj.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpbs_conj.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpbs_conj.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpn_fpn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpn_fpn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpn_fpn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpn_fpn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpns.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpns.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpns.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpns.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpns_fpns.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpns_fpns.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fpns_fpns.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fpns_fpns.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fqu.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fqu.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fqu.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fqu.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fsb.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fsb.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fsb.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fsb.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fsb_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fsb_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/fsb_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/fsb_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpn/lazyeq_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/lazyeq_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpn/lazyeq_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpn/lazyeq_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_cfpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_cfpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_cfpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_cfpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_cpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_cpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_cpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_cpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_ltpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_ltpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/cfpr_ltpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/cfpr_ltpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpc_fpc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpc_fpc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpc_fpc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpc_fpc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_cpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_cpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_cpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_cpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_fpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_fpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_fpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_fpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_fprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_fprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpcs_fprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpcs_fprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpr_cpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpr_cpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpr_cpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpr_cpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpr_fpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpr_fpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fpr_fpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fpr_fpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs_cprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs_cprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs_cprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs_cprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs_fprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs_fprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/fprs_fprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/fprs_fprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lenv_px_bi.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lenv_px_bi.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lenv_px_bi.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lenv_px_bi.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lfpr_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lfpr_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lfpr_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lfpr_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lfpr_fpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lfpr_fpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lfpr_fpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lfpr_fpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lfprs_fprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lfprs_fprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fpr/lfprs_fprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fpr/lfprs_fprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsup.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsup.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsup.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsup.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsupp.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsupp.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsupp.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsupp.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsupp_frsupp.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsupp_frsupp.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsupp_frsupp.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsupp_frsupp.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsups.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsups.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsups.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsups.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsups_frsups.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsups_frsups.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/frsup/frsups_frsups.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/frsups_frsups.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/frsup/ssta_frsups.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/ssta_frsups.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/frsup/ssta_frsups.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/frsup/ssta_frsups.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fsup/fsup.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/fsup.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fsup/fsup.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/fsup.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fsup/fsups.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/fsups.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fsup/fsups.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/fsups.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fsup/ldrop_fsup.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/ldrop_fsup.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fsup/ldrop_fsup.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/ldrop_fsup.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/fsup/ldrop_fsups.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/ldrop_fsups.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/fsup/ldrop_fsups.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/fsup/ldrop_fsups.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/gcp/gcp_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/gcp/gcp_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/gcp/gcp_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/gcp/gcp_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/gcp/gcp_cr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/gcp/gcp_cr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/gcp/gcp_cr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/gcp/gcp_cr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/hod/ntas.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/hod/ntas.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/hod/ntas.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/hod/ntas.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/hod/ntas_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/hod/ntas_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/hod/ntas_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/hod/ntas_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/coeq_4.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/coeq_4.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/coeq_4.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/coeq_4.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/lcoeq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/lcoeq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/lcoeq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/lcoeq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/lcoeq_lcoeq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/lcoeq_lcoeq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/lcoeq_lcoeq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/lcoeq_lcoeq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/ldrop_lcoeq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/ldrop_lcoeq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lcoeq/ldrop_lcoeq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcoeq/ldrop_lcoeq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lcpcs/lcpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcpcs/lcpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lcpcs/lcpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcpcs/lcpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lcpcs/lcpcs_ltpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcpcs/lcpcs_ltpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lcpcs/lcpcs_ltpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lcpcs/lcpcs_ltpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lazyeqalt_4.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lazyeqalt_4.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lazyeqalt_4.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lazyeqalt_4.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_ext.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_ext.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_ext.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_ext.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_fqus.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_fqus.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_fqus.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_fqus.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_lleq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_lleq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lleq_alt/lleq_lleq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lleq_alt/lleq_lleq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llneq/lazynegatedeq_4.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/lazynegatedeq_4.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llneq/lazynegatedeq_4.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/lazynegatedeq_4.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llneq/lazynegatedeqalt_4.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/lazynegatedeqalt_4.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llneq/lazynegatedeqalt_4.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/lazynegatedeqalt_4.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llneq/llneq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/llneq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llneq/llneq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/llneq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llneq/llneq_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/llneq_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llneq/llneq_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/llneq_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llneq/llneq_ext.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/llneq_ext.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llneq/llneq_ext.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/llneq_ext.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llneq/lpxs_llneq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/lpxs_llneq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llneq/lpxs_llneq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llneq/lpxs_llneq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/cpcs_cpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/cpcs_cpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/cpcs_cpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/cpcs_cpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/cprs_cprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/cprs_cprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/cprs_cprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/cprs_cprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/cprs_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/cprs_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/cprs_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/cprs_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/lazypredsn_5.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/lazypredsn_5.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/lazypredsn_5.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/lazypredsn_5.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/lazypredsnstar_5.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/lazypredsnstar_5.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/lazypredsnstar_5.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/lazypredsnstar_5.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpr_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpr_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpr_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpr_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpr_llpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpr_llpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpr_llpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpr_llpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llprs_cprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llprs_cprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llprs_cprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llprs_cprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llprs_llprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llprs_llprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llprs_llprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llprs_llprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpx_sn_llpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpx_sn_llpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpr/llpx_sn_llpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpr/llpx_sn_llpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/cpxs_llpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/cpxs_llpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/cpxs_llpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/cpxs_llpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/csx_llpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/csx_llpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/csx_llpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/csx_llpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/csx_llpxs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/csx_llpxs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/csx_llpxs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/csx_llpxs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/fpbs_lpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/fpbs_lpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/fpbs_lpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/fpbs_lpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazypredsn_7.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazypredsn_7.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazypredsn_7.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazypredsn_7.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazypredsnstar_7.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazypredsnstar_7.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazypredsnstar_7.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazypredsnstar_7.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazysn_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazysn_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazysn_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazysn_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazysnalt_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazysnalt_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/lazysnalt_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/lazysnalt_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_lleq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_lleq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_lleq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_lleq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_lpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_lpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpx_lpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpx_lpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_cpxs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_cpxs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_cpxs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_cpxs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_lleq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_lleq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_lleq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_lleq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_llpxs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_llpxs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_llpxs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_llpxs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_lprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_lprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llpxs_lprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llpxs_lprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_csx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_csx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_csx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_csx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_llpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_llpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_llpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_llpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_llpxs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_llpxs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx/llsx_llpxs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx/llsx_llpxs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx_sn/llpx_sn_tc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx_sn/llpx_sn_tc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx_sn/llpx_sn_tc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx_sn/llpx_sn_tc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/llpx_sn/lpx_conj.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx_sn/lpx_conj.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/llpx_sn/lpx_conj.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/llpx_sn/lpx_conj.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpc_lfpc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpc_lfpc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpc_lfpc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpc_lfpc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_fpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_fpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_fpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_fpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_lfpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_lfpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_lfpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_lfpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_lfprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_lfprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpc/lfpcs_lfprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpc/lfpcs_lfprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/cpr_llpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/cpr_llpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/cpr_llpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/cpr_llpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/cpx_llpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/cpx_llpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/cpx_llpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/cpx_llpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lleq.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lleq.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lleq.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lleq.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_alt_rec.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_alt_rec.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_alt_rec.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_alt_rec.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_lpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_lpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_lpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_lpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_tc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_tc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/llpx_sn_tc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/llpx_sn_tc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_lpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_lpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_lpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_lpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_tc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_tc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/lpx_sn_tc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/lpx_sn_tc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/ssta_llpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/ssta_llpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lpx_sn/ssta_llpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lpx_sn/ssta_llpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubn/lsubn_lsubn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubn/lsubn_lsubn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubn/lsubn_lsubn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubn/lsubn_lsubn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/aaa_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/aaa_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/aaa_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/aaa_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpcs_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpcs_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpcs_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpcs_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpqs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpqs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpqs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpqs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpqs_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpqs_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpqs_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpqs_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cprs_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cprs_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cprs_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cprs_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpss_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpss_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/cpss_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/cpss_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/dxprs_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/dxprs_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/dxprs_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/dxprs_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs_cpqs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs_cpqs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs_cpqs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs_cpqs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs_lpqs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs_lpqs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpqs_lpqs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpqs_lpqs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpr_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpr_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpr_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpr_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lprs_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lprs_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lprs_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lprs_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss_cpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss_cpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss_cpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss_cpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lpss_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lpss_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lsubr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lsubr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lsubr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lsubr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lsubr_etc.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lsubr_etc.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lsubr_etc.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lsubr_etc.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lsubr_lsubr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lsubr_lsubr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/lsubr_lsubr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/lsubr_lsubr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/snv_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/snv_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/snv_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/snv_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/ssta_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/ssta_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/ssta_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/ssta_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/sstas_lpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/sstas_lpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/lsubr/sstas_lpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/lsubr/sstas_lpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn_cpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn_cpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn_cpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn_cpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn_nta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn_nta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/lsubn_nta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/lsubn_nta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_ltpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_ltpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_ltpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_ltpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_ltpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_ltpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_ltpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_ltpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_nta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_nta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_nta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_nta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_sta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_sta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_sta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_sta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_thin.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_thin.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/nta/nta_thin.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/nta/nta_thin.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn_cpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn_cpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn_cpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn_cpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn_ldrop.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn_ldrop.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn_ldrop.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn_ldrop.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn_snta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn_snta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/lsubsn_snta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/lsubsn_snta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_ltpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_ltpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_ltpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_ltpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_ltpss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_ltpss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_ltpss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_ltpss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_snta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_snta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_snta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_snta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_thin.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_thin.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snta/snta_thin.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snta/snta_thin.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_cpcs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_cpcs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_cpcs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_cpcs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_da_lpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_da_lpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_da_lpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_da_lpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_lpx.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_lpx.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_lpx.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_lpx.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_lstas_lpr.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_lstas_lpr.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snv/snv_lstas_lpr.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv/snv_lstas_lpr.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/snv_preserve.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv_preserve.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/snv_preserve.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/snv_preserve.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/da_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/da_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/da_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/da_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/da_sta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/da_sta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/da_sta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/da_sta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_alt.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_alt.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_alt.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_alt.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_da.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_da.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_da.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_da.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_lstas.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_lstas.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/lstas_lstas.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/lstas_lstas.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_llpx_sn.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_llpx_sn.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_llpx_sn.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_llpx_sn.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_sta.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_sta.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/sta_sta.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/sta_sta.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/statictype_5.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/statictype_5.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/statictype_5.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/statictype_5.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/sta/statictypestaralt_6.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/statictypestaralt_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/sta/statictypestaralt_6.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/sta/statictypestaralt_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/tshf/chnf.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/tshf/chnf.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/tshf/chnf.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/tshf/chnf.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/tshf/cpr_tshf.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/tshf/cpr_tshf.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/tshf/cpr_tshf.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/tshf/cpr_tshf.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/tshf/tshf.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/tshf/tshf.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/tshf/tshf.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/tshf/tshf.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xpr_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xpr_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xpr_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xpr_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xpr_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xpr_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xpr_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xpr_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xpr_lsubss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xpr_lsubss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xpr_lsubss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xpr_lsubss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_aaa.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_aaa.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_aaa.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_aaa.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_cprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_cprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_cprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_cprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_lift.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_lift.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_lift.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_lift.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_lsubss.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_lsubss.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_lsubss.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_lsubss.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_xprs.etc b/matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_xprs.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc/xpr/xprs_xprs.etc rename to matita/matita/contribs/lambdadelta/basic_2/etc_2A1/xpr/xprs_xprs.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/ceq.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/ceq.etc similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/ceq.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/ceq.etc index abd6b25b3..57ecbaf68 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/ceq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/etc_new/ceq.etc @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/lenv.ma". +include "basic_2/syntax/lenv.ma". (* CONTEXT-SENSITIVE EQUIVALENCES FOR TERMS *********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/ceq_ceq.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/ceq_ceq.etc similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/ceq_ceq.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/ceq_ceq.etc index 142f3b863..b17b186e2 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/ceq_ceq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/etc_new/ceq_ceq.etc @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/ceq.ma". +include "basic_2/syntax/ceq.ma". (* CONTEXT-SENSITIVE EQUIVALENCES FOR TERMS *********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/etc_new/cpr/cpr_cir.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/cpr/cpr_cir.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/etc_new/cpr/cpr_cir.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/cpr/cpr_cir.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazyor_5.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/lazyor_5.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazyor_5.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/lazyor_5.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeq_4.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/lrsubeq_4.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeq_4.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/lrsubeq_4.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/psubst_6.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/psubst_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/psubst_6.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/psubst_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/psubststar_6.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/psubststar_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/psubststar_6.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/psubststar_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/psubststaralt_6.ma b/matita/matita/contribs/lambdadelta/basic_2/etc_new/psubststaralt_6.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/notation/relations/psubststaralt_6.ma rename to matita/matita/contribs/lambdadelta/basic_2/etc_new/psubststaralt_6.etc diff --git a/matita/matita/contribs/lambdadelta/basic_2/names.txt b/matita/matita/contribs/lambdadelta/basic_2/names.txt index bf8778e2d..a1cb0e0d1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/names.txt +++ b/matita/matita/contribs/lambdadelta/basic_2/names.txt @@ -26,9 +26,9 @@ i,j : local reference depth (de Bruijn's) k,l : global reference level m : n : type iterations -o : sort degree parameter +o : sort degree parameter (origin) p,q : binder polarity -r : reduction kind parameter (true = ordinary, false = extended) +r : s : sort index t,u : v,w : local reference position level (de Bruijn's) (RTM) diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabbr_2.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabbr_2.ma index afd2f1892..80ba76465 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabbr_2.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabbr_2.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( T1 . break ⓓ T2 )" +notation "hvbox( L . break ⓓ T1 )" left associative with precedence 48 - for @{ 'DxAbbr $T1 $T2 }. + for @{ 'DxAbbr $L $T1 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabst_2.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabst_2.ma index 43e324eae..5455e678e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabst_2.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxabst_2.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( T1 . break ⓛ T2 )" +notation "hvbox( L . break ⓛ T1 )" left associative with precedence 49 - for @{ 'DxAbst $T1 $T2 }. + for @{ 'DxAbst $L $T1 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind2_3.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind2_3.ma index bbded1eab..b276334f1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind2_3.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/constructors/dxbind2_3.ma @@ -14,10 +14,10 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation > "hvbox( T . break ②{ term 46 I } break term 47 T1 )" +notation > "hvbox( L . break ②{ term 46 I } break term 47 T1 )" non associative with precedence 46 - for @{ 'DxBind2 $T $I $T1 }. + for @{ 'DxBind2 $L $I $T1 }. -notation "hvbox( T . break ⓑ { term 46 I } break term 48 T1 )" +notation "hvbox( L . break ⓑ { term 46 I } break term 48 T1 )" non associative with precedence 47 - for @{ 'DxBind2 $T $I $T1 }. + for @{ 'DxBind2 $L $I $T1 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpred_8.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpred_8.ma index 68a41ffc0..7e58d203e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpred_8.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpred_8.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≽ break [ term 46 o, break term 46 h ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" +notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≽ break [ term 46 h, break term 46 o ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" non associative with precedence 45 for @{ 'BTPRed $h $o $G1 $L1 $T1 $G2 $L2 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredalt_8.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredalt_8.ma index 97ea5b59f..2e0ebf5a0 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredalt_8.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredalt_8.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≽ ≽ break [ term 46 o, break term 46 h ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" +notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≽ ≽ break [ term 46 h, break term 46 o ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" non associative with precedence 45 for @{ 'BTPRedAlt $h $o $G1 $L1 $T1 $G2 $L2 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredproper_8.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredproper_8.ma index 2dce25d43..e036aa7d5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredproper_8.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredproper_8.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≻ break [ term 46 o, break term 46 h ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" +notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≻ break [ term 46 h, break term 46 o ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" non associative with precedence 45 for @{ 'BTPRedProper $h $o $G1 $L1 $T1 $G2 $L2 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstar_8.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstar_8.ma index c48d221d4..6d216e2fa 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstar_8.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstar_8.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≥ break [ term 46 o, break term 46 h ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" +notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≥ break [ term 46 h, break term 46 o ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" non associative with precedence 45 for @{ 'BTPRedStar $h $o $G1 $L1 $T1 $G2 $L2 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstaralt_8.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstaralt_8.ma index 79b3fd9d2..3b2cd2bfe 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstaralt_8.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btpredstaralt_8.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≥ ≥ break [ term 46 o, break term 46 h ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" +notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ ≥ ≥ break [ term 46 h, break term 46 o ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" non associative with precedence 45 for @{ 'BTPRedStarAlt $h $o $G1 $L1 $T1 $G2 $L2 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsn_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsn_5.ma index 06d5b7b88..7abf15de8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsn_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsn_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦥ [ term 46 o, break term 46 h ] break ⦃ term 46 G, break term 46 L, break term 46 T ⦄ )" +notation "hvbox( ⦥ [ term 46 h, break term 46 o ] break ⦃ term 46 G, break term 46 L, break term 46 T ⦄ )" non associative with precedence 45 for @{ 'BTSN $h $o $G $L $T }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsnalt_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsnalt_5.ma index c303e309e..5e9d1ec67 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsnalt_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/btsnalt_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦥ ⦥ [ term 46 o, break term 46 h ] break ⦃ term 46 G, break term 46 L, break term 46 T ⦄ )" +notation "hvbox( ⦥ ⦥ [ term 46 h, break term 46 o ] break ⦃ term 46 G, break term 46 L, break term 46 T ⦄ )" non associative with precedence 45 for @{ 'BTSNAlt $h $o $G $L $T }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/cosn_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/cosn_5.ma index e9c9e645d..ef632cba9 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/cosn_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/cosn_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( G ⊢ ~ ⬊ * break [ term 46 o , break term 46 h , break term 46 f ] break term 46 L )" +notation "hvbox( G ⊢ ~ ⬊ * break [ term 46 h , break term 46 o , break term 46 f ] break term 46 L )" non associative with precedence 45 for @{ 'CoSN $h $o $f $G $L }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpconvstar_8.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpconvstar_8.ma index 8ae707641..8d37f5217 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpconvstar_8.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpconvstar_8.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T1 • * ⬌ * break [ term 46 o , break term 46 h , break term 46 n1 , break term 46 n2 ] break term 46 T2 )" +notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T1 • * ⬌ * break [ term 46 h , break term 46 o , break term 46 n1 , break term 46 n2 ] break term 46 T2 )" non associative with precedence 45 for @{ 'DPConvStar $h $o $n1 $n2 $G $L $T1 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpredstar_7.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpredstar_7.ma index a85c0e4f8..d9ab259ab 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpredstar_7.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/dpredstar_7.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T1 • * ➡ * break [ term 46 o , break term 46 h , break term 46 n ] break term 46 T2 )" +notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T1 • * ➡ * break [ term 46 h , break term 46 o , break term 46 n ] break term 46 T2 )" non associative with precedence 45 for @{ 'DPRedStar $h $o $n $G $L $T1 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazybtpredstarproper_8.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazybtpredstarproper_8.ma index c99a3af6d..9c1252ac7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazybtpredstarproper_8.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazybtpredstarproper_8.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ >≡ break [ term 46 o, break term 46 h ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" +notation "hvbox( ⦃ term 46 G1, break term 46 L1, break term 46 T1 ⦄ >≡ break [ term 46 h, break term 46 o ] break ⦃ term 46 G2, break term 46 L2 , break term 46 T2 ⦄ )" non associative with precedence 45 for @{ 'LazyBTPRedStarProper $h $o $G1 $L1 $T1 $G2 $L2 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazyeq_4.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazyeq_4.ma new file mode 100644 index 000000000..aec1914f1 --- /dev/null +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lazyeq_4.ma @@ -0,0 +1,19 @@ +(**************************************************************************) +(* ___ *) +(* ||M|| *) +(* ||A|| A project by Andrea Asperti *) +(* ||T|| *) +(* ||I|| Developers: *) +(* ||T|| The HELM team. *) +(* ||A|| http://helm.cs.unibo.it *) +(* \ / *) +(* \ / This file is distributed under the terms of the *) +(* v GNU General Public License Version 2 *) +(* *) +(**************************************************************************) + +(* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) + +notation "hvbox( T1 ≡ break [ term 46 h , term 46 o ] break term 46 T2 )" + non associative with precedence 45 + for @{ 'LazyEq $h $o $T1 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqv_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqv_5.ma index f39c6bcc7..d404926bf 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqv_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/lrsubeqv_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( G ⊢ break term 46 L1 ⫃ ¡ break [ term 46 o, break term 46 h ] break term 46 L2 )" +notation "hvbox( G ⊢ break term 46 L1 ⫃ ¡ break [ term 46 h, break term 46 o ] break term 46 L2 )" non associative with precedence 45 for @{ 'LRSubEqV $h $o $G $L1 $L2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_5.ma index 50e2452c2..4efadabad 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T ¡ break [ term 46 o, break term 46 h ] )" +notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T ¡ break [ term 46 h, break term 46 o ] )" non associative with precedence 45 for @{ 'NativeValid $h $o $G $L $T }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_6.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_6.ma index 2cd233332..d387e60be 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_6.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/nativevalid_6.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T ¡ break [ term 46 o , break term 46 h , break term 46 d ] )" +notation "hvbox( ⦃ term 46 G , break term 46 L ⦄ ⊢ break term 46 T ¡ break [ term 46 h , break term 46 o , break term 46 d ] )" non associative with precedence 45 for @{ 'NativeValid $h $o $d $G $L $T }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predeval_6.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predeval_6.ma index 80c61f26f..391f21f3c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predeval_6.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predeval_6.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ break term 46 T1 ➡ * break [ term 46 o , break term 46 h ] break 𝐍 ⦃ term 46 T2 ⦄ )" +notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ break term 46 T1 ➡ * break [ term 46 h , break term 46 o ] break 𝐍 ⦃ term 46 T2 ⦄ )" non associative with precedence 45 for @{ 'PRedEval $h $o $G $L $T1 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predsnstar_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predsnstar_5.ma index 3b12bc0e9..bb2d10464 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predsnstar_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predsnstar_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G, break term 46 L1 ⦄ ⊢ ➡ * break [ term 46 o , break term 46 h ] break term 46 L2 )" +notation "hvbox( ⦃ term 46 G, break term 46 L1 ⦄ ⊢ ➡ * break [ term 46 h , break term 46 o ] break term 46 L2 )" non associative with precedence 45 for @{ 'PRedSnStar $h $o $G $L1 $L2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predstar_6.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predstar_6.ma index b336dd9d7..265244809 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predstar_6.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/predstar_6.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ break term 46 T1 ➡ * break [ term 46 o , break term 46 h ] break term 46 T2 )" +notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ break term 46 T1 ➡ * break [ term 46 h , break term 46 o ] break term 46 T2 )" non associative with precedence 45 for @{ 'PRedStar $h $o $G $L $T1 $T2 }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_5.ma index 050140b69..4ac3bc7aa 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ ⬊ * break [ term 46 o, break term 46 h ] break term 46 T )" +notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ ⬊ * break [ term 46 h, break term 46 o ] break term 46 T )" non associative with precedence 45 for @{ 'SN $h $o $G $L $T }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_6.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_6.ma index ea018c41b..268bd0b61 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_6.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/sn_6.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( G ⊢ ⬊ * break [ term 46 o , break term 46 h , break term 46 T , break term 46 f ] break term 46 L )" +notation "hvbox( G ⊢ ⬊ * break [ term 46 h , break term 46 o , break term 46 T , break term 46 f ] break term 46 L )" non associative with precedence 45 for @{ 'SN $h $o $T $f $G $L }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_5.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_5.ma index 0c624b913..59196e5b1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_5.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_5.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ ⬊ ⬊ * break [ term 46 o , break term 46 h ] break term 46 T )" +notation "hvbox( ⦃ term 46 G, break term 46 L ⦄ ⊢ ⬊ ⬊ * break [ term 46 h , break term 46 o ] break term 46 T )" non associative with precedence 45 for @{ 'SNAlt $h $o $G $L $T }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_6.ma b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_6.ma index 09e6918e0..8f59a5f1c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_6.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/notation/relations/snalt_6.ma @@ -14,6 +14,6 @@ (* NOTATION FOR THE FORMAL SYSTEM λδ ****************************************) -notation "hvbox( G ⊢ ⬊ ⬊ * break [ term 46 o , break term 46 h , break term 46 T , break term 46 f ] break term 46 L )" +notation "hvbox( G ⊢ ⬊ ⬊ * break [ term 46 h , break term 46 o , break term 46 T , break term 46 f ] break term 46 L )" non associative with precedence 45 for @{ 'SNAlt $h $o $T $f $G $L }. diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_length.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_length.ma index 546485cb5..7426ebb53 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/lenv_length.ma". +include "basic_2/syntax/lenv_length.ma". include "basic_2/relocation/drops.ma". (* GENERIC SLICING FOR LOCAL ENVIRONMENTS ***********************************) @@ -37,7 +37,7 @@ theorem drops_fwd_length_eq1: ∀b1,b2,f,L1,K1. ⬇*[b1, f] L1 ≡ K1 → | #f #I1 #L1 #K1 #V1 #V2 #_ #_ #IH #X2 #Y2 #HX #H elim (length_inv_succ_sn … H) -H #I2 #L2 #V2 #H12 #H destruct elim (drops_inv_skip1 … HX) -HX #K2 #W2 #HLK2 #_ #H destruct - lapply (IH … HLK2 H12) -f /2 width=1 by/ (**) (* full auto fails *) + lapply (IH … HLK2 H12) -f >length_pair >length_pair /2 width=1 by/ (**) (* full auto fails *) ] qed-. @@ -47,8 +47,8 @@ lemma drops_fwd_fcla: ∀f,L1,L2. ⬇*[Ⓣ, f] L1 ≡ L2 → ∃∃n. 𝐂⦃f⦄ ≡ n & |L1| = |L2| + n. #f #L1 #L2 #H elim H -f -L1 -L2 [ /4 width=3 by fcla_isid, ex2_intro/ -| #f #I #L1 #L2 #V #_ * /3 width=3 by fcla_next, ex2_intro, eq_f/ -| #f #I #L1 #L2 #V1 #V2 #_ #_ * /3 width=3 by fcla_push, ex2_intro/ +| #f #I #L1 #L2 #V #_ * >length_pair /3 width=3 by fcla_next, ex2_intro, eq_f/ +| #f #I #L1 #L2 #V1 #V2 #_ #_ * >length_pair >length_pair /3 width=3 by fcla_push, ex2_intro/ ] qed-. @@ -56,7 +56,7 @@ qed-. lemma drops_fcla_fwd: ∀f,L1,L2,n. ⬇*[Ⓣ, f] L1 ≡ L2 → 𝐂⦃f⦄ ≡ n → |L1| = |L2| + n. #f #l1 #l2 #n #Hf #Hn elim (drops_fwd_fcla … Hf) -Hf -#m #Hm #H <(fcla_mono … Hm … Hn) -f // +#k #Hm #H <(fcla_mono … Hm … Hn) -f // qed-. lemma drops_fwd_fcla_le2: ∀f,L1,L2. ⬇*[Ⓣ, f] L1 ≡ L2 → @@ -68,7 +68,7 @@ qed-. lemma drops_fcla_fwd_le2: ∀f,L1,L2,n. ⬇*[Ⓣ, f] L1 ≡ L2 → 𝐂⦃f⦄ ≡ n → n ≤ |L1|. #f #L1 #L2 #n #H #Hn elim (drops_fwd_fcla_le2 … H) -H -#m #Hm #H <(fcla_mono … Hm … Hn) -f // +#k #Hm #H <(fcla_mono … Hm … Hn) -f // qed-. lemma drops_fwd_fcla_lt2: ∀f,L1,I2,K2,V2. ⬇*[Ⓣ, f] L1 ≡ K2.ⓑ{I2}V2 → @@ -82,7 +82,7 @@ lemma drops_fcla_fwd_lt2: ∀f,L1,I2,K2,V2,n. ⬇*[Ⓣ, f] L1 ≡ K2.ⓑ{I2}V2 → 𝐂⦃f⦄ ≡ n → n < |L1|. #f #L1 #I2 #K2 #V2 #n #H #Hn elim (drops_fwd_fcla_lt2 … H) -H -#m #Hm #H <(fcla_mono … Hm … Hn) -f // +#k #Hm #H <(fcla_mono … Hm … Hn) -f // qed-. (* Basic_2A1: includes: drop_fwd_length_lt4 *) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lreq.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lreq.ma index c6899fd3e..c9934f664 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lreq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_lreq.ma @@ -21,8 +21,7 @@ include "basic_2/relocation/drops_lexs.ma". lemma lreq_co_dedropable: co_dedropable_sn lreq. @lexs_liftable_co_dedropable -/2 width=6 by cfull_lift, ceq_lift, cfull_refl, ceq_refl/ -qed-. +/2 width=6 by cfull_lift, ceq_lift/ qed-. lemma lreq_co_dropable_sn: co_dropable_sn lreq. @lexs_co_dropable_sn qed-. @@ -56,5 +55,4 @@ lemma drops_lreq_trans_next: ∀f1,K1,K2. K1 ≡[f1] K2 → ∃∃L2. ⬇*[b,f] L2.ⓑ{I}V ≡ K2 & L1 ≡[f2] L2 & L1.ⓑ{I}V ≡[f] L2.ⓑ{I}V. #f1 #K1 #K2 #HK12 #b #f #I #L1 #V #HLK1 #f2 #Hf2 elim (drops_lexs_trans_next … HK12 … HLK1 … Hf2) -f1 -K1 -/2 width=6 by cfull_lift, ceq_lift, cfull_refl, ceq_refl, ex3_intro/ -qed-. +/2 width=6 by cfull_lift, ceq_lift, ex3_intro/ qed-. diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_weight.ma index 7cbe05e1e..1840b9122 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_weight.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/drops_weight.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/cl_restricted_weight.ma". +include "basic_2/syntax/cl_restricted_weight.ma". include "basic_2/relocation/lifts_weight.ma". include "basic_2/relocation/drops.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma index 9587c2659..e99ea0393 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs.ma @@ -14,7 +14,7 @@ include "ground_2/relocation/rtmap_sle.ma". include "basic_2/notation/relations/relationstar_5.ma". -include "basic_2/grammar/lenv.ma". +include "basic_2/syntax/lenv.ma". (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs_length.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs_length.ma index e407927a2..972c773ed 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lexs_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/lenv_length.ma". +include "basic_2/syntax/lenv_length.ma". include "basic_2/relocation/lexs.ma". (* GENERIC ENTRYWISE EXTENSION OF CONTEXT-SENSITIVE REALTIONS FOR TERMS *****) @@ -22,4 +22,5 @@ include "basic_2/relocation/lexs.ma". (* Basic_2A1: includes: lpx_sn_fwd_length *) lemma lexs_fwd_length: ∀RN,RP,f,L1,L2. L1 ⦻*[RN, RP, f] L2 → |L1| = |L2|. #RM #RP #f #L1 #L2 #H elim H -f -L1 -L2 // +#f #I #L1 #L2 #V1 #V2 >length_pair >length_pair // qed-. diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts.ma index d7176d732..73f3be9e7 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts.ma @@ -15,7 +15,7 @@ include "ground_2/relocation/nstream_after.ma". include "basic_2/notation/relations/rliftstar_3.ma". -include "basic_2/grammar/term.ma". +include "basic_2/syntax/term.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_simple.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_simple.ma index a8a9cc133..9afa0c02f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_simple.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_simple.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_simple.ma". +include "basic_2/syntax/term_simple.ma". include "basic_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_vector.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_vector.ma index 1662b56d2..26d395f19 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_vector.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_vector.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_vector.ma". +include "basic_2/syntax/term_vector.ma". include "basic_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR TERM VECTORS *************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight.ma index a2e774964..c6ad5b974 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lifts_weight.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_weight.ma". +include "basic_2/syntax/term_weight.ma". include "basic_2/relocation/lifts.ma". (* GENERIC RELOCATION FOR TERMS *********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/relocation/lreq.ma b/matita/matita/contribs/lambdadelta/basic_2/relocation/lreq.ma index b5ee58d79..aa2956699 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/relocation/lreq.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/relocation/lreq.ma @@ -13,7 +13,6 @@ (**************************************************************************) include "basic_2/notation/relations/lazyeq_3.ma". -include "basic_2/grammar/ceq.ma". include "basic_2/relocation/lexs.ma". (* RANGED EQUIVALENCE FOR LOCAL ENVIRONMENTS ********************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts.ma index 6434ff37f..c9d5f5ae9 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/tsts.ma". +include "basic_2/syntax/tsts.ma". include "basic_2/computation/lpxs_cpxs.ma". (* CONTEXT-SENSITIVE EXTENDED PARALLEL COMPUTATION ON TERMS *****************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts_vector.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts_vector.ma index 738d5907a..6252ed90e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts_vector.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/cpxs_tsts_vector.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/tsts_vector.ma". +include "basic_2/syntax/tsts_vector.ma". include "basic_2/substitution/lift_vector.ma". include "basic_2/computation/cpxs_tsts.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_lpx.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_lpx.ma index dd01e6a24..1c239f8f8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_lpx.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_lpx.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/tsts_tsts.ma". +include "basic_2/syntax/tsts_tsts.ma". include "basic_2/computation/cpxs_cpxs.ma". include "basic_2/computation/csx_alt.ma". include "basic_2/computation/csx_lift.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma index 95269945f..7d23b2f92 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/csx_vector.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_vector.ma". +include "basic_2/syntax/term_vector.ma". include "basic_2/computation/csx.ma". (* CONTEXT-SENSITIVE EXTENDED STRONGLY NORMALIZING TERM VECTORS *************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp.ma index 61e9182cd..12c661564 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/genv.ma". +include "basic_2/syntax/genv.ma". include "basic_2/multiple/drops.ma". (* GENERIC COMPUTATION PROPERTIES *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp_cr.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp_cr.ma index 13b57701c..3d1143900 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp_cr.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_computation/gcp_cr.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/ineint_5.ma". -include "basic_2/grammar/aarity.ma". +include "basic_2/syntax/aarity.ma". include "basic_2/multiple/mr2_mr2.ma". include "basic_2/multiple/lifts_lift_vector.ma". include "basic_2/multiple/drops_drop.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma index 73be2e83d..b682e561d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg.ma @@ -15,10 +15,10 @@ include "ground_2/steps/rtc_max.ma". include "ground_2/steps/rtc_plus.ma". include "basic_2/notation/relations/predty_7.ma". -include "basic_2/grammar/lenv.ma". -include "basic_2/grammar/genv.ma". +include "basic_2/syntax/item_sh.ma". +include "basic_2/syntax/lenv.ma". +include "basic_2/syntax/genv.ma". include "basic_2/relocation/lifts.ma". -include "basic_2/static/sh.ma". (* COUNTED CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma index 0afd4cabb..506386e42 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpg_simple.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_simple.ma". +include "basic_2/syntax/term_simple.ma". include "basic_2/rt_transition/cpg.ma". (* COUNTED CONTEXT-SENSITIVE PARALLEL RT-TRANSITION FOR TERMS ***************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm.ma index 2ff07da04..c207e05c1 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm.ma @@ -124,8 +124,8 @@ lemma cpm_inv_atom1: ∀n,h,J,G,L,T2. ⦃G, L⦄ ⊢ ⓪{J} ➡[n, h] T2 → | ∃∃s. T2 = ⋆(next h s) & J = Sort s & n = 1 | ∃∃K,V1,V2. ⦃G, K⦄ ⊢ V1 ➡[n, h] V2 & ⬆*[1] V2 ≡ T2 & L = K.ⓓV1 & J = LRef 0 - | ∃∃m,K,V1,V2. ⦃G, K⦄ ⊢ V1 ➡[m, h] V2 & ⬆*[1] V2 ≡ T2 & - L = K.ⓛV1 & J = LRef 0 & n = ⫯m + | ∃∃k,K,V1,V2. ⦃G, K⦄ ⊢ V1 ➡[k, h] V2 & ⬆*[1] V2 ≡ T2 & + L = K.ⓛV1 & J = LRef 0 & n = ⫯k | ∃∃I,K,V,T,i. ⦃G, K⦄ ⊢ #i ➡[n, h] T & ⬆*[1] T ≡ T2 & L = K.ⓑ{I}V & J = LRef (⫯i). #n #h #J #G #L #T2 * #c #Hc #H elim (cpg_inv_atom1 … H) -H * @@ -134,7 +134,7 @@ lemma cpm_inv_atom1: ∀n,h,J,G,L,T2. ⦃G, L⦄ ⊢ ⓪{J} ➡[n, h] T2 → | #cV #K #V1 #V2 #HV12 #HVT2 #H1 #H2 #H3 destruct /4 width=6 by or5_intro2, ex4_3_intro, ex2_intro/ | #cV #K #V1 #V2 #HV12 #HVT2 #H1 #H2 #H3 destruct - elim (isrt_inv_plus_SO_dx … Hc) -Hc // #m #Hc #H destruct + elim (isrt_inv_plus_SO_dx … Hc) -Hc // #k #Hc #H destruct /4 width=9 by or5_intro3, ex5_4_intro, ex2_intro/ | #I #K #V1 #V2 #i #HV2 #HVT2 #H1 #H2 destruct /4 width=9 by or5_intro4, ex4_5_intro, ex2_intro/ @@ -153,14 +153,14 @@ lemma cpm_inv_zero1: ∀n,h,G,L,T2. ⦃G, L⦄ ⊢ #0 ➡[n, h] T2 → ∨∨ (T2 = #0 ∧ n = 0) | ∃∃K,V1,V2. ⦃G, K⦄ ⊢ V1 ➡[n, h] V2 & ⬆*[1] V2 ≡ T2 & L = K.ⓓV1 - | ∃∃m,K,V1,V2. ⦃G, K⦄ ⊢ V1 ➡[m, h] V2 & ⬆*[1] V2 ≡ T2 & - L = K.ⓛV1 & n = ⫯m. + | ∃∃k,K,V1,V2. ⦃G, K⦄ ⊢ V1 ➡[k, h] V2 & ⬆*[1] V2 ≡ T2 & + L = K.ⓛV1 & n = ⫯k. #n #h #G #L #T2 * #c #Hc #H elim (cpg_inv_zero1 … H) -H * [ #H1 #H2 destruct /4 width=1 by isrt_inv_00, or3_intro0, conj/ | #cV #K #V1 #V2 #HV12 #HVT2 #H1 #H2 destruct /4 width=8 by or3_intro1, ex3_3_intro, ex2_intro/ | #cV #K #V1 #V2 #HV12 #HVT2 #H1 #H2 destruct - elim (isrt_inv_plus_SO_dx … Hc) -Hc // #m #Hc #H destruct + elim (isrt_inv_plus_SO_dx … Hc) -Hc // #k #Hc #H destruct /4 width=8 by or3_intro2, ex4_4_intro, ex2_intro/ ] qed-. @@ -263,7 +263,7 @@ lemma cpm_inv_cast1: ∀n,h,G,L,V1,U1,U2. ⦃G, L⦄ ⊢ ⓝV1.U1 ➡[n, h] U2 ∨∨ ∃∃V2,T2. ⦃G, L⦄ ⊢ V1 ➡[n, h] V2 & ⦃G, L⦄ ⊢ U1 ➡[n, h] T2 & U2 = ⓝV2.T2 | ⦃G, L⦄ ⊢ U1 ➡[n, h] U2 - | ∃∃m. ⦃G, L⦄ ⊢ V1 ➡[m, h] U2 & n = ⫯m. + | ∃∃k. ⦃G, L⦄ ⊢ V1 ➡[k, h] U2 & n = ⫯k. #n #h #G #L #V1 #U1 #U2 * #c #Hc #H elim (cpg_inv_cast1 … H) -H * [ #cV #cT #V2 #T2 #HV12 #HT12 #HcVT #H1 #H2 destruct elim (isrt_inv_max … Hc) -Hc #nV #nT #HcV #HcT #H destruct @@ -273,7 +273,7 @@ lemma cpm_inv_cast1: ∀n,h,G,L,V1,U1,U2. ⦃G, L⦄ ⊢ ⓝV1.U1 ➡[n, h] U2 | #cU #U12 #H destruct /4 width=3 by isrt_inv_plus_O_dx, or3_intro1, ex2_intro/ | #cU #H12 #H destruct - elim (isrt_inv_plus_SO_dx … Hc) -Hc // #m #Hc #H destruct + elim (isrt_inv_plus_SO_dx … Hc) -Hc // #k #Hc #H destruct /4 width=3 by or3_intro2, ex2_intro/ ] qed-. diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm_drops.ma index 786d2f9ce..fbcd7958d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpm_drops.ma @@ -42,8 +42,8 @@ lemma cpm_inv_atom1_drops: ∀n,h,I,G,L,T2. ⦃G, L⦄ ⊢ ⓪{I} ➡[n, h] T2 | ∃∃s. T2 = ⋆(next h s) & I = Sort s & n = 1 | ∃∃K,V,V2,i. ⬇*[i] L ≡ K.ⓓV & ⦃G, K⦄ ⊢ V ➡[n, h] V2 & ⬆*[⫯i] V2 ≡ T2 & I = LRef i - | ∃∃m,K,V,V2,i. ⬇*[i] L ≡ K.ⓛV & ⦃G, K⦄ ⊢ V ➡[m, h] V2 & - ⬆*[⫯i] V2 ≡ T2 & I = LRef i & n = ⫯m. + | ∃∃k,K,V,V2,i. ⬇*[i] L ≡ K.ⓛV & ⦃G, K⦄ ⊢ V ➡[k, h] V2 & + ⬆*[⫯i] V2 ≡ T2 & I = LRef i & n = ⫯k. #n #h #I #G #L #T2 * #c #Hc #H elim (cpg_inv_atom1_drops … H) -H * [ #H1 #H2 destruct lapply (isrt_inv_00 … Hc) -Hc /3 width=1 by or4_intro0, conj/ @@ -61,8 +61,8 @@ lemma cpm_inv_lref1_drops: ∀n,h,G,L,T2,i. ⦃G, L⦄ ⊢ #i ➡[n, h] T2 → ∨∨ T2 = #i ∧ n = 0 | ∃∃K,V,V2. ⬇*[i] L ≡ K. ⓓV & ⦃G, K⦄ ⊢ V ➡[n, h] V2 & ⬆*[⫯i] V2 ≡ T2 - | ∃∃m,K,V,V2. ⬇*[i] L ≡ K. ⓛV & ⦃G, K⦄ ⊢ V ➡[m, h] V2 & - ⬆*[⫯i] V2 ≡ T2 & n = ⫯m. + | ∃∃k,K,V,V2. ⬇*[i] L ≡ K. ⓛV & ⦃G, K⦄ ⊢ V ➡[k, h] V2 & + ⬆*[⫯i] V2 ≡ T2 & n = ⫯k. #n #h #G #L #T2 #i * #c #Hc #H elim (cpg_inv_lref1_drops … H) -H * [ #H1 #H2 destruct lapply (isrt_inv_00 … Hc) -Hc /3 width=1 by or3_intro0, conj/ diff --git a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_drops.ma b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_drops.ma index 48d281e4f..c7c287036 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_drops.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/rt_transition/cpr_drops.ma @@ -27,7 +27,7 @@ lemma cpr_inv_atom1_drops: ∀h,I,G,L,T2. ⦃G, L⦄ ⊢ ⓪{I} ➡[h] T2 → [ /2 width=1 by or_introl/ | #s #_ #_ #H destruct | /3 width=8 by ex4_4_intro, or_intror/ -| #m #K #V1 #V2 #i #_ #_ #_ #_ #H destruct +| #k #K #V1 #V2 #i #_ #_ #_ #_ #H destruct ] qed-. @@ -40,6 +40,6 @@ lemma cpr_inv_lref1_drops: ∀h,G,L,T2,i. ⦃G, L⦄ ⊢ #i ➡[h] T2 → #h #G #L #T2 #i #H elim (cpm_inv_lref1_drops … H) -H * [ /2 width=1 by or_introl/ | /3 width=6 by ex3_3_intro, or_intror/ -| #m #K #V1 #V2 #_ #_ #_ #H destruct +| #k #K #V1 #V2 #_ #_ #_ #H destruct ] qed-. diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu.ma b/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu.ma index 043d01598..f5ef91e0c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "basic_2/notation/relations/supterm_6.ma". -include "basic_2/grammar/lenv.ma". -include "basic_2/grammar/genv.ma". +include "basic_2/syntax/lenv.ma". +include "basic_2/syntax/genv.ma". include "basic_2/relocation/lifts.ma". (* SUPCLOSURE ***************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_length.ma b/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_length.ma index 9719388a5..c64b9ed5e 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/lenv_length.ma". +include "basic_2/syntax/lenv_length.ma". include "basic_2/s_transition/fqu.ma". (* SUPCLOSURE ***************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_weight.ma index 8969786c9..93148750f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_weight.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/s_transition/fqu_weight.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/cl_weight.ma". +include "basic_2/syntax/cl_weight.ma". include "basic_2/relocation/lifts_weight.ma". include "basic_2/s_transition/fqu.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/aaa.ma b/matita/matita/contribs/lambdadelta/basic_2/static/aaa.ma index a57a60b24..94cfde2f5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/aaa.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/static/aaa.ma @@ -13,9 +13,9 @@ (**************************************************************************) include "basic_2/notation/relations/atomicarity_4.ma". -include "basic_2/grammar/aarity.ma". -include "basic_2/grammar/lenv.ma". -include "basic_2/grammar/genv.ma". +include "basic_2/syntax/aarity.ma". +include "basic_2/syntax/lenv.ma". +include "basic_2/syntax/genv.ma". (* ATONIC ARITY ASSIGNMENT FOR TERMS ****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/frees.ma b/matita/matita/contribs/lambdadelta/basic_2/static/frees.ma index 5911dddfe..de1568f2d 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/frees.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/static/frees.ma @@ -14,7 +14,7 @@ include "ground_2/relocation/rtmap_sor.ma". include "basic_2/notation/relations/freestar_3.ma". -include "basic_2/grammar/lenv.ma". +include "basic_2/syntax/lenv.ma". (* CONTEXT-SENSITIVE FREE VARIABLES *****************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lfxs.ma b/matita/matita/contribs/lambdadelta/basic_2/static/lfxs.ma index 2064f1217..92888ef46 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lfxs.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/static/lfxs.ma @@ -14,7 +14,6 @@ include "ground_2/relocation/rtmap_id.ma". include "basic_2/notation/relations/relationstar_4.ma". -include "basic_2/grammar/ceq.ma". include "basic_2/relocation/lexs.ma". include "basic_2/static/frees.ma". diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr.ma b/matita/matita/contribs/lambdadelta/basic_2/static/lsubr.ma index fe7ce2608..352626ccd 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/static/lsubr.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/lrsubeqc_2.ma". -include "basic_2/grammar/lenv.ma". +include "basic_2/syntax/lenv.ma". (* RESTRICTED REFINEMENT FOR LOCAL ENVIRONMENTS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_length.ma b/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_length.ma index e240002bf..9c6beef12 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/static/lsubr_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/lenv_length.ma". +include "basic_2/syntax/lenv_length.ma". include "basic_2/static/lsubr.ma". (* RESTRICTED REFINEMENT FOR LOCAL ENVIRONMENTS *****************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/aarity.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/aarity.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/aarity.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/aarity.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/append.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/append.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/append.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/append.ma index cdbb45d48..f78ecb55c 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/append.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/append.ma @@ -16,7 +16,7 @@ include "ground_2/notation/functions/append_2.ma". include "basic_2/notation/functions/snbind2_3.ma". include "basic_2/notation/functions/snabbr_2.ma". include "basic_2/notation/functions/snabst_2.ma". -include "basic_2/grammar/lenv.ma". +include "basic_2/syntax/lenv.ma". (* APPEND FOR LOCAL ENVIRONMENTS ********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/append_length.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/append_length.ma similarity index 93% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/append_length.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/append_length.ma index 21e5a868e..cab2cb810 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/append_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/append_length.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/grammar/lenv_length.ma". -include "basic_2/grammar/append.ma". +include "basic_2/syntax/lenv_length.ma". +include "basic_2/syntax/append.ma". (* APPEND FOR LOCAL ENVIRONMENTS ********************************************) @@ -40,14 +40,14 @@ qed-. (* Basic_2A1: was: length_inv_pos_dx_ltail *) lemma length_inv_succ_dx_ltail: ∀L,l. |L| = ⫯l → - ∃∃I,K,V. |K| = l & L = ⓑ{I}V.K. + ∃∃I,K,V. |K| = l & L = ⓑ{I}V.K. #Y #l #H elim (length_inv_succ_dx … H) -H #I #L #V #Hl #HLK destruct elim (lpair_ltail L I V) /2 width=5 by ex2_3_intro/ qed-. (* Basic_2A1: was: length_inv_pos_sn_ltail *) lemma length_inv_succ_sn_ltail: ∀L,l. ⫯l = |L| → - ∃∃I,K,V. l = |K| & L = ⓑ{I}V.K. + ∃∃I,K,V. l = |K| & L = ⓑ{I}V.K. #Y #l #H elim (length_inv_succ_sn … H) -H #I #L #V #Hl #HLK destruct elim (lpair_ltail L I V) /2 width=5 by ex2_3_intro/ qed-. @@ -64,9 +64,9 @@ lemma append_inj_length_sn: ∀K1,K2,L1,L2. L1 @@ K1 = L2 @@ K2 → |K1| = |K2| | #K1 #I1 #V1 #IH * [ #L1 #L2 #_ >length_atom >length_pair #H destruct - | #K2 #I2 #V2 #L1 #L2 #H1 #H2 + | #K2 #I2 #V2 #L1 #L2 #H1 >length_pair >length_pair #H2 elim (destruct_lpair_lpair_aux … H1) -H1 #H1 #H3 #H4 destruct (**) (* destruct lemma needed *) - elim (IH … H1) -IH -H1 /2 width=1 by conj/ + elim (IH … H1) -IH -H1 /3 width=4 by conj/ ] ] qed-. diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_restricted_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_restricted_weight.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/cl_restricted_weight.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/cl_restricted_weight.ma index fcf56071b..32fd77331 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_restricted_weight.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_restricted_weight.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/functions/weight_2.ma". -include "basic_2/grammar/lenv_weight.ma". +include "basic_2/syntax/lenv_weight.ma". (* WEIGHT OF A RESTRICTED CLOSURE *******************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_weight.ma similarity index 96% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/cl_weight.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/cl_weight.ma index bd837d4df..b93368814 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_weight.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/cl_weight.ma @@ -13,8 +13,8 @@ (**************************************************************************) include "basic_2/notation/functions/weight_3.ma". -include "basic_2/grammar/lenv_weight.ma". -include "basic_2/grammar/genv.ma". +include "basic_2/syntax/lenv_weight.ma". +include "basic_2/syntax/genv.ma". (* WEIGHT OF A CLOSURE ******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/deq.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/deq.ma new file mode 100644 index 000000000..a14f7e3d8 --- /dev/null +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/deq.ma @@ -0,0 +1,104 @@ +(**************************************************************************) +(* ___ *) +(* ||M|| *) +(* ||A|| A project by Andrea Asperti *) +(* ||T|| *) +(* ||I|| Developers: *) +(* ||T|| The HELM team. *) +(* ||A|| http://helm.cs.unibo.it *) +(* \ / *) +(* \ / This file is distributed under the terms of the *) +(* v GNU General Public License Version 2 *) +(* *) +(**************************************************************************) + +include "basic_2/notation/relations/lazyeq_4.ma". +include "basic_2/syntax/item_sd.ma". +include "basic_2/syntax/lenv.ma". + +(* DEGREE-BASED EQUIVALENCE ON TERMS ****************************************) + +inductive deq (h) (o): relation term ≝ +| deq_sort: ∀s1,s2,d. deg h o s1 d → deg h o s2 d → deq h o (⋆s1) (⋆s2) +| deq_lref: ∀i. deq h o (#i) (#i) +| deq_gref: ∀l. deq h o (§l) (§l) +| deq_pair: ∀I,V1,V2,T1,T2. deq h o V1 V2 → deq h o T1 T2 → deq h o (②{I}V1.T1) (②{I}V2.T2) +. + +interpretation + "degree-based equivalence (terms)" + 'LazyEq h o T1 T2 = (deq h o T1 T2). + +definition cdeq: ∀h. sd h → relation3 lenv term term ≝ + λh,o,L. deq h o. + +(* Basic properties *********************************************************) + +lemma deq_refl: ∀h,o. reflexive … (deq h o). +#h #o #T elim T -T /2 width=1 by deq_pair/ +* /2 width=1 by deq_lref, deq_gref/ +#s elim (deg_total h o s) /2 width=3 by deq_sort/ +qed. + +lemma deq_sym: ∀h,o. symmetric … (deq h o). +#h #o #T1 #T2 #H elim H -T1 -T2 +/2 width=3 by deq_sort, deq_lref, deq_gref, deq_pair/ +qed-. + +(* Basic inversion lemmas ***************************************************) + +fact deq_inv_sort1_aux: ∀h,o,X,Y. X ≡[h, o] Y → ∀s1. X = ⋆s1 → + ∃∃s2,d. deg h o s1 d & deg h o s2 d & Y = ⋆s2. +#h #o #X #Y * -X -Y +[ #s1 #s2 #d #Hs1 #Hs2 #s #H destruct /2 width=5 by ex3_2_intro/ +| #i #s #H destruct +| #l #s #H destruct +| #I #V1 #V2 #T1 #T2 #_ #_ #s #H destruct +] +qed-. + +lemma deq_inv_sort1: ∀h,o,Y,s1. ⋆s1 ≡[h, o] Y → + ∃∃s2,d. deg h o s1 d & deg h o s2 d & Y = ⋆s2. +/2 width=3 by deq_inv_sort1_aux/ qed-. + +fact deq_inv_lref1_aux: ∀h,o,X,Y. X ≡[h, o] Y → ∀i. X = #i → Y = #i. +#h #o #X #Y * -X -Y // +[ #s1 #s2 #d #_ #_ #j #H destruct +| #I #V1 #V2 #T1 #T2 #_ #_ #j #H destruct +] +qed-. + +lemma deq_inv_lref1: ∀h,o,Y,i. #i ≡[h, o] Y → Y = #i. +/2 width=5 by deq_inv_lref1_aux/ qed-. + +fact deq_inv_gref1_aux: ∀h,o,X,Y. X ≡[h, o] Y → ∀l. X = §l → Y = §l. +#h #o #X #Y * -X -Y // +[ #s1 #s2 #d #_ #_ #k #H destruct +| #I #V1 #V2 #T1 #T2 #_ #_ #k #H destruct +] +qed-. + +lemma deq_inv_gref1: ∀h,o,Y,l. §l ≡[h, o] Y → Y = §l. +/2 width=5 by deq_inv_gref1_aux/ qed-. + +fact deq_inv_pair1_aux: ∀h,o,X,Y. X ≡[h, o] Y → ∀I,V1,T1. X = ②{I}V1.T1 → + ∃∃V2,T2. V1 ≡[h, o] V2 & T1 ≡[h, o] T2 & Y = ②{I}V2.T2. +#h #o #X #Y * -X -Y +[ #s1 #s2 #d #_ #_ #J #W1 #U1 #H destruct +| #i #J #W1 #U1 #H destruct +| #l #J #W1 #U1 #H destruct +| #I #V1 #V2 #T1 #T2 #HV #HT #J #W1 #U1 #H destruct /2 width=5 by ex3_2_intro/ +] +qed-. + +lemma deq_inv_pair1: ∀h,o,I,V1,T1,Y. ②{I}V1.T1 ≡[h, o] Y → + ∃∃V2,T2. V1 ≡[h, o] V2 & T1 ≡[h, o] T2 & Y = ②{I}V2.T2. +/2 width=3 by deq_inv_pair1_aux/ qed-. + +(* Advanced inversion lemmas ************************************************) + +lemma deq_inv_sort1_deg: ∀h,o,Y,s1. ⋆s1 ≡[h, o] Y → ∀d. deg h o s1 d → + ∃∃s2. deg h o s2 d & Y = ⋆s2. +#h #o #Y #s1 #H #d #Hs1 elim (deq_inv_sort1 … H) -H +#s2 #x #Hx <(deg_mono h o … Hx … Hs1) -s1 -d /2 width=3 by ex2_intro/ +qed-. diff --git a/matita/matita/contribs/lambdadelta/basic_2/syntax/deq_deq.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/deq_deq.ma new file mode 100644 index 000000000..b69e2dc4e --- /dev/null +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/deq_deq.ma @@ -0,0 +1,30 @@ +(**************************************************************************) +(* ___ *) +(* ||M|| *) +(* ||A|| A project by Andrea Asperti *) +(* ||T|| *) +(* ||I|| Developers: *) +(* ||T|| The HELM team. *) +(* ||A|| http://helm.cs.unibo.it *) +(* \ / *) +(* \ / This file is distributed under the terms of the *) +(* v GNU General Public License Version 2 *) +(* *) +(**************************************************************************) + +include "basic_2/syntax/deq.ma". + +(* DEGREE-BASED EQUIVALENCE ON TERMS ****************************************) + +(* Main properties **********************************************************) + +theorem deq_trans: ∀h,o. Transitive … (deq h o). +#h #o #T1 #T #H elim H -T1 -T +[ #s1 #s #d #Hs1 #Hs #X #H + elim (deq_inv_sort1_deg … H … Hs) -s /2 width=3 by deq_sort/ +| #i1 #i #H <(deq_inv_lref1 … H) -H // +| #l1 #l #H <(deq_inv_gref1 … H) -H // +| #I #V1 #V #T1 #T #_ #_ #IHV #IHT #X #H destruct + elim (deq_inv_pair1 … H) -H /3 width=1 by deq_pair/ +] +qed-. diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/genv.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/genv.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/genv.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/genv.ma index c614e0f4e..8483917c4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/genv.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/genv.ma @@ -17,7 +17,7 @@ include "basic_2/notation/constructors/star_0.ma". include "basic_2/notation/constructors/dxbind2_3.ma". include "basic_2/notation/constructors/dxabbr_2.ma". include "basic_2/notation/constructors/dxabst_2.ma". -include "basic_2/grammar/term.ma". +include "basic_2/syntax/term.ma". (* GLOBAL ENVIRONMENTS ******************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/item.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/item.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/item.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/item.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/sd.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/item_sd.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/static/sd.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/item_sd.ma index bf7534529..3387066d3 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/static/sd.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/item_sd.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/static/sh.ma". +include "basic_2/syntax/item_sh.ma". (* SORT DEGREE **************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/static/sh.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/item_sh.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/basic_2/static/sh.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/item_sh.ma diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/lenv.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/lenv.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/lenv.ma index 80738ebbd..cfefa7fd8 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/lenv.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv.ma @@ -16,7 +16,7 @@ include "basic_2/notation/constructors/star_0.ma". include "basic_2/notation/constructors/dxbind2_3.ma". include "basic_2/notation/constructors/dxabbr_2.ma". include "basic_2/notation/constructors/dxabst_2.ma". -include "basic_2/grammar/term.ma". +include "basic_2/syntax/term.ma". (* LOCAL ENVIRONMENTS *******************************************************) @@ -38,6 +38,10 @@ interpretation "abbreviation (local environment)" interpretation "abstraction (local environment)" 'DxAbst L T = (LPair L Abst T). +definition ceq: relation3 lenv term term ≝ λL,T1,T2. T1 = T2. + +definition cfull: relation3 lenv term term ≝ λL,T1,T2. ⊤. + (* Basic properties *********************************************************) lemma eq_lenv_dec: ∀L1,L2:lenv. Decidable (L1 = L2). diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/lenv_length.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_length.ma similarity index 94% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/lenv_length.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_length.ma index a7a99ba01..41e09d5d5 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/lenv_length.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_length.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/lenv.ma". +include "basic_2/syntax/lenv.ma". (* LENGTH OF A LOCAL ENVIRONMENT ********************************************) @@ -44,8 +44,8 @@ lemma length_inv_zero_sn: ∀L. 0 = |L| → L = ⋆. (* Basic_2A1: was: length_inv_pos_dx *) lemma length_inv_succ_dx: ∀n,L. |L| = ⫯n → ∃∃I,K,V. |K| = n & L = K. ⓑ{I}V. -#n * /3 width=5 by injective_S, ex2_3_intro/ ->length_atom #H destruct +#n * [ >length_atom #H destruct ] +#L #I #V >length_pair /3 width=5 by ex2_3_intro, injective_S/ qed-. (* Basic_2A1: was: length_inv_pos_sn *) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/lenv_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_weight.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/lenv_weight.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_weight.ma index c9d79e5f5..1a61b7d4f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/lenv_weight.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/lenv_weight.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_weight.ma". -include "basic_2/grammar/lenv.ma". +include "basic_2/syntax/term_weight.ma". +include "basic_2/syntax/lenv.ma". (* WEIGHT OF A LOCAL ENVIRONMENT ********************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/term.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/term.ma similarity index 99% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/term.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/term.ma index ff00f4f84..ccbb494dd 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/term.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/term.ma @@ -29,7 +29,7 @@ include "basic_2/notation/constructors/snabstpos_2.ma". include "basic_2/notation/constructors/snabstneg_2.ma". include "basic_2/notation/constructors/snappl_2.ma". include "basic_2/notation/constructors/sncast_2.ma". -include "basic_2/grammar/item.ma". +include "basic_2/syntax/item.ma". (* TERMS ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/term_simple.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/term_simple.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/term_simple.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/term_simple.ma index 6332ff149..50e259544 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/term_simple.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/term_simple.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/simple_1.ma". -include "basic_2/grammar/term.ma". +include "basic_2/syntax/term.ma". (* SIMPLE (NEUTRAL) TERMS ***************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/term_vector.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/term_vector.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/term_vector.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/term_vector.ma index d33d4b452..1de2ef352 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/term_vector.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/term_vector.ma @@ -14,7 +14,7 @@ include "ground_2/lib/list.ma". include "basic_2/notation/functions/snapplvector_2.ma". -include "basic_2/grammar/term_simple.ma". +include "basic_2/syntax/term_simple.ma". (* TERMS ********************************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/term_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/term_weight.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/term_weight.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/term_weight.ma index 23659262d..9076a9b2f 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/term_weight.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/term_weight.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/functions/weight_1.ma". -include "basic_2/grammar/term.ma". +include "basic_2/syntax/term.ma". (* WEIGHT OF A TERM *********************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/tsts.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/tsts.ma similarity index 98% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/tsts.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/tsts.ma index d3bc8ee96..281f7fc81 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/tsts.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/tsts.ma @@ -13,7 +13,7 @@ (**************************************************************************) include "basic_2/notation/relations/topiso_2.ma". -include "basic_2/grammar/term_simple.ma". +include "basic_2/syntax/term_simple.ma". (* SAME TOP TERM STRUCTURE **************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/tsts_tsts.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/tsts_tsts.ma similarity index 97% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/tsts_tsts.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/tsts_tsts.ma index d46b497c8..59dfd02e4 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/tsts_tsts.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/tsts_tsts.ma @@ -12,7 +12,7 @@ (* *) (**************************************************************************) -include "basic_2/grammar/tsts.ma". +include "basic_2/syntax/tsts.ma". (* SAME TOP TERM STRUCTURE **************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/tsts_vector.ma b/matita/matita/contribs/lambdadelta/basic_2/syntax/tsts_vector.ma similarity index 95% rename from matita/matita/contribs/lambdadelta/basic_2/grammar/tsts_vector.ma rename to matita/matita/contribs/lambdadelta/basic_2/syntax/tsts_vector.ma index e90370621..9341af67b 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/grammar/tsts_vector.ma +++ b/matita/matita/contribs/lambdadelta/basic_2/syntax/tsts_vector.ma @@ -12,8 +12,8 @@ (* *) (**************************************************************************) -include "basic_2/grammar/term_vector.ma". -include "basic_2/grammar/tsts.ma". +include "basic_2/syntax/term_vector.ma". +include "basic_2/syntax/tsts.ma". (* SAME TOP TERM STRUCTURE **************************************************) diff --git a/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl b/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl index 172b43b1d..cd88f565a 100644 --- a/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl +++ b/matita/matita/contribs/lambdadelta/basic_2/web/basic_2_src.tbl @@ -162,10 +162,6 @@ table { ] class "green" [ { "static typing" * } { - [ { "parameters" * } { - [ "sh" "sd" * ] - } - ] [ { "restricted ref. for atomic arity assignment" * } { [ "lsuba ( ? ⊢ ? ⫃⁝ ? )" "lsuba_drops" + "lsuba_lsubr" + "lsuba_aaa" + "lsuba_lsuba" * ] } @@ -241,13 +237,13 @@ table { } ] class "red" - [ { "grammar" * } { + [ { "syntax" * } { [ { "append for local environments" * } { [ "append ( ? @@ ? )" "append_length" * ] } ] - [ { "context-sensitive equivalences for terms" * } { - [ "ceq" "ceq_ceq" * ] + [ { "degree-based equivalence for terms" * } { + [ "deq ( ? ≡[?,?] ? ) " "deq_deq" * ] } ] [ { "same top term structure" * } { @@ -255,17 +251,34 @@ table { } ] [ { "closures" * } { - [ "cl_weight ( ♯{?,?,?} )" "cl_restricted_weight ( ♯{?,?} )" * ] + [ "cl_weight ( ♯{?,?,?} )" * ] + [ "cl_restricted_weight ( ♯{?,?} )" * ] } ] - [ { "internal syntax" * } { + [ { "global environments" * } { [ "genv" * ] - [ "lenv" "lenv_weight ( ♯{?} )" "lenv_length ( |?| )" * ] - [ "term" "term_weight ( ♯{?} )" "term_simple ( 𝐒⦃?⦄ )" "term_vector ( Ⓐ?.? )" * ] + } + ] + [ { "local environments" * } { + [ "lenv_length ( |?| )" * ] + [ "lenv_weight ( ♯{?} )" * ] + [ "lenv" * ] + } + ] + [ { "terms" * } { + [ "term_vector ( Ⓐ?.? )" * ] + [ "term_simple ( 𝐒⦃?⦄ )" * ] + [ "term_weight ( ♯{?} )" * ] + [ "term" * ] + } + ] + [ { "items" * } { + [ "item_sd" * ] + [ "item_sh" * ] [ "item" * ] } ] - [ { "external syntax" * } { + [ { "atomic arities" * } { [ "aarity" * ] } ] diff --git a/matita/matita/contribs/lambdadelta/replace.sh b/matita/matita/contribs/lambdadelta/replace.sh index 739dd9871..2f053dec9 100644 --- a/matita/matita/contribs/lambdadelta/replace.sh +++ b/matita/matita/contribs/lambdadelta/replace.sh @@ -1,6 +1,6 @@ #!/bin/sh -#for MA in `find -name "*.ma"`; do -for MA in `find -name "cpg*.ma" -or -name "cpx*.ma"`; do +for MA in `find -name "*.ma"`; do +#for MA in `find -name "cpg*.ma" -or -name "cpx*.ma"`; do echo ${MA}; sed "s!$1!$2!g" ${MA} > ${MA}.new if diff ${MA} ${MA}.new > /dev/null; then rm -f ${MA}.new; -- 2.39.2