Browse Source

updating require and provide boilerplate for new ob* files

Eric Schulte 15 years ago
parent
commit
0738893160

+ 4 - 4
lisp/babel/langs/ob-C.el

@@ -1,4 +1,4 @@
-;;; org-babel-C.el --- org-babel functions for C and similar languages
+;;; ob-C.el --- org-babel functions for C and similar languages
 
 
 ;; Copyright (C) 2010 Eric Schulte
 ;; Copyright (C) 2010 Eric Schulte
 
 
@@ -33,7 +33,7 @@
 ;; - not much in the way of error feedback
 ;; - not much in the way of error feedback
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'cc-mode)
 (require 'cc-mode)
 
 
 (org-babel-add-interpreter "C")
 (org-babel-add-interpreter "C")
@@ -189,5 +189,5 @@ of the same value.  TODO list support."
       (format "u32 %S = %S;" var val)))))
       (format "u32 %S = %S;" var val)))))
 
 
 
 
-(provide 'org-babel-C)
-;;; org-babel-C.el ends here
+(provide 'ob-C)
+;;; ob-C.el ends here

+ 4 - 4
lisp/babel/langs/ob-R.el

@@ -1,4 +1,4 @@
-;;; org-babel-R.el --- org-babel functions for R code evaluation
+;;; ob-R.el --- org-babel functions for R code evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -29,7 +29,7 @@
 ;; Org-Babel support for evaluating R code
 ;; Org-Babel support for evaluating R code
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "R")
 (org-babel-add-interpreter "R")
 
 
@@ -250,5 +250,5 @@ Currently, insert hline if column names in output have been requested."
     result))
     result))
   
   
 
 
-(provide 'org-babel-R)
-;;; org-babel-R.el ends here
+(provide 'ob-R)
+;;; ob-R.el ends here

+ 4 - 4
lisp/babel/langs/ob-asymptote.el

@@ -1,4 +1,4 @@
-;;; org-babel-asymptote.el --- org-babel functions for asymptote evaluation
+;;; ob-asymptote.el --- org-babel functions for asymptote evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -45,7 +45,7 @@
 ;; - asy-mode :: Major mode for editing asymptote files
 ;; - asy-mode :: Major mode for editing asymptote files
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "asymptote")
 (org-babel-add-interpreter "asymptote")
 
 
@@ -151,5 +151,5 @@ every cell must be of int type."
                                    (anything-but-int (cdr el)))))))
                                    (anything-but-int (cdr el)))))))
     (or (anything-but-int data) 'int)))
     (or (anything-but-int data) 'int)))
 
 
-(provide 'org-babel-asymptote)
-;;; org-babel-asymptote.el ends here
+(provide 'ob-asymptote)
+;;; ob-asymptote.el ends here

+ 5 - 4
lisp/babel/langs/ob-clojure.el

@@ -1,4 +1,4 @@
-;;; org-babel-clojure.el --- org-babel functions for clojure evaluation
+;;; ob-clojure.el --- org-babel functions for clojure evaluation
 
 
 ;; Copyright (C) 2009 Joel Boehland
 ;; Copyright (C) 2009 Joel Boehland
 
 
@@ -26,7 +26,7 @@
 
 
 ;;; Commentary:
 ;;; Commentary:
 
 
-;;; Org-Babel support for evaluating clojure code
+;;; ob support for evaluating clojure code
 
 
 ;;; Requirements:
 ;;; Requirements:
 
 
@@ -40,7 +40,7 @@
 ;;; web page: http://technomancy.us/126
 ;;; web page: http://technomancy.us/126
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'cl)
 (require 'cl)
 (require 'slime)
 (require 'slime)
 (require 'swank-clojure)
 (require 'swank-clojure)
@@ -278,4 +278,5 @@ last statement in BODY, as elisp."
      (org-babel-pick-name (nth 4 processed-params) (cdr (assoc :colnames params)))
      (org-babel-pick-name (nth 4 processed-params) (cdr (assoc :colnames params)))
      (org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params))))))
      (org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params))))))
 
 
