mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 05:07:48 +00:00
7c710f6f57
* lisp/ob-J.el (org-babel-J-command): * lisp/ob-core.el (org-babel-hash-show-time): * lisp/ob-exp.el (org-babel-exp-inline-code-template): * lisp/ob-lisp.el (org-babel-lisp-eval-fn): * lisp/org-agenda.el (org-agenda-view-columns-initially): * lisp/org-attach.el (org-attach-commit): (org-attach-archive-delete): (org-attach-annex-auto-get): * lisp/org-bibtex.el (org-bibtex-inherit-tags): * lisp/org-clock.el (org-clock-into-drawer): * lisp/org-colview.el (org-columns-summary-types): * lisp/org-faces.el (org-block): * lisp/org-src.el (org-src-block-faces): * lisp/org-table.el (org-table-copy-increment): (org-table-formula-create-columns): (org-table-convert-region-max-lines): * lisp/org-timer.el (org-timer-default-timer): * lisp/org.el (org-export-backends): (org-show-context-detail): (org-cycle-hook): (org-occur-case-fold-search): (org-preview-latex-default-process): (org-preview-latex-process-alist): (org-preview-latex-image-directory): (org-latex-default-packages-alist): (org-sparse-tree-default-date-type): (org-structure-template-alist): (org-effort-durations): (org-agenda-ignore-properties): Change :version from "25.2" to "26.1". (customize-package-emacs-version-alist): Fix associations between Org and Emacs releases. * lisp/ox-ascii.el (org-ascii-list-margin): * lisp/ox-beamer.el (org-beamer-subtitle-format): * lisp/ox-html.el (org-html-format-headline-function): (org-html-format-inlinetask-function): (org-html-viewport): * lisp/ox-latex.el (org-latex-caption-above): (org-latex-prefer-user-labels): (org-latex-subtitle-format): (org-latex-hyperref-template): (org-latex-footnote-defined-format): (org-latex-images-centered): (org-latex-default-figure-position): (org-latex-text-markup-alist): (org-latex-format-inlinetask-function): (org-latex-custom-lang-environments): (org-latex-compiler-file-string): (org-latex-compiler): (org-latex-bib-compiler): (org-latex-logfiles-extensions): (org-latex-known-warnings): * lisp/ox-md.el (org-md-footnotes-section): (org-md-footnote-format): * lisp/ox-odt.el (org-odt-format-headline-function): (org-odt-format-inlinetask-function): (org-odt-inline-image-rules): * lisp/ox-texinfo.el (org-texinfo-format-headline-function): * lisp/ox.el (org-export-with-creator): (org-export-with-title): (org-export-with-broken-links): (org-export-copy-to-kill-ring): Change :version from "25.2" to "26.1". It looks like the goal is to sync Org 9.0.* (maint) with the Emacs master branch (what will be version 26.1): https://lists.gnu.org/archive/html/emacs-orgmode/2017-01/msg00558.html
187 lines
5.9 KiB
EmacsLisp
187 lines
5.9 KiB
EmacsLisp
;;; ob-J.el --- Babel Functions for J -*- lexical-binding: t; -*-
|
||
|
||
;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
|
||
|
||
;; Author: Oleh Krehel
|
||
;; 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 J code.
|
||
;;
|
||
;; Session interaction depends on `j-console' from package `j-mode'
|
||
;; (available in MELPA).
|
||
|
||
;;; Code:
|
||
|
||
(require 'ob)
|
||
|
||
(declare-function org-trim "org" (s &optional keep-lead))
|
||
(declare-function j-console-ensure-session "ext:j-console" ())
|
||
|
||
(defcustom org-babel-J-command "jconsole"
|
||
"Command to call J."
|
||
:group 'org-babel
|
||
:version "26.1"
|
||
:package-version '(Org . "9.0")
|
||
:type 'string)
|
||
|
||
(defun org-babel-expand-body:J (body _params &optional _processed-params)
|
||
"Expand BODY according to PARAMS, return the expanded body.
|
||
PROCESSED-PARAMS isn't used yet."
|
||
(org-babel-J-interleave-echos-except-functions body))
|
||
|
||
(defun org-babel-J-interleave-echos (body)
|
||
"Interleave echo',' between each source line of BODY."
|
||
(mapconcat #'identity (split-string body "\n") "\necho','\n"))
|
||
|
||
(defun org-babel-J-interleave-echos-except-functions (body)
|
||
"Interleave echo',' between source lines of BODY that aren't functions."
|
||
(if (obj-string-match-m "\\(?:^\\|\n\\)[^\n]*\\(?:0\\|1\\|2\\|3\\|4\\|dyad\\) : 0\n.*\n)\\(?:\n\\|$\\)" body)
|
||
(let ((s1 (substring body 0 (match-beginning 0)))
|
||
(s2 (match-string 0 body))
|
||
(s3 (substring body (match-end 0))))
|
||
(concat
|
||
(if (string= s1 "")
|
||
""
|
||
(concat (org-babel-J-interleave-echos s1)
|
||
"\necho','\n"))
|
||
s2
|
||
"\necho','\n"
|
||
(org-babel-J-interleave-echos-except-functions s3)))
|
||
(org-babel-J-interleave-echos body)))
|
||
|
||
(defalias 'org-babel-execute:j 'org-babel-execute:J)
|
||
|
||
(defun org-babel-execute:J (body params)
|
||
"Execute a block of J code BODY.
|
||
PARAMS are given by org-babel.
|
||
This function is called by `org-babel-execute-src-block'"
|
||
(message "executing J source code block")
|
||
(let* ((processed-params (org-babel-process-params params))
|
||
(sessionp (cdr (assq :session params)))
|
||
(full-body (org-babel-expand-body:J
|
||
body params processed-params))
|
||
(tmp-script-file (org-babel-temp-file "J-src")))
|
||
(org-babel-j-initiate-session sessionp)
|
||
(org-babel-J-strip-whitespace
|
||
(if (string= sessionp "none")
|
||
(progn
|
||
(with-temp-file tmp-script-file
|
||
(insert full-body))
|
||
(org-babel-eval (format "%s < %s" org-babel-J-command tmp-script-file) ""))
|
||
(org-babel-J-eval-string full-body)))))
|
||
|
||
(defun org-babel-J-eval-string (str)
|
||
"Sends STR to the `j-console-cmd' session and exectues it."
|
||
(let ((session (j-console-ensure-session)))
|
||
(with-current-buffer (process-buffer session)
|
||
(goto-char (point-max))
|
||
(insert (format "\n%s\n" str))
|
||
(let ((beg (point)))
|
||
(comint-send-input)
|
||
(sit-for .1)
|
||
(buffer-substring-no-properties
|
||
beg (point-max))))))
|
||
|
||
(defun org-babel-J-strip-whitespace (str)
|
||
"Remove whitespace from jconsole output STR."
|
||
(mapconcat
|
||
#'identity
|
||
(delete "" (mapcar
|
||
#'org-babel-J-print-block
|
||
(split-string str "^ *,\n" t)))
|
||
"\n\n"))
|
||
|
||
(defun obj-get-string-alignment (str)
|
||
"Return a number to describe STR alignment.
|
||
STR represents a table.
|
||
Positive/negative/zero result means right/left/undetermined.
|
||
Don't trust first line."
|
||
(let* ((str (org-trim str))
|
||
(lines (split-string str "\n" t))
|
||
n1 n2)
|
||
(cond ((<= (length lines) 1)
|
||
0)
|
||
((= (length lines) 2)
|
||
;; numbers are right-aligned
|
||
(if (and
|
||
(numberp (read (car lines)))
|
||
(numberp (read (cadr lines)))
|
||
(setq n1 (obj-match-second-space-right (nth 0 lines)))
|
||
(setq n2 (obj-match-second-space-right (nth 1 lines))))
|
||
n2
|
||
0))
|
||
((not (obj-match-second-space-left (nth 0 lines)))
|
||
0)
|
||
((and
|
||
(setq n1 (obj-match-second-space-left (nth 1 lines)))
|
||
(setq n2 (obj-match-second-space-left (nth 2 lines)))
|
||
(= n1 n2))
|
||
n1)
|
||
((and
|
||
(setq n1 (obj-match-second-space-right (nth 1 lines)))
|
||
(setq n2 (obj-match-second-space-right (nth 2 lines)))
|
||
(= n1 n2))
|
||
(- n1))
|
||
(t 0))))
|
||
|
||
(defun org-babel-J-print-block (x)
|
||
"Prettify jconsole output X."
|
||
(let* ((x (org-trim x))
|
||
(a (obj-get-string-alignment x))
|
||
(lines (split-string x "\n" t))
|
||
b)
|
||
(cond ((< a 0)
|
||
(setq b (obj-match-second-space-right (nth 0 lines)))
|
||
(concat (make-string (+ a b) ? ) x))
|
||
((> a 0)
|
||
(setq b (obj-match-second-space-left (nth 0 lines)))
|
||
(concat (make-string (- a b) ? ) x))
|
||
(t x))))
|
||
|
||
(defun obj-match-second-space-left (s)
|
||
"Return position of leftmost space in second space block of S or nil."
|
||
(and (string-match "^ *[^ ]+\\( \\)" s)
|
||
(match-beginning 1)))
|
||
|
||
(defun obj-match-second-space-right (s)
|
||
"Return position of rightmost space in second space block of S or nil."
|
||
(and (string-match "^ *[^ ]+ *\\( \\)[^ ]" s)
|
||
(match-beginning 1)))
|
||
|
||
(defun obj-string-match-m (regexp string &optional start)
|
||
"Call (string-match REGEXP STRING START).
|
||
REGEXP is modified so that .* matches newlines as well."
|
||
(string-match
|
||
(replace-regexp-in-string "\\.\\*" "[\0-\377[:nonascii:]]*" regexp)
|
||
string
|
||
start))
|
||
|
||
(defun org-babel-j-initiate-session (&optional session)
|
||
"Initiate a J session.
|
||
SESSION is a parameter given by org-babel."
|
||
(unless (string= session "none")
|
||
(require 'j-console)
|
||
(j-console-ensure-session)))
|
||
|
||
(provide 'ob-J)
|
||
|
||
;;; ob-J.el ends here
|