emacs: lisp/textmodes/bibtex.el comparison

comparison lisp/textmodes/bibtex.el @ 90428:a8190f7e546e

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 285-296) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: admin/FOR-RELEASE: Update refcard section. * gnus--rel--5.10 (patch 102-104) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

author	Miles Bader <miles@gnu.org>
date	Wed, 07 Jun 2006 18:05:10 +0000
parents	2ecafc6d5db7 da5fa425123d
children	02cf29720f31

comparison

equal deleted inserted replaced

-:ddb25860d044
+:a8190f7e546e
 If this is a function, call it to generate the initial field text."
 :group 'bibtex
 :type '(choice (const :tag "None" nil)
 (string :tag "Initial text")
 (function :tag "Initialize Function" :value fun)
-(other :tag "Default" t)))
+(const :tag "Default" t)))
 (put 'bibtex-include-OPTkey 'risky-local-variable t)
 (defcustom bibtex-user-optional-fields
 '(("annote" "Personal annotation (ignored)"))
 "List of optional fields the user wants to have always present.
 :type 'hook)
 (defcustom bibtex-maintain-sorted-entries nil
 "If non-nil, BibTeX mode maintains all entries in sorted order.
 Allowed non-nil values are:
-plain        All entries are sorted alphabetically.
+plain or t   All entries are sorted alphabetically.
 crossref     All entries are sorted alphabetically unless an entry has a
 crossref field.  These crossrefed entries are placed in
 alphabetical order immediately preceding the main entry.
 entry-class  The entries are divided into classes according to their
 entry name, see `bibtex-sort-entry-class'.  Within each class
 See also `bibtex-sort-ignore-string-entries'."
 :group 'bibtex
 :type '(choice (const nil)
 (const plain)
 (const crossref)
-(const entry-class)))
+(const entry-class)
+(const t)))
+(put 'bibtex-maintain-sorted-entries 'safe-local-variable
+'(lambda (a) (memq a '(nil t plain crossref entry-class))))
 (defcustom bibtex-sort-entry-class
 '(("String")
 (catch-all)
 ("Book" "Proceedings"))
 to all entries not explicitly mentioned."
 :group 'BibTeX
 :type '(repeat (choice :tag "Class"
 (const :tag "catch-all" (catch-all))
 (repeat :tag "Entry name" string))))