-(provide 'org-babel-clojure)
+(provide 'ob-clojure)
+;;; ob-clojure.el ends here

+ 4 - 4
lisp/babel/langs/ob-css.el

@@ -1,4 +1,4 @@
-;;; org-babel-css.el --- org-babel functions for css evaluation
+;;; ob-css.el --- org-babel functions for css evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -30,7 +30,7 @@
 ;; CSS from org-mode files.
 ;; CSS from org-mode files.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "css")
 (org-babel-add-interpreter "css")
 
 
@@ -48,5 +48,5 @@ called by `org-babel-execute-src-block'."
   "Prepare SESSION according to the header arguments specified in PARAMS."
   "Prepare SESSION according to the header arguments specified in PARAMS."
   (error "CSS sessions are nonsensical"))
   (error "CSS sessions are nonsensical"))
 
 
-(provide 'org-babel-css)
-;;; org-babel-css.el ends here
+(provide 'ob-css)
+;;; ob-css.el ends here

+ 4 - 4
lisp/babel/langs/ob-ditaa.el

@@ -1,4 +1,4 @@
-;;; org-babel-ditaa.el --- org-babel functions for ditaa evaluation
+;;; ob-ditaa.el --- org-babel functions for ditaa evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -39,7 +39,7 @@
 ;; 4) there are no variables (at least for now)
 ;; 4) there are no variables (at least for now)
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "ditaa")
 (org-babel-add-interpreter "ditaa")
 
 
@@ -69,5 +69,5 @@ called by `org-babel-execute-src-block'."
 (defun org-babel-prep-session:ditaa (session params)
 (defun org-babel-prep-session:ditaa (session params)
   (error "Ditaa does not support sessions"))
   (error "Ditaa does not support sessions"))
 
 
-(provide 'org-babel-ditaa)
-;;; org-babel-ditaa.el ends here
+(provide 'ob-ditaa)
+;;; ob-ditaa.el ends here

+ 4 - 4
lisp/babel/langs/ob-dot.el

@@ -1,4 +1,4 @@
-;;; org-babel-dot.el --- org-babel functions for dot evaluation
+;;; ob-dot.el --- org-babel functions for dot evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -41,7 +41,7 @@
 ;; 4) there are no variables (at least for now)
 ;; 4) there are no variables (at least for now)
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "dot")
 (org-babel-add-interpreter "dot")
 
 
@@ -69,5 +69,5 @@ called by `org-babel-execute-src-block'."
 (defun org-babel-prep-session:dot (session params)
 (defun org-babel-prep-session:dot (session params)
   (error "Dot does not support sessions"))
   (error "Dot does not support sessions"))
 
 
-(provide 'org-babel-dot)
-;;; org-babel-dot.el ends here
+(provide 'ob-dot)
+;;; ob-dot.el ends here

+ 4 - 4
lisp/babel/langs/ob-emacs-lisp.el

@@ -1,4 +1,4 @@
-;;; org-babel-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
+;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -29,7 +29,7 @@
 ;; Org-Babel support for evaluating emacs-lisp code
 ;; Org-Babel support for evaluating emacs-lisp code
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "emacs-lisp")
 (org-babel-add-interpreter "emacs-lisp")
 
 
@@ -67,5 +67,5 @@
        (org-babel-pick-name (nth 4 processed-params) (cdr (assoc :colnames params)))
        (org-babel-pick-name (nth 4 processed-params) (cdr (assoc :colnames params)))
        (org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params)))))))
        (org-babel-pick-name (nth 5 processed-params) (cdr (assoc :rownames params)))))))
 
 
-(provide 'org-babel-emacs-lisp)
-;;; org-babel-emacs-lisp.el ends here
+(provide 'obemacs-lisp)
+;;; ob-emacs-lisp.el ends here

+ 4 - 4
lisp/babel/langs/ob-gnuplot.el

@@ -1,4 +1,4 @@
-;;; org-babel-gnuplot.el --- org-babel functions for gnuplot evaluation
+;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -41,7 +41,7 @@
 ;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
 ;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'gnuplot)
 (require 'gnuplot)
 
 
 (org-babel-add-interpreter "gnuplot")
 (org-babel-add-interpreter "gnuplot")
@@ -210,5 +210,5 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 	      params))))
 	      params))))
   data-file)
   data-file)
 
 
-(provide 'org-babel-gnuplot)
-;;; org-babel-gnuplot.el ends here
+(provide 'ob-gnuplot)
+;;; ob-gnuplot.el ends here

+ 4 - 4
lisp/babel/langs/ob-haskell.el

@@ -1,4 +1,4 @@
-;;; org-babel-haskell.el --- org-babel functions for haskell evaluation
+;;; ob-haskell.el --- org-babel functions for haskell evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -42,7 +42,7 @@
 ;; - (optionally) lhs2tex :: http://people.cs.uu.nl/andres/lhs2tex/
 ;; - (optionally) lhs2tex :: http://people.cs.uu.nl/andres/lhs2tex/
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'haskell-mode)
 (require 'haskell-mode)
 (require 'inf-haskell)
 (require 'inf-haskell)
 
 
@@ -201,5 +201,5 @@ constructs (header arguments, no-web syntax etc...) are ignored."
       ;; process .lhs file with lhs2tex
       ;; process .lhs file with lhs2tex
       (message "running %s" command) (shell-command command) (find-file tex-file))))
       (message "running %s" command) (shell-command command) (find-file tex-file))))
 
 
-(provide 'org-babel-haskell)
-;;; org-babel-haskell.el ends here
+(provide 'ob-haskell)
+;;; ob-haskell.el ends here

+ 4 - 4
lisp/babel/langs/ob-latex.el

@@ -1,4 +1,4 @@
-;;; org-babel-latex.el --- org-babel functions for latex "evaluation"
+;;; ob-latex.el --- org-babel functions for latex "evaluation"
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -33,7 +33,7 @@
 ;; be created directly form the latex source code.
 ;; be created directly form the latex source code.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "latex")
 (org-babel-add-interpreter "latex")
 
 
@@ -136,5 +136,5 @@ called by `org-babel-execute-src-block'."
 (defun org-babel-prep-session:latex (session params)
 (defun org-babel-prep-session:latex (session params)
   (error "Latex does not support sessions"))
   (error "Latex does not support sessions"))
 
 
