forked from mirrors/org-mode
adcebf38f8
* ox.el (org-export-async-init-file): Use :set to set the default value. * ox-texinfo.el (org-texinfo-filename): Fix default value. (org-texinfo-format-headline-function): Use 'ignore as the default value. (org-texinfo-format-drawer-function): Use a function as the default value. Update docstring. (org-texinfo-drawer): Always use `org-texinfo-format-drawer-function' as it is now a function by default. (org-texinfo-headline): Compare `org-texinfo-format-headline-function' against 'ignore. (org-texinfo-inlinetask): Compare `org-texinfo-format-inlinetask-function' against 'ignore. * ox-odt.el (org-odt-format-drawer-function): Use a function as the default value. Update docstring. (org-odt-format-headline-function) (org-odt-format-inlinetask-function): Fix default value. (org-odt-with-latex): Use :set to set the default value. (org-odt-drawer): Always use `org-odt-format-drawer-function' as it is now a function by default. (org-odt-format-headline--wrap): Compare `org-odt-format-headline-function' against 'ignore. * ox-latex.el (org-latex-format-drawer-function): Use a function as the default value. Update docstring. (org-latex-format-inlinetask-function): Fix default value. (org-latex-drawer): Always use `org-latex-format-drawer-function' as it is now a function by default. (org-latex-inlinetask): Compare `org-latex-format-inlinetask-function' against 'ignore. * ox-html.el (org-html-format-drawer-function): Use a function as the default value. Update docstring. (org-html-format-headline-function) (org-html-format-inlinetask-function): Fix default value. (org-html-with-latex): Use :set to set the default value. (org-html--format-toc-headline) (org-html-format-headline--wrap): Compare `org-html-format-headline-function' against 'ignore. (org-html-inlinetask): Compare `org-html-format-inlinetask-function' against 'ignore. * ox-ascii.el (org-ascii-format-drawer-function): Use a function as the default value. Update docstring. (org-ascii-drawer): Always use `org-ascii-format-drawer-function' as it is now a function by default. (org-ascii-format-inlinetask-default): New function. (org-ascii-format-inlinetask-function): Use `org-ascii-format-inlinetask-default' as the default. * org.el (org-mouse-1-follows-link): Use :set to set the default value. Update custom type. (org-log-note-headings): Fix order or list items in the custom type. (orgstruct-heading-prefix-regexp): Use an empty string as the default value. Use 'regexp as the custom type. (orgstruct-make-binding): Tiny docstring enhancement. Assume `orgstruct-heading-prefix-regexp' is a string. * org-agenda.el (org-agenda-search-view-max-outline-level): Set default value to 0. Update docstring. (org-agenda-deadline-leaders): Fix custom type. (org-search-view): Assume `org-agenda-search-view-max-outline-level' is a number. * ob-ruby.el (org-babel-ruby-nil-to): Fix custom type. * ob-python.el (org-babel-python-mode): Use :set to set the default value. (org-babel-python-None-to): Fix custom type. * ob-plantuml.el (org-plantuml-jar-path): Fix default value. (org-babel-execute:plantuml): Assume `org-plantuml-jar-path' is a string. * ob-latex.el (org-babel-latex-htlatex): Fix default value. (org-babel-latex-htlatex-packages): Fix custom type. (org-babel-execute:latex): Assume `org-babel-latex-htlatex' is a string. Thanks to Glenn Morris for reporting this.
86 lines
3 KiB
EmacsLisp
86 lines
3 KiB
EmacsLisp
;;; ob-plantuml.el --- org-babel functions for plantuml evaluation
|
|
|
|
;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
|
|
|
|
;; Author: Zhang Weize
|
|
;; Keywords: literate programming, reproducible research
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Org-Babel support for evaluating plantuml script.
|
|
;;
|
|
;; Inspired by Ian Yang's org-export-blocks-format-plantuml
|
|
;; http://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el
|
|
|
|
;;; Requirements:
|
|
|
|
;; plantuml | http://plantuml.sourceforge.net/
|
|
;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
|
|
(defvar org-babel-default-header-args:plantuml
|
|
'((:results . "file") (:exports . "results"))
|
|
"Default arguments for evaluating a plantuml source block.")
|
|
|
|
(defcustom org-plantuml-jar-path ""
|
|
"Path to the plantuml.jar file."
|
|
:group 'org-babel
|
|
:version "24.1"
|
|
:type 'string)
|
|
|
|
(defun org-babel-execute:plantuml (body params)
|
|
"Execute a block of plantuml code with org-babel.
|
|
This function is called by `org-babel-execute-src-block'."
|
|
(let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
|
|
(out-file (or (cdr (assoc :file params))
|
|
(error "PlantUML requires a \":file\" header argument")))
|
|
(cmdline (cdr (assoc :cmdline params)))
|
|
(in-file (org-babel-temp-file "plantuml-"))
|
|
(java (or (cdr (assoc :java params)) ""))
|
|
(cmd (if (string= "" org-plantuml-jar-path)
|
|
(error "`org-plantuml-jar-path' is not set")
|
|
(concat "java " java " -jar "
|
|
(shell-quote-argument
|
|
(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)
|
|
" > "
|
|
(org-babel-process-file-name out-file)))))
|
|
(unless (file-exists-p org-plantuml-jar-path)
|
|
(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 "")
|
|
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."
|
|
(error "Plantuml does not support sessions"))
|
|
|
|
(provide 'ob-plantuml)
|
|
|
|
|
|
|
|
;;; ob-plantuml.el ends here
|