2008-09-23 02:03:13 -04:00
|
|
|
;;; org-list.el --- Plain lists for Org-mode
|
|
|
|
;;
|
2010-04-07 10:26:10 -04:00
|
|
|
;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
2009-01-26 03:42:33 -05:00
|
|
|
;; Free Software Foundation, Inc.
|
2008-09-23 02:03:13 -04:00
|
|
|
;;
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
2008-12-16 11:17:15 -05:00
|
|
|
;; Bastien Guerry <bzg AT altern DOT org>
|
2008-09-23 02:03:13 -04:00
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
|
|
;; Homepage: http://orgmode.org
|
2010-07-19 02:33:24 -04:00
|
|
|
;; Version: 7.01trans
|
2008-09-23 02:03:13 -04:00
|
|
|
;;
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;;
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2008-12-16 11:17:15 -05:00
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
2008-09-23 02:03:13 -04:00
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; This file contains the code dealing with plain lists in Org-mode.
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2010-05-13 12:02:05 -04:00
|
|
|
(eval-when-compile
|
|
|
|
(require 'cl))
|
2008-09-23 02:03:13 -04:00
|
|
|
(require 'org-macs)
|
|
|
|
(require 'org-compat)
|
|
|
|
|
|
|
|
(defvar org-blank-before-new-entry)
|
|
|
|
(defvar org-M-RET-may-split-line)
|
2009-08-03 07:28:24 -04:00
|
|
|
(defvar org-complex-heading-regexp)
|
|
|
|
(defvar org-odd-levels-only)
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(declare-function org-invisible-p "org" ())
|
|
|
|
(declare-function org-on-heading-p "org" (&optional invisible-ok))
|
2008-11-08 16:00:03 -05:00
|
|
|
(declare-function outline-next-heading "outline" ())
|
2008-09-23 02:03:13 -04:00
|
|
|
(declare-function org-back-to-heading "org" (&optional invisible-ok))
|
|
|
|
(declare-function org-back-over-empty-lines "org" ())
|
|
|
|
(declare-function org-skip-whitespace "org" ())
|
|
|
|
(declare-function org-trim "org" (s))
|
|
|
|
(declare-function org-get-indentation "org" (&optional line))
|
2008-11-25 14:42:06 -05:00
|
|
|
(declare-function org-timer-item "org-timer" (&optional arg))
|
2009-01-06 11:23:36 -05:00
|
|
|
(declare-function org-combine-plists "org" (&rest plists))
|
2010-08-27 16:35:09 -04:00
|
|
|
(declare-function org-entry-get "org"
|
|
|
|
(pom property &optional inherit literal-nil))
|
2009-05-05 04:33:12 -04:00
|
|
|
(declare-function org-narrow-to-subtree "org" ())
|
|
|
|
(declare-function org-show-subtree "org" ())
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defgroup org-plain-lists nil
|
|
|
|
"Options concerning plain lists in Org-mode."
|
|
|
|
:tag "Org Plain lists"
|
|
|
|
:group 'org-structure)
|
|
|
|
|
2009-07-01 03:34:13 -04:00
|
|
|
(defcustom org-cycle-include-plain-lists t
|
|
|
|
"When t, make TAB cycle visibility on plain list items.
|
|
|
|
|
|
|
|
Cycling plain lists works only when the cursor is on a plain list
|
|
|
|
item. When the cursor is on an outline heading, plain lists are
|
|
|
|
treated as text. This is the most stable way of handling this,
|
|
|
|
which is why it is the default.
|
|
|
|
|
|
|
|
When this is the symbol `integrate', then during cycling, plain
|
|
|
|
list items will *temporarily* be interpreted as outline headlines
|
|
|
|
with a level given by 1000+i where i is the indentation of the
|
|
|
|
bullet. This setting can lead to strange effects when switching
|
|
|
|
visibility to `children', because the first \"child\" in a
|
|
|
|
subtree decides what children should be listed. If that first
|
|
|
|
\"child\" is a plain list item with an implied large level
|
|
|
|
number, all true children and grand children of the outline
|
|
|
|
heading will be exposed in a children' view."
|
2008-09-23 02:03:13 -04:00
|
|
|
:group 'org-plain-lists
|
2009-07-01 03:34:13 -04:00
|
|
|
:type '(choice
|
|
|
|
(const :tag "Never" nil)
|
2009-07-01 03:42:24 -04:00
|
|
|
(const :tag "With cursor in plain list (recommended)" t)
|
|
|
|
(const :tag "As children of outline headings" integrate)))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2009-07-06 02:53:50 -04:00
|
|
|
(defcustom org-list-demote-modify-bullet nil
|
|
|
|
"Default bullet type installed when demoting an item.
|
|
|
|
This is an association list, for each bullet type, this alist will point
|
2010-05-23 01:11:01 -04:00
|
|
|
to the bullet that should be used when this item is demoted.
|
|
|
|
For example,
|
|
|
|
|
|
|
|
(setq org-list-demote-modify-bullet
|
|
|
|
'((\"+\" . \"-\") (\"-\" . \"+\") (\"*\" . \"+\")))
|
|
|
|
|
|
|
|
will make
|
|
|
|
|
|
|
|
+ Movies
|
|
|
|
+ Silence of the Lambs
|
|
|
|
+ My Cousin Vinny
|
|
|
|
+ Books
|
|
|
|
+ The Hunt for Red October
|
|
|
|
+ The Road to Omaha
|
|
|
|
|
|
|
|
into
|
|
|
|
|
|
|
|
+ Movies
|
|
|
|
- Silence of the Lambs
|
|
|
|
- My Cousin Vinny
|
|
|
|
+ Books
|
|
|
|
- The Hunt for Red October
|
|
|
|
- The Road to Omaha"
|
2009-07-06 02:53:50 -04:00
|
|
|
:group 'org-plain-lists
|
|
|
|
:type '(repeat
|
|
|
|
(cons
|
|
|
|
(choice :tag "If the current bullet is "
|
|
|
|
(const "-")
|
|
|
|
(const "+")
|
|
|
|
(const "*")
|
|
|
|
(const "1.")
|
|
|
|
(const "1)"))
|
|
|
|
(choice :tag "demotion will change it to"
|
|
|
|
(const "-")
|
|
|
|
(const "+")
|
|
|
|
(const "*")
|
|
|
|
(const "1.")
|
|
|
|
(const "1)")))))
|
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
(defcustom org-plain-list-ordered-item-terminator t
|
|
|
|
"The character that makes a line with leading number an ordered list item.
|
|
|
|
Valid values are ?. and ?\). To get both terminators, use t. While
|
|
|
|
?. may look nicer, it creates the danger that a line with leading
|
|
|
|
number may be incorrectly interpreted as an item. ?\) therefore is
|
|
|
|
the safe choice."
|
|
|
|
:group 'org-plain-lists
|
|
|
|
:type '(choice (const :tag "dot like in \"2.\"" ?.)
|
|
|
|
(const :tag "paren like in \"2)\"" ?\))
|
|
|
|
(const :tab "both" t)))
|
|
|
|
|
2008-11-21 00:54:46 -05:00
|
|
|
(defcustom org-list-two-spaces-after-bullet-regexp nil
|
|
|
|
"A regular expression matching bullets that should have 2 spaces after them.
|
|
|
|
When nil, no bullet will have two spaces after them.
|
2010-07-10 11:02:58 -04:00
|
|
|
When a string, it will be used as a regular expression. When the
|
|
|
|
bullet type of a list is changed, the new bullet type will be
|
|
|
|
matched against this regexp. If it matches, there will be two
|
2010-07-17 17:00:22 -04:00
|
|
|
spaces instead of one after the bullet in each item of the list."
|
2010-04-21 03:51:30 -04:00
|
|
|
:group 'org-plain-lists
|
2008-11-21 00:54:46 -05:00
|
|
|
:type '(choice
|
|
|
|
(const :tag "never" nil)
|
|
|
|
(regexp)))
|
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
(defcustom org-empty-line-terminates-plain-lists nil
|
2010-01-21 10:15:40 -05:00
|
|
|
"Non-nil means an empty line ends all plain list levels.
|
2010-07-13 09:52:11 -04:00
|
|
|
Otherwise, look for `org-list-end-regexp'."
|
2008-09-23 02:03:13 -04:00
|
|
|
:group 'org-plain-lists
|
|
|
|
:type 'boolean)
|
|
|
|
|
2010-07-14 03:31:12 -04:00
|
|
|
(defcustom org-list-end-regexp "^[ \t]*\n[ \t]*\n"
|
2010-07-13 09:52:11 -04:00
|
|
|
"Regexp matching the end of all plain list levels.
|
|
|
|
It must start with \"^\" and end with \"\\n\". It defaults to 2
|
2010-07-14 03:31:12 -04:00
|
|
|
blank lines. `org-empty-line-terminates-plain-lists' has
|
2010-07-13 09:52:11 -04:00
|
|
|
precedence over it."
|
|
|
|
:group 'org-plain-lists
|
|
|
|
:type 'string)
|
|
|
|
|
2010-07-23 14:36:42 -04:00
|
|
|
(defcustom org-list-automatic-rules '((bullet . t)
|
|
|
|
(checkbox . t)
|
|
|
|
(indent . t)
|
|
|
|
(insert . t)
|
|
|
|
(renumber . t))
|
|
|
|
"Non-nil means apply set of rules when acting on lists.
|
|
|
|
|
|
|
|
By default, automatic actions are taken when using
|
|
|
|
\\[org-shiftmetaup], \\[org-shiftmetadown], \\[org-meta-return],
|
|
|
|
\\[org-metaright], \\[org-metaleft], \\[org-shiftmetaright],
|
|
|
|
\\[org-shiftmetaleft], \\[org-ctrl-c-minus] or
|
|
|
|
\\[org-insert-todo-heading]. You can disable individually these
|
|
|
|
rules by setting sets to nil. Valid sets are:
|
|
|
|
|
|
|
|
bullet when non-nil, cycling bullet do not allow lists at
|
|
|
|
column 0 to have * as a bullet and descriptions lists
|
|
|
|
to be numbered.
|
|
|
|
checkbox when non-nil, checkbox statistics is updated each time
|
|
|
|
you either insert a new checkbox or toggle a checkbox.
|
|
|
|
indent when non-nil indenting or outdenting list top-item will
|
|
|
|
move the whole list, indenting the first item of a
|
|
|
|
sub-list will be forbidden and outdenting a list whose
|
|
|
|
bullet is * to column 0 will change that bullet to -.
|
|
|
|
insert when non-nil, trying to insert an item inside a block
|
|
|
|
will insert it right before the block instead of
|
|
|
|
throwing an error.
|
|
|
|
renumber when non-nil, renumber ordered plain lists whenever it
|
|
|
|
is modified. You can always use \\[org-ctrl-c-ctrl-c]
|
|
|
|
to trigger renumbering."
|
|
|
|
:group 'org-plain-lists
|
|
|
|
:type '(alist :tag "Sets of rules"
|
|
|
|
:key-type
|
|
|
|
(choice
|
|
|
|
(const :tag "Bullet" bullet)
|
|
|
|
(const :tag "Checkbox" checkbox)
|
|
|
|
(const :tag "Indent" indent)
|
|
|
|
(const :tag "Insert" insert)
|
|
|
|
(const :tag "Renumber" renumber))
|
|
|
|
:value-type
|
|
|
|
(boolean :tag "Activate" :value t)))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2009-05-08 11:34:40 -04:00
|
|
|
(defcustom org-hierarchical-checkbox-statistics t
|
2010-01-21 10:15:40 -05:00
|
|
|
"Non-nil means checkbox statistics counts only the state of direct children.
|
2009-08-18 10:43:55 -04:00
|
|
|
When nil, all boxes below the cookie are counted.
|
2009-11-12 07:39:29 -05:00
|
|
|
This can be set to nil on a per-node basis using a COOKIE_DATA property
|
2009-08-18 10:43:55 -04:00
|
|
|
with the word \"recursive\" in the value."
|
2009-05-08 11:34:40 -04:00
|
|
|
:group 'org-plain-lists
|
|
|
|
:type 'boolean)
|
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
(defcustom org-description-max-indent 20
|
|
|
|
"Maximum indentation for the second line of a description list.
|
|
|
|
When the indentation would be larger than this, it will become
|
|
|
|
5 characters instead."
|
|
|
|
:group 'org-plain-lists
|
|
|
|
:type 'integer)
|
|
|
|
|
|
|
|
(defcustom org-list-radio-list-templates
|
|
|
|
'((latex-mode "% BEGIN RECEIVE ORGLST %n
|
|
|
|
% END RECEIVE ORGLST %n
|
|
|
|
\\begin{comment}
|
|
|
|
#+ORGLST: SEND %n org-list-to-latex
|
2010-07-12 08:44:51 -04:00
|
|
|
-
|
2008-09-23 02:03:13 -04:00
|
|
|
\\end{comment}\n")
|
|
|
|
(texinfo-mode "@c BEGIN RECEIVE ORGLST %n
|
|
|
|
@c END RECEIVE ORGLST %n
|
|
|
|
@ignore
|
|
|
|
#+ORGLST: SEND %n org-list-to-texinfo
|
2010-07-12 08:44:51 -04:00
|
|
|
-
|
2008-09-23 02:03:13 -04:00
|
|
|
@end ignore\n")
|
|
|
|
(html-mode "<!-- BEGIN RECEIVE ORGLST %n -->
|
|
|
|
<!-- END RECEIVE ORGLST %n -->
|
|
|
|
<!--
|
|
|
|
#+ORGLST: SEND %n org-list-to-html
|
2010-07-12 08:44:51 -04:00
|
|
|
-
|
2008-09-23 02:03:13 -04:00
|
|
|
-->\n"))
|
|
|
|
"Templates for radio lists in different major modes.
|
|
|
|
All occurrences of %n in a template will be replaced with the name of the
|
|
|
|
list, obtained by prompting the user."
|
|
|
|
:group 'org-plain-lists
|
|
|
|
:type '(repeat
|
|
|
|
(list (symbol :tag "Major mode")
|
|
|
|
(string :tag "Format"))))
|
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
;;; Internal functions
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
(defun org-list-end-re ()
|
|
|
|
"Return the regex corresponding to the end of a list.
|
|
|
|
It depends on `org-empty-line-terminates-plain-lists'."
|
|
|
|
(if org-empty-line-terminates-plain-lists
|
2010-07-13 09:52:11 -04:00
|
|
|
"^[ \t]*\n"
|
|
|
|
org-list-end-regexp))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-04-21 09:52:01 -04:00
|
|
|
(defun org-item-re (&optional general)
|
|
|
|
"Return the correct regular expression for plain lists.
|
|
|
|
If GENERAL is non-nil, return the general regexp independent of the value
|
|
|
|
of `org-plain-list-ordered-item-terminator'."
|
|
|
|
(cond
|
|
|
|
((or general (eq org-plain-list-ordered-item-terminator t))
|
|
|
|
"\\([ \t]*\\([-+]\\|\\([0-9]+[.)]\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
|
|
|
|
((= org-plain-list-ordered-item-terminator ?.)
|
|
|
|
"\\([ \t]*\\([-+]\\|\\([0-9]+\\.\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
|
|
|
|
((= org-plain-list-ordered-item-terminator ?\))
|
|
|
|
"\\([ \t]*\\([-+]\\|\\([0-9]+)\\)\\)\\|[ \t]+\\*\\)\\( \\|$\\)")
|
|
|
|
(t (error "Invalid value of `org-plain-list-ordered-item-terminator'"))))
|
|
|
|
|
2010-07-20 15:13:37 -04:00
|
|
|
(defconst org-item-beginning-re (concat "^" (org-item-re))
|
|
|
|
"Regexp matching the beginning of a plain list item.")
|
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
(defun org-list-terminator-between (min max &optional firstp)
|
|
|
|
"Find the position of a list ender between MIN and MAX, or nil.
|
|
|
|
This function looks for `org-list-end-re' not matching a block.
|
|
|
|
|
|
|
|
If FIRSTP in non-nil, return the point at the beginning of the
|
|
|
|
nearest valid terminator from min. Otherwise, return the point at
|
|
|
|
the end of the nearest terminator from max."
|
|
|
|
(save-excursion
|
|
|
|
(let* ((start (if firstp min max))
|
|
|
|
(end (if firstp max min))
|
|
|
|
(search-fun (if firstp
|
|
|
|
#'org-search-forward-unenclosed
|
|
|
|
#'org-search-backward-unenclosed))
|
|
|
|
(list-end-p (progn
|
|
|
|
(goto-char start)
|
2010-07-17 05:27:58 -04:00
|
|
|
(funcall search-fun (org-list-end-re) end t))))
|
2010-07-10 11:02:58 -04:00
|
|
|
;; Is there a valid list terminator somewhere ?
|
|
|
|
(and list-end-p
|
|
|
|
;; we want to be on the first line of the list ender
|
|
|
|
(match-beginning 0)))))
|
|
|
|
|
2010-07-19 05:33:20 -04:00
|
|
|
(defun org-list-search-unenclosed-generic (search-fun regexp bound noerror count)
|
2010-07-17 05:27:58 -04:00
|
|
|
"Search for REGEXP with SEARCH-FUN but don't stop inside blocks or at protected places."
|
2010-07-12 04:48:17 -04:00
|
|
|
(let ((origin (point)))
|
|
|
|
(cond
|
|
|
|
;; nothing found: return nil
|
2010-07-17 05:27:58 -04:00
|
|
|
((not (funcall search-fun regexp bound noerror count)) nil)
|
2010-07-14 09:40:12 -04:00
|
|
|
((or (save-match-data
|
|
|
|
(org-in-regexps-block-p "^[ \t]*#\\+\\(begin\\|BEGIN\\)_\\([a-zA-Z0-9_]+\\)"
|
|
|
|
'(concat "^[ \t]*#\\+\\(end\\|END\\)_" (match-string 2))))
|
|
|
|
(get-text-property (match-beginning 0) 'org-protected))
|
2010-07-20 09:58:48 -04:00
|
|
|
;; match is enclosed or protected: start again, searching one
|
|
|
|
;; occurrence away.
|
2010-07-12 04:48:17 -04:00
|
|
|
(goto-char origin)
|
2010-07-19 05:33:20 -04:00
|
|
|
(org-list-search-unenclosed-generic search-fun regexp bound noerror (1+ count)))
|
2010-07-14 09:40:12 -04:00
|
|
|
;; else return point.
|
2010-07-17 05:27:58 -04:00
|
|
|
(t (point)))))
|
2010-07-12 04:48:17 -04:00
|
|
|
|
2010-07-17 05:27:58 -04:00
|
|
|
(defun org-search-backward-unenclosed (regexp &optional bound noerror)
|
|
|
|
"Like `re-search-backward' but don't stop inside blocks or at protected places."
|
2010-07-19 05:33:20 -04:00
|
|
|
(org-list-search-unenclosed-generic #'re-search-backward regexp bound noerror 1))
|
2010-07-12 04:48:17 -04:00
|
|
|
|
2010-07-17 05:27:58 -04:00
|
|
|
(defun org-search-forward-unenclosed (regexp &optional bound noerror)
|
|
|
|
"Like `re-search-forward' but don't stop inside blocks or at protected places."
|
2010-07-19 05:33:20 -04:00
|
|
|
(org-list-search-unenclosed-generic #'re-search-forward regexp bound noerror 1))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
2010-07-19 05:21:22 -04:00
|
|
|
(defun org-list-at-regexp-after-bullet-p (regexp)
|
|
|
|
"Is point at a list item with REGEXP after bullet?"
|
|
|
|
(and (org-at-item-p)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(skip-chars-forward " \t")
|
|
|
|
(looking-at regexp))))
|
|
|
|
|
2010-07-19 05:33:20 -04:00
|
|
|
(defun org-list-get-item-same-level (search-fun pos limit pre-move)
|
2010-07-10 11:02:58 -04:00
|
|
|
"Return point at the beginning of next item at the same level.
|
|
|
|
Search items using function SEARCH-FUN, from POS to LIMIT. It
|
2010-07-20 09:58:48 -04:00
|
|
|
uses PRE-MOVE before search. Return nil if no item was found."
|
2010-07-10 11:02:58 -04:00
|
|
|
(save-excursion
|
2010-07-20 09:58:48 -04:00
|
|
|
(goto-char pos)
|
|
|
|
(let ((ind (progn
|
2010-07-14 10:37:24 -04:00
|
|
|
(org-beginning-of-item)
|
|
|
|
(org-get-indentation)))
|
|
|
|
(start (point-at-bol)))
|
2010-07-20 09:58:48 -04:00
|
|
|
;; We don't want to match the current line.
|
2010-07-10 11:02:58 -04:00
|
|
|
(funcall pre-move)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; Skip any sublist on the way
|
2010-07-20 15:13:37 -04:00
|
|
|
(while (and (funcall search-fun org-item-beginning-re limit t)
|
2010-07-20 09:58:48 -04:00
|
|
|
(> (org-get-indentation) ind)))
|
2010-07-10 11:02:58 -04:00
|
|
|
(when (and (/= (point-at-bol) start) ; Have we moved ?
|
|
|
|
(= (org-get-indentation) ind))
|
|
|
|
(point-at-bol)))))
|
|
|
|
|
2010-07-19 05:33:20 -04:00
|
|
|
(defun org-list-insert-item-generic (pos &optional checkbox after-bullet)
|
|
|
|
"Insert a new list item at POS.
|
2010-07-15 12:28:01 -04:00
|
|
|
|
|
|
|
If POS is before first character after bullet of the item, the
|
|
|
|
new item will be created before the current one.
|
|
|
|
|
|
|
|
Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET
|
|
|
|
after the bullet. Cursor will be after this text once the
|
2010-07-18 05:04:15 -04:00
|
|
|
function ends."
|
2010-07-15 12:28:01 -04:00
|
|
|
(goto-char pos)
|
2010-07-23 14:36:42 -04:00
|
|
|
;; Is point in a special block?
|
2010-07-15 12:28:01 -04:00
|
|
|
(when (org-in-regexps-block-p
|
|
|
|
"^[ \t]*#\\+\\(begin\\|BEGIN\\)_\\([a-zA-Z0-9_]+\\)"
|
|
|
|
'(concat "^[ \t]*#\\+\\(end\\|END\\)_" (match-string 2)))
|
2010-07-23 14:36:42 -04:00
|
|
|
(if (not (cdr (assq 'insert org-list-automatic-rules)))
|
|
|
|
;; Rule in `org-list-automatic-rules' disallows insertion.
|
|
|
|
(error "Cannot insert item inside a block.")
|
|
|
|
;; Else, move before it prior to add a new item.
|
|
|
|
(end-of-line)
|
|
|
|
(re-search-backward "^[ \t]*#\\+\\(begin\\|BEGIN\\)_" nil t)
|
|
|
|
(end-of-line 0)))
|
2010-07-15 12:28:01 -04:00
|
|
|
(let* ((true-pos (point))
|
2010-07-17 04:05:05 -04:00
|
|
|
(bullet (and (org-beginning-of-item)
|
2010-07-20 15:13:37 -04:00
|
|
|
(looking-at org-item-beginning-re)
|
2010-07-17 04:05:05 -04:00
|
|
|
(match-string 0)))
|
2010-07-15 12:28:01 -04:00
|
|
|
(before-p (progn
|
2010-07-19 05:21:22 -04:00
|
|
|
;; Description item: text starts after colons.
|
|
|
|
(or (org-at-description-p)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; At a checkbox: text starts after it.
|
2010-07-15 12:28:01 -04:00
|
|
|
(org-at-item-checkbox-p)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; Otherwise, text starts after bullet.
|
2010-07-15 12:28:01 -04:00
|
|
|
(org-at-item-p))
|
2010-07-17 04:05:05 -04:00
|
|
|
(<= true-pos (match-end 0))))
|
2010-07-15 12:28:01 -04:00
|
|
|
;; Guess number of blank lines used to separate items.
|
|
|
|
(blank-lines-nb
|
|
|
|
(let ((insert-blank-p
|
|
|
|
(cdr (assq 'plain-list-item org-blank-before-new-entry))))
|
|
|
|
(cond
|
2010-07-21 05:18:31 -04:00
|
|
|
;; Trivial cases where there should be none.
|
2010-07-20 09:58:48 -04:00
|
|
|
((or org-empty-line-terminates-plain-lists
|
|
|
|
(not insert-blank-p)) 0)
|
2010-07-21 05:18:31 -04:00
|
|
|
;; When `org-blank-before-new-entry' says so, or item is
|
|
|
|
;; alone in the whole list, it is 1.
|
|
|
|
((or (eq insert-blank-p t)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (org-list-top-point))
|
|
|
|
(end-of-line)
|
|
|
|
(not (org-search-forward-unenclosed
|
|
|
|
org-item-beginning-re (org-list-bottom-point) t)))) 1)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; plain-list-item is 'auto. Count blank lines separating
|
2010-07-18 05:04:15 -04:00
|
|
|
;; neighbours items in list.
|
2010-07-20 09:58:48 -04:00
|
|
|
(t (let ((next-p (org-get-next-item (point) (org-list-bottom-point))))
|
|
|
|
(cond
|
|
|
|
;; Is there a next item?
|
|
|
|
(next-p (goto-char next-p)
|
|
|
|
(org-back-over-empty-lines))
|
|
|
|
;; Is there a previous item?
|
|
|
|
((not (org-first-list-item-p)) (org-back-over-empty-lines))
|
2010-07-21 05:18:31 -04:00
|
|
|
;; Local search failed: search globally.
|
|
|
|
((and (goto-char (org-list-bottom-point))
|
|
|
|
(beginning-of-line 0)
|
|
|
|
(org-search-backward-unenclosed "^[ \t]*$" (org-list-top-point) t))
|
|
|
|
(1+ (org-back-over-empty-lines)))
|
|
|
|
;; No blank line found in the whole list.
|
|
|
|
(t 0)))))))
|
2010-07-15 12:28:01 -04:00
|
|
|
(insert-fun
|
2010-07-17 17:00:22 -04:00
|
|
|
(lambda (text)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; insert bullet above item in order to avoid bothering
|
|
|
|
;; with possible blank lines ending last item.
|
2010-07-15 12:28:01 -04:00
|
|
|
(org-beginning-of-item)
|
2010-07-20 09:58:48 -04:00
|
|
|
(insert (concat bullet (when checkbox "[ ] ") after-bullet))
|
2010-07-17 04:05:05 -04:00
|
|
|
;; Stay between after-bullet and before text.
|
2010-07-15 12:28:01 -04:00
|
|
|
(save-excursion
|
|
|
|
(insert (concat text (make-string (1+ blank-lines-nb) ?\n))))
|
|
|
|
(unless before-p (org-move-item-down))
|
|
|
|
(when checkbox (org-update-checkbox-count-maybe)))))
|
|
|
|
(goto-char true-pos)
|
|
|
|
(cond
|
2010-07-20 09:58:48 -04:00
|
|
|
(before-p (funcall insert-fun nil)
|
|
|
|
;; Not taking advantage of renumbering while moving
|
|
|
|
;; down. Need to call it directly.
|
|
|
|
(org-maybe-renumber-ordered-list) t)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; Can't split item: insert bullet at the end of item.
|
2010-07-15 12:28:01 -04:00
|
|
|
((not (org-get-alist-option org-M-RET-may-split-line 'item))
|
2010-07-17 17:00:22 -04:00
|
|
|
(funcall insert-fun nil) t)
|
2010-07-15 12:28:01 -04:00
|
|
|
;; else, insert a new bullet along with everything from point
|
2010-07-16 05:43:40 -04:00
|
|
|
;; down to last non-blank line of item.
|
2010-07-15 12:28:01 -04:00
|
|
|
(t
|
|
|
|
(delete-horizontal-space)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; Get pos again in case previous command modified line.
|
2010-07-15 12:28:01 -04:00
|
|
|
(let* ((pos (point))
|
|
|
|
(end-before-blank (org-end-of-item-before-blank))
|
2010-07-17 17:00:22 -04:00
|
|
|
(after-text
|
|
|
|
(when (< pos end-before-blank)
|
|
|
|
(prog1
|
2010-07-25 05:27:28 -04:00
|
|
|
(delete-and-extract-region pos end-before-blank)
|
2010-07-17 17:00:22 -04:00
|
|
|
;; delete any blank line at and before point.
|
|
|
|
(beginning-of-line)
|
|
|
|
(while (looking-at "^[ \t]*$")
|
|
|
|
(delete-region (point-at-bol) (1+ (point-at-eol)))
|
2010-07-18 05:04:15 -04:00
|
|
|
(beginning-of-line 0))))))
|
2010-07-15 12:28:01 -04:00
|
|
|
(funcall insert-fun after-text) t)))))
|
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
;;; Predicates
|
|
|
|
|
|
|
|
(defun org-in-item-p ()
|
|
|
|
"Is the cursor inside a plain list ?"
|
2010-07-20 09:58:48 -04:00
|
|
|
(unless (let ((outline-regexp org-outline-regexp)) (org-at-heading-p))
|
2010-07-20 05:47:54 -04:00
|
|
|
(save-excursion
|
2010-07-20 09:58:48 -04:00
|
|
|
(let* ((limit (save-excursion (outline-previous-heading)))
|
|
|
|
;; Move to eol so current line can be matched by `org-item-re'.
|
|
|
|
(actual-pos (goto-char (point-at-eol)))
|
|
|
|
(last-item-start (save-excursion
|
2010-07-20 15:13:37 -04:00
|
|
|
(org-search-backward-unenclosed org-item-beginning-re limit t)))
|
2010-07-20 09:58:48 -04:00
|
|
|
(list-ender (org-list-terminator-between last-item-start actual-pos)))
|
|
|
|
;; We are in a list when we are on an item line or when we can
|
|
|
|
;; find an item before point and there is no valid list ender
|
|
|
|
;; between it and the point.
|
|
|
|
(and last-item-start
|
|
|
|
(not list-ender))))))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
(defun org-first-list-item-p ()
|
|
|
|
"Is this heading the first item in a plain list?"
|
|
|
|
(unless (org-at-item-p)
|
|
|
|
(error "Not at a plain list item"))
|
|
|
|
(save-excursion
|
|
|
|
(= (save-excursion (org-beginning-of-item)) (org-beginning-of-item-list))))
|
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
(defun org-at-item-p ()
|
|
|
|
"Is point in a line starting a hand-formatted item?"
|
2010-04-21 09:52:01 -04:00
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-at-bol))
|
2010-07-20 15:13:37 -04:00
|
|
|
(looking-at org-item-beginning-re)))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
Support for Shift Selection
Emacs 23 introduces `shift-selection-mode', and even turns it on by
default. Therefore, it is fair to assume that users of Emacs 23 will
expect to be able to select a region by holding down shift will moving
the cursor. This conflicts with the use of shifted cursor keys in
Org-mode for other purposes, in particular to "change the item under
the cursor", like it is done for time stamps, item bullet types, TODO
keywords and priorities.
This commit tries to support `shift-selection-mode' as much as possible,
while retaining these valuable commands keys for Org-mode. The
following things are changed:
1. The range of contexts where Org's commands do act is reduced.
- S-up and S-down no longer jump to the previous and next plain list
item - you can use the paragraph commands C-up and C-down for this
quite well.
- S-left and S-right only change the bullet type of a plain list
item when the cursor is *exactly* on the bullet, not just anywhere
in the item line.
2. When a S-cursor key is used outside a special context, a region is
started or extended.
3. When a region has already been started, it will be continue to
extend even if the S-cursor keys move the cursor into a special
context.
4. If you want S-cursor selection to work in headlines as well, you
can set the variable `org-support-shift-select' to
`even-in-headlines'. Then you need to rely on `C-c C-t' to set
TODO keywords, and on `C-c ,' to set priorities.
If you want everything to behave the way it was, set
`org-support-shift-select' to nil.
2009-01-26 10:23:44 -05:00
|
|
|
(defun org-at-item-bullet-p ()
|
|
|
|
"Is point at the bullet of a plain list item?"
|
|
|
|
(and (org-at-item-p)
|
|
|
|
(not (member (char-after) '(?\ ?\t)))
|
|
|
|
(< (point) (match-end 0))))
|
|
|
|
|
2010-07-17 09:17:38 -04:00
|
|
|
(defun org-at-item-timer-p ()
|
2010-07-19 04:50:15 -04:00
|
|
|
"Is point at a line starting a plain list item with a timer?"
|
2010-07-19 05:21:22 -04:00
|
|
|
(org-list-at-regexp-after-bullet-p "\\([0-9]+:[0-9]+:[0-9]+\\)[ \t]+::[ \t]+"))
|
|
|
|
|
|
|
|
(defun org-at-description-p ()
|
|
|
|
"Is point at a description list item?"
|
2010-07-19 06:38:14 -04:00
|
|
|
(org-list-at-regexp-after-bullet-p "\\(\\S-.+\\)[ \t]+::[ \t]+"))
|
2010-07-17 09:17:38 -04:00
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
(defun org-at-item-checkbox-p ()
|
|
|
|
"Is point at a line starting a plain-list item with a checklet?"
|
2010-07-19 11:02:58 -04:00
|
|
|
(org-list-at-regexp-after-bullet-p "\\(\\[[- X]\\]\\)[ \t]+"))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-22 05:45:49 -04:00
|
|
|
(defun org-item-has-children-p ()
|
|
|
|
"Does the current item have subitems?"
|
|
|
|
(save-excursion
|
|
|
|
(org-beginning-of-item)
|
|
|
|
(let ((ind (org-get-indentation)))
|
|
|
|
(org-end-of-item-text-before-children)
|
|
|
|
(and (org-at-item-p)
|
|
|
|
(> (org-get-indentation) ind)))))
|
|
|
|
|
2009-02-19 03:13:08 -05:00
|
|
|
(defun org-checkbox-blocked-p ()
|
|
|
|
"Is the current checkbox blocked from for being checked now?
|
|
|
|
A checkbox is blocked if all of the following conditions are fulfilled:
|
|
|
|
|
|
|
|
1. The checkbox is not checked already.
|
|
|
|
2. The current entry has the ORDERED property set.
|
|
|
|
3. There is an unchecked checkbox in this entry before the current line."
|
|
|
|
(catch 'exit
|
|
|
|
(save-match-data
|
|
|
|
(save-excursion
|
|
|
|
(unless (org-at-item-checkbox-p) (throw 'exit nil))
|
2010-07-19 11:02:58 -04:00
|
|
|
(when (equal (match-string 1) "[X]")
|
2009-02-19 03:13:08 -05:00
|
|
|
;; the box is already checked!
|
|
|
|
(throw 'exit nil))
|
|
|
|
(let ((end (point-at-bol)))
|
|
|
|
(condition-case nil (org-back-to-heading t)
|
|
|
|
(error (throw 'exit nil)))
|
|
|
|
(unless (org-entry-get nil "ORDERED") (throw 'exit nil))
|
2010-07-17 05:27:58 -04:00
|
|
|
(when (org-search-forward-unenclosed "^[ \t]*[-+*0-9.)] \\[[- ]\\]" end t)
|
|
|
|
(org-current-line)))))))
|
2009-02-19 03:13:08 -05:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
;;; Navigate
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
(defun org-list-top-point ()
|
|
|
|
"Return point at the top level item in a list, or nil if not in a list."
|
|
|
|
(save-excursion
|
|
|
|
(and (org-in-item-p)
|
|
|
|
(let ((pos (point-at-eol))
|
|
|
|
(bound (or (outline-previous-heading) (point-min))))
|
|
|
|
;; Is there some list above this one ? If so, go to its ending.
|
|
|
|
;; Otherwise, go back to the heading above or bob.
|
|
|
|
(goto-char (or (org-list-terminator-between bound pos) bound))
|
|
|
|
;; From there, search down our list.
|
2010-07-20 15:13:37 -04:00
|
|
|
(org-search-forward-unenclosed org-item-beginning-re pos t)
|
2010-07-10 11:02:58 -04:00
|
|
|
(point-at-bol)))))
|
|
|
|
|
|
|
|
(defun org-list-bottom-point ()
|
|
|
|
"Return point just before list ending or nil if not in a list."
|
|
|
|
(save-excursion
|
|
|
|
(and (org-in-item-p)
|
|
|
|
(let ((pos (org-beginning-of-item))
|
2010-07-15 06:18:25 -04:00
|
|
|
(bound (or (and (let ((outline-regexp org-outline-regexp))
|
2010-07-16 05:43:40 -04:00
|
|
|
;; Use default regexp because folding
|
|
|
|
;; changes OUTLINE-REGEXP.
|
2010-07-15 06:18:25 -04:00
|
|
|
(outline-next-heading))
|
2010-07-11 09:07:34 -04:00
|
|
|
(skip-chars-backward " \t\r\n")
|
2010-07-10 11:02:58 -04:00
|
|
|
(1+ (point-at-eol)))
|
|
|
|
(point-max))))
|
|
|
|
;; The list ending is either first point matching
|
2010-07-16 05:43:40 -04:00
|
|
|
;; `org-list-end-re', point at first white-line before next
|
2010-07-10 11:02:58 -04:00
|
|
|
;; heading, or eob.
|
|
|
|
(or (org-list-terminator-between pos bound t) bound)))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defun org-beginning-of-item ()
|
|
|
|
"Go to the beginning of the current hand-formatted item.
|
2010-07-10 11:02:58 -04:00
|
|
|
If the cursor is not in an item, throw an error. Return point."
|
2008-09-23 02:03:13 -04:00
|
|
|
(interactive)
|
2010-07-19 03:16:13 -04:00
|
|
|
(if (not (org-in-item-p))
|
|
|
|
(error "Not in an item")
|
|
|
|
;; Possibly match the current line.
|
|
|
|
(end-of-line)
|
2010-07-20 15:13:37 -04:00
|
|
|
(org-search-backward-unenclosed org-item-beginning-re nil t)
|
2010-07-19 03:16:13 -04:00
|
|
|
(goto-char (point-at-bol))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defun org-end-of-item ()
|
|
|
|
"Go to the end of the current hand-formatted item.
|
|
|
|
If the cursor is not in an item, throw an error."
|
|
|
|
(interactive)
|
2010-07-10 11:02:58 -04:00
|
|
|
(let ((next-p (org-get-next-item (point) (org-list-bottom-point))))
|
|
|
|
(cond ((not (org-in-item-p))
|
|
|
|
(error "Not in an item"))
|
|
|
|
(next-p
|
|
|
|
(goto-char next-p))
|
|
|
|
(t
|
|
|
|
(org-end-of-item-list)))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-04-21 09:52:01 -04:00
|
|
|
(defun org-end-of-item-text-before-children ()
|
|
|
|
"Move to the end of the item text, stops before the first child if any.
|
2010-07-16 17:22:01 -04:00
|
|
|
Assumes that the cursor is in the first line of an item."
|
2010-07-10 11:02:58 -04:00
|
|
|
(let ((limit (org-list-bottom-point)))
|
|
|
|
(end-of-line)
|
|
|
|
(goto-char
|
2010-07-20 15:13:37 -04:00
|
|
|
(if (org-search-forward-unenclosed org-item-beginning-re limit t)
|
2010-07-10 11:02:58 -04:00
|
|
|
(point-at-bol)
|
|
|
|
limit))))
|
|
|
|
|
|
|
|
(defun org-end-of-item-before-blank ()
|
|
|
|
"Return point at end of item, before any blank line.
|
|
|
|
Point returned is at eol."
|
|
|
|
(save-excursion
|
|
|
|
(org-end-of-item)
|
|
|
|
(skip-chars-backward " \r\t\n")
|
|
|
|
(point-at-eol)))
|
|
|
|
|
|
|
|
(defun org-get-next-item (pos limit)
|
|
|
|
"Get the point of the next item at the same level as POS.
|
|
|
|
Stop searching at LIMIT. Return nil if no item is found. This
|
|
|
|
function does not move point."
|
2010-07-19 05:33:20 -04:00
|
|
|
(org-list-get-item-same-level
|
2010-07-19 05:43:33 -04:00
|
|
|
#'org-search-forward-unenclosed pos limit #'end-of-line))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
(defun org-get-previous-item (pos limit)
|
|
|
|
"Get the point of the previous item at the same level as POS.
|
|
|
|
Stop searching at LIMIT. Return nil if no item is found. This
|
|
|
|
function does not move point."
|
2010-07-19 05:33:20 -04:00
|
|
|
(org-list-get-item-same-level
|
2010-07-19 05:43:33 -04:00
|
|
|
#'org-search-backward-unenclosed pos limit #'beginning-of-line))
|
2010-04-21 09:52:01 -04:00
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
(defun org-next-item ()
|
2010-07-10 11:02:58 -04:00
|
|
|
"Move to the beginning of the next item.
|
|
|
|
Item is at the same level in the current plain list. Error if not
|
|
|
|
in a plain list, or if this is the last item in the list."
|
2008-09-23 02:03:13 -04:00
|
|
|
(interactive)
|
2010-07-10 11:02:58 -04:00
|
|
|
(let ((next-p (org-get-next-item (point) (org-list-bottom-point))))
|
|
|
|
(if next-p
|
|
|
|
(goto-char next-p)
|
2008-09-23 02:03:13 -04:00
|
|
|
(error "On last item"))))
|
|
|
|
|
|
|
|
(defun org-previous-item ()
|
2010-07-10 11:02:58 -04:00
|
|
|
"Move to the beginning of the previous item.
|
|
|
|
Item is at the same level in the current plain list. Error if not
|
|
|
|
in a plain list, or if this is the first item in the list."
|
2008-09-23 02:03:13 -04:00
|
|
|
(interactive)
|
2010-07-10 11:02:58 -04:00
|
|
|
(let ((prev-p (org-get-previous-item (point) (org-list-top-point))))
|
|
|
|
(if prev-p
|
|
|
|
(goto-char prev-p)
|
|
|
|
(error "On first item"))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
(defun org-beginning-of-item-list ()
|
|
|
|
"Go to the beginning item of the current list or sublist.
|
|
|
|
Return point."
|
|
|
|
(interactive)
|
|
|
|
(let ((limit (org-list-top-point))
|
|
|
|
(move-up (lambda (pos bound)
|
|
|
|
;; prev-p: any item of same level before ?
|
|
|
|
(let ((prev-p (org-get-previous-item pos bound)))
|
|
|
|
;; recurse until no more item of the same level
|
|
|
|
;; can be found.
|
2010-07-20 09:58:48 -04:00
|
|
|
(if prev-p (funcall move-up prev-p bound) pos)))))
|
2010-07-10 11:02:58 -04:00
|
|
|
;; Go to the last item found and at bol in case we didn't move
|
|
|
|
(goto-char (funcall move-up (point) limit))
|
|
|
|
(goto-char (point-at-bol))))
|
|
|
|
|
|
|
|
(defun org-end-of-item-list ()
|
|
|
|
"Go to the end of the current list or sublist.
|
|
|
|
Return point."
|
|
|
|
(interactive)
|
|
|
|
(org-beginning-of-item)
|
|
|
|
(let ((limit (org-list-bottom-point))
|
|
|
|
(ind (org-get-indentation))
|
|
|
|
(get-last-item (lambda (pos bound)
|
|
|
|
;; next-p: any item of same level after ?
|
|
|
|
(let ((next-p (org-get-next-item pos bound)))
|
|
|
|
;; recurse until no more item of the same level
|
|
|
|
;; can be found.
|
2010-07-20 09:58:48 -04:00
|
|
|
(if next-p (funcall get-last-item next-p bound) pos)))))
|
2010-07-10 11:02:58 -04:00
|
|
|
;; Move to the last item of every list or sublist encountered, and
|
|
|
|
;; down to bol of a higher-level item, or limit.
|
|
|
|
(while (and (/= (point) limit)
|
|
|
|
(>= (org-get-indentation) ind))
|
|
|
|
(goto-char (funcall get-last-item (point) limit))
|
|
|
|
(end-of-line)
|
2010-07-20 15:13:37 -04:00
|
|
|
(when (org-search-forward-unenclosed org-item-beginning-re limit 'move)
|
2010-07-10 11:02:58 -04:00
|
|
|
(beginning-of-line)))
|
|
|
|
(point)))
|
|
|
|
|
|
|
|
;;; Manipulate
|
|
|
|
|
|
|
|
(defun org-list-exchange-items (beg-A beg-B)
|
|
|
|
"Swap item starting at BEG-A with item starting at BEG-B.
|
|
|
|
Blank lines at the end of items are left in place. Assumes
|
|
|
|
BEG-A is lesser than BEG-B."
|
2009-07-06 02:53:50 -04:00
|
|
|
(save-excursion
|
2010-07-10 11:02:58 -04:00
|
|
|
(let* ((end-of-item-no-blank (lambda (pos)
|
|
|
|
(goto-char pos)
|
|
|
|
(goto-char (org-end-of-item-before-blank))))
|
|
|
|
(end-A-no-blank (funcall end-of-item-no-blank beg-A))
|
|
|
|
(end-B-no-blank (funcall end-of-item-no-blank beg-B))
|
|
|
|
(body-A (buffer-substring beg-A end-A-no-blank))
|
|
|
|
(body-B (buffer-substring beg-B end-B-no-blank))
|
|
|
|
(between-A-no-blank-and-B (buffer-substring end-A-no-blank beg-B)))
|
|
|
|
(goto-char beg-A)
|
|
|
|
(delete-region beg-A end-B-no-blank)
|
|
|
|
(insert (concat body-B between-A-no-blank-and-B body-A)))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defun org-move-item-down ()
|
|
|
|
"Move the plain list item at point down, i.e. swap with following item.
|
|
|
|
Subitems (items with larger indentation) are considered part of the item,
|
|
|
|
so this really moves item trees."
|
|
|
|
(interactive)
|
2010-07-10 11:02:58 -04:00
|
|
|
(let ((pos (point))
|
|
|
|
(col (current-column))
|
|
|
|
(actual-item (org-beginning-of-item))
|
|
|
|
(next-item (org-get-next-item (point) (save-excursion (org-end-of-item-list)))))
|
|
|
|
(if (not next-item)
|
2008-09-23 02:03:13 -04:00
|
|
|
(progn
|
2010-07-10 11:02:58 -04:00
|
|
|
(goto-char pos)
|
|
|
|
(error "Cannot move this item further down"))
|
|
|
|
(org-list-exchange-items actual-item next-item)
|
|
|
|
(org-maybe-renumber-ordered-list)
|
|
|
|
(org-next-item)
|
|
|
|
(move-to-column col))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
(defun org-move-item-up ()
|
2008-09-23 02:03:13 -04:00
|
|
|
"Move the plain list item at point up, i.e. swap with previous item.
|
|
|
|
Subitems (items with larger indentation) are considered part of the item,
|
|
|
|
so this really moves item trees."
|
|
|
|
(interactive)
|
2010-07-10 11:02:58 -04:00
|
|
|
(let ((pos (point))
|
|
|
|
(col (current-column))
|
|
|
|
(actual-item (org-beginning-of-item))
|
|
|
|
(prev-item (org-get-previous-item (point) (save-excursion (org-beginning-of-item-list)))))
|
|
|
|
(if (not prev-item)
|
|
|
|
(progn
|
|
|
|
(goto-char pos)
|
|
|
|
(error "Cannot move this item further up"))
|
|
|
|
(org-list-exchange-items prev-item actual-item)
|
|
|
|
(org-maybe-renumber-ordered-list)
|
|
|
|
(move-to-column col))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
(defun org-insert-item (&optional checkbox)
|
|
|
|
"Insert a new item at the current level.
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
If cursor is before first character after bullet of the item, the
|
|
|
|
new item will be created before the current one. Return t when
|
2010-07-14 15:31:50 -04:00
|
|
|
things worked, nil when we are not in an item, or item is
|
|
|
|
invisible."
|
2010-07-10 11:02:58 -04:00
|
|
|
(unless (or (not (org-in-item-p))
|
2010-07-20 05:47:54 -04:00
|
|
|
(org-invisible-p))
|
2010-07-17 17:00:22 -04:00
|
|
|
(if (save-excursion
|
|
|
|
(org-beginning-of-item)
|
|
|
|
(org-at-item-timer-p))
|
2010-07-17 09:17:38 -04:00
|
|
|
;; Timer list: delegate to `org-timer-item'.
|
2010-07-15 10:57:37 -04:00
|
|
|
(progn (org-timer-item) t)
|
2010-07-15 12:28:01 -04:00
|
|
|
;; if we're in a description list, ask for the new term.
|
|
|
|
(let ((desc-text (when (save-excursion
|
|
|
|
(and (org-beginning-of-item)
|
2010-07-19 05:21:22 -04:00
|
|
|
(org-at-description-p)))
|
2010-07-15 12:28:01 -04:00
|
|
|
(concat (read-string "Term: ") " :: "))))
|
2010-07-19 05:33:20 -04:00
|
|
|
(org-list-insert-item-generic
|
|
|
|
(point) (and checkbox (not desc-text)) desc-text)))))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
;;; Indentation
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defun org-get-string-indentation (s)
|
|
|
|
"What indentation has S due to SPACE and TAB at the beginning of the string?"
|
|
|
|
(let ((n -1) (i 0) (w tab-width) c)
|
|
|
|
(catch 'exit
|
|
|
|
(while (< (setq n (1+ n)) (length s))
|
|
|
|
(setq c (aref s n))
|
|
|
|
(cond ((= c ?\ ) (setq i (1+ i)))
|
|
|
|
((= c ?\t) (setq i (* (/ (+ w i) w) w)))
|
|
|
|
(t (throw 'exit t)))))
|
|
|
|
i))
|
|
|
|
|
2009-11-02 16:01:38 -05:00
|
|
|
(defvar org-suppress-item-indentation) ; dynamically scoped parameter
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2008-11-20 04:03:31 -05:00
|
|
|
(defun org-shift-item-indentation (delta)
|
|
|
|
"Shift the indentation in current item by DELTA."
|
2009-11-02 16:01:38 -05:00
|
|
|
(unless (org-bound-and-true-p org-suppress-item-indentation)
|
|
|
|
(save-excursion
|
|
|
|
(let ((beg (point-at-bol))
|
2010-07-19 06:39:06 -04:00
|
|
|
(end (org-end-of-item)))
|
2009-11-02 16:01:38 -05:00
|
|
|
(beginning-of-line 0)
|
|
|
|
(while (> (point) beg)
|
|
|
|
(when (looking-at "[ \t]*\\S-")
|
|
|
|
;; this is not an empty line
|
2010-07-19 06:39:06 -04:00
|
|
|
(let ((i (org-get-indentation)))
|
|
|
|
(when (and (> i 0) (> (+ i delta) 0))
|
|
|
|
(indent-line-to (+ i delta)))))
|
2009-11-02 16:01:38 -05:00
|
|
|
(beginning-of-line 0))))))
|
2008-11-20 04:03:31 -05:00
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defvar org-last-indent-begin-marker (make-marker))
|
|
|
|
(defvar org-last-indent-end-marker (make-marker))
|
|
|
|
|
|
|
|
(defun org-outdent-item (arg)
|
2010-04-21 09:52:01 -04:00
|
|
|
"Outdent a local list item, but not its children."
|
2008-09-23 02:03:13 -04:00
|
|
|
(interactive "p")
|
2010-04-21 09:52:01 -04:00
|
|
|
(org-indent-item-tree (- arg) 'no-subtree))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defun org-indent-item (arg)
|
2010-04-21 09:52:01 -04:00
|
|
|
"Indent a local list item, but not its children."
|
|
|
|
(interactive "p")
|
|
|
|
(org-indent-item-tree arg 'no-subtree))
|
|
|
|
|
|
|
|
(defun org-outdent-item-tree (arg &optional no-subtree)
|
|
|
|
"Outdent a local list item including its children.
|
2010-07-16 17:22:01 -04:00
|
|
|
If NO-SUBTREE is set, only outdent the item itself, not its children."
|
2010-04-21 09:52:01 -04:00
|
|
|
(interactive "p")
|
|
|
|
(org-indent-item-tree (- arg) no-subtree))
|
|
|
|
|
|
|
|
(defun org-indent-item-tree (arg &optional no-subtree)
|
|
|
|
"Indent a local list item including its children.
|
2010-07-21 17:05:03 -04:00
|
|
|
If NO-SUBTREE is set, only indent the item itself, not its
|
|
|
|
children. Return t if sucessful."
|
2008-09-23 02:03:13 -04:00
|
|
|
(interactive "p")
|
2009-02-20 11:20:46 -05:00
|
|
|
(and (org-region-active-p) (org-cursor-to-region-beginning))
|
2008-09-23 02:03:13 -04:00
|
|
|
(unless (org-at-item-p)
|
|
|
|
(error "Not on an item"))
|
2010-07-25 15:57:28 -04:00
|
|
|
(let ((line (org-current-line))
|
|
|
|
(col (current-column))
|
|
|
|
(pos (point))
|
|
|
|
(origin-ind (save-excursion
|
2010-07-10 11:02:58 -04:00
|
|
|
(goto-char (org-list-top-point))
|
|
|
|
(org-get-indentation)))
|
2010-07-21 05:26:44 -04:00
|
|
|
beg end ind ind1 ind-pos bullet delta ind-down ind-up firstp)
|
2009-07-06 02:53:50 -04:00
|
|
|
(setq firstp (org-first-list-item-p))
|
2010-07-25 15:57:28 -04:00
|
|
|
(setq end (and (org-region-active-p) (region-end)))
|
|
|
|
;; If moving a subtree, don't drain other items on the way.
|
|
|
|
(if (and (memq last-command '(org-shiftmetaright org-shiftmetaleft))
|
|
|
|
(memq this-command '(org-shiftmetaright org-shiftmetaleft)))
|
|
|
|
(setq beg org-last-indent-begin-marker
|
|
|
|
end org-last-indent-end-marker)
|
|
|
|
(org-beginning-of-item)
|
|
|
|
(setq beg (move-marker org-last-indent-begin-marker (point)))
|
|
|
|
;; Determine end point of indentation
|
|
|
|
(if no-subtree
|
|
|
|
(org-end-of-item-text-before-children)
|
|
|
|
(org-end-of-item))
|
|
|
|
(setq end (move-marker org-last-indent-end-marker (or end (point)))))
|
|
|
|
;; Get some information
|
|
|
|
(goto-char beg)
|
|
|
|
(setq ind-pos (org-item-indent-positions)
|
|
|
|
bullet (cdr (car ind-pos))
|
|
|
|
ind (caar ind-pos)
|
|
|
|
ind-down (car (nth 2 ind-pos))
|
|
|
|
ind-up (car (nth 1 ind-pos))
|
|
|
|
delta (if (> arg 0)
|
|
|
|
(if ind-down (- ind-down ind) 2)
|
|
|
|
(if ind-up (- ind-up ind) -2)))
|
|
|
|
;; Make some checks before indenting.
|
|
|
|
(cond
|
|
|
|
((< (+ delta ind) 0)
|
|
|
|
(goto-char pos)
|
|
|
|
(error "Cannot outdent beyond margin"))
|
|
|
|
;; Apply indent rules if activated.
|
|
|
|
((cdr (assq 'indent org-list-automatic-rules))
|
2010-07-19 06:39:06 -04:00
|
|
|
(cond
|
2010-07-25 15:57:28 -04:00
|
|
|
;; 1. If at top-point move the whole list. Moreover, if
|
|
|
|
;; *-list is going to column 0, change bullet to "-".
|
|
|
|
((= (point-at-bol) (org-list-top-point))
|
|
|
|
(when (and (= (+ delta ind) 0) (equal bullet "*")) (org-fix-bullet-type "-"))
|
|
|
|
(setq end (set-marker org-last-indent-end-marker (org-list-bottom-point))))
|
|
|
|
;; 2. Do not indent before top-item.
|
|
|
|
((< (+ delta ind) origin-ind)
|
|
|
|
(goto-char pos)
|
|
|
|
(error "Cannot outdent beyond top level item"))
|
|
|
|
;; 3. Do not indent the first item of a list.
|
|
|
|
((and firstp (> delta 0))
|
|
|
|
(goto-char pos)
|
|
|
|
(error "Cannot indent the beginning of a sublist"))
|
|
|
|
;; 4. Do not outdent item that has children without moving.
|
|
|
|
;; In the case of a subtree, make sure the check applies to
|
|
|
|
;; its last item.
|
|
|
|
((and (< delta 0)
|
|
|
|
(save-excursion (goto-char (1- end)) (org-item-has-children-p)))
|
|
|
|
(goto-char pos)
|
|
|
|
(error "Cannot outdent an item having children")))))
|
|
|
|
;; Proceed to reindentation.
|
|
|
|
(while (< (point) end)
|
|
|
|
(beginning-of-line)
|
|
|
|
(skip-chars-forward " \t") (setq ind1 (current-column))
|
|
|
|
(delete-region (point-at-bol) (point))
|
|
|
|
(or (eolp) (org-indent-to-column (+ ind1 delta)))
|
|
|
|
(beginning-of-line 2))
|
|
|
|
;; Get back to original position, shifted by delta
|
|
|
|
(goto-line line)
|
|
|
|
(move-to-column (max (+ delta col) 0))
|
|
|
|
;; Fix bullet type
|
2009-07-06 02:53:50 -04:00
|
|
|
(org-fix-bullet-type
|
|
|
|
(and (> arg 0)
|
2010-07-21 05:26:44 -04:00
|
|
|
(cdr (assoc bullet org-list-demote-modify-bullet))))
|
2010-07-21 12:43:47 -04:00
|
|
|
;; Reorder lists that might have changed
|
2009-07-06 02:53:50 -04:00
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line 0)
|
2010-07-10 11:02:58 -04:00
|
|
|
(ignore-errors (org-beginning-of-item))
|
2010-07-21 12:43:47 -04:00
|
|
|
(org-maybe-renumber-ordered-list))
|
|
|
|
(save-excursion
|
|
|
|
(org-end-of-item-text-before-children)
|
|
|
|
(org-maybe-renumber-ordered-list))
|
|
|
|
(save-excursion
|
|
|
|
(org-end-of-item-list)
|
2010-07-21 17:05:03 -04:00
|
|
|
(org-maybe-renumber-ordered-list))
|
2010-07-25 15:57:28 -04:00
|
|
|
;; Get back to original position, shifted by delta
|
|
|
|
(goto-line line)
|
|
|
|
(move-to-column (+ delta col))
|
2010-07-21 17:05:03 -04:00
|
|
|
t))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defun org-item-indent-positions ()
|
|
|
|
"Return indentation for plain list items.
|
2008-12-16 11:17:15 -05:00
|
|
|
This returns a list with three values: The current indentation, the
|
2008-12-16 11:20:59 -05:00
|
|
|
parent indentation and the indentation a child should have.
|
2008-09-23 02:03:13 -04:00
|
|
|
Assumes cursor in item line."
|
|
|
|
(let* ((bolpos (point-at-bol))
|
|
|
|
(ind (org-get-indentation))
|
2009-07-06 02:53:50 -04:00
|
|
|
(bullet (org-get-bullet))
|
|
|
|
ind-down ind-up bullet-up bullet-down pos)
|
2008-09-23 02:03:13 -04:00
|
|
|
(save-excursion
|
|
|
|
(org-beginning-of-item-list)
|
|
|
|
(skip-chars-backward "\n\r \t")
|
|
|
|
(when (org-in-item-p)
|
|
|
|
(org-beginning-of-item)
|
2010-07-10 11:02:58 -04:00
|
|
|
(let ((prev-indent (org-get-indentation)))
|
|
|
|
(when (< prev-indent ind)
|
|
|
|
(setq ind-up prev-indent)
|
|
|
|
(setq bullet-up (org-get-bullet))))))
|
2008-09-23 02:03:13 -04:00
|
|
|
(setq pos (point))
|
|
|
|
(save-excursion
|
|
|
|
(cond
|
2010-07-10 11:02:58 -04:00
|
|
|
((and (ignore-errors (progn (org-previous-item) t))
|
|
|
|
(or (end-of-line) t)
|
2010-07-20 15:13:37 -04:00
|
|
|
(org-search-forward-unenclosed org-item-beginning-re bolpos t))
|
2009-07-06 02:53:50 -04:00
|
|
|
(setq ind-down (org-get-indentation)
|
|
|
|
bullet-down (org-get-bullet)))
|
2008-09-23 02:03:13 -04:00
|
|
|
((and (goto-char pos)
|
|
|
|
(org-at-item-p))
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(skip-chars-forward " \t")
|
2009-07-06 02:53:50 -04:00
|
|
|
(setq ind-down (current-column)
|
|
|
|
bullet-down (org-get-bullet)))))
|
2009-07-07 07:52:17 -04:00
|
|
|
(if (and bullet-down (string-match "\\`[0-9]+\\(\\.\\|)\\)\\'" bullet-down))
|
|
|
|
(setq bullet-down (concat "1" (match-string 1 bullet-down))))
|
|
|
|
(if (and bullet-up (string-match "\\`[0-9]+\\(\\.\\|)\\)\\'" bullet-up))
|
|
|
|
(setq bullet-up (concat "1" (match-string 1 bullet-up))))
|
|
|
|
(if (and bullet (string-match "\\`[0-9]+\\(\\.\\|)\\)\\'" bullet))
|
|
|
|
(setq bullet (concat "1" (match-string 1 bullet))))
|
2009-07-06 02:53:50 -04:00
|
|
|
(list (cons ind bullet)
|
|
|
|
(cons ind-up bullet-up)
|
|
|
|
(cons ind-down bullet-down))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2009-11-02 16:01:38 -05:00
|
|
|
(defvar org-tab-ind-state) ; defined in org.el
|
2010-07-21 17:05:03 -04:00
|
|
|
|
2009-11-02 16:01:38 -05:00
|
|
|
(defun org-cycle-item-indentation ()
|
|
|
|
(let ((org-suppress-item-indentation t)
|
|
|
|
(org-adapt-indentation nil))
|
2010-07-25 14:16:26 -04:00
|
|
|
(when (and (or (org-at-description-p) (org-at-item-checkbox-p) (org-at-item-p))
|
|
|
|
(>= (match-end 0) (save-excursion
|
|
|
|
(org-end-of-item-text-before-children)
|
|
|
|
(skip-chars-backward " \r\t\n")
|
|
|
|
(point))))
|
2009-11-02 16:01:38 -05:00
|
|
|
(setq this-command 'org-cycle-item-indentation)
|
2010-07-21 17:05:03 -04:00
|
|
|
;; When in the middle of the cycle, try to outdent first. If it
|
|
|
|
;; fails, and point is still at initial position, indent. Else,
|
|
|
|
;; go back to original position.
|
2009-11-02 16:01:38 -05:00
|
|
|
(if (eq last-command 'org-cycle-item-indentation)
|
2010-07-21 17:05:03 -04:00
|
|
|
(cond
|
|
|
|
((ignore-errors (org-indent-item -1)))
|
|
|
|
((and (= (org-get-indentation) org-tab-ind-state)
|
|
|
|
(ignore-errors (org-indent-item 1))))
|
|
|
|
(t (back-to-indentation)
|
|
|
|
(org-indent-to-column org-tab-ind-state)
|
|
|
|
(end-of-line)
|
|
|
|
(org-maybe-renumber-ordered-list)
|
|
|
|
;; Break cycle
|
|
|
|
(setq this-command 'identity)))
|
|
|
|
;; If a cycle has just started, try to indent first. If it
|
|
|
|
;; fails, try to outdent.
|
2009-11-02 16:01:38 -05:00
|
|
|
(setq org-tab-ind-state (org-get-indentation))
|
2010-07-21 17:05:03 -04:00
|
|
|
(cond
|
|
|
|
((ignore-errors (org-indent-item 1)))
|
|
|
|
((ignore-errors (org-indent-item -1)))
|
2010-07-22 03:47:11 -04:00
|
|
|
(t (error "Cannot move item"))))
|
|
|
|
t)))
|
2009-11-02 16:01:38 -05:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
;;; Bullets
|
|
|
|
|
2009-07-06 02:53:50 -04:00
|
|
|
(defun org-get-bullet ()
|
2010-07-20 09:58:48 -04:00
|
|
|
(and (org-at-item-p)
|
|
|
|
(org-trim (match-string 1))))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2010-07-10 11:02:58 -04:00
|
|
|
(defun org-fix-bullet-type (&optional force-bullet)
|
|
|
|
"Make sure all items in this list have the same bullet as the first item.
|
|
|
|
Also, fix the indentation."
|
|
|
|
(interactive)
|
|
|
|
(unless (org-at-item-p) (error "This is not a list"))
|
|
|
|
(org-preserve-lc
|
2010-07-20 09:58:48 -04:00
|
|
|
(let* ((ini-bul (progn (org-beginning-of-item-list) (org-get-bullet)))
|
|
|
|
(bullet
|
2010-07-10 11:02:58 -04:00
|
|
|
(progn
|
2010-07-20 09:58:48 -04:00
|
|
|
(concat
|
|
|
|
(or force-bullet ini-bul) " "
|
|
|
|
;; Do we need to concat another white space ?
|
|
|
|
(when (and org-list-two-spaces-after-bullet-regexp
|
|
|
|
(string-match org-list-two-spaces-after-bullet-regexp ini-bul))
|
|
|
|
" "))))
|
2010-07-10 11:02:58 -04:00
|
|
|
(replace-bullet
|
2010-07-12 11:40:00 -04:00
|
|
|
(lambda (result bullet)
|
2010-07-10 11:02:58 -04:00
|
|
|
(let* ((old (progn
|
2010-07-20 09:58:48 -04:00
|
|
|
(looking-at "[ \t]*\\(\\S-+[ \t]*\\)")
|
|
|
|
(match-string 1))))
|
2010-07-10 11:02:58 -04:00
|
|
|
(unless (equal bullet old)
|
2010-07-20 09:58:48 -04:00
|
|
|
(replace-match bullet nil nil nil 1)
|
2010-07-16 05:43:40 -04:00
|
|
|
;; When bullet lengths are differents, move the whole
|
2010-07-10 11:02:58 -04:00
|
|
|
;; sublist accordingly
|
|
|
|
(org-shift-item-indentation (- (length bullet) (length old))))))))
|
2010-07-12 11:40:00 -04:00
|
|
|
(org-apply-on-list replace-bullet nil bullet)
|
2010-07-21 05:40:06 -04:00
|
|
|
(org-maybe-renumber-ordered-list))))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
(defun org-renumber-ordered-list (&optional arg)
|
|
|
|
"Renumber an ordered plain list.
|
|
|
|
Cursor needs to be in the first line of an item, the line that starts
|
|
|
|
with something like \"1.\" or \"2)\". Start to count at ARG or 1."
|
|
|
|
(interactive "p")
|
|
|
|
(unless (and (org-at-item-p)
|
|
|
|
(match-beginning 3))
|
|
|
|
(error "This is not an ordered list"))
|
|
|
|
(org-preserve-lc
|
|
|
|
(let* ((offset (progn
|
|
|
|
(org-beginning-of-item)
|
|
|
|
(or (and (looking-at "[ \t]*\\[@start:\\([0-9]+\\)")
|
|
|
|
(string-to-number (match-string 1)))
|
|
|
|
arg
|
|
|
|
1)))
|
|
|
|
(item-fmt (progn
|
|
|
|
(looking-at "[ \t]*[0-9]+\\([.)]\\)")
|
|
|
|
(concat "%d" (or (match-string 1) "."))))
|
|
|
|
;; Here is the function applied at each item of the list.
|
|
|
|
(renumber-item (lambda (counter off fmt)
|
|
|
|
(let* ((new (format fmt (+ counter off)))
|
|
|
|
(old (progn
|
2010-07-20 15:13:37 -04:00
|
|
|
(looking-at org-item-beginning-re)
|
2010-07-10 11:02:58 -04:00
|
|
|
(match-string 2)))
|
|
|
|
(begin (match-beginning 2))
|
|
|
|
(end (match-end 2)))
|
|
|
|
(delete-region begin end)
|
|
|
|
(goto-char begin)
|
|
|
|
(insert new)
|
|
|
|
;; In case item number went from 9. to 10.
|
|
|
|
;; or the other way.
|
2010-07-12 11:40:00 -04:00
|
|
|
(org-shift-item-indentation (- (length new) (length old)))
|
|
|
|
(1+ counter)))))
|
|
|
|
(org-apply-on-list renumber-item 0 offset item-fmt))))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
(defun org-maybe-renumber-ordered-list ()
|
|
|
|
"Renumber the ordered list at point if setup allows it.
|
2010-07-23 14:36:42 -04:00
|
|
|
This tests the if 'renumber rule is set in
|
|
|
|
`org-list-automatic-rules' before doing the renumbering.
|
|
|
|
Do not throw error on failure."
|
2010-07-10 11:02:58 -04:00
|
|
|
(interactive)
|
2010-07-23 14:36:42 -04:00
|
|
|
(when (cdr (assq 'renumber org-list-automatic-rules))
|
2010-07-21 06:14:52 -04:00
|
|
|
(ignore-errors (org-renumber-ordered-list))))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
(defun org-cycle-list-bullet (&optional which)
|
|
|
|
"Cycle through the different itemize/enumerate bullets.
|
2010-07-20 06:36:01 -04:00
|
|
|
This cycle the entire list level through the sequence:
|
2010-07-10 11:02:58 -04:00
|
|
|
|
2010-07-20 05:06:35 -04:00
|
|
|
`-' -> `+' -> `*' -> `1.' -> `1)'
|
2010-07-10 11:02:58 -04:00
|
|
|
|
2010-07-20 05:06:35 -04:00
|
|
|
If WHICH is a valid string, use that as the new bullet. If WHICH
|
2010-07-20 06:36:01 -04:00
|
|
|
is an integer, 0 means `-', 1 means `+' etc. If WHICH is
|
|
|
|
'previous, cycle backwards."
|
2010-07-10 11:02:58 -04:00
|
|
|
(interactive "P")
|
|
|
|
(org-preserve-lc
|
2010-07-20 05:06:35 -04:00
|
|
|
(let* ((bullet (progn (org-beginning-of-item-list)
|
|
|
|
(org-get-bullet)))
|
|
|
|
(current (cond
|
|
|
|
((string-match "\\." bullet) "1.")
|
|
|
|
((string-match ")" bullet) "1)")
|
|
|
|
(t bullet)))
|
2010-07-23 14:36:42 -04:00
|
|
|
(bullet-rule-p (cdr (assq 'bullet org-list-automatic-rules)))
|
2010-07-20 06:01:10 -04:00
|
|
|
(bullet-list (append '("-" "+" )
|
|
|
|
;; *-bullets are not allowed at column 0
|
2010-07-23 14:36:42 -04:00
|
|
|
(unless (and bullet-rule-p
|
|
|
|
(looking-at "\\S-")) '("*"))
|
2010-07-20 06:01:10 -04:00
|
|
|
;; Description items cannot be numbered
|
2010-07-23 14:36:42 -04:00
|
|
|
(unless (and bullet-rule-p
|
2010-07-25 05:29:38 -04:00
|
|
|
(or (eq org-plain-list-ordered-item-terminator ?.)
|
|
|
|
(org-at-description-p))) '("1)"))
|
|
|
|
(unless (and bullet-rule-p
|
|
|
|
(or (eq org-plain-list-ordered-item-terminator ?\))
|
|
|
|
(org-at-description-p))) '("1."))))
|
2010-07-20 06:36:01 -04:00
|
|
|
(len (length bullet-list))
|
2010-07-20 09:58:48 -04:00
|
|
|
(item-index (- len (length (member current bullet-list))))
|
|
|
|
(get-value (lambda (index) (nth (mod index len) bullet-list)))
|
2010-07-10 11:02:58 -04:00
|
|
|
(new (cond
|
2010-07-20 05:06:35 -04:00
|
|
|
((member which bullet-list) which)
|
2010-07-20 09:58:48 -04:00
|
|
|
((numberp which) (funcall get-value which))
|
|
|
|
((eq 'previous which) (funcall get-value (1- item-index)))
|
|
|
|
(t (funcall get-value (1+ item-index))))))
|
2010-07-20 06:01:10 -04:00
|
|
|
(org-fix-bullet-type new))))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
;;; Checkboxes
|
|
|
|
|
|
|
|
(defun org-toggle-checkbox (&optional toggle-presence)
|
|
|
|
"Toggle the checkbox in the current line.
|
|
|
|
With prefix arg TOGGLE-PRESENCE, add or remove checkboxes.
|
|
|
|
With double prefix, set checkbox to [-].
|
|
|
|
When there is an active region, toggle status or presence of the checkbox
|
|
|
|
in the first line, and make every item in the region have the same
|
|
|
|
status or presence, respectively.
|
|
|
|
If the cursor is in a headline, apply this to all checkbox items in the
|
|
|
|
text below the heading."
|
|
|
|
(interactive "P")
|
|
|
|
(catch 'exit
|
|
|
|
(let (beg end status first-present first-status blocked)
|
|
|
|
(cond
|
|
|
|
((org-region-active-p)
|
|
|
|
(setq beg (region-beginning) end (region-end)))
|
|
|
|
((org-on-heading-p)
|
|
|
|
(setq beg (point) end (save-excursion (outline-next-heading) (point))))
|
|
|
|
((org-at-item-checkbox-p)
|
|
|
|
(save-excursion
|
|
|
|
(if (equal toggle-presence '(4))
|
|
|
|
(progn
|
2010-07-19 11:02:58 -04:00
|
|
|
(replace-match "" nil nil nil 1)
|
2010-07-10 11:02:58 -04:00
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(just-one-space))
|
|
|
|
(when (setq blocked (org-checkbox-blocked-p))
|
|
|
|
(error "Checkbox blocked because of unchecked box in line %d"
|
|
|
|
blocked))
|
|
|
|
(replace-match
|
|
|
|
(cond ((equal toggle-presence '(16)) "[-]")
|
2010-07-19 11:02:58 -04:00
|
|
|
((member (match-string 1) '("[ ]" "[-]")) "[X]")
|
2010-07-10 11:02:58 -04:00
|
|
|
(t "[ ]"))
|
2010-07-19 11:02:58 -04:00
|
|
|
t t nil 1)))
|
2010-07-10 11:02:58 -04:00
|
|
|
(throw 'exit t))
|
|
|
|
((org-at-item-p)
|
|
|
|
;; add a checkbox
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(insert "[ ] "))
|
|
|
|
(throw 'exit t))
|
|
|
|
(t (error "Not at a checkbox or heading, and no active region")))
|
|
|
|
(setq end (move-marker (make-marker) end))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char beg)
|
|
|
|
(setq first-present (org-at-item-checkbox-p)
|
|
|
|
first-status
|
|
|
|
(save-excursion
|
2010-07-17 05:27:58 -04:00
|
|
|
(and (org-search-forward-unenclosed "[ \t]\\(\\[[ X]\\]\\)" end t)
|
2010-07-19 11:02:58 -04:00
|
|
|
(equal (match-string 0) "[X]"))))
|
2010-07-10 11:02:58 -04:00
|
|
|
(while (< (point) end)
|
|
|
|
(if toggle-presence
|
|
|
|
(cond
|
|
|
|
((and first-present (org-at-item-checkbox-p))
|
|
|
|
(save-excursion
|
|
|
|
(replace-match "")
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(just-one-space)))
|
|
|
|
((and (not first-present) (not (org-at-item-checkbox-p))
|
|
|
|
(org-at-item-p))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(insert "[ ] "))))
|
|
|
|
(when (org-at-item-checkbox-p)
|
2010-07-19 11:02:58 -04:00
|
|
|
(setq status (equal (match-string 1) "[X]"))
|
2010-07-10 11:02:58 -04:00
|
|
|
(replace-match
|
2010-07-19 11:02:58 -04:00
|
|
|
(if first-status "[ ]" "[X]") t t nil 1)))
|
2010-07-10 11:02:58 -04:00
|
|
|
(beginning-of-line 2)))))
|
|
|
|
(org-update-checkbox-count-maybe))
|
|
|
|
|
|
|
|
(defun org-reset-checkbox-state-subtree ()
|
|
|
|
"Reset all checkboxes in an entry subtree."
|
|
|
|
(interactive "*")
|
|
|
|
(save-restriction
|
|
|
|
(save-excursion
|
|
|
|
(org-narrow-to-subtree)
|
|
|
|
(org-show-subtree)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let ((end (point-max)))
|
|
|
|
(while (< (point) end)
|
|
|
|
(when (org-at-item-checkbox-p)
|
2010-07-19 11:02:58 -04:00
|
|
|
(replace-match "[ ]" t t nil 1))
|
2010-07-10 11:02:58 -04:00
|
|
|
(beginning-of-line 2))))
|
|
|
|
(org-update-checkbox-count-maybe)))
|
|
|
|
|
|
|
|
(defvar org-checkbox-statistics-hook nil
|
|
|
|
"Hook that is run whenever Org thinks checkbox statistics should be updated.
|
2010-07-23 14:36:42 -04:00
|
|
|
This hook runs even if 'checkbox rules in
|
|
|
|
`org-list-automatic-rules' do not apply, so it can be used to
|
|
|
|
implement alternative ways of collecting statistics
|
|
|
|
information.")
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
(defun org-update-checkbox-count-maybe ()
|
|
|
|
"Update checkbox statistics unless turned off by user."
|
2010-07-23 14:36:42 -04:00
|
|
|
(when (cdr (assq 'checkbox org-list-automatic-rules))
|
2010-07-10 11:02:58 -04:00
|
|
|
(org-update-checkbox-count))
|
|
|
|
(run-hooks 'org-checkbox-statistics-hook))
|
|
|
|
|
|
|
|
(defun org-update-checkbox-count (&optional all)
|
|
|
|
"Update the checkbox statistics in the current section.
|
|
|
|
This will find all statistic cookies like [57%] and [6/12] and update them
|
|
|
|
with the current numbers. With optional prefix argument ALL, do this for
|
|
|
|
the whole buffer."
|
|
|
|
(interactive "P")
|
|
|
|
(save-excursion
|
|
|
|
(let* ((buffer-invisibility-spec (org-inhibit-invisibility)) ; Emacs 21
|
|
|
|
(beg (condition-case nil
|
|
|
|
(progn (org-back-to-heading) (point))
|
|
|
|
(error (point-min))))
|
|
|
|
(end (move-marker (make-marker)
|
|
|
|
(progn (outline-next-heading) (point))))
|
|
|
|
(re "\\(\\(\\[[0-9]*%\\]\\)\\|\\(\\[[0-9]*/[0-9]*\\]\\)\\)")
|
|
|
|
(re-box "^[ \t]*\\([-+*]\\|[0-9]+[.)]\\) +\\(\\[[- X]\\]\\)")
|
|
|
|
(re-find (concat re "\\|" re-box))
|
|
|
|
beg-cookie end-cookie is-percent c-on c-off lim new
|
|
|
|
eline curr-ind next-ind continue-from startsearch
|
|
|
|
(recursive
|
|
|
|
(or (not org-hierarchical-checkbox-statistics)
|
|
|
|
(string-match "\\<recursive\\>"
|
|
|
|
(or (ignore-errors
|
|
|
|
(org-entry-get nil "COOKIE_DATA"))
|
|
|
|
""))))
|
|
|
|
(cstat 0)
|
|
|
|
)
|
|
|
|
(when all
|
|
|
|
(goto-char (point-min))
|
|
|
|
(outline-next-heading)
|
|
|
|
(setq beg (point) end (point-max)))
|
|
|
|
(goto-char end)
|
|
|
|
;; find each statistics cookie
|
2010-07-17 05:27:58 -04:00
|
|
|
(while (and (org-search-backward-unenclosed re-find beg t)
|
2010-07-10 11:02:58 -04:00
|
|
|
(not (save-match-data
|
|
|
|
(and (org-on-heading-p)
|
|
|
|
(string-match "\\<todo\\>"
|
|
|
|
(downcase
|
|
|
|
(or (org-entry-get
|
|
|
|
nil "COOKIE_DATA")
|
|
|
|
"")))))))
|
|
|
|
(setq beg-cookie (match-beginning 1)
|
|
|
|
end-cookie (match-end 1)
|
|
|
|
cstat (+ cstat (if end-cookie 1 0))
|
|
|
|
startsearch (point-at-eol)
|
|
|
|
continue-from (match-beginning 0)
|
|
|
|
is-percent (match-beginning 2)
|
|
|
|
lim (cond
|
|
|
|
((org-on-heading-p) (outline-next-heading) (point))
|
|
|
|
((org-at-item-p) (org-end-of-item) (point))
|
|
|
|
(t nil))
|
|
|
|
c-on 0
|
|
|
|
c-off 0)
|
|
|
|
(when lim
|
|
|
|
;; find first checkbox for this cookie and gather
|
|
|
|
;; statistics from all that are at this indentation level
|
|
|
|
(goto-char startsearch)
|
2010-07-17 05:27:58 -04:00
|
|
|
(if (org-search-forward-unenclosed re-box lim t)
|
2010-07-10 11:02:58 -04:00
|
|
|
(progn
|
|
|
|
(org-beginning-of-item)
|
|
|
|
(setq curr-ind (org-get-indentation))
|
|
|
|
(setq next-ind curr-ind)
|
|
|
|
(while (and (bolp) (org-at-item-p)
|
|
|
|
(if recursive
|
|
|
|
(<= curr-ind next-ind)
|
|
|
|
(= curr-ind next-ind)))
|
2010-07-19 03:16:13 -04:00
|
|
|
(setq eline (point-at-eol))
|
2010-07-17 05:27:58 -04:00
|
|
|
(if (org-search-forward-unenclosed re-box eline t)
|
2010-07-10 11:02:58 -04:00
|
|
|
(if (member (match-string 2) '("[ ]" "[-]"))
|
|
|
|
(setq c-off (1+ c-off))
|
|
|
|
(setq c-on (1+ c-on))))
|
|
|
|
(if (not recursive)
|
|
|
|
;; org-get-next-item goes through list-enders
|
|
|
|
;; with proper limit.
|
|
|
|
(goto-char (or (org-get-next-item (point) lim) lim))
|
|
|
|
(end-of-line)
|
2010-07-20 15:13:37 -04:00
|
|
|
(when (org-search-forward-unenclosed org-item-beginning-re lim t)
|
2010-07-10 11:02:58 -04:00
|
|
|
(beginning-of-line)))
|
|
|
|
(setq next-ind (org-get-indentation)))))
|
|
|
|
(goto-char continue-from)
|
|
|
|
;; update cookie
|
|
|
|
(when end-cookie
|
|
|
|
(setq new (if is-percent
|
|
|
|
(format "[%d%%]" (/ (* 100 c-on) (max 1 (+ c-on c-off))))
|
|
|
|
(format "[%d/%d]" c-on (+ c-on c-off))))
|
|
|
|
(goto-char beg-cookie)
|
|
|
|
(insert new)
|
|
|
|
(delete-region (point) (+ (point) (- end-cookie beg-cookie))))
|
|
|
|
;; update items checkbox if it has one
|
|
|
|
(when (org-at-item-p)
|
|
|
|
(org-beginning-of-item)
|
|
|
|
(when (and (> (+ c-on c-off) 0)
|
2010-07-17 05:27:58 -04:00
|
|
|
(org-search-forward-unenclosed re-box (point-at-eol) t))
|
2010-07-10 11:02:58 -04:00
|
|
|
(setq beg-cookie (match-beginning 2)
|
|
|
|
end-cookie (match-end 2))
|
|
|
|
(delete-region beg-cookie end-cookie)
|
|
|
|
(goto-char beg-cookie)
|
|
|
|
(cond ((= c-off 0) (insert "[X]"))
|
|
|
|
((= c-on 0) (insert "[ ]"))
|
|
|
|
(t (insert "[-]")))
|
|
|
|
)))
|
|
|
|
(goto-char continue-from))
|
|
|
|
(when (interactive-p)
|
|
|
|
(message "Checkbox statistics updated %s (%d places)"
|
|
|
|
(if all "in entire file" "in current outline entry") cstat)))))
|
|
|
|
|
|
|
|
(defun org-get-checkbox-statistics-face ()
|
|
|
|
"Select the face for checkbox statistics.
|
|
|
|
The face will be `org-done' when all relevant boxes are checked.
|
|
|
|
Otherwise it will be `org-todo'."
|
|
|
|
(if (match-end 1)
|
|
|
|
(if (equal (match-string 1) "100%")
|
|
|
|
'org-checkbox-statistics-done
|
|
|
|
'org-checkbox-statistics-todo)
|
|
|
|
(if (and (> (match-end 2) (match-beginning 2))
|
|
|
|
(equal (match-string 2) (match-string 3)))
|
|
|
|
'org-checkbox-statistics-done
|
|
|
|
'org-checkbox-statistics-todo)))
|
|
|
|
|
|
|
|
;;; Misc Tools
|
|
|
|
|
2010-07-12 11:40:00 -04:00
|
|
|
(defun org-apply-on-list (function init-value &rest args)
|
2010-07-10 11:02:58 -04:00
|
|
|
"Call FUNCTION for each item of a the list under point.
|
|
|
|
|
2010-07-12 11:40:00 -04:00
|
|
|
FUNCTION must be called with at least one argument : a return
|
|
|
|
value that will contain the value returned by the function at
|
|
|
|
the previous item, plus ARGS extra arguments. INIT-VALUE will be
|
|
|
|
the value passed to the function at the first item of the list.
|
2010-07-10 11:02:58 -04:00
|
|
|
|
2010-07-12 11:40:00 -04:00
|
|
|
As an example, (org-apply-on-list (lambda (result) (1+ result)) 0)
|
|
|
|
will return the number of items in the current list.
|
|
|
|
|
|
|
|
Sublists of the list are skipped. Cursor is always at the
|
|
|
|
beginning of the item."
|
2010-07-10 11:02:58 -04:00
|
|
|
(save-excursion
|
2010-07-19 13:26:51 -04:00
|
|
|
(let ((end (copy-marker (save-excursion (org-end-of-item-list))))
|
2010-07-19 13:16:37 -04:00
|
|
|
(next-p (make-marker))
|
|
|
|
(move-down-action
|
2010-07-12 11:40:00 -04:00
|
|
|
(lambda (pos value &rest args)
|
2010-07-10 11:02:58 -04:00
|
|
|
(goto-char pos)
|
2010-07-19 13:16:37 -04:00
|
|
|
(set-marker next-p (org-get-next-item pos end))
|
|
|
|
(let ((return-value (apply function value args)))
|
|
|
|
(if (marker-position next-p)
|
2010-07-12 11:40:00 -04:00
|
|
|
(apply move-down-action next-p return-value args)
|
|
|
|
return-value)))))
|
|
|
|
(apply move-down-action (org-beginning-of-item-list) init-value args))))
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
(defun org-sort-list (&optional with-case sorting-type getkey-func compare-func)
|
|
|
|
"Sort plain list items.
|
|
|
|
The cursor may be at any item of the list that should be sorted.
|
2010-07-17 07:56:11 -04:00
|
|
|
Sublists are not sorted. Checkboxes, if any, are ignored.
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
Sorting can be alphabetically, numerically, by date/time as given by
|
|
|
|
a time stamp, by a property or by priority.
|
|
|
|
|
2010-07-17 07:56:11 -04:00
|
|
|
The command prompts for the sorting type unless it has been given
|
|
|
|
to the function through the SORTING-TYPE argument, which needs to
|
|
|
|
be a character, \(?n ?N ?a ?A ?t ?T ?f ?F). Here is the precise
|
|
|
|
meaning of each character:
|
2010-07-10 11:02:58 -04:00
|
|
|
|
2010-07-17 07:56:11 -04:00
|
|
|
n Numerically, by converting the beginning of the item to a number.
|
|
|
|
a Alphabetically.
|
|
|
|
t By date/time, either the first active time stamp in the entry, if
|
|
|
|
any, or by the first inactive one. In a timer list, sorts the timers.
|
|
|
|
Only the first line of item is checked.
|
2010-07-10 11:02:58 -04:00
|
|
|
|
|
|
|
Capital letters will reverse the sort order.
|
|
|
|
|
|
|
|
If the SORTING-TYPE is ?f or ?F, then GETKEY-FUNC specifies a
|
|
|
|
function to be called with point at the beginning of the record.
|
|
|
|
It must return either a string or a number that should serve as
|
|
|
|
the sorting key for that record.
|
|
|
|
|
|
|
|
Comparing entries ignores case by default. However, with an
|
|
|
|
optional argument WITH-CASE, the sorting considers case as well."
|
|
|
|
(interactive "P")
|
|
|
|
(let* ((case-func (if with-case 'identity 'downcase))
|
|
|
|
(start (org-beginning-of-item-list))
|
|
|
|
(end (save-excursion (org-end-of-item-list)))
|
|
|
|
(sorting-type
|
|
|
|
(progn
|
|
|
|
(message
|
|
|
|
"Sort plain list: [a]lpha [n]umeric [t]ime [f]unc A/N/T/F means reversed:")
|
|
|
|
(read-char-exclusive)))
|
|
|
|
(getkey-func (and (= (downcase sorting-type) ?f)
|
|
|
|
(org-icompleting-read "Sort using function: "
|
|
|
|
obarray 'fboundp t nil nil)
|
|
|
|
(intern getkey-func))))
|
|
|
|
(message "Sorting items...")
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region start end)
|
|
|
|
(let* ((dcst (downcase sorting-type))
|
|
|
|
(case-fold-search nil)
|
|
|
|
(now (current-time))
|
|
|
|
(sort-func (cond
|
|
|
|
((= dcst ?a) 'string<)
|
|
|
|
((= dcst ?f) compare-func)
|
2010-07-17 07:56:11 -04:00
|
|
|
((= dcst ?t) '<)
|
2010-07-10 11:02:58 -04:00
|
|
|
(t nil)))
|
|
|
|
(begin-record (lambda ()
|
2010-07-12 08:31:20 -04:00
|
|
|
(skip-chars-forward " \r\t\n")
|
|
|
|
(beginning-of-line)))
|
2010-07-10 11:02:58 -04:00
|
|
|
(end-record (lambda ()
|
|
|
|
(goto-char (org-end-of-item-before-blank))))
|
2010-07-17 07:56:11 -04:00
|
|
|
(value-to-sort
|
|
|
|
(lambda ()
|
|
|
|
(when (looking-at "[ \t]*[-+*0-9.)]+\\([ \t]+\\[[- X]\\]\\)?[ \t]+")
|
|
|
|
(cond
|
|
|
|
((= dcst ?n)
|
|
|
|
(string-to-number (buffer-substring (match-end 0)
|
|
|
|
(point-at-eol))))
|
|
|
|
((= dcst ?a)
|
|
|
|
(buffer-substring (match-end 0) (point-at-eol)))
|
|
|
|
((= dcst ?t)
|
|
|
|
(cond
|
|
|
|
;; If it is a timer list, convert timer to seconds
|
2010-07-17 09:17:38 -04:00
|
|
|
((org-at-item-timer-p)
|
2010-07-17 07:56:11 -04:00
|
|
|
(org-timer-hms-to-secs (match-string 1)))
|
|
|
|
((or (org-search-forward-unenclosed org-ts-regexp
|
|
|
|
(point-at-eol) t)
|
|
|
|
(org-search-forward-unenclosed org-ts-regexp-both
|
|
|
|
(point-at-eol) t))
|
|
|
|
(org-time-string-to-seconds (match-string 0)))
|
|
|
|
(t (org-float-time now))))
|
|
|
|
((= dcst ?f)
|
|
|
|
(if getkey-func
|
|
|
|
(let ((value (funcall getkey-func)))
|
|
|
|
(if (stringp value)
|
|
|
|
(funcall case-func value)
|
|
|
|
value))
|
|
|
|
(error "Invalid key function `%s'" getkey-func)))
|
|
|
|
(t (error "Invalid sorting type `%c'" sorting-type)))))))
|
2010-07-10 11:02:58 -04:00
|
|
|
(sort-subr (/= dcst sorting-type) begin-record end-record value-to-sort nil sort-func)
|
|
|
|
(org-maybe-renumber-ordered-list)
|
|
|
|
(run-hooks 'org-after-sorting-entries-or-items-hook)
|
|
|
|
(message "Sorting items...done")))))
|
|
|
|
|
2008-09-23 02:13:32 -04:00
|
|
|
;;; Send and receive lists
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(defun org-list-parse-list (&optional delete)
|
|
|
|
"Parse the list at point and maybe DELETE it.
|
|
|
|
Return a list containing first level items as strings and
|
|
|
|
sublevels as a list of strings."
|
2010-07-10 11:02:58 -04:00
|
|
|
(let* ((start (goto-char (org-list-top-point)))
|
2010-07-11 13:24:35 -04:00
|
|
|
(end (org-list-bottom-point))
|
2008-12-16 11:17:15 -05:00
|
|
|
output itemsep ltype)
|
2010-07-20 15:13:37 -04:00
|
|
|
(while (org-search-forward-unenclosed org-item-beginning-re end t)
|
2010-07-10 11:02:58 -04:00
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
2010-07-19 19:20:56 -04:00
|
|
|
(setq ltype (cond ((looking-at-p "^[ \t]*[0-9]") 'ordered)
|
|
|
|
((org-at-description-p) 'descriptive)
|
|
|
|
(t 'unordered))))
|
2010-07-10 11:02:58 -04:00
|
|
|
(let* ((indent1 (org-get-indentation))
|
|
|
|
(nextitem (or (org-get-next-item (point) end) end))
|
|
|
|
(item (org-trim (buffer-substring (point) (org-end-of-item-text-before-children))))
|
2010-07-13 08:40:39 -04:00
|
|
|
(nextindent (if (= (point) end) 0 (org-get-indentation)))
|
2009-01-06 11:23:36 -05:00
|
|
|
(item (if (string-match "^\\[\\([xX ]\\)\\]" item)
|
|
|
|
(replace-match (if (equal (match-string 1 item) " ")
|
|
|
|
"[CBOFF]"
|
|
|
|
"[CBON]")
|
|
|
|
t nil item)
|
|
|
|
item)))
|
2008-09-23 02:03:13 -04:00
|
|
|
(push item output)
|
2010-07-10 11:02:58 -04:00
|
|
|
(when (> nextindent indent1)
|
2010-07-10 17:56:41 -04:00
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) nextitem)
|
|
|
|
(push (org-list-parse-list) output)))))
|
2010-07-11 09:39:49 -04:00
|
|
|
(when delete
|
|
|
|
(delete-region start end)
|
2010-07-11 13:24:35 -04:00
|
|
|
(save-match-data
|
|
|
|
(when (looking-at (org-list-end-re))
|
|
|
|
(replace-match "\n"))))
|
2008-09-23 02:03:13 -04:00
|
|
|
(setq output (nreverse output))
|
|
|
|
(push ltype output)))
|
|
|
|
|
2009-07-25 16:48:32 -04:00
|
|
|
(defun org-list-make-subtree ()
|
|
|
|
"Convert the plain list at point into a subtree."
|
|
|
|
(interactive)
|
2010-07-20 05:47:54 -04:00
|
|
|
(if (not (org-in-item-p))
|
|
|
|
(error "Not in a list.")
|
|
|
|
(goto-char (org-list-top-point))
|
|
|
|
(let ((list (org-list-parse-list t)) nstars)
|
|
|
|
(save-excursion
|
|
|
|
(if (ignore-errors
|
|
|
|
(org-back-to-heading))
|
|
|
|
(progn (org-search-forward-unenclosed org-complex-heading-regexp nil t)
|
|
|
|
(setq nstars (length (match-string 1))))
|
|
|
|
(setq nstars 0)))
|
|
|
|
(org-list-make-subtrees list (1+ nstars)))))
|
2009-07-25 16:48:32 -04:00
|
|
|
|
|
|
|
(defun org-list-make-subtrees (list level)
|
|
|
|
"Convert LIST into subtrees starting at LEVEL."
|
|
|
|
(if (symbolp (car list))
|
|
|
|
(org-list-make-subtrees (cdr list) level)
|
|
|
|
(mapcar (lambda (item)
|
|
|
|
(if (stringp item)
|
2009-08-03 11:30:30 -04:00
|
|
|
(insert (make-string
|
|
|
|
(if org-odd-levels-only
|
2009-07-25 16:48:32 -04:00
|
|
|
(1- (* 2 level)) level) ?*) " " item "\n")
|
|
|
|
(org-list-make-subtrees item (1+ level))))
|
|
|
|
list)))
|
|
|
|
|
2008-09-23 02:03:13 -04:00
|
|
|
(defun org-list-insert-radio-list ()
|
|
|
|
"Insert a radio list template appropriate for this major mode."
|
|
|
|
(interactive)
|
|
|
|
(let* ((e (assq major-mode org-list-radio-list-templates))
|
|
|
|
(txt (nth 1 e))
|
|
|
|
name pos)
|
|
|
|
(unless e (error "No radio list setup defined for %s" major-mode))
|
|
|
|
(setq name (read-string "List name: "))
|
|
|
|
(while (string-match "%n" txt)
|
|
|
|
(setq txt (replace-match name t t txt)))
|
|
|
|
(or (bolp) (insert "\n"))
|
|
|
|
(setq pos (point))
|
|
|
|
(insert txt)
|
|
|
|
(goto-char pos)))
|
|
|
|
|
|
|
|
(defun org-list-send-list (&optional maybe)
|
2009-11-12 07:39:29 -05:00
|
|
|
"Send a transformed version of this list to the receiver position.
|
2008-09-23 02:03:13 -04:00
|
|
|
With argument MAYBE, fail quietly if no transformation is defined for
|
|
|
|
this list."
|
|
|
|
(interactive)
|
|
|
|
(catch 'exit
|
|
|
|
(unless (org-at-item-p) (error "Not at a list"))
|
|
|
|
(save-excursion
|
2010-07-14 05:11:10 -04:00
|
|
|
(re-search-backward "#\\+ORGLST" nil t)
|
2010-07-12 05:16:42 -04:00
|
|
|
(unless (looking-at "[ \t]*#\\+ORGLST[: \t][ \t]*SEND[ \t]+\\([^ \t\r\n]+\\)[ \t]+\\([^ \t\r\n]+\\)\\([ \t]+.*\\)?")
|
2008-09-23 02:03:13 -04:00
|
|
|
(if maybe
|
|
|
|
(throw 'exit nil)
|
|
|
|
(error "Don't know how to transform this list"))))
|
|
|
|
(let* ((name (match-string 1))
|
|
|
|
(transform (intern (match-string 2)))
|
2010-07-10 17:56:41 -04:00
|
|
|
(bottom-point
|
|
|
|
(save-excursion
|
2010-07-14 05:11:10 -04:00
|
|
|
(re-search-forward "\\(\\\\end{comment}\\|@end ignore\\|-->\\)" nil t)
|
|
|
|
(match-beginning 0)))
|
|
|
|
(top-point
|
|
|
|
(progn
|
|
|
|
(re-search-backward "#\\+ORGLST" nil t)
|
2010-07-20 15:13:37 -04:00
|
|
|
(re-search-forward org-item-beginning-re bottom-point t)
|
2010-07-14 05:11:10 -04:00
|
|
|
(match-beginning 0)))
|
2010-07-10 17:56:41 -04:00
|
|
|
(list (save-restriction
|
|
|
|
(narrow-to-region top-point bottom-point)
|
|
|
|
(org-list-parse-list)))
|
|
|
|
beg txt)
|
2008-09-23 02:03:13 -04:00
|
|
|
(unless (fboundp transform)
|
|
|
|
(error "No such transformation function %s" transform))
|
2010-07-16 02:49:37 -04:00
|
|
|
(let ((txt (funcall transform list)))
|
|
|
|
;; Find the insertion place
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(unless (re-search-forward
|
|
|
|
(concat "BEGIN RECEIVE ORGLST +" name "\\([ \t]\\|$\\)") nil t)
|
|
|
|
(error "Don't know where to insert translated list"))
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(beginning-of-line 2)
|
|
|
|
(setq beg (point))
|
|
|
|
(unless (re-search-forward (concat "END RECEIVE ORGLST +" name) nil t)
|
|
|
|
(error "Cannot find end of insertion region"))
|
2010-07-19 03:16:13 -04:00
|
|
|
(delete-region beg (point-at-bol))
|
2010-07-16 02:49:37 -04:00
|
|
|
(goto-char beg)
|
|
|
|
(insert txt "\n")))
|
2008-09-23 02:03:13 -04:00
|
|
|
(message "List converted and installed at receiver location"))))
|
|
|
|
|
|
|
|
(defun org-list-to-generic (list params)
|
|
|
|
"Convert a LIST parsed through `org-list-parse-list' to other formats.
|
|
|
|
|
|
|
|
Valid parameters PARAMS are
|
|
|
|
|
2008-12-16 11:17:15 -05:00
|
|
|
:ustart String to start an unordered list
|
|
|
|
:uend String to end an unordered list
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2008-12-16 11:17:15 -05:00
|
|
|
:ostart String to start an ordered list
|
|
|
|
:oend String to end an ordered list
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2008-12-16 11:17:15 -05:00
|
|
|
:dstart String to start a descriptive list
|
|
|
|
:dend String to end a descriptive list
|
2008-09-23 02:03:13 -04:00
|
|
|
:dtstart String to start a descriptive term
|
2008-12-16 11:17:15 -05:00
|
|
|
:dtend String to end a descriptive term
|
2008-09-23 02:03:13 -04:00
|
|
|
:ddstart String to start a description
|
2008-12-16 11:17:15 -05:00
|
|
|
:ddend String to end a description
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2008-12-16 11:17:15 -05:00
|
|
|
:splice When set to t, return only list body lines, don't wrap
|
|
|
|
them into :[u/o]start and :[u/o]end. Default is nil.
|
2008-09-23 02:03:13 -04:00
|
|
|
|
2008-12-16 11:17:15 -05:00
|
|
|
:istart String to start a list item
|
|
|
|
:iend String to end a list item
|
|
|
|
:isep String to separate items
|
2009-01-06 11:23:36 -05:00
|
|
|
:lsep String to separate sublists
|
|
|
|
|
|
|
|
:cboff String to insert for an unchecked checkbox
|
|
|
|
:cbon String to insert for a checked checkbox"
|
2008-09-23 02:03:13 -04:00
|
|
|
(interactive)
|
|
|
|
(let* ((p params) sublist
|
|
|
|
(splicep (plist-get p :splice))
|
2010-07-10 11:02:58 -04:00
|
|
|
(ostart (plist-get p :ostart))
|
|
|
|
(oend (plist-get p :oend))
|
|
|
|
(ustart (plist-get p :ustart))
|
|
|
|
(uend (plist-get p :uend))
|
|
|
|
(dstart (plist-get p :dstart))
|
|
|
|
(dend (plist-get p :dend))
|
|
|
|
(dtstart (plist-get p :dtstart))
|
|
|
|
(dtend (plist-get p :dtend))
|
|
|
|
(ddstart (plist-get p :ddstart))
|
|
|
|
(ddend (plist-get p :ddend))
|
|
|
|
(istart (plist-get p :istart))
|
|
|
|
(iend (plist-get p :iend))
|
|
|
|
(isep (plist-get p :isep))
|
|
|
|
(lsep (plist-get p :lsep))
|
|
|
|
(cbon (plist-get p :cbon))
|
2009-01-06 11:23:36 -05:00
|
|
|
(cboff (plist-get p :cboff)))
|
2008-09-23 02:03:13 -04:00
|
|
|
(let ((wrapper
|
|
|
|
(cond ((eq (car list) 'ordered)
|
|
|
|
(concat ostart "\n%s" oend "\n"))
|
|
|
|
((eq (car list) 'unordered)
|
|
|
|
(concat ustart "\n%s" uend "\n"))
|
|
|
|
((eq (car list) 'descriptive)
|
|
|
|
(concat dstart "\n%s" dend "\n"))))
|
|
|
|
rtn term defstart defend)
|
|
|
|
(while (setq sublist (pop list))
|
|
|
|
(cond ((symbolp sublist) nil)
|
|
|
|
((stringp sublist)
|
2010-07-19 05:21:22 -04:00
|
|
|
(when (string-match "^\\(\\S-+\\)[ \t]+::" sublist)
|
2008-12-16 11:17:15 -05:00
|
|
|
(setq term (org-trim (format (concat dtstart "%s" dtend)
|
|
|
|
(match-string 1 sublist))))
|
2010-07-10 11:02:58 -04:00
|
|
|
(setq sublist (concat ddstart
|
|
|
|
(org-trim (substring sublist (match-end 0)))
|
|
|
|
ddend)))
|
2009-01-06 11:23:36 -05:00
|
|
|
(if (string-match "\\[CBON\\]" sublist)
|
|
|
|
(setq sublist (replace-match cbon t t sublist)))
|
|
|
|
(if (string-match "\\[CBOFF\\]" sublist)
|
|
|
|
(setq sublist (replace-match cboff t t sublist)))
|
2009-11-06 11:11:44 -05:00
|
|
|
(if (string-match "\\[-\\]" sublist)
|
|
|
|
(setq sublist (replace-match "$\\boxminus$" t t sublist)))
|
2010-07-10 11:02:58 -04:00
|
|
|
(setq rtn (concat rtn istart term sublist iend isep)))
|
|
|
|
(t (setq rtn (concat rtn ;; previous list
|
|
|
|
lsep ;; list separator
|
2008-12-16 11:17:15 -05:00
|
|
|
(org-list-to-generic sublist p)
|
2010-07-10 11:02:58 -04:00
|
|
|
lsep ;; list separator
|
2008-12-16 11:17:15 -05:00
|
|
|
)))))
|
2008-09-23 02:03:13 -04:00
|
|
|
(format wrapper rtn))))
|
|
|
|
|
2009-01-06 11:23:36 -05:00
|
|
|
(defun org-list-to-latex (list &optional params)
|
|
|
|
"Convert LIST into a LaTeX list.
|
2010-07-16 17:22:01 -04:00
|
|
|
LIST is as returned by `org-list-parse-list'. PARAMS is a property list
|
2009-01-06 11:23:36 -05:00
|
|
|
with overruling parameters for `org-list-to-generic'."
|
2008-09-23 02:03:13 -04:00
|
|
|
(org-list-to-generic
|
2009-01-06 11:23:36 -05:00
|
|
|
list
|
|
|
|
(org-combine-plists
|
|
|
|
'(:splicep nil :ostart "\\begin{enumerate}" :oend "\\end{enumerate}"
|
|
|
|
:ustart "\\begin{itemize}" :uend "\\end{itemize}"
|
|
|
|
:dstart "\\begin{description}" :dend "\\end{description}"
|
|
|
|
:dtstart "[" :dtend "]"
|
|
|
|
:ddstart "" :ddend ""
|
|
|
|
:istart "\\item " :iend ""
|
|
|
|
:isep "\n" :lsep "\n"
|
|
|
|
:cbon "\\texttt{[X]}" :cboff "\\texttt{[ ]}")
|
|
|
|
params)))
|
|
|
|
|
|
|
|
(defun org-list-to-html (list &optional params)
|
|
|
|
"Convert LIST into a HTML list.
|
2010-07-16 17:22:01 -04:00
|
|
|
LIST is as returned by `org-list-parse-list'. PARAMS is a property list
|
2009-01-06 11:23:36 -05:00
|
|
|
with overruling parameters for `org-list-to-generic'."
|
2008-09-23 02:03:13 -04:00
|
|
|
(org-list-to-generic
|
2009-01-06 11:23:36 -05:00
|
|
|
list
|
|
|
|
(org-combine-plists
|
|
|
|
'(:splicep nil :ostart "<ol>" :oend "</ol>"
|
|
|
|
:ustart "<ul>" :uend "</ul>"
|
|
|
|
:dstart "<dl>" :dend "</dl>"
|
|
|
|
:dtstart "<dt>" :dtend "</dt>"
|
|
|
|
:ddstart "<dd>" :ddend "</dd>"
|
|
|
|
:istart "<li>" :iend "</li>"
|
|
|
|
:isep "\n" :lsep "\n"
|
|
|
|
:cbon "<code>[X]</code>" :cboff "<code>[ ]</code>")
|
|
|
|
params)))
|
|
|
|
|
|
|
|
(defun org-list-to-texinfo (list &optional params)
|
|
|
|
"Convert LIST into a Texinfo list.
|
2010-07-16 17:22:01 -04:00
|
|
|
LIST is as returned by `org-list-parse-list'. PARAMS is a property list
|
2009-01-06 11:23:36 -05:00
|
|
|
with overruling parameters for `org-list-to-generic'."
|
2008-09-23 02:03:13 -04:00
|
|
|
(org-list-to-generic
|
2009-06-08 02:00:46 -04:00
|
|
|
list
|
2009-01-06 11:23:36 -05:00
|
|
|
(org-combine-plists
|
|
|
|
'(:splicep nil :ostart "@itemize @minus" :oend "@end itemize"
|
|
|
|
:ustart "@enumerate" :uend "@end enumerate"
|
|
|
|
:dstart "@table" :dend "@end table"
|
|
|
|
:dtstart "@item " :dtend "\n"
|
|
|
|
:ddstart "" :ddend ""
|
|
|
|
:istart "@item\n" :iend ""
|
|
|
|
:isep "\n" :lsep "\n"
|
|
|
|
:cbon "@code{[X]}" :cboff "@code{[ ]}")
|
|
|
|
params)))
|
2008-09-23 02:03:13 -04:00
|
|
|
|
|
|
|
(provide 'org-list)
|
|
|
|
|
2008-10-15 04:20:24 -04:00
|
|
|
;; arch-tag: 73cf50c1-200f-4d1d-8a53-4e842a5b11c8
|
2008-09-23 02:03:13 -04:00
|
|
|
;;; org-list.el ends here
|