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

org-babel: Reinstate switches when exporting blocks of code

This commit is contained in:
Dan Davison 2009-10-31 13:28:20 -04:00
parent a0d03014ab
commit 64cd40700e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,13 +53,19 @@ none ----- do not display either code or results upon export"
(message "org-babel-exp processing...")
(let* ((lang (car headers))
(lang-headers (intern (concat "org-babel-default-header-args:" lang)))
(params (org-babel-merge-params
(switches (cdr headers)) params)
(while (and (cadr headers) (not (string-match "[ \t]*:" (cadr headers))))
(pop headers))
(setq params (cdr headers))
(setf (cdr headers) nil)
(setq switches (mapconcat #'identity switches " "))
(setq params (org-babel-merge-params
org-babel-default-header-args
(if (boundp lang-headers) (eval lang-headers) nil)
(org-babel-params-from-properties)
(org-babel-parse-header-arguments
(mapconcat #'identity (cdr headers) " ")))))
(org-babel-exp-do-export (list lang body params) 'block)))
(mapconcat #'identity params " "))))
(org-babel-exp-do-export (list lang body params switches) 'block)))
(defun org-babel-exp-inline-src-blocks (start end)
"Process inline src blocks between START and END for export.
@ -111,10 +117,11 @@ options are taken from `org-babel-default-header-args'."
(defun org-babel-exp-code (info type)
(let ((lang (first info))
(body (second info)))
(body (second info))
(switches (fourth info)))
(case type
('inline (format "=%s=" (second info)))
('block (format "#+BEGIN_SRC %s\n%s%s\n#+END_SRC" lang body
('block (format "#+BEGIN_SRC %s %s\n%s%s\n#+END_SRC" lang switches body
(if (string-match "\n$" body) "" "\n")))
('lob (save-excursion
(re-search-backward org-babel-lob-one-liner-regexp)