diff options
author | Miles Bader <miles@gnu.org> | 2005-02-18 00:41:50 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-02-18 00:41:50 +0000 |
commit | 8d46efcc0f2045a1e5a2739c55ba6a88fbf4bcfc (patch) | |
tree | bc968a02587d51199537bb335d5494e756e35fdf /lisp/calc/calc-rules.el | |
parent | 8589dc17f80450f5773a2d449fa6d94c9bb04fe3 (diff) | |
parent | 9b516537a9899900647d4eae5ec8778e6837ad3c (diff) | |
download | emacs-8d46efcc0f2045a1e5a2739c55ba6a88fbf4bcfc.tar.gz emacs-8d46efcc0f2045a1e5a2739c55ba6a88fbf4bcfc.tar.bz2 emacs-8d46efcc0f2045a1e5a2739c55ba6a88fbf4bcfc.zip |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-15
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96
Move Gnus images into etc/images
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-97
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-105
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-14
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
Update from CVS: lisp/imap.el (imap-log): Doc fix.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-16
Merge from emacs--cvs-trunk--0
Diffstat (limited to 'lisp/calc/calc-rules.el')
-rw-r--r-- | lisp/calc/calc-rules.el | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el index 1ccbf3fffac..7a11cfa5012 100644 --- a/lisp/calc/calc-rules.el +++ b/lisp/calc/calc-rules.el @@ -153,10 +153,14 @@ tan(select(2 a)) := 2 tan(select(a)) / (1 - tan(a)^2), tan(select(n a)) := (tan((n-1) select(a)) + tan(a)) / (1 - tan((n-1) a) tan(a)) :: integer(n) :: n > 2, +cot(select(a + b)) := (cot(select(a)) cot(b) - 1) / + (cot(a) + cot(b)), sinh(select(a + b)) := sinh(select(a)) cosh(b) + cosh(a) sinh(b), cosh(select(a + b)) := cosh(select(a)) cosh(b) + sinh(a) sinh(b), tanh(select(a + b)) := (tanh(select(a)) + tanh(b)) / (1 + tanh(a) tanh(b)), +coth(select(a + b)) := (coth(select(a)) coth(b) + 1) / + (coth(a) + coth(b)), x && select(a || b) := (x && select(a)) || (x && b), select(a || b) && x := (select(a) && x) || (b && x), ! select(a && b) := (!a) || (!b), @@ -269,12 +273,18 @@ exp(select(x)) := 1 / exp(select(-x)), sin(select(x)) := -sin(select(-x)), cos(select(x)) := cos(select(-x)), tan(select(x)) := -tan(select(-x)), +sec(select(x)) := sec(select(-x)), +csc(select(x)) := -csc(select(-x)), +cot(select(x)) := -cot(select(-x)), arcsin(select(x)) := -arcsin(select(-x)), arccos(select(x)) := 4 arctan(1) - arccos(select(-x)), arctan(select(x)) := -arctan(select(-x)), sinh(select(x)) := -sinh(select(-x)), cosh(select(x)) := cosh(select(-x)), tanh(select(x)) := -tanh(select(-x)), +sech(select(x)) := sech(select(-x)), +csch(select(x)) := -csch(select(-x)), +coth(select(x)) := -coth(select(-x)), arcsinh(select(x)) := -arcsinh(select(-x)), arctanh(select(x)) := -arctanh(select(-x)), select(x) = a := select(-x) = -a, |