tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-09-02 21:32:12 +02:00
parent a6165748cf 980aef2dfb
commit a2d0cd922e
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lisp/ox-html.el
View File

@ -2811,17 +2811,16 @@ INFO is a plist holding contextual information. See
(org-trim (plist-get info :html-link-home)))) (org-trim (plist-get info :html-link-home))))
(use-abs-url (plist-get info :html-link-use-abs-url)) (use-abs-url (plist-get info :html-link-use-abs-url))
(link-org-files-as-html-maybe (link-org-files-as-html-maybe
(function (lambda (raw-path info)
(lambda (raw-path info) ;; Treat links to `file.org' as links to `file.html', if
"Treat links to `file.org' as links to `file.html', if needed. ;; needed. See `org-html-link-org-files-as-html'.
See `org-html-link-org-files-as-html'." (cond
(cond ((and (plist-get info :html-link-org-files-as-html)
((and (plist-get info :html-link-org-files-as-html) (string= ".org"
(string= ".org" (downcase (file-name-extension raw-path "."))))
(downcase (file-name-extension raw-path ".")))) (concat (file-name-sans-extension raw-path) "."
(concat (file-name-sans-extension raw-path) "." (plist-get info :html-extension)))
(plist-get info :html-extension))) (t raw-path))))
(t raw-path)))))
(type (org-element-property :type link)) (type (org-element-property :type link))
(raw-path (org-element-property :path link)) (raw-path (org-element-property :path link))
;; Ensure DESC really exists, or set it to nil. ;; Ensure DESC really exists, or set it to nil.
@ -2829,9 +2828,8 @@ INFO is a plist holding contextual information. See
(path (path
(cond (cond
((member type '("http" "https" "ftp" "mailto")) ((member type '("http" "https" "ftp" "mailto"))
(org-html-encode-plain-text (org-link-escape-browser
(org-link-escape-browser (org-link-unescape (concat type ":" raw-path))))
(org-link-unescape (concat type ":" raw-path)))))
((string= type "file") ((string= type "file")
;; Treat links to ".org" files as ".html", if needed. ;; Treat links to ".org" files as ".html", if needed.
(setq raw-path (setq raw-path
@ -2950,21 +2948,25 @@ INFO is a plist holding contextual information. See
;; Coderef: replace link with the reference name or the ;; Coderef: replace link with the reference name or the
;; equivalent line number. ;; equivalent line number.
((string= type "coderef") ((string= type "coderef")
(let ((fragment (concat "coderef-" path))) (let ((fragment (concat "coderef-" (org-html-encode-plain-text path))))
(format "<a href=\"#%s\"%s%s>%s</a>" (format "<a href=\"#%s\"%s%s>%s</a>"
fragment fragment
(org-trim (format "class=\"coderef\" onmouseover=\"CodeHighlightOn(this, \
(format (concat "class=\"coderef\"" '%s');\" onmouseout=\"CodeHighlightOff(this, '%s');\""
" onmouseover=\"CodeHighlightOn(this, '%s');\"" fragment fragment)
" onmouseout=\"CodeHighlightOff(this, '%s');\"")
fragment fragment))
attributes attributes
(format (org-export-get-coderef-format path desc) (format (org-export-get-coderef-format path desc)
(org-export-resolve-coderef path info))))) (org-export-resolve-coderef path info)))))
;; External link with a description part. ;; External link with a description part.
((and path desc) (format "<a href=\"%s\"%s>%s</a>" path attributes desc)) ((and path desc) (format "<a href=\"%s\"%s>%s</a>"
(org-html-encode-plain-text path)
attributes
desc))
;; External link without a description part. ;; External link without a description part.
(path (format "<a href=\"%s\"%s>%s</a>" path attributes path)) (path (format "<a href=\"%s\"%s>%s</a>"
(org-html-encode-plain-text path)
attributes
path))
;; No path, only description. Try to do something useful. ;; No path, only description. Try to do something useful.
(t (format "<i>%s</i>" desc))))) (t (format "<i>%s</i>" desc)))))