monnier pushed a commit to branch externals/auctex
in repository elpa.
commit d853bc02aa55afc6534b3ae0879b9c0413eb8de2
Author: Tassilo Horn <[email protected]>
Date: Tue Feb 12 07:54:40 2013 +0000
* style/biblatex.el: Update copyright range.
("biblatex"): Check `backend' option value in
`TeX-active-styles'.
* tex-style.el: Update copyright years.
(LaTeX-biblatex-use-Biber) Remove unused variable.
* tex.el: Update copyright range.
(TeX-auto-add-type): Append new type to `TeX-auto-parser' instead
of prepending it.
(TeX-auto-store): Fix indentation of first lines of parsed file.
* latex.el (LaTeX-auto-cleanup): Append options and styles to
`TeX-auto-file' instead of prepending them.
---
ChangeLog | 17 +++++++++++++++++
latex.el | 12 +++++++-----
style/biblatex.el | 12 ++++++------
tex-style.el | 9 +--------
tex.el | 11 ++++++-----
5 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9e33202..fb6173f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2013-02-08 Mos� Giordano <[email protected]>
+
+ * style/biblatex.el: Update copyright range.
+ ("biblatex"): Check `backend' option value in
+ `TeX-active-styles'.
+
+ * tex-style.el: Update copyright years.
+ (LaTeX-biblatex-use-Biber) Remove unused variable.
+
+ * tex.el: Update copyright range.
+ (TeX-auto-add-type): Append new type to `TeX-auto-parser' instead
+ of prepending it.
+ (TeX-auto-store): Fix indentation of first lines of parsed file.
+
+ * latex.el (LaTeX-auto-cleanup): Append options and styles to
+ `TeX-auto-file' instead of prepending them.
+
2013-01-28 Mads Jensen <[email protected]>
* doc/todo.texi (Wishlist): Remove "Completion for sboxes".
diff --git a/latex.el b/latex.el
index 0466cc8..17ce77a 100644
--- a/latex.el
+++ b/latex.el
@@ -1345,18 +1345,20 @@ The input string may include LaTeX comments and
newlines."
;; Get the options.
(setq options (LaTeX-listify-package-options options))
- ;; Add them, to the style list.
+ ;; Append them to the style list.
(dolist (elt options)
- (add-to-list 'TeX-auto-file elt))
+ (add-to-list 'TeX-auto-file elt t))
;; Treat documentclass/documentstyle specially.
(if (or (string-equal "package" class)
(string-equal "Package" class))
(dolist (elt (TeX-split-string
"\\([ \t\r\n]\\|%[^\n\r]*[\n\r]\\|,\\)+" style))
- (add-to-list 'TeX-auto-file elt))
+ ;; Append style to the style list, so style files can check the
+ ;; values of the options given on load time to packages.
+ (add-to-list 'TeX-auto-file elt t))
;; And a special "art10" style file combining style and size.
- (add-to-list 'TeX-auto-file style)
+ (add-to-list 'TeX-auto-file style t)
(add-to-list 'TeX-auto-file
(concat
(cond ((string-equal "article" style)
@@ -1383,7 +1385,7 @@ The input string may include LaTeX comments and newlines."
((member "12pt" options)
"12")
(t
- "10")))))
+ "10"))) t))
;; The third argument if "class" indicates LaTeX2e features.
(cond ((equal class "class")
diff --git a/style/biblatex.el b/style/biblatex.el
index 3a66cff..5a4c005 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -1,6 +1,6 @@
;;; biblatex.el --- AUCTeX style for `biblatex.sty'
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
;; Author: Ralf Angeli <[email protected]>
;; Maintainer: [email protected]
@@ -33,11 +33,11 @@
(TeX-add-style-hook
"biblatex"
(lambda ()
- ;; Unfortunately `(member "backend=biber" TeX-active-styles)' does
- ;; not work as a test because "backend=biber" is added to
- ;; `TeX-active-styles' after "biblatex". So we check the value of
- ;; `LaTeX-biblatex-use-biber' and let the user set it if desired.
- (when LaTeX-biblatex-use-Biber
+ ;; Biblatex uses as default backend biber, run it unless biblatex `backend'
+ ;; option value is one of `bibtex', `bibtex8', `bibtexu'.
+ (unless (or (member "backend=bibtex" TeX-active-styles)
+ (member "backend=bibtex8" TeX-active-styles)
+ (member "backend=bibtexu" TeX-active-styles))
(setq LaTeX-using-Biber t))))
;; TODO: Add package options.
diff --git a/tex-style.el b/tex-style.el
index 1c91168..05a706e 100644
--- a/tex-style.el
+++ b/tex-style.el
@@ -1,6 +1,6 @@
;;; tex-style.el --- Customizable variables for AUCTeX style files
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2013 Free Software Foundation, Inc.
;; Author: Reiner Steib <[email protected]>
;; Keywords: tex, wp, convenience
@@ -213,13 +213,6 @@ It can be a list of themes or a function. If it is the
symbol
:tag "Other"
(string)))))
-;; style/biblatex.el
-
-(defcustom LaTeX-biblatex-use-Biber t
- "Whether to use Biber with biblatex."
- :type 'boolean
- :group 'LaTeX-style)
-
;; style/comment.el
(defcustom LaTeX-comment-env-list '("comment")
diff --git a/tex.el b/tex.el
index 7a59a76..c2af20d 100644
--- a/tex.el
+++ b/tex.el
@@ -1,6 +1,6 @@
;;; tex.el --- Support for TeX documents.
-;; Copyright (C) 1985-1987, 1991, 1993, 1994, 1996, 1997, 1999-2012
+;; Copyright (C) 1985-1987, 1991, 1993, 1994, 1996, 1997, 1999-2013
;; Free Software Foundation, Inc.
;; Maintainer: [email protected]
@@ -3121,8 +3121,9 @@ separate type of information in the parser."
(add (intern (concat prefix "-add-" names)))
(local (intern (concat prefix "-" name "-list")))
(change (intern (concat prefix "-" name "-changed"))))
- (setq TeX-auto-parser
- (cons (list name tmp add local change) TeX-auto-parser))
+ ;; Append new type to `TeX-auto-parser' in order to make `style' type
always
+ ;; the first.
+ (add-to-list 'TeX-auto-parser (list name tmp add local change) t)
(set local nil)
(make-variable-buffer-local local)
(set change nil)
@@ -3345,8 +3346,8 @@ If TEX is a directory, generate style files for all files
in the directory."
(save-excursion
(set-buffer (generate-new-buffer file))
(erase-buffer)
- (insert "(TeX-add-style-hook \"" style "\"\n"
- " (lambda ()")
+ (insert "(TeX-add-style-hook\n \""
+ style "\"\n (lambda ()")
(mapc (lambda (el) (TeX-auto-insert el style))
TeX-auto-parser)
(insert "))\n\n")
