diff options
Diffstat (limited to 'lisp/ox-html.el')
| -rw-r--r-- | lisp/ox-html.el | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el index db8ac69..88e5720 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -170,10 +170,8 @@ "progress" "section" "video") "New elements in html5. -<hgroup> is not included because it's currently impossible to -wrap special blocks around multiple headlines. For other blocks -that should contain headlines, use the HTML_CONTAINER property on -the headline itself.") +For blocks that should contain headlines, use the HTML_CONTAINER +property on the headline itself.") (defconst org-html-special-string-regexps '(("\\\\-" . "­") ; shy @@ -457,6 +455,7 @@ export back-end currently used." (not org-html-use-infojs) (and (eq org-html-use-infojs 'when-configured) (or (not (plist-get exp-plist :infojs-opt)) + (string= "" (plist-get exp-plist :infojs-opt)) (string-match "\\<view:nil\\>" (plist-get exp-plist :infojs-opt))))) (let* ((template org-html-infojs-template) @@ -2661,19 +2660,20 @@ INFO is a plist holding contextual information. See (path (cond ((member type '("http" "https" "ftp" "mailto")) - (concat type ":" raw-path)) + (org-link-escape + (org-link-unescape + (concat type ":" raw-path)) org-link-escape-chars-browser)) ((string= type "file") ;; Treat links to ".org" files as ".html", if needed. (setq raw-path (funcall link-org-files-as-html-maybe raw-path info)) ;; If file path is absolute, prepend it with protocol - ;; component - "file://". - (cond ((file-name-absolute-p raw-path) - (setq raw-path - (concat "file://" (expand-file-name - raw-path)))) - ((and home use-abs-url) - (setq raw-path (concat (file-name-as-directory home) raw-path)))) + ;; component - "file:". + (cond + ((file-name-absolute-p raw-path) + (setq raw-path (concat "file:" raw-path))) + ((and home use-abs-url) + (setq raw-path (concat (file-name-as-directory home) raw-path)))) ;; Add search option, if any. A search option can be ;; relative to a custom-id or a headline title. Any other ;; option is ignored. @@ -2721,9 +2721,9 @@ INFO is a plist holding contextual information. See (let ((destination (org-export-resolve-radio-link link info))) (when destination (format "<a href=\"#%s\"%s>%s</a>" - (org-export-solidify-link-text path) - attributes - (org-export-data (org-element-contents destination) info))))) + (org-export-solidify-link-text + (org-element-property :value destination)) + attributes desc)))) ;; Links pointing to a headline: Find destination and build ;; appropriate referencing command. ((member type '("custom-id" "fuzzy" "id")) |