diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-20 15:31:46 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-20 15:31:46 +0100 |
commit | 1067d6c5ff67b8cfc9b147fb0494ff20cc5dc4b3 (patch) | |
tree | e82941e01f65d42d044a888de8403f1e065712ca | |
parent | dee24037545625648f5e91f404b9f6110bcf012e (diff) | |
parent | 0f70354b3200a55d45d463a1cbc063615eaab53a (diff) | |
download | org-mode-1067d6c5ff67b8cfc9b147fb0494ff20cc5dc4b3.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/ox-ascii.el | 3 | ||||
-rw-r--r-- | lisp/ox-latex.el | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index ae95ed9..14a2646 100644 --- a/lisp/ox-ascii.el +++ b/lisp/ox-ascii.el @@ -1600,7 +1600,8 @@ INFO is a plist holding contextual information." ;; Don't know what to do. Signal it. (_ "???")))) (t - (let ((raw-link (org-element-property :raw-link link))) + (let ((raw-link (org-link-unescape + (org-element-property :raw-link link)))) (if (not (org-string-nw-p desc)) (format "<%s>" raw-link) (concat (format "[%s]" desc) (and (not (plist-get info :ascii-links-to-notes)) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 893192a..1cb02d5 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -2344,7 +2344,8 @@ CONTENTS is nil. INFO is a plist holding contextual information." LINK is the link pointing to the inline image. INFO is a plist used as a communication channel." (let* ((parent (org-export-get-parent-element link)) - (path (let ((raw-path (org-element-property :path link))) + (path (let ((raw-path (org-link-unescape + (org-element-property :path link)))) (if (not (file-name-absolute-p raw-path)) raw-path (expand-file-name raw-path)))) (filetype (file-name-extension path)) @@ -2500,7 +2501,8 @@ INFO is a plist holding contextual information. See (path (org-latex--protect-text (cond ((member type '("http" "https" "ftp" "mailto" "doi")) (concat type ":" raw-path)) - ((string= type "file") (org-export-file-uri raw-path)) + ((string= type "file") + (org-export-file-uri (org-link-unescape raw-path))) (t raw-path))))) (cond ;; Link type is handled by a special function. @@ -2556,7 +2558,7 @@ INFO is a plist holding contextual information. See (format (org-export-get-coderef-format path desc) (org-export-resolve-coderef path info))) ;; External link with a description part. - ((and path desc) (format "\\href{%s}{%s}" path desc)) + ((and path desc) (format "\\href{%s}{%s}" (org-link-unescape path) desc)) ;; External link without a description part. (path (format "\\url{%s}" path)) ;; No path, only description. Try to do something useful. |