Mercurial > emacs
changeset 61439:267229876c56
(bibtex-autokey-titleword-ignore, bibtex-reference-key)
(bibtex-autokey-demangle-name, bibtex-mode): Use char-classes to accept
non-ascii letters, accepted in some recent bibtex implementations.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 10 Apr 2005 20:35:00 +0000 |
| parents | 35f1da1a7f48 |
| children | cc32b1ad8413 |
| files | lisp/textmodes/bibtex.el |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/textmodes/bibtex.el Sun Apr 10 20:31:02 2005 +0000 +++ b/lisp/textmodes/bibtex.el Sun Apr 10 20:35:00 2005 +0000 @@ -652,7 +652,7 @@ (defcustom bibtex-autokey-titleword-ignore '("A" "An" "On" "The" "Eine?" "Der" "Die" "Das" - "[^A-Z].*" ".*[^A-Z0-9].*") + "[^[:upper:]].*" ".*[^[:upper:]0-9].*") "Determines words from the title that are not to be used in the key. Each item of the list is a regexp. If a word of the title matches a regexp from that list, it is not included in the title part of the key. @@ -1078,10 +1078,10 @@ (defconst bibtex-entry-type (concat "@" bibtex-field-name) "Regexp matching the type part of a BibTeX entry.") -(defconst bibtex-reference-key "[][a-zA-Z0-9.:;?!`'/*@+|()<>&_^$-]+" +(defconst bibtex-reference-key "[][[:alnum:].:;?!`'/*@+|()<>&_^$-]+" "Regexp matching the reference key part of a BibTeX entry.") -(defconst bibtex-field-const "[][a-zA-Z0-9.:;?!`'/*@+=|<>&_^$-]+" +(defconst bibtex-field-const "[][[:alnum:].:;?!`'/*@+=|<>&_^$-]+" "Regexp matching a BibTeX field constant.") (defconst bibtex-entry-head @@ -2103,7 +2103,7 @@ (defun bibtex-autokey-demangle-name (fullname) "Get the last part from a well-formed FULLNAME and perform abbreviations." (let* (case-fold-search - (name (cond ((string-match "\\([A-Z][^, ]*\\)[^,]*," fullname) + (name (cond ((string-match "\\([[:upper:]][^, ]*\\)[^,]*," fullname) ;; Name is of the form "von Last, First" or ;; "von Last, Jr, First" ;; --> Take the first capital part before the comma @@ -2112,7 +2112,7 @@ ;; Strange name: we have a comma, but nothing capital ;; So we accept even lowercase names (match-string 1 fullname)) - ((string-match "\\(\\<[a-z][^ ]* +\\)+\\([A-Z][^ ]*\\)" + ((string-match "\\(\\<[[:lower:]][^ ]* +\\)+\\([[:upper:]][^ ]*\\)" fullname) ;; name is of the form "First von Last", "von Last", ;; "First von von Last", or "d'Last" @@ -2796,7 +2796,7 @@ (set (make-local-variable 'comment-start-skip) (concat (regexp-quote bibtex-comment-start) "\\>[ \t]*")) (set (make-local-variable 'comment-column) 0) - (set (make-local-variable 'defun-prompt-regexp) "^[ \t]*@[a-zA-Z0-9]+[ \t]*") + (set (make-local-variable 'defun-prompt-regexp) "^[ \t]*@[[:alnum:]]+[ \t]*") (set (make-local-variable 'outline-regexp) "[ \t]*@") (set (make-local-variable 'fill-paragraph-function) 'bibtex-fill-field) (set (make-local-variable 'fill-prefix) (make-string (+ bibtex-entry-offset @@ -2825,7 +2825,7 @@ ;; XEmacs needs easy-menu-add, Emacs does not care (easy-menu-add bibtex-edit-menu) (easy-menu-add bibtex-entry-menu) - (run-hooks 'bibtex-mode-hook)) + (run-mode-hooks 'bibtex-mode-hook)) (defun bibtex-field-list (entry-type) "Return list of allowed fields for entry ENTRY-TYPE.