diff --git a/lisp/org-html.el b/lisp/org-html.el
index 0abecace3..c6f26b5ef 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -848,9 +848,9 @@ MAY-INLINE-P allows inlining it as an image."
(message "image %s %s" thefile org-par-open)
(org-export-html-format-image thefile org-par-open))
(concat
- "@"
+ ""
(org-export-html-format-desc desc)
- "@")))))
+ "")))))
(defun org-html-handle-links (line opt-plist)
"Return LINE with markup of Org mode links.
@@ -1530,9 +1530,6 @@ lang=\"%s\" xml:lang=\"%s\">
"@ ")
t t line)))))
- ;; Format the links
- (setq line (org-html-handle-links line opt-plist))
-
(setq line (org-html-handle-time-stamps line))
;; replace "&" by "&", "<" and ">" by "<" and ">"
@@ -1541,6 +1538,9 @@ lang=\"%s\" xml:lang=\"%s\">
(or (string-match org-table-hline-regexp line)
(setq line (org-html-expand line)))
+ ;; Format the links
+ (setq line (org-html-handle-links line opt-plist))
+
;; TODO items
(if (and (string-match org-todo-line-regexp line)
(match-beginning 2))
@@ -1829,7 +1829,7 @@ lang=\"%s\" xml:lang=\"%s\">
"Create image tag with source and attributes."
(save-match-data
(if (string-match "^ltxpng/" src)
- (format "@"
+ (format "
"
src (org-find-text-property-in-string 'org-latex-src src))
(let* ((caption (org-find-text-property-in-string 'org-caption src))
(attr (org-find-text-property-in-string 'org-attributes src))
@@ -1837,20 +1837,20 @@ lang=\"%s\" xml:lang=\"%s\">
(setq caption (and caption (org-html-do-expand caption)))
(concat
(if caption
- (format "%s@
" - (if org-par-open "@
\n" "") + (format "%s" + (if org-par-open "
\n" "") (if label (format "id=\"%s\" " (org-solidify-link-text label)) ""))) - (format "@" caption "@
") - (if org-par-open "\n@" "")))))))) + (format "
%s +" caption "
") + (if org-par-open "\n" "")))))))) (defun org-export-html-get-bibliography () "Find bibliography, cut it out and return it."