# HG changeset patch
# User paulson <lp15@cam.ac.uk>
# Date 1425918499 0
# Node ID 0cc388370041c33c2dc8bd0de2982e956d89cb1d
# Parent  2441a80fb6c1daa6f6fad7cb630a0f6fdcf0a7e2
sin, cos generalised from type real to any "'a::{real_normed_field,banach}", including complex

diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Complex.thy
--- a/src/HOL/Complex.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Complex.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -681,8 +681,8 @@
 
 subsubsection {* Complex exponential *}
 
-abbreviation expi :: "complex \<Rightarrow> complex"
-  where "expi \<equiv> exp"
+abbreviation Exp :: "complex \<Rightarrow> complex"
+  where "Exp \<equiv> exp"
 
 lemma cis_conv_exp: "cis b = exp (\<i> * b)"
 proof -
@@ -695,28 +695,28 @@
     then have "(\<i> * complex_of_real b) ^ n /\<^sub>R fact n =
         of_real (cos_coeff n * b^n) + \<i> * of_real (sin_coeff n * b^n)"
       by (simp add: field_simps) }
-  then show ?thesis
+  then show ?thesis using sin_converges [of b] cos_converges [of b]
     by (auto simp add: cis.ctr exp_def simp del: of_real_mult
-             intro!: sums_unique sums_add sums_mult sums_of_real sin_converges cos_converges)
+             intro!: sums_unique sums_add sums_mult sums_of_real)
 qed
 
-lemma expi_def: "expi z = exp (Re z) * cis (Im z)"
+lemma Exp_eq_polar: "Exp z = exp (Re z) * cis (Im z)"
   unfolding cis_conv_exp exp_of_real [symmetric] mult_exp_exp by (cases z) simp
 
 lemma Re_exp: "Re (exp z) = exp (Re z) * cos (Im z)"
-  unfolding expi_def by simp
+  unfolding Exp_eq_polar by simp
 
 lemma Im_exp: "Im (exp z) = exp (Re z) * sin (Im z)"
-  unfolding expi_def by simp
+  unfolding Exp_eq_polar by simp
 
-lemma complex_expi_Ex: "\<exists>a r. z = complex_of_real r * expi a"
+lemma complex_Exp_Ex: "\<exists>a r. z = complex_of_real r * Exp a"
 apply (insert rcis_Ex [of z])
-apply (auto simp add: expi_def rcis_def mult.assoc [symmetric])
+apply (auto simp add: Exp_eq_polar rcis_def mult.assoc [symmetric])
 apply (rule_tac x = "ii * complex_of_real a" in exI, auto)
 done
 
-lemma expi_two_pi_i [simp]: "expi((2::complex) * complex_of_real pi * ii) = 1"
-  by (simp add: expi_def complex_eq_iff)
+lemma Exp_two_pi_i [simp]: "Exp((2::complex) * complex_of_real pi * ii) = 1"
+  by (simp add: Exp_eq_polar complex_eq_iff)
 
 subsubsection {* Complex argument *}
 
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Decision_Procs/Approximation.thy
--- a/src/HOL/Decision_Procs/Approximation.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Decision_Procs/Approximation.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -959,7 +959,7 @@
       unfolding cos_coeff_def atLeast0LessThan by auto
 
     have "cos t * (- 1) ^ n = cos t * cos (n * pi) + sin t * sin (n * pi)" by auto
-    also have "\<dots> = cos (t + n * pi)"  using cos_add by auto
+    also have "\<dots> = cos (t + n * pi)" by (simp add: cos_add)  
     also have "\<dots> = ?rest" by auto
     finally have "cos t * (- 1) ^ n = ?rest" .
     moreover
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Decision_Procs/ex/Approximation_Ex.thy
--- a/src/HOL/Decision_Procs/ex/Approximation_Ex.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Decision_Procs/ex/Approximation_Ex.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -47,7 +47,7 @@
 lemma "\<bar> pi - 3.1415926535897932385 \<bar> < inverse 10 ^ 18"
   by (approximation 70)
 
-lemma "\<bar> sin 100 + 0.50636564110975879 \<bar> < inverse 10 ^ 17"
+lemma "\<bar> sin 100 + 0.50636564110975879 \<bar> < (inverse 10 ^ 17 :: real)"
   by (approximation 70)
 
 section "Use variable ranges"
@@ -64,7 +64,7 @@
 lemma "1 / 2^1 \<le> x \<and> x \<le> 9 / 2^1 \<Longrightarrow> \<bar> arctan x - 0.91 \<bar> < 0.455"
   by (approximation 10)
 
-lemma "3.2 \<le> x \<and> x \<le> 6.2 \<Longrightarrow> sin x \<le> 0"
+lemma "3.2 \<le> (x::real) \<and> x \<le> 6.2 \<Longrightarrow> sin x \<le> 0"
   by (approximation 10)
 
 lemma
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Fact.thy
--- a/src/HOL/Fact.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Fact.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -319,4 +319,222 @@
   "fact (numeral k) = (numeral k) * (fact (pred_numeral k))"
   by (simp add: numeral_eq_Suc)
 
