\n" lang) - t t rtn)))) + (setq rtn + (concat + (if caption + (concat + "

" + (format + "%s" + caption)) + "") + (replace-match + (format "

\n" lang)
+                                t t rtn)
+                               (if caption "

" ""))))) (if textareap (setq rtn (concat - (format "

\n\n" + (format "<p>\n<textarea cols=\"%d\" rows=\"%d\">" cols rows) rtn "\n

\n")) (with-temp-buffer @@ -2403,7 +2224,7 @@ (concat "\n#+BEGIN_HTML\n" (org-add-props rtn '(org-protected t)) "\n#+END_HTML\n\n")) ((eq backend 'latex) (setq rtn (org-export-number-lines rtn 'latex 0 0 num cont rpllbl fmt)) - (concat "\n#+BEGIN_LaTeX\n" + (concat "#+BEGIN_LaTeX\n" (org-add-props (if org-export-latex-listings (concat @@ -2417,17 +2238,20 @@ org-export-latex-listings-langs)) lang))) (format "\\lstset{language=%s}\n" lstlang)) - "") + "\n") + (when caption + (format "\n%s $\\equiv$ \n" caption)) "\\begin{lstlisting}\n" rtn "\\end{lstlisting}\n") (concat (car org-export-latex-verbatim-wrap) rtn (cdr org-export-latex-verbatim-wrap))) '(org-protected t)) - "#+END_LaTeX\n\n")) + "#+END_LaTeX\n")) ((eq backend 'ascii) ;; This is not HTML or LaTeX, so just make it an example. (setq rtn (org-export-number-lines rtn 'ascii 0 0 num cont rpllbl fmt)) - (concat "#+BEGIN_ASCII\n" + (concat caption "\n" + "#+BEGIN_ASCII\n" (org-add-props (concat (mapconcat @@ -2546,14 +2370,19 @@ command." (interactive (list (progn - (message "Export visible: [a]SCII [h]tml [b]rowse HTML [H/R]uffer with HTML [D]ocBook [x]OXO [ ]keep buffer") + (message "Export visible: [a]SCII [h]tml [b]rowse HTML [H/R]buffer with HTML [D]ocBook [l]atex [p]df [d]view pdf [L]atex buffer [x]OXO [ ]keep buffer") (read-char-exclusive)) current-prefix-arg)) - (if (not (member type '(?a ?\C-a ?b ?\C-b ?h ?D ?x ?\ ))) + (if (not (member type '(?a ?n ?u ?\C-a ?b ?\C-b ?h ?D ?x ?\ ?l ?p ?d ?L))) (error "Invalid export key")) (let* ((binding (cdr (assoc type - '((?a . org-export-as-ascii) + '( + (?a . org-export-as-ascii) (?A . org-export-as-ascii-to-buffer) + (?n . org-export-as-latin1) + (?N . org-export-as-latin1-to-buffer) + (?u . org-export-as-utf8) + (?U . org-export-as-utf8-to-buffer) (?\C-a . org-export-as-ascii) (?b . org-export-as-html-and-open) (?\C-b . org-export-as-html-and-open) @@ -2561,6 +2390,12 @@ (?H . org-export-as-html-to-buffer) (?R . org-export-region-as-html) (?D . org-export-as-docbook) + + (?l . org-export-as-latex) + (?p . org-export-as-pdf) + (?d . org-export-as-pdf-and-open) + (?L . org-export-as-latex-to-buffer) + (?x . org-export-as-xoxo))))) (keepp (equal type ?\ )) (file buffer-file-name) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-faces.el --- a/lisp/org/org-faces.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-faces.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -49,7 +49,7 @@ (defgroup org-faces nil "Faces in Org-mode." :tag "Org Faces" - :group 'org-font-lock) + :group 'org-appearance) (defface org-hide '((((background light)) (:foreground "white")) @@ -338,29 +338,53 @@ to the part of the headline after the DONE keyword." :group 'org-faces) +(defcustom org-faces-easy-properties + '((todo . :foreground) (tag . :foreground) (priority . :foreground)) + "The property changes by easy faces. +This is an alist, the keys show the area of application, the values +can be `:foreground' or `:background'. A color string for special +keywords will then be interpreted as either foreground or background +color." + :group 'org-faces + :group 'org-todo + :type '(repeat + (cons (choice (const todo) (const tag) (const priority)) + (choice (const :foreground) (const :background))))) + (defcustom org-todo-keyword-faces nil "Faces for specific TODO keywords. This is a list of cons cells, with TODO keywords in the car -and faces in the cdr. The face can be a symbol, or a property -list of attributes, like (:foreground \"blue\" :weight bold :underline t)." +and faces in the cdr. The face can be a symbol, a color +as a string (in which case the rest is inherited from the `org-todo' face), +or a property list of attributes, like + (:foreground \"blue\" :weight bold :underline t). +If it is a color string, the variable `org-faces-easy-properties' +determines if it is a foreground or a background color." :group 'org-faces :group 'org-todo :type '(repeat (cons - (string :tag "keyword") - (sexp :tag "face")))) + (string :tag "Keyword") + (choice :tag "Face " + (string :tag "Color") + (sexp :tag "Face"))))) (defcustom org-priority-faces nil "Faces for specific Priorities. This is a list of cons cells, with priority character in the car -and faces in the cdr. The face can be a symbol, or a property -list of attributes, like (:foreground \"blue\" :weight bold :underline t)." +and faces in the cdr. The face can be a symbol, a color as +as a string, or a property list of attributes, like + (:foreground \"blue\" :weight bold :underline t). +If it is a color string, the variable `org-faces-easy-properties' +determines if it is a foreground or a background color." :group 'org-faces :group 'org-todo :type '(repeat (cons (character :tag "Priority") - (sexp :tag "face")))) + (choice :tag "Face " + (string :tag "Color") + (sexp :tag "Face"))))) (defvar org-tags-special-faces-re nil) (defun org-set-tag-faces (var value) @@ -378,15 +402,16 @@ (org-copy-face 'org-todo 'org-checkbox-statistics-todo - "Face used for unfinished checkbox statistics.") + "Face used for unfinished checkbox statistics.") (org-copy-face 'org-done 'org-checkbox-statistics-done - "Face used for finished checkbox statistics.") + "Face used for finished checkbox statistics.") (defcustom org-tag-faces nil "Faces for specific tags. This is a list of cons cells, with tags in the car and faces in the cdr. -The face can be a symbol, or a property list of attributes, +The face can be a symbol, a foreground color (in which case the rest is +inherited from the `org-tag' face) or a property list of attributes, like (:foreground \"blue\" :weight bold :underline t). If you set this variable through customize, it will immediately be effective in new buffers and in modified lines. @@ -397,8 +422,10 @@ :set 'org-set-tag-faces :type '(repeat (cons - (string :tag "Tag") - (sexp :tag "Face")))) + (string :tag "Tag ") + (choice :tag "Face" + (string :tag "Foreground color") + (sexp :tag "Face"))))) (defface org-table ;; originally copied from font-lock-function-name-face (org-compatible-face nil @@ -441,6 +468,34 @@ :group 'org-faces :version "22.1") +(defface org-document-title + '((((class color) (background light)) (:foreground "midnight blue" :weight bold :height 1.44)) + (((class color) (background dark)) (:foreground "pale turquoise" :weight bold :height 1.44)) + (t (:weight bold :height 1.44))) + "Face for document title, i.e. that which follows the #+TITLE: keyword." + :group 'org-faces) + +(defface org-document-info + '((((class color) (background light)) (:foreground "midnight blue")) + (((class color) (background dark)) (:foreground "pale turquoise")) + (t nil)) + "Face for document date, author and email; i.e. that which +follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword." + :group 'org-faces) + +(defface org-document-info-keyword + (org-compatible-face 'shadow + '((((class color grayscale) (min-colors 88) (background light)) + (:foreground "grey50")) + (((class color grayscale) (min-colors 88) (background dark)) + (:foreground "grey70")) + (((class color) (min-colors 8) (background light)) + (:foreground "green")) + (((class color) (min-colors 8) (background dark)) + (:foreground "yellow")))) + "Face for #+TITLE:, #+AUTHOR:, #+EMAIL: and #+DATE: keywords." + :group 'org-faces) + (defface org-block (org-compatible-face 'shadow '((((class color grayscale) (min-colors 88) (background light)) @@ -474,6 +529,13 @@ (org-copy-face 'org-block 'org-verse "Face for #+BEGIN_VERSE ... #+END_VERSE blocks.") +(defcustom org-fontify-quote-and-verse-blocks nil + "Non-nil means, add a special face to #+begin_quote and #+begin_verse block. +When nil, format these as normal Org. This is the default, because the +content of these blocks will still be treated as Org syntax." + :group 'org-faces + :type 'boolean) + (defface org-clock-overlay ;; copied from secondary-selection (org-compatible-face nil '((((class color) (min-colors 88) (background light)) @@ -502,17 +564,17 @@ :group 'org-faces) (org-copy-face 'org-agenda-structure 'org-agenda-date - "Face used in agenda for normal days.") + "Face used in agenda for normal days.") (org-copy-face 'org-agenda-date 'org-agenda-date-today - "Face used in agenda for today." - :weight 'bold :italic 't) + "Face used in agenda for today." + :weight 'bold :italic 't) (org-copy-face 'secondary-selection 'org-agenda-clocking - "Face marking the current clock item in the agenda.") + "Face marking the current clock item in the agenda.") (org-copy-face 'org-agenda-date 'org-agenda-date-weekend - "Face used in agenda for weekend days. + "Face used in agenda for weekend days. See the variable `org-agenda-weekend-days' for a definition of which days belong to the weekend." :weight 'bold) @@ -605,6 +667,12 @@ "Face used for time grids." :group 'org-faces) +(defface org-agenda-diary + (org-compatible-face 'default + nil) + "Face used for agenda entries that come from the Emacs diary." + :group 'org-faces) + (defconst org-level-faces '(org-level-1 org-level-2 org-level-3 org-level-4 org-level-5 org-level-6 org-level-7 org-level-8 @@ -634,7 +702,10 @@ :group 'org-faces) (org-copy-face 'modeline 'org-mode-line-clock - "Face used for clock display in mode line.") + "Face used for clock display in mode line.") +(org-copy-face 'modeline 'org-mode-line-clock-overrun + "Face used for clock display for overrun tasks in mode line." + :background "red") (provide 'org-faces) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-feed.el --- a/lisp/org/org-feed.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-feed.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -234,7 +234,7 @@ :type '(string :tag "Template")) (defcustom org-feed-save-after-adding t - "Non-nil means, save buffer after adding new feed items." + "Non-nil means save buffer after adding new feed items." :group 'org-feed :type 'boolean) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-footnote.el --- a/lisp/org/org-footnote.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-footnote.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -47,6 +47,7 @@ (declare-function org-back-to-heading "org" (&optional invisible-ok)) (declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading)) (declare-function org-in-verbatim-emphasis "org" ()) +(declare-function org-inside-latex-macro-p "org" ()) (defvar org-odd-levels-only) ;; defined in org.el (defconst org-footnote-re @@ -90,7 +91,7 @@ :type 'string) (defcustom org-footnote-define-inline nil - "Non-nil means, define footnotes inline, at reference location. + "Non-nil means define footnotes inline, at reference location. When nil, footnotes will be defined in a special section near the end of the document. When t, the [fn:label:definition] notation will be used to define the footnote at the reference position." @@ -98,7 +99,7 @@ :type 'boolean) (defcustom org-footnote-auto-label t - "Non-nil means, define automatically new labels for footnotes. + "Non-nil means define automatically new labels for footnotes. Possible values are: nil prompt the user for each label @@ -115,7 +116,7 @@ (const :tag "Create automatic [N]" plain))) (defcustom org-footnote-auto-adjust nil - "Non-nil means, automatically adjust footnotes after insert/delete. + "Non-nil means automatically adjust footnotes after insert/delete. When this is t, after each insertion or deletion of a footnote, simple fn:N footnotes will be renumbered, and all footnotes will be sorted. If you want to have just sorting or just renumbering, set this variable @@ -132,7 +133,7 @@ (const :tag "Renumber and Sort" t))) (defcustom org-footnote-fill-after-inline-note-extraction nil - "Non-nil means, fill paragraphs after extracting footnotes. + "Non-nil means fill paragraphs after extracting footnotes. When extracting inline footnotes, the lengths of lines can change a lot. When this option is set, paragraphs from which an inline footnote has been extracted will be filled again." @@ -182,7 +183,7 @@ (message "Edit definition and go back with `C-c &' or, if unique, with `C-c C-c'.")))) (defun org-footnote-goto-next-reference (label) - "Find the definition of the footnote with label LABEL." + "Find the next reference of the footnote with label LABEL." (interactive "sLabel: ") (org-mark-ring-push) (setq label (org-footnote-normalize-label label)) @@ -366,7 +367,8 @@ ;; Now find footnote references, and extract the definitions (goto-char (point-min)) (while (re-search-forward org-footnote-re nil t) - (unless (or (org-in-commented-line) (org-in-verbatim-emphasis)) + (unless (or (org-in-commented-line) (org-in-verbatim-emphasis) + (org-inside-latex-macro-p)) (org-if-unprotected (setq def (match-string 4) idef def @@ -397,13 +399,13 @@ (skip-chars-backward " \t\n\t") (delete-region (1+ (point)) (match-beginning 0)))))) (unless sort-only - (replace-match (concat before "[" marker "]")) + (replace-match (concat before "[" marker "]") t t) (and idef org-footnote-fill-after-inline-note-extraction (fill-paragraph))) (if (not a) (push (list ref marker def (if idef t nil)) ref-table))))) - + ;; First find and remove the footnote section (goto-char (point-min)) (cond diff -r d33170754d70 -r 805a52720f82 lisp/org/org-freemind.el --- a/lisp/org/org-freemind.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-freemind.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Lennart Borgman (lennart O borgman A gmail O com) ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -81,6 +81,7 @@ (require 'xml) (require 'org) +(require 'rx) (require 'org-exp) (eval-when-compile (require 'cl)) @@ -240,7 +241,7 @@ ;; file is utf-8: ;; ;; (format "&#x%x;" (- cc ;; ?\x800)) - (format "&#x%x" (encode-char cc 'ucs)) + (format "&#x%x;" (encode-char cc 'ucs)) )))) fm-str)) @@ -561,11 +562,10 @@ (num-top2-nodes 0) num-left-nodes (unclosed-nodes 0) + (odd-only org-odd-levels-only) (first-time t) (current-level 1) base-level - skipping-odd - (skipped-odd 0) prev-node-end rich-text unfinished-tag @@ -671,21 +671,6 @@ (setq next-node-start (match-beginning 0)) (setq next-m2 (match-string-no-properties 2)) (setq next-level (length next-m1)) - (when (> next-level current-level) - (if (not (and org-odd-levels-only - (/= (mod current-level 2) 0) - (= next-level (+ 2 current-level)))) - (setq skipping-odd nil) - (setq skipping-odd t) - (setq skipped-odd (1+ skipped-odd))) - (unless (or (= next-level (1+ current-level)) - skipping-odd) - (if (or org-odd-levels-only - (/= next-level (+ 2 current-level))) - (error "Next level step > +1 for node ending at line %s" (line-number-at-pos)) - (error "Next level step = +2 for node ending at line %s, forgot org-odd-levels-only?" - (line-number-at-pos))) - )) (setq next-children-visible (not (eq 'outline (get-char-property (line-end-position) 'invisible)))) @@ -698,11 +683,8 @@ (while (>= current-level next-level) (with-current-buffer mm-buffer (insert "\n") - (setq current-level (1- current-level)) - (when (< 0 skipped-odd) - (setq skipped-odd (1- skipped-odd)) - (setq current-level (1- current-level))) - ))) + (setq current-level + (- current-level (if odd-only 2 1)))))) (setq this-node-end (1+ next-node-end)) (setq this-m2 next-m2) (setq current-level next-level) @@ -725,7 +707,8 @@ (with-current-buffer mm-buffer (while (> current-level base-level) (insert "\n") - (setq current-level (1- current-level)) + (setq current-level + (- current-level (if odd-only 2 1))) )) (with-current-buffer mm-buffer (insert "") diff -r d33170754d70 -r 805a52720f82 lisp/org/org-gnus.el --- a/lisp/org/org-gnus.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-gnus.el Thu Apr 15 12:13:27 2010 +0200 @@ -7,7 +7,7 @@ ;; Tassilo Horn ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -48,7 +48,7 @@ (defvaralias 'org-usenet-links-prefer-google 'org-gnus-prefer-web-links)) (defcustom org-gnus-prefer-web-links nil - "Non-nil means, `org-store-link' will create web links to Google groups. + "Non-nil means `org-store-link' will create web links to Google groups. When nil, Gnus will be used for such links. Using a prefix arg to the command \\[org-store-link] (`org-store-link') negates this setting for the duration of the command." @@ -169,19 +169,28 @@ (cond ((and group article) (gnus-activate-group group t) (condition-case nil - (let ((articles 1) - group-opened) - (while (and (not group-opened) - ;; stop on integer overflows - (> articles 0)) - (setq group-opened (gnus-group-read-group articles nil group) - articles (if (< articles 16) - (1+ articles) - (* articles 2)))) - (if group-opened - (gnus-summary-goto-article article nil t) - (message "Couldn't follow gnus link. %s" - "The summary couldn't be opened."))) + (let ((backend (car (gnus-find-method-for-group group)))) + (cond + ((eq backend 'nndoc) + (if (gnus-group-read-group t nil group) + (gnus-summary-goto-article article nil t) + (message "Couldn't follow gnus link. %s" + "The summary couldn't be opened."))) + (t + (let ((articles 1) + group-opened) + (while (and (not group-opened) + ;; stop on integer overflows + (> articles 0)) + (setq group-opened (gnus-group-read-group + articles nil group) + articles (if (< articles 16) + (1+ articles) + (* articles 2)))) + (if group-opened + (gnus-summary-goto-article article nil t) + (message "Couldn't follow gnus link. %s" + "The summary couldn't be opened.")))))) (quit (message "Couldn't follow gnus link. %s" "The linked group is empty.")))) (group (gnus-group-jump-to-group group)))) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-habit.el --- a/lisp/org/org-habit.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-habit.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: John Wiegley ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -67,52 +67,52 @@ :type 'boolean) (defface org-habit-clear-face - '((((background light)) (:background "slateblue")) + '((((background light)) (:background "#8270f9")) (((background dark)) (:background "blue"))) "Face for days on which a task shouldn't be done yet." :group 'org-habit :group 'org-faces) (defface org-habit-clear-future-face - '((((background light)) (:background "powderblue")) + '((((background light)) (:background "#d6e4fc")) (((background dark)) (:background "midnightblue"))) "Face for future days on which a task shouldn't be done yet." :group 'org-habit :group 'org-faces) (defface org-habit-ready-face - '((((background light)) (:background "green")) + '((((background light)) (:background "#4df946")) (((background dark)) (:background "forestgreen"))) "Face for days on which a task should start to be done." :group 'org-habit :group 'org-faces) (defface org-habit-ready-future-face - '((((background light)) (:background "palegreen")) + '((((background light)) (:background "#acfca9")) (((background dark)) (:background "darkgreen"))) "Face for days on which a task should start to be done." :group 'org-habit :group 'org-faces) (defface org-habit-alert-face - '((((background light)) (:background "yellow")) + '((((background light)) (:background "#f5f946")) (((background dark)) (:background "gold"))) "Face for days on which a task is due." :group 'org-habit :group 'org-faces) (defface org-habit-alert-future-face - '((((background light)) (:background "palegoldenrod")) + '((((background light)) (:background "#fafca9")) (((background dark)) (:background "darkgoldenrod"))) "Face for days on which a task is due." :group 'org-habit :group 'org-faces) (defface org-habit-overdue-face - '((((background light)) (:background "red")) + '((((background light)) (:background "#f9372d")) (((background dark)) (:background "firebrick"))) "Face for days on which a task is overdue." :group 'org-habit :group 'org-faces) (defface org-habit-overdue-future-face - '((((background light)) (:background "mistyrose")) + '((((background light)) (:background "#fc9590")) (((background dark)) (:background "darkred"))) "Face for days on which a task is overdue." :group 'org-habit @@ -305,6 +305,7 @@ (defun org-habit-insert-consistency-graphs (&optional line) "Insert consistency graph for any habitual tasks." (let ((inhibit-read-only t) l c + (buffer-invisibility-spec '(org-link)) (moment (time-subtract (current-time) (list 0 (* 3600 org-extend-today-until) 0)))) (save-excursion diff -r d33170754d70 -r 805a52720f82 lisp/org/org-html.el --- a/lisp/org/org-html.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-html.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -81,7 +81,7 @@ (string :tag "Declaration"))))) (defcustom org-export-html-style-include-scripts t - "Non-nil means, include the javascript snippets in exported HTML files. + "Non-nil means include the javascript snippets in exported HTML files. The actual script is defined in `org-export-html-scripts' and should not be modified." :group 'org-export-html @@ -137,6 +137,7 @@ dt { font-weight: bold; } div.figure { padding: 0.5em; } div.figure p { text-align: center; } + textarea { overflow-x: auto; } .linenr { font-size:smaller } .code-highlighted {background-color:#ffff00;} .org-info-js_info-navigation { border-style:none; } @@ -153,7 +154,7 @@ `org-export-html-style-include-default'.") (defcustom org-export-html-style-include-default t - "Non-nil means, include the default style in exported HTML files. + "Non-nil means include the default style in exported HTML files. The actual style is defined in `org-export-html-style-default' and should not be modified. Use the variables `org-export-html-style' to add your own style information." @@ -253,7 +254,7 @@ :type 'string) (defcustom org-export-html-link-org-files-as-html t - "Non-nil means, make file links to `file.org' point to `file.html'. + "Non-nil means make file links to `file.org' point to `file.html'. When org-mode is exporting an org-mode file to HTML, links to non-html files are directly put into a href tag in HTML. However, links to other Org-mode files (recognized by the @@ -265,7 +266,7 @@ :type 'boolean) (defcustom org-export-html-inline-images 'maybe - "Non-nil means, inline images into exported HTML pages. + "Non-nil means inline images into exported HTML pages. This is done using an tag. When nil, an anchor with href is used to link to the image. If this option is `maybe', then images in links with an empty description will be inlined, while images with a description will @@ -333,13 +334,13 @@ (defcustom org-export-html-table-use-header-tags-for-first-column nil - "Non-nil means, format column one in tables with header tags. + "Non-nil means format column one in tables with header tags. When nil, also column one will use data tags." :group 'org-export-tables :type 'boolean) (defcustom org-export-html-validation-link nil - "Non-nil means, add validationlink to postamble of HTML exported files." + "Non-nil means add validationlink to postamble of HTML exported files." :group 'org-export-html :type '(choice (const :tag "Nothing" nil) @@ -420,7 +421,7 @@ "Hook run during HTML export, after blockquote, verse, center are done.") (defvar org-export-html-final-hook nil - "Hook run during HTML export, after blockquote, verse, center are done.") + "Hook run at the end of HTML export, in the new buffer.") ;;; HTML export @@ -433,7 +434,16 @@ (file-name-nondirectory org-current-export-file))) org-current-export-dir nil "Creating LaTeX image %s")) - (message "Exporting...")) + (goto-char (point-min)) + (let (label l1) + (while (re-search-forward "\\\\ref{\$[^{}\n]+\$}" nil t) + (org-if-unprotected-at (match-beginning 1) + (setq label (match-string 1)) + (save-match-data + (if (string-match "\\`[a-z]\\{1,10\\}:\$.+\$" label) + (setq l1 (substring label (match-beginning 1))) + (setq l1 label))) + (replace-match (format "[[#%s][%s]]" label l1) t t))))) ;;;###autoload (defun org-export-as-html-and-open (arg) @@ -443,7 +453,9 @@ headlines. The default is 3. Lower levels will become bulleted lists." (interactive "P") (org-export-as-html arg 'hidden) - (org-open-file buffer-file-name)) + (org-open-file buffer-file-name) + (when org-export-kill-product-buffer-when-displayed + (kill-buffer))) ;;;###autoload (defun org-export-as-html-batch () @@ -539,6 +551,7 @@ ..., without even the body tags themselves. When PUB-DIR is set, use this as the publishing directory." (interactive "P") + (run-hooks 'org-export-first-hook) ;; Make sure we have a file name when we need it. (when (and (not (or to-buffer body-only)) @@ -624,7 +637,8 @@ (author (plist-get opt-plist :author)) (title (or (and subtree-p (org-export-get-title-from-subtree)) (plist-get opt-plist :title) - (and (not + (and (not body-only) + (not (plist-get opt-plist :skip-before-1st-heading)) (org-export-grab-title-from-buffer)) (and buffer-file-name @@ -804,7 +818,8 @@ (push "

