emacs: lisp/textmodes/bibtex.el comparison

comparison lisp/textmodes/bibtex.el @ 90140:02f1dbc4a199

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 228-240) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 53-58) - Merge from emacs--cvs-trunk--0 - Update from CVS - Collapse feature addition/removal within single ChangeLog entry

author	Miles Bader <miles@gnu.org>
date	Sat, 09 Apr 2005 02:16:29 +0000
parents	f8a7a9ba3d08 d11749d2bcff
children	146c086df160

comparison

equal deleted inserted replaced

-:e0d294b9b23e
+:02f1dbc4a199
 ;;; bibtex.el --- BibTeX mode for GNU Emacs
-;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2004
+;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2004, 2005
 ;;           Free Software Foundation, Inc.
 ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
 ;;      Bengt Martensson <bengt@mathematik.uni-Bremen.de>
 ;;      Mark Shapiro <shapiro@corto.inria.fr>
 :group 'bibtex
 :type '(choice (const :tag "Default" bibtex-summary)
 (function :tag "Personalized function")))
 (defcustom bibtex-generate-url-list
-'((("url" . ".*:.*"))
+'((("url" . ".*:.*")))
-;; Example of a complex setup.
-(("journal" . "\\<\\(PR[ABCDEL]?\\|RMP\\)\\>")
-"http://link.aps.org/abstract/"
-("journal" ".*" downcase)
-"/v"
-("volume" ".*" 0)
-"/p"
-("pages" "\\`\\([0-9]+\\)" 1)))
 "List of schemes for generating the URL of a BibTeX entry.
 These schemes are used by `bibtex-url'.
-Each scheme is of the form ((FIELD . REGEXP) STEP...).
+Each scheme should have one of these forms:
+((FIELD . REGEXP))
+((FIELD . REGEXP) STEP...)
+((FIELD . REGEXP) STRING STEP...)
 FIELD is a field name as returned by `bibtex-parse-entry'.
-REGEXP is matched against the text of FIELD.  If the match succeeds, then
+REGEXP is matched against the text of FIELD.  If the match succeeds,
-this scheme is used.  If no STEPs are specified the matched text is used
+then this scheme is used.  If no STRING and STEPs are specified
-as the URL, otherwise the URL is built by concatenating the STEPs.
+the matched text is used as the URL, otherwise the URL is built
+by evaluating STEPs.  If no STRING is specified the STEPs must result
-A STEP can be a string or a list (FIELD REGEXP REPLACE) in which case
+in strings which are concatenated.  Otherwise the resulting objects
-the text of FIELD is matched against REGEXP, and is replaced with REPLACE.
+are passed through `format' using STRING as format control string.
-REPLACE can be a string, or a number (which selects the corresponding submatch)
-or a function called with the field's text as argument and with the
+A STEP is a list (FIELD REGEXP REPLACE).  The text of FIELD
-`match-data' properly set.
+is matched against REGEXP, and is replaced with REPLACE.
+REPLACE can be a string, or a number (which selects the corresponding
-Case is always ignored.  Always remove the field delimiters."
+submatch), or a function called with the field's text as argument
+and with the `match-data' properly set.
+Case is always ignored.  Always remove the field delimiters.
+The following is a complex example, see http://link.aps.org/linkfaq.html.
+(((\"journal\" . \"\\\\=<\\(PR[ABCDEL]?\\|RMP\\)\\\\=>\")
+\"http://link.aps.org/abstract/%s/v%s/p%s\"
+(\"journal\" \".*\" downcase)
+(\"volume\" \".*\" 0)
+(\"pages\" \"\\`[A-Z]?[0-9]+\" 0)))"
 :group 'bibtex
 :type '(repeat
