remove bad aliases from toolbox

diff --git a/helm/software/matita/library/demo/toolbox.ma b/helm/software/matita/library/demo/toolbox.ma
index 2b076ee7f970bbe672e36bee7f3d1434cf6cfa71..adc6b1d83650d13ae19febc219ec1e805e9cc960 100644 (file)
--- a/helm/software/matita/library/demo/toolbox.ma
+++ b/helm/software/matita/library/demo/toolbox.ma
@@ -48,7 +48,6 @@ definition proofs: CProp → setoid.
  constructor 1;
   [ apply A
   | intros;
-    alias id "True" = "cic:/Coq/Init/Logic/True.ind#xpointer(1/1)".
     apply True
   | intro;
     constructor 1
@@ -71,7 +70,6 @@ definition proofs1: CProp → setoid1.
  constructor 1;
   [ apply A
   | intros;
-    alias id "True" = "cic:/Coq/Init/Logic/True.ind#xpointer(1/1)".
     apply True
   | intro;
     constructor 1
@@ -259,4 +257,4 @@ definition intersection: ∀A. ssubset A ⇒ ssubset A ⇒ ssubset A.
      |
   |
   |
-*)
\ No newline at end of file
+*)

diff --git a/helm/software/matita/library/depends b/helm/software/matita/library/depends
index 2be7477f3ab3e28cb9b48429611494077c336439..7048d60de35e4c97036253c3a572e0c649ad4e13 100644 (file)
--- a/helm/software/matita/library/depends
+++ b/helm/software/matita/library/depends
@@ -1,101 +1,102 @@
-Z/dirichlet_product.ma Z/sigma_p.ma Z/times.ma nat/primes.ma
-Z/moebius.ma Z/sigma_p.ma nat/factorization.ma
 Z/times.ma Z/plus.ma nat/lt_arith.ma
-Z/orders.ma Z/z.ma nat/orders.ma
-Z/inversion.ma Z/dirichlet_product.ma Z/moebius.ma
-Z/plus.ma Z/z.ma nat/minus.ma
-Z/compare.ma Z/orders.ma nat/compare.ma
-Z/sigma_p.ma Z/plus.ma Z/times.ma nat/generic_iter_p.ma nat/ord.ma nat/primes.ma
-Z/z.ma datatypes/bool.ma nat/nat.ma
-datatypes/constructors.ma logic/equality.ma
-datatypes/compare.ma 
-datatypes/bool.ma higher_order_defs/functions.ma logic/equality.ma
-datatypes/subsets.ma logic/cprop_connectives.ma logic/equality.ma
-algebra/groups.ma algebra/monoids.ma datatypes/bool.ma logic/connectives.ma nat/compare.ma nat/le_arith.ma
-algebra/finite_groups.ma algebra/groups.ma nat/relevant_equations.ma
-algebra/semigroups.ma higher_order_defs/functions.ma
-algebra/monoids.ma algebra/semigroups.ma
-demo/power_derivative.ma nat/compare.ma nat/nat.ma nat/orders.ma nat/plus.ma
-demo/propositional_sequent_calculus.ma datatypes/constructors.ma list/sort.ma nat/compare.ma nat/plus.ma
-demo/realisability.ma datatypes/constructors.ma logic/connectives.ma
-demo/formal_topology.ma datatypes/subsets.ma
-demo/natural_deduction.ma 
 list/sort.ma datatypes/bool.ma datatypes/constructors.ma list/in.ma
 list/list.ma datatypes/bool.ma higher_order_defs/functions.ma logic/equality.ma nat/nat.ma nat/orders.ma nat/plus.ma
