From 9cc60dee48851756dd95af46b37b7adc172952e2 Mon Sep 17 00:00:00 2001 From: Joseph Turner Date: Fri, 5 Aug 2022 13:18:13 -0700 Subject: [PATCH] lisp/ob-plantuml.el: Insert results in buffer When :results header arg is set to a value that doesn't include "file", insert txt output in buffer below src block. TINYCHANGE --- etc/ORG-NEWS | 7 +++++++ lisp/ob-plantuml.el | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 700dd4a26..947bf4375 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -343,6 +343,13 @@ files that are exported to Texinfo. =org-at-heading-p= now returns t by default on headings inside folds. Passing optional argument will produce the old behaviour. + +*** =org-babel-execute:plantuml= can output ASCII graphs in the buffer + +Previously, executing PlantUML src blocks always exported to a file. Now, if +:results is set to a value which does not include "file", no file will be +exported and an ASCII graph will be inserted below the src block. + ** Removed or renamed functions and variables *** =org-plantump-executable-args= is renamed and applies to jar as well diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el index ebbcdf166..a339d8485 100644 --- a/lisp/ob-plantuml.el +++ b/lisp/ob-plantuml.el @@ -109,8 +109,11 @@ If BODY does not contain @startXXX ... @endXXX clauses, @startuml (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* ((out-file (or (cdr (assq :file params)) - (error "PlantUML requires a \":file\" header argument"))) + (let* ((do-export (member "file" (cdr (assq :result-params params)))) + (out-file (if do-export + (or (cdr (assq :file params)) + (error "No :file provided but :results set to file. For plain text output, set :results to verbatim")) + (org-babel-temp-file "plantuml-" ".txt"))) (cmdline (cdr (assq :cmdline params))) (in-file (org-babel-temp-file "plantuml-")) (java (or (cdr (assq :java params)) "")) @@ -155,7 +158,10 @@ This function is called by `org-babel-execute-src-block'." (if (and (string= (file-name-extension out-file) "svg") org-babel-plantuml-svg-text-to-path) (org-babel-eval (format "inkscape %s -T -l %s" out-file out-file) "")) - nil)) ;; signal that output has already been written to file + (unless do-export (with-temp-buffer + (insert-file-contents out-file) + (buffer-substring-no-properties + (point-min) (point-max)))))) (defun org-babel-prep-session:plantuml (_session _params) "Return an error because plantuml does not support sessions."