+
+text {* This development is based on the work of Andy Gordon and
+  Florian Kammueller. *}
+
+subsection {* Basic definitions and lemmas *}
+
+primrec binomial :: "nat \<Rightarrow> nat \<Rightarrow> nat" (infixl "choose" 65)
+where
+  "0 choose k = (if k = 0 then 1 else 0)"
+| "Suc n choose k = (if k = 0 then 1 else (n choose (k - 1)) + (n choose k))"
+
+lemma binomial_n_0 [simp]: "(n choose 0) = 1"
+  by (cases n) simp_all
+
+lemma binomial_0_Suc [simp]: "(0 choose Suc k) = 0"
+  by simp
+
+lemma binomial_Suc_Suc [simp]: "(Suc n choose Suc k) = (n choose k) + (n choose Suc k)"
+  by simp
+
+lemma choose_reduce_nat: 
+  "0 < (n::nat) \<Longrightarrow> 0 < k \<Longrightarrow>
+    (n choose k) = ((n - 1) choose (k - 1)) + ((n - 1) choose k)"
+  by (metis Suc_diff_1 binomial.simps(2) neq0_conv)
+
+lemma binomial_eq_0: "n < k \<Longrightarrow> n choose k = 0"
+  by (induct n arbitrary: k) auto
+
+declare binomial.simps [simp del]
+
+lemma binomial_n_n [simp]: "n choose n = 1"
+  by (induct n) (simp_all add: binomial_eq_0)
+
+lemma binomial_Suc_n [simp]: "Suc n choose n = Suc n"
+  by (induct n) simp_all
+
+lemma binomial_1 [simp]: "n choose Suc 0 = n"
+  by (induct n) simp_all
+
+lemma zero_less_binomial: "k \<le> n \<Longrightarrow> n choose k > 0"
+  by (induct n k rule: diff_induct) simp_all
+
+lemma binomial_eq_0_iff [simp]: "n choose k = 0 \<longleftrightarrow> n < k"
+  by (metis binomial_eq_0 less_numeral_extra(3) not_less zero_less_binomial)
+
+lemma zero_less_binomial_iff [simp]: "n choose k > 0 \<longleftrightarrow> k \<le> n"
+  by (metis binomial_eq_0_iff not_less0 not_less zero_less_binomial)
+
+lemma Suc_times_binomial_eq:
+  "Suc n * (n choose k) = (Suc n choose Suc k) * Suc k"
+  apply (induct n arbitrary: k, simp add: binomial.simps)
+  apply (case_tac k)
+   apply (auto simp add: add_mult_distrib add_mult_distrib2 le_Suc_eq binomial_eq_0)
+  done
+
+text{*The absorption property*}
+lemma Suc_times_binomial:
+  "Suc k * (Suc n choose Suc k) = Suc n * (n choose k)"
+  using Suc_times_binomial_eq by auto
+
+text{*This is the well-known version of absorption, but it's harder to use because of the
+  need to reason about division.*}
+lemma binomial_Suc_Suc_eq_times:
+    "(Suc n choose Suc k) = (Suc n * (n choose k)) div Suc k"
+  by (simp add: Suc_times_binomial_eq del: mult_Suc mult_Suc_right)
+
+text{*Another version of absorption, with -1 instead of Suc.*}
+lemma times_binomial_minus1_eq:
+  "0 < k \<Longrightarrow> k * (n choose k) = n * ((n - 1) choose (k - 1))"
+  using Suc_times_binomial_eq [where n = "n - 1" and k = "k - 1"]
+  by (auto split add: nat_diff_split)
+
+
+subsection {* Combinatorial theorems involving @{text "choose"} *}
+
+text {*By Florian Kamm\"uller, tidied by LCP.*}
+
+lemma card_s_0_eq_empty: "finite A \<Longrightarrow> card {B. B \<subseteq> A & card B = 0} = 1"
+  by (simp cong add: conj_cong add: finite_subset [THEN card_0_eq])
+
+lemma choose_deconstruct: "finite M \<Longrightarrow> x \<notin> M \<Longrightarrow>
+    {s. s \<subseteq> insert x M \<and> card s = Suc k} =
+    {s. s \<subseteq> M \<and> card s = Suc k} \<union> {s. \<exists>t. t \<subseteq> M \<and> card t = k \<and> s = insert x t}"
+  apply safe
+     apply (auto intro: finite_subset [THEN card_insert_disjoint])
+  by (metis (full_types) Diff_insert_absorb Set.set_insert Zero_neq_Suc card_Diff_singleton_if 
+     card_eq_0_iff diff_Suc_1 in_mono subset_insert_iff)
+
+lemma finite_bex_subset [simp]:
+  assumes "finite B"
+    and "\<And>A. A \<subseteq> B \<Longrightarrow> finite {x. P x A}"
+  shows "finite {x. \<exists>A \<subseteq> B. P x A}"
+  by (metis (no_types) assms finite_Collect_bounded_ex finite_Collect_subsets)
+
+text{*There are as many subsets of @{term A} having cardinality @{term k}
+ as there are sets obtained from the former by inserting a fixed element
+ @{term x} into each.*}
+lemma constr_bij:
+   "finite A \<Longrightarrow> x \<notin> A \<Longrightarrow>
+    card {B. \<exists>C. C \<subseteq> A \<and> card C = k \<and> B = insert x C} =
+    card {B. B \<subseteq> A & card(B) = k}"
+  apply (rule card_bij_eq [where f = "\<lambda>s. s - {x}" and g = "insert x"])
+  apply (auto elim!: equalityE simp add: inj_on_def)
+  apply (metis card_Diff_singleton_if finite_subset in_mono)
+  done
+
+text {*
+  Main theorem: combinatorial statement about number of subsets of a set.
+*}
+
+theorem n_subsets: "finite A \<Longrightarrow> card {B. B \<subseteq> A \<and> card B = k} = (card A choose k)"
+proof (induct k arbitrary: A)
+  case 0 then show ?case by (simp add: card_s_0_eq_empty)
+next
+  case (Suc k)
+  show ?case using `finite A`
+  proof (induct A)
+    case empty show ?case by (simp add: card_s_0_eq_empty)
+  next
+    case (insert x A)
+    then show ?case using Suc.hyps
+      apply (simp add: card_s_0_eq_empty choose_deconstruct)
+      apply (subst card_Un_disjoint)
+         prefer 4 apply (force simp add: constr_bij)
+        prefer 3 apply force
+       prefer 2 apply (blast intro: finite_Pow_iff [THEN iffD2]
+         finite_subset [of _ "Pow (insert x F)" for F])
+      apply (blast intro: finite_Pow_iff [THEN iffD2, THEN [2] finite_subset])
+      done
+  qed
+qed
+
+
+subsection {* The binomial theorem (courtesy of Tobias Nipkow): *}
+
+text{* Avigad's version, generalized to any commutative ring *}
+theorem binomial_ring: "(a+b::'a::{comm_ring_1,power})^n = 
+  (\<Sum>k=0..n. (of_nat (n choose k)) * a^k * b^(n-k))" (is "?P n")
+proof (induct n)
+  case 0 then show "?P 0" by simp
+next
+  case (Suc n)
+  have decomp: "{0..n+1} = {0} Un {n+1} Un {1..n}"
+    by auto
+  have decomp2: "{0..n} = {0} Un {1..n}"
+    by auto
+  have "(a+b)^(n+1) = 
+      (a+b) * (\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k))"
+    using Suc.hyps by simp
+  also have "\<dots> = a*(\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k)) +
+                   b*(\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k))"
+    by (rule distrib_right)
+  also have "\<dots> = (\<Sum>k=0..n. of_nat (n choose k) * a^(k+1) * b^(n-k)) +
+                  (\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k+1))"
+    by (auto simp add: setsum_right_distrib ac_simps)
+  also have "\<dots> = (\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n+1-k)) +
+                  (\<Sum>k=1..n+1. of_nat (n choose (k - 1)) * a^k * b^(n+1-k))"
+    by (simp add:setsum_shift_bounds_cl_Suc_ivl Suc_diff_le field_simps  
+        del:setsum_cl_ivl_Suc)
+  also have "\<dots> = a^(n+1) + b^(n+1) +
+                  (\<Sum>k=1..n. of_nat (n choose (k - 1)) * a^k * b^(n+1-k)) +
+                  (\<Sum>k=1..n. of_nat (n choose k) * a^k * b^(n+1-k))"
+    by (simp add: decomp2)
+  also have
+      "\<dots> = a^(n+1) + b^(n+1) + 
+            (\<Sum>k=1..n. of_nat(n+1 choose k) * a^k * b^(n+1-k))"
+    by (auto simp add: field_simps setsum.distrib [symmetric] choose_reduce_nat)
+  also have "\<dots> = (\<Sum>k=0..n+1. of_nat (n+1 choose k) * a^k * b^(n+1-k))"
+    using decomp by (simp add: field_simps)
+  finally show "?P (Suc n)" by simp
+qed
+
+text{* Original version for the naturals *}
+corollary binomial: "(a+b::nat)^n = (\<Sum>k=0..n. (of_nat (n choose k)) * a^k * b^(n-k))"
+    using binomial_ring [of "int a" "int b" n]
+  by (simp only: of_nat_add [symmetric] of_nat_mult [symmetric] of_nat_power [symmetric]
+           of_nat_setsum [symmetric]
+           of_nat_eq_iff of_nat_id)
+
+lemma binomial_fact_lemma: "k \<le> n \<Longrightarrow> fact k * fact (n - k) * (n choose k) = fact n"
+proof (induct n arbitrary: k rule: nat_less_induct)
+  fix n k assume H: "\<forall>m<n. \<forall>x\<le>m. fact x * fact (m - x) * (m choose x) =
+                      fact m" and kn: "k \<le> n"
+  let ?ths = "fact k * fact (n - k) * (n choose k) = fact n"
+  { assume "n=0" then have ?ths using kn by simp }
+  moreover
+  { assume "k=0" then have ?ths using kn by simp }
+  moreover
+  { assume nk: "n=k" then have ?ths by simp }
+  moreover
+  { fix m h assume n: "n = Suc m" and h: "k = Suc h" and hm: "h < m"
+    from n have mn: "m < n" by arith
+    from hm have hm': "h \<le> m" by arith
+    from hm h n kn have km: "k \<le> m" by arith
+    have "m - h = Suc (m - Suc h)" using  h km hm by arith
+    with km h have th0: "fact (m - h) = (m - h) * fact (m - k)"
+      by simp
+    from n h th0
+    have "fact k * fact (n - k) * (n choose k) =
+        k * (fact h * fact (m - h) * (m choose h)) + 
+        (m - h) * (fact k * fact (m - k) * (m choose k))"
+      by (simp add: field_simps)
+    also have "\<dots> = (k + (m - h)) * fact m"
+      using H[rule_format, OF mn hm'] H[rule_format, OF mn km]
+      by (simp add: field_simps)
+    finally have ?ths using h n km by simp }
+  moreover have "n=0 \<or> k = 0 \<or> k = n \<or> (\<exists>m h. n = Suc m \<and> k = Suc h \<and> h < m)"
+    using kn by presburger
+  ultimately show ?ths by blast
+qed
+
+lemma binomial_fact:
+  assumes kn: "k \<le> n"
+  shows "(of_nat (n choose k) :: 'a::{field,ring_char_0}) =
+    of_nat (fact n) / (of_nat (fact k) * of_nat (fact (n - k)))"
+  using binomial_fact_lemma[OF kn]
+  by (simp add: field_simps of_nat_mult [symmetric])
+
 end
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/NSA/HTranscendental.thy
--- a/src/HOL/NSA/HTranscendental.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/NSA/HTranscendental.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -413,13 +413,16 @@
 apply (rule NSconvergent_NSBseq)
 apply (rule convergent_NSconvergent_iff [THEN iffD1])
 apply (rule summable_iff_convergent [THEN iffD1])
-apply (rule summable_sin)
+using summable_norm_sin [of x]
+apply (simp add: summable_rabs_cancel)
 done
 
 lemma STAR_sin_zero [simp]: "( *f* sin) 0 = 0"
 by transfer (rule sin_zero)
 
-lemma STAR_sin_Infinitesimal [simp]: "x \<in> Infinitesimal ==> ( *f* sin) x @= x"
+lemma STAR_sin_Infinitesimal [simp]:
+  fixes x :: "'a::{real_normed_field,banach} star"
+  shows "x \<in> Infinitesimal ==> ( *f* sin) x @= x"
 apply (case_tac "x = 0")
 apply (cut_tac [2] x = 0 in DERIV_sin)
 apply (auto simp add: NSDERIV_DERIV_iff [symmetric] nsderiv_def)
@@ -436,13 +439,16 @@
 apply (rule NSconvergent_NSBseq)
 apply (rule convergent_NSconvergent_iff [THEN iffD1])
 apply (rule summable_iff_convergent [THEN iffD1])
-apply (rule summable_cos)
+using summable_norm_cos [of x]
+apply (simp add: summable_rabs_cancel)
 done
 
 lemma STAR_cos_zero [simp]: "( *f* cos) 0 = 1"
 by transfer (rule cos_zero)
 
-lemma STAR_cos_Infinitesimal [simp]: "x \<in> Infinitesimal ==> ( *f* cos) x @= 1"
+lemma STAR_cos_Infinitesimal [simp]:
+  fixes x :: "'a::{real_normed_field,banach} star"
+  shows "x \<in> Infinitesimal ==> ( *f* cos) x @= 1"
 apply (case_tac "x = 0")
 apply (cut_tac [2] x = 0 in DERIV_cos)
 apply (auto simp add: NSDERIV_DERIV_iff [symmetric] nsderiv_def)
@@ -469,10 +475,10 @@
 done
 
 lemma STAR_sin_cos_Infinitesimal_mult:
-     "x \<in> Infinitesimal ==> ( *f* sin) x * ( *f* cos) x @= x"
-apply (insert approx_mult_HFinite [of "( *f* sin) x" _ "( *f* cos) x" 1]) 
-apply (simp add: Infinitesimal_subset_HFinite [THEN subsetD])
-done
+  fixes x :: "'a::{real_normed_field,banach} star"
+  shows "x \<in> Infinitesimal ==> ( *f* sin) x * ( *f* cos) x @= x"
+using approx_mult_HFinite [of "( *f* sin) x" _ "( *f* cos) x" 1] 
+by (simp add: Infinitesimal_subset_HFinite [THEN subsetD])
 
 lemma HFinite_pi: "hypreal_of_real pi \<in> HFinite"
 by simp
@@ -486,10 +492,10 @@
 by (simp add: mult.assoc [symmetric] zero_less_HNatInfinite)
 
 lemma STAR_sin_Infinitesimal_divide:
-     "[|x \<in> Infinitesimal; x \<noteq> 0 |] ==> ( *f* sin) x/x @= 1"
-apply (cut_tac x = 0 in DERIV_sin)
-apply (simp add: NSDERIV_DERIV_iff [symmetric] nsderiv_def)
-done
+  fixes x :: "'a::{real_normed_field,banach} star"
+  shows "[|x \<in> Infinitesimal; x \<noteq> 0 |] ==> ( *f* sin) x/x @= 1"
+using DERIV_sin [of "0::'a"]
+by (simp add: NSDERIV_DERIV_iff [symmetric] nsderiv_def)
 
 (*------------------------------------------------------------------------*) 
 (* sin* (1/n) * 1/(1/n) @= 1 for n = oo                                   *)
@@ -586,16 +592,18 @@
 text{*A familiar approximation to @{term "cos x"} when @{term x} is small*}
 
 lemma STAR_cos_Infinitesimal_approx:
-     "x \<in> Infinitesimal ==> ( *f* cos) x @= 1 - x\<^sup>2"
+  fixes x :: "'a::{real_normed_field,banach} star"
+  shows "x \<in> Infinitesimal ==> ( *f* cos) x @= 1 - x\<^sup>2"
 apply (rule STAR_cos_Infinitesimal [THEN approx_trans])
 apply (auto simp add: Infinitesimal_approx_minus [symmetric] 
             add.assoc [symmetric] numeral_2_eq_2)
 done
 
 lemma STAR_cos_Infinitesimal_approx2:
-     "x \<in> Infinitesimal ==> ( *f* cos) x @= 1 - (x\<^sup>2)/2"
+  fixes x :: hypreal  --{*perhaps could be generalised, like many other hypreal results*}
+  shows "x \<in> Infinitesimal ==> ( *f* cos) x @= 1 - (x\<^sup>2)/2"
 apply (rule STAR_cos_Infinitesimal [THEN approx_trans])
-apply (auto intro: Infinitesimal_SReal_divide 
+apply (auto intro: Infinitesimal_SReal_divide Infinitesimal_mult
             simp add: Infinitesimal_approx_minus [symmetric] numeral_2_eq_2)
 done
 
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/NSA/NSCA.thy
--- a/src/HOL/NSA/NSCA.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/NSA/NSCA.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -54,9 +54,7 @@
 by (simp add: Standard_def)
 
 lemma inv_hcomplex_of_complex_image: "inv hcomplex_of_complex `SComplex = UNIV"
-apply (auto simp add: Standard_def image_def)
-apply (rule inj_hcomplex_of_complex [THEN inv_f_f, THEN subst], blast)
-done
+by (auto simp add: Standard_def image_def) (metis inj_star_of inv_f_f)
 
 lemma SComplex_hcomplex_of_complex_image: 
       "[| \<exists>x. x: P; P \<le> SComplex |] ==> \<exists>Q. P = hcomplex_of_complex ` Q"
@@ -69,10 +67,6 @@
 apply (auto intro: SReal_dense simp add: SReal_hcmod_SComplex)
 done
 
-lemma SComplex_hcmod_SReal: 
-      "z \<in> SComplex ==> hcmod z \<in> Reals"
-by (simp add: Reals_eq_Standard)
-
 
 subsection{*The Finite Elements form a Subring*}
 
@@ -193,7 +187,7 @@
 
 lemma Infinitesimal_less_SComplex:
    "[| x \<in> SComplex; y \<in> Infinitesimal; 0 < hcmod x |] ==> hcmod y < hcmod x"
-by (auto intro: Infinitesimal_less_SReal SComplex_hcmod_SReal simp add: Infinitesimal_hcmod_iff)
+by (auto intro: Infinitesimal_less_SReal SReal_hcmod_SComplex simp add: Infinitesimal_hcmod_iff)
 
 lemma SComplex_Int_Infinitesimal_zero: "SComplex Int Infinitesimal = {0}"
 by (auto simp add: Standard_def Infinitesimal_hcmod_iff)
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/NSA/NSComplex.thy
--- a/src/HOL/NSA/NSComplex.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/NSA/NSComplex.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -71,8 +71,8 @@
 
   (*------------ e ^ (x + iy) ------------*)
 definition
-  hexpi :: "hcomplex => hcomplex" where
-  "hexpi = *f* expi"
+  hExp :: "hcomplex => hcomplex" where
+  "hExp = *f* Exp"
 
 definition
   HComplex :: "[hypreal,hypreal] => hcomplex" where
@@ -80,7 +80,7 @@
 
 lemmas hcomplex_defs [transfer_unfold] =
   hRe_def hIm_def iii_def hcnj_def hsgn_def harg_def hcis_def
-  hrcis_def hexpi_def HComplex_def
+  hrcis_def hExp_def HComplex_def
 
 lemma Standard_hRe [simp]: "x \<in> Standard \<Longrightarrow> hRe x \<in> Standard"
 by (simp add: hcomplex_defs)
@@ -103,7 +103,7 @@
 lemma Standard_hcis [simp]: "r \<in> Standard \<Longrightarrow> hcis r \<in> Standard"
 by (simp add: hcomplex_defs)
 
-lemma Standard_hexpi [simp]: "x \<in> Standard \<Longrightarrow> hexpi x \<in> Standard"
+lemma Standard_hExp [simp]: "x \<in> Standard \<Longrightarrow> hExp x \<in> Standard"
 by (simp add: hcomplex_defs)
 
 lemma Standard_hrcis [simp]:
@@ -596,17 +596,13 @@
 lemma sin_n_hIm_hcis_hcpow_n: "( *f* sin) (hypreal_of_hypnat n * a) = hIm(hcis a pow n)"
 by (simp add: NSDeMoivre_ext)
 
-lemma hexpi_add: "!!a b. hexpi(a + b) = hexpi(a) * hexpi(b)"
+lemma hExp_add: "!!a b. hExp(a + b) = hExp(a) * hExp(b)"
 by transfer (rule exp_add)
 
 
 subsection{*@{term hcomplex_of_complex}: the Injection from
   type @{typ complex} to to @{typ hcomplex}*}
 
-lemma inj_hcomplex_of_complex: "inj(hcomplex_of_complex)"
-(* TODO: delete *)
-by (rule inj_star_of)
-
 lemma hcomplex_of_complex_i: "iii = hcomplex_of_complex ii"
 by (rule iii_def)
 
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Number_Theory/Binomial.thy
--- a/src/HOL/Number_Theory/Binomial.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Number_Theory/Binomial.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -10,185 +10,6 @@
 imports Cong Fact Complex_Main
 begin
 
-
-text {* This development is based on the work of Andy Gordon and
-  Florian Kammueller. *}
-
-subsection {* Basic definitions and lemmas *}
-
-primrec binomial :: "nat \<Rightarrow> nat \<Rightarrow> nat" (infixl "choose" 65)
-where
-  "0 choose k = (if k = 0 then 1 else 0)"
-| "Suc n choose k = (if k = 0 then 1 else (n choose (k - 1)) + (n choose k))"
-
-lemma binomial_n_0 [simp]: "(n choose 0) = 1"
-  by (cases n) simp_all
-
-lemma binomial_0_Suc [simp]: "(0 choose Suc k) = 0"
-  by simp
-
-lemma binomial_Suc_Suc [simp]: "(Suc n choose Suc k) = (n choose k) + (n choose Suc k)"
-  by simp
-
-lemma choose_reduce_nat: 
-  "0 < (n::nat) \<Longrightarrow> 0 < k \<Longrightarrow>
-    (n choose k) = ((n - 1) choose (k - 1)) + ((n - 1) choose k)"
-  by (metis Suc_diff_1 binomial.simps(2) neq0_conv)
-
-lemma binomial_eq_0: "n < k \<Longrightarrow> n choose k = 0"
-  by (induct n arbitrary: k) auto
-
-declare binomial.simps [simp del]
-
-lemma binomial_n_n [simp]: "n choose n = 1"
-  by (induct n) (simp_all add: binomial_eq_0)
-
-lemma binomial_Suc_n [simp]: "Suc n choose n = Suc n"
-  by (induct n) simp_all
-
-lemma binomial_1 [simp]: "n choose Suc 0 = n"
-  by (induct n) simp_all
-
-lemma zero_less_binomial: "k \<le> n \<Longrightarrow> n choose k > 0"
-  by (induct n k rule: diff_induct) simp_all
-
-lemma binomial_eq_0_iff [simp]: "n choose k = 0 \<longleftrightarrow> n < k"
-  by (metis binomial_eq_0 less_numeral_extra(3) not_less zero_less_binomial)
-
-lemma zero_less_binomial_iff [simp]: "n choose k > 0 \<longleftrightarrow> k \<le> n"
-  by (metis binomial_eq_0_iff not_less0 not_less zero_less_binomial)
-
-lemma Suc_times_binomial_eq:
-  "Suc n * (n choose k) = (Suc n choose Suc k) * Suc k"
-  apply (induct n arbitrary: k, simp add: binomial.simps)
-  apply (case_tac k)
-   apply (auto simp add: add_mult_distrib add_mult_distrib2 le_Suc_eq binomial_eq_0)
-  done
-
-text{*The absorption property*}
-lemma Suc_times_binomial:
-  "Suc k * (Suc n choose Suc k) = Suc n * (n choose k)"
-  using Suc_times_binomial_eq by auto
-
-text{*This is the well-known version of absorption, but it's harder to use because of the
-  need to reason about division.*}
-lemma binomial_Suc_Suc_eq_times:
-    "(Suc n choose Suc k) = (Suc n * (n choose k)) div Suc k"
-  by (simp add: Suc_times_binomial_eq del: mult_Suc mult_Suc_right)
-
-text{*Another version of absorption, with -1 instead of Suc.*}
-lemma times_binomial_minus1_eq:
-  "0 < k \<Longrightarrow> k * (n choose k) = n * ((n - 1) choose (k - 1))"
-  using Suc_times_binomial_eq [where n = "n - 1" and k = "k - 1"]
-  by (auto split add: nat_diff_split)
-
-
-subsection {* Combinatorial theorems involving @{text "choose"} *}
-
-text {*By Florian Kamm\"uller, tidied by LCP.*}
-
-lemma card_s_0_eq_empty: "finite A \<Longrightarrow> card {B. B \<subseteq> A & card B = 0} = 1"
-  by (simp cong add: conj_cong add: finite_subset [THEN card_0_eq])
-
-lemma choose_deconstruct: "finite M \<Longrightarrow> x \<notin> M \<Longrightarrow>
-    {s. s \<subseteq> insert x M \<and> card s = Suc k} =
-    {s. s \<subseteq> M \<and> card s = Suc k} \<union> {s. \<exists>t. t \<subseteq> M \<and> card t = k \<and> s = insert x t}"
-  apply safe
-     apply (auto intro: finite_subset [THEN card_insert_disjoint])
-  by (metis (full_types) Diff_insert_absorb Set.set_insert Zero_neq_Suc card_Diff_singleton_if 
-     card_eq_0_iff diff_Suc_1 in_mono subset_insert_iff)
-
-lemma finite_bex_subset [simp]:
-  assumes "finite B"
-    and "\<And>A. A \<subseteq> B \<Longrightarrow> finite {x. P x A}"
-  shows "finite {x. \<exists>A \<subseteq> B. P x A}"
-  by (metis (no_types) assms finite_Collect_bounded_ex finite_Collect_subsets)
-
-text{*There are as many subsets of @{term A} having cardinality @{term k}
- as there are sets obtained from the former by inserting a fixed element
- @{term x} into each.*}
-lemma constr_bij:
-   "finite A \<Longrightarrow> x \<notin> A \<Longrightarrow>
-    card {B. \<exists>C. C \<subseteq> A \<and> card C = k \<and> B = insert x C} =
-    card {B. B \<subseteq> A & card(B) = k}"
-  apply (rule card_bij_eq [where f = "\<lambda>s. s - {x}" and g = "insert x"])
-  apply (auto elim!: equalityE simp add: inj_on_def)
-  apply (metis card_Diff_singleton_if finite_subset in_mono)
-  done
-
-text {*
-  Main theorem: combinatorial statement about number of subsets of a set.
-*}
-
-theorem n_subsets: "finite A \<Longrightarrow> card {B. B \<subseteq> A \<and> card B = k} = (card A choose k)"
-proof (induct k arbitrary: A)
-  case 0 then show ?case by (simp add: card_s_0_eq_empty)
-next
-  case (Suc k)
-  show ?case using `finite A`
-  proof (induct A)
-    case empty show ?case by (simp add: card_s_0_eq_empty)
-  next
-    case (insert x A)
-    then show ?case using Suc.hyps
-      apply (simp add: card_s_0_eq_empty choose_deconstruct)
-      apply (subst card_Un_disjoint)
-         prefer 4 apply (force simp add: constr_bij)
-        prefer 3 apply force
-       prefer 2 apply (blast intro: finite_Pow_iff [THEN iffD2]
-         finite_subset [of _ "Pow (insert x F)" for F])
-      apply (blast intro: finite_Pow_iff [THEN iffD2, THEN [2] finite_subset])
-      done
-  qed
-qed
-
-
-subsection {* The binomial theorem (courtesy of Tobias Nipkow): *}
-
-text{* Avigad's version, generalized to any commutative ring *}
-theorem binomial_ring: "(a+b::'a::{comm_ring_1,power})^n = 
-  (\<Sum>k=0..n. (of_nat (n choose k)) * a^k * b^(n-k))" (is "?P n")
-proof (induct n)
-  case 0 then show "?P 0" by simp
-next
-  case (Suc n)
-  have decomp: "{0..n+1} = {0} Un {n+1} Un {1..n}"
-    by auto
-  have decomp2: "{0..n} = {0} Un {1..n}"
-    by auto
-  have "(a+b)^(n+1) = 
-      (a+b) * (\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k))"
-    using Suc.hyps by simp
-  also have "\<dots> = a*(\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k)) +
-                   b*(\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k))"
-    by (rule distrib_right)
-  also have "\<dots> = (\<Sum>k=0..n. of_nat (n choose k) * a^(k+1) * b^(n-k)) +
-                  (\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n-k+1))"
-    by (auto simp add: setsum_right_distrib ac_simps)
-  also have "\<dots> = (\<Sum>k=0..n. of_nat (n choose k) * a^k * b^(n+1-k)) +
-                  (\<Sum>k=1..n+1. of_nat (n choose (k - 1)) * a^k * b^(n+1-k))"
-    by (simp add:setsum_shift_bounds_cl_Suc_ivl Suc_diff_le field_simps  
-        del:setsum_cl_ivl_Suc)
-  also have "\<dots> = a^(n+1) + b^(n+1) +
-                  (\<Sum>k=1..n. of_nat (n choose (k - 1)) * a^k * b^(n+1-k)) +
-                  (\<Sum>k=1..n. of_nat (n choose k) * a^k * b^(n+1-k))"
-    by (simp add: decomp2)
-  also have
-      "\<dots> = a^(n+1) + b^(n+1) + 
-            (\<Sum>k=1..n. of_nat(n+1 choose k) * a^k * b^(n+1-k))"
-    by (auto simp add: field_simps setsum.distrib [symmetric] choose_reduce_nat)
-  also have "\<dots> = (\<Sum>k=0..n+1. of_nat (n+1 choose k) * a^k * b^(n+1-k))"
-    using decomp by (simp add: field_simps)
-  finally show "?P (Suc n)" by simp
-qed
-
-text{* Original version for the naturals *}
-corollary binomial: "(a+b::nat)^n = (\<Sum>k=0..n. (of_nat (n choose k)) * a^k * b^(n-k))"
-    using binomial_ring [of "int a" "int b" n]
-  by (simp only: of_nat_add [symmetric] of_nat_mult [symmetric] of_nat_power [symmetric]
-           of_nat_setsum [symmetric]
-           of_nat_eq_iff of_nat_id)
-
 lemma choose_row_sum: "(\<Sum>k=0..n. n choose k) = 2^n"
   using binomial [of 1 "1" n]
   by (simp add: numeral_2_eq_2)
@@ -397,44 +218,6 @@
       eq setprod.distrib[symmetric])
 qed
 