-list/in.ma datatypes/bool.ma datatypes/constructors.ma list/list.ma
-logic/equality.ma higher_order_defs/relations.ma logic/connectives.ma
-logic/connectives.ma 
-logic/coimplication.ma logic/connectives.ma
-logic/connectives2.ma higher_order_defs/relations.ma
-logic/cprop_connectives.ma datatypes/constructors.ma logic/equality.ma
-nat/div_and_mod.ma datatypes/constructors.ma nat/minus.ma
-nat/count.ma nat/permutation.ma nat/relevant_equations.ma nat/sigma_and_pi.ma
-nat/totient1.ma nat/compare.ma nat/gcd_properties1.ma nat/iteration2.ma nat/totient.ma
-nat/congruence.ma nat/primes.ma nat/relevant_equations.ma
-nat/minus.ma nat/compare.ma nat/le_arith.ma
-nat/chinese_reminder.ma nat/congruence.ma nat/exp.ma nat/gcd.ma nat/permutation.ma
-nat/permutation.ma nat/compare.ma nat/sigma_and_pi.ma
 nat/factorial.ma nat/le_arith.ma
-nat/nth_prime.ma nat/lt_arith.ma nat/primes.ma
-nat/fermat_little_theorem.ma nat/congruence.ma nat/exp.ma nat/gcd.ma nat/permutation.ma
-nat/exp.ma nat/div_and_mod.ma nat/lt_arith.ma
-nat/minimization.ma nat/minus.ma
-nat/gcd.ma nat/lt_arith.ma nat/primes.ma
 nat/sigma_and_pi.ma nat/exp.ma nat/factorial.ma nat/lt_arith.ma
-nat/le_arith.ma nat/orders.ma nat/times.ma
-nat/times.ma nat/plus.ma
-nat/gcd_properties1.ma nat/gcd.ma
-nat/totient.ma nat/chinese_reminder.ma nat/iteration2.ma
-nat/lt_arith.ma nat/div_and_mod.ma
-nat/factorization.ma nat/ord.ma
-nat/generic_iter_p.ma nat/div_and_mod_diseq.ma nat/ord.ma nat/primes.ma
-nat/iteration2.ma nat/count.ma nat/generic_iter_p.ma nat/ord.ma nat/primes.ma
-nat/factorial2.ma nat/exp.ma nat/factorial.ma
-nat/pi_p.ma nat/generic_iter_p.ma nat/iteration2.ma nat/primes.ma
-nat/nat.ma higher_order_defs/functions.ma
-nat/relevant_equations.ma nat/gcd.ma nat/minus.ma nat/times.ma
-nat/map_iter_p.ma nat/count.ma nat/permutation.ma
-nat/orders.ma higher_order_defs/ordering.ma logic/connectives.ma nat/nat.ma
-nat/plus.ma nat/nat.ma
-nat/euler_theorem.ma nat/nat.ma nat/map_iter_p.ma nat/totient.ma
 nat/compare.ma datatypes/bool.ma datatypes/compare.ma nat/orders.ma
-nat/primes.ma logic/connectives.ma nat/div_and_mod.ma nat/factorial.ma nat/minimization.ma nat/sigma_and_pi.ma
-nat/ord.ma datatypes/constructors.ma nat/exp.ma nat/gcd.ma nat/nth_prime.ma nat/relevant_equations.ma
-nat/chebyshev.ma nat/factorial2.ma nat/factorization.ma nat/log.ma nat/o.ma nat/pi_p.ma
-nat/log.ma datatypes/constructors.ma nat/div_and_mod_diseq.ma nat/iteration2.ma nat/minimization.ma nat/primes.ma nat/relevant_equations.ma
-nat/chebyshev_thm.ma nat/neper.ma
-nat/div_and_mod_diseq.ma nat/lt_arith.ma
-nat/binomial.ma nat/factorial2.ma nat/iteration2.ma
 nat/neper.ma nat/binomial.ma nat/chebyshev.ma nat/div_and_mod_diseq.ma nat/iteration2.ma nat/log.ma