-(provide 'org-babel-latex)
-;;; org-babel-latex.el ends here
+(provide 'ob-latex)
+;;; ob-latex.el ends here

+ 4 - 4
lisp/babel/langs/ob-matlab.el

@@ -1,4 +1,4 @@
-;;; org-babel-matlab.el --- org-babel support for matlab evaluation
+;;; ob-matlab.el --- org-babel support for matlab evaluation
 
 
 ;; Copyright (C) Dan Davison
 ;; Copyright (C) Dan Davison
 
 
@@ -39,7 +39,7 @@
 
 
 ;;; Code:
 ;;; Code:
 (require 'matlab)
 (require 'matlab)
-(require 'org-babel-octave)
+(require 'ob-octave)
 
 
 (org-babel-add-interpreter "matlab")
 (org-babel-add-interpreter "matlab")
 (add-to-list 'org-babel-tangle-langs '("matlab" "m" "#!/usr/bin/env matlab"))
 (add-to-list 'org-babel-tangle-langs '("matlab" "m" "#!/usr/bin/env matlab"))
@@ -76,5 +76,5 @@ If there is not a current inferior-process-buffer in SESSION
 then create. Return the initialized session."
 then create. Return the initialized session."
   (org-babel-octave-initiate-session session params 'matlab))
   (org-babel-octave-initiate-session session params 'matlab))
 
 
-(provide 'org-babel-matlab)
-;;; org-babel-matlab.el ends here
+(provide 'ob-matlab)
+;;; ob-matlab.el ends here

+ 4 - 4
lisp/babel/langs/ob-ocaml.el

@@ -1,4 +1,4 @@
-;;; org-babel-ocaml.el --- org-babel functions for ocaml evaluation
+;;; ob-ocaml.el --- org-babel functions for ocaml evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -38,7 +38,7 @@
 ;; - tuareg-mode :: http://www-rocq.inria.fr/~acohen/tuareg/
 ;; - tuareg-mode :: http://www-rocq.inria.fr/~acohen/tuareg/
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'tuareg)
 (require 'tuareg)
 
 
 (org-babel-add-interpreter "ocaml")
 (org-babel-add-interpreter "ocaml")
@@ -122,5 +122,5 @@ Emacs-lisp table, otherwise return the results as a string."
                                          "'" "\"" results)))))
                                          "'" "\"" results)))))
      results)))
      results)))
 
 
