Mercurial > emacs
comparison lisp/org/org-infojs.el @ 94414:d86cb59eea9f
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org.el (org-html-level-start): Always have id's in HTML
(org-export-as-html): Use `org-link-protocols' to
retrieve the export form of the link.
(org-add-link-type): Final parameter renamed from PUBLISH. Better
documentation of how it is to be used. Avoid double entries for
the same link type.
(org-add-link-props): New function.
(org-modules-loaded): New variable.
(org-load-modules-maybe, org-set-modules): New function.
(org-modules): New option.
(org-mode, org-cycle, orgstruct-mode, org-run-like-in-org-mode)
(orgtbl-mode, org-store-link, org-insert-link-global)
(org-open-at-point): Call `org-load-modules-maybe'.
(org-search-view): Add more text properties.
(org-agenda-schedule, org-agenda-deadline): Allow also in
search-type agendas.
(org-search-view): Order of arguments has been changed.
Interpret prefix-arg as TODO-ONLY.
(org-agenda, org-run-agenda-series, org-agenda-manipulate-query):
Take new argument order of `org-search-view' into account.
(org-todo-only): New variable.
(org-search-syntax-table): New variable and function.
(org-search-view): Do the search with the special syntax table.
(define-obsolete-function-alias): Make work with XEmacs.
(org-add-planning-info): Use old date as default when modifying an
existing deadline or scheduled item.
(org-agenda-compute-time-span): Make argument N optional.
(org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays).
(org-read-date-analyze): Define local variable `iso-date'.
(org-agenda-format-date-aligned): Remove dependency on
`calendar-time-from-absolute'.
(org-remember-apply-template, org-go-to-remember-target):
Interpret filenames relative to `org-directory'.
(org-complete): Silently fail when trying to complete
keywords that don't have a default value.
(org-get-current-options): Added a #+DATE: option.
(org-additional-option-like-keywords): Removed "DATE:" from the
list of additional keywords.
(org-export-as-html): Removed (current-time) as unnecessary second
argument of `format-time-string'.
(org-clock-find-position): Handle special case at end of
buffer.
(org-agenda-day-view): New argument DAY-OF-YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-week-view): New argument ISO-WEEK, pass it on to
`org-agenda-change-time-span'.
(org-agenda-month-view): New argument MONTH, pass it on to
`org-agenda-change-time-span'.
(org-agenda-year-view): New argument YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-change-time-span): New optional argument N, pass it on
to `org-agenda-compute-time-span'.
(org-agenda-compute-time-span): New argument N, interpret it by
changing the starting day.
(org-small-year-to-year): New function.
(org-scheduled-past-days): Respect
`org-scheduled-past-days'.
(org-auto-repeat-maybe): Make sure that repeating
dates are pushed into the future, and that the shift is at least
one interval, never 0.
(org-update-checkbox-count): Fix bug with checkbox
counting.
(org-add-note): New command.
(org-add-log-setup): Renamed from `org-add-log-maybe'.
(org-log-note-headings): New entry for plain notes (i.e. notes not
related to state changes or clocking).
(org-get-org-file): Check for availability of
`remember-data-file'.
(org-cached-entry-get): Allow a regexp value for
`org-use-property-inheritance'.
(org-use-property-inheritance): Allow regexp value. Fix bug in
customization type.
(org-use-tag-inheritance): Allow a list and a regexp value for
this variable.
(org-scan-tags, org-get-tags-at): Implement selective tag
inheritance.
(org-entry-get): Respect value `selective' for the INHERIT
argument.
(org-tag-inherit-p, org-property-inherit-p): New functions.
(org-agenda-format-date-aligned): Allow 10 characters for
weekday, to acomodate German locale.
(org-add-archive-files): New function.
(org-agenda-files): New argument `ext', to
get archive files as well.
(org-tbl-menu): Protect the use of variables that
are only available when org-table.el gets loaded.
(org-read-agenda-file-list): Error if `org-agenda-files' is a
single directory.
(org-open-file): Allow a batch process to trigger
waiting after executing a system command.
(org-store-link): Link to headline when there is not
target and no region in an org-mode buffer when creating a link.
(org-link-types-re): New variable.
(org-make-link-regexps): Compute `org-link-types-re'.
(org-make-link-description-function): New option.
(org-agenda-date, org-agenda-date-weekend): New faces.
(org-archive-sibling-heading): New option.
(org-archive-to-archive-sibling): New function.
(org-iswitchb): New command.
(org-buffer-list): New function.
(org-agenda-columns): Also try the #+COLUMNS line in
the buffer associated with the entry at point (or with the first
entry in the agenda view).
(org-modules): Add entry for org-bibtex.el.
(org-completion-fallback-command): Moved into `org-completion'
group.
(org-clock-heading-function): Moved to `org-progress' group.
(org-auto-repeat-maybe): Make sure that a note can
be enforces if `org-log-repeat' is `note'.
(org-modules): Allow additional symbols for external
packages.
(org-ctrl-c-ctrl-c): Allow for `org-clock-overlays' to be
undefined.
(org-clock-goto): Hide drawers after showing an
entry with `org-clock-goto.'
(org-shiftup, org-shiftdown, org-shiftright, org-shiftleft): Try
also a clocktable block shift.
(org-clocktable-try-shift): New function.
(org-columns-hscoll-title): New function.
(org-columns-previous-hscroll): New variable.
(org-columns-full-header-line-format): New variable.
(org-columns-display-here-title, org-columns-remove-overlays):
Install `org-columns-hscoll-title' in post-command-hook.
* org/org.el: Split into many small files.
* org/org-agenda.el: New file, split off from org.el.
* org/org-archive.el: New file, split off from org.el.
* org/org-bbdb.el: New file.
* org/org-bibtex.el: New file, split off from org.el.
* org/org-clock.el: New file, split off from org.el.
* org/org-colview.el: New file, split off from org.el.
* org/org-compat.el: New file, split off from org.el.
* org/org-exp.el: New file, split off from org.el.
* org/org-faces.el: New file, split off from org.el.
* org/org-gnus.el: New file, split off from org.el.
* org/org-info.el: New file, split off from org.el.
* org/org-infojs.el: New file.
* org/org-irc.el: New file.
* org/org-macs.el: New file, split off from org.el.
* org/org-mew.el: New file.
* org/org-mhe.el: New file, split off from org.el.
* org/org-publish.el: New file, split off from org.el.
* org/org-remember.el: New file, split off from org.el.
* org/org-rmail.el: New file, split off from org.el.
* org/org-table.el: New file, split off from org.el.
* org/org-vm.el: New file, split off from org.el.
* org/org-wl.el: New file, split off from org.el.
2008-04-27 Jason Riedy <jason@acm.org>
* lisp/org-table.el (orgtbl-to-generic): Add a :remove-nil-lines
parameter that supresses lines that evaluate to NIL.
(orgtbl-get-fmt): New inline function for
picking apart formats that may be lists.
(orgtbl-apply-fmt): New inline function for applying formats that
may be functions.
(orgtbl-eval-str): New inline function for strings that may be
functions.
(orgtbl-format-line, orgtbl-to-generic): Use and document.
(orgtbl-to-latex, orgtbl-to-texinfo): Document.
(*orgtbl-llfmt*, *orgtbl-llstart*)
(*orgtbl-llend*): Dynamic variables for last-line formatting.
(orgtbl-format-section): Shift formatting to support detecting the
last line and formatting it specially.
(orgtbl-to-generic): Document :ll* formats. Set to the non-ll
formats unless overridden.
(orgtbl-to-latex): Suggest using :llend to suppress the final \\.
(*orgtbl-table*, *orgtbl-rtn*): Dynamically
bound variables to hold the input collection of lines and output
formatted text.
(*orgtbl-hline*, *orgtbl-sep*, *orgtbl-fmt*, *orgtbl-efmt*,
(*orgtbl-lfmt*, *orgtbl-lstart*, *orgtbl-lend*): Dynamically bound
format parameters.
(orgtbl-format-line): New function encapsulating formatting for a
single line.
(orgtbl-format-section): Similar for each section. Rebinding the
dynamic vars customizes the formatting for each section.
(orgtbl-to-generic): Use orgtbl-format-line and
orgtbl-format-section.
(org-get-param): Now unused, so delete.
(orgtbl-gather-send-defs): New function to
gather all the SEND definitions before a table.
(orgtbl-send-replace-tbl): New function to find the RECEIVE
corresponding to the current name.
(orgtbl-send-table): Use the previous two functions and implement
multiple destinations for each table.
* doc/org.texi (A LaTeX example): Note that fmt may be a
one-argument function, and efmt may be a two-argument function.
(Radio tables): Document multiple destinations.
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org-agenda.el (org-add-to-diary-list): New function.
(org-prefix-has-effort): New variable.
(org-sort-agenda-noeffort-is-high): New option.
(org-agenda-columns-show-summaries)
(org-agenda-columns-compute-summary-properties): New options.
(org-format-agenda-item): Compute the duration of the item.
(org-agenda-weekend-days): New variable.
(org-agenda-list, org-timeline): Use the proper faces for dates in
the agenda and timeline buffers.
(org-agenda-archive-to-archive-sibling): New command.
(org-agenda-start-with-clockreport-mode): New option.
(org-agenda-clockreport-parameter-plist): New option.
(org-agenda-clocktable-mode): New variable.
(org-agenda-deadline-leaders): Allow a function value for the
deadline leader.
(org-agenda-get-deadlines): Deal with new function value.
* lisp/org-clock.el (org-clock): New customization group.
(org-clock-into-drawer, org-clock-out-when-done)
(org-clock-in-switch-to-state, org-clock-heading-function): Moved
into the new group.
(org-clock-out-remove-zero-time-clocks): New option.
(org-clock-out): Use `org-clock-out-remove-zero-time-clocks'.
(org-dblock-write:clocktable): Allow a Lisp form for the scope
parameter.
(org-dblock-write:clocktable): Fixed bug with total time
calculation.
(org-dblock-write:clocktable): Request the unrestricted list of
files.
(org-get-clocktable): New function.
(org-dblock-write:clocktable): Make sure :tstart and :tend can not
only be strings but also integers (an absolute day number) and
lists (m d y).
* org/org-colview.el (org-columns-next-allowed-value)
(org-columns-edit-value): Limit the effort for updatig in the
agenda to recomputing a single file.
(org-columns-compute): Only write property value if it has
changed. This avoids raising the buffer-change-flag
unnecessarily.
(org-agenda-colview-summarize)
(org-agenda-colview-compute): New functions.
(org-agenda-columns): Call `org-agenda-colview-summarize'.
* org/org-exp.el (org-export-run-in-background): New option.
(org-export-icalendar): Allow a batch process to trigger waiting
after executing a system command.
(org-export-preprocess-string): Renamed-from
`org-cleaned-string-for-export'.
(org-export-html-style): Made target class look like normal text.
(org-export-as-html): Make use of the better proprocessing in
`org-cleaned-string-for-export'.
(org-cleaned-string-for-export): Better treatment of heuristic
targets, many more internal links will now work in HTML export.
(org-get-current-options): Incorporate LINK_UP, LINK_HOME, and
INFOJS.
(org-export-inbuffer-options-extra): New variable.
(org-export-options-filters): New hook.
(org-infile-export-plist): Find also the settings keywords in
`org-export-inbuffer-options-extra'.
(org-infile-export-plist): Allow multiple #+OPTIONS lines and
multiple #+INFOJS_OPT lines.
(org-export-html-handle-js-options): New function.
(org-export-html-infojs-setup): New option.
(org-export-as-html): Call `org-export-html-handle-js-options'.
Add autoload to all entry points.
(org-skip-comments): Function removed.
* org/org-table.el (org-table-make-reference): Extra parenthesis
around single fields, to make sure that algebraic formulas get
correctly interpreted by calc.
(org-table-current-column): No longer interactive.
* org/org-export-latex.el (org-export-latex-preprocess): Renamed
from `org-export-latex-cleaned-string'.
2008-04-27 Bastien Guerry <bzg@altern.org>
* org/org-publish.el (org-publish-get-base-files-1): New function.
(org-publish-get-base-files): Use it.
(org-publish-temp-files): New variable.
Don't require 'dired-aux anymore.
(org-publish-initial-buffer): New variable.
(org-publish-org-to, org-publish): Use it.
(org-publish-get-base-files-1): Bug fix: get
the proper list of files when recursing thru a directory.
(org-publish-get-base-files): Use the :exclude property to skip
both files and directories.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 27 Apr 2008 18:33:39 +0000 |
parents | |
children | da5141d2e8fc |
comparison
equal
deleted
inserted
replaced
94413:90289baecd6a | 94414:d86cb59eea9f |
---|---|
1 ;;; org-infojs.el --- Support for org-info.js Javascript in Org HTML export | |
2 | |
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Carsten Dominik <carsten at orgmode dot org> | |
6 ;; Keywords: outlines, hypermedia, calendar, wp | |
7 ;; Homepage: http://orgmode.org | |
8 ;; Version: 6.02b | |
9 ;; | |
10 ;; This file is part of GNU Emacs. | |
11 ;; | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 3, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
25 ;; Boston, MA 02110-1301, USA. | |
26 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
27 ;; | |
28 ;;; Commentary: | |
29 | |
30 ;; This file implements the support for Sebastian Rose's Javascript | |
31 ;; org-info.js to display an org-mode file exported to HTML in an | |
32 ;; Info-like way, or using folding similar to the outline structure | |
33 ;; org org-mode itself. | |
34 | |
35 ;; Documentation for using this module is in the Org manual. The script | |
36 ;; itself is documented by Sebastian Rose in a file distributed with | |
37 ;; the script. FIXME: Accurate pointers! | |
38 | |
39 ;; Org-mode loads this module by default - if this is not what you want, | |
40 ;; configure the variable `org-modules'. | |
41 | |
42 ;;; Code: | |
43 | |
44 (require 'org-exp) | |
45 | |
46 (add-to-list 'org-export-inbuffer-options-extra '("INFOJS_OPT" :infojs-opt)) | |
47 (add-hook 'org-export-options-filters 'org-infojs-handle-options) | |
48 | |
49 (defgroup org-infojs nil | |
50 "Options specific for using org-info.js in HTML export of Org-mode files." | |
51 :tag "Org Export HTML INFOJS" | |
52 :group 'org-export-html) | |
53 | |
54 (defcustom org-export-html-use-infojs 'when-configured | |
55 "Should Sebasian Rose's Java Script org-info.js be linked into HTML files? | |
56 This option can be nil or t to never or always use the script. It can | |
57 also be the symbol `when-configured', meaning that the script will be | |
58 linked into the export file if and only if there is a \"#+INFOJS_OPT:\" | |
59 line in the buffer. See also the variable `org-infojs-options'." | |
60 :group 'org-export-html | |
61 :group 'org-infojs | |
62 :type '(choice | |
63 (const :tag "Never" nil) | |
64 (const :tag "When configured in buffer" when-configured) | |
65 (const :tag "Always" t))) | |
66 | |
67 (defconst org-infojs-opts-table | |
68 '((path PATH "http://orgmode.org/org-info.js") | |
69 (view VIEW "info") | |
70 (toc TOC :table-of-contents) | |
71 (tdepth TOC_DEPTH "max") | |
72 (sdepth SECTION_DEPTH "max") | |
73 (mouse MOUSE_HINT "underline") | |
74 (buttons VIEW_BUTTONS "0") | |
75 (ltoc LOCAL_TOC "1") | |
76 (up LINK_UP :link-up) | |
77 (home LINK_HOME :link-home)) | |
78 "JavaScript options, long form for script, default values.") | |
79 | |
80 (defvar org-infojs-options) | |
81 (when (and (boundp 'org-infojs-options) | |
82 (assq 'runs org-infojs-options)) | |
83 (setq org-infojs-options (delq (assq 'runs org-infojs-options) | |
84 org-infojs-options))) | |
85 | |
86 (defcustom org-infojs-options | |
87 (mapcar (lambda (x) (cons (car x) (nth 2 x))) | |
88 org-infojs-opts-table) | |
89 "Options settings for the INFOJS Javascript. | |
90 Each of the options must have an entry in `org-export-html/infojs-opts-table'. | |
91 The value can either be a string that will be passed to the script, or | |
92 a property. This property is then assumed to be a property that is defined | |
93 by the Export/Publishing setup of Org. | |
94 The `sdepth' and `tdepth' parameters can also be set to \"max\", which | |
95 means to use the maximum value consistent with other options." | |
96 :group 'org-infojs | |
97 :type | |
98 `(set :greedy t :inline t | |
99 ,@(mapcar | |
100 (lambda (x) | |
101 (list 'cons (list 'const (car x)) | |
102 '(choice | |
103 (symbol :tag "Publishing/Export property") | |
104 (string :tag "Value")))) | |
105 org-infojs-opts-table))) | |
106 | |
107 (defcustom org-infojs-template | |
108 "<script type=\"text/javascript\" language=\"JavaScript\" src=\"%SCRIPT_PATH\"></script> | |
109 <script type=\"text/javascript\" language=\"JavaScript\"> | |
110 /* <![CDATA[ */ | |
111 %MANAGER_OPTIONS | |
112 org_html_manager.setup(); // activate after the parameterd are set | |
113 /* ]]> */ | |
114 </script>" | |
115 "The template for the export style additions when org-info.js is used. | |
116 Option settings will replace the %MANAGER-OPTIONS cookie." | |
117 :group 'org-infojs | |
118 :type 'string) | |
119 | |
120 (defun org-infojs-handle-options (exp-plist) | |
121 "Analyze JavaScript options in INFO-PLIST and modify EXP-PLIST accordingly." | |
122 (if (or (not org-export-html-use-infojs) | |
123 (and (eq org-export-html-use-infojs 'when-configured) | |
124 (or (not (plist-get exp-plist :infojs-opt)) | |
125 (string-match "\\<view:nil\\>" | |
126 (plist-get exp-plist :infojs-opt))))) | |
127 ;; We do not want to use the script | |
128 exp-plist | |
129 ;; We do want to use the script, set it up | |
130 (let ((template org-infojs-template) | |
131 (ptoc (plist-get exp-plist :table-of-contents)) | |
132 (hlevels (plist-get exp-plist :headline-levels)) | |
133 tdepth sdepth p1 s p v a1 tmp e opt var val table default) | |
134 (setq sdepth hlevels | |
135 tdepth hlevels) | |
136 (if (integerp ptoc) (setq tdepth (min ptoc tdepth))) | |
137 (setq v (plist-get exp-plist :infojs-opt) | |
138 table org-infojs-opts-table) | |
139 (while (setq e (pop table)) | |
140 (setq opt (car e) var (nth 1 e) | |
141 default (cdr (assoc opt org-infojs-options))) | |
142 (and (symbolp default) (not (memq default '(t nil))) | |
143 (setq default (plist-get exp-plist default))) | |
144 (if (string-match (format " %s:\\(\\S-+\\)" opt) v) | |
145 (setq val (match-string 1 v)) | |
146 (setq val default)) | |
147 (cond | |
148 ((eq opt 'path) | |
149 (and (string-match "%SCRIPT_PATH" template) | |
150 (setq template (replace-match val t t template)))) | |
151 ((eq opt 'sdepth) | |
152 (if (integerp (read val)) | |
153 (setq sdepth (min (read val) hlevels)))) | |
154 ((eq opt 'tdepth) | |
155 (if (integerp (read val)) | |
156 (setq tdepth (min (read val) hlevels)))) | |
157 (t | |
158 (setq val | |
159 (cond | |
160 ((or (eq val t) (equal val "t")) "1") | |
161 ((or (eq val nil) (equal val "nil")) "0") | |
162 ((stringp val) val) | |
163 (t (format "%s" val)))) | |
164 (push (cons var val) s)))) | |
165 | |
166 ;; Now we set the depth of the *generated* TOC to SDEPTH, because the | |
167 ;; toc will actually determine the splitting. How much of the toc will | |
168 ;; actually be displayed is governed by the TDEPTH option. | |
169 (setq exp-plist (plist-put exp-plist :table-of-contents sdepth)) | |
170 | |
171 ;; The table of contents should ot show more sections then we generate | |
172 (setq tdepth (min tdepth sdepth)) | |
173 (push (cons "TOC_DEPTH" tdepth) s) | |
174 | |
175 (setq s (mapconcat | |
176 (lambda (x) (format "org_html_manager.set(\"%s\", \"%s\");" | |
177 (car x) (cdr x))) | |
178 s "\n")) | |
179 (when (and s (> (length s) 0)) | |
180 (and (string-match "%MANAGER_OPTIONS" template) | |
181 (setq s (replace-match s t t template)) | |
182 (setq exp-plist | |
183 (plist-put | |
184 exp-plist :style | |
185 (concat (or (plist-get exp-plist :style) "") "\n" s))))) | |
186 ;; This script absolutely needs the table of contents, to we change that | |
187 ;; setting | |
188 (if (not (plist-get exp-plist :table-of-contents)) | |
189 (setq exp-plist (plist-put exp-plist :table-of-contents t))) | |
190 ;; Return the modified property list | |
191 exp-plist))) | |
192 | |
193 (defun org-infojs-options-inbuffer-template () | |
194 (format "#+INFOJS_OPT: view:%s toc:%s ltoc:%s mouse:%s buttons:%s path:%s" | |
195 (if (eq t org-export-html-use-infojs) (cdr (assoc 'view org-infojs-options)) nil) | |
196 (let ((a (cdr (assoc 'toc org-infojs-options)))) | |
197 (cond ((memq a '(nil t)) a) | |
198 (t (plist-get (org-infile-export-plist) :table-of-contents)))) | |
199 (if (equal (cdr (assoc 'ltoc org-infojs-options)) "1") t nil) | |
200 (cdr (assoc 'mouse org-infojs-options)) | |
201 (cdr (assoc 'buttons org-infojs-options)) | |
202 (cdr (assoc 'path org-infojs-options)))) | |
203 | |
204 (provide 'org-infojs) | |
205 | |
206 ;;; org-infojs.el ends here |