-nat/sqrt.ma nat/compare.ma nat/log.ma nat/times.ma
-nat/chebyshev_teta.ma nat/binomial.ma nat/pi_p.ma
-nat/o.ma nat/binomial.ma nat/sqrt.ma
-nat/bertrand.ma list/in.ma list/sort.ma nat/chebyshev.ma nat/chebyshev_teta.ma nat/o.ma nat/sieve.ma nat/sqrt.ma
-nat/sieve.ma list/sort.ma nat/primes.ma
-nat/factorization2.ma list/list.ma nat/factorization.ma nat/sieve.ma
-Q/q.ma Q/fraction/fraction.ma Z/compare.ma Z/plus.ma nat/factorization.ma
-Q/Qaxioms.ma Z/compare.ma Z/times.ma nat/iteration2.ma
-Q/frac.ma nat/nat.ma Q/q/q.ma Q/q/qinv.ma nat/factorization.ma
-Q/inv.ma Q/fraction/finv.ma Q/q.ma Q/q/q.ma
 Q/ratio/rtimes.ma Q/fraction/ftimes.ma Q/ratio/rinv.ma
-Q/ratio/ratio.ma Q/fraction/fraction.ma
+nat/lt_arith.ma nat/div_and_mod.ma
+nat/exp.ma nat/div_and_mod.ma nat/lt_arith.ma
+Q/q/qtimes.ma Q/q/qinv.ma Q/ratio/rtimes.ma
+nat/euler_theorem.ma nat/map_iter_p.ma nat/nat.ma nat/totient.ma
+nat/binomial.ma nat/factorial2.ma nat/iteration2.ma
+Z/orders.ma Z/z.ma nat/orders.ma
+datatypes/subsets.ma logic/cprop_connectives.ma logic/equality.ma
+logic/connectives2.ma higher_order_defs/relations.ma
+nat/factorization2.ma list/list.ma nat/factorization.ma nat/sieve.ma
+nat/o.ma nat/binomial.ma nat/sqrt.ma
 Q/ratio/rinv.ma Q/fraction/finv.ma Q/ratio/ratio.ma
-Q/fraction/fraction.ma Z/compare.ma nat/factorization.ma
-Q/fraction/ftimes.ma Q/fraction/finv.ma Q/nat_fact/times.ma Q/ratio/ratio.ma Z/times.ma
-Q/fraction/numerator_denominator.ma Q/fraction/finv.ma
-Q/fraction/finv.ma Q/fraction/fraction.ma Z/plus.ma
-Q/q/qplus.ma nat/factorization.ma
+nat/permutation.ma nat/compare.ma nat/sigma_and_pi.ma
 Q/q/qinv.ma Q/q/q.ma Q/ratio/rinv.ma
+nat/plus.ma nat/nat.ma
+Q/fraction/fraction.ma Z/compare.ma nat/factorization.ma
+algebra/finite_groups.ma algebra/groups.ma nat/relevant_equations.ma
+Z/dirichlet_product.ma Z/sigma_p.ma Z/times.ma nat/primes.ma
+nat/chinese_reminder.ma nat/congruence.ma nat/exp.ma nat/gcd.ma nat/permutation.ma
+nat/fermat_little_theorem.ma nat/congruence.ma nat/exp.ma nat/gcd.ma nat/permutation.ma
+nat/div_and_mod.ma datatypes/constructors.ma nat/minus.ma
+nat/count.ma nat/permutation.ma nat/relevant_equations.ma nat/sigma_and_pi.ma
+higher_order_defs/ordering.ma logic/equality.ma
+datatypes/constructors.ma logic/equality.ma
+Q/q.ma Q/fraction/fraction.ma Z/compare.ma Z/plus.ma nat/factorization.ma
+Z/compare.ma Z/orders.ma nat/compare.ma
 Q/q/q.ma Q/fraction/numerator_denominator.ma Q/ratio/ratio.ma
