2008-04-09 13:42:36 +00:00
|
|
|
;;; org-colview.el --- Column View in Org-mode
|
|
|
|
|
2014-01-07 13:18:17 +00:00
|
|
|
;; Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;;
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;;
|
2008-05-06 12:45:52 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2008-04-09 13:42:36 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 12:45:52 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
;; 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
|
2008-05-06 12:45:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2008-04-09 13:42:36 +00:00
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;
|
|
|
|
;;; Commentary:
|
|
|
|
|
2008-12-17 08:08:06 +00:00
|
|
|
;; This file contains the column view for Org.
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
(require 'org)
|
|
|
|
|
2008-05-30 07:30:43 +00:00
|
|
|
(declare-function org-agenda-redo "org-agenda" ())
|
2009-11-13 22:22:18 +00:00
|
|
|
(declare-function org-agenda-do-context-action "org-agenda" ())
|
2012-08-05 16:59:51 +00:00
|
|
|
(declare-function org-clock-sum-today "org-clock" (&optional headline-filter))
|
2008-05-30 07:30:43 +00:00
|
|
|
|
2010-04-21 07:03:30 +00:00
|
|
|
(when (featurep 'xemacs)
|
2013-03-04 17:36:34 +00:00
|
|
|
(error "Do not load this file into XEmacs, use `org-colview-xemacs.el' from the contrib/ directory"))
|
2010-04-21 07:03:30 +00:00
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
;;; Column View
|
|
|
|
|
|
|
|
(defvar org-columns-overlays nil
|
|
|
|
"Holds the list of current column overlays.")
|
|
|
|
|
|
|
|
(defvar org-columns-current-fmt nil
|
|
|
|
"Local variable, holds the currently active column format.")
|
2008-04-15 09:02:10 +00:00
|
|
|
(make-variable-buffer-local 'org-columns-current-fmt)
|
2008-04-09 13:42:36 +00:00
|
|
|
(defvar org-columns-current-fmt-compiled nil
|
|
|
|
"Local variable, holds the currently active column format.
|
|
|
|
This is the compiled version of the format.")
|
2008-04-15 09:02:10 +00:00
|
|
|
(make-variable-buffer-local 'org-columns-current-fmt-compiled)
|
2008-04-09 13:42:36 +00:00
|
|
|
(defvar org-columns-current-widths nil
|
|
|
|
"Loval variable, holds the currently widths of fields.")
|
2008-04-15 09:02:10 +00:00
|
|
|
(make-variable-buffer-local 'org-columns-current-widths)
|
2008-04-09 13:42:36 +00:00
|
|
|
(defvar org-columns-current-maxwidths nil
|
|
|
|
"Loval variable, holds the currently active maximum column widths.")
|
2008-04-15 09:02:10 +00:00
|
|
|
(make-variable-buffer-local 'org-columns-current-maxwidths)
|
2008-04-09 13:42:36 +00:00
|
|
|
(defvar org-columns-begin-marker (make-marker)
|
|
|
|
"Points to the position where last a column creation command was called.")
|
|
|
|
(defvar org-columns-top-level-marker (make-marker)
|
|
|
|
"Points to the position where current columns region starts.")
|
|
|
|
|
|
|
|
(defvar org-columns-map (make-sparse-keymap)
|
|
|
|
"The keymap valid in column display.")
|
|
|
|
|
|
|
|
(defun org-columns-content ()
|
|
|
|
"Switch to contents view while in columns view."
|
|
|
|
(interactive)
|
|
|
|
(org-overview)
|
|
|
|
(org-content))
|
|
|
|
|
|
|
|
(org-defkey org-columns-map "c" 'org-columns-content)
|
|
|
|
(org-defkey org-columns-map "o" 'org-overview)
|
|
|
|
(org-defkey org-columns-map "e" 'org-columns-edit-value)
|
|
|
|
(org-defkey org-columns-map "\C-c\C-t" 'org-columns-todo)
|
|
|
|
(org-defkey org-columns-map "\C-c\C-c" 'org-columns-set-tags-or-toggle)
|
|
|
|
(org-defkey org-columns-map "\C-c\C-o" 'org-columns-open-link)
|
|
|
|
(org-defkey org-columns-map "v" 'org-columns-show-value)
|
|
|
|
(org-defkey org-columns-map "q" 'org-columns-quit)
|
|
|
|
(org-defkey org-columns-map "r" 'org-columns-redo)
|
|
|
|
(org-defkey org-columns-map "g" 'org-columns-redo)
|
|
|
|
(org-defkey org-columns-map [left] 'backward-char)
|
|
|
|
(org-defkey org-columns-map "\M-b" 'backward-char)
|
|
|
|
(org-defkey org-columns-map "a" 'org-columns-edit-allowed)
|
|
|
|
(org-defkey org-columns-map "s" 'org-columns-edit-attributes)
|
2009-03-05 08:50:38 +00:00
|
|
|
(org-defkey org-columns-map "\M-f"
|
|
|
|
(lambda () (interactive) (goto-char (1+ (point)))))
|
|
|
|
(org-defkey org-columns-map [right]
|
|
|
|
(lambda () (interactive) (goto-char (1+ (point)))))
|
|
|
|
(org-defkey org-columns-map [down]
|
|
|
|
(lambda () (interactive)
|
|
|
|
(let ((col (current-column)))
|
2009-03-10 16:45:22 +00:00
|
|
|
(beginning-of-line 2)
|
|
|
|
(while (and (org-invisible-p2) (not (eobp)))
|
|
|
|
(beginning-of-line 2))
|
2009-11-12 08:04:48 +00:00
|
|
|
(move-to-column col)
|
2009-11-13 13:48:00 +00:00
|
|
|
(if (eq major-mode 'org-agenda-mode)
|
|
|
|
(org-agenda-do-context-action)))))
|
2009-03-05 08:50:38 +00:00
|
|
|
(org-defkey org-columns-map [up]
|
|
|
|
(lambda () (interactive)
|
|
|
|
(let ((col (current-column)))
|
2009-03-10 16:45:22 +00:00
|
|
|
(beginning-of-line 0)
|
|
|
|
(while (and (org-invisible-p2) (not (bobp)))
|
|
|
|
(beginning-of-line 0))
|
2009-11-12 08:04:48 +00:00
|
|
|
(move-to-column col)
|
2009-11-13 13:48:00 +00:00
|
|
|
(if (eq major-mode 'org-agenda-mode)
|
|
|
|
(org-agenda-do-context-action)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(org-defkey org-columns-map [(shift right)] 'org-columns-next-allowed-value)
|
|
|
|
(org-defkey org-columns-map "n" 'org-columns-next-allowed-value)
|
|
|
|
(org-defkey org-columns-map [(shift left)] 'org-columns-previous-allowed-value)
|
|
|
|
(org-defkey org-columns-map "p" 'org-columns-previous-allowed-value)
|
|
|
|
(org-defkey org-columns-map "<" 'org-columns-narrow)
|
|
|
|
(org-defkey org-columns-map ">" 'org-columns-widen)
|
|
|
|
(org-defkey org-columns-map [(meta right)] 'org-columns-move-right)
|
|
|
|
(org-defkey org-columns-map [(meta left)] 'org-columns-move-left)
|
|
|
|
(org-defkey org-columns-map [(shift meta right)] 'org-columns-new)
|
|
|
|
(org-defkey org-columns-map [(shift meta left)] 'org-columns-delete)
|
2008-06-09 07:53:19 +00:00
|
|
|
(dotimes (i 10)
|
|
|
|
(org-defkey org-columns-map (number-to-string i)
|
2009-08-28 12:50:51 +00:00
|
|
|
`(lambda () (interactive)
|
|
|
|
(org-columns-next-allowed-value nil ,i))))
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
(easy-menu-define org-columns-menu org-columns-map "Org Column Menu"
|
|
|
|
'("Column"
|
|
|
|
["Edit property" org-columns-edit-value t]
|
|
|
|
["Next allowed value" org-columns-next-allowed-value t]
|
|
|
|
["Previous allowed value" org-columns-previous-allowed-value t]
|
|
|
|
["Show full value" org-columns-show-value t]
|
|
|
|
["Edit allowed values" org-columns-edit-allowed t]
|
|
|
|
"--"
|
|
|
|
["Edit column attributes" org-columns-edit-attributes t]
|
|
|
|
["Increase column width" org-columns-widen t]
|
|
|
|
["Decrease column width" org-columns-narrow t]
|
|
|
|
"--"
|
|
|
|
["Move column right" org-columns-move-right t]
|
|
|
|
["Move column left" org-columns-move-left t]
|
|
|
|
["Add column" org-columns-new t]
|
|
|
|
["Delete column" org-columns-delete t]
|
|
|
|
"--"
|
|
|
|
["CONTENTS" org-columns-content t]
|
|
|
|
["OVERVIEW" org-overview t]
|
|
|
|
["Refresh columns display" org-columns-redo t]
|
|
|
|
"--"
|
|
|
|
["Open link" org-columns-open-link t]
|
|
|
|
"--"
|
|
|
|
["Quit" org-columns-quit t]))
|
|
|
|
|
|
|
|
(defun org-columns-new-overlay (beg end &optional string face)
|
|
|
|
"Create a new column overlay and add it to the list."
|
2010-04-18 14:37:42 +00:00
|
|
|
(let ((ov (make-overlay beg end)))
|
|
|
|
(overlay-put ov 'face (or face 'secondary-selection))
|
2012-08-21 18:05:34 +00:00
|
|
|
(remove-text-properties 0 (length string) '(face nil) string)
|
2008-04-09 13:42:36 +00:00
|
|
|
(org-overlay-display ov string face)
|
|
|
|
(push ov org-columns-overlays)
|
|
|
|
ov))
|
|
|
|
|
2008-11-17 16:49:58 +00:00
|
|
|
(defun org-columns-display-here (&optional props dateline)
|
2008-04-09 13:42:36 +00:00
|
|
|
"Overlay the current line with column display."
|
|
|
|
(interactive)
|
|
|
|
(let* ((fmt org-columns-current-fmt-compiled)
|
|
|
|
(beg (point-at-bol))
|
|
|
|
(level-face (save-excursion
|
|
|
|
(beginning-of-line 1)
|
|
|
|
(and (looking-at "\\(\\**\\)\\(\\* \\)")
|
|
|
|
(org-get-level-face 2))))
|
2008-04-25 06:06:13 +00:00
|
|
|
(ref-face (or level-face
|
|
|
|
(and (eq major-mode 'org-agenda-mode)
|
|
|
|
(get-text-property (point-at-bol) 'face))
|
|
|
|
'default))
|
2008-05-01 08:06:15 +00:00
|
|
|
(color (list :foreground (face-attribute ref-face :foreground)))
|
2013-06-28 07:50:27 +00:00
|
|
|
(font (list :height (face-attribute 'default :height)
|
|
|
|
:family (face-attribute 'default :family)))
|
|
|
|
(face (list color font 'org-column ref-face))
|
|
|
|
(face1 (list color font 'org-agenda-column-dateline ref-face))
|
2008-05-28 21:58:53 +00:00
|
|
|
(cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp))
|
2014-03-05 14:47:41 +00:00
|
|
|
pom property ass width f fc string fm ov column val modval s2 title calc)
|
2008-04-09 13:42:36 +00:00
|
|
|
;; Check if the entry is in another buffer.
|
|
|
|
(unless props
|
|
|
|
(if (eq major-mode 'org-agenda-mode)
|
2009-09-25 08:48:59 +00:00
|
|
|
(setq pom (or (org-get-at-bol 'org-hd-marker)
|
|
|
|
(org-get-at-bol 'org-marker))
|
2008-04-09 13:42:36 +00:00
|
|
|
props (if pom (org-entry-properties pom) nil))
|
|
|
|
(setq props (org-entry-properties nil))))
|
|
|
|
;; Walk the format
|
|
|
|
(while (setq column (pop fmt))
|
|
|
|
(setq property (car column)
|
2008-07-26 00:05:37 +00:00
|
|
|
title (nth 1 column)
|
2015-01-07 17:08:51 +00:00
|
|
|
ass (assoc-string property props t)
|
|
|
|
width (or (cdr
|
|
|
|
(assoc-string property org-columns-current-maxwidths t))
|
2008-04-09 13:42:36 +00:00
|
|
|
(nth 2 column)
|
|
|
|
(length property))
|
|
|
|
f (format "%%-%d.%ds | " width width)
|
2014-02-11 14:39:09 +00:00
|
|
|
fm (nth 4 column)
|
|
|
|
fc (nth 5 column)
|
2009-08-28 12:50:51 +00:00
|
|
|
calc (nth 7 column)
|
2008-04-09 13:42:36 +00:00
|
|
|
val (or (cdr ass) "")
|
2009-08-28 12:50:51 +00:00
|
|
|
modval (cond ((and org-columns-modify-value-for-display-function
|
|
|
|
(functionp
|
|
|
|
org-columns-modify-value-for-display-function))
|
|
|
|
(funcall org-columns-modify-value-for-display-function
|
|
|
|
title val))
|
|
|
|
((equal property "ITEM")
|
2014-11-10 15:41:34 +00:00
|
|
|
(org-columns-compact-links val))
|
2014-02-11 14:39:09 +00:00
|
|
|
(fc (org-columns-number-to-string
|
|
|
|
(org-columns-string-to-number val fm) fm fc))
|
2009-08-28 12:50:51 +00:00
|
|
|
((and calc (functionp calc)
|
2009-11-10 02:42:17 +00:00
|
|
|
(not (string= val ""))
|
2009-08-28 12:50:51 +00:00
|
|
|
(not (get-text-property 0 'org-computed val)))
|
|
|
|
(org-columns-number-to-string
|
|
|
|
(funcall calc (org-columns-string-to-number
|
2014-02-11 14:39:09 +00:00
|
|
|
val fm)) fm))))
|
2008-05-29 04:55:01 +00:00
|
|
|
(setq s2 (org-columns-add-ellipses (or modval val) width))
|
|
|
|
(setq string (format f s2))
|
2008-04-09 13:42:36 +00:00
|
|
|
;; Create the overlay
|
2013-02-25 10:44:27 +00:00
|
|
|
(org-with-silent-modifications
|
|
|
|
(setq ov (org-columns-new-overlay
|
|
|
|
beg (setq beg (1+ beg)) string (if dateline face1 face)))
|
|
|
|
(overlay-put ov 'keymap org-columns-map)
|
|
|
|
(overlay-put ov 'org-columns-key property)
|
|
|
|
(overlay-put ov 'org-columns-value (cdr ass))
|
|
|
|
(overlay-put ov 'org-columns-value-modified modval)
|
|
|
|
(overlay-put ov 'org-columns-pom pom)
|
|
|
|
(overlay-put ov 'org-columns-format f)
|
|
|
|
(overlay-put ov 'line-prefix "")
|
|
|
|
(overlay-put ov 'wrap-prefix ""))
|
2008-04-09 13:42:36 +00:00
|
|
|
(if (or (not (char-after beg))
|
|
|
|
(equal (char-after beg) ?\n))
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char beg)
|
|
|
|
(org-unmodified (insert " ")))))) ;; FIXME: add props and remove later?
|
2012-08-11 17:10:44 +00:00
|
|
|
;; Make the rest of the line disappear.
|
|
|
|
(org-unmodified
|
|
|
|
(setq ov (org-columns-new-overlay beg (point-at-eol)))
|
|
|
|
(overlay-put ov 'invisible t)
|
|
|
|
(overlay-put ov 'keymap org-columns-map)
|
|
|
|
(overlay-put ov 'line-prefix "")
|
|
|
|
(overlay-put ov 'wrap-prefix "")
|
|
|
|
(push ov org-columns-overlays)
|
|
|
|
(setq ov (make-overlay (1- (point-at-eol)) (1+ (point-at-eol))))
|
|
|
|
(overlay-put ov 'keymap org-columns-map)
|
|
|
|
(push ov org-columns-overlays)
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(put-text-property (max (point-min) (1- (point-at-bol)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(min (point-max) (1+ (point-at-eol)))
|
|
|
|
'read-only "Type `e' to edit property")))))
|
|
|
|
|
2008-05-30 07:30:43 +00:00
|
|
|
(defun org-columns-add-ellipses (string width)
|
|
|
|
"Truncate STRING with WIDTH characters, with ellipses."
|
2008-12-04 14:33:43 +00:00
|
|
|
(cond
|
2008-05-30 07:30:43 +00:00
|
|
|
((<= (length string) width) string)
|
|
|
|
((<= width (length org-columns-ellipses))
|
|
|
|
(substring org-columns-ellipses 0 width))
|
|
|
|
(t (concat (substring string 0 (- width (length org-columns-ellipses)))
|
|
|
|
org-columns-ellipses))))
|
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
(defvar org-columns-full-header-line-format nil
|
2008-12-16 14:49:08 +00:00
|
|
|
"The full header line format, will be shifted by horizontal scrolling." )
|
2008-04-09 13:42:36 +00:00
|
|
|
(defvar org-previous-header-line-format nil
|
|
|
|
"The header line format before column view was turned on.")
|
|
|
|
(defvar org-columns-inhibit-recalculation nil
|
|
|
|
"Inhibit recomputing of columns on column view startup.")
|
2008-04-24 06:33:49 +00:00
|
|
|
(defvar org-columns-flyspell-was-active nil
|
|
|
|
"Remember the state of `flyspell-mode' before column view.
|
|
|
|
Flyspell-mode can cause problems in columns view, so it is turned off
|
2008-04-24 08:29:47 +00:00
|
|
|
for the duration of the command.")
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
(defvar header-line-format)
|
|
|
|
(defvar org-columns-previous-hscroll 0)
|
2009-08-28 12:50:51 +00:00
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-display-here-title ()
|
|
|
|
"Overlay the newline before the current line with the table title."
|
|
|
|
(interactive)
|
|
|
|
(let ((fmt org-columns-current-fmt-compiled)
|
|
|
|
string (title "")
|
|
|
|
property width f column str widths)
|
|
|
|
(while (setq column (pop fmt))
|
|
|
|
(setq property (car column)
|
|
|
|
str (or (nth 1 column) property)
|
2015-01-07 17:08:51 +00:00
|
|
|
width (or (cdr (assoc-string property
|
|
|
|
org-columns-current-maxwidths
|
|
|
|
t))
|
2008-04-09 13:42:36 +00:00
|
|
|
(nth 2 column)
|
|
|
|
(length str))
|
|
|
|
widths (push width widths)
|
|
|
|
f (format "%%-%d.%ds | " width width)
|
|
|
|
string (format f str)
|
|
|
|
title (concat title string)))
|
|
|
|
(setq title (concat
|
|
|
|
(org-add-props " " nil 'display '(space :align-to 0))
|
2008-04-17 16:26:27 +00:00
|
|
|
;;(org-add-props title nil 'face '(:weight bold :underline t :inherit default))))
|
|
|
|
(org-add-props title nil 'face 'org-column-title)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(org-set-local 'org-previous-header-line-format header-line-format)
|
|
|
|
(org-set-local 'org-columns-current-widths (nreverse widths))
|
|
|
|
(setq org-columns-full-header-line-format title)
|
|
|
|
(setq org-columns-previous-hscroll -1)
|
2012-08-11 17:10:44 +00:00
|
|
|
; (org-columns-hscoll-title)
|
2008-04-09 13:42:36 +00:00
|
|
|
(org-add-hook 'post-command-hook 'org-columns-hscoll-title nil 'local)))
|
|
|
|
|
|
|
|
(defun org-columns-hscoll-title ()
|
2010-07-15 20:26:51 +00:00
|
|
|
"Set the `header-line-format' so that it scrolls along with the table."
|
2008-04-09 13:42:36 +00:00
|
|
|
(sit-for .0001) ; need to force a redisplay to update window-hscroll
|
|
|
|
(when (not (= (window-hscroll) org-columns-previous-hscroll))
|
|
|
|
(setq header-line-format
|
|
|
|
(concat (substring org-columns-full-header-line-format 0 1)
|
|
|
|
(substring org-columns-full-header-line-format
|
|
|
|
(1+ (window-hscroll))))
|
|
|
|
org-columns-previous-hscroll (window-hscroll))
|
|
|
|
(force-mode-line-update)))
|
|
|
|
|
2009-03-21 14:59:56 +00:00
|
|
|
(defvar org-colview-initial-truncate-line-value nil
|
|
|
|
"Remember the value of `truncate-lines' across colview.")
|
|
|
|
|
2013-11-15 05:53:59 +00:00
|
|
|
;;;###autoload
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-remove-overlays ()
|
|
|
|
"Remove all currently active column overlays."
|
|
|
|
(interactive)
|
|
|
|
(when (marker-buffer org-columns-begin-marker)
|
|
|
|
(with-current-buffer (marker-buffer org-columns-begin-marker)
|
|
|
|
(when (local-variable-p 'org-previous-header-line-format)
|
|
|
|
(setq header-line-format org-previous-header-line-format)
|
|
|
|
(kill-local-variable 'org-previous-header-line-format)
|
|
|
|
(remove-hook 'post-command-hook 'org-columns-hscoll-title 'local))
|
|
|
|
(move-marker org-columns-begin-marker nil)
|
|
|
|
(move-marker org-columns-top-level-marker nil)
|
2013-02-25 10:44:27 +00:00
|
|
|
(org-with-silent-modifications
|
|
|
|
(mapc 'delete-overlay org-columns-overlays)
|
|
|
|
(setq org-columns-overlays nil)
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(remove-text-properties (point-min) (point-max) '(read-only t))))
|
2008-04-24 06:33:49 +00:00
|
|
|
(when org-columns-flyspell-was-active
|
2009-03-21 14:59:56 +00:00
|
|
|
(flyspell-mode 1))
|
|
|
|
(when (local-variable-p 'org-colview-initial-truncate-line-value)
|
|
|
|
(setq truncate-lines org-colview-initial-truncate-line-value)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
|
2008-05-29 04:55:01 +00:00
|
|
|
(defun org-columns-compact-links (s)
|
|
|
|
"Replace [[link][desc]] with [desc] or [link]."
|
|
|
|
(while (string-match org-bracket-link-regexp s)
|
|
|
|
(setq s (replace-match
|
|
|
|
(concat "[" (match-string (if (match-end 3) 3 1) s) "]")
|
|
|
|
t t s)))
|
|
|
|
s)
|
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-show-value ()
|
|
|
|
"Show the full value of the property."
|
|
|
|
(interactive)
|
|
|
|
(let ((value (get-char-property (point) 'org-columns-value)))
|
|
|
|
(message "Value is: %s" (or value ""))))
|
|
|
|
|
2008-04-18 03:42:38 +00:00
|
|
|
(defvar org-agenda-columns-active) ;; defined in org-agenda.el
|
2009-08-28 12:50:51 +00:00
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-quit ()
|
|
|
|
"Remove the column overlays and in this way exit column editing."
|
|
|
|
(interactive)
|
2013-02-25 10:44:27 +00:00
|
|
|
(org-with-silent-modifications
|
|
|
|
(org-columns-remove-overlays)
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(remove-text-properties (point-min) (point-max) '(read-only t))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(when (eq major-mode 'org-agenda-mode)
|
2008-04-15 12:01:59 +00:00
|
|
|
(setq org-agenda-columns-active nil)
|
2008-04-09 13:42:36 +00:00
|
|
|
(message
|
|
|
|
"Modification not yet reflected in Agenda buffer, use `r' to refresh")))
|
|
|
|
|
|
|
|
(defun org-columns-check-computed ()
|
|
|
|
"Check if this column value is computed.
|
|
|
|
If yes, throw an error indicating that changing it does not make sense."
|
|
|
|
(let ((val (get-char-property (point) 'org-columns-value)))
|
|
|
|
(when (and (stringp val)
|
|
|
|
(get-char-property 0 'org-computed val))
|
|
|
|
(error "This value is computed from the entry's children"))))
|
|
|
|
|
|
|
|
(defun org-columns-todo (&optional arg)
|
|
|
|
"Change the TODO state during column view."
|
|
|
|
(interactive "P")
|
|
|
|
(org-columns-edit-value "TODO"))
|
|
|
|
|
|
|
|
(defun org-columns-set-tags-or-toggle (&optional arg)
|
|
|
|
"Toggle checkbox at point, or set tags for current headline."
|
|
|
|
(interactive "P")
|
|
|
|
(if (string-match "\\`\\[[ xX-]\\]\\'"
|
|
|
|
(get-char-property (point) 'org-columns-value))
|
|
|
|
(org-columns-next-allowed-value)
|
|
|
|
(org-columns-edit-value "TAGS")))
|
|
|
|
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(defvar org-agenda-overriding-columns-format nil
|
|
|
|
"When set, overrides any other format definition for the agenda.
|
|
|
|
Don't set this, this is meant for dynamic scoping.")
|
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-edit-value (&optional key)
|
|
|
|
"Edit the value of the property at point in column view.
|
|
|
|
Where possible, use the standard interface for changing this line."
|
|
|
|
(interactive)
|
|
|
|
(org-columns-check-computed)
|
2009-02-20 08:12:10 +00:00
|
|
|
(let* ((col (current-column))
|
2008-04-09 13:42:36 +00:00
|
|
|
(key (or key (get-char-property (point) 'org-columns-key)))
|
|
|
|
(value (get-char-property (point) 'org-columns-value))
|
|
|
|
(bol (point-at-bol)) (eol (point-at-eol))
|
|
|
|
(pom (or (get-text-property bol 'org-hd-marker)
|
2015-01-07 17:08:51 +00:00
|
|
|
(point))) ; keep despite of compiler waring
|
2008-04-09 13:42:36 +00:00
|
|
|
(line-overlays
|
|
|
|
(delq nil (mapcar (lambda (x)
|
|
|
|
(and (eq (overlay-buffer x) (current-buffer))
|
|
|
|
(>= (overlay-start x) bol)
|
|
|
|
(<= (overlay-start x) eol)
|
|
|
|
x))
|
|
|
|
org-columns-overlays)))
|
2009-08-28 12:50:51 +00:00
|
|
|
(org-columns-time (time-to-number-of-days (current-time)))
|
2008-04-09 13:42:36 +00:00
|
|
|
nval eval allowed)
|
|
|
|
(cond
|
|
|
|
((equal key "CLOCKSUM")
|
|
|
|
(error "This special column cannot be edited"))
|
|
|
|
((equal key "ITEM")
|
|
|
|
(setq eval '(org-with-point-at pom
|
|
|
|
(org-edit-headline))))
|
|
|
|
((equal key "TODO")
|
2009-02-20 08:12:10 +00:00
|
|
|
(setq eval '(org-with-point-at
|
2012-08-11 17:10:44 +00:00
|
|
|
pom
|
|
|
|
(call-interactively 'org-todo))))
|
2008-04-09 13:42:36 +00:00
|
|
|
((equal key "PRIORITY")
|
|
|
|
(setq eval '(org-with-point-at pom
|
|
|
|
(call-interactively 'org-priority))))
|
|
|
|
((equal key "TAGS")
|
|
|
|
(setq eval '(org-with-point-at pom
|
|
|
|
(let ((org-fast-tag-selection-single-key
|
|
|
|
(if (eq org-fast-tag-selection-single-key 'expert)
|
|
|
|
t org-fast-tag-selection-single-key)))
|
|
|
|
(call-interactively 'org-set-tags)))))
|
|
|
|
((equal key "DEADLINE")
|
|
|
|
(setq eval '(org-with-point-at pom
|
|
|
|
(call-interactively 'org-deadline))))
|
|
|
|
((equal key "SCHEDULED")
|
|
|
|
(setq eval '(org-with-point-at pom
|
|
|
|
(call-interactively 'org-schedule))))
|
2009-12-11 07:44:35 +00:00
|
|
|
((equal key "BEAMER_env")
|
|
|
|
(setq eval '(org-with-point-at pom
|
2010-07-31 15:37:16 +00:00
|
|
|
(call-interactively 'org-beamer-select-environment))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(t
|
|
|
|
(setq allowed (org-property-get-allowed-values pom key 'table))
|
|
|
|
(if allowed
|
2009-12-11 07:44:35 +00:00
|
|
|
(setq nval (org-icompleting-read
|
|
|
|
"Value: " allowed nil
|
|
|
|
(not (get-text-property 0 'org-unrestricted
|
|
|
|
(caar allowed)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq nval (read-string "Edit: " value)))
|
|
|
|
(setq nval (org-trim nval))
|
|
|
|
(when (not (equal nval value))
|
|
|
|
(setq eval '(org-entry-put pom key nval)))))
|
|
|
|
(when eval
|
2008-04-18 13:24:58 +00:00
|
|
|
|
|
|
|
(cond
|
|
|
|
((equal major-mode 'org-agenda-mode)
|
2008-05-29 05:21:07 +00:00
|
|
|
(org-columns-eval eval)
|
2008-04-18 13:24:58 +00:00
|
|
|
;; The following let preserves the current format, and makes sure
|
2011-11-28 14:11:52 +00:00
|
|
|
;; that in only a single file things need to be updated.
|
2008-04-18 13:24:58 +00:00
|
|
|
(let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
|
|
|
|
(buffer (marker-buffer pom))
|
|
|
|
(org-agenda-contributing-files
|
|
|
|
(list (with-current-buffer buffer
|
|
|
|
(buffer-file-name (buffer-base-buffer))))))
|
|
|
|
(org-agenda-columns)))
|
|
|
|
(t
|
|
|
|
(let ((inhibit-read-only t))
|
2013-02-25 10:44:27 +00:00
|
|
|
(org-with-silent-modifications
|
|
|
|
(remove-text-properties
|
|
|
|
(max (point-min) (1- bol)) eol '(read-only t)))
|
2008-04-18 13:24:58 +00:00
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(setq org-columns-overlays
|
|
|
|
(org-delete-all line-overlays org-columns-overlays))
|
2010-04-18 14:37:42 +00:00
|
|
|
(mapc 'delete-overlay line-overlays)
|
2008-04-18 13:24:58 +00:00
|
|
|
(org-columns-eval eval))
|
|
|
|
(org-columns-display-here)))
|
2008-04-24 14:44:12 +00:00
|
|
|
(org-move-to-column col)
|
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 18:03:45 +00:00
|
|
|
(if (and (derived-mode-p 'org-mode)
|
2015-01-07 17:08:51 +00:00
|
|
|
(nth 3 (assoc-string key org-columns-current-fmt-compiled t)))
|
2008-04-18 13:24:58 +00:00
|
|
|
(org-columns-update key)))))))
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
(defun org-edit-headline () ; FIXME: this is not columns specific. Make interactive????? Use from agenda????
|
|
|
|
"Edit the current headline, the part without TODO keyword, TAGS."
|
|
|
|
(org-back-to-heading)
|
|
|
|
(when (looking-at org-todo-line-regexp)
|
2008-05-30 04:04:29 +00:00
|
|
|
(let ((pos (point))
|
|
|
|
(pre (buffer-substring (match-beginning 0) (match-beginning 3)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(txt (match-string 3))
|
|
|
|
(post "")
|
|
|
|
txt2)
|
2010-08-21 00:30:31 +00:00
|
|
|
(if (string-match (org-re "[ \t]+:[[:alnum:]:_@#%]+:[ \t]*$") txt)
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq post (match-string 0 txt)
|
|
|
|
txt (substring txt 0 (match-beginning 0))))
|
|
|
|
(setq txt2 (read-string "Edit: " txt))
|
|
|
|
(when (not (equal txt txt2))
|
2008-05-30 04:04:29 +00:00
|
|
|
(goto-char pos)
|
2008-04-09 13:42:36 +00:00
|
|
|
(insert pre txt2 post)
|
|
|
|
(delete-region (point) (point-at-eol))
|
|
|
|
(org-set-tags nil t)))))
|
|
|
|
|
|
|
|
(defun org-columns-edit-allowed ()
|
|
|
|
"Edit the list of allowed values for the current property."
|
|
|
|
(interactive)
|
2009-09-25 08:48:59 +00:00
|
|
|
(let* ((pom (or (org-get-at-bol 'org-marker)
|
|
|
|
(org-get-at-bol 'org-hd-marker)
|
2008-04-15 09:02:10 +00:00
|
|
|
(point)))
|
|
|
|
(key (get-char-property (point) 'org-columns-key))
|
2008-04-09 13:42:36 +00:00
|
|
|
(key1 (concat key "_ALL"))
|
2008-04-15 09:02:10 +00:00
|
|
|
(allowed (org-entry-get pom key1 t))
|
2008-04-09 13:42:36 +00:00
|
|
|
nval)
|
|
|
|
;; FIXME: Cover editing TODO, TAGS etc in-buffer settings.????
|
2008-04-15 09:02:10 +00:00
|
|
|
;; FIXME: Write back to #+PROPERTY setting if that is needed.
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq nval (read-string "Allowed: " allowed))
|
|
|
|
(org-entry-put
|
|
|
|
(cond ((marker-position org-entry-property-inherited-from)
|
|
|
|
org-entry-property-inherited-from)
|
|
|
|
((marker-position org-columns-top-level-marker)
|
2008-04-15 09:02:10 +00:00
|
|
|
org-columns-top-level-marker)
|
|
|
|
(t pom))
|
2008-04-09 13:42:36 +00:00
|
|
|
key1 nval)))
|
|
|
|
|
|
|
|
(defun org-columns-eval (form)
|
|
|
|
(let (hidep)
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line 1)
|
|
|
|
;; `next-line' is needed here, because it skips invisible line.
|
|
|
|
(condition-case nil (org-no-warnings (next-line 1)) (error nil))
|
2012-01-02 18:52:35 +00:00
|
|
|
(setq hidep (org-at-heading-p 1)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(eval form)
|
|
|
|
(and hidep (hide-entry))))
|
|
|
|
|
|
|
|
(defun org-columns-previous-allowed-value ()
|
|
|
|
"Switch to the previous allowed value for this column."
|
|
|
|
(interactive)
|
|
|
|
(org-columns-next-allowed-value t))
|
|
|
|
|
2008-06-09 07:53:19 +00:00
|
|
|
(defun org-columns-next-allowed-value (&optional previous nth)
|
|
|
|
"Switch to the next allowed value for this column.
|
|
|
|
When PREVIOUS is set, go to the previous value. When NTH is
|
|
|
|
an integer, select that value."
|
2008-04-09 13:42:36 +00:00
|
|
|
(interactive)
|
|
|
|
(org-columns-check-computed)
|
|
|
|
(let* ((col (current-column))
|
|
|
|
(key (get-char-property (point) 'org-columns-key))
|
|
|
|
(value (get-char-property (point) 'org-columns-value))
|
|
|
|
(bol (point-at-bol)) (eol (point-at-eol))
|
|
|
|
(pom (or (get-text-property bol 'org-hd-marker)
|
2015-01-07 17:08:51 +00:00
|
|
|
(point))) ; keep despite of compiler waring
|
2008-04-09 13:42:36 +00:00
|
|
|
(line-overlays
|
|
|
|
(delq nil (mapcar (lambda (x)
|
|
|
|
(and (eq (overlay-buffer x) (current-buffer))
|
|
|
|
(>= (overlay-start x) bol)
|
|
|
|
(<= (overlay-start x) eol)
|
|
|
|
x))
|
|
|
|
org-columns-overlays)))
|
|
|
|
(allowed (or (org-property-get-allowed-values pom key)
|
|
|
|
(and (memq
|
2015-01-07 17:08:51 +00:00
|
|
|
(nth 4 (assoc-string key
|
|
|
|
org-columns-current-fmt-compiled
|
|
|
|
t))
|
2008-04-09 13:42:36 +00:00
|
|
|
'(checkbox checkbox-n-of-m checkbox-percent))
|
2008-09-18 08:24:57 +00:00
|
|
|
'("[ ]" "[X]"))
|
|
|
|
(org-colview-construct-allowed-dates value)))
|
2008-04-09 13:42:36 +00:00
|
|
|
nval)
|
2008-06-09 07:53:19 +00:00
|
|
|
(when (integerp nth)
|
|
|
|
(setq nth (1- nth))
|
|
|
|
(if (= nth -1) (setq nth 9)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(when (equal key "ITEM")
|
|
|
|
(error "Cannot edit item headline from here"))
|
2012-08-30 14:42:13 +00:00
|
|
|
(unless (or allowed (member key '("SCHEDULED" "DEADLINE" "CLOCKSUM")))
|
2008-04-09 13:42:36 +00:00
|
|
|
(error "Allowed values for this property have not been defined"))
|
2012-08-30 14:42:13 +00:00
|
|
|
(if (member key '("SCHEDULED" "DEADLINE" "CLOCKSUM"))
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq nval (if previous 'earlier 'later))
|
|
|
|
(if previous (setq allowed (reverse allowed)))
|
2008-06-09 07:53:19 +00:00
|
|
|
(cond
|
|
|
|
(nth
|
|
|
|
(setq nval (nth nth allowed))
|
|
|
|
(if (not nval)
|
|
|
|
(error "There are only %d allowed values for property `%s'"
|
|
|
|
(length allowed) key)))
|
|
|
|
((member value allowed)
|
|
|
|
(setq nval (or (car (cdr (member value allowed)))
|
|
|
|
(car allowed)))
|
|
|
|
(if (equal nval value)
|
2008-06-16 16:23:18 +00:00
|
|
|
(error "Only one allowed value for this property")))
|
|
|
|
(t (setq nval (car allowed)))))
|
2008-04-15 12:01:59 +00:00
|
|
|
(cond
|
|
|
|
((equal major-mode 'org-agenda-mode)
|
2008-04-18 13:24:58 +00:00
|
|
|
(org-columns-eval '(org-entry-put pom key nval))
|
|
|
|
;; The following let preserves the current format, and makes sure
|
2011-11-28 14:11:52 +00:00
|
|
|
;; that in only a single file things need to be updated.
|
2008-04-18 13:24:58 +00:00
|
|
|
(let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
|
|
|
|
(buffer (marker-buffer pom))
|
|
|
|
(org-agenda-contributing-files
|
|
|
|
(list (with-current-buffer buffer
|
|
|
|
(buffer-file-name (buffer-base-buffer))))))
|
|
|
|
(org-agenda-columns)))
|
|
|
|
(t
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(remove-text-properties (1- bol) eol '(read-only t))
|
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(setq org-columns-overlays
|
|
|
|
(org-delete-all line-overlays org-columns-overlays))
|
2010-04-18 14:37:42 +00:00
|
|
|
(mapc 'delete-overlay line-overlays)
|
2008-04-18 13:24:58 +00:00
|
|
|
(org-columns-eval '(org-entry-put pom key nval)))
|
|
|
|
(org-columns-display-here)))
|
2008-04-24 14:44:12 +00:00
|
|
|
(org-move-to-column col)
|
2015-01-07 17:08:51 +00:00
|
|
|
(and (nth 3 (assoc-string key org-columns-current-fmt-compiled t))
|
2008-04-18 13:24:58 +00:00
|
|
|
(org-columns-update key))))))
|
2008-04-09 13:42:36 +00:00
|
|
|
|
2008-09-18 08:24:57 +00:00
|
|
|
(defun org-colview-construct-allowed-dates (s)
|
|
|
|
"Construct a list of three dates around the date in S.
|
|
|
|
This respects the format of the time stamp in S, active or non-active,
|
|
|
|
and also including time or not. S must be just a time stamp, no text
|
|
|
|
around it."
|
2009-01-16 11:50:09 +00:00
|
|
|
(when (and s (string-match (concat "^" org-ts-regexp3 "$") s))
|
2008-09-18 08:24:57 +00:00
|
|
|
(let* ((time (org-parse-time-string s 'nodefaults))
|
|
|
|
(active (equal (string-to-char s) ?<))
|
2008-09-19 06:30:22 +00:00
|
|
|
(fmt (funcall (if (nth 1 time) 'cdr 'car) org-time-stamp-formats))
|
|
|
|
time-before time-after)
|
2008-09-18 08:24:57 +00:00
|
|
|
(unless active (setq fmt (concat "[" (substring fmt 1 -1) "]")))
|
|
|
|
(setf (car time) (or (car time) 0))
|
|
|
|
(setf (nth 1 time) (or (nth 1 time) 0))
|
|
|
|
(setf (nth 2 time) (or (nth 2 time) 0))
|
|
|
|
(setq time-before (copy-sequence time))
|
|
|
|
(setq time-after (copy-sequence time))
|
|
|
|
(setf (nth 3 time-before) (1- (nth 3 time)))
|
|
|
|
(setf (nth 3 time-after) (1+ (nth 3 time)))
|
|
|
|
(mapcar (lambda (x) (format-time-string fmt (apply 'encode-time x)))
|
|
|
|
(list time-before time time-after)))))
|
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-verify-version (task)
|
|
|
|
(cond
|
|
|
|
((eq task 'columns)
|
|
|
|
(if (or (featurep 'xemacs)
|
|
|
|
(< emacs-major-version 22))
|
|
|
|
(error "Emacs 22 is required for the columns feature")))))
|
|
|
|
|
|
|
|
(defun org-columns-open-link (&optional arg)
|
|
|
|
(interactive "P")
|
|
|
|
(let ((value (get-char-property (point) 'org-columns-value)))
|
|
|
|
(org-open-link-from-string value arg)))
|
|
|
|
|
2013-11-15 05:53:59 +00:00
|
|
|
;;;###autoload
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-get-format-and-top-level ()
|
2012-08-12 21:00:55 +00:00
|
|
|
(let ((fmt (org-columns-get-format)))
|
2012-08-12 09:48:44 +00:00
|
|
|
(org-columns-goto-top-level)
|
|
|
|
fmt))
|
|
|
|
|
|
|
|
(defun org-columns-get-format (&optional fmt-string)
|
|
|
|
(interactive)
|
2012-08-12 21:00:55 +00:00
|
|
|
(let (fmt-as-property fmt)
|
2008-04-09 13:42:36 +00:00
|
|
|
(when (condition-case nil (org-back-to-heading) (error nil))
|
2012-08-12 09:48:44 +00:00
|
|
|
(setq fmt-as-property (org-entry-get nil "COLUMNS" t)))
|
|
|
|
(setq fmt (or fmt-string fmt-as-property org-columns-default-format))
|
2008-04-09 13:42:36 +00:00
|
|
|
(org-set-local 'org-columns-current-fmt fmt)
|
|
|
|
(org-columns-compile-format fmt)
|
|
|
|
fmt))
|
|
|
|
|
2012-08-12 09:48:44 +00:00
|
|
|
(defun org-columns-goto-top-level ()
|
|
|
|
(when (condition-case nil (org-back-to-heading) (error nil))
|
2012-08-31 05:56:58 +00:00
|
|
|
(org-entry-get nil "COLUMNS" t))
|
|
|
|
(if (marker-position org-entry-property-inherited-from)
|
|
|
|
(move-marker org-columns-top-level-marker org-entry-property-inherited-from)
|
|
|
|
(move-marker org-columns-top-level-marker (point))))
|
2012-08-12 09:48:44 +00:00
|
|
|
|
Update autoloads.
* org.el: Don't dynamically autoload already autoloaded
functions.
(org-clock-update-time-maybe): Move to org-clock.el.
* org-exp.el (org-insert-export-options-template): Remove
autoload cookie.
* org-clock.el (org-resolve-clocks, org-clock-in)
(org-clock-out, org-clock-cancel, org-clock-goto)
(org-clock-sum, org-clock-display, org-clock-report)
(org-dblock-write:clocktable): Add autoload cookie.
(org-clock-update-time-maybe): Moved from org.el.
* org-beamer.el (org-beamer-sectioning, org-beamer-mode): Ditto.
* org-ascii.el (org-export-ascii-preprocess): Ditto.
* org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling, org-toggle-archive-tag): Add
autoload cookie.
* org-colview.el (org-columns, org-dblock-write:columnview)
(org-insert-columns-dblock, org-agenda-columns): Ditto.
* org-table.el (org-table-create-with-table.el)
(org-table-create-or-convert-from-region, org-table-create)
(org-table-convert-region, org-table-import)
(org-table-export, org-table-align)
(org-table-justify-field-maybe, org-table-next-field)
(org-table-previous-field, org-table-next-row)
(org-table-copy-down, org-table-field-info)
(org-table-current-dline, org-table-goto-column)
(org-table-insert-column, org-table-delete-column)
(org-table-move-column-right, org-table-move-column-left)
(org-table-move-column, org-table-move-row-down)
(org-table-move-row-up, org-table-move-row)
(org-table-insert-row, org-table-insert-hline)
(org-table-hline-and-move, org-table-kill-row)
(org-table-sort-lines, org-table-cut-region)
(org-table-copy-region, org-table-paste-rectangle)
(org-table-convert, org-table-wrap-region)
(org-table-edit-field, org-table-sum)
(org-table-get-stored-formulas)
(org-table-maybe-eval-formula)
(org-table-rotate-recalc-marks)
(org-table-maybe-recalculate-line, org-table-eval-formula)
(org-table-recalculate, org-table-iterate)
(org-table-edit-formulas)
(org-table-toggle-coordinate-overlays)
(org-table-toggle-formula-debugger, orgtbl-to-generic)
(orgtbl-to-tsv, orgtbl-to-csv, orgtbl-to-latex)
(orgtbl-to-html, orgtbl-to-texinfo, orgtbl-to-orgtbl): Ditto.
2012-10-02 08:52:17 +00:00
|
|
|
;;;###autoload
|
2012-08-12 09:48:44 +00:00
|
|
|
(defun org-columns (&optional columns-fmt-string)
|
|
|
|
"Turn on column view on an org-mode file.
|
|
|
|
When COLUMNS-FMT-STRING is non-nil, use it as the column format."
|
2008-04-09 13:42:36 +00:00
|
|
|
(interactive)
|
|
|
|
(org-verify-version 'columns)
|
|
|
|
(org-columns-remove-overlays)
|
|
|
|
(move-marker org-columns-begin-marker (point))
|
2015-06-02 15:02:55 +00:00
|
|
|
(org-columns-goto-top-level)
|
|
|
|
;; Initialize `org-columns-current-fmt' and
|
|
|
|
;; `org-columns-current-fmt-compiled'.
|
|
|
|
(let ((org-columns-time (time-to-number-of-days (current-time))))
|
|
|
|
(org-columns-get-format columns-fmt-string))
|
|
|
|
(unless org-columns-inhibit-recalculation (org-columns-compute-all))
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region
|
|
|
|
org-columns-top-level-marker
|
|
|
|
(or (ignore-errors (org-end-of-subtree t t)) (point-max)))
|
|
|
|
(goto-char (point-min))
|
2008-04-09 13:42:36 +00:00
|
|
|
(when (assoc "CLOCKSUM" org-columns-current-fmt-compiled)
|
2015-06-02 15:02:55 +00:00
|
|
|
(org-clock-sum))
|
2012-08-05 09:12:04 +00:00
|
|
|
(when (assoc "CLOCKSUM_T" org-columns-current-fmt-compiled)
|
2015-06-02 15:02:55 +00:00
|
|
|
(org-clock-sum-today))
|
|
|
|
(let* ((column-names (mapcar #'car org-columns-current-fmt-compiled))
|
|
|
|
(cache
|
|
|
|
(org-map-entries
|
|
|
|
(lambda ()
|
2015-06-02 20:01:06 +00:00
|
|
|
(cons (point)
|
2015-06-02 15:02:55 +00:00
|
|
|
(mapcar
|
|
|
|
(lambda (p)
|
|
|
|
(cons p (org-entry-get nil p 'selective t)))
|
|
|
|
column-names)))
|
|
|
|
nil nil (and org-columns-skip-archived-trees 'archive))))
|
|
|
|
(when cache
|
|
|
|
(org-set-local 'org-columns-current-maxwidths
|
|
|
|
(org-columns-get-autowidth-alist
|
|
|
|
org-columns-current-fmt
|
|
|
|
cache))
|
|
|
|
(org-columns-display-here-title)
|
|
|
|
(when (org-set-local 'org-columns-flyspell-was-active
|
|
|
|
(org-bound-and-true-p flyspell-mode))
|
|
|
|
(flyspell-mode 0))
|
|
|
|
(unless (local-variable-p 'org-colview-initial-truncate-line-value)
|
|
|
|
(org-set-local 'org-colview-initial-truncate-line-value
|
|
|
|
truncate-lines))
|
|
|
|
(setq truncate-lines t)
|
|
|
|
(dolist (x cache)
|
2015-06-02 20:01:06 +00:00
|
|
|
(goto-char (car x))
|
2015-06-02 15:02:55 +00:00
|
|
|
(org-columns-display-here (cdr x))))))))
|
2008-04-09 13:42:36 +00:00
|
|
|
|
2009-08-28 12:50:51 +00:00
|
|
|
(eval-when-compile (defvar org-columns-time))
|
|
|
|
|
2009-05-21 05:54:54 +00:00
|
|
|
(defvar org-columns-compile-map
|
2009-11-11 04:53:17 +00:00
|
|
|
'(("none" none +)
|
|
|
|
(":" add_times +)
|
|
|
|
("+" add_numbers +)
|
|
|
|
("$" currency +)
|
|
|
|
("X" checkbox +)
|
|
|
|
("X/" checkbox-n-of-m +)
|
|
|
|
("X%" checkbox-percent +)
|
|
|
|
("max" max_numbers max)
|
|
|
|
("min" min_numbers min)
|
2009-08-28 12:50:51 +00:00
|
|
|
("mean" mean_numbers
|
2009-11-11 04:53:17 +00:00
|
|
|
(lambda (&rest x) (/ (apply '+ x) (float (length x)))))
|
|
|
|
(":max" max_times max)
|
|
|
|
(":min" min_times min)
|
2009-08-28 12:50:51 +00:00
|
|
|
(":mean" mean_times
|
2009-11-11 04:53:17 +00:00
|
|
|
(lambda (&rest x) (/ (apply '+ x) (float (length x)))))
|
2009-10-30 03:16:18 +00:00
|
|
|
("@min" min_age min (lambda (x) (- org-columns-time x)))
|
|
|
|
("@max" max_age max (lambda (x) (- org-columns-time x)))
|
|
|
|
("@mean" mean_age
|
|
|
|
(lambda (&rest x) (/ (apply '+ x) (float (length x))))
|
2010-06-22 07:36:10 +00:00
|
|
|
(lambda (x) (- org-columns-time x)))
|
|
|
|
("est+" estimate org-estimate-combine))
|
2009-11-01 00:00:31 +00:00
|
|
|
"Operator <-> format,function,calc map.
|
2009-05-21 05:54:54 +00:00
|
|
|
Used to compile/uncompile columns format and completing read in
|
2010-07-15 20:26:51 +00:00
|
|
|
interactive function `org-columns-new'.
|
2009-11-01 00:00:31 +00:00
|
|
|
|
|
|
|
operator string used in #+COLUMNS definition describing the
|
2009-11-11 04:53:17 +00:00
|
|
|
summary type
|
2009-11-01 00:00:31 +00:00
|
|
|
format symbol describing summary type selected interactively in
|
2010-07-15 20:26:51 +00:00
|
|
|
`org-columns-new' and internally in
|
|
|
|
`org-columns-number-to-string' and
|
|
|
|
`org-columns-string-to-number'
|
2009-11-01 00:00:31 +00:00
|
|
|
function called with a list of values as argument to calculate
|
2009-11-11 04:53:17 +00:00
|
|
|
the summary value
|
2010-07-15 20:26:51 +00:00
|
|
|
calc function called on every element before summarizing. This is
|
2009-11-11 04:53:17 +00:00
|
|
|
optional and should only be specified if needed")
|
2009-05-21 05:54:54 +00:00
|
|
|
|
|
|
|
(defun org-columns-new (&optional prop title width op fmt fun &rest rest)
|
2008-04-09 13:42:36 +00:00
|
|
|
"Insert a new column, to the left of the current column."
|
|
|
|
(interactive)
|
2015-01-07 17:08:51 +00:00
|
|
|
(let ((editp (and prop
|
|
|
|
(assoc-string prop org-columns-current-fmt-compiled t)))
|
2008-04-09 13:42:36 +00:00
|
|
|
cell)
|
2009-08-19 08:33:17 +00:00
|
|
|
(setq prop (org-icompleting-read
|
2008-04-09 13:42:36 +00:00
|
|
|
"Property: " (mapcar 'list (org-buffer-property-keys t nil t))
|
|
|
|
nil nil prop))
|
|
|
|
(setq title (read-string (concat "Column title [" prop "]: ") (or title prop)))
|
|
|
|
(setq width (read-string "Column width: " (if width (number-to-string width))))
|
|
|
|
(if (string-match "\\S-" width)
|
|
|
|
(setq width (string-to-number width))
|
|
|
|
(setq width nil))
|
2009-08-19 08:33:17 +00:00
|
|
|
(setq fmt (org-icompleting-read
|
2009-08-03 15:30:30 +00:00
|
|
|
"Summary [none]: "
|
|
|
|
(mapcar (lambda (x) (list (symbol-name (cadr x))))
|
|
|
|
org-columns-compile-map)
|
|
|
|
nil t))
|
2009-05-21 05:54:54 +00:00
|
|
|
(setq fmt (intern fmt)
|
2009-11-01 00:00:31 +00:00
|
|
|
fun (cdr (assoc fmt (mapcar 'cdr org-columns-compile-map))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(if (eq fmt 'none) (setq fmt nil))
|
|
|
|
(if editp
|
|
|
|
(progn
|
|
|
|
(setcar editp prop)
|
2009-05-21 05:54:54 +00:00
|
|
|
(setcdr editp (list title width nil fmt nil fun)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq cell (nthcdr (1- (current-column))
|
|
|
|
org-columns-current-fmt-compiled))
|
2009-10-30 03:16:18 +00:00
|
|
|
(setcdr cell (cons (list prop title width nil fmt nil
|
2009-11-01 00:00:31 +00:00
|
|
|
(car fun) (cadr fun))
|
2008-04-09 13:42:36 +00:00
|
|
|
(cdr cell))))
|
|
|
|
(org-columns-store-format)
|
|
|
|
(org-columns-redo)))
|
|
|
|
|
|
|
|
(defun org-columns-delete ()
|
|
|
|
"Delete the column at point from columns view."
|
|
|
|
(interactive)
|
|
|
|
(let* ((n (current-column))
|
|
|
|
(title (nth 1 (nth n org-columns-current-fmt-compiled))))
|
|
|
|
(when (y-or-n-p
|
|
|
|
(format "Are you sure you want to remove column \"%s\"? " title))
|
|
|
|
(setq org-columns-current-fmt-compiled
|
|
|
|
(delq (nth n org-columns-current-fmt-compiled)
|
|
|
|
org-columns-current-fmt-compiled))
|
|
|
|
(org-columns-store-format)
|
|
|
|
(org-columns-redo)
|
|
|
|
(if (>= (current-column) (length org-columns-current-fmt-compiled))
|
|
|
|
(backward-char 1)))))
|
|
|
|
|
|
|
|
(defun org-columns-edit-attributes ()
|
|
|
|
"Edit the attributes of the current column."
|
|
|
|
(interactive)
|
|
|
|
(let* ((n (current-column))
|
|
|
|
(info (nth n org-columns-current-fmt-compiled)))
|
|
|
|
(apply 'org-columns-new info)))
|
|
|
|
|
|
|
|
(defun org-columns-widen (arg)
|
|
|
|
"Make the column wider by ARG characters."
|
|
|
|
(interactive "p")
|
|
|
|
(let* ((n (current-column))
|
|
|
|
(entry (nth n org-columns-current-fmt-compiled))
|
|
|
|
(width (or (nth 2 entry)
|
2015-01-07 17:08:51 +00:00
|
|
|
(cdr (assoc-string (car entry)
|
|
|
|
org-columns-current-maxwidths
|
|
|
|
t)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq width (max 1 (+ width arg)))
|
|
|
|
(setcar (nthcdr 2 entry) width)
|
|
|
|
(org-columns-store-format)
|
|
|
|
(org-columns-redo)))
|
|
|
|
|
|
|
|
(defun org-columns-narrow (arg)
|
2008-12-16 14:49:08 +00:00
|
|
|
"Make the column narrower by ARG characters."
|
2008-04-09 13:42:36 +00:00
|
|
|
(interactive "p")
|
|
|
|
(org-columns-widen (- arg)))
|
|
|
|
|
|
|
|
(defun org-columns-move-right ()
|
|
|
|
"Swap this column with the one to the right."
|
|
|
|
(interactive)
|
|
|
|
(let* ((n (current-column))
|
|
|
|
(cell (nthcdr n org-columns-current-fmt-compiled))
|
|
|
|
e)
|
|
|
|
(when (>= n (1- (length org-columns-current-fmt-compiled)))
|
|
|
|
(error "Cannot shift this column further to the right"))
|
|
|
|
(setq e (car cell))
|
|
|
|
(setcar cell (car (cdr cell)))
|
|
|
|
(setcdr cell (cons e (cdr (cdr cell))))
|
|
|
|
(org-columns-store-format)
|
|
|
|
(org-columns-redo)
|
|
|
|
(forward-char 1)))
|
|
|
|
|
|
|
|
(defun org-columns-move-left ()
|
|
|
|
"Swap this column with the one to the left."
|
|
|
|
(interactive)
|
|
|
|
(let* ((n (current-column)))
|
|
|
|
(when (= n 0)
|
|
|
|
(error "Cannot shift this column further to the left"))
|
|
|
|
(backward-char 1)
|
|
|
|
(org-columns-move-right)
|
|
|
|
(backward-char 1)))
|
|
|
|
|
|
|
|
(defun org-columns-store-format ()
|
|
|
|
"Store the text version of the current columns format in appropriate place.
|
|
|
|
This is either in the COLUMNS property of the node starting the current column
|
|
|
|
display, or in the #+COLUMNS line of the current buffer."
|
|
|
|
(let (fmt (cnt 0))
|
|
|
|
(setq fmt (org-columns-uncompile-format org-columns-current-fmt-compiled))
|
|
|
|
(org-set-local 'org-columns-current-fmt fmt)
|
|
|
|
(if (marker-position org-columns-top-level-marker)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char org-columns-top-level-marker)
|
|
|
|
(if (and (org-at-heading-p)
|
|
|
|
(org-entry-get nil "COLUMNS"))
|
|
|
|
(org-entry-put nil "COLUMNS" fmt)
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; Overwrite all #+COLUMNS lines....
|
2014-03-12 18:54:05 +00:00
|
|
|
(while (re-search-forward "^[ \t]*#\\+COLUMNS:.*" nil t)
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq cnt (1+ cnt))
|
|
|
|
(replace-match (concat "#+COLUMNS: " fmt) t t))
|
|
|
|
(unless (> cnt 0)
|
|
|
|
(goto-char (point-min))
|
2012-01-02 18:52:35 +00:00
|
|
|
(or (org-at-heading-p t) (outline-next-heading))
|
2008-04-09 13:42:36 +00:00
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(insert-before-markers "#+COLUMNS: " fmt "\n")))
|
|
|
|
(org-set-local 'org-columns-default-format fmt))))))
|
|
|
|
|
|
|
|
(defun org-columns-get-autowidth-alist (s cache)
|
|
|
|
"Derive the maximum column widths from the format and the cache."
|
|
|
|
(let ((start 0) rtn)
|
|
|
|
(while (string-match (org-re "%\\([[:alpha:]][[:alnum:]_-]*\\)") s start)
|
|
|
|
(push (cons (match-string 1 s) 1) rtn)
|
|
|
|
(setq start (match-end 0)))
|
|
|
|
(mapc (lambda (x)
|
2015-01-07 17:08:51 +00:00
|
|
|
(setcdr x
|
|
|
|
(apply #'max
|
|
|
|
(let ((prop (car x)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(mapcar
|
|
|
|
(lambda (y)
|
2015-01-07 17:08:51 +00:00
|
|
|
(length (or (cdr (assoc-string prop (cdr y) t))
|
|
|
|
" ")))
|
|
|
|
cache)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
rtn)
|
|
|
|
rtn))
|
|
|
|
|
|
|
|
(defun org-columns-compute-all ()
|
|
|
|
"Compute all columns that have operators defined."
|
2013-02-25 10:44:27 +00:00
|
|
|
(org-with-silent-modifications
|
|
|
|
(remove-text-properties (point-min) (point-max) '(org-summaries t)))
|
2009-08-28 12:50:51 +00:00
|
|
|
(let ((columns org-columns-current-fmt-compiled)
|
|
|
|
(org-columns-time (time-to-number-of-days (current-time)))
|
|
|
|
col)
|
2008-04-09 13:42:36 +00:00
|
|
|
(while (setq col (pop columns))
|
|
|
|
(when (nth 3 col)
|
|
|
|
(save-excursion
|
|
|
|
(org-columns-compute (car col)))))))
|
|
|
|
|
|
|
|
(defun org-columns-update (property)
|
|
|
|
"Recompute PROPERTY, and update the columns display for it."
|
|
|
|
(org-columns-compute property)
|
|
|
|
(let (fmt val pos)
|
|
|
|
(save-excursion
|
|
|
|
(mapc (lambda (ov)
|
2010-04-18 14:37:42 +00:00
|
|
|
(when (equal (overlay-get ov 'org-columns-key) property)
|
|
|
|
(setq pos (overlay-start ov))
|
2008-04-09 13:42:36 +00:00
|
|
|
(goto-char pos)
|
2015-01-07 17:08:51 +00:00
|
|
|
(when (setq val (cdr (assoc-string
|
|
|
|
property
|
|
|
|
(get-text-property
|
|
|
|
(point-at-bol) 'org-summaries)
|
|
|
|
t)))
|
2010-04-18 14:37:42 +00:00
|
|
|
(setq fmt (overlay-get ov 'org-columns-format))
|
|
|
|
(overlay-put ov 'org-columns-value val)
|
|
|
|
(overlay-put ov 'display (format fmt val)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
org-columns-overlays))))
|
|
|
|
|
2012-03-23 21:04:36 +00:00
|
|
|
(defvar org-inlinetask-min-level
|
|
|
|
(if (featurep 'org-inlinetask) org-inlinetask-min-level 15))
|
2013-11-15 05:53:59 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-compute (property)
|
|
|
|
"Sum the values of property PROPERTY hierarchically, for the entire buffer."
|
|
|
|
(interactive)
|
Don't use `outline-regexp' anymore.
Use `org-outline-regexp' instead or `outline-regexp'. Also use the
new defconst `org-outline-regexp-bol' to match `org-outline-regexp'
at the beginning of line.
* org.el (org-outline-regexp-bol): New defconst.
(org-outline-level, org-set-font-lock-defaults, org-cycle)
(org-overview, org-content, org-flag-drawer)
(org-first-headline-recenter, org-insert-todo-heading)
(org-map-region, org-move-subtree-down, org-paste-subtree)
(org-kill-is-subtree-p, org-context-p, org-refile)
(org-refile-new-child, org-toggle-comment, org-todo)
(org-add-planning-info, org-add-log-setup, org-scan-tags)
(org-set-tags, org-insert-property-drawer)
(org-prepare-agenda-buffers, org-preview-latex-fragment)
(org-speed-command-default-hook, org-check-for-hidden)
(org-toggle-item, org-toggle-heading)
(org-indent-line-function, org-set-autofill-regexps)
(org-fill-paragraph, org-toggle-fixed-width-section)
(org-yank-generic, org-yank-folding-would-swallow-text)
(org-first-sibling-p, org-goto-sibling)
(org-goto-first-child, org-show-entry): Use
`org-outline-regexp' and `org-outline-regexp-bol'.
* org-remember.el (org-remember-handler): Use
`org-outline-regexp-bol'.
* org-mouse.el (org-mouse-match-todo-keyword, org-mode-hook)
(org-mouse-move-tree, org-mouse-transform-to-outline): Use
`org-outline-regexp' and `org-outline-regexp-bol'.
* org-macs.el (org-with-limited-levels)
(org-get-limited-outline-regexp): Use `org-outline-regexp'.
* org-indent.el (org-indent-outline-re)
(org-indent-refresh-section, org-indent-refresh-to): Use
`org-outline-regexp' and `org-outline-regexp-bol'.
* org-html.el (org-export-as-html): Use
`org-outline-regexp-bol'.
* org-footnote.el (org-footnote-at-definition-p)
(org-footnote-normalize): Use `org-outline-regexp' and
`org-outline-regexp-bol'.
* org-exp.el (org-export-preprocess-string): Don't redefine
`outline-regexp'.
* org-docbook.el (org-export-as-docbook): Use
`org-outline-regexp-bol'.
* org-colview.el (org-columns, org-columns-compute): Use
`org-outline-regexp' and `org-outline-regexp-bol'.
* org-colview-xemacs.el (org-columns, org-columns-compute):
Use `org-outline-regexp-bol'.
* org-clock.el (org-clock-insert-selection-line)
(org-clock-in, org-clock-out, org-dblock-write:clocktable):
Use `org-outline-regexp' and `org-outline-regexp-bol'.
* org-ascii.el (org-export-as-ascii)
(org-export-ascii-push-links): Use `org-outline-regexp' and
`org-outline-regexp-bol'.
* org-archive.el (org-archive-to-archive-sibling)
(org-archive-all-done): Use `org-outline-regexp' and
`org-outline-regexp-bol'.
* org-agenda.el (org-agenda, org-search-view)
(org-agenda-list-stuck-projects, org-agenda-get-timestamps)
(org-agenda-get-progress, org-agenda-get-blocks): Use
`org-outline-regexp' and `org-outline-regexp-bol'.
2011-07-17 19:17:08 +00:00
|
|
|
(let* ((re org-outline-regexp-bol)
|
2015-01-07 17:08:51 +00:00
|
|
|
(lmax 30) ; Does anyone use deeper levels???
|
2009-05-21 05:54:54 +00:00
|
|
|
(lvals (make-vector lmax nil))
|
2008-04-09 13:42:36 +00:00
|
|
|
(lflag (make-vector lmax nil))
|
|
|
|
(level 0)
|
2015-01-07 17:08:51 +00:00
|
|
|
(ass (assoc-string property org-columns-current-fmt-compiled t))
|
2008-04-09 13:42:36 +00:00
|
|
|
(format (nth 4 ass))
|
|
|
|
(printf (nth 5 ass))
|
2009-05-21 05:54:54 +00:00
|
|
|
(fun (nth 6 ass))
|
2009-08-28 12:50:51 +00:00
|
|
|
(calc (or (nth 7 ass) 'identity))
|
2008-04-09 13:42:36 +00:00
|
|
|
(beg org-columns-top-level-marker)
|
2012-03-23 21:04:36 +00:00
|
|
|
(inminlevel org-inlinetask-min-level)
|
|
|
|
(last-level org-inlinetask-min-level)
|
|
|
|
val valflag flag end sumpos sum-alist sum str str1 useval)
|
2008-04-09 13:42:36 +00:00
|
|
|
(save-excursion
|
|
|
|
;; Find the region to compute
|
|
|
|
(goto-char beg)
|
|
|
|
(setq end (condition-case nil (org-end-of-subtree t) (error (point-max))))
|
|
|
|
(goto-char end)
|
|
|
|
;; Walk the tree from the back and do the computations
|
|
|
|
(while (re-search-backward re beg t)
|
|
|
|
(setq sumpos (match-beginning 0)
|
2012-03-23 21:04:36 +00:00
|
|
|
last-level (if (not (or (zerop level) (eq level inminlevel)))
|
|
|
|
level last-level)
|
2008-04-09 13:42:36 +00:00
|
|
|
level (org-outline-level)
|
|
|
|
val (org-entry-get nil property)
|
|
|
|
valflag (and val (string-match "\\S-" val)))
|
|
|
|
(cond
|
|
|
|
((< level last-level)
|
2014-12-16 22:48:41 +00:00
|
|
|
;; Put the sum of lower levels here as a property. If
|
|
|
|
;; values are estimate, use an appropriate sum function.
|
|
|
|
(setq sum (funcall
|
|
|
|
(if (eq fun 'org-estimate-combine) #'org-estimate-combine
|
|
|
|
#'+)
|
|
|
|
(if (and (/= last-level inminlevel)
|
|
|
|
(aref lvals last-level))
|
|
|
|
(apply fun (aref lvals last-level)) 0)
|
|
|
|
(if (aref lvals inminlevel)
|
|
|
|
(apply fun (aref lvals inminlevel)) 0))
|
2012-03-23 21:04:36 +00:00
|
|
|
flag (or (aref lflag last-level) ; any valid entries from children?
|
|
|
|
(aref lflag inminlevel)) ; or inline tasks?
|
2008-04-09 13:42:36 +00:00
|
|
|
str (org-columns-number-to-string sum format printf)
|
|
|
|
str1 (org-add-props (copy-sequence str) nil 'org-computed t 'face 'bold)
|
|
|
|
useval (if flag str1 (if valflag val ""))
|
|
|
|
sum-alist (get-text-property sumpos 'org-summaries))
|
2015-01-07 17:08:51 +00:00
|
|
|
(let ((old (assoc-string property sum-alist t)))
|
|
|
|
(if old (setcdr old useval)
|
|
|
|
(push (cons property useval) sum-alist)
|
|
|
|
(org-with-silent-modifications
|
|
|
|
(add-text-properties sumpos (1+ sumpos)
|
|
|
|
(list 'org-summaries sum-alist)))))
|
2008-04-15 12:01:59 +00:00
|
|
|
(when (and val (not (equal val (if flag str val))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(org-entry-put nil property (if flag str val)))
|
2009-08-28 12:50:51 +00:00
|
|
|
;; add current to current level accumulator
|
2008-04-09 13:42:36 +00:00
|
|
|
(when (or flag valflag)
|
2009-08-28 12:50:51 +00:00
|
|
|
(push (if flag
|
|
|
|
sum
|
|
|
|
(funcall calc (org-columns-string-to-number
|
|
|
|
(if flag str val) format)))
|
2009-05-21 05:54:54 +00:00
|
|
|
(aref lvals level))
|
2008-04-09 13:42:36 +00:00
|
|
|
(aset lflag level t))
|
|
|
|
;; clear accumulators for deeper levels
|
|
|
|
(loop for l from (1+ level) to (1- lmax) do
|
2009-05-21 05:54:54 +00:00
|
|
|
(aset lvals l nil)
|
2008-04-09 13:42:36 +00:00
|
|
|
(aset lflag l nil)))
|
|
|
|
((>= level last-level)
|
|
|
|
;; add what we have here to the accumulator for this level
|
2009-05-21 08:47:56 +00:00
|
|
|
(when valflag
|
2009-08-28 12:50:51 +00:00
|
|
|
(push (funcall calc (org-columns-string-to-number val format))
|
|
|
|
(aref lvals level))
|
2009-05-21 08:47:56 +00:00
|
|
|
(aset lflag level t)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(t (error "This should not happen")))))))
|
|
|
|
|
|
|
|
(defun org-columns-redo ()
|
|
|
|
"Construct the column display again."
|
|
|
|
(interactive)
|
|
|
|
(message "Recomputing columns...")
|
2008-05-29 06:50:44 +00:00
|
|
|
(let ((line (org-current-line))
|
|
|
|
(col (current-column)))
|
|
|
|
(save-excursion
|
|
|
|
(if (marker-position org-columns-begin-marker)
|
|
|
|
(goto-char org-columns-begin-marker))
|
|
|
|
(org-columns-remove-overlays)
|
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 18:03:45 +00:00
|
|
|
(if (derived-mode-p 'org-mode)
|
2008-05-29 06:50:44 +00:00
|
|
|
(call-interactively 'org-columns)
|
|
|
|
(org-agenda-redo)
|
|
|
|
(call-interactively 'org-agenda-columns)))
|
2009-08-27 08:24:09 +00:00
|
|
|
(org-goto-line line)
|
2008-05-29 06:50:44 +00:00
|
|
|
(move-to-column col))
|
2008-04-09 13:42:36 +00:00
|
|
|
(message "Recomputing columns...done"))
|
|
|
|
|
|
|
|
(defun org-columns-not-in-agenda ()
|
|
|
|
(if (eq major-mode 'org-agenda-mode)
|
|
|
|
(error "This command is only allowed in Org-mode buffers")))
|
|
|
|
|
|
|
|
(defun org-string-to-number (s)
|
|
|
|
"Convert string to number, and interpret hh:mm:ss."
|
|
|
|
(if (not (string-match ":" s))
|
|
|
|
(string-to-number s)
|
|
|
|
(let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
|
|
|
|
(while l
|
|
|
|
(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
|
|
|
|
sum)))
|
|
|
|
|
2013-11-15 05:53:59 +00:00
|
|
|
;;;###autoload
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-number-to-string (n fmt &optional printf)
|
|
|
|
"Convert a computed column number to a string value, according to FMT."
|
|
|
|
(cond
|
2010-06-22 07:36:10 +00:00
|
|
|
((memq fmt '(estimate)) (org-estimate-print n printf))
|
2009-05-21 08:47:56 +00:00
|
|
|
((not (numberp n)) "")
|
2009-05-21 05:54:54 +00:00
|
|
|
((memq fmt '(add_times max_times min_times mean_times))
|
2012-11-11 22:20:24 +00:00
|
|
|
(org-hours-to-clocksum-string n))
|
2008-04-09 13:42:36 +00:00
|
|
|
((eq fmt 'checkbox)
|
|
|
|
(cond ((= n (floor n)) "[X]")
|
|
|
|
((> n 1.) "[-]")
|
|
|
|
(t "[ ]")))
|
|
|
|
((memq fmt '(checkbox-n-of-m checkbox-percent))
|
|
|
|
(let* ((n1 (floor n)) (n2 (floor (+ .5 (* 1000000 (- n n1))))))
|
|
|
|
(org-nofm-to-completion n1 (+ n2 n1) (eq fmt 'checkbox-percent))))
|
|
|
|
(printf (format printf n))
|
|
|
|
((eq fmt 'currency)
|
|
|
|
(format "%.2f" n))
|
2009-10-30 03:16:18 +00:00
|
|
|
((memq fmt '(min_age max_age mean_age))
|
2009-08-28 12:50:51 +00:00
|
|
|
(org-format-time-period n))
|
2008-04-09 13:42:36 +00:00
|
|
|
(t (number-to-string n))))
|
|
|
|
|
|
|
|
(defun org-nofm-to-completion (n m &optional percent)
|
|
|
|
(if (not percent)
|
|
|
|
(format "[%d/%d]" n m)
|
|
|
|
(format "[%d%%]"(floor (+ 0.5 (* 100. (/ (* 1.0 n) m)))))))
|
|
|
|
|
2010-06-22 07:36:10 +00:00
|
|
|
|
2009-08-28 12:50:51 +00:00
|
|
|
(defun org-columns-string-to-number (s fmt)
|
2008-04-09 13:42:36 +00:00
|
|
|
"Convert a column value to a number that can be used for column computing."
|
2009-08-28 12:50:51 +00:00
|
|
|
(if s
|
|
|
|
(cond
|
2009-10-30 03:16:18 +00:00
|
|
|
((memq fmt '(min_age max_age mean_age))
|
2010-06-22 07:36:10 +00:00
|
|
|
(cond ((string= s "") org-columns-time)
|
|
|
|
((string-match
|
|
|
|
"\\([0-9]+\\)d \\([0-9]+\\)h \\([0-9]+\\)m \\([0-9]+\\)s"
|
|
|
|
s)
|
|
|
|
(+ (* 60 (+ (* 60 (+ (* 24 (string-to-number (match-string 1 s)))
|
|
|
|
(string-to-number (match-string 2 s))))
|
|
|
|
(string-to-number (match-string 3 s))))
|
|
|
|
(string-to-number (match-string 4 s))))
|
|
|
|
(t (time-to-number-of-days (apply 'encode-time
|
|
|
|
(org-parse-time-string s t))))))
|
2009-08-28 12:50:51 +00:00
|
|
|
((string-match ":" s)
|
2010-06-22 07:36:10 +00:00
|
|
|
(let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
|
|
|
|
(while l
|
|
|
|
(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
|
2012-05-01 15:47:13 +00:00
|
|
|
sum))
|
2014-12-16 22:48:41 +00:00
|
|
|
((memq fmt '(checkbox checkbox-n-of-m checkbox-percent))
|
|
|
|
(if (equal s "[X]") 1. 0.000001))
|
|
|
|
((memq fmt '(estimate)) (org-string-to-estimate s))
|
2012-05-01 15:47:13 +00:00
|
|
|
((string-match (concat "\\([0-9.]+\\) *\\("
|
|
|
|
(regexp-opt (mapcar 'car org-effort-durations))
|
|
|
|
"\\)") s)
|
|
|
|
(setq s (concat "0:" (org-duration-string-to-minutes s t)))
|
|
|
|
(let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
|
|
|
|
(while l
|
|
|
|
(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
|
2010-06-22 07:36:10 +00:00
|
|
|
sum))
|
2009-11-10 02:42:17 +00:00
|
|
|
(t (string-to-number s)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
(defun org-columns-uncompile-format (cfmt)
|
|
|
|
"Turn the compiled columns format back into a string representation."
|
2013-11-26 12:14:06 +00:00
|
|
|
(let ((rtn "") e s prop title op op-match width fmt printf fun calc ee map)
|
2008-04-09 13:42:36 +00:00
|
|
|
(while (setq e (pop cfmt))
|
|
|
|
(setq prop (car e)
|
|
|
|
title (nth 1 e)
|
|
|
|
width (nth 2 e)
|
|
|
|
op (nth 3 e)
|
|
|
|
fmt (nth 4 e)
|
2009-05-21 05:54:54 +00:00
|
|
|
printf (nth 5 e)
|
2009-10-30 03:16:18 +00:00
|
|
|
fun (nth 6 e)
|
|
|
|
calc (nth 7 e))
|
2013-11-26 17:23:35 +00:00
|
|
|
(setq map (copy-sequence org-columns-compile-map))
|
2013-11-26 12:14:06 +00:00
|
|
|
(while (setq ee (pop map))
|
|
|
|
(if (equal fmt (nth 1 ee))
|
|
|
|
(setq op (car ee) map nil)))
|
2008-04-09 13:42:36 +00:00
|
|
|
(if (and op printf) (setq op (concat op ";" printf)))
|
|
|
|
(if (equal title prop) (setq title nil))
|
|
|
|
(setq s (concat "%" (if width (number-to-string width))
|
|
|
|
prop
|
|
|
|
(if title (concat "(" title ")"))
|
|
|
|
(if op (concat "{" op "}"))))
|
|
|
|
(setq rtn (concat rtn " " s)))
|
|
|
|
(org-trim rtn)))
|
|
|
|
|
|
|
|
(defun org-columns-compile-format (fmt)
|
2015-06-02 19:14:55 +00:00
|
|
|
"Turn a column format string FMT into an alist of specifications.
|
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
The alist has one entry for each column in the format. The elements of
|
|
|
|
that list are:
|
|
|
|
property the property
|
|
|
|
title the title field for the columns
|
|
|
|
width the column width in characters, can be nil for automatic
|
|
|
|
operator the operator if any
|
|
|
|
format the output format for computed results, derived from operator
|
2009-05-21 05:54:54 +00:00
|
|
|
printf a printf format for computed values
|
2009-08-28 12:50:51 +00:00
|
|
|
fun the lisp function to compute summary values, derived from operator
|
2015-06-02 19:14:55 +00:00
|
|
|
calc function to get values from base elements
|
|
|
|
|
|
|
|
This function updates `org-columns-current-fmt-compiled'."
|
2009-08-28 12:50:51 +00:00
|
|
|
(let ((start 0) width prop title op op-match f printf fun calc)
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq org-columns-current-fmt-compiled nil)
|
|
|
|
(while (string-match
|
|
|
|
(org-re "%\\([0-9]+\\)?\\([[:alnum:]_-]+\\)\\(?:(\\([^)]+\\))\\)?\\(?:{\\([^}]+\\)}\\)?\\s-*")
|
|
|
|
fmt start)
|
|
|
|
(setq start (match-end 0)
|
|
|
|
width (match-string 1 fmt)
|
|
|
|
prop (match-string 2 fmt)
|
|
|
|
title (or (match-string 3 fmt) prop)
|
|
|
|
op (match-string 4 fmt)
|
|
|
|
f nil
|
2009-05-21 05:54:54 +00:00
|
|
|
printf nil
|
2009-08-28 12:50:51 +00:00
|
|
|
fun '+
|
|
|
|
calc nil)
|
2008-04-09 13:42:36 +00:00
|
|
|
(if width (setq width (string-to-number width)))
|
|
|
|
(when (and op (string-match ";" op))
|
|
|
|
(setq printf (substring op (match-end 0))
|
|
|
|
op (substring op 0 (match-beginning 0))))
|
2009-05-21 05:54:54 +00:00
|
|
|
(when (setq op-match (assoc op org-columns-compile-map))
|
|
|
|
(setq f (cadr op-match)
|
2009-08-28 12:50:51 +00:00
|
|
|
fun (caddr op-match)
|
|
|
|
calc (cadddr op-match)))
|
|
|
|
(push (list prop title width op f printf fun calc)
|
|
|
|
org-columns-current-fmt-compiled))
|
2008-04-09 13:42:36 +00:00
|
|
|
(setq org-columns-current-fmt-compiled
|
|
|
|
(nreverse org-columns-current-fmt-compiled))))
|
|
|
|
|
|
|
|
|
|
|
|
;;; Dynamic block for Column view
|
|
|
|
|
2011-10-28 15:26:22 +00:00
|
|
|
(defvar org-heading-regexp) ; defined in org.el
|
|
|
|
(defvar org-heading-keyword-regexp-format) ; defined in org.el
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-columns-capture-view (&optional maxlevel skip-empty-rows)
|
|
|
|
"Get the column view of the current buffer or subtree.
|
|
|
|
The first optional argument MAXLEVEL sets the level limit. A
|
|
|
|
second optional argument SKIP-EMPTY-ROWS tells whether to skip
|
|
|
|
empty rows, an empty row being one where all the column view
|
|
|
|
specifiers except ITEM are empty. This function returns a list
|
|
|
|
containing the title row and all other rows. Each row is a list
|
|
|
|
of fields."
|
|
|
|
(save-excursion
|
|
|
|
(let* ((title (mapcar 'cadr org-columns-current-fmt-compiled))
|
2009-06-18 15:35:59 +00:00
|
|
|
(re-archive (concat ".*:" org-archive-tag ":"))
|
2008-04-09 13:42:36 +00:00
|
|
|
(n (length title)) row tbl)
|
|
|
|
(goto-char (point-min))
|
2011-08-24 23:58:29 +00:00
|
|
|
(while (re-search-forward org-heading-regexp nil t)
|
2009-06-18 15:35:59 +00:00
|
|
|
(catch 'next
|
|
|
|
(when (and (or (null maxlevel)
|
|
|
|
(>= maxlevel
|
|
|
|
(if org-odd-levels-only
|
|
|
|
(/ (1+ (length (match-string 1))) 2)
|
|
|
|
(length (match-string 1)))))
|
|
|
|
(get-char-property (match-beginning 0) 'org-columns-key))
|
2014-03-24 20:46:00 +00:00
|
|
|
(when (or (org-in-commented-heading-p t)
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
2009-06-18 15:35:59 +00:00
|
|
|
(looking-at re-archive)))
|
|
|
|
(org-end-of-subtree t)
|
|
|
|
(throw 'next t))
|
|
|
|
(setq row nil)
|
|
|
|
(loop for i from 0 to (1- n) do
|
|
|
|
(push
|
|
|
|
(org-quote-vert
|
|
|
|
(or (get-char-property (+ (match-beginning 0) i) 'org-columns-value-modified)
|
|
|
|
(get-char-property (+ (match-beginning 0) i) 'org-columns-value)
|
|
|
|
""))
|
|
|
|
row))
|
|
|
|
(setq row (nreverse row))
|
|
|
|
(unless (and skip-empty-rows
|
|
|
|
(eq 1 (length (delete "" (delete-dups (copy-sequence row))))))
|
|
|
|
(push row tbl)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(append (list title 'hline) (nreverse tbl)))))
|
|
|
|
|
Update autoloads.
* org.el: Don't dynamically autoload already autoloaded
functions.
(org-clock-update-time-maybe): Move to org-clock.el.
* org-exp.el (org-insert-export-options-template): Remove
autoload cookie.
* org-clock.el (org-resolve-clocks, org-clock-in)
(org-clock-out, org-clock-cancel, org-clock-goto)
(org-clock-sum, org-clock-display, org-clock-report)
(org-dblock-write:clocktable): Add autoload cookie.
(org-clock-update-time-maybe): Moved from org.el.
* org-beamer.el (org-beamer-sectioning, org-beamer-mode): Ditto.
* org-ascii.el (org-export-ascii-preprocess): Ditto.
* org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling, org-toggle-archive-tag): Add
autoload cookie.
* org-colview.el (org-columns, org-dblock-write:columnview)
(org-insert-columns-dblock, org-agenda-columns): Ditto.
* org-table.el (org-table-create-with-table.el)
(org-table-create-or-convert-from-region, org-table-create)
(org-table-convert-region, org-table-import)
(org-table-export, org-table-align)
(org-table-justify-field-maybe, org-table-next-field)
(org-table-previous-field, org-table-next-row)
(org-table-copy-down, org-table-field-info)
(org-table-current-dline, org-table-goto-column)
(org-table-insert-column, org-table-delete-column)
(org-table-move-column-right, org-table-move-column-left)
(org-table-move-column, org-table-move-row-down)
(org-table-move-row-up, org-table-move-row)
(org-table-insert-row, org-table-insert-hline)
(org-table-hline-and-move, org-table-kill-row)
(org-table-sort-lines, org-table-cut-region)
(org-table-copy-region, org-table-paste-rectangle)
(org-table-convert, org-table-wrap-region)
(org-table-edit-field, org-table-sum)
(org-table-get-stored-formulas)
(org-table-maybe-eval-formula)
(org-table-rotate-recalc-marks)
(org-table-maybe-recalculate-line, org-table-eval-formula)
(org-table-recalculate, org-table-iterate)
(org-table-edit-formulas)
(org-table-toggle-coordinate-overlays)
(org-table-toggle-formula-debugger, orgtbl-to-generic)
(orgtbl-to-tsv, orgtbl-to-csv, orgtbl-to-latex)
(orgtbl-to-html, orgtbl-to-texinfo, orgtbl-to-orgtbl): Ditto.
2012-10-02 08:52:17 +00:00
|
|
|
;;;###autoload
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-dblock-write:columnview (params)
|
|
|
|
"Write the column view table.
|
|
|
|
PARAMS is a property list of parameters:
|
|
|
|
|
|
|
|
:width enforce same column widths with <N> specifiers.
|
|
|
|
:id the :ID: property of the entry where the columns view
|
2009-08-28 12:50:51 +00:00
|
|
|
should be built. When the symbol `local', call locally.
|
|
|
|
When `global' call column view with the cursor at the beginning
|
|
|
|
of the buffer (usually this means that the whole buffer switches
|
|
|
|
to column view). When \"file:path/to/file.org\", invoke column
|
|
|
|
view at the start of that file. Otherwise, the ID is located
|
|
|
|
using `org-id-find'.
|
2008-04-09 13:42:36 +00:00
|
|
|
:hlines When t, insert a hline before each item. When a number, insert
|
2009-08-28 12:50:51 +00:00
|
|
|
a hline before each level <= that number.
|
2008-04-09 13:42:36 +00:00
|
|
|
:vlines When t, make each column a colgroup to enforce vertical lines.
|
|
|
|
:maxlevel When set to a number, don't capture headlines below this level.
|
|
|
|
:skip-empty-rows
|
2012-08-12 09:48:44 +00:00
|
|
|
When t, skip rows where all specifiers other than ITEM are empty.
|
|
|
|
:format When non-nil, specify the column view format to use."
|
2012-12-20 04:46:41 +00:00
|
|
|
(let ((pos (point-marker))
|
2008-04-09 13:42:36 +00:00
|
|
|
(hlines (plist-get params :hlines))
|
|
|
|
(vlines (plist-get params :vlines))
|
|
|
|
(maxlevel (plist-get params :maxlevel))
|
2008-09-08 07:43:41 +00:00
|
|
|
(content-lines (org-split-string (plist-get params :content) "\n"))
|
2008-04-09 13:42:36 +00:00
|
|
|
(skip-empty-rows (plist-get params :skip-empty-rows))
|
2012-08-12 09:48:44 +00:00
|
|
|
(columns-fmt (plist-get params :format))
|
2012-04-21 13:36:04 +00:00
|
|
|
(case-fold-search t)
|
2008-12-22 07:13:20 +00:00
|
|
|
tbl id idpos nfields tmp recalc line
|
|
|
|
id-as-string view-file view-pos)
|
|
|
|
(when (setq id (plist-get params :id))
|
|
|
|
(setq id-as-string (cond ((numberp id) (number-to-string id))
|
|
|
|
((symbolp id) (symbol-name id))
|
|
|
|
((stringp id) id)
|
|
|
|
(t "")))
|
|
|
|
(cond ((not id) nil)
|
|
|
|
((eq id 'global) (setq view-pos (point-min)))
|
|
|
|
((eq id 'local))
|
|
|
|
((string-match "^file:\\(.*\\)" id-as-string)
|
|
|
|
(setq view-file (match-string 1 id-as-string)
|
|
|
|
view-pos 1)
|
|
|
|
(unless (file-exists-p view-file)
|
|
|
|
(error "No such file: \"%s\"" id-as-string)))
|
|
|
|
((setq idpos (org-find-entry-with-id id))
|
|
|
|
(setq view-pos idpos))
|
|
|
|
((setq idpos (org-id-find id))
|
|
|
|
(setq view-file (car idpos))
|
|
|
|
(setq view-pos (cdr idpos)))
|
|
|
|
(t (error "Cannot find entry with :ID: %s" id))))
|
|
|
|
(with-current-buffer (if view-file
|
|
|
|
(get-file-buffer view-file)
|
|
|
|
(current-buffer))
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(goto-char (or view-pos (point)))
|
2012-08-12 09:48:44 +00:00
|
|
|
(org-columns columns-fmt)
|
2008-12-22 07:13:20 +00:00
|
|
|
(setq tbl (org-columns-capture-view maxlevel skip-empty-rows))
|
|
|
|
(setq nfields (length (car tbl)))
|
|
|
|
(org-columns-quit))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(goto-char pos)
|
|
|
|
(move-marker pos nil)
|
|
|
|
(when tbl
|
|
|
|
(when (plist-get params :hlines)
|
|
|
|
(setq tmp nil)
|
|
|
|
(while tbl
|
|
|
|
(if (eq (car tbl) 'hline)
|
|
|
|
(push (pop tbl) tmp)
|
|
|
|
(if (string-match "\\` *\\(\\*+\\)" (caar tbl))
|
|
|
|
(if (and (not (eq (car tmp) 'hline))
|
|
|
|
(or (eq hlines t)
|
2008-12-22 07:13:20 +00:00
|
|
|
(and (numberp hlines)
|
|
|
|
(<= (- (match-end 1) (match-beginning 1))
|
|
|
|
hlines))))
|
2008-04-09 13:42:36 +00:00
|
|
|
(push 'hline tmp)))
|
|
|
|
(push (pop tbl) tmp)))
|
|
|
|
(setq tbl (nreverse tmp)))
|
|
|
|
(when vlines
|
|
|
|
(setq tbl (mapcar (lambda (x)
|
|
|
|
(if (eq 'hline x) x (cons "" x)))
|
|
|
|
tbl))
|
|
|
|
(setq tbl (append tbl (list (cons "/" (make-list nfields "<>"))))))
|
2008-09-08 07:43:41 +00:00
|
|
|
(when content-lines
|
|
|
|
(while (string-match "^#" (car content-lines))
|
|
|
|
(insert (pop content-lines) "\n")))
|
2013-09-22 06:07:58 +00:00
|
|
|
(setq pos (point))
|
2008-04-09 13:42:36 +00:00
|
|
|
(insert (org-listtable-to-string tbl))
|
|
|
|
(when (plist-get params :width)
|
|
|
|
(insert "\n|" (mapconcat (lambda (x) (format "<%d>" (max 3 x)))
|
|
|
|
org-columns-current-widths "|")))
|
2008-09-08 07:43:41 +00:00
|
|
|
(while (setq line (pop content-lines))
|
|
|
|
(when (string-match "^#" line)
|
|
|
|
(insert "\n" line)
|
2012-04-21 13:36:04 +00:00
|
|
|
(when (string-match "^[ \t]*#\\+tblfm" line)
|
2008-09-08 07:43:41 +00:00
|
|
|
(setq recalc t))))
|
|
|
|
(if recalc
|
|
|
|
(progn (goto-char pos) (org-table-recalculate 'all))
|
|
|
|
(goto-char pos)
|
|
|
|
(org-table-align)))))
|
2008-04-09 13:42:36 +00:00
|
|
|
|
|
|
|
(defun org-listtable-to-string (tbl)
|
|
|
|
"Convert a listtable TBL to a string that contains the Org-mode table.
|
2008-12-16 14:49:08 +00:00
|
|
|
The table still need to be aligned. The resulting string has no leading
|
2008-04-09 13:42:36 +00:00
|
|
|
and tailing newline characters."
|
|
|
|
(mapconcat
|
|
|
|
(lambda (x)
|
|
|
|
(cond
|
|
|
|
((listp x)
|
|
|
|
(concat "|" (mapconcat 'identity x "|") "|"))
|
|
|
|
((eq x 'hline) "|-|")
|
|
|
|
(t (error "Garbage in listtable: %s" x))))
|
|
|
|
tbl "\n"))
|
|
|
|
|
Update autoloads.
* org.el: Don't dynamically autoload already autoloaded
functions.
(org-clock-update-time-maybe): Move to org-clock.el.
* org-exp.el (org-insert-export-options-template): Remove
autoload cookie.
* org-clock.el (org-resolve-clocks, org-clock-in)
(org-clock-out, org-clock-cancel, org-clock-goto)
(org-clock-sum, org-clock-display, org-clock-report)
(org-dblock-write:clocktable): Add autoload cookie.
(org-clock-update-time-maybe): Moved from org.el.
* org-beamer.el (org-beamer-sectioning, org-beamer-mode): Ditto.
* org-ascii.el (org-export-ascii-preprocess): Ditto.
* org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling, org-toggle-archive-tag): Add
autoload cookie.
* org-colview.el (org-columns, org-dblock-write:columnview)
(org-insert-columns-dblock, org-agenda-columns): Ditto.
* org-table.el (org-table-create-with-table.el)
(org-table-create-or-convert-from-region, org-table-create)
(org-table-convert-region, org-table-import)
(org-table-export, org-table-align)
(org-table-justify-field-maybe, org-table-next-field)
(org-table-previous-field, org-table-next-row)
(org-table-copy-down, org-table-field-info)
(org-table-current-dline, org-table-goto-column)
(org-table-insert-column, org-table-delete-column)
(org-table-move-column-right, org-table-move-column-left)
(org-table-move-column, org-table-move-row-down)
(org-table-move-row-up, org-table-move-row)
(org-table-insert-row, org-table-insert-hline)
(org-table-hline-and-move, org-table-kill-row)
(org-table-sort-lines, org-table-cut-region)
(org-table-copy-region, org-table-paste-rectangle)
(org-table-convert, org-table-wrap-region)
(org-table-edit-field, org-table-sum)
(org-table-get-stored-formulas)
(org-table-maybe-eval-formula)
(org-table-rotate-recalc-marks)
(org-table-maybe-recalculate-line, org-table-eval-formula)
(org-table-recalculate, org-table-iterate)
(org-table-edit-formulas)
(org-table-toggle-coordinate-overlays)
(org-table-toggle-formula-debugger, orgtbl-to-generic)
(orgtbl-to-tsv, orgtbl-to-csv, orgtbl-to-latex)
(orgtbl-to-html, orgtbl-to-texinfo, orgtbl-to-orgtbl): Ditto.
2012-10-02 08:52:17 +00:00
|
|
|
;;;###autoload
|
2008-04-09 13:42:36 +00:00
|
|
|
(defun org-insert-columns-dblock ()
|
|
|
|
"Create a dynamic block capturing a column view table."
|
|
|
|
(interactive)
|
|
|
|
(let ((defaults '(:name "columnview" :hlines 1))
|
2009-08-19 08:33:17 +00:00
|
|
|
(id (org-icompleting-read
|
2008-04-09 13:42:36 +00:00
|
|
|
"Capture columns (local, global, entry with :ID: property) [local]: "
|
|
|
|
(append '(("global") ("local"))
|
|
|
|
(mapcar 'list (org-property-values "ID"))))))
|
|
|
|
(if (equal id "") (setq id 'local))
|
|
|
|
(if (equal id "global") (setq id 'global))
|
|
|
|
(setq defaults (append defaults (list :id id)))
|
|
|
|
(org-create-dblock defaults)
|
|
|
|
(org-update-dblock)))
|
|
|
|
|
2008-04-15 12:01:59 +00:00
|
|
|
;;; Column view in the agenda
|
|
|
|
|
|
|
|
(defvar org-agenda-view-columns-initially nil
|
|
|
|
"When set, switch to columns view immediately after creating the agenda.")
|
|
|
|
|
|
|
|
(defvar org-agenda-columns-show-summaries) ; defined in org-agenda.el
|
2008-04-17 16:26:27 +00:00
|
|
|
(defvar org-agenda-columns-compute-summary-properties); defined in org-agenda.el
|
2008-04-18 03:42:38 +00:00
|
|
|
(defvar org-agenda-columns-add-appointments-to-effort-sum); as well
|
2008-04-15 12:01:59 +00:00
|
|
|
|
Update autoloads.
* org.el: Don't dynamically autoload already autoloaded
functions.
(org-clock-update-time-maybe): Move to org-clock.el.
* org-exp.el (org-insert-export-options-template): Remove
autoload cookie.
* org-clock.el (org-resolve-clocks, org-clock-in)
(org-clock-out, org-clock-cancel, org-clock-goto)
(org-clock-sum, org-clock-display, org-clock-report)
(org-dblock-write:clocktable): Add autoload cookie.
(org-clock-update-time-maybe): Moved from org.el.
* org-beamer.el (org-beamer-sectioning, org-beamer-mode): Ditto.
* org-ascii.el (org-export-ascii-preprocess): Ditto.
* org-archive.el (org-archive-subtree)
(org-archive-to-archive-sibling, org-toggle-archive-tag): Add
autoload cookie.
* org-colview.el (org-columns, org-dblock-write:columnview)
(org-insert-columns-dblock, org-agenda-columns): Ditto.
* org-table.el (org-table-create-with-table.el)
(org-table-create-or-convert-from-region, org-table-create)
(org-table-convert-region, org-table-import)
(org-table-export, org-table-align)
(org-table-justify-field-maybe, org-table-next-field)
(org-table-previous-field, org-table-next-row)
(org-table-copy-down, org-table-field-info)
(org-table-current-dline, org-table-goto-column)
(org-table-insert-column, org-table-delete-column)
(org-table-move-column-right, org-table-move-column-left)
(org-table-move-column, org-table-move-row-down)
(org-table-move-row-up, org-table-move-row)
(org-table-insert-row, org-table-insert-hline)
(org-table-hline-and-move, org-table-kill-row)
(org-table-sort-lines, org-table-cut-region)
(org-table-copy-region, org-table-paste-rectangle)
(org-table-convert, org-table-wrap-region)
(org-table-edit-field, org-table-sum)
(org-table-get-stored-formulas)
(org-table-maybe-eval-formula)
(org-table-rotate-recalc-marks)
(org-table-maybe-recalculate-line, org-table-eval-formula)
(org-table-recalculate, org-table-iterate)
(org-table-edit-formulas)
(org-table-toggle-coordinate-overlays)
(org-table-toggle-formula-debugger, orgtbl-to-generic)
(orgtbl-to-tsv, orgtbl-to-csv, orgtbl-to-latex)
(orgtbl-to-html, orgtbl-to-texinfo, orgtbl-to-orgtbl): Ditto.
2012-10-02 08:52:17 +00:00
|
|
|
;;;###autoload
|
2008-04-15 12:01:59 +00:00
|
|
|
(defun org-agenda-columns ()
|
2008-04-18 13:24:58 +00:00
|
|
|
"Turn on or update column view in the agenda."
|
2008-04-15 12:01:59 +00:00
|
|
|
(interactive)
|
|
|
|
(org-verify-version 'columns)
|
|
|
|
(org-columns-remove-overlays)
|
|
|
|
(move-marker org-columns-begin-marker (point))
|
2009-10-30 03:33:28 +00:00
|
|
|
(let ((org-columns-time (time-to-number-of-days (current-time)))
|
2015-06-02 19:56:50 +00:00
|
|
|
(fmt
|
|
|
|
(cond
|
|
|
|
((org-bound-and-true-p org-agenda-overriding-columns-format))
|
|
|
|
((let ((m (org-get-at-bol 'org-hd-marker)))
|
|
|
|
(and m
|
|
|
|
(or (org-entry-get m "COLUMNS" t)
|
|
|
|
(with-current-buffer (marker-buffer m)
|
|
|
|
org-columns-default-format)))))
|
|
|
|
((and (local-variable-p 'org-columns-current-fmt)
|
|
|
|
org-columns-current-fmt))
|
|
|
|
((let ((m (next-single-property-change (point-min) 'org-hd-marker)))
|
|
|
|
(and m
|
|
|
|
(let ((m (get-text-property m 'org-hd-marker)))
|
|
|
|
(or (org-entry-get m "COLUMNS" t)
|
|
|
|
(with-current-buffer (marker-buffer m)
|
|
|
|
org-columns-default-format))))))
|
|
|
|
(t org-columns-default-format))))
|
2008-04-15 12:01:59 +00:00
|
|
|
(org-set-local 'org-columns-current-fmt fmt)
|
|
|
|
(org-columns-compile-format fmt)
|
2008-04-17 16:26:27 +00:00
|
|
|
(when org-agenda-columns-compute-summary-properties
|
|
|
|
(org-agenda-colview-compute org-columns-current-fmt-compiled))
|
2008-04-15 12:01:59 +00:00
|
|
|
(save-excursion
|
2015-06-02 19:56:50 +00:00
|
|
|
;; Collect properties for each headline in current view.
|
2008-04-15 12:01:59 +00:00
|
|
|
(goto-char (point-min))
|
2015-06-02 19:56:50 +00:00
|
|
|
(let (cache)
|
|
|
|
(let ((names (mapcar #'car org-columns-current-fmt-compiled)) m)
|
|
|
|
(while (not (eobp))
|
|
|
|
(when (setq m (or (org-get-at-bol 'org-hd-marker)
|
|
|
|
(org-get-at-bol 'org-marker)))
|
|
|
|
(push
|
|
|
|
(cons
|
|
|
|
(line-beginning-position)
|
|
|
|
(org-with-point-at m
|
|
|
|
(mapcar
|
|
|
|
(lambda (name)
|
|
|
|
(let ((value (org-entry-get (point) name 'selective t)))
|
|
|
|
(cons
|
|
|
|
name
|
|
|
|
(if (and org-agenda-columns-add-appointments-to-effort-sum
|
|
|
|
(not value)
|
|
|
|
(eq (compare-strings name nil nil
|
|
|
|
org-effort-property nil nil
|
|
|
|
t)
|
|
|
|
t)
|
|
|
|
;; Effort property is not defined. Try
|
|
|
|
;; to use appointment duration.
|
|
|
|
(get-text-property (point) 'duration))
|
|
|
|
(org-propertize
|
|
|
|
(org-minutes-to-clocksum-string
|
|
|
|
(get-text-property (point) 'duration))
|
|
|
|
'face 'org-warning)
|
|
|
|
value))))
|
|
|
|
names)))
|
|
|
|
cache))
|
|
|
|
(forward-line)))
|
|
|
|
(when cache
|
|
|
|
(org-set-local 'org-columns-current-maxwidths
|
|
|
|
(org-columns-get-autowidth-alist fmt cache))
|
|
|
|
(org-columns-display-here-title)
|
|
|
|
(when (org-set-local 'org-columns-flyspell-was-active
|
|
|
|
(org-bound-and-true-p flyspell-mode))
|
|
|
|
(flyspell-mode 0))
|
|
|
|
(dolist (x cache)
|
|
|
|
(goto-char (car x))
|
|
|
|
(org-columns-display-here (cdr x)))
|
|
|
|
(when org-agenda-columns-show-summaries
|
|
|
|
(org-agenda-colview-summarize cache)))))))
|
2008-04-15 12:01:59 +00:00
|
|
|
|
|
|
|
(defun org-agenda-colview-summarize (cache)
|
|
|
|
"Summarize the summarizable columns in column view in the agenda.
|
|
|
|
This will add overlays to the date lines, to show the summary for each day."
|
|
|
|
(let* ((fmt (mapcar (lambda (x)
|
2012-08-05 09:12:04 +00:00
|
|
|
(if (string-match "CLOCKSUM.*" (car x))
|
2012-08-31 05:56:58 +00:00
|
|
|
(list (match-string 0 (car x))
|
|
|
|
(nth 1 x) (nth 2 x) ":" 'add_times
|
2009-11-25 01:41:20 +00:00
|
|
|
nil '+ nil)
|
|
|
|
x))
|
2008-04-15 12:01:59 +00:00
|
|
|
org-columns-current-fmt-compiled))
|
2009-12-11 07:49:44 +00:00
|
|
|
line c c1 stype calc sumfunc props lsum entries prop v title)
|
2008-04-17 16:26:27 +00:00
|
|
|
(catch 'exit
|
|
|
|
(when (delq nil (mapcar 'cadr fmt))
|
|
|
|
;; OK, at least one summation column, it makes sense to try this
|
|
|
|
(goto-char (point-max))
|
|
|
|
(while t
|
|
|
|
(when (or (get-text-property (point) 'org-date-line)
|
|
|
|
(eq (get-text-property (point) 'face)
|
|
|
|
'org-agenda-structure))
|
|
|
|
;; OK, this is a date line that should be used
|
|
|
|
(setq line (org-current-line))
|
|
|
|
(setq entries nil c cache cache nil)
|
|
|
|
(while (setq c1 (pop c))
|
|
|
|
(if (> (car c1) line)
|
|
|
|
(push c1 entries)
|
|
|
|
(push c1 cache)))
|
|
|
|
;; now ENTRIES are the ones we want to use, CACHE is the rest
|
|
|
|
;; Compute the summaries for the properties we want,
|
|
|
|
;; set nil properties for the rest.
|
|
|
|
(when (setq entries (mapcar 'cdr entries))
|
|
|
|
(setq props
|
|
|
|
(mapcar
|
|
|
|
(lambda (f)
|
2009-11-10 02:42:17 +00:00
|
|
|
(setq prop (car f)
|
2009-11-25 01:41:20 +00:00
|
|
|
title (nth 1 f)
|
|
|
|
stype (nth 4 f)
|
|
|
|
sumfunc (nth 6 f)
|
|
|
|
calc (or (nth 7 f) 'identity))
|
2008-04-17 16:26:27 +00:00
|
|
|
(cond
|
|
|
|
((equal prop "ITEM")
|
|
|
|
(cons prop (buffer-substring (point-at-bol)
|
|
|
|
(point-at-eol))))
|
|
|
|
((not stype) (cons prop ""))
|
2009-11-10 02:42:17 +00:00
|
|
|
(t ;; do the summary
|
|
|
|
(setq lsum nil)
|
|
|
|
(dolist (x entries)
|
2015-01-07 17:08:51 +00:00
|
|
|
(setq v (cdr (assoc-string prop x t)))
|
2009-11-10 02:42:17 +00:00
|
|
|
(if v
|
|
|
|
(push
|
|
|
|
(funcall
|
|
|
|
(if (not (get-text-property 0 'org-computed v))
|
|
|
|
calc
|
|
|
|
'identity)
|
|
|
|
(org-columns-string-to-number
|
|
|
|
v stype))
|
|
|
|
lsum)))
|
|
|
|
(setq lsum (remove nil lsum))
|
|
|
|
(setq lsum
|
|
|
|
(cond ((> (length lsum) 1)
|
|
|
|
(org-columns-number-to-string
|
|
|
|
(apply sumfunc lsum) stype))
|
|
|
|
((eq (length lsum) 1)
|
|
|
|
(org-columns-number-to-string
|
|
|
|
(car lsum) stype))
|
|
|
|
(t "")))
|
|
|
|
(put-text-property 0 (length lsum) 'face 'bold lsum)
|
2009-11-12 09:34:50 +00:00
|
|
|
(unless (eq calc 'identity)
|
|
|
|
(put-text-property 0 (length lsum) 'org-computed t lsum))
|
2008-04-17 16:26:27 +00:00
|
|
|
(cons prop lsum))))
|
|
|
|
fmt))
|
2008-11-17 16:49:58 +00:00
|
|
|
(org-columns-display-here props 'dateline)
|
2008-04-17 16:26:27 +00:00
|
|
|
(org-set-local 'org-agenda-columns-active t)))
|
|
|
|
(if (bobp) (throw 'exit t))
|
2008-04-15 12:01:59 +00:00
|
|
|
(beginning-of-line 0))))))
|
|
|
|
|
|
|
|
(defun org-agenda-colview-compute (fmt)
|
|
|
|
"Compute the relevant columns in the contributing source buffers."
|
2008-04-17 16:26:27 +00:00
|
|
|
(let ((files org-agenda-contributing-files)
|
|
|
|
(org-columns-begin-marker (make-marker))
|
|
|
|
(org-columns-top-level-marker (make-marker))
|
|
|
|
f fm a b)
|
|
|
|
(while (setq f (pop files))
|
|
|
|
(setq b (find-buffer-visiting f))
|
|
|
|
(with-current-buffer (or (buffer-base-buffer b) b)
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
2013-02-25 10:44:27 +00:00
|
|
|
(org-with-silent-modifications
|
|
|
|
(remove-text-properties (point-min) (point-max) '(org-summaries t)))
|
2008-04-17 16:26:27 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(org-columns-get-format-and-top-level)
|
|
|
|
(while (setq fm (pop fmt))
|
2012-08-05 09:12:04 +00:00
|
|
|
(cond ((equal (car fm) "CLOCKSUM")
|
|
|
|
(org-clock-sum))
|
|
|
|
((equal (car fm) "CLOCKSUM_T")
|
|
|
|
(org-clock-sum-today))
|
|
|
|
((and (nth 4 fm)
|
2015-01-07 17:08:51 +00:00
|
|
|
(setq a (assoc-string (car fm)
|
|
|
|
org-columns-current-fmt-compiled
|
|
|
|
t))
|
2012-08-05 09:12:04 +00:00
|
|
|
(equal (nth 4 a) (nth 4 fm)))
|
|
|
|
(org-columns-compute (car fm)))))))))))
|
2008-04-15 12:01:59 +00:00
|
|
|
|
2009-08-28 12:50:51 +00:00
|
|
|
(defun org-format-time-period (interval)
|
2010-07-15 20:26:51 +00:00
|
|
|
"Convert time in fractional days to days/hours/minutes/seconds."
|
2009-08-28 12:50:51 +00:00
|
|
|
(if (numberp interval)
|
2012-08-11 17:10:44 +00:00
|
|
|
(let* ((days (floor interval))
|
|
|
|
(frac-hours (* 24 (- interval days)))
|
|
|
|
(hours (floor frac-hours))
|
|
|
|
(minutes (floor (* 60 (- frac-hours hours))))
|
|
|
|
(seconds (floor (* 60 (- (* 60 (- frac-hours hours)) minutes)))))
|
|
|
|
(format "%dd %02dh %02dm %02ds" days hours minutes seconds))
|
2009-08-28 12:50:51 +00:00
|
|
|
""))
|
|
|
|
|
2010-06-22 07:36:10 +00:00
|
|
|
(defun org-estimate-mean-and-var (v)
|
|
|
|
"Return the mean and variance of an estimate."
|
2014-12-16 22:48:41 +00:00
|
|
|
(let* ((v (cond ((consp v) v)
|
|
|
|
((numberp v) (list v v))
|
|
|
|
(t (error "Invalid estimate type"))))
|
|
|
|
(low (float (car v)))
|
2010-06-22 07:36:10 +00:00
|
|
|
(high (float (cadr v)))
|
|
|
|
(mean (/ (+ low high) 2.0))
|
|
|
|
(var (/ (+ (expt (- mean low) 2.0) (expt (- high mean) 2.0)) 2.0)))
|
2010-07-19 11:56:17 +00:00
|
|
|
(list mean var)))
|
2010-06-22 07:36:10 +00:00
|
|
|
|
|
|
|
(defun org-estimate-combine (&rest el)
|
|
|
|
"Combine a list of estimates, using mean and variance.
|
|
|
|
The mean and variance of the result will be the sum of the means
|
|
|
|
and variances (respectively) of the individual estimates."
|
|
|
|
(let ((mean 0)
|
|
|
|
(var 0))
|
|
|
|
(mapc (lambda (e)
|
2012-08-11 17:10:44 +00:00
|
|
|
(let ((stats (org-estimate-mean-and-var e)))
|
|
|
|
(setq mean (+ mean (car stats)))
|
|
|
|
(setq var (+ var (cadr stats)))))
|
|
|
|
el)
|
2010-06-22 07:36:10 +00:00
|
|
|
(let ((stdev (sqrt var)))
|
2010-07-19 11:56:17 +00:00
|
|
|
(list (- mean stdev) (+ mean stdev)))))
|
2010-06-22 07:36:10 +00:00
|
|
|
|
|
|
|
(defun org-estimate-print (e &optional fmt)
|
2010-07-19 11:56:17 +00:00
|
|
|
"Prepare a string representation of an estimate.
|
|
|
|
This formats these numbers as two numbers with a \"-\" between them."
|
2014-12-16 22:48:41 +00:00
|
|
|
(let ((fmt (or fmt "%.0f"))
|
|
|
|
(e (cond ((consp e) e)
|
|
|
|
((numberp e) (list e e))
|
|
|
|
(t (error "Invalid estimate type")))))
|
|
|
|
(format "%s" (mapconcat (lambda (n) (format fmt n)) e "-"))))
|
2010-06-22 07:36:10 +00:00
|
|
|
|
|
|
|
(defun org-string-to-estimate (s)
|
2010-07-19 11:56:17 +00:00
|
|
|
"Convert a string to an estimate.
|
|
|
|
The string should be two numbers joined with a \"-\"."
|
2010-06-22 07:36:10 +00:00
|
|
|
(if (string-match "\\(.*\\)-\\(.*\\)" s)
|
2010-07-19 11:56:17 +00:00
|
|
|
(list (string-to-number (match-string 1 s))
|
|
|
|
(string-to-number(match-string 2 s)))
|
|
|
|
(list (string-to-number s) (string-to-number s))))
|
2009-08-28 12:50:51 +00:00
|
|
|
|
2008-04-09 13:42:36 +00:00
|
|
|
(provide 'org-colview)
|
|
|
|
|
2008-04-29 05:15:41 +00:00
|
|
|
;;; org-colview.el ends here
|