mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-20 01:56:29 +00:00
Code Releases Activity

org-export-expand-include-keyword: Fix relative links in recursive includes

Browse source 
* lisp/ox.el (org-export-expand-include-keyword): Add new optional
argument INCLUDER-FILE to explicitly pass the includer file path when
expanding inside a temporary buffer.  Pass the INCLUDER-FILE later
during recursive expansion.

Reported-by: Gabriel Petrini da Silveira <gpetrinidasilveira@gmail.com>
Link: https://orgmode.org/list/CAHCA-UvaqnegPYfpPcJCqiY8+dDoj0pfX0vDckUui-MCj3wq5A@mail.gmail.com
This commit is contained in:
Ihor Radchenko 2023-01-18 11:41:03 +03:00
parent 104311c7f8
commit 0e5de0ff64
No known key found for this signature in database
GPG key ID: 6470762A7DA11D8B
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/ox.el
View file

@ -3283,15 +3283,24 @@ locally for the subtree through node properties."
(downcase (car key))
(if (org-string-nw-p val) (format " %s" val) ""))))))))
(defun org-export-expand-include-keyword (&optional included dir footnotes)
(defun org-export-expand-include-keyword (&optional included dir footnotes includer-file)
"Expand every include keyword in buffer.
Optional argument INCLUDED is a list of included file names along
with their line restriction, when appropriate. It is used to
avoid infinite recursion. Optional argument DIR is the current
working directory. It is used to properly resolve relative
paths. Optional argument FOOTNOTES is a hash-table used for
storing and resolving footnotes. It is created automatically."
(let ((includer-file (buffer-file-name (buffer-base-buffer)))
avoid infinite recursion.
Optional argument DIR is the current working directory. It is used to
properly resolve relative paths.
Optional argument FOOTNOTES is a hash-table used for
storing and resolving footnotes. It is created automatically.
Optional argument INCLUDER-FILE is the file path corresponding to the
buffer contents being included. It is used when current buffer does
not have `buffer-file-name' assigned."
(let ((includer-file (or includer-file
(buffer-file-name (buffer-base-buffer))))
(case-fold-search t)
(file-prefix (make-hash-table :test #'equal))
(current-prefix 0)
@ -3422,7 +3431,7 @@ storing and resolving footnotes. It is created automatically."
(cons (list file lines) included)
(unless (org-url-p file)
(file-name-directory file))
footnotes)
footnotes includer-file)
(buffer-string)))))
;; Expand footnotes after all files have been
;; included. Footnotes are stored at end of buffer.