ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

babel: noweb references are now expanded in the pre-export buffer 

this is required because in the temporary org-mode file used during
  export code blocks may be removed entirely leading to unresolved
  references

* contrib/babel/lisp/org-babel-exp.el (org-babel-exp-src-blocks):
  expanding noweb references during export now takes place in the
  pre-export buffer

  (org-babel-exp-inline-src-blocks): expanding noweb references during
  export now takes place in the pre-export buffer

  (org-babel-exp-results): ensure that the expanded body is passed
  through to org-babel-execute-src-block
This commit is contained in:
Eric Schulte 2010-06-08 14:07:12 -07:00
parent cdc70ed68d
commit ae234f787b
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
contrib/babel/lisp/org-babel-exp.el
View File

@ -76,7 +76,17 @@ none ----- do not display either code or results upon export"
(when (member (first headers) org-babel-interpreters) (when (member (first headers) org-babel-interpreters)
(save-excursion (save-excursion
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(org-babel-exp-do-export (org-babel-get-src-block-info) 'block)))) (let* ((info (org-babel-get-src-block-info))
(params (third info)))
(message "info:%S" info)
;; expand noweb references in the original file
(setf (second info)
(if (and (cdr (assoc :noweb params))
(string= "yes" (cdr (assoc :noweb params))))
(org-babel-expand-noweb-references
info (get-file-buffer org-current-export-file))
(second info)))
(org-babel-exp-do-export info 'block)))))
(defun org-babel-exp-inline-src-blocks (start end) (defun org-babel-exp-inline-src-blocks (start end)
"Process inline src blocks between START and END for export. "Process inline src blocks between START and END for export.
@ -88,8 +98,18 @@ options and are taken from `org-babel-defualt-inline-header-args'."
(while (and (< (point) end) (while (and (< (point) end)
(re-search-forward org-babel-inline-src-block-regexp end t)) (re-search-forward org-babel-inline-src-block-regexp end t))
(let* ((info (save-match-data (org-babel-parse-inline-src-block-match))) (let* ((info (save-match-data (org-babel-parse-inline-src-block-match)))
(replacement (save-match-data (params (third info))
(org-babel-exp-do-export info 'inline)))) (replacement
(save-match-data
;; expand noweb references in the original file
(setf (second info)
(if (and (cdr (assoc :noweb params))
(string= "yes" (cdr (assoc :noweb params))))
(org-babel-expand-noweb-references
info (get-file-buffer org-current-export-file))
(second info)))
(message "info:%S" info)
(org-babel-exp-do-export info 'inline))))
(setq end (+ end (- (length replacement) (length (match-string 1))))) (setq end (+ end (- (length replacement) (length (match-string 1)))))
(replace-match replacement t t nil 1))))) (replace-match replacement t t nil 1)))))
@ -213,16 +233,16 @@ results into the buffer."
(format "=%S=" raw))))))) (format "=%S=" raw)))))))
('block ('block
(org-babel-execute-src-block (org-babel-execute-src-block
nil nil (org-babel-merge-params nil info (org-babel-merge-params
params `((:results . ,(if silent "silent" "replace"))))) params `((:results . ,(if silent "silent" "replace")))))
"") "")
('lob ('lob
(save-excursion (save-excursion
(re-search-backward org-babel-lob-one-liner-regexp nil t) (re-search-backward org-babel-lob-one-liner-regexp nil t)
(org-babel-execute-src-block (org-babel-execute-src-block
nil (list lang body nil info (org-babel-merge-params
(org-babel-merge-params params `((:results . ,(if silent "silent" "replace")))))
params `((:results . ,(if silent "silent" "replace")))))) ""))))) "")))))
(provide 'org-babel-exp) (provide 'org-babel-exp)
;;; org-babel-exp.el ends here ;;; org-babel-exp.el ends here