From: Bastien Guerry Date: Tue, 12 Nov 2013 20:00:14 +0000 (+0100) Subject: Remove non-existent files in Org 8.2.3a X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~848 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=757f401fe7d6410924c0a512818d9e49b46626fd;p=emacs.git Remove non-existent files in Org 8.2.3a --- 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 @@ add #, add Calc infinite numbers uinf, -inf and inf. -2013-11-12 Michael Gauland - - * ob-ebnf.el: New file. - 2013-11-12 Muchenxuan Tong (tiny change) * org-mobile.el (org-mobile-push): Add `save-restriction'. @@ -5212,10 +5208,6 @@ * ob-core.el (org-babel-where-is-src-block-head): Return `point-marker' instead of `point'. -2013-11-12 William Waites - - * ob-abc.el: New file. - 2013-11-12 Yann Hodique * 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 @@ -;;; ob-abc.el --- org-babel functions for template evaluation - -;; Copyright (C) 2013 Free Software Foundation, Inc. - -;; Author: William Waites -;; Keywords: literate programming, music -;; Homepage: http://www.tardis.ed.ac.uk/wwaites -;; Version: 0.01 - -;; 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: - -;; This file adds support to Org Babel for music in ABC notation. -;; It requires that the abcm2ps program is installed. -;; See http://moinejf.free.fr/ - -;;; Code: - -(require 'ob) - -;; optionally define a file extension for this language -(add-to-list 'org-babel-tangle-lang-exts '("abc" . "abc")) - -;; optionally declare default header arguments for this language -(defvar org-babel-default-header-args:abc - '((:results . "file") (:exports . "results")) - "Default arguments to use when evaluating an ABC source block.") - -(defun org-babel-expand-body:abc (body params) - "Expand BODY according to PARAMS, return the expanded body." - (dolist (pair (mapcar #'cdr (org-babel-get-header params :var))) - (let ((name (symbol-name (car pair))) - (value (cdr pair))) - (setq body - (replace-regexp-in-string - (concat "\$" (regexp-quote name)) ;FIXME: "\$" == "$"! - (if (stringp value) value (format "%S" value)) - body)))) - body) - -(defun org-babel-execute:abc (body params) - "Execute a block of ABC code with org-babel. This function is - called by `org-babel-execute-src-block'" - (message "executing Abc source code block") - (let* ((result-params (split-string (or (cdr (assoc :results params))))) - (cmdline (cdr (assoc :cmdline params))) - (out-file - (let ((el (cdr (assoc :file params)))) - (if el (replace-regexp-in-string "\\.pdf\\'" ".ps" el) - (error "abc code block requires :file header argument")))) - (in-file (org-babel-temp-file "abc-")) - (render (concat "abcm2ps" " " cmdline - " -O " (org-babel-process-file-name out-file) - " " (org-babel-process-file-name in-file)))) - (with-temp-file in-file (insert (org-babel-expand-body:abc body params))) - (org-babel-eval render "") - ;;; handle where abcm2ps changes the file name (to support multiple files - (when (or (string= (file-name-extension out-file) "eps") - (string= (file-name-extension out-file) "svg")) - (rename-file (concat - (file-name-sans-extension out-file) "001." - (file-name-extension out-file)) - out-file t)) - ;;; if we were asked for a pdf... - (when (string= (file-name-extension (cdr (assoc :file params))) "pdf") - (org-babel-eval (concat "ps2pdf" " " out-file " " (cdr (assoc :file params))) "")) - ;;; indicate that the file has been written - nil)) - -;; This function should be used to assign any variables in params in -;; the context of the session environment. -(defun org-babel-prep-session:abc (session params) - "Return an error because abc does not support sessions." - (error "ABC does not support sessions")) - -(provide 'ob-abc) -;;; 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 @@ -;;; ob-ebnf.el --- org-babel functions for ebnf evaluation - -;; Copyright (C) 2013 Free Software Foundation, Inc. - -;; Author: Michael Gauland -;; Keywords: literate programming, reproducible research -;; Homepage: http://orgmode.org -;; Version: 1.00 - -;; 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 using ebnf2ps to generate encapsulated postscript -;;; railroad diagrams. It recogises these arguments: -;;; -;;; :file is required; it must include the extension '.eps.' All the rules -;;; in the block will be drawn in the same file. This is done by -;;; inserting a '[' comment at the start of the block (see the -;;; documentation for ebnf-eps-buffer for more information). -;;; -;;; :style specifies a value in ebnf-style-database. This provides the -;;; ability to customise the output. The style can also specify the -;;; grammar syntax (by setting ebnf-syntax); note that only ebnf, -;;; iso-ebnf, and yacc are supported by this file. - -;;; Requirements: - -;;; Code: -(require 'ob) -(require 'ebnf2ps) - -;; optionally declare default header arguments for this language -(defvar org-babel-default-header-args:ebnf '((:style . nil))) - -;; Use ebnf-eps-buffer to produce an encapsulated postscript file. -;; -(defun org-babel-execute:ebnf (body params) - "Execute a block of Ebnf code with org-babel. This function is -called by `org-babel-execute-src-block'" - (save-excursion - (let* ((dest-file (cdr (assoc :file params))) - (dest-dir (file-name-directory dest-file)) - (dest-root (file-name-sans-extension - (file-name-nondirectory dest-file))) - (dest-ext (file-name-extension dest-file)) - (style (cdr (assoc :style params))) - (current-dir default-directory) - (result nil)) - (with-temp-buffer - (when style (ebnf-push-style style)) - (let ((comment-format - (cond ((string= ebnf-syntax 'yacc) "/*%s*/") - ((string= ebnf-syntax 'ebnf) ";%s") - ((string= ebnf-syntax 'iso-ebnf) "(*%s*)") - (t (setq result - (format "EBNF error: format %s not supported." - ebnf-syntax)))))) - (setq ebnf-eps-prefix dest-dir) - (insert (format comment-format (format "[%s" dest-root))) - (newline) - (insert body) - (newline) - (insert (format comment-format (format "]%s" dest-root))) - (ebnf-eps-buffer) - (when style (ebnf-pop-style)))) - result))) - -(provide 'ob-ebnf) -;;; ob-ebnf.el ends here