Mercurial > emacs
annotate lisp/org/org-jsinfo.el @ 107596:866e76f8ad75
Retrospective commit from 2009-10-08.
Finish up working on paragraph's base direction.
Start working on display of right-to-left glyph rows.
Rewrite set_cursor_from_row to support bidi.
xdisp.c (string_buffer_position_lim): New function.
(string_buffer_position): Most of code moved to
string_buffer_position_lim. Last argument and return value are
now EMACS_INT; all callers changed.
(set_cursor_from_row): Rewritten to support bidirectional text and
reversed glyph rows.
dispextern.h <string_buffer_position>: Update prototype.
bidi.c (bidi_paragraph_init): Fix initialization of POS.
dispextern.h (struct glyph_row): New member reversed_p.
buffer.c (syms_of_buffer): Remove DEFVAR_LISP_NOPRO for
default-direction-reversed, default-bidi-display-reordering, and
default-paragraph-direction.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 01 Jan 2010 06:27:51 -0500 |
parents | 83924fb4f59c |
children | 1d1d5d9bd884 |
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 |
101515
64ef70f990a9
2009-01-26 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
101458
diff
changeset
|
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 |
64ef70f990a9
2009-01-26 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
101458
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
5 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
6 ;; 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
|
7 ;; Keywords: outlines, hypermedia, calendar, wp |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
8 ;; Homepage: http://orgmode.org |
106168
83924fb4f59c
2009-11-20 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
106022
diff
changeset
|
9 ;; Version: 6.33x |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
10 ;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
11 ;; This file is part of GNU Emacs. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
12 ;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
13 ;; 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
|
14 ;; 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
|
15 ;; 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
|
16 ;; (at your option) any later version. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
17 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
18 ;; 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
|
19 ;; 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
|
20 ;; 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
|
21 ;; GNU General Public License for more details. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
22 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
23 ;; 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
|
24 ;; 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
|
25 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
26 ;; |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
27 ;;; Commentary: |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
28 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
29 ;; 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
|
30 ;; 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
|
31 ;; 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
|
32 ;; org org-mode itself. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
33 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
34 ;; 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
|
35 ;; 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
|
36 ;; the script. FIXME: Accurate pointers! |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
37 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
38 ;; 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
|
39 ;; configure the variable `org-modules'. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
40 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
41 ;;; Code: |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
42 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
43 (require 'org-exp) |
104164
ac1a55cc2c38
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
101760
diff
changeset
|
44 (require 'org-html) |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
45 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
46 (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
|
47 (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
|
48 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
49 (defgroup org-infojs nil |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
50 "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
|
51 :tag "Org Export HTML INFOJS" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
52 :group 'org-export-html) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
53 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
54 (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
|
55 "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
|
56 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
|
57 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
|
58 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
|
59 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
|
60 :group 'org-export-html |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
61 :group 'org-infojs |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
62 :type '(choice |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
63 (const :tag "Never" nil) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
64 (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
|
65 (const :tag "Always" t))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
66 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
67 (defconst org-infojs-opts-table |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
68 '((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
|
69 (view VIEW "info") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
70 (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
|
71 (ftoc FIXED_TOC "0") |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
72 (tdepth TOC_DEPTH "max") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
73 (sdepth SECTION_DEPTH "max") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
74 (mouse MOUSE_HINT "underline") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
75 (buttons VIEW_BUTTONS "0") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
76 (ltoc LOCAL_TOC "1") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
77 (up LINK_UP :link-up) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
78 (home LINK_HOME :link-home)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
79 "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
|
80 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
81 (defvar org-infojs-options) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
82 (when (and (boundp 'org-infojs-options) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
83 (assq 'runs org-infojs-options)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
84 (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
|
85 org-infojs-options))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
86 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
87 (defcustom org-infojs-options |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
88 (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
|
89 org-infojs-opts-table) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
90 "Options settings for the INFOJS Javascript. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
91 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
|
92 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
|
93 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
|
94 by the Export/Publishing setup of Org. |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
95 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
|
96 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
|
97 :group 'org-infojs |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
98 :type |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
99 `(set :greedy t :inline t |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
100 ,@(mapcar |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
101 (lambda (x) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
102 (list 'cons (list 'const (car x)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
103 '(choice |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
104 (symbol :tag "Publishing/Export property") |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
105 (string :tag "Value")))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
106 org-infojs-opts-table))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
107 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
108 (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
|
109 "<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
|
110 <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
|
111 <!--/*--><![CDATA[/*><!--*/ |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
112 %MANAGER_OPTIONS |
100458
ba23e35d3eaf
2008-12-17 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
100448
diff
changeset
|
113 org_html_manager.setup(); // activate after the parameters are set |
104164
ac1a55cc2c38
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
101760
diff
changeset
|
114 /*]]>*///--> |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
115 </script>" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
116 "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
|
117 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
|
118 :group 'org-infojs |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
119 :type 'string) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
120 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
121 (defun org-infojs-handle-options (exp-plist) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
122 "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
|
123 (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
|
124 (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
|
125 (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
|
126 (string-match "\\<view:nil\\>" |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
127 (plist-get exp-plist :infojs-opt))))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
128 ;; 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
|
129 exp-plist |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
130 ;; 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
|
131 (let ((template org-infojs-template) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
132 (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
|
133 (hlevels (plist-get exp-plist :headline-levels)) |
101568
f5aedb5cbd80
2009-01-27 Carsten Dominik <carsten.dominik@gmail.com>
Carsten Dominik <dominik@science.uva.nl>
parents:
101515
diff
changeset
|
134 tdepth sdepth s v e opt var val table default) |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
135 (setq sdepth hlevels |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
136 tdepth hlevels) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
137 (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
|
138 (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
|
139 table org-infojs-opts-table) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
140 (while (setq e (pop table)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
141 (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
|
142 default (cdr (assoc opt org-infojs-options))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
143 (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
|
144 (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
|
145 (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
|
146 (setq val (match-string 1 v)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
147 (setq val default)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
148 (cond |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
149 ((eq opt 'path) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
150 (and (string-match "%SCRIPT_PATH" template) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
151 (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
|
152 ((eq opt 'sdepth) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
153 (if (integerp (read val)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
154 (setq sdepth (min (read val) hlevels)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
155 ((eq opt 'tdepth) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
156 (if (integerp (read val)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
157 (setq tdepth (min (read val) hlevels)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
158 (t |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
159 (setq val |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
160 (cond |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
161 ((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
|
162 ((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
|
163 ((stringp val) val) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
164 (t (format "%s" val)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
165 (push (cons var val) s)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
166 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
167 ;; 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
|
168 ;; 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
|
169 ;; 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
|
170 (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
|
171 |
101760
9f3e0387f078
2009-02-02 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
101757
diff
changeset
|
172 ;; The table of contents should not show more sections then we generate |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
173 (setq tdepth (min tdepth sdepth)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
174 (push (cons "TOC_DEPTH" tdepth) s) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
175 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
176 (setq s (mapconcat |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
177 (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
|
178 (car x) (cdr x))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
179 s "\n")) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
180 (when (and s (> (length s) 0)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
181 (and (string-match "%MANAGER_OPTIONS" template) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
182 (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
|
183 (setq exp-plist |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
184 (plist-put |
97027
adc2dffbdfc3
2008-07-25 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
96975
diff
changeset
|
185 exp-plist :style-extra |
adc2dffbdfc3
2008-07-25 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
96975
diff
changeset
|
186 (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
|
187 ;; 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
|
188 ;; setting |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
189 (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
|
190 (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
|
191 ;; Return the modified property list |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
192 exp-plist))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
193 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
194 (defun org-infojs-options-inbuffer-template () |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
195 (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
|
196 (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
|
197 (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
|
198 (cond ((memq a '(nil t)) a) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
199 (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
|
200 (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
|
201 (cdr (assoc 'mouse org-infojs-options)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
202 (cdr (assoc 'buttons org-infojs-options)) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
203 (cdr (assoc 'path org-infojs-options)))) |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
204 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
205 (provide 'org-infojs) |
96044
c1ef445563bb
2008-06-17 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents:
94757
diff
changeset
|
206 (provide 'org-jsinfo) |
94750
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
207 |
61756b574ffd
Renamed org-infojs.el to org-jsinfo.el.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
208 ;; 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
|
209 |
94757
427077740277
Change file name on the last line.
Eli Zaretskii <eliz@gnu.org>
parents:
94750
diff
changeset
|
210 ;;; org-jsinfo.el ends here |