Max Nikulin <maniku...@gmail.com> writes: >> - (org-export-file-uri raw-path)) >> + (pcase (org-export-file-uri raw-path) >> + (`(and (pred #'file-name-absolute-p) ,path) >> + path) > > I am in doubts if this branch may be executed at all. For absolute file > names `org-export-file-uri' adds "file:" prefix so I expect that > `file-name-absolute-p' is always false.
You are indeed right. See the attached new version of the patch. > This time I am not lucky enough to accidentally face a case with invalid > link URI. However I do not think that for the link > > [[file:file-b.org]] > > "../file-b.org" is appropriate default description. I do not expect > "../" here. I also noticed this, but I feel that it is reasonable. In odt, "file-b.org" implies a resource inside the odt archive. "../file-b.org" will highlight that it is an external file. I'd prefer to leave the "../file" description for now and only do something when/if we hear from the ox-odt users.
>From c72d90244eb1a0fafb42a8c7841be82ad882efc5 Mon Sep 17 00:00:00 2001 Message-Id: <c72d90244eb1a0fafb42a8c7841be82ad882efc5.1667364775.git.yanta...@posteo.net> From: Ihor Radchenko <yanta...@posteo.net> Date: Mon, 31 Oct 2022 14:11:19 +0800 Subject: [PATCH v3] org-odt-link: Fix relative file links * lisp/ox-odt.el (org-odt-link): Append an extra "../" to relative links. This is needed to conform with OpenOffice convention to treat base path inside the odt archive. The path containing the odt file is thus "../". Reported-by: Ihor Radchenko <yanta...@posteo.net> Link: https://orgmode.org/list/87ilkc30wd.fsf@localhost --- lisp/ox-odt.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index 15a9cf2de..11b834d5d 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -2688,7 +2688,14 @@ (defun org-odt-link (link desc info) ((member type '("http" "https" "ftp" "mailto")) (concat type ":" raw-path)) ((string= type "file") - (org-export-file-uri raw-path)) + (let ((path-uri (org-export-file-uri raw-path))) + (if (string-prefix-p "file://" path-uri) + path + ;; Otherwise, it is a relative path. + ;; OpenOffice treats base directory inside the odt + ;; archive. The directory containing the odt file + ;; is "../". + (concat "../" path)))) (t raw-path))) ;; Convert & to & for correct XML representation (path (replace-regexp-in-string "&" "&" path))) -- 2.35.1
-- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at <https://orgmode.org/>. Support Org development at <https://liberapay.com/org-mode>, or support my work at <https://liberapay.com/yantar92>