+(put 'bibtex-sort-entry-class 'safe-local-variable
+(lambda (x) (let ((OK t))
+(while (consp x)
+(let ((y (pop x)))
+(while (consp y)
+(let ((z (pop y)))
+(unless (or (stringp z) (eq z 'catch-all))
+(setq OK nil))))
+(unless (null y) (setq OK nil))))
+(unless (null x) (setq OK nil))
+OK)))
 (defcustom bibtex-sort-ignore-string-entries t
 "If non-nil, BibTeX @String entries are not sort-significant.
 That means they are ignored when determining ordering of the buffer
 \(e.g., sorting, locating alphabetical position for new entries, etc.)."
 :type '(choice (const :tag "Preserve case" identity)
 (const :tag "Downcase" downcase)
 (const :tag "Capitalize" capitalize)
 (const :tag "Upcase" upcase)
 (function :tag "Conversion function")))
+(put 'bibtex-autokey-name-case-convert-function 'safe-local-variable
+(lambda (x) (memq x '(upcase downcase capitalize identity))))
 (defvaralias 'bibtex-autokey-name-case-convert
 'bibtex-autokey-name-case-convert-function)
 (defcustom bibtex-autokey-name-length 'infty
 "Number of characters from name to incorporate into key.
 "Regexp for `bibtex-font-lock-url'.")
 (defvar bibtex-string-empty-key nil
 "If non-nil, `bibtex-parse-string' accepts empty key.")
-(defvar bibtex-sort-entry-class-alist
+(defvar bibtex-sort-entry-class-alist nil
-(let ((i -1) alist)
-(dolist (class bibtex-sort-entry-class alist)
-(setq i (1+ i))
-(dolist (entry class)
-;; all entry names should be downcase (for ease of comparison)
-(push (cons (if (stringp entry) (downcase entry) entry) i) alist))))
 "Alist mapping entry types to their sorting index.
 Auto-generated from `bibtex-sort-entry-class'.
 Used when `bibtex-maintain-sorted-entries' is `entry-class'.")
 crossref-key bounds alternatives-there non-empty-alternative
 entry-list req-field-list field-list)
 ;; identify entry type
 (goto-char (point-min))
-(re-search-forward bibtex-entry-type)
+(or (re-search-forward bibtex-entry-type nil t)
+(error "Not inside a BibTeX entry"))
 (let ((beg-type (1+ (match-beginning 0)))
 (end-type (match-end 0)))
 (setq entry-list (assoc-string (buffer-substring-no-properties
 					  beg-type end-type)
 					 bibtex-entry-field-alist
 (list key
 (if bounds (bibtex-text-in-field-bounds bounds t))
 entry-name))
 (list key nil entry-name))))))
+(defun bibtex-init-sort-entry-class-alist ()
+(unless (local-variable-p 'bibtex-sort-entry-class-alist)
+(set (make-local-variable 'bibtex-sort-entry-class-alist)
+(let ((i -1) alist)
+(dolist (class bibtex-sort-entry-class alist)
+(setq i (1+ i))
+(dolist (entry class)
+;; All entry names should be downcase (for ease of comparison).
+(push (cons (if (stringp entry) (downcase entry) entry) i)
+alist)))))))
 (defun bibtex-lessp (index1 index2)
 "Predicate for sorting BibTeX entries with indices INDEX1 and INDEX2.
 Each index is a list (KEY CROSSREF-KEY ENTRY-NAME).
 The predicate depends on the variable `bibtex-maintain-sorted-entries'.
 If its value is nil use plain sorting."
 The predicate for sorting is defined via `bibtex-maintain-sorted-entries'.
 If its value is nil use plain sorting.  Text outside of BibTeX entries is not
 affected.  If `bibtex-sort-ignore-string-entries' is non-nil, @String entries
 are ignored."
 (interactive)
-(bibtex-beginning-of-first-entry) ;; needed by `sort-subr'
+(bibtex-beginning-of-first-entry)     ; Needed by `sort-subr'
-(sort-subr nil
+(bibtex-init-sort-entry-class-alist)  ; Needed by `bibtex-lessp'.
-'bibtex-skip-to-valid-entry ; NEXTREC function
+(sort-subr nil
-'bibtex-end-of-entry        ; ENDREC function
+'bibtex-skip-to-valid-entry   ; NEXTREC function
-'bibtex-entry-index         ; STARTKEY function
+'bibtex-end-of-entry          ; ENDREC function
-nil                         ; ENDKEY function
+'bibtex-entry-index           ; STARTKEY function
-'bibtex-lessp))             ; PREDICATE
+nil                           ; ENDKEY function
+'bibtex-lessp))               ; PREDICATE
 (defun bibtex-find-crossref (crossref-key &optional pnt split)
 "Move point to the beginning of BibTeX entry CROSSREF-KEY.
 If `bibtex-files' is non-nil, search all these files.
 Otherwise the search is limited to the current buffer.
 Move point where the entry KEY should be placed.
 If `bibtex-maintain-sorted-entries' is non-nil, perform a binary
 search to look for place for KEY.  This requires that buffer is sorted,
 see `bibtex-validate'.
 Return t if preparation was successful or nil if entry KEY already exists."
+(bibtex-init-sort-entry-class-alist)  ; Needed by `bibtex-lessp'.
 (let ((key (nth 0 index))
 key-exist)
 (cond ((or (null key)
 (and (stringp key)
 (string-equal key ""))
 ;; Opt. arg called-by-reformat is t if bibtex-clean-entry
 ;; is called by bibtex-reformat
 (interactive "P")
 (let ((case-fold-search t)
 (start (bibtex-beginning-of-entry))
-(_ (looking-at bibtex-any-entry-maybe-empty-head))
+(_ (or (looking-at bibtex-any-entry-maybe-empty-head)
+	       (error "Not inside a BibTeX entry")))
 (entry-type (bibtex-type-in-head))
 (key (bibtex-key-in-head)))
 ;; formatting
 (cond ((bibtex-string= entry-type "preamble")
 ;; (bibtex-format-preamble)

Mercurial > emacs

comparison lisp/textmodes/bibtex.el @ 90428:a8190f7e546e