tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

org-babel: behaviour-neutral changes anticipating subsequent work on export 

merging original change by Dan Davison which generalizes the types
  of blocks exported by org-babel to include the following types
  - inline
  - lob
  - block
This commit is contained in:
Eric Schulte 2009-10-23 15:12:02 -06:00
parent 6ef0dd44bd
commit 824c8c0dba
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ none ----- do not display either code or results upon export"
(org-babel-params-from-properties) (org-babel-params-from-properties)
(org-babel-parse-header-arguments (org-babel-parse-header-arguments
(mapconcat #'identity (cdr headers) " "))))) (mapconcat #'identity (cdr headers) " ")))))
(org-babel-exp-do-export lang body params))) (org-babel-exp-do-export lang body params '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.
@ -72,28 +72,28 @@ options and are taken from `org-babel-defualt-inline-header-args'."
(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 (replacement (save-match-data
(org-babel-exp-do-export (org-babel-exp-do-export
(first info) (second info) (third info) t)))) (first info) (second info) (third info) 'inline))))
;; (message "%s -> %s" (second info) replacement) ;; debugging ;; (message "%s -> %s" (second info) replacement) ;; debugging
(setf end (+ end (- (length replacement) (setf end (+ end (- (length replacement)
(+ 6 (length (first info)) (length (second info)))))) (+ 6 (length (first info)) (length (second info))))))
(replace-match replacement t t))))) (replace-match replacement t t)))))
(defun org-babel-exp-do-export (lang body params &optional inline) (defun org-babel-exp-do-export (lang body params type)
(case (intern (or (cdr (assoc :exports params)) "code")) (case (intern (or (cdr (assoc :exports params)) "code"))
('none "") ('none "")
('code (org-babel-exp-code body lang params inline)) ('code (org-babel-exp-code body lang params type))
('results (org-babel-exp-results body lang params inline)) ('results (org-babel-exp-results body lang params type))
('both (concat (org-babel-exp-code body lang params inline) ('both (concat (org-babel-exp-code body lang params type)
"\n\n" "\n\n"
(org-babel-exp-results body lang params inline))))) (org-babel-exp-results body lang params type)))))
(defun org-babel-exp-code (body lang params &optional inline) (defun org-babel-exp-code (body lang params type)
(if inline (case type
(format "=%s=" body) ('inline (format "=%s=" body))
(format "#+BEGIN_SRC %s\n%s%s\n#+END_SRC" lang body ('block (format "#+BEGIN_SRC %s\n%s%s\n#+END_SRC" lang body
(if (string-match "\n$" body) "" "\n")))) (if (string-match "\n$" body) "" "\n")))))
(defun org-babel-exp-results (body lang params &optional inline) (defun org-babel-exp-results (body lang params type)
(let ((params (let ((params
;; lets ensure that we lookup references in the original file ;; lets ensure that we lookup references in the original file
(mapcar (lambda (pair) (mapcar (lambda (pair)
@ -103,7 +103,8 @@ options and are taken from `org-babel-defualt-inline-header-args'."
"=" org-current-export-file "=" org-current-export-file
":" (match-string 2 (cdr pair)))) ":" (match-string 2 (cdr pair))))
pair)) params))) pair)) params)))
(if inline (case type
('inline
(let ((raw (org-babel-execute-src-block (let ((raw (org-babel-execute-src-block
nil (list lang body params) '((:results . "silent")))) nil (list lang body params) '((:results . "silent"))))
(result-params (split-string (cdr (assoc :results params))))) (result-params (split-string (cdr (assoc :results params)))))
@ -116,11 +117,12 @@ options and are taken from `org-babel-defualt-inline-header-args'."
(format "src_%s{%s}" lang raw)) (format "src_%s{%s}" lang raw))
(t (t
(if (and (stringp raw) (= 0 (length raw))) (if (and (stringp raw) (= 0 (length raw)))
"=(no results)=" (format "=%S=" raw))))) "=(no results)=" (format "=%S=" raw))))))
(save-excursion ;; org-exp-blocks places us at the end of the block ('block
(re-search-backward org-babel-src-block-regexp nil t) (save-excursion ;; org-exp-blocks places us at the end of the block
(org-babel-execute-src-block (re-search-backward org-babel-src-block-regexp nil t)
nil nil (org-babel-merge-params params '((:results . "replace")))) "")))) (org-babel-execute-src-block
nil nil (org-babel-merge-params params '((:results . "replace")))) "")))))
(provide 'org-babel-exp) (provide 'org-babel-exp)
;;; org-babel-exp.el ends here ;;; org-babel-exp.el ends here