-Q/q/qtimes.ma Q/q/qinv.ma Q/ratio/rtimes.ma
-Q/nat_fact/times.ma nat/factorization.ma
+Q/fraction/numerator_denominator.ma Q/fraction/finv.ma
+nat/log.ma datatypes/constructors.ma nat/div_and_mod_diseq.ma nat/iteration2.ma nat/minimization.ma nat/primes.ma nat/relevant_equations.ma
+datatypes/bool.ma higher_order_defs/functions.ma logic/equality.ma
+Q/ratio/ratio.ma Q/fraction/fraction.ma
+nat/div_and_mod_diseq.ma nat/lt_arith.ma
+decidable_kit/list_aux.ma decidable_kit/eqtype.ma list/list.ma nat/plus.ma
+nat/chebyshev_teta.ma nat/binomial.ma nat/pi_p.ma
+logic/connectives.ma 
 technicalities/setoids.ma datatypes/constructors.ma logic/coimplication.ma logic/connectives2.ma
+datatypes/compare.ma 
+nat/orders.ma higher_order_defs/ordering.ma logic/connectives.ma nat/nat.ma
+nat/sqrt.ma nat/compare.ma nat/log.ma nat/times.ma
+nat/relevant_equations.ma nat/gcd.ma nat/minus.ma nat/times.ma
+nat/factorial2.ma nat/exp.ma nat/factorial.ma
+nat/chebyshev_thm.ma nat/neper.ma
+algebra/groups.ma algebra/monoids.ma datatypes/bool.ma logic/connectives.ma nat/compare.ma nat/le_arith.ma
+demo/power_derivative.ma nat/compare.ma nat/nat.ma nat/orders.ma nat/plus.ma
+nat/minimization.ma nat/minus.ma
+nat/gcd_properties1.ma nat/gcd.ma
+decidable_kit/fgraph.ma decidable_kit/fintype.ma
+Q/fraction/finv.ma Q/fraction/fraction.ma Z/plus.ma
+Z/plus.ma Z/z.ma nat/minus.ma
+nat/minus.ma nat/compare.ma nat/le_arith.ma
+nat/generic_iter_p.ma nat/div_and_mod_diseq.ma nat/ord.ma nat/primes.ma
+Q/Qaxioms.ma Z/compare.ma Z/times.ma nat/iteration2.ma
+Z/z.ma datatypes/bool.ma nat/nat.ma
 decidable_kit/streicher.ma logic/connectives.ma logic/equality.ma
-decidable_kit/decidable.ma datatypes/bool.ma decidable_kit/streicher.ma logic/connectives.ma nat/compare.ma
+nat/ord.ma datatypes/constructors.ma nat/exp.ma nat/gcd.ma nat/nth_prime.ma nat/relevant_equations.ma
+nat/map_iter_p.ma nat/count.ma nat/permutation.ma
+demo/realisability.ma datatypes/constructors.ma logic/connectives.ma
+nat/totient1.ma nat/compare.ma nat/gcd_properties1.ma nat/iteration2.ma nat/totient.ma
 decidable_kit/eqtype.ma datatypes/constructors.ma decidable_kit/decidable.ma
-decidable_kit/list_aux.ma decidable_kit/eqtype.ma list/list.ma nat/plus.ma
+nat/gcd.ma nat/lt_arith.ma nat/primes.ma
+nat/factorization.ma nat/ord.ma
+algebra/monoids.ma algebra/semigroups.ma
+demo/propositional_sequent_calculus.ma datatypes/constructors.ma list/sort.ma nat/compare.ma nat/plus.ma
+logic/coimplication.ma logic/connectives.ma
 decidable_kit/fintype.ma decidable_kit/eqtype.ma decidable_kit/list_aux.ma
-decidable_kit/fgraph.ma decidable_kit/fintype.ma
-higher_order_defs/relations.ma logic/connectives.ma
+logic/equality.ma higher_order_defs/relations.ma logic/connectives.ma
 higher_order_defs/functions.ma logic/equality.ma