-lemma binomial_fact_lemma: "k \<le> n \<Longrightarrow> fact k * fact (n - k) * (n choose k) = fact n"
-proof (induct n arbitrary: k rule: nat_less_induct)
-  fix n k assume H: "\<forall>m<n. \<forall>x\<le>m. fact x * fact (m - x) * (m choose x) =
-                      fact m" and kn: "k \<le> n"
-  let ?ths = "fact k * fact (n - k) * (n choose k) = fact n"
-  { assume "n=0" then have ?ths using kn by simp }
-  moreover
-  { assume "k=0" then have ?ths using kn by simp }
-  moreover
-  { assume nk: "n=k" then have ?ths by simp }
-  moreover
-  { fix m h assume n: "n = Suc m" and h: "k = Suc h" and hm: "h < m"
-    from n have mn: "m < n" by arith
-    from hm have hm': "h \<le> m" by arith
-    from hm h n kn have km: "k \<le> m" by arith
-    have "m - h = Suc (m - Suc h)" using  h km hm by arith
-    with km h have th0: "fact (m - h) = (m - h) * fact (m - k)"
-      by simp
-    from n h th0
-    have "fact k * fact (n - k) * (n choose k) =
-        k * (fact h * fact (m - h) * (m choose h)) + 
-        (m - h) * (fact k * fact (m - k) * (m choose k))"
-      by (simp add: field_simps)
-    also have "\<dots> = (k + (m - h)) * fact m"
-      using H[rule_format, OF mn hm'] H[rule_format, OF mn km]
-      by (simp add: field_simps)
-    finally have ?ths using h n km by simp }
-  moreover have "n=0 \<or> k = 0 \<or> k = n \<or> (\<exists>m h. n = Suc m \<and> k = Suc h \<and> h < m)"
-    using kn by presburger
-  ultimately show ?ths by blast
-qed
-
-lemma binomial_fact:
-  assumes kn: "k \<le> n"
-  shows "(of_nat (n choose k) :: 'a::field_char_0) =
-    of_nat (fact n) / (of_nat (fact k) * of_nat (fact (n - k)))"
-  using binomial_fact_lemma[OF kn]
-  by (simp add: field_simps of_nat_mult [symmetric])
 
 lemma binomial_gbinomial: "of_nat (n choose k) = of_nat n gchoose k"
 proof -
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Probability/Borel_Space.thy
--- a/src/HOL/Probability/Borel_Space.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Probability/Borel_Space.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -1089,10 +1089,10 @@
 lemma borel_measurable_of_real [measurable]: "(of_real :: _ \<Rightarrow> (_::real_normed_algebra)) \<in> borel_measurable borel"
   by (intro borel_measurable_continuous_on1 continuous_intros)
 
-lemma borel_measurable_sin [measurable]: "sin \<in> borel_measurable borel"
+lemma borel_measurable_sin [measurable]: "(sin :: _ \<Rightarrow> (_::{real_normed_field,banach})) \<in> borel_measurable borel"
   by (intro borel_measurable_continuous_on1 continuous_intros)
 
-lemma borel_measurable_cos [measurable]: "cos \<in> borel_measurable borel"
+lemma borel_measurable_cos [measurable]: "(cos :: _ \<Rightarrow> (_::{real_normed_field,banach})) \<in> borel_measurable borel"
   by (intro borel_measurable_continuous_on1 continuous_intros)
 
 lemma borel_measurable_arctan [measurable]: "arctan \<in> borel_measurable borel"
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Real_Vector_Spaces.thy
--- a/src/HOL/Real_Vector_Spaces.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Real_Vector_Spaces.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -859,6 +859,16 @@
   assumes "x^2 = 1" shows "norm x = 1"
   by (metis assms norm_minus_cancel norm_one power2_eq_1_iff)
 
+lemma norm_less_p1:
+  fixes x :: "'a::real_normed_algebra_1"
+  shows "norm x < norm (of_real (norm x) + 1 :: 'a)"
+proof -
+  have "norm x < norm (of_real (norm x + 1) :: 'a)"
+    by (simp add: of_real_def)
+  then show ?thesis
+    by simp
+qed
+
 lemma setprod_norm:
   fixes f :: "'a \<Rightarrow> 'b::{comm_semiring_1,real_normed_div_algebra}"
   shows "setprod (\<lambda>x. norm(f x)) A = norm (setprod f A)"
diff -r 2441a80fb6c1 -r 0cc388370041 src/HOL/Transcendental.thy
--- a/src/HOL/Transcendental.thy	Mon Mar 09 11:32:32 2015 +0100
+++ b/src/HOL/Transcendental.thy	Mon Mar 09 16:28:19 2015 +0000
@@ -2347,11 +2347,11 @@
 definition cos_coeff :: "nat \<Rightarrow> real" where
   "cos_coeff = (\<lambda>n. if even n then ((- 1) ^ (n div 2)) / real (fact n) else 0)"
 
-definition sin :: "real \<Rightarrow> real"
-  where "sin = (\<lambda>x. \<Sum>n. sin_coeff n * x ^ n)"
-
-definition cos :: "real \<Rightarrow> real"
-  where "cos = (\<lambda>x. \<Sum>n. cos_coeff n * x ^ n)"
+definition sin :: "'a \<Rightarrow> 'a::{real_normed_algebra_1,banach}"
+  where "sin = (\<lambda>x. \<Sum>n. sin_coeff n *\<^sub>R x^n)"
+
+definition cos :: "'a \<Rightarrow> 'a::{real_normed_algebra_1,banach}"
+  where "cos = (\<lambda>x. \<Sum>n. cos_coeff n *\<^sub>R x^n)"
 
 lemma sin_coeff_0 [simp]: "sin_coeff 0 = 0"
   unfolding sin_coeff_def by simp
@@ -2367,23 +2367,65 @@
   unfolding cos_coeff_def sin_coeff_def
   by (simp del: mult_Suc) (auto elim: oddE)
 
-lemma summable_sin: "summable (\<lambda>n. sin_coeff n * x ^ n)"
-  unfolding sin_coeff_def
-  apply (rule summable_comparison_test [OF _ summable_exp [where x="\<bar>x\<bar>"]])
-  apply (auto simp add: divide_inverse abs_mult power_abs [symmetric] zero_le_mult_iff)
+lemma summable_norm_sin: 
+  fixes x :: "'a::{real_normed_algebra_1,banach}"
+  shows "summable (\<lambda>n. norm (sin_coeff n *\<^sub>R x^n))"
+  unfolding sin_coeff_def 
+  apply (rule summable_comparison_test [OF _ summable_norm_exp [where x=x]])
+  apply (auto simp: divide_inverse abs_mult power_abs [symmetric] zero_le_mult_iff)
   done
 
-lemma summable_cos: "summable (\<lambda>n. cos_coeff n * x ^ n)"
+lemma summable_norm_cos: 
+  fixes x :: "'a::{real_normed_algebra_1,banach}"
+  shows "summable (\<lambda>n. norm (cos_coeff n *\<^sub>R x ^ n))"
   unfolding cos_coeff_def
-  apply (rule summable_comparison_test [OF _ summable_exp [where x="\<bar>x\<bar>"]])
-  apply (auto simp add: divide_inverse abs_mult power_abs [symmetric] zero_le_mult_iff)
+  apply (rule summable_comparison_test [OF _ summable_norm_exp [where x=x]])
+  apply (auto simp: divide_inverse abs_mult power_abs [symmetric] zero_le_mult_iff)
   done
 
-lemma sin_converges: "(\<lambda>n. sin_coeff n * x ^ n) sums sin(x)"
-  unfolding sin_def by (rule summable_sin [THEN summable_sums])
-
-lemma cos_converges: "(\<lambda>n. cos_coeff n * x ^ n) sums cos(x)"
-  unfolding cos_def by (rule summable_cos [THEN summable_sums])
+lemma sin_converges: "(\<lambda>n. sin_coeff n *\<^sub>R x^n) sums sin(x)"
+unfolding sin_def
+  by (metis (full_types) summable_norm_cancel summable_norm_sin summable_sums)
+
+lemma cos_converges: "(\<lambda>n. cos_coeff n *\<^sub>R x^n) sums cos(x)"
+unfolding cos_def
+  by (metis (full_types) summable_norm_cancel summable_norm_cos summable_sums)
+
+lemma sin_of_real:
+  fixes x::real
+  shows "sin (of_real x) = of_real (sin x)"
+proof -
+  have "(\<lambda>n. of_real (sin_coeff n *\<^sub>R  x^n)) = (\<lambda>n. sin_coeff n *\<^sub>R  (of_real x)^n)"
+  proof
+    fix n
+    show "of_real (sin_coeff n *\<^sub>R  x ^ n) = sin_coeff n *\<^sub>R of_real x ^ n"
+      by (simp add: scaleR_conv_of_real)
+  qed
+  also have "... sums (sin (of_real x))"
+    by (rule sin_converges)
+  finally have "(\<lambda>n. of_real (sin_coeff n *\<^sub>R x^n)) sums (sin (of_real x))" .
+  then show ?thesis
+    using sums_unique2 sums_of_real [OF sin_converges] 
+    by blast
+qed
+
+lemma cos_of_real:
+  fixes x::real
+  shows "cos (of_real x) = of_real (cos x)"
+proof -
+  have "(\<lambda>n. of_real (cos_coeff n *\<^sub>R  x^n)) = (\<lambda>n. cos_coeff n *\<^sub>R  (of_real x)^n)"
+  proof
+    fix n
+    show "of_real (cos_coeff n *\<^sub>R  x ^ n) = cos_coeff n *\<^sub>R of_real x ^ n"
+      by (simp add: scaleR_conv_of_real)
+  qed
+  also have "... sums (cos (of_real x))"
+    by (rule cos_converges)
+  finally have "(\<lambda>n. of_real (cos_coeff n *\<^sub>R x^n)) sums (cos (of_real x))" .
+  then show ?thesis
+    using sums_unique2 sums_of_real [OF cos_converges]  
+    by blast
+qed
 
 lemma diffs_sin_coeff: "diffs sin_coeff = cos_coeff"
   by (simp add: diffs_def sin_coeff_Suc real_of_nat_def del: of_nat_Suc)
@@ -2393,106 +2435,339 @@
 
 text{*Now at last we can get the derivatives of exp, sin and cos*}
 
-lemma DERIV_sin [simp]: "DERIV sin x :> cos(x)"
-  unfolding sin_def cos_def
-  apply (rule DERIV_cong, rule termdiffs [where K="1 + \<bar>x\<bar>"])
-  apply (simp_all add: diffs_sin_coeff diffs_cos_coeff
-    summable_minus summable_sin summable_cos)
+lemma DERIV_sin [simp]:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "DERIV sin x :> cos(x)"
+  unfolding sin_def cos_def scaleR_conv_of_real
+  apply (rule DERIV_cong)
+  apply (rule termdiffs [where K="of_real (norm x) + 1 :: 'a"])
+  apply (simp_all add: norm_less_p1 diffs_of_real diffs_sin_coeff diffs_cos_coeff 
+              summable_minus_iff scaleR_conv_of_real [symmetric]
+              summable_norm_sin [THEN summable_norm_cancel]
+              summable_norm_cos [THEN summable_norm_cancel])
   done
-
+  
 declare DERIV_sin[THEN DERIV_chain2, derivative_intros]
 
-lemma DERIV_cos [simp]: "DERIV cos x :> -sin(x)"
-  unfolding cos_def sin_def
-  apply (rule DERIV_cong, rule termdiffs [where K="1 + \<bar>x\<bar>"])
-  apply (simp_all add: diffs_sin_coeff diffs_cos_coeff diffs_minus
-    summable_minus summable_sin summable_cos suminf_minus)
+lemma DERIV_cos [simp]: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "DERIV cos x :> -sin(x)"
+  unfolding sin_def cos_def scaleR_conv_of_real
+  apply (rule DERIV_cong)
+  apply (rule termdiffs [where K="of_real (norm x) + 1 :: 'a"])
+  apply (simp_all add: norm_less_p1 diffs_of_real diffs_minus suminf_minus 
+              diffs_sin_coeff diffs_cos_coeff 
+              summable_minus_iff scaleR_conv_of_real [symmetric]
+              summable_norm_sin [THEN summable_norm_cancel]
+              summable_norm_cos [THEN summable_norm_cancel])
   done
 
 declare DERIV_cos[THEN DERIV_chain2, derivative_intros]
 
-lemma isCont_sin: "isCont sin x"
+lemma isCont_sin:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "isCont sin x"
   by (rule DERIV_sin [THEN DERIV_isCont])
 
-lemma isCont_cos: "isCont cos x"
+lemma isCont_cos: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "isCont cos x"
   by (rule DERIV_cos [THEN DERIV_isCont])
 
-lemma isCont_sin' [simp]: "isCont f a \<Longrightarrow> isCont (\<lambda>x. sin (f x)) a"
+lemma isCont_sin' [simp]:
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "isCont f a \<Longrightarrow> isCont (\<lambda>x. sin (f x)) a"
   by (rule isCont_o2 [OF _ isCont_sin])
 
-lemma isCont_cos' [simp]: "isCont f a \<Longrightarrow> isCont (\<lambda>x. cos (f x)) a"
+(*FIXME A CONTEXT FOR F WOULD BE BETTER*)
+
+lemma isCont_cos' [simp]: 
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "isCont f a \<Longrightarrow> isCont (\<lambda>x. cos (f x)) a"
   by (rule isCont_o2 [OF _ isCont_cos])
 
 lemma tendsto_sin [tendsto_intros]:
-  "(f ---> a) F \<Longrightarrow> ((\<lambda>x. sin (f x)) ---> sin a) F"
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "(f ---> a) F \<Longrightarrow> ((\<lambda>x. sin (f x)) ---> sin a) F"
   by (rule isCont_tendsto_compose [OF isCont_sin])
 
 lemma tendsto_cos [tendsto_intros]:
-  "(f ---> a) F \<Longrightarrow> ((\<lambda>x. cos (f x)) ---> cos a) F"
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "(f ---> a) F \<Longrightarrow> ((\<lambda>x. cos (f x)) ---> cos a) F"
   by (rule isCont_tendsto_compose [OF isCont_cos])
 
 lemma continuous_sin [continuous_intros]:
-  "continuous F f \<Longrightarrow> continuous F (\<lambda>x. sin (f x))"
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "continuous F f \<Longrightarrow> continuous F (\<lambda>x. sin (f x))"
   unfolding continuous_def by (rule tendsto_sin)
 
 lemma continuous_on_sin [continuous_intros]:
-  "continuous_on s f \<Longrightarrow> continuous_on s (\<lambda>x. sin (f x))"
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "continuous_on s f \<Longrightarrow> continuous_on s (\<lambda>x. sin (f x))"
   unfolding continuous_on_def by (auto intro: tendsto_sin)
 
+lemma continuous_within_sin:
+  fixes z :: "'a::{real_normed_field,banach}"
+  shows "continuous (at z within s) sin"
+  by (simp add: continuous_within tendsto_sin)
+
 lemma continuous_cos [continuous_intros]:
-  "continuous F f \<Longrightarrow> continuous F (\<lambda>x. cos (f x))"
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "continuous F f \<Longrightarrow> continuous F (\<lambda>x. cos (f x))"
   unfolding continuous_def by (rule tendsto_cos)
 
 lemma continuous_on_cos [continuous_intros]:
-  "continuous_on s f \<Longrightarrow> continuous_on s (\<lambda>x. cos (f x))"
+  fixes f:: "_ \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "continuous_on s f \<Longrightarrow> continuous_on s (\<lambda>x. cos (f x))"
   unfolding continuous_on_def by (auto intro: tendsto_cos)
 
+lemma continuous_within_cos:
+  fixes z :: "'a::{real_normed_field,banach}"
+  shows "continuous (at z within s) cos"
+  by (simp add: continuous_within tendsto_cos)
+
 subsection {* Properties of Sine and Cosine *}
 
 lemma sin_zero [simp]: "sin 0 = 0"
-  unfolding sin_def sin_coeff_def by (simp add: powser_zero)
+  unfolding sin_def sin_coeff_def by (simp add: scaleR_conv_of_real powser_zero)
 
 lemma cos_zero [simp]: "cos 0 = 1"
-  unfolding cos_def cos_coeff_def by (simp add: powser_zero)
-
-lemma sin_cos_squared_add [simp]: "(sin x)\<^sup>2 + (cos x)\<^sup>2 = 1"
+  unfolding cos_def cos_coeff_def by (simp add: scaleR_conv_of_real powser_zero)
+
+lemma DERIV_fun_sin:
+     "DERIV g x :> m \<Longrightarrow> DERIV (\<lambda>x. sin(g x)) x :> cos(g x) * m"
+  by (auto intro!: derivative_intros)
+
+lemma DERIV_fun_cos:
+     "DERIV g x :> m \<Longrightarrow> DERIV (\<lambda>x. cos(g x)) x :> -sin(g x) * m"
+  by (auto intro!: derivative_eq_intros simp: real_of_nat_def)
+
+subsection {*Deriving the Addition Formulas*}
+
+text{*The the product of two cosine series*}
+lemma cos_x_cos_y: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "(\<lambda>p. \<Sum>n\<le>p. 
+          if even p \<and> even n 
+          then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0) 
+         sums (cos x * cos y)"
+proof -
+  { fix n p::nat
+    assume "n\<le>p"
+    then have *: "even n \<Longrightarrow> even p \<Longrightarrow> (-1) ^ (n div 2) * (-1) ^ ((p - n) div 2) = (-1 :: real) ^ (p div 2)"
+      by (metis div_add power_add le_add_diff_inverse odd_add)
+    have "(cos_coeff n * cos_coeff (p - n)) *\<^sub>R (x^n * y^(p-n)) = 
+          (if even p \<and> even n then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0)"
+    using `n\<le>p`
+      by (auto simp: * algebra_simps cos_coeff_def binomial_fact real_of_nat_def)
+  } 
+  then have "(\<lambda>p. \<Sum>n\<le>p. if even p \<and> even n 
+                  then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0) =
+             (\<lambda>p. \<Sum>n\<le>p. (cos_coeff n * cos_coeff (p - n)) *\<^sub>R (x^n * y^(p-n)))"
+    by simp
+  also have "... = (\<lambda>p. \<Sum>n\<le>p. (cos_coeff n *\<^sub>R x^n) * (cos_coeff (p - n) *\<^sub>R y^(p-n)))"
+    by (simp add: algebra_simps)
+  also have "... sums (cos x * cos y)"
+    using summable_norm_cos
+    by (auto simp: cos_def scaleR_conv_of_real intro!: Cauchy_product_sums)
+  finally show ?thesis .
+qed
+
+text{*The product of two sine series*}
+lemma sin_x_sin_y: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "(\<lambda>p. \<Sum>n\<le>p. 
+          if even p \<and> odd n 
+               then - ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0) 
+         sums (sin x * sin y)"
+proof -
+  { fix n p::nat
+    assume "n\<le>p"
+    { assume np: "odd n" "even p"
+        with `n\<le>p` have "n - Suc 0 + (p - Suc n) = p - Suc (Suc 0)" "Suc (Suc 0) \<le> p"
+        by arith+
+      moreover have "(p - Suc (Suc 0)) div 2 = p div 2 - Suc 0"
+        by simp
+      ultimately have *: "(-1) ^ ((n - Suc 0) div 2) * (-1) ^ ((p - Suc n) div 2) = - ((-1 :: real) ^ (p div 2))"
+        using np `n\<le>p`
+        apply (simp add: power_add [symmetric] div_add [symmetric] del: div_add)
+        apply (metis (no_types) One_nat_def Suc_1 le_div_geq minus_minus mult.left_neutral mult_minus_left power.simps(2) zero_less_Suc)
+        done
+    } then
+    have "(sin_coeff n * sin_coeff (p - n)) *\<^sub>R (x^n * y^(p-n)) = 
+          (if even p \<and> odd n 
+          then -((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0)"
+    using `n\<le>p`
+      by (auto simp:  algebra_simps sin_coeff_def binomial_fact real_of_nat_def)
+  } 
+  then have "(\<lambda>p. \<Sum>n\<le>p. if even p \<and> odd n 
+               then - ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0) =
+             (\<lambda>p. \<Sum>n\<le>p. (sin_coeff n * sin_coeff (p - n)) *\<^sub>R (x^n * y^(p-n)))"
+    by simp
+  also have "... = (\<lambda>p. \<Sum>n\<le>p. (sin_coeff n *\<^sub>R x^n) * (sin_coeff (p - n) *\<^sub>R y^(p-n)))"
+    by (simp add: algebra_simps)
+  also have "... sums (sin x * sin y)"
+    using summable_norm_sin
+    by (auto simp: sin_def scaleR_conv_of_real intro!: Cauchy_product_sums)
+  finally show ?thesis .
+qed
+
+lemma sums_cos_x_plus_y: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows
+  "(\<lambda>p. \<Sum>n\<le>p. if even p 
+               then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) 
+               else 0) 
+        sums cos (x + y)"
 proof -