-(provide 'org-babel-ocaml)
-;;; org-babel-ocaml.el ends here
+(provide 'ob-ocaml)
+;;; ob-ocaml.el ends here

+ 4 - 4
lisp/babel/langs/ob-octave.el

@@ -1,4 +1,4 @@
-;;; org-babel-octave.el --- org-babel functions for octave and matlab evaluation
+;;; ob-octave.el --- org-babel functions for octave and matlab evaluation
 
 
 ;; Copyright (C) Dan Davison
 ;; Copyright (C) Dan Davison
 
 
@@ -32,7 +32,7 @@
 ;; octave-mode.el and octave-inf.el come with GNU emacs
 ;; octave-mode.el and octave-inf.el come with GNU emacs
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'octave-inf)
 (require 'octave-inf)
 
 
 (org-babel-add-interpreter "octave")
 (org-babel-add-interpreter "octave")
@@ -214,5 +214,5 @@ This removes initial blank and comment lines and then calls
       (match-string 1 string)
       (match-string 1 string)
     string))
     string))
 
 
-(provide 'org-babel-octave)
-;;; org-babel-octave.el ends here
+(provide 'ob-octave)
+;;; ob-octave.el ends here

+ 4 - 4
lisp/babel/langs/ob-perl.el

@@ -1,4 +1,4 @@
-;;; org-babel-perl.el --- org-babel functions for perl evaluation
+;;; ob-perl.el --- org-babel functions for perl evaluation
 
 
 ;; Copyright (C) 2009 Dan Davison, Eric Schulte
 ;; Copyright (C) 2009 Dan Davison, Eric Schulte
 
 
@@ -29,7 +29,7 @@
 ;; Org-Babel support for evaluating perl source code.
 ;; Org-Babel support for evaluating perl source code.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "perl")
 (org-babel-add-interpreter "perl")
 
 
@@ -126,5 +126,5 @@ last statement in BODY, as elisp."
     ;; comint session evaluation
     ;; comint session evaluation
     (error "Sessions are not supported for Perl.")))
     (error "Sessions are not supported for Perl.")))
 
 