-higher_order_defs/ordering.ma logic/equality.ma
+algebra/semigroups.ma higher_order_defs/functions.ma
+nat/pi_p.ma nat/generic_iter_p.ma nat/iteration2.ma nat/primes.ma
+nat/sieve.ma list/sort.ma nat/primes.ma
+Q/nat_fact/times.ma nat/factorization.ma
+nat/totient.ma nat/chinese_reminder.ma nat/iteration2.ma
+logic/cprop_connectives.ma logic/connectives.ma
+nat/primes.ma logic/connectives.ma nat/div_and_mod.ma nat/factorial.ma nat/minimization.ma nat/sigma_and_pi.ma
+higher_order_defs/relations.ma logic/connectives.ma
+demo/toolbox.ma logic/cprop_connectives.ma
+demo/natural_deduction.ma 
+Q/inv.ma Q/q/q.ma Q/fraction/finv.ma Q/q.ma
+decidable_kit/decidable.ma datatypes/bool.ma decidable_kit/streicher.ma logic/connectives.ma nat/compare.ma
+Z/moebius.ma Z/sigma_p.ma nat/factorization.ma
+Z/inversion.ma Z/dirichlet_product.ma Z/moebius.ma
+Q/fraction/ftimes.ma Q/fraction/finv.ma Q/nat_fact/times.ma Q/ratio/ratio.ma Z/times.ma
+Q/q/qplus.ma nat/factorization.ma
+Q/frac.ma Q/q/q.ma Q/q/qinv.ma nat/nat.ma nat/factorization.ma
+Z/sigma_p.ma Z/plus.ma Z/times.ma nat/generic_iter_p.ma nat/ord.ma nat/primes.ma
+nat/bertrand.ma list/in.ma list/sort.ma nat/chebyshev.ma nat/chebyshev_teta.ma nat/o.ma nat/sieve.ma nat/sqrt.ma
+nat/nat.ma higher_order_defs/functions.ma
+nat/chebyshev.ma nat/o.ma nat/factorial2.ma nat/factorization.ma nat/log.ma nat/pi_p.ma
+demo/formal_topology.ma datatypes/subsets.ma
+nat/congruence.ma nat/primes.ma nat/relevant_equations.ma
+nat/le_arith.ma nat/orders.ma nat/times.ma
+nat/times.ma nat/plus.ma
+list/in.ma datatypes/bool.ma datatypes/constructors.ma list/list.ma
+nat/nth_prime.ma nat/lt_arith.ma nat/primes.ma
+nat/iteration2.ma nat/count.ma nat/generic_iter_p.ma nat/ord.ma nat/primes.ma

diff --git a/helm/software/matita/library/logic/cprop_connectives.ma b/helm/software/matita/library/logic/cprop_connectives.ma
index fe377cbd954d0fd9331935efc7360bdb380b12ba..3b43ef3993670c4699354fd8417d37cda8e83025 100644 (file)
--- a/helm/software/matita/library/logic/cprop_connectives.ma
+++ b/helm/software/matita/library/logic/cprop_connectives.ma
@@ -12,6 +12,8 @@
 (*                                                                        *)
 (**************************************************************************)
 
+include "logic/connectives.ma".
+
 inductive Or (A,B:CProp) : CProp ≝
  | Left : A → Or A B
  | Right : B → Or A B.
@@ -101,7 +103,6 @@ interpretation "exT2 \snd" 'pi2b x y = (pi2exT23 _ _ _ _ x y).
 inductive exT2 (A:Type) (P,Q:A→CProp) : CProp ≝
   ex_introT2: ∀w:A. P w → Q w → exT2 A P Q.
 
-alias id "False" = "cic:/Coq/Init/Logic/False.ind#xpointer(1/1)".
 definition Not : CProp → Prop ≝ λx:CProp.x → False.
 
 interpretation "constructive not" 'not x = (Not x).