-  have "\<forall>x. DERIV (\<lambda>x. (sin x)\<^sup>2 + (cos x)\<^sup>2) x :> 0"
-    by (auto intro!: derivative_eq_intros)
-  hence "(sin x)\<^sup>2 + (cos x)\<^sup>2 = (sin 0)\<^sup>2 + (cos 0)\<^sup>2"
-    by (rule DERIV_isconst_all)
-  thus "(sin x)\<^sup>2 + (cos x)\<^sup>2 = 1" by simp
+  { fix p::nat
+    have "(\<Sum>n\<le>p. if even p
+                  then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n)
+                  else 0) = 
+          (if even p
+                  then \<Sum>n\<le>p. ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n)
+                  else 0)"
+      by simp
+    also have "... = (if even p
+                  then of_real ((-1) ^ (p div 2) / of_nat (fact p)) * (\<Sum>n\<le>p. (p choose n) *\<^sub>R (x^n) * y^(p-n))
+                  else 0)"
+      by (auto simp: setsum_right_distrib field_simps scaleR_conv_of_real nonzero_of_real_divide)
+    also have "... = cos_coeff p *\<^sub>R ((x + y) ^ p)"
+      by (simp add: cos_coeff_def binomial_ring [of x y]  scaleR_conv_of_real real_of_nat_def atLeast0AtMost)
+    finally have "(\<Sum>n\<le>p. if even p
+                  then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n)
+                  else 0) = cos_coeff p *\<^sub>R ((x + y) ^ p)" .
+  }  
+  then have "(\<lambda>p. \<Sum>n\<le>p. 
+               if even p 
+               then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) 
+               else 0) 
+        = (\<lambda>p. cos_coeff p *\<^sub>R ((x+y)^p))"
+        by simp
+   also have "... sums cos (x + y)"
+    by (rule cos_converges)
+   finally show ?thesis .
+qed
+
+theorem cos_add: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "cos (x + y) = cos x * cos y - sin x * sin y"
+proof -
+  { fix n p::nat
+    assume "n\<le>p"
+    then have "(if even p \<and> even n 
+               then ((- 1) ^ (p div 2) * int (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0) -
+          (if even p \<and> odd n 
+               then - ((- 1) ^ (p div 2) * int (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0)
+          = (if even p 
+               then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0)"
+      by simp
+  }   
+  then have "(\<lambda>p. \<Sum>n\<le>p. (if even p 
+               then ((-1) ^ (p div 2) * (p choose n) / of_nat (fact p)) *\<^sub>R (x^n) * y^(p-n) else 0)) 
+        sums (cos x * cos y - sin x * sin y)"
+    using sums_diff [OF cos_x_cos_y [of x y] sin_x_sin_y [of x y]]
+    by (simp add: setsum_subtractf [symmetric])
+  then show ?thesis
+    by (blast intro: sums_cos_x_plus_y sums_unique2)
 qed
 
-lemma sin_cos_squared_add2 [simp]: "(cos x)\<^sup>2 + (sin x)\<^sup>2 = 1"
+lemma sin_minus_converges: "(\<lambda>n. - (sin_coeff n *\<^sub>R (-x)^n)) sums sin(x)"
+proof -
+  have [simp]: "\<And>n. - (sin_coeff n *\<^sub>R (-x)^n) = (sin_coeff n *\<^sub>R x^n)"
+    by (auto simp: sin_coeff_def elim!: oddE)
+  show ?thesis
+    by (simp add: sin_def summable_norm_sin [THEN summable_norm_cancel, THEN summable_sums])
+qed
+
+lemma sin_minus [simp]:
+  fixes x :: "'a::{real_normed_algebra_1,banach}"
+  shows "sin (-x) = -sin(x)"
+using sin_minus_converges [of x] 
+by (auto simp: sin_def summable_norm_sin [THEN summable_norm_cancel] suminf_minus sums_iff equation_minus_iff)
+
+lemma cos_minus_converges: "(\<lambda>n. (cos_coeff n *\<^sub>R (-x)^n)) sums cos(x)"
+proof -
+  have [simp]: "\<And>n. (cos_coeff n *\<^sub>R (-x)^n) = (cos_coeff n *\<^sub>R x^n)"
+    by (auto simp: Transcendental.cos_coeff_def elim!: evenE)
+  show ?thesis
+    by (simp add: cos_def summable_norm_cos [THEN summable_norm_cancel, THEN summable_sums])
+qed
+
+lemma cos_minus [simp]:
+  fixes x :: "'a::{real_normed_algebra_1,banach}"
+  shows "cos (-x) = cos(x)"
+using cos_minus_converges [of x]
+by (simp add: cos_def summable_norm_cos [THEN summable_norm_cancel] 
+              suminf_minus sums_iff equation_minus_iff)
+
+    
+lemma sin_cos_squared_add [simp]: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "(sin x)\<^sup>2 + (cos x)\<^sup>2 = 1"
+using cos_add [of x "-x"]
+by (simp add: power2_eq_square algebra_simps)
+
+lemma sin_cos_squared_add2 [simp]:  
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "(cos x)\<^sup>2 + (sin x)\<^sup>2 = 1"
   by (subst add.commute, rule sin_cos_squared_add)
 
-lemma sin_cos_squared_add3 [simp]: "cos x * cos x + sin x * sin x = 1"
+lemma sin_cos_squared_add3 [simp]:  
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "cos x * cos x + sin x * sin x = 1"
   using sin_cos_squared_add2 [unfolded power2_eq_square] .
 
-lemma sin_squared_eq: "(sin x)\<^sup>2 = 1 - (cos x)\<^sup>2"
+lemma sin_squared_eq:  
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "(sin x)\<^sup>2 = 1 - (cos x)\<^sup>2"
   unfolding eq_diff_eq by (rule sin_cos_squared_add)
 
-lemma cos_squared_eq: "(cos x)\<^sup>2 = 1 - (sin x)\<^sup>2"
+lemma cos_squared_eq:  
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "(cos x)\<^sup>2 = 1 - (sin x)\<^sup>2"
   unfolding eq_diff_eq by (rule sin_cos_squared_add2)
 
-lemma abs_sin_le_one [simp]: "\<bar>sin x\<bar> \<le> 1"
+lemma abs_sin_le_one [simp]:  
+  fixes x :: real
+  shows "\<bar>sin x\<bar> \<le> 1"
   by (rule power2_le_imp_le, simp_all add: sin_squared_eq)
 
-lemma sin_ge_minus_one [simp]: "-1 \<le> sin x"
+lemma sin_ge_minus_one [simp]: 
+  fixes x :: real
+  shows "-1 \<le> sin x"
+  using abs_sin_le_one [of x] unfolding abs_le_iff by simp
+
+lemma sin_le_one [simp]: 
+  fixes x :: real
+  shows "sin x \<le> 1"
   using abs_sin_le_one [of x] unfolding abs_le_iff by simp
 
-lemma sin_le_one [simp]: "sin x \<le> 1"
-  using abs_sin_le_one [of x] unfolding abs_le_iff by simp
-
-lemma abs_cos_le_one [simp]: "\<bar>cos x\<bar> \<le> 1"
+lemma abs_cos_le_one [simp]: 
+  fixes x :: real
+  shows "\<bar>cos x\<bar> \<le> 1"
   by (rule power2_le_imp_le, simp_all add: cos_squared_eq)
 
-lemma cos_ge_minus_one [simp]: "-1 \<le> cos x"
+lemma cos_ge_minus_one [simp]: 
+  fixes x :: real
+  shows "-1 \<le> cos x"
+  using abs_cos_le_one [of x] unfolding abs_le_iff by simp
+
+lemma cos_le_one [simp]: 
+  fixes x :: real
+  shows "cos x \<le> 1"
   using abs_cos_le_one [of x] unfolding abs_le_iff by simp
 
-lemma cos_le_one [simp]: "cos x \<le> 1"
-  using abs_cos_le_one [of x] unfolding abs_le_iff by simp
+lemma cos_diff: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "cos (x - y) = cos x * cos y + sin x * sin y"
+  using cos_add [of x "- y"] by simp
+
+lemma cos_double: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "cos(2*x) = (cos x)\<^sup>2 - (sin x)\<^sup>2"
+  using cos_add [where x=x and y=x]
+  by (simp add: power2_eq_square)
 
 lemma DERIV_fun_pow: "DERIV g x :> m ==>
       DERIV (\<lambda>x. (g x) ^ n) x :> real n * (g x) ^ (n - 1) * m"
@@ -2502,93 +2777,6 @@
      "DERIV g x :> m ==> DERIV (\<lambda>x. exp(g x)) x :> exp(g x) * m"
   by (auto intro!: derivative_intros)
 
-lemma DERIV_fun_sin:
-     "DERIV g x :> m ==> DERIV (\<lambda>x. sin(g x)) x :> cos(g x) * m"
-  by (auto intro!: derivative_intros)
-
-lemma DERIV_fun_cos:
-     "DERIV g x :> m ==> DERIV (\<lambda>x. cos(g x)) x :> -sin(g x) * m"
-  by (auto intro!: derivative_eq_intros simp: real_of_nat_def)
-
-lemma sin_cos_add_lemma:
-  "(sin (x + y) - (sin x * cos y + cos x * sin y))\<^sup>2 +
-    (cos (x + y) - (cos x * cos y - sin x * sin y))\<^sup>2 = 0"
-  (is "?f x = 0")
-proof -
-  have "\<forall>x. DERIV (\<lambda>x. ?f x) x :> 0"
-    by (auto intro!: derivative_eq_intros simp add: algebra_simps)
-  hence "?f x = ?f 0"
-    by (rule DERIV_isconst_all)
-  thus ?thesis by simp
-qed
-
-lemma sin_add: "sin (x + y) = sin x * cos y + cos x * sin y"
-  using sin_cos_add_lemma unfolding realpow_two_sum_zero_iff by simp
-
-lemma cos_add: "cos (x + y) = cos x * cos y - sin x * sin y"
-  using sin_cos_add_lemma unfolding realpow_two_sum_zero_iff by simp
-
-lemma sin_cos_minus_lemma:
-  "(sin(-x) + sin(x))\<^sup>2 + (cos(-x) - cos(x))\<^sup>2 = 0" (is "?f x = 0")
-proof -
-  have "\<forall>x. DERIV (\<lambda>x. ?f x) x :> 0"
-    by (auto intro!: derivative_eq_intros simp add: algebra_simps)
-  hence "?f x = ?f 0"
-    by (rule DERIV_isconst_all)
-  thus ?thesis by simp
-qed
-
-lemma sin_minus [simp]: "sin (-x) = -sin(x)"
-  using sin_cos_minus_lemma [where x=x] by simp
-
-lemma cos_minus [simp]: "cos (-x) = cos(x)"
-  using sin_cos_minus_lemma [where x=x] by simp
-
-lemma sin_diff: "sin (x - y) = sin x * cos y - cos x * sin y"
-  using sin_add [of x "- y"] by simp
-
-lemma sin_diff2: "sin (x - y) = cos y * sin x - sin y * cos x"
-  by (simp add: sin_diff mult.commute)
-
-lemma cos_diff: "cos (x - y) = cos x * cos y + sin x * sin y"
-  using cos_add [of x "- y"] by simp
-
-lemma cos_diff2: "cos (x - y) = cos y * cos x + sin y * sin x"
-  by (simp add: cos_diff mult.commute)
-
-lemma sin_double [simp]: "sin(2 * x) = 2* sin x * cos x"
-  using sin_add [where x=x and y=x] by simp
-
-lemma cos_double: "cos(2* x) = ((cos x)\<^sup>2) - ((sin x)\<^sup>2)"
-  using cos_add [where x=x and y=x]
-  by (simp add: power2_eq_square)
-
-lemma sin_x_le_x: assumes x: "x \<ge> 0" shows "sin x \<le> x"
-proof -
-  let ?f = "\<lambda>x. x - sin x"
-  from x have "?f x \<ge> ?f 0"
-    apply (rule DERIV_nonneg_imp_nondecreasing)
-    apply (intro allI impI exI[of _ "1 - cos x" for x])
-    apply (auto intro!: derivative_eq_intros simp: field_simps)
-    done
-  thus "sin x \<le> x" by simp
-qed
-
-lemma sin_x_ge_neg_x: assumes x: "x \<ge> 0" shows "sin x \<ge> - x"
-proof -
-  let ?f = "\<lambda>x. x + sin x"
-  from x have "?f x \<ge> ?f 0"
-    apply (rule DERIV_nonneg_imp_nondecreasing)
-    apply (intro allI impI exI[of _ "1 + cos x" for x])
-    apply (auto intro!: derivative_eq_intros simp: field_simps real_0_le_add_iff)
-    done
-  thus "sin x \<ge> -x" by simp
-qed
-
-lemma abs_sin_x_le_abs_x: "\<bar>sin x\<bar> \<le> \<bar>x\<bar>"
-  using sin_x_ge_neg_x [of x] sin_x_le_x [of x] sin_x_ge_neg_x [of "-x"] sin_x_le_x [of "-x"]
-  by (auto simp: abs_real_def)
-
 subsection {* The Constant Pi *}
 
 definition pi :: real
@@ -2598,14 +2786,18 @@
    hence define pi.*}
 
 lemma sin_paired:
