Commits

Ivan Andrus committed 8e9db1a

Renamed sage-auctex.el to sage-latex.el since it now handles org as well

Comments (0)

Files changed (2)

emacs/sage-auctex.el

-;;; sage-latex.el --- LaTeX support for Sage code
-
-;; Copyright (C) 2012  Ivan Andrus
-
-;; Author: Ivan Andrus <darthandrus@gmail.com>
-;; Keywords: sage tex
-
-;;; Commentary:
-
-;; This file adds functionality to AUCTeX and org-mode, to support
-;; usage of SageTeX.
-
-;;; Code:
-
-(eval-when-compile
-  (and (require 'tex-site nil t)
-       (require 'tex)
-       (require 'tex-buf))
-  (require 'org-latex nil t))
-
-;;;###autoload
-(defun sage-run-sagetex (name command file)
-  "Function to be used in `TeX-command-list' to run sage on sagetex files.
-Makes `TeX-command-default' the next command to be run since we
-need to retypeset after running sage.
-For details of NAME, COMMAND and FILE see the documetation for `TeX-command-list'."
-  (TeX-run-compile name command file)
-  ;; TODO: This only works if there is a process buffer, i.e. not a compile buffer.
-  (with-no-warnings
-    (TeX-process-set-variable file 'TeX-command-next
-			      TeX-command-default)))
-
-(defadvice TeX-LaTeX-sentinel (after LaTeX-recognize-sage (process name))
-  "Recognize when Sage needs to be run."
-  ;; Only run if we haven't already found something "more important" to do
-  (when (eq TeX-command-next TeX-command-Show)
-    (cond ((re-search-forward "Package sagetex Warning: `final' option provided" nil t)
-           (message "Remove the final option to sagetex and rerun (La)TeX." )
-           (setq TeX-command-next TeX-command-default))
-          ;; More general -- right now there is only one warning
-          ((re-search-forward "Package sagetex Warning: \\(.*\\)" nil t)
-           (message "You should run Sage: %s." (match-string 1))
-           (setq TeX-command-next "Sage")))))
-
-;;;###autoload
-(defun sage-auctex-setup ()
-  "Hooks Sage support into AUCTeX.
-Must be called after AUCTeX has been loaded.
-
-Adds entries `TeX-expand-list' and `TeX-command-list' and advises
-`TeX-LaTeX-sentinel'."
-  (add-to-list 'TeX-expand-list
-               '("%(sage)" (lambda () (require 'sage) sage-command)))
-  (add-to-list 'TeX-expand-list
-               '("%(sagetex-extension)" (lambda () ".sagetex.sage")))
-  (add-to-list 'TeX-command-list
-               '("Sage" "%(sage) %s%(sagetex-extension)"
-                 sage-run-sagetex t t
-                 :help "Run Sage on sagetex files."))
-  ;; Support the Clean command
-  (dolist (l '(TeX-clean-default-intermediate-suffixes
-               plain-TeX-clean-intermediate-suffixes
-               LaTeX-clean-intermediate-suffixes
-               ConTeXt-clean-intermediate-suffixes
-               docTeX-clean-intermediate-suffixes
-               Texinfo-clean-output-suffixes))
-    ;; If they are not bound they will pick up the value from
-    ;; `TeX-clean-default-intermediate-suffixes'
-    (when (boundp l)
-      ;; cleanup .sagetex.sage .sagetex.py .sagetex.sout .sagetex.cmd
-      (add-to-list l "\\.sagetex\\..*")))
-
-  (ad-enable-advice 'TeX-LaTeX-sentinel 'after 'LaTeX-recognize-sage)
-  (ad-activate 'TeX-LaTeX-sentinel))
-
-;;;###autoload
-(defun sage-org-latex-setup ()
-  "Sets up `org-mode' variables to support using SageTeX.
-Currently only `org-latex-to-pdf-process' is affected."
-
-  (let ((is-default (equal org-latex-to-pdf-process
-			   (default-value 'org-latex-to-pdf-process))))
-    (unless (loop for command in org-latex-to-pdf-process
-		  when (string-match "sagetex.sage" command) collect command)
-      (setcdr org-latex-to-pdf-process
-	      (cons (concat "if [ -f %b.sagetex.sage ]; then "
-			    sage-command " %b.sagetex.sage; fi")
-		    (cdr org-latex-to-pdf-process)))
-      (and (not is-default)
-	   (message
-	    "It appears you have made changes to `org-latex-to-pdf-process'. You may also wish to add support for SageTeX.")))))
-
-;;;###autoload
-(eval-after-load 'tex '(sage-auctex-setup))
-;;;###autoload
-(eval-after-load 'org-latex '(sage-org-latex-setup))
-
-(provide 'sage-auctex)
-
-;;; sage-latex.el ends here

emacs/sage-latex.el

+;;; sage-latex.el --- LaTeX support for Sage code
+
+;; Copyright (C) 2012  Ivan Andrus
+
+;; Author: Ivan Andrus <darthandrus@gmail.com>
+;; Keywords: sage tex
+
+;;; Commentary:
+
+;; This file adds functionality to AUCTeX and org-mode, to support
+;; usage of SageTeX.
+
+;;; Code:
+
+(eval-when-compile
+  (and (require 'tex-site nil t)
+       (require 'tex)
+       (require 'tex-buf))
+  (require 'org-latex nil t))
+
+;;;###autoload
+(defun sage-run-sagetex (name command file)
+  "Function to be used in `TeX-command-list' to run sage on sagetex files.
+Makes `TeX-command-default' the next command to be run since we
+need to retypeset after running sage.
+For details of NAME, COMMAND and FILE see the documetation for `TeX-command-list'."
+  (TeX-run-compile name command file)
+  ;; TODO: This only works if there is a process buffer, i.e. not a compile buffer.
+  (with-no-warnings
+    (TeX-process-set-variable file 'TeX-command-next
+			      TeX-command-default)))
+
+(defadvice TeX-LaTeX-sentinel (after LaTeX-recognize-sage (process name))
+  "Recognize when Sage needs to be run."
+  ;; Only run if we haven't already found something "more important" to do
+  (when (eq TeX-command-next TeX-command-Show)
+    (cond ((re-search-forward "Package sagetex Warning: `final' option provided" nil t)
+           (message "Remove the final option to sagetex and rerun (La)TeX." )
+           (setq TeX-command-next TeX-command-default))
+          ;; More general -- right now there is only one warning
+          ((re-search-forward "Package sagetex Warning: \\(.*\\)" nil t)
+           (message "You should run Sage: %s." (match-string 1))
+           (setq TeX-command-next "Sage")))))
+
+;;;###autoload
+(defun sage-auctex-setup ()
+  "Hooks Sage support into AUCTeX.
+Must be called after AUCTeX has been loaded.
+
+Adds entries `TeX-expand-list' and `TeX-command-list' and advises
+`TeX-LaTeX-sentinel'."
+  (add-to-list 'TeX-expand-list
+               '("%(sage)" (lambda () (require 'sage) sage-command)))
+  (add-to-list 'TeX-expand-list
+               '("%(sagetex-extension)" (lambda () ".sagetex.sage")))
+  (add-to-list 'TeX-command-list
+               '("Sage" "%(sage) %s%(sagetex-extension)"
+                 sage-run-sagetex t t
+                 :help "Run Sage on sagetex files."))
+  ;; Support the Clean command
+  (dolist (l '(TeX-clean-default-intermediate-suffixes
+               plain-TeX-clean-intermediate-suffixes
+               LaTeX-clean-intermediate-suffixes
+               ConTeXt-clean-intermediate-suffixes
+               docTeX-clean-intermediate-suffixes
+               Texinfo-clean-output-suffixes))
+    ;; If they are not bound they will pick up the value from
+    ;; `TeX-clean-default-intermediate-suffixes'
+    (when (boundp l)
+      ;; cleanup .sagetex.sage .sagetex.py .sagetex.sout .sagetex.cmd
+      (add-to-list l "\\.sagetex\\..*")))
+
+  (ad-enable-advice 'TeX-LaTeX-sentinel 'after 'LaTeX-recognize-sage)
+  (ad-activate 'TeX-LaTeX-sentinel))
+
+;;;###autoload
+(defun sage-org-latex-setup ()
+  "Sets up `org-mode' variables to support using SageTeX.
+Currently only `org-latex-to-pdf-process' is affected."
+
+  (let ((is-default (equal org-latex-to-pdf-process
+			   (default-value 'org-latex-to-pdf-process))))
+    (unless (loop for command in org-latex-to-pdf-process
+		  when (string-match "sagetex.sage" command) collect command)
+      (setcdr org-latex-to-pdf-process
+	      (cons (concat "if [ -f %b.sagetex.sage ]; then "
+			    sage-command " %b.sagetex.sage; fi")
+		    (cdr org-latex-to-pdf-process)))
+      (and (not is-default)
+	   (message
+	    "It appears you have made changes to `org-latex-to-pdf-process'. You may also wish to add support for SageTeX.")))))
+
+;;;###autoload
+(eval-after-load 'tex '(sage-auctex-setup))
+;;;###autoload
+(eval-after-load 'org-latex '(sage-org-latex-setup))
+
+(provide 'sage-auctex)
+
+;;; sage-latex.el ends here