mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-27 17:32:52 +00:00
Code Releases Activity

Fix bugs related to includes files in new export system

Browse source
This commit is contained in:
Nicolas Goaziou 2012-02-04 12:39:31 +01:00
parent 42c96c4c26
commit c8d9f1438f
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
contrib/lisp/org-element.el
View file

@ -3038,10 +3038,12 @@ Nil values returned from FUN are ignored in the result."
;; included file becomes a direct child of
;; the current headline in the buffer.
:headline-offset
,(- (+ (plist-get
(plist-get --local :inherited-properties)
:level)
(or (plist-get --local :headline-offset) 0))
,(- (let ((parent
(org-export-get-parent-headline
--blob --local)))
(if (not parent) 0
(org-export-get-relative-level
parent --local)))
(1- (org-export-get-min-level
--data --local))))))))
;; Limiting recursion to greater elements, and --BLOB

16
contrib/lisp/org-export.el
View file

@ -2267,17 +2267,17 @@ Return the transcoded string."
data backend
(org-combine-plists
info
;; Store full path of already included files to avoid
;; recursive file inclusion.
;; Store full path of already included files to avoid recursive
;; file inclusion.
`(:included-files
,(cons (expand-file-name file) (plist-get info :included-files))
;; Ensure that a top-level headline in the included
;; file becomes a direct child of the current headline
;; in the buffer.
;; Ensure that a top-level headline in the included file
;; becomes a direct child of the current headline in the
;; buffer.
:headline-offset
,(- (+ (org-element-get-property
:level (org-export-get-parent-headline keyword info))
(plist-get info :headline-offset))
,(- (let ((parent (org-export-get-parent-headline keyword info)))
(if (not parent) 0
(org-export-get-relative-level parent info)))
(1- (org-export-get-min-level data info)))))))))
(defun org-export-get-file-contents (file &optional lines)