diff --git a/yatex19.el b/yatex19.el
index eb04e04..7b1cb61 100644
--- a/yatex19.el
+++ b/yatex19.el
@@ -1,9 +1,9 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX facilities for Emacs 19 or later
+;;; yatex19.el -- YaTeX facilities for Emacs 19 or later
 ;;; (c)1994-2012 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Sun Jan 29 23:00:52 2012 on firestorm
+;;; Last modified Sat Sep  1 08:07:31 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 ;(require 'yatex)
 
 (and (boundp 'YaTeX-use-hilit19)
diff --git a/yatexadd.el b/yatexadd.el
index a9c2dfb..c9c57df 100644
--- a/yatexadd.el
+++ b/yatexadd.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX add-in functions.
+;;; yatexadd.el --- YaTeX add-in functions
 ;;; yatexadd.el rev.20
 ;;; (c)1991-2012 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Fri Mar  9 21:19:09 2012 on firestorm
+;;; Last modified Sat Sep  1 08:08:21 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 ;;;
 ;;Sample functions for LaTeX environment.
 ;;;
diff --git a/yatexenv.el b/yatexenv.el
index 8481f30..264a17b 100644
--- a/yatexenv.el
+++ b/yatexenv.el
@@ -1,10 +1,9 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX environment-specific functions.
-;;; yatexenv.el
+;;; yatexenv.el --- YaTeX environment-specific functions
 ;;; (c) 1994-2012 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Sun Feb 12 11:15:33 2012 on firestorm
+;;; Last modified Sat Sep  1 08:08:42 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 ;;;
 ;; Functions for tabular environment
 ;;;
diff --git a/yatexgen.el b/yatexgen.el
index ac069e4..96be562 100644
--- a/yatexgen.el
+++ b/yatexgen.el
@@ -1,16 +1,15 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX add-in function generator.
-;;; yatexgen.el rev.5
+;;; yatexgen.el --- YaTeX add-in function generator(rev.5)
+
 ;;; (c)1991-1995,1999,2000 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Fri Jun 27 12:09:37 2003 on firestorm
+;;; Last modified Sat Sep  1 08:10:36 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 (require 'yatex)
 
 (defmacro YaTeX-setq (var japanese english)
   (list 'setq var
-	(if YaTeX-japan japanese english))
-)
+	(if YaTeX-japan japanese english)))
 
 (put 'YaTeX-setq 'lisp-indent-hook 1)
 
@@ -29,8 +28,7 @@
 reading my messages *carefully*, or you'll fail to generate appropriate
 function.
 
-  Hit return key!"
-)
+  Hit return key!")
 
 (YaTeX-setq YaTeX-generate-start-message
   "�����͂��߂��.\n1.�o�^�������⊮������Ă݂�.
@@ -40,33 +38,27 @@
   "Let's begin completion for which you want to make add-in function.
 If you want to make add-in function for \\documentstyle input only
 `\\documentstyle{}' *with* completion of yatex-mode.
-If you finish this, please press RET."
-)
+If you finish this, please press RET.")
 
 (YaTeX-setq YaTeX-generate-abort-message
   "��߂��A��߂��`���߂�ǂ����`"
-  "Aborted."
-)
+  "Aborted.")
 
 (YaTeX-setq YaTeX-generate-same-message
   "���ꂶ��A�Ȃɂ��ς���Ă˂�����[��! ��߂��B"
-  "I found no difference between them.  So I'm quitting."
-)
+  "I found no difference between them.  So I'm quitting.")
 
 (YaTeX-setq YaTeX-generate-invalid-message
   "����́A���Ɩ����Ƃ������̂���."
-  "It's impossible."
-)
+  "It's impossible.")
 
 (YaTeX-setq YaTeX-generate-idontknow-message
   "���`��A����Ă悭�킩��Ȃ��Ȃ��B�΂��ł��߂�˃F�`"
-  "Sorry I can't tell your adding method."
-)
+  "Sorry I can't tell your adding method.")
 
 (YaTeX-setq YaTeX-generate-confirm-message
   "�Ƃ������Ƃ́A�t���������������͂���ł����̂�"
-  "Is it additional string of add-in function?"
-)
+  "Is it additional string of add-in function?")
 
 (YaTeX-setq YaTeX-generate-output-message
   "2.����A����ɂ����‚��������̂� *�J�[�\���̈ʒu��* �����Ă݂�. 
@@ -75,8 +67,7 @@
 �ŁA�܂����������肽�[��!!"
   "2.Then input additional string *at CURSOR POSITION*
 According to last example \\documentstyle{},
-modify it \\documentstyle[12pt]{}.  RET to finish."
-)
+modify it \\documentstyle[12pt]{}.  RET to finish.")
 
 (YaTeX-setq YaTeX-generate-put-arg-message
   "3.���̂����A�L�[�{�[�h����ǂݍ���ŗ~��������������ɓ���āB
@@ -86,8 +77,7 @@
   "3.In this string, extract string which you want to input from key
 board with quiry afterwards.  For example, though additional string is
 \\documentstyle[12pt]{}, but you want enter only `12pt' by hand.
-RET to finish!"
-)
+RET to finish!")
 
 (YaTeX-setq YaTeX-generate-read-prompt-message
   "4.�ł́A���Ƃł����̕������ǂݍ��ގ��ɁA�ǂ������v�����v�g��
@@ -95,8 +85,7 @@
 �������� 12pt �̕�����������A�w�T�C�Y�́x�Ƃ����������߁B"
   "4.When you use this add-in function afterwards, what message
 do you like to be prompted with to enter these values.  In last
-example `12pt', typical prompt string may be `Size?: '."
-)
+example `12pt', typical prompt string may be `Size?: '.")
 
 (YaTeX-setq YaTeX-generate-done-message
   "�悵! ���ꂪ�A�N�̍�肽�������֐����B~/.emacs �ɂł�����Ă�������
@@ -109,34 +98,29 @@
 for testing of this function please.
   But you can see this function quite easy, can't you? You had better
 write your most favorite add-in function yourself!
-"
-)
+")
 
 (YaTeX-setq YaTeX-generate-nomatch-message
   "���炱��A����ȕ�����ǂ��ɂ��ˁ[��!!"
-  "No such string in additional string."
-)
+  "No such string in additional string.")
+
 (YaTeX-setq YaTeX-generate-buffer
   "*�t���֐������o�b�t�@*"
-  "*Generate-add-in-function*"
-)
+  "*Generate-add-in-function*")
 
 (YaTeX-setq YaTeX-generate-message-buffer
   "*���ē�*"
-  "*Guide*"
-)
+  "*Guide*")
 
 (YaTeX-setq YaTeX-generate-bug-message
   "���߁`��!! ������ƁA���̃A�h�C���֐��‚���̎��s����������݂���!!
 ��҂܂ŘA�����Ă������`�`�`��!"
   "Sorry I failed to make add-in function for you...
-Send bug report to me."
-)
+Send bug report to me.")
 
 (YaTeX-setq YaTeX-generate-narrow-message
   "��ʂ����܂�����悤�ȋC�����܂��B"
-  "Too narrow screen height."
-)
+  "Too narrow screen height.")
 
 (defvar YaTeX-generate-message-height
   10 "Window height of YaTeX-generate-message-buffer")
@@ -249,8 +233,7 @@
   (condition-case error
       (eval-current-buffer)
     (error (insert YaTeX-generate-bug-message)))
-  (pop-to-buffer YaTeX-generate-message-buffer)
-)
+  (pop-to-buffer YaTeX-generate-message-buffer))
 
 (defun YaTeX-generate-parse-add-in (args add-in)
   "Parse add-in string and extract argument for it.
@@ -313,8 +296,7 @@
     (insert ")\n(concat " (YaTeX-generate-lisp-quote string)
 	    ")))\n")
     (indent-region (point-min) (point) nil)
-    used)
-)
+    used))
 
 (defun YaTeX-generate-ask-match-position ()
   "Ask user whether match-position is in his expectation,
@@ -331,14 +313,12 @@
   (insert "\n" (if YaTeX-japan "�����ɂ��Ή����Ă��?"
 		 "this underlined part too?"))
   (other-window -1)
-  (y-or-n-p (if YaTeX-japan "�������͂����Ă܂���" "Is underline right"))
-)
+  (y-or-n-p (if YaTeX-japan "�������͂����Ă܂���" "Is underline right")))
 
 (defun YaTeX-generate-register-match ()
   (nconc arg (list (list beg end)))
   (let ((x beg))
-    (while (< x end) (aset used x i)(setq x (1+ x))))
-)
+    (while (< x end) (aset used x i)(setq x (1+ x)))))
 
 (defun YaTeX-generate-display-message (mes &optional bottom)
   "Display message to generation buffer."
@@ -347,8 +327,7 @@
   (insert "\n\n")
   (if bottom (recenter (1- bottom)) (recenter 0))
   (insert mes)
-  (other-window -1)
-)
+  (other-window -1))
 
 (defun YaTeX-generate-move-to-add-in-position ()
   "Move cursor where add-in function should insert string."
@@ -366,9 +345,7 @@
    ((eq YaTeX-current-completion-type 'maketitle)
     (goto-char (point-max))
     (if (= (preceding-char) ? )
-	(forward-char -1)))
-   )
-)
+	(forward-char -1)))))
 
 (defun YaTeX-generate-function-name ()
   (concat
@@ -376,8 +353,7 @@
    (cond
     ((eq YaTeX-current-completion-type 'begin) YaTeX-env-name)
     ((eq YaTeX-current-completion-type 'section) YaTeX-section-name)
-    ((eq YaTeX-current-completion-type 'maketitle) YaTeX-single-command)))
-)
+    ((eq YaTeX-current-completion-type 'maketitle) YaTeX-single-command))))
 
 (defun YaTeX-generate-lisp-quote (str)
   (let ((len (length str))(i 0) (quote ""))
@@ -388,8 +364,7 @@
 	  (setq quote (concat quote "\""))
 	(setq quote (concat quote (substring str i (1+ i)))))
       (setq i (1+ i)))
-    quote)
-)
+    quote))
 
 (defun YaTeX-generate-quote-quote (str)
   (let ((len (length str))(i 0) (quote ""))
@@ -398,15 +373,13 @@
 	  (setq quote (concat quote (char-to-string 127))))
       (setq quote (concat quote (substring str i (1+ i))))
       (setq i (1+ i)))
-    quote)
-)
+    quote))
 
 (defun YaTeX-suppress-sparse-keymap (map)
   (let ((i ? ))
     (while (< i 127)
       (define-key map (char-to-string i) 'undefined)
-      (setq i (1+ i))))
-)
+      (setq i (1+ i)))))
 
 ;;;
 ;; Auto-generate Function for Lispers.
@@ -423,8 +396,8 @@
      ((= c ?p) 'oneof)
      ((= c ?o) 'coord)
      ;;((= c ?m) 'macro)
-     (t        'quit)))
- )
+     (t        'quit))))
+
 (defun YaTeX-generate-read-completion-table ()
   (let ((i 1) cand (cands "(") (cb (current-buffer))
 	(buf (get-buffer-create " *Candidates*")))
@@ -441,8 +414,8 @@
 	(insert cand "\n"))
       (kill-buffer buf)))
     ;;(set-buffer cb)
-    (setq YaTeX-generate-current-completion-table (concat cands ")")))
-)
+    (setq YaTeX-generate-current-completion-table (concat cands ")"))))
+
 (defun YaTeX-generate-corresponding-paren (left)
   (cond
    ((equal left "{") "}")
@@ -450,16 +423,16 @@
    ((equal left "(") ")")
    ((equal left "<") ">")
    ((equal left "\\begin{") "}")
-   (t left))
-)
+   (t left)))
+
 (defun YaTeX-generate-create-read-string (&optional nth)
   (concat
    "(read-string \""
    (read-string (if nth (format "Prompt for argument#%d: " nth) "Prompt: "))
    ": \"\n"
    "\"" (read-string "Default: ") "\""
-   ")\n")
-)
+   ")\n"))
+
 (defun YaTeX-generate-create-completing-read (&optional nth)
   (prog1
       (concat
@@ -475,21 +448,21 @@
 	      (cons
 	       (cons (format "YaTeX-%s-%d" command (or nth 0))
 		     YaTeX-generate-current-completion-table)
-	       YaTeX-generate-variables-for-learning))))
-)
+	       YaTeX-generate-variables-for-learning)))))
+
 (defun YaTeX-generate-create-read-file-name (&optional nth)
   (concat
    "(read-file-name \""
    (read-string (if nth (format "Prompt for argument#%d: " nth) "Prompt: "))
-   ": \" "" \"\" t \"\")\n")
-)
+   ": \" "" \"\" t \"\")\n"))
+
 (defun YaTeX-generate-create-read-oneof (&optional nth readpos)
   (concat
    (if readpos
        "(YaTeX:read-position \""
      "(YaTeX:read-oneof \"")
-   (read-string "Acceptable characters: " "lcr") "\")\n")
-)
+   (read-string "Acceptable characters: " "lcr") "\")\n"))
+
 (defun YaTeX-generate-option-type (command)
   (let ((func (format "YaTeX:%s" command)) leftp
 	(buf (get-buffer-create YaTeX-generate-buffer)) type (n 1))
@@ -546,8 +519,8 @@
     (goto-char (point-min))
     (while (not (eobp)) (lisp-indent-line) (forward-line 1))
     (eval-current-buffer)
-    buf)
-)
+    buf))
+
 (defun YaTeX-generate-argument-type (command argc)
   "Create an argument-type add-in function."
   (interactive)
@@ -581,8 +554,8 @@
     (YaTeX-update-table
      (if (> argc 1) (list command argc) (list command))
      'section-table 'user-section-table 'tmp-section-table)
-    buf)
-)
+    buf))
+
 (defun YaTeX-generate-simple (&optional command)
   "Simple but requiring some elisp knowledge add-in generator."
   (interactive)
@@ -607,6 +580,6 @@
        (YaTeX-generate-option-type command)
      (YaTeX-generate-argument-type
       command
-      (string-to-int (read-string "How many arguments?: ")))) nil)
-)
+      (string-to-int (read-string "How many arguments?: ")))) nil))
+
 (provide 'yatexgen)
diff --git a/yatexhie.el b/yatexhie.el
index 4bd3e0a..381348a 100644
--- a/yatexhie.el
+++ b/yatexhie.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX hierarchy browser.
-;;; yatexhie.el
+;;; yatexhie.el --- YaTeX hierarchy browser
+;;; 
 ;;; (c)1995-2012 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Mon Jan  9 20:19:06 2012 on firestorm
+;;; Last modified Sat Sep  1 08:11:00 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 ;; ----- Customizable variables -----
 (defvar YaTeX-hierarchy-ignore-heading-regexp
   "\\$[A-Z][a-z]+: .* \\$\\|-\\*- .* -\\*-"
diff --git a/yatexhlp.el b/yatexhlp.el
index aa3e8ae..808552a 100644
--- a/yatexhlp.el
+++ b/yatexhlp.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX helper with LaTeX commands and macros.
-;;; yatexhlp.el
+;;; yatexhlp.el --- YaTeX helper with LaTeX commands and macros
+;;; 
 ;;; (c)1994,1998,2004 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Tue Oct 19 01:13:21 2004 on firestorm
+;;; Last modified Sat Sep  1 08:11:14 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 (let ((help-file (concat "YATEXHLP."
 			 (cond (YaTeX-japan "jp")
 			       (t "eng"))))
diff --git a/yatexinf.el b/yatexinf.el
index 4c51b50..daf0cae 100644
--- a/yatexinf.el
+++ b/yatexinf.el
@@ -1,8 +1,8 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX interfaces for Texinfo mode.
+;;; yatexinf.el -- YaTeX interfaces for Texinfo mode
 ;;; (c)1994-2012 by HIROSE, Yuuji [yuuji@yatex.org]
-;;; Last modified Mon Jan  9 20:19:55 2012 on firestorm
+;;; Last modified Sat Sep  1 08:11:25 2012 on firestorm
 
+;;; Code:
 (require 'yatex)
 (or (boundp 'texinfo-mode-map)
     (load "texinfo"))
diff --git a/yatexlib.el b/yatexlib.el
index 49dc657..b951c1c 100644
--- a/yatexlib.el
+++ b/yatexlib.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX and yahtml common libraries, general functions and definitions
-;;; yatexlib.el
+;;; yatexlib.el --- YaTeX and yahtml common libraries
+;;; 
 ;;; (c)1994-2012 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Wed Feb 29 09:49:30 2012 on firestorm
+;;; Last modified Sat Sep  1 08:12:09 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 ;; General variables
 (defvar YaTeX-dos (memq system-type '(ms-dos windows-nt OS/2)))
 (defvar YaTeX-macos (memq system-type '(darwin)))
diff --git a/yatexm-o.el b/yatexm-o.el
index 368ecac..d8aff88 100644
--- a/yatexm-o.el
+++ b/yatexm-o.el
@@ -1,8 +1,9 @@
-;;; -*- Emacs-Lisp -*-
-;;; Sample startup file to invoke yatex-mode with outline-minor mode.
-;;; (c)1993 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Fri Jun 27 12:10:15 2003 on firestorm
+;;; yatexm-o.el --- Sample to invoke yatex-mode with outline-minor mode
 
+;;; (c)1993 by HIROSE Yuuji [yuuji@yatex.org]
+;;; Last modified Sat Sep  1 08:12:40 2012 on firestorm
+
+;;; Code:
 ;;;
 ;; outline-minor-mode(�g�p���Ȃ��ꍇ�͕s�v�ł�)
 ;;; 
diff --git a/yatexmth.el b/yatexmth.el
index cb6c196..c6b8643 100644
--- a/yatexmth.el
+++ b/yatexmth.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX math-mode-specific functions.
-;;; yatexmth.el
+;;; yatexmth.el --- YaTeX math-mode-specific functions
+;;; 
 ;;; (c)1993-2012 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Tue Jan 24 08:58:56 2012 on firestorm
+;;; Last modified Sat Sep  1 08:13:08 2012 on firestorm
 ;;; $Id$
 
+;;; Commentary:
 ;;; [Customization guide]
 ;;;
 ;;;	  By default,  you can use two  completion  groups in YaTeX math
@@ -84,6 +84,7 @@
 ;;;	������ ~/.emacs �ɏ����Ă����΁Amath-mode �Ŏ�����p�̃C���[�W
 ;;;	�⊮�����p�ł��܂��B
 
+;;; Code:
 (defvar YaTeX-jisold
   (and (boundp 'dos-machine-type)
        (eq dos-machine-type 'pc98)))
diff --git a/yatexpkg.el b/yatexpkg.el
index f2a70c7..f5acc91 100644
--- a/yatexpkg.el
+++ b/yatexpkg.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX package manager
-;;; yatexpkg.el
+;;; yatexpkg.el --- YaTeX package manager
+;;; 
 ;;; (c)2003-2012 by HIROSE, Yuuji [yuuji@yatex.org]
-;;; Last modified Mon Jan  9 20:13:53 2012 on firestorm
+;;; Last modified Sat Sep  1 08:13:23 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 (defvar YaTeX-package-ams-envs
   (mapcar 'car YaTeX-ams-env-table))
 
diff --git a/yatexprc.el b/yatexprc.el
index 99081d5..23a85a0 100644
--- a/yatexprc.el
+++ b/yatexprc.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX process handler.
-;;; yatexprc.el
+;;; yatexprc.el --- YaTeX process handler
+;;; 
 ;;; (c)1993-2012 by HIROSE Yuuji.[yuuji@yatex.org]
-;;; Last modified Fri Feb 17 22:35:38 2012 on firestorm
+;;; Last modified Sat Sep  1 08:13:49 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 ;(require 'yatex)
 (require 'yatexlib)
 
diff --git a/yatexsec.el b/yatexsec.el
index eafcf9a..5e036b2 100644
--- a/yatexsec.el
+++ b/yatexsec.el
@@ -1,10 +1,10 @@
-;;; -*- Emacs-Lisp -*-
-;;; YaTeX sectioning browser.
-;;; yatexsec.el
+;;; yatexsec.el --- YaTeX sectioning browser
+;;; 
 ;;; (c) 1994-2012 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Mon Jan  9 20:20:32 2012 on firestorm
+;;; Last modified Sat Sep  1 08:13:52 2012 on firestorm
 ;;; $Id$
 
+;;; Code:
 (defvar YaTeX-sectioning-level
   '(("part" . 0)
     ("chapter" . 1)