[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-cite.el
|
From: |
Thien-Thi Nguyen |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-cite.el |
|
Date: |
Sat, 06 Aug 2005 13:41:31 -0400 |
Index: emacs/lisp/textmodes/reftex-cite.el
diff -c emacs/lisp/textmodes/reftex-cite.el:1.29
emacs/lisp/textmodes/reftex-cite.el:1.30
*** emacs/lisp/textmodes/reftex-cite.el:1.29 Mon Jul 4 16:45:00 2005
--- emacs/lisp/textmodes/reftex-cite.el Sat Aug 6 17:41:15 2005
***************
*** 1,6 ****
;;; reftex-cite.el --- creating citations with RefTeX
! ;; Copyright (c) 1997, 1998, 1999, 2000, 2003, 2004, 2005
! ;; Free Software Foundation, Inc.
;; Author: Carsten Dominik <address@hidden>
;; Version: 4.28
--- 1,7 ----
;;; reftex-cite.el --- creating citations with RefTeX
!
! ;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
! ;; 2005 Free Software Foundation, Inc.
;; Author: Carsten Dominik <address@hidden>
;; Version: 4.28
***************
*** 69,75 ****
(unless (eq (get 'reftex-default-bibliography :reftex-raw)
reftex-default-bibliography)
(put 'reftex-default-bibliography :reftex-expanded
! (reftex-locate-bibliography-files
default-directory reftex-default-bibliography))
(put 'reftex-default-bibliography :reftex-raw
reftex-default-bibliography))
--- 70,76 ----
(unless (eq (get 'reftex-default-bibliography :reftex-raw)
reftex-default-bibliography)
(put 'reftex-default-bibliography :reftex-expanded
! (reftex-locate-bibliography-files
default-directory reftex-default-bibliography))
(put 'reftex-default-bibliography :reftex-raw
reftex-default-bibliography))
***************
*** 128,134 ****
;; If RETURN is non-nil, just return the entry.
(let* ((re
! (if item
(concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}")
(concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key)
"[, \t\r\n}]")))
--- 129,135 ----
;; If RETURN is non-nil, just return the entry.
(let* ((re
! (if item
(concat "\\\\bibitem\\(\\[[^]]*\\]\\)?{" (regexp-quote key) "}")
(concat "@[a-zA-Z]+[ \t\n\r]*[{(][ \t\n\r]*" (regexp-quote key)
"[, \t\r\n}]")))
***************
*** 150,156 ****
(when return
;; Just return the relevant entry
(if item (goto-char (match-end 0)))
! (setq return (buffer-substring
(point) (reftex-end-of-bib-entry item)))
(set-buffer buffer-conf)
(throw 'exit return))
--- 151,157 ----
(when return
;; Just return the relevant entry
(if item (goto-char (match-end 0)))
! (setq return (buffer-substring
(point) (reftex-end-of-bib-entry item)))
(set-buffer buffer-conf)
(throw 'exit return))
***************
*** 166,174 ****
(error "No BibTeX entry with citation key %s" key)))))
(defun reftex-end-of-bib-entry (item)
! (save-excursion
(condition-case nil
! (if item
(progn (end-of-line)
(re-search-forward
"\\\\bibitem\\|\\end{thebibliography}")
--- 167,175 ----
(error "No BibTeX entry with citation key %s" key)))))
(defun reftex-end-of-bib-entry (item)
! (save-excursion
(condition-case nil
! (if item
(progn (end-of-line)
(re-search-forward
"\\\\bibitem\\|\\end{thebibliography}")
***************
*** 189,204 ****
;; Read a regexp, completing on known citation keys.
(setq default (regexp-quote (reftex-get-bibkey-default)))
! (setq re-list
! (split-string
! (completing-read
(concat
"Regex { && Regex...}: "
"[" default "]: ")
(if reftex-mode
(if (fboundp 'LaTeX-bibitem-list)
(LaTeX-bibitem-list)
! (cdr (assoc 'bibview-cache
(symbol-value reftex-docstruct-symbol))))
nil)
nil nil nil 'reftex-cite-regexp-hist)
--- 190,205 ----
;; Read a regexp, completing on known citation keys.
(setq default (regexp-quote (reftex-get-bibkey-default)))
! (setq re-list
! (split-string
! (completing-read
(concat
"Regex { && Regex...}: "
"[" default "]: ")
(if reftex-mode
(if (fboundp 'LaTeX-bibitem-list)
(LaTeX-bibitem-list)
! (cdr (assoc 'bibview-cache
(symbol-value reftex-docstruct-symbol))))
nil)
nil nil nil 'reftex-cite-regexp-hist)
***************
*** 245,251 ****
(error (goto-char key-point)
(throw 'search-again nil)))
(setq end-point (point))
!
;; Ignore @string, @comment and @c entries or things
;; outside entries
(when (or (string= (downcase (match-string 2)) "string")
--- 246,252 ----
(error (goto-char key-point)
(throw 'search-again nil)))
(setq end-point (point))
!
;; Ignore @string, @comment and @c entries or things
;; outside entries
(when (or (string= (downcase (match-string 2)) "string")
***************
*** 254,265 ****
(< (point) key-point)) ; this means match not in {}
(goto-char key-point)
(throw 'search-again nil))
!
;; Well, we have got a match
;;(setq entry (concat
;; (buffer-substring start-point (point)) "\n"))
(setq entry (buffer-substring start-point (point)))
!
;; Check if other regexp match as well
(setq re-list rest-re)
(while re-list
--- 255,266 ----
(< (point) key-point)) ; this means match not in {}
(goto-char key-point)
(throw 'search-again nil))
!
;; Well, we have got a match
;;(setq entry (concat
;; (buffer-substring start-point (point)) "\n"))
(setq entry (buffer-substring start-point (point)))
!
;; Check if other regexp match as well
(setq re-list rest-re)
(while re-list
***************
*** 267,290 ****
;; nope - move on
(throw 'search-again nil))
(pop re-list))
!
(setq alist (reftex-parse-bibtex-entry
nil start-point end-point))
(push (cons "&entry" entry) alist)
!
;; check for crossref entries
(if (assoc "crossref" alist)
(setq alist
(append
alist (reftex-get-crossref-alist alist))))
!
;; format the entry
(push (cons "&formatted" (reftex-format-bib-entry alist))
alist)
!
;; make key the first element
(push (reftex-get-bib-field "&key" alist) alist)
!
;; add it to the list
(push alist found-list)))))
(reftex-kill-temporary-buffers))))
--- 268,291 ----
;; nope - move on
(throw 'search-again nil))
(pop re-list))
!
(setq alist (reftex-parse-bibtex-entry
nil start-point end-point))
(push (cons "&entry" entry) alist)
!
;; check for crossref entries
(if (assoc "crossref" alist)
(setq alist
(append
alist (reftex-get-crossref-alist alist))))
!
;; format the entry
(push (cons "&formatted" (reftex-format-bib-entry alist))
alist)
!
;; make key the first element
(push (reftex-get-bib-field "&key" alist) alist)
!
;; add it to the list
(push alist found-list)))))
(reftex-kill-temporary-buffers))))
***************
*** 347,353 ****
(unless files
(error "Need file name to find thebibliography environment"))
(while (setq file (pop files))
! (setq buf (reftex-get-file-buffer-force
file (not reftex-keep-temporary-buffers)))
(unless buf
(error "No such file %s" file))
--- 348,354 ----
(unless files
(error "Need file name to find thebibliography environment"))
(while (setq file (pop files))
! (setq buf (reftex-get-file-buffer-force
file (not reftex-keep-temporary-buffers)))
(unless buf
(error "No such file %s" file))
***************
*** 358,378 ****
(save-restriction
(widen)
(goto-char (point-min))
! (while (re-search-forward
"\\(\\`\\|[\n\r]\\)[ \t]*\\\\begin{thebibliography}" nil t)
(beginning-of-line 2)
(setq start (point))
! (if (re-search-forward
"\\(\\`\\|[\n\r]\\)[ \t]*\\\\end{thebibliography}" nil t)
(progn
(beginning-of-line 1)
(setq end (point))))
(when (and start end)
! (setq entries
(append entries
(mapcar 'reftex-parse-bibitem
(delete ""
! (split-string
(buffer-substring-no-properties start end)
"[ \t\n\r]*\\\\bibitem\\(\\[[^]]*]\\)*"))))))
(goto-char end)))))
--- 359,379 ----
(save-restriction
(widen)
(goto-char (point-min))
! (while (re-search-forward
"\\(\\`\\|[\n\r]\\)[ \t]*\\\\begin{thebibliography}" nil t)
(beginning-of-line 2)
(setq start (point))
! (if (re-search-forward
"\\(\\`\\|[\n\r]\\)[ \t]*\\\\end{thebibliography}" nil t)
(progn
(beginning-of-line 1)
(setq end (point))))
(when (and start end)
! (setq entries
(append entries
(mapcar 'reftex-parse-bibitem
(delete ""
! (split-string
(buffer-substring-no-properties start end)
"[ \t\n\r]*\\\\bibitem\\(\\[[^]]*]\\)*"))))))
(goto-char end)))))
***************
*** 381,396 ****
;; Read a regexp, completing on known citation keys.
(setq default (regexp-quote (reftex-get-bibkey-default)))
! (setq re-list
! (split-string
! (completing-read
(concat
"Regex { && Regex...}: "
"[" default "]: ")
(if reftex-mode
(if (fboundp 'LaTeX-bibitem-list)
(LaTeX-bibitem-list)
! (cdr (assoc 'bibview-cache
(symbol-value reftex-docstruct-symbol))))
nil)
nil nil nil 'reftex-cite-regexp-hist)
--- 382,397 ----
;; Read a regexp, completing on known citation keys.
(setq default (regexp-quote (reftex-get-bibkey-default)))
! (setq re-list
! (split-string
! (completing-read
(concat
"Regex { && Regex...}: "
"[" default "]: ")
(if reftex-mode
(if (fboundp 'LaTeX-bibitem-list)
(LaTeX-bibitem-list)
! (cdr (assoc 'bibview-cache
(symbol-value reftex-docstruct-symbol))))
nil)
nil nil nil 'reftex-cite-regexp-hist)
***************
*** 403,416 ****
(error "Empty regular expression"))
(while (and (setq re (pop re-list)) entries)
! (setq entries
(delq nil (mapcar
(lambda (x)
(if (string-match re (cdr (assoc "&entry" x)))
x nil))
entries))))
! (setq entries
! (mapcar
(lambda (x)
(push (cons "&formatted" (reftex-format-bibitem x)) x)
(push (reftex-get-bib-field "&key" x) x)
--- 404,417 ----
(error "Empty regular expression"))
(while (and (setq re (pop re-list)) entries)
! (setq entries
(delq nil (mapcar
(lambda (x)
(if (string-match re (cdr (assoc "&entry" x)))
x nil))
entries))))
! (setq entries
! (mapcar
(lambda (x)
(push (cons "&formatted" (reftex-format-bibitem x)) x)
(push (reftex-get-bib-field "&key" x) x)
***************
*** 654,662 ****
;; FIXME: Unfortunately, this meens that commenting does not work right.
(pop selected-entries)
(let ((concat-keys (mapconcat 'car selected-entries ",")))
! (setq insert-entries
(list (list concat-keys (cons "&key" concat-keys))))))
!
(unless no-insert
;; We shall insert this into the buffer...
--- 655,663 ----
;; FIXME: Unfortunately, this meens that commenting does not work right.
(pop selected-entries)
(let ((concat-keys (mapconcat 'car selected-entries ",")))
! (setq insert-entries
(list (list concat-keys (cons "&key" concat-keys))))))
!
(unless no-insert
;; We shall insert this into the buffer...
***************
*** 683,689 ****
;; it has to go. If there is only a single arg and empty, it can go
;; as well.
(when reftex-cite-cleanup-optional-args
! (cond
((string-match "\\([a-zA-Z0-9]\\)\\[\\]{" string)
(setq string (replace-match "\\1{" nil nil string)))
((string-match "\\[\\]\\(\\[[a-zA-Z0-9., ]+\\]\\)" string)
--- 684,690 ----
;; it has to go. If there is only a single arg and empty, it can go
;; as well.
(when reftex-cite-cleanup-optional-args
! (cond
((string-match "\\([a-zA-Z0-9]\\)\\[\\]{" string)
(setq string (replace-match "\\1{" nil nil string)))
((string-match "\\[\\]\\(\\[[a-zA-Z0-9., ]+\\]\\)" string)
***************
*** 698,711 ****
(delete-char 1))
;; Tell AUCTeX
! (when (and reftex-mode
(fboundp 'LaTeX-add-bibitems)
reftex-plug-into-AUCTeX)
(apply 'LaTeX-add-bibitems (mapcar 'car selected-entries)))
!
;; Produce the cite-view strings
(when (and reftex-mode reftex-cache-cite-echo cite-view)
! (mapcar (lambda (entry)
(reftex-make-cite-echo-string entry docstruct-symbol))
selected-entries))
--- 699,712 ----
(delete-char 1))
;; Tell AUCTeX
! (when (and reftex-mode
(fboundp 'LaTeX-add-bibitems)
reftex-plug-into-AUCTeX)
(apply 'LaTeX-add-bibitems (mapcar 'car selected-entries)))
!
;; Produce the cite-view strings
(when (and reftex-mode reftex-cache-cite-echo cite-view)
! (mapcar (lambda (entry)
(reftex-make-cite-echo-string entry docstruct-symbol))
selected-entries))
***************
*** 713,728 ****
(set-marker reftex-select-return-marker nil)
(reftex-kill-buffer "*RefTeX Select*")
!
;; Check if the prefix arg was numeric, and call recursively
(when (integerp arg)
(if (> arg 1)
! (progn
(skip-chars-backward "}")
(decf arg)
(reftex-do-citation arg))
(forward-char 1)))
!
;; Return the citation key
(car (car selected-entries))))
--- 714,729 ----
(set-marker reftex-select-return-marker nil)
(reftex-kill-buffer "*RefTeX Select*")
!
;; Check if the prefix arg was numeric, and call recursively
(when (integerp arg)
(if (> arg 1)
! (progn
(skip-chars-backward "}")
(decf arg)
(reftex-do-citation arg))
(forward-char 1)))
!
;; Return the citation key
(car (car selected-entries))))
***************
*** 736,742 ****
(no-insert
;; Format does not really matter because nothing will be inserted.
(setq format "%l"))
!
((and (stringp macro)
(string-match "\\`\\\\cite\\|cite\\'" macro))
;; We are already inside a cite macro
--- 737,743 ----
(no-insert
;; Format does not really matter because nothing will be inserted.
(setq format "%l"))
!
((and (stringp macro)
(string-match "\\`\\\\cite\\|cite\\'" macro))
;; We are already inside a cite macro
***************
*** 757,763 ****
(when (listp format)
(setq key
(or format-key
! (reftex-select-with-char
"" (concat "SELECT A CITATION FORMAT\n\n"
(mapconcat
(lambda (x)
--- 758,764 ----
(when (listp format)
(setq key
(or format-key
! (reftex-select-with-char
"" (concat "SELECT A CITATION FORMAT\n\n"
(mapconcat
(lambda (x)
***************
*** 786,793 ****
(let ((bibtype (reftex-bib-or-thebib))
found-list rtn key data selected-entries)
! (while
! (not
(catch 'done
;; Scan bibtex files
(setq found-list
--- 787,794 ----
(let ((bibtype (reftex-bib-or-thebib))
found-list rtn key data selected-entries)
! (while
! (not
(catch 'done
;; Scan bibtex files
(setq found-list
***************
*** 802,821 ****
(reftex-extract-bib-entries-from-thebibliography
(reftex-uniquify
(mapcar 'cdr
! (reftex-all-assq
'thebib (symbol-value reftex-docstruct-symbol))))))
(reftex-default-bibliography
(message "Using default bibliography")
(reftex-extract-bib-entries (reftex-default-bibliography)))
(t (error "No valid bibliography in this document, and no
default available"))))
!
(unless found-list
(error "Sorry, no matches found"))
!
;; Remember where we came from
(setq reftex-call-back-to-this-buffer (current-buffer))
(set-marker reftex-select-return-marker (point))
!
;; Offer selection
(save-window-excursion
(delete-other-windows)
--- 803,822 ----
(reftex-extract-bib-entries-from-thebibliography
(reftex-uniquify
(mapcar 'cdr
! (reftex-all-assq
'thebib (symbol-value reftex-docstruct-symbol))))))
(reftex-default-bibliography
(message "Using default bibliography")
(reftex-extract-bib-entries (reftex-default-bibliography)))
(t (error "No valid bibliography in this document, and no
default available"))))
!
(unless found-list
(error "Sorry, no matches found"))
!
;; Remember where we came from
(setq reftex-call-back-to-this-buffer (current-buffer))
(set-marker reftex-select-return-marker (point))
!
;; Offer selection
(save-window-excursion
(delete-other-windows)
***************
*** 856,870 ****
(goto-char 1))
((eq key ?A)
;; Take all (marked)
! (setq selected-entries
(if reftex-select-marked
(mapcar 'car (nreverse reftex-select-marked))
found-list))
(throw 'done t))
((eq key ?a)
;; Take all (marked), and push the symbol 'concat
! (setq selected-entries
! (cons 'concat
(if reftex-select-marked
(mapcar 'car (nreverse reftex-select-marked))
found-list)))
--- 857,871 ----
(goto-char 1))
((eq key ?A)
;; Take all (marked)
! (setq selected-entries
(if reftex-select-marked
(mapcar 'car (nreverse reftex-select-marked))
found-list))
(throw 'done t))
((eq key ?a)
;; Take all (marked), and push the symbol 'concat
! (setq selected-entries
! (cons 'concat
(if reftex-select-marked
(mapcar 'car (nreverse reftex-select-marked))
found-list)))
***************
*** 883,891 ****
((or (eq key ?\C-m)
(eq key 'return))
;; Take selected
! (setq selected-entries
(if reftex-select-marked
! (cons 'concat
(mapcar 'car (nreverse reftex-select-marked)))
(if data (list data) nil)))
(throw 'done t))
--- 884,892 ----
((or (eq key ?\C-m)
(eq key 'return))
;; Take selected
! (setq selected-entries
(if reftex-select-marked
! (cons 'concat
(mapcar 'car (nreverse reftex-select-marked)))
(if data (list data) nil)))
(throw 'done t))
***************
*** 925,931 ****
(let ((file (read-file-name "File to create: ")))
(find-file-other-window file)
(if (> (buffer-size) 0)
! (unless (yes-or-no-p
(format "Overwrite non-empty file %s? " file))
(error "Abort")))
(erase-buffer)
--- 926,932 ----
(let ((file (read-file-name "File to create: ")))
(find-file-other-window file)
(if (> (buffer-size) 0)
! (unless (yes-or-no-p
(format "Overwrite non-empty file %s? " file))
(error "Abort")))
(erase-buffer)
***************
*** 950,956 ****
reftex-mouse-selected-face
nil))
tmp len)
! (mapcar
(lambda (x)
(setq tmp (cdr (assoc "&formatted" x))
len (length tmp))
--- 951,957 ----
reftex-mouse-selected-face
nil))
tmp len)
! (mapcar
(lambda (x)
(setq tmp (cdr (assoc "&formatted" x))
len (length tmp))
***************
*** 1045,1051 ****
(defun reftex-make-cite-echo-string (entry docstruct-symbol)
;; Format a bibtex entry for the echo area and cache the result.
(let* ((key (reftex-get-bib-field "&key" entry))
! (string
(let* ((reftex-cite-punctuation '(" " " & " " etal.")))
(reftex-format-citation entry reftex-cite-view-format)))
(cache (assq 'bibview-cache (symbol-value docstruct-symbol)))
--- 1046,1052 ----
(defun reftex-make-cite-echo-string (entry docstruct-symbol)
;; Format a bibtex entry for the echo area and cache the result.
(let* ((key (reftex-get-bib-field "&key" entry))
! (string
(let* ((reftex-cite-punctuation '(" " " & " " etal.")))
(reftex-format-citation entry reftex-cite-view-format)))
(cache (assq 'bibview-cache (symbol-value docstruct-symbol)))
***************
*** 1087,1093 ****
(setq bibfile-list
(reftex-uniquify
(mapcar 'cdr
! (reftex-all-assq
'thebib (symbol-value reftex-docstruct-symbol))))
item t))
(reftex-default-bibliography
--- 1088,1094 ----
(setq bibfile-list
(reftex-uniquify
(mapcar 'cdr
! (reftex-all-assq
'thebib (symbol-value reftex-docstruct-symbol))))
item t))
(reftex-default-bibliography
***************
*** 1098,1107 ****
(setq bibfile-list (reftex-visited-files bibfile-list)))
(condition-case nil
! (reftex-pop-to-bibtex-entry
key bibfile-list (not reftex-keep-temporary-buffers) t item)
(error (ding))))
!
(select-window win)))
;;; Global BibTeX file
--- 1099,1108 ----
(setq bibfile-list (reftex-visited-files bibfile-list)))
(condition-case nil
! (reftex-pop-to-bibtex-entry
key bibfile-list (not reftex-keep-temporary-buffers) t item)
(error (ding))))
!
(select-window win)))
;;; Global BibTeX file
***************
*** 1130,1136 ****
"Create a new BibTeX database file with all entries referenced in document.
The command prompts for a filename and writes the collected entries to
that file. Only entries referenced in the current document with
! any \\cite-like macros are used.
The sequence in the new file is the same as it was in the old database."
(interactive "FNew BibTeX file: ")
(let ((keys (reftex-all-used-citation-keys))
--- 1131,1137 ----
"Create a new BibTeX database file with all entries referenced in document.
The command prompts for a filename and writes the collected entries to
that file. Only entries referenced in the current document with
! any \\cite-like macros are used.
The sequence in the new file is the same as it was in the old database."
(interactive "FNew BibTeX file: ")
(let ((keys (reftex-all-used-citation-keys))
***************
*** 1144,1150 ****
(save-restriction
(widen)
(goto-char (point-min))
! (while (re-search-forward
"^[ address@hidden \t]*{\\([^ \t\r\n]+\\),"
nil t)
(setq key (match-string 1)
--- 1145,1151 ----
(save-restriction
(widen)
(goto-char (point-min))
! (while (re-search-forward
"^[ address@hidden \t]*{\\([^ \t\r\n]+\\),"
nil t)
(setq key (match-string 1)
***************
*** 1161,1167 ****
keys (delete key keys)))))))))
(find-file-other-window bibfile)
(if (> (buffer-size) 0)
! (unless (yes-or-no-p
(format "Overwrite non-empty file %s? " bibfile))
(error "Abort")))
(erase-buffer)
--- 1162,1168 ----
keys (delete key keys)))))))))
(find-file-other-window bibfile)
(if (> (buffer-size) 0)
! (unless (yes-or-no-p
(format "Overwrite non-empty file %s? " bibfile))
(error "Abort")))
(erase-buffer)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/textmodes/reftex-cite.el,
Thien-Thi Nguyen <=