Mercurial > emacs
annotate lisp/org/org-jsinfo.el @ 101458:36abe982e7cd
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-html): Turn \par into a paragraph.
* org.el (org-agenda-tags-todo-honor-ignore-options): Declare
variable.
* org-table.el (org-table-insert-hline): Fix typo in fuction call
to `backward-char'.
* org-exp.el (org-export-as-html): Remove the initial space from
colon examples.
* org.el (org-scan-tags): Call
`org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item'.
* org-agenda.el (org-agenda-todo-list, org-agenda-match-view): New
customization groups.
(org-agenda-tags-todo-honor-ignore-options): New option.
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
New function.
(org-agenda-get-todos): Use
`org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item'.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-format-source-code-or-example): Escape
HTML characters also in examples that anre not treated with
htmlize. Also, just switch to EXAMPLE processing if we do not
have a good version of htmlize.
* org-rmail.el: Fix copyright notice.
* org.el (org-activate-footnote-links): Improve footnote link
highlighting.
* org-footnote.el (org-footnote-normalize): Fix finding the end of
a footnote definition at the end of the file.
* org-table.el (org-table-get-specials): Add an imagined hline at
the end of the table. This can be useful for references that want
to go to the end of the table. Also fix bug when computing last
row constants, in tables that do not start right at the right
margin.
(org-table-eval-formula): Match and replace remove references.
(org-table-formula-substitute-names): Make sure that names inside
a "remote" call are left alone, the will be replaced later when
the remote call is handled.
(org-table-convert-refs-to-rc): Do not convert things that might
look like a reference, but are really part of an ID or namei n a
remote reference.
(org-table-get-remote-range): New function.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-faces.el (org-clock-overlay): Fix bug in face definition.
* org-clock.el (org-clock-put-overlay): Use new face instead of
`secondary-selection'.
* org-faces.el (org-clock-overlay): New face.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-get-current-options): Include the option for
publishing time stamps.
* org.el (org-toggle-heading): Renamed from
`org-toggel-region-headings'.
No longer needs a region defined, but will use it if there is one.
(org-ctrl-c-star): Simplified, relying more on the internal
workings of `org-toggle-heading'.
(org-toggle-item): Renamed from `org-toggle-region-items'.
No longer needs a region defined, but will use it if there is one.
(org-ctrl-c-minus): Simplified, relying more on the inernal
workings of `org-toggle-item'.
* org-export-latex.el (org-export-latex-preprocess): Fix bug in
environment detection. Also, do real changes only in unprotected
places.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-export-latex.el (org-export-latex-quotation-marks): Use
`org-if-unprotected-1'.
(org-export-latex-set-initial-vars): Check for class definition in
property.
* org-macs.el (org-if-unprotected-1): New macro.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-compat.el (org-count-lines): New function.
* org-exp.el (org-export-format-source-code-or-example): Handle
switches related to text areas.
* org.el (org-activate-footnote-links): Don't allow match inside a
link.
* org-footnote.el (org-footnote-re): Don't allow match inside a link.
* org-export-latex.el (org-export-latex-links): Keep a relative
path relative also after export.
* org-exp.el (org-export-html-scripts): Fix HTML snippet.
* org.el (org-make-tags-matcher): Never use IDO for completing the
tags matcher match string.
(org-completing-read): Also remove the special biding for "?".
* org-attach.el (org-attach-allow-inheritance): New option.
(org-attach-inherited): New variable.
(org-attach-dir): Handle properties related to the attachment
directory.
(org-attach-check-absolute-path): New function.
(org-attach-set-directory, org-attach-set-inherit): New commands.
(org-attach): Accommodate the new commands in the dispatcher.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-compat.el (org-fit-window-to-buffer): Fix bug with using
`window-full-width-p'.
* org-exp.el (org-export-as-html): Only check for images files
that really can be inlined
* org.el (org-image-file-name-regexp, org-file-image-p): Allow the
list of extensions to be a parameter.
* org-exp.el (org-export-html-inline-image-extensions): New
variable.
* org-agenda.el (org-prepare-agenda): Use
`org-agenda-block-separator'.
(org-agenda-block-separator): New option.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-export-latex.el (org-export-latex-tables): Call
`org-table-clean-before-export' with the new optional argument.
* org-exp.el (org-table-clean-before-export): New optional
parameter MAYBE-QUOTED, allows for quoted characters like \# in
first column.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-plot.el (org-plot/gnuplot): Fix text-ind parameter for
histograms.
* org-colview.el (org-colview-construct-allowed-dates): Better
error catching when a date/time property does not have allowed
values defined.
* org-colview-xemacs.el (org-colview-construct-allowed-dates):
Better error catching when a date/time property does not have
allowed values defined.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-map-entries): Restore point and restriction after
`org-map-entries'.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-time=, org-time<, org-time<=, org-time>)
(org-time>=, org-time<>): Make sure both values are dates.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-archive.el (org-extract-archive-heading): Allow %s for file
name also in achive location heading.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-archive.el (org-add-archive-files): Uniquify the list before
returning it.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-compat.el (org-fit-window-to-buffer): Use
`window-full-width-p'.
* org-export-latex.el (org-export-latex-fixed-width): Enforce the
space after the colon in short examples.
* org-exp.el (org-export-protect-colon-examples): Rewritten, to
enforce a space after the colon. However, we also allow lines
that are *only* a colon.
(org-export-as-html): Enforce the space after the colon in short
examples.
(org-export-preprocess-string): Do the colon example protection
earlier.
(org-export-remove-timestamps): Do not check for protection at the
end of the line.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-format-latex-options): Add new matcher for single
letters between dollars.
(org-get-header): Function removed.
(org-heading-components): New function.
* org-exp.el (org-export-define-heading-targets): Record ID's also
as alternative targets.
(org-export-as-html): Interpret "id:" links to other files by
preserving the relative path.
* org-jsinfo.el (org-infojs-handle-options): Catch the case if v
is nil.
* org-exp.el (org-export-normalize-links): Protect the main link,
to avoid special character processing.
* org-export-latex.el (org-export-latex-special-keyword-regexp):
New variable.
(org-export-latex-special-string-regexps): Variable removed.
(org-export-latex-keywords): Use the new regexp.
* org-exp.el (org-export-handle-include-files): Fetch switches and
put them into the BEGIN statement.
* org-timer.el (org-timer-mode-line-string): New variable.
* org-clock.el (org-clock-mode-line-map): Renamed from
`org-clock-mode-map'.
(org-clock-mode-line-timer): Renamed from `org-mode-line-timer'.
(org-clock-update-mode-line): Renamed from `org-update-mode-line'.
(org-clock-put-overlay): Renamed from `org-put-clock-overlay'.
(org-clock-remove-overlays): Renamed from
`org-remove-clock-overlays'.
* org-timer.el (org-timer-pause-or-continue): Implement stopping
and mode line display.
(org-timer-stop): New command.
(org-timer-seconds): Return correct time when timer is paused.
(org-timer-mode-line-timer): New variable.
(org-timer-set-mode-line, org-timer-update-mode-line): New
functions.
* org.el (org-insert-heading): Handle new value `auto' for
`org-blank-before-new-entry'.
(org-org-menu): Add new items for timer functions.
* org-list.el (org-insert-item): Handle new value `auto' for
`org-blank-before-new-entry'.
* org.el (org-blank-before-new-entry): New value `auto', made
default.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-normalize-links): If the link is also
used as the description, protect the description.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-closest-date): Fix bug with yearly repeats, in
combination with preference of the past as it is used for deadline
and scheduling search.
* org-exp.el (org-html-handle-time-stamps): No longer check for
the `org-export-with-timestamps' option, because the preprocesser
has taken care of this already.
* org.el (org-entry-properties): Catch the case when this is
called in a non-org-mode file.
* org-export-latex.el (org-export-latex-remove-from-headlines):
Variable made obsolete, also LaTeX export now uses the standard
variables.
(org-export-as-latex): Add the timestamps parameter to the
preprocessor parameter list.
(org-export-latex-content): Export the remaining keywords without
considering to remove them.
(org-export-latex-keywords-maybe): Make the REMOVE-LIST optional.
Use bold font instead of tt font for the keywords.
(org-export-latex-fontify-headline): Format headlines, assuming
that all keywords still present should be published.
(org-export-latex-keywords): Remove argument TIMESTAMPS and just
publish what ever remains of the time stamps.
(org-export-latex-list-parameters): New option.
(org-export-latex-lists): Pass additional parameters to the list
converter.
* org-exp.el (org-export-preprocess-string): Remove clock lines
and timestamps already in the preprocesor.
(org-export-remove-timestamps, org-export-remove-clock-lines): New
functions.
(org-export-as-ascii, org-export-as-html): Add the timestamps
parameter to the preprocessor parameter list.
* org-list.el (org-list-parse-list): Parse for checkboxes.
(org-list-to-generic): Introduce and handle new parameters :cbon
and :cboff.
(org-list-to-latex, org-list-to-html, org-list-to-texinfo): Add
optional parameter PARAMS.
* org-export-latex.el (org-export-latex-special-chars): Fix
problems with interpreting dollar signs.
(org-inside-latex-math-p): New function.
(org-export-latex-preprocess): Protect all the math fragments.
* org.el (org-latex-regexps): Allow a dash after a dollar.
* org-w3m.el (org-w3m-copy-for-org-mode): Always deactivate the
mark after copying.
* org-agenda.el (org-run-agenda-series): Have series options set
when finalizing the agenda.
* org-exp.el (org-export-format-source-code-or-example): Protect
the converted examples.
* org.el (org-set-regexps-and-options): Fix the regexp
`org-complex-heading-regexp'.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-edit-src-get-label-format): New function.
(org-coderef-label-format): New option.
(org-edit-src-code, org-edit-src-find-region-and-lang): Parse for
a label format specification and make sure it is used in the edit
buffer.
(org-edit-src-get-label-format): New function.
(org-store-link): Handle new coderef formats.
(org-link-search): Handle new coderef formats.
* org-footnote.el (org-footnote-create-definition)
(org-footnote-goto-local-insertion-point): Make footnote insertion
work correctly when the "Footnotes" headline is the last line in
the buffer.
* org.el (org-goto-marker-or-bmk): Expose context after jumping to
the location.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-w3m.el (org-w3m): New customization group.
(org-w3m-deactivate-mark): New option.
(org-w3m-copy-for-org-mode): Deactivate region, unless the user
option say not to.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-set-font-lock-defaults): Trigger footnote
fontification.
(org-activate-footnote-links): New function.
(org-activate-links): New entry `footnote'.
* org-faces.el (org-footnote): New face.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-macs.el (org-re): Handle the [:word:] class.
* org-exp.el (org-export-preprocess-string): Call
`org-export-protect-colon-examples'.
(org-export-protect-colon-examples): Renamed from
`org-export-protect-examples', and scope limited to lines starting
with a colon.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-string): Move the preprocess
hook to after turning on Org-mode.
(org-export-preprocess-after-include-files-hook)
(org-export-preprocess-after-tree-selection-hook)
(org-export-preprocess-before-backend-specifics-hook)
(org-export-preprocess-final-hook): New hooks.
(org-export-preprocess-string): Run the new hooks.
* org.el (org-ctrl-c-minus): Fix indentation for new items.
* org-footnote.el: New file.
* org.el (org-footnote): Require footnote code.
(org-startup-options): Add new footnote options.
(org-mode-map): New keybindig for footnotes.
(org-ctrl-c-ctrl-c): Add function at footnotes.
(org-org-menu): New menu entries for footnotes.
* org-export-latex.el (org-export-as-latex): Pass footnote
variable to preprocessor.
(org-export-latex-preprocess): Treat multiple references to a
footnote.
* org-exp.el (org-export-preprocess-string): Call
`org-footnote-normalize'.
(org-export-as-ascii, org-export-as-html): Pass footnote variable
to preprocessor.
(org-export-as-html): Treat multiple references to a footnote.
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
* org-export-latex.el (org-export-latex-links): Handle coderef
links.
* org.el (org-bracket-link-analytic-regexp++): New variable.
(org-make-link-regexps): Initialize
`org-bracket-link-analytic-regexp++'.
(org-store-link): Implement special case in edit-src buffer.
(org-insert-link): No use of ide to insert stored links.
(org-link-search): Implement special case for coderefs.
* org-exp.el (org-export-html-scripts): New constant.
(org-export-html-style-default): Add a new style for highlighted
code.
(org-export-code-refs): New variable.
(org-export-preprocess-string): Initialize `org-export-code-refs'.
Call `org-export-replace-src-segments-and-examples'
No longer call `org-export-protect-examples'.
(org-export-target-internal-links): Take care of coderef targets.
(org-export-last-code-line-counter-value): New variable.
(org-export-replace-src-segments-and-examples): Renamed from
`org-export-replace-src-segments', and modified.
(org-export-format-source-code-or-example): Renamed from
`org-export-format-source-code'.
(org-export-number-lines): New function.
(org-export-as-ascii, org-export-as-html): Handle coderef links.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 25 Jan 2009 15:49:43 +0000 |
parents | a9dc0e7c3f2b |
children | 64ef70f990a9 |
rev | line source |
---|---|
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
1 ;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
2 |
100908 | 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
4 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
5 ;; Author: Carsten Dominik <carsten at orgmode dot org> |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
6 ;; Keywords: outlines, hypermedia, calendar, wp |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
7 ;; Homepage: http://orgmode.org |
101458
36abe982e7cd
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
100908
diff
changeset
|
8 ;; Version: 6.19a |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
9 ;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
10 ;; This file is part of GNU Emacs. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
11 ;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
15 ;; (at your option) any later version. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
16 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
20 ;; GNU General Public License for more details. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
21 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
24 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
25 ;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
26 ;;; Commentary: |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
27 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
28 ;; This file implements the support for Sebastian Rose's Javascript |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
29 ;; org-info.js to display an org-mode file exported to HTML in an |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
30 ;; Info-like way, or using folding similar to the outline structure |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
31 ;; org org-mode itself. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
32 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
33 ;; Documentation for using this module is in the Org manual. The script |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
34 ;; itself is documented by Sebastian Rose in a file distributed with |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
35 ;; the script. FIXME: Accurate pointers! |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
36 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
37 ;; Org-mode loads this module by default - if this is not what you want, |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
38 ;; configure the variable `org-modules'. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
39 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
40 ;;; Code: |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
41 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
42 (require 'org-exp) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
43 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
44 (add-to-list 'org-export-inbuffer-options-extra '("INFOJS_OPT" :infojs-opt)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
45 (add-hook 'org-export-options-filters 'org-infojs-handle-options) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
46 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
47 (defgroup org-infojs nil |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
48 "Options specific for using org-info.js in HTML export of Org-mode files." |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
49 :tag "Org Export HTML INFOJS" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
50 :group 'org-export-html) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
51 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
52 (defcustom org-export-html-use-infojs 'when-configured |
100458
ba23e35d3eaf
2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
100448
diff
changeset
|
53 "Should Sebastian Rose's Java Script org-info.js be linked into HTML files? |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
54 This option can be nil or t to never or always use the script. It can |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
55 also be the symbol `when-configured', meaning that the script will be |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
56 linked into the export file if and only if there is a \"#+INFOJS_OPT:\" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
57 line in the buffer. See also the variable `org-infojs-options'." |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
58 :group 'org-export-html |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
59 :group 'org-infojs |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
60 :type '(choice |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
61 (const :tag "Never" nil) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
62 (const :tag "When configured in buffer" when-configured) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
63 (const :tag "Always" t))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
64 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
65 (defconst org-infojs-opts-table |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
66 '((path PATH "http://orgmode.org/org-info.js") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
67 (view VIEW "info") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
68 (toc TOC :table-of-contents) |
96044
c1ef445563bb
2008-06-17 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
94757
diff
changeset
|
69 (ftoc FIXED_TOC "0") |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
70 (tdepth TOC_DEPTH "max") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
71 (sdepth SECTION_DEPTH "max") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
72 (mouse MOUSE_HINT "underline") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
73 (buttons VIEW_BUTTONS "0") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
74 (ltoc LOCAL_TOC "1") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
75 (up LINK_UP :link-up) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
76 (home LINK_HOME :link-home)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
77 "JavaScript options, long form for script, default values.") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
78 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
79 (defvar org-infojs-options) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
80 (when (and (boundp 'org-infojs-options) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
81 (assq 'runs org-infojs-options)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
82 (setq org-infojs-options (delq (assq 'runs org-infojs-options) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
83 org-infojs-options))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
84 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
85 (defcustom org-infojs-options |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
86 (mapcar (lambda (x) (cons (car x) (nth 2 x))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
87 org-infojs-opts-table) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
88 "Options settings for the INFOJS Javascript. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
89 Each of the options must have an entry in `org-export-html/infojs-opts-table'. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
90 The value can either be a string that will be passed to the script, or |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
91 a property. This property is then assumed to be a property that is defined |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
92 by the Export/Publishing setup of Org. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
93 The `sdepth' and `tdepth' parameters can also be set to \"max\", which |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
94 means to use the maximum value consistent with other options." |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
95 :group 'org-infojs |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
96 :type |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
97 `(set :greedy t :inline t |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
98 ,@(mapcar |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
99 (lambda (x) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
100 (list 'cons (list 'const (car x)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
101 '(choice |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
102 (symbol :tag "Publishing/Export property") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
103 (string :tag "Value")))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
104 org-infojs-opts-table))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
105 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
106 (defcustom org-infojs-template |
99501
e3acb52d33e1
2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
99139
diff
changeset
|
107 "<script type=\"text/javascript\" src=\"%SCRIPT_PATH\"></script> |
e3acb52d33e1
2008-11-12 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
99139
diff
changeset
|
108 <script type=\"text/javascript\" > |
100267
c851df8e004e
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
99866
diff
changeset
|
109 <!--/*--><![CDATA[/*><!--*/ |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
110 %MANAGER_OPTIONS |
100458
ba23e35d3eaf
2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
100448
diff
changeset
|
111 org_html_manager.setup(); // activate after the parameters are set |
100267
c851df8e004e
2008-12-07 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
99866
diff
changeset
|
112 /*]]>*/--> |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
113 </script>" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
114 "The template for the export style additions when org-info.js is used. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
115 Option settings will replace the %MANAGER-OPTIONS cookie." |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
116 :group 'org-infojs |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
117 :type 'string) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
118 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
119 (defun org-infojs-handle-options (exp-plist) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
120 "Analyze JavaScript options in INFO-PLIST and modify EXP-PLIST accordingly." |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
121 (if (or (not org-export-html-use-infojs) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
122 (and (eq org-export-html-use-infojs 'when-configured) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
123 (or (not (plist-get exp-plist :infojs-opt)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
124 (string-match "\\<view:nil\\>" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
125 (plist-get exp-plist :infojs-opt))))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
126 ;; We do not want to use the script |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
127 exp-plist |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
128 ;; We do want to use the script, set it up |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
129 (let ((template org-infojs-template) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
130 (ptoc (plist-get exp-plist :table-of-contents)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
131 (hlevels (plist-get exp-plist :headline-levels)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
132 tdepth sdepth p1 s p v a1 tmp e opt var val table default) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
133 (setq sdepth hlevels |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
134 tdepth hlevels) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
135 (if (integerp ptoc) (setq tdepth (min ptoc tdepth))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
136 (setq v (plist-get exp-plist :infojs-opt) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
137 table org-infojs-opts-table) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
138 (while (setq e (pop table)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
139 (setq opt (car e) var (nth 1 e) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
140 default (cdr (assoc opt org-infojs-options))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
141 (and (symbolp default) (not (memq default '(t nil))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
142 (setq default (plist-get exp-plist default))) |
101458
36abe982e7cd
2009-01-25 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
100908
diff
changeset
|
143 (if (and v (string-match (format " %s:\\(\\S-+\\)" opt) v)) |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
144 (setq val (match-string 1 v)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
145 (setq val default)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
146 (cond |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
147 ((eq opt 'path) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
148 (and (string-match "%SCRIPT_PATH" template) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
149 (setq template (replace-match val t t template)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
150 ((eq opt 'sdepth) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
151 (if (integerp (read val)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
152 (setq sdepth (min (read val) hlevels)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
153 ((eq opt 'tdepth) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
154 (if (integerp (read val)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
155 (setq tdepth (min (read val) hlevels)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
156 (t |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
157 (setq val |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
158 (cond |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
159 ((or (eq val t) (equal val "t")) "1") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
160 ((or (eq val nil) (equal val "nil")) "0") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
161 ((stringp val) val) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
162 (t (format "%s" val)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
163 (push (cons var val) s)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
164 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
165 ;; Now we set the depth of the *generated* TOC to SDEPTH, because the |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
166 ;; toc will actually determine the splitting. How much of the toc will |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
167 ;; actually be displayed is governed by the TDEPTH option. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
168 (setq exp-plist (plist-put exp-plist :table-of-contents sdepth)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
169 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
170 ;; The table of contents should ot show more sections then we generate |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
171 (setq tdepth (min tdepth sdepth)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
172 (push (cons "TOC_DEPTH" tdepth) s) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
173 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
174 (setq s (mapconcat |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
175 (lambda (x) (format "org_html_manager.set(\"%s\", \"%s\");" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
176 (car x) (cdr x))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
177 s "\n")) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
178 (when (and s (> (length s) 0)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
179 (and (string-match "%MANAGER_OPTIONS" template) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
180 (setq s (replace-match s t t template)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
181 (setq exp-plist |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
182 (plist-put |
97027
adc2dffbdfc3
2008-07-25 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
96975
diff
changeset
|
183 exp-plist :style-extra |
adc2dffbdfc3
2008-07-25 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
96975
diff
changeset
|
184 (concat (or (plist-get exp-plist :style-extra) "") "\n" s))))) |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
185 ;; This script absolutely needs the table of contents, to we change that |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
186 ;; setting |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
187 (if (not (plist-get exp-plist :table-of-contents)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
188 (setq exp-plist (plist-put exp-plist :table-of-contents t))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
189 ;; Return the modified property list |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
190 exp-plist))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
191 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
192 (defun org-infojs-options-inbuffer-template () |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
193 (format "#+INFOJS_OPT: view:%s toc:%s ltoc:%s mouse:%s buttons:%s path:%s" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
194 (if (eq t org-export-html-use-infojs) (cdr (assoc 'view org-infojs-options)) nil) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
195 (let ((a (cdr (assoc 'toc org-infojs-options)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
196 (cond ((memq a '(nil t)) a) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
197 (t (plist-get (org-infile-export-plist) :table-of-contents)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
198 (if (equal (cdr (assoc 'ltoc org-infojs-options)) "1") t nil) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
199 (cdr (assoc 'mouse org-infojs-options)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
200 (cdr (assoc 'buttons org-infojs-options)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
201 (cdr (assoc 'path org-infojs-options)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
202 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
203 (provide 'org-infojs) |
96044
c1ef445563bb
2008-06-17 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
94757
diff
changeset
|
204 (provide 'org-jsinfo) |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
205 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
206 ;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac |
96044
c1ef445563bb
2008-06-17 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
94757
diff
changeset
|
207 |
94757
427077740277
Change file name on the last line.
Eli Zaretskii <eliz@gnu.org>
parents:
94750
diff
changeset
|
208 ;;; org-jsinfo.el ends here |