diff options
| author | Bastien Guerry <bastien1@free.fr> | 2011-07-28 17:13:49 +0200 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2011-07-28 17:13:49 +0200 |
| commit | 3ab2c837b302b01fff610f7b83050ab7e703477c (patch) | |
| tree | efa67ed523bbda4d41488ae6b9ad2782941ddcf2 /lisp/org/ob-plantuml.el | |
| parent | 44a8054f971837447e80d618b6e0c2a77778a2ee (diff) | |
| download | emacs-3ab2c837b302b01fff610f7b83050ab7e703477c.tar.gz | |
Merge changes from Org 7.4 to current Org 7.7.
Diffstat (limited to 'lisp/org/ob-plantuml.el')
| -rw-r--r-- | lisp/org/ob-plantuml.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el index f455bc9bb4c..b226a5342ff 100644 --- a/lisp/org/ob-plantuml.el +++ b/lisp/org/ob-plantuml.el @@ -1,11 +1,11 @@ ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org -;; Version: 7.4 +;; Version: 7.7 ;; This file is part of GNU Emacs. @@ -62,6 +62,8 @@ This function is called by `org-babel-execute-src-block'." (expand-file-name org-plantuml-jar-path)) (if (string= (file-name-extension out-file) "svg") " -tsvg" "") + (if (string= (file-name-extension out-file) "eps") + " -teps" "") " -p " cmdline " < " (org-babel-process-file-name in-file) " > " @@ -70,7 +72,7 @@ This function is called by `org-babel-execute-src-block'." (error "Could not find plantuml.jar at %s" org-plantuml-jar-path)) (with-temp-file in-file (insert (concat "@startuml\n" body "\n@enduml"))) (message "%s" cmd) (org-babel-eval cmd "") - out-file)) + nil)) ;; signal that output has already been written to file (defun org-babel-prep-session:plantuml (session params) "Return an error because plantuml does not support sessions." @@ -78,5 +80,6 @@ This function is called by `org-babel-execute-src-block'." (provide 'ob-plantuml) +;; arch-tag: 451f50c5-e779-407e-ad64-70e0e8f161d1 ;;; ob-plantuml.el ends here |