2009-04-07 17:55:32 +00:00
|
|
|
;;; org-html.el --- HTML export for Org-mode
|
|
|
|
|
2012-03-17 15:31:04 +00:00
|
|
|
;; Copyright (C) 2004-2012 Free Software Foundation, Inc.
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;;
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;;
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
;;
|
|
|
|
;;; Commentary:
|
|
|
|
|
2010-07-15 22:54:53 +00:00
|
|
|
;;; Code:
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(require 'org-exp)
|
2011-02-10 12:19:37 +00:00
|
|
|
(require 'format-spec)
|
2010-07-15 22:54:53 +00:00
|
|
|
|
2009-09-02 08:39:55 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(declare-function org-id-find-id-file "org-id" (id))
|
|
|
|
(declare-function htmlize-region "ext:htmlize" (beg end))
|
2011-09-11 14:01:59 +00:00
|
|
|
(declare-function org-pop-to-buffer-same-window
|
2011-07-18 17:25:10 +00:00
|
|
|
"org-compat" (&optional buffer-or-name norecord label))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2009-07-27 03:32:52 +00:00
|
|
|
(defgroup org-export-html nil
|
|
|
|
"Options specific for HTML export of Org-mode files."
|
|
|
|
:tag "Org Export HTML"
|
|
|
|
:group 'org-export)
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(defcustom org-export-html-footnotes-section "<div id=\"footnotes\">
|
|
|
|
<h2 class=\"footnotes\">%s: </h2>
|
|
|
|
<div id=\"text-footnotes\">
|
|
|
|
%s
|
|
|
|
</div>
|
|
|
|
</div>"
|
|
|
|
"Format for the footnotes section.
|
|
|
|
Should contain a two instances of %s. The first will be replaced with the
|
|
|
|
language-specific word for \"Footnotes\", the second one will be replaced
|
|
|
|
by the footnotes themselves."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
|
2009-07-27 03:32:52 +00:00
|
|
|
(defcustom org-export-html-footnote-format "<sup>%s</sup>"
|
|
|
|
"The format for the footnote reference.
|
|
|
|
%s will be replaced by the footnote reference itself."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2011-05-14 08:26:40 +00:00
|
|
|
|
|
|
|
(defcustom org-export-html-footnote-separator "<sup>, </sup>"
|
|
|
|
"Text used to separate footnotes."
|
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2011-05-14 08:26:40 +00:00
|
|
|
:type 'string)
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(defcustom org-export-html-coding-system nil
|
2010-07-15 22:54:53 +00:00
|
|
|
"Coding system for HTML export, defaults to `buffer-file-coding-system'."
|
2009-04-07 17:55:32 +00:00
|
|
|
:group 'org-export-html
|
|
|
|
:type 'coding-system)
|
|
|
|
|
|
|
|
(defcustom org-export-html-extension "html"
|
|
|
|
"The extension for exported HTML files."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
|
2009-05-20 06:24:49 +00:00
|
|
|
(defcustom org-export-html-xml-declaration
|
2009-05-27 14:16:31 +00:00
|
|
|
'(("html" . "<?xml version=\"1.0\" encoding=\"%s\"?>")
|
2009-07-02 05:44:01 +00:00
|
|
|
("php" . "<?php echo \"<?xml version=\\\"1.0\\\" encoding=\\\"%s\\\" ?>\"; ?>"))
|
2009-05-20 06:24:49 +00:00
|
|
|
"The extension for exported HTML files.
|
2009-05-27 14:16:31 +00:00
|
|
|
%s will be replaced with the charset of the exported file.
|
|
|
|
This may be a string, or an alist with export extensions
|
|
|
|
and corresponding declarations."
|
2009-05-20 06:24:49 +00:00
|
|
|
:group 'org-export-html
|
2009-05-27 14:16:31 +00:00
|
|
|
:type '(choice
|
|
|
|
(string :tag "Single declaration")
|
|
|
|
(repeat :tag "Dependent on extension"
|
|
|
|
(cons (string :tag "Extension")
|
|
|
|
(string :tag "Declaration")))))
|
2009-05-20 06:24:49 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(defcustom org-export-html-style-include-scripts t
|
2010-07-15 22:54:53 +00:00
|
|
|
"Non-nil means include the JavaScript snippets in exported HTML files.
|
2009-04-07 17:55:32 +00:00
|
|
|
The actual script is defined in `org-export-html-scripts' and should
|
|
|
|
not be modified."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'boolean)
|
|
|
|
|
2012-08-21 10:37:32 +00:00
|
|
|
(defvar org-export-html-scripts
|
2012-08-11 17:10:44 +00:00
|
|
|
"<script type=\"text/javascript\">
|
2012-08-21 10:37:32 +00:00
|
|
|
/*
|
|
|
|
@licstart The following is the entire license notice for the
|
|
|
|
JavaScript code in this tag.
|
|
|
|
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
The JavaScript code in this tag is free software: you can
|
|
|
|
redistribute it and/or modify it under the terms of the GNU
|
|
|
|
General Public License (GNU GPL) as published by the Free Software
|
|
|
|
Foundation, either version 3 of the License, or (at your option)
|
|
|
|
any later version. The code is distributed WITHOUT ANY WARRANTY;
|
|
|
|
without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
|
|
|
|
|
|
|
|
As additional permission under GNU GPL version 3 section 7, you
|
|
|
|
may distribute non-source (e.g., minimized or compacted) forms of
|
|
|
|
that code without the copy of the GNU GPL normally required by
|
|
|
|
section 4, provided you include this license notice and a URL
|
|
|
|
through which recipients can access the Corresponding Source.
|
|
|
|
|
|
|
|
|
|
|
|
@licend The above is the entire license notice
|
|
|
|
for the JavaScript code in this tag.
|
|
|
|
*/
|
2009-04-07 17:55:32 +00:00
|
|
|
<!--/*--><![CDATA[/*><!--*/
|
|
|
|
function CodeHighlightOn(elem, id)
|
|
|
|
{
|
|
|
|
var target = document.getElementById(id);
|
|
|
|
if(null != target) {
|
|
|
|
elem.cacheClassElem = elem.className;
|
|
|
|
elem.cacheClassTarget = target.className;
|
|
|
|
target.className = \"code-highlighted\";
|
|
|
|
elem.className = \"code-highlighted\";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
function CodeHighlightOff(elem, id)
|
|
|
|
{
|
|
|
|
var target = document.getElementById(id);
|
|
|
|
if(elem.cacheClassElem)
|
|
|
|
elem.className = elem.cacheClassElem;
|
|
|
|
if(elem.cacheClassTarget)
|
|
|
|
target.className = elem.cacheClassTarget;
|
|
|
|
}
|
2009-05-04 19:04:38 +00:00
|
|
|
/*]]>*///-->
|
2009-04-07 17:55:32 +00:00
|
|
|
</script>"
|
2012-08-11 17:10:44 +00:00
|
|
|
"Basic JavaScript that is needed by HTML files produced by Org-mode.")
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(defconst org-export-html-style-default
|
2012-08-11 17:10:44 +00:00
|
|
|
"<style type=\"text/css\">
|
2009-04-07 17:55:32 +00:00
|
|
|
<!--/*--><![CDATA[/*><!--*/
|
|
|
|
html { font-family: Times, serif; font-size: 12pt; }
|
|
|
|
.title { text-align: center; }
|
|
|
|
.todo { color: red; }
|
|
|
|
.done { color: green; }
|
|
|
|
.tag { background-color: #add8e6; font-weight:normal }
|
|
|
|
.target { }
|
|
|
|
.timestamp { color: #bebebe; }
|
|
|
|
.timestamp-kwd { color: #5f9ea0; }
|
2010-10-25 06:41:18 +00:00
|
|
|
.right {margin-left:auto; margin-right:0px; text-align:right;}
|
|
|
|
.left {margin-left:0px; margin-right:auto; text-align:left;}
|
|
|
|
.center {margin-left:auto; margin-right:auto; text-align:center;}
|
2009-04-07 17:55:32 +00:00
|
|
|
p.verse { margin-left: 3% }
|
|
|
|
pre {
|
|
|
|
border: 1pt solid #AEBDCC;
|
|
|
|
background-color: #F3F5F7;
|
|
|
|
padding: 5pt;
|
|
|
|
font-family: courier, monospace;
|
|
|
|
font-size: 90%;
|
|
|
|
overflow:auto;
|
|
|
|
}
|
|
|
|
table { border-collapse: collapse; }
|
2010-10-23 05:50:10 +00:00
|
|
|
td, th { vertical-align: top; }
|
|
|
|
th.right { text-align:center; }
|
|
|
|
th.left { text-align:center; }
|
|
|
|
th.center { text-align:center; }
|
|
|
|
td.right { text-align:right; }
|
|
|
|
td.left { text-align:left; }
|
|
|
|
td.center { text-align:center; }
|
2009-04-07 17:55:32 +00:00
|
|
|
dt { font-weight: bold; }
|
|
|
|
div.figure { padding: 0.5em; }
|
|
|
|
div.figure p { text-align: center; }
|
2011-08-11 20:07:45 +00:00
|
|
|
div.inlinetask {
|
|
|
|
padding:10px;
|
|
|
|
border:2px solid gray;
|
|
|
|
margin:10px;
|
|
|
|
background: #ffffcc;
|
|
|
|
}
|
2010-02-25 14:39:55 +00:00
|
|
|
textarea { overflow-x: auto; }
|
2009-04-07 17:55:32 +00:00
|
|
|
.linenr { font-size:smaller }
|
|
|
|
.code-highlighted {background-color:#ffff00;}
|
|
|
|
.org-info-js_info-navigation { border-style:none; }
|
|
|
|
#org-info-js_console-label { font-size:10px; font-weight:bold;
|
|
|
|
white-space:nowrap; }
|
|
|
|
.org-info-js_search-highlight {background-color:#ffff00; color:#000000;
|
|
|
|
font-weight:bold; }
|
2009-05-04 14:19:44 +00:00
|
|
|
/*]]>*/-->
|
2009-04-07 17:55:32 +00:00
|
|
|
</style>"
|
|
|
|
"The default style specification for exported HTML files.
|
|
|
|
Please use the variables `org-export-html-style' and
|
|
|
|
`org-export-html-style-extra' to add to this style. If you wish to not
|
|
|
|
have the default style included, customize the variable
|
|
|
|
`org-export-html-style-include-default'.")
|
|
|
|
|
|
|
|
(defcustom org-export-html-style-include-default t
|
2010-01-21 15:15:40 +00:00
|
|
|
"Non-nil means include the default style in exported HTML files.
|
2009-04-07 17:55:32 +00:00
|
|
|
The actual style is defined in `org-export-html-style-default' and should
|
|
|
|
not be modified. Use the variables `org-export-html-style' to add
|
|
|
|
your own style information."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'boolean)
|
2012-10-02 08:03:15 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;;;###autoload
|
2009-12-15 05:11:39 +00:00
|
|
|
(put 'org-export-html-style-include-default 'safe-local-variable 'booleanp)
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(defcustom org-export-html-style ""
|
|
|
|
"Org-wide style definitions for exported HTML files.
|
|
|
|
|
|
|
|
This variable needs to contain the full HTML structure to provide a style,
|
|
|
|
including the surrounding HTML tags. If you set the value of this variable,
|
|
|
|
you should consider to include definitions for the following classes:
|
|
|
|
title, todo, done, timestamp, timestamp-kwd, tag, target.
|
|
|
|
|
|
|
|
For example, a valid value would be:
|
|
|
|
|
|
|
|
<style type=\"text/css\">
|
|
|
|
<![CDATA[
|
|
|
|
p { font-weight: normal; color: gray; }
|
|
|
|
h1 { color: black; }
|
|
|
|
.title { text-align: center; }
|
|
|
|
.todo, .timestamp-kwd { color: red; }
|
|
|
|
.done { color: green; }
|
|
|
|
]]>
|
|
|
|
</style>
|
|
|
|
|
2011-06-29 13:39:58 +00:00
|
|
|
If you'd like to refer to an external style file, use something like
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
<link rel=\"stylesheet\" type=\"text/css\" href=\"mystyles.css\">
|
|
|
|
|
|
|
|
As the value of this option simply gets inserted into the HTML <head> header,
|
|
|
|
you can \"misuse\" it to add arbitrary text to the header.
|
|
|
|
See also the variable `org-export-html-style-extra'."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
;;;###autoload
|
|
|
|
(put 'org-export-html-style 'safe-local-variable 'stringp)
|
|
|
|
|
|
|
|
(defcustom org-export-html-style-extra ""
|
|
|
|
"Additional style information for HTML export.
|
|
|
|
The value of this variable is inserted into the HTML buffer right after
|
|
|
|
the value of `org-export-html-style'. Use this variable for per-file
|
|
|
|
settings of style information, and do not forget to surround the style
|
|
|
|
settings with <style>...</style> tags."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
;;;###autoload
|
|
|
|
(put 'org-export-html-style-extra 'safe-local-variable 'stringp)
|
|
|
|
|
2010-08-13 12:22:16 +00:00
|
|
|
(defcustom org-export-html-mathjax-options
|
|
|
|
'((path "http://orgmode.org/mathjax/MathJax.js")
|
|
|
|
(scale "100")
|
|
|
|
(align "center")
|
|
|
|
(indent "2em")
|
|
|
|
(mathml nil))
|
|
|
|
"Options for MathJax setup.
|
|
|
|
|
|
|
|
path The path where to find MathJax
|
|
|
|
scale Scaling for the HTML-CSS backend, usually between 100 and 133
|
|
|
|
align How to align display math: left, center, or right
|
|
|
|
indent If align is not center, how far from the left/right side?
|
|
|
|
mathml Should a MathML player be used if available?
|
|
|
|
This is faster and reduces bandwidth use, but currently
|
|
|
|
sometimes has lower spacing quality. Therefore, the default is
|
|
|
|
nil. When browsers get better, this switch can be flipped.
|
|
|
|
|
|
|
|
You can also customize this for each buffer, using something like
|
|
|
|
|
|
|
|
#+MATHJAX: scale:\"133\" align:\"right\" mathml:t path:\"/MathJax/\""
|
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2010-08-13 12:22:16 +00:00
|
|
|
:type '(list :greedy t
|
2012-08-11 17:10:44 +00:00
|
|
|
(list :tag "path (the path from where to load MathJax.js)"
|
|
|
|
(const :format " " path) (string))
|
|
|
|
(list :tag "scale (scaling for the displayed math)"
|
|
|
|
(const :format " " scale) (string))
|
|
|
|
(list :tag "align (alignment of displayed equations)"
|
|
|
|
(const :format " " align) (string))
|
|
|
|
(list :tag "indent (indentation with left or right alignment)"
|
|
|
|
(const :format " " indent) (string))
|
|
|
|
(list :tag "mathml (should MathML display be used is possible)"
|
|
|
|
(const :format " " mathml) (boolean))))
|
2010-08-13 12:22:16 +00:00
|
|
|
|
|
|
|
(defun org-export-html-mathjax-config (template options in-buffer)
|
|
|
|
"Insert the user setup into the matchjax template."
|
|
|
|
(let (name val (yes " ") (no "// ") x)
|
|
|
|
(mapc
|
|
|
|
(lambda (e)
|
|
|
|
(setq name (car e) val (nth 1 e))
|
|
|
|
(if (string-match (concat "\\<" (symbol-name name) ":") in-buffer)
|
|
|
|
(setq val (car (read-from-string
|
|
|
|
(substring in-buffer (match-end 0))))))
|
|
|
|
(if (not (stringp val)) (setq val (format "%s" val)))
|
2012-08-21 10:37:32 +00:00
|
|
|
(setq template
|
|
|
|
(replace-regexp-in-string
|
|
|
|
(concat "%" (upcase (symbol-name name))) val template t t)))
|
2010-08-13 12:22:16 +00:00
|
|
|
options)
|
|
|
|
(setq val (nth 1 (assq 'mathml options)))
|
|
|
|
(if (string-match (concat "\\<mathml:") in-buffer)
|
|
|
|
(setq val (car (read-from-string
|
|
|
|
(substring in-buffer (match-end 0))))))
|
|
|
|
;; Exchange prefixes depending on mathml setting
|
|
|
|
(if (not val) (setq x yes yes no no x))
|
|
|
|
;; Replace cookies to turn on or off the config/jax lines
|
|
|
|
(if (string-match ":MMLYES:" template)
|
|
|
|
(setq template (replace-match yes t t template)))
|
|
|
|
(if (string-match ":MMLNO:" template)
|
|
|
|
(setq template (replace-match no t t template)))
|
|
|
|
;; Return the modified template
|
|
|
|
template))
|
|
|
|
|
|
|
|
(defcustom org-export-html-mathjax-template
|
|
|
|
"<script type=\"text/javascript\" src=\"%PATH\">
|
2012-08-21 10:37:32 +00:00
|
|
|
/**
|
|
|
|
*
|
|
|
|
* @source: %PATH
|
|
|
|
*
|
|
|
|
* @licstart The following is the entire license notice for the
|
|
|
|
* JavaScript code in %PATH.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2012 MathJax
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the \"License\");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an \"AS IS\" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*
|
|
|
|
* @licend The above is the entire license notice
|
|
|
|
* for the JavaScript code in %PATH.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
@licstart The following is the entire license notice for the
|
|
|
|
JavaScript code below.
|
|
|
|
|
|
|
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
The JavaScript code below is free software: you can
|
|
|
|
redistribute it and/or modify it under the terms of the GNU
|
|
|
|
General Public License (GNU GPL) as published by the Free Software
|
|
|
|
Foundation, either version 3 of the License, or (at your option)
|
|
|
|
any later version. The code is distributed WITHOUT ANY WARRANTY;
|
|
|
|
without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
|
|
|
|
|
|
|
|
As additional permission under GNU GPL version 3 section 7, you
|
|
|
|
may distribute non-source (e.g., minimized or compacted) forms of
|
|
|
|
that code without the copy of the GNU GPL normally required by
|
|
|
|
section 4, provided you include this license notice and a URL
|
|
|
|
through which recipients can access the Corresponding Source.
|
|
|
|
|
|
|
|
|
|
|
|
@licend The above is the entire license notice
|
|
|
|
for the JavaScript code below.
|
|
|
|
*/
|
2010-08-13 12:22:16 +00:00
|
|
|
<!--/*--><![CDATA[/*><!--*/
|
|
|
|
MathJax.Hub.Config({
|
|
|
|
// Only one of the two following lines, depending on user settings
|
|
|
|
// First allows browser-native MathML display, second forces HTML/CSS
|
|
|
|
:MMLYES: config: [\"MMLorHTML.js\"], jax: [\"input/TeX\"],
|
|
|
|
:MMLNO: jax: [\"input/TeX\", \"output/HTML-CSS\"],
|
|
|
|
extensions: [\"tex2jax.js\",\"TeX/AMSmath.js\",\"TeX/AMSsymbols.js\",
|
|
|
|
\"TeX/noUndefined.js\"],
|
|
|
|
tex2jax: {
|
|
|
|
inlineMath: [ [\"\\\\(\",\"\\\\)\"] ],
|
2010-12-07 22:42:47 +00:00
|
|
|
displayMath: [ ['$$','$$'], [\"\\\\[\",\"\\\\]\"], [\"\\\\begin{displaymath}\",\"\\\\end{displaymath}\"] ],
|
2010-08-13 12:22:16 +00:00
|
|
|
skipTags: [\"script\",\"noscript\",\"style\",\"textarea\",\"pre\",\"code\"],
|
|
|
|
ignoreClass: \"tex2jax_ignore\",
|
|
|
|
processEscapes: false,
|
|
|
|
processEnvironments: true,
|
|
|
|
preview: \"TeX\"
|
|
|
|
},
|
|
|
|
showProcessingMessages: true,
|
|
|
|
displayAlign: \"%ALIGN\",
|
|
|
|
displayIndent: \"%INDENT\",
|
|
|
|
|
|
|
|
\"HTML-CSS\": {
|
|
|
|
scale: %SCALE,
|
|
|
|
availableFonts: [\"STIX\",\"TeX\"],
|
|
|
|
preferredFont: \"TeX\",
|
|
|
|
webFont: \"TeX\",
|
|
|
|
imageFont: \"TeX\",
|
|
|
|
showMathMenu: true,
|
|
|
|
},
|
|
|
|
MMLorHTML: {
|
|
|
|
prefer: {
|
|
|
|
MSIE: \"MML\",
|
|
|
|
Firefox: \"MML\",
|
|
|
|
Opera: \"HTML\",
|
|
|
|
other: \"HTML\"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
/*]]>*///-->
|
|
|
|
</script>"
|
|
|
|
"The MathJax setup for XHTML files."
|
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2010-08-13 12:22:16 +00:00
|
|
|
:type 'string)
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(defcustom org-export-html-tag-class-prefix ""
|
2010-07-15 22:54:53 +00:00
|
|
|
"Prefix to class names for TODO keywords.
|
2009-04-07 17:55:32 +00:00
|
|
|
Each tag gets a class given by the tag itself, with this prefix.
|
|
|
|
The default prefix is empty because it is nice to just use the keyword
|
|
|
|
as a class name. But if you get into conflicts with other, existing
|
2010-07-15 22:54:53 +00:00
|
|
|
CSS classes, then this prefix can be very useful."
|
2009-04-07 17:55:32 +00:00
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
(defcustom org-export-html-todo-kwd-class-prefix ""
|
2010-07-15 22:54:53 +00:00
|
|
|
"Prefix to class names for TODO keywords.
|
2009-04-07 17:55:32 +00:00
|
|
|
Each TODO keyword gets a class given by the keyword itself, with this prefix.
|
|
|
|
The default prefix is empty because it is nice to just use the keyword
|
|
|
|
as a class name. But if you get into conflicts with other, existing
|
2010-07-15 22:54:53 +00:00
|
|
|
CSS classes, then this prefix can be very useful."
|
2009-04-07 17:55:32 +00:00
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
|
2011-12-11 15:50:05 +00:00
|
|
|
(defcustom org-export-html-headline-anchor-format "<a name=\"%s\" id=\"%s\"></a>"
|
|
|
|
"Format for anchors in HTML headlines.
|
|
|
|
It requires to %s: both will be replaced by the anchor referring
|
|
|
|
to the headline (e.g. \"sec-2\"). When set to `nil', don't insert
|
|
|
|
HTML anchors in headlines."
|
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2011-12-11 15:50:05 +00:00
|
|
|
:type 'string)
|
|
|
|
|
2011-03-15 14:36:25 +00:00
|
|
|
(defcustom org-export-html-preamble t
|
2011-02-10 12:19:37 +00:00
|
|
|
"Non-nil means insert a preamble in HTML export.
|
2011-03-15 15:18:38 +00:00
|
|
|
|
|
|
|
When `t', insert a string as defined by one of the formatting
|
|
|
|
strings in `org-export-html-preamble-format'. When set to a
|
|
|
|
string, this string overrides `org-export-html-preamble-format'.
|
|
|
|
When set to a function, apply this function and insert the
|
2011-12-12 23:10:00 +00:00
|
|
|
returned string. The function takes no argument, but you can
|
|
|
|
use `opt-plist' to access the current export options.
|
2011-03-15 14:36:25 +00:00
|
|
|
|
|
|
|
Setting :html-preamble in publishing projects will take
|
|
|
|
precedence over this variable."
|
2011-02-10 12:19:37 +00:00
|
|
|
:group 'org-export-html
|
2011-03-15 14:36:25 +00:00
|
|
|
:type '(choice (const :tag "No preamble" nil)
|
|
|
|
(const :tag "Default preamble" t)
|
2012-04-02 21:28:52 +00:00
|
|
|
(string :tag "Custom format string")
|
2011-03-15 14:36:25 +00:00
|
|
|
(function :tag "Function (must return a string)")))
|
2011-02-10 12:19:37 +00:00
|
|
|
|
2011-07-27 17:23:24 +00:00
|
|
|
(defcustom org-export-html-preamble-format '(("en" ""))
|
2012-04-02 21:28:52 +00:00
|
|
|
"Alist of languages and format strings for the HTML preamble.
|
|
|
|
|
|
|
|
The first element of each list is the language code, as used for
|
|
|
|
the #+LANGUAGE keyword.
|
|
|
|
|
|
|
|
The second element of each list is a format string to format the
|
|
|
|
preamble itself. This format string can contain these elements:
|
2011-02-10 12:19:37 +00:00
|
|
|
|
2011-03-02 17:30:06 +00:00
|
|
|
%t stands for the title.
|
2011-07-27 17:23:24 +00:00
|
|
|
%a stands for the author's name.
|
|
|
|
%e stands for the author's email.
|
|
|
|
%d stands for the date.
|
2011-03-02 17:30:06 +00:00
|
|
|
|
|
|
|
If you need to use a \"%\" character, you need to escape it
|
|
|
|
like that: \"%%\"."
|
2011-02-10 12:19:37 +00:00
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2011-02-10 12:19:37 +00:00
|
|
|
:type 'string)
|
|
|
|
|
2011-03-15 14:36:25 +00:00
|
|
|
(defcustom org-export-html-postamble 'auto
|
2011-02-10 12:19:37 +00:00
|
|
|
"Non-nil means insert a postamble in HTML export.
|
2011-03-15 14:36:25 +00:00
|
|
|
|
2012-07-11 16:03:02 +00:00
|
|
|
When `t', insert a string as defined by the format string in
|
2011-03-15 14:36:25 +00:00
|
|
|
`org-export-html-postamble-format'. When set to a string, this
|
|
|
|
string overrides `org-export-html-postamble-format'. When set to
|
|
|
|
'auto, discard `org-export-html-postamble-format' and honor
|
|
|
|
`org-export-author/email/creator-info' variables. When set to a
|
|
|
|
function, apply this function and insert the returned string.
|
2011-12-12 23:10:00 +00:00
|
|
|
The function takes no argument, but you can use `opt-plist' to
|
|
|
|
access the current export options.
|
2011-03-15 14:36:25 +00:00
|
|
|
|
|
|
|
Setting :html-postamble in publishing projects will take
|
|
|
|
precedence over this variable."
|
2011-02-10 12:19:37 +00:00
|
|
|
:group 'org-export-html
|
2011-03-15 14:36:25 +00:00
|
|
|
:type '(choice (const :tag "No postamble" nil)
|
|
|
|
(const :tag "Auto preamble" 'auto)
|
2012-04-02 21:28:52 +00:00
|
|
|
(const :tag "Default format string" t)
|
|
|
|
(string :tag "Custom format string")
|
2011-03-15 14:36:25 +00:00
|
|
|
(function :tag "Function (must return a string)")))
|
2011-02-10 12:19:37 +00:00
|
|
|
|
|
|
|
(defcustom org-export-html-postamble-format
|
|
|
|
'(("en" "<p class=\"author\">Author: %a (%e)</p>
|
|
|
|
<p class=\"date\">Date: %d</p>
|
|
|
|
<p class=\"creator\">Generated by %c</p>
|
|
|
|
<p class=\"xhtml-validation\">%v</p>
|
|
|
|
"))
|
2012-04-02 21:28:52 +00:00
|
|
|
"Alist of languages and format strings for the HTML postamble.
|
|
|
|
|
|
|
|
The first element of each list is the language code, as used for
|
|
|
|
the #+LANGUAGE keyword.
|
|
|
|
|
|
|
|
The second element of each list is a format string to format the
|
|
|
|
postamble itself. This format string can contain these elements:
|
2011-02-10 12:19:37 +00:00
|
|
|
|
2011-07-27 17:23:24 +00:00
|
|
|
%a stands for the author's name.
|
|
|
|
%e stands for the author's email.
|
2011-02-10 12:19:37 +00:00
|
|
|
%d stands for the date.
|
2011-07-27 17:23:24 +00:00
|
|
|
%c will be replaced by information about Org/Emacs versions.
|
2011-03-02 17:30:06 +00:00
|
|
|
%v will be replaced by `org-export-html-validation-link'.
|
|
|
|
|
|
|
|
If you need to use a \"%\" character, you need to escape it
|
|
|
|
like that: \"%%\"."
|
2009-04-07 17:55:32 +00:00
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2009-04-07 17:55:32 +00:00
|
|
|
:type 'string)
|
|
|
|
|
2009-07-07 11:20:25 +00:00
|
|
|
(defcustom org-export-html-home/up-format
|
2009-11-16 17:08:42 +00:00
|
|
|
"<div id=\"org-div-home-and-up\" style=\"text-align:right;font-size:70%%;white-space:nowrap;\">
|
2009-07-07 11:20:25 +00:00
|
|
|
<a accesskey=\"h\" href=\"%s\"> UP </a>
|
|
|
|
|
|
|
|
|
<a accesskey=\"H\" href=\"%s\"> HOME </a>
|
|
|
|
</div>"
|
2010-07-15 22:54:53 +00:00
|
|
|
"Snippet used to insert the HOME and UP links.
|
|
|
|
This is a format string, the first %s will receive the UP link,
|
|
|
|
the second the HOME link. If both `org-export-html-link-up' and
|
|
|
|
`org-export-html-link-home' are empty, the entire snippet will be
|
|
|
|
ignored."
|
2009-07-07 11:20:25 +00:00
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(defcustom org-export-html-toplevel-hlevel 2
|
|
|
|
"The <H> level for level 1 headings in HTML export.
|
|
|
|
This is also important for the classes that will be wrapped around headlines
|
|
|
|
and outline structure. If this variable is 1, the top-level headlines will
|
|
|
|
be <h1>, and the corresponding classes will be outline-1, section-number-1,
|
|
|
|
and outline-text-1. If this is 2, all of these will get a 2 instead.
|
|
|
|
The default for this variable is 2, because we use <h1> for formatting the
|
|
|
|
document title."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
|
|
|
|
(defcustom org-export-html-link-org-files-as-html t
|
2010-01-21 15:15:40 +00:00
|
|
|
"Non-nil means make file links to `file.org' point to `file.html'.
|
2009-04-07 17:55:32 +00:00
|
|
|
When org-mode is exporting an org-mode file to HTML, links to
|
|
|
|
non-html files are directly put into a href tag in HTML.
|
|
|
|
However, links to other Org-mode files (recognized by the
|
|
|
|
extension `.org.) should become links to the corresponding html
|
|
|
|
file, assuming that the linked org-mode file will also be
|
|
|
|
converted to HTML.
|
|
|
|
When nil, the links still point to the plain `.org' file."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
(defcustom org-export-html-inline-images 'maybe
|
2010-01-21 15:15:40 +00:00
|
|
|
"Non-nil means inline images into exported HTML pages.
|
2009-04-07 17:55:32 +00:00
|
|
|
This is done using an <img> tag. When nil, an anchor with href is used to
|
|
|
|
link to the image. If this option is `maybe', then images in links with
|
|
|
|
an empty description will be inlined, while images with a description will
|
|
|
|
be linked only."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type '(choice (const :tag "Never" nil)
|
|
|
|
(const :tag "Always" t)
|
|
|
|
(const :tag "When there is no description" maybe)))
|
|
|
|
|
|
|
|
(defcustom org-export-html-inline-image-extensions
|
2010-10-04 08:28:53 +00:00
|
|
|
'("png" "jpeg" "jpg" "gif" "svg")
|
2009-04-07 17:55:32 +00:00
|
|
|
"Extensions of image files that can be inlined into HTML."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type '(repeat (string :tag "Extension")))
|
|
|
|
|
|
|
|
(defcustom org-export-html-table-tag
|
|
|
|
"<table border=\"2\" cellspacing=\"0\" cellpadding=\"6\" rules=\"groups\" frame=\"hsides\">"
|
|
|
|
"The HTML tag that is used to start a table.
|
|
|
|
This must be a <table> tag, but you may change the options like
|
|
|
|
borders and spacing."
|
|
|
|
:group 'org-export-html
|
|
|
|
:type 'string)
|
|
|
|
|
2010-10-22 07:19:04 +00:00
|
|
|
(defcustom org-export-table-header-tags '("<th scope=\"%s\"%s>" . "</th>")
|
2009-04-07 17:55:32 +00:00
|
|
|
"The opening tag for table header fields.
|
2009-05-08 04:34:13 +00:00
|
|
|
This is customizable so that alignment options can be specified.
|
2010-10-22 07:19:04 +00:00
|
|
|
The first %s will be filled with the scope of the field, either row or col.
|
|
|
|
The second %s will be replaced by a style entry to align the field.
|
|
|
|
See also the variable `org-export-html-table-use-header-tags-for-first-column'.
|
|
|
|
See also the variable `org-export-html-table-align-individual-fields'."
|
2009-04-07 17:55:32 +00:00
|
|
|
:group 'org-export-tables
|
|
|
|
:type '(cons (string :tag "Opening tag") (string :tag "Closing tag")))
|
|
|
|
|
2010-10-22 07:19:04 +00:00
|
|
|
(defcustom org-export-table-data-tags '("<td%s>" . "</td>")
|
2009-04-07 17:55:32 +00:00
|
|
|
"The opening tag for table data fields.
|
2010-10-22 07:19:04 +00:00
|
|
|
This is customizable so that alignment options can be specified.
|
|
|
|
The first %s will be filled with the scope of the field, either row or col.
|
|
|
|
The second %s will be replaced by a style entry to align the field.
|
|
|
|
See also the variable `org-export-html-table-align-individual-fields'."
|
2009-04-07 17:55:32 +00:00
|
|
|
:group 'org-export-tables
|
|
|
|
:type '(cons (string :tag "Opening tag") (string :tag "Closing tag")))
|
|
|
|
|
2009-06-18 05:07:22 +00:00
|
|
|
(defcustom org-export-table-row-tags '("<tr>" . "</tr>")
|
|
|
|
"The opening tag for table data fields.
|
|
|
|
This is customizable so that alignment options can be specified.
|
2009-06-18 21:22:08 +00:00
|
|
|
Instead of strings, these can be Lisp forms that will be evaluated
|
2009-06-18 05:07:22 +00:00
|
|
|
for each row in order to construct the table row tags. During evaluation,
|
|
|
|
the variable `head' will be true when this is a header line, nil when this
|
|
|
|
is a body line. And the variable `nline' will contain the line number,
|
|
|
|
starting from 1 in the first header line. For example
|
|
|
|
|
|
|
|
(setq org-export-table-row-tags
|
|
|
|
(cons '(if head
|
|
|
|
\"<tr>\"
|
|
|
|
(if (= (mod nline 2) 1)
|
|
|
|
\"<tr class=\\\"tr-odd\\\">\"
|
|
|
|
\"<tr class=\\\"tr-even\\\">\"))
|
|
|
|
\"</tr>\"))
|
|
|
|
|
|
|
|
will give even lines the class \"tr-even\" and odd lines the class \"tr-odd\"."
|
|
|
|
:group 'org-export-tables
|
2009-07-27 09:59:21 +00:00
|
|
|
:type '(cons
|
2009-06-18 05:07:22 +00:00
|
|
|
(choice :tag "Opening tag"
|
|
|
|
(string :tag "Specify")
|
|
|
|
(sexp))
|
|
|
|
(choice :tag "Closing tag"
|
|
|
|
(string :tag "Specify")
|
|
|
|
(sexp))))
|
|
|
|
|
2010-10-22 07:19:04 +00:00
|
|
|
(defcustom org-export-html-table-align-individual-fields t
|
|
|
|
"Non-nil means attach style attributes for alignment to each table field.
|
|
|
|
When nil, alignment will only be specified in the column tags, but this
|
|
|
|
is ignored by some browsers (like Firefox, Safari). Opera does it right
|
|
|
|
though."
|
|
|
|
:group 'org-export-tables
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2010-10-22 07:19:04 +00:00
|
|
|
:type 'boolean)
|
2009-06-18 05:07:22 +00:00
|
|
|
|
2009-05-07 13:05:41 +00:00
|
|
|
(defcustom org-export-html-table-use-header-tags-for-first-column nil
|
2010-01-21 15:15:40 +00:00
|
|
|
"Non-nil means format column one in tables with header tags.
|
2009-05-07 13:05:41 +00:00
|
|
|
When nil, also column one will use data tags."
|
|
|
|
:group 'org-export-tables
|
|
|
|
:type 'boolean)
|
|
|
|
|
2011-02-10 12:19:37 +00:00
|
|
|
(defcustom org-export-html-validation-link
|
|
|
|
"<a href=\"http://validator.w3.org/check?uri=referer\">Validate XHTML 1.0</a>"
|
|
|
|
"Link to HTML validation service."
|
2009-04-07 17:55:32 +00:00
|
|
|
:group 'org-export-html
|
2011-02-10 12:19:37 +00:00
|
|
|
:type 'string)
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2011-07-23 17:09:07 +00:00
|
|
|
;; FIXME Obsolete since Org 7.7
|
|
|
|
;; Use the :timestamp option or `org-export-time-stamp-file' instead
|
|
|
|
(defvar org-export-html-with-timestamp nil
|
|
|
|
"If non-nil, write container for HTML-helper-mode timestamp.")
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2011-07-23 17:09:07 +00:00
|
|
|
;; FIXME Obsolete since Org 7.7
|
|
|
|
(defvar org-export-html-html-helper-timestamp
|
|
|
|
"\n<p><br/><br/>\n<!-- hhmts start --> <!-- hhmts end --></p>\n"
|
|
|
|
"The HTML tag used as timestamp delimiter for HTML-helper-mode.")
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2011-02-12 11:49:50 +00:00
|
|
|
(defcustom org-export-html-protect-char-alist
|
|
|
|
'(("&" . "&")
|
|
|
|
("<" . "<")
|
|
|
|
(">" . ">"))
|
|
|
|
"Alist of characters to be converted by `org-html-protect'."
|
2011-07-02 14:27:43 +00:00
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2011-03-15 13:13:25 +00:00
|
|
|
:type '(repeat (cons (string :tag "Character")
|
|
|
|
(string :tag "HTML equivalent"))))
|
2011-02-15 10:07:46 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(defgroup org-export-htmlize nil
|
|
|
|
"Options for processing examples with htmlize.el."
|
|
|
|
:tag "Org Export Htmlize"
|
|
|
|
:group 'org-export-html)
|
|
|
|
|
|
|
|
(defcustom org-export-htmlize-output-type 'inline-css
|
|
|
|
"Output type to be used by htmlize when formatting code snippets.
|
2011-01-05 03:29:41 +00:00
|
|
|
Choices are `css', to export the CSS selectors only, or `inline-css', to
|
|
|
|
export the CSS attribute values inline in the HTML. We use as default
|
|
|
|
`inline-css', in order to make the resulting HTML self-containing.
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
However, this will fail when using Emacs in batch mode for export, because
|
|
|
|
then no rich font definitions are in place. It will also not be good if
|
|
|
|
people with different Emacs setup contribute HTML files to a website,
|
|
|
|
because the fonts will represent the individual setups. In these cases,
|
|
|
|
it is much better to let Org/Htmlize assign classes only, and to use
|
|
|
|
a style file to define the look of these classes.
|
2009-07-15 14:59:33 +00:00
|
|
|
To get a start for your css file, start Emacs session and make sure that
|
2009-04-07 17:55:32 +00:00
|
|
|
all the faces you are interested in are defined, for example by loading files
|
|
|
|
in all modes you want. Then, use the command
|
|
|
|
\\[org-export-htmlize-generate-css] to extract class definitions."
|
|
|
|
:group 'org-export-htmlize
|
|
|
|
:type '(choice (const css) (const inline-css)))
|
|
|
|
|
|
|
|
(defcustom org-export-htmlize-css-font-prefix "org-"
|
|
|
|
"The prefix for CSS class names for htmlize font specifications."
|
|
|
|
:group 'org-export-htmlize
|
|
|
|
:type 'string)
|
|
|
|
|
2009-05-13 08:51:01 +00:00
|
|
|
(defcustom org-export-htmlized-org-css-url nil
|
|
|
|
"URL pointing to a CSS file defining text colors for htmlized Emacs buffers.
|
|
|
|
Normally when creating an htmlized version of an Org buffer, htmlize will
|
|
|
|
create CSS to define the font colors. However, this does not work when
|
|
|
|
converting in batch mode, and it also can look bad if different people
|
|
|
|
with different fontification setup work on the same website.
|
|
|
|
When this variable is non-nil, creating an htmlized version of an Org buffer
|
|
|
|
using `org-export-as-org' will remove the internal CSS section and replace it
|
|
|
|
with a link to this URL."
|
2009-05-14 08:17:14 +00:00
|
|
|
:group 'org-export-htmlize
|
2009-05-13 08:51:01 +00:00
|
|
|
:type '(choice
|
|
|
|
(const :tag "Keep internal css" nil)
|
|
|
|
(string :tag "URL or local href")))
|
|
|
|
|
2011-07-23 17:09:07 +00:00
|
|
|
;; FIXME: The following variable is obsolete since Org 7.7 but is
|
|
|
|
;; still declared and checked within code for compatibility reasons.
|
|
|
|
;; Use the custom variables `org-export-html-divs' instead.
|
|
|
|
(defvar org-export-html-content-div "content"
|
|
|
|
"The name of the container DIV that holds all the page contents.
|
|
|
|
|
|
|
|
This variable is obsolete since Org version 7.7.
|
|
|
|
Please set `org-export-html-divs' instead.")
|
2011-07-11 11:40:36 +00:00
|
|
|
|
2011-07-23 17:09:07 +00:00
|
|
|
(defcustom org-export-html-divs '("preamble" "content" "postamble")
|
2011-08-25 13:09:44 +00:00
|
|
|
"The name of the main divs for HTML export.
|
|
|
|
This is a list of three strings, the first one for the preamble
|
|
|
|
DIV, the second one for the content DIV and the third one for the
|
|
|
|
postamble DIV."
|
2011-07-11 11:41:34 +00:00
|
|
|
:group 'org-export-html
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2011-07-23 17:09:07 +00:00
|
|
|
:type '(list
|
|
|
|
(string :tag " Div for the preamble:")
|
|
|
|
(string :tag " Div for the content:")
|
|
|
|
(string :tag "Div for the postamble:")))
|
2011-03-10 17:07:12 +00:00
|
|
|
|
2012-03-20 11:10:58 +00:00
|
|
|
(defcustom org-export-html-date-format-string "%Y-%m-%dT%R%z"
|
|
|
|
"Format string to format the date and time.
|
2012-03-20 11:04:39 +00:00
|
|
|
|
2012-03-20 11:10:58 +00:00
|
|
|
The default is an extended format of the ISO 8601 specification."
|
|
|
|
:group 'org-export-html
|
|
|
|
:version "24.1"
|
|
|
|
:type 'string)
|
2012-03-20 11:04:39 +00:00
|
|
|
|
2009-05-02 06:02:17 +00:00
|
|
|
;;; Hooks
|
|
|
|
|
|
|
|
(defvar org-export-html-after-blockquotes-hook nil
|
|
|
|
"Hook run during HTML export, after blockquote, verse, center are done.")
|
|
|
|
|
2009-09-29 05:07:36 +00:00
|
|
|
(defvar org-export-html-final-hook nil
|
2010-01-01 10:18:10 +00:00
|
|
|
"Hook run at the end of HTML export, in the new buffer.")
|
2009-09-29 05:07:36 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;;; HTML export
|
|
|
|
|
|
|
|
(defun org-export-html-preprocess (parameters)
|
2010-07-15 22:54:53 +00:00
|
|
|
"Convert LaTeX fragments to images."
|
2009-04-07 17:55:32 +00:00
|
|
|
(when (and org-current-export-file
|
|
|
|
(plist-get parameters :LaTeX-fragments))
|
|
|
|
(org-format-latex
|
2012-09-13 20:35:44 +00:00
|
|
|
(concat org-latex-preview-ltxpng-directory (file-name-sans-extension
|
2009-04-07 17:55:32 +00:00
|
|
|
(file-name-nondirectory
|
|
|
|
org-current-export-file)))
|
2010-07-01 07:41:44 +00:00
|
|
|
org-current-export-dir nil "Creating LaTeX image %s"
|
2010-08-13 12:22:16 +00:00
|
|
|
nil nil
|
|
|
|
(cond
|
|
|
|
((eq (plist-get parameters :LaTeX-fragments) 'verbatim) 'verbatim)
|
|
|
|
((eq (plist-get parameters :LaTeX-fragments) 'mathjax ) 'mathjax)
|
|
|
|
((eq (plist-get parameters :LaTeX-fragments) t ) 'mathjax)
|
2012-04-20 17:21:43 +00:00
|
|
|
((eq (plist-get parameters :LaTeX-fragments) 'imagemagick) 'imagemagick)
|
Remove useless (t nil) sexps at the end of some (cond ...) constructs
* org.el (org-compute-latex-and-specials-regexp)
(org-paste-subtree, org-sort-entries, org-store-link)
(org-open-at-point, org-file-remote-p, org-add-log-setup)
(org-set-tags-to, org-fast-tag-selection)
(org-diary-sexp-entry): Ditto.
* org-agenda.el (org-agenda-get-blocks, org-cmp-priority)
(org-cmp-effort, org-cmp-todo-state, org-cmp-alpha)
(org-cmp-tag, org-cmp-time): Remove useless (t nil) sexps at
the end of (cond ...) constructs.
* org-mobile.el (org-mobile-create-index-file): Ditto.
* org-lparse.el (org-lparse-format-table-row): Ditto.
* org-list.el (org-sort-list): Ditto.
* org-id.el (org-id-get): Ditto.
* org-html.el (org-export-html-preprocess): Ditto.
* org-exp.el (org-default-export-plist)
(org-table-clean-before-export): Ditto.
(t nil) in (cond (...) (...) (t nil)) has no other meaning that to
remind the developer that the cond sexp returns nil in case no condition
is matched. For several (cond ...) constructs this is obvious from reading
the code. For others, the reminder might be useful and we leave it.
See the discussion about this on emacs-devel:
http://thread.gmane.org/gmane.emacs.devel/152664
2012-08-19 12:42:54 +00:00
|
|
|
((eq (plist-get parameters :LaTeX-fragments) 'dvipng ) 'dvipng))))
|
2010-03-29 08:11:01 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(let (label l1)
|
|
|
|
(while (re-search-forward "\\\\ref{\\([^{}\n]+\\)}" nil t)
|
|
|
|
(org-if-unprotected-at (match-beginning 1)
|
|
|
|
(setq label (match-string 1))
|
|
|
|
(save-match-data
|
|
|
|
(if (string-match "\\`[a-z]\\{1,10\\}:\\(.+\\)" label)
|
|
|
|
(setq l1 (substring label (match-beginning 1)))
|
|
|
|
(setq l1 label)))
|
2010-07-13 09:46:51 +00:00
|
|
|
(replace-match (format "[[#%s][%s]]" label l1) t t)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-export-as-html-and-open (arg)
|
|
|
|
"Export the outline as HTML and immediately open it with a browser.
|
|
|
|
If there is an active region, export only the region.
|
|
|
|
The prefix ARG specifies how many levels of the outline should become
|
|
|
|
headlines. The default is 3. Lower levels will become bulleted lists."
|
|
|
|
(interactive "P")
|
|
|
|
(org-export-as-html arg 'hidden)
|
2010-02-21 08:19:21 +00:00
|
|
|
(org-open-file buffer-file-name)
|
|
|
|
(when org-export-kill-product-buffer-when-displayed
|
2010-04-18 14:54:19 +00:00
|
|
|
(kill-buffer (current-buffer))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-export-as-html-batch ()
|
2010-07-15 22:54:53 +00:00
|
|
|
"Call the function `org-export-as-html'.
|
|
|
|
This function can be used in batch processing as:
|
2009-04-07 17:55:32 +00:00
|
|
|
emacs --batch
|
|
|
|
--load=$HOME/lib/emacs/org.el
|
|
|
|
--eval \"(setq org-export-headline-levels 2)\"
|
|
|
|
--visit=MyFile --funcall org-export-as-html-batch"
|
|
|
|
(org-export-as-html org-export-headline-levels 'hidden))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-export-as-html-to-buffer (arg)
|
|
|
|
"Call `org-export-as-html` with output to a temporary buffer.
|
|
|
|
No file is created. The prefix ARG is passed through to `org-export-as-html'."
|
|
|
|
(interactive "P")
|
|
|
|
(org-export-as-html arg nil nil "*Org HTML Export*")
|
2009-05-21 07:14:33 +00:00
|
|
|
(when org-export-show-temporary-export-buffer
|
|
|
|
(switch-to-buffer-other-window "*Org HTML Export*")))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-replace-region-by-html (beg end)
|
|
|
|
"Assume the current region has org-mode syntax, and convert it to HTML.
|
|
|
|
This can be used in any buffer. For example, you could write an
|
|
|
|
itemized list in org-mode syntax in an HTML buffer and then use this
|
|
|
|
command to convert it."
|
|
|
|
(interactive "r")
|
|
|
|
(let (reg html buf pop-up-frames)
|
|
|
|
(save-window-excursion
|
Use (derived-mode-p 'org-mode) instead of (eq major-mode 'org-mode).
* org.el (org-show-hierarchy-above, org-cycle)
(org-global-cycle, org-files-list, org-store-link)
(org-link-search, org-open-file, org-display-outline-path)
(org-refile-get-location, org-update-all-dblocks)
(org-change-tag-in-region, org-entry-properties)
(org-save-all-org-buffers, org-revert-all-org-buffers)
(org-buffer-list, org-cdlatex-mode)
(org-install-agenda-files-menu, org-end-of-subtree)
(org-speedbar-set-agenda-restriction): Use (derived-mode-p
'org-mode) instead of (eq major-mode 'org-mode).
* org-timer.el (org-timer-set-timer): Ditto.
* org-table.el (orgtbl-mode, org-table-align, orgtbl-mode): Ditto.
* org-src.el (org-edit-src-exit, org-edit-src-code)
(org-edit-fixed-width-region, org-edit-src-exit): Ditto.
* org-remember.el (org-remember-handler): Ditto.
* org-mouse.el (dnd-open-file, org-mouse-insert-item): Ditto.
* org-macs.el (org-get-limited-outline-regexp): Ditto.
* org-lparse.el (org-replace-region-by): Ditto.
* org-latex.el (org-latex-to-pdf-process)
(org-replace-region-by-latex): Ditto.
* org-indent.el (org-indent-indent-buffer): Ditto.
* org-id.el (org-id-store-link, org-id-update-id-locations)
(org-id-store-link): Ditto.
* org-html.el (org-export-html-preprocess)
(org-replace-region-by-html): Ditto.
* org-footnote.el (org-footnote-normalize)
(org-footnote-goto-definition)
(org-footnote-create-definition, org-footnote-normalize): Ditto.
* org-docbook.el (org-replace-region-by-docbook): Ditto.
* org-ctags.el (find-tag): Ditto.
* org-colview.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-colview-xemacs.el (org-columns-redo)
(org-columns-display-here, org-columns-edit-value)
(org-columns-redo): Ditto.
* org-capture.el (org-capture-insert-template-here)
(org-capture, org-capture-finalize)
(org-capture-set-target-location)
(org-capture-insert-template-here): Ditto.
* org-ascii.el (org-replace-region-by-ascii): Ditto.
* org-archive.el (org-archive-subtree): Ditto.
* org-agenda.el (org-agenda)
(org-agenda-get-restriction-and-command)
(org-agenda-get-some-entry-text, org-search-view)
(org-tags-view, org-agenda-get-day-entries)
(org-agenda-format-item, org-agenda-goto, org-agenda-kill)
(org-agenda-archive-with, org-agenda-switch-to): Ditto.
2012-04-20 18:03:45 +00:00
|
|
|
(if (derived-mode-p 'org-mode)
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq html (org-export-region-as-html
|
|
|
|
beg end t 'string))
|
|
|
|
(setq reg (buffer-substring beg end)
|
|
|
|
buf (get-buffer-create "*Org tmp*"))
|
|
|
|
(with-current-buffer buf
|
|
|
|
(erase-buffer)
|
|
|
|
(insert reg)
|
|
|
|
(org-mode)
|
|
|
|
(setq html (org-export-region-as-html
|
|
|
|
(point-min) (point-max) t 'string)))
|
|
|
|
(kill-buffer buf)))
|
|
|
|
(delete-region beg end)
|
|
|
|
(insert html)))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun org-export-region-as-html (beg end &optional body-only buffer)
|
|
|
|
"Convert region from BEG to END in org-mode buffer to HTML.
|
|
|
|
If prefix arg BODY-ONLY is set, omit file header, footer, and table of
|
|
|
|
contents, and only produce the region of converted text, useful for
|
|
|
|
cut-and-paste operations.
|
|
|
|
If BUFFER is a buffer or a string, use/create that buffer as a target
|
|
|
|
of the converted HTML. If BUFFER is the symbol `string', return the
|
|
|
|
produced HTML as a string and leave not buffer behind. For example,
|
|
|
|
a Lisp program could call this function in the following way:
|
|
|
|
|
|
|
|
(setq html (org-export-region-as-html beg end t 'string))
|
|
|
|
|
|
|
|
When called interactively, the output buffer is selected, and shown
|
|
|
|
in a window. A non-interactive call will only return the buffer."
|
|
|
|
(interactive "r\nP")
|
2011-06-29 22:25:09 +00:00
|
|
|
(when (org-called-interactively-p 'any)
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq buffer "*Org HTML Export*"))
|
|
|
|
(let ((transient-mark-mode t) (zmacs-regions t)
|
|
|
|
ext-plist rtn)
|
2009-11-12 16:50:31 +00:00
|
|
|
(setq ext-plist (plist-put ext-plist :ignore-subtree-p t))
|
2009-04-07 17:55:32 +00:00
|
|
|
(goto-char end)
|
|
|
|
(set-mark (point)) ;; to activate the region
|
|
|
|
(goto-char beg)
|
|
|
|
(setq rtn (org-export-as-html
|
|
|
|
nil nil ext-plist
|
|
|
|
buffer body-only))
|
|
|
|
(if (fboundp 'deactivate-mark) (deactivate-mark))
|
2011-06-29 22:25:09 +00:00
|
|
|
(if (and (org-called-interactively-p 'any) (bufferp rtn))
|
2009-04-07 17:55:32 +00:00
|
|
|
(switch-to-buffer-other-window rtn)
|
|
|
|
rtn)))
|
|
|
|
|
|
|
|
(defvar html-table-tag nil) ; dynamically scoped into this.
|
|
|
|
(defvar org-par-open nil)
|
2010-05-17 22:17:38 +00:00
|
|
|
|
|
|
|
;;; org-html-cvt-link-fn
|
2010-06-07 06:35:10 +00:00
|
|
|
(defconst org-html-cvt-link-fn
|
2012-08-11 17:10:44 +00:00
|
|
|
nil
|
|
|
|
"Function to convert link URLs to exportable URLs.
|
2010-05-17 22:17:38 +00:00
|
|
|
Takes two arguments, TYPE and PATH.
|
2010-07-15 22:54:53 +00:00
|
|
|
Returns exportable url as (TYPE PATH), or nil to signal that it
|
2010-05-17 22:17:38 +00:00
|
|
|
didn't handle this case.
|
|
|
|
Intended to be locally bound around a call to `org-export-as-html'." )
|
|
|
|
|
|
|
|
(defun org-html-cvt-org-as-html (opt-plist type path)
|
2012-08-11 17:10:44 +00:00
|
|
|
"Convert an org filename to an equivalent html filename.
|
2010-05-17 22:17:38 +00:00
|
|
|
If TYPE is not file, just return `nil'.
|
|
|
|
See variable `org-export-html-link-org-files-as-html'"
|
|
|
|
|
2012-08-11 17:10:44 +00:00
|
|
|
(save-match-data
|
|
|
|
(and
|
|
|
|
org-export-html-link-org-files-as-html
|
|
|
|
(string= type "file")
|
|
|
|
(string-match "\\.org$" path)
|
|
|
|
(progn
|
|
|
|
(list
|
|
|
|
"file"
|
|
|
|
(concat
|
|
|
|
(substring path 0 (match-beginning 0))
|
|
|
|
"."
|
|
|
|
(plist-get opt-plist :html-extension)))))))
|
2010-05-17 22:17:38 +00:00
|
|
|
|
|
|
|
|
|
|
|
;;; org-html-should-inline-p
|
|
|
|
(defun org-html-should-inline-p (filename descp)
|
2012-08-11 17:10:44 +00:00
|
|
|
"Return non-nil if link FILENAME should be inlined.
|
2010-07-15 22:54:53 +00:00
|
|
|
The decision to inline the FILENAME link is based on the current
|
|
|
|
settings. DESCP is the boolean of whether there was a link
|
|
|
|
description. See variables `org-export-html-inline-images' and
|
2010-05-17 22:17:38 +00:00
|
|
|
`org-export-html-inline-image-extensions'."
|
2012-08-11 17:10:44 +00:00
|
|
|
(declare (special
|
|
|
|
org-export-html-inline-images
|
|
|
|
org-export-html-inline-image-extensions))
|
|
|
|
(and (or (eq t org-export-html-inline-images)
|
|
|
|
(and org-export-html-inline-images (not descp)))
|
|
|
|
(org-file-image-p
|
|
|
|
filename org-export-html-inline-image-extensions)))
|
2010-05-17 22:17:38 +00:00
|
|
|
|
|
|
|
;;; org-html-make-link
|
|
|
|
(defun org-html-make-link (opt-plist type path fragment desc attr
|
2012-08-11 17:10:44 +00:00
|
|
|
may-inline-p)
|
|
|
|
"Make an HTML link.
|
2010-05-17 22:17:38 +00:00
|
|
|
OPT-PLIST is an options list.
|
2011-08-24 14:13:14 +00:00
|
|
|
TYPE is the device-type of the link (THIS://foo.html).
|
|
|
|
PATH is the path of the link (http://THIS#location).
|
|
|
|
FRAGMENT is the fragment part of the link, if any (foo.html#THIS).
|
2010-05-17 22:17:38 +00:00
|
|
|
DESC is the link description, if any.
|
2011-08-24 14:13:14 +00:00
|
|
|
ATTR is a string of other attributes of the \"a\" element.
|
2010-05-17 22:17:38 +00:00
|
|
|
MAY-INLINE-P allows inlining it as an image."
|
|
|
|
|
2012-08-11 17:10:44 +00:00
|
|
|
(declare (special org-par-open))
|
|
|
|
(save-match-data
|
|
|
|
(let* ((filename path)
|
|
|
|
;;First pass. Just sanity stuff.
|
|
|
|
(components-1
|
|
|
|
(cond
|
|
|
|
((string= type "file")
|
|
|
|
(list
|
|
|
|
type
|
|
|
|
;;Substitute just if original path was absolute.
|
|
|
|
;;(Otherwise path must remain relative)
|
|
|
|
(if (file-name-absolute-p path)
|
|
|
|
(concat "file://" (expand-file-name path))
|
|
|
|
path)))
|
|
|
|
((string= type "")
|
|
|
|
(list nil path))
|
|
|
|
(t (list type path))))
|
|
|
|
|
|
|
|
;;Second pass. Components converted so they can refer
|
|
|
|
;;to a remote site.
|
|
|
|
(components-2
|
|
|
|
(or
|
|
|
|
(and org-html-cvt-link-fn
|
|
|
|
(apply org-html-cvt-link-fn
|
|
|
|
opt-plist components-1))
|
|
|
|
(apply #'org-html-cvt-org-as-html
|
|
|
|
opt-plist components-1)
|
|
|
|
components-1))
|
|
|
|
(type (first components-2))
|
|
|
|
(thefile (second components-2)))
|
|
|
|
|
|
|
|
|
|
|
|
;;Third pass. Build final link except for leading type
|
|
|
|
;;spec.
|
|
|
|
(cond
|
|
|
|
((or
|
|
|
|
(not type)
|
|
|
|
(string= type "http")
|
|
|
|
(string= type "https")
|
|
|
|
(string= type "file")
|
|
|
|
(string= type "coderef"))
|
|
|
|
(if fragment
|
|
|
|
(setq thefile (concat thefile "#" fragment))))
|
|
|
|
|
|
|
|
(t))
|
|
|
|
|
|
|
|
;;Final URL-build, for all types.
|
|
|
|
(setq thefile
|
2010-05-17 22:17:38 +00:00
|
|
|
(let
|
2012-08-11 17:10:44 +00:00
|
|
|
((str (org-export-html-format-href thefile)))
|
2011-04-12 18:18:50 +00:00
|
|
|
(if (and type (not (or (string= "file" type)
|
|
|
|
(string= "coderef" type))))
|
2010-05-17 22:17:38 +00:00
|
|
|
(concat type ":" str)
|
2012-08-11 17:10:44 +00:00
|
|
|
str)))
|
2010-05-17 22:17:38 +00:00
|
|
|
|
2012-08-11 17:10:44 +00:00
|
|
|
(if (and
|
|
|
|
may-inline-p
|
|
|
|
;;Can't inline a URL with a fragment.
|
|
|
|
(not fragment))
|
|
|
|
(progn
|
|
|
|
(message "image %s %s" thefile org-par-open)
|
|
|
|
(org-export-html-format-image thefile org-par-open))
|
|
|
|
(concat
|
|
|
|
"<a href=\"" thefile "\"" (if attr (concat " " attr)) ">"
|
|
|
|
(org-export-html-format-desc desc)
|
|
|
|
"</a>")))))
|
2010-05-17 22:17:38 +00:00
|
|
|
|
2012-04-28 17:06:52 +00:00
|
|
|
(defun org-html-handle-links (org-line opt-plist)
|
|
|
|
"Return ORG-LINE with markup of Org mode links.
|
2011-01-30 22:20:28 +00:00
|
|
|
OPT-PLIST is the export options list."
|
|
|
|
(let ((start 0)
|
|
|
|
(current-dir (if buffer-file-name
|
2012-08-11 17:10:44 +00:00
|
|
|
(file-name-directory buffer-file-name)
|
|
|
|
default-directory))
|
2011-01-30 22:20:28 +00:00
|
|
|
(link-validate (plist-get opt-plist :link-validation-function))
|
|
|
|
type id-file fnc
|
|
|
|
rpl path attr desc descp desc1 desc2 link)
|
2012-04-28 17:06:52 +00:00
|
|
|
(while (string-match org-bracket-link-analytic-regexp++ org-line start)
|
2011-01-30 22:20:28 +00:00
|
|
|
(setq start (match-beginning 0))
|
|
|
|
(setq path (save-match-data (org-link-unescape
|
2012-04-28 17:06:52 +00:00
|
|
|
(match-string 3 org-line))))
|
2011-01-30 22:20:28 +00:00
|
|
|
(setq type (cond
|
2012-04-28 17:06:52 +00:00
|
|
|
((match-end 2) (match-string 2 org-line))
|
2011-01-30 22:20:28 +00:00
|
|
|
((save-match-data
|
|
|
|
(or (file-name-absolute-p path)
|
|
|
|
(string-match "^\\.\\.?/" path)))
|
|
|
|
"file")
|
|
|
|
(t "internal")))
|
2011-09-11 14:01:59 +00:00
|
|
|
(setq path (org-extract-attributes path))
|
2011-01-30 22:20:28 +00:00
|
|
|
(setq attr (get-text-property 0 'org-attributes path))
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq desc1 (if (match-end 5) (match-string 5 org-line))
|
2011-01-30 22:20:28 +00:00
|
|
|
desc2 (if (match-end 2) (concat type ":" path) path)
|
|
|
|
descp (and desc1 (not (equal desc1 desc2)))
|
|
|
|
desc (or desc1 desc2))
|
|
|
|
;; Make an image out of the description if that is so wanted
|
|
|
|
(when (and descp (org-file-image-p
|
|
|
|
desc org-export-html-inline-image-extensions))
|
|
|
|
(save-match-data
|
|
|
|
(if (string-match "^file:" desc)
|
|
|
|
(setq desc (substring desc (match-end 0)))))
|
|
|
|
(setq desc (org-add-props
|
2011-09-11 14:01:59 +00:00
|
|
|
(concat "<img src=\"" desc "\" alt=\""
|
2011-04-19 13:34:49 +00:00
|
|
|
(file-name-nondirectory desc) "\"/>")
|
2011-01-30 22:20:28 +00:00
|
|
|
'(org-protected t))))
|
|
|
|
(cond
|
|
|
|
((equal type "internal")
|
|
|
|
(let
|
|
|
|
((frag-0
|
|
|
|
(if (= (string-to-char path) ?#)
|
|
|
|
(substring path 1)
|
|
|
|
path)))
|
|
|
|
(setq rpl
|
|
|
|
(org-html-make-link
|
|
|
|
opt-plist
|
|
|
|
""
|
|
|
|
""
|
|
|
|
(org-solidify-link-text
|
|
|
|
(save-match-data (org-link-unescape frag-0))
|
|
|
|
nil)
|
|
|
|
desc attr nil))))
|
|
|
|
((and (equal type "id")
|
|
|
|
(setq id-file (org-id-find-id-file path)))
|
|
|
|
;; This is an id: link to another file (if it was the same file,
|
|
|
|
;; it would have become an internal link...)
|
|
|
|
(save-match-data
|
|
|
|
(setq id-file (file-relative-name
|
|
|
|
id-file
|
|
|
|
(file-name-directory org-current-export-file)))
|
|
|
|
(setq rpl
|
|
|
|
(org-html-make-link opt-plist
|
|
|
|
"file" id-file
|
|
|
|
(concat (if (org-uuidgen-p path) "ID-") path)
|
|
|
|
desc
|
|
|
|
attr
|
|
|
|
nil))))
|
|
|
|
((member type '("http" "https"))
|
|
|
|
;; standard URL, can inline as image
|
|
|
|
(setq rpl
|
|
|
|
(org-html-make-link opt-plist
|
|
|
|
type path nil
|
|
|
|
desc
|
|
|
|
attr
|
|
|
|
(org-html-should-inline-p path descp))))
|
|
|
|
((member type '("ftp" "mailto" "news"))
|
|
|
|
;; standard URL, can't inline as image
|
|
|
|
(setq rpl
|
|
|
|
(org-html-make-link opt-plist
|
|
|
|
type path nil
|
|
|
|
desc
|
|
|
|
attr
|
|
|
|
nil)))
|
|
|
|
|
|
|
|
((string= type "coderef")
|
|
|
|
(let*
|
|
|
|
((coderef-str (format "coderef-%s" path))
|
|
|
|
(attr-1
|
|
|
|
(format "class=\"coderef\" onmouseover=\"CodeHighlightOn(this, '%s');\" onmouseout=\"CodeHighlightOff(this, '%s');\""
|
|
|
|
coderef-str coderef-str)))
|
|
|
|
(setq rpl
|
|
|
|
(org-html-make-link opt-plist
|
|
|
|
type "" coderef-str
|
|
|
|
(format
|
|
|
|
(org-export-get-coderef-format
|
|
|
|
path
|
|
|
|
(and descp desc))
|
|
|
|
(cdr (assoc path org-export-code-refs)))
|
|
|
|
attr-1
|
|
|
|
nil))))
|
|
|
|
|
|
|
|
((functionp (setq fnc (nth 2 (assoc type org-link-protocols))))
|
|
|
|
;; The link protocol has a function for format the link
|
|
|
|
(setq rpl
|
|
|
|
(save-match-data
|
|
|
|
(funcall fnc (org-link-unescape path) desc1 'html))))
|
|
|
|
|
|
|
|
((string= type "file")
|
|
|
|
;; FILE link
|
|
|
|
(save-match-data
|
|
|
|
(let*
|
|
|
|
((components
|
|
|
|
(if
|
|
|
|
(string-match "::\\(.*\\)" path)
|
|
|
|
(list
|
|
|
|
(replace-match "" t nil path)
|
|
|
|
(match-string 1 path))
|
|
|
|
(list path nil)))
|
|
|
|
|
|
|
|
;;The proper path, without a fragment
|
|
|
|
(path-1
|
|
|
|
(first components))
|
|
|
|
|
|
|
|
;;The raw fragment
|
|
|
|
(fragment-0
|
|
|
|
(second components))
|
|
|
|
|
|
|
|
;;Check the fragment. If it can't be used as
|
|
|
|
;;target fragment we'll pass nil instead.
|
|
|
|
(fragment-1
|
|
|
|
(if
|
|
|
|
(and fragment-0
|
|
|
|
(not (string-match "^[0-9]*$" fragment-0))
|
|
|
|
(not (string-match "^\\*" fragment-0))
|
|
|
|
(not (string-match "^/.*/$" fragment-0)))
|
|
|
|
(org-solidify-link-text
|
|
|
|
(org-link-unescape fragment-0))
|
|
|
|
nil))
|
|
|
|
(desc-2
|
|
|
|
;;Description minus "file:" and ".org"
|
|
|
|
(if (string-match "^file:" desc)
|
|
|
|
(let
|
|
|
|
((desc-1 (replace-match "" t t desc)))
|
|
|
|
(if (string-match "\\.org$" desc-1)
|
|
|
|
(replace-match "" t t desc-1)
|
|
|
|
desc-1))
|
|
|
|
desc)))
|
|
|
|
|
|
|
|
(setq rpl
|
|
|
|
(if
|
|
|
|
(and
|
|
|
|
(functionp link-validate)
|
|
|
|
(not (funcall link-validate path-1 current-dir)))
|
|
|
|
desc
|
|
|
|
(org-html-make-link opt-plist
|
|
|
|
"file" path-1 fragment-1 desc-2 attr
|
|
|
|
(org-html-should-inline-p path-1 descp)))))))
|
|
|
|
|
|
|
|
(t
|
|
|
|
;; just publish the path, as default
|
2011-10-08 19:18:57 +00:00
|
|
|
(setq rpl (concat "<i><" type ":"
|
2011-01-30 22:20:28 +00:00
|
|
|
(save-match-data (org-link-unescape path))
|
2011-10-08 19:18:57 +00:00
|
|
|
"></i>"))))
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (replace-match rpl t t org-line)
|
2011-01-30 22:20:28 +00:00
|
|
|
start (+ start (length rpl))))
|
2012-04-28 17:06:52 +00:00
|
|
|
org-line))
|
2011-01-30 22:20:28 +00:00
|
|
|
|
2010-05-17 22:17:38 +00:00
|
|
|
;;; org-export-as-html
|
2011-10-28 15:26:22 +00:00
|
|
|
|
|
|
|
(defvar org-heading-keyword-regexp-format) ; defined in org.el
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;;;###autoload
|
2011-03-30 03:35:00 +00:00
|
|
|
(defun org-export-as-html (arg &optional hidden ext-plist
|
2009-04-07 17:55:32 +00:00
|
|
|
to-buffer body-only pub-dir)
|
|
|
|
"Export the outline as a pretty HTML file.
|
|
|
|
If there is an active region, export only the region. The prefix
|
|
|
|
ARG specifies how many levels of the outline should become
|
|
|
|
headlines. The default is 3. Lower levels will become bulleted
|
2009-05-19 06:09:30 +00:00
|
|
|
lists. HIDDEN is obsolete and does nothing.
|
2009-04-07 17:55:32 +00:00
|
|
|
EXT-PLIST is a property list with external parameters overriding
|
|
|
|
org-mode's default settings, but still inferior to file-local
|
|
|
|
settings. When TO-BUFFER is non-nil, create a buffer with that
|
|
|
|
name and export to that buffer. If TO-BUFFER is the symbol
|
|
|
|
`string', don't leave any buffer behind but just return the
|
|
|
|
resulting HTML as a string. When BODY-ONLY is set, don't produce
|
|
|
|
the file header and footer, simply return the content of
|
|
|
|
<body>...</body>, without even the body tags themselves. When
|
|
|
|
PUB-DIR is set, use this as the publishing directory."
|
|
|
|
(interactive "P")
|
2009-12-11 07:40:19 +00:00
|
|
|
(run-hooks 'org-export-first-hook)
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; Make sure we have a file name when we need it.
|
|
|
|
(when (and (not (or to-buffer body-only))
|
|
|
|
(not buffer-file-name))
|
|
|
|
(if (buffer-base-buffer)
|
|
|
|
(org-set-local 'buffer-file-name
|
|
|
|
(with-current-buffer (buffer-base-buffer)
|
|
|
|
buffer-file-name))
|
2009-09-24 08:09:33 +00:00
|
|
|
(error "Need a file name to be able to export")))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(message "Exporting...")
|
|
|
|
(setq-default org-todo-line-regexp org-todo-line-regexp)
|
|
|
|
(setq-default org-deadline-line-regexp org-deadline-line-regexp)
|
|
|
|
(setq-default org-done-keywords org-done-keywords)
|
|
|
|
(setq-default org-maybe-keyword-time-regexp org-maybe-keyword-time-regexp)
|
|
|
|
(let* ((opt-plist
|
|
|
|
(org-export-process-option-filters
|
|
|
|
(org-combine-plists (org-default-export-plist)
|
|
|
|
ext-plist
|
|
|
|
(org-infile-export-plist))))
|
2009-05-25 13:58:16 +00:00
|
|
|
(body-only (or body-only (plist-get opt-plist :body-only)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(style (concat (if (plist-get opt-plist :style-include-default)
|
|
|
|
org-export-html-style-default)
|
|
|
|
(plist-get opt-plist :style)
|
|
|
|
(plist-get opt-plist :style-extra)
|
|
|
|
"\n"
|
|
|
|
(if (plist-get opt-plist :style-include-scripts)
|
|
|
|
org-export-html-scripts)))
|
|
|
|
(html-extension (plist-get opt-plist :html-extension))
|
|
|
|
valid thetoc have-headings first-heading-pos
|
|
|
|
(odd org-odd-levels-only)
|
|
|
|
(region-p (org-region-active-p))
|
|
|
|
(rbeg (and region-p (region-beginning)))
|
|
|
|
(rend (and region-p (region-end)))
|
|
|
|
(subtree-p
|
2009-11-12 16:50:31 +00:00
|
|
|
(if (plist-get opt-plist :ignore-subtree-p)
|
2009-04-07 17:55:32 +00:00
|
|
|
nil
|
|
|
|
(when region-p
|
|
|
|
(save-excursion
|
|
|
|
(goto-char rbeg)
|
|
|
|
(and (org-at-heading-p)
|
|
|
|
(>= (org-end-of-subtree t t) rend))))))
|
|
|
|
(level-offset (if subtree-p
|
|
|
|
(save-excursion
|
|
|
|
(goto-char rbeg)
|
|
|
|
(+ (funcall outline-level)
|
|
|
|
(if org-odd-levels-only 1 0)))
|
|
|
|
0))
|
|
|
|
(opt-plist (setq org-export-opt-plist
|
|
|
|
(if subtree-p
|
|
|
|
(org-export-add-subtree-options opt-plist rbeg)
|
|
|
|
opt-plist)))
|
|
|
|
;; The following two are dynamically scoped into other
|
|
|
|
;; routines below.
|
|
|
|
(org-current-export-dir
|
|
|
|
(or pub-dir (org-export-directory :html opt-plist)))
|
|
|
|
(org-current-export-file buffer-file-name)
|
2012-04-28 17:06:52 +00:00
|
|
|
(level 0) (org-line "") (origline "") txt todo
|
2009-04-07 17:55:32 +00:00
|
|
|
(umax nil)
|
|
|
|
(umax-toc nil)
|
|
|
|
(filename (if to-buffer nil
|
|
|
|
(expand-file-name
|
|
|
|
(concat
|
|
|
|
(file-name-sans-extension
|
|
|
|
(or (and subtree-p
|
|
|
|
(org-entry-get (region-beginning)
|
|
|
|
"EXPORT_FILE_NAME" t))
|
|
|
|
(file-name-nondirectory buffer-file-name)))
|
|
|
|
"." html-extension)
|
|
|
|
(file-name-as-directory
|
|
|
|
(or pub-dir (org-export-directory :html opt-plist))))))
|
|
|
|
(current-dir (if buffer-file-name
|
|
|
|
(file-name-directory buffer-file-name)
|
|
|
|
default-directory))
|
2011-10-28 08:03:33 +00:00
|
|
|
(auto-insert nil); Avoid any auto-insert stuff for the new file
|
2009-04-07 17:55:32 +00:00
|
|
|
(buffer (if to-buffer
|
|
|
|
(cond
|
|
|
|
((eq to-buffer 'string) (get-buffer-create "*Org HTML Export*"))
|
|
|
|
(t (get-buffer-create to-buffer)))
|
|
|
|
(find-file-noselect filename)))
|
|
|
|
(org-levels-open (make-vector org-level-max nil))
|
2011-10-29 12:17:56 +00:00
|
|
|
(date (org-html-expand (plist-get opt-plist :date)))
|
|
|
|
(author (org-html-expand (plist-get opt-plist :author)))
|
2011-02-15 14:57:20 +00:00
|
|
|
(html-validation-link (or org-export-html-validation-link ""))
|
2011-02-16 10:53:28 +00:00
|
|
|
(title (org-html-expand
|
|
|
|
(or (and subtree-p (org-export-get-title-from-subtree))
|
|
|
|
(plist-get opt-plist :title)
|
|
|
|
(and (not body-only)
|
|
|
|
(not
|
|
|
|
(plist-get opt-plist :skip-before-1st-heading))
|
|
|
|
(org-export-grab-title-from-buffer))
|
|
|
|
(and buffer-file-name
|
|
|
|
(file-name-sans-extension
|
|
|
|
(file-name-nondirectory buffer-file-name)))
|
|
|
|
"UNTITLED")))
|
2009-07-07 11:20:25 +00:00
|
|
|
(link-up (and (plist-get opt-plist :link-up)
|
|
|
|
(string-match "\\S-" (plist-get opt-plist :link-up))
|
|
|
|
(plist-get opt-plist :link-up)))
|
|
|
|
(link-home (and (plist-get opt-plist :link-home)
|
2010-07-13 09:54:00 +00:00
|
|
|
(string-match "\\S-" (plist-get opt-plist :link-home))
|
|
|
|
(plist-get opt-plist :link-home)))
|
2009-07-06 16:10:26 +00:00
|
|
|
(dummy (setq opt-plist (plist-put opt-plist :title title)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(html-table-tag (plist-get opt-plist :html-table-tag))
|
2011-08-24 23:58:29 +00:00
|
|
|
(quote-re0 (concat "^ *" org-quote-string "\\( +\\|[ \t]*$\\)"))
|
|
|
|
(quote-re (format org-heading-keyword-regexp-format
|
|
|
|
org-quote-string))
|
2009-04-07 17:55:32 +00:00
|
|
|
(inquote nil)
|
|
|
|
(infixed nil)
|
|
|
|
(inverse nil)
|
|
|
|
(email (plist-get opt-plist :email))
|
|
|
|
(language (plist-get opt-plist :language))
|
2011-10-29 12:17:56 +00:00
|
|
|
(keywords (org-html-expand (plist-get opt-plist :keywords)))
|
|
|
|
(description (org-html-expand (plist-get opt-plist :description)))
|
2011-03-23 14:38:18 +00:00
|
|
|
(num (plist-get opt-plist :section-numbers))
|
2009-04-07 17:55:32 +00:00
|
|
|
(lang-words nil)
|
|
|
|
(head-count 0) cnt
|
|
|
|
(start 0)
|
|
|
|
(coding-system (and (boundp 'buffer-file-coding-system)
|
|
|
|
buffer-file-coding-system))
|
|
|
|
(coding-system-for-write (or org-export-html-coding-system
|
|
|
|
coding-system))
|
|
|
|
(save-buffer-coding-system (or org-export-html-coding-system
|
|
|
|
coding-system))
|
|
|
|
(charset (and coding-system-for-write
|
|
|
|
(fboundp 'coding-system-get)
|
|
|
|
(coding-system-get coding-system-for-write
|
|
|
|
'mime-charset)))
|
|
|
|
(region
|
|
|
|
(buffer-substring
|
|
|
|
(if region-p (region-beginning) (point-min))
|
|
|
|
(if region-p (region-end) (point-max))))
|
2010-08-13 12:22:16 +00:00
|
|
|
(org-export-have-math nil)
|
2011-06-26 16:51:28 +00:00
|
|
|
(org-export-footnotes-seen nil)
|
2011-05-11 16:02:15 +00:00
|
|
|
(org-export-footnotes-data (org-footnote-all-labels 'with-defs))
|
2012-04-08 14:49:51 +00:00
|
|
|
(custom-id (or (org-entry-get nil "CUSTOM_ID" t) ""))
|
|
|
|
(footnote-def-prefix (format "fn-%s" custom-id))
|
|
|
|
(footnote-ref-prefix (format "fnr-%s" custom-id))
|
2009-04-07 17:55:32 +00:00
|
|
|
(lines
|
|
|
|
(org-split-string
|
|
|
|
(org-export-preprocess-string
|
|
|
|
region
|
|
|
|
:emph-multiline t
|
2011-02-15 10:07:46 +00:00
|
|
|
:for-backend 'html
|
2009-04-07 17:55:32 +00:00
|
|
|
:skip-before-1st-heading
|
|
|
|
(plist-get opt-plist :skip-before-1st-heading)
|
|
|
|
:drawers (plist-get opt-plist :drawers)
|
|
|
|
:todo-keywords (plist-get opt-plist :todo-keywords)
|
2011-03-29 22:48:29 +00:00
|
|
|
:tasks (plist-get opt-plist :tasks)
|
2009-04-07 17:55:32 +00:00
|
|
|
:tags (plist-get opt-plist :tags)
|
|
|
|
:priority (plist-get opt-plist :priority)
|
|
|
|
:footnotes (plist-get opt-plist :footnotes)
|
|
|
|
:timestamps (plist-get opt-plist :timestamps)
|
|
|
|
:archived-trees
|
|
|
|
(plist-get opt-plist :archived-trees)
|
|
|
|
:select-tags (plist-get opt-plist :select-tags)
|
|
|
|
:exclude-tags (plist-get opt-plist :exclude-tags)
|
|
|
|
:add-text
|
|
|
|
(plist-get opt-plist :text)
|
|
|
|
:LaTeX-fragments
|
|
|
|
(plist-get opt-plist :LaTeX-fragments))
|
|
|
|
"[\r\n]"))
|
2010-08-13 12:22:16 +00:00
|
|
|
(mathjax
|
|
|
|
(if (or (eq (plist-get opt-plist :LaTeX-fragments) 'mathjax)
|
|
|
|
(and org-export-have-math
|
|
|
|
(eq (plist-get opt-plist :LaTeX-fragments) t)))
|
|
|
|
|
|
|
|
(org-export-html-mathjax-config
|
|
|
|
org-export-html-mathjax-template
|
|
|
|
org-export-html-mathjax-options
|
|
|
|
(or (plist-get opt-plist :mathjax) ""))
|
|
|
|
""))
|
2011-01-30 22:20:28 +00:00
|
|
|
table-open
|
2009-04-07 17:55:32 +00:00
|
|
|
table-buffer table-orig-buffer
|
2011-01-02 12:52:16 +00:00
|
|
|
ind
|
|
|
|
rpl path attr desc descp desc1 desc2 link
|
|
|
|
snumber fnc
|
2009-04-07 17:55:32 +00:00
|
|
|
footnotes footref-seen
|
2012-08-21 10:37:32 +00:00
|
|
|
href)
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(org-unmodified
|
|
|
|
(remove-text-properties (point-min) (point-max)
|
|
|
|
'(:org-license-to-kill t))))
|
|
|
|
|
|
|
|
(message "Exporting...")
|
|
|
|
|
|
|
|
(setq org-min-level (org-get-min-level lines level-offset))
|
|
|
|
(setq org-last-level org-min-level)
|
|
|
|
(org-init-section-numbers)
|
|
|
|
|
|
|
|
(cond
|
|
|
|
((and date (string-match "%" date))
|
|
|
|
(setq date (format-time-string date)))
|
|
|
|
(date)
|
2012-03-20 11:04:39 +00:00
|
|
|
(t (setq date (format-time-string org-export-html-date-format-string))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; Get the language-dependent settings
|
|
|
|
(setq lang-words (or (assoc language org-export-language-setup)
|
|
|
|
(assoc "en" org-export-language-setup)))
|
|
|
|
|
|
|
|
;; Switch to the output buffer
|
|
|
|
(set-buffer buffer)
|
|
|
|
(let ((inhibit-read-only t)) (erase-buffer))
|
|
|
|
(fundamental-mode)
|
2009-07-06 15:00:03 +00:00
|
|
|
(org-install-letbind)
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(and (fboundp 'set-buffer-file-coding-system)
|
|
|
|
(set-buffer-file-coding-system coding-system-for-write))
|
|
|
|
|
|
|
|
(let ((case-fold-search nil)
|
|
|
|
(org-odd-levels-only odd))
|
|
|
|
;; create local variables for all options, to make sure all called
|
|
|
|
;; functions get the correct information
|
|
|
|
(mapc (lambda (x)
|
|
|
|
(set (make-local-variable (nth 2 x))
|
|
|
|
(plist-get opt-plist (car x))))
|
|
|
|
org-export-plist-vars)
|
|
|
|
(setq umax (if arg (prefix-numeric-value arg)
|
|
|
|
org-export-headline-levels))
|
|
|
|
(setq umax-toc (if (integerp org-export-with-toc)
|
|
|
|
(min org-export-with-toc umax)
|
|
|
|
umax))
|
|
|
|
(unless body-only
|
|
|
|
;; File header
|
|
|
|
(insert (format
|
2009-05-20 06:24:49 +00:00
|
|
|
"%s
|
|
|
|
<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"
|
2009-04-07 17:55:32 +00:00
|
|
|
\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">
|
2011-10-23 21:39:23 +00:00
|
|
|
<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"%s\" xml:lang=\"%s\">
|
2009-04-07 17:55:32 +00:00
|
|
|
<head>
|
|
|
|
<title>%s</title>
|
|
|
|
<meta http-equiv=\"Content-Type\" content=\"text/html;charset=%s\"/>
|
2011-10-23 21:39:23 +00:00
|
|
|
<meta name=\"title\" content=\"%s\"/>
|
2009-04-07 17:55:32 +00:00
|
|
|
<meta name=\"generator\" content=\"Org-mode\"/>
|
|
|
|
<meta name=\"generated\" content=\"%s\"/>
|
|
|
|
<meta name=\"author\" content=\"%s\"/>
|
|
|
|
<meta name=\"description\" content=\"%s\"/>
|
|
|
|
<meta name=\"keywords\" content=\"%s\"/>
|
|
|
|
%s
|
2010-08-13 12:22:16 +00:00
|
|
|
%s
|
2009-04-07 17:55:32 +00:00
|
|
|
</head>
|
|
|
|
<body>
|
2011-07-11 11:40:36 +00:00
|
|
|
%s
|
2009-04-07 17:55:32 +00:00
|
|
|
"
|
2009-05-27 14:16:31 +00:00
|
|
|
(format
|
|
|
|
(or (and (stringp org-export-html-xml-declaration)
|
|
|
|
org-export-html-xml-declaration)
|
|
|
|
(cdr (assoc html-extension org-export-html-xml-declaration))
|
|
|
|
(cdr (assoc "html" org-export-html-xml-declaration))
|
2009-05-27 14:16:31 +00:00
|
|
|
|
2009-06-02 12:49:38 +00:00
|
|
|
"")
|
2009-05-27 14:16:31 +00:00
|
|
|
(or charset "iso-8859-1"))
|
2009-07-07 11:20:25 +00:00
|
|
|
language language
|
2010-05-21 20:21:12 +00:00
|
|
|
title
|
2009-11-17 14:11:28 +00:00
|
|
|
(or charset "iso-8859-1")
|
2011-10-23 21:39:23 +00:00
|
|
|
title date author description keywords
|
2009-11-17 14:11:28 +00:00
|
|
|
style
|
2010-08-13 12:22:16 +00:00
|
|
|
mathjax
|
2009-07-07 11:20:25 +00:00
|
|
|
(if (or link-up link-home)
|
|
|
|
(concat
|
|
|
|
(format org-export-html-home/up-format
|
|
|
|
(or link-up link-home)
|
|
|
|
(or link-home link-up))
|
|
|
|
"\n")
|
2009-11-17 14:11:28 +00:00
|
|
|
"")))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2011-03-04 15:32:10 +00:00
|
|
|
;; insert html preamble
|
2011-03-15 14:36:25 +00:00
|
|
|
(when (plist-get opt-plist :html-preamble)
|
2011-09-29 19:49:11 +00:00
|
|
|
(let ((html-pre (plist-get opt-plist :html-preamble))
|
2012-01-15 09:27:51 +00:00
|
|
|
(html-pre-real-contents ""))
|
2011-12-12 17:37:09 +00:00
|
|
|
(cond ((stringp html-pre)
|
|
|
|
(setq html-pre-real-contents
|
|
|
|
(format-spec html-pre `((?t . ,title) (?a . ,author)
|
|
|
|
(?d . ,date) (?e . ,email)))))
|
|
|
|
((functionp html-pre)
|
|
|
|
(insert "<div id=\"" (nth 0 org-export-html-divs) "\">\n")
|
2011-12-12 23:10:00 +00:00
|
|
|
(if (stringp (funcall html-pre)) (insert (funcall html-pre)))
|
2011-12-12 17:37:09 +00:00
|
|
|
(insert "\n</div>\n"))
|
|
|
|
(t
|
|
|
|
(setq html-pre-real-contents
|
2012-08-11 17:10:44 +00:00
|
|
|
(format-spec
|
|
|
|
(or (cadr (assoc (nth 0 lang-words)
|
|
|
|
org-export-html-preamble-format))
|
|
|
|
(cadr (assoc "en" org-export-html-preamble-format)))
|
|
|
|
`((?t . ,title) (?a . ,author)
|
|
|
|
(?d . ,date) (?e . ,email))))))
|
2011-12-12 17:37:09 +00:00
|
|
|
;; don't output an empty preamble DIV
|
|
|
|
(unless (and (functionp html-pre)
|
|
|
|
(equal html-pre-real-contents ""))
|
|
|
|
(insert "<div id=\"" (nth 0 org-export-html-divs) "\">\n")
|
|
|
|
(insert html-pre-real-contents)
|
|
|
|
(insert "\n</div>\n"))))
|
2011-07-23 17:09:07 +00:00
|
|
|
|
|
|
|
;; begin wrap around body
|
2011-09-11 14:01:59 +00:00
|
|
|
(insert (format "\n<div id=\"%s\">"
|
2011-07-27 17:23:24 +00:00
|
|
|
;; FIXME org-export-html-content-div is obsolete since 7.7
|
2011-09-11 14:01:59 +00:00
|
|
|
(or org-export-html-content-div
|
2011-07-27 17:23:24 +00:00
|
|
|
(nth 1 org-export-html-divs)))
|
|
|
|
;; FIXME this should go in the preamble but is here so
|
|
|
|
;; that org-infojs can still find it
|
|
|
|
"\n<h1 class=\"title\">" title "</h1>\n"))
|
2011-03-12 04:22:41 +00:00
|
|
|
|
2011-07-23 17:09:07 +00:00
|
|
|
;; insert body
|
2012-04-03 16:32:56 +00:00
|
|
|
(if org-export-with-toc
|
2009-04-07 17:55:32 +00:00
|
|
|
(progn
|
|
|
|
(push (format "<h%d>%s</h%d>\n"
|
|
|
|
org-export-html-toplevel-hlevel
|
|
|
|
(nth 3 lang-words)
|
|
|
|
org-export-html-toplevel-hlevel)
|
|
|
|
thetoc)
|
|
|
|
(push "<div id=\"text-table-of-contents\">\n" thetoc)
|
|
|
|
(push "<ul>\n<li>" thetoc)
|
|
|
|
(setq lines
|
2011-09-11 14:01:59 +00:00
|
|
|
(mapcar
|
2012-04-28 17:06:52 +00:00
|
|
|
#'(lambda (org-line)
|
|
|
|
(if (and (string-match org-todo-line-regexp org-line)
|
|
|
|
(not (get-text-property 0 'org-protected org-line)))
|
2011-07-27 17:23:24 +00:00
|
|
|
;; This is a headline
|
|
|
|
(progn
|
|
|
|
(setq have-headings t)
|
|
|
|
(setq level (- (match-end 1) (match-beginning 1)
|
|
|
|
level-offset)
|
|
|
|
level (org-tr-level level)
|
|
|
|
txt (save-match-data
|
|
|
|
(org-html-expand
|
|
|
|
(org-export-cleanup-toc-line
|
2012-04-28 17:06:52 +00:00
|
|
|
(match-string 3 org-line))))
|
2011-07-27 17:23:24 +00:00
|
|
|
todo
|
|
|
|
(or (and org-export-mark-todo-in-toc
|
|
|
|
(match-beginning 2)
|
2012-04-28 17:06:52 +00:00
|
|
|
(not (member (match-string 2 org-line)
|
2011-07-27 17:23:24 +00:00
|
|
|
org-done-keywords)))
|
2009-04-07 17:55:32 +00:00
|
|
|
; TODO, not DONE
|
2011-07-27 17:23:24 +00:00
|
|
|
(and org-export-mark-todo-in-toc
|
|
|
|
(= level umax-toc)
|
|
|
|
(org-search-todo-below
|
2012-04-28 17:06:52 +00:00
|
|
|
org-line lines level))))
|
2011-07-27 17:23:24 +00:00
|
|
|
(if (string-match
|
|
|
|
(org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$") txt)
|
2011-09-11 14:01:59 +00:00
|
|
|
(setq txt (replace-match
|
2012-03-09 01:54:34 +00:00
|
|
|
" <span class=\"tag\">\\1</span>" t nil txt)))
|
2011-07-27 17:23:24 +00:00
|
|
|
(if (string-match quote-re0 txt)
|
|
|
|
(setq txt (replace-match "" t t txt)))
|
|
|
|
(setq snumber (org-section-number level))
|
|
|
|
(if (and num (if (integerp num)
|
|
|
|
(>= num level)
|
|
|
|
num))
|
|
|
|
(setq txt (concat snumber " " txt)))
|
|
|
|
(if (<= level (max umax umax-toc))
|
|
|
|
(setq head-count (+ head-count 1)))
|
|
|
|
(if (<= level umax-toc)
|
|
|
|
(progn
|
|
|
|
(if (> level org-last-level)
|
2010-07-13 09:54:00 +00:00
|
|
|
(progn
|
2011-07-27 17:23:24 +00:00
|
|
|
(setq cnt (- level org-last-level))
|
|
|
|
(while (>= (setq cnt (1- cnt)) 0)
|
|
|
|
(push "\n<ul>\n<li>" thetoc))
|
|
|
|
(push "\n" thetoc)))
|
|
|
|
(if (< level org-last-level)
|
|
|
|
(progn
|
|
|
|
(setq cnt (- org-last-level level))
|
|
|
|
(while (>= (setq cnt (1- cnt)) 0)
|
|
|
|
(push "</li>\n</ul>" thetoc))
|
|
|
|
(push "\n" thetoc)))
|
|
|
|
;; Check for targets
|
2012-04-28 17:06:52 +00:00
|
|
|
(while (string-match org-any-target-regexp org-line)
|
|
|
|
(setq org-line (replace-match
|
2012-08-11 17:10:44 +00:00
|
|
|
(concat "@<span class=\"target\">"
|
|
|
|
(match-string 1 org-line) "@</span> ")
|
|
|
|
t t org-line)))
|
2011-07-27 17:23:24 +00:00
|
|
|
(while (string-match "<\\(<\\)+\\|>\\(>\\)+" txt)
|
|
|
|
(setq txt (replace-match "" t t txt)))
|
|
|
|
(setq href
|
|
|
|
(replace-regexp-in-string
|
|
|
|
"\\." "-" (format "sec-%s" snumber)))
|
2011-09-11 14:01:59 +00:00
|
|
|
(setq href (org-solidify-link-text
|
|
|
|
(or (cdr (assoc href
|
2011-07-27 17:23:24 +00:00
|
|
|
org-export-preferred-target-alist)) href)))
|
|
|
|
(push
|
|
|
|
(format
|
|
|
|
(if todo
|
|
|
|
"</li>\n<li><a href=\"#%s\"><span class=\"todo\">%s</span></a>"
|
|
|
|
"</li>\n<li><a href=\"#%s\">%s</a>")
|
|
|
|
href txt) thetoc)
|
2011-09-11 14:01:59 +00:00
|
|
|
|
2011-07-27 17:23:24 +00:00
|
|
|
(setq org-last-level level)))))
|
2012-04-28 17:06:52 +00:00
|
|
|
org-line)
|
2011-07-27 17:23:24 +00:00
|
|
|
lines))
|
2009-04-07 17:55:32 +00:00
|
|
|
(while (> org-last-level (1- org-min-level))
|
|
|
|
(setq org-last-level (1- org-last-level))
|
|
|
|
(push "</li>\n</ul>\n" thetoc))
|
|
|
|
(push "</div>\n" thetoc)
|
|
|
|
(setq thetoc (if have-headings (nreverse thetoc) nil))))
|
2011-09-11 14:01:59 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq head-count 0)
|
|
|
|
(org-init-section-numbers)
|
2011-09-11 14:01:59 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-open-par)
|
2011-09-11 14:01:59 +00:00
|
|
|
|
2012-04-28 17:06:52 +00:00
|
|
|
(while (setq org-line (pop lines) origline org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(catch 'nextline
|
2011-09-11 14:01:59 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;; end of quote section?
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (and inquote (string-match org-outline-regexp-bol org-line))
|
2009-04-07 17:55:32 +00:00
|
|
|
(insert "</pre>\n")
|
2009-04-09 07:09:34 +00:00
|
|
|
(org-open-par)
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq inquote nil))
|
|
|
|
;; inside a quote section?
|
|
|
|
(when inquote
|
2012-04-28 17:06:52 +00:00
|
|
|
(insert (org-html-protect org-line) "\n")
|
2009-04-07 17:55:32 +00:00
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
;; Fixed-width, verbatim lines (examples)
|
|
|
|
(when (and org-export-with-fixed-width
|
2012-04-28 17:06:52 +00:00
|
|
|
(string-match "^[ \t]*:\\(\\([ \t]\\|$\\)\\(.*\\)\\)" org-line))
|
2009-04-07 17:55:32 +00:00
|
|
|
(when (not infixed)
|
|
|
|
(setq infixed t)
|
|
|
|
(org-close-par-maybe)
|
|
|
|
|
|
|
|
(insert "<pre class=\"example\">\n"))
|
2012-04-28 17:06:52 +00:00
|
|
|
(insert (org-html-protect (match-string 3 org-line)) "\n")
|
2009-04-07 17:55:32 +00:00
|
|
|
(when (or (not lines)
|
|
|
|
(not (string-match "^[ \t]*:\\(\\([ \t]\\|$\\)\\(.*\\)\\)"
|
|
|
|
(car lines))))
|
|
|
|
(setq infixed nil)
|
2009-04-09 07:09:34 +00:00
|
|
|
(insert "</pre>\n")
|
|
|
|
(org-open-par))
|
2009-04-07 17:55:32 +00:00
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
;; Protected HTML
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (and (get-text-property 0 'org-protected org-line)
|
2010-11-12 13:18:09 +00:00
|
|
|
;; Make sure it is the entire line that is protected
|
|
|
|
(not (< (or (next-single-property-change
|
2012-04-28 17:06:52 +00:00
|
|
|
0 'org-protected org-line) 10000)
|
|
|
|
(length org-line))))
|
|
|
|
(let (par (ind (get-text-property 0 'original-indentation org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(when (re-search-backward
|
|
|
|
"\\(<p>\\)\\([ \t\r\n]*\\)\\=" (- (point) 100) t)
|
|
|
|
(setq par (match-string 1))
|
|
|
|
(replace-match "\\2\n"))
|
2012-04-28 17:06:52 +00:00
|
|
|
(insert org-line "\n")
|
2009-04-07 17:55:32 +00:00
|
|
|
(while (and lines
|
2009-06-14 16:05:02 +00:00
|
|
|
(or (= (length (car lines)) 0)
|
|
|
|
(not ind)
|
|
|
|
(equal ind (get-text-property 0 'original-indentation (car lines))))
|
2009-04-07 17:55:32 +00:00
|
|
|
(or (= (length (car lines)) 0)
|
|
|
|
(get-text-property 0 'org-protected (car lines))))
|
|
|
|
(insert (pop lines) "\n"))
|
|
|
|
(and par (insert "<p>\n")))
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
|
|
|
;; Blockquotes, verse, and center
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (equal "ORG-BLOCKQUOTE-START" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert "<blockquote>\n")
|
|
|
|
(org-open-par)
|
|
|
|
(throw 'nextline nil))
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (equal "ORG-BLOCKQUOTE-END" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert "\n</blockquote>\n")
|
2009-04-09 07:09:34 +00:00
|
|
|
(org-open-par)
|
2009-04-07 17:55:32 +00:00
|
|
|
(throw 'nextline nil))
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (equal "ORG-VERSE-START" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert "\n<p class=\"verse\">\n")
|
Terminating lists by indentation of #+SPECIALS too
Sebastien Rose writes:
> there was much discussion about a terminator and I ran into a problem,
> that made me think we need one. But then I found we had one --- it's
> just not used on HTML export.
>
>
> Below is a little file I wrote. Thanks to the `- __' items, it results
> in the XHTML closely to what I wanted it to.
> But only as long as I use those _undocumented_ `- __' items. Once you
> remove them, you'll see, that the `#+html: </div...' stuff ends up
> inside the last list item and the XHTML will not validate.
>
>
> As I looked at it, I found the most natural solution would be, to
> terminate the list by regarding the indentation of `#+WHATEVER' and
> `#+BEGIN_WHATEVER' if inside lists [fn:1].
>
>
>
> The patch below (diffed against `remove-compatibility-code') makes
> XHTML-export honor the indentation of `#+SPECIALS'.
>
>
>
> Here's the Org-file I wrote (remove and add the `- __' list items to see
> the effect):
>
> #+OPTIONS: toc:nil
> #+STYLE: <style type="text/css">
> #+STYLE: body,p,div,td{font-size:13px;font-family:sans-serif;}
> #+STYLE: div { text-align:left; }
> #+STYLE: #content {width:550px;
> #+STYLE: margin-left:auto;margin-right:auto;text-align:center; }
> #+STYLE: #postamble { width:550px;clear:both;border-top:1px solid black;
> #+STYLE: margin-left:auto;margin-right:auto;text-align:center; }
> #+STYLE: </style>
>
> * List of design patterns
>
> #+HTML: <div style="width:48%;float:left;">
> *Behavioural Patterns*
> - [[file:BatchCommand][BatchCommand]]
> - [[file:ChainOfResponsibility.org][Chain Of Responsibility]]
> - [[file:Command.org][Command]], UndoableCommand and BatchCommand
> - [[file:Interpreter.org][Interpreter]]
> - [[file:Iterator.org][Iterator]]
> - [[file:Mediator.org][Mediator]]
> - [[file:Memento.org][Memento]]
> - [[file:NullObject][NullObject]]
> - [[file:Observer.org][Observer]]
> - [[file:State.org][State]]
> - [[file:Strategy.org][Strategy]]
> - [[file:TemplateMethod.org][Template Method]]
> - [[file:Visitor.org][Visitor]]
> *Creational Patterns*
> - [[file:AbstractFactory.org][Abstract Factory]]
> - [[file:Builder.org][Builder]]
> - [[file:Factory.org][Factory]]
> - [[file:FactoryMethod.org][Factory Method]]
> - [[file:Prototype.org][Prototype]]
> - [[file:Singleton.org][Singleton]]
> - __
> #+html: </div>
> #+html: <div style="width:48%;float:right;">
> *Structural Patterns*
> - [[file:Adapter.org][Adapter]]
> - [[file:Composite.org][Composite]]
> - [[file::Bridge.org][Bridge]]
> - [[file:Decorator.org][Decorator]]
> - [[file:Facade.org][Facade]]
> - [[file:Flyweight.org][Flyweight]]
> - [[file:Proxy.org][Proxy]]
> *Unsorted*
> - [[file:BusinessDelegate.org][Business Delegate]]
> - [[file:DataAccessObject.org][Data Access Object]]
> - [[file:DataTransferObject.org][Data Transfer Object]]
> - [[file:DependencyInjection.org][Dependency Injection]]
> - [[file:FluentInterface.org][Fluent Interface]]
> - [[file:InversionOfControl.org][Inversion Of Control]]
> - [[file:ModelViewControler.org][Model View Controler]]
> - [[file:ModelViewPresenter.org][Model View Presenter]]
> - [[file:Plugin.org][Plugin]]
> - __
> #+HTML: </div>
2010-04-22 06:41:09 +00:00
|
|
|
(setq org-par-open t)
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq inverse t)
|
|
|
|
(throw 'nextline nil))
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (equal "ORG-VERSE-END" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(insert "</p>\n")
|
Terminating lists by indentation of #+SPECIALS too
Sebastien Rose writes:
> there was much discussion about a terminator and I ran into a problem,
> that made me think we need one. But then I found we had one --- it's
> just not used on HTML export.
>
>
> Below is a little file I wrote. Thanks to the `- __' items, it results
> in the XHTML closely to what I wanted it to.
> But only as long as I use those _undocumented_ `- __' items. Once you
> remove them, you'll see, that the `#+html: </div...' stuff ends up
> inside the last list item and the XHTML will not validate.
>
>
> As I looked at it, I found the most natural solution would be, to
> terminate the list by regarding the indentation of `#+WHATEVER' and
> `#+BEGIN_WHATEVER' if inside lists [fn:1].
>
>
>
> The patch below (diffed against `remove-compatibility-code') makes
> XHTML-export honor the indentation of `#+SPECIALS'.
>
>
>
> Here's the Org-file I wrote (remove and add the `- __' list items to see
> the effect):
>
> #+OPTIONS: toc:nil
> #+STYLE: <style type="text/css">
> #+STYLE: body,p,div,td{font-size:13px;font-family:sans-serif;}
> #+STYLE: div { text-align:left; }
> #+STYLE: #content {width:550px;
> #+STYLE: margin-left:auto;margin-right:auto;text-align:center; }
> #+STYLE: #postamble { width:550px;clear:both;border-top:1px solid black;
> #+STYLE: margin-left:auto;margin-right:auto;text-align:center; }
> #+STYLE: </style>
>
> * List of design patterns
>
> #+HTML: <div style="width:48%;float:left;">
> *Behavioural Patterns*
> - [[file:BatchCommand][BatchCommand]]
> - [[file:ChainOfResponsibility.org][Chain Of Responsibility]]
> - [[file:Command.org][Command]], UndoableCommand and BatchCommand
> - [[file:Interpreter.org][Interpreter]]
> - [[file:Iterator.org][Iterator]]
> - [[file:Mediator.org][Mediator]]
> - [[file:Memento.org][Memento]]
> - [[file:NullObject][NullObject]]
> - [[file:Observer.org][Observer]]
> - [[file:State.org][State]]
> - [[file:Strategy.org][Strategy]]
> - [[file:TemplateMethod.org][Template Method]]
> - [[file:Visitor.org][Visitor]]
> *Creational Patterns*
> - [[file:AbstractFactory.org][Abstract Factory]]
> - [[file:Builder.org][Builder]]
> - [[file:Factory.org][Factory]]
> - [[file:FactoryMethod.org][Factory Method]]
> - [[file:Prototype.org][Prototype]]
> - [[file:Singleton.org][Singleton]]
> - __
> #+html: </div>
> #+html: <div style="width:48%;float:right;">
> *Structural Patterns*
> - [[file:Adapter.org][Adapter]]
> - [[file:Composite.org][Composite]]
> - [[file::Bridge.org][Bridge]]
> - [[file:Decorator.org][Decorator]]
> - [[file:Facade.org][Facade]]
> - [[file:Flyweight.org][Flyweight]]
> - [[file:Proxy.org][Proxy]]
> *Unsorted*
> - [[file:BusinessDelegate.org][Business Delegate]]
> - [[file:DataAccessObject.org][Data Access Object]]
> - [[file:DataTransferObject.org][Data Transfer Object]]
> - [[file:DependencyInjection.org][Dependency Injection]]
> - [[file:FluentInterface.org][Fluent Interface]]
> - [[file:InversionOfControl.org][Inversion Of Control]]
> - [[file:ModelViewControler.org][Model View Controler]]
> - [[file:ModelViewPresenter.org][Model View Presenter]]
> - [[file:Plugin.org][Plugin]]
> - __
> #+HTML: </div>
2010-04-22 06:41:09 +00:00
|
|
|
(setq org-par-open nil)
|
2009-04-09 07:09:34 +00:00
|
|
|
(org-open-par)
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq inverse nil)
|
|
|
|
(throw 'nextline nil))
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (equal "ORG-CENTER-START" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert "\n<div style=\"text-align: center\">")
|
|
|
|
(org-open-par)
|
|
|
|
(throw 'nextline nil))
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (equal "ORG-CENTER-END" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert "\n</div>")
|
2009-04-09 07:09:34 +00:00
|
|
|
(org-open-par)
|
2009-04-07 17:55:32 +00:00
|
|
|
(throw 'nextline nil))
|
2009-05-02 06:02:17 +00:00
|
|
|
(run-hooks 'org-export-html-after-blockquotes-hook)
|
2009-04-07 17:55:32 +00:00
|
|
|
(when inverse
|
2012-04-28 17:06:52 +00:00
|
|
|
(let ((i (org-get-string-indentation org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(if (> i 0)
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (concat (mapconcat 'identity
|
2012-08-11 17:10:44 +00:00
|
|
|
(make-list (* 2 i) "\\nbsp") "")
|
|
|
|
" " (org-trim org-line))))
|
2012-04-28 17:06:52 +00:00
|
|
|
(unless (string-match "\\\\\\\\[ \t]*$" org-line)
|
|
|
|
(setq org-line (concat org-line "\\\\")))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; make targets to anchors
|
2009-11-08 10:24:01 +00:00
|
|
|
(setq start 0)
|
2009-04-07 17:55:32 +00:00
|
|
|
(while (string-match
|
2012-04-28 17:06:52 +00:00
|
|
|
"<<<?\\([^<>]*\\)>>>?\\((INVISIBLE)\\)?[ \t]*\n?" org-line start)
|
2009-04-07 17:55:32 +00:00
|
|
|
(cond
|
2012-04-28 17:06:52 +00:00
|
|
|
((get-text-property (match-beginning 1) 'org-protected org-line)
|
2009-11-08 10:24:01 +00:00
|
|
|
(setq start (match-end 1)))
|
2009-04-07 17:55:32 +00:00
|
|
|
((match-end 2)
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (replace-match
|
2012-08-11 17:10:44 +00:00
|
|
|
(format
|
|
|
|
"@<a name=\"%s\" id=\"%s\">@</a>"
|
|
|
|
(org-solidify-link-text (match-string 1 org-line))
|
|
|
|
(org-solidify-link-text (match-string 1 org-line)))
|
|
|
|
t t org-line)))
|
2012-04-28 17:06:52 +00:00
|
|
|
((and org-export-with-toc (equal (string-to-char org-line) ?*))
|
2009-04-07 17:55:32 +00:00
|
|
|
;; FIXME: NOT DEPENDENT on TOC?????????????????????
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (replace-match
|
2012-08-11 17:10:44 +00:00
|
|
|
(concat "@<span class=\"target\">"
|
|
|
|
(match-string 1 org-line) "@</span> ")
|
|
|
|
;; (concat "@<i>" (match-string 1 org-line) "@</i> ")
|
|
|
|
t t org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(t
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (replace-match
|
2012-08-11 17:10:44 +00:00
|
|
|
(concat "@<a name=\""
|
|
|
|
(org-solidify-link-text (match-string 1 org-line))
|
|
|
|
"\" class=\"target\">" (match-string 1 org-line)
|
|
|
|
"@</a> ")
|
|
|
|
t t org-line)))))
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (org-html-handle-time-stamps org-line))
|
2011-03-13 19:27:12 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;; replace "&" by "&", "<" and ">" by "<" and ">"
|
|
|
|
;; handle @<..> HTML tags (replace "@>..<" by "<..>")
|
|
|
|
;; Also handle sub_superscripts and checkboxes
|
2012-04-28 17:06:52 +00:00
|
|
|
(or (string-match org-table-hline-regexp org-line)
|
|
|
|
(string-match "^[ \t]*\\([+]-\\||[ ]\\)[-+ |]*[+|][ \t]*$" org-line)
|
|
|
|
(setq org-line (org-html-expand org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2011-03-17 08:07:14 +00:00
|
|
|
;; Format the links
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (org-html-handle-links org-line opt-plist))
|
2011-03-17 08:07:14 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;; TODO items
|
2011-09-20 04:20:02 +00:00
|
|
|
(if (and org-todo-line-regexp
|
2012-04-28 17:06:52 +00:00
|
|
|
(string-match org-todo-line-regexp org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(match-beginning 2))
|
|
|
|
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line
|
|
|
|
(concat (substring org-line 0 (match-beginning 2))
|
2009-04-07 17:55:32 +00:00
|
|
|
"<span class=\""
|
2012-04-28 17:06:52 +00:00
|
|
|
(if (member (match-string 2 org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
org-done-keywords)
|
|
|
|
"done" "todo")
|
2011-10-16 14:36:02 +00:00
|
|
|
" " (org-export-html-get-todo-kwd-class-name
|
2012-04-28 17:06:52 +00:00
|
|
|
(match-string 2 org-line))
|
|
|
|
"\">" (match-string 2 org-line)
|
|
|
|
"</span>" (substring org-line (match-end 2)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; Does this contain a reference to a footnote?
|
|
|
|
(when org-export-with-footnotes
|
|
|
|
(setq start 0)
|
2012-04-28 17:06:52 +00:00
|
|
|
(while (string-match "\\([^* \t].*?\\)\\[\\([0-9]+\\)\\]" org-line start)
|
2011-05-26 18:35:46 +00:00
|
|
|
;; Discard protected matches not clearly identified as
|
|
|
|
;; footnote markers.
|
2012-04-28 17:06:52 +00:00
|
|
|
(if (or (get-text-property (match-beginning 2) 'org-protected org-line)
|
|
|
|
(not (get-text-property (match-beginning 2) 'org-footnote org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq start (match-end 2))
|
2012-04-28 17:06:52 +00:00
|
|
|
(let ((n (match-string 2 org-line)) extra a)
|
2009-04-07 17:55:32 +00:00
|
|
|
(if (setq a (assoc n footref-seen))
|
|
|
|
(progn
|
|
|
|
(setcdr a (1+ (cdr a)))
|
|
|
|
(setq extra (format ".%d" (cdr a))))
|
|
|
|
(setq extra "")
|
|
|
|
(push (cons n 1) footref-seen))
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line
|
2009-04-07 17:55:32 +00:00
|
|
|
(replace-match
|
2011-05-14 08:26:40 +00:00
|
|
|
(concat
|
|
|
|
(format
|
|
|
|
(concat "%s"
|
|
|
|
(format org-export-html-footnote-format
|
2012-04-08 14:49:51 +00:00
|
|
|
(concat "<a class=\"footref\" name=\"" footnote-ref-prefix ".%s%s\" href=\"#" footnote-def-prefix ".%s\">%s</a>")))
|
2012-04-28 17:06:52 +00:00
|
|
|
(or (match-string 1 org-line) "") n extra n n)
|
2011-05-14 08:26:40 +00:00
|
|
|
;; If another footnote is following the
|
|
|
|
;; current one, add a separator.
|
|
|
|
(if (save-match-data
|
|
|
|
(string-match "\\`\\[[0-9]+\\]"
|
2012-04-28 17:06:52 +00:00
|
|
|
(substring org-line (match-end 0))))
|
2011-05-14 08:26:40 +00:00
|
|
|
org-export-html-footnote-separator
|
|
|
|
""))
|
2012-04-28 17:06:52 +00:00
|
|
|
t t org-line))))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(cond
|
2012-04-28 17:06:52 +00:00
|
|
|
((string-match "^\\(\\*+\\)\\(?: +\\(.*?\\)\\)?[ \t]*$" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
;; This is a headline
|
|
|
|
(setq level (org-tr-level (- (match-end 1) (match-beginning 1)
|
|
|
|
level-offset))
|
2012-08-18 16:44:56 +00:00
|
|
|
txt (or (match-string 2 org-line) ""))
|
2009-04-07 17:55:32 +00:00
|
|
|
(if (string-match quote-re0 txt)
|
|
|
|
(setq txt (replace-match "" t t txt)))
|
|
|
|
(if (<= level (max umax umax-toc))
|
|
|
|
(setq head-count (+ head-count 1)))
|
|
|
|
(setq first-heading-pos (or first-heading-pos (point)))
|
|
|
|
(org-html-level-start level txt umax
|
|
|
|
(and org-export-with-toc (<= level umax))
|
2011-03-23 14:38:18 +00:00
|
|
|
head-count opt-plist)
|
2009-06-08 06:00:46 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;; QUOTES
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (string-match quote-re org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert "<pre>")
|
|
|
|
(setq inquote t)))
|
|
|
|
|
|
|
|
((and org-export-with-tables
|
2012-04-28 17:06:52 +00:00
|
|
|
(string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)" org-line))
|
2009-04-07 17:55:32 +00:00
|
|
|
(when (not table-open)
|
|
|
|
;; New table starts
|
|
|
|
(setq table-open t table-buffer nil table-orig-buffer nil))
|
|
|
|
|
|
|
|
;; Accumulate lines
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq table-buffer (cons org-line table-buffer)
|
2009-04-07 17:55:32 +00:00
|
|
|
table-orig-buffer (cons origline table-orig-buffer))
|
|
|
|
(when (or (not lines)
|
|
|
|
(not (string-match "^\\([ \t]*\\)\\(|\\|\\+-+\\+\\)"
|
|
|
|
(car lines))))
|
|
|
|
(setq table-open nil
|
|
|
|
table-buffer (nreverse table-buffer)
|
|
|
|
table-orig-buffer (nreverse table-orig-buffer))
|
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert (org-format-table-html table-buffer table-orig-buffer))))
|
2011-01-02 12:52:16 +00:00
|
|
|
|
|
|
|
;; Normal lines
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(t
|
2011-01-02 12:52:16 +00:00
|
|
|
;; This line either is list item or end a list.
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (get-text-property 0 'list-item org-line)
|
|
|
|
(setq org-line (org-html-export-list-line
|
2012-08-11 17:10:44 +00:00
|
|
|
org-line
|
|
|
|
(get-text-property 0 'list-item org-line)
|
|
|
|
(get-text-property 0 'list-struct org-line)
|
|
|
|
(get-text-property 0 'list-prevs org-line))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
2009-07-27 05:06:00 +00:00
|
|
|
;; Horizontal line
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (string-match "^[ \t]*-\\{5,\\}[ \t]*$" org-line)
|
2009-07-27 05:06:00 +00:00
|
|
|
(if org-par-open
|
|
|
|
(insert "\n</p>\n<hr/>\n<p>\n")
|
|
|
|
(insert "\n<hr/>\n"))
|
|
|
|
(throw 'nextline nil))
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;; Empty lines start a new paragraph. If hand-formatted lists
|
|
|
|
;; are not fully interpreted, lines starting with "-", "+", "*"
|
|
|
|
;; also start a new paragraph.
|
2012-04-28 17:06:52 +00:00
|
|
|
(if (string-match "^ [-+*]-\\|^[ \t]*$" org-line) (org-open-par))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; Is this the start of a footnote?
|
|
|
|
(when org-export-with-footnotes
|
|
|
|
(when (and (boundp 'footnote-section-tag-regexp)
|
|
|
|
(string-match (concat "^" footnote-section-tag-regexp)
|
2012-04-28 17:06:52 +00:00
|
|
|
org-line))
|
2009-04-07 17:55:32 +00:00
|
|
|
;; ignore this line
|
|
|
|
(throw 'nextline nil))
|
2012-04-28 17:06:52 +00:00
|
|
|
(when (string-match "^[ \t]*\\[\\([0-9]+\\)\\]" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-close-par-maybe)
|
2012-04-28 17:06:52 +00:00
|
|
|
(let ((n (match-string 1 org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq org-par-open t
|
2012-04-28 17:06:52 +00:00
|
|
|
org-line (replace-match
|
2012-08-11 17:10:44 +00:00
|
|
|
(format
|
|
|
|
(concat "<p class=\"footnote\">"
|
|
|
|
(format org-export-html-footnote-format
|
|
|
|
(concat
|
|
|
|
"<a class=\"footnum\" name=\"" footnote-def-prefix ".%s\" href=\"#" footnote-ref-prefix ".%s\">%s</a>")))
|
|
|
|
n n n) t t org-line)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
;; Check if the line break needs to be conserved
|
|
|
|
(cond
|
2012-04-28 17:06:52 +00:00
|
|
|
((string-match "\\\\\\\\[ \t]*$" org-line)
|
|
|
|
(setq org-line (replace-match "<br/>" t t org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-export-preserve-breaks
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq org-line (concat org-line "<br/>"))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; Check if a paragraph should be started
|
|
|
|
(let ((start 0))
|
|
|
|
(while (and org-par-open
|
2012-04-28 17:06:52 +00:00
|
|
|
(string-match "\\\\par\\>" org-line start))
|
2009-04-07 17:55:32 +00:00
|
|
|
;; Leave a space in the </p> so that the footnote matcher
|
|
|
|
;; does not see this.
|
|
|
|
(if (not (get-text-property (match-beginning 0)
|
2012-04-28 17:06:52 +00:00
|
|
|
'org-protected org-line))
|
|
|
|
(setq org-line (replace-match "</p ><p >" t t org-line)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq start (match-end 0))))
|
|
|
|
|
2012-04-28 17:06:52 +00:00
|
|
|
(insert org-line "\n")))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; Properly close all local lists and other lists
|
|
|
|
(when inquote
|
|
|
|
(insert "</pre>\n")
|
|
|
|
(org-open-par))
|
2010-07-13 13:11:35 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-html-level-start 1 nil umax
|
|
|
|
(and org-export-with-toc (<= level umax))
|
2011-03-23 14:38:18 +00:00
|
|
|
head-count opt-plist)
|
2009-04-07 17:55:32 +00:00
|
|
|
;; the </div> to close the last text-... div.
|
|
|
|
(when (and (> umax 0) first-heading-pos) (insert "</div>\n"))
|
|
|
|
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
2011-03-23 14:08:49 +00:00
|
|
|
(while (re-search-forward
|
|
|
|
"\\(\\(<p class=\"footnote\">\\)[^\000]*?\\)\\(\\(\\2\\)\\|\\'\\)"
|
2011-03-18 16:52:05 +00:00
|
|
|
nil t)
|
|
|
|
(push (match-string 1) footnotes)
|
|
|
|
(replace-match "\\4" t nil)
|
|
|
|
(goto-char (match-beginning 0))))
|
2009-04-07 17:55:32 +00:00
|
|
|
(when footnotes
|
|
|
|
(insert (format org-export-html-footnotes-section
|
2009-07-27 09:59:21 +00:00
|
|
|
(nth 4 lang-words)
|
2009-04-07 17:55:32 +00:00
|
|
|
(mapconcat 'identity (nreverse footnotes) "\n"))
|
|
|
|
"\n"))
|
|
|
|
(let ((bib (org-export-html-get-bibliography)))
|
|
|
|
(when bib
|
|
|
|
(insert "\n" bib "\n")))
|
2011-02-10 12:19:37 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(unless body-only
|
2011-07-23 17:09:07 +00:00
|
|
|
;; end wrap around body
|
|
|
|
(insert "</div>\n")
|
|
|
|
|
|
|
|
;; export html postamble
|
2011-03-15 14:36:25 +00:00
|
|
|
(let ((html-post (plist-get opt-plist :html-postamble))
|
|
|
|
(email
|
|
|
|
(mapconcat (lambda(e)
|
|
|
|
(format "<a href=\"mailto:%s\">%s</a>" e e))
|
|
|
|
(split-string email ",+ *")
|
|
|
|
", "))
|
|
|
|
(creator-info
|
2012-07-05 14:02:06 +00:00
|
|
|
(concat "<a href=\"http://orgmode.org\">Org</a> version "
|
|
|
|
(org-version) " with <a href=\"http://www.gnu.org/software/emacs/\">Emacs</a> version "
|
2011-03-15 14:36:25 +00:00
|
|
|
(number-to-string emacs-major-version))))
|
2011-07-23 17:09:07 +00:00
|
|
|
|
2011-03-15 14:36:25 +00:00
|
|
|
(when (plist-get opt-plist :html-postamble)
|
2011-07-23 17:09:07 +00:00
|
|
|
(insert "\n<div id=\"" (nth 2 org-export-html-divs) "\">\n")
|
2011-03-15 14:36:25 +00:00
|
|
|
(cond ((stringp html-post)
|
|
|
|
(insert (format-spec html-post
|
|
|
|
`((?a . ,author) (?e . ,email)
|
|
|
|
(?d . ,date) (?c . ,creator-info)
|
2011-07-23 17:09:07 +00:00
|
|
|
(?v . ,html-validation-link)))))
|
2011-03-15 14:36:25 +00:00
|
|
|
((functionp html-post)
|
2011-12-12 23:10:00 +00:00
|
|
|
(if (stringp (funcall html-post)) (insert (funcall html-post))))
|
2011-03-15 14:36:25 +00:00
|
|
|
((eq html-post 'auto)
|
|
|
|
;; fall back on default postamble
|
2011-03-15 14:53:36 +00:00
|
|
|
(when (plist-get opt-plist :time-stamp-file)
|
|
|
|
(insert "<p class=\"date\">" (nth 2 lang-words) ": " date "</p>\n"))
|
2011-03-15 14:36:25 +00:00
|
|
|
(when (and (plist-get opt-plist :author-info) author)
|
2012-08-11 17:10:44 +00:00
|
|
|
(insert "<p class=\"author\">" (nth 1 lang-words) ": " author "</p>\n"))
|
2011-03-15 14:36:25 +00:00
|
|
|
(when (and (plist-get opt-plist :email-info) email)
|
2011-03-15 17:36:10 +00:00
|
|
|
(insert "<p class=\"email\">" email "</p>\n"))
|
2011-03-15 14:36:25 +00:00
|
|
|
(when (plist-get opt-plist :creator-info)
|
|
|
|
(insert "<p class=\"creator\">"
|
2012-05-18 06:32:08 +00:00
|
|
|
(concat "<a href=\"http://orgmode.org\">Org</a> version "
|
|
|
|
(org-version) " with <a href=\"http://www.gnu.org/software/emacs/\">Emacs</a> version "
|
2011-03-15 14:36:25 +00:00
|
|
|
(number-to-string emacs-major-version) "</p>\n")))
|
2011-07-23 17:09:07 +00:00
|
|
|
(insert html-validation-link "\n"))
|
2011-03-15 14:36:25 +00:00
|
|
|
(t
|
|
|
|
(insert (format-spec
|
|
|
|
(or (cadr (assoc (nth 0 lang-words)
|
|
|
|
org-export-html-postamble-format))
|
|
|
|
(cadr (assoc "en" org-export-html-postamble-format)))
|
|
|
|
`((?a . ,author) (?e . ,email)
|
|
|
|
(?d . ,date) (?c . ,creator-info)
|
2011-07-23 17:09:07 +00:00
|
|
|
(?v . ,html-validation-link))))))
|
|
|
|
(insert "\n</div>"))))
|
2011-09-11 14:01:59 +00:00
|
|
|
|
2011-07-23 17:09:07 +00:00
|
|
|
;; FIXME `org-export-html-with-timestamp' has been declared
|
|
|
|
;; obsolete since Org 7.7 -- don't forget to remove this.
|
2011-02-10 12:19:37 +00:00
|
|
|
(if org-export-html-with-timestamp
|
|
|
|
(insert org-export-html-html-helper-timestamp))
|
|
|
|
|
2011-07-23 17:09:07 +00:00
|
|
|
(unless body-only (insert "\n</body>\n</html>\n"))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(unless (plist-get opt-plist :buffer-will-be-killed)
|
|
|
|
(normal-mode)
|
2009-09-02 07:28:59 +00:00
|
|
|
(if (eq major-mode (default-value 'major-mode))
|
|
|
|
(html-mode)))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
;; insert the table of contents
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when thetoc
|
|
|
|
(if (or (re-search-forward
|
|
|
|
"<p>\\s-*\\[TABLE-OF-CONTENTS\\]\\s-*</p>" nil t)
|
|
|
|
(re-search-forward
|
|
|
|
"\\[TABLE-OF-CONTENTS\\]" nil t))
|
|
|
|
(progn
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
(replace-match ""))
|
|
|
|
(goto-char first-heading-pos)
|
|
|
|
(when (looking-at "\\s-*</p>")
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(insert "\n")))
|
|
|
|
(insert "<div id=\"table-of-contents\">\n")
|
2011-01-04 21:10:25 +00:00
|
|
|
(let ((beg (point)))
|
|
|
|
(mapc 'insert thetoc)
|
|
|
|
(insert "</div>\n")
|
|
|
|
(while (re-search-backward "<li>[ \r\n\t]*</li>\n?" beg t)
|
|
|
|
(replace-match ""))))
|
|
|
|
;; remove empty paragraphs
|
2009-04-07 17:55:32 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(while (re-search-forward "<p>[ \r\n\t]*</p>" nil t)
|
|
|
|
(replace-match ""))
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; Convert whitespace place holders
|
|
|
|
(goto-char (point-min))
|
|
|
|
(let (beg end n)
|
|
|
|
(while (setq beg (next-single-property-change (point) 'org-whitespace))
|
|
|
|
(setq n (get-text-property beg 'org-whitespace)
|
|
|
|
end (next-single-property-change beg 'org-whitespace))
|
|
|
|
(goto-char beg)
|
|
|
|
(delete-region beg end)
|
|
|
|
(insert (format "<span style=\"visibility:hidden;\">%s</span>"
|
|
|
|
(make-string n ?x)))))
|
2009-11-21 19:50:37 +00:00
|
|
|
;; Remove empty lines at the beginning of the file.
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (looking-at "\\s-+\n") (replace-match ""))
|
2010-01-04 09:23:15 +00:00
|
|
|
;; Remove display properties
|
|
|
|
(remove-text-properties (point-min) (point-max) '(display t))
|
2009-11-21 19:50:37 +00:00
|
|
|
;; Run the hook
|
2009-09-29 05:07:36 +00:00
|
|
|
(run-hooks 'org-export-html-final-hook)
|
2009-04-07 17:55:32 +00:00
|
|
|
(or to-buffer (save-buffer))
|
|
|
|
(goto-char (point-min))
|
2009-05-21 07:14:33 +00:00
|
|
|
(or (org-export-push-to-kill-ring "HTML")
|
|
|
|
(message "Exporting... done"))
|
2009-04-07 17:55:32 +00:00
|
|
|
(if (eq to-buffer 'string)
|
|
|
|
(prog1 (buffer-substring (point-min) (point-max))
|
|
|
|
(kill-buffer (current-buffer)))
|
|
|
|
(current-buffer)))))
|
|
|
|
|
|
|
|
(defun org-export-html-format-href (s)
|
|
|
|
"Make sure the S is valid as a href reference in an XHTML document."
|
|
|
|
(save-match-data
|
|
|
|
(let ((start 0))
|
|
|
|
(while (string-match "&" s start)
|
|
|
|
(setq start (+ (match-beginning 0) 3)
|
|
|
|
s (replace-match "&" t t s)))))
|
|
|
|
s)
|
|
|
|
|
|
|
|
(defun org-export-html-format-desc (s)
|
|
|
|
"Make sure the S is valid as a description in a link."
|
|
|
|
(if (and s (not (get-text-property 1 'org-protected s)))
|
|
|
|
(save-match-data
|
|
|
|
(org-html-do-expand s))
|
|
|
|
s))
|
|
|
|
|
|
|
|
(defun org-export-html-format-image (src par-open)
|
|
|
|
"Create image tag with source and attributes."
|
|
|
|
(save-match-data
|
2012-09-13 20:35:44 +00:00
|
|
|
(if (string-match (regexp-quote org-latex-preview-ltxpng-directory) src)
|
2011-03-17 08:07:14 +00:00
|
|
|
(format "<img src=\"%s\" alt=\"%s\"/>"
|
2010-03-31 16:23:24 +00:00
|
|
|
src (org-find-text-property-in-string 'org-latex-src src))
|
2009-04-07 17:55:32 +00:00
|
|
|
(let* ((caption (org-find-text-property-in-string 'org-caption src))
|
|
|
|
(attr (org-find-text-property-in-string 'org-attributes src))
|
|
|
|
(label (org-find-text-property-in-string 'org-label src)))
|
2010-03-29 05:30:00 +00:00
|
|
|
(setq caption (and caption (org-html-do-expand caption)))
|
2009-10-02 06:29:21 +00:00
|
|
|
(concat
|
2012-08-11 17:10:44 +00:00
|
|
|
(if caption
|
|
|
|
(format "%s<div %sclass=\"figure\">
|
2011-03-17 08:07:14 +00:00
|
|
|
<p>"
|
2012-08-11 17:10:44 +00:00
|
|
|
(if org-par-open "</p>\n" "")
|
|
|
|
(if label (format "id=\"%s\" " (org-solidify-link-text label)) "")))
|
|
|
|
(format "<img src=\"%s\"%s />"
|
|
|
|
src
|
|
|
|
(if (string-match "\\<alt=" (or attr ""))
|
|
|
|
(concat " " attr )
|
|
|
|
(concat " " attr " alt=\"" src "\"")))
|
|
|
|
(if caption
|
|
|
|
(format "</p>%s
|
2011-03-17 08:07:14 +00:00
|
|
|
</div>%s"
|
2012-08-11 17:10:44 +00:00
|
|
|
(concat "\n<p>" caption "</p>")
|
|
|
|
(if org-par-open "\n<p>" ""))))))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(defun org-export-html-get-bibliography ()
|
|
|
|
"Find bibliography, cut it out and return it."
|
|
|
|
(catch 'exit
|
|
|
|
(let (beg end (cnt 1) bib)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward "^[ \t]*<div \\(id\\|class\\)=\"bibliography\"" nil t)
|
|
|
|
(setq beg (match-beginning 0))
|
|
|
|
(while (re-search-forward "</?div\\>" nil t)
|
|
|
|
(setq cnt (+ cnt (if (string= (match-string 0) "<div") +1 -1)))
|
|
|
|
(when (= cnt 0)
|
|
|
|
(and (looking-at ">") (forward-char 1))
|
|
|
|
(setq bib (buffer-substring beg (point)))
|
|
|
|
(delete-region beg (point))
|
2012-08-11 17:10:44 +00:00
|
|
|
(throw 'exit bib))))
|
2009-04-07 17:55:32 +00:00
|
|
|
nil))))
|
|
|
|
|
|
|
|
(defvar org-table-number-regexp) ; defined in org-table.el
|
2010-10-26 05:10:48 +00:00
|
|
|
(defun org-format-table-html (lines olines &optional no-css)
|
|
|
|
"Find out which HTML converter to use and return the HTML code.
|
|
|
|
NO-CSS is passed to the exporter."
|
2009-04-07 17:55:32 +00:00
|
|
|
(if (stringp lines)
|
|
|
|
(setq lines (org-split-string lines "\n")))
|
|
|
|
(if (string-match "^[ \t]*|" (car lines))
|
|
|
|
;; A normal org table
|
2010-10-26 05:10:48 +00:00
|
|
|
(org-format-org-table-html lines nil no-css)
|
2011-09-11 14:01:59 +00:00
|
|
|
;; Table made by table.el
|
2011-04-25 03:42:23 +00:00
|
|
|
(or (org-format-table-table-html-using-table-generate-source
|
|
|
|
olines (not org-export-prefer-native-exporter-for-tables))
|
|
|
|
;; We are here only when table.el table has NO col or row
|
|
|
|
;; spanning and the user prefers using org's own converter for
|
|
|
|
;; exporting of such simple table.el tables.
|
|
|
|
(org-format-table-table-html lines))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(defvar org-table-number-fraction) ; defined in org-table.el
|
2010-10-26 05:10:48 +00:00
|
|
|
(defun org-format-org-table-html (lines &optional splice no-css)
|
|
|
|
"Format a table into HTML.
|
|
|
|
LINES is a list of lines. Optional argument SPLICE means, do not
|
|
|
|
insert header and surrounding <table> tags, just format the lines.
|
|
|
|
Optional argument NO-CSS means use XHTML attributes instead of CSS
|
|
|
|
for formatting. This is required for the DocBook exporter."
|
2009-04-07 17:55:32 +00:00
|
|
|
(require 'org-table)
|
|
|
|
;; Get rid of hlines at beginning and end
|
|
|
|
(if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
|
|
|
|
(setq lines (nreverse lines))
|
|
|
|
(if (string-match "^[ \t]*|-" (car lines)) (setq lines (cdr lines)))
|
|
|
|
(setq lines (nreverse lines))
|
|
|
|
(when org-export-table-remove-special-lines
|
|
|
|
;; Check if the table has a marking column. If yes remove the
|
|
|
|
;; column and the special lines
|
|
|
|
(setq lines (org-table-clean-before-export lines)))
|
|
|
|
|
2010-03-29 08:11:01 +00:00
|
|
|
(let* ((caption (org-find-text-property-in-string 'org-caption (car lines)))
|
|
|
|
(label (org-find-text-property-in-string 'org-label (car lines)))
|
2011-10-16 08:54:20 +00:00
|
|
|
(col-cookies (org-find-text-property-in-string 'org-col-cookies
|
|
|
|
(car lines)))
|
2010-03-29 08:11:01 +00:00
|
|
|
(attributes (org-find-text-property-in-string 'org-attributes
|
|
|
|
(car lines)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(html-table-tag (org-export-splice-attributes
|
|
|
|
html-table-tag attributes))
|
|
|
|
(head (and org-export-highlight-first-table-line
|
|
|
|
(delq nil (mapcar
|
|
|
|
(lambda (x) (string-match "^[ \t]*|-" x))
|
|
|
|
(cdr lines)))))
|
2010-10-21 14:28:06 +00:00
|
|
|
(nline 0) fnum nfields i (cnt 0)
|
2012-04-28 17:06:52 +00:00
|
|
|
tbopen org-line fields html gr colgropen rowstart rowend
|
2010-10-22 07:19:04 +00:00
|
|
|
ali align aligns n)
|
2010-03-29 05:30:00 +00:00
|
|
|
(setq caption (and caption (org-html-do-expand caption)))
|
2011-10-16 08:54:20 +00:00
|
|
|
(when (and col-cookies org-table-clean-did-remove-column)
|
|
|
|
(setq col-cookies
|
|
|
|
(mapcar (lambda (x) (cons (1- (car x)) (cdr x))) col-cookies)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(if splice (setq head nil))
|
|
|
|
(unless splice (push (if head "<thead>" "<tbody>") html))
|
|
|
|
(setq tbopen t)
|
2012-04-28 17:06:52 +00:00
|
|
|
(while (setq org-line (pop lines))
|
2009-04-07 17:55:32 +00:00
|
|
|
(catch 'next-line
|
2012-04-28 17:06:52 +00:00
|
|
|
(if (string-match "^[ \t]*|-" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(progn
|
|
|
|
(unless splice
|
|
|
|
(push (if head "</thead>" "</tbody>") html)
|
|
|
|
(if lines (push "<tbody>" html) (setq tbopen nil)))
|
|
|
|
(setq head nil) ;; head ends here, first time around
|
|
|
|
;; ignore this line
|
|
|
|
(throw 'next-line t)))
|
|
|
|
;; Break the line into fields
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq fields (org-split-string org-line "[ \t]*|[ \t]*"))
|
HTML export: Fix alignment bug
Patch by Stephen Peters.
Stephen writes:
> When creating a table, I was noticing that the
> <colgroup><col>... provides useful alignment information based on
> whether or not the column has numbers in it. I think, however, that
> there is a mistake in this routine. Take, for example, the following
> table:
>
> | Id | Task | Developer | Estimate | Spent | Remaining | Comp.% | Updated |
> |-----+--------------+-----------+----------+-------+-----------+--------+-----------------|
> | 1 | Task One | SLP | 1 | 0 | 1 | 0 | SLP, 2010-04-27 |
> | 2 | Task Two | SLP | 1 | 0 | 1 | 0 | SLP, 2010-04-27 |
> | 3 | Task Three | SLP | 2 | 0 | 2 | 0 | SLP, 2010-04-27 |
> | 4 | Task Four | SLP | 2 | 0 | 2 | 0 | SLP, 2010-04-27 |
> | 5 | Task Five | SLP | .25 | 0 | 0.25 | 0 | SLP, 2010-04-27 |
> | 5.1 | Another Task | XML team | 0 | 1 | 0 | 0 | SLP, 2010-04-27 |
> | 6 | Task Six | SLP | .25 | 0 | 0.25 | 0 | SLP, 2010-04-27 |
> | 6.1 | More Tasks | DB team | 3 | 0 | 3 | 0 | SLP, 2010-04-27 |
> | 7 | Task Seven | SLP | 3 | 0 | 3 | 0 | SLP, 2010-04-27 |
>
> When the colgroup list is created for this table, it reads:
>
> <colgroup><col align="right" /><col align="left" /><col align="left" /><col align="right" /><col align="right" /><col align="left" /><col align="left" /><col align="left" />
> </colgroup>
>
> Note that the first columns are correct, but the last few are not. It
> should read right, left, left, right, right, right, right, left.
>
> I believe that this is due to the (< i nline) comparison within
> org-format-org-table-html, which is nonsensical because it's trying to
> compare a column number with a number of rows. I've attached a patch
> for the problem.
2010-04-29 13:01:10 +00:00
|
|
|
(unless fnum (setq fnum (make-vector (length fields) 0)
|
|
|
|
nfields (length fnum)))
|
2009-06-18 05:07:22 +00:00
|
|
|
(setq nline (1+ nline) i -1
|
|
|
|
rowstart (eval (car org-export-table-row-tags))
|
|
|
|
rowend (eval (cdr org-export-table-row-tags)))
|
|
|
|
(push (concat rowstart
|
2009-04-07 17:55:32 +00:00
|
|
|
(mapconcat
|
|
|
|
(lambda (x)
|
2010-10-23 05:50:10 +00:00
|
|
|
(setq i (1+ i) ali (format "@@class%03d@@" i))
|
HTML export: Fix alignment bug
Patch by Stephen Peters.
Stephen writes:
> When creating a table, I was noticing that the
> <colgroup><col>... provides useful alignment information based on
> whether or not the column has numbers in it. I think, however, that
> there is a mistake in this routine. Take, for example, the following
> table:
>
> | Id | Task | Developer | Estimate | Spent | Remaining | Comp.% | Updated |
> |-----+--------------+-----------+----------+-------+-----------+--------+-----------------|
> | 1 | Task One | SLP | 1 | 0 | 1 | 0 | SLP, 2010-04-27 |
> | 2 | Task Two | SLP | 1 | 0 | 1 | 0 | SLP, 2010-04-27 |
> | 3 | Task Three | SLP | 2 | 0 | 2 | 0 | SLP, 2010-04-27 |
> | 4 | Task Four | SLP | 2 | 0 | 2 | 0 | SLP, 2010-04-27 |
> | 5 | Task Five | SLP | .25 | 0 | 0.25 | 0 | SLP, 2010-04-27 |
> | 5.1 | Another Task | XML team | 0 | 1 | 0 | 0 | SLP, 2010-04-27 |
> | 6 | Task Six | SLP | .25 | 0 | 0.25 | 0 | SLP, 2010-04-27 |
> | 6.1 | More Tasks | DB team | 3 | 0 | 3 | 0 | SLP, 2010-04-27 |
> | 7 | Task Seven | SLP | 3 | 0 | 3 | 0 | SLP, 2010-04-27 |
>
> When the colgroup list is created for this table, it reads:
>
> <colgroup><col align="right" /><col align="left" /><col align="left" /><col align="right" /><col align="right" /><col align="left" /><col align="left" /><col align="left" />
> </colgroup>
>
> Note that the first columns are correct, but the last few are not. It
> should read right, left, left, right, right, right, right, left.
>
> I believe that this is due to the (< i nline) comparison within
> org-format-org-table-html, which is nonsensical because it's trying to
> compare a column number with a number of rows. I've attached a patch
> for the problem.
2010-04-29 13:01:10 +00:00
|
|
|
(if (and (< i nfields) ; make sure no rogue line causes an error here
|
2009-04-07 17:55:32 +00:00
|
|
|
(string-match org-table-number-regexp x))
|
|
|
|
(incf (aref fnum i)))
|
2009-05-08 04:34:13 +00:00
|
|
|
(cond
|
|
|
|
(head
|
|
|
|
(concat
|
2010-10-22 07:19:04 +00:00
|
|
|
(format (car org-export-table-header-tags)
|
|
|
|
"col" ali)
|
2009-05-08 04:34:13 +00:00
|
|
|
x
|
|
|
|
(cdr org-export-table-header-tags)))
|
|
|
|
((and (= i 0) org-export-html-table-use-header-tags-for-first-column)
|
|
|
|
(concat
|
2010-10-22 07:19:04 +00:00
|
|
|
(format (car org-export-table-header-tags)
|
|
|
|
"row" ali)
|
2009-05-08 04:34:13 +00:00
|
|
|
x
|
|
|
|
(cdr org-export-table-header-tags)))
|
|
|
|
(t
|
2010-10-22 07:19:04 +00:00
|
|
|
(concat (format (car org-export-table-data-tags) ali)
|
|
|
|
x
|
2009-05-08 04:34:13 +00:00
|
|
|
(cdr org-export-table-data-tags)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
fields "")
|
2009-06-18 05:07:22 +00:00
|
|
|
rowend)
|
2009-04-07 17:55:32 +00:00
|
|
|
html)))
|
|
|
|
(unless splice (if tbopen (push "</tbody>" html)))
|
|
|
|
(unless splice (push "</table>\n" html))
|
|
|
|
(setq html (nreverse html))
|
|
|
|
(unless splice
|
2009-11-12 12:39:29 +00:00
|
|
|
;; Put in col tags with the alignment (unfortunately often ignored...)
|
2009-07-26 06:15:34 +00:00
|
|
|
(unless (car org-table-colgroup-info)
|
|
|
|
(setq org-table-colgroup-info
|
|
|
|
(cons :start (cdr org-table-colgroup-info))))
|
2010-10-21 14:28:06 +00:00
|
|
|
(setq i 0)
|
2009-07-26 06:15:34 +00:00
|
|
|
(push (mapconcat
|
|
|
|
(lambda (x)
|
2010-10-21 14:28:06 +00:00
|
|
|
(setq gr (pop org-table-colgroup-info)
|
2010-10-22 07:19:04 +00:00
|
|
|
i (1+ i)
|
2011-10-16 08:54:20 +00:00
|
|
|
align (if (nth 1 (assoc i col-cookies))
|
|
|
|
(cdr (assoc (nth 1 (assoc i col-cookies))
|
2010-10-22 07:19:04 +00:00
|
|
|
'(("l" . "left") ("r" . "right")
|
|
|
|
("c" . "center"))))
|
|
|
|
(if (> (/ (float x) nline)
|
|
|
|
org-table-number-fraction)
|
|
|
|
"right" "left")))
|
|
|
|
(push align aligns)
|
2010-10-26 05:10:48 +00:00
|
|
|
(format (if no-css
|
|
|
|
"%s<col align=\"%s\" />%s"
|
|
|
|
"%s<col class=\"%s\" />%s")
|
2009-07-26 06:15:34 +00:00
|
|
|
(if (memq gr '(:start :startend))
|
|
|
|
(prog1
|
2010-10-22 07:19:04 +00:00
|
|
|
(if colgropen
|
|
|
|
"</colgroup>\n<colgroup>"
|
|
|
|
"<colgroup>")
|
2009-07-26 06:15:34 +00:00
|
|
|
(setq colgropen t))
|
|
|
|
"")
|
2010-10-22 07:19:04 +00:00
|
|
|
align
|
2009-07-26 06:15:34 +00:00
|
|
|
(if (memq gr '(:end :startend))
|
|
|
|
(progn (setq colgropen nil) "</colgroup>")
|
|
|
|
"")))
|
|
|
|
fnum "")
|
2009-04-07 17:55:32 +00:00
|
|
|
html)
|
2010-10-22 07:19:04 +00:00
|
|
|
(setq aligns (nreverse aligns))
|
|
|
|
(if colgropen (setq html (cons (car html)
|
|
|
|
(cons "</colgroup>" (cdr html)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
;; Since the output of HTML table formatter can also be used in
|
2012-08-18 14:58:28 +00:00
|
|
|
;; DocBook document, include empty captions for the DocBook
|
|
|
|
;; export only so that it produces valid XML.
|
|
|
|
(when (or caption (eq org-export-current-backend 'docbook))
|
|
|
|
(push (format "<caption>%s</caption>" (or caption "")) html))
|
2011-03-09 20:06:37 +00:00
|
|
|
(when label
|
2012-08-11 17:10:44 +00:00
|
|
|
(setq html-table-tag (org-export-splice-attributes html-table-tag (format "id=\"%s\"" (org-solidify-link-text label)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
(push html-table-tag html))
|
2010-10-22 07:19:04 +00:00
|
|
|
(setq html (mapcar
|
|
|
|
(lambda (x)
|
|
|
|
(replace-regexp-in-string
|
2010-10-23 05:50:10 +00:00
|
|
|
"@@class\\([0-9]+\\)@@"
|
2010-10-22 07:19:04 +00:00
|
|
|
(lambda (txt)
|
|
|
|
(if (not org-export-html-table-align-individual-fields)
|
|
|
|
""
|
|
|
|
(setq n (string-to-number (match-string 1 txt)))
|
2010-10-26 05:10:48 +00:00
|
|
|
(format (if no-css " align=\"%s\"" " class=\"%s\"")
|
2010-10-22 07:19:04 +00:00
|
|
|
(or (nth n aligns) "left"))))
|
|
|
|
x))
|
|
|
|
html))
|
2009-04-07 17:55:32 +00:00
|
|
|
(concat (mapconcat 'identity html "\n") "\n")))
|
|
|
|
|
|
|
|
(defun org-export-splice-attributes (tag attributes)
|
|
|
|
"Read attributes in string ATTRIBUTES, add and replace in HTML tag TAG."
|
|
|
|
(if (not attributes)
|
|
|
|
tag
|
|
|
|
(let (oldatt newatt)
|
|
|
|
(setq oldatt (org-extract-attributes-from-string tag)
|
|
|
|
tag (pop oldatt)
|
|
|
|
newatt (cdr (org-extract-attributes-from-string attributes)))
|
|
|
|
(while newatt
|
|
|
|
(setq oldatt (plist-put oldatt (pop newatt) (pop newatt))))
|
|
|
|
(if (string-match ">" tag)
|
|
|
|
(setq tag
|
|
|
|
(replace-match (concat (org-attributes-to-string oldatt) ">")
|
|
|
|
t t tag)))
|
|
|
|
tag)))
|
|
|
|
|
|
|
|
(defun org-format-table-table-html (lines)
|
|
|
|
"Format a table generated by table.el into HTML.
|
|
|
|
This conversion does *not* use `table-generate-source' from table.el.
|
|
|
|
This has the advantage that Org-mode's HTML conversions can be used.
|
|
|
|
But it has the disadvantage, that no cell- or row-spanning is allowed."
|
2012-04-28 17:06:52 +00:00
|
|
|
(let (org-line field-buffer
|
2012-08-11 17:10:44 +00:00
|
|
|
(head org-export-highlight-first-table-line)
|
|
|
|
fields html empty i)
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq html (concat html-table-tag "\n"))
|
2012-04-28 17:06:52 +00:00
|
|
|
(while (setq org-line (pop lines))
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq empty " ")
|
|
|
|
(catch 'next-line
|
2012-04-28 17:06:52 +00:00
|
|
|
(if (string-match "^[ \t]*\\+-" org-line)
|
2009-04-07 17:55:32 +00:00
|
|
|
(progn
|
|
|
|
(if field-buffer
|
|
|
|
(progn
|
|
|
|
(setq
|
|
|
|
html
|
|
|
|
(concat
|
|
|
|
html
|
|
|
|
"<tr>"
|
|
|
|
(mapconcat
|
|
|
|
(lambda (x)
|
|
|
|
(if (equal x "") (setq x empty))
|
|
|
|
(if head
|
2009-05-08 04:34:13 +00:00
|
|
|
(concat
|
2010-10-22 07:19:04 +00:00
|
|
|
(format (car org-export-table-header-tags) "col" "")
|
2009-05-08 04:34:13 +00:00
|
|
|
x
|
|
|
|
(cdr org-export-table-header-tags))
|
2010-10-22 07:19:04 +00:00
|
|
|
(concat (format (car org-export-table-data-tags) "") x
|
2009-04-07 17:55:32 +00:00
|
|
|
(cdr org-export-table-data-tags))))
|
|
|
|
field-buffer "\n")
|
|
|
|
"</tr>\n"))
|
|
|
|
(setq head nil)
|
|
|
|
(setq field-buffer nil)))
|
|
|
|
;; Ignore this line
|
|
|
|
(throw 'next-line t)))
|
|
|
|
;; Break the line into fields and store the fields
|
2012-04-28 17:06:52 +00:00
|
|
|
(setq fields (org-split-string org-line "[ \t]*|[ \t]*"))
|
2009-04-07 17:55:32 +00:00
|
|
|
(if field-buffer
|
|
|
|
(setq field-buffer (mapcar
|
|
|
|
(lambda (x)
|
|
|
|
(concat x "<br/>" (pop fields)))
|
|
|
|
field-buffer))
|
|
|
|
(setq field-buffer fields))))
|
|
|
|
(setq html (concat html "</table>\n"))
|
|
|
|
html))
|
|
|
|
|
2011-04-25 03:42:23 +00:00
|
|
|
(defun org-format-table-table-html-using-table-generate-source (lines
|
|
|
|
&optional
|
|
|
|
spanned-only)
|
2009-04-07 17:55:32 +00:00
|
|
|
"Format a table into html, using `table-generate-source' from table.el.
|
2011-04-25 03:42:23 +00:00
|
|
|
Use SPANNED-ONLY to suppress exporting of simple table.el tables.
|
|
|
|
|
|
|
|
When SPANNED-ONLY is nil, all table.el tables are exported. When
|
|
|
|
SPANNED-ONLY is non-nil, only tables with either row or column
|
|
|
|
spans are exported.
|
|
|
|
|
|
|
|
This routine returns the generated source or nil as appropriate.
|
|
|
|
|
|
|
|
Refer docstring of `org-export-prefer-native-exporter-for-tables'
|
|
|
|
for further information."
|
2009-04-07 17:55:32 +00:00
|
|
|
(require 'table)
|
|
|
|
(with-current-buffer (get-buffer-create " org-tmp1 ")
|
|
|
|
(erase-buffer)
|
|
|
|
(insert (mapconcat 'identity lines "\n"))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (not (re-search-forward "|[^+]" nil t))
|
|
|
|
(error "Error processing table"))
|
|
|
|
(table-recognize-table)
|
2011-04-25 03:42:23 +00:00
|
|
|
(when (or (not spanned-only)
|
|
|
|
(let* ((dim (table-query-dimension))
|
|
|
|
(c (nth 4 dim)) (r (nth 5 dim)) (cells (nth 6 dim)))
|
|
|
|
(not (= (* c r) cells))))
|
|
|
|
(with-current-buffer (get-buffer-create " org-tmp2 ") (erase-buffer))
|
|
|
|
(table-generate-source 'html " org-tmp2 ")
|
|
|
|
(set-buffer " org-tmp2 ")
|
|
|
|
(buffer-substring (point-min) (point-max)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(defun org-export-splice-style (style extra)
|
|
|
|
"Splice EXTRA into STYLE, just before \"</style>\"."
|
|
|
|
(if (and (stringp extra)
|
|
|
|
(string-match "\\S-" extra)
|
|
|
|
(string-match "</style>" style))
|
|
|
|
(concat (substring style 0 (match-beginning 0))
|
|
|
|
"\n" extra "\n"
|
|
|
|
(substring style (match-beginning 0)))
|
|
|
|
style))
|
|
|
|
|
|
|
|
(defun org-html-handle-time-stamps (s)
|
|
|
|
"Format time stamps in string S, or remove them."
|
|
|
|
(catch 'exit
|
|
|
|
(let (r b)
|
2011-09-20 04:20:02 +00:00
|
|
|
(when org-maybe-keyword-time-regexp
|
|
|
|
(while (string-match org-maybe-keyword-time-regexp s)
|
|
|
|
(or b (setq b (substring s 0 (match-beginning 0))))
|
|
|
|
(setq r (concat
|
|
|
|
r (substring s 0 (match-beginning 0))
|
|
|
|
" @<span class=\"timestamp-wrapper\">"
|
|
|
|
(if (match-end 1)
|
|
|
|
(format "@<span class=\"timestamp-kwd\">%s @</span>"
|
|
|
|
(match-string 1 s)))
|
|
|
|
(format " @<span class=\"timestamp\">%s@</span>"
|
|
|
|
(substring
|
|
|
|
(org-translate-time (match-string 3 s)) 1 -1))
|
|
|
|
"@</span>")
|
|
|
|
s (substring s (match-end 0)))))
|
2009-04-07 17:55:32 +00:00
|
|
|
;; Line break if line started and ended with time stamp stuff
|
|
|
|
(if (not r)
|
|
|
|
s
|
|
|
|
(setq r (concat r s))
|
|
|
|
(unless (string-match "\\S-" (concat b s))
|
2011-03-21 05:45:10 +00:00
|
|
|
(setq r (concat r "@<br/>")))
|
2009-04-07 17:55:32 +00:00
|
|
|
r))))
|
|
|
|
|
|
|
|
(defvar htmlize-buffer-places) ; from htmlize.el
|
|
|
|
(defun org-export-htmlize-region-for-paste (beg end)
|
|
|
|
"Convert the region to HTML, using htmlize.el.
|
|
|
|
This is much like `htmlize-region-for-paste', only that it uses
|
|
|
|
the settings define in the org-... variables."
|
|
|
|
(let* ((htmlize-output-type org-export-htmlize-output-type)
|
|
|
|
(htmlize-css-name-prefix org-export-htmlize-css-font-prefix)
|
|
|
|
(htmlbuf (htmlize-region beg end)))
|
|
|
|
(unwind-protect
|
|
|
|
(with-current-buffer htmlbuf
|
|
|
|
(buffer-substring (plist-get htmlize-buffer-places 'content-start)
|
|
|
|
(plist-get htmlize-buffer-places 'content-end)))
|
|
|
|
(kill-buffer htmlbuf))))
|
|
|
|
|
|
|
|
(defun org-export-htmlize-generate-css ()
|
|
|
|
"Create the CSS for all font definitions in the current Emacs session.
|
|
|
|
Use this to create face definitions in your CSS style file that can then
|
|
|
|
be used by code snippets transformed by htmlize.
|
|
|
|
This command just produces a buffer that contains class definitions for all
|
|
|
|
faces used in the current Emacs session. You can copy and paste the ones you
|
|
|
|
need into your CSS file.
|
|
|
|
|
|
|
|
If you then set `org-export-htmlize-output-type' to `css', calls to
|
|
|
|
the function `org-export-htmlize-region-for-paste' will produce code
|
|
|
|
that uses these same face definitions."
|
|
|
|
(interactive)
|
|
|
|
(require 'htmlize)
|
|
|
|
(and (get-buffer "*html*") (kill-buffer "*html*"))
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((fl (face-list))
|
|
|
|
(htmlize-css-name-prefix "org-")
|
|
|
|
(htmlize-output-type 'css)
|
|
|
|
f i)
|
|
|
|
(while (setq f (pop fl)
|
|
|
|
i (and f (face-attribute f :inherit)))
|
|
|
|
(when (and (symbolp f) (or (not i) (not (listp i))))
|
|
|
|
(insert (org-add-props (copy-sequence "1") nil 'face f))))
|
|
|
|
(htmlize-region (point-min) (point-max))))
|
2011-07-18 17:25:10 +00:00
|
|
|
(org-pop-to-buffer-same-window "*html*")
|
2009-04-07 17:55:32 +00:00
|
|
|
(goto-char (point-min))
|
|
|
|
(if (re-search-forward "<style" nil t)
|
|
|
|
(delete-region (point-min) (match-beginning 0)))
|
|
|
|
(if (re-search-forward "</style>" nil t)
|
|
|
|
(delete-region (1+ (match-end 0)) (point-max)))
|
|
|
|
(beginning-of-line 1)
|
|
|
|
(if (looking-at " +") (replace-match ""))
|
|
|
|
(goto-char (point-min)))
|
|
|
|
|
|
|
|
(defun org-html-protect (s)
|
2011-02-12 11:49:50 +00:00
|
|
|
"Convert characters to HTML equivalent.
|
|
|
|
Possible conversions are set in `org-export-html-protect-char-alist'."
|
2011-03-09 20:06:37 +00:00
|
|
|
(let ((cl org-export-html-protect-char-alist) c)
|
2011-02-12 11:49:50 +00:00
|
|
|
(while (setq c (pop cl))
|
2011-03-09 20:06:37 +00:00
|
|
|
(let ((start 0))
|
2011-03-11 17:37:22 +00:00
|
|
|
(while (string-match (car c) s start)
|
2011-03-09 20:06:37 +00:00
|
|
|
(setq s (replace-match (cdr c) t t s)
|
2011-03-11 22:30:43 +00:00
|
|
|
start (1+ (match-beginning 0))))))
|
2011-02-12 11:49:50 +00:00
|
|
|
s))
|
2009-04-07 17:55:32 +00:00
|
|
|
|
|
|
|
(defun org-html-expand (string)
|
2010-07-15 22:54:53 +00:00
|
|
|
"Prepare STRING for HTML export. Apply all active conversions.
|
2011-10-29 13:00:52 +00:00
|
|
|
If there are links in the string, don't modify these. If STRING
|
|
|
|
is nil, return nil."
|
|
|
|
(when string
|
|
|
|
(let* ((re (concat org-bracket-link-regexp "\\|"
|
|
|
|
(org-re "[ \t]+\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$")))
|
|
|
|
m s l res)
|
|
|
|
(while (setq m (string-match re string))
|
|
|
|
(setq s (substring string 0 m)
|
|
|
|
l (match-string 0 string)
|
|
|
|
string (substring string (match-end 0)))
|
|
|
|
(push (org-html-do-expand s) res)
|
2012-08-11 17:10:44 +00:00
|
|
|
(push l res))
|
2011-10-29 13:00:52 +00:00
|
|
|
(push (org-html-do-expand string) res)
|
|
|
|
(apply 'concat (nreverse res)))))
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(defun org-html-do-expand (s)
|
|
|
|
"Apply all active conversions to translate special ASCII to HTML."
|
|
|
|
(setq s (org-html-protect s))
|
|
|
|
(if org-export-html-expand
|
|
|
|
(while (string-match "@<\\([^&]*\\)>" s)
|
|
|
|
(setq s (replace-match "<\\1>" t nil s))))
|
|
|
|
(if org-export-with-emphasize
|
|
|
|
(setq s (org-export-html-convert-emphasize s)))
|
|
|
|
(if org-export-with-special-strings
|
|
|
|
(setq s (org-export-html-convert-special-strings s)))
|
|
|
|
(if org-export-with-sub-superscripts
|
|
|
|
(setq s (org-export-html-convert-sub-super s)))
|
|
|
|
(if org-export-with-TeX-macros
|
2010-03-28 07:48:03 +00:00
|
|
|
(let ((start 0) wd rep)
|
2010-03-29 12:05:56 +00:00
|
|
|
(while (setq start (string-match "\\\\\\([a-zA-Z]+[0-9]*\\)\\({}\\)?"
|
2009-04-07 17:55:32 +00:00
|
|
|
s start))
|
|
|
|
(if (get-text-property (match-beginning 0) 'org-protected s)
|
|
|
|
(setq start (match-end 0))
|
|
|
|
(setq wd (match-string 1 s))
|
2010-03-28 07:48:03 +00:00
|
|
|
(if (setq rep (org-entity-get-representation wd 'html))
|
|
|
|
(setq s (replace-match rep t t s))
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq start (+ start (length wd))))))))
|
|
|
|
s)
|
|
|
|
|
|
|
|
(defun org-export-html-convert-special-strings (string)
|
|
|
|
"Convert special characters in STRING to HTML."
|
|
|
|
(let ((all org-export-html-special-string-regexps)
|
|
|
|
e a re rpl start)
|
|
|
|
(while (setq a (pop all))
|
|
|
|
(setq re (car a) rpl (cdr a) start 0)
|
|
|
|
(while (string-match re string start)
|
|
|
|
(if (get-text-property (match-beginning 0) 'org-protected string)
|
|
|
|
(setq start (match-end 0))
|
|
|
|
(setq string (replace-match rpl t nil string)))))
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defun org-export-html-convert-sub-super (string)
|
|
|
|
"Convert sub- and superscripts in STRING to HTML."
|
|
|
|
(let (key c (s 0) (requireb (eq org-export-with-sub-superscripts '{})))
|
|
|
|
(while (string-match org-match-substring-regexp string s)
|
|
|
|
(cond
|
|
|
|
((and requireb (match-end 8)) (setq s (match-end 2)))
|
|
|
|
((get-text-property (match-beginning 2) 'org-protected string)
|
|
|
|
(setq s (match-end 2)))
|
|
|
|
(t
|
|
|
|
(setq s (match-end 1)
|
|
|
|
key (if (string= (match-string 2 string) "_") "sub" "sup")
|
|
|
|
c (or (match-string 8 string)
|
|
|
|
(match-string 6 string)
|
|
|
|
(match-string 5 string))
|
|
|
|
string (replace-match
|
|
|
|
(concat (match-string 1 string)
|
|
|
|
"<" key ">" c "</" key ">")
|
|
|
|
t t string)))))
|
|
|
|
(while (string-match "\\\\\\([_^]\\)" string)
|
|
|
|
(setq string (replace-match (match-string 1 string) t t string)))
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defun org-export-html-convert-emphasize (string)
|
|
|
|
"Apply emphasis."
|
|
|
|
(let ((s 0) rpl)
|
|
|
|
(while (string-match org-emph-re string s)
|
|
|
|
(if (not (equal
|
|
|
|
(substring string (match-beginning 3) (1+ (match-beginning 3)))
|
|
|
|
(substring string (match-beginning 4) (1+ (match-beginning 4)))))
|
|
|
|
(setq s (match-beginning 0)
|
|
|
|
rpl
|
|
|
|
(concat
|
|
|
|
(match-string 1 string)
|
|
|
|
(nth 2 (assoc (match-string 3 string) org-emphasis-alist))
|
|
|
|
(match-string 4 string)
|
|
|
|
(nth 3 (assoc (match-string 3 string)
|
|
|
|
org-emphasis-alist))
|
|
|
|
(match-string 5 string))
|
|
|
|
string (replace-match rpl t t string)
|
|
|
|
s (+ s (- (length rpl) 2)))
|
|
|
|
(setq s (1+ s))))
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defun org-open-par ()
|
|
|
|
"Insert <p>, but first close previous paragraph if any."
|
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert "\n<p>")
|
|
|
|
(setq org-par-open t))
|
|
|
|
(defun org-close-par-maybe ()
|
|
|
|
"Close paragraph if there is one open."
|
|
|
|
(when org-par-open
|
|
|
|
(insert "</p>")
|
|
|
|
(setq org-par-open nil)))
|
|
|
|
(defun org-close-li (&optional type)
|
|
|
|
"Close <li> if necessary."
|
|
|
|
(org-close-par-maybe)
|
|
|
|
(insert (if (equal type "d") "</dd>\n" "</li>\n")))
|
|
|
|
|
|
|
|
(defvar body-only) ; dynamically scoped into this.
|
2011-03-23 14:38:18 +00:00
|
|
|
(defun org-html-level-start (level title umax with-toc head-count &optional opt-plist)
|
2009-04-07 17:55:32 +00:00
|
|
|
"Insert a new level in HTML export.
|
|
|
|
When TITLE is nil, just close all open levels."
|
|
|
|
(org-close-par-maybe)
|
|
|
|
(let* ((target (and title (org-get-text-property-any 0 'target title)))
|
2010-03-31 07:26:05 +00:00
|
|
|
(extra-targets (and target
|
|
|
|
(assoc target org-export-target-aliases)))
|
2010-02-01 08:37:35 +00:00
|
|
|
(extra-class (and title (org-get-text-property-any 0 'html-container-class title)))
|
2010-03-31 07:26:05 +00:00
|
|
|
(preferred (and target
|
|
|
|
(cdr (assoc target org-export-preferred-target-alist))))
|
2009-04-16 16:19:20 +00:00
|
|
|
(l org-level-max)
|
2011-03-23 14:38:18 +00:00
|
|
|
(num (plist-get opt-plist :section-numbers))
|
2010-04-24 15:37:39 +00:00
|
|
|
snumber snu href suffix)
|
2010-11-21 08:45:02 +00:00
|
|
|
(setq extra-targets (remove (or preferred target) extra-targets))
|
2009-04-16 16:19:20 +00:00
|
|
|
(setq extra-targets
|
2009-04-07 17:55:32 +00:00
|
|
|
(mapconcat (lambda (x)
|
2011-01-29 19:30:08 +00:00
|
|
|
(setq x (org-solidify-link-text
|
|
|
|
(if (org-uuidgen-p x) (concat "ID-" x) x)))
|
2011-12-11 15:50:05 +00:00
|
|
|
(if (stringp org-export-html-headline-anchor-format)
|
|
|
|
(format org-export-html-headline-anchor-format x x)
|
|
|
|
""))
|
2009-04-16 16:19:20 +00:00
|
|
|
extra-targets
|
2009-04-07 17:55:32 +00:00
|
|
|
""))
|
|
|
|
(while (>= l level)
|
|
|
|
(if (aref org-levels-open (1- l))
|
|
|
|
(progn
|
|
|
|
(org-html-level-close l umax)
|
|
|
|
(aset org-levels-open (1- l) nil)))
|
|
|
|
(setq l (1- l)))
|
|
|
|
(when title
|
|
|
|
;; If title is nil, this means this function is called to close
|
|
|
|
;; all levels, so the rest is done only if title is given
|
2012-08-11 17:10:44 +00:00
|
|
|
(when (string-match (org-re "\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$") title)
|
|
|
|
(setq title (replace-match
|
|
|
|
(if org-export-with-tags
|
|
|
|
(save-match-data
|
|
|
|
(concat
|
|
|
|
" <span class=\"tag\">"
|
|
|
|
(mapconcat
|
|
|
|
(lambda (x)
|
|
|
|
(format "<span class=\"%s\">%s</span>"
|
|
|
|
(org-export-html-get-tag-class-name x)
|
|
|
|
x))
|
|
|
|
(org-split-string (match-string 1 title) ":")
|
|
|
|
" ")
|
|
|
|
"</span>"))
|
|
|
|
"")
|
|
|
|
t t title)))
|
2009-04-07 17:55:32 +00:00
|
|
|
(if (> level umax)
|
|
|
|
(progn
|
|
|
|
(if (aref org-levels-open (1- level))
|
|
|
|
(progn
|
|
|
|
(org-close-li)
|
|
|
|
(if target
|
2011-01-29 19:30:08 +00:00
|
|
|
(insert (format "<li id=\"%s\">" (org-solidify-link-text (or preferred target)))
|
2010-11-21 08:45:02 +00:00
|
|
|
extra-targets title "<br/>\n")
|
2009-04-07 17:55:32 +00:00
|
|
|
(insert "<li>" title "<br/>\n")))
|
|
|
|
(aset org-levels-open (1- level) t)
|
|
|
|
(org-close-par-maybe)
|
|
|
|
(if target
|
2011-01-29 19:30:08 +00:00
|
|
|
(insert (format "<ul>\n<li id=\"%s\">" (org-solidify-link-text (or preferred target)))
|
2009-04-07 17:55:32 +00:00
|
|
|
extra-targets title "<br/>\n")
|
|
|
|
(insert "<ul>\n<li>" title "<br/>\n"))))
|
|
|
|
(aset org-levels-open (1- level) t)
|
2010-04-24 15:37:39 +00:00
|
|
|
(setq snumber (org-section-number level)
|
2011-06-14 08:46:09 +00:00
|
|
|
snu (replace-regexp-in-string "\\." "-" snumber))
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq level (+ level org-export-html-toplevel-hlevel -1))
|
2011-03-23 14:38:18 +00:00
|
|
|
(if (and num (not body-only))
|
2009-04-07 17:55:32 +00:00
|
|
|
(setq title (concat
|
|
|
|
(format "<span class=\"section-number-%d\">%s</span>"
|
2011-03-23 14:38:18 +00:00
|
|
|
level
|
2011-03-29 13:30:27 +00:00
|
|
|
(if (and num
|
|
|
|
(if (integerp num)
|
|
|
|
;; fix up num to take into
|
|
|
|
;; account the top-level
|
|
|
|
;; heading value
|
|
|
|
(>= (+ num org-export-html-toplevel-hlevel -1)
|
|
|
|
level)
|
|
|
|
num))
|
|
|
|
snumber
|
|
|
|
""))
|
2009-04-07 17:55:32 +00:00
|
|
|
" " title)))
|
|
|
|
(unless (= head-count 1) (insert "\n</div>\n"))
|
2010-04-24 15:37:39 +00:00
|
|
|
(setq href (cdr (assoc (concat "sec-" snu) org-export-preferred-target-alist)))
|
2011-01-29 19:30:08 +00:00
|
|
|
(setq suffix (org-solidify-link-text (or href snu)))
|
|
|
|
(setq href (org-solidify-link-text (or href (concat "sec-" snu))))
|
2010-02-01 08:37:35 +00:00
|
|
|
(insert (format "\n<div id=\"outline-container-%s\" class=\"outline-%d%s\">\n<h%d id=\"%s\">%s%s</h%d>\n<div class=\"outline-text-%d\" id=\"text-%s\">\n"
|
|
|
|
suffix level (if extra-class (concat " " extra-class) "")
|
|
|
|
level href
|
2009-04-16 16:19:20 +00:00
|
|
|
extra-targets
|
|
|
|
title level level suffix))
|
2009-04-07 17:55:32 +00:00
|
|
|
(org-open-par)))))
|
|
|
|
|
|
|
|
(defun org-export-html-get-tag-class-name (tag)
|
|
|
|
"Turn tag into a valid class name.
|
|
|
|
Replaces invalid characters with \"_\" and then prepends a prefix."
|
|
|
|
(save-match-data
|
|
|
|
(while (string-match "[^a-zA-Z0-9_]" tag)
|
|
|
|
(setq tag (replace-match "_" t t tag))))
|
|
|
|
(concat org-export-html-tag-class-prefix tag))
|
|
|
|
|
|
|
|
(defun org-export-html-get-todo-kwd-class-name (kwd)
|
|
|
|
"Turn todo keyword into a valid class name.
|
|
|
|
Replaces invalid characters with \"_\" and then prepends a prefix."
|
|
|
|
(save-match-data
|
|
|
|
(while (string-match "[^a-zA-Z0-9_]" kwd)
|
|
|
|
(setq kwd (replace-match "_" t t kwd))))
|
|
|
|
(concat org-export-html-todo-kwd-class-prefix kwd))
|
|
|
|
|
|
|
|
(defun org-html-level-close (level max-outline-level)
|
|
|
|
"Terminate one level in HTML export."
|
|
|
|
(if (<= level max-outline-level)
|
|
|
|
(insert "</div>\n")
|
|
|
|
(org-close-li)
|
|
|
|
(insert "</ul>\n")))
|
|
|
|
|
2012-04-28 17:06:52 +00:00
|
|
|
(defun org-html-export-list-line (org-line pos struct prevs)
|
2012-08-11 17:10:44 +00:00
|
|
|
"Insert list syntax in export buffer. Return ORG-LINE, maybe modified.
|
2011-01-02 12:52:16 +00:00
|
|
|
|
2012-04-28 17:06:52 +00:00
|
|
|
POS is the item position or org-line position the org-line had before
|
2012-08-11 17:10:44 +00:00
|
|
|
modifications to buffer. STRUCT is the list structure. PREVS is
|
2011-01-02 12:52:16 +00:00
|
|
|
the alist of previous items."
|
|
|
|
(let* ((get-type
|
|
|
|
(function
|
2011-01-17 18:30:04 +00:00
|
|
|
;; Translate type of list containing POS to "d", "o" or
|
|
|
|
;; "u".
|
|
|
|
(lambda (pos struct prevs)
|
|
|
|
(let ((type (org-list-get-list-type pos struct prevs)))
|
|
|
|
(cond
|
|
|
|
((eq 'ordered type) "o")
|
|
|
|
((eq 'descriptive type) "d")
|
|
|
|
(t "u"))))))
|
2011-01-02 12:52:16 +00:00
|
|
|
(get-closings
|
|
|
|
(function
|
|
|
|
;; Return list of all items and sublists ending at POS, in
|
|
|
|
;; reverse order.
|
|
|
|
(lambda (pos)
|
|
|
|
(let (out)
|
|
|
|
(catch 'exit
|
|
|
|
(mapc (lambda (e)
|
|
|
|
(let ((end (nth 6 e))
|
|
|
|
(item (car e)))
|
|
|
|
(cond
|
|
|
|
((= end pos) (push item out))
|
|
|
|
((>= item pos) (throw 'exit nil)))))
|
|
|
|
struct))
|
|
|
|
out)))))
|
|
|
|
;; First close any previous item, or list, ending at POS.
|
|
|
|
(mapc (lambda (e)
|
|
|
|
(let* ((lastp (= (org-list-get-last-item e struct prevs) e))
|
|
|
|
(first-item (org-list-get-list-begin e struct prevs))
|
2011-01-17 18:30:04 +00:00
|
|
|
(type (funcall get-type first-item struct prevs)))
|
2011-01-02 12:52:16 +00:00
|
|
|
(org-close-par-maybe)
|
|
|
|
;; Ending for every item
|
|
|
|
(org-close-li type)
|
|
|
|
;; We're ending last item of the list: end list.
|
2011-03-15 20:51:19 +00:00
|
|
|
(when lastp
|
|
|
|
(insert (format "</%sl>\n" type))
|
|
|
|
(org-open-par))))
|
2011-01-02 12:52:16 +00:00
|
|
|
(funcall get-closings pos))
|
|
|
|
(cond
|
|
|
|
;; At an item: insert appropriate tags in export buffer.
|
|
|
|
((assq pos struct)
|
|
|
|
(string-match
|
2011-03-18 17:36:22 +00:00
|
|
|
(concat "[ \t]*\\(\\S-+[ \t]*\\)"
|
2011-06-30 20:55:05 +00:00
|
|
|
"\\(?:\\[@\\(?:start:\\)?\\([0-9]+\\|[A-Za-z]\\)\\][ \t]*\\)?"
|
2011-01-02 12:52:16 +00:00
|
|
|
"\\(?:\\(\\[[ X-]\\]\\)[ \t]+\\)?"
|
2011-04-09 16:39:35 +00:00
|
|
|
"\\(?:\\(.*\\)[ \t]+::\\(?:[ \t]+\\|$\\)\\)?"
|
2012-04-28 17:06:52 +00:00
|
|
|
"\\(.*\\)") org-line)
|
|
|
|
(let* ((checkbox (match-string 3 org-line))
|
|
|
|
(desc-tag (or (match-string 4 org-line) "???"))
|
|
|
|
(body (or (match-string 5 org-line) ""))
|
2011-01-02 12:52:16 +00:00
|
|
|
(list-beg (org-list-get-list-begin pos struct prevs))
|
|
|
|
(firstp (= list-beg pos))
|
|
|
|
;; Always refer to first item to determine list type, in
|
|
|
|
;; case list is ill-formed.
|
2011-01-17 18:30:04 +00:00
|
|
|
(type (funcall get-type list-beg struct prevs))
|
org-list: implement alphabetical lists
* lisp/org-list.el (org-alphabetical-lists): new variable
(org-item-re, org-list-full-item, org-cycle-list-bullet,
org-list-struct-fix-bul, org-list-inc-bullet-maybe): reflect
introduction of the new variable.
(org-item-beginning-re): changed into a function, so any modification
of `org-alphabetical-lists' will not require reloading Org.
(org-at-item-p, org-toggle-checkbox, org-update-checkbox-count,
org-list-parse-list, org-list-send-list): reflect changes to
`org-item-beginning-re'.
(org-list-use-alpha-bul-p): new function.
* lisp/org.el (org-check-for-hidden): reflect changes to
`org-item-beginning-re'.
* lisp/org-capture.el (org-capture-place-item): reflect changes to
`org-item-beginning-re'.
* lisp/org-docbook.el (org-export-docbook-list-line): handle new type
of items.
* lisp/org-exp.el (org-export-mark-list-end,
org-export-mark-list-properties): reflect changes to
`org-item-beginning-re'.
* lisp/org-html.el (org-html-export-list-line): handle new type of
items.
* lisp/org-latex.el (org-export-latex-lists): handle new type of items
and reflect changes to `org-item-beginning-re'.
* lisp/org-ascii.el (org-export-ascii-preprocess): handle new counters.
Modified from a patch by Nathaniel Flath.
2011-01-13 22:25:55 +00:00
|
|
|
(counter (let ((count-tmp (org-list-get-counter pos struct)))
|
|
|
|
(cond
|
|
|
|
((not count-tmp) nil)
|
2011-01-18 21:36:49 +00:00
|
|
|
((string-match "[A-Za-z]" count-tmp)
|
org-list: implement alphabetical lists
* lisp/org-list.el (org-alphabetical-lists): new variable
(org-item-re, org-list-full-item, org-cycle-list-bullet,
org-list-struct-fix-bul, org-list-inc-bullet-maybe): reflect
introduction of the new variable.
(org-item-beginning-re): changed into a function, so any modification
of `org-alphabetical-lists' will not require reloading Org.
(org-at-item-p, org-toggle-checkbox, org-update-checkbox-count,
org-list-parse-list, org-list-send-list): reflect changes to
`org-item-beginning-re'.
(org-list-use-alpha-bul-p): new function.
* lisp/org.el (org-check-for-hidden): reflect changes to
`org-item-beginning-re'.
* lisp/org-capture.el (org-capture-place-item): reflect changes to
`org-item-beginning-re'.
* lisp/org-docbook.el (org-export-docbook-list-line): handle new type
of items.
* lisp/org-exp.el (org-export-mark-list-end,
org-export-mark-list-properties): reflect changes to
`org-item-beginning-re'.
* lisp/org-html.el (org-html-export-list-line): handle new type of
items.
* lisp/org-latex.el (org-export-latex-lists): handle new type of items
and reflect changes to `org-item-beginning-re'.
* lisp/org-ascii.el (org-export-ascii-preprocess): handle new counters.
Modified from a patch by Nathaniel Flath.
2011-01-13 22:25:55 +00:00
|
|
|
(- (string-to-char (upcase count-tmp)) 64))
|
2011-01-18 21:36:49 +00:00
|
|
|
((string-match "[0-9]+" count-tmp)
|
org-list: implement alphabetical lists
* lisp/org-list.el (org-alphabetical-lists): new variable
(org-item-re, org-list-full-item, org-cycle-list-bullet,
org-list-struct-fix-bul, org-list-inc-bullet-maybe): reflect
introduction of the new variable.
(org-item-beginning-re): changed into a function, so any modification
of `org-alphabetical-lists' will not require reloading Org.
(org-at-item-p, org-toggle-checkbox, org-update-checkbox-count,
org-list-parse-list, org-list-send-list): reflect changes to
`org-item-beginning-re'.
(org-list-use-alpha-bul-p): new function.
* lisp/org.el (org-check-for-hidden): reflect changes to
`org-item-beginning-re'.
* lisp/org-capture.el (org-capture-place-item): reflect changes to
`org-item-beginning-re'.
* lisp/org-docbook.el (org-export-docbook-list-line): handle new type
of items.
* lisp/org-exp.el (org-export-mark-list-end,
org-export-mark-list-properties): reflect changes to
`org-item-beginning-re'.
* lisp/org-html.el (org-html-export-list-line): handle new type of
items.
* lisp/org-latex.el (org-export-latex-lists): handle new type of items
and reflect changes to `org-item-beginning-re'.
* lisp/org-ascii.el (org-export-ascii-preprocess): handle new counters.
Modified from a patch by Nathaniel Flath.
2011-01-13 22:25:55 +00:00
|
|
|
count-tmp)))))
|
2011-01-02 12:52:16 +00:00
|
|
|
(when firstp
|
|
|
|
(org-close-par-maybe)
|
2011-01-18 21:36:49 +00:00
|
|
|
(insert (format "<%sl>\n" type)))
|
2011-01-02 12:52:16 +00:00
|
|
|
(insert (cond
|
|
|
|
((equal type "d")
|
2011-02-08 19:54:58 +00:00
|
|
|
(format "<dt>%s</dt><dd>" desc-tag))
|
2011-01-02 12:52:16 +00:00
|
|
|
((and (equal type "o") counter)
|
2011-02-08 19:54:58 +00:00
|
|
|
(format "<li value=\"%s\">" counter))
|
|
|
|
(t "<li>")))
|
2011-01-02 12:52:16 +00:00
|
|
|
;; If line had a checkbox, some additional modification is required.
|
|
|
|
(when checkbox
|
|
|
|
(setq body
|
|
|
|
(concat
|
|
|
|
(cond
|
2011-02-06 16:33:49 +00:00
|
|
|
((string-match "X" checkbox) "<code>[X]</code> ")
|
2011-02-09 21:58:07 +00:00
|
|
|
((string-match " " checkbox) "<code>[ ]</code> ")
|
2011-02-06 16:33:49 +00:00
|
|
|
(t "<code>[-]</code> "))
|
2011-01-02 12:52:16 +00:00
|
|
|
body)))
|
|
|
|
;; Return modified line
|
|
|
|
body))
|
|
|
|
;; At a list ender: go to next line (side-effects only).
|
2012-04-28 17:06:52 +00:00
|
|
|
((equal "ORG-LIST-END-MARKER" org-line) (throw 'nextline nil))
|
2011-01-02 12:52:16 +00:00
|
|
|
;; Not at an item: return line unchanged (side-effects only).
|
2012-04-28 17:06:52 +00:00
|
|
|
(t org-line))))
|
2011-01-02 12:52:16 +00:00
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
(provide 'org-html)
|
|
|
|
|
2012-10-02 06:50:46 +00:00
|
|
|
;; Local variables:
|
|
|
|
;; generated-autoload-file: "org-loaddefs.el"
|
|
|
|
;; End:
|
|
|
|
|
2009-04-07 17:55:32 +00:00
|
|
|
;;; org-html.el ends here
|