emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
blob 63967de0ff2d7de2fe1abad89701c8a6ca495246 4506 bytes (raw)
name: lisp/ob-ditaa.el 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
 
;;; ob-ditaa.el --- org-babel functions for ditaa evaluation

;; Copyright (C) 2009-2013 Free Software Foundation, Inc.

;; Author: Eric Schulte
;; 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 ditaa source code.
;;
;; This differs from most standard languages in that
;;
;; 1) there is no such thing as a "session" in ditaa
;;
;; 2) we are generally only going to return results of type "file"
;;
;; 3) we are adding the "file" and "cmdline" header arguments
;;
;; 4) there are no variables (at least for now)

;;; Code:
(require 'ob)
(require 'org-compat)

(defvar org-babel-default-header-args:ditaa
  '((:results . "file")
    (:exports . "results")
    (:java . "-Dfile.encoding=UTF-8"))
  "Default arguments for evaluating a ditaa source block.")

(defcustom org-ditaa-jar-path (expand-file-name
			       "ditaa.jar"
			       (file-name-as-directory
				(expand-file-name
				 "scripts"
				 (file-name-as-directory
				  (expand-file-name
				   "../contrib"
				   (file-name-directory (org-find-library-dir "org")))))))
  "Path to the ditaa jar executable."
  :group 'org-babel
  :type 'string)

(defcustom org-ditaa-eps-jar-path
  (expand-file-name "DitaaEps.jar" (file-name-directory org-ditaa-jar-path))
  "Path to the DitaaEps.jar executable."
  :group 'org-babel
  :version "24.4"
  :package-version '(Org . "8.0")
  :type 'string)

(defcustom org-ditaa-jar-option "-jar"
  "Option for the ditaa jar file.
Do not leave leading or trailing spaces in this string."
  :group 'org-babel
  :version "24.1"
  :type 'string)

(defun org-babel-execute:ditaa (body params)
  "Execute a block of Ditaa 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 ((lambda (el)
		      (or el
			  (error
			   "ditaa code block requires :file header argument")))
		    (cdr (assoc :file params))))
	 (cmdline (cdr (assoc :cmdline params)))
	 (java (cdr (assoc :java params)))
	 (in-file (org-babel-temp-file "ditaa-"))
	 (eps (cdr (assoc :eps params)))
	 (jar-file-name (shell-quote-argument
			 (expand-file-name
			  (if eps org-ditaa-eps-jar-path org-ditaa-jar-path))))
	 (emacs-p (string-match "cygwin" (emacs-version)))
	 (jar-file-name-wrapped
	  (if emacs-p
	      ;; Cygwin doesn't have Jave, have to use Windows native Java.
	      ;; So Cygwin paths must be converted to Windows paths.
	      (format "`cygpath -w %s`" jar-file-name)
	    jar-file-name))
	 (in-file-wrapped
	  (if emacs-p
	      (format "`cygpath -w %s`" (org-babel-process-file-name in-file))
	    (org-babel-process-file-name in-file)))
	 (out-file-wrapped
	  (if emacs-p
	      (format "`cygpath -w %s`" (org-babel-process-file-name out-file))
	    (org-babel-process-file-name out-file)))
	 (cmd (concat "java " java " " org-ditaa-jar-option " "
		      jar-file-name-wrapped
		      " " cmdline
		      " " in-file-wrapped
		      " " out-file-wrapped))
	 (pdf-cmd (when (and (or (string= (file-name-extension out-file) "pdf")
				 (cdr (assoc :pdf params))))
		    (concat
		     "epstopdf"
		     " " (org-babel-process-file-name (concat in-file ".eps"))
		     " -o=" (org-babel-process-file-name out-file)))))
    (unless (file-exists-p org-ditaa-jar-path)
      (error "Could not find ditaa.jar at %s" org-ditaa-jar-path))
    (with-temp-file in-file (insert body))
    (message cmd) (shell-command cmd)
    (when pdf-cmd (message pdf-cmd) (shell-command pdf-cmd))
    nil)) ;; signal that output has already been written to file

(defun org-babel-prep-session:ditaa (session params)
  "Return an error because ditaa does not support sessions."
  (error "Ditaa does not support sessions"))

(provide 'ob-ditaa)



;;; ob-ditaa.el ends here

debug log:

solving 63967de ...
found 63967de in https://list.orgmode.org/orgmode/CAHenMCFA3kaL3w-hUpy5cPU7Cmc+rSip4hN6Bo9QHPYTuGSZvg@mail.gmail.com/ ||
	https://list.orgmode.org/orgmode/CAHenMCFoPCwFHKuc1i+6-0WAfCXssa3KYW8WwB_Nu3vVuD0K-w@mail.gmail.com/
found d3d76e5 in https://git.savannah.gnu.org/cgit/emacs/org-mode.git
preparing index
index prepared:
100644 d3d76e57ac1a1ade2bf146578a59c92e4f966cd1	lisp/ob-ditaa.el

applying [1/1] https://list.orgmode.org/orgmode/CAHenMCFA3kaL3w-hUpy5cPU7Cmc+rSip4hN6Bo9QHPYTuGSZvg@mail.gmail.com/
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index d3d76e5..63967de 100644

Checking patch lisp/ob-ditaa.el...
Applied patch lisp/ob-ditaa.el cleanly.

skipping https://list.orgmode.org/orgmode/CAHenMCFoPCwFHKuc1i+6-0WAfCXssa3KYW8WwB_Nu3vVuD0K-w@mail.gmail.com/ for 63967de
index at:
100644 63967de0ff2d7de2fe1abad89701c8a6ca495246	lisp/ob-ditaa.el

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).