* lisp/loadup.el: Count byte-code functions as well.

[gnu-emacs] / lisp / org / org-html.el

diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 82fdd507b03568acdf56355c62ce291bfbccd943..5cecc44a2dfed5a0fc7acec53a847b03978b87be 100644 (file)
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -64,6 +64,7 @@ by the footnotes themselves."
 (defcustom org-export-html-footnote-separator "<sup>, </sup>"
   "Text used to separate footnotes."
   :group 'org-export-html
+  :version "24.1"
   :type 'string)
 
 (defcustom org-export-html-coding-system nil
@@ -252,6 +253,7 @@ You can also customize this for each buffer, using something like
 
 #+MATHJAX: scale:\"133\" align:\"right\" mathml:t path:\"/MathJax/\""
   :group 'org-export-html
+  :version "24.1"
   :type '(list :greedy t
              (list :tag "path   (the path from where to load MathJax.js)"
                    (const :format "       " path) (string))
@@ -335,6 +337,7 @@ You can also customize this for each buffer, using something like
 </script>"
   "The MathJax setup for XHTML files."
   :group 'org-export-html
+  :version "24.1"
   :type 'string)
 
 (defcustom org-export-html-tag-class-prefix ""
@@ -361,6 +364,7 @@ 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
+  :version "24.1"
   :type 'string)
 
 (defcustom org-export-html-preamble t
@@ -392,6 +396,7 @@ precedence over this variable."
 If you need to use a \"%\" character, you need to escape it
 like that: \"%%\"."
   :group 'org-export-html
+  :version "24.1"
   :type 'string)
 
 (defcustom org-export-html-postamble 'auto
@@ -432,6 +437,7 @@ precedence over this variable."
 If you need to use a \"%\" character, you need to escape it
 like that: \"%%\"."
   :group 'org-export-html
+  :version "24.1"
   :type 'string)
 
 (defcustom org-export-html-home/up-format
@@ -548,6 +554,7 @@ 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
+  :version "24.1"
   :type 'boolean)
 
 (defcustom org-export-html-table-use-header-tags-for-first-column nil
@@ -578,6 +585,7 @@ When nil, also column one will use data tags."
     (">" . "&gt;"))
   "Alist of characters to be converted by `org-html-protect'."
   :group 'org-export-html
+  :version "24.1"
   :type '(repeat (cons (string :tag "Character")
                       (string :tag "HTML equivalent"))))
 
@@ -639,6 +647,7 @@ 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."
   :group 'org-export-html
+  :version "24.1"
   :type '(list
          (string :tag " Div for the preamble:")
          (string :tag "  Div for the content:")
@@ -1351,7 +1360,7 @@ PUB-DIR is set, use this as the publishing directory."
        ;; insert html preamble
        (when (plist-get opt-plist :html-preamble)
          (let ((html-pre (plist-get opt-plist :html-preamble))
-               html-pre-real-contents)
+               (html-pre-real-contents ""))
            (cond ((stringp html-pre)
                   (setq html-pre-real-contents
                         (format-spec html-pre `((?t . ,title) (?a . ,author)
@@ -1422,7 +1431,7 @@ PUB-DIR is set, use this as the publishing directory."
                             (if (string-match
                                  (org-re "[ \t]+:\\([[:alnum:]_@:]+\\):[ \t]*$") txt)
                                 (setq txt (replace-match
-                                           "&nbsp;&nbsp;&nbsp;<span class=\"tag\"> \\1</span>" t nil txt)))
+                                           "&nbsp;&nbsp;&nbsp;<span class=\"tag\">\\1</span>" t nil txt)))
                             (if (string-match quote-re0 txt)
                                 (setq txt (replace-match "" t t txt)))
                             (setq snumber (org-section-number level))
@@ -1630,7 +1639,7 @@ PUB-DIR is set, use this as the publishing directory."
                                "done" "todo")
                            " " (org-export-html-get-todo-kwd-class-name
                                 (match-string 2 line))
-                           "\"> " (match-string 2 line)
+                           "\">" (match-string 2 line)
                            "</span>" (substring line (match-end 2)))))
 
          ;; Does this contain a reference to a footnote?