[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Orgmode] [PATCH] recursively resolve #+INCLUDE files
From: |
Eric Schulte |
Subject: |
[Orgmode] [PATCH] recursively resolve #+INCLUDE files |
Date: |
Sun, 13 Jun 2010 15:16:21 -0700 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) |
What do people think of this proposed patch.
I'd like to apply it, but figured I'd run it by the list first
Best -- Eric
,----[from the commit message]
| org-exp: now recursively resolve #+INCLUDE: files in a safe way
|
| * lisp/org-exp.el (org-export-preprocess-string):
| now using `org-export-handle-include-files-recurse' to resolve
| included files
|
| (org-export-handle-include-files): now returns a list of the
| included files
|
| (org-export-handle-include-files-recurse): recursively calls
| `org-export-handle-include-files' while checking to see if the
| process has entered an infinite loop.
`----
>From 3c3dbd683857041703109e950e0ad85e6fec8a13 Mon Sep 17 00:00:00 2001
From: Eric Schulte <address@hidden>
Date: Sun, 13 Jun 2010 15:14:08 -0700
Subject: [PATCH] org-exp: now recursively resolve #+INCLUDE: files in a safe way
* lisp/org-exp.el (org-export-preprocess-string):
now using `org-export-handle-include-files-recurse' to resolve
included files
(org-export-handle-include-files): now returns a list of the
included files
(org-export-handle-include-files-recurse): recursively calls
`org-export-handle-include-files' while checking to see if the
process has entered an infinite loop.
---
lisp/org-exp.el | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 915e1f5..9428439 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1032,7 +1032,7 @@ on this string to produce the exported version."
(untabify (point-min) (point-max))
;; Handle include files, and call a hook
- (org-export-handle-include-files)
+ (org-export-handle-include-files-recurse)
(run-hooks 'org-export-preprocess-after-include-files-hook)
;; Get rid of archived trees
@@ -1969,7 +1969,7 @@ TYPE must be a string, any of:
(defun org-export-handle-include-files ()
"Include the contents of include files, with proper formatting."
(let ((case-fold-search t)
- params file markup lang start end prefix prefix1 switches)
+ params file markup lang start end prefix prefix1 switches all)
(goto-char (point-min))
(while (re-search-forward "^#\\+INCLUDE:?[ \t]+\\(.*\\)" nil t)
(setq params (read (concat "(" (match-string 1) ")"))
@@ -1986,6 +1986,7 @@ TYPE must be a string, any of:
(not (file-exists-p file))
(not (file-readable-p file)))
(insert (format "CANNOT INCLUDE FILE %s" file))
+ (setq all (cons file all))
(when markup
(if (equal (downcase markup) "src")
(setq start (format "#+begin_src %s %s\n"
@@ -1998,7 +1999,22 @@ TYPE must be a string, any of:
(insert (org-get-file-contents (expand-file-name file)
prefix prefix1 markup))
(or (bolp) (newline))
- (insert (or end ""))))))
+ (insert (or end ""))))
+ all))
+
+(defun org-export-handle-include-files-recurse ()
+ "Recursively include files aborting on circular inclusion."
+ (let ((now (list org-current-export-file)) all)
+ (while now
+ (setq all (remove-duplicates (append now all)))
+ (setq now (org-export-handle-include-files))
+ (let ((intersection
+ (delq nil
+ (mapcar
+ (lambda (el) (when (member el all) el))
+ now))))
+ (when (intersection now all)
+ (error "recursive #+INCLUDE: %S" intersection))))))
(defun org-get-file-contents (file &optional prefix prefix1 markup)
"Get the contents of FILE and return them as a string.
--
1.7.0.4
- [Orgmode] [PATCH] recursively resolve #+INCLUDE files,
Eric Schulte <=