-  "(\<lambda>n. (- 1) ^ n /(real (fact (2 * n + 1))) * x ^ (2 * n + 1)) sums  sin x"
+  fixes x :: real 
+  shows "(\<lambda>n. (- 1) ^ n /(real (fact (2 * n + 1))) * x ^ (2 * n + 1)) sums  sin x"
 proof -
-  have "(\<lambda>n. \<Sum>k = n * 2..<n * 2 + 2. sin_coeff k * x ^ k) sums sin x"
-    by (rule sin_converges [THEN sums_group], simp)
+  have "(\<lambda>n. \<Sum>k = n*2..<n * 2 + 2. sin_coeff k * x ^ k) sums sin x"
+    apply (rule sums_group)
+    using sin_converges [of x, unfolded scaleR_conv_of_real]
+    by auto
   thus ?thesis unfolding One_nat_def sin_coeff_def by (simp add: ac_simps)
 qed
 
-lemma sin_gt_zero:
+lemma sin_gt_zero_02:
+  fixes x :: real 
   assumes "0 < x" and "x < 2"
   shows "0 < sin x"
 proof -
@@ -2631,39 +2823,42 @@
     by (rule suminf_pos)
 qed
 
-lemma cos_double_less_one: "0 < x \<Longrightarrow> x < 2 \<Longrightarrow> cos (2 * x) < 1"
-  using sin_gt_zero [where x = x] by (auto simp add: cos_squared_eq cos_double)
-
-lemma cos_paired: "(\<lambda>n. (- 1) ^ n /(real (fact (2 * n))) * x ^ (2 * n)) sums cos x"
+lemma cos_double_less_one:
+  fixes x :: real 
+  shows "0 < x \<Longrightarrow> x < 2 \<Longrightarrow> cos (2 * x) < 1"
+  using sin_gt_zero_02 [where x = x] by (auto simp: cos_squared_eq cos_double)
+
+lemma cos_paired:
+  fixes x :: real 
+  shows "(\<lambda>n. (- 1) ^ n /(real (fact (2 * n))) * x ^ (2 * n)) sums cos x"
 proof -
   have "(\<lambda>n. \<Sum>k = n * 2..<n * 2 + 2. cos_coeff k * x ^ k) sums cos x"
-    by (rule cos_converges [THEN sums_group], simp)
+    apply (rule sums_group)
+    using cos_converges [of x, unfolded scaleR_conv_of_real]
+    by auto
   thus ?thesis unfolding cos_coeff_def by (simp add: ac_simps)
 qed
 
 lemmas realpow_num_eq_if = power_eq_if
 
-lemma sumr_pos_lt_pair:
+lemma sumr_pos_lt_pair:  (*FIXME A MESS, BUT THE REAL MESS IS THE NEXT THEOREM*)
   fixes f :: "nat \<Rightarrow> real"
   shows "\<lbrakk>summable f;
         \<And>d. 0 < f (k + (Suc(Suc 0) * d)) + f (k + ((Suc(Suc 0) * d) + 1))\<rbrakk>
       \<Longrightarrow> setsum f {..<k} < suminf f"
 unfolding One_nat_def
-apply (subst suminf_split_initial_segment [where k="k"])
-apply assumption
-apply simp
-apply (drule_tac k="k" in summable_ignore_initial_segment)
+apply (subst suminf_split_initial_segment [where k=k], assumption, simp)
+apply (drule_tac k=k in summable_ignore_initial_segment)
 apply (drule_tac k="Suc (Suc 0)" in sums_group [OF summable_sums], simp)
 apply simp
 apply (frule sums_unique)
-apply (drule sums_summable)
-apply simp
+apply (drule sums_summable, simp)
 apply (erule suminf_pos)
 apply (simp add: ac_simps)
 done
 
 lemma cos_two_less_zero [simp]:
