*** bibtex-mode+.el	Thu Apr 16 19:56:47 1992
--- jbibtex-mode.el	Sat Jun 20 00:45:42 1992
***************
*** 1,3 ****
--- 1,6 ----
+ ;;; Modified by S. Kobayashi for Mule (1992.6.20)
+ ;;; Modified by S. Kobayashi for allowing KANJI reference name (1992.5.28)
+ ;;; Modefied by T. Yoshiba for JBiBTeX
  ;Path: icspub!astemgw!wnoc-tyo-news!ccut!sun-barr!rutgers!tut.cis.ohio-state.edu!GUMBY.CS.CALTECH.EDU!newton
  ;From: newton@GUMBY.CS.CALTECH.EDU (Mike Newton)
  ;Newsgroups: gnu.emacs.sources
***************
*** 125,132 ****
  (defconst bibtex-text-in-cfield 2
    "The regexp subexpression number of the text part in bibtex-cfield.")
  
! (defconst bibtex-field-name "[A-Za-z][---A-Za-z0-9:_+]*"
!   "Regexp defining the name part of a bibtex field.")
  
  ;; bibtex-field-text must be able to handle
  ;;   title = "Proc. Fifteenth Annual" # STOC,
--- 128,143 ----
  (defconst bibtex-text-in-cfield 2
    "The regexp subexpression number of the text part in bibtex-cfield.")
  
! ;; Allows two bytes code (Changed by koba)
! (if (boundp 'MULE) (defconst bibtex-field-name
! 		     "\\([A-Za-z]\\|\\cj\\)\\([---A-Za-z0-9:_+]\\|\\cj\\)*"
! 		     "Regexp defining the name part of a bibtex field.")
!   (if (boundp 'NEMACS) (defconst bibtex-field-name
! 			 "\\([A-Za-z]\\|\\z\\)\\([---A-Za-z0-9:_+]\\|\\z\\)*"
! 			 "Regexp defining the name part of a bibtex field.")
!     (defconst bibtex-field-name
!       "\\([A-Za-z]\\)\\([---A-Za-z0-9:_+]\\)*"
!       "Regexp defining the name part of a bibtex field.")))
  
  ;; bibtex-field-text must be able to handle
  ;;   title = "Proc. Fifteenth Annual" # STOC,
***************
*** 165,171 ****
  
  (defconst bibtex-name-in-field bibtex-name-in-cfield
    "The regexp subexpression number of the name part in bibtex-field")
! (defconst bibtex-text-in-field bibtex-text-in-cfield
    "The regexp subexpression number of the text part in bibtex-field")
  
  ;;; references
--- 176,183 ----
  
  (defconst bibtex-name-in-field bibtex-name-in-cfield
    "The regexp subexpression number of the name part in bibtex-field")
! ;; Changed because of the change of bibtex-field-name (by koba)
! (defconst bibtex-text-in-field 4
    "The regexp subexpression number of the text part in bibtex-field")
  
  ;;; references
***************
*** 261,266 ****
--- 273,280 ----
              How something strange has been published (begins sentence)
      institution
             Sponsoring institution
+     isbm
+            ISBM code (for Book(s))
      journal
             Journal name (macros are provided for many)
      key
***************
*** 291,296 ****
--- 305,312 ----
             Volume of a journal or multivolume work
      year
             Year---should contain only numerals
+     yomi
+            Japanese Furigana of the author
  ---------------------------------------------------------
  Entry to this mode calls the value of bibtex-mode-hook if that value is
  non-nil."
