[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/bibtex.el
From: |
Romain Francoise |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/bibtex.el |
Date: |
Sat, 01 Oct 2005 16:09:25 -0400 |
Index: emacs/lisp/textmodes/bibtex.el
diff -c emacs/lisp/textmodes/bibtex.el:1.99 emacs/lisp/textmodes/bibtex.el:1.100
*** emacs/lisp/textmodes/bibtex.el:1.99 Sun Sep 18 12:28:29 2005
--- emacs/lisp/textmodes/bibtex.el Sat Oct 1 20:09:22 2005
***************
*** 1120,1126 ****
"Regexp matching the name of a valid BibTeX entry.")
(defvar bibtex-valid-entry-whitespace-re
! (concat "[ \t\n]*\\(" bibtex-valid-entry-re "\\)")
"Regexp matching the name of a valid BibTeX entry preceded by whitespace.")
(defvar bibtex-any-valid-entry-re
--- 1120,1126 ----
"Regexp matching the name of a valid BibTeX entry.")
(defvar bibtex-valid-entry-whitespace-re
! (concat "[ \t]*\\(" bibtex-valid-entry-re "\\)")
"Regexp matching the name of a valid BibTeX entry preceded by whitespace.")
(defvar bibtex-any-valid-entry-re
***************
*** 2566,2599 ****
"Return summary of current BibTeX entry.
Used as default value of `bibtex-summary-function'."
;; It would be neat to customize this function. How?
! (save-excursion
! (if (looking-at bibtex-entry-maybe-empty-head)
! (let* ((bibtex-autokey-name-case-convert 'identity)
! (bibtex-autokey-name-length 'infty)
! (bibtex-autokey-names 1)
! (bibtex-autokey-names-stretch 0)
! (bibtex-autokey-name-separator " ")
! (bibtex-autokey-additional-names " etal")
! (names (bibtex-autokey-get-names))
! (bibtex-autokey-year-length 4)
! (year (bibtex-autokey-get-year))
! (bibtex-autokey-titlewords 5)
! (bibtex-autokey-titlewords-stretch 2)
! (bibtex-autokey-titleword-case-convert 'identity)
! (bibtex-autokey-titleword-length 5)
! (bibtex-autokey-titleword-separator " ")
! (title (bibtex-autokey-get-title))
! (journal (bibtex-autokey-get-field
! "journal" bibtex-autokey-transcriptions))
! (volume (bibtex-autokey-get-field "volume"))
! (pages (bibtex-autokey-get-field "pages" '(("-.*\\'" . "")))))
! (mapconcat (lambda (arg)
! (if (not (string= "" (cdr arg)))
! (concat (car arg) (cdr arg))))
! `((" " . ,names) (" " . ,year) (": " . ,title)
! (", " . ,journal) (" " . ,volume) (":" . ,pages))
! ""))
! (error "Entry not found"))))
(defun bibtex-pop (arg direction)
"Fill current field from the ARGth same field's text in DIRECTION.
--- 2566,2598 ----
"Return summary of current BibTeX entry.
Used as default value of `bibtex-summary-function'."
;; It would be neat to customize this function. How?
! (if (looking-at bibtex-entry-maybe-empty-head)
! (let* ((bibtex-autokey-name-case-convert 'identity)
! (bibtex-autokey-name-length 'infty)
! (bibtex-autokey-names 1)
! (bibtex-autokey-names-stretch 0)
! (bibtex-autokey-name-separator " ")
! (bibtex-autokey-additional-names " etal")
! (names (bibtex-autokey-get-names))
! (bibtex-autokey-year-length 4)
! (year (bibtex-autokey-get-year))
! (bibtex-autokey-titlewords 5)
! (bibtex-autokey-titlewords-stretch 2)
! (bibtex-autokey-titleword-case-convert 'identity)
! (bibtex-autokey-titleword-length 5)
! (bibtex-autokey-titleword-separator " ")
! (title (bibtex-autokey-get-title))
! (journal (bibtex-autokey-get-field
! "journal" bibtex-autokey-transcriptions))
! (volume (bibtex-autokey-get-field "volume"))
! (pages (bibtex-autokey-get-field "pages" '(("-.*\\'" . "")))))
! (mapconcat (lambda (arg)
! (if (not (string= "" (cdr arg)))
! (concat (car arg) (cdr arg))))
! `((" " . ,names) (" " . ,year) (": " . ,title)
! (", " . ,journal) (" " . ,volume) (":" . ,pages))
! ""))
! (error "Entry not found")))
(defun bibtex-pop (arg direction)
"Fill current field from the ARGth same field's text in DIRECTION.
***************
*** 3950,3958 ****
(insert " ")
(indent-to-column bibtex-text-indentation)))
(re-search-forward "[ \t\n]*=[ \t\n]*" end-field))
! (while (re-search-forward "[ \t\n]+" end-field 'move)
! (replace-match " "))
! (do-auto-fill)
(if move (goto-char end-field))))
(defun bibtex-fill-field (&optional justify)
--- 3949,3957 ----
(insert " ")
(indent-to-column bibtex-text-indentation)))
(re-search-forward "[ \t\n]*=[ \t\n]*" end-field))
! ;; Paragraphs within fields are not preserved. Bother?
! (fill-region-as-paragraph (line-beginning-position) end-field
! default-justification nil (point))
(if move (goto-char end-field))))
(defun bibtex-fill-field (&optional justify)
***************
*** 3992,4004 ****
(defun bibtex-realign ()
"Realign BibTeX entries such that they are separated by one blank line."
(goto-char (point-min))
! (let ((case-fold-search t))
;; No blank lines prior to the first valid entry if there no
;; non-white characters in front of it.
! (when (looking-at bibtex-valid-entry-whitespace-re)
(replace-match "\\1"))
;; Valid entries are separated by one blank line.
! (while (re-search-forward bibtex-valid-entry-whitespace-re nil t)
(replace-match "\n\n\\1"))
;; One blank line past the last valid entry if it is followed by
;; non-white characters, no blank line otherwise.
--- 3991,4004 ----
(defun bibtex-realign ()
"Realign BibTeX entries such that they are separated by one blank line."
(goto-char (point-min))
! (let ((case-fold-search t)
! (valid-entry (concat "[ \t\n]*\\(" bibtex-valid-entry-re "\\)")))
;; No blank lines prior to the first valid entry if there no
;; non-white characters in front of it.
! (when (looking-at valid-entry)
(replace-match "\\1"))
;; Valid entries are separated by one blank line.
! (while (re-search-forward valid-entry nil t)
(replace-match "\n\n\\1"))
;; One blank line past the last valid entry if it is followed by
;; non-white characters, no blank line otherwise.
- [Emacs-diffs] Changes to emacs/lisp/textmodes/bibtex.el,
Romain Francoise <=