-(provide 'org-babel-perl)
-;;; org-babel-perl.el ends here
+(provide 'ob-perl)
+;;; ob-perl.el ends here

+ 6 - 6
lisp/babel/langs/ob-python.el

@@ -1,4 +1,4 @@
-;;; org-babel-python.el --- org-babel functions for python evaluation
+;;; ob-python.el --- org-babel functions for python evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -29,9 +29,9 @@
 ;; Org-Babel support for evaluating python source code.
 ;; Org-Babel support for evaluating python source code.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
-(require 'org-babel-tangle)
-(require 'org-babel-comint)
+(require 'ob)
+(require 'ob-tangle)
+(require 'ob-comint)
 (require (if (featurep 'xemacs) 'python-mode 'python))
 (require (if (featurep 'xemacs) 'python-mode 'python))
 
 
 (org-babel-add-interpreter "python")
 (org-babel-add-interpreter "python")
@@ -249,5 +249,5 @@ last statement in BODY, as elisp."
       (match-string 1 string)
       (match-string 1 string)
     string))
     string))
 
 
-(provide 'org-babel-python)
-;;; org-babel-python.el ends here
+(provide 'ob-python)
+;;; ob-python.el ends here

+ 4 - 4
lisp/babel/langs/ob-ruby.el

@@ -1,4 +1,4 @@
-;;; org-babel-ruby.el --- org-babel functions for ruby evaluation
+;;; ob-ruby.el --- org-babel functions for ruby evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -39,7 +39,7 @@
 ;;   http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
 ;;   http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'inf-ruby)
 (require 'inf-ruby)
 
 
 (org-babel-add-interpreter "ruby")
 (org-babel-add-interpreter "ruby")
@@ -232,5 +232,5 @@ last statement in BODY, as elisp."
       (match-string 1 string)
       (match-string 1 string)
     string))
     string))
 
 
-(provide 'org-babel-ruby)
-;;; org-babel-ruby.el ends here
+(provide 'ob-ruby)
+;;; ob-ruby.el ends here

+ 4 - 4
lisp/babel/langs/ob-sass.el

@@ -1,4 +1,4 @@
-;;; org-babel-sass.el --- org-babel functions for the sass css generation language
+;;; ob-sass.el --- org-babel functions for the sass css generation language
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -41,7 +41,7 @@
 ;; - sass-mode :: http://github.com/nex3/haml/blob/master/extra/sass-mode.el
 ;; - sass-mode :: http://github.com/nex3/haml/blob/master/extra/sass-mode.el
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'sass-mode)
 (require 'sass-mode)
 
 
 (org-babel-add-interpreter "sass")
 (org-babel-add-interpreter "sass")
@@ -67,5 +67,5 @@ called by `org-babel-execute-src-block'."
 (defun org-babel-prep-session:sass (session params)
 (defun org-babel-prep-session:sass (session params)
   (error "Sass does not support sessions"))
   (error "Sass does not support sessions"))
 
 
-(provide 'org-babel-sass)
-;;; org-babel-sass.el ends here
+(provide 'ob-sass)
+;;; ob-sass.el ends here

+ 4 - 4
lisp/babel/langs/ob-screen.el

@@ -1,4 +1,4 @@
-;;; org-babel-screen.el --- org-babel support for interactive terminal
+;;; ob-screen.el --- org-babel support for interactive terminal
 
 
 ;; Copyright (C) 2009 Benjamin Andresen
 ;; Copyright (C) 2009 Benjamin Andresen
 
 
@@ -36,7 +36,7 @@
 ;; M-x org-babel-screen-test RET
 ;; M-x org-babel-screen-test RET
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "screen")
 (org-babel-add-interpreter "screen")
 
 
@@ -143,5 +143,5 @@ The terminal should shortly flicker."
                          "WORKS."
                          "WORKS."
                          "DOESN'T work.")))))
                          "DOESN'T work.")))))
 
 
-(provide 'org-babel-screen)
-;;; org-babel-screen.el ends here
+(provide 'ob-screen)
+;;; ob-screen.el ends here

+ 4 - 4
lisp/babel/langs/ob-sh.el

@@ -1,4 +1,4 @@
-;;; org-babel-sh.el --- org-babel functions for shell evaluation
+;;; ob-sh.el --- org-babel functions for shell evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -29,7 +29,7 @@
 ;; Org-Babel support for evaluating shell source code.
 ;; Org-Babel support for evaluating shell source code.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'shell)
 (require 'shell)
 
 
 (org-babel-add-interpreter "sh")
 (org-babel-add-interpreter "sh")
@@ -187,5 +187,5 @@ last statement in BODY."
     (setq string (substring string (match-end 0))))
     (setq string (substring string (match-end 0))))
   string)
   string)
 
 
-(provide 'org-babel-sh)
-;;; org-babel-sh.el ends here
+(provide 'ob-sh)
+;;; ob-sh.el ends here

+ 4 - 4
lisp/babel/langs/ob-sql.el

@@ -1,4 +1,4 @@
-;;; org-babel-sql.el --- org-babel functions for sql evaluation
+;;; ob-sql.el --- org-babel functions for sql evaluation
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -45,7 +45,7 @@
 ;; 
 ;; 
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (org-babel-add-interpreter "sql")
 (org-babel-add-interpreter "sql")
 
 
@@ -83,5 +83,5 @@ called by `org-babel-execute-src-block'."
   "Prepare SESSION according to the header arguments specified in PARAMS."
   "Prepare SESSION according to the header arguments specified in PARAMS."
   (error "sql sessions not yet implemented"))
   (error "sql sessions not yet implemented"))
 
 
-(provide 'org-babel-sql)
-;;; org-babel-sql.el ends here
+(provide 'ob-sql)
+;;; ob-sql.el ends here

+ 4 - 4
lisp/babel/ob-comint.el

@@ -1,4 +1,4 @@
-;;; org-babel-comint.el --- org-babel functions for interaction with comint buffers
+;;; ob-comint.el --- org-babel functions for interaction with comint buffers
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -33,7 +33,7 @@
 ;; org-babel at large.
 ;; org-babel at large.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'comint)
 (require 'comint)
 
 
 (defun org-babel-comint-buffer-livep (buffer)
 (defun org-babel-comint-buffer-livep (buffer)
@@ -123,5 +123,5 @@ code)."
                                 "comint-highlight-prompt"))))
                                 "comint-highlight-prompt"))))
       (accept-process-output (get-buffer-process buffer)))))
       (accept-process-output (get-buffer-process buffer)))))
 
 