***************
*** 406,429 ****
    (interactive)
    (bibtex-entry "Article" '("author" "title")
  		'("crossref" "journal" "year" "volume" "number" "pages"
! 		  "month" "note")))
  
  (defun bibtex-Book ()
    (interactive)
    (bibtex-entry "Book" '("author" "title" "publisher" "year")
  		'("editor" "volume" "series" "address"
! 			   "edition" "month" "note")))
  
  (defun bibtex-Booklet ()
    (interactive)
    (bibtex-entry "Booklet" '("title")
! 		'("author" "howpublished" "address" "month" "year" "note")))
  
  ;; France: Dipl\^{o}me d'Etudes Approfondies (similar to Master's)
  (defun bibtex-DEAthesis ()
    (interactive)
    (bibtex-entry "DEAthesis" '("author" "title" "school" "year")
! 		'("address" "month" "note")))
  
  ;; Same problem -- crossref subsumes publisher and year
  ;(defun bibtex-InBook ()
--- 422,445 ----
    (interactive)
    (bibtex-entry "Article" '("author" "title")
  		'("crossref" "journal" "year" "volume" "number" "pages"
! 		  "month" "note" "yomi")))
  
  (defun bibtex-Book ()
    (interactive)
    (bibtex-entry "Book" '("author" "title" "publisher" "year")
  		'("editor" "volume" "series" "address"
! 			   "edition" "month" "note" "isbm" "yomi")))
  
  (defun bibtex-Booklet ()
    (interactive)
    (bibtex-entry "Booklet" '("title")
! 		'("author" "yomi" "howpublished" "address" "month" "year" "note")))
  
  ;; France: Dipl\^{o}me d'Etudes Approfondies (similar to Master's)
  (defun bibtex-DEAthesis ()
    (interactive)
    (bibtex-entry "DEAthesis" '("author" "title" "school" "year")
! 		'("address" "month" "note" "yomi")))
  
  ;; Same problem -- crossref subsumes publisher and year
  ;(defun bibtex-InBook ()
***************
*** 435,441 ****
    (interactive)
    (bibtex-entry "InBook" '("author" "title" "chapter")
  		'("crossref" "publisher" "year" "editor" "pages" "volume"
! 		  "series" "address" "edition" "month" "note")))
  
  ;; Same problem -- cross ref subsumes  "booktitle" "publisher" "year"
  ;(defun bibtex-InCollection ()
--- 451,457 ----
    (interactive)
    (bibtex-entry "InBook" '("author" "title" "chapter")
  		'("crossref" "publisher" "year" "editor" "pages" "volume"
! 		  "series" "address" "edition" "month" "note" "isbm" "yomi")))
  
  ;; Same problem -- cross ref subsumes  "booktitle" "publisher" "year"
  ;(defun bibtex-InCollection ()
***************
*** 446,452 ****
    (interactive)
    (bibtex-entry "InCollection" '("author" "title")
  		'("crossref" "booktitle" "publisher" "year"
! 		  "editor" "chapter" "pages" "address" "month" "note")))
  
  
  ;; same...
--- 462,468 ----
    (interactive)
    (bibtex-entry "InCollection" '("author" "title")
  		'("crossref" "booktitle" "publisher" "year"
! 		  "editor" "chapter" "pages" "address" "month" "note" "yomi")))
  
  
  ;; same...
***************
*** 461,504 ****
    (interactive)
    (bibtex-entry "InProceedings" '("author" "title")
  		'("booktitle" "year" "crossref" "editor" "pages" "location"
! 		  "organization" "publisher" "address" "month" "note")))
  
  (defun bibtex-Manual ()
    (interactive)
    (bibtex-entry "Manual" '("title")
! 		'("author" "organization" "address" "edition" "year"
  			   "month" "note")))
  
  (defun bibtex-MastersThesis ()
    (interactive)
    (bibtex-entry "MastersThesis" '("author" "title" "school" "year")
! 		'("address" "month" "note")))
  
  (defun bibtex-Misc ()
    (interactive)
    (bibtex-entry "Misc" '()
! 		'("author" "title" "howpublished" "year" "month" "note")))
  
  (defun bibtex-PhdThesis ()
    (interactive)
    (bibtex-entry "PhdThesis" '("author" "title" "school" "year")
! 		'("address" "month" "note")))
  
  (defun bibtex-Proceedings ()
    (interactive)
    (bibtex-entry "Proceedings" '("title" "year")
  		'("editor" "publisher" "organization" "key"
! 			   "address" "month" "note")))
  (defun bibtex-TechReport ()
    (interactive)
    (bibtex-entry "TechReport" '("author" "title" "institution" "year")
! 		'("type" "number" "address" "month" "note")))
  
  
  (defun bibtex-Unpublished ()
    (interactive)
    (bibtex-entry "Unpublished" '("author" "title" "note")
! 		'("year" "month")))
  
  (defun bibtex-string ()
    (interactive)
--- 477,520 ----
    (interactive)
    (bibtex-entry "InProceedings" '("author" "title")
  		'("booktitle" "year" "crossref" "editor" "pages" "location"
! 		  "organization" "publisher" "address" "month" "note" "yomi")))
  
  (defun bibtex-Manual ()
    (interactive)
    (bibtex-entry "Manual" '("title")
! 		'("author" "yomi" "organization" "address" "edition" "year"
  			   "month" "note")))
  
  (defun bibtex-MastersThesis ()
    (interactive)
    (bibtex-entry "MastersThesis" '("author" "title" "school" "year")
! 		'("address" "month" "note" "yomi")))
  
  (defun bibtex-Misc ()
    (interactive)
    (bibtex-entry "Misc" '()
! 		'("author" "yomi" "title" "howpublished" "year" "month" "note")))
  
  (defun bibtex-PhdThesis ()
    (interactive)
    (bibtex-entry "PhdThesis" '("author" "title" "school" "year")
! 		'("address" "month" "note" "yomi")))
  
  (defun bibtex-Proceedings ()
    (interactive)
    (bibtex-entry "Proceedings" '("title" "year")
  		'("editor" "publisher" "organization" "key"
! 			   "address" "month" "note" "yomi")))
  (defun bibtex-TechReport ()
    (interactive)
    (bibtex-entry "TechReport" '("author" "title" "institution" "year")
! 		'("type" "number" "address" "month" "note" "yomi")))
  
  
  (defun bibtex-Unpublished ()
    (interactive)
    (bibtex-entry "Unpublished" '("author" "title" "note")
! 		'("year" "month" "yomi")))
  
  (defun bibtex-string ()
    (interactive)
