* textmodes/reftex-cite.el (reftex-format-citation): Add format

[gnu-emacs] / lisp / textmodes / reftex-cite.el

diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 5edd9f24122b19f6a0bea1a2c568f650a7748840..079101b56ee9b1eb2bfa16962eb4d2edc161d0c4 100644 (file)
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -1,12 +1,9 @@
 ;;; reftex-cite.el --- creating citations with RefTeX
 
 ;;; reftex-cite.el --- creating citations with RefTeX
 

-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1997-2013 Free Software Foundation, Inc.

 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Maintainer: auctex-devel@gnu.org

-;; Version: 4.31
-;; Package: reftex

 
 ;; This file is part of GNU Emacs.
 
 
 ;; This file is part of GNU Emacs.
 


@@ -70,14 +67,14 @@
   (unless (eq (get 'reftex-default-bibliography :reftex-raw)
               reftex-default-bibliography)
     (put 'reftex-default-bibliography :reftex-expanded
   (unless (eq (get 'reftex-default-bibliography :reftex-raw)
               reftex-default-bibliography)
     (put 'reftex-default-bibliography :reftex-expanded

-         (reftex-locate-bibliography-files 
+         (reftex-locate-bibliography-files

           default-directory reftex-default-bibliography))
     (put 'reftex-default-bibliography :reftex-raw
          reftex-default-bibliography))
   (get 'reftex-default-bibliography :reftex-expanded))
 
 (defun reftex-bib-or-thebib ()
           default-directory reftex-default-bibliography))
     (put 'reftex-default-bibliography :reftex-raw
          reftex-default-bibliography))
   (get 'reftex-default-bibliography :reftex-expanded))
 
 (defun reftex-bib-or-thebib ()

-  ;; Tests if BibTeX or \begin{tehbibliography} should be used for the
+  ;; Tests if BibTeX or \begin{thebibliography} should be used for the

   ;; citation
   ;; Find the bof of the current file
   (let* ((docstruct (symbol-value reftex-docstruct-symbol))
   ;; citation
   ;; Find the bof of the current file
   (let* ((docstruct (symbol-value reftex-docstruct-symbol))


@@ -129,10 +126,11 @@
   ;; If RETURN is non-nil, just return the entry and restore point.
 
   (let* ((re
   ;; If RETURN is non-nil, just return the entry and restore point.
 
   (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}]")))
+          (if item
+              (concat "\\\\bibitem[ \t]*\\(\\[[^]]*\\]\\)?[ \t]*{"
+                     (regexp-quote key) "}")
+            (concat "@\\(?:\\w\\|\\s_\\)+[ \t\n\r]*[{(][ \t\n\r]*"
+                   (regexp-quote key) "[, \t\r\n}]")))

          (buffer-conf (current-buffer))
          file buf pos oldpos)
 
          (buffer-conf (current-buffer))
          file buf pos oldpos)
 


@@ -153,7 +151,7 @@
           (when return
             ;; Just return the relevant entry
             (if item (goto-char (match-end 0)))
           (when return
             ;; Just return the relevant entry
             (if item (goto-char (match-end 0)))

-            (setq return (buffer-substring 
+            (setq return (buffer-substring

                           (point) (reftex-end-of-bib-entry item)))
            (goto-char oldpos) ;; restore point.
             (set-buffer buffer-conf)
                           (point) (reftex-end-of-bib-entry item)))
            (goto-char oldpos) ;; restore point.
             (set-buffer buffer-conf)


@@ -170,9 +168,9 @@
         (error "No BibTeX entry with citation key %s" key)))))
 
 (defun reftex-end-of-bib-entry (item)
         (error "No BibTeX entry with citation key %s" key)))))
 
 (defun reftex-end-of-bib-entry (item)

-  (save-excursion 
+  (save-excursion

     (condition-case nil
     (condition-case nil

-        (if item 
+        (if item

             (progn (end-of-line)
                    (re-search-forward
                     "\\\\bibitem\\|\\end{thebibliography}")
             (progn (end-of-line)
                    (re-search-forward
                     "\\\\bibitem\\|\\end{thebibliography}")


@@ -193,16 +191,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))

-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read

             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)

-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache

                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)


@@ -230,7 +228,13 @@
                            buffer (not reftex-keep-temporary-buffers))))
           (if (not buffer1)
               (message "No such BibTeX file %s (ignored)" buffer)
                            buffer (not reftex-keep-temporary-buffers))))
           (if (not buffer1)
               (message "No such BibTeX file %s (ignored)" buffer)

-            (message "Scanning bibliography database %s" buffer1))
+            (message "Scanning bibliography database %s" buffer1)
+           (unless (verify-visited-file-modtime buffer1)
+                (when (y-or-n-p
+                       (format "File %s changed on disk.  Reread from disk? "
+                               (file-name-nondirectory
+                                (buffer-file-name buffer1))))
+                  (with-current-buffer buffer1 (revert-buffer t t)))))

 
           (set-buffer buffer1)
           (reftex-with-special-syntax-for-bib
 
           (set-buffer buffer1)
           (reftex-with-special-syntax-for-bib


@@ -239,8 +243,8 @@
              (while (re-search-forward first-re nil t)
                (catch 'search-again
                  (setq key-point (point))
              (while (re-search-forward first-re nil t)
                (catch 'search-again
                  (setq key-point (point))

-                 (unless (re-search-backward
-                          "\\(\\`\\|[\n\r]\\)[ \t]*@\\([a-zA-Z]+\\)[ \t\n\r]*[{(]" nil t)
+                 (unless (re-search-backward "\\(\\`\\|[\n\r]\\)[ \t]*\
+@\\(\\(?:\\w\\|\\s_\\)+\\)[ \t\n\r]*[{(]" nil t)

                    (throw 'search-again nil))
                  (setq start-point (point))
                  (goto-char (match-end 0))
                    (throw 'search-again nil))
                  (setq start-point (point))
                  (goto-char (match-end 0))


@@ -249,7 +253,7 @@
                    (error (goto-char key-point)
                           (throw 'search-again nil)))
                  (setq end-point (point))
                    (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")
                  ;; Ignore @string, @comment and @c entries or things
                  ;; outside entries
                  (when (or (string= (downcase (match-string 2)) "string")


@@ -258,12 +262,12 @@
                            (< (point) key-point)) ; this means match not in {}
                    (goto-char key-point)
                    (throw 'search-again nil))
                            (< (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)))
                  ;; 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
                  ;; Check if other regexp match as well
                  (setq re-list rest-re)
                  (while re-list


@@ -271,24 +275,24 @@
                      ;; nope - move on
                      (throw 'search-again nil))
                    (pop re-list))
                      ;; 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)
                  (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))))
                  ;; 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)
                  ;; 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)
                  ;; 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))))
                  ;; add it to the list
                  (push alist found-list)))))
           (reftex-kill-temporary-buffers))))


@@ -351,7 +355,7 @@
     (unless files
       (error "Need file name to find thebibliography environment"))
     (while (setq file (pop files))
     (unless files
       (error "Need file name to find thebibliography environment"))
     (while (setq file (pop files))

-      (setq buf (reftex-get-file-buffer-force 
+      (setq buf (reftex-get-file-buffer-force

                  file (not reftex-keep-temporary-buffers)))
       (unless buf
         (error "No such file %s" file))
                  file (not reftex-keep-temporary-buffers)))
       (unless buf
         (error "No such file %s" file))


@@ -379,7 +383,7 @@
                                              (split-string
                                               (buffer-substring-no-properties
                                                start end)
                                              (split-string
                                               (buffer-substring-no-properties
                                                start end)

-                                              "[ \t\n\r]*\\\\bibitem\
+                                              "[ \t\n\r]*\\\\bibitem[ \t]*\

 \\(\\[[^]]*]\\)*\[ \t]*"))))))
              (goto-char end))))))
     (unless entries
 \\(\\[[^]]*]\\)*\[ \t]*"))))))
              (goto-char end))))))
     (unless entries


@@ -387,16 +391,16 @@
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))
 
     ;; Read a regexp, completing on known citation keys.
     (setq default (regexp-quote (reftex-get-bibkey-default)))