-  "cos 2 < 0"
+  "cos 2 < (0::real)"
 proof -
   note fact_Suc [simp del]
   from cos_paired
@@ -2699,30 +2894,30 @@
     by (rule order_less_trans)
   moreover from * have "- cos 2 = (\<Sum>n. - ((- 1) ^ n * 2 ^ (2 * n) / real (fact (2 * n))))"
     by (rule sums_unique)
-  ultimately have "0 < - cos 2" by simp
+  ultimately have "(0::real) < - cos 2" by simp
   then show ?thesis by simp
 qed
 
 lemmas cos_two_neq_zero [simp] = cos_two_less_zero [THEN less_imp_neq]
 lemmas cos_two_le_zero [simp] = cos_two_less_zero [THEN order_less_imp_le]
 
-lemma cos_is_zero: "EX! x. 0 \<le> x & x \<le> 2 \<and> cos x = 0"
+lemma cos_is_zero: "EX! x::real. 0 \<le> x & x \<le> 2 \<and> cos x = 0"
 proof (rule ex_ex1I)
-  show "\<exists>x. 0 \<le> x & x \<le> 2 & cos x = 0"
+  show "\<exists>x::real. 0 \<le> x & x \<le> 2 & cos x = 0"
     by (rule IVT2, simp_all)
 next
-  fix x y
+  fix x::real and y::real
   assume x: "0 \<le> x \<and> x \<le> 2 \<and> cos x = 0"
   assume y: "0 \<le> y \<and> y \<le> 2 \<and> cos y = 0"
-  have [simp]: "\<forall>x. cos differentiable (at x)"
+  have [simp]: "\<forall>x::real. cos differentiable (at x)"
     unfolding real_differentiable_def by (auto intro: DERIV_cos)
   from x y show "x = y"
     apply (cut_tac less_linear [of x y], auto)
     apply (drule_tac f = cos in Rolle)
     apply (drule_tac [5] f = cos in Rolle)
     apply (auto dest!: DERIV_cos [THEN DERIV_unique])
-    apply (metis order_less_le_trans less_le sin_gt_zero)
-    apply (metis order_less_le_trans less_le sin_gt_zero)
+    apply (metis order_less_le_trans less_le sin_gt_zero_02)
+    apply (metis order_less_le_trans less_le sin_gt_zero_02)
     done
 qed
 