-(list :tag "Scheme"
+(cons :tag "Scheme"
 (cons :tag "Matcher" :extra-offset 4
 (string :tag "BibTeX field")
 		      (regexp :tag "Regexp"))
-(repeat :tag "Steps to generate URL" :inline t
+(choice
-(choice
+(const :tag "Take match as is" nil)
-(string :tag "Literal text")
+(cons :tag "Formatted"
+(string :tag "Format control string")
+(repeat :tag "Steps to generate URL"
+(list (string :tag "BibTeX field")
+(regexp :tag "Regexp")
+(choice (string :tag "Replacement")
+(integer :tag "Sub-match")
+(function :tag "Filter")))))
+(repeat :tag "Concatenated"
 (list (string :tag "BibTeX field")
 			       (regexp :tag "Regexp")
 (choice (string :tag "Replacement")
 				       (integer :tag "Sub-match")
 				       (function :tag "Filter"))))))))
 (setq start (1+ start)))
 (>= bound start)))
 (let ((lst bibtex-generate-url-list) url)
 (goto-char start)
 	(while (and (not found)
-		    (setq url (caar lst)))
+		    (setq url (car (pop lst))))
 	  (setq found (and (bibtex-string= field (car url))
 (re-search-forward (cdr url) end t)
-(>= (match-beginning 0) pnt))
+(>= (match-beginning 0) pnt)))))
-lst (cdr lst))))
 (goto-char end))
 (if found (bibtex-button (match-beginning 0) (match-end 0)
 'bibtex-url (match-beginning 0)))
 found))
 (bibtex-beginning-of-entry)
 (let ((fields-alist (bibtex-parse-entry))
 ;; Always ignore case,
 (case-fold-search t)
 (lst bibtex-generate-url-list)
-field url scheme)
+field url scheme obj fmt)
 (while (setq scheme (pop lst))
 (when (and (setq field (cdr (assoc-string (caar scheme)
 						  fields-alist t)))
 ;; Always remove field delimiters
 (progn (setq field (bibtex-remove-delimiters-string field))
 (string-match (cdar scheme) field)))
-(setq lst nil)
+(setq lst nil
-	  (if (null (cdr scheme))
+scheme (cdr scheme)
-	      (setq url (match-string 0 field)))
+url (if (null scheme) (match-string 0 field)
-(dolist (step (cdr scheme))
+(if (stringp (car scheme))
-(cond ((stringp step)
+(setq fmt (pop scheme)))
-(setq url (concat url step)))
+(dolist (step scheme)
-((setq field (cdr (assoc-string (car step) fields-alist t)))
+;; Always remove field delimiters
-;; Always remove field delimiters
+(setq field (bibtex-remove-delimiters-string
-(setq field (bibtex-remove-delimiters-string field))
+(cdr (assoc-string (car step) fields-alist t))))
 (if (string-match (nth 1 step) field)
-(setq field (cond
+(setq field (cond ((functionp (nth 2 step))
-((functionp (nth 2 step))
+(funcall (nth 2 step) field))
-(funcall (nth 2 step) field))
+((numberp (nth 2 step))
-((numberp (nth 2 step))
+(match-string (nth 2 step) field))
-(match-string (nth 2 step) field))
+(t
-(t
+(replace-match (nth 2 step) t nil field))))
-(replace-match (nth 2 step) t nil field))))
+;; If the scheme is set up correctly,
-;; If the scheme is set up correctly,
+;; we should never reach this point
-;; we should never reach this point
+(error "Match failed: %s" field))
-(error "Match failed: %s" field))
+(push field obj))
-(setq url (concat url field)))
+(if fmt (apply 'format fmt (nreverse obj))
-;; If the scheme is set up correctly,
+(apply 'concat (nreverse obj)))))
-;; we should never reach this point
+(browse-url (message "%s" url))))
-(t (error "Step failed: %s" step))))
-(message "%s" url)
-(browse-url url)))
 (unless url (message "No URL known.")))))
 ;; Make BibTeX a Feature

Mercurial > emacs

comparison lisp/textmodes/bibtex.el @ 90140:02f1dbc4a199