-    (setq re-list 
-          (split-string 
-           (completing-read 
+    (setq re-list
+          (split-string
+           (completing-read

             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)
             (concat
              "Regex { && Regex...}: "
              "[" default "]: ")
             (if reftex-mode
                 (if (fboundp 'LaTeX-bibitem-list)
                     (LaTeX-bibitem-list)

-                  (cdr (assoc 'bibview-cache 
+                  (cdr (assoc 'bibview-cache

                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)
                               (symbol-value reftex-docstruct-symbol))))
               nil)
             nil nil nil 'reftex-cite-regexp-hist)


@@ -409,14 +413,14 @@
         (error "Empty regular expression"))
 
     (while (and (setq re (pop re-list)) entries)
         (error "Empty regular expression"))
 
     (while (and (setq re (pop re-list)) entries)

-      (setq entries 
+      (setq entries

             (delq nil (mapcar
                        (lambda (x)
                          (if (string-match re (cdr (assoc "&entry" x)))
                              x nil))
                        entries))))
             (delq nil (mapcar
                        (lambda (x)
                          (if (string-match re (cdr (assoc "&entry" x)))
                              x nil))
                        entries))))

-    (setq entries 
-          (mapcar 
+    (setq entries
+          (mapcar

             (lambda (x)
               (push (cons "&formatted" (reftex-format-bibitem x)) x)
               (push (reftex-get-bib-field "&key" x) x)
             (lambda (x)
               (push (cons "&formatted" (reftex-format-bibitem x)) x)
               (push (reftex-get-bib-field "&key" x) x)


@@ -452,7 +456,8 @@
       (setq names (replace-match " " nil t names)))
     (split-string names "\n")))
 
       (setq names (replace-match " " nil t names)))
     (split-string names "\n")))
 

-(defun reftex-parse-bibtex-entry (entry &optional from to)
+(defun reftex-parse-bibtex-entry (entry &optional from to raw)
+  ; if RAW is non-nil, keep double quotes/curly braces delimiting fields

   (let (alist key start field)
     (save-excursion
       (save-restriction
   (let (alist key start field)
     (save-excursion
       (save-restriction


@@ -464,41 +469,56 @@
               (erase-buffer)
               (insert entry))
           (widen)
               (erase-buffer)
               (insert entry))
           (widen)

-          (narrow-to-region from to))
+          (if (and from to) (narrow-to-region from to)))

         (goto-char (point-min))
 
         (goto-char (point-min))
 

-        (if (re-search-forward
-             "@\\(\\w+\\)[ \t\n\r]*[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t)
+        (if (re-search-forward "@\\(\\(?:\\w\\|\\s_\\)+\\)[ \t\n\r]*\
+\[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t)

             (setq alist
                   (list
                    (cons "&type" (downcase (reftex-match-string 1)))
                    (cons "&key"  (reftex-match-string 2)))))
             (setq alist
                   (list
                    (cons "&type" (downcase (reftex-match-string 1)))
                    (cons "&key"  (reftex-match-string 2)))))

-        (while (re-search-forward "\\(\\w+\\)[ \t\n\r]*=[ \t\n\r]*" nil t)
+        (while (re-search-forward "\\(\\(?:\\w\\|-\\)+\\)[ \t\n\r]*=[ \t\n\r]*"
+                                 nil t)

           (setq key (downcase (reftex-match-string 1)))
           (cond
            ((= (following-char) ?{)
           (setq key (downcase (reftex-match-string 1)))
           (cond
            ((= (following-char) ?{)

-            (forward-char 1)
-            (setq start (point))
-            (condition-case nil
-                (up-list 1)
-              (error nil)))
+            (cond
+             (raw
+              (setq start (point))
+              (forward-char 1))
+             (t
+              (forward-char 1)
+              (setq start (point))
+              (condition-case nil
+                  (up-list 1)
+                (error nil)))))

            ((= (following-char) ?\")
            ((= (following-char) ?\")

-            (forward-char 1)
-            (setq start (point))
+            (cond
+             (raw
+              (setq start (point))
+              (forward-char 1))
+             (t
+              (forward-char 1)
+              (setq start (point))))

             (while (and (search-forward "\"" nil t)
                         (= ?\\ (char-after (- (point) 2))))))
            (t
             (setq start (point))
             (re-search-forward "[ \t]*[\n\r,}]" nil 1)))
             (while (and (search-forward "\"" nil t)
                         (= ?\\ (char-after (- (point) 2))))))
            (t
             (setq start (point))
             (re-search-forward "[ \t]*[\n\r,}]" nil 1)))

-          (setq field (buffer-substring-no-properties start (1- (point))))
+          ;; extract field value, ignore trailing comma if in RAW mode
+          (let ((stop (if (and raw (not (= (char-after (1- (point))) ?,)))
+                        (point)
+                        (1- (point))) ))
+            (setq field (buffer-substring-no-properties start stop)))

           ;; remove extra whitespace
           (while (string-match "[\n\t\r]\\|[ \t][ \t]+" field)
             (setq field (replace-match " " nil t field)))
           ;; remove leading garbage
           ;; remove extra whitespace
           (while (string-match "[\n\t\r]\\|[ \t][ \t]+" field)
             (setq field (replace-match " " nil t field)))
           ;; remove leading garbage

-          (if (string-match "^[ \t{]+" field)
+          (if (string-match (if raw "^[ \t]+" "^[ \t{]+") field)

               (setq field (replace-match "" nil t field)))
           ;; remove trailing garbage
               (setq field (replace-match "" nil t field)))
           ;; remove trailing garbage

-          (if (string-match "[ \t}]+$" field)
+          (if (string-match (if raw "[ \t]+$" "[ \t}]+$") field)

               (setq field (replace-match "" nil t field)))
           (push (cons key field) alist))))
     alist))
               (setq field (replace-match "" nil t field)))
           (push (cons key field) alist))))
     alist))


@@ -543,10 +563,7 @@
          (t ""))))
     (setq authors (reftex-truncate authors 30 t t))
     (when (reftex-use-fonts)
          (t ""))))
     (setq authors (reftex-truncate authors 30 t t))
     (when (reftex-use-fonts)

-      (put-text-property 0 (length key)     'face
-                         (reftex-verified-face reftex-label-face
-                                               'font-lock-constant-face
-                                               'font-lock-reference-face)
+      (put-text-property 0 (length key)     'face reftex-label-face

                          key)
       (put-text-property 0 (length authors) 'face reftex-bib-author-face
                          authors)
                          key)
       (put-text-property 0 (length authors) 'face reftex-bib-author-face
                          authors)


@@ -642,26 +659,25 @@ While entering the regexp, completion on knows citation keys is possible.
          (insert-entries selected-entries)
          entry string cite-view)
 
          (insert-entries selected-entries)
          entry string cite-view)
 

-    (when (stringp selected-entries)
-      (error selected-entries))

     (unless selected-entries (error "Quit"))
 
     (if (stringp selected-entries)
         ;; Nonexistent entry
     (unless selected-entries (error "Quit"))
 
     (if (stringp selected-entries)
         ;; Nonexistent entry

-        (setq selected-entries nil
-              insert-entries (list (list selected-entries
-                                         (cons "&key" selected-entries))))
+        (setq insert-entries (list (list selected-entries
+                                         (cons "&key" selected-entries)))
+             selected-entries nil)

       ;; It makes sense to compute the cite-view strings.
       (setq cite-view t))
 
     (when (eq (car selected-entries) 'concat)
       ;; All keys go into a single command - we need to trick a little
       ;; It makes sense to compute the cite-view strings.
       (setq cite-view t))
 
     (when (eq (car selected-entries) 'concat)
       ;; All keys go into a single command - we need to trick a little

-      ;; FIXME: Unfortunately, this meens that commenting does not work right.
+      ;; FIXME: Unfortunately, this means that commenting does not work right.

       (pop selected-entries)
       (pop selected-entries)

-      (let ((concat-keys (mapconcat 'car selected-entries ",")))
-        (setq insert-entries 
+      (let ((concat-keys (mapconcat 'car selected-entries
+                                   reftex-cite-key-separator)))
+        (setq insert-entries

               (list (list concat-keys (cons "&key" concat-keys))))))
               (list (list concat-keys (cons "&key" concat-keys))))))

-    
+

     (unless no-insert
 
       ;; We shall insert this into the buffer...
     (unless no-insert
 
       ;; We shall insert this into the buffer...


@@ -679,8 +695,9 @@ While entering the regexp, completion on knows citation keys is possible.
                        (equal arg '(4))))
           (let ((start 0) (nth 0) value)
             (while (setq start (string-match "\\[\\]" string start))
                        (equal arg '(4))))
           (let ((start 0) (nth 0) value)
             (while (setq start (string-match "\\[\\]" string start))

-              (setq value (read-string (format "Optional argument %d: "
-                                               (setq nth (1+ nth)))))
+              (setq value (save-match-data
+                           (read-string (format "Optional argument %d: "
+                                                (setq nth (1+ nth))))))

               (setq string (replace-match (concat "[" value "]") t t string))
               (setq start (1+ start)))))
         ;; Should we cleanup empty optional arguments?
               (setq string (replace-match (concat "[" value "]") t t string))
               (setq start (1+ start)))))
         ;; Should we cleanup empty optional arguments?


@@ -729,7 +746,7 @@ While entering the regexp, completion on knows citation keys is possible.
         (forward-char 1)))
 
     ;; Return the citation key
         (forward-char 1)))
 
     ;; Return the citation key

-    (car (car selected-entries))))
+    (mapcar 'car selected-entries)))

 
 (defun reftex-figure-out-cite-format (arg &optional no-insert format-key)
   ;; Check if there is already a cite command at point and change cite format
 
 (defun reftex-figure-out-cite-format (arg &optional no-insert format-key)
   ;; Check if there is already a cite command at point and change cite format


@@ -748,9 +765,13 @@ While entering the regexp, completion on knows citation keys is possible.
       (if (or (not arg) (not (listp arg)))
           (setq format
                 (concat
       (if (or (not arg) (not (listp arg)))
           (setq format
                 (concat

-                 (if (member (preceding-char) '(?\{ ?,)) "" ",")
+                 (if (member (preceding-char) '(?\{ ?,))
+                    ""
+                  reftex-cite-key-separator)

                  "%l"
                  "%l"

-                 (if (member (following-char) '(?\} ?,)) "" ",")))
+                 (if (member (following-char) '(?\} ?,))
+                    ""
+                  reftex-cite-key-separator)))

         (setq format "%l")))
      (t
       ;; Figure out the correct format
         (setq format "%l")))
      (t
       ;; Figure out the correct format


@@ -1022,6 +1043,7 @@ While entering the regexp, completion on knows citation keys is possible.
                ((= l ?k) (reftex-get-bib-field "key" entry))
                ((= l ?m) (reftex-get-bib-field "month" entry))
                ((= l ?n) (reftex-get-bib-field "number" entry))
                ((= l ?k) (reftex-get-bib-field "key" entry))
                ((= l ?m) (reftex-get-bib-field "month" entry))
                ((= l ?n) (reftex-get-bib-field "number" entry))

+              ((= l ?N) (reftex-get-bib-field "note" entry))

                ((= l ?o) (reftex-get-bib-field "organization" entry))
                ((= l ?p) (reftex-get-bib-field "pages" entry))
                ((= l ?P) (car (split-string
                ((= l ?o) (reftex-get-bib-field "organization" entry))
                ((= l ?p) (reftex-get-bib-field "pages" entry))
                ((= l ?P) (car (split-string


@@ -1029,6 +1051,7 @@ While entering the regexp, completion on knows citation keys is possible.
                                "[- .]+")))
                ((= l ?s) (reftex-get-bib-field "school" entry))
                ((= l ?u) (reftex-get-bib-field "publisher" entry))
                                "[- .]+")))
                ((= l ?s) (reftex-get-bib-field "school" entry))
                ((= l ?u) (reftex-get-bib-field "publisher" entry))

+              ((= l ?U) (reftex-get-bib-field "url" entry))

                ((= l ?r) (reftex-get-bib-field "address" entry))
                ((= l ?t) (reftex-get-bib-field "title" entry))
                ((= l ?T) (reftex-abbreviate-title
                ((= l ?r) (reftex-get-bib-field "address" entry))
                ((= l ?t) (reftex-get-bib-field "title" entry))
                ((= l ?T) (reftex-abbreviate-title


@@ -1118,7 +1141,7 @@ While entering the regexp, completion on knows citation keys is possible.
           (save-restriction
             (widen)
             (goto-char (point-min))
           (save-restriction
             (widen)
             (goto-char (point-min))

-            (while (re-search-forward "^[^%\n\r]*\\\\\\(bibentry\\|[a-zA-Z]*cite[a-zA-Z]*\\)\\(\\[[^\\]]*\\]\\)?{\\([^}]+\\)}" nil t)
+            (while (re-search-forward "\\(?:^\\|\\=\\)[^%\n\r]*?\\\\\\(bibentry\\|[a-zA-Z]*cite[a-zA-Z]*\\)\\(\\[[^\\]]*\\]\\)?{\\([^}]+\\)}" nil t)

               (setq kk (match-string-no-properties 3))
               (while (string-match "%.*\n?" kk)
                 (setq kk (replace-match "" t t kk)))
               (setq kk (match-string-no-properties 3))
               (while (string-match "%.*\n?" kk)
                 (setq kk (replace-match "" t t kk)))


@@ -1129,27 +1152,43 @@ While entering the regexp, completion on knows citation keys is possible.
     (reftex-kill-temporary-buffers)
     keys))
 
     (reftex-kill-temporary-buffers)
     keys))
 

+(defun reftex-get-string-refs (alist)
+  "Return a list of BibTeX @string references that appear as values in ALIST."
+  (reftex-remove-if (lambda (x) (string-match "^\\([\"{]\\|[0-9]+$\\)" x))
+                   ;; get list of values, discard keys
+                   (mapcar 'cdr
+                           ;; remove &key and &type entries
+                           (reftex-remove-if (lambda (pair)
+                                               (string-match "^&" (car pair)))
+                                             alist))))
+

 (defun reftex-create-bibtex-file (bibfile)
   "Create a new BibTeX database file with all entries referenced in document.
 (defun reftex-create-bibtex-file (bibfile)
   "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."
+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.
+
+Entries referenced from other entries must appear after all
+referencing entries.
+
+You can define strings to be used as header or footer for the
+created files in the variables `reftex-create-bibtex-header' or
+`reftex-create-bibtex-footer' respectively."

   (interactive "FNew BibTeX file: ")
   (let ((keys (reftex-all-used-citation-keys))
         (files (reftex-get-bibfile-list))
   (interactive "FNew BibTeX file: ")
   (let ((keys (reftex-all-used-citation-keys))
         (files (reftex-get-bibfile-list))

-        file key entries beg end entry)
+        file key entries beg end entry string-keys string-entries)

     (save-current-buffer
     (save-current-buffer

-      (while (setq file (pop files))
+      (dolist (file files)

         (set-buffer (reftex-get-file-buffer-force file 'mark))
         (reftex-with-special-syntax-for-bib
          (save-excursion
            (save-restriction
              (widen)
              (goto-char (point-min))
         (set-buffer (reftex-get-file-buffer-force file 'mark))
         (reftex-with-special-syntax-for-bib
          (save-excursion
            (save-restriction
              (widen)
              (goto-char (point-min))

-             (while (re-search-forward
-                     "^[ \t]*@[a-zA-Z]+[ \t]*{\\([^ \t\r\n]+\\),"
-                     nil t)
+             (while (re-search-forward "^[ \t]*@\\(?:\\w\\|\\s_\\)+[ \t\n\r]*\
+\[{(][ \t\n\r]*\\([^ \t\n\r,]+\\)" nil t)

                (setq key (match-string 1)
                      beg (match-beginning 0)
                      end (progn
                (setq key (match-string 1)
                      beg (match-beginning 0)
                      end (progn


@@ -1161,19 +1200,58 @@ The sequence in the new file is the same as it was in the old database."
                (when (member key keys)
                  (setq entry (buffer-substring beg end)
                        entries (cons entry entries)
                (when (member key keys)
                  (setq entry (buffer-substring beg end)
                        entries (cons entry entries)

-                       keys (delete key keys)))))))))
+                       keys (delete key keys))
+
+                 ;; check for crossref entries
+                 (let* ((attr-list (reftex-parse-bibtex-entry nil beg end))
+                        (xref-key (cdr (assoc "crossref" attr-list))))
+                   (if xref-key (pushnew xref-key keys)))
+                 ;; check for string references
+                 (let* ((raw-fields (reftex-parse-bibtex-entry nil beg end t))
+                        (string-fields (reftex-get-string-refs raw-fields)))
+                   (dolist (skey string-fields)
+                     (unless (member skey string-keys)
+                       (push skey string-keys)))))))))))
+    ;; second pass: grab @string references
+    (if string-keys
+        (save-current-buffer
+          (dolist (file files)
+            (set-buffer (reftex-get-file-buffer-force file 'mark))
+            (reftex-with-special-syntax-for-bib
+             (save-excursion
+               (save-restriction
+                 (widen)
+                 (goto-char (point-min))
+                 (while (re-search-forward
+                         "^[ \t]*@[Ss][Tt][Rr][Ii][Nn][Gg][ \t]*{[ \t]*\\([^ \t\r\n]+\\)"
+                         nil t)
+                   (setq key (match-string 1)
+                         beg (match-beginning 0)
+                         end (progn
+                               (goto-char (match-beginning 1))
+                               (condition-case nil
+                                   (up-list 1)
+                                 (error (goto-char (match-end 0))))
+                               (point)))
+                   (when (member key string-keys)
+                     (setq entry (buffer-substring beg end)
+                           string-entries (cons entry string-entries)
+                           string-keys (delete key string-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)
     (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)

+    (if reftex-create-bibtex-header (insert reftex-create-bibtex-header "\n\n"))
+    (insert (mapconcat 'identity (reverse string-entries) "\n\n"))
+    (if string-entries (insert "\n\n\n"))

     (insert (mapconcat 'identity (reverse entries) "\n\n"))
     (insert (mapconcat 'identity (reverse entries) "\n\n"))

+    (if reftex-create-bibtex-footer (insert "\n\n" reftex-create-bibtex-footer))

     (goto-char (point-min))
     (save-buffer)
     (message "%d entries extracted and copied to new database"
              (length entries))))
 
 
     (goto-char (point-min))
     (save-buffer)
     (message "%d entries extracted and copied to new database"
              (length entries))))
 
 

-;; arch-tag: d53d0a5a-ab32-4b52-a846-2a7c3527cd89

 ;;; reftex-cite.el ends here
 ;;; reftex-cite.el ends here