@@ -2732,6 +2927,11 @@
 lemma cos_pi_half [simp]: "cos (pi / 2) = 0"
   by (simp add: pi_half cos_is_zero [THEN theI'])
 
+lemma cos_of_real_pi_half [simp]: 
+  fixes x :: "'a :: {real_field,banach,real_normed_algebra_1}"
+  shows "cos ((of_real pi / 2) :: 'a) = 0"
+by (metis cos_pi_half cos_of_real eq_numeral_simps(4) nonzero_of_real_divide of_real_0 of_real_numeral)
+
 lemma pi_half_gt_zero [simp]: "0 < pi / 2"
   apply (rule order_le_neq_trans)
   apply (simp add: pi_half cos_is_zero [THEN theI'])
@@ -2765,29 +2965,67 @@
 lemma minus_pi_half_less_zero: "-(pi/2) < 0"
   by simp
 
-lemma m2pi_less_pi: "- (2 * pi) < pi"
+lemma m2pi_less_pi: "- (2*pi) < pi"
   by simp
 
 lemma sin_pi_half [simp]: "sin(pi/2) = 1"
   using sin_cos_squared_add2 [where x = "pi/2"]
-  using sin_gt_zero [OF pi_half_gt_zero pi_half_less_two]
+  using sin_gt_zero_02 [OF pi_half_gt_zero pi_half_less_two]
   by (simp add: power2_eq_1_iff)
 
+lemma sin_of_real_pi_half [simp]:
+  fixes x :: "'a :: {real_field,banach,real_normed_algebra_1}"
+  shows "sin ((of_real pi / 2) :: 'a) = 1"
+  using sin_pi_half 
+by (metis sin_pi_half eq_numeral_simps(4) nonzero_of_real_divide of_real_1 of_real_numeral sin_of_real)
+
+lemma sin_cos_eq:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "sin x = cos (of_real pi / 2 - x)"
+  by (simp add: cos_diff)
+
+lemma minus_sin_cos_eq:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "-sin x = cos (x + of_real pi / 2)"
+  by (simp add: cos_add nonzero_of_real_divide)
+
+lemma cos_sin_eq:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "cos x = sin (of_real pi / 2 - x)"
+  using sin_cos_eq [of "of_real pi / 2 - x"]
+  by simp
+
+lemma sin_add: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "sin (x + y) = sin x * cos y + cos x * sin y"
+  using cos_add [of "of_real pi / 2 - x" "-y"]
+  by (simp add: cos_sin_eq) (simp add: sin_cos_eq)
+
+lemma sin_diff:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "sin (x - y) = sin x * cos y - cos x * sin y"
+  using sin_add [of x "- y"] by simp
+
+lemma sin_double: 
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "sin(2 * x) = 2 * sin x * cos x"
+  using sin_add [where x=x and y=x] by simp
+
+
+lemma cos_of_real_pi [simp]: "cos (of_real pi) = -1"
+  using cos_add [where x = "pi/2" and y = "pi/2"]
+  by (simp add: cos_of_real)
+
+lemma sin_of_real_pi [simp]: "sin (of_real pi) = 0"
+  using sin_add [where x = "pi/2" and y = "pi/2"] 
+  by (simp add: sin_of_real)
+  
 lemma cos_pi [simp]: "cos pi = -1"
   using cos_add [where x = "pi/2" and y = "pi/2"] by simp
 
 lemma sin_pi [simp]: "sin pi = 0"
   using sin_add [where x = "pi/2" and y = "pi/2"] by simp
 
-lemma sin_cos_eq: "sin x = cos (pi/2 - x)"
-  by (simp add: cos_diff)
-
-lemma minus_sin_cos_eq: "-sin x = cos (x + pi/2)"
-  by (simp add: cos_add)
-
-lemma cos_sin_eq: "cos x = sin (pi/2 - x)"
-  by (simp add: sin_diff)
-
 lemma sin_periodic_pi [simp]: "sin (x + pi) = - sin x"
   by (simp add: sin_add)
 
@@ -2798,31 +3036,31 @@
   by (simp add: cos_add)
 
 lemma sin_periodic [simp]: "sin (x + 2*pi) = sin x"
-  by (simp add: sin_add cos_double)
+  by (simp add: sin_add sin_double cos_double)
 
 lemma cos_periodic [simp]: "cos (x + 2*pi) = cos x"
-  by (simp add: cos_add cos_double)
+  by (simp add: cos_add sin_double cos_double)
 
 lemma cos_npi [simp]: "cos (real n * pi) = (- 1) ^ n"
-  by (induct n) (auto simp add: real_of_nat_Suc distrib_right)
+  by (induct n) (auto simp: real_of_nat_Suc distrib_right)
 
 lemma cos_npi2 [simp]: "cos (pi * real n) = (- 1) ^ n"
   by (metis cos_npi mult.commute)
 
 lemma sin_npi [simp]: "sin (real (n::nat) * pi) = 0"
-  by (induct n) (auto simp add: real_of_nat_Suc distrib_right)
+  by (induct n) (auto simp: real_of_nat_Suc distrib_right)
 
 lemma sin_npi2 [simp]: "sin (pi * real (n::nat)) = 0"
   by (simp add: mult.commute [of pi])
 
-lemma cos_two_pi [simp]: "cos (2 * pi) = 1"
+lemma cos_two_pi [simp]: "cos (2*pi) = 1"
   by (simp add: cos_double)
 
-lemma sin_two_pi [simp]: "sin (2 * pi) = 0"
-  by simp
-
-lemma sin_gt_zero2: "[| 0 < x; x < pi/2 |] ==> 0 < sin x"
-  by (metis sin_gt_zero order_less_trans pi_half_less_two)
+lemma sin_two_pi [simp]: "sin (2*pi) = 0"
+  by (simp add: sin_double)
+
+lemma sin_gt_zero2: "\<lbrakk>0 < x; x < pi/2\<rbrakk> \<Longrightarrow> 0 < sin x"
+  by (metis sin_gt_zero_02 order_less_trans pi_half_less_two)
 
 lemma sin_less_zero:
   assumes "- pi/2 < x" and "x < 0"
@@ -2835,53 +3073,52 @@
 lemma pi_less_4: "pi < 4"
   using pi_half_less_two by auto
 
-lemma cos_gt_zero: "[| 0 < x; x < pi/2 |] ==> 0 < cos x"
-  apply (cut_tac pi_less_4)
-  apply (cut_tac f = cos and a = 0 and b = x and y = 0 in IVT2_objl, safe, simp_all)
-  apply (cut_tac cos_is_zero, safe)
-  apply (rename_tac y z)
-  apply (drule_tac x = y in spec)
-  apply (drule_tac x = "pi/2" in spec, simp)
-  done
-
-lemma cos_gt_zero_pi: "[| -(pi/2) < x; x < pi/2 |] ==> 0 < cos x"
-  apply (rule_tac x = x and y = 0 in linorder_cases)
-  apply (metis cos_gt_zero cos_minus minus_less_iff neg_0_less_iff_less)
-  apply (auto intro: cos_gt_zero)
-  done
-
-lemma cos_ge_zero: "[| -(pi/2) \<le> x; x \<le> pi/2 |] ==> 0 \<le> cos x"
-  apply (auto simp add: order_le_less cos_gt_zero_pi)
-  apply (subgoal_tac "x = pi/2", auto)
-  done
-
-lemma sin_gt_zero_pi: "[| 0 < x; x < pi  |] ==> 0 < sin x"
+lemma cos_gt_zero: "\<lbrakk>0 < x; x < pi/2\<rbrakk> \<Longrightarrow> 0 < cos x"
+  by (simp add: cos_sin_eq sin_gt_zero2)
+
+lemma cos_gt_zero_pi: "\<lbrakk>-(pi/2) < x; x < pi/2\<rbrakk> \<Longrightarrow> 0 < cos x"
+  using cos_gt_zero [of x] cos_gt_zero [of "-x"]
+  by (cases rule: linorder_cases [of x 0]) auto
+
+lemma cos_ge_zero: "\<lbrakk>-(pi/2) \<le> x; x \<le> pi/2\<rbrakk> \<Longrightarrow> 0 \<le> cos x"
+  apply (auto simp: order_le_less cos_gt_zero_pi)
+  by (metis cos_pi_half eq_divide_eq eq_numeral_simps(4))
+
+lemma sin_gt_zero: "\<lbrakk>0 < x; x < pi \<rbrakk> \<Longrightarrow> 0 < sin x"
   by (simp add: sin_cos_eq cos_gt_zero_pi)
 
+lemma sin_lt_zero: "pi < x \<Longrightarrow> x < 2*pi \<Longrightarrow> sin x < 0"
+  using sin_gt_zero [of "x-pi"]
+  by (simp add: sin_diff)
+
 lemma pi_ge_two: "2 \<le> pi"
 proof (rule ccontr)
   assume "\<not> 2 \<le> pi" hence "pi < 2" by auto
-  have "\<exists>y > pi. y < 2 \<and> y < 2 * pi"
-  proof (cases "2 < 2 * pi")
+  have "\<exists>y > pi. y < 2 \<and> y < 2*pi"
+  proof (cases "2 < 2*pi")
     case True with dense[OF `pi < 2`] show ?thesis by auto
   next
-    case False have "pi < 2 * pi" by auto
+    case False have "pi < 2*pi" by auto
     from dense[OF this] and False show ?thesis by auto
   qed
-  then obtain y where "pi < y" and "y < 2" and "y < 2 * pi" by blast
-  hence "0 < sin y" using sin_gt_zero by auto
+  then obtain y where "pi < y" and "y < 2" and "y < 2*pi" by blast
+  hence "0 < sin y" using sin_gt_zero_02 by auto
   moreover
-  have "sin y < 0" using sin_gt_zero_pi[of "y - pi"] `pi < y` and `y < 2 * pi` sin_periodic_pi[of "y - pi"] by auto
+  have "sin y < 0" using sin_gt_zero[of "y - pi"] `pi < y` and `y < 2*pi` sin_periodic_pi[of "y - pi"] by auto
   ultimately show False by auto
 qed
 
-lemma sin_ge_zero: "[| 0 \<le> x; x \<le> pi |] ==> 0 \<le> sin x"
-  by (auto simp add: order_le_less sin_gt_zero_pi)
+lemma sin_ge_zero: "\<lbrakk>0 \<le> x; x \<le> pi\<rbrakk> \<Longrightarrow> 0 \<le> sin x"
+  by (auto simp: order_le_less sin_gt_zero)
+
+lemma sin_le_zero: "pi \<le> x \<Longrightarrow> x < 2*pi \<Longrightarrow> sin x \<le> 0"
+  using sin_ge_zero [of "x-pi"]
+  by (simp add: sin_diff)
 
 text {* FIXME: This proof is almost identical to lemma @{text cos_is_zero}.
   It should be possible to factor out some of the common parts. *}
 
-lemma cos_total: "[| -1 \<le> y; y \<le> 1 |] ==> EX! x. 0 \<le> x & x \<le> pi & (cos x = y)"
+lemma cos_total: "\<lbrakk>-1 \<le> y; y \<le> 1\<rbrakk> \<Longrightarrow> EX! x. 0 \<le> x & x \<le> pi & (cos x = y)"
 proof (rule ex_ex1I)
   assume y: "-1 \<le> y" "y \<le> 1"
   show "\<exists>x. 0 \<le> x & x \<le> pi & cos x = y"
@@ -2890,34 +3127,37 @@
   fix a b
   assume a: "0 \<le> a \<and> a \<le> pi \<and> cos a = y"
   assume b: "0 \<le> b \<and> b \<le> pi \<and> cos b = y"
-  have [simp]: "\<forall>x. cos differentiable (at x)"
+  have [simp]: "\<forall>x::real. cos differentiable (at x)"
     unfolding real_differentiable_def by (auto intro: DERIV_cos)
   from a b show "a = b"
     apply (cut_tac less_linear [of a b], auto)
     apply (drule_tac f = cos in Rolle)
     apply (drule_tac [5] f = cos in Rolle)
     apply (auto dest!: DERIV_cos [THEN DERIV_unique])
-    apply (metis order_less_le_trans less_le sin_gt_zero_pi)
-    apply (metis order_less_le_trans less_le sin_gt_zero_pi)
+    apply (metis order_less_le_trans less_le sin_gt_zero)
+    apply (metis order_less_le_trans less_le sin_gt_zero)
     done
 qed
 
 lemma sin_total:
-     "[| -1 \<le> y; y \<le> 1 |] ==> EX! x. -(pi/2) \<le> x & x \<le> pi/2 & (sin x = y)"
-apply (rule ccontr)
-apply (subgoal_tac "\<forall>x. (- (pi/2) \<le> x & x \<le> pi/2 & (sin x = y)) = (0 \<le> (x + pi/2) & (x + pi/2) \<le> pi & (cos (x + pi/2) = -y))")
-apply (erule contrapos_np)
-apply simp
-apply (cut_tac y="-y" in cos_total, simp) apply simp
-apply (erule ex1E)
-apply (rule_tac a = "x - (pi/2)" in ex1I)
-apply (simp (no_asm) add: add.assoc)
-apply (rotate_tac 3)
-apply (drule_tac x = "xa + pi/2" in spec, safe, simp_all add: cos_add)
-done
+  assumes y: "-1 \<le> y" "y \<le> 1"
+    shows "\<exists>! x. -(pi/2) \<le> x & x \<le> pi/2 & (sin x = y)"
+proof -
+  from cos_total [OF y]
+  obtain x where x: "0 \<le> x" "x \<le> pi" "cos x = y"
+           and uniq: "\<And>x'. 0 \<le> x' \<Longrightarrow> x' \<le> pi \<Longrightarrow> cos x' = y \<Longrightarrow> x' = x "
+    by blast
+  show ?thesis
+    apply (simp add: sin_cos_eq)
+    apply (rule ex1I [where a="pi/2 - x"])
+    apply (cut_tac [2] x'="pi/2 - xa" in uniq)
+    using x
+    apply auto
+    done
+qed
 
 lemma reals_Archimedean4:
-     "[| 0 < y; 0 \<le> x |] ==> \<exists>n. real n * y \<le> x & x < real (Suc n) * y"
+     "\<lbrakk>0 < y; 0 \<le> x\<rbrakk> \<Longrightarrow> \<exists>n. real n * y \<le> x & x < real (Suc n) * y"
 apply (auto dest!: reals_Archimedean3)
 apply (drule_tac x = x in spec, clarify)
 apply (subgoal_tac "x < real(LEAST m::nat. x < real m * y) * y")
@@ -2928,15 +3168,13 @@
  prefer 2 apply (rule not_less_Least, simp, force)
 done
 
-(* Pre Isabelle99-2 proof was simpler- numerals arithmetic
-   now causes some unwanted re-arrangements of literals!   *)
 lemma cos_zero_lemma:
-     "[| 0 \<le> x; cos x = 0 |] ==>
-      \<exists>n::nat. ~even n & x = real n * (pi/2)"
+     "\<lbrakk>0 \<le> x; cos x = 0\<rbrakk> \<Longrightarrow>
+      \<exists>n::nat. odd n & x = real n * (pi/2)"
 apply (drule pi_gt_zero [THEN reals_Archimedean4], safe)
 apply (subgoal_tac "0 \<le> x - real n * pi &
                     (x - real n * pi) \<le> pi & (cos (x - real n * pi) = 0) ")
-apply (auto simp add: algebra_simps real_of_nat_Suc)
+apply (auto simp: algebra_simps real_of_nat_Suc)
  prefer 2 apply (simp add: cos_diff)
 apply (simp add: cos_diff)
 apply (subgoal_tac "EX! x. 0 \<le> x & x \<le> pi & cos x = 0")
@@ -2949,19 +3187,19 @@
 done
 
 lemma sin_zero_lemma:
-     "[| 0 \<le> x; sin x = 0 |] ==>
+     "\<lbrakk>0 \<le> x; sin x = 0\<rbrakk> \<Longrightarrow>
       \<exists>n::nat. even n & x = real n * (pi/2)"
 apply (subgoal_tac "\<exists>n::nat. ~ even n & x + pi/2 = real n * (pi/2) ")
  apply (clarify, rule_tac x = "n - 1" in exI)
  apply (auto elim!: oddE simp add: real_of_nat_Suc field_simps)[1]
  apply (rule cos_zero_lemma)
- apply (auto simp add: cos_add)
+ apply (auto simp: cos_add)
 done
 
 lemma cos_zero_iff:
      "(cos x = 0) =
-      ((\<exists>n::nat. ~even n & (x = real n * (pi/2))) |
-       (\<exists>n::nat. ~even n & (x = -(real n * (pi/2)))))"
+      ((\<exists>n::nat. odd n & (x = real n * (pi/2))) |
+       (\<exists>n::nat. odd n & (x = -(real n * (pi/2)))))"
 proof -
   { fix n :: nat
     assume "odd n"
@@ -2991,6 +3229,53 @@
 apply (auto elim: evenE)
 done
 
+
+lemma cos_zero_iff_int:
+     "cos x = 0 \<longleftrightarrow> (\<exists>n::int. odd n & x = real n * (pi/2))"
+proof safe
+  assume "cos x = 0"
+  then show "\<exists>n::int. odd n & x = real n * (pi/2)"
+    apply (simp add: cos_zero_iff, safe)
+    apply (metis even_int_iff real_of_int_of_nat_eq)
+    apply (rule_tac x="- (int n)" in exI, simp)
+    done
+next
+  fix n::int
+  assume "odd n" 
+  then show "cos (real n * (pi / 2)) = 0"
+    apply (simp add: cos_zero_iff)
+    apply (case_tac n rule: int_cases2, simp)
+    apply (rule disjI2)
+    apply (rule_tac x="nat (-n)" in exI, simp)
+    done
+qed
+
+lemma sin_zero_iff_int:  
+     "sin x = 0 \<longleftrightarrow> (\<exists>n::int. even n & (x = real n * (pi/2)))"
+proof safe
+  assume "sin x = 0"
+  then show "\<exists>n::int. even n \<and> x = real n * (pi / 2)"
+    apply (simp add: sin_zero_iff, safe)
+    apply (metis even_int_iff real_of_int_of_nat_eq)
+    apply (rule_tac x="- (int n)" in exI, simp)
+    done
+next
+  fix n::int
+  assume "even n" 
+  then show "sin (real n * (pi / 2)) = 0"
+    apply (simp add: sin_zero_iff)
+    apply (case_tac n rule: int_cases2, simp)
+    apply (rule disjI2)
+    apply (rule_tac x="nat (-n)" in exI, simp)
+    done
+qed
+
+lemma sin_zero_iff_int2: "sin x = 0 \<longleftrightarrow> (\<exists>n::int. x = real n * pi)"
+  apply (simp only: sin_zero_iff_int)     
+  apply (safe elim!: evenE)     
+  apply (simp_all add: field_simps)
+  using dvd_triv_left by fastforce
+
 lemma cos_monotone_0_pi:
   assumes "0 \<le> y" and "y < x" and "x \<le> pi"
   shows "cos x < cos y"
@@ -3001,7 +3286,7 @@
   obtain z where "y < z" and "z < x" and cos_diff: "cos x - cos y = (x - y) * - sin z"
     by auto
   hence "0 < z" and "z < pi" using assms by auto
-  hence "0 < sin z" using sin_gt_zero_pi by auto
+  hence "0 < sin z" using sin_gt_zero by auto
   hence "cos x - cos y < 0"
     unfolding cos_diff minus_mult_commute[symmetric]
     using `- (x - y) < 0` by (rule mult_pos_neg2)
@@ -3051,13 +3336,43 @@
   have "0 \<le> y + pi / 2" and "y + pi / 2 \<le> x + pi / 2" and "x + pi /2 \<le> pi"
     using pi_ge_two and assms by auto
   from cos_monotone_0_pi'[OF this] show ?thesis
-    unfolding minus_sin_cos_eq[symmetric] by auto
+    unfolding minus_sin_cos_eq[symmetric]
+    by (metis minus_sin_cos_eq mult.right_neutral neg_le_iff_le of_real_def real_scaleR_def) 
+qed
+
+lemma sin_x_le_x:
+  fixes x::real assumes x: "x \<ge> 0" shows "sin x \<le> x"
+proof -
+  let ?f = "\<lambda>x. x - sin x"
+  from x have "?f x \<ge> ?f 0"
+    apply (rule DERIV_nonneg_imp_nondecreasing)
+    apply (intro allI impI exI[of _ "1 - cos x" for x])
+    apply (auto intro!: derivative_eq_intros simp: field_simps)
+    done
+  thus "sin x \<le> x" by simp
 qed
 
+lemma sin_x_ge_neg_x:
+  fixes x::real assumes x: "x \<ge> 0" shows "sin x \<ge> - x"
+proof -
+  let ?f = "\<lambda>x. x + sin x"
+  from x have "?f x \<ge> ?f 0"
+    apply (rule DERIV_nonneg_imp_nondecreasing)
+    apply (intro allI impI exI[of _ "1 + cos x" for x])
+    apply (auto intro!: derivative_eq_intros simp: field_simps real_0_le_add_iff)
+    done
+  thus "sin x \<ge> -x" by simp
+qed
+
+lemma abs_sin_x_le_abs_x:
+  fixes x::real shows "\<bar>sin x\<bar> \<le> \<bar>x\<bar>"
+  using sin_x_ge_neg_x [of x] sin_x_le_x [of x] sin_x_ge_neg_x [of "-x"] sin_x_le_x [of "-x"]
+  by (auto simp: abs_real_def)
+
 
 subsection {* Tangent *}
 
-definition tan :: "real \<Rightarrow> real"
+definition tan :: "'a \<Rightarrow> 'a::{real_normed_field,banach}"
   where "tan = (\<lambda>x. sin x / cos x)"
 
 lemma tan_zero [simp]: "tan 0 = 0"
@@ -3080,20 +3395,25 @@
   by (simp add: tan_def cos_add field_simps)
 
 lemma add_tan_eq:
-  "\<lbrakk>cos x \<noteq> 0; cos y \<noteq> 0\<rbrakk> \<Longrightarrow> tan x + tan y = sin(x + y)/(cos x * cos y)"
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "\<lbrakk>cos x \<noteq> 0; cos y \<noteq> 0\<rbrakk> \<Longrightarrow> tan x + tan y = sin(x + y)/(cos x * cos y)"
   by (simp add: tan_def sin_add field_simps)
 
 lemma tan_add:
-     "[| cos x \<noteq> 0; cos y \<noteq> 0; cos (x + y) \<noteq> 0 |]
-      ==> tan(x + y) = (tan(x) + tan(y))/(1 - tan(x) * tan(y))"
-  by (simp add: add_tan_eq lemma_tan_add1, simp add: tan_def)
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows 
+     "\<lbrakk>cos x \<noteq> 0; cos y \<noteq> 0; cos (x + y) \<noteq> 0\<rbrakk>
+      \<Longrightarrow> tan(x + y) = (tan(x) + tan(y))/(1 - tan(x) * tan(y))"
+      by (simp add: add_tan_eq lemma_tan_add1 field_simps) (simp add: tan_def)
 
 lemma tan_double:
-     "[| cos x \<noteq> 0; cos (2 * x) \<noteq> 0 |]
-      ==> tan (2 * x) = (2 * tan x) / (1 - (tan x)\<^sup>2)"
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows 
+     "\<lbrakk>cos x \<noteq> 0; cos (2 * x) \<noteq> 0\<rbrakk>
+      \<Longrightarrow> tan (2 * x) = (2 * tan x) / (1 - (tan x)\<^sup>2)"
   using tan_add [of x x] by (simp add: power2_eq_square)
 
-lemma tan_gt_zero: "[| 0 < x; x < pi/2 |] ==> 0 < tan x"
+lemma tan_gt_zero: "\<lbrakk>0 < x; x < pi/2\<rbrakk> \<Longrightarrow> 0 < tan x"
   by (simp add: tan_def zero_less_divide_iff sin_gt_zero2 cos_gt_zero_pi)
 
 lemma tan_less_zero:
@@ -3104,41 +3424,49 @@
   thus ?thesis by simp
 qed
 
-lemma tan_half: "tan x = sin (2 * x) / (cos (2 * x) + 1)"
+lemma tan_half:
+  fixes x :: "'a::{real_normed_field,banach,field_inverse_zero}"
+  shows  "tan x = sin (2 * x) / (cos (2 * x) + 1)"
   unfolding tan_def sin_double cos_double sin_squared_eq
   by (simp add: power2_eq_square)
 
-lemma DERIV_tan [simp]: "cos x \<noteq> 0 \<Longrightarrow> DERIV tan x :> inverse ((cos x)\<^sup>2)"
+lemma DERIV_tan [simp]:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "cos x \<noteq> 0 \<Longrightarrow> DERIV tan x :> inverse ((cos x)\<^sup>2)"
   unfolding tan_def
   by (auto intro!: derivative_eq_intros, simp add: divide_inverse power2_eq_square)
 
-lemma isCont_tan: "cos x \<noteq> 0 \<Longrightarrow> isCont tan x"
+lemma isCont_tan:
+  fixes x :: "'a::{real_normed_field,banach}"
+  shows "cos x \<noteq> 0 \<Longrightarrow> isCont tan x"
   by (rule DERIV_tan [THEN DERIV_isCont])
 
-lemma isCont_tan' [simp]:
-  "\<lbrakk>isCont f a; cos (f a) \<noteq> 0\<rbrakk> \<Longrightarrow> isCont (\<lambda>x. tan (f x)) a"
+lemma isCont_tan' [simp,continuous_intros]:
+  fixes a :: "'a::{real_normed_field,banach}" and f :: "'a \<Rightarrow> 'a"
+  shows "\<lbrakk>isCont f a; cos (f a) \<noteq> 0\<rbrakk> \<Longrightarrow> isCont (\<lambda>x. tan (f x)) a"
   by (rule isCont_o2 [OF _ isCont_tan])
 
 lemma tendsto_tan [tendsto_intros]:
-  "\<lbrakk>(f ---> a) F; cos a \<noteq> 0\<rbrakk> \<Longrightarrow> ((\<lambda>x. tan (f x)) ---> tan a) F"
+  fixes f :: "'a \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "\<lbrakk>(f ---> a) F; cos a \<noteq> 0\<rbrakk> \<Longrightarrow> ((\<lambda>x. tan (f x)) ---> tan a) F"
   by (rule isCont_tendsto_compose [OF isCont_tan])
 
 lemma continuous_tan:
-  "continuous F f \<Longrightarrow> cos (f (Lim F (\<lambda>x. x))) \<noteq> 0 \<Longrightarrow> continuous F (\<lambda>x. tan (f x))"
+  fixes f :: "'a \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "continuous F f \<Longrightarrow> cos (f (Lim F (\<lambda>x. x))) \<noteq> 0 \<Longrightarrow> continuous F (\<lambda>x. tan (f x))"
   unfolding continuous_def by (rule tendsto_tan)
 
-lemma isCont_tan'' [continuous_intros]:
-  "continuous (at x) f \<Longrightarrow> cos (f x) \<noteq> 0 \<Longrightarrow> continuous (at x) (\<lambda>x. tan (f x))"
-  unfolding continuous_at by (rule tendsto_tan)
+lemma continuous_on_tan [continuous_intros]:
+  fixes f :: "'a \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows "continuous_on s f \<Longrightarrow> (\<forall>x\<in>s. cos (f x) \<noteq> 0) \<Longrightarrow> continuous_on s (\<lambda>x. tan (f x))"
+  unfolding continuous_on_def by (auto intro: tendsto_tan)
 
 lemma continuous_within_tan [continuous_intros]:
+  fixes f :: "'a \<Rightarrow> 'a::{real_normed_field,banach}"
+  shows 
   "continuous (at x within s) f \<Longrightarrow> cos (f x) \<noteq> 0 \<Longrightarrow> continuous (at x within s) (\<lambda>x. tan (f x))"
   unfolding continuous_within by (rule tendsto_tan)
 
-lemma continuous_on_tan [continuous_intros]:
-  "continuous_on s f \<Longrightarrow> (\<forall>x\<in>s. cos (f x) \<noteq> 0) \<Longrightarrow> continuous_on s (\<lambda>x. tan (f x))"
-  unfolding continuous_on_def by (auto intro: tendsto_tan)
-
 lemma LIM_cos_div_sin: "(\<lambda>x. cos(x)/sin(x)) -- pi/2 --> 0"
   by (rule LIM_cong_limit, (rule tendsto_intros)+, simp_all)
 
@@ -3279,7 +3607,9 @@
 lemma tan_periodic_n[simp]: "tan (x + numeral n * pi) = tan x"
   using tan_periodic_int[of _ "numeral n" ] unfolding real_numeral .
 
+
 subsection {* Inverse Trigonometric Functions *}
+text{*STILL DEFINED FOR THE REALS ONLY*}
 
 definition arcsin :: "real => real"
   where "arcsin y = (THE x. -(pi/2) \<le> x & x \<le> pi/2 & sin x = y)"
@@ -3314,7 +3644,7 @@
   by (blast dest: arcsin)
 
 lemma arcsin_lt_bounded:
-     "[| -1 < y; y < 1 |] ==> -(pi/2) < arcsin y & arcsin y < pi/2"
+     "\<lbrakk>-1 < y; y < 1\<rbrakk> \<Longrightarrow> -(pi/2) < arcsin y & arcsin y < pi/2"
   apply (frule order_less_imp_le)
   apply (frule_tac y = y in order_less_imp_le)
   apply (frule arcsin_bounded)
@@ -3324,32 +3654,32 @@
   apply (drule_tac [!] f = sin in arg_cong, auto)
   done
 
-lemma arcsin_sin: "[|-(pi/2) \<le> x; x \<le> pi/2 |] ==> arcsin(sin x) = x"
+lemma arcsin_sin: "\<lbrakk>-(pi/2) \<le> x; x \<le> pi/2\<rbrakk> \<Longrightarrow> arcsin(sin x) = x"
   apply (unfold arcsin_def)
   apply (rule the1_equality)
   apply (rule sin_total, auto)
   done
 
 lemma arccos:
-     "[| -1 \<le> y; y \<le> 1 |]
-      ==> 0 \<le> arccos y & arccos y \<le> pi & cos(arccos y) = y"
+     "\<lbrakk>-1 \<le> y; y \<le> 1\<rbrakk>
+      \<Longrightarrow> 0 \<le> arccos y & arccos y \<le> pi & cos(arccos y) = y"
   unfolding arccos_def by (rule theI' [OF cos_total])
 
-lemma cos_arccos [simp]: "[| -1 \<le> y; y \<le> 1 |] ==> cos(arccos y) = y"
+lemma cos_arccos [simp]: "\<lbrakk>-1 \<le> y; y \<le> 1\<rbrakk> \<Longrightarrow> cos(arccos y) = y"
   by (blast dest: arccos)
 
-lemma arccos_bounded: "[| -1 \<le> y; y \<le> 1 |] ==> 0 \<le> arccos y & arccos y \<le> pi"
+lemma arccos_bounded: "\<lbrakk>-1 \<le> y; y \<le> 1\<rbrakk> \<Longrightarrow> 0 \<le> arccos y & arccos y \<le> pi"
   by (blast dest: arccos)
 
-lemma arccos_lbound: "[| -1 \<le> y; y \<le> 1 |] ==> 0 \<le> arccos y"
+lemma arccos_lbound: "\<lbrakk>-1 \<le> y; y \<le> 1\<rbrakk> \<Longrightarrow> 0 \<le> arccos y"
   by (blast dest: arccos)
 
-lemma arccos_ubound: "[| -1 \<le> y; y \<le> 1 |] ==> arccos y \<le> pi"
+lemma arccos_ubound: "\<lbrakk>-1 \<le> y; y \<le> 1\<rbrakk> \<Longrightarrow> arccos y \<le> pi"
   by (blast dest: arccos)
 
 lemma arccos_lt_bounded:
-     "[| -1 < y; y < 1 |]
-      ==> 0 < arccos y & arccos y < pi"
+     "\<lbrakk>-1 < y; y < 1\<rbrakk>
+      \<Longrightarrow> 0 < arccos y & arccos y < pi"
   apply (frule order_less_imp_le)
   apply (frule_tac y = y in order_less_imp_le)
   apply (frule arccos_bounded, auto)
@@ -3358,12 +3688,12 @@
   apply (drule_tac [!] f = cos in arg_cong, auto)
   done
 
-lemma arccos_cos: "[|0 \<le> x; x \<le> pi |] ==> arccos(cos x) = x"
+lemma arccos_cos: "\<lbrakk>0 \<le> x; x \<le> pi\<rbrakk> \<Longrightarrow> arccos(cos x) = x"
   apply (simp add: arccos_def)
   apply (auto intro!: the1_equality cos_total)
   done
 
-lemma arccos_cos2: "[|x \<le> 0; -pi \<le> x |] ==> arccos(cos x) = -x"
+lemma arccos_cos2: "\<lbrakk>x \<le> 0; -pi \<le> x\<rbrakk> \<Longrightarrow> arccos(cos x) = -x"
   apply (simp add: arccos_def)
   apply (auto intro!: the1_equality cos_total)
   done
@@ -3423,8 +3753,7 @@
 lemma arctan_minus: "arctan (- x) = - arctan x"
   apply (rule arctan_unique)
   apply (simp only: neg_less_iff_less arctan_ubound)
-  apply (metis minus_less_iff arctan_lbound)
-  apply simp
+  apply (metis minus_less_iff arctan_lbound, simp)
   done
 
 lemma cos_arctan_not_zero [simp]: "cos (arctan x) \<noteq> 0"
@@ -3448,7 +3777,9 @@
   using tan_arctan [of x] unfolding tan_def cos_arctan
   by (simp add: eq_divide_eq)
 
-lemma tan_sec: "cos x \<noteq> 0 ==> 1 + (tan x)\<^sup>2 = (inverse (cos x))\<^sup>2"
+lemma tan_sec:
+  fixes x :: "'a::{real_normed_field,banach,field_inverse_zero}"
+  shows "cos x \<noteq> 0 \<Longrightarrow> 1 + (tan x)\<^sup>2 = (inverse (cos x))\<^sup>2"
   apply (rule power_inverse [THEN subst])
   apply (rule_tac c1 = "(cos x)\<^sup>2" in mult_right_cancel [THEN iffD1])
   apply (auto dest: field_power_not_zero
@@ -3548,26 +3879,22 @@
 
 lemma DERIV_arcsin:
   "\<lbrakk>-1 < x; x < 1\<rbrakk> \<Longrightarrow> DERIV arcsin x :> inverse (sqrt (1 - x\<^sup>2))"
-  apply (rule DERIV_inverse_function [where f=sin and a="-1" and b="1"])
+  apply (rule DERIV_inverse_function [where f=sin and a="-1" and b=1])
   apply (rule DERIV_cong [OF DERIV_sin])
   apply (simp add: cos_arcsin)
   apply (subgoal_tac "\<bar>x\<bar>\<^sup>2 < 1\<^sup>2", simp)
-  apply (rule power_strict_mono, simp, simp, simp)
-  apply assumption
-  apply assumption
+  apply (rule power_strict_mono, simp, simp, simp, assumption, assumption)
   apply simp
   apply (erule (1) isCont_arcsin)
   done
 
 lemma DERIV_arccos:
   "\<lbrakk>-1 < x; x < 1\<rbrakk> \<Longrightarrow> DERIV arccos x :> inverse (- sqrt (1 - x\<^sup>2))"
-  apply (rule DERIV_inverse_function [where f=cos and a="-1" and b="1"])
+  apply (rule DERIV_inverse_function [where f=cos and a="-1" and b=1])
   apply (rule DERIV_cong [OF DERIV_cos])
   apply (simp add: sin_arccos)
   apply (subgoal_tac "\<bar>x\<bar>\<^sup>2 < 1\<^sup>2", simp)
-  apply (rule power_strict_mono, simp, simp, simp)
-  apply assumption
-  apply assumption
+  apply (rule power_strict_mono, simp, simp, simp, assumption, assumption)
   apply simp
   apply (erule (1) isCont_arccos)
   done
@@ -3643,7 +3970,7 @@
     using nonneg by (rule power2_eq_imp_eq) simp
 qed
 
-lemma cos_30: "cos (pi / 6) = sqrt 3 / 2"
+lemma cos_30: "cos (pi / 6) = sqrt 3/2"
 proof -
   let ?c = "cos (pi / 6)" and ?s = "sin (pi / 6)"
   have pos_c: "0 < ?c"
@@ -3654,7 +3981,7 @@
     by (simp only: cos_add sin_add)
   also have "\<dots> = ?c * (?c\<^sup>2 - 3 * ?s\<^sup>2)"
     by (simp add: algebra_simps power2_eq_square)
-  finally have "?c\<^sup>2 = (sqrt 3 / 2)\<^sup>2"
+  finally have "?c\<^sup>2 = (sqrt 3/2)\<^sup>2"
     using pos_c by (simp add: sin_squared_eq power_divide)
   thus ?thesis
     using pos_c [THEN order_less_imp_le]
@@ -3664,7 +3991,7 @@
 lemma sin_45: "sin (pi / 4) = sqrt 2 / 2"
   by (simp add: sin_cos_eq cos_45)
 
-lemma sin_60: "sin (pi / 3) = sqrt 3 / 2"
+lemma sin_60: "sin (pi / 3) = sqrt 3/2"
   by (simp add: sin_cos_eq cos_30)
 
 lemma cos_60: "cos (pi / 3) = 1 / 2"
@@ -3688,7 +4015,7 @@
 lemma sin_cos_npi [simp]: "sin (real (Suc (2 * n)) * pi / 2) = (-1) ^ n"
 proof -
   have "sin ((real n + 1/2) * pi) = cos (real n * pi)"
-    by (auto simp add: algebra_simps sin_add)
+    by (auto simp: algebra_simps sin_add)
   thus ?thesis
     by (simp add: real_of_nat_Suc distrib_right add_divide_distrib
                   mult.commute [of pi])
@@ -3697,32 +4024,39 @@
 lemma cos_2npi [simp]: "cos (2 * real (n::nat) * pi) = 1"
   by (cases "even n") (simp_all add: cos_double mult.assoc)
 
-lemma cos_3over2_pi [simp]: "cos (3 / 2 * pi) = 0"
+lemma cos_3over2_pi [simp]: "cos (3/2*pi) = 0"
   apply (subgoal_tac "cos (pi + pi/2) = 0", simp)
   apply (subst cos_add, simp)
   done
 
 lemma sin_2npi [simp]: "sin (2 * real (n::nat) * pi) = 0"
-  by (auto simp add: mult.assoc)
-
-lemma sin_3over2_pi [simp]: "sin (3 / 2 * pi) = - 1"
+  by (auto simp: mult.assoc sin_double)
+
+lemma sin_3over2_pi [simp]: "sin (3/2*pi) = - 1"
   apply (subgoal_tac "sin (pi + pi/2) = - 1", simp)
   apply (subst sin_add, simp)
   done
 
 lemma cos_pi_eq_zero [simp]: "cos (pi * real (Suc (2 * m)) / 2) = 0"
-  apply (simp only: cos_add sin_add real_of_nat_Suc distrib_right distrib_left add_divide_distrib)
-  apply auto
-  done
+by (simp only: cos_add sin_add real_of_nat_Suc distrib_right distrib_left add_divide_distrib, auto)
 
 lemma DERIV_cos_add [simp]: "DERIV (\<lambda>x. cos (x + k)) xa :> - sin (xa + k)"
   by (auto intro!: derivative_eq_intros)
 
-lemma sin_zero_abs_cos_one: "sin x = 0 ==> \<bar>cos x\<bar> = 1"
-  by (auto simp add: sin_zero_iff elim: evenE)
-
-lemma cos_one_sin_zero: "cos x = 1 ==> sin x = 0"
-  using sin_cos_squared_add3 [where x = x] by auto
+lemma sin_zero_norm_cos_one:
+  fixes x :: "'a::{real_normed_field,banach}"
+  assumes "sin x = 0" shows "norm (cos x) = 1"
+  using sin_cos_squared_add [of x, unfolded assms]
+  by (simp add: square_norm_one)
+
+lemma sin_zero_abs_cos_one: "sin x = 0 \<Longrightarrow> \<bar>cos x\<bar> = (1::real)"
+  using sin_zero_norm_cos_one by fastforce
+
+lemma cos_one_sin_zero:
+  fixes x :: "'a::{real_normed_field,banach}"
+  assumes "cos x = 1" shows "sin x = 0"
+  using sin_cos_squared_add [of x, unfolded assms]
+  by simp
 
 
 subsection {* Machins formula *}
@@ -3775,7 +4109,7 @@
 qed
 
 
-subsection {* Introducing the arcus tangens power series *}
+subsection {* Introducing the inverse tangent power series *}
 
 lemma monoseq_arctan_series:
   fixes x :: real
@@ -3852,6 +4186,7 @@
   qed
 qed
 
+text{*FIXME: generalise from the reals via type classes?*}
 lemma summable_arctan_series:
   fixes x :: real and n :: nat
   assumes "\<bar>x\<bar> \<le> 1"
@@ -4249,7 +4584,7 @@
 
 lemmas sin_arccos_lemma1 = sin_arccos_abs [OF cos_x_y_le_one]
 
-lemma polar_Ex: "\<exists>r a. x = r * cos a & y = r * sin a"
+lemma polar_Ex: "\<exists>r::real. \<exists>a. x = r * cos a & y = r * sin a"
 proof -
   have polar_ex1: "\<And>y. 0 < y \<Longrightarrow> \<exists>r a. x = r * cos a & y = r * sin a"
     apply (rule_tac x = "sqrt (x\<^sup>2 + y\<^sup>2)" in exI)