Change form of license text to match rest of Emacs.

[bpt/emacs.git] / lisp / calc / calc-lang.el

diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 67cc527..5e91fe1 100644 (file)
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -1,26 +1,27 @@
 ;;; calc-lang.el --- calc language functions
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
 
 ;; This file is part of GNU Emacs.
 
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
 ;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY.  No author or distributor
-;; accepts responsibility to anyone for the consequences of using it
-;; or for whether it serves any particular purpose or works at all,
-;; unless he says so in writing.  Refer to the GNU Emacs General Public
-;; License for full details.
-
-;; Everyone is granted permission to copy, modify and redistribute
-;; GNU Emacs, but only under the conditions described in the
-;; GNU Emacs General Public License.   A copy of this license is
-;; supposed to have been given to you along with GNU Emacs so you
-;; can know your rights and responsibilities.  It should be in a
-;; file named COPYING.  Among other things, the copyright notice
-;; and this notice must be preserved on all copies.
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -353,10 +354,10 @@
      ( "\\times"  *               191 190 )
      ( "*"        *               191 190 )
      ( "2x"      *                191 190 )
+     ( "/"       /                185 186 )
      ( "+"       +                180 181 )
      ( "-"       -                180 181 )
      ( "\\over"          /                170 171 )
-     ( "/"       /                170 171 )
      ( "\\choose" calcFunc-choose  170 171 )
      ( "\\mod"   %                170 171 )
      ( "<"       calcFunc-lt      160 161 )
@@ -408,13 +409,54 @@
      ( \\mu       . calcFunc-moebius )))
 
 (put 'tex 'math-variable-table
-  '( ( \\pi       . var-pi )
-     ( \\infty    . var-inf )
-     ( \\infty    . var-uinf )
-     ( \\phi       . var-phi )
-     ( \\gamma     . var-gamma )
-     ( \\sum       . (math-parse-tex-sum calcFunc-sum) )
-     ( \\prod      . (math-parse-tex-sum calcFunc-prod) )))
+  '( 
+    ;; The Greek letters
+    ( \\alpha      . var-alpha )
+    ( \\beta       . var-beta  )
+    ( \\gamma      . var-gamma )
+    ( \\Gamma      . var-Gamma )
+    ( \\delta      . var-delta )
+    ( \\Delta      . var-Delta )
+    ( \\epsilon    . var-epsilon )
+    ( \\varepsilon . var-varepsilon)
+    ( \\zeta       . var-zeta )
+    ( \\eta        . var-eta  )
+    ( \\theta      . var-theta )
+    ( \\vartheta   . var-vartheta )
+    ( \\Theta      . var-Theta )
+    ( \\iota       . var-iota )
+    ( \\kappa      . var-kappa )
+    ( \\lambda     . var-lambda )
+    ( \\Lambda     . var-Lambda )
+    ( \\mu         . var-mu )
+    ( \\nu         . var-nu )
+    ( \\xi         . var-xi )
+    ( \\Xi         . var-Xi )
+    ( \\pi         . var-pi )
+    ( \\varpi      . var-varpi )
+    ( \\Pi         . var-Pi )
+    ( \\rho        . var-rho )
+    ( \\varrho     . var-varrho )
+    ( \\sigma      . var-sigma )
+    ( \\sigma      . var-varsigma )
+    ( \\Sigma      . var-Sigma )
+    ( \\tau        . var-tau )
+    ( \\upsilon    . var-upsilon )
+    ( \\Upsilon    . var-Upsilon )
+    ( \\phi        . var-phi )
+    ( \\varphi     . var-varphi )
+    ( \\Phi        . var-Phi )
+    ( \\chi        . var-chi )
+    ( \\psi        . var-psi )
+    ( \\Psi        . var-Psi )
+    ( \\omega      . var-omega )
+    ( \\Omega      . var-Omega )
+    ;; Others
+    ( \\ell        . var-ell )
+    ( \\infty     . var-inf )
+    ( \\infty     . var-uinf )
+    ( \\sum        . (math-parse-tex-sum calcFunc-sum) )
+    ( \\prod       . (math-parse-tex-sum calcFunc-prod) )))
 
 (put 'tex 'math-complex-format 'i)