diff --git a/lisp/ob-maxima.el b/lisp/ob-maxima.el index 9c39a5fb0..f14cf550a 100644 --- a/lisp/ob-maxima.el +++ b/lisp/ob-maxima.el @@ -47,9 +47,9 @@ (list ;; graphic output (let ((graphic-file (org-babel-maxima-graphical-output-file params))) - (if graphic-file - (format - "set_plot_option ([gnuplot_term, png]); set_plot_option ([gnuplot_out_file, %S]);" + (if graphic-file + (format + "set_plot_option ([gnuplot_term, png]); set_plot_option ([gnuplot_out_file, %S]);" graphic-file) "")) ;; variables @@ -81,8 +81,8 @@ called by `org-babel-execute-src-block'." (= 0 (length line))) line)) (split-string raw "[\r\n]"))) "\n")) - (org-babel-eval cmd ""))))) - (if (org-babel-maxima-graphical-output-file params) + (org-babel-eval cmd ""))))) + (if (org-babel-maxima-graphical-output-file params) nil (if (or (member "scalar" result-params) (member "verbatim" result-params) @@ -105,7 +105,7 @@ of the same value." (setq val (symbol-name val)) (when (= (length val) 1) (setq val (string-to-char val)))) - (format "%S: %s$" var + (format "%S: %s$" var (org-babel-maxima-elisp-to-maxima val)))) (defun org-babel-maxima-graphical-output-file (params) diff --git a/testing/examples/ob-maxima-test.org b/testing/examples/ob-maxima-test.org index ad5fc8022..244f018eb 100644 --- a/testing/examples/ob-maxima-test.org +++ b/testing/examples/ob-maxima-test.org @@ -61,7 +61,7 @@ print(s+1.0); #+end_src Matrix -#+tblname: test_tbl_mtr +#+tblname: test_tbl_mtr | 1.0 | 1.0 | #+begin_src maxima :var s=test_tbl_mtr :results silent :results verbatim @@ -88,4 +88,3 @@ tex(ratsimp(diff(%e^(a*x), x))); #+BEGIN_LaTeX $$a\,e^{a\,x}$$ #+END_LaTeX - diff --git a/testing/lisp/test-ob-maxima.el b/testing/lisp/test-ob-maxima.el index dff4033da..a63908c27 100644 --- a/testing/lisp/test-ob-maxima.el +++ b/testing/lisp/test-ob-maxima.el @@ -79,4 +79,3 @@ (provide 'test-ob-maxima) ;;; test-ob-maxima.el ends here -