" thetoc) (setq lines (mapcar '(lambda (line) - (if (string-match org-todo-line-regexp line) + (if (and (string-match org-todo-line-regexp line) + (not (get-text-property 0 'org-protected line))) ;; This is a headline (progn (setq have-headings t) @@ -999,7 +1014,7 @@ "\" class=\"target\">" (match-string 1 line) "@ ") t t line))))) - + (setq line (org-html-handle-time-stamps line)) ;; replace "&" by "&", "<" and ">" by "<" and ">" @@ -1125,9 +1140,11 @@ (not (string-match "^[0-9]*$" search)) (not (string-match "^\\*" search)) (not (string-match "^/.*/$" search))) - (setq thefile (concat thefile "#" - (org-solidify-link-text - (org-link-unescape search))))) + (setq thefile + (concat thefile + (if (= (string-to-char search) ?#) "" "#") + (org-solidify-link-text + (org-link-unescape search))))) (when (string-match "^file:" desc) (setq desc (replace-match "" t t desc)) (if (string-match "\\.org$" desc) @@ -1402,7 +1419,7 @@ (when (and org-export-author-info author) (insert "
" (nth 1 lang-words) ": " author "\n") - (when email + (when (and org-export-email-info email (string-match "\\S-" email)) (if (listp (split-string email ",+ *")) (mapc (lambda(e) (insert "<" @@ -1469,6 +1486,12 @@ (delete-region beg end) (insert (format "%s" (make-string n ?x))))) + ;; Remove empty lines at the beginning of the file. + (goto-char (point-min)) + (when (looking-at "\\s-+\n") (replace-match "")) + ;; Remove display properties + (remove-text-properties (point-min) (point-max) '(display t)) + ;; Run the hook (run-hooks 'org-export-html-final-hook) (or to-buffer (save-buffer)) (goto-char (point-min)) @@ -1506,10 +1529,12 @@ "Create image tag with source and attributes." (save-match-data (if (string-match "^ltxpng/" src) - (format "" src) + (format " $\"%s\"/$ " + src (org-find-text-property-in-string 'org-latex-src src)) (let* ((caption (org-find-text-property-in-string 'org-caption src)) (attr (org-find-text-property-in-string 'org-attributes src)) (label (org-find-text-property-in-string 'org-label src))) + (setq caption (and caption (org-html-do-expand caption))) (concat (if caption (format "%s
@@ -1585,16 +1610,10 @@ ;; column and the special lines (setq lines (org-table-clean-before-export lines))) - (let* ((caption (or (get-text-property 0 'org-caption (car lines)) - (get-text-property (or (next-single-property-change - 0 'org-caption (car lines)) - 0) - 'org-caption (car lines)))) - (attributes (or (get-text-property 0 'org-attributes (car lines)) - (get-text-property (or (next-single-property-change - 0 'org-attributes (car lines)) - 0) - 'org-attributes (car lines)))) + (let* ((caption (org-find-text-property-in-string 'org-caption (car lines))) + (label (org-find-text-property-in-string 'org-label (car lines))) + (attributes (org-find-text-property-in-string 'org-attributes + (car lines))) (html-table-tag (org-export-splice-attributes html-table-tag attributes)) (head (and org-export-highlight-first-table-line @@ -1604,6 +1623,7 @@ (nline 0) fnum i tbopen line fields html gr colgropen rowstart rowend) + (setq caption (and caption (org-html-do-expand caption))) (if splice (setq head nil)) (unless splice (push (if head "" "") html)) (setq tbopen t) @@ -1676,6 +1696,8 @@ ;; DocBook document, we want to always include the caption to make ;; DocBook XML file valid. (push (format "%s" (or caption "")) html) + (when label (push (format "" label label) + html)) (push html-table-tag html)) (concat (mapconcat 'identity html "\n") "\n"))) @@ -1865,14 +1887,16 @@ (let* ((re (concat org-bracket-link-regexp "\\|" (org-re "[ \t]+\$:[[:alnum:]_@:]+:\$[ \t]*$"))) m s l res) - (while (setq m (string-match re string)) - (setq s (substring string 0 m) - l (match-string 0 string) - string (substring string (match-end 0))) - (push (org-html-do-expand s) res) - (push l res)) - (push (org-html-do-expand string) res) - (apply 'concat (nreverse res)))) + (if (string-match "^[ \t]*\\+-[-+]*\\+[ \t]*$" string) + string + (while (setq m (string-match re string)) + (setq s (substring string 0 m) + l (match-string 0 string) + string (substring string (match-end 0))) + (push (org-html-do-expand s) res) + (push l res)) + (push (org-html-do-expand string) res) + (apply 'concat (nreverse res))))) (defun org-html-do-expand (s) "Apply all active conversions to translate special ASCII to HTML." @@ -1887,16 +1911,14 @@ (if org-export-with-sub-superscripts (setq s (org-export-html-convert-sub-super s))) (if org-export-with-TeX-macros - (let ((start 0) wd ass) - (while (setq start (string-match "\\\\\$[a-zA-Z]+\$\${}\$?" + (let ((start 0) wd rep) + (while (setq start (string-match "\\\\\$[a-zA-Z]+[0-9]*\$\${}\$?" s start)) (if (get-text-property (match-beginning 0) 'org-protected s) (setq start (match-end 0)) (setq wd (match-string 1 s)) - (if (setq ass (assoc wd org-html-entities)) - (setq s (replace-match (or (cdr ass) - (concat "&" (car ass) ";")) - t t s)) + (if (setq rep (org-entity-get-representation wd 'html)) + (setq s (replace-match rep t t s)) (setq start (+ start (length wd)))))))) s) @@ -1994,8 +2016,11 @@ When TITLE is nil, just close all open levels." (org-close-par-maybe) (let* ((target (and title (org-get-text-property-any 0 'target title))) - (extra-targets (assoc target org-export-target-aliases)) - (preferred (cdr (assoc target org-export-preferred-target-alist))) + (extra-targets (and target + (assoc target org-export-target-aliases))) + (extra-class (and title (org-get-text-property-any 0 'html-container-class title))) + (preferred (and target + (cdr (assoc target org-export-preferred-target-alist)))) (remove (or preferred target)) (l org-level-max) snumber href suffix) @@ -2058,8 +2083,9 @@ (setq href (cdr (assoc (concat "sec-" snumber) org-export-preferred-target-alist))) (setq suffix (or href snumber)) (setq href (or href (concat "sec-" snumber))) - (insert (format "\n
\n%s%s\n
\n" - suffix level level href + (insert (format "\n
\n%s%s\n
\n" + suffix level (if extra-class (concat " " extra-class) "") + level href extra-targets title level level suffix)) (org-open-par))))) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-icalendar.el --- a/lisp/org/org-icalendar.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-icalendar.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -48,7 +48,7 @@ :type 'string) (defcustom org-icalendar-use-plain-timestamp t - "Non-nil means, make an event from every plain time stamp." + "Non-nil means make an event from every plain time stamp." :group 'org-export-icalendar :type 'boolean) @@ -104,7 +104,7 @@ (const :tag "All tags, including inherited ones" all-tags)))) (defcustom org-icalendar-include-todo nil - "Non-nil means, export to iCalendar files should also cover TODO items. + "Non-nil means export to iCalendar files should also cover TODO items. Valid values are: nil don't include any TODO items t include all TODO items that are not in a DONE state @@ -129,13 +129,13 @@ for whatever you need.") (defcustom org-icalendar-include-bbdb-anniversaries nil - "Non-nil means, a combined iCalendar files should include anniversaries. + "Non-nil means a combined iCalendar files should include anniversaries. The anniversaries are define in the BBDB database." :group 'org-export-icalendar :type 'boolean) (defcustom org-icalendar-include-sexps t - "Non-nil means, export to iCalendar files should also cover sexp entries. + "Non-nil means export to iCalendar files should also cover sexp entries. These are entries like in the diary, but directly in an Org-mode file." :group 'org-export-icalendar :type 'boolean) @@ -152,7 +152,7 @@ (integer :tag "Max characters"))) (defcustom org-icalendar-store-UID nil - "Non-nil means, store any created UIDs in properties. + "Non-nil means store any created UIDs in properties. The iCalendar standard requires that all entries have a unique identifier. Org will create these identifiers as needed. When this variable is non-nil, the created UIDs will be stored in the ID property of the entry. Then the diff -r d33170754d70 -r 805a52720f82 lisp/org/org-id.el --- a/lisp/org/org-id.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-id.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -123,7 +123,7 @@ (string :tag "Prefix"))) (defcustom org-id-include-domain nil - "Non-nil means, add the domain name to new IDs. + "Non-nil means add the domain name to new IDs. This ensures global uniqueness of IDs, and is also suggested by RFC 2445 in combination with RFC 822. This is only relevant if `org-id-method' is `org'. When uuidgen is used, the domain will never @@ -135,7 +135,7 @@ :type 'boolean) (defcustom org-id-track-globally t - "Non-nil means, track IDs through files, so that links work globally. + "Non-nil means track IDs through files, so that links work globally. This work by maintaining a hash table for IDs and writing this table to disk when exiting Emacs. Because of this, it works best if you use a single Emacs process, not many. @@ -178,7 +178,7 @@ (file)))) (defcustom org-id-search-archives t - "Non-nil means, search also the archive files of agenda files for entries. + "Non-nil means search also the archive files of agenda files for entries. This is a possibility to reduce overhead, but it means that entries moved to the archives can no longer be found by ID. This variable is only relevant when `org-id-track-globally' is set." @@ -466,7 +466,7 @@ (defun org-id-locations-save () "Save `org-id-locations' in `org-id-locations-file'." - (when org-id-track-globally + (when (and org-id-track-globally org-id-locations) (let ((out (if (hash-table-p org-id-locations) (org-id-hash-to-alist org-id-locations) org-id-locations))) @@ -545,7 +545,9 @@ (defun org-id-find-id-file (id) "Query the id database for the file in which this ID is located." (unless org-id-locations (org-id-locations-load)) - (or (gethash id org-id-locations) + (or (and org-id-locations + (hash-table-p org-id-locations) + (gethash id org-id-locations)) ;; ball back on current buffer (buffer-file-name (or (buffer-base-buffer (current-buffer)) (current-buffer))))) @@ -576,6 +578,7 @@ "Store a link to the current entry, using its ID." (interactive) (let* ((link (org-make-link "id:" (org-id-get-create))) + (case-fold-search nil) (desc (save-excursion (org-back-to-heading t) (or (and (looking-at org-complex-heading-regexp) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-indent.el --- a/lisp/org/org-indent.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-indent.el Thu Apr 15 12:13:27 2010 +0200 @@ -4,7 +4,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -38,7 +38,7 @@ (defgroup org-indent nil "Options concerning dynamic virtual outline indentation." - :tag "Org Structure" + :tag "Org Indent" :group 'org) (defconst org-indent-max 40 @@ -67,13 +67,13 @@ :type 'character) (defcustom org-indent-mode-turns-off-org-adapt-indentation t - "Non-nil means, turning on org-indent-mode turns off indentation adaptation. + "Non-nil means turning on `org-indent-mode' turns off indentation adaptation. For details see the variable `org-adapt-indentation'." :group 'org-indent :type 'boolean) (defcustom org-indent-mode-turns-on-hiding-stars t - "Non-nil means, turning on org-indent-mode turns on `org-hide-leading-stars'." + "Non-nil means turning on `org-indent-mode' turns on `org-hide-leading-stars'." :group 'org-indent :type 'boolean) @@ -227,7 +227,7 @@ b e (list 'line-prefix (aref org-indent-strings n) 'wrap-prefix (aref org-indent-strings n)))) (setq b (1+ (point-at-eol)) - n (* level org-indent-indentation-per-level)))))))) + n (* (or level 0) org-indent-indentation-per-level)))))))) (defun org-indent-refresh-section () "Refresh indentation properties in the current outline section. diff -r d33170754d70 -r 805a52720f82 lisp/org/org-info.el --- a/lisp/org/org-info.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-info.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; diff -r d33170754d70 -r 805a52720f82 lisp/org/org-inlinetask.el --- a/lisp/org/org-inlinetask.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-inlinetask.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; This file is part of GNU Emacs. @@ -94,7 +94,7 @@ :type 'boolean) (defcustom org-inlinetask-export t - "Non-nil means, export inline tasks. + "Non-nil means export inline tasks. When nil, they will not be exported." :group 'org-inlinetask :type 'boolean) @@ -149,7 +149,17 @@ (when (string-match org-complex-heading-regexp headline) (setq headline (concat (if (match-end 2) - (concat (match-string 2 headline) " ") "") + (concat + (org-add-props + (format + "@ %s@" + (if (member (match-string 2 headline) + org-done-keywords) + "done" "todo") + (match-string 2 headline) + (match-string 2 headline)) + nil 'org-protected t) + " ") "") (match-string 4 headline))) (when content (if (not (string-match "\\S-" content)) @@ -232,5 +242,4 @@ (provide 'org-inlinetask) -;; arch-tag: 59fdac51-8bcc-469e-a21e-6897dd6697bb ;;; org-inlinetask.el ends here diff -r d33170754d70 -r 805a52720f82 lisp/org/org-irc.el --- a/lisp/org/org-irc.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-irc.el Thu Apr 15 12:13:27 2010 +0200 @@ -4,7 +4,7 @@ ;; ;; Author: Philip Jackson ;; Keywords: erc, irc, link, org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; diff -r d33170754d70 -r 805a52720f82 lisp/org/org-jsinfo.el --- a/lisp/org/org-jsinfo.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-jsinfo.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; diff -r d33170754d70 -r 805a52720f82 lisp/org/org-latex.el --- a/lisp/org/org-latex.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-latex.el Thu Apr 15 12:13:27 2010 +0200 @@ -4,7 +4,7 @@ ;; ;; Emacs Lisp Archive Entry ;; Filename: org-latex.el -;; Version: 6.33x +;; Version: 6.35i ;; Author: Bastien Guerry ;; Maintainer: Carsten Dominik ;; Keywords: org, wp, tex @@ -50,9 +50,11 @@ (require 'org) (require 'org-exp) (require 'org-macs) +(require 'org-beamer) ;;; Variables: (defvar org-export-latex-class nil) +(defvar org-export-latex-class-options nil) (defvar org-export-latex-header nil) (defvar org-export-latex-append-header nil) (defvar org-export-latex-options-plist nil) @@ -89,53 +91,30 @@ (defcustom org-export-latex-classes '(("article" - "\\documentclass[11pt]{article} -\\usepackage[utf8]{inputenc} -\\usepackage[T1]{fontenc} -\\usepackage{graphicx} -\\usepackage{longtable} -\\usepackage{float} -\\usepackage{wrapfig} -\\usepackage{soul} -\\usepackage{amssymb} -\\usepackage{hyperref}" + "\\documentclass[11pt]{article}" ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}") ("\\paragraph{%s}" . "\\paragraph*{%s}") ("\\subparagraph{%s}" . "\\subparagraph*{%s}")) ("report" - "\\documentclass[11pt]{report} -\\usepackage[utf8]{inputenc} -\\usepackage[T1]{fontenc} -\\usepackage{graphicx} -\\usepackage{longtable} -\\usepackage{float} -\\usepackage{wrapfig} -\\usepackage{soul} -\\usepackage{amssymb} -\\usepackage{hyperref}" + "\\documentclass[11pt]{report}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) ("book" - "\\documentclass[11pt]{book} -\\usepackage[utf8]{inputenc} -\\usepackage[T1]{fontenc} -\\usepackage{graphicx} -\\usepackage{longtable} -\\usepackage{float} -\\usepackage{wrapfig} -\\usepackage{soul} -\\usepackage{amssymb} -\\usepackage{hyperref}" + "\\documentclass[11pt]{book}" ("\\part{%s}" . "\\part*{%s}") ("\\chapter{%s}" . "\\chapter*{%s}") ("\\section{%s}" . "\\section*{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") - ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))) + ("\\subsubsection{%s}" . "\\subsubsection*{%s}")) + ("beamer" + "\\documentclass{beamer}" + org-beamer-sectioning + )) "Alist of LaTeX classes and associated header and structure. If #+LaTeX_CLASS is set in the buffer, use its value and the associated information. Here is the structure of each cell: @@ -145,11 +124,59 @@ (numbered-section . unnumbered-section\) ...\) -A %s formatter is mandatory in each section string and will be -replaced by the title of the section. +The header string +----------------- + +The HEADER-STRING is the header that will be inserted into the LaTeX file. +It should contain the \\documentclass macro, and anything else that is needed +for this setup. To this header, the following commands will be added: + +- Calls to \\usepackage for all packages mentioned in the variables + `org-export-latex-default-packages-alist' and + `org-export-latex-packages-alist'. Thus, your header definitions should + avoid to also request these packages. + +- Lines specified via \"#+LaTeX_HEADER:\" + +If you need more control about the sequence in which the header is built +up, or if you want to exclude one of these building blocks for a particular +class, you can use the following macro-like placeholders. + + [DEFAULT-PACKAGES] \\usepackage statements for default packages + [NO-DEFAULT-PACKAGES] do not include any of the default packages + [PACKAGES] \\usepackage statements for packages + [NO-PACKAGES] do not include the packages + [EXTRA] the stuff from #+LaTeX_HEADER + [NO-EXTRA] do not include #+LaTeX_HEADER stuff + +So a header like + + \\documentclass{article} + [NO-DEFAULT-PACKAGES] + [EXTRA] + \\providecommand{\\alert}[1]{\\textbf{#1}} + [PACKAGES] + +will omit the default packages, and will include the #+LaTeX_HEADER lines, +then have a call to \\providecommand, and then place \\usepackage commands +based on the content of `org-export-latex-packages-alist'. + +If your header or `org-export-latex-default-packages-alist' inserts +\"\\usepackage[AUTO]{inputenc}\", AUTO will automatically be replaced with +a coding system derived from `buffer-file-coding-system'. See also the +variable `org-export-latex-inputenc-alist' for a way to influence this +mechanism. + +The sectioning structure +------------------------ + +The sectioning structure of the class is given by the elements following +the header string. For each sectioning level, a number of strings is +specified. A %s formatter is mandatory in each section string and will +be replaced by the title of the section. Instead of a cons cell (numbered . unnumbered), you can also provide a list -of 2-4 elements, +of 2 or 4 elements, (numbered-open numbered-close) @@ -157,9 +184,15 @@ (numbered-open numbered-close unnumbered-open unnumbered-close) -providing opening and closing strings for an environment that should +providing opening and closing strings for a LaTeX environment that should represent the document section. The opening clause should have a %s -to represent the section title." +to represent the section title. + +Instead of a list of sectioning commands, you can also specify a +function name. That function will be called with two parameters, +the (reduced) level of the headline, and the headline text. The function +must return a cons cell with the (possibly modified) headline text, and the +sectioning list in the cdr." :group 'org-export-latex :type '(repeat (list (string :tag "LaTeX class") @@ -167,13 +200,29 @@ (repeat :tag "Levels" :inline t (choice (cons :tag "Heading" - (string :tag "numbered") - (string :tag "unnumbered)")) + (string :tag " numbered") + (string :tag "unnumbered")) (list :tag "Environment" - (string :tag "Opening (numbered) ") - (string :tag "Closing (numbered) ") + (string :tag "Opening (numbered)") + (string :tag "Closing (numbered)") (string :tag "Opening (unnumbered)") - (string :tag "Closing (unnumbered)"))))))) + (string :tag "Closing (unnumbered)")) + (function :tag "Hook computing sectioning")))))) + +(defcustom org-export-latex-inputenc-alist nil + "Alist of inputenc coding system names, and what should really be used. +For example, adding an entry + + (\"utf8\" . \"utf8x\") + +will cause \\usepackage[utf8x]{inputenc} to be used for buffers that +are written as utf8 files." + :group 'org-export-latex + :type '(repeat + (cons + (string :tag "Derived from buffer") + (string :tag "Use this instead")))) + (defcustom org-export-latex-emphasis-alist '(("*" "\\textbf{%s}" nil) @@ -240,6 +289,13 @@ :group 'org-export-latex :type 'string) +(defcustom org-export-latex-hyperref-format "\\href{%s}{%s}" + "A printf format string to be applied to hyperref links. +The format must contain two %s instances. The first will be filled with +the link, the second with the link description." + :group 'org-export-latex + :type 'string) + (defcustom org-export-latex-tables-verbatim nil "When non-nil, tables are exported verbatim." :group 'org-export-latex @@ -305,7 +361,7 @@ (string :tag "Close"))) (defcustom org-export-latex-listings nil - "Non-nil means, export source code using the listings package. + "Non-nil means export source code using the listings package. This package will fontify source code, possibly even with color. If you want to use this, you also need to make LaTeX use the listings package, and if you want to have color, the color @@ -376,7 +432,7 @@ (defgroup org-export-pdf nil "Options for exporting Org-mode files to PDF, via LaTeX." - :tag "Org Export LaTeX" + :tag "Org Export PDF" :group 'org-export-latex :group 'org-export) @@ -395,25 +451,39 @@ Alternatively, this may be a Lisp function that does the processing, so you could use this to apply the machinery of AUCTeX or the Emacs LaTeX mode. This function should accept the file name as its single argument." - :group 'org-export-latex + :group 'org-export-pdf :type '(choice (repeat :tag "Shell command sequence" (string :tag "Shell command")) (function))) +(defcustom org-export-pdf-logfiles + '("aux" "idx" "log" "out" "toc" "nav" "snm" "vrb") + "The list of file extensions to consider as LaTeX logfiles." + :group 'org-export-pdf + :type '(repeat (string :tag "Extension"))) + (defcustom org-export-pdf-remove-logfiles t - "Non-nil means, remove the logfiles produced by PDF production. + "Non-nil means remove the logfiles produced by PDF production. These are the .aux, .log, .out, and .toc files." :group 'org-export-pdf :type 'boolean) ;;; Hooks +(defvar org-export-latex-after-initial-vars-hook nil + "Hook run before LaTeX export. +The exact moment is after the initial variables like org-export-latex-class +have been determined from the environment.") + (defvar org-export-latex-after-blockquotes-hook nil "Hook run during LaTeX export, after blockquote, verse, center are done.") (defvar org-export-latex-final-hook nil "Hook run in the finalized LaTeX buffer.") +(defvar org-export-latex-after-save-hook nil + "Hook run in the finalized LaTeX buffer, after it has been saved.") + ;;; Autoload functions: ;;;###autoload @@ -514,6 +584,8 @@ without even the \begin{document} and \end{document} commands. when PUB-DIR is set, use this as the publishing directory." (interactive "P") + (run-hooks 'org-export-first-hook) + ;; Make sure we have a file name when we need it. (when (and (not (or to-buffer body-only)) (not buffer-file-name)) @@ -525,10 +597,14 @@ (message "Exporting to LaTeX...") (org-unmodified - (remove-text-properties (point-min) (point-max) - '(:org-license-to-kill nil))) + (let ((inhibit-read-only t)) + (remove-text-properties (point-min) (point-max) + '(:org-license-to-kill nil)))) (org-update-radio-target-regexp) (org-export-latex-set-initial-vars ext-plist arg) + (setq org-export-opt-plist org-export-latex-options-plist) + (org-install-letbind) + (run-hooks 'org-export-latex-after-initial-vars-hook) (let* ((wcf (current-window-configuration)) (opt-plist org-export-latex-options-plist) (region-p (org-region-active-p)) @@ -547,27 +623,40 @@ (org-export-add-subtree-options opt-plist rbeg) opt-plist))) ;; Make sure the variable contains the updated values. - (org-export-latex-options-plist opt-plist) + (org-export-latex-options-plist (setq org-export-opt-plist opt-plist)) + ;; The following two are dynamically scoped into other + ;; routines below. + (org-current-export-dir + (or pub-dir (org-export-directory :html opt-plist))) + (org-current-export-file buffer-file-name) (title (or (and subtree-p (org-export-get-title-from-subtree)) (plist-get opt-plist :title) (and (not (plist-get opt-plist :skip-before-1st-heading)) (org-export-grab-title-from-buffer)) - (file-name-sans-extension - (file-name-nondirectory buffer-file-name)))) - (filename (concat (file-name-as-directory - (or pub-dir - (org-export-directory :LaTeX ext-plist))) - (file-name-sans-extension - (or (and subtree-p - (org-entry-get rbeg "EXPORT_FILE_NAME" t)) - (file-name-nondirectory ;sans-extension - buffer-file-name))) - ".tex")) - (filename (if (equal (file-truename filename) - (file-truename buffer-file-name)) - (concat filename ".tex") - filename)) + (and buffer-file-name + (file-name-sans-extension + (file-name-nondirectory buffer-file-name))) + "No Title")) + (filename + (and (not to-buffer) + (concat + (file-name-as-directory + (or pub-dir + (org-export-directory :LaTeX ext-plist))) + (file-name-sans-extension + (or (and subtree-p + (org-entry-get rbeg "EXPORT_FILE_NAME" t)) + (file-name-nondirectory ;sans-extension + (or buffer-file-name + (error "Don't know which export file to use."))))) + ".tex"))) + (filename + (and filename + (if (equal (file-truename filename) + (file-truename (or buffer-file-name "dummy.org"))) + (concat filename ".tex") + filename))) (buffer (if to-buffer (cond ((eq to-buffer 'string) (get-buffer-create @@ -602,6 +691,24 @@ (region (buffer-substring (if region-p (region-beginning) (point-min)) (if region-p (region-end) (point-max)))) + (text + (and text (string-match "\\S-" text) + (org-export-preprocess-string + text + :emph-multiline t + :for-LaTeX t + :comments nil + :tags (plist-get opt-plist :tags) + :priority (plist-get opt-plist :priority) + :footnotes (plist-get opt-plist :footnotes) + :drawers (plist-get opt-plist :drawers) + :timestamps (plist-get opt-plist :timestamps) + :todo-keywords (plist-get opt-plist :todo-keywords) + :add-text nil + :skip-before-1st-heading skip + :select-tags nil + :exclude-tags nil + :LaTeX-fragments nil))) (string-for-export (org-export-preprocess-string region @@ -656,6 +763,11 @@ ;; finalization (unless body-only (insert "\n\\end{document}")) + ;; Attach description terms to the \item macro + (goto-char (point-min)) + (while (re-search-forward "^[ \t]*\\\\item\$[ \t]+\$\\[" nil t) + (delete-region (match-beginning 1) (match-end 1))) + ;; Relocate the table of contents (goto-char (point-min)) (when (re-search-forward "\\[TABLE-OF-CONTENTS\\]" nil t) @@ -666,8 +778,23 @@ (and (re-search-forward "\\[TABLE-OF-CONTENTS\\]" nil t) (replace-match "\\tableofcontents" t t))) + ;; Cleanup forced line ends in items where they are not needed + (goto-char (point-min)) + (while (re-search-forward + "^[ \t]*\\\\item\\>.*\$\\\\\\\\\$[ \t]*\$\n\\\\label.*\$*\n\\\\begin" + nil t) + (delete-region (match-beginning 1) (match-end 1))) + (goto-char (point-min)) + (while (re-search-forward + "^[ \t]*\\\\item\\>.*\$\\\\\\\\\$[ \t]*\$\n\\\\label.*\$*" + nil t) + (if (looking-at "[\n \t]+") + (replace-match "\n"))) + (run-hooks 'org-export-latex-final-hook) (or to-buffer (save-buffer)) + (org-export-latex-fix-inputenc) + (run-hooks 'org-export-latex-after-save-hook) (goto-char (point-min)) (or (org-export-push-to-kill-ring "LaTeX") (message "Exporting to LaTeX...done")) @@ -698,7 +825,6 @@ (re-search-forward "\\\\bibliography{" nil t)))) cmd) (with-current-buffer outbuf (erase-buffer)) - (and (file-exists-p pdffile) (delete-file pdffile)) (message "Processing LaTeX file...") (if (and cmds (symbolp cmds)) (funcall cmds file) @@ -720,7 +846,7 @@ (error "PDF file was not produced") (set-window-configuration wconfig) (when org-export-pdf-remove-logfiles - (dolist (ext '("aux" "log" "out" "toc")) + (dolist (ext org-export-pdf-logfiles) (setq file (concat base "." ext)) (and (file-exists-p file) (delete-file file)))) (message "Exporting to PDF...done") @@ -732,7 +858,12 @@ (interactive "P") (let ((pdffile (org-export-as-pdf arg))) (if pdffile - (org-open-file pdffile) + (progn + (org-open-file pdffile) + (when org-export-kill-product-buffer-when-displayed + (kill-buffer (find-buffer-visiting + (concat (file-name-sans-extension (buffer-file-name)) + ".tex"))))) (error "PDF file was not produced")))) ;;; Parsing functions: @@ -745,7 +876,7 @@ (goto-char (point-min)) (let* ((cnt 0) output (depth org-export-latex-sectioning-depth)) - (while (re-search-forward + (while (org-re-search-forward-unprotected (concat "^\$\\(?:\\*\$\\{" (number-to-string (+ (if odd 2 1) level)) "\\}\\) \$.*\$$") @@ -753,7 +884,7 @@ (when (> level 0) (save-excursion (save-match-data - (re-search-forward + (org-re-search-forward-unprotected (concat "^\$\\(?:\\*\$\\{" (number-to-string level) "\\}\\) \$.*\$$") nil t)))) t) @@ -765,7 +896,7 @@ (narrow-to-region (point) (save-match-data - (if (re-search-forward + (if (org-re-search-forward-unprotected (concat "^\$\\(?:\\*\$\\{" (number-to-string (+ (if odd 2 1) level)) "\\}\\) \$.*\$$") nil t) @@ -789,7 +920,7 @@ (defun org-export-latex-parse-content () "Extract the content of a section." (let ((beg (point)) - (end (if (re-search-forward "^\$\\*\$+ .*$" nil t) + (end (if (org-re-search-forward-unprotected "^\$\\*\$+ .*$" nil t) (progn (beginning-of-line) (point)) (point-max)))) (buffer-substring beg end))) @@ -797,7 +928,7 @@ (defun org-export-latex-parse-subcontent (level odd) "Extract the subcontent of a section at LEVEL. If ODD Is non-nil, assume subcontent only contains odd sections." - (if (not (re-search-forward + (if (not (org-re-search-forward-unprotected (concat "^\$\\(?:\\*\$\\{" (number-to-string (+ (if odd 4 2) level)) "\\}\\) \$.*\$$") @@ -824,8 +955,7 @@ (defun org-export-latex-subcontent (subcontent num) "Export each cell of SUBCONTENT to LaTeX. If NUM, export sections as numerical sections." - (let* ((heading (org-export-latex-fontify-headline - (cdr (assoc 'heading subcontent)))) + (let* ((heading (cdr (assoc 'heading subcontent))) (level (- (cdr (assoc 'level subcontent)) org-export-latex-add-level)) (occur (number-to-string (cdr (assoc 'occur subcontent)))) @@ -833,32 +963,61 @@ (subcontent (cadr (assoc 'subcontent subcontent))) (label (org-get-text-property-any 0 'target heading)) (label-list (cons label (cdr (assoc label - org-export-target-aliases))))) + org-export-target-aliases)))) + (sectioning org-export-latex-sectioning) + (depth org-export-latex-sectioning-depth) + main-heading sub-heading) + (when (symbolp (car sectioning)) + (setq sectioning (funcall (car sectioning) level heading)) + (when sectioning + (setq heading (car sectioning) + sectioning (cdr sectioning) + ;; target property migh have changed... + label (org-get-text-property-any 0 'target heading) + label-list (cons label (cdr (assoc label + org-export-target-aliases))))) + (if sectioning (setq sectioning (make-list 10 sectioning))) + (setq depth (if sectioning 10000 0))) + (if (string-match "[ \t]*\\\\\\\\[ \t]*" heading) + (setq main-heading (substring heading 0 (match-beginning 0)) + sub-heading (substring heading (match-end 0)))) + (setq heading (org-export-latex-fontify-headline heading) + sub-heading (and sub-heading + (org-export-latex-fontify-headline sub-heading)) + main-heading (and main-heading + (org-export-latex-fontify-headline main-heading))) (cond ;; Normal conversion - ((<= level org-export-latex-sectioning-depth) - (let* ((sec (nth (1- level) org-export-latex-sectioning)) + ((<= level depth) + (let* ((sec (nth (1- level) sectioning)) start end) (if (consp (cdr sec)) (setq start (nth (if num 0 2) sec) end (nth (if num 1 3) sec)) (setq start (if num (car sec) (cdr sec)))) - (insert (format start heading) "\n") + (insert (format start (if main-heading main-heading heading) + (or sub-heading ""))) + (insert "\n") (when label (insert (mapconcat (lambda (l) (format "\\label{%s}" l)) label-list "\n") "\n")) (insert (org-export-latex-content content)) (cond ((stringp subcontent) (insert subcontent)) - ((listp subcontent) (org-export-latex-sub subcontent))) - (if end (insert end "\n")))) + ((listp subcontent) + (while (org-looking-back "\n\n") (backward-delete-char 1)) + (org-export-latex-sub subcontent))) + (when (and end (string-match "[^ \t]" end)) + (let ((hook (org-get-text-property-any 0 'org-insert-hook end))) + (and (functionp hook) (funcall hook))) + (insert end "\n")))) ;; At a level under the hl option: we can drop this subsection - ((> level org-export-latex-sectioning-depth) + ((> level depth) (cond ((eq org-export-latex-low-levels 'description) (if (string-match "% ends low level$" (buffer-substring (point-at-bol 0) (point))) (delete-region (point-at-bol 0) (point)) (insert "\\begin{description}\n")) - (insert (format "\n\\item[%s]%s~\n\n" + (insert (format "\n\\item[%s]%s~\n" heading (if label (format "\\label{%s}" label) ""))) (insert (org-export-latex-content content)) @@ -871,7 +1030,7 @@ (delete-region (point-at-bol 0) (point)) (insert (format "\\begin{%s}\n" (symbol-name org-export-latex-low-levels)))) - (insert (format "\n\\item %s\\\\\n%s\n" + (insert (format "\n\\item %s\\\\\n%s%%" heading (if label (format "\\label{%s}" label) ""))) (insert (org-export-latex-content content)) @@ -930,6 +1089,19 @@ (match-string 1)))) (plist-get org-export-latex-options-plist :latex-class) org-export-latex-default-class) + org-export-latex-class-options + (or (and (org-region-active-p) + (save-excursion + (goto-char (region-beginning)) + (and (looking-at org-complex-heading-regexp) + (org-entry-get nil "LaTeX_CLASS_OPTIONS" 'selective)))) + (save-excursion + (save-restriction + (widen) + (goto-char (point-min)) + (and (re-search-forward "^#\\+LaTeX_CLASS_OPTIONS:[ \t]*\$.*?\$[ \t]*$" nil t) + (match-string 1)))) + (plist-get org-export-latex-options-plist :latex-class-options)) org-export-latex-class (or (car (assoc org-export-latex-class org-export-latex-classes)) (error "No definition for class `%s' in `org-export-latex-classes'" @@ -943,32 +1115,42 @@ (let ((hl-levels (plist-get org-export-latex-options-plist :headline-levels)) (sec-depth (length org-export-latex-sectioning))) - (if (> hl-levels sec-depth) sec-depth hl-levels))))) + (if (> hl-levels sec-depth) sec-depth hl-levels)))) + (when (and org-export-latex-class-options + (string-match "\\S-" org-export-latex-class-options) + (string-match "^[ \t]*\$\\\\documentclass\$\$\\[.*?\\]\$?" + org-export-latex-header)) + (setq org-export-latex-header + (concat (substring org-export-latex-header 0 (match-end 1)) + org-export-latex-class-options + (substring org-export-latex-header (match-end 0)))))) + +(defvar org-export-latex-format-toc-function + 'org-export-latex-format-toc-default + "The function formatting returning the string to createthe table of contents. +The function mus take one parameter, the depth of the table of contents.") (defun org-export-latex-make-header (title opt-plist) "Make the LaTeX header and return it as a string. TITLE is the current title from the buffer or region. OPT-PLIST is the options plist for current buffer." (let ((toc (plist-get opt-plist :table-of-contents)) - (author (plist-get opt-plist :author))) + (author (org-export-apply-macros-in-string + (plist-get opt-plist :author)))) (concat (if (plist-get opt-plist :time-stamp-file) (format-time-string "%% Created %Y-%m-%d %a %H:%M\n")) - ;; insert LaTeX custom header - (org-export-apply-macros-in-string org-export-latex-header) - "\n" - ;; insert information on LaTeX packages - (when org-export-latex-packages-alist - (mapconcat (lambda(p) - (if (equal "" (car p)) - (format "\\usepackage{%s}" (cadr p)) - (format "\\usepackage[%s]{%s}" - (car p) (cadr p)))) - org-export-latex-packages-alist "\n")) - ;; insert additional commands in the header - (org-export-apply-macros-in-string - (plist-get opt-plist :latex-header-extra)) + ;; insert LaTeX custom header and packages from the list + (org-splice-latex-header + (org-export-apply-macros-in-string org-export-latex-header) + org-export-latex-default-packages-alist + org-export-latex-packages-alist + (org-export-apply-macros-in-string + (plist-get opt-plist :latex-header-extra))) + ;; append another special variable (org-export-apply-macros-in-string org-export-latex-append-header) + ;; define align if not yet defined + "\n\\providecommand{\\alert}[1]{\\textbf{#1}}" ;; insert the title (format "\n\n\\title{%s}\n" @@ -980,7 +1162,7 @@ (format "\\author{%s}\n" (org-export-latex-fontify-headline (or author user-full-name))) (format "%%\\author{%s}\n" - (or author user-full-name))) + (org-export-latex-fontify-headline (or author user-full-name)))) ;; insert the date (format "\\date{%s}\n" (format-time-string @@ -997,13 +1179,15 @@ ;; table of contents (when (and org-export-with-toc (plist-get opt-plist :section-numbers)) - (cond ((numberp toc) - (format "\\setcounter{tocdepth}{%s}\n\\tableofcontents\n\\vspace*{1cm}\n" - (min toc (plist-get opt-plist :headline-levels)))) - (toc (format "\\setcounter{tocdepth}{%s}\n\\tableofcontents\n\\vspace*{1cm}\n" - (plist-get opt-plist :headline-levels))))) - (when (plist-get opt-plist :preserve-breaks) - "\\obeylines\n")))) + (funcall org-export-latex-format-toc-function + (cond ((numberp toc) + (min toc (plist-get opt-plist :headline-levels))) + (toc (plist-get opt-plist :headline-levels)))))))) + +(defun org-export-latex-format-toc-default (depth) + (when depth + (format "\\setcounter{tocdepth}{%s}\n\\tableofcontents\n\\vspace*{1cm}\n" + depth))) (defun org-export-latex-first-lines (opt-plist &optional beg end) "Export the first lines before first headline. @@ -1028,8 +1212,9 @@ :timestamps (plist-get opt-plist :timestamps) :footnotes (plist-get opt-plist :footnotes))) (org-unmodified - (add-text-properties pt (max pt (1- end)) - '(:org-license-to-kill t))))))) + (let ((inhibit-read-only t)) + (add-text-properties pt (max pt (1- end)) + '(:org-license-to-kill t)))))))) (defvar org-export-latex-header-defs nil "The header definitions that might be used in the LaTeX body.") @@ -1127,13 +1312,20 @@ ;; the beginning of the buffer - inserting "\n" is safe here though. (insert "\n" string) (goto-char (point-min)) - (let ((re (concat "\\\\[a-zA-Z]+\$?:" - "\\[.*\\]" - "\$?" - (org-create-multibrace-regexp "{" "}" 3)))) + (let ((re (concat "\\\\\$[a-zA-Z]+\$" + "\$?:<[^<>\n]*>\$*" + "\$?:\\[[^][\n]*?\\]\$*" + "\$?:<[^<>\n]*>\$*" + "\$" + (org-create-multibrace-regexp "{" "}" 3) + "\$\\{1,3\\}"))) (while (re-search-forward re nil t) - (unless (save-excursion (goto-char (match-beginning 0)) - (equal (char-after (point-at-bol)) ?#)) + (unless (or + ;; check for comment line + (save-excursion (goto-char (match-beginning 0)) + (equal (char-after (point-at-bol)) ?#)) + ;; Check if this is a defined entity, so that is may need conversion + (org-entity-get (match-string 1))) (add-text-properties (match-beginning 0) (match-end 0) '(org-protected t))))) (when (plist-get org-export-latex-options-plist :emphasize) @@ -1192,7 +1384,8 @@ (if (equal (match-string 1) "\\") (replace-match (match-string 2) t t) (replace-match (concat (match-string 1) "\\" - (match-string 2)) t t))) + (match-string 2)) t t) + (backward-char 1))) ((equal (match-string 2) "...") (replace-match (concat (match-string 1) @@ -1216,7 +1409,19 @@ (org-export-latex-treat-backslash-char (match-string 1) (or (match-string 3) ""))) - "") t t)) + "") t t) + (when (and (get-text-property (1- (point)) 'org-entity) + (looking-at "{}")) + ;; OK, this was an entity replacement, and the user + ;; had terminated the entity with {}. Make sure + ;; {} is protected as well, and remove the extra {} + ;; inserted by the conversion. + (put-text-property (point) (+ 2 (point)) 'org-protected t) + (if (save-excursion (goto-char (max (- (point) 2) (point-min))) + (looking-at "{}")) + (replace-match "")) + (forward-char 2)) + (backward-char 1)) ((member (match-string 2) '("_" "^")) (replace-match (or (save-match-data (org-export-latex-treat-sub-super-char @@ -1227,8 +1432,8 @@ (backward-char 1))))))) '(;"^\$[^\n$]*?\\|^\$\$\\\\?\\$\$\$[^\n$]*\$$" "\$\\(\\\\?\\$\$\\)" - "\$[a-za-z0-9]+\\|[ \t\n]\\|\\b\\|\\\\\$\$_\\|\\^\$\${[^{}]+}\\|[a-za-z0-9]+\\|[ \t\n]\\|[:punct:]\\|)\\|{[a-za-z0-9]+}\\|([a-za-z0-9]+)\$" - "\$.\\|^\$\$\\\\\$\$[ \t\n]\\|[a-zA-Z&#%{}\"]+\$" + "\$[a-zA-Z0-9()]+\\|[ \t\n]\\|\\b\\|\\\\\$\$_\\|\\^\$\${[^{}]+}\\|[a-zA-Z0-9]+\\|[ \t\n]\\|[:punct:]\\|)\\|{[a-zA-Z0-9]+}\\|([a-zA-Z0-9]+)\$" + "\$.\\|^\$\$\\\\\$\$[ \t\n]\\|\\([&#%{}\"]\\|[a-zA-Z][a-zA-Z0-9]*\$\\)" "\$.\\|^\$\$&\$" "\$.\\|^\$\$#\$" "\$.\\|^\$\$%\$" @@ -1280,29 +1485,35 @@ (defun org-export-latex-treat-backslash-char (string-before string-after) "Convert the \"$\" special character to LaTeX. The conversion is made depending of STRING-BEFORE and STRING-AFTER." - (cond ((member (list string-after) org-html-entities) - ;; backslash is part of a special entity (like "\alpha") - (concat string-before "$\\" - (or (cdar (member (list string-after) org-html-entities)) - string-after) "$")) - ((and (not (string-match "^[ \n\t]" string-after)) - (not (string-match "[ \t]\\'\\|^" string-before))) - ;; backslash is inside a word - (org-export-latex-protect-string - (concat string-before "\\textbackslash{}" string-after))) - ((not (or (equal string-after "") - (string-match "^[ \t\n]" string-after))) - ;; backslash might escape a character (like \#) or a user TeX - ;; macro (like \setcounter) - (org-export-latex-protect-string - (concat string-before "\\" string-after))) - ((and (string-match "^[ \t\n]" string-after) - (string-match "[ \t\n]\\'" string-before)) - ;; backslash is alone, convert it to $\backslash$ - (org-export-latex-protect-string - (concat string-before "\\textbackslash{}" string-after))) - (t (org-export-latex-protect-string - (concat string-before "\\textbackslash{}" string-after))))) + (let ((ass (org-entity-get string-after))) + (cond + (ass (org-add-props + (if (nth 2 ass) + (concat string-before + (org-export-latex-protect-string + (concat "$" (nth 1 ass) "$"))) + (concat string-before (org-export-latex-protect-string + (nth 1 ass)))) + nil 'org-entity t)) + ((and (not (string-match "^[ \n\t]" string-after)) + (not (string-match "[ \t]\\'\\|^" string-before))) + ;; backslash is inside a word + (concat string-before + (org-export-latex-protect-string + (concat "\\textbackslash{}" string-after)))) + ((not (or (equal string-after "") + (string-match "^[ \t\n]" string-after))) + ;; backslash might escape a character (like \#) or a user TeX + ;; macro (like \setcounter) + (concat string-before + (org-export-latex-protect-string (concat "\\" string-after)))) + ((and (string-match "^[ \t\n]" string-after) + (string-match "[ \t\n]\\'" string-before)) + ;; backslash is alone, convert it to $\backslash$ + (org-export-latex-protect-string + (concat string-before "\\textbackslash{}" string-after))) + (t (org-export-latex-protect-string + (concat string-before "\\textbackslash{}" string-after)))))) (defun org-export-latex-keywords () "Convert special keywords to LaTeX." @@ -1312,9 +1523,9 @@ (match-string 0)) t t) (save-excursion (beginning-of-line 1) - (unless (looking-at ".*\\\\newline[ \t]*$") + (unless (looking-at ".*\n[ \t]*\n") (end-of-line 1) - (insert "\\newline"))))) + (insert "\n"))))) (defun org-export-latex-fixed-width (opt) "When OPT is non-nil convert fixed-width sections to LaTeX." @@ -1340,6 +1551,14 @@ (declare-function orgtbl-to-latex "org-table" (table params) t) (defun org-export-latex-tables (insert) "Convert tables to LaTeX and INSERT it." + ;; First, get the table.el tables + (goto-char (point-min)) + (while (re-search-forward "^[ \t]*\$\\+-[-+]*\\+\$[ \t]*\n[ \t]*|" nil t) + (org-if-unprotected + (require 'table) + (org-export-latex-convert-table.el-table))) + + ;; And now the Org-mode tables (goto-char (point-min)) (while (re-search-forward "^\$[ \t]*\$|" nil t) (org-if-unprotected-at (1- (point)) @@ -1370,6 +1589,7 @@ (string-match "\\" attr)) + floatp (or label caption)) + (and (get-buffer "*org-export-table*") + (kill-buffer (get-buffer "*org-export-table*"))) + (table-generate-source 'latex "*org-export-table*" "caption") + (setq tbl (with-current-buffer "*org-export-table*" + (buffer-string))) + (while (string-match "^%.*\n" tbl) + (setq tbl (replace-match "" t t tbl))) + ;; fix the hlines + (when rmlines + (let ((n 0) lines) + (setq lines (mapcar (lambda (x) + (if (string-match "^\\\\hline$" x) + (progn + (setq n (1+ n)) + (if (= n 2) x nil)) + x)) + (org-split-string tbl "\n"))) + (setq tbl (mapconcat 'identity (delq nil lines) "\n")))) + (when (and align (string-match "\\\\begin{tabular}{.*}" tbl)) + (setq tbl (replace-match (concat "\\begin{tabular}{" align "}") + t t tbl))) + (and (get-buffer "*org-export-table*") + (kill-buffer (get-buffer "*org-export-table*"))) + (beginning-of-line 0) + (while (looking-at "[ \t]*\$|\\|\\+-\$") + (delete-region (point) (1+ (point-at-eol)))) + (when org-export-latex-tables-centered + (setq tbl (concat "\\begin{center}\n" tbl "\\end{center}"))) + (when floatp + (setq tbl (concat "\\begin{table}\n" + (format "\\caption{%s%s}\n" + (if label (format "\\label{%s}" label) "") + (or caption "")) + tbl + "\n\\end{table}\n"))) + (insert (org-export-latex-protect-string tbl)))) + (defun org-export-latex-fontify () "Convert fontification to LaTeX." (goto-char (point-min)) @@ -1473,7 +1743,10 @@ (save-match-data (and (org-at-table-p) (string-match - "[|\n]" (buffer-substring beg end)))))) + "[|\n]" (buffer-substring beg end))))) + (and (equal (match-string 3) "+") + (save-match-data + (string-match "\\`-+\\'" (match-string 4))))) (setq s (match-string 4)) (setq rpl (concat (match-string 1) (org-export-latex-emph-format (cadr emph) @@ -1482,7 +1755,7 @@ (if (caddr emph) (setq rpl (org-export-latex-protect-string rpl)) (save-match-data - (if (string-match "\\`.\$\\\\[a-z]+{\$\$.*\$\$}\$.?\\'" rpl) + (if (string-match "\\`.?\$\\\\[a-z]+{\$\$.*\$\$}\$.?\\'" rpl) (progn (add-text-properties (match-beginning 1) (match-end 1) '(org-protected t) rpl) @@ -1573,6 +1846,7 @@ raw-path)))))))) ;; process with link inserting (apply 'delete-region remove) + (setq caption (and caption (org-export-latex-fontify-headline caption))) (cond ((and imgp (plist-get org-export-latex-options-plist :inline-images)) ;; OK, we need to inline an image @@ -1589,27 +1863,28 @@ (org-remove-initial-hash (org-solidify-link-text raw-path)) desc))) - (path + (path (when (org-at-table-p) ;; There is a strange problem when we have a link in a table, ;; ampersands then cause a problem. I think this must be ;; a LaTeX issue, but we here implement a work-around anyway. (setq path (org-export-latex-protect-amp path) desc (org-export-latex-protect-amp desc))) - (insert (format "\\href{%s}{%s}" path desc))) + (insert (format org-export-latex-hyperref-format path desc))) (t (insert "\\texttt{" desc "}"))))))) (defun org-export-latex-format-image (path caption label attr) "Format the image element, depending on user settings." - (let (floatp wrapp placement figenv) + (let (ind floatp wrapp placement figenv) (setq floatp (or caption label)) + (setq ind (org-get-text-property-any 0 'original-indentation path)) (when (and attr (stringp attr)) (if (string-match "[ \t]*\\" attr) (setq wrapp t floatp nil attr (replace-match "" t t attr))) (if (string-match "[ \t]*\\" attr) (setq wrapp nil floatp t attr (replace-match "" t t attr)))) - + (setq placement (cond (wrapp "{l}{0.5\\textwidth}") @@ -1639,20 +1914,28 @@ \\end{figure}") (t "\\includegraphics[%attr]{%path}"))) + + (setq figenv (mapconcat 'identity (split-string figenv "\n") + (save-excursion (beginning-of-line 1) + (looking-at "[ \t]*") + (concat "\n" (match-string 0))))) + (if (and (not label) (not caption) (string-match "^\\\\caption{.*\n" figenv)) (setq figenv (replace-match "" t t figenv))) - (org-fill-template - figenv - (list (cons "path" - (if (file-name-absolute-p path) - (expand-file-name path) - path)) - (cons "attr" attr) - (cons "labelcmd" (if label (format "\\label{%s}" - label)"")) - (cons "caption" (or caption "")) - (cons "placement" (or placement "")))))) + (org-add-props + (org-fill-template + figenv + (list (cons "path" + (if (file-name-absolute-p path) + (expand-file-name path) + path)) + (cons "attr" attr) + (cons "labelcmd" (if label (format "\\label{%s}" + label)"")) + (cons "caption" (or caption "")) + (cons "placement" (or placement "")))) + nil 'original-indentation ind))) (defun org-export-latex-protect-amp (s) (while (string-match "\$[^\\\\]\$\$&\$" s) @@ -1705,13 +1988,15 @@ (setq beg (+ (match-beginning 0) off) end (- (match-end 0) 0)) (add-text-properties beg end '(org-protected t org-latex-math t)))))) - ;; Convert LaTeX to \LaTeX{} + ;; Convert LaTeX to \LaTeX{} and TeX to \TeX{} (goto-char (point-min)) (let ((case-fold-search nil)) - (while (re-search-forward "\$[^+_]\$LaTeX" nil t) - (org-if-unprotected - (replace-match (org-export-latex-protect-string - (concat (match-string 1) "\\LaTeX{}")) t t)))) + (while (re-search-forward "\\<\$\\(La\$?TeX\\)\\>" nil t) + (unless (eq (char-before (match-beginning 1)) ?\\) + (org-if-unprotected-1 + (replace-match (org-export-latex-protect-string + (concat "\\" (match-string 1) + "{}")) t t))))) ;; Convert blockquotes (goto-char (point-min)) @@ -1759,13 +2044,21 @@ (replace-match (org-export-latex-protect-string "\\hrule") t t))) ;; Protect LaTeX commands like \command[...]{...} or \command{...} - (let ((re (concat "\\\\[a-zA-Z]+\$?:" - "\\[.*\\]" - "\$?" - (org-create-multibrace-regexp "{" "}" 3)))) + (goto-char (point-min)) + (let ((re (concat + "\\\\\$[a-zA-Z]+\$" + "\$?:<[^<>\n]*>\$*" + "\$?:\\[[^][\n]*?\\]\$*" + "\$?:<[^<>\n]*>\$*" + "\$" (org-create-multibrace-regexp "{" "}" 3) "\$\\{1,3\\}"))) (while (re-search-forward re nil t) - (unless (save-excursion (goto-char (match-beginning 0)) - (equal (char-after (point-at-bol)) ?#)) + (unless (or + ;; check for comment line + (save-excursion (goto-char (match-beginning 0)) + (equal (char-after (point-at-bol)) ?#)) + ;; Check if this is a defined entity, so that is may need conversion + (org-entity-get (match-string 1)) + ) (add-text-properties (match-beginning 0) (match-end 0) '(org-protected t))))) @@ -1786,10 +2079,12 @@ ">>>?\$(INVISIBLE)\$?") nil t) (org-if-unprotected-at (+ (match-beginning 0) 2) (replace-match - (org-export-latex-protect-string - (format "\\label{%s}%s" (save-match-data (org-solidify-link-text - (match-string 1))) - (if (match-string 2) "" (match-string 1)))) t t))) + (concat + (org-export-latex-protect-string + (format "\\label{%s}" (save-match-data (org-solidify-link-text + (match-string 1))))) + (if (match-string 2) "" (match-string 1))) + t t))) ;; Delete @<...> constructs ;; Thanks to Daniel Clemente for this regexp @@ -1832,6 +2127,10 @@ (add-text-properties (1- (length footnote-rpl)) (length footnote-rpl) '(org-protected t) footnote-rpl) + (if (org-on-heading-p) + (setq footnote-rpl + (concat (org-export-latex-protect-string "\\protect") + footnote-rpl))) (insert footnote-rpl))) ))))) @@ -1842,6 +2141,24 @@ (org-if-unprotected (replace-match ""))))) +(defun org-export-latex-fix-inputenc () + "Set the codingsystem in inputenc to what the buffer is." + (let* ((cs buffer-file-coding-system) + (opt (or (ignore-errors (latexenc-coding-system-to-inputenc cs)) + "utf8"))) + (when opt + ;; Translate if that is requested + (setq opt (or (cdr (assoc opt org-export-latex-inputenc-alist)) opt)) + ;; find the \usepackage statement and replace the option + (goto-char (point-min)) + (while (re-search-forward "\\\\usepackage\\[\$AUTO\$\\]{inputenc}" + nil t) + (goto-char (match-beginning 1)) + (delete-region (match-beginning 1) (match-end 1)) + (insert opt)) + (and buffer-file-name + (save-buffer))))) + ;;; List handling: (defun org-export-latex-lists () diff -r d33170754d70 -r 805a52720f82 lisp/org/org-list.el --- a/lisp/org/org-list.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-list.el Thu Apr 15 12:13:27 2010 +0200 @@ -7,7 +7,7 @@ ;; Bastien Guerry ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -125,13 +125,15 @@ (regexp))) (defcustom org-empty-line-terminates-plain-lists nil - "Non-nil means, an empty line ends all plain list levels. + "Non-nil means an empty line ends all plain list levels. +This is currently effective only during export. It should also have +an effect for indentation and plain list folding, but it does not. When nil, empty lines are part of the preceding item." :group 'org-plain-lists :type 'boolean) (defcustom org-auto-renumber-ordered-lists t - "Non-nil means, automatically renumber ordered plain lists. + "Non-nil means automatically renumber ordered plain lists. Renumbering happens when the sequence have been changed with \\[org-shiftmetaup] or \\[org-shiftmetadown]. After other editing commands, use \\[org-ctrl-c-ctrl-c] to trigger renumbering." @@ -139,7 +141,7 @@ :type 'boolean) (defcustom org-provide-checkbox-statistics t - "Non-nil means, update checkbox statistics after insert and toggle. + "Non-nil means update checkbox statistics after insert and toggle. When this is set, checkbox statistics is updated each time you either insert a new checkbox with \\[org-insert-todo-heading] or toggle a checkbox with \\[org-ctrl-c-ctrl-c]." @@ -147,7 +149,7 @@ :type 'boolean) (defcustom org-hierarchical-checkbox-statistics t - "Non-nil means, checkbox statistics counts only the state of direct children. + "Non-nil means checkbox statistics counts only the state of direct children. When nil, all boxes below the cookie are counted. This can be set to nil on a per-node basis using a COOKIE_DATA property with the word \"recursive\" in the value." @@ -432,7 +434,9 @@ (recursive (or (not org-hierarchical-checkbox-statistics) (string-match "\\" - (or (org-entry-get nil "COOKIE_DATA") "")))) + (or (ignore-errors + (org-entry-get nil "COOKIE_DATA")) + "")))) (cstat 0) ) (when all @@ -614,7 +618,8 @@ (if (looking-at "[ \t]*$") nil (if (<= (setq ind1 (org-get-indentation)) ind) - (throw 'exit t))))) + (throw 'exit t))) + (if (bobp) (throw 'exit t)))) (condition-case nil (if (or (not (org-at-item-p)) (< ind1 (1- ind))) @@ -847,7 +852,7 @@ (interactive) (unless (org-at-item-p) (error "This is not a list")) (let ((line (org-current-line)) - (col (current-column)) + (chars-from-eol (- (point-at-eol) (point))) (ind (current-indentation)) ind1 bullet oldbullet) ;; find where this list begins @@ -878,7 +883,7 @@ (org-shift-item-indentation (- (length bullet) (length oldbullet)))))) (org-goto-line line) - (org-move-to-column col) + (goto-char (max (point-at-bol) (- (point-at-eol) chars-from-eol))) (if (string-match "[0-9]" bullet) (org-renumber-ordered-list 1)))) @@ -1049,7 +1054,7 @@ (org-adapt-indentation nil)) (cond ((and (looking-at "[ \t]*$") - (looking-back "^\$[ \t]*\$\$[-+*]\\|[0-9]+[).]\$[ \t]+")) + (org-looking-back "^\$[ \t]*\$\$[-+*]\\|[0-9]+[).]\$[ \t]+")) (setq this-command 'org-cycle-item-indentation) (if (eq last-command 'org-cycle-item-indentation) (condition-case nil @@ -1081,7 +1086,10 @@ sublevels as a list of strings." (let* ((item-beginning (org-list-item-beginning)) (start (car item-beginning)) - (end (org-list-end (cdr item-beginning))) + (end (save-excursion + (goto-char (org-list-end (cdr item-beginning))) + (org-back-over-empty-lines) + (point))) output itemsep ltype) (while (re-search-forward org-list-beginning-re end t) (goto-char (match-beginning 3)) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-mac-message.el --- a/lisp/org/org-mac-message.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-mac-message.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: John Wiegley ;; Christopher Suckling -;; Version: 6.33x +;; Version: 6.35i ;; Keywords: outlines, hypermedia, calendar, wp ;; This file is part of GNU Emacs. @@ -209,7 +209,7 @@ (insert "\n" (org-mac-message-get-links "f"))) (goto-char (point-max)) (insert "\n") - (org-insert-heading) + (org-insert-heading nil t) (insert org-heading "\n" (org-mac-message-get-links "f")))))) (provide 'org-mac-message) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-macs.el --- a/lisp/org/org-macs.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-macs.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -63,6 +63,8 @@ (setq ss (replace-match "a-zA-Z0-9" t t ss))) (while (string-match "\\[:alpha:\\]" ss) (setq ss (replace-match "a-zA-Z" t t ss))) + (while (string-match "\\[:punct:\\]" ss) + (setq ss (replace-match "\001-@[-`{-~" t t ss))) ss)) s)) @@ -123,6 +125,14 @@ ,@body)) (put 'org-if-unprotected-at 'lisp-indent-function 1) +(defun org-re-search-forward-unprotected (&rest args) + "Like re-search-forward, but stop only in unprotected places." + (catch 'exit + (while t + (unless (apply 're-search-forward args) + (throw 'exit nil)) + (unless (get-text-property (match-beginning 0) 'org-protected) + (throw 'exit (point)))))) (defmacro org-with-remote-undo (_buffer &rest _body) "Execute BODY while recording undo information in two buffers." diff -r d33170754d70 -r 805a52720f82 lisp/org/org-mew.el --- a/lisp/org/org-mew.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-mew.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Tokuya Kameshima ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; This file is part of GNU Emacs. diff -r d33170754d70 -r 805a52720f82 lisp/org/org-mhe.el --- a/lisp/org/org-mhe.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-mhe.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; diff -r d33170754d70 -r 805a52720f82 lisp/org/org-mobile.el --- a/lisp/org/org-mobile.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-mobile.el Thu Apr 15 12:13:27 2010 +0200 @@ -4,7 +4,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -47,7 +47,7 @@ In addition to this, the list may also contain the following symbols: org-agenda-files - This means, include the complete, unrestricted list of files given in + This means include the complete, unrestricted list of files given in the variable `org-agenda-files'. org-agenda-text-search-extra-files Include the files given in the variable @@ -65,6 +65,34 @@ :group 'org-mobile :type 'directory) +(defcustom org-mobile-use-encryption nil + "Non-nil means keep only encrypted files on the webdav server. +Encryption uses AES-256, with a password given in +`org-mobile-encryption-password'. +When nil, plain files are kept on the server. +Turning on encryption requires to set the same password in the MobileOrg +application." + :group 'org-mobile + :type 'boolean) + +(defcustom org-mobile-encryption-tempfile "~/orgtmpcrypt" + "File that is being used as a temporary file for encryption. +This must be local file on your local machine (not on the webdav server). +You might want to put this file into a directory where only you have access." + :group 'org-mobile + :type 'directory) + +(defcustom org-mobile-encryption-password "" + "Password for encrypting files uploaded to the server. +This is a single password which is used for AES-256 encryption. The same +password must also be set in the MobileOrg application. All Org files, +including mobileorg.org will be encrypted using this password. +Note that, whe Org runs the encryption commands, the password could +be visible on your system with the `ps' command. So this method is only +intended to keep the files secure on the server, not on your own machine." + :group 'org-mobile + :type '(string :tag "Password")) + (defcustom org-mobile-inbox-for-pull "~/org/from-mobile.org" "The file where captured notes and flags will be appended to. During the execution of `org-mobile-pull', the file @@ -85,13 +113,29 @@ :group 'org-mobile :type 'file) +(defcustom org-mobile-agendas 'all + "The agendas that should be pushed to MobileOrg. +Allowed values: + +default the weekly agenda and the global TODO list +custom all custom agendas defined by the user +all the custom agendas and the default ones +list a list of selection key(s) as string." + :group 'org-mobile + :type '(choice + (const :tag "Default Agendas" default) + (const :tag "Custom Agendas" custom) + (const :tag "Default and Custom Agendas" all) + (repeat :tag "Selected" + (string :tag "Selection Keys")))) + (defcustom org-mobile-force-id-on-agenda-items t "Non-nil means make all agenda items carry and ID." :group 'org-mobile :type 'boolean) (defcustom org-mobile-force-mobile-change nil - "Non-nil means, force the change made on the mobile device. + "Non-nil means force the change made on the mobile device. So even if there have been changes to the computer version of the entry, force the new value set on the mobile. When nil, mark the entry from the mobile with an error message. @@ -247,15 +291,14 @@ (kill-buffer a-buffer) (let ((cw (selected-window))) (select-window (get-buffer-window a-buffer)) - (org-agenda-redo) (select-window cw))))) (message "Files for mobile viewer staged")) - + (defvar org-mobile-before-process-capture-hook nil "Hook that is run after content was moved to `org-mobile-inbox-for-pull'. -The inbox file is in the current buffer, and the buffer is arrowed to the -new captured data.") +The inbox file is visited by the current buffer, and the buffer is +narrowed to the newly captured data.") ;;;###autoload (defun org-mobile-pull () @@ -305,7 +348,16 @@ (file-exists-p (file-name-directory org-mobile-inbox-for-pull))) (error - "Variable `org-mobile-inbox-for-pull' must point to a file in an existing directory"))) + "Variable `org-mobile-inbox-for-pull' must point to a file in an existing directory")) + (when org-mobile-use-encryption + (unless (string-match "\\S-" org-mobile-encryption-password) + (error + "To use encryption, you must set `org-mobile-encryption-password'")) + (unless (file-writable-p org-mobile-encryption-tempfile) + (error "Cannot write to entryption tempfile %s" + org-mobile-encryption-tempfile)) + (unless (executable-find "openssl") + (error "openssl is needed to encrypt files.")))) (defun org-mobile-create-index-file () "Write the index file in the WebDAV directory." @@ -314,7 +366,7 @@ (def-todo (default-value 'org-todo-keywords)) (def-tags (default-value 'org-tag-alist)) file link-name todo-kwds done-kwds tags drawers entry kwds dwds twds) - + (org-prepare-agenda-buffers (mapcar 'car files-alist)) (setq done-kwds (org-uniquify org-done-keywords-for-agenda)) (setq todo-kwds (org-delete-all @@ -385,7 +437,9 @@ target-dir (file-name-directory target-path)) (unless (file-directory-p target-dir) (make-directory target-dir 'parents)) - (copy-file file target-path 'ok-if-exists) + (if org-mobile-use-encryption + (org-mobile-encrypt-and-move file target-path) + (copy-file file target-path 'ok-if-exists)) (setq check (shell-command-to-string (concat org-mobile-checksum-binary " " (shell-quote-argument (expand-file-name file))))) @@ -426,8 +480,22 @@ ((not (nth 1 x)) (cons (car x) (cons "" (cddr x)))) (t (cons (car x) (cons "" (cdr x)))))) org-agenda-custom-commands))) - new e key desc type match settings cmds gkey gdesc gsettings cnt) - (while (setq e (pop custom-list)) + (default-list '(("a" "Agenda" agenda) ("t" "All TODO" alltodo))) + thelist new e key desc type match settings cmds gkey gdesc gsettings cnt) + (cond + ((eq org-mobile-agendas 'custom) + (setq thelist custom-list)) + ((eq org-mobile-agendas 'default) + (setq thelist default-list)) + ((eq org-mobile-agendas 'all) + (setq thelist custom-list) + (unless (assoc "t" thelist) (push '("t" "ALL TODO" alltodo) thelist)) + (unless (assoc "a" thelist) (push '("a" "Agenda" agenda) thelist))) + ((listp org-mobile-agendas) + (setq thelist (append custom-list default-list)) + (setq thelist (delq nil (mapcar (lambda (k) (assoc k thelist)) + org-mobile-agendas))))) + (while (setq e (pop thelist)) (cond ((stringp (cdr e)) ;; this is a description entry - skip it @@ -438,7 +506,12 @@ ((memq (nth 2 e) '(todo-tree tags-tree occur-tree)) ;; These are trees, not really agenda commands ) - ((memq (nth 2 e) '(agenda todo tags)) + ((and (memq (nth 2 e) '(todo tags tags-todo)) + (or (null (nth 3 e)) + (not (string-match "\\S-" (nth 3 e))))) + ;; These would be interactive because the match string is empty + ) + ((memq (nth 2 e) '(agenda alltodo todo tags tags-todo)) ;; a normal command (setq key (car e) desc (nth 1 e) type (nth 2 e) match (nth 3 e) settings (nth 4 e)) @@ -541,26 +614,66 @@ (interactive) (let* ((file (expand-file-name "agendas.org" org-mobile-directory)) + (file1 (if org-mobile-use-encryption + org-mobile-encryption-tempfile + file)) (sumo (org-mobile-sumo-agenda-command)) (org-agenda-custom-commands - (list (append sumo (list (list file))))) + (list (append sumo (list (list file1))))) (org-mobile-creating-agendas t)) - (unless (file-writable-p file) - (error "Cannot write to file %s" file)) + (unless (file-writable-p file1) + (error "Cannot write to file %s" file1)) (when sumo - (org-store-agenda-views)))) + (org-store-agenda-views)) + (when org-mobile-use-encryption + (org-mobile-encrypt-file file1 file) + (delete-file file1)))) + +(defun org-mobile-encrypt-and-move (infile outfile) + "Encrypt INFILE locally to INFILE_enc, then move it to OUTFILE. +We do this in two steps so that remote paths will work, even if the +encryption program does not understand them." + (let ((encfile (concat infile "_enc"))) + (org-mobile-encrypt-file infile encfile) + (when outfile + (copy-file encfile outfile 'ok-if-exists) + (delete-file encfile)))) + +(defun org-mobile-encrypt-file (infile outfile) + "Encrypt INFILE to OUTFILE, using `org-mobile-encryption-password'." + (shell-command + (format "openssl enc -aes-256-cbc -salt -pass %s -in %s -out %s" + (shell-quote-argument (concat "pass:" org-mobile-encryption-password)) + (shell-quote-argument (expand-file-name infile)) + (shell-quote-argument (expand-file-name outfile))))) + +(defun org-mobile-decrypt-file (infile outfile) + "Decrypt INFILE to OUTFILE, using `org-mobile-encryption-password'." + (shell-command + (format "openssl enc -d -aes-256-cbc -salt -pass %s -in %s -out %s" + (shell-quote-argument (concat "pass:" org-mobile-encryption-password)) + (shell-quote-argument (expand-file-name infile)) + (shell-quote-argument (expand-file-name outfile))))) (defun org-mobile-move-capture () "Move the contents of the capture file to the inbox file. Return a marker to the location where the new content has been added. If nothing new has been added, return nil." (interactive) - (let ((inbox-buffer (find-file-noselect org-mobile-inbox-for-pull)) - (capture-buffer (find-file-noselect - (expand-file-name org-mobile-capture-file - org-mobile-directory))) - (insertion-point (make-marker)) - not-empty content) + (let* ((encfile nil) + (capture-file (expand-file-name org-mobile-capture-file + org-mobile-directory)) + (inbox-buffer (find-file-noselect org-mobile-inbox-for-pull)) + (capture-buffer + (if (not org-mobile-use-encryption) + (find-file-noselect capture-file) + (delete-file org-mobile-encryption-tempfile) + (setq encfile (concat org-mobile-encryption-tempfile "_enc")) + (copy-file capture-file encfile) + (org-mobile-decrypt-file encfile org-mobile-encryption-tempfile) + (find-file-noselect org-mobile-encryption-tempfile))) + (insertion-point (make-marker)) + not-empty content) (with-current-buffer capture-buffer (setq content (buffer-string)) (setq not-empty (string-match "\\S-" content)) @@ -577,9 +690,13 @@ (save-buffer) (org-mobile-update-checksum-for-capture-file (buffer-string)))) (kill-buffer capture-buffer) + (when org-mobile-use-encryption + (org-mobile-encrypt-and-move org-mobile-encryption-tempfile + capture-file)) (if not-empty insertion-point))) (defun org-mobile-update-checksum-for-capture-file (buffer-string) + "Find the checksum line and modify it to match BUFFER-STRING." (let* ((file (expand-file-name "checksums.dat" org-mobile-directory)) (buffer (find-file-noselect file))) (when buffer @@ -856,7 +973,7 @@ (org-todo (or new 'none)) t) (t (error "State before change was expected as \"%s\", but is \"%s\"" old current)))) - + ((eq what 'tags) (setq current (org-get-tags) new1 (and new (org-split-string new ":+")) @@ -869,7 +986,7 @@ (org-set-tags-to new1) t) (t (error "Tags before change were expected as \"%s\", but are \"%s\"" (or old "") (or current ""))))) - + ((eq what 'priority) (when (looking-at org-complex-heading-regexp) (setq current (and (match-end 3) (substring (match-string 3) 2 3))) @@ -895,7 +1012,7 @@ (delete-region (point) (+ (point) (length current))) (org-set-tags nil 'align)) (t (error "Heading changed in MobileOrg and on the computer"))))) - + ((eq what 'body) (setq current (buffer-substring (min (1+ (point-at-eol)) (point-max)) (save-excursion (outline-next-heading) @@ -915,7 +1032,7 @@ (point)))) t) (t (error "Body was changed in MobileOrg and on the computer"))))))) - + (defun org-mobile-tags-same-p (list1 list2) "Are the two tag lists the same?" diff -r d33170754d70 -r 805a52720f82 lisp/org/org-mouse.el --- a/lisp/org/org-mouse.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-mouse.el Thu Apr 15 12:13:27 2010 +0200 @@ -4,7 +4,7 @@ ;; ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -189,7 +189,7 @@ (interactive) (end-of-line) (skip-chars-backward "\t ") - (when (looking-back ":[A-Za-z]+:") + (when (org-looking-back ":[A-Za-z]+:") (skip-chars-backward ":A-Za-z") (skip-chars-backward "\t "))) @@ -607,7 +607,7 @@ (:end ; insert text here (skip-chars-backward " \t") (kill-region (point) (point-at-eol)) - (unless (looking-back org-mouse-punctuation) + (unless (org-looking-back org-mouse-punctuation) (insert (concat org-mouse-punctuation " "))))) (insert text) @@ -674,7 +674,7 @@ 'org-mode-restart)))) ((or (eolp) (and (looking-at "\$ \\|\t\$\$+:[0-9a-zA-Z_:]+\$?\$ \\|\t\$+$") - (looking-back " \\|\t"))) + (org-looking-back " \\|\t"))) (org-mouse-popup-global-menu)) ((get-context :checkbox) (popup-menu diff -r d33170754d70 -r 805a52720f82 lisp/org/org-plot.el --- a/lisp/org/org-plot.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-plot.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Eric Schulte ;; Keywords: tables, plotting ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -134,7 +134,7 @@ (defun org-plot/gnuplot-to-grid-data (table data-file params) "Export the data in TABLE to DATA-FILE for gnuplot. -This means, in a format appropriate for grid plotting by gnuplot. +This means in a format appropriate for grid plotting by gnuplot. PARAMS specifies which columns of TABLE should be plotted as independent and dependant variables." (interactive) @@ -250,8 +250,9 @@ (setf plot-lines (cons (format plot-str data-file - (or (and (not text-ind) ind - (> ind 0) (format "%d:" ind)) "") + (or (and ind (> ind 0) + (not text-ind) + (format "%d:" ind)) "") (+ 1 col) (if text-ind (format ":xticlabel(%d)" ind) "") with @@ -300,7 +301,7 @@ (setf table (delq 'hline (cdr table)))) ;; clean non-data from table ;; collect options (save-excursion (while (and (equal 0 (forward-line -1)) - (looking-at "#\\+")) + (looking-at "[[:space:]]*#\\+")) (setf params (org-plot/collect-options params)))) ;; dump table to datafile (very different for grid) (case (plist-get params :plot-type) @@ -320,7 +321,6 @@ (mapcar (lambda (row) (nth ind row)) table)))) 0) (plist-put params :timeind t) ;; check for text ind column - (if (or (string= (plist-get params :with) "hist") (> (length (delq 0 (mapcar diff -r d33170754d70 -r 805a52720f82 lisp/org/org-protocol.el --- a/lisp/org/org-protocol.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-protocol.el Thu Apr 15 12:13:27 2010 +0200 @@ -9,7 +9,7 @@ ;; Author: Ross Patterson ;; Maintainer: Sebastian Rose ;; Keywords: org, emacsclient, wp -;; Version: 6.33x +;; Version: 6.35i ;; This file is part of GNU Emacs. ;; @@ -470,9 +470,10 @@ (url (org-protocol-sanitize-uri (car parts))) (type (if (string-match "^\$[a-z]+\$:" url) (match-string 1 url))) - (title (cadr parts)) - (region (caddr parts)) - (orglink (org-make-link-string url title)) + (title (or (cadr parts) "")) + (region (or (caddr parts) "")) + (orglink (org-make-link-string + url (if (string-match "[^[:space:]]" title) title url))) remember-annotation-functions) (setq org-stored-links (cons (list url title) org-stored-links)) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-publish.el --- a/lisp/org/org-publish.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-publish.el Thu Apr 15 12:13:27 2010 +0200 @@ -1,10 +1,11 @@ ;;; org-publish.el --- publish related org-mode files as a website -;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: David O'Toole ;; Maintainer: Carsten Dominik ;; Keywords: hypermedia, outlines, wp -;; Version: 6.33x +;; Version: 6.35i ;; This file is part of GNU Emacs. ;; @@ -31,7 +32,7 @@ ;; + Publish all one's org-files to HTML or PDF ;; + Upload HTML, images, attachments and other files to a web server ;; + Exclude selected private pages from publishing -;; + Publish a clickable index of pages +;; + Publish a clickable sitemap of pages ;; + Manage local timestamps for publishing only changed files ;; + Accept plugin functions to extend range of publishable content ;; @@ -39,6 +40,17 @@ ;;; Code: + +(defun org-publish-sanitize-plist (plist) + (mapcar (lambda (x) + (or (cdr (assq x '((:index-filename . :sitemap-filename) + (:index-title . :sitemap-title) + (:index-function . :sitemap-function) + (:index-style . :sitemap-style) + (:auto-index . :auto-sitemap)))) + x)) + plist)) + (eval-when-compile (require 'cl)) (require 'org) @@ -112,9 +124,11 @@ certain makefile, to ensure published files are built up to date. :preparation-function Function to be called before publishing - this project. + this project. This may also be a list + of functions. :completion-function Function to be called after publishing - this project. + this project. This may also be a list + of functions. Some properties control details of the Org publishing process, and are equivalent to the corresponding user variables listed in @@ -144,22 +158,22 @@ :author `user-full-name' :email `user-mail-address' -The following properties may be used to control publishing of an -index of files or summary page for a given project. +The following properties may be used to control publishing of a +sitemap of files or summary page for a given project. - :auto-index Whether to publish an index during + :auto-sitemap Whether to publish a sitemap during `org-publish-current-project' or `org-publish-all'. - :index-filename Filename for output of index. Defaults + :sitemap-filename Filename for output of sitemap. Defaults to 'sitemap.org' (which becomes 'sitemap.html'). - :index-title Title of index page. Defaults to name of file. - :index-function Plugin function to use for generation of index. - Defaults to `org-publish-org-index', which + :sitemap-title Title of sitemap page. Defaults to name of file. + :sitemap-function Plugin function to use for generation of sitemap. + Defaults to `org-publish-org-sitemap', which generates a plain list of links to all files in the project. - :index-style Can be `list' (index is just an itemized list + :sitemap-style Can be `list' (sitemap is just an itemized list of the titles of the files involved) or `tree' (the directory structure of the source - files is reflected in the index). Defaults to + files is reflected in the sitemap). Defaults to `tree'." :group 'org-publish :type 'alist) @@ -177,7 +191,7 @@ :type 'directory) (defcustom org-publish-list-skipped-files t - "Non-nil means, show message about files *not* published." + "Non-nil means show message about files *not* published." :group 'org-publish :type 'boolean) @@ -306,6 +320,7 @@ list)) (declare-function org-publish-delete-dups "org-publish" (list)) +(declare-function find-lisp-find-files "find-lisp" (directory regexp)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Getting project information out of org-publish-project-alist @@ -426,8 +441,8 @@ (buffer-live-p export-buf-or-file)) (set-buffer export-buf-or-file) ;; run hooks after export and save export - (and (run-hooks 'org-publish-after-export-hook) - (if (buffer-modified-p) (save-buffer))) + (progn (run-hooks 'org-publish-after-export-hook) + (if (buffer-modified-p) (save-buffer))) (kill-buffer export-buf-or-file)) ;; maybe restore buffer's content (set-buffer init-buf) @@ -439,20 +454,33 @@ (unless visiting (kill-buffer init-buf)))))) +(defmacro org-publish-with-aux-preprocess-maybe (&rest body) + "Execute BODY with a modified hook to preprocess for index." + `(let ((org-export-preprocess-after-headline-targets-hook + (if (plist-get project-plist :makeindex) + (cons 'org-publish-aux-preprocess + org-export-preprocess-after-headline-targets-hook) + org-export-preprocess-after-headline-targets-hook))) + ,@body)) + +(defvar project-plist) (defun org-publish-org-to-latex (plist filename pub-dir) "Publish an org file to LaTeX. See `org-publish-org-to' to the list of arguments." - (org-publish-org-to "latex" plist filename pub-dir)) + (org-publish-with-aux-preprocess-maybe + (org-publish-org-to "latex" plist filename pub-dir))) (defun org-publish-org-to-pdf (plist filename pub-dir) "Publish an org file to PDF (via LaTeX). See `org-publish-org-to' to the list of arguments." - (org-publish-org-to "pdf" plist filename pub-dir)) + (org-publish-with-aux-preprocess-maybe + (org-publish-org-to "pdf" plist filename pub-dir))) (defun org-publish-org-to-html (plist filename pub-dir) "Publish an org file to HTML. See `org-publish-org-to' to the list of arguments." - (org-publish-org-to "html" plist filename pub-dir)) + (org-publish-with-aux-preprocess-maybe + (org-publish-org-to "html" plist filename pub-dir))) (defun org-publish-org-to-org (plist filename pub-dir) "Publish an org file to HTML. @@ -518,31 +546,39 @@ (defun org-publish-projects (projects) "Publish all files belonging to the PROJECTS alist. -If :auto-index is set, publish the index too." +If :auto-sitemap is set, publish the sitemap too. +If :makeindex is set, also produce a file theindex.org." (mapc (lambda (project) (let* ((project-plist (cdr project)) (exclude-regexp (plist-get project-plist :exclude)) - (index-p (plist-get project-plist :auto-index)) - (index-filename (or (plist-get project-plist :index-filename) - "sitemap.org")) - (index-function (or (plist-get project-plist :index-function) - 'org-publish-org-index)) + (sitemap-p (plist-get project-plist :auto-sitemap)) + (sitemap-filename (or (plist-get project-plist :sitemap-filename) + "sitemap.org")) + (sitemap-function (or (plist-get project-plist :sitemap-function) + 'org-publish-org-sitemap)) (preparation-function (plist-get project-plist :preparation-function)) (completion-function (plist-get project-plist :completion-function)) (files (org-publish-get-base-files project exclude-regexp)) file) - (when preparation-function (funcall preparation-function)) - (if index-p (funcall index-function project index-filename)) + (when preparation-function (run-hooks 'preparation-function)) + (if sitemap-p (funcall sitemap-function project sitemap-filename)) (while (setq file (pop files)) (org-publish-file file project)) - (when completion-function (funcall completion-function)))) + (when (plist-get project-plist :makeindex) + (org-publish-index-generate-theindex.inc + (plist-get project-plist :base-directory)) + (org-publish-file (expand-file-name + "theindex.org" + (plist-get project-plist :base-directory)) + project)) + (when completion-function (run-hooks 'completion-function)))) (org-publish-expand-projects projects))) -(defun org-publish-org-index (project &optional index-filename) - "Create an index of pages in set defined by PROJECT. -Optionally set the filename of the index with INDEX-FILENAME. -Default for INDEX-FILENAME is 'sitemap.org'." +(defun org-publish-org-sitemap (project &optional sitemap-filename) + "Create an sitemap of pages in set defined by PROJECT. +Optionally set the filename of the sitemap with SITEMAP-FILENAME. +Default for SITEMAP-FILENAME is 'sitemap.org'." (let* ((project-plist (cdr project)) (dir (file-name-as-directory (plist-get project-plist :base-directory))) @@ -550,28 +586,28 @@ (indent-str (make-string 2 ?\ )) (exclude-regexp (plist-get project-plist :exclude)) (files (nreverse (org-publish-get-base-files project exclude-regexp))) - (index-filename (concat dir (or index-filename "sitemap.org"))) - (index-title (or (plist-get project-plist :index-title) - (concat "Index for project " (car project)))) - (index-style (or (plist-get project-plist :index-style) + (sitemap-filename (concat dir (or sitemap-filename "sitemap.org"))) + (sitemap-title (or (plist-get project-plist :sitemap-title) + (concat "Sitemap for project " (car project)))) + (sitemap-style (or (plist-get project-plist :sitemap-style) 'tree)) - (visiting (find-buffer-visiting index-filename)) - (ifn (file-name-nondirectory index-filename)) - file index-buffer) - (with-current-buffer (setq index-buffer - (or visiting (find-file index-filename))) + (visiting (find-buffer-visiting sitemap-filename)) + (ifn (file-name-nondirectory sitemap-filename)) + file sitemap-buffer) + (with-current-buffer (setq sitemap-buffer + (or visiting (find-file sitemap-filename))) (erase-buffer) - (insert (concat "#+TITLE: " index-title "\n\n")) + (insert (concat "#+TITLE: " sitemap-title "\n\n")) (while (setq file (pop files)) (let ((fn (file-name-nondirectory file)) (link (file-relative-name file dir)) (oldlocal localdir)) - ;; index shouldn't index itself - (unless (equal (file-truename index-filename) + ;; sitemap shouldn't list itself + (unless (equal (file-truename sitemap-filename) (file-truename file)) - (if (eq index-style 'list) - (message "Generating list-style index for %s" index-title) - (message "Generating tree-style index for %s" index-title) + (if (eq sitemap-style 'list) + (message "Generating list-style sitemap for %s" sitemap-title) + (message "Generating tree-style sitemap for %s" sitemap-title) (setq localdir (concat (file-name-as-directory dir) (file-name-directory link))) (unless (string= localdir oldlocal) @@ -600,7 +636,7 @@ (org-publish-find-title file) "]]\n"))))) (save-buffer)) - (or visiting (kill-buffer index-buffer)))) + (or visiting (kill-buffer sitemap-buffer)))) (defun org-publish-find-title (file) "Find the title of file in project." @@ -650,18 +686,19 @@ (interactive "P") (when force (org-publish-remove-all-timestamps)) - (org-publish-initialize-files-alist) + (org-publish-initialize-files-alist force) (save-window-excursion (let ((org-publish-use-timestamps-flag (if force nil org-publish-use-timestamps-flag))) (org-publish-projects org-publish-project-alist)))) + ;;;###autoload (defun org-publish-current-file (&optional force) "Publish the current file. With prefix argument, force publish the file." (interactive "P") - (org-publish-initialize-files-alist) + (org-publish-initialize-files-alist force) (save-window-excursion (let ((org-publish-use-timestamps-flag (if force nil org-publish-use-timestamps-flag))) @@ -673,7 +710,7 @@ With a prefix argument, force publishing of all files in the project." (interactive "P") - (org-publish-initialize-files-alist) + (org-publish-initialize-files-alist force) (save-window-excursion (let ((project (org-publish-get-project-from-filename (buffer-file-name) 'up)) (org-publish-use-timestamps-flag @@ -682,6 +719,96 @@ (error "File %s is not part of any known project" (buffer-file-name))) (org-publish project)))) + +;;; Index generation + +(defvar backend) ; dynamically scoped +(defun org-publish-aux-preprocess () + "Find index entries and write them to an .orgx file." + (let ((case-fold-search t) + entry index target) + (goto-char (point-min)) + (while + (and + (re-search-forward "^[ \t]*#\\+index:[ \t]*\$.*?\$[ \t]*$" nil t) + (> (match-end 1) (match-beginning 1))) + (setq entry (match-string 1)) + (when (eq backend 'latex) + (replace-match (format "\\index{%s}" entry) t t)) + (save-excursion + (org-back-to-heading t) + (setq target (get-text-property (point) 'target)) + (setq target (or (cdr (assoc target org-export-preferred-target-alist)) + (cdr (assoc target org-export-id-target-alist)) + target)) + (push (cons entry target) index))) + (with-temp-file + (concat (file-name-sans-extension org-current-export-file) ".orgx") + (dolist (entry (nreverse index)) + (insert (format "INDEX: (%s) %s\n" (cdr entry) (car entry))))))) + +(defun org-publish-index-generate-theindex.inc (directory) + "Generate the index from all .orgx files in the current directory and below." + (require 'find-lisp) + (let* ((fulldir (file-name-as-directory + (expand-file-name directory))) + (full-files (find-lisp-find-files directory "\\.orgx\\'")) + (re (concat "\\`" fulldir)) + (files (mapcar (lambda (f) (if (string-match re f) + (substring f (match-end 0)) + f)) + full-files)) + (default-directory directory) + index origfile buf target entry ibuffer + main last-main letter last-letter file sub link) + ;; `files' contains the list of relative file names + (dolist (file files) + (setq origfile (substring file 0 -1)) + (setq buf (find-file-noselect file)) + (with-current-buffer buf + (goto-char (point-min)) + (while (re-search-forward "^INDEX: (\$.*?\$) \$.*\$" nil t) + (setq target (match-string 1) + entry (match-string 2)) + (push (list entry origfile target) index))) + (kill-buffer buf)) + (setq index (sort index (lambda (a b) (string< (downcase (car a)) + (downcase (car b)))))) + (setq ibuffer (find-file-noselect (expand-file-name "theindex.inc" directory))) + (with-current-buffer ibuffer + (erase-buffer) + (insert "* Index\n") + (setq last-letter nil) + (dolist (idx index) + (setq entry (car idx) file (nth 1 idx) target (nth 2 idx)) + (setq letter (upcase (substring entry 0 1))) + (when (not (equal letter last-letter)) + (insert "** " letter "\n") + (setq last-letter letter)) + (if (string-match "!" entry) + (setq main (substring entry 0 (match-beginning 0)) + sub (substring entry (match-end 0))) + (setq main nil sub nil last-main nil)) + (when (and main (not (equal main last-main))) + (insert " - " main "\n") + (setq last-main main)) + (setq link (concat "[[file:" file "::#" target "]" + "[" (or sub entry) "]]")) + (if (and main sub) + (insert " - " link "\n") + (insert " - " link "\n"))) + (save-buffer)) + (kill-buffer ibuffer) + + (let ((index-file (expand-file-name "theindex.org" directory))) + (unless (file-exists-p index-file) + (setq ibuffer (find-file-noselect index-file)) + (with-current-buffer ibuffer + (erase-buffer) + (insert "\n\n#+include: \"theindex.inc\"\n\n") + (save-buffer)) + (kill-buffer ibuffer))))) + (provide 'org-publish) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-remember.el --- a/lisp/org/org-remember.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-remember.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -54,7 +54,7 @@ :group 'org) (defcustom org-remember-store-without-prompt t - "Non-nil means, `C-c C-c' stores remember note without further prompts. + "Non-nil means `C-c C-c' stores remember note without further prompts. It then uses the file and headline specified by the template or (if the template does not specify them) by the variables `org-default-notes-file' and `org-remember-default-headline'. To force prompting anyway, use @@ -131,7 +131,7 @@ You may define a prompt like %^{Please specify birthday %n user name (taken from `user-full-name') %a annotation, normally the link created with org-store-link - %i initial content, copied from the active region. If %i is + %i initial content, copied from the active region. If %i is indented, the entire inserted text will be indented as well. %c current kill ring head %x content of the X clipboard @@ -225,7 +225,7 @@ (define-key org-remember-mode-map "\C-c\C-k" 'org-remember-kill) (defcustom org-remember-clock-out-on-exit 'query - "Non-nil means, stop the clock when exiting a clocking remember buffer. + "Non-nil means stop the clock when exiting a clocking remember buffer. This only applies if the clock is running in the remember buffer. If the clock is not stopped, it continues to run in the storage location. Instead of nil or t, this may also be the symbol `query' to prompt the @@ -248,7 +248,7 @@ (directory :tag "Directory"))) (defcustom org-remember-auto-remove-backup-files t - "Non-nil means, remove remember backup files after successfully storage. + "Non-nil means remove remember backup files after successfully storage. When remember is finished successfully, with storing the note at the desired target, remove the backup files related to this remember process and show a message about remaining backup files, from previous, unfinished @@ -351,7 +351,7 @@ org-force-remember-template-char)) (t (setq msg (format - "Select template: %s" + "Select template: %s%s" (mapconcat (lambda (x) (cond @@ -362,13 +362,17 @@ (format "[%c]%s" (car x) (substring (nth 1 x) 1))) (t (format "[%c]%s" (car x) (nth 1 x))))) - templates " "))) + templates " ") + (if (assoc ?C templates) + "" + " [C]customize templates"))) (let ((inhibit-quit t) char0) (while (not char0) (message msg) (setq char0 (read-char-exclusive)) (when (and (not (assoc char0 templates)) - (not (equal char0 ?\C-g))) + (not (equal char0 ?\C-g)) + (not (equal char0 ?C))) (message "No such template \"%c\"" char0) (ding) (sit-for 1) (setq char0 nil))) @@ -376,6 +380,11 @@ (jump-to-register remember-register) (kill-buffer remember-buffer) (error "Abort")) + (when (not (assoc char0 templates)) + (jump-to-register remember-register) + (kill-buffer remember-buffer) + (customize-variable 'org-remember-templates) + (error "Customize templates")) char0)))))) (cddr (assoc char templates))))) @@ -470,7 +479,7 @@ ## C-u C-c C-c like C-c C-c, and immediately visit note at target location ## C-0 C-c C-c \"%s\" -> \"* %s\" ## %s to select file and header location interactively. -## C-2 C-c C-c as child of the currently clocked item +## C-2 C-c C-c as child (C-3: as sibling) of the currently clocked item ## To switch templates, use `\\[org-remember]'. To abort use `C-c C-k'.\n\n" (if org-remember-store-without-prompt " C-c C-c" " C-1 C-c C-c") (abbreviate-file-name (or file org-default-notes-file)) @@ -479,21 +488,6 @@ (or (cdr org-remember-previous-location) "???") (if org-remember-store-without-prompt "C-1 C-c C-c" " C-c C-c")))) (insert tpl) - (goto-char (point-min)) - - ;; Simple %-escapes - (while (re-search-forward "%\$[tTuUaiAcxkKI]\$" nil t) - (unless (org-remember-escaped-%) - (when (and initial (equal (match-string 0) "%i")) - (save-match-data - (let* ((lead (buffer-substring - (point-at-bol) (match-beginning 0)))) - (setq v-i (mapconcat 'identity - (org-split-string initial "\n") - (concat "\n" lead)))))) - (replace-match - (or (eval (intern (concat "v-" (match-string 1)))) "") - t t))) ;; %[] Insert contents of a file. (goto-char (point-min)) @@ -508,6 +502,21 @@ (insert-file-contents filename) (error (insert (format "%%![Couldn't insert %s: %s]" filename error))))))) + ;; Simple %-escapes + (goto-char (point-min)) + (while (re-search-forward "%\$[tTuUaiAcxkKI]\$" nil t) + (unless (org-remember-escaped-%) + (when (and initial (equal (match-string 0) "%i")) + (save-match-data + (let* ((lead (buffer-substring + (point-at-bol) (match-beginning 0)))) + (setq v-i (mapconcat 'identity + (org-split-string initial "\n") + (concat "\n" lead)))))) + (replace-match + (or (eval (intern (concat "v-" (match-string 1)))) "") + t t))) + ;; %() embedded elisp (goto-char (point-min)) (while (re-search-forward "%\$(.+)\$" nil t) @@ -860,6 +869,7 @@ (previousp (and (member current-prefix-arg '((16) 0)) org-remember-previous-location)) (clockp (equal current-prefix-arg 2)) + (clocksp (equal current-prefix-arg 3)) (fastp (org-xor (equal current-prefix-arg 1) org-remember-store-without-prompt)) (file (cond @@ -882,7 +892,7 @@ visiting (and file (org-find-base-buffer-visiting file)) heading (cdr org-remember-previous-location) fastp t)) - (when clockp + (when (or clockp clocksp) (setq file (buffer-file-name (marker-buffer org-clock-marker)) visiting (and file (org-find-base-buffer-visiting file)) heading org-clock-heading-for-remember @@ -1015,7 +1025,9 @@ (beginning-of-line 2) (end-of-line 1) (insert "\n")))) - (org-paste-subtree (org-get-valid-level level 1) txt) + (org-paste-subtree (if clocksp + level + (org-get-valid-level level 1)) txt) (and org-auto-align-tags (org-set-tags nil t)) (bookmark-set "org-remember-last-stored") (move-marker org-remember-last-stored-marker (point))) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-rmail.el --- a/lisp/org/org-rmail.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-rmail.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; diff -r d33170754d70 -r 805a52720f82 lisp/org/org-src.el --- a/lisp/org/org-src.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-src.el Thu Apr 15 12:13:27 2010 +0200 @@ -8,7 +8,7 @@ ;; Dan Davison ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -38,6 +38,7 @@ (require 'cl)) (declare-function org-do-remove-indentation "org" (&optional n)) +(declare-function org-at-table.el-p "org" ()) (declare-function org-get-indentation "org" (&optional line)) (declare-function org-switch-to-buffer-other-window "org" (&rest args)) @@ -113,7 +114,6 @@ :group 'org-edit-structure :type 'boolean) - (defcustom org-src-window-setup 'reorganize-frame "How the source code edit buffer should be displayed. Possible values for this option are: @@ -192,7 +192,7 @@ The example is copied to a separate buffer, and that buffer is switched to the correct language mode. When done, exit with \\[org-edit-src-exit]. This will remove the original code in the Org buffer, and replace it with -the edited version. Optional argument CONTEXT is used by +the edited version. Optional argument CONTEXT is used by \\[org-edit-src-save] when calling this function." (interactive) (unless (eq context 'save) @@ -221,6 +221,13 @@ block-nindent (nth 5 info) lang-f (intern (concat lang "-mode")) begline (save-excursion (goto-char beg) (org-current-line))) + (if (equal lang-f 'table.el-mode) + (setq lang-f (lambda () + (text-mode) + (if (org-bound-and-true-p flyspell-mode) + (flyspell-mode -1)) + (table-recognize) + (org-set-local 'org-edit-src-content-indentation 0)))) (unless (functionp lang-f) (error "No such language mode: %s" lang-f)) (org-goto-line line) @@ -452,6 +459,15 @@ (pos (point)) re1 re2 single beg end lang lfmt match-re1 ind entry) (catch 'exit + (when (org-at-table.el-p) + (re-search-backward "^[\t]*[^ \t|\\+]" nil t) + (setq beg (1+ (point-at-eol))) + (goto-char beg) + (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t) + (progn (goto-char (point-max)) (newline))) + (setq end (point-at-bol)) + (setq ind (org-edit-src-get-indentation beg)) + (throw 'exit (list beg end 'table.el nil nil ind))) (while (setq entry (pop re-list)) (setq re1 (car entry) re2 (nth 1 entry) lang (nth 2 entry) single (nth 3 entry)) @@ -515,6 +531,7 @@ (interactive) (unless org-edit-src-from-org-mode (error "This is not a sub-editing buffer, something is wrong...")) + (widen) (let* ((beg org-edit-src-beg-marker) (end org-edit-src-end-marker) (ovl org-edit-src-overlay) @@ -525,7 +542,7 @@ org-edit-src-content-indentation)) (preserve-indentation org-src-preserve-indentation) (delta 0) code line col indent) - (untabify (point-min) (point-max)) + (unless preserve-indentation (untabify (point-min) (point-max))) (save-excursion (goto-char (point-min)) (if (looking-at "[ \t\n]*\n") (replace-match "")) @@ -575,8 +592,15 @@ (insert code) (goto-char beg) (if single (just-one-space)) - (org-goto-line (1- (+ (org-current-line) line))) - (org-move-to-column (if preserve-indentation col (+ col total-nindent delta))) + (if (memq t (mapcar (lambda (overlay) + (eq (org-overlay-get overlay 'invisible) + 'org-hide-block)) + (org-overlays-at (point)))) + ;; Block is hidden; put point at start of block + (beginning-of-line 0) + ;; Block is visible, put point where it was in the code buffer + (org-goto-line (1- (+ (org-current-line) line))) + (org-move-to-column (if preserve-indentation col (+ col total-nindent delta)))) (move-marker beg nil) (move-marker end nil)) (unless (eq context 'save) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-table.el --- a/lisp/org/org-table.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-table.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -49,7 +49,7 @@ (defvar constants-unit-system) (defcustom orgtbl-optimized (eq org-enable-table-editor 'optimized) - "Non-nil means, use the optimized table editor version for `orgtbl-mode'. + "Non-nil means use the optimized table editor version for `orgtbl-mode'. In the optimized version, the table editor takes over all simple keys that normally just insert a character. In tables, the characters are inserted in a way to minimize disturbing the table structure (i.e. in overwrite mode @@ -142,14 +142,14 @@ :group 'org-table) (defcustom org-table-automatic-realign t - "Non-nil means, automatically re-align table when pressing TAB or RETURN. + "Non-nil means automatically re-align table when pressing TAB or RETURN. When nil, aligning is only done with \\[org-table-align], or after column removal/insertion." :group 'org-table-editing :type 'boolean) (defcustom org-table-auto-blank-field t - "Non-nil means, automatically blank table field when starting to type into it. + "Non-nil means automatically blank table field when starting to type into it. This only happens when typing immediately after a field motion command (TAB, S-TAB or RET). Only relevant when `org-enable-table-editor' is equal to `optimized'." @@ -157,7 +157,7 @@ :type 'boolean) (defcustom org-table-tab-jumps-over-hlines t - "Non-nil means, tab in the last column of a table with jump over a hline. + "Non-nil means tab in the last column of a table with jump over a hline. If a horizontal separator line is following the current line, `org-table-next-field' can either create a new row before that line, or jump over the line. When this option is nil, a new line will be created before @@ -183,7 +183,7 @@ (const :tag "Convert user input, don't offer during editing" 'from))) (defcustom org-table-copy-increment t - "Non-nil means, increment when copying current field with \\[org-table-copy-down]." + "Non-nil means increment when copying current field with \\[org-table-copy-down]." :group 'org-table-calculation :type 'boolean) @@ -204,7 +204,7 @@ :type 'plist) (defcustom org-table-formula-evaluate-inline t - "Non-nil means, TAB and RET evaluate a formula in current table field. + "Non-nil means TAB and RET evaluate a formula in current table field. If the current field starts with an equal sign, it is assumed to be a formula which should be evaluated as described in the manual and in the documentation string of the command `org-table-eval-formula'. This feature requires the @@ -215,7 +215,7 @@ :type 'boolean) (defcustom org-table-formula-use-constants t - "Non-nil means, interpret constants in formulas in tables. + "Non-nil means interpret constants in formulas in tables. A constant looks like `$c' or `$Grav' and will be replaced before evaluation by the value given in `org-table-formula-constants', or by a value obtained from the `constants.el' package." @@ -241,8 +241,8 @@ (string :tag "value")))) (defcustom org-table-allow-automatic-line-recalculation t - "Non-nil means, lines marked with |#| or |*| will be recomputed automatically. -Automatically means, when TAB or RET or C-c C-c are pressed in the line." + "Non-nil means lines marked with |#| or |*| will be recomputed automatically. +Automatically means when TAB or RET or C-c C-c are pressed in the line." :group 'org-table-calculation :type 'boolean) @@ -252,7 +252,7 @@ :type 'boolean) (defcustom org-table-relative-ref-may-cross-hline t - "Non-nil means, relative formula references may cross hlines. + "Non-nil means relative formula references may cross hlines. Here are the allowed values: nil Relative references may not cross hlines. They will reference the @@ -567,7 +567,7 @@ "List of max width of fields in each column. This is being used to correctly align a single field after TAB or RET.") (defvar org-table-formula-debug nil - "Non-nil means, debug table formulas. + "Non-nil means debug table formulas. When nil, simply write \"#ERROR\" in corrupted fields.") (make-variable-buffer-local 'org-table-formula-debug) (defvar org-table-overlay-coordinates nil @@ -575,6 +575,7 @@ (make-variable-buffer-local 'org-table-overlay-coordinates) (defvar org-last-recalc-line nil) +(defvar org-table-do-narrow t) ; for dynamic scoping (defconst org-narrow-column-arrow "=>" "Used as display property in narrowed table columns.") @@ -621,7 +622,8 @@ ;; Check if we are narrowing any columns (goto-char beg) - (setq narrow (and org-format-transports-properties-p + (setq narrow (and org-table-do-narrow + org-format-transports-properties-p (re-search-forward "<[rl]?[0-9]+>" end t))) (goto-char beg) (setq falign (re-search-forward "<[rl][0-9]*>" end t)) @@ -660,13 +662,14 @@ (while (< (setq i (1+ i)) maxfields) ;; Loop over all columns (setq column (mapcar (lambda (x) (or (nth i x) "")) fields)) ;; Check if there is an explicit width specified + (setq fmax nil) (when (or narrow falign) (setq c column fmax nil falign1 nil) (while c (setq e (pop c)) (when (and (stringp e) (string-match "^<\$[rl]\$?\$[0-9]+\$?>$" e)) (if (match-end 1) (setq falign1 (match-string 1 e))) - (if (match-end 2) + (if (and org-table-do-narrow (match-end 2)) (setq fmax (string-to-number (match-string 2 e)) c nil)))) ;; Find fields that are wider than fmax, and shorten them (when fmax @@ -685,7 +688,8 @@ (list 'display org-narrow-column-arrow) xx))))) ;; Get the maximum width for each column - (push (apply 'max 1 (mapcar 'org-string-width column)) lengths) + (push (apply 'max (or fmax 1) 1 (mapcar 'org-string-width column)) + lengths) ;; Get the fraction of numbers, to decide about alignment of the column (if falign1 (push (equal (downcase falign1) "r") typenums) @@ -1003,6 +1007,47 @@ (defvar org-table-clip nil "Clipboard for table regions.") +(defun org-table-get (line column) + "Get the field in table line LINE, column COLUMN. +If LINE is larger than the number of data lines in the table, the function +returns nil. However, if COLUMN is too large, we will simply return an +empty string. +If LINE is nil, use the current line. +If column is nil, use the current column." + (setq column (or column (org-table-current-column))) + (save-excursion + (and (or (not line) (org-table-goto-line line)) + (org-trim (org-table-get-field column))))) + +(defun org-table-put (line column value &optional align) + "Put VALUE into line LINE, column COLUMN. +When ALIGN is set, als realign the table." + (setq column (or column (org-table-current-column))) + (prog1 (save-excursion + (and (or (not line) (org-table-goto-line line)) + (progn (org-table-goto-column column nil 'force) t) + (org-table-get-field column value))) + (and align (org-table-align)))) + +(defun org-table-current-line () + "Return the index of the current data line." + (let ((pos (point)) (end (org-table-end)) (cnt 0)) + (save-excursion + (goto-char (org-table-begin)) + (while (and (re-search-forward org-table-dataline-regexp end t) + (setq cnt (1+ cnt)) + (< (point-at-eol) pos)))) + cnt)) + +(defun org-table-goto-line (N) + "Go to the Nth data line in the current table. +Return t when the line exists, nil if it does not exist." + (goto-char (org-table-begin)) + (let ((end (org-table-end)) (cnt 0)) + (while (and (re-search-forward org-table-dataline-regexp end t) + (< (setq cnt (1+ cnt)) N))) + (= cnt N))) + (defun org-table-blank-field () "Blank the current table field or active region." (interactive) @@ -1102,22 +1147,20 @@ If there are less than N fields, just go to after the last delimiter. However, when FORCE is non-nil, create new columns if necessary." (interactive "p") - (let ((pos (point-at-eol))) - (beginning-of-line 1) - (when (> n 0) - (while (and (> (setq n (1- n)) -1) - (or (search-forward "|" pos t) - (and force - (progn (end-of-line 1) - (skip-chars-backward "^|") - (insert " | ")))))) -; (backward-char 2) t))))) - (when (and force (not (looking-at ".*|"))) - (save-excursion (end-of-line 1) (insert " | "))) - (if on-delim - (backward-char 1) - (if (looking-at " ") (forward-char 1)))))) - + (beginning-of-line 1) + (when (> n 0) + (while (and (> (setq n (1- n)) -1) + (or (search-forward "|" (point-at-eol) t) + (and force + (progn (end-of-line 1) + (skip-chars-backward "^|") + (insert " | ") + t))))) + (when (and force (not (looking-at ".*|"))) + (save-excursion (end-of-line 1) (insert " | "))) + (if on-delim + (backward-char 1) + (if (looking-at " ") (forward-char 1))))) (defun org-table-insert-column () "Insert a new column into the table." @@ -2243,6 +2286,20 @@ (setq form (copy-sequence formula) lispp (and (> (length form) 2)(equal (substring form 0 2) "'("))) (if (and lispp literal) (setq lispp 'literal)) + + ;; Insert row and column number of formula result field + (while (string-match "[@$]#" form) + (setq form + (replace-match + (format "%d" + (save-match-data + (if (equal (substring form (match-beginning 0) + (1+ (match-beginning 0))) + "@") + (org-table-current-dline) + (org-table-current-column)))) + t t form))) + ;; Check for old vertical references (setq form (org-table-rewrite-old-row-references form)) ;; Insert remote references @@ -2340,7 +2397,7 @@ "Get a calc vector from a column, according to descriptor DESC. Optional arguments TBEG and COL can give the beginning of the table and the current column, to avoid unnecessary parsing. -HIGHLIGHT means, just highlight the range." +HIGHLIGHT means just highlight the range." (if (not (equal (string-to-char desc) ?@)) (setq desc (concat "@" desc))) (save-excursion @@ -2797,6 +2854,12 @@ (not (equal ?. (aref s (max (- (match-beginning 0) 2) 0))))) ;; 3.e5 or something like this. (setq start (match-end 0))) + ((or (> (- (match-end 1) (match-beginning 1)) 2) + ;; (member (match-string 1 s) + ;; '("arctan" "exp" "expm" "lnp" "log" "stir")) + ) + ;; function name, just advance + (setq start (match-end 0))) (t (setq start (match-beginning 0) s (replace-match diff -r d33170754d70 -r 805a52720f82 lisp/org/org-timer.el --- a/lisp/org/org-timer.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-timer.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -48,6 +48,24 @@ :group 'org-time :type 'string) +(defvar org-timer-start-hook nil + "Hook run after relative timer is started.") + +(defvar org-timer-stop-hook nil + "Hook run before relative timer is stopped.") + +(defvar org-timer-pause-hook nil + "Hook run before relative timer is paused.") + +(defvar org-timer-set-hook nil + "Hook run after countdown timer is set.") + +(defvar org-timer-done-hook nil + "Hook run after countdown timer reaches zero.") + +(defvar org-timer-cancel-hook nil + "Hook run before countdown timer is canceled.") + ;;;###autoload (defun org-timer-start (&optional offset) "Set the starting time for the relative timer to now. @@ -82,7 +100,8 @@ (org-timer-set-mode-line 'on) (message "Timer start time set to %s, current value is %s" (format-time-string "%T" org-timer-start-time) - (org-timer-secs-to-hms (or delta 0)))))) + (org-timer-secs-to-hms (or delta 0))) + (run-hooks 'org-timer-start-hook)))) (defun org-timer-pause-or-continue (&optional stop) "Pause or continue the relative timer. With prefix arg, stop it entirely." @@ -103,6 +122,7 @@ (message "Timer continues at %s" (org-timer-value-string))) (t ;; pause timer + (run-hooks 'org-timer-pause-hook) (setq org-timer-pause-time (current-time)) (org-timer-set-mode-line 'pause) (message "Timer paused at %s" (org-timer-value-string))))) @@ -110,6 +130,7 @@ (defun org-timer-stop () "Stop the relative timer." (interactive) + (run-hooks 'org-timer-stop-hook) (setq org-timer-start-time nil org-timer-pause-time nil) (org-timer-set-mode-line 'off)) @@ -254,37 +275,28 @@ (concat " <" (substring (org-timer-value-string) 0 -1) ">")) (force-mode-line-update))) -(defvar org-timer-timer1 nil) -(defvar org-timer-timer2 nil) -(defvar org-timer-timer3 nil) -(defvar org-timer-last-timer nil) - -(defun org-timer-cancel-timers () - "Reset all timers." +(defvar org-timer-current-timer nil) +(defun org-timer-cancel-timer () + "Cancel the current timer." (interactive) - (mapc (lambda(timer) - (when (eval timer) - (cancel-timer timer) - (setq timer nil))) - '(org-timer-timer1 - org-timer-timer2 - org-timer-timer3)) - (message "All timers reset")) + (when (eval org-timer-current-timer) + (run-hooks 'org-timer-cancel-hook) + (cancel-timer org-timer-current-timer) + (setq org-timer-current-timer nil)) + (message "Last timer canceled")) (defun org-timer-show-remaining-time () "Display the remaining time before the timer ends." (interactive) (require 'time) - (if (and (not org-timer-timer1) - (not org-timer-timer2) - (not org-timer-timer3)) + (if (not org-timer-current-timer) (message "No timer set") (let* ((rtime (decode-time - (time-subtract (timer--time org-timer-last-timer) + (time-subtract (timer--time org-timer-current-timer) (current-time)))) (rsecs (nth 0 rtime)) (rmins (nth 1 rtime))) - (message "%d minutes %d seconds left before next time out" + (message "%d minute(s) %d seconds left before next time out" rmins rsecs)))) ;;;###autoload @@ -311,16 +323,15 @@ (org-get-heading)) (t (error "Not in an Org buffer")))) timer-set) - (mapcar (lambda(timer) - (when (not (or (eval timer) timer-set)) - (setq timer-set t) - (setq org-timer-last-timer - (run-with-timer - secs nil 'org-notify (format "%s: time out" hl) t)) - (set timer org-timer-last-timer))) - '(org-timer-timer1 - org-timer-timer2 - org-timer-timer3))))) + (if org-timer-current-timer + (error "You cannot run several timers at the same time") + (setq org-timer-current-timer + (run-with-timer + secs nil `(lambda () + (setq org-timer-current-timer nil) + (org-notify ,(format "%s: time out" hl) t) + (run-hooks 'org-timer-done-hook)))) + (run-hooks 'org-timer-set-hook))))) (provide 'org-timer) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-vm.el --- a/lisp/org/org-vm.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-vm.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; diff -r d33170754d70 -r 805a52720f82 lisp/org/org-w3m.el --- a/lisp/org/org-w3m.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-w3m.el Thu Apr 15 12:13:27 2010 +0200 @@ -5,7 +5,7 @@ ;; Author: Andy Stewart ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; diff -r d33170754d70 -r 805a52720f82 lisp/org/org-wl.el --- a/lisp/org/org-wl.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-wl.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Tokuya Kameshima ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -104,6 +104,10 @@ (subject (let (wl-thr-indent-string wl-parent-message-entity) (wl-summary-line-subject))) desc link) + ;; remove text properties of subject string to avoid possible bug + ;; when formatting the subject + (set-text-properties 0 (length subject) nil subject) + (org-store-link-props :type "wl" :from from :to to :subject subject :message-id message-id) (setq message-id (org-remove-angle-brackets message-id)) diff -r d33170754d70 -r 805a52720f82 lisp/org/org-xoxo.el --- a/lisp/org/org-xoxo.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org-xoxo.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -43,6 +43,7 @@ "Export the org buffer as XOXO. The XOXO buffer is named *xoxo-*" (interactive (list (current-buffer))) + (run-hooks 'org-export-first-hook) ;; A quickie abstraction ;; Output everything as XOXO diff -r d33170754d70 -r 805a52720f82 lisp/org/org.el --- a/lisp/org/org.el Thu Apr 15 11:31:54 2010 +0200 +++ b/lisp/org/org.el Thu Apr 15 12:13:27 2010 +0200 @@ -6,7 +6,7 @@ ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 6.33x +;; Version: 6.35i ;; ;; This file is part of GNU Emacs. ;; @@ -61,7 +61,6 @@ ;; A list of recent changes can be found at ;; http://orgmode.org/Changes.html ;; - ;;; Code: (defvar org-inhibit-highlight-removal nil) ; dynamically scoped param @@ -86,6 +85,7 @@ (require 'easymenu) (require 'org-macs) +(require 'org-entities) (require 'org-compat) (require 'org-faces) (require 'org-list) @@ -96,7 +96,7 @@ ;;; Version -(defconst org-version "6.33x" +(defconst org-version "6.35i" "The version number of the file org.el.") (defun org-version (&optional here) @@ -170,7 +170,7 @@ (let ((a (member 'org-infojs org-modules))) (and a (setcar a 'org-jsinfo)))) -(defcustom org-modules '(org-bbdb org-bibtex org-gnus org-info org-jsinfo org-irc org-mew org-mhe org-rmail org-vm org-w3m org-wl) +(defcustom org-modules '(org-bbdb org-bibtex org-docview org-gnus org-info org-jsinfo org-irc org-mew org-mhe org-rmail org-vm org-w3m org-wl) "Modules that should always be loaded together with org.el. If a description starts with , the file is not part of Emacs and loading it will require that you have downloaded and properly installed @@ -189,6 +189,8 @@ (const :tag " bbdb: Links to BBDB entries" org-bbdb) (const :tag " bibtex: Links to BibTeX entries" org-bibtex) (const :tag " crypt: Encryption of subtrees" org-crypt) + (const :tag " ctags: Access to Emacs tags with links" org-ctags) + (const :tag " docview: Links to doc-view buffers" org-docview) (const :tag " gnus: Links to GNUS folders/messages" org-gnus) (const :tag " id: Global IDs for identifying entries" org-id) (const :tag " info: Links to Info nodes" org-info) @@ -229,10 +231,10 @@ (const :tag "C man: Support for links to manpages in Org-mode" org-man) (const :tag "C mtags: Support for muse-like tags" org-mtags) (const :tag "C panel: Simple routines for us with bad memory" org-panel) - (const :tag "C R: Computation using the R language" org-R) (const :tag "C registry: A registry for Org-mode links" org-registry) (const :tag "C org2rem: Convert org appointments into reminders" org2rem) (const :tag "C screen: Visit screen sessions through Org-mode links" org-screen) + (const :tag "C secretary: Team management with org-mode" org-secretary) (const :tag "C special-blocks: Turn blocks into LaTeX envs and HTML divs" org-special-blocks) (const :tag "C sqlinsert: Convert Org-mode tables to SQL insertions" orgtbl-sqlinsert) (const :tag "C toc: Table of contents for Org-mode buffer" org-toc) @@ -240,7 +242,7 @@ (repeat :tag "External packages" :inline t (symbol :tag "Package")))) (defcustom org-support-shift-select nil - "Non-nil means, make shift-cursor commands select text when possible. + "Non-nil means make shift-cursor commands select text when possible. In Emacs 23, when `shift-select-mode' is on, shifted cursor keys start selecting a region, or enlarge thusly regions started in this way. @@ -288,7 +290,7 @@ :group 'org) (defcustom org-startup-folded t - "Non-nil means, entering Org-mode will switch to OVERVIEW. + "Non-nil means entering Org-mode will switch to OVERVIEW. This can also be configured on a per-file basis by adding one of the following lines anywhere in the buffer: @@ -304,14 +306,14 @@ (const :tag "show everything, even drawers" showeverything))) (defcustom org-startup-truncated t - "Non-nil means, entering Org-mode will set `truncate-lines'. + "Non-nil means entering Org-mode will set `truncate-lines'. This is useful since some lines containing links can be very long and uninteresting. Also tables look terrible when wrapped." :group 'org-startup :type 'boolean) (defcustom org-startup-indented nil - "Non-nil means, turn on `org-indent-mode' on startup. + "Non-nil means turn on `org-indent-mode' on startup. This can also be configured on a per-file basis by adding one of the following lines anywhere in the buffer: @@ -322,8 +324,17 @@ (const :tag "Not" nil) (const :tag "Globally (slow on startup in large files)" t))) +(defcustom org-startup-with-beamer-mode nil + "Non-nil means turn on `org-beamer-mode' on startup. +This can also be configured on a per-file basis by adding one of +the following lines anywhere in the buffer: + + #+STARTUP: beamer" + :group 'org-startup + :type 'boolean) + (defcustom org-startup-align-all-tables nil - "Non-nil means, align all tables when visiting a file. + "Non-nil means align all tables when visiting a file. This is useful when the column width in tables is forced with cookies in table fields. Such tables will look correct only after the first re-align. This can also be configured on a per-file basis by adding one of @@ -514,7 +525,7 @@ "Contexts for the reveal options.") (defcustom org-show-hierarchy-above '((default . t)) - "Non-nil means, show full hierarchy when revealing a location. + "Non-nil means show full hierarchy when revealing a location. Org-mode often shows locations in an org-mode file which might have been invisible before. When this is set, the hierarchy of headings above the exposed location is shown. @@ -534,7 +545,7 @@ :type org-context-choice) (defcustom org-show-following-heading '((default . nil)) - "Non-nil means, show following heading when revealing a location. + "Non-nil means show following heading when revealing a location. Org-mode often shows locations in an org-mode file which might have been invisible before. When this is set, the heading following the match is shown. @@ -547,7 +558,7 @@ :type org-context-choice) (defcustom org-show-siblings '((default . nil) (isearch t)) - "Non-nil means, show all sibling heading when revealing a location. + "Non-nil means show all sibling heading when revealing a location. Org-mode often shows locations in an org-mode file which might have been invisible before. When this is set, the sibling of the current entry heading are all made visible. If `org-show-hierarchy-above' is t, @@ -563,7 +574,7 @@ :type org-context-choice) (defcustom org-show-entry-below '((default . nil)) - "Non-nil means, show the entry below a headline when revealing a location. + "Non-nil means show the entry below a headline when revealing a location. Org-mode often shows locations in an org-mode file which might have been invisible before. When this is set, the text below the headline that is exposed is also shown. @@ -594,7 +605,7 @@ (const :tag "One dedicated frame" dedicated-frame))) (defcustom org-use-speed-commands nil - "Non-nil means, activate single letter commands at beginning of a headline. + "Non-nil means activate single letter commands at beginning of a headline. This may also be a function to test for appropriate locations where speed commands should be active." :group 'org-structure @@ -631,7 +642,7 @@ :group 'org-structure) (defcustom org-cycle-skip-children-state-if-no-children t - "Non-nil means, skip CHILDREN state in entries that don't have any." + "Non-nil means skip CHILDREN state in entries that don't have any." :group 'org-cycle :type 'boolean) @@ -668,7 +679,7 @@ :type '(repeat (string :tag "Drawer Name"))) (defcustom org-hide-block-startup nil - "Non-nil means, , entering Org-mode will fold all blocks. + "Non-nil means entering Org-mode will fold all blocks. This can also be set in on a per-file basis with #+STARTUP: hideblocks @@ -690,7 +701,7 @@ :type 'boolean) (defcustom org-cycle-level-after-item/entry-creation t - "Non-nil means, cycle entry level or item indentation in new empty entries. + "Non-nil means cycle entry level or item indentation in new empty entries. When the cursor is at the end of an empty headline, i.e with only stars and maybe a TODO keyword, TAB will then switch the entry to become a child, @@ -727,7 +738,7 @@ headline, this empty line is hidden when the subtree is folded. Org-mode will leave (exactly) one empty line visible if the number of empty lines is equal or larger to the number given in this variable. -So the default 2 means, at least 2 empty lines after the end of a subtree +So the default 2 means at least 2 empty lines after the end of a subtree are needed to produce free space between a collapsed subtree and the following headline. @@ -768,7 +779,7 @@ :group 'org-structure) (defcustom org-odd-levels-only nil - "Non-nil means, skip even levels and only use odd levels for the outline. + "Non-nil means skip even levels and only use odd levels for the outline. This has the effect that two stars are being added/taken away in promotion/demotion commands. It also influences how levels are handled by the exporters. @@ -780,11 +791,11 @@ #+STARTUP: odd #+STARTUP: oddeven" :group 'org-edit-structure - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-adapt-indentation t - "Non-nil means, adapt indentation to outline node level. + "Non-nil means adapt indentation to outline node level. When this variable is set, Org assumes that you write outlines by indenting text in each node to align with the headline (after the stars). @@ -858,7 +869,7 @@ :type 'boolean) (defcustom org-yank-folded-subtrees t - "Non-nil means, when yanking subtrees, fold them. + "Non-nil means when yanking subtrees, fold them. If the kill is a single subtree, or a sequence of subtrees, i.e. if it starts with a heading and all other headings in it are either children or siblings, then fold all the subtrees. However, do this only if no @@ -867,14 +878,14 @@ :type 'boolean) (defcustom org-yank-adjusted-subtrees nil - "Non-nil means, when yanking subtrees, adjust the level. + "Non-nil means when yanking subtrees, adjust the level. With this setting, `org-paste-subtree' is used to insert the subtree, see this function for details." :group 'org-edit-structure :type 'boolean) (defcustom org-M-RET-may-split-line '((default . t)) - "Non-nil means, M-RET will split the line at the cursor position. + "Non-nil means M-RET will split the line at the cursor position. When nil, it will go to the end of the line before making a new line. You may also set this option in a different way for different @@ -901,7 +912,7 @@ (defcustom org-insert-heading-respect-content nil - "Non-nil means, insert new headings after the current subtree. + "Non-nil means insert new headings after the current subtree. When nil, the new heading is created directly after the current line. The commands \\[org-insert-heading-respect-content] and \\[org-insert-todo-heading-respect-content] turn this variable on @@ -933,8 +944,8 @@ :type 'hook) (defcustom org-enable-fixed-width-editor t - "Non-nil means, lines starting with \":\" are treated as fixed-width. -This currently only means, they are never auto-wrapped. + "Non-nil means lines starting with \":\" are treated as fixed-width. +This currently only means they are never auto-wrapped. When nil, such lines will be treated like ordinary lines. See also the QUOTE keyword." :group 'org-edit-structure @@ -942,7 +953,7 @@ (defcustom org-goto-auto-isearch t - "Non-nil means, typing characters in org-goto starts incremental search." + "Non-nil means typing characters in org-goto starts incremental search." :group 'org-edit-structure :type 'boolean) @@ -952,14 +963,14 @@ :group 'org-structure) (defcustom org-highlight-sparse-tree-matches t - "Non-nil means, highlight all matches that define a sparse tree. + "Non-nil means highlight all matches that define a sparse tree. The highlights will automatically disappear the next time the buffer is changed by an edit command." :group 'org-sparse-trees :type 'boolean) (defcustom org-remove-highlights-with-change t - "Non-nil means, any change to the buffer will remove temporary highlights. + "Non-nil means any change to the buffer will remove temporary highlights. Such highlights are created by `org-occur' and `org-clock-display'. When nil, `C-c C-c needs to be used to get rid of the highlights. The highlights created by `org-preview-latex-fragment' always need @@ -993,7 +1004,7 @@ :group 'org) (defcustom org-enable-table-editor 'optimized - "Non-nil means, lines starting with \"|\" are handled by the table editor. + "Non-nil means lines starting with \"|\" are handled by the table editor. When nil, such lines will be treated like ordinary lines. When equal to the symbol `optimized', the table editor will be optimized to @@ -1032,7 +1043,7 @@ :type 'boolean) (defcustom org-table-tab-recognizes-table.el t - "Non-nil means, TAB will automatically notice a table.el table. + "Non-nil means TAB will automatically notice a table.el table. When it sees such a table, it moves point into it and - if necessary - calls `table-recognize-table'." :group 'org-table-editing @@ -1077,7 +1088,7 @@ (function))))) (defcustom org-descriptive-links t - "Non-nil means, hide link part and only show description of bracket links. + "Non-nil means hide link part and only show description of bracket links. Bracket links are like [[link][description]]. This variable sets the initial state in new org-mode buffers. The setting can then be toggled on a per-buffer basis from the Org->Hyperlinks menu." @@ -1174,7 +1185,7 @@ :type 'regexp) (defcustom org-link-to-org-use-id 'create-if-interactive-and-no-custom-id - "Non-nil means, storing a link to an Org file will use entry IDs. + "Non-nil means storing a link to an Org file will use entry IDs. Note that before this variable is even considered, org-id must be loaded, so please customize `org-modules' and turn it on. @@ -1214,7 +1225,7 @@ (const :tag "Do not use ID to create link" nil))) (defcustom org-context-in-file-links t - "Non-nil means, file links from `org-store-link' contain context. + "Non-nil means file links from `org-store-link' contain context. A search string will be added to the file name with :: as separator and used to find the context when the link is activated by the command `org-open-at-point'. @@ -1224,7 +1235,7 @@ :type 'boolean) (defcustom org-keep-stored-link-after-insertion nil - "Non-nil means, keep link in list for entire session. + "Non-nil means keep link in list for entire session. The command `org-store-link' adds a link pointing to the current location to an internal list. These links accumulate during a session. @@ -1261,7 +1272,7 @@ :type 'hook) (defcustom org-tab-follows-link nil - "Non-nil means, on links TAB will follow the link. + "Non-nil means on links TAB will follow the link. Needs to be set before org.el is loaded. This really should not be used, it does not make sense, and the implementation is bad." @@ -1269,14 +1280,14 @@ :type 'boolean) (defcustom org-return-follows-link nil - "Non-nil means, on links RET will follow the link. + "Non-nil means on links RET will follow the link. Needs to be set before org.el is loaded." :group 'org-link-follow :type 'boolean) (defcustom org-mouse-1-follows-link (if (boundp 'mouse-1-click-follows-link) mouse-1-click-follows-link t) - "Non-nil means, mouse-1 on a link will follow the link. + "Non-nil means mouse-1 on a link will follow the link. A longer mouse click will still set point. Does not work on XEmacs. Needs to be set before org.el is loaded." :group 'org-link-follow @@ -1329,7 +1340,7 @@ (const find-file-other-frame))))) (defcustom org-display-internal-link-with-indirect-buffer nil - "Non-nil means, use indirect buffer to display infile links. + "Non-nil means use indirect buffer to display infile links. Activating internal links (from one location in a file to another location in the same file) normally just jumps to the location. When the link is activated with a C-u prefix (or with mouse-3), the link is displayed in @@ -1340,7 +1351,7 @@ :type 'boolean) (defcustom org-open-non-existing-files nil - "Non-nil means, `org-open-file' will open non-existing files. + "Non-nil means `org-open-file' will open non-existing files. When nil, an error will be generated. This variable applies only to external applications because they might choke on non-existing files. If the link is to a file that @@ -1349,7 +1360,7 @@ :type 'boolean) (defcustom org-open-directory-means-index-dot-org nil - "Non-nil means, a link to a directory really means to index.org. + "Non-nil means a link to a directory really means to index.org. When nil, following a directory link will run dired or open a finder/explorer window on that directory." :group 'org-link-follow @@ -1369,7 +1380,7 @@ (cons :tag "other" (function) (repeat :tag "argument" sexp)))) (defcustom org-confirm-shell-link-function 'yes-or-no-p - "Non-nil means, ask for confirmation before executing shell links. + "Non-nil means ask for confirmation before executing shell links. Shell links can be dangerous: just think about a link [[shell:rm -rf ~/*][Google Search]] @@ -1386,7 +1397,7 @@ (const :tag "no confirmation (dangerous)" nil))) (defcustom org-confirm-elisp-link-function 'yes-or-no-p - "Non-nil means, ask for confirmation before executing Emacs Lisp links. + "Non-nil means ask for confirmation before executing Emacs Lisp links. Elisp links can be dangerous: just think about a link [[elisp:(shell-command \"rm -rf ~/*\")][Google Search]] @@ -1452,9 +1463,10 @@ extension. The entries in this list are cons cells where the car identifies files and the cdr the corresponding command. Possible values for the file identifier are - \"regex\" Regular expression matched against the file name. For backward - compatibility, this can also be a string with only alphanumeric - characters, which is then interpreted as an extension. + \"regex\" Regular expression matched against the file: link. For + backward compatibility, this can also be a string with only + alphanumeric characters, which is then interpreted as an + extension. `directory' Matches a directory `remote' Matches a remote file, accessible through tramp or efs. Remote files most likely should be visited through Emacs @@ -1483,9 +1495,13 @@ does define this command, but you can overrule/replace it here. string A command to be executed by a shell; %s will be replaced - by the path to the file. + by the path to the file. If the file identifier is a regex, + %n will be replaced by the match of the nth match group. sexp A Lisp form which will be evaluated. The file path will - be available in the Lisp variable `file'. + be available in the Lisp variable `file', the link itself + in the Lisp variable `link'. If the file identifier is a regex, + the original match data will be restored, so subexpression + matches are accessible using (match-string n link). For more examples, see the system specific constants `org-file-apps-defaults-macosx' `org-file-apps-defaults-windowsnt' @@ -1560,7 +1576,7 @@ :type 'integer) (defcustom org-reverse-note-order nil - "Non-nil means, store new notes at the beginning of a file or entry. + "Non-nil means store new notes at the beginning of a file or entry. When nil, new notes will be filed to the end of a file or entry. This can also be a list with cons cells of regular expressions that are matched against file names, and values." @@ -1572,13 +1588,40 @@ (repeat :tag "By file name regexp" (cons regexp boolean)))) +(defcustom org-log-refile nil + "Information to record when a task is refiled. + +Possible values are: + +nil Don't add anything +time Add a time stamp to the task +note Prompt for a note and add it with template `org-log-note-headings' + +This option can also be set with on a per-file-basis with + + #+STARTUP: nologrefile + #+STARTUP: logrefile + #+STARTUP: lognoterefile + +You can have local logging settings for a subtree by setting the LOGGING +property to one or more of these keywords. + +When bulk-refiling from the agenda, the value `note' is forbidden and +will temporarily be changed to `time'." + :group 'org-refile + :group 'org-progress + :type '(choice + (const :tag "No logging" nil) + (const :tag "Record timestamp" time) + (const :tag "Record timestamp with note." note))) + (defcustom org-refile-targets nil "Targets for refiling entries with \\[org-refile]. This is list of cons cells. Each cell contains: - a specification of the files to be considered, either a list of files, or a symbol whose function or variable value will be used to retrieve a file name or a list of file names. If you use `org-agenda-files' for - that, all agenda files will be scanned for targets. Nil means, consider + that, all agenda files will be scanned for targets. Nil means consider headings in the current buffer. - A specification of how to find candidate refile targets. This may be any of: @@ -1630,7 +1673,7 @@ :type 'function) (defcustom org-refile-use-outline-path nil - "Non-nil means, provide refile targets as paths. + "Non-nil means provide refile targets as paths. So a level 3 headline will be available as level1/level2/level3. When the value is `file', also include the file name (without directory) @@ -1646,7 +1689,7 @@ (const :tag "Start with full file path" full-file-path))) (defcustom org-outline-path-complete-in-steps t - "Non-nil means, complete the outline path in hierarchical steps. + "Non-nil means complete the outline path in hierarchical steps. When Org-mode uses the refile interface to select an outline path \(see variable `org-refile-use-outline-path'), the completion of the path can be done is a single go, or if can be done in steps down @@ -1658,7 +1701,7 @@ :type 'boolean) (defcustom org-refile-allow-creating-parent-nodes nil - "Non-nil means, allow to create new nodes as refile targets. + "Non-nil means allow to create new nodes as refile targets. New nodes are then created by adding \"/new node name\" to the completion of an existing node. When the value of this variable is `confirm', new node creation must be confirmed by the user (recommended) @@ -1794,7 +1837,7 @@ (const type))) (defcustom org-use-fast-todo-selection t - "Non-nil means, use the fast todo selection scheme with C-c C-t. + "Non-nil means use the fast todo selection scheme with C-c C-t. This variable describes if and under what circumstances the cycling mechanism for TODO keywords will be replaced by a single-key, direct selection scheme. @@ -1818,7 +1861,7 @@ (const :tag "Only with C-u C-c C-t" prefix))) (defcustom org-provide-todo-statistics t - "Non-nil means, update todo statistics after insert and toggle. + "Non-nil means update todo statistics after insert and toggle. ALL-HEADLINES means update todo statistics by including headlines with no TODO keyword as well, counting them as not done. A list of TODO keywords means the same, but skip keywords that are @@ -1835,7 +1878,7 @@ (other :tag "No TODO statistics" nil))) (defcustom org-hierarchical-todo-statistics t - "Non-nil means, TODO statistics covers just direct children. + "Non-nil means TODO statistics covers just direct children. When nil, all entries in the subtree are considered. This has only an effect if `org-provide-todo-statistics' is set. To set this to nil for only a single subtree, use a COOKIE_DATA @@ -1880,7 +1923,7 @@ :to new state, like in :from") (defcustom org-enforce-todo-dependencies nil - "Non-nil means, undone TODO entries will block switching the parent to DONE. + "Non-nil means undone TODO entries will block switching the parent to DONE. Also, if a parent has an :ORDERED: property, switching an entry to DONE will be blocked if any prior sibling is not yet done. Finally, if the parent is blocked because of ordered siblings of its own, @@ -1899,7 +1942,7 @@ :type 'boolean) (defcustom org-enforce-todo-checkbox-dependencies nil - "Non-nil means, unchecked boxes will block switching the parent to DONE. + "Non-nil means unchecked boxes will block switching the parent to DONE. When this is nil, checkboxes have no influence on switching TODO states. When non-nil, you first need to check off all check boxes before the TODO entry can be switched to DONE. @@ -1917,7 +1960,7 @@ :type 'boolean) (defcustom org-treat-insert-todo-heading-as-state-change nil - "Non-nil means, inserting a TODO heading is treated as state change. + "Non-nil means inserting a TODO heading is treated as state change. So when the command \\[org-insert-todo-heading] is used, state change logging will apply if appropriate. When nil, the new TODO item will be inserted directly, and no logging will take place." @@ -1925,7 +1968,7 @@ :type 'boolean) (defcustom org-treat-S-cursor-todo-selection-as-state-change t - "Non-nil means, switching TODO states with S-cursor counts as state change. + "Non-nil means switching TODO states with S-cursor counts as state change. This is the default behavior. However, setting this to nil allows a convenient way to select a TODO state and bypass any logging associated with that." @@ -2029,7 +2072,7 @@ (const :tag "Record timestamp with note." note))) (defcustom org-log-note-clock-out nil - "Non-nil means, record a note when clocking out of an item. + "Non-nil means record a note when clocking out of an item. This can also be configured on a per-file basis by adding one of the following lines anywhere in the buffer: @@ -2040,7 +2083,7 @@ :type 'boolean) (defcustom org-log-done-with-time t - "Non-nil means, the CLOSED time stamp will contain date and time. + "Non-nil means the CLOSED time stamp will contain date and time. When nil, only the date will be recorded." :group 'org-progress :type 'boolean) @@ -2050,7 +2093,10 @@ (state . "State %-12s from %-12S %t") (note . "Note taken on %t") (reschedule . "Rescheduled from %S on %t") + (delschedule . "Not scheduled, was %S on %t") (redeadline . "New deadline from %S on %t") + (deldeadline . "Removed deadline, was %S on %t") + (refile . "Refiled on %t") (clock-out . "")) "Headings for notes added to entries. The value is an alist, with the car being a symbol indicating the note @@ -2060,7 +2106,10 @@ %s will be replaced by the new TODO state, in double quotes. %S will be replaced by the old TODO state, in double quotes. %u will be replaced by the user name. -%U will be replaced by the full user name." +%U will be replaced by the full user name. + +In fact, it is not a good idea to change the `state' entry, because +agenda log mode depends on the format of these entries." :group 'org-todo :group 'org-progress :type '(list :greedy t @@ -2070,14 +2119,17 @@ state) string) (cons (const :tag "Heading when just taking a note" note) string) (cons (const :tag "Heading when clocking out" clock-out) string) + (cons (const :tag "Heading when an item is no longer scheduled" delschedule) string) (cons (const :tag "Heading when rescheduling" reschedule) string) - (cons (const :tag "Heading when changing deadline" redeadline) string))) + (cons (const :tag "Heading when changing deadline" redeadline) string) + (cons (const :tag "Heading when deleting a deadline" deldeadline) string) + (cons (const :tag "Heading when refiling" refile) string))) (unless (assq 'note org-log-note-headings) (push '(note . "%t") org-log-note-headings)) (defcustom org-log-into-drawer nil - "Non-nil means, insert state change notes and time stamps into a drawer. + "Non-nil means insert state change notes and time stamps into a drawer. When nil, state changes notes will be inserted after the headline and any scheduling and clock lines, but not inside a drawer. @@ -2113,7 +2165,7 @@ (t p)))) (defcustom org-log-state-notes-insert-after-drawers nil - "Non-nil means, insert state change notes after any drawers in entry. + "Non-nil means insert state change notes after any drawers in entry. Only the drawers that *immediately* follow the headline and the deadline/scheduled line are skipped. When nil, insert notes right after the heading and perhaps the line @@ -2126,14 +2178,14 @@ :type 'boolean) (defcustom org-log-states-order-reversed t - "Non-nil means, the latest state change note will be directly after heading. -When nil, the notes will be orderer according to time." + "Non-nil means the latest state note will be directly after heading. +When nil, the state change notes will be ordered according to time." :group 'org-todo :group 'org-progress :type 'boolean) (defcustom org-log-repeat 'time - "Non-nil means, record moving through the DONE state when triggering repeat. + "Non-nil means record moving through the DONE state when triggering repeat. An auto-repeating task is immediately switched back to TODO when marked DONE. If you are not logging state changes (by adding \"@\" or \"!\" to the TODO keyword definition), or set `org-log-done' to @@ -2166,7 +2218,7 @@ :group 'org-todo) (defcustom org-enable-priority-commands t - "Non-nil means, priority commands are active. + "Non-nil means priority commands are active. When nil, these commands will be disabled, so that you never accidentally set a priority." :group 'org-priorities @@ -2191,7 +2243,7 @@ :type 'character) (defcustom org-priority-start-cycle-with-default t - "Non-nil means, start with default priority when starting to cycle. + "Non-nil means start with default priority when starting to cycle. When this is nil, the first step in the cycle will be (depending on the command used) one higher or lower that the default priority." :group 'org-priorities @@ -2203,7 +2255,7 @@ :group 'org) (defcustom org-insert-labeled-timestamps-at-point nil - "Non-nil means, SCHEDULED and DEADLINE timestamps are inserted at point. + "Non-nil means SCHEDULED and DEADLINE timestamps are inserted at point. When nil, these labeled time stamps are forces into the second line of an entry, just after the headline. When scheduling from the global TODO list, the time stamp will always be forced into the second line." @@ -2244,7 +2296,7 @@ org-time-stamp-rounding-minutes))) (defcustom org-display-custom-times nil - "Non-nil means, overlay custom formats over all time stamps. + "Non-nil means overlay custom formats over all time stamps. The formats are defined through the variable `org-time-stamp-custom-formats'. To turn this on on a per-file basis, insert anywhere in the file: #+STARTUP: customtime" @@ -2301,7 +2353,7 @@ :type 'integer) (defcustom org-read-date-prefer-future t - "Non-nil means, assume future for incomplete date input from user. + "Non-nil means assume future for incomplete date input from user. This affects the following situations: 1. The user gives a month but not a year. For example, if it is april and you enter \"feb 2\", this will be read @@ -2328,13 +2380,13 @@ (const :tag "Check month, day, and time" time))) (defcustom org-read-date-display-live t - "Non-nil means, display current interpretation of date prompt live. + "Non-nil means display current interpretation of date prompt live. This display will be in an overlay, in the minibuffer." :group 'org-time :type 'boolean) (defcustom org-read-date-popup-calendar t - "Non-nil means, pop up a calendar when prompting for a date. + "Non-nil means pop up a calendar when prompting for a date. In the calendar, the date can be selected with mouse-1. However, the minibuffer will also be active, and you can simply enter the date as well. When nil, only the minibuffer will be available." @@ -2367,13 +2419,13 @@ :type 'integer) (defcustom org-edit-timestamp-down-means-later nil - "Non-nil means, S-down will increase the time in a time stamp. + "Non-nil means S-down will increase the time in a time stamp. When nil, S-up will increase." :group 'org-time :type 'boolean) (defcustom org-calendar-follow-timestamp-change t - "Non-nil means, make the calendar window follow timestamp changes. + "Non-nil means make the calendar window follow timestamp changes. When a timestamp is modified and the calendar window is visible, it will be moved to the new date." :group 'org-time @@ -2425,6 +2477,20 @@ (const :tag "End radio group" (:endgroup)) (const :tag "New line" (:newline))))) +(defcustom org-complete-tags-always-offer-all-agenda-tags nil + "If non-nil, always offer completion for all tags of all agenda files. +Instead of customizing this variable directly, you might want to +set it locally for remember buffers, because there no list of +tags in that file can be created dynamically (there are none). + + (add-hook 'org-remember-mode-hook + (lambda () + (set (make-local-variable + 'org-complete-tags-always-offer-all-agenda-tags) + t)))" + :group 'org-tags + :type 'boolean) + (defvar org-file-tags nil "List of tags that can be inherited by all entries in the file. The tags will be inherited if the variable `org-use-tag-inheritance' @@ -2432,7 +2498,7 @@ This variable is populated from #+FILETAGS lines.") (defcustom org-use-fast-tag-selection 'auto - "Non-nil means, use fast tag selection scheme. + "Non-nil means use fast tag selection scheme. This is a special interface to select and deselect tags with single keys. When nil, fast selection is never used. When the symbol `auto', fast selection is used if and only if selection @@ -2447,7 +2513,7 @@ (const :tag "When selection characters are configured" 'auto))) (defcustom org-fast-tag-selection-single-key nil - "Non-nil means, fast tag selection exits after first change. + "Non-nil means fast tag selection exits after first change. When nil, you have to press RET to exit it. During fast tag selection, you can toggle this flag with `C-c'. This variable can also have the value `expert'. In this case, the window @@ -2459,7 +2525,7 @@ (const :tag "Expert" expert))) (defvar org-fast-tag-selection-include-todo nil - "Non-nil means, fast tags selection interface will also offer TODO states. + "Non-nil means fast tags selection interface will also offer TODO states. This is an undocumented feature, you should not rely on it.") (defcustom org-tags-column (if (featurep 'xemacs) -76 -77) @@ -2471,7 +2537,7 @@ :type 'integer) (defcustom org-auto-align-tags t - "Non-nil means, realign tags after pro/demotion of TODO state change. + "Non-nil means realign tags after pro/demotion of TODO state change. These operations change the length of a headline and therefore shift the tags around. With this options turned on, after each such operation the tags are again aligned to `org-tags-column'." @@ -2479,7 +2545,7 @@ :type 'boolean) (defcustom org-use-tag-inheritance t - "Non-nil means, tags in levels apply also for sublevels. + "Non-nil means tags in levels apply also for sublevels. When nil, only the tags directly given in a specific line apply there. This may also be a list of tags that should be inherited, or a regexp that matches tags that should be inherited. Additional control is possible @@ -2570,7 +2636,7 @@ :type 'string) (defcustom org-use-property-inheritance nil - "Non-nil means, properties apply also for sublevels. + "Non-nil means properties apply also for sublevels. This setting is chiefly used during property searches. Turning it on can cause significant overhead when doing a search, which is why it is not @@ -2714,7 +2780,9 @@ If the value of the variable is not a list but a single file name, then the list of agenda files is actually stored and maintained in that file, one -agenda file per line." +agenda file per line. In this file paths can be given relative to +`org-directory'. Tilde expansion and environment variable substitution +are also made." :group 'org-agenda :type '(choice (repeat :tag "List of files and directories" file) @@ -2832,13 +2900,19 @@ :group 'org-latex :type 'plist) +(defcustom org-format-latex-signal-error t + "Non-nil means signal an error when image creation of LaTeX snippets fails. +When nil, just push out a message." + :group 'org-latex + :type 'boolean) + (defcustom org-format-latex-header "\\documentclass{article} -\\usepackage{amssymb} \\usepackage[usenames]{color} \\usepackage{amsmath} -\\usepackage{latexsym} \\usepackage[mathscr]{eucal} \\pagestyle{empty} % do not remove +\[PACKAGES] +\[DEFAULT-PACKAGES] % The settings below are copied from fullpage.sty \\setlength{\\textwidth}{\\paperwidth} \\addtolength{\\textwidth}{-3cm} @@ -2854,25 +2928,83 @@ \\addtolength{\\topmargin}{-2.54cm}" "The document header used for processing LaTeX fragments. It is imperative that this header make sure that no page number -appears on the page." +appears on the page. The package defined in the variables +`org-export-latex-default-packages-alist' and `org-export-latex-packages-alist' +will either replace the placeholder \"[PACKAGES]\" in this header, or they +will be appended." :group 'org-latex :type 'string) -;; The following variable is defined here because is it also used +(defvar org-format-latex-header-extra nil) + +;; The following variables are defined here because is it also used ;; when formatting latex fragments. Originally it was part of the ;; LaTeX exporter, which is why the name includes "export". -(defcustom org-export-latex-packages-alist nil - "Alist of packages to be inserted in the header. -Each cell is of the format $ \"option\" . \"package\" $." +(defcustom org-export-latex-default-packages-alist + '(("AUTO" "inputenc") + ("T1" "fontenc") + ("" "fixltx2e") + ("" "graphicx") + ("" "longtable") + ("" "float") + ("" "wrapfig") + ("" "soul") + ("" "t1enc") + ("" "textcomp") + ("" "marvosym") + ("" "wasysym") + ("" "latexsym") + ("" "amssymb") + ("" "hyperref") + "\\tolerance=1000" + ) + "Alist of default packages to be inserted in the header. +Change this only if one of the packages here causes an incompatibility +with another package you are using. +The packages in this list are needed by one part or another of Org-mode +to function properly. + +- inputenc, fontenc, t1enc: for basic font and character selection +- textcomp, marvosymb, wasysym, latexsym, amssym: for various symbols used + for interpreting the entities in `org-entities'. You can skip some of these + packages if you don't use any of the symbols in it. +- graphicx: for including images +- float, wrapfig: for figure placement +- longtable: for long tables +- hyperref: for cross references + +Therefore you should not modify this variable unless you know what you +are doing. The one reason to change it anyway is that you might be loading +some other package that conflicts with one of the default packages. +Each cell is of the format $ \"options\" \"package\" $." :group 'org-export-latex :type '(repeat - (list - (string :tag "option") - (string :tag "package")))) - -(defgroup org-font-lock nil - "Font-lock settings for highlighting in Org-mode." - :tag "Org Font Lock" + (choice + (string :tag "A line of LaTeX") + (list :tag "options/package pair" + (string :tag "options") + (string :tag "package"))))) + +(defcustom org-export-latex-packages-alist nil + "Alist of packages to be inserted in every LaTeX the header. +These will be inserted after `org-export-latex-default-packages-alist'. +Each cell is of the format $ \"options\" \"package\" $. +Make sure that you only lis packages here which: +- you want in every file +- do not conflict with the default packages in + `org-export-latex-default-packages-alist' +- do not conflict with the setup in `org-format-latex-header'." + :group 'org-export-latex + :type '(repeat + (choice + (string :tag "A line of LaTeX") + (list :tag "options/package pair" + (string :tag "options") + (string :tag "package"))))) + +(defgroup org-appearance nil + "Settings for Org-mode appearance." + :tag "Org Appearance" :group 'org) (defcustom org-level-color-stars-only nil @@ -2880,11 +3012,11 @@ When nil, the entire headline is fontified. Changing it requires restart of `font-lock-mode' to become effective also in regions already fontified." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-hide-leading-stars nil - "Non-nil means, hide the first N-1 stars in a headline. + "Non-nil means hide the first N-1 stars in a headline. This works by using the face `org-hide' for these stars. This face is white for a light background, and black for a dark background. You may have to customize the face `org-hide' to @@ -2896,38 +3028,49 @@ #+STARTUP: hidestars #+STARTUP: showstars" - :group 'org-font-lock - :type 'boolean) + :group 'org-appearance + :type 'boolean) + +(defcustom org-hidden-keywords nil + "List of keywords that should be hidden when typed in the org buffer. +For example, add #+TITLE to this list in order to make the +document title appear in the buffer without the initial #+TITLE: +keyword." + :group 'org-appearance + :type '(set (const :tag "#+AUTHOR" author) + (const :tag "#+DATE" date) + (const :tag "#+EMAIL" email) + (const :tag "#+TITLE" title))) (defcustom org-fontify-done-headline nil - "Non-nil means, change the face of a headline if it is marked DONE. + "Non-nil means change the face of a headline if it is marked DONE. Normally, only the TODO/DONE keyword indicates the state of a headline. When this is non-nil, the headline after the keyword is set to the `org-headline-done' as an additional indication." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-fontify-emphasized-text t "Non-nil means fontify *bold*, /italic/ and _underlined_ text. Changing this variable requires a restart of Emacs to take effect." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-fontify-whole-heading-line nil "Non-nil means fontify the whole line for headings. This is useful when setting a background color for the org-level-* faces." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defcustom org-highlight-latex-fragments-and-specials nil - "Non-nil means, fontify what is treated specially by the exporters." - :group 'org-font-lock + "Non-nil means fontify what is treated specially by the exporters." + :group 'org-appearance :type 'boolean) (defcustom org-hide-emphasis-markers nil "Non-nil mean font-lock should hide the emphasis marker characters." - :group 'org-font-lock + :group 'org-appearance :type 'boolean) (defvar org-emph-re nil @@ -3008,7 +3151,7 @@ newline The maximum number of newlines allowed in an emphasis exp. Use customize to modify this, or restart Emacs after changing it." - :group 'org-font-lock + :group 'org-appearance :set 'org-set-emph-re :type '(list (sexp :tag "Allowed chars in pre ") @@ -3034,7 +3177,7 @@ Emacs buffers, and the HTML tags to be used for this. For LaTeX export, see the variable `org-export-latex-emphasis-alist'. Use customize to modify this, or restart Emacs after changing it." - :group 'org-font-lock + :group 'org-appearance :set 'org-set-emph-re :type '(repeat (list @@ -3059,7 +3202,7 @@ :group 'org) (defcustom org-completion-use-ido nil - "Non-nil means, use ido completion wherever possible. + "Non-nil means use ido completion wherever possible. Note that `ido-mode' must be active for this variable to be relevant. If you decide to turn this variable on, you might well want to turn off `org-outline-path-complete-in-steps'. @@ -3068,7 +3211,7 @@ :type 'boolean) (defcustom org-completion-use-iswitchb nil - "Non-nil means, use iswitchb completion wherever possible. + "Non-nil means use iswitchb completion wherever possible. Note that `iswitchb-mode' must be active for this variable to be relevant. If you decide to turn this variable on, you might well want to turn off `org-outline-path-complete-in-steps'. @@ -3078,7 +3221,7 @@ (defcustom org-completion-fallback-command 'hippie-expand "The expansion command called by \\[org-complete] in normal context. -Normal means, no org-mode-specific context." +Normal means no org-mode-specific context." :group 'org-completion :type 'function) @@ -3267,16 +3410,27 @@ '(org-export-as-ascii org-export-ascii-preprocess org-export-as-ascii-to-buffer org-replace-region-by-ascii org-export-region-as-ascii)) + (org-autoload "org-latex" + '(org-export-as-latex-batch org-export-as-latex-to-buffer + org-replace-region-by-latex org-export-region-as-latex + org-export-as-latex org-export-as-pdf + org-export-as-pdf-and-open)) (org-autoload "org-html" '(org-export-as-html-and-open org-export-as-html-batch org-export-as-html-to-buffer org-replace-region-by-html org-export-region-as-html org-export-as-html)) + (org-autoload "org-docbook" + '(org-export-as-docbook-batch org-export-as-docbook-to-buffer + org-replace-region-by-docbook org-export-region-as-docbook + org-export-as-docbook-pdf org-export-as-docbook-pdf-and-open + org-export-as-docbook)) (org-autoload "org-icalendar" '(org-export-icalendar-this-file org-export-icalendar-all-agenda-files org-export-icalendar-combine-agenda-files)) - (org-autoload "org-xoxo" '(org-export-as-xoxo))) + (org-autoload "org-xoxo" '(org-export-as-xoxo)) + (org-autoload "org-beamer" '(org-beamer-mode org-beamer-sectioning))) ;; Declare and autoload functions from org-agenda.el @@ -3487,7 +3641,7 @@ :type 'string) (defcustom org-agenda-skip-archived-trees t - "Non-nil means, the agenda will skip any items located in archived trees. + "Non-nil means the agenda will skip any items located in archived trees. An archived tree is a tree marked with the tag ARCHIVE. The use of this variable is no longer recommended, you should leave it at the value t. Instead, use the key `v' to cycle the archives-mode in the agenda." @@ -3496,13 +3650,13 @@ :type 'boolean) (defcustom org-columns-skip-archived-trees t - "Non-nil means, ignore archived trees when creating column view." + "Non-nil means ignore archived trees when creating column view." :group 'org-archive :group 'org-properties :type 'boolean) (defcustom org-cycle-open-archived-trees nil - "Non-nil means, `org-cycle' will open archived trees. + "Non-nil means `org-cycle' will open archived trees. An archived tree is a tree marked with the tag ARCHIVE. When nil, archived trees will stay folded. You can still open them with normal outline commands like `show-all', but not with the cycling commands." @@ -3545,8 +3699,9 @@ (let* ((re (concat ":" org-archive-tag ":"))) (goto-char beg) (while (re-search-forward re end t) - (and (org-on-heading-p) (org-flag-subtree t)) - (org-end-of-subtree t))))) + (when (org-on-heading-p) + (org-flag-subtree t) + (org-end-of-subtree t)))))) (defun org-flag-subtree (flag) (save-excursion @@ -3664,6 +3819,9 @@ (defvar org-planning-or-clock-line-re nil "Matches a line with planning or clock info.") (make-variable-buffer-local 'org-planning-or-clock-line-re) +(defvar org-all-time-keywords nil + "List of time keywords.") +(make-variable-buffer-local 'org-all-time-keywords) (defconst org-plain-time-of-day-regexp (concat @@ -3735,6 +3893,9 @@ ("logredeadline" org-log-redeadline time) ("lognoteredeadline" org-log-redeadline note) ("nologredeadline" org-log-redeadline nil) + ("logrefile" org-log-refile time) + ("lognoterefile" org-log-refile note) + ("nologrefile" org-log-refile nil) ("fninline" org-footnote-define-inline t) ("nofninline" org-footnote-define-inline nil) ("fnlocal" org-footnote-section nil) @@ -3748,7 +3909,8 @@ ("constSI" constants-unit-system SI) ("noptag" org-tag-persistent-alist nil) ("hideblocks" org-hide-block-startup t) - ("nohideblocks" org-hide-block-startup nil)) + ("nohideblocks" org-hide-block-startup nil) + ("beamer" org-startup-with-beamer-mode t)) "Variable associated with STARTUP options for org-mode. Each element is a list of three items: The startup options as written in the #+STARTUP line, the corresponding variable, and the value to @@ -3771,11 +3933,11 @@ (let ((re (org-make-options-regexp '("CATEGORY" "TODO" "COLUMNS" "STARTUP" "ARCHIVE" "FILETAGS" "TAGS" "LINK" "PRIORITIES" - "CONSTANTS" "PROPERTY" "DRAWERS" "SETUPFILE") + "CONSTANTS" "PROPERTY" "DRAWERS" "SETUPFILE" "LATEX_CLASS") "\$?:[a-zA-Z][0-9a-zA-Z_]*_TODO\$")) (splitre "[ \t]+") kwds kws0 kwsa key log value cat arch tags const links hw dws - tail sep kws1 prio props ftags drawers + tail sep kws1 prio props ftags drawers beamer-p ext-setup-or-nil setup-contents (start 0)) (save-excursion (save-restriction @@ -3846,6 +4008,8 @@ (setq arch (replace-match "" t t value)) (remove-text-properties 0 (length arch) '(face t fontified t) arch)) + ((equal key "LATEX_CLASS") + (setq beamer-p (equal value "beamer"))) ((equal key "SETUPFILE") (setq setup-contents (org-file-contents (expand-file-name @@ -4033,6 +4197,10 @@ "\\|" org-deadline-string "\\|" org-closed-string "\\|" org-clock-string "\\)\\>\\)") + org-all-time-keywords + (mapcar (lambda (w) (substring w 0 -1)) + (list org-scheduled-string org-deadline-string + org-clock-string org-closed-string)) ) (org-compute-latex-and-specials-regexp) (org-set-font-lock-defaults)))) @@ -4073,30 +4241,24 @@ x)) list)) -;; FIXME: this could be done much better, using second characters etc. (defun org-assign-fast-keys (alist) "Assign fast keys to a keyword-key alist. Respect keys that are already there." - (let (new e k c c1 c2 (char ?a)) + (let (new e (alt ?0)) (while (setq e (pop alist)) - (cond - ((equal e '(:startgroup)) (push e new)) - ((equal e '(:endgroup)) (push e new)) - ((equal e '(:newline)) (push e new)) - (t - (setq k (car e) c2 nil) - (if (cdr e) - (setq c (cdr e)) - ;; automatically assign a character. - (setq c1 (string-to-char - (downcase (substring - k (if (= (string-to-char k) ?@) 1 0))))) - (if (or (rassoc c1 new) (rassoc c1 alist)) - (while (or (rassoc char new) (rassoc char alist)) - (setq char (1+ char))) - (setq c2 c1)) - (setq c (or c2 char))) - (push (cons k c) new)))) + (if (or (memq (car e) '(:newline :endgroup :startgroup)) + (cdr e)) ;; Key already assigned. + (push e new) + (let ((clist (string-to-list (downcase (car e)))) + (used (append new alist))) + (when (= (car clist) ?@) + (pop clist)) + (while (and clist (rassoc (car clist) used)) + (pop clist)) + (unless clist + (while (rassoc alt used) + (incf alt))) + (push (cons (car e) (or (car clist) alt)) new)))) (nreverse new))) ;;; Some variables used in various places @@ -4117,7 +4279,7 @@ (defvar date) ;; Defined somewhere in this file, but used before definition. -(defvar org-html-entities) +(defvar org-entities) ;; defined in org-entities.el (defvar org-struct-menu) (defvar org-org-menu) (defvar org-tbl-menu) @@ -4139,6 +4301,7 @@ (setq org-table-may-need-update t)) (defvar org-mode-map) (defvar org-inhibit-startup nil) ; Dynamically-scoped param. +(defvar org-inhibit-startup-visibility-stuff nil) ; Dynamically-scoped param. (defvar org-agenda-keep-modes nil) ; Dynamically-scoped param. (defvar org-inhibit-logging nil) ; Dynamically-scoped param. (defvar org-inhibit-blocking nil) ; Dynamically-scoped param. @@ -4260,12 +4423,14 @@ (org-set-local 'outline-isearch-open-invisible-function (lambda (&rest ignore) (org-show-context 'isearch)))) + ;; Turn on org-beamer-mode? + (and org-startup-with-beamer-mode (org-beamer-mode 1)) + ;; If empty file that did not turn on org-mode automatically, make it to. (if (and org-insert-mode-line-in-empty-file (interactive-p) (= (point-min) (point-max))) (insert "# -*- mode: org -*-\n\n")) - (unless org-inhibit-startup (when org-startup-align-all-tables (let ((bmp (buffer-modified-p))) @@ -4274,7 +4439,8 @@ (when org-startup-indented (require 'org-indent) (org-indent-mode 1)) - (org-set-startup-visibility))) + (unless org-inhibit-startup-visibility-stuff + (org-set-startup-visibility)))) (when (fboundp 'abbrev-table-put) (abbrev-table-put org-mode-abbrev-table @@ -4342,40 +4508,41 @@ This should be called after the variable `org-link-types' has changed." (setq org-link-types-re (concat - "\\`\$" (mapconcat 'identity org-link-types "\\|") "\$:") + "\\`\$" (mapconcat 'regexp-quote org-link-types "\\|") "\$:") org-link-re-with-space (concat - "?") org-link-re-with-space2 (concat - "?") org-link-re-with-space3 (concat - "") org-plain-link-re (concat - "\\<\$" (mapconcat 'identity org-link-types "\\|") "\$:" - "\$[^]\t\n\r<>() ]+[^]\t\n\r<>,.;() ]\$") + "\\<\$" (mapconcat 'regexp-quote org-link-types "\\|") "\$:" + (org-re "\$[^ \t\n()<>]+\\(?:([[:word:]0-9]+)\\|\\([^[:punct:] \t\n]\\|/\$\\)\\)")) + ;; "\$[^]\t\n\r<>() ]+[^]\t\n\r<>,.;() ]\$") org-bracket-link-regexp "\\[\\[\$[^][]+\$\\]\$\\[\\([^][]+\$\\]\\)?\\]" org-bracket-link-analytic-regexp (concat "\\[\\[" - "\$\\(" (mapconcat 'identity org-link-types "\\|") "\$:\\)?" + "\$\\(" (mapconcat 'regexp-quote org-link-types "\\|") "\$:\\)?" "\$[^]]+\$" "\\]" "\$\\[" "\\([^]]+\$" "\\]\\)?" @@ -4383,7 +4550,7 @@ org-bracket-link-analytic-regexp++ (concat "\\[\\[" - "\$\\(" (mapconcat 'identity (cons "coderef" org-link-types) "\\|") "\$:\\)?" + "\$\\(" (mapconcat 'regexp-quote (cons "coderef" org-link-types) "\\|") "\$:\\)?" "\$[^]]+\$" "\\]" "\$\\[" "\\([^]]+\$" "\\]\\)?" @@ -4495,8 +4662,9 @@ (string-match (concat "[" (nth 0 erc) "\n]") (char-to-string (char-before (point))))) (insert " ")) - (unless (string-match (concat "[" (nth 1 erc) "\n]") - (char-to-string (char-after (point)))) + (unless (or (eobp) + (string-match (concat "[" (nth 1 erc) "\n]") + (char-to-string (char-after (point))))) (insert " ") (backward-char 1)) (insert string) (and move (backward-char 1)))) @@ -4574,11 +4742,23 @@ (cond (quoting (add-text-properties beg1 end1 '(face org-block))) + ((not org-fontify-quote-and-verse-blocks)) ((string= block-type "quote") (add-text-properties beg1 end1 '(face org-quote))) ((string= block-type "verse") (add-text-properties beg1 end1 '(face org-verse)))) t)) + ((member dc1 '("title:" "author:" "email:" "date:")) + (add-text-properties + beg (match-end 3) + (if (member (intern (substring dc1 0 -1)) org-hidden-keywords) + '(font-lock-fontified t invisible t) + '(font-lock-fontified t face org-document-info-keyword))) + (add-text-properties + (match-beginning 6) (match-end 6) + (if (string-equal dc1 "title:") + '(font-lock-fontified t face org-document-title) + '(font-lock-fontified t face org-document-info)))) ((not (member (char-after beg) '(?\ ?\t))) ;; just any other in-buffer setting, but not indented (add-text-properties @@ -4742,6 +4922,7 @@ ((matchers (plist-get org-format-latex-options :matchers)) (latexs (delq nil (mapcar (lambda (x) (if (member (car x) matchers) x)) org-latex-regexps))) + (org-export-allow-BIND nil) (options (org-combine-plists (org-default-export-plist) (org-infile-export-plist))) (org-export-with-sub-superscripts (plist-get options :sub-superscript)) @@ -4763,7 +4944,8 @@ (if org-export-with-TeX-macros (list (concat "\\\\" (regexp-opt - (append (mapcar 'car org-html-entities) + (append (mapcar 'car (append org-entities-user + org-entities)) (if (boundp 'org-latex-entities) (mapcar (lambda (x) (or (car-safe x) x)) @@ -4842,7 +5024,7 @@ (defun org-activate-tags (limit) (if (re-search-forward (org-re "^\\*+.*[ \t]\$:[[:alnum:]_@:]+:\$[ \r\n]") limit t) (progn - (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) + (org-remove-flyspell-overlays-in (match-beginning 1) (match-end 1)) (add-text-properties (match-beginning 1) (match-end 1) (list 'mouse-face 'highlight 'keymap org-mouse-map)) @@ -4995,10 +5177,20 @@ "Get the right face for a TODO keyword KWD. If KWD is a number, get the corresponding match group." (if (numberp kwd) (setq kwd (match-string kwd))) - (or (cdr (assoc kwd org-todo-keyword-faces)) + (or (org-face-from-face-or-color + 'todo 'org-todo (cdr (assoc kwd org-todo-keyword-faces))) (and (member kwd org-done-keywords) 'org-done) 'org-todo)) +(defun org-face-from-face-or-color (context inherit face-or-color) + "Create a face list that inherits INHERIT, but sets the foreground color. +When FACE-OR-COLOR is not a string, just return it." + (if (stringp face-or-color) + (list :inherit inherit + (cdr (assoc context org-faces-easy-properties)) + face-or-color) + face-or-color)) + (defun org-font-lock-add-tag-faces (limit) "Add the special tag faces." (when (and org-tag-faces org-tags-special-faces-re) @@ -5013,8 +5205,10 @@ (while (re-search-forward "\\[#\$[A-Z0-9]\$\\]" limit t) (add-text-properties (match-beginning 0) (match-end 0) - (list 'face (or (cdr (assoc (char-after (match-beginning 1)) - org-priority-faces)) + (list 'face (or (org-face-from-face-or-color + 'priority 'org-special-keyword + (cdr (assoc (char-after (match-beginning 1)) + org-priority-faces))) 'org-special-keyword) 'font-lock-fontified t)))) @@ -5022,7 +5216,8 @@ "Get the right face for a TODO keyword KWD. If KWD is a number, get the corresponding match group." (if (numberp kwd) (setq kwd (match-string kwd))) - (or (cdr (assoc kwd org-tag-faces)) + (or (org-face-from-face-or-color + 'tag 'org-tag (cdr (assoc kwd org-tag-faces))) 'org-tag)) (defun org-unfontify-region (beg end &optional maybe_loudly) @@ -5086,6 +5281,12 @@ 3. SUBTREE: Show the entire subtree, including body text. If there is no subtree, switch directly from CHILDREN to FOLDED. +- When point is at the beginning of an empty headline and the variable + `org-cycle-level-after-item/entry-creation' is set, cycle the level + of the headline by demoting and promoting it to likely levels. This + speeds up creation document structure by presing TAB once or several + times right after creating a new headline. + - When there is a numeric prefix, go up to a heading with level ARG, do a `show-subtree' and return to the previous cursor position. If ARG is negative, go up that many levels. @@ -5146,11 +5347,11 @@ ((org-at-table-p 'any) ;; Enter the table or move to the next field in the table - (or (org-table-recognize-table.el) - (progn - (if arg (org-table-edit-field t) - (org-table-justify-field-maybe) - (call-interactively 'org-table-next-field))))) + (if (org-at-table.el-p) + (message "Use C-c ' to edit table.el tables") + (if arg (org-table-edit-field t) + (org-table-justify-field-maybe) + (call-interactively 'org-table-next-field)))) ((run-hook-with-args-until-success 'org-tab-after-check-for-table-hook)) @@ -5466,7 +5667,9 @@ ;; Properly fold already folded siblings (goto-char (point-min)) (while (re-search-forward re nil t) - (if (save-excursion (goto-char (point-at-eol)) (org-invisible-p)) + (if (and (not (org-invisible-p)) + (save-excursion + (goto-char (point-at-eol)) (org-invisible-p))) (hide-entry)))) (org-cycle-show-empty-lines 'overview) (org-cycle-hide-drawers 'overview))))) @@ -5580,12 +5783,68 @@ (defun org-first-headline-recenter (&optional N) "Move cursor to the first headline and recenter the headline. -Optional argument N means, put the headline into the Nth line of the window." +Optional argument N means put the headline into the Nth line of the window." (goto-char (point-min)) (when (re-search-forward (concat "^\$" outline-regexp "\$") nil t) (beginning-of-line) (recenter (prefix-numeric-value N)))) +;;; Saving and restoring visibility + +(defun org-outline-overlay-data (&optional use-markers) + "Return a list of the locations of all outline overlays. +The are overlays with the `invisible' property value `outline'. +The return valus is a list of cons cells, with start and stop +positions for each overlay. +If USE-MARKERS is set, return the positions as markers." + (let (beg end) + (save-excursion + (save-restriction + (widen) + (delq nil + (mapcar (lambda (o) + (when (eq (org-overlay-get o 'invisible) 'outline) + (setq beg (org-overlay-start o) + end (org-overlay-end o)) + (and beg end (> end beg) + (if use-markers + (cons (move-marker (make-marker) beg) + (move-marker (make-marker) end)) + (cons beg end))))) + (org-overlays-in (point-min) (point-max)))))))) + +(defun org-set-outline-overlay-data (data) + "Create visibility overlays for all positions in DATA. +DATA should have been made by `org-outline-overlay-data'." + (let (o) + (save-excursion + (save-restriction + (widen) + (show-all) + (mapc (lambda (c) + (setq o (org-make-overlay (car c) (cdr c))) + (org-overlay-put o 'invisible 'outline)) + data))))) + +(defmacro org-save-outline-visibility (use-markers &rest body) + "Save and restore outline visibility around BODY. +If USE-MARKERS is non-nil, use markers for the positions. +This means that the buffer may change while running BODY, +but it also means that the buffer should stay alive +during the operation, because otherwise all these markers will +point nowhere." + `(let ((data (org-outline-overlay-data ,use-markers))) + (unwind-protect + (progn + ,@body + (org-set-outline-overlay-data data)) + (when ,use-markers + (mapc (lambda (c) + (and (markerp (car c)) (move-marker (car c) nil)) + (and (markerp (cdr c)) (move-marker (cdr c) nil))) + data))))) + + ;;; Folding of blocks (defconst org-block-regexp @@ -5776,7 +6035,11 @@ (isearch-hide-immediately nil) (isearch-search-fun-function (lambda () 'org-goto-local-search-headings)) - (org-goto-selected-point org-goto-exit-command)) + (org-goto-selected-point org-goto-exit-command) + (pop-up-frames nil) + (special-display-buffer-names nil) + (special-display-regexps nil) + (special-display-function nil)) (save-excursion (save-window-excursion (delete-other-windows) @@ -5903,7 +6166,9 @@ (outline-up-heading 1 t))) (setq beg (point) heading (org-get-heading)) - (org-end-of-subtree t t) (setq end (point))) + (org-end-of-subtree t t) + (if (org-on-heading-p) (backward-char 1)) + (setq end (point))) (if (and (buffer-live-p org-last-indirect-buffer) (not (eq org-indirect-buffer-display 'new-frame)) (not arg)) @@ -5965,21 +6230,26 @@ (save-match-data (looking-at "[ \t]*$"))))) -(defun org-insert-heading (&optional force-heading) +(defun org-insert-heading (&optional force-heading invisible-ok) "Insert a new heading or item with same depth at point. If point is in a plain list and FORCE-HEADING is nil, create a new list item. If point is at the beginning of a headline, insert a sibling before the current headline. If point is not at the beginning, do not split the line, -but create the new headline after the current line." - (interactive "P") - (if (= (buffer-size) 0) +but create the new headline after the current line. +When INVISIBLE-OK is set, stop at invisible headlines when going back. +This is important for non-interactive uses of the command." + (interactive "P") + (if (or (= (buffer-size) 0) + (and (not (save-excursion (and (ignore-errors (org-back-to-heading invisible-ok)) + (org-on-heading-p)))) + (not (org-in-item-p)))) (insert "\n* ") (when (or force-heading (not (org-insert-item))) (let* ((empty-line-p nil) (head (save-excursion (condition-case nil (progn - (org-back-to-heading) + (org-back-to-heading invisible-ok) (setq empty-line-p (org-previous-line-empty-p)) (match-string 0)) (error "*")))) @@ -6032,6 +6302,9 @@ (setq pos (point-at-bol)) (or split (end-of-line 1)) (delete-horizontal-space) + (if (string-match "\\`\\*+\\'" + (buffer-substring (point-at-bol) (point))) + (insert " ")) (newline (if blank 2 1)) (when tags (save-excursion @@ -6073,7 +6346,7 @@ - the tags string, or nil." (save-excursion (org-back-to-heading t) - (if (looking-at org-complex-heading-regexp) + (if (let (case-fold-search) (looking-at org-complex-heading-regexp)) (list (length (match-string 1)) (org-reduced-level (length (match-string 1))) (org-match-string-no-properties 2) @@ -6226,11 +6499,30 @@ (funcall outline-level)) (error nil)))) +(defun org-get-previous-line-level () + "Return the outline depth of the last headline before the current line. +Returns 0 for the first headline in the buffer, and nil if before the +first headline." + (let ((current-level (org-current-level)) + (prev-level (when (> (line-number-at-pos) 1) + (save-excursion + (beginning-of-line 0) + (org-current-level))))) + (cond ((null current-level) nil) ; Before first headline + ((null prev-level) 0) ; At first headline + (prev-level)))) + (defun org-reduced-level (l) "Compute the effective level of a heading. This takes into account the setting of `org-odd-levels-only'." (if org-odd-levels-only (1+ (floor (/ l 2))) l)) +(defun org-level-increment () + "Return the number of stars that will be added or removed at a +time to headlines when structure editing, based on the value of +`org-odd-levels-only'." + (if org-odd-levels-only 2 1)) + (defun org-get-valid-level (level &optional change) "Rectify a level change under the influence of `org-odd-levels-only' LEVEL is a current level, CHANGE is by how much the level should be @@ -6278,30 +6570,41 @@ (if org-adapt-indentation (org-fixup-indentation diff)) (run-hooks 'org-after-demote-entry-hook))) -(defvar org-tab-ind-state nil) - (defun org-cycle-level () + "Cycle the level of an empty headline through possible states. +This goes first to child, then to parent, level, then up the hierarchy. +After top level, it switches back to sibling level." + (interactive) (let ((org-adapt-indentation nil)) - (when (and (looking-at "[ \t]*$") - (looking-back - (concat "^\$\\*+\$[ \t]+\$" org-todo-regexp "\$?[ \t]*"))) - (setq this-command 'org-cycle-level) - (if (eq last-command 'org-cycle-level) - (condition-case nil - (progn (org-do-promote) - (if (equal org-tab-ind-state (org-current-level)) - (org-do-promote))) - (error - (progn - (save-excursion - (beginning-of-line 1) - (and (looking-at "\\*+") - (replace-match - (make-string org-tab-ind-state ?*)))) - (setq this-command 'org-cycle)))) - (setq org-tab-ind-state (- (match-end 1) (match-beginning 1))) - (org-do-demote)) - t))) + (when (org-point-at-end-of-empty-headline) + (setq this-command 'org-cycle-level) ; Only needed for caching + (let ((cur-level (org-current-level)) + (prev-level (org-get-previous-line-level))) + (cond + ;; If first headline in file, promote to top-level. + ((= prev-level 0) + (loop repeat (/ (- cur-level 1) (org-level-increment)) + do (org-do-promote))) + ;; If same level as prev, demote one. + ((= prev-level cur-level) + (org-do-demote)) + ;; If parent is top-level, promote to top level if not already. + ((= prev-level 1) + (loop repeat (/ (- cur-level 1) (org-level-increment)) + do (org-do-promote))) + ;; If top-level, return to prev-level. + ((= cur-level 1) + (loop repeat (/ (- prev-level 1) (org-level-increment)) + do (org-do-demote))) + ;; If less than prev-level, promote one. + ((< cur-level prev-level) + (org-do-promote)) + ;; If deeper than prev-level, promote until higher than + ;; prev-level. + ((> cur-level prev-level) + (loop repeat (+ 1 (/ (- cur-level prev-level) (org-level-increment))) + do (org-do-promote)))) + t)))) (defun org-map-tree (fun) "Call FUN for every heading underneath the current one." @@ -6707,7 +7010,9 @@ (save-match-data (narrow-to-region (progn (org-back-to-heading t) (point)) - (progn (org-end-of-subtree t t) (point)))))) + (progn (org-end-of-subtree t t) + (if (org-on-heading-p) (backward-char 1)) + (point)))))) (defun org-clone-subtree-with-time-shift (n &optional shift) "Clone the task (subtree) at point N times. @@ -7540,11 +7845,14 @@ ((eq major-mode 'dired-mode) ;; link to the file in the current line - (setq cpltxt (concat "file:" - (abbreviate-file-name - (expand-file-name - (dired-get-filename nil t)))) - link (org-make-link cpltxt))) + (let ((file (dired-get-filename nil t))) + (setq file (if file + (abbreviate-file-name + (expand-file-name (dired-get-filename nil t))) + ;; otherwise, no file so use current directory. + default-directory)) + (setq cpltxt (concat "file:" file) + link (org-make-link cpltxt)))) ((and buffer-file-name (org-mode-p)) (setq custom-id (ignore-errors (org-entry-get nil "CUSTOM_ID"))) @@ -7755,7 +8063,7 @@ (?\371 . "%F9") ; `u (?\373 . "%FB") ; ^u (?\; . "%3B") - (?? . "%3F") +;; (?? . "%3F") (?= . "%3D") (?+ . "%2B") ) @@ -7771,7 +8079,7 @@ (defun org-link-escape (text &optional table) "Escape characters in TEXT that are problematic for links." - (if org-url-encoding-use-url-hexify + (if (and org-url-encoding-use-url-hexify (not table)) (url-hexify-string text) (setq table (or table org-link-escape-chars)) (when text @@ -7788,16 +8096,18 @@ (defun org-link-unescape (text &optional table) "Reverse the action of `org-link-escape'." - (if org-url-encoding-use-url-hexify + (if (and org-url-encoding-use-url-hexify (not table)) (url-unhex-string text) (setq table (or table org-link-escape-chars)) (when text - (let ((re (mapconcat (lambda (x) (regexp-quote (cdr x))) + (let ((case-fold-search t) + (re (mapconcat (lambda (x) (regexp-quote (downcase (cdr x)))) table "\\|"))) (while (string-match re text) (setq text (replace-match - (char-to-string (car (rassoc (match-string 0 text) table))) + (char-to-string (car (rassoc (upcase (match-string 0 text)) + table))) t t text))) text)))) @@ -7899,7 +8209,7 @@ (if (nth 1 x) (concat (car x) " (" (nth 1 x) ")") (car x))) (reverse org-stored-links) "\n")))) (let ((cw (selected-window))) - (select-window (get-buffer-window "*Org Links*")) + (select-window (get-buffer-window "*Org Links*" 'visible)) (setq truncate-lines t) (unless (pos-visible-in-window-p (point-max)) (org-fit-window-to-buffer)) @@ -7924,6 +8234,8 @@ nil nil nil 'tmphist (car (car org-stored-links))))) + (if (not (string-match "\\S-" link)) + (error "No link selected")) (if (or (member link all-prefixes) (and (equal ":" (substring link -1)) (member (substring link 0 -1) all-prefixes) @@ -7956,8 +8268,9 @@ (setq link search))))) ;; Check if we can/should use a relative path. If yes, simplify the link - (when (string-match "^file:\$.*\$" link) - (let* ((path (match-string 1 link)) + (when (string-match "^\$file:\\|docview:\$\$.*\$" link) + (let* ((type (match-string 1 link)) + (path (match-string 2 link)) (origpath path) (case-fold-search nil)) (cond @@ -7978,7 +8291,7 @@ (setq path (substring (expand-file-name path) (match-end 0))) (setq path (abbreviate-file-name (expand-file-name path))))))) - (setq link (concat "file:" path)) + (setq link (concat type path)) (if (equal desc origpath) (setq desc path)))) @@ -8097,6 +8410,23 @@ (defvar org-link-search-failed nil) +(defvar org-open-link-functions nil + "Hook for functions finding a plain text link. +These functions must take a single argument, the link content. +They will be called for links that look like [[link text][description]] +when LINK TEXT does not have a protocol like \"http:\" and does not look +like a filename (e.g. \"./blue.png\"). + +These functions will be called *before* Org attempts to resolve the +link by doing text searches in the current buffer - so if you want a +link \"[[target]]\" to still find \"<>\", your function should +handle this as a special case. + +When the function does handle the link, it must return a non-nil value. +If it decides that it is not responsible for this link, it must return +nil to indicate that that Org-mode can continue with other options +like exact and fuzzy text search.") + (defun org-next-link () "Move forward to the next link. If the link is in hidden text, expose it." @@ -8209,6 +8539,10 @@ (org-mode) (insert s) (goto-char (point-min)) + (when reference-buffer + (setq org-link-abbrev-alist-local + (with-current-buffer reference-buffer + org-link-abbrev-alist-local))) (org-open-at-point arg reference-buffer))))) (defun org-open-at-point (&optional in-emacs reference-buffer) @@ -8230,7 +8564,8 @@ (concat org-plain-link-re "\\|" org-bracket-link-regexp "\\|" org-angle-link-re "\\|" - "[ \t]:[^ \t\n]+:[ \t]*$")))) + "[ \t]:[^ \t\n]+:[ \t]*$"))) + (not (get-text-property (point) 'org-linked-text))) (or (org-offer-links-in-entry in-emacs) (progn (require 'org-attach) (org-attach-reveal 'if-exists)))) ((org-at-timestamp-p t) (org-follow-timestamp-link)) @@ -8241,7 +8576,7 @@ (catch 'match (save-excursion (skip-chars-forward "^]\n\r") - (when (org-in-regexp org-bracket-link-regexp) + (when (org-in-regexp org-bracket-link-regexp 1) (setq link (org-extract-attributes (org-link-unescape (org-match-string-no-properties 1)))) (while (string-match " *\n *" link) @@ -8330,19 +8665,6 @@ ((string= type "tags") (org-tags-view in-emacs path)) - ((string= type "thisfile") - (if in-emacs - (switch-to-buffer-other-window - (org-get-buffer-for-internal-link (current-buffer))) - (org-mark-ring-push)) - (let ((cmd `(org-link-search - ,path - ,(cond ((equal in-emacs '(4)) 'occur) - ((equal in-emacs '(16)) 'org-occur) - (t nil)) - ,pos))) - (condition-case nil (eval cmd) - (error (progn (widen) (eval cmd)))))) ((string= type "tree-match") (org-occur (concat "\\[" (regexp-quote path) "\\]"))) @@ -8387,6 +8709,24 @@ (call-interactively (read cmd)))) (error "Abort")))) + ((and (string= type "thisfile") + (run-hook-with-args-until-success + 'org-open-link-functions path))) + + ((string= type "thisfile") + (if in-emacs + (switch-to-buffer-other-window + (org-get-buffer-for-internal-link (current-buffer))) + (org-mark-ring-push)) + (let ((cmd `(org-link-search + ,path + ,(cond ((equal in-emacs '(4)) 'occur) + ((equal in-emacs '(16)) 'org-occur) + (t nil)) + ,pos))) + (condition-case nil (eval cmd) + (error (progn (widen) (eval cmd)))))) + (t (browse-url-at-point))))))) (move-marker org-open-link-marker nil) @@ -8418,7 +8758,7 @@ ((null links) (message "No links")) ((equal (length links) 1) - (setq link (car links))) + (setq link (list (car links)))) ((and (integerp nth) (>= (length links) (if have-zero (1+ nth) nth))) (setq link (nth (if have-zero nth (1- nth)) links))) (t ; we have to select a link @@ -8437,19 +8777,44 @@ (match-string 1 l)))))) links)) (org-fit-window-to-buffer (get-buffer-window "*Select Link*")) - (message "Select link to open:") + (message "Select link to open, RET to open all:") (setq c (read-char-exclusive)) (and (get-buffer "*Select Link*") (kill-buffer "*Select Link*")))) (when (equal c ?q) (error "Abort")) - (setq nth (- c ?0)) - (if have-zero (setq nth (1+ nth))) - (unless (and (integerp nth) (>= (length links) nth)) - (error "Invalid link selection")) - (setq link (nth (1- nth) links)))) + (if (equal c ?\C-m) + (setq link links) + (setq nth (- c ?0)) + (if have-zero (setq nth (1+ nth))) + (unless (and (integerp nth) (>= (length links) nth)) + (error "Invalid link selection")) + (setq link (list (nth (1- nth) links)))))) (if link - (progn (org-open-link-from-string link in-emacs (current-buffer)) t) + (let ((buf (current-buffer))) + (dolist (l link) + (org-open-link-from-string l in-emacs buf)) + t) nil))) +;; Add special file links that specify the way of opening + +(org-add-link-type "file+sys" 'org-open-file-with-system) +(org-add-link-type "file+emacs" 'org-open-file-with-emacs) +(defun org-open-file-with-system (path) + "Open file at PATH using the system way of opeing it." + (org-open-file path 'system)) +(defun org-open-file-with-emacs (path) + "Open file at PATH in emacs." + (org-open-file path 'emacs)) +(defun org-remove-file-link-modifiers () + "Remove the file link modifiers in `file+sys:' and `file+emacs:' links." + (goto-char (point-min)) + (while (re-search-forward "\\ level 19) - (error "Outline path failure, more than 19 levels")) + (error "Outline path failure, more than 19 levels.")) (loop for i from level upto 19 do (aset org-olpa i nil)) (prog1 (delq nil (append org-olpa nil)) (aset org-olpa level heading))) - (let (rtn) + (let (rtn case-fold-search) (save-excursion (save-restriction (widen) @@ -9075,8 +9479,9 @@ (defun org-display-outline-path (&optional file current) "Display the current outline path in the echo area." (interactive "P") - (let ((bfn (buffer-file-name (buffer-base-buffer))) - (path (and (org-mode-p) (org-get-outline-path)))) + (let* ((bfn (buffer-file-name (buffer-base-buffer))) + (case-fold-search nil) + (path (and (org-mode-p) (org-get-outline-path)))) (if current (setq path (append path (save-excursion (org-back-to-heading t) @@ -9202,8 +9607,14 @@ (goto-char (point-min)) (or (outline-next-heading) (goto-char (point-max))))) (if (not (bolp)) (newline)) + (org-paste-subtree level) + (when org-log-refile + (org-add-log-setup 'refile nil nil 'findpos + org-log-refile) + (unless (eq org-log-refile 'note) + (save-excursion (org-add-log-note)))) + (and org-auto-align-tags (org-set-tags nil t)) (bookmark-set "org-refile-last-stored") - (org-paste-subtree level) (if (fboundp 'deactivate-mark) (deactivate-mark)) (run-hooks 'org-after-refile-insert-hook)))) (if regionp @@ -9265,15 +9676,19 @@ (if (equal (car org-refile-history) (nth 1 org-refile-history)) (pop org-refile-history))) pa) - (when (string-match "\\`\$.*\$/\$[^/]+\$\\'" answ) - (setq parent (match-string 1 answ) - child (match-string 2 answ)) - (setq parent-target (or (assoc parent tbl) (assoc (concat parent "/") tbl))) - (when (and parent-target - (or (eq new-nodes t) - (and (eq new-nodes 'confirm) - (y-or-n-p (format "Create new node \"%s\"? " child))))) - (org-refile-new-child parent-target child)))))) + (if (string-match "\\`\$.*\$/\$[^/]+\$\\'" answ) + (progn + (setq parent (match-string 1 answ) + child (match-string 2 answ)) + (setq parent-target (or (assoc parent tbl) + (assoc (concat parent "/") tbl))) + (when (and parent-target + (or (eq new-nodes t) + (and (eq new-nodes 'confirm) + (y-or-n-p (format "Create new node \"%s\"? " + child))))) + (org-refile-new-child parent-target child))) + (error "Invalid target location"))))) (defun org-refile-new-child (parent-target child) "Use refile target PARENT-TARGET to add new CHILD below it." @@ -9398,16 +9813,15 @@ (defun org-map-dblocks (&optional command) "Apply COMMAND to all dynamic blocks in the current buffer. If COMMAND is not given, use `org-update-dblock'." - (let ((cmd (or command 'org-update-dblock)) - pos) + (let ((cmd (or command 'org-update-dblock))) (save-excursion (goto-char (point-min)) (while (re-search-forward org-dblock-start-re nil t) - (goto-char (setq pos (match-beginning 0))) - (condition-case nil - (funcall cmd) - (error (message "Error during update of dynamic block"))) - (goto-char pos) + (goto-char (match-beginning 0)) + (save-excursion + (condition-case nil + (funcall cmd) + (error (message "Error during update of dynamic block")))) (unless (re-search-forward org-dblock-end-re nil t) (error "Dynamic block not terminated")))))) @@ -9476,7 +9890,8 @@ (defconst org-additional-option-like-keywords '("BEGIN_HTML" "END_HTML" "HTML:" "ATTR_HTML" "BEGIN_DocBook" "END_DocBook" "DocBook:" "ATTR_DocBook" - "BEGIN_LaTeX" "END_LaTeX" "LaTeX:" "LATEX_HEADER:" "LATEX_CLASS:" "ATTR_LaTeX" + "BEGIN_LaTeX" "END_LaTeX" "LaTeX:" "LATEX_HEADER:" + "LATEX_CLASS:" "LATEX_CLASS_OPTIONS:" "ATTR_LaTeX" "BEGIN:" "END:" "ORGTBL" "TBLFM:" "TBLNAME:" "BEGIN_EXAMPLE" "END_EXAMPLE" @@ -9636,7 +10051,7 @@ org-link-abbrev-alist)) (texp (setq type :tex) - org-html-entities) + (append org-entities-user org-entities)) ((string-match "\\`\\*+[ \t]+\\'" (buffer-substring (point-at-bol) beg)) (setq type :todo) @@ -9980,54 +10395,56 @@ 3. The parent of the task is blocked because it has siblings that should be done first, or is child of a block grandparent TODO entry." - (catch 'dont-block - ;; If this is not a todo state change, or if this entry is already DONE, - ;; do not block - (when (or (not (eq (plist-get change-plist :type) 'todo-state-change)) - (member (plist-get change-plist :from) - (cons 'done org-done-keywords)) - (member (plist-get change-plist :to) - (cons 'todo org-not-done-keywords)) - (not (plist-get change-plist :to))) - (throw 'dont-block t)) - ;; If this task has children, and any are undone, it's blocked - (save-excursion - (org-back-to-heading t) - (let ((this-level (funcall outline-level))) - (outline-next-heading) - (let ((child-level (funcall outline-level))) - (while (and (not (eobp)) - (> child-level this-level)) - ;; this todo has children, check whether they are all - ;; completed - (if (and (not (org-entry-is-done-p)) - (org-entry-is-todo-p)) - (throw 'dont-block nil)) - (outline-next-heading) - (setq child-level (funcall outline-level)))))) - ;; Otherwise, if the task's parent has the :ORDERED: property, and - ;; any previous siblings are undone, it's blocked - (save-excursion - (org-back-to-heading t) - (let* ((pos (point)) - (parent-pos (and (org-up-heading-safe) (point)))) - (if (not parent-pos) (throw 'dont-block t)) ; no parent - (when (and (org-entry-get (point) "ORDERED") - (forward-line 1) - (re-search-forward org-not-done-heading-regexp pos t)) - (throw 'dont-block nil)) ; block, there is an older sibling not done. - ;; Search further up the hierarchy, to see if an anchestor is blocked - (while t - (goto-char parent-pos) - (if (not (looking-at org-not-done-heading-regexp)) - (throw 'dont-block t)) ; do not block, parent is not a TODO - (setq pos (point)) - (setq parent-pos (and (org-up-heading-safe) (point))) + (if (not org-enforce-todo-dependencies) + t ; if locally turned off don't block + (catch 'dont-block + ;; If this is not a todo state change, or if this entry is already DONE, + ;; do not block + (when (or (not (eq (plist-get change-plist :type) 'todo-state-change)) + (member (plist-get change-plist :from) + (cons 'done org-done-keywords)) + (member (plist-get change-plist :to) + (cons 'todo org-not-done-keywords)) + (not (plist-get change-plist :to))) + (throw 'dont-block t)) + ;; If this task has children, and any are undone, it's blocked + (save-excursion + (org-back-to-heading t) + (let ((this-level (funcall outline-level))) + (outline-next-heading) + (let ((child-level (funcall outline-level))) + (while (and (not (eobp)) + (> child-level this-level)) + ;; this todo has children, check whether they are all + ;; completed + (if (and (not (org-entry-is-done-p)) + (org-entry-is-todo-p)) + (throw 'dont-block nil)) + (outline-next-heading) + (setq child-level (funcall outline-level)))))) + ;; Otherwise, if the task's parent has the :ORDERED: property, and + ;; any previous siblings are undone, it's blocked + (save-excursion + (org-back-to-heading t) + (let* ((pos (point)) + (parent-pos (and (org-up-heading-safe) (point)))) (if (not parent-pos) (throw 'dont-block t)) ; no parent (when (and (org-entry-get (point) "ORDERED") (forward-line 1) (re-search-forward org-not-done-heading-regexp pos t)) - (throw 'dont-block nil))))))) ; block, older sibling not done. + (throw 'dont-block nil)) ; block, there is an older sibling not done. + ;; Search further up the hierarchy, to see if an anchestor is blocked + (while t + (goto-char parent-pos) + (if (not (looking-at org-not-done-heading-regexp)) + (throw 'dont-block t)) ; do not block, parent is not a TODO + (setq pos (point)) + (setq parent-pos (and (org-up-heading-safe) (point))) + (if (not parent-pos) (throw 'dont-block t)) ; no parent + (when (and (org-entry-get (point) "ORDERED") + (forward-line 1) + (re-search-forward org-not-done-heading-regexp pos t)) + (throw 'dont-block nil)))))))) ; block, older sibling not done. (defcustom org-track-ordered-property-with-tag nil "Should the ORDERED property also be shown as a tag? @@ -10071,30 +10488,44 @@ "Block turning an entry into a TODO, using checkboxes. This checks whether the current task should be blocked from state changes because there are unchecked boxes in this entry." - (catch 'dont-block - ;; If this is not a todo state change, or if this entry is already DONE, - ;; do not block - (when (or (not (eq (plist-get change-plist :type) 'todo-state-change)) - (member (plist-get change-plist :from) - (cons 'done org-done-keywords)) - (member (plist-get change-plist :to) - (cons 'todo org-not-done-keywords)) - (not (plist-get change-plist :to))) - (throw 'dont-block t)) - ;; If this task has checkboxes that are not checked, it's blocked - (save-excursion - (org-back-to-heading t) - (let ((beg (point)) end) - (outline-next-heading) - (setq end (point)) - (goto-char beg) - (if (re-search-forward "^[ \t]*\$[-+*]\\|[0-9]+[.)]\$[ \t]+\\[[- ]\\]" - end t) - (progn - (if (boundp 'org-blocked-by-checkboxes) - (setq org-blocked-by-checkboxes t)) - (throw 'dont-block nil))))) - t)) ; do not block + (if (not org-enforce-todo-checkbox-dependencies) + t ; if locally turned off don't block + (catch 'dont-block + ;; If this is not a todo state change, or if this entry is already DONE, + ;; do not block + (when (or (not (eq (plist-get change-plist :type) 'todo-state-change)) + (member (plist-get change-plist :from) + (cons 'done org-done-keywords)) + (member (plist-get change-plist :to) + (cons 'todo org-not-done-keywords)) + (not (plist-get change-plist :to))) + (throw 'dont-block t)) + ;; If this task has checkboxes that are not checked, it's blocked + (save-excursion + (org-back-to-heading t) + (let ((beg (point)) end) + (outline-next-heading) + (setq end (point)) + (goto-char beg) + (if (re-search-forward "^[ \t]*\$[-+*]\\|[0-9]+[.)]\$[ \t]+\\[[- ]\\]" + end t) + (progn + (if (boundp 'org-blocked-by-checkboxes) + (setq org-blocked-by-checkboxes t)) + (throw 'dont-block nil))))) + t))) ; do not block + +(defun org-entry-blocked-p () + "Is the current entry blocked?" + (if (org-entry-get nil "NOBLOCKING") + nil ;; Never block this entry + (not + (run-hook-with-args-until-failure + 'org-blocker-hook + (list :type 'todo-state-change + :position (point) + :from 'todo + :to 'done))))) (defun org-update-statistics-cookies (all) "Update the statistics cookie, either from TODO or from checkboxes. @@ -10116,8 +10547,9 @@ (outline-next-heading) (if (org-on-heading-p) (setq l2 (org-outline-level))) (point))) - (if (and (save-excursion (re-search-forward - "^[ \t]*[-+*] \\[[- X]\\]" end t)) + (if (and (save-excursion + (re-search-forward + "^[ \t]*\$[-+*]\\|[0-9]+[.)]\$ \\[[- X]\\]" end t)) (not (save-excursion (re-search-forward ":COOKIE_DATA:.*\\" end t)))) (org-update-checkbox-count) @@ -10125,7 +10557,12 @@ (progn (goto-char end) (org-update-parent-todo-statistics)) - (error "No data for statistics cookie")))) + (goto-char pos) + (beginning-of-line 1) + (while (re-search-forward + "\$\\(\\[[0-9]*%\\]\$\\|\$\\[[0-9]*/[0-9]*\\]\$\\)" + (point-at-eol) t) + (replace-match (if (match-end 2) "[100%]" "[0/0]") t t))))) (goto-char pos) (move-marker pos nil))))) @@ -10488,20 +10925,37 @@ When TIME is set, it should be an internal time specification, and the scheduling will use the corresponding date." (interactive "P") - (let ((old-date (org-entry-get nil "DEADLINE"))) + (let* ((old-date (org-entry-get nil "DEADLINE")) + (repeater (and old-date + (string-match "\$[.+]+[0-9]+[dwmy]\$ ?" old-date) + (match-string 1 old-date)))) (if remove (progn + (when (and old-date org-log-redeadline) + (org-add-log-setup 'deldeadline nil old-date 'findpos + org-log-redeadline)) (org-remove-timestamp-with-keyword org-deadline-string) (message "Item no longer has a deadline.")) - (if (org-get-repeat) - (error "Cannot change deadline on task with repeater, please do that by hand") - (org-add-planning-info 'deadline time 'closed) - (when (and old-date org-log-redeadline - (not (equal old-date - (substring org-last-inserted-timestamp 1 -1)))) - (org-add-log-setup 'redeadline nil old-date 'findpos - org-log-redeadline)) - (message "Deadline on %s" org-last-inserted-timestamp))))) + (org-add-planning-info 'deadline time 'closed) + (when (and old-date org-log-redeadline + (not (equal old-date + (substring org-last-inserted-timestamp 1 -1)))) + (org-add-log-setup 'redeadline nil old-date 'findpos + org-log-redeadline)) + (when repeater + (save-excursion + (org-back-to-heading t) + (when (re-search-forward (concat org-deadline-string " " + org-last-inserted-timestamp) + (save-excursion + (outline-next-heading) (point)) t) + (goto-char (1- (match-end 0))) + (insert " " repeater) + (setq org-last-inserted-timestamp + (concat (substring org-last-inserted-timestamp 0 -1) + " " repeater + (substring org-last-inserted-timestamp -1)))))) + (message "Deadline on %s" org-last-inserted-timestamp)))) (defun org-schedule (&optional remove time) "Insert the SCHEDULED: string with a timestamp to schedule a TODO item. @@ -10509,20 +10963,37 @@ When TIME is set, it should be an internal time specification, and the scheduling will use the corresponding date." (interactive "P") - (let ((old-date (org-entry-get nil "SCHEDULED"))) + (let* ((old-date (org-entry-get nil "SCHEDULED")) + (repeater (and old-date + (string-match "\$[.+]+[0-9]+[dwmy]\$ ?" old-date) + (match-string 1 old-date)))) (if remove (progn + (when (and old-date org-log-reschedule) + (org-add-log-setup 'delschedule nil old-date 'findpos + org-log-reschedule)) (org-remove-timestamp-with-keyword org-scheduled-string) (message "Item is no longer scheduled.")) - (if (org-get-repeat) - (error "Cannot reschedule task with repeater, please do that by hand") - (org-add-planning-info 'scheduled time 'closed) - (when (and old-date org-log-reschedule - (not (equal old-date - (substring org-last-inserted-timestamp 1 -1)))) - (org-add-log-setup 'reschedule nil old-date 'findpos - org-log-reschedule)) - (message "Scheduled to %s" org-last-inserted-timestamp))))) + (org-add-planning-info 'scheduled time 'closed) + (when (and old-date org-log-reschedule + (not (equal old-date + (substring org-last-inserted-timestamp 1 -1)))) + (org-add-log-setup 'reschedule nil old-date 'findpos + org-log-reschedule)) + (when repeater + (save-excursion + (org-back-to-heading t) + (when (re-search-forward (concat org-scheduled-string " " + org-last-inserted-timestamp) + (save-excursion + (outline-next-heading) (point)) t) + (goto-char (1- (match-end 0))) + (insert " " repeater) + (setq org-last-inserted-timestamp + (concat (substring org-last-inserted-timestamp 0 -1) + " " repeater + (substring org-last-inserted-timestamp -1)))))) + (message "Scheduled to %s" org-last-inserted-timestamp)))) (defun org-get-scheduled-time (pom &optional inherit) "Get the scheduled time as a time tuple, of a format suitable @@ -10766,8 +11237,14 @@ (or org-log-note-state ""))) ((eq org-log-note-purpose 'reschedule) "rescheduling") + ((eq org-log-note-purpose 'delschedule) + "no longer scheduled") ((eq org-log-note-purpose 'redeadline) "changing deadline") + ((eq org-log-note-purpose 'deldeadline) + "removing deadline") + ((eq org-log-note-purpose 'refile) + "refiling") ((eq org-log-note-purpose 'note) "this entry") (t (error "This should not happen"))))) @@ -10971,6 +11448,9 @@ (org-flag-heading nil) (when siblings-p (org-show-siblings)))))))) +(defvar org-reveal-start-hook nil + "Hook run before revealing a location.") + (defun org-reveal (&optional siblings) "Show current entry, hierarchy above it, and the following headline. This can be used to show a consistent set of context around locations @@ -10979,12 +11459,20 @@ With optional argument SIBLINGS, on each level of the hierarchy all siblings are shown. This repairs the tree structure to what it would -look like when opened with hierarchical calls to `org-cycle'." - (interactive "P") +look like when opened with hierarchical calls to `org-cycle'. +With double optional argument `C-u C-u', go to the parent and show the +entire tree." + (interactive "P") + (run-hooks 'org-reveal-start-hook) (let ((org-show-hierarchy-above t) (org-show-following-heading t) (org-show-siblings (if siblings t org-show-siblings))) - (org-show-context nil))) + (org-show-context nil)) + (when (equal siblings '(16)) + (save-excursion + (when (org-up-heading-safe) + (org-show-subtree) + (run-hook-with-args 'org-cycle-hook 'subtree))))) (defun org-highlight-new-match (beg end) "Highlight from BEG to END and mark the highlight is an occur headline." @@ -11677,7 +12165,9 @@ ;; Get a new set of tags from the user (save-excursion (setq table (append org-tag-persistent-alist - (or org-tag-alist (org-get-buffer-tags))) + (or org-tag-alist (org-get-buffer-tags)) + (and org-complete-tags-always-offer-all-agenda-tags + (org-global-tags-completion-table (org-agenda-files)))) org-last-tags-completion-table table current-tags (org-split-string current ":") inherited-tags (nreverse @@ -11719,7 +12209,8 @@ (if (equal tags "") (setq rpl "") (goto-char (match-beginning 0)) - (setq c0 (current-column) p0 (point) + (setq c0 (current-column) p0 (if (equal (char-before) ?*) + (1+ (point)) (point)) c1 (max (1+ c0) (if (> org-tags-column 0) org-tags-column (- (- org-tags-column) (length tags)))) @@ -11822,6 +12313,7 @@ (put-text-property 0 (length s) 'face '(secondary-selection org-tag) s) (org-overlay-display org-tags-overlay (concat prefix s))))) +(defvar org-last-tag-selection-key nil) (defun org-fast-tag-selection (current inherited table &optional todo-table) "Fast tag selection with single keys. CURRENT is the current list of tags in the headline, INHERITED is the @@ -11936,6 +12428,7 @@ (if (not groups) "no " "") (if expert " [C-c]:window" (if exit-after-next " [C-c]:single" " [C-c]:multi"))) (setq c (let ((inhibit-quit t)) (read-char-exclusive))) + (setq org-last-tag-selection-key c) (cond ((= c ?\r) (throw 'exit t)) ((= c ?!) @@ -12159,7 +12652,7 @@ (defconst org-special-properties '("TODO" "TAGS" "ALLTAGS" "DEADLINE" "SCHEDULED" "CLOCK" "CLOSED" "PRIORITY" - "TIMESTAMP" "TIMESTAMP_IA") + "TIMESTAMP" "TIMESTAMP_IA" "BLOCKED") "The special properties valid in Org-mode. These are properties that are not defined in the property drawer, @@ -12171,7 +12664,7 @@ "TABLE_EXPORT_FORMAT" "TABLE_EXPORT_FILE" "EXPORT_FILE_NAME" "EXPORT_TITLE" "EXPORT_AUTHOR" "EXPORT_DATE" "ORDERED" "NOBLOCKING" "COOKIE_DATA" "LOG_INTO_DRAWER" - "CLOCK_MODELINE_TOTAL" "STYLE") + "CLOCK_MODELINE_TOTAL" "STYLE" "HTML_CONTAINER_CLASS") "Some properties that are used by Org-mode for various purposes. Being in this list makes sure that they are offered for completion.") @@ -12179,7 +12672,7 @@ "Regular expression matching the first line of a property drawer.") (defconst org-property-end-re "^[ \t]*:END:[ \t]*$" - "Regular expression matching the first line of a property drawer.") + "Regular expression matching the last line of a property drawer.") (defconst org-clock-drawer-start-re "^[ \t]*:CLOCK:[ \t]*$" "Regular expression matching the first line of a property drawer.") @@ -12256,13 +12749,16 @@ (message "%s is now %s" prop val))) (defun org-at-property-p () - "Is the cursor in a property line?" - ;; FIXME: Does not check if we are actually in the drawer. - ;; FIXME: also returns true on any drawers..... - ;; This is used by C-c C-c for property action. + "Is cursor inside a property drawer?" (save-excursion (beginning-of-line 1) - (looking-at (org-re "^[ \t]*\$:\\([[:alpha:]][[:alnum:]_-]*\$:\\)[ \t]*\$.*\$")))) + (when (looking-at (org-re "^[ \t]*\$:\\([[:alpha:]][[:alnum:]_-]*\$:\\)[ \t]*\$.*\$")) + (let ((match (match-data)) ;; Keep match-data for use by calling + (p (point)) ;; procedures. + (range (unless (org-before-first-heading-p) + (org-get-property-block)))) + (prog1 (and range (<= (car range) p) (< p (cdr range))) + (set-match-data match)))))) (defun org-get-property-block (&optional beg end force) "Return the (beg . end) range of the body of the property drawer. @@ -12293,7 +12789,7 @@ (insert ":END:\n")) (cons beg end))))) -(defun org-entry-properties (&optional pom which) +(defun org-entry-properties (&optional pom which specific) "Get all properties of the entry at point-or-marker POM. This includes the TODO keyword, the tags, time strings for deadline, scheduled, and clocking, and any additional properties defined in the @@ -12301,11 +12797,15 @@ if the property key was used several times. POM may also be nil, in which case the current entry is used. If WHICH is nil or `all', get all properties. If WHICH is -`special' or `standard', only get that subclass." +`special' or `standard', only get that subclass. If WHICH +is a string only get exactly this property. Specific can be a string, the +specific property we are interested in. Specifying it can speed +things up because then unnecessary parsing is avoided." (setq which (or which 'all)) (org-with-point-at pom (let ((clockstr (substring org-clock-string 0 -1)) - (excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY")) + (excluded '("TODO" "TAGS" "ALLTAGS" "PRIORITY" "BLOCKED")) + (case-fold-search nil) beg end range props sum-props key value string clocksum) (save-excursion (when (condition-case nil @@ -12319,30 +12819,40 @@ (when (memq which '(all special)) ;; Get the special properties, like TODO and tags (goto-char beg) - (when (and (looking-at org-todo-line-regexp) (match-end 2)) + (when (and (or (not specific) (string= specific "TODO")) + (looking-at org-todo-line-regexp) (match-end 2)) (push (cons "TODO" (org-match-string-no-properties 2)) props)) - (when (looking-at org-priority-regexp) + (when (and (or (not specific) (string= specific "PRIORITY")) + (looking-at org-priority-regexp)) (push (cons "PRIORITY" (org-match-string-no-properties 2)) props)) - (when (and (setq value (org-get-tags-string)) + (when (and (or (not specific) (string= specific "TAGS")) + (setq value (org-get-tags-string)) (string-match "\\S-" value)) (push (cons "TAGS" value) props)) - (when (setq value (org-get-tags-at)) - (push (cons "ALLTAGS" (concat ":" (mapconcat 'identity value ":") ":")) + (when (and (or (not specific) (string= specific "ALLTAGS")) + (setq value (org-get-tags-at))) + (push (cons "ALLTAGS" (concat ":" (mapconcat 'identity value ":") + ":")) props)) - (while (re-search-forward org-maybe-keyword-time-regexp end t) - (setq key (if (match-end 1) (substring (org-match-string-no-properties 1) 0 -1)) - string (if (equal key clockstr) - (org-no-properties - (org-trim + (when (or (not specific) (string= specific "BLOCKED")) + (push (cons "BLOCKED" (if (org-entry-blocked-p) "t" "")) props)) + (when (or (not specific) + (member specific org-all-time-keywords) + (member specific '("TIMESTAMP" "TIMESTAMP_IA"))) + (while (re-search-forward org-maybe-keyword-time-regexp end t) + (setq key (if (match-end 1) (substring (org-match-string-no-properties 1) 0 -1)) + string (if (equal key clockstr) + (org-no-properties + (org-trim (buffer-substring (match-beginning 3) (goto-char (point-at-eol))))) - (substring (org-match-string-no-properties 3) 1 -1))) - (unless key - (if (= (char-after (match-beginning 3)) ?\[) - (setq key "TIMESTAMP_IA") - (setq key "TIMESTAMP"))) - (when (or (equal key clockstr) (not (assoc key props))) - (push (cons key string) props))) + (substring (org-match-string-no-properties 3) 1 -1))) + (unless key + (if (= (char-after (match-beginning 3)) ?\[) + (setq key "TIMESTAMP_IA") + (setq key "TIMESTAMP"))) + (when (or (equal key clockstr) (not (assoc key props))) + (push (cons key string) props)))) ) @@ -12384,8 +12894,9 @@ t)) (org-entry-get-with-inheritance property) (if (member property org-special-properties) - ;; We need a special property. Use brute force, get all properties. - (cdr (assoc property (org-entry-properties nil 'special))) + ;; We need a special property. Use `org-entry-properties' to + ;; retrieve it, but specify the wanted property + (cdr (assoc property (org-entry-properties nil 'special property))) (let ((range (org-get-property-block))) (if (and range (goto-char (car range)) @@ -12508,6 +13019,11 @@ (cdr (assoc property org-global-properties)) (cdr (assoc property org-global-properties-fixed)))))) +(defvar org-property-changed-functions nil + "Hook called when the value of a property has changed. +Each hook function should accept two arguments, the name of the property +and the new value.") + (defun org-entry-put (pom property value) "Set PROPERTY to VALUE for entry at point-or-marker POM." (org-with-point-at pom @@ -12560,7 +13076,8 @@ (org-indent-line-function) (insert ":" property ":")) (and value (insert " " value)) - (org-indent-line-function))))))) + (org-indent-line-function))))) + (run-hook-with-args 'org-property-changed-functions property value))) (defun org-buffer-property-keys (&optional include-specials include-defaults include-columns) "Get all property keys in the current buffer. @@ -12680,16 +13197,17 @@ keys))) prop0))) (cur (org-entry-get nil prop)) + (prompt (concat prop " value" + (if (and cur (string-match "\\S-" cur)) + (concat " [" cur "]") "") ": ")) (allowed (org-property-get-allowed-values nil prop 'table)) (existing (mapcar 'list (org-property-values prop))) (val (if allowed - (org-completing-read "Value: " allowed nil 'req-match) + (org-completing-read prompt allowed nil + (not (get-text-property 0 'org-unrestricted + (caar allowed)))) (let (org-completion-use-ido org-completion-use-iswitchb) - (org-completing-read - (concat "Value " (if (and cur (string-match "\\S-" cur)) - (concat "[" cur "]") "") - ": ") - existing nil nil "" nil cur))))) + (org-completing-read prompt existing nil nil "" nil cur))))) (list prop (if (equal val "") cur val)))) (unless (equal (org-entry-get nil property) value) (org-entry-put nil property value))) @@ -12698,8 +13216,7 @@ "In the current entry, delete PROPERTY." (interactive (let* ((completion-ignore-case t) - (prop (org-icompleting-read - "Property: " (org-entry-properties nil 'standard)))) + (prop (org-icompleting-read "Property: " (org-entry-properties nil 'standard)))) (list prop))) (message "Property %s %s" property (if (org-entry-delete nil property) @@ -12741,6 +13258,15 @@ (error "No operator defined for property %s" prop)) (org-columns-compute prop))) +(defvar org-property-allowed-value-functions nil + "Hook for functions supplying allowed values for a specific property. +The functions must take a single argument, the name of the property, and +return a flat list of allowed values. If \":ETC\" is one of +the values, this means that these values are intended as defaults for +completion, but that other values should be allowed too. +The functions must return nil if they are not responsible for this +property.") + (defun org-property-get-allowed-values (pom property &optional table) "Get allowed values for the property PROPERTY. When TABLE is non-nil, return an alist that can directly be used for @@ -12756,9 +13282,10 @@ (push (char-to-string n) vals) (setq n (1- n))))) ((member property org-special-properties)) + ((setq vals (run-hook-with-args-until-success + 'org-property-allowed-value-functions property))) (t (setq vals (org-entry-get pom (concat property "_ALL") 'inherit)) - (when (and vals (string-match "\\S-" vals)) (setq vals (car (read-from-string (concat "(" vals ")")))) (setq vals (mapcar (lambda (x) @@ -12767,6 +13294,9 @@ ((symbolp x) (symbol-name x)) (t "???"))) vals))))) + (when (member ":ETC" vals) + (setq vals (remove ":ETC" vals)) + (org-add-props (car vals) '(org-unrestricted t))) (if table (mapcar 'list vals) vals))) (defun org-property-previous-allowed-value (&optional previous) @@ -12797,7 +13327,8 @@ (replace-match (concat " :" key ": " nval) t t) (org-indent-line-function) (beginning-of-line 1) - (skip-chars-forward " \t"))) + (skip-chars-forward " \t") + (run-hook-with-args 'org-property-changed-functions key nval))) (defun org-find-entry-with-id (ident) "Locate the entry that contains the ID property with exact value IDENT. @@ -13132,9 +13663,10 @@ (defun org-read-date-analyze (ans def defdecode) "Analyse the combined answer of the date prompt." ;; FIXME: cleanup and comment - (let (delta deltan deltaw deltadef year month day - hour minute second wday pm h2 m2 tl wday1 - iso-year iso-weekday iso-week iso-year iso-date futurep) + (let ((nowdecode (decode-time (current-time))) + delta deltan deltaw deltadef year month day + hour minute second wday pm h2 m2 tl wday1 + iso-year iso-weekday iso-week iso-year iso-date futurep kill-year) (setq org-read-date-analyze-futurep nil) (when (string-match "\\`[ \t]*\\.[ \t]*\\'" ans) (setq ans "+0")) @@ -13149,22 +13681,38 @@ ;; If yes, store the info and postpone interpreting it until the rest ;; of the parsing is done (when (string-match "\\<\$?:\\([0-9]+\$-\\)?[wW]\$[0-9]\\{1,2\\}\$\$?:-\\([0-6]\$\\)?\$[ \t]\\|$\$" ans) - (setq iso-year (if (match-end 1) (org-small-year-to-year (string-to-number (match-string 1 ans)))) - iso-weekday (if (match-end 3) (string-to-number (match-string 3 ans))) + (setq iso-year (if (match-end 1) + (org-small-year-to-year + (string-to-number (match-string 1 ans)))) + iso-weekday (if (match-end 3) + (string-to-number (match-string 3 ans))) iso-week (string-to-number (match-string 2 ans))) (setq ans (replace-match "" t t ans))) - ;; Help matching ISO dates with single digit month ot day, like 2006-8-11. + ;; Help matching ISO dates with single digit month or day, like 2006-8-11. (when (string-match "^ *\$\\([0-9]+\$-\\)?\$[0-1]?[0-9]\$-\$[0-3]?[0-9]\$\$[^-0-9]\\|$\$" ans) (setq year (if (match-end 2) (string-to-number (match-string 2 ans)) - (string-to-number (format-time-string "%Y"))) + (progn (setq kill-year t) + (string-to-number (format-time-string "%Y")))) month (string-to-number (match-string 3 ans)) day (string-to-number (match-string 4 ans))) (if (< year 100) (setq year (+ 2000 year))) (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) t nil ans))) + ;; Help matching american dates, like 5/30 or 5/30/7 + (when (string-match + "^ *\$[0-3]?[0-9]\$/\$[0-1]?[0-9]\$\$/\\([0-9]+\$\\)?\$[^/0-9]\\|$\$" ans) + (setq year (if (match-end 4) + (string-to-number (match-string 4 ans)) + (progn (setq kill-year t) + (string-to-number (format-time-string "%Y")))) + month (string-to-number (match-string 1 ans)) + day (string-to-number (match-string 2 ans))) + (if (< year 100) (setq year (+ 2000 year))) + (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) + t nil ans))) ;; Help matching am/pm times, because `parse-time-string' does not do that. ;; If there is a time with am/pm, and *no* time without it, we convert ;; so that matching will be successful. @@ -13207,13 +13755,13 @@ day (or (nth 3 tl) (nth 3 defdecode)) month (or (nth 4 tl) (if (and org-read-date-prefer-future - (nth 3 tl) (< (nth 3 tl) (nth 3 defdecode))) - (prog1 (1+ (nth 4 defdecode)) (setq futurep t)) + (nth 3 tl) (< (nth 3 tl) (nth 3 nowdecode))) + (prog1 (1+ (nth 4 nowdecode)) (setq futurep t)) (nth 4 defdecode))) - year (or (nth 5 tl) + year (or (and (not kill-year) (nth 5 tl)) (if (and org-read-date-prefer-future - (nth 4 tl) (< (nth 4 tl) (nth 4 defdecode))) - (prog1 (1+ (nth 5 defdecode)) (setq futurep t)) + (nth 4 tl) (< (nth 4 tl) (nth 4 nowdecode))) + (prog1 (1+ (nth 5 nowdecode)) (setq futurep t)) (nth 5 defdecode))) hour (or (nth 2 tl) (nth 2 defdecode)) minute (or (nth 1 tl) (nth 1 defdecode)) @@ -13222,14 +13770,14 @@ (when (and (eq org-read-date-prefer-future 'time) (not (nth 3 tl)) (not (nth 4 tl)) (not (nth 5 tl)) - (equal day (nth 3 defdecode)) - (equal month (nth 4 defdecode)) - (equal year (nth 5 defdecode)) + (equal day (nth 3 nowdecode)) + (equal month (nth 4 nowdecode)) + (equal year (nth 5 nowdecode)) (nth 2 tl) - (or (< (nth 2 tl) (nth 2 defdecode)) - (and (= (nth 2 tl) (nth 2 defdecode)) + (or (< (nth 2 tl) (nth 2 nowdecode)) + (and (= (nth 2 tl) (nth 2 nowdecode)) (nth 1 tl) - (< (nth 1 tl) (nth 1 defdecode))))) + (< (nth 1 tl) (nth 1 nowdecode))))) (setq day (1+ day) futurep t)) @@ -13237,6 +13785,7 @@ (cond (iso-week ;; There was an iso week + (require 'cal-iso) (setq futurep nil) (setq year (or iso-year year) day (or iso-weekday wday 1) @@ -13316,6 +13865,23 @@ (list delta "d" rel)) (list (* n (if (= dir ?-) -1 1)) what rel))))) +(defun org-order-calendar-date-args (arg1 arg2 arg3) + "Turn a user-specified date into the internal representation. +The internal representation needed by the calendar is (month day year). +This is a wrapper to handle the brain-dead convention in calendar that +user function argument order change dependent on argument order." + (if (boundp 'calendar-date-style) + (cond + ((eq calendar-date-style 'american) + (list arg1 arg2 arg3)) + ((eq calendar-date-style 'european) + (list arg2 arg1 arg3)) + ((eq calendar-date-style 'iso) + (list arg2 arg3 arg1))) + (if (org-bound-and-true-p european-calendar-style) + (list arg2 arg1 arg3) + (list arg1 arg2 arg3)))) + (defun org-eval-in-calendar (form &optional keepdate) "Eval FORM in the calendar window and return to current window. Also, store the cursor date in variable org-ans2." @@ -13343,7 +13909,7 @@ (defun org-insert-time-stamp (time &optional with-hm inactive pre post extra) "Insert a date stamp for the date given by the internal TIME. -WITH-HM means, use the stamp format that includes the time of the day. +WITH-HM means use the stamp format that includes the time of the day. INACTIVE means use square brackets instead of angular ones, so that the stamp will not contribute to the agenda. PRE and POST are optional strings to be inserted before and after the @@ -14162,7 +14728,7 @@ "Get the list of agenda files. Optional UNRESTRICTED means return the full list even if a restriction is currently in place. -When ARCHIVES is t, include all archive files hat are really being +When ARCHIVES is t, include all archive files that are really being used by the agenda files. If ARCHIVE is `ifmode', do this only if `org-agenda-archives-mode' is t." (let ((files @@ -14215,24 +14781,41 @@ (defun org-store-new-agenda-file-list (list) "Set new value for the agenda file list and save it correctly." (if (stringp org-agenda-files) - (let ((f org-agenda-files) b) - (while (setq b (find-buffer-visiting f)) (kill-buffer b)) - (with-temp-file f - (insert (mapconcat 'identity list "\n") "\n"))) + (let ((fe (org-read-agenda-file-list t)) b u) + (while (setq b (find-buffer-visiting org-agenda-files)) + (kill-buffer b)) + (with-temp-file org-agenda-files + (insert + (mapconcat + (lambda (f) ;; Keep un-expanded entries. + (if (setq u (assoc f fe)) + (cdr u) + f)) + list "\n") + "\n"))) (let ((org-mode-hook nil) (org-inhibit-startup t) (org-insert-mode-line-in-empty-file nil)) (setq org-agenda-files list) (customize-save-variable 'org-agenda-files org-agenda-files)))) -(defun org-read-agenda-file-list () - "Read the list of agenda files from a file." +(defun org-read-agenda-file-list (&optional pair-with-expansion) + "Read the list of agenda files from a file. +If PAIR-WITH-EXPANSION is t return pairs with un-expanded +filenames, used by `org-store-new-agenda-file-list' to write back +un-expanded file names." (when (file-directory-p org-agenda-files) (error "`org-agenda-files' cannot be a single directory")) (when (stringp org-agenda-files) (with-temp-buffer (insert-file-contents org-agenda-files) - (org-split-string (buffer-string) "[ \t\r\n]*?[\r\n][ \t\r\n]*")))) - + (mapcar + (lambda (f) + (let ((e (expand-file-name (substitute-in-file-name f) + org-directory))) + (if pair-with-expansion + (cons e f) + e))) + (org-split-string (buffer-string) "[ \t\r\n]*?[\r\n][ \t\r\n]*"))))) ;;;###autoload (defun org-cycle-agenda-files () @@ -14280,7 +14863,7 @@ (defun org-remove-file (&optional file) "Remove current file from the list of files in variable `org-agenda-files'. These are the files which are being checked for agenda entries. -Optional argument FILE means, use this file instead of the current." +Optional argument FILE means use this file instead of the current." (interactive) (let* ((org-agenda-skip-unavailable-files nil) (file (or file buffer-file-name)) @@ -14382,6 +14965,8 @@ (add-text-properties (match-beginning 0) (org-end-of-subtree t) pc))) (set-buffer-modified-p bmp))))) + (setq org-todo-keywords-for-agenda + (org-uniquify org-todo-keywords-for-agenda)) (setq org-todo-keyword-alist-for-agenda (org-uniquify org-todo-keyword-alist-for-agenda) org-tag-alist-for-agenda (org-uniquify org-tag-alist-for-agenda)))) @@ -14477,6 +15062,15 @@ (goto-char pos) (if dd-on (cons "$$" m)))))) +(defun org-inside-latex-macro-p () + "Is point inside a LaTeX macro or its arguments?" + (save-match-data + (org-in-regexp + "\\\\[a-zA-Z]+\\*?\$\\(\\[[^][\n{}]*\\]\$\\|\${[^{}\n]*}\$\\)*"))) + +(defun test () + (interactive) + (message "%s" (org-inside-latex-macro-p))) (defun org-try-cdlatex-tab () "Check if it makes sense to execute `cdlatex-tab', and do it if yes. @@ -14585,6 +15179,8 @@ (opt org-format-latex-options) (matchers (plist-get opt :matchers)) (re-list org-latex-regexps) + (org-format-latex-header-extra + (plist-get (org-infile-export-plist) :latex-header-extra)) (cnt 0) txt hash link beg end re e checkdir executables-checked m n block linkfile movefile ov) @@ -14604,16 +15200,18 @@ 'org-latex-overlay)))) (setq txt (match-string n) beg (match-beginning n) end (match-end n) - cnt (1+ cnt) - link (concat block "[[file:" linkfile "]]" block)) + cnt (1+ cnt)) (let (print-length print-level) ; make sure full list is printed (setq hash (sha1 (prin1-to-string (list org-format-latex-header + org-format-latex-header-extra + org-export-latex-default-packages-alist org-export-latex-packages-alist org-format-latex-options forbuffer txt))) linkfile (format "%s_%s.png" prefix hash) movefile (format "%s_%s.png" absprefix hash))) + (setq link (concat block "[[file:" linkfile "]]" block)) (if msg (message msg cnt)) (goto-char beg) (unless checkdir ; make sure the directory exists @@ -14651,7 +15249,9 @@ (push ov org-latex-fragment-image-overlays) (goto-char end)) (delete-region beg end) - (insert link)))))))) + (insert (org-add-props link + (list 'org-latex-src + (replace-regexp-in-string "\"" "" txt))))))))))) ;; This function borrows from Ganesh Swami's latex2png.el (defun org-create-formula-image (string tofile options buffer) @@ -14677,17 +15277,14 @@ (if (eq fg 'default) (setq fg (org-dvipng-color :foreground))) (if (eq bg 'default) (setq bg (org-dvipng-color :background))) (with-temp-file texfile - (insert org-format-latex-header - (if org-export-latex-packages-alist - (concat "\n" - (mapconcat (lambda(p) - (if (equal "" (car p)) - (format "\\usepackage{%s}" (cadr p)) - (format "\\usepackage[%s]{%s}" - (car p) (cadr p)))) - org-export-latex-packages-alist "\n")) - "") - "\n\\begin{document}\n" string "\n\\end{document}\n")) + (insert (org-splice-latex-header + org-format-latex-header + org-export-latex-default-packages-alist + org-export-latex-packages-alist + org-format-latex-header-extra)) + (insert "\n\\begin{document}\n" string "\n\\end{document}\n") + (require 'org-latex) + (org-export-latex-fix-inputenc)) (let ((dir default-directory)) (condition-case nil (progn @@ -14707,13 +15304,70 @@ dvifile) (error nil)) (if (not (file-exists-p pngfile)) - (progn (message "Failed to create png file from %s" texfile) nil) + (if org-format-latex-signal-error + (error "Failed to create png file from %s" texfile) + (message "Failed to create png file from %s" texfile) + nil) ;; Use the requested file name and clean up (copy-file pngfile tofile 'replace) (loop for e in '(".dvi" ".tex" ".aux" ".log" ".png") do (delete-file (concat texfilebase e))) pngfile)))) +(defun org-splice-latex-header (tpl def-pkg pkg &optional extra) + "Fill a LaTeX header template TPL. +In the template, the following place holders will be recognized: + + [DEFAULT-PACKAGES] \\usepackage statements for DEF-PKG + [NO-DEFAULT-PACKAGES] do not include DEF-PKG + [PACKAGES] \\usepackage statements for PKG + [NO-PACKAGES] do not include PKG + [EXTRA] the string EXTRA + [NO-EXTRA] do not include EXTRA + +For backward compatibility, if both the positive and the negative place +holder is missing, the positive one (without the \"NO-\") will be +assumed to be present at the end of the template. +DEF-PKG and PKG are assumed to be alists of options/packagename lists. +EXTRA is a string." + (let (rpl (end "")) + (if (string-match "^[ \t]*\\[\$NO-\$?DEFAULT-PACKAGES\\][ \t]*\n?" tpl) + (setq rpl (if (or (match-end 1) (not def-pkg)) + "" (org-latex-packages-to-string def-pkg t)) + tpl (replace-match rpl t t tpl)) + (if def-pkg (setq end (org-latex-packages-to-string def-pkg)))) + + (if (string-match "\\[\$NO-\$?PACKAGES\\][ \t]*\n?" tpl) + (setq rpl (if (or (match-end 1) (not pkg)) + "" (org-latex-packages-to-string pkg t)) + tpl (replace-match rpl t t tpl)) + (if pkg (setq end (concat end "\n" (org-latex-packages-to-string pkg))))) + + (if (string-match "\\[\$NO-\$?EXTRA\\][ \t]*\n?" tpl) + (setq rpl (if (or (match-end 1) (not extra)) + "" (concat extra "\n")) + tpl (replace-match rpl t t tpl)) + (if (and extra (string-match "\\S-" extra)) + (setq end (concat end "\n" extra)))) + + (if (string-match "\\S-" end) + (concat tpl "\n" end) + tpl))) + +(defun org-latex-packages-to-string (pkg &optional newline) + "Turn an alist of packages into a string with the \\usepackage macros." + (setq pkg (mapconcat (lambda(p) + (cond + ((stringp p) p) + ((equal "" (car p)) + (format "\\usepackage{%s}" (cadr p))) + (t + (format "\\usepackage[%s]{%s}" + (car p) (cadr p))))) + pkg + "\n")) + (if newline (concat pkg "\n") pkg)) + (defun org-dvipng-color (attr) "Return an rgb color specification for dvipng." (apply 'format "rgb %s %s %s" @@ -14985,7 +15639,7 @@ "Show the available speed commands." (interactive) (if (not org-use-speed-commands) - (error "Speed commands are not activated, customize `org-use-speed-commands'") + (error "Speed commands are not activated, customize `org-use-speed-commands'.") (with-output-to-temp-buffer "*Help*" (princ "User-defined Speed commands\n===========================\n") (mapc 'org-print-speed-command org-speed-commands-user) @@ -15562,6 +16216,8 @@ `ffap' to visit the file at point." (interactive) (cond + ((org-at-table.el-p) + (org-edit-src-code)) ((org-at-table-p) (call-interactively 'org-table-edit-formulas)) ((save-excursion @@ -15602,9 +16258,6 @@ - If the cursor is a the beginning of a dynamic block, update it. -- If the cursor is inside a table created by the table.el package, - activate that table. - - If the current buffer is a remember buffer, close note and file it. A prefix argument of 1 files to the default location without further interaction. A prefix argument of 2 files to @@ -15631,7 +16284,8 @@ (fboundp org-finish-function)) (funcall org-finish-function)) ((run-hook-with-args-until-success 'org-ctrl-c-ctrl-c-hook)) - ((org-at-property-p) + ((or (looking-at org-property-start-re) + (org-at-property-p)) (call-interactively 'org-property-action)) ((org-on-target-p) (call-interactively 'org-update-radio-target-regexp)) ((and (org-in-regexp "\\[\$[0-9]*%\\|[0-9]*/[0-9]*\$\\]") @@ -15639,10 +16293,7 @@ (call-interactively 'org-update-statistics-cookies)) ((org-on-heading-p) (call-interactively 'org-set-tags)) ((org-at-table.el-p) - (require 'table) - (beginning-of-line 1) - (re-search-forward "|" (save-excursion (end-of-line 2) (point))) - (call-interactively 'table-recognize-table)) + (message "Use C-c ' to edit table.el tables")) ((org-at-table-p) (org-table-maybe-eval-formula) (if arg @@ -15674,9 +16325,9 @@ (if (org-at-table-p) (org-call-with-arg 'org-table-recalculate (or arg t))))) (t -; (org-set-regexps-and-options) -; (org-restart-font-lock) - (let ((org-inhibit-startup t)) (org-mode-restart)) + (let ((org-inhibit-startup-visibility-stuff t) + (org-startup-align-all-tables nil)) + (org-save-outline-visibility 'use-markers (org-mode-restart))) (message "Local setup has been refreshed")))) ((org-clock-update-time-maybe)) (t (error "C-c C-c can do nothing useful at this location"))))) @@ -16099,7 +16750,9 @@ (not org-export-with-LaTeX-fragments)) (require 'org-exp)) :style toggle :selected (and (boundp 'org-export-with-LaTeX-fragments) - org-export-with-LaTeX-fragments)]) + org-export-with-LaTeX-fragments)] + "--" + ["Template for BEAMER" org-beamer-settings-template t]) "--" ("MobileOrg" ["Push Files and Views" org-mobile-push t] @@ -16440,7 +17093,8 @@ (defun org-fill-template (template alist) "Find each %key of ALIST in TEMPLATE and replace it." - (let (entry key value) + (let ((case-fold-search nil) + entry key value) (setq alist (sort (copy-sequence alist) (lambda (a b) (< (length (car a)) (length (car b)))))) (while (setq entry (pop alist)) @@ -16664,6 +17318,17 @@ (throw 'exit t))) nil)))) +(defun org-in-regexps-block-p (start-re end-re) + "Returns t if the current point is between matches of START-RE and END-RE. +This will also return to if point is on one of the two matches." + (interactive) + (let ((p (point))) + (save-excursion + (and (or (org-at-regexp-p start-re) + (re-search-backward start-re nil t)) + (re-search-forward end-re nil t) + (>= (point) p))))) + (defun org-occur-in-agenda-files (regexp &optional nlines) "Call `multi-occur' with buffers for all agenda files." (interactive "sOrg-files matching: \np") @@ -16970,6 +17635,12 @@ t t)) (org-move-to-column column))) +(defvar org-adaptive-fill-regexp-backup adaptive-fill-regexp + "Variable to store copy of `adaptive-fill-regexp'. +Since `adaptive-fill-regexp' is set to never match, we need to +store a backup of its value before entering `org-mode' so that +the functionality can be provided as a fall-back.") + (defun org-set-autofill-regexps () (interactive) ;; In the paragraph separator we include headlines, because filling @@ -17005,8 +17676,11 @@ ;; and fixed-width regions are not wrapped. That function will pass ;; through to `fill-paragraph' when appropriate. (org-set-local 'fill-paragraph-function 'org-fill-paragraph) - ; Adaptive filling: To get full control, first make sure that + ;; Adaptive filling: To get full control, first make sure that ;; `adaptive-fill-regexp' never matches. Then install our own matcher. + (unless (local-variable-p 'adaptive-fill-regexp) + (org-set-local 'org-adaptive-fill-regexp-backup + adaptive-fill-regexp)) (org-set-local 'adaptive-fill-regexp "\000") (org-set-local 'adaptive-fill-function 'org-adaptive-fill-function) @@ -17035,8 +17709,11 @@ "Return a fill prefix for org-mode files. In particular, this makes sure hanging paragraphs for hand-formatted lists work correctly." - (cond ((looking-at "#[ \t]+") - (match-string 0)) + (cond + ;; Comment line + ((looking-at "#[ \t]+") + (match-string-no-properties 0)) + ;; Description list ((looking-at "[ \t]*\$[-*+] .*? :: \$") (save-excursion (if (> (match-end 1) (+ (match-beginning 1) @@ -17044,11 +17721,14 @@ (goto-char (+ (match-beginning 1) 5)) (goto-char (match-end 0))) (make-string (current-column) ?\ ))) - ((looking-at "[ \t]*\$[-*+] \\|[0-9]+[.)] ?\$?") + ;; Ordered or unordered list + ((looking-at "[ \t]*\$[-*+] \\|[0-9]+[.)] ?\$") (save-excursion (goto-char (match-end 0)) (make-string (current-column) ?\ ))) - (t nil))) + ;; Other text + ((looking-at org-adaptive-fill-regexp-backup) + (match-string-no-properties 0)))) ;;; Other stuff. @@ -17389,6 +18069,15 @@ (defun org-at-heading-p (&optional ignored) (outline-on-heading-p t)) +(defun org-point-at-end-of-empty-headline () + "If point is at the end of an empty headline, return t, else nil. +If the heading only contains a TODO keyword, it is still still considered +empty." + (and (looking-at "[ \t]*$") + (save-excursion + (beginning-of-line 1) + (looking-at (concat "^\$\\*+\$[ \t]+\$" org-todo-regexp + "\$?[ \t]*$"))))) (defun org-at-heading-or-item-p () (or (org-on-heading-p) (org-at-item-p))) @@ -17567,7 +18256,7 @@ (setq l (- (match-end 0) (match-beginning 0) 1)) (= l level) (not invisible-ok) - (org-invisible-p)) + (progn (backward-char 1) (org-invisible-p))) (if (< l level) (setq arg 1))) (setq arg (1- arg))) (beginning-of-line 1))) @@ -17849,4 +18538,3 @@ ;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd ;;; org.el ends here -