emacs: lisp/calc/calccomp.el comparison

comparison lisp/calc/calccomp.el @ 109033:d150a25a0eb9

Add some utf-8 coding cookies. * lisp/calc/calc-aent.el, lisp/calc/calc-ext.el, lisp/calc/calc-lang.el: * lisp/calc/calc-store.el, lisp/calc/calc-units.el, lisp/calc/calc.el: * lisp/calc/calccomp.el: Add explicit utf-8 coding cookies to files with utf-8 characters. Also delete trailing whitespace.

author	Glenn Morris <rgm@gnu.org>
date	Tue, 22 Jun 2010 00:41:10 -0700
parents	c84578d13e42
children	bc0b9af387a7

comparison

equal deleted inserted replaced

-:d8720405694a
+:d150a25a0eb9
 ;;; calccomp.el --- composition functions for Calc
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 ;; This file is part of GNU Emacs.
 ;;;    (subscr C1 C2)        Composition C1 with subscript C2
 ;;;    (rule X)              Horizontal line of X, full width of enclosing comp
 ;;;
 ;;;    (tag X C)             Composition C corresponds to sub-expression X
 ;; math-comp-just and math-comp-comma-spc are local to
 ;; math-compose-expr, but are used by math-compose-matrix, which is
 ;; called by math-compose-expr
 (defvar math-comp-just)
 (defvar math-comp-comma-spc)
 ;; math-comp-vector-prec is local to math-compose-expr, but is used by
 ;; math-compose-matrix and math-compose-rows, which are called by
 ;; math-compose-expr.
 (defvar math-comp-vector-prec)
 ;; math-comp-left-bracket, math-comp-right-bracket and math-comp-comma are
 ;; local to math-compose-expr, but are used by math-compose-rows, which is
 ;; called by math-compose-expr.
 (defvar math-comp-left-bracket)
 (defvar math-comp-right-bracket)
 (defvar math-comp-comma)
 (let ((math-comp-selected nil))
 	(and math-comp-tagged (setq math-comp-tagged a))
 	(list 'tag a (math-compose-expr a prec))))
 ((and (not (consp a)) (not (integerp a)))
 (concat "'" (prin1-to-string a)))
 ((setq spfn (assq (car-safe a)
 (get calc-language 'math-special-function-table)))
 (setq spfn (cdr spfn))
 (if (consp spfn)
 (funcall (car spfn) a spfn)
 (funcall spfn a)))
 ((math-scalarp a)
 (if (or (eq (car-safe a) 'frac)
 	      (and (nth 1 calc-frac-format) (Math-integerp a)))
 	  (if (and
 calc-language
 (not (memq calc-language
 '(flat big unform))))
 	      (let ((aa (math-adjust-fraction a))
 		    (calc-frac-format nil))
 		(math-compose-expr (list '/
 					 (if (memq calc-language
 calc-lang-slash-idiv)
 					     (math-float (nth 1 aa))
 					   (nth 1 aa))
 					 (nth 2 aa)) prec))
 	    (if (and (eq calc-language 'big)
 			(cons 'vleft (cons base
 					   (math-compose-rows
 					    (cdr a)
 					    (if full rows 3) t)))))
 	      (if (or calc-full-vectors (< (length a) 7))
 (if (and
 (setq spfn (get calc-language 'math-matrix-formatter))
 (math-matrixp a))
 (funcall spfn a)
 (list 'horiz
 math-comp-left-bracket
 (math-compose-vector (cdr a)
 (concat math-comp-comma " ")
 math-comp-vector-prec)
 math-comp-right-bracket))
 		(list 'horiz
 		      math-comp-left-bracket
 		      (math-compose-vector (list (nth 1 a) (nth 2 a) (nth 3 a))
 					   (concat math-comp-comma " ")
 math-comp-vector-prec)
 		      math-comp-comma
 (if (setq spfn (get calc-language 'math-dots))
 (concat " " spfn)
 " ...")
 		      math-comp-comma " "
 		      (list 'break math-compose-level)
 						   (math-compose-expr
 						    (nth col r)
 						    math-comp-vector-prec)
 						   (if (= col cols)
 						       ""
 						     (concat
 math-comp-comma-spc " ")))))
 					  a)))
 		      res)))
 (nreverse res)))
 (defun math-compose-rows (a count first)
 (if (cdr a)
 (if (<= count 0)
 	  (if (< count 0)
 	      (math-compose-rows (cdr a) -1 nil)
 	    (cons (concat
 (let ((mdots (get calc-language 'math-dots)))
 (if mdots
 (concat " " mdots)
 "  ..."))
 math-comp-comma)
 		   " " "")
 	       expr
 	       (if (memq prec '(196 201)) ")" "")))))
 ;; The variables math-svo-c, math-svo-wid and math-svo-off are local
 ;; to math-stack-value-offset in calc.el, but are used by
 ;; math-stack-value-offset-fancy, which is called by math-stack-value-offset..
 (defvar math-svo-c)
 (defvar math-svo-wid)
 (defvar math-svo-off)
 ;;; Convert a one-line composition to a string.  Break into multiple
 ;;; lines if necessary, choosing break points according to the structure
 ;;; of the formula.
 ;; The variables math-comp-full-width, math-comp-highlight, math-comp-word,
 ;; math-comp-level, math-comp-margin and math-comp-buf are local to
 ;; math-comp-to-string-flat, but are used by math-comp-to-string-flat-term,
 ;; which is called by math-comp-to-string-flat.
 ;; math-comp-highlight and math-comp-buf are also local to
 ;; math-comp-simplify-term and math-comp-simplify respectively, but are used
 ;; by math-comp-add-string.
 (defvar math-comp-full-width)
 (defvar math-comp-highlight)
 (defvar math-comp-word)
 (defvar math-comp-level)
 (defun math-comp-to-string-flat-term (c)
 (cond ((not (consp c))
 	 (if math-comp-highlight
 	     (setq c (math-comp-highlight-string c)))
 	 (setq math-comp-word (if (= (length math-comp-word) 0) c
 (concat math-comp-word c))
 	       math-comp-pos (+ math-comp-pos (length c))))
 	((eq (car c) 'horiz)
 	 (while (setq c (cdr c))
 	  (aset s i (if calc-show-selections ?\. ?\#)))))
 s)
 ;; The variable math-comp-sel-tag is local to calc-find-selected-part
 ;; in calc-sel.el, but is used by math-comp-sel-flat-term and
 ;; math-comp-add-string-sel, which are called (indirectly) by
 ;; calc-find-selected-part.
 (defvar math-comp-sel-tag)
 (defun math-comp-sel-flat-term (c)
 (cond ((not (consp c))
 	      (math-comp-to-string-raw-step (cdr cl) indent))
 ""))
 (provide 'calccomp)
+;; Local variables:
+;; coding: utf-8
+;; End:
 ;; arch-tag: 7c45d10a-a286-4dab-af49-7ae8989fbf78
 ;;; calccomp.el ends here

Mercurial > emacs

comparison lisp/calc/calccomp.el @ 109033:d150a25a0eb9