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

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

This commit is contained in:
Carsten Dominik 2010-02-15 20:23:14 +01:00
parent 203ad53b46 1e96482389
commit c9d7c2e966
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/babel/lisp/langs/org-babel-latex.el
View File

@ -69,7 +69,7 @@ called by `org-babel-execute-src-block'."
body out-file org-format-latex-options in-buffer)) body out-file org-format-latex-options in-buffer))
((string-match "\\.pdf$" out-file) ((string-match "\\.pdf$" out-file)
(org-babel-latex-body-to-tex-file tex-file body pdfheight pdfwidth) (org-babel-latex-body-to-tex-file tex-file body pdfheight pdfwidth)
(delete-file out-file) (when (file-exists-p out-file) (delete-file out-file))
(rename-file (org-babel-latex-tex-to-pdf tex-file) out-file)) (rename-file (org-babel-latex-tex-to-pdf tex-file) out-file))
((string-match "\\.\\([^\\.]+\\)$" out-file) ((string-match "\\.\\([^\\.]+\\)$" out-file)
(error (error

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

@ -138,11 +138,11 @@ options are taken from `org-babel-default-header-args'."
('block ('block
(let ((str (format "#+BEGIN_SRC %s %s\n%s%s#+END_SRC\n" lang switches body (let ((str (format "#+BEGIN_SRC %s %s\n%s%s#+END_SRC\n" lang switches body
(if (string-match "\n$" body) "" "\n")))) (if (string-match "\n$" body) "" "\n"))))
(add-text-properties 0 (length str) (when name (add-text-properties 0 (length str)
(list 'org-caption (list 'org-caption
(format "%s(%s)" (format "%s(%s)"
name (mapconcat #'identity args ", "))) name (mapconcat #'identity args ", ")))
str) str)) str) str)))
('lob ('lob
(let ((call-line (and (string-match "results=" (car args)) (let ((call-line (and (string-match "results=" (car args))
(substring (car args) (match-end 0))))) (substring (car args) (match-end 0)))))