From: Enrico Tassi <enrico.tassi@inria.fr>
Date: Fri, 26 Sep 2008 11:46:12 +0000 (+0000)
Subject: fixed some notational collisions
X-Git-Tag: make_still_working~4730
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;ds=sidebyside;h=aa5f71baeba0299c0d29be01798f7a1ad13656f9;p=helm.git

fixed some notational collisions
---

diff --git a/helm/software/matita/core_notation.moo b/helm/software/matita/core_notation.moo
index 025a9899d..1c1e59cb3 100644
--- a/helm/software/matita/core_notation.moo
+++ b/helm/software/matita/core_notation.moo
@@ -205,6 +205,10 @@ notation "↓a" with precedence 55 for @{ 'downarrow $a }.
 
 notation "hvbox(U break ↓ V)" non associative with precedence 55 for @{ 'fintersects $U $V }.
 
+notation "↑a" with precedence 55 for @{ 'uparrow $a }.
+
+notation "hvbox(a break ↑ b)" with precedence 55 for @{ 'funion $a $b }.
+
 notation "(a \sup b)" left associative with precedence 60 for @{ 'exp $a $b}.
 notation "s \sup (-1)" with precedence 60 for @{ 'invert $s }.
 notation < "s \sup (-1) x" with precedence 60 for @{ 'invert_appl $s $x}. 
diff --git a/helm/software/matita/library/demo/formal_topology.ma b/helm/software/matita/library/demo/formal_topology.ma
index 190e00e5d..15da20a11 100644
--- a/helm/software/matita/library/demo/formal_topology.ma
+++ b/helm/software/matita/library/demo/formal_topology.ma
@@ -158,13 +158,9 @@ qed.
 
 definition uparrow ≝ λA:axiom_set.λa:A.mk_powerset ? (λb:A. a ≤ b).
 
-notation "↑a" with precedence 80 for @{ 'uparrow $a }.
-
 interpretation "uparrow" 'uparrow a = (uparrow _ a).
 
-definition downarrow ≝ λA:axiom_set.λU:Ω \sup A.mk_powerset ? (λa:A. ↑a ≬ U).
-
-notation "↓a" with precedence 80 for @{ 'downarrow $a }.
+definition downarrow ≝ λA:axiom_set.λU:Ω \sup A.mk_powerset ? (λa:A. (↑a) ≬ U).
 
 interpretation "downarrow" 'downarrow a = (downarrow _ a).
 
@@ -172,9 +168,7 @@ definition fintersects ≝ λA:axiom_set.λU,V:Ω \sup A.↓U ∩ ↓V.
 
 interpretation "fintersects" 'fintersects U V = (fintersects _ U V).
 
-(*
 record convergent_generated_topology : Type ≝
  { AA:> axiom_set;
    convergence: ∀a:AA.∀U,V:Ω \sup AA. a ◃ U → a ◃ V → a ◃ (U ↓ V)
  }.
-*)
diff --git a/helm/software/matita/library/demo/power_derivative.ma b/helm/software/matita/library/demo/power_derivative.ma
index e8ab55c35..8ab638da8 100644
--- a/helm/software/matita/library/demo/power_derivative.ma
+++ b/helm/software/matita/library/demo/power_derivative.ma
@@ -40,11 +40,7 @@ interpretation "None" 'one =
 interpretation "Rplus" 'plus x y =
  (cic:/matita/demo/power_derivative/Rplus.con x y).
 
-notation "hvbox(a break \middot b)" 
-  left associative with precedence 55
-for @{ 'times $a $b }.
-
-interpretation "Rmult" 'times x y =
+interpretation "Rmult" 'middot x y =
  (cic:/matita/demo/power_derivative/Rmult.con x y).
 
 definition Fplus ≝
@@ -55,7 +51,7 @@ definition Fmult ≝
 
 interpretation "Fplus" 'plus x y =
  (cic:/matita/demo/power_derivative/Fplus.con x y).
-interpretation "Fmult" 'times x y =
+interpretation "Fmult" 'middot x y =
  (cic:/matita/demo/power_derivative/Fmult.con x y).
 
 notation "2" with precedence 89
@@ -93,13 +89,13 @@ coercion inj.
 axiom Rplus_Rzero_x: ∀x:R.0+x=x.
 axiom Rplus_comm: symmetric ? Rplus.
 axiom Rplus_assoc: associative ? Rplus.
-axiom Rmult_Rone_x: ∀x:R.1*x=x.
-axiom Rmult_Rzero_x: ∀x:R.0*x=0.
+axiom Rmult_Rone_x: ∀x:R.1 · x=x.
+axiom Rmult_Rzero_x: ∀x:R.0 · x=0.
 axiom Rmult_assoc: associative ? Rmult.
 axiom Rmult_comm: symmetric ? Rmult.
 axiom Rmult_Rplus_distr: distributive ? Rmult Rplus.
 
-alias symbol "times" = "Rmult".
+alias symbol "middot" = "Rmult".
 alias symbol "plus" = "natural plus".
 
 definition monomio ≝
@@ -245,7 +241,7 @@ axiom derivative_x0: D[x \sup 0] = 0.
 axiom derivative_x1: D[x] = 1.
 axiom derivative_mult: ∀f,g:R→R. D[f·g] = D[f]·g + f·D[g].
 
-alias symbol "times" = "Fmult".
+alias symbol "middot" = "Fmult".
 
 theorem derivative_power: ∀n:nat. D[x \sup n] = n·x \sup (pred n).
  assume n:nat.