emacs: lisp/textmodes/bibtex.el comparison

comparison lisp/textmodes/bibtex.el @ 90384:c156f6a9e7b5

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 204-225) - Update from CVS - Sync from erc--emacs--0 - Merge from gnus--rel--5.10 - Improve tq.el. - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6. * gnus--rel--5.10 (patch 81-85) - Update from CVS - Merge from emacs--devo--0

author	Miles Bader <miles@gnu.org>
date	Mon, 17 Apr 2006 08:41:12 +0000
parents	e6bf73e43cf4 14e2e318d372
children	2ecafc6d5db7

comparison

equal deleted inserted replaced

-:ab20fb198dda
+:c156f6a9e7b5
 (bibtex-next-field t)
 (if (member-ignore-case entry-type bibtex-autofill-types)
 	(bibtex-autofill-entry))
 (run-hooks 'bibtex-add-entry-hook)))
-(defun bibtex-entry-update ()
+(defun bibtex-entry-update (&optional entry-type)
 "Update an existing BibTeX entry.
 In the BibTeX entry at point, make new fields for those items that may occur
-according to `bibtex-field-list', but are not yet present."
+according to `bibtex-field-list', but are not yet present.
-(interactive)
+Also, add field delimiters to numerical fields if they are not present.
+If ENTRY-TYPE is non-nil, change first the entry type to ENTRY-TYPE.
+When called interactively with a prefix arg, query for a value of ENTRY-TYPE."
+(interactive
+(list (if current-prefix-arg
+(let ((completion-ignore-case t))
+(completing-read "New entry type: " bibtex-entry-field-alist
+nil t nil 'bibtex-entry-type-history)))))
 (save-excursion
 (bibtex-beginning-of-entry)
-;; For inserting new fields, we use the fact that
+(when (looking-at bibtex-entry-maybe-empty-head)
-;; `bibtex-parse-entry' moves point to the end of the last field.
+(goto-char (match-end 0))
-(let* ((fields-alist (bibtex-parse-entry))
+(if entry-type
-(field-list (bibtex-field-list
+(save-excursion
-(cdr (assoc "=type=" fields-alist)))))
+(replace-match (concat "@" entry-type) nil nil nil 1))
-(skip-chars-backward " \t\n")
+(setq entry-type (bibtex-type-in-head)))
-(dolist (field (car field-list))
+(let* ((field-list (bibtex-field-list entry-type))
-(unless (assoc-string (car field) fields-alist t)
+(required (copy-tree (car field-list)))
-(bibtex-make-field field)))
+(optional (copy-tree (cdr field-list)))
-(dolist (field (cdr field-list))
+bounds)
-(unless (assoc-string (car field) fields-alist t)
+(while (setq bounds (bibtex-parse-field))
-(bibtex-make-optional-field field))))))
+(let ((fname (bibtex-name-in-field bounds t))
+(end (copy-marker (bibtex-end-of-field bounds) t)))
+(setq required (delete (assoc-string fname required t) required)
+optional (delete (assoc-string fname optional t) optional))
+(when (string-match "\\`[0-9]+\\'"
+(bibtex-text-in-field-bounds bounds))
+(goto-char (bibtex-end-of-text-in-field bounds))
+(insert (bibtex-field-right-delimiter))
+(goto-char (bibtex-start-of-text-in-field bounds))
+(insert (bibtex-field-left-delimiter)))
+(goto-char end)))
+(skip-chars-backward " \t\n")
+(dolist (field required) (bibtex-make-field field))
+(dolist (field optional) (bibtex-make-optional-field field))))))
 (defun bibtex-parse-entry (&optional content)
 "Parse entry at point, return an alist.
 The alist elements have the form (FIELD . TEXT), where FIELD can also be
 the special strings \"=type=\" and \"=key=\".  For the FIELD \"=key=\"
 (if help (bibtex-print-help-message (car bounds))))
 ((not noerror) (error "Not on BibTeX field")))))
 (defun bibtex-find-text-internal (&optional noerror subfield comma)
 "Find text part of current BibTeX field or entry head.
-Return list (NAME START-TEXT END-TEXT END) with field or entry name,
+Return list (NAME START-TEXT END-TEXT END STRING-CONST) with field
-start and end of text and end of field or entry head, or nil if not found.
+or entry name, start and end of text, and end of field or entry head.
-If optional arg NOERROR is non-nil, an error message is suppressed if text
+STRING-CONST is a flag which is non-nil if current subfield delimited by #
-is not found.  If optional arg SUBFIELD is non-nil START-TEXT and END-TEXT
+is a BibTeX string constant.  Return value is nil if field or entry head
-correspond to the current subfield delimited by #.
+are not found.
+If optional arg NOERROR is non-nil, an error message is suppressed
+if text is not found.  If optional arg SUBFIELD is non-nil START-TEXT
+and END-TEXT correspond to the current subfield delimited by #.
 Optional arg COMMA is as in `bibtex-enclosing-field'."
 (save-excursion
 (let ((pnt (point))
 (bounds (bibtex-enclosing-field comma t))
 (case-fold-search t)
-name start-text end-text end failure done no-sub)
+name start-text end-text end failure done no-sub string-const)
 (bibtex-beginning-of-entry)
 (cond (bounds
 (setq name (bibtex-name-in-field bounds t)
 start-text (bibtex-start-of-text-in-field bounds)
 end-text (bibtex-end-of-text-in-field bounds)
 (setq failure no-sub)
 (unless failure
 (goto-char start-text)
 (while (not done)
 (if (or (prog1 (looking-at bibtex-field-const)
-(setq end-text (match-end 0)))
+(setq end-text (match-end 0)
+string-const t))
 (prog1 (setq bounds (bibtex-parse-field-string))
-(setq end-text (cdr bounds))))
+(setq end-text (cdr bounds)
+string-const nil)))
 (progn
 (if (and (<= start-text pnt) (<= pnt end-text))
 (setq done t)
 (goto-char end-text))
 (if (looking-at "[ \t\n]*#[ \t\n]*")
 (setq start-text (goto-char (match-end 0)))))
 (setq done t failure t)))))
 (cond ((not failure)
-(list name start-text end-text end))
+(list name start-text end-text end string-const))
 ((and no-sub (not noerror))
 (error "Not on text part of BibTeX field"))
 ((not noerror) (error "Not on BibTeX field"))))))
 (defun bibtex-remove-OPT-or-ALT (&optional comma)
 (defun bibtex-remove-delimiters (&optional comma)
 "Remove \"\" or {} around current BibTeX field text.
 Optional arg COMMA is as in `bibtex-enclosing-field'.  It is t for
 interactive calls."
 (interactive (list t))
-(let* ((bounds (bibtex-find-text-internal nil t comma))
+(let ((bounds (bibtex-find-text-internal nil t comma)))
-(start (nth 1 bounds))
+(unless (nth 4 bounds)
-(end (nth 2 bounds)))
+(delete-region (1- (nth 2 bounds)) (nth 2 bounds))
-(if (memq (char-before end) '(?\} ?\"))
+(delete-region (nth 1 bounds) (1+ (nth 1 bounds))))))
-(delete-region (1- end) end))
-(if (memq (char-after start) '(?\{ ?\"))
-(delete-region start (1+ start)))))
 (defun bibtex-kill-field (&optional copy-only comma)
 "Kill the entire enclosing BibTeX field.
 With prefix arg COPY-ONLY, copy the current field to `bibtex-field-kill-ring',
 but do not actually kill it.  Optional arg COMMA is as in

Mercurial > emacs

comparison lisp/textmodes/bibtex.el @ 90384:c156f6a9e7b5