-(provide 'org-babel-comint)
-;;; org-babel-comint.el ends here
+(provide 'ob-comint)
+;;; ob-comint.el ends here

+ 4 - 4
lisp/babel/ob-exp.el

@@ -1,4 +1,4 @@
-;;; org-babel-exp.el --- Exportation of org-babel source blocks
+;;; ob-exp.el --- Exportation of org-babel source blocks
 
 
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 
 
@@ -29,7 +29,7 @@
 ;; for more information see the comments in org-babel.el
 ;; for more information see the comments in org-babel.el
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 (require 'org-exp-blocks)
 (require 'org-exp-blocks)
 (org-export-blocks-add-block '(src org-babel-exp-src-blocks nil))
 (org-export-blocks-add-block '(src org-babel-exp-src-blocks nil))
 (add-to-list 'org-export-interblocks '(src org-babel-exp-inline-src-blocks))
 (add-to-list 'org-export-interblocks '(src org-babel-exp-inline-src-blocks))
@@ -273,5 +273,5 @@ results into the buffer."
 		    params `((:results . ,(if silent "silent" "replace")))))
 		    params `((:results . ,(if silent "silent" "replace")))))
 	 "")))))
 	 "")))))
 
 
-(provide 'org-babel-exp)
-;;; org-babel-exp.el ends here
+(provide 'ob-exp)
+;;; ob-exp.el ends here

+ 4 - 4
lisp/babel/ob-keys.el

@@ -1,4 +1,4 @@
-;;; org-babel-keys.el --- key bindings for org-babel
+;;; ob-keys.el --- key bindings for org-babel
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -32,7 +32,7 @@
 ;; interactive functions and their associated keys.
 ;; interactive functions and their associated keys.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (defvar org-babel-key-prefix "\C-c\C-v"
 (defvar org-babel-key-prefix "\C-c\C-v"
   "The `org-babel-key-prefix' variable holds the key prefix
   "The `org-babel-key-prefix' variable holds the key prefix
@@ -82,5 +82,5 @@ a-list placed behind the generic `org-babel-key-prefix'.")
         (define-key org-babel-map (car pair) (cdr pair)))
         (define-key org-babel-map (car pair) (cdr pair)))
       org-babel-key-bindings)
       org-babel-key-bindings)
 
 
-(provide 'org-babel-keys)
-;;; org-babel-keys.el ends here
+(provide 'ob-keys)
+;;; ob-keys.el ends here

+ 6 - 6
lisp/babel/ob-lob.el

@@ -1,4 +1,4 @@
-;;; org-babel-lob.el --- The Library of Babel: off-the-shelf functions for data analysis and plotting using org-babel
+;;; ob-lob.el --- The Library of Babel: off-the-shelf functions for data analysis and plotting using org-babel
 
 
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 
 
@@ -29,9 +29,9 @@
 ;; See org-babel.org in the parent directory for more information
 ;; See org-babel.org in the parent directory for more information
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
-(require 'org-babel-table)
-(require 'org-babel-exp)
+(require 'ob)
+(require 'ob-table)
+(require 'ob-exp)
 
 
 (defvar org-babel-library-of-babel nil
 (defvar org-babel-library-of-babel nil
   "Library of source-code blocks.  This is an association list.
   "Library of source-code blocks.  This is an association list.
@@ -108,5 +108,5 @@ the word 'call'."
     (org-babel-execute-src-block
     (org-babel-execute-src-block
      nil (list "emacs-lisp" "results" params nil nil (third info)))))
      nil (list "emacs-lisp" "results" params nil nil (third info)))))
 
 
-(provide 'org-babel-lob)
-;;; org-babel-lob.el ends here
+(provide 'ob-lob)
+;;; ob-lob.el ends here

+ 4 - 4
lisp/babel/ob-ref.el

@@ -1,4 +1,4 @@
-;;; org-babel-ref.el --- org-babel functions for referencing external data
+;;; ob-ref.el --- org-babel functions for referencing external data
 
 
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 
 
@@ -52,7 +52,7 @@
 ;;
 ;;
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (defun org-babel-ref-variables (params)
 (defun org-babel-ref-variables (params)
   "Takes a parameter alist, and return an alist of variable
   "Takes a parameter alist, and return an alist of variable
@@ -217,5 +217,5 @@ types are tables and source blocks."
         ((looking-at org-bracket-link-regexp) 'file)
         ((looking-at org-bracket-link-regexp) 'file)
         ((looking-at org-babel-result-regexp) 'results-line)))
         ((looking-at org-babel-result-regexp) 'results-line)))
 
 
-(provide 'org-babel-ref)
-;;; org-babel-ref.el ends here
+(provide 'ob-ref)
+;;; ob-ref.el ends here

+ 4 - 4
lisp/babel/ob-table.el

@@ -1,4 +1,4 @@
-;;; org-babel-table.el --- integration for calling org-babel functions from tables
+;;; ob-table.el --- integration for calling org-babel functions from tables
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -53,7 +53,7 @@
 ;; #+TBLFM: $2='(sbe 'fibbd (n $1))
 ;; #+TBLFM: $2='(sbe 'fibbd (n $1))
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (defun org-babel-table-truncate-at-newline (string)
 (defun org-babel-table-truncate-at-newline (string)
   (if (and (stringp string) (string-match "[\n\r]" string))
   (if (and (stringp string) (string-match "[\n\r]" string))
@@ -101,5 +101,5 @@ example above."
                       (org-babel-merge-params '((:results . "silent")) params))))
                       (org-babel-merge-params '((:results . "silent")) params))))
        ""))))
        ""))))
 
 
-(provide 'org-babel-table)
-;;; org-babel-table.el ends here
+(provide 'ob-table)
+;;; ob-table.el ends here

+ 4 - 4
lisp/babel/ob-tangle.el

@@ -1,4 +1,4 @@
-;;; org-babel-tangle.el --- Extract source code from org-mode files
+;;; ob-tangle.el --- Extract source code from org-mode files
 
 
 ;; Copyright (C) 2009 Eric Schulte
 ;; Copyright (C) 2009 Eric Schulte
 
 
@@ -29,7 +29,7 @@
 ;; Extract the code from source blocks out into raw source-code files.
 ;; Extract the code from source blocks out into raw source-code files.
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-babel)
+(require 'ob)
 
 
 (defvar org-babel-tangle-langs nil
 (defvar org-babel-tangle-langs nil
   "List of languages supported by `org-babel-tangle'.  The first
   "List of languages supported by `org-babel-tangle'.  The first
@@ -259,5 +259,5 @@ form
 				"^," "" (org-babel-chomp body))))
 				"^," "" (org-babel-chomp body))))
       (insert-comment (format "%s ends here" source-name)))))
       (insert-comment (format "%s ends here" source-name)))))
 
 
-(provide 'org-babel-tangle)
-;;; org-babel-tangle.el ends here
+(provide 'ob-tangle)
+;;; ob-tangle.el ends here

+ 4 - 3
lisp/babel/ob.el

@@ -1,4 +1,4 @@
-;;; org-babel.el --- working with code blocks in org-mode
+;;; ob.el --- working with code blocks in org-mode
 
 
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 ;; Copyright (C) 2009 Eric Schulte, Dan Davison
 
 
@@ -29,6 +29,7 @@
 ;; See org-babel.org in the parent directory for more information
 ;; See org-babel.org in the parent directory for more information
 
 
 ;;; Code:
 ;;; Code:
+(eval-when-compile (require 'cl))
 (require 'org)
 (require 'org)
 
 
 ;; add the langs/ directory to the load path
 ;; add the langs/ directory to the load path
@@ -1606,5 +1607,5 @@ specifies the value of ERROR-BUFFER."
       (delete-file error-file))
       (delete-file error-file))
     exit-status))
     exit-status))
 
 
-(provide 'org-babel)
-;;; org-babel.el ends here
+(provide 'ob)
+;;; ob.el ends here