Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
f5fc6cb215
|
@ -30,6 +30,13 @@ the root of the org-mode repository.
|
|||
Failure to update this repository will cause loading of
|
||||
org-test.el to throw errors.
|
||||
** Details
|
||||
*** Org-babel speed commands
|
||||
All Org-babel commands (behind the C-c C-v key prefix) are now
|
||||
available as speed commands when the point is on the first line of a
|
||||
code block. This uses the existing Org-mode speed key mechanisms.
|
||||
|
||||
Thanks to Jambunathan K for implementation this new feature.
|
||||
|
||||
*** Fontify code in code blocks.
|
||||
|
||||
Source code in code blocks can now be fontified. Please customize the
|
||||
|
|
|
@ -0,0 +1,57 @@
|
|||
;;; ob-calc.el --- org-babel functions for calc code evaluation
|
||||
|
||||
;; Copyright (C) 2010 Free Software Foundation, Inc
|
||||
|
||||
;; Author: Eric Schulte
|
||||
;; Keywords: literate programming, reproducible research
|
||||
;; Homepage: http://orgmode.org
|
||||
;; Version: 7.01trans
|
||||
|
||||
;; 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 calc code
|
||||
|
||||
;;; Code:
|
||||
(require 'ob)
|
||||
(require 'calc)
|
||||
(eval-when-compile (require 'ob-comint))
|
||||
|
||||
(defvar org-babel-default-header-args:calc nil
|
||||
"Default arguments for evaluating an calc source block.")
|
||||
|
||||
(defun org-babel-expand-body:calc (body params)
|
||||
"Expand BODY according to PARAMS, return the expanded body." body)
|
||||
|
||||
(defun org-babel-execute:calc (body params)
|
||||
"Execute a block of calc code with Babel."
|
||||
(mapcar
|
||||
(lambda (line)
|
||||
(when (> (length line) 0)
|
||||
(if (string= "'" (substring line 0 1))
|
||||
(funcall (lookup-key calc-mode-map (substring line 1)) nil)
|
||||
(calc-push-list (list ((lambda (res)
|
||||
(if (numberp res) res (math-read-number res)))
|
||||
(calc-eval line)))))))
|
||||
(split-string (org-babel-expand-body:calc body params) "[\n\r]"))
|
||||
(calc-eval (calc-top 1)))
|
||||
|
||||
(provide 'ob-calc)
|
||||
|
||||
;; arch-tag: 5c57a3b7-5818-4c6c-acda-7a94831a6449
|
||||
|
||||
;;; ob-calc.el ends here
|
Loading…
Reference in New Issue