emacs: lisp/textmodes/bibtex.el comparison

comparison lisp/textmodes/bibtex.el @ 90813:e6fdae9180d4

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 698-710) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 216) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196

author	Miles Bader <miles@gnu.org>
date	Tue, 24 Apr 2007 21:56:25 +0000
parents	95d0cdf160ea 372e6a7ea660
children	988f1edc9674

comparison

equal deleted inserted replaced

-:6137cc8ddf90
+:e6fdae9180d4
 If this is a string, use it as the initial field text.
 If this is a function, call it to generate the initial field text."
 :group 'bibtex
 :type '(choice (const :tag "None" nil)
 (string :tag "Initial text")
-(function :tag "Initialize Function" :value fun)
+(function :tag "Initialize Function")
 (const :tag "Default" t)))
 (put 'bibtex-include-OPTkey 'risky-local-variable t)
 (defcustom bibtex-user-optional-fields
 '(("annote" "Personal annotation (ignored)"))
 Entries should be of the same form as the OPTIONAL and
 CROSSREF-OPTIONAL lists in `bibtex-entry-field-alist' (which see)."
 :group 'bibtex
 :type '(repeat (group (string :tag "Field")
 (string :tag "Comment")
-(option (group :inline t
+(option (choice :tag "Init"
-:extra-offset -4
+(const nil) string function)))))
-(choice :tag "Init" :value ""
-string
-function))))))
 (put 'bibtex-user-optional-fields 'risky-local-variable t)
 (defcustom bibtex-entry-format
 '(opts-or-alts required-fields numerical-fields)
 "Type of formatting performed by `bibtex-clean-entry'.
 "If non-nil, use fast but simplified algorithm for parsing BibTeX keys.
 If parsing fails, try to set this variable to nil."
 :group 'bibtex
 :type 'boolean)
-(defvar bibtex-entry-field-alist
+(defcustom bibtex-entry-field-alist
 '(("Article"
 ((("author" "Author1 [and Author2 ...] [and others]")
 ("title" "Title of the article (BibTeX converts it to lowercase)")
 ("journal" "Name of the journal (use string, remove braces)")
 ("year" "Year of publication"))
 FIELD-NAME is the name of the field, COMMENT-STRING is the comment that
 appears in the echo area, INIT is either the initial content of the
 field or a function, which is called to determine the initial content
 of the field, and ALTERNATIVE-FLAG (either nil or t) marks if the
 field is an alternative.  ALTERNATIVE-FLAG may be t only in the
-REQUIRED or CROSSREF-REQUIRED lists.")
+REQUIRED or CROSSREF-REQUIRED lists."
+:group 'bibtex
+:type '(repeat (group (string :tag "Entry name")
+(group (repeat :tag "Required fields"
+(group (string :tag "Field")
+(string :tag "Comment")
+(option (choice :tag "Init" :value nil
+(const nil) string function))
+(option (choice :tag "Alternative"
+(const :tag "No" nil)
+(const :tag "Yes" t)))))
+(repeat :tag "Optional fields"
+(group (string :tag "Field")
+(string :tag "Comment")
+(option (choice :tag "Init" :value nil
+(const nil) string function)))))
+(option :extra-offset -4
+(group (repeat :tag "Crossref: required fields"
+(group (string :tag "Field")
+(string :tag "Comment")
+(option (choice :tag "Init" :value nil
+(const nil) string function))
+(option (choice :tag "Alternative"
+(const :tag "No" nil)
+(const :tag "Yes" t)))))
+(repeat :tag "Crossref: optional fields"
+(group (string :tag "Field")
+(string :tag "Comment")
+(option (choice :tag "Init" :value nil
+(const nil) string function)))))))))
 (put 'bibtex-entry-field-alist 'risky-local-variable t)
 (defcustom bibtex-comment-start "@Comment"
 "String starting a BibTeX comment."
 :group 'bibtex
 ;; insert past the current field
 (goto-char (bibtex-end-of-field (bibtex-enclosing-field comma)))
 (set-mark (point))
 (message "Mark set")
 (bibtex-make-field (funcall fun 'bibtex-field-kill-ring-yank-pointer
-bibtex-field-kill-ring) t))
+bibtex-field-kill-ring) t nil t))
 ;; insert past the current entry
 (bibtex-skip-to-valid-entry)
 (set-mark (point))
 (message "Mark set")
 (insert (funcall fun 'bibtex-entry-kill-ring-yank-pointer
 optional (nth 1 (nth 1 e))))
 (if bibtex-include-OPTkey
 (push (list "key"
 "Used for reference key creation if author and editor fields are missing"
 (if (or (stringp bibtex-include-OPTkey)
-(fboundp bibtex-include-OPTkey))
+(functionp bibtex-include-OPTkey))
 bibtex-include-OPTkey))
 optional))
 (if (member-ignore-case entry-type bibtex-include-OPTcrossref)
 (push '("crossref" "Reference key of the cross-referenced entry")
 optional))
 (comment (assoc-string field (append (car field-list)
 (cdr field-list)) t)))
 (if comment (message "%s" (nth 1 comment))
 (message "No comment available")))))
-(defun bibtex-make-field (field &optional move interactive)
+(defun bibtex-make-field (field &optional move interactive nodelim)
 "Make a field named FIELD in current BibTeX entry.
 FIELD is either a string or a list of the form
 \(FIELD-NAME COMMENT-STRING INIT ALTERNATIVE-FLAG) as in
 `bibtex-entry-field-alist'.
 If MOVE is non-nil, move point past the present field before making
 the new field.  If INTERACTIVE is non-nil, move point to the end of
 the new field.  Otherwise move point past the new field.
-MOVE and INTERACTIVE are t when called interactively."
+MOVE and INTERACTIVE are t when called interactively.
+INIT is surrounded by field delimiters, unless NODELIM is non-nil."
 (interactive
 (list (let ((completion-ignore-case t)
 (field-list (bibtex-field-list
 (save-excursion
 (bibtex-beginning-of-entry)
 (insert "= ")
 (unless bibtex-align-at-equal-sign
 (indent-to-column (+ bibtex-entry-offset
 bibtex-text-indentation)))
 (let ((init (nth 2 field)))
-(insert (cond ((stringp init) init)
+(if (not init) (setq init "")
-((fboundp init) (funcall init))
+(if (functionp init) (setq init (funcall init)))
-(t (concat (bibtex-field-left-delimiter)
+(unless (stringp init) (error "`%s' is not a string" init)))
-(bibtex-field-right-delimiter))))))
+;; NODELIM is required by `bibtex-insert-kill'
+(if nodelim (insert init)
+(insert (bibtex-field-left-delimiter) init
+(bibtex-field-right-delimiter))))
 (when interactive
 ;; (bibtex-find-text nil nil bibtex-help-message)
 (if (memq (preceding-char) '(?} ?\")) (forward-char -1))
 (if bibtex-help-message (bibtex-print-help-message (car field)))))

Mercurial > emacs

comparison lisp/textmodes/bibtex.el @ 90813:e6fdae9180d4