aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Guerry2013-11-12 21:00:14 +0100
committerBastien Guerry2013-11-12 21:00:14 +0100
commit757f401fe7d6410924c0a512818d9e49b46626fd (patch)
treebbfa0717f0979405821bf3576f1b7079d653647a
parent666ffc7e09d3f55e2ce370bc3cf0bda347ae2e21 (diff)
downloademacs-757f401fe7d6410924c0a512818d9e49b46626fd.tar.gz
emacs-757f401fe7d6410924c0a512818d9e49b46626fd.zip
Remove non-existent files in Org 8.2.3a
-rw-r--r--lisp/org/ChangeLog8
-rw-r--r--lisp/org/ob-abc.el91
-rw-r--r--lisp/org/ob-ebnf.el83
3 files changed, 0 insertions, 182 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 216edbd6d40..c8ae3496e44 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -3225,10 +3225,6 @@
3225 add <radix>#<number>, add Calc infinite numbers uinf, -inf and 3225 add <radix>#<number>, add Calc infinite numbers uinf, -inf and
3226 inf. 3226 inf.
3227 3227
32282013-11-12 Michael Gauland <mikelygee@no8wireless.co.nz>
3229
3230 * ob-ebnf.el: New file.
3231
32322013-11-12 Muchenxuan Tong <demon386@gmail.com> (tiny change) 32282013-11-12 Muchenxuan Tong <demon386@gmail.com> (tiny change)
3233 3229
3234 * org-mobile.el (org-mobile-push): Add `save-restriction'. 3230 * org-mobile.el (org-mobile-push): Add `save-restriction'.
@@ -5212,10 +5208,6 @@
5212 * ob-core.el (org-babel-where-is-src-block-head): Return 5208 * ob-core.el (org-babel-where-is-src-block-head): Return
5213 `point-marker' instead of `point'. 5209 `point-marker' instead of `point'.
5214 5210
52152013-11-12 William Waites <ww@styx.org>
5216
5217 * ob-abc.el: New file.
5218
52192013-11-12 Yann Hodique <yann.hodique@gmail.com> 52112013-11-12 Yann Hodique <yann.hodique@gmail.com>
5220 5212
5221 * org-publish.el (org-publish-org-to-taskjuggler): New function to 5213 * org-publish.el (org-publish-org-to-taskjuggler): New function to
diff --git a/lisp/org/ob-abc.el b/lisp/org/ob-abc.el
deleted file mode 100644
index bb6abe396cd..00000000000
--- a/lisp/org/ob-abc.el
+++ /dev/null
@@ -1,91 +0,0 @@
1;;; ob-abc.el --- org-babel functions for template evaluation
2
3;; Copyright (C) 2013 Free Software Foundation, Inc.
4
5;; Author: William Waites
6;; Keywords: literate programming, music
7;; Homepage: http://www.tardis.ed.ac.uk/wwaites
8;; Version: 0.01
9
10;; This file is part of GNU Emacs.
11
12;; GNU Emacs is free software: you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation, either version 3 of the License, or
15;; (at your option) any later version.
16
17;; GNU Emacs is distributed in the hope that it will be useful,
18;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20;; GNU General Public License for more details.
21
22;; You should have received a copy of the GNU General Public License
23;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
24
25;;; Commentary:
26
27;; This file adds support to Org Babel for music in ABC notation.
28;; It requires that the abcm2ps program is installed.
29;; See http://moinejf.free.fr/
30
31;;; Code:
32
33(require 'ob)
34
35;; optionally define a file extension for this language
36(add-to-list 'org-babel-tangle-lang-exts '("abc" . "abc"))
37
38;; optionally declare default header arguments for this language
39(defvar org-babel-default-header-args:abc
40 '((:results . "file") (:exports . "results"))
41 "Default arguments to use when evaluating an ABC source block.")
42
43(defun org-babel-expand-body:abc (body params)
44 "Expand BODY according to PARAMS, return the expanded body."
45 (dolist (pair (mapcar #'cdr (org-babel-get-header params :var)))
46 (let ((name (symbol-name (car pair)))
47 (value (cdr pair)))
48 (setq body
49 (replace-regexp-in-string
50 (concat "\$" (regexp-quote name)) ;FIXME: "\$" == "$"!
51 (if (stringp value) value (format "%S" value))
52 body))))
53 body)
54
55(defun org-babel-execute:abc (body params)
56 "Execute a block of ABC code with org-babel. This function is
57 called by `org-babel-execute-src-block'"
58 (message "executing Abc source code block")
59 (let* ((result-params (split-string (or (cdr (assoc :results params)))))
60 (cmdline (cdr (assoc :cmdline params)))
61 (out-file
62 (let ((el (cdr (assoc :file params))))
63 (if el (replace-regexp-in-string "\\.pdf\\'" ".ps" el)
64 (error "abc code block requires :file header argument"))))
65 (in-file (org-babel-temp-file "abc-"))
66 (render (concat "abcm2ps" " " cmdline
67 " -O " (org-babel-process-file-name out-file)
68 " " (org-babel-process-file-name in-file))))
69 (with-temp-file in-file (insert (org-babel-expand-body:abc body params)))
70 (org-babel-eval render "")
71 ;;; handle where abcm2ps changes the file name (to support multiple files
72 (when (or (string= (file-name-extension out-file) "eps")
73 (string= (file-name-extension out-file) "svg"))
74 (rename-file (concat
75 (file-name-sans-extension out-file) "001."
76 (file-name-extension out-file))
77 out-file t))
78 ;;; if we were asked for a pdf...
79 (when (string= (file-name-extension (cdr (assoc :file params))) "pdf")
80 (org-babel-eval (concat "ps2pdf" " " out-file " " (cdr (assoc :file params))) ""))
81 ;;; indicate that the file has been written
82 nil))
83
84;; This function should be used to assign any variables in params in
85;; the context of the session environment.
86(defun org-babel-prep-session:abc (session params)
87 "Return an error because abc does not support sessions."
88 (error "ABC does not support sessions"))
89
90(provide 'ob-abc)
91;;; ob-abc.el ends here
diff --git a/lisp/org/ob-ebnf.el b/lisp/org/ob-ebnf.el
deleted file mode 100644
index 753f25f1c5c..00000000000
--- a/lisp/org/ob-ebnf.el
+++ /dev/null
@@ -1,83 +0,0 @@
1;;; ob-ebnf.el --- org-babel functions for ebnf evaluation
2
3;; Copyright (C) 2013 Free Software Foundation, Inc.
4
5;; Author: Michael Gauland
6;; Keywords: literate programming, reproducible research
7;; Homepage: http://orgmode.org
8;; Version: 1.00
9
10;; This file is part of GNU Emacs.
11
12;; GNU Emacs is free software: you can redistribute it and/or modify
13;; it under the terms of the GNU General Public License as published by
14;; the Free Software Foundation, either version 3 of the License, or
15;; (at your option) any later version.
16
17;; GNU Emacs is distributed in the hope that it will be useful,
18;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20;; GNU General Public License for more details.
21
22;; You should have received a copy of the GNU General Public License
23;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
24
25;;; Commentary:
26
27;;; Org-Babel support for using ebnf2ps to generate encapsulated postscript
28;;; railroad diagrams. It recogises these arguments:
29;;;
30;;; :file is required; it must include the extension '.eps.' All the rules
31;;; in the block will be drawn in the same file. This is done by
32;;; inserting a '[<file>' comment at the start of the block (see the
33;;; documentation for ebnf-eps-buffer for more information).
34;;;
35;;; :style specifies a value in ebnf-style-database. This provides the
36;;; ability to customise the output. The style can also specify the
37;;; grammar syntax (by setting ebnf-syntax); note that only ebnf,
38;;; iso-ebnf, and yacc are supported by this file.
39
40;;; Requirements:
41
42;;; Code:
43(require 'ob)
44(require 'ebnf2ps)
45
46;; optionally declare default header arguments for this language
47(defvar org-babel-default-header-args:ebnf '((:style . nil)))
48
49;; Use ebnf-eps-buffer to produce an encapsulated postscript file.
50;;
51(defun org-babel-execute:ebnf (body params)
52 "Execute a block of Ebnf code with org-babel. This function is
53called by `org-babel-execute-src-block'"
54 (save-excursion
55 (let* ((dest-file (cdr (assoc :file params)))
56 (dest-dir (file-name-directory dest-file))
57 (dest-root (file-name-sans-extension
58 (file-name-nondirectory dest-file)))
59 (dest-ext (file-name-extension dest-file))
60 (style (cdr (assoc :style params)))
61 (current-dir default-directory)
62 (result nil))
63 (with-temp-buffer
64 (when style (ebnf-push-style style))
65 (let ((comment-format
66 (cond ((string= ebnf-syntax 'yacc) "/*%s*/")
67 ((string= ebnf-syntax 'ebnf) ";%s")
68 ((string= ebnf-syntax 'iso-ebnf) "(*%s*)")
69 (t (setq result
70 (format "EBNF error: format %s not supported."
71 ebnf-syntax))))))
72 (setq ebnf-eps-prefix dest-dir)
73 (insert (format comment-format (format "[%s" dest-root)))
74 (newline)
75 (insert body)
76 (newline)
77 (insert (format comment-format (format "]%s" dest-root)))
78 (ebnf-eps-buffer)
79 (when style (ebnf-pop-style))))
80 result)))
81
82(provide 'ob-ebnf)
83;;; ob-ebnf.el ends here