Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Hi Terje, sorry for the late reply. Terje Larsen writes: > Did this look okay? I've had to rebase this once again due to some > conflicts in the ORG-NEWS. Applied, thanks! -- Bastien
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Did this look okay? I've had to rebase this once again due to some conflicts in the ORG-NEWS. Find the latest patch attached. Best regards Terje On Tue, Jun 9, 2020 at 8:53 AM Terje Larsen wrote: > > Thank you Bastien, > > I didn't get what the updated patch with shorter lines meant, the only > thing I could see difference between that patch and my previous patch > was the line breaks using CR LF instead of LF. I generate my patch > with git format-patch > > Here is the updated patch using mapconcat. > > Best regards > Terje > > On Mon, Jun 1, 2020 at 4:00 PM Bastien wrote: > > > > Hello Terje, > > > > > I have now signed the FSF papers. Here is the updated patch on top of > > > current master. > > > > Great, thanks. > > > > > Let me know if all looks good or if I need to make further changes or > > > need to provide something else. > > > > It looks good -- here is an updated patch with shorter lines. > > > > The last change you need to make is to use mapconcat instead > > of string-join, which would require us to load subr-x.el. > > > > Once this is done I'll apply your patch. > > > > Thanks, > > > > -- > > Bastien > > > > -- > // Terje Larsen -- // Terje Larsen From d2d73cd6dce1576d7396f734c70657f9a9e1806f Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Fri, 8 Nov 2019 10:25:49 +0100 Subject: [PATCH] ob-plantuml: Add support for plantuml executable * lisp/ob-plantuml (org-babel-variable-assignments:plantuml): Support using plantuml executable instead of jar. Some systems come with an executable for plantuml instead of a specific JAR file. This adds support for two different modes: - jar :: using java together with a JAR (previous behavior) - plantuml :: using a PlantUML executable The PlantUML executable can be configured via `org-plantuml-executable-path` and also the arguments that will be given via `org-plantuml-executable-args`. --- etc/ORG-NEWS| 7 lisp/ob-plantuml.el | 94 + 2 files changed, 67 insertions(+), 34 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 10658a970..87c5696d8 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -266,6 +266,13 @@ can now be inserted with this prefix argument. Source code block header argument =:file-mode= can set file permissions if =:file= argument is provided. +*** =ob-plantuml=: now supports using PlantUML executable to generate diagrams + +Set =org-plantuml-exec-mode= to ='plantuml= in order to use the +executable instead of JAR. When using an executable it is also +possible to configure executable location as well as arguments via: +=org-plantuml-executable-path= and =org-plantuml-executable-args=. + ** New commands *** ~org-table-header-line-mode~ diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 0e1d4eda2..4d10a68f4 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -31,7 +31,7 @@ ;;; Requirements: ;; plantuml | http://plantuml.sourceforge.net/ -;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file +;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file (when exec mode is `jar') ;;; Code: (require 'ob) @@ -46,6 +46,31 @@ :version "24.1" :type 'string) +(defcustom org-plantuml-exec-mode 'jar + "Method to use for PlantUML diagram generation. +`jar' means to use java together with the JAR. +The JAR can be configured via `org-plantuml-jar-path'. + +`plantuml' means to use the PlantUML executable. +The executable can be configured via `org-plantuml-executable-path'. +You can also configure extra arguments via `org-plantuml-executable-args'." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'symbol + :options '(jar plantuml)) + +(defcustom org-plantuml-executable-path "plantuml" + "File name of the PlantUML executable." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'string) + +(defcustom org-plantuml-executable-args (list "-headless") + "The arguments passed to plantuml executable when executing PlantUML." + :group 'org-babel + :package-version '(Org . "9.4") + :type '(repeat string)) + (defun org-babel-variable-assignments:plantuml (params) "Return a list of PlantUML statements assigning the block's variables. PARAMS is a property list of source block parameters, which may @@ -83,40 +108,41 @@ This function is called by `org-babel-execute-src-block'." (cmdline (cdr (assq :cmdline params))) (in-file (org-babel-temp-file "plantuml-")) (java (or (cdr (assq :java params)) "")) + (executable (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-path) + (t "java"))) + (executable-args (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-args) +((string= "" org-plantuml-jar-path) + (error "`org-plantuml-jar-path' is not set")) +((not (file-exists-p org-plantuml-jar-path)) + (error "Could not find plantuml.jar at %s" org-plantuml-jar-path)) +(t (list java + "-jar" +
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Thank you Bastien, I didn't get what the updated patch with shorter lines meant, the only thing I could see difference between that patch and my previous patch was the line breaks using CR LF instead of LF. I generate my patch with git format-patch Here is the updated patch using mapconcat. Best regards Terje On Mon, Jun 1, 2020 at 4:00 PM Bastien wrote: > > Hello Terje, > > > I have now signed the FSF papers. Here is the updated patch on top of > > current master. > > Great, thanks. > > > Let me know if all looks good or if I need to make further changes or > > need to provide something else. > > It looks good -- here is an updated patch with shorter lines. > > The last change you need to make is to use mapconcat instead > of string-join, which would require us to load subr-x.el. > > Once this is done I'll apply your patch. > > Thanks, > > -- > Bastien -- // Terje Larsen From 5a26a6cf2783836bfa16e006607d06a911b97c56 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Fri, 8 Nov 2019 10:25:49 +0100 Subject: [PATCH] ob-plantuml: Add support for plantuml executable * lisp/ob-plantuml (org-babel-variable-assignments:plantuml): Support using plantuml executable instead of jar. Some systems come with an executable for plantuml instead of a specific JAR file. This adds support for two different modes: - jar :: using java together with a JAR (previous behavior) - plantuml :: using a PlantUML executable The PlantUML executable can be configured via `org-plantuml-executable-path` and also the arguments that will be given via `org-plantuml-executable-args`. --- etc/ORG-NEWS| 7 lisp/ob-plantuml.el | 94 + 2 files changed, 67 insertions(+), 34 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index f313b07fe..93695dd01 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -255,6 +255,13 @@ explicitly: In situations where ~org-return~ calls ~newline~, multiple newlines can now be inserted with this prefix argument. +*** =ob-plantuml=: now supports using PlantUML executable to generate diagrams + +Set =org-plantuml-exec-mode= to ='plantuml= in order to use the +executable instead of JAR. When using an executable it is also +possible to configure executable location as well as arguments via: +=org-plantuml-executable-path= and =org-plantuml-executable-args=. + ** New commands *** ~org-table-header-line-mode~ diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 0e1d4eda2..4d10a68f4 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -31,7 +31,7 @@ ;;; Requirements: ;; plantuml | http://plantuml.sourceforge.net/ -;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file +;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file (when exec mode is `jar') ;;; Code: (require 'ob) @@ -46,6 +46,31 @@ :version "24.1" :type 'string) +(defcustom org-plantuml-exec-mode 'jar + "Method to use for PlantUML diagram generation. +`jar' means to use java together with the JAR. +The JAR can be configured via `org-plantuml-jar-path'. + +`plantuml' means to use the PlantUML executable. +The executable can be configured via `org-plantuml-executable-path'. +You can also configure extra arguments via `org-plantuml-executable-args'." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'symbol + :options '(jar plantuml)) + +(defcustom org-plantuml-executable-path "plantuml" + "File name of the PlantUML executable." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'string) + +(defcustom org-plantuml-executable-args (list "-headless") + "The arguments passed to plantuml executable when executing PlantUML." + :group 'org-babel + :package-version '(Org . "9.4") + :type '(repeat string)) + (defun org-babel-variable-assignments:plantuml (params) "Return a list of PlantUML statements assigning the block's variables. PARAMS is a property list of source block parameters, which may @@ -83,40 +108,41 @@ This function is called by `org-babel-execute-src-block'." (cmdline (cdr (assq :cmdline params))) (in-file (org-babel-temp-file "plantuml-")) (java (or (cdr (assq :java params)) "")) + (executable (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-path) + (t "java"))) + (executable-args (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-args) +((string= "" org-plantuml-jar-path) + (error "`org-plantuml-jar-path' is not set")) +((not (file-exists-p org-plantuml-jar-path)) + (error "Could not find plantuml.jar at %s" org-plantuml-jar-path)) +(t (list java + "-jar" + (shell-quote-argument (expand-file-name org-plantuml-jar-path)) (full-body (org-babel-plantuml-make-body body 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
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Hello Terje, > I have now signed the FSF papers. Here is the updated patch on top of > current master. Great, thanks. > Let me know if all looks good or if I need to make further changes or > need to provide something else. It looks good -- here is an updated patch with shorter lines. The last change you need to make is to use mapconcat instead of string-join, which would require us to load subr-x.el. Once this is done I'll apply your patch. Thanks, -- Bastien >From b5f1bf735e6cf7eeeaa4f8bfdab921bed0959b46 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Fri, 8 Nov 2019 10:25:49 +0100 Subject: [PATCH] ob-plantuml: Add support for plantuml executable * lisp/ob-plantuml (org-babel-variable-assignments:plantuml): Support using plantuml executable instead of jar. Some systems come with an executable for plantuml instead of a specific JAR file. This adds support for two different modes: - jar :: using java together with a JAR (previous behavior) - plantuml :: using a PlantUML executable The PlantUML executable can be configured via `org-plantuml-executable-path` and also the arguments that will be given via `org-plantuml-executable-args`. --- etc/ORG-NEWS| 7 lisp/ob-plantuml.el | 94 + 2 files changed, 67 insertions(+), 34 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 5183b58de..0b161a32b 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -243,6 +243,13 @@ explicitly: In situations where ~org-return~ calls ~newline~, multiple newlines can now be inserted with this prefix argument. +*** =ob-plantuml=: now supports using PlantUML executable to generate diagrams + +Set =org-plantuml-exec-mode= to ='plantuml= in order to use the +executable instead of JAR. When using an executable it is also +possible to configure executable location as well as arguments via: +=org-plantuml-executable-path= and =org-plantuml-executable-args=. + ** New commands *** ~org-table-header-line-mode~ diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 0e1d4eda2..67b469c31 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -31,7 +31,7 @@ ;;; Requirements: ;; plantuml | http://plantuml.sourceforge.net/ -;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file +;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file (when exec mode is `jar') ;;; Code: (require 'ob) @@ -46,6 +46,31 @@ :version "24.1" :type 'string) +(defcustom org-plantuml-exec-mode 'jar + "Method to use for PlantUML diagram generation. +`jar' means to use java together with the JAR. +The JAR can be configured via `org-plantuml-jar-path'. + +`plantuml' means to use the PlantUML executable. +The executable can be configured via `org-plantuml-executable-path'. +You can also configure extra arguments via `org-plantuml-executable-args'." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'symbol + :options '(jar plantuml)) + +(defcustom org-plantuml-executable-path "plantuml" + "File name of the PlantUML executable." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'string) + +(defcustom org-plantuml-executable-args (list "-headless") + "The arguments passed to plantuml executable when executing PlantUML." + :group 'org-babel + :package-version '(Org . "9.4") + :type '(repeat string)) + (defun org-babel-variable-assignments:plantuml (params) "Return a list of PlantUML statements assigning the block's variables. PARAMS is a property list of source block parameters, which may @@ -83,40 +108,41 @@ This function is called by `org-babel-execute-src-block'." (cmdline (cdr (assq :cmdline params))) (in-file (org-babel-temp-file "plantuml-")) (java (or (cdr (assq :java params)) "")) + (executable (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-path) + (t "java"))) + (executable-args (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-args) +((string= "" org-plantuml-jar-path) + (error "`org-plantuml-jar-path' is not set")) +((not (file-exists-p org-plantuml-jar-path)) + (error "Could not find plantuml.jar at %s" org-plantuml-jar-path)) +(t (list java + "-jar" + (shell-quote-argument (expand-file-name org-plantuml-jar-path)) (full-body (org-babel-plantuml-make-body body 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) "png") - " -tpng" "") - (if (string= (file-name-extension out-file) "svg") - " -tsvg" "") - (if (string= (file-name-extension out-file) "eps") - " -teps" "") - (if (string= (file-name-extension out-file) "pdf") - " -tpdf" "") - (if (string= (file-name-extension out-file) "tex") - " -tlatex" "") - (if (string= (file-name-extension
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Hello Bastien, I have now signed the FSF papers. Here is the updated patch on top of current master. Let me know if all looks good or if I need to make further changes or need to provide something else. Best regards, Terje On Mon, Feb 17, 2020 at 12:29 AM Bastien wrote: > > Hi Terje, > > Terje Larsen writes: > > > You are welcome, I have never gotten around to sign the FSF papers as > > I thought it was a > > bit of a hassle, but with those clear instructions I have now started > > the process. > > Thanks! > > > I guess I have to wait until the process is done until I can > > resubmit? > > Yes, exactly. Thanks for contributing, > > -- > Bastien -- // Terje Larsen From b5f1bf735e6cf7eeeaa4f8bfdab921bed0959b46 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Fri, 8 Nov 2019 10:25:49 +0100 Subject: [PATCH] ob-plantuml: Add support for plantuml executable * lisp/ob-plantuml (org-babel-variable-assignments:plantuml): Support using plantuml executable instead of jar. Some systems come with an executable for plantuml instead of a specific JAR file. This adds support for two different modes: - jar :: using java together with a JAR (previous behavior) - plantuml :: using a PlantUML executable The PlantUML executable can be configured via `org-plantuml-executable-path` and also the arguments that will be given via `org-plantuml-executable-args`. --- etc/ORG-NEWS| 7 lisp/ob-plantuml.el | 94 + 2 files changed, 67 insertions(+), 34 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 5183b58de..0b161a32b 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -243,6 +243,13 @@ explicitly: In situations where ~org-return~ calls ~newline~, multiple newlines can now be inserted with this prefix argument. +*** =ob-plantuml=: now supports using PlantUML executable to generate diagrams + +Set =org-plantuml-exec-mode= to ='plantuml= in order to use the +executable instead of JAR. When using an executable it is also +possible to configure executable location as well as arguments via: +=org-plantuml-executable-path= and =org-plantuml-executable-args=. + ** New commands *** ~org-table-header-line-mode~ diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 0e1d4eda2..67b469c31 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -31,7 +31,7 @@ ;;; Requirements: ;; plantuml | http://plantuml.sourceforge.net/ -;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file +;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file (when exec mode is `jar') ;;; Code: (require 'ob) @@ -46,6 +46,31 @@ :version "24.1" :type 'string) +(defcustom org-plantuml-exec-mode 'jar + "Method to use for PlantUML diagram generation. +`jar' means to use java together with the JAR. +The JAR can be configured via `org-plantuml-jar-path'. + +`plantuml' means to use the PlantUML executable. +The executable can be configured via `org-plantuml-executable-path'. +You can also configure extra arguments via `org-plantuml-executable-args'." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'symbol + :options '(jar plantuml)) + +(defcustom org-plantuml-executable-path "plantuml" + "File name of the PlantUML executable." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'string) + +(defcustom org-plantuml-executable-args (list "-headless") + "The arguments passed to plantuml executable when executing PlantUML." + :group 'org-babel + :package-version '(Org . "9.4") + :type '(repeat string)) + (defun org-babel-variable-assignments:plantuml (params) "Return a list of PlantUML statements assigning the block's variables. PARAMS is a property list of source block parameters, which may @@ -83,40 +108,41 @@ This function is called by `org-babel-execute-src-block'." (cmdline (cdr (assq :cmdline params))) (in-file (org-babel-temp-file "plantuml-")) (java (or (cdr (assq :java params)) "")) + (executable (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-path) + (t "java"))) + (executable-args (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-args) +((string= "" org-plantuml-jar-path) + (error "`org-plantuml-jar-path' is not set")) +((not (file-exists-p org-plantuml-jar-path)) + (error "Could not find plantuml.jar at %s" org-plantuml-jar-path)) +(t (list java + "-jar" + (shell-quote-argument (expand-file-name org-plantuml-jar-path)) (full-body (org-babel-plantuml-make-body body 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) "png") - " -tpng" "") - (if (string= (file-name-extension out-file) "svg") - " -tsvg" "") - (if (string= (file-name-extension out-file) "eps") - "
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Hi Terje, Terje Larsen writes: > You are welcome, I have never gotten around to sign the FSF papers as > I thought it was a > bit of a hassle, but with those clear instructions I have now started > the process. Thanks! > I guess I have to wait until the process is done until I can > resubmit? Yes, exactly. Thanks for contributing, -- Bastien
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Thank you Bastien, You are welcome, I have never gotten around to sign the FSF papers as I thought it was a bit of a hassle, but with those clear instructions I have now started the process. I guess I have to wait until the process is done until I can resubmit? On Wed, Feb 12, 2020 at 6:31 PM Bastien wrote: > > Hi Terje, > > Terje Larsen writes: > > > I have been missing this feature for a while and noticed it had already > > been requested before (2014), See: > > https://lists.gnu.org/archive/html/emacs-orgmode/2016-08/msg00105.html > > > > With this patch you can switch between using jar or plantuml. The idea > > partly stemmed from plantuml-mode and my inability to use the default > > implementation. You can see the implementation for plantuml-mode here: > > https://github.com/skuro/plantuml-mode/pull/102/files > > > > My patch is available here: > > https://code.orgmode.org/terlar/org-mode/commit/fbe245c0b09513ee5a6d3b189e112708b9d08da0 > > Thanks for the patch -- I see you're already on the list of committers > with TINYCHANGE: https://orgmode.org/worg/org-contribute.html#orgcd077ac > > Would you like to sign the FSF papers and resubmit your patch on top > of current master? > > https://orgmode.org/request-assign-future.txt > > Thanks a lot, > > -- > Bastien -- // Terje Larsen
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Hi Terje, Terje Larsen writes: > I have been missing this feature for a while and noticed it had already > been requested before (2014), See: > https://lists.gnu.org/archive/html/emacs-orgmode/2016-08/msg00105.html > > With this patch you can switch between using jar or plantuml. The idea > partly stemmed from plantuml-mode and my inability to use the default > implementation. You can see the implementation for plantuml-mode here: > https://github.com/skuro/plantuml-mode/pull/102/files > > My patch is available here: > https://code.orgmode.org/terlar/org-mode/commit/fbe245c0b09513ee5a6d3b189e112708b9d08da0 Thanks for the patch -- I see you're already on the list of committers with TINYCHANGE: https://orgmode.org/worg/org-contribute.html#orgcd077ac Would you like to sign the FSF papers and resubmit your patch on top of current master? https://orgmode.org/request-assign-future.txt Thanks a lot, -- Bastien
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Nicolas Goaziou writes: Hello and thank you for the feedback, made me learn a few things and make some improvements. I have made the suggested changes (see attachment). >From e3c46993714234c0290f3100683cbec3c0d5f056 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Fri, 8 Nov 2019 10:25:49 +0100 Subject: [PATCH] ob-plantuml: Add support for plantuml executable * lisp/ob-plantuml (org-babel-variable-assignments:plantuml): Support using plantuml executable instead of jar. Some systems come with an executable for plantuml instead of a specific JAR file. This adds support for two different modes: - jar :: using java together with a JAR (previous behavior) - plantuml :: using a PlantUML executable The PlantUML executable can be configured via `org-plantuml-executable-path` and also the arguments that will be given via `org-plantuml-executable-args`. --- etc/ORG-NEWS| 5 +++ lisp/ob-plantuml.el | 94 + 2 files changed, 65 insertions(+), 34 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 689a07871..2cce7dd41 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -19,6 +19,11 @@ just as if it was at outline level 0. Inheritance for properties will work also for this level. In other words; defining things in a property drawer before the first headline will make them "inheritable" for all headlines. +*** Babel + ob-plantuml now supports using PlantUML executable to generate diagrams +Set =org-plantuml-exec-mode= to ='plantuml= in order to use the +executable instead of JAR. Executable mode can be configured via: +=org-plantuml-executable-path= and =org-plantuml-executable-args=. * Version 9.3 diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index 09c9a3334..aeea1802f 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -31,7 +31,7 @@ ;;; Requirements: ;; plantuml | http://plantuml.sourceforge.net/ -;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file +;; plantuml.jar | `org-plantuml-jar-path' should point to the jar file (when exec mode is `jar') ;;; Code: (require 'ob) @@ -46,6 +46,31 @@ :version "24.1" :type 'string) +(defcustom org-plantuml-exec-mode 'jar + "Method to use for PlantUML diagram generation. +`jar' means to use java together with the JAR. +The JAR can be configured via `org-plantuml-jar-path'. + +`plantuml' means to use the PlantUML executable. +The executable can be configured via `org-plantuml-executable-path'. +You can also configure extra arguments via `org-plantuml-executable-args'." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'symbol + :options '(jar plantuml)) + +(defcustom org-plantuml-executable-path "plantuml" + "File name of the PlantUML executable." + :group 'org-babel + :package-version '(Org . "9.4") + :type 'string) + +(defcustom org-plantuml-executable-args (list "-headless") + "The arguments passed to plantuml executable when executing PlantUML." + :group 'org-babel + :package-version '(Org . "9.4") + :type '(repeat string)) + (defun org-babel-variable-assignments:plantuml (params) "Return a list of PlantUML statements assigning the block's variables. PARAMS is a property list of source block parameters, which may @@ -82,40 +107,41 @@ This function is called by `org-babel-execute-src-block'." (cmdline (cdr (assq :cmdline params))) (in-file (org-babel-temp-file "plantuml-")) (java (or (cdr (assq :java params)) "")) + (executable (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-path) + (t "java"))) + (executable-args (cond ((eq org-plantuml-exec-mode 'plantuml) org-plantuml-executable-args) +((string= "" org-plantuml-jar-path) + (error "`org-plantuml-jar-path' is not set")) +((not (file-exists-p org-plantuml-jar-path)) + (error "Could not find plantuml.jar at %s" org-plantuml-jar-path)) +(t (list java + "-jar" + (shell-quote-argument (expand-file-name org-plantuml-jar-path)) (full-body (org-babel-plantuml-make-body body 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) "png") - " -tpng" "") - (if (string= (file-name-extension out-file) "svg") - " -tsvg" "") - (if (string= (file-name-extension out-file) "eps") - " -teps" "") - (if (string= (file-name-extension out-file) "pdf") - " -tpdf" "") - (if (string= (file-name-extension out-file) "tex") - " -tlatex" "") - (if (string= (file-name-extension out-file) "vdx") - " -tvdx" "") - (if (string= (file-name-extension out-file) "xmi") - " -txmi" "") - (if (string= (file-name-extension out-file) "scxml") - " -tscxml" "") - (if (string= (file-name-extension out-file) "html") - " -thtml" "") - (if (string= (file-name-extension
Re: [PATCH] ob-plantuml: Support for plantuml as well as the current java+jar solution
Hello,
Terje Larsen writes:
> And also see attached within this mail.
Thank you.
Could you rebase it on top of "next" branch and add an entry in
ORG-NEWS, section "Org 9.4" about it?
> +(defcustom org-plantuml-exec-mode 'jar
> + "Method to use for PlantUML diagram generation.
> +`jar' means to use java together with the JAR.
> +The JAR can be configured via `org-plantuml-jar-path'.
> +
> +`plantuml' means to use the PlantUML executable.
> +The executable can be configured via `org-plantuml-executable-path'.
> +You can also configure extra arguments via `org-plantuml-executable-args'."
> + :group 'org-babel
> + :version "24.1"
Please use
:package-version '(Org . "9.4")
instead.
> +(defcustom org-plantuml-executable-path "plantuml"
> + "Path to the PlantUML executable."
File name of the PlantUML executable.
> +(defcustom org-plantuml-executable-args (list "-headless")
> + "The arguments passed to plantuml executable when executing PlantUML."
> + :group 'org-babel
> + :version "24.1"
See above.
> + (executable-args (cond ((eq org-plantuml-exec-mode 'plantuml)
> org-plantuml-executable-args)
> + (t (cond ((string= "" org-plantuml-jar-path)
> + (error "`org-plantuml-jar-path' is
> not set"))
> + ((not (file-exists-p
> org-plantuml-jar-path))
> + (error "Could not find plantuml.jar
> at %s" org-plantuml-jar-path))
> + (t (list java
> + "-jar"
> + (shell-quote-argument
> +(expand-file-name
> org-plantuml-jar-path
Could you merge the two `cond' in `executable-args'?
> + (cmd (string-join
> +(append
> + (list executable)
> + executable-args
> + (cond ((string= (file-name-extension out-file) "png")
> '("-tpng"))
> + ((string= (file-name-extension out-file) "svg")
> '("-tsvg"))
> + ((string= (file-name-extension out-file) "eps")
> '("-teps"))
> + ((string= (file-name-extension out-file) "pdf")
> '("-tpdf"))
> + ((string= (file-name-extension out-file) "tex")
> '("-tlatex"))
> + ((string= (file-name-extension out-file) "vdx")
> '("-tvdx"))
> + ((string= (file-name-extension out-file) "xmi")
> '("-txmi"))
> + ((string= (file-name-extension out-file) "scxml")
> '("-tscxml"))
> + ((string= (file-name-extension out-file) "html")
> '("-thtml"))
> + ((string= (file-name-extension out-file) "txt")
> '("-ttxt"))
> + ((string= (file-name-extension out-file) "utxt")
> '("-utxt")))
Could you use
(pcase (file-name-extension out-file)
("png" ...)
...)
instead?
Regards,
--
Nicolas Goaziou
