From fc1f7d752fcd526909f0bb619cb9b3568c87665f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 14 Apr 2014 12:32:25 +0200 Subject: [PATCH] Fix link export * lisp/ox-html.el (org-html-link): * lisp/ox-latex.el (org-latex-link): * lisp/ox-man.el (org-man-link): * lisp/ox-odt.el (org-odt-link): * lisp/ox-texinfo.el (org-texinfo-link): Append "//" after some link types. * lisp/ox-md.el (org-md-link): * contrib/lisp/ox-groff.el (org-groff-link): Ditto. Also remove some unused code, as search options are already stripped out link's path. Since 3589f64e42dfbc894e789c2a9fba530eac36c665, Org ignores "//" in a link type so it has to be re-introduced upon exporting. --- contrib/lisp/ox-groff.el | 4 +--- lisp/ox-html.el | 2 +- lisp/ox-latex.el | 2 +- lisp/ox-man.el | 4 +--- lisp/ox-md.el | 2 +- lisp/ox-odt.el | 2 +- lisp/ox-texinfo.el | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/contrib/lisp/ox-groff.el b/contrib/lisp/ox-groff.el index 1990f878f..46be766e4 100644 --- a/contrib/lisp/ox-groff.el +++ b/contrib/lisp/ox-groff.el @@ -1252,10 +1252,8 @@ INFO is a plist holding contextual information. See link org-groff-inline-image-rules)) (path (cond ((member type '("http" "https" "ftp" "mailto")) - (concat type ":" raw-path)) + (concat type "://" raw-path)) ((string= type "file") - (when (string-match "\\(.+\\)::.+" raw-path) - (setq raw-path (match-string 1 raw-path))) (if (file-name-absolute-p raw-path) (concat "file://" (expand-file-name raw-path)) (concat "file://" raw-path))) diff --git a/lisp/ox-html.el b/lisp/ox-html.el index c590d86c4..9455d6249 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -2661,7 +2661,7 @@ INFO is a plist holding contextual information. See ((member type '("http" "https" "ftp" "mailto")) (org-link-escape (org-link-unescape - (concat type ":" raw-path)) org-link-escape-chars-browser)) + (concat type "://" raw-path)) org-link-escape-chars-browser)) ((string= type "file") ;; Treat links to ".org" files as ".html", if needed. (setq raw-path diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 6a2f69dde..e70ff0105 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1798,7 +1798,7 @@ INFO is a plist holding contextual information. See link org-latex-inline-image-rules)) (path (cond ((member type '("http" "https" "ftp" "mailto")) - (concat type ":" raw-path)) + (concat type "://" raw-path)) ((string= type "file") (if (not (file-name-absolute-p raw-path)) raw-path (concat "file://" (expand-file-name raw-path)))) diff --git a/lisp/ox-man.el b/lisp/ox-man.el index f5653f1a2..2985a75e3 100644 --- a/lisp/ox-man.el +++ b/lisp/ox-man.el @@ -646,10 +646,8 @@ INFO is a plist holding contextual information. See (path (cond ((member type '("http" "https" "ftp" "mailto")) - (concat type ":" raw-path)) + (concat type "://" raw-path)) ((string= type "file") - (when (string-match "\\(.+\\)::.+" raw-path) - (setq raw-path (match-string 1 raw-path))) (if (file-name-absolute-p raw-path) (concat "file://" (expand-file-name raw-path)) (concat "file://" raw-path))) diff --git a/lisp/ox-md.el b/lisp/ox-md.el index 47994ac32..455c3b334 100644 --- a/lisp/ox-md.el +++ b/lisp/ox-md.el @@ -320,7 +320,7 @@ a communication channel." (path (cond ((member type '("http" "https" "ftp")) - (concat type ":" raw-path)) + (concat type "://" raw-path)) ((equal type "file") (let ((path (funcall link-org-files-as-md raw-path))) (if (not (file-name-absolute-p path)) path diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 0ddf2d56e..e0f42d2a2 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -2712,7 +2712,7 @@ INFO is a plist holding contextual information. See link org-odt-inline-image-rules)) (path (cond ((member type '("http" "https" "ftp" "mailto")) - (concat type ":" raw-path)) + (concat type "://" raw-path)) ((string= type "file") (if (file-name-absolute-p raw-path) (concat "file://" (expand-file-name raw-path)) diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el index ef881afe2..865a21dbb 100644 --- a/lisp/ox-texinfo.el +++ b/lisp/ox-texinfo.el @@ -1221,7 +1221,7 @@ INFO is a plist holding contextual information. See (desc (and (not (string= desc "")) desc)) (path (cond ((member type '("http" "https" "ftp")) - (concat type ":" raw-path)) + (concat type "://" raw-path)) ((string= type "file") (if (file-name-absolute-p raw-path) (concat "file://" (expand-file-name raw-path)) -- 2.11.4.GIT