From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarmo Hurri Subject: [PATCH, take 2] Processing language support in Babel Date: Tue, 14 Apr 2015 16:53:41 +0300 Message-ID: <87egnm95p6.fsf@iki.fi> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi1I1-00011i-As for emacs-orgmode@gnu.org; Tue, 14 Apr 2015 09:54:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yi1Hx-0005JG-RO for emacs-orgmode@gnu.org; Tue, 14 Apr 2015 09:54:09 -0400 Received: from plane.gmane.org ([80.91.229.3]:60478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi1Hx-0005J6-GM for emacs-orgmode@gnu.org; Tue, 14 Apr 2015 09:54:05 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Yi1Hv-0004Rm-Sx for emacs-orgmode@gnu.org; Tue, 14 Apr 2015 15:54:03 +0200 Received: from 89-27-26-138.bb.dnainternet.fi ([89.27.26.138]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 14 Apr 2015 15:54:03 +0200 Received: from jarmo.hurri by 89-27-26-138.bb.dnainternet.fi with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 14 Apr 2015 15:54:03 +0200 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Greetings. Please find two files attached to this message. 1. A patch implementing Processing programming language support in Babel. The commit message of the patch is the following: ******************************************************************** ob-processing.el: Support for Processing language in Babel * lisp/ob-processing.el: Necessary functions for implementing editing of Processing code blocks, viewing the resulting sketches in an external viewer, and HTML export of the sketches. Editing Processing blocks requires processing2-emacs mode. Viewing Processing blocks embedded in Org buffer in an external viewer also requires processing2-emacs. This viewing is bound to C-c C-v C-k and produces no results in Org buffer. HTML export of the results of a Processing block is also supported, assuming that the processing.js module is available: the sketch is then drawn by the browser when the HTML page is viewed. This drawing is implemented by embedding the Processing code in a script using the processing.js module. The user is responsible for making sure that processing.js is available in the correct location. Console output from a Processing block produced e.g. by println() is shown in the Processing compilation window when the code is executed in Org buffer, and in text area (console) of the browser when the code is embedded in HTML. ******************************************************************** 2. File test.org, illustrating the use of Processing in Org. The HTML export of this file can be viewed at http://www.syk.fi/~jhurri/org-processing/test.html The sketches (figures) on the page will be re-initialised on page reload. I will be writing teaching material using a combination of Org and Processing, and may add features to Processing support if I find the need. All the best, Jarmo --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-ob-processing.el-Support-for-Processing-language-in-.patch Content-Description: patch >From c19d5fbca0c7d2faed26fb991430da15114a3dda Mon Sep 17 00:00:00 2001 From: Jarmo Hurri Date: Tue, 14 Apr 2015 16:51:15 +0300 Subject: [PATCH] ob-processing.el: Support for Processing language in Babel * lisp/ob-processing.el: Necessary functions for implementing editing of Processing code blocks, viewing the resulting sketches in an external viewer, and HTML export of the sketches. Editing Processing blocks requires processing2-emacs mode. Viewing Processing blocks embedded in Org buffer in an external viewer also requires processing2-emacs. This viewing is bound to C-c C-v C-k and produces no results in Org buffer. HTML export of the results of a Processing block is also supported, assuming that the processing.js module is available: the sketch is then drawn by the browser when the HTML page is viewed. This drawing is implemented by embedding the Processing code in a script using the processing.js module. The user is responsible for making sure that processing.js is available in the correct location. Console output from a Processing block produced e.g. by println() is shown in the Processing compilation window when the code is executed in Org buffer, and in text area (console) of the browser when the code is embedded in HTML. --- lisp/ob-processing.el | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 lisp/ob-processing.el diff --git a/lisp/ob-processing.el b/lisp/ob-processing.el new file mode 100644 index 0000000..1971343 --- /dev/null +++ b/lisp/ob-processing.el @@ -0,0 +1,206 @@ +;;; ob-processing.el --- org-babel functions for evaluation of processing + +;; Copyright (C) 2009-2015 Free Software Foundation, Inc. + +;; Author: Jarmo Hurri (adapted from ob-asymptote.el written by 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 . + +;;; Commentary: + +;; Org-Babel support for evaluating processing source code. +;; +;; This differs from most standard languages in that +;; +;; 1) there is no such thing as a "session" in processing +;; +;; 2) results can only be exported as html; in this case, the +;; processing code is embedded via a file into a javascript block +;; using the processing.js module; the script then draws the +;; resulting output when the web page is viewed in a browser; note +;; that the user is responsible for making sure that processing.js +;; is available on the website +;; +;; 3) C-c C-v C-k is bound to interactive viewing of the sketch of the +;; Processing code block via Processing 2.0 Emacs mode + +;;; Requirements: + +;; - processing2-emacs mode :: https://github.com/ptrv/processing2-emacs +;; - Processing.js module :: http://processingjs.org/ + +;;; Code: +(require 'ob) +(require 'ox) +(require 'sha1) + +(eval-when-compile (require 'cl)) + +;; declaration needed because requiring ob does not define the variable +(defvar org-babel-temporary-directory) + +(defvar org-babel-tangle-lang-exts) +(add-to-list 'org-babel-tangle-lang-exts '("processing" . "pde")) + +;; default header tags depend on whether exporting html or not; if not +;; exporting html, then no results are produced; otherwise results are +;; html +(defvar org-babel-default-header-args:processing + '((:results . "html") (:exports . "results")) + "Default arguments when evaluating a Processing source block.") + +(defvar org-babel-processing-processing-js-filename + "processing.js" + "Filename of the processing.js file.") + +;; declaration of needed function from processing mode in case +;; processing-mode is not available +(if (null (require 'processing-mode nil :noerror)) + (declare-function processing-sketch-run "processing-mode.el" nil)) + +(defun org-babel-processing-view-sketch () + "Show the sketch of the Processing block under point in an external viewer." + (interactive) + (let ((info (org-babel-get-src-block-info))) + (if (string= (nth 0 info) "processing") + (let* ((body (nth 1 info)) + (params (org-babel-process-params (nth 2 info))) + (sketch-code + (org-babel-expand-body:generic + body + params + (org-babel-variable-assignments:processing params)))) + ;; note: sketch filename can not contain a hyphen, since it + ;; has to be a valid java class name; for this reason + ;; make-temp-file is repeated until no hyphen is in the + ;; name; also sketch dir name must be the same as the + ;; basename of the sketch file + (let* ((temporary-file-directory org-babel-temporary-directory) + (sketch-dir + (let (sketch-dir-candidate) + (while + (progn + (setq sketch-dir-candidate + (make-temp-file "processing" t)) + (if (string-match + "-" + (file-name-nondirectory sketch-dir-candidate)) + (progn + (delete-directory sketch-dir-candidate) + t) + nil))) + sketch-dir-candidate)) + (sketch-filename + (concat sketch-dir + "/" + (file-name-nondirectory sketch-dir) + ".pde"))) + (with-temp-file sketch-filename (insert sketch-code)) + (find-file sketch-filename) + (processing-sketch-run) + (kill-buffer))) + (message "Not inside a Processing source block.")))) + +(define-key org-babel-map "\C-k" 'org-babel-processing-view-sketch) + +(defun org-babel-execute:processing (body params) + "Execute a block of Processing code. +This function is called by `org-babel-execute-src-block'." + (let ((sketch-code + (org-babel-expand-body:generic + body + params + (org-babel-variable-assignments:processing params)))) + ;; results are html + (let ((sketch-canvas-id + (concat "ob-" (sha1 sketch-code)))) + (concat "\n ")))) + +(defun org-babel-prep-session:processing (session params) + "Return an error if the :session header argument is set. +Processing does not support sessions" + (error "Processing does not support sessions")) + +(defun org-babel-variable-assignments:processing (params) + "Return list of processing statements assigning the block's variables." + (mapcar #'org-babel-processing-var-to-processing + (mapcar #'cdr (org-babel-get-header params :var)))) + +(defun org-babel-processing-var-to-processing (pair) + "Convert an elisp value into a Processing variable. +The elisp value PAIR is converted into Processing code specifying +a variable of the same value." + (let ((var (car pair)) + (val (let ((v (cdr pair))) + (if (symbolp v) (symbol-name v) v)))) + (cond + ((integerp val) + (format "int %S=%S;" var val)) + ((floatp val) + (format "float %S=%S;" var val)) + ((stringp val) + (format "String %S=\"%s\";" var val)) + ((and (listp val) (not (listp (car val)))) + (let* ((type (org-babel-processing-define-type val)) + (fmt (if (eq 'String type) "\"%s\"" "%s")) + (vect (mapconcat (lambda (e) (format fmt e)) val ", "))) + (format "%s[] %S={%s};" type var vect))) + ((listp val) + (let* ((type (org-babel-processing-define-type val)) + (fmt (if (eq 'String type) "\"%s\"" "%s")) + (array (mapconcat (lambda (row) + (concat "{" + (mapconcat (lambda (e) (format fmt e)) + row ", ") + "}")) + val ","))) + (format "%S[][] %S={%s};" type var array)))))) + +(defun org-babel-processing-define-type (data) + "Determine type of DATA. + +DATA is a list. Return type as a symbol. + +The type is `String' if any element in DATA is +a string. Otherwise, it is either `float', if some elements are +floats, or `int'." + (let* ((type 'int) + find-type ; for byte-compiler + (find-type + (function + (lambda (row) + (catch 'exit + (mapc (lambda (el) + (cond ((listp el) (funcall find-type el)) + ((stringp el) (throw 'exit (setq type 'String))) + ((floatp el) (setq type 'float)))) + row)))))) + (funcall find-type data) type)) + +(provide 'ob-processing) + +;;; ob-processing.el ends here -- 1.9.3 --=-=-= Content-Type: application/vnd.lotus-organizer Content-Disposition: attachment; filename=test.org Content-Transfer-Encoding: base64 Content-Description: test file KiBkeW5hbWljCgogICMrQkVHSU5fU1JDIHByb2Nlc3NpbmcgOmV4cG9ydHMgYm90aAogICAgZmlu YWwgaW50IFcgPSA4MDA7CiAgICBmaW5hbCBpbnQgSCA9IDYwMDsKICAgIGZpbmFsIGludCBTVU5f RCA9IDMwMDsKICAgIGZpbmFsIGludCBNT09OX0QgPSBTVU5fRCAtIDEwOwogICAgZmluYWwgaW50 IE1JRFBPSU5UX1ggPSBXIC8gMjsKICAgIGZpbmFsIGludCBNSURQT0lOVF9ZID0gSCAvIDI7Cgog ICAgZmxvYXQgbW9vblggPSBNSURQT0lOVF9YICsgTU9PTl9EOwoKICAgIHZvaWQgc2V0dXAgKCkK ICAgIHsKICAgICAgc2l6ZSAoVywgSCk7CiAgICAgIG5vU3Ryb2tlICgpOwogICAgfQoKICAgIHZv aWQgZHJhdyAoKQogICAgewogICAgICBiYWNrZ3JvdW5kICgwKTsKICAgICAgZmlsbCAoY29sb3Ig KDI1NSwgMjU1LCAwKSk7CiAgICAgIGVsbGlwc2UgKE1JRFBPSU5UX1gsIE1JRFBPSU5UX1ksIFNV Tl9ELCBTVU5fRCk7CgogICAgICBpZiAobW9vblggKyBNT09OX0QgLyAyID49IDApCiAgICAgIHsK ICAgICAgICBmaWxsIChjb2xvciAoMCkpOwogICAgICAgIGVsbGlwc2UgKG1vb25YLCBNSURQT0lO VF9ZLCBNT09OX0QsIE1PT05fRCk7CiAgICAgICAgbW9vblggLT0gMC40OwogICAgICB9CiAgICB9 CiAgIytFTkRfU1JDCiogc3RhdGljCiAgIytCRUdJTl9TUkMgcHJvY2Vzc2luZyA6ZXhwb3J0cyBi b3RoCiAgICBmaW5hbCBpbnQgVyA9IDEwMjQsIEggPSA3Njg7CiAgICBmaW5hbCBpbnQgQ09MT1Jf TUFYID0gMjU1OwogICAgc2l6ZSAoVywgSCk7CiAgICBiYWNrZ3JvdW5kIChDT0xPUl9NQVgpOwog ICAgY29sb3JNb2RlIChIU0IsIENPTE9SX01BWCwgQ09MT1JfTUFYLCBDT0xPUl9NQVgpOyAKICAg IG5vU3Ryb2tlICgpOwoKICAgIGZvciAoaW50IGkgPSAwOyBpIDwgMzA7IGkrKykKICAgICB7CiAg ICAgICBmaWxsIChjb2xvciAocmFuZG9tIChDT0xPUl9NQVgpLCBDT0xPUl9NQVgsIENPTE9SX01B WCwgMC4zICogQ09MT1JfTUFYKSk7CiAgIAogICAgICAgZmxvYXQgeCA9IHJhbmRvbSAoVyAtIDEp OwogICAgICAgZmxvYXQgeSA9IHJhbmRvbSAoSCAtIDEpOwogICAKICAgICAgIGZsb2F0IHIgPSBy YW5kb20gKG1pbiAobWluICh4LCBXIC0gMSAtIHgpLCBtaW4gKHksIEggLSAxIC0geSkpKTsgCiAg IAogICAgICAgaWYgKHIgPiAwKQogICAgICAgewogICAgICAgICBmbG9hdCBkID0gMiAqIHI7CiAg ICAgICAgIGVsbGlwc2UgKHgsIHksIGQsIGQpOwogICAgICAgfQogICAgIH0KCiAgIytFTkRfU1JD CgoqIHBhc3NpbmcgdmFyaWFibGVzIGFuZCBjb25zb2xlIG91dHB1dAoKICAjK0JFR0lOX1NSQyBw cm9jZXNzaW5nIDp2YXIgdGV4dFN6PTMyIDp2YXIgdGl0bGU9Ik9yZyBydWxlcyEiIDp2YXIgZmFj dG9yPTAuMyA6ZXhwb3J0cyBib3RoCiAgICBzaXplICg0MDAsIDMwMCk7CiAgICB0ZXh0U2l6ZSAo dGV4dFN6KTsKICAgIHRleHQgKHRpdGxlLCBmYWN0b3IgKiB3aWR0aCwgMTAwKTsKICAgIHByaW50 bG4gKCJjb25zb2xlIG91dHB1dCB0ZXh0Iik7CiAgIytFTkRfU1JDCg== --=-=-=--