Mercurial > emacs
view lisp/calc/calcsel2.el @ 100267:c851df8e004e
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-id.el (org-id-locations-file): Wrap file name with
`convert-standard-filename'.
(org-id-files): New variable.
(org-id-use-hash): New option.
(org-id-update-id-locations): Also search in all files current
listed in `org-id-files'. Convert the resulting alist to a hash
if the user customation says so.
(org-id-locations-save): Handle he case if `org-id-locations' is a
hash.
(org-id-locations-load): Convert the alist to a hash.
(org-id-add-location): Handle the hast case.
(kill-emacs-hook): Make sure id locations are saved when Emacs is
exited.
(org-id-hash-to-alist, org-id-alist-to-hash)
(org-id-paste-tracker): New functions.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-goto-calendar): Remove duplicate let
bindings of calendar variables.
* org-table.el (org-table-find-row-type): Renamed from
`org-find-row-type'.
(org-table-rewrite-old-row-references): Renamed from
`org-rewrite-old-row-references'.
(org-table-shift-refpart): Renamed from `org-shift-refpart'.
(org-table-cleanup-narrow-column-properties): Renamed from
`org-cleanup-narrow-column-properties'.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (org-find-row-type): New arguments DESC and CLINE,
for better error messages.
(org-table-get-descriptor-line): Supply the new arguments to
`org-find-row-type'.
(org-table-error-on-row-ref-crossing-hline): New option.
* org.el (org-target-link-regexp): Make buffer-local.
(org-move-subtree-down): Fix bug with trees at beginning of
buffer.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-faces.el (org-set-tag-faces): New function.
(org-tags-special-faces-re): New variable.
* org.el (org-font-lock-add-tag-faces, org-get-tag-face): New functions.
* org-faces.el (org-tag-faces): New option.
(org-tag): Mention `org-tag-faces' in the docstring.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-html-style-default): Implement new
quoting.
* org-jsinfo.el (org-infojs-template): Implement new quoting.
* org-w3m.el (w3m-minor-mode-hook): Also add the special copy
command to the `w3m-minor-mode-map'.
* org-archive.el (org-archive-to-archive-sibling): Protect
`this-command' to avoid appending kills during archiving.
* org-exp.el (org-export-with-priority): New variable.
(org-export-add-options-to-plist): Use `org-export-plist-vars'
instead of internal list of strings and properties.
(org-print-icalendar-entries): Retrieve the location property with
inheritance.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-with-todo-keywords): New option.
(org-export-plist-vars): Include also the keys for the #+OPTIONS
line.
(org-default-export-plist, org-export-add-options-to-plist)
(org-export-as-ascii, org-export-as-html): Use the new structure
of `org-export-plist-vars'.
* org.el (org-map-entries): Return all values.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-matcher-time): Recognize more special values.
* org-gnus.el (fboundp): Fix defvaralias for XEmacs.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-tags-exclude-from-inheritance): New option.
(org-tag-inherit-p, org-remove-uniherited-tags): Respect
`org-tags-exclude-from-inheritance'.
* org-agenda.el (org-agenda-show-inherited-tags): New option.
(org-format-agenda-item): Add inherited tags to the agenda line
string, and make sure that properties are kept when downcasing the
tags list.
(org-agenda-add-inherited-tags): New function.
(org-downcase-keep-props): New function.
* org.el (org-scan-tags): Mark inherited tags with a text
property.
(org-get-tags-at): Mark inherited tags with a text property.
(org-add-prop-inherited): New function.
* org-agenda.el (org-agenda-add-inherited-tags): New function.
(org-agenda-show-inherited-tags): New option.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-modules): Add org-w3m to the default modules.
* org-table.el (orgtbl-self-insert-command): Make S-SPC work in
orgtbl-mode.
(orgtabl-create-or-convert-from-region): New command.
* org-exp.el (org-export-as-ascii): Remove the handling of
targets.
(org-export-ascii-preprocess): Handle targets already in this
function.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-timer.el (org-timer-start-time): Define this variable.
(org-timer-item): Make argument optional.
* org-list.el (org-insert-item): Automatically insert a timer item
if the current list is a timer list.
* org-timer.el: New file.
* org-publish.el (org-publish-org-index): Only exclude the index
file in the main directory from being added to the site-map.
(org-publish-get-project-from-filename): If the current project is
a component, start publishing from the parent project.
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
* org-table.el (orgtbl-ret): Fix RET at beginning-of-buffer.
* org-publish.el (org-publish-org-index): Improve removal of
temporary buffers.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 07 Dec 2008 18:36:02 +0000 |
parents | 6c9af2bfcfee |
children | a9dc0e7c3f2b |
line wrap: on
line source
;;; calcsel2.el --- selection functions for Calc ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008 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. ;; 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 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; 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. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;;; Code: ;; This file is autoloaded from calc-ext.el. (require 'calc-ext) (require 'calc-macs) ;; The variable calc-keep-selection is declared and set in calc-sel.el. (defvar calc-keep-selection) ;; The variable calc-sel-reselect is local to the methods below, ;; but is used by some functions in calc-sel.el which are called ;; by the functions below. (defun calc-commute-left (arg) (interactive "p") (if (< arg 0) (calc-commute-right (- arg)) (calc-wrapper (calc-preserve-point) (let ((num (max 1 (calc-locate-cursor-element (point)))) (calc-sel-reselect calc-keep-selection)) (if (= arg 0) (setq arg nil)) (while (or (null arg) (>= (setq arg (1- arg)) 0)) (let* ((entry (calc-top num 'entry)) (expr (car entry)) (sel (calc-auto-selection entry)) parent new) (or (and sel (consp (setq parent (calc-find-assoc-parent-formula expr sel)))) (error "No term is selected")) (if (and calc-assoc-selections (assq (car parent) calc-assoc-ops)) (let ((outer (calc-find-parent-formula parent sel))) (if (eq sel (nth 2 outer)) (setq new (calc-replace-sub-formula parent outer (cond ((memq (car outer) (nth 1 (assq (car-safe (nth 1 outer)) calc-assoc-ops))) (let* ((other (nth 2 (nth 1 outer))) (new (calc-build-assoc-term (car (nth 1 outer)) (calc-build-assoc-term (car outer) (nth 1 (nth 1 outer)) sel) other))) (setq sel (nth 2 (nth 1 new))) new)) ((eq (car outer) '-) (calc-build-assoc-term '+ (setq sel (math-neg sel)) (nth 1 outer))) ((eq (car outer) '/) (calc-build-assoc-term '* (setq sel (calcFunc-div 1 sel)) (nth 1 outer))) (t (calc-build-assoc-term (car outer) sel (nth 1 outer)))))) (let ((next (calc-find-parent-formula parent outer))) (if (not (and (consp next) (eq outer (nth 2 next)) (eq (car next) (car outer)))) (setq new nil) (setq new (calc-build-assoc-term (car next) sel (calc-build-assoc-term (car next) (nth 1 next) (nth 2 outer))) sel (nth 1 new) new (calc-replace-sub-formula parent next new)))))) (if (eq (nth 1 parent) sel) (setq new nil) (let ((p (nthcdr (1- (calc-find-sub-formula parent sel)) (setq new (copy-sequence parent))))) (setcar (cdr p) (car p)) (setcar p sel)))) (if (null new) (if arg (error "Term is already leftmost") (or calc-sel-reselect (calc-pop-push-list 1 (list expr) num '(nil))) (setq arg 0)) (calc-pop-push-record-list 1 "left" (list (calc-replace-sub-formula expr parent new)) num (list (and (or (not (eq arg 0)) calc-sel-reselect) sel)))))))))) (defun calc-commute-right (arg) (interactive "p") (if (< arg 0) (calc-commute-left (- arg)) (calc-wrapper (calc-preserve-point) (let ((num (max 1 (calc-locate-cursor-element (point)))) (calc-sel-reselect calc-keep-selection)) (if (= arg 0) (setq arg nil)) (while (or (null arg) (>= (setq arg (1- arg)) 0)) (let* ((entry (calc-top num 'entry)) (expr (car entry)) (sel (calc-auto-selection entry)) parent new) (or (and sel (consp (setq parent (calc-find-assoc-parent-formula expr sel)))) (error "No term is selected")) (if (and calc-assoc-selections (assq (car parent) calc-assoc-ops)) (let ((outer (calc-find-parent-formula parent sel))) (if (eq sel (nth 1 outer)) (setq new (calc-replace-sub-formula parent outer (if (memq (car outer) (nth 2 (assq (car-safe (nth 2 outer)) calc-assoc-ops))) (let ((other (nth 1 (nth 2 outer)))) (calc-build-assoc-term (car outer) other (calc-build-assoc-term (car (nth 2 outer)) sel (nth 2 (nth 2 outer))))) (let ((new (cond ((eq (car outer) '-) (calc-build-assoc-term '+ (math-neg (nth 2 outer)) sel)) ((eq (car outer) '/) (calc-build-assoc-term '* (calcFunc-div 1 (nth 2 outer)) sel)) (t (calc-build-assoc-term (car outer) (nth 2 outer) sel))))) (setq sel (nth 2 new)) new)))) (let ((next (calc-find-parent-formula parent outer))) (if (not (and (consp next) (eq outer (nth 1 next)))) (setq new nil) (setq new (calc-build-assoc-term (car outer) (calc-build-assoc-term (car next) (nth 1 outer) (nth 2 next)) sel) sel (nth 2 new) new (calc-replace-sub-formula parent next new)))))) (if (eq (nth (1- (length parent)) parent) sel) (setq new nil) (let ((p (nthcdr (calc-find-sub-formula parent sel) (setq new (copy-sequence parent))))) (setcar p (nth 1 p)) (setcar (cdr p) sel)))) (if (null new) (if arg (error "Term is already rightmost") (or calc-sel-reselect (calc-pop-push-list 1 (list expr) num '(nil))) (setq arg 0)) (calc-pop-push-record-list 1 "rght" (list (calc-replace-sub-formula expr parent new)) num (list (and (or (not (eq arg 0)) calc-sel-reselect) sel)))))))))) (defun calc-build-assoc-term (op lhs rhs) (cond ((and (eq op '+) (or (math-looks-negp rhs) (and (eq (car-safe rhs) 'cplx) (math-negp (nth 1 rhs)) (eq (nth 2 rhs) 0)))) (list '- lhs (math-neg rhs))) ((and (eq op '-) (or (math-looks-negp rhs) (and (eq (car-safe rhs) 'cplx) (math-negp (nth 1 rhs)) (eq (nth 2 rhs) 0)))) (list '+ lhs (math-neg rhs))) ((and (eq op '*) (and (eq (car-safe rhs) '/) (or (math-equal-int (nth 1 rhs) 1) (equal (nth 1 rhs) '(cplx 1 0))))) (list '/ lhs (nth 2 rhs))) ((and (eq op '/) (and (eq (car-safe rhs) '/) (or (math-equal-int (nth 1 rhs) 1) (equal (nth 1 rhs) '(cplx 1 0))))) (list '/ lhs (nth 2 rhs))) (t (list op lhs rhs)))) (defun calc-sel-unpack () (interactive) (calc-wrapper (calc-preserve-point) (let* ((num (max 1 (calc-locate-cursor-element (point)))) (calc-sel-reselect calc-keep-selection) (entry (calc-top num 'entry)) (expr (car entry)) (sel (or (calc-auto-selection entry) expr))) (or (and (not (math-primp sel)) (= (length sel) 2)) (error "Selection must be a function of one argument")) (calc-pop-push-record-list 1 "unpk" (list (calc-replace-sub-formula expr sel (nth 1 sel))) num (list (and calc-sel-reselect (nth 1 sel))))))) (defun calc-sel-isolate () (interactive) (calc-slow-wrapper (calc-preserve-point) (let* ((num (max 1 (calc-locate-cursor-element (point)))) (calc-sel-reselect calc-keep-selection) (entry (calc-top num 'entry)) (expr (car entry)) (sel (or (calc-auto-selection entry) (error "No selection"))) (eqn sel) soln) (while (and (or (consp (setq eqn (calc-find-parent-formula expr eqn))) (error "Selection must be a member of an equation")) (not (assq (car eqn) calc-tweak-eqn-table)))) (setq soln (math-solve-eqn eqn sel calc-hyperbolic-flag)) (or soln (error "No solution found")) (setq soln (calc-encase-atoms (if (eq (not (calc-find-sub-formula (nth 2 eqn) sel)) (eq (nth 1 soln) sel)) soln (list (nth 1 (assq (car soln) calc-tweak-eqn-table)) (nth 2 soln) (nth 1 soln))))) (calc-pop-push-record-list 1 "isol" (list (calc-replace-sub-formula expr eqn soln)) num (list (and calc-sel-reselect sel))) (calc-handle-whys)))) (defun calc-sel-commute (many) (interactive "P") (let ((calc-assoc-selections nil)) (calc-rewrite-selection "CommuteRules" many "cmut")) (calc-set-mode-line)) (defun calc-sel-jump-equals (many) (interactive "P") (calc-rewrite-selection "JumpRules" many "jump")) (defun calc-sel-distribute (many) (interactive "P") (calc-rewrite-selection "DistribRules" many "dist")) (defun calc-sel-merge (many) (interactive "P") (calc-rewrite-selection "MergeRules" many "merg")) (defun calc-sel-negate (many) (interactive "P") (calc-rewrite-selection "NegateRules" many "jneg")) (defun calc-sel-invert (many) (interactive "P") (calc-rewrite-selection "InvertRules" many "jinv")) (provide 'calcsel2) ;; arch-tag: 7c5b8d65-b8f0-45d9-820d-9930f8ee114b ;;; calcsel2.el ends here