# HG changeset patch
# User yuuji
# Date 854096646 0
# Node ID 9e08ed569d805decbd643207984673e8875fade8
# Parent  48ac97a6b6ce0a29d17987c3133db15fa343305a
yahtml: change keystroke of calling browser to [prefix] t p
yahtml: don't count <a>tag contents as column in <pre>
yahtml: support [prefix] c against src="", align="".
and many many more

diff -r 48ac97a6b6ce -r 9e08ed569d80 docs/qanda.eng
--- a/docs/qanda.eng	Wed May 01 15:35:40 1996 +0000
+++ b/docs/qanda.eng	Fri Jan 24 09:04:06 1997 +0000
@@ -3,6 +3,9 @@
 %%
 %% C-u C-x $ shows only questions.  C-x $ shows all.
 %%
+(New Item
+     *It is bothering for me to determine I should call bibtex or latex...
+     *Filling a paragraph doesn't work as I expected.
 
 [Installation]
 ==============
@@ -201,6 +204,32 @@
 	ftp://ftp.ae.keio.ac.jp/pub/emacs-lisp/util/
 	ftp://archive.cis.ohio-state.edu/pub/gnu/elisp-archive/
 	
+*It is bothering for me to determine I should call bibtex or latex...
+	
+	Why don't you try `latexmk' perl script, which is a TeX specific 
+	tool as `make'?  It detects the dependency among the TeX-related 
+	files such as .tex, .bib, and so on, and will execute suitable
+	commands in a suitable sequence.  You can find `latexmk' script
+	in a directory of supports/latexmk in some CTAN ftp directory.
+	
+*Filling a paragraph doesn't work as I expected.	
+	
+	It is because the indentation  depth  is different from  default
+	depth.    Please keep  turning   on auto-fill   to  make filling
+	function  work  well.  If  you bring  some  paragraph  which has
+	different  indentation from other part  of document, you have to
+	re-indent it with the default indentation by  typing TAB on each
+	line.  If the paragraph is large, try the next operation;
+	
+	       (1)Type C-x . on the beginning of line
+	       (2)Mark paragraph to be re-indented
+	       (3)Type M-C-\
+	
+	then fill the paragraph.  If  you want fill that paragraph  with
+	current   indentation depth,  move the     cursor on the   first
+	appearance  of  non-white-space  character  on  the  line before
+	filling.
+	
 [About Emacs-19/Mule2]
 ======================
 *Equations are too dark to read when I use hilit19.
diff -r 48ac97a6b6ce -r 9e08ed569d80 docs/yatexe.tex
--- a/docs/yatexe.tex	Wed May 01 15:35:40 1996 +0000
+++ b/docs/yatexe.tex	Fri Jan 24 09:04:06 1997 +0000
@@ -126,7 +126,7 @@
 @itemize
 @item Invocation of typesetter,  previewer and related programs(@kbd{C-c t})
 @item Typesetting on static region which is independent from point
-@item Semiautomatic replacing of @code{\include only}
+@item Semiautomatic replacing of @code{\includeonly}
 @item Jumping to error line(@kbd{C-c '})
 @item Completing-read of La@TeX{} commands such as @code{\begin@{@}},
         @code{\section} etc. 
@@ -1562,9 +1562,9 @@
 @section Lisp variables
 @cindex customizable variables
 
-  You   can change the   key assignments or   make completion more
-comfortable  by  setting the values   of   various variables which
-control the movement of yatex-mode.
+  You can change the key assignments or make completion more comfortable
+by setting the values of various variables which control the movement of
+yatex-mode.
 
   For example, if you want to change the prefix key stroke from @kbd{C-c}
 to any other sequence, set YaTeX-prefix to whatever you want to use.  If
@@ -1595,145 +1595,137 @@
 the variable by @kbd{M-x describe-variable}.
 
 @defvar YaTeX-prefix
-        Prefix key stroke (@kbd{C-c})
+Prefix key stroke (@kbd{C-c})
 @end defvar
 
 @defvar YaTeX-inhibit-prefix-letter
-        Change key stroke from @kbd{C-c letter} to @kbd{C-c C-letter}
-        (@code{nil})
+Change key stroke from @kbd{C-c letter} to @kbd{C-c C-letter} (@code{nil})
 @end defvar
 
 @defvar YaTeX-fill-prefix
-        Fill-prefix used in yatex-mode (@code{nil})
+Fill-prefix used in yatex-mode (@code{nil})
 @end defvar
 
 @defvar YaTeX-user-completion-table
-        Name of user dictionary where learned completion table will be stored.
-        (@code{"~/.yatexrc"})
+Name of user dictionary where learned completion table will be stored. 
+(@code{"~/.yatexrc"})
+@end defvar
+
+@defvar tex-command
+La@TeX{} typesetter command (@code{"latex"})
+@end defvar
+
+@defvar dvi2-command
+Preview command (@code{"xdvi -geo +0+0 -s 4"})
+@end defvar
+
+@defvar dviprint-command-format
+Command format to print dvi file (@code{"dvi2ps %f %t %s | lpr"})
+@end defvar
+
+@defvar dviprint-from-format
+Start page format of above %f. %b will turn to start page (@code{"-f %b"})
+@end defvar
+
+@defvar dviprint-to-format
+End page format of above %t. %e will turn to @code{end} page (@code{"-t %e"})
+@end defvar
+
+@defvar makeindex-command
+Default makeindex command (@code{"makeindex"} (@code{"makeind"} on MS-DOS))
+@end defvar
+
+@defvar section-name
+Initial default value at the first section-type completion 
+(@code{"documentstyle"})
+@end defvar
+
+@defvar env-name
+Initial default value at the first begin-type completion (@code{"document"})
+@end defvar
+
+@defvar fontsize-name
+Ditto of large-type (@code{"large"})
+@end defvar
+
+@defvar single-command
+Ditto of maketitle-type (@code{"maketitle"})
+@end defvar
+
+@defvar YaTeX-need-nonstop
+Put @code{\nonstopmode@{@}} or not (@code{nil})
+@end defvar
+
+@defvar latex-warning-regexp
+Regular expression of warning message latex command puts out 
+(@code{"line.* [0-9]*"})
+@end defvar
+
+@defvar latex-error-regexp
+Regular expression of error message (@code{"l\\.[1-9][0-9]*"})
+@end defvar
+
+@defvar latex-dos-emergency-message
+Message latex command running on DOS puts at abort (@code{"Emergency stop"})
 @end defvar
 
 @defvar YaTeX-item-regexp
-        Regular expression of item command(@code{"\\\\item"})
-@end defvar
-
-@defvar tex-command
-        La@TeX{} typesetter command (@code{"latex"})
-@end defvar
-
-@defvar dvi2-command
-        Preview command
-        (@code{"xdvi -geo +0+0 -s 4 -display (getenv"DISPLAY")"})
-@end defvar
-
-@defvar dviprint-command-format
-        Command format to print dvi file (@code{"dvi2ps %f %t %s | lpr"})
-@end defvar
-
-@defvar dviprint-from-format
-        Start page format of above %f. %b will turn to start page
-        (@code{"-f %b"})
-@end defvar
-
-@defvar dviprint-to-format
-        End page format of above %t. %e will turn to @code{end} page
-        (@code{"-t %e"})
-@end defvar
-
-@defvar section-name
-        Initial default value at the first section-type completion
-        (@code{"documentstyle"})
-@end defvar
-
-@defvar env-name
-        Initial default value at the first begin-type completion
-        (@code{"document"})
-@end defvar
-
-@defvar fontsize-name
-        Ditto of large-type (@code{"large"})
-@end defvar
-
-@defvar single-command
-        Ditto of maketitle-type (@code{"maketitle"})
-@end defvar
-
-@defvar YaTeX-need-nonstop
-        Put @code{\nonstopmode@{@}} or not (@code{nil})
-@end defvar
-
-@defvar latex-warning-regexp
-        Regular expression of warning message latex command puts out
-        (@code{"line.* [0-9]*"})
-@end defvar
-
-@defvar latex-error-regexp
-        Regular expression of error message (@code{"l\\.[1-9][0-9]*"})
-@end defvar
-
-@defvar latex-dos-emergency-message
-        Message latex command running on DOS puts at abort
-        (@code{"Emergency stop"})
-@end defvar
-
-@defvar YaTeX-item-regexp
-        Regexp of La@TeX{} itemization command (@code{"\\\\(sub\\)*item"})
+Regular expression of item command (@code{"\\\\item"})
 @end defvar
 
 @defvar YaTeX-verb-regexp
-        Regexp of La@TeX{} verb command family.  Omit \\\\.
-        (@code{"verb\\*?\\|path"})
+Regexp of verb family.  Omit \\\\. (@code{"verb\\*?\\|path"})
 @end defvar
 
-@defvar         YaTeX-nervous
-        T for using local dictionary (@code{t})
+@defvar YaTeX-nervous
+T for using local dictionary (@code{t})
 @end defvar
 
 @defvar YaTeX-sectioning-regexp
-        Regexp of La@TeX{} sectioning command
-
-        (@code{"part\\|chapter\\|\\(sub\\)*\\(section\\|paragraph\\)"})
+Regexp of La@TeX{} sectioning command 
+(@code{"\\(part\\|chapter\\*?\\|\\(sub\\)*\\(section\\|paragraph\\)\\*?\\)\\b"})
 @end defvar
 
 @defvar YaTeX-fill-inhibit-environments
-        Inhibit fill in these environments (@code{'("verbatim" "tabular")})
+Inhibit fill in these environments 
+(@code{'("tabular" "tabular*" "array" "picture" "eqnarray" "eqnarray*" "equation" "math" "displaymath" "verbatim" "verbatim*")})
 @end defvar
 
 @defvar YaTeX-uncomment-once
-        @code{T} for deleting all preceding @code{%} (@code{nil})
+T for deleting all preceding @code{%} (@code{nil})
 @end defvar
 
 @defvar YaTeX-close-paren-always
-        @code{T} for always close all parenthesis automatically,
-        @code{nil} for only eol(@code{t})
+T for always close all parenthesis automatically, @code{nil} for only eol 
+(@code{t})
 @end defvar
 
 @defvar YaTeX-auto-math-mode
-        Switch math-mode automatically(@code{t})
+Switch math-mode automatically (@code{t})
 @end defvar
 
 @defvar YaTeX-math-key-list-private
-        User defined alist, math-mode-prefix vs completion alist
-        used in image completion(@code{nil}).  See @file{yatexmth.el}
-        for the information about how to define a completion alist.
+User defined alist, math-mode-prefix vs completion alist
+used in image completion (@code{nil}).  See @file{yatexmth.el}
+for the information about how to define a completion alist.
 @end defvar
 
 @defvar YaTeX-default-pop-window-height
-        Initial height of typesetting buffer when one-window.
-        Number for the lines of the buffer, numerical string for
-        the percentage of the screen-height.
-        @code{nil} for half height(10)
+Initial height of typesetting buffer when one-window.
+Number for the lines of the buffer, numerical string for
+the percentage of the screen-height. @code{nil} for half height (10)
 @end defvar
 
 @defvar YaTeX-help-file
-        Global online help file name (@file{$EMACS/etc/YATEXHLP.jp})
+Global online help file name (@file{$EMACS/etc/YATEXHLP.jp})
 @end defvar
 
 @defvar YaTeX-help-file-private
-        Private online help file name (@file{"~/YATEXHLP.jp"})
+Private online help file name (@file{"~/YATEXHLP.jp"})
 @end defvar
 
 @defvar YaTeX-no-begend-shortcut
-        Disable [prefix] b ?? shortcut (@code{nil)}
+Disable [prefix] b ?? shortcut (@code{nil)}
 @end defvar
 
 @defvar YaTeX-hilit-pattern-adjustment-private
@@ -1758,16 +1750,17 @@
 
 @defvar YaTeX-skip-default-reader
 Non-nil for this variable skips the default argument reader of
-section-type command when add-in function for it is not defined.
+section-type command when add-in function for it is not defined 
+(@code{nil})
 @end defvar
 
 @defvar YaTeX-create-file-prefix-g
 When typing @kbd{prefix g} on the @code{\include} line,
-open the target file even if the file doesn't exist(@code{nil}).
+open the target file even if the file doesn't exist (@code{nil})
 @end defvar
 
 @defvar YaTeX-simple-messages
-Simplyfy messages of various completions(@code{nil})$B!#(B
+Simplyfy messages of various completions (@code{nil})
 @end defvar
 
 @defvar YaTeX-hilit-sectioning-face
@@ -1781,12 +1774,12 @@
 
 @defvar YaTeX-hilit-sectioning-attenuation-rate
 When color mode, this variable specifies how much attenuate the color
-density of @code{\subparagraph} compared with that of @code{\chapter}.
-See also $B!#(B@code{YaTeX-hilit-sectioning-face}.
+density of @code{\subparagraph} compared with that of @code{\chapter} 
+(@code{'(15 40)}) See also @code{YaTeX-hilit-sectioning-face}.
 @end defvar
 
 @defvar YaTeX-use-AMS-LaTeX
-If you use AMS-LaTeX, set to @code{t}(@code{nil}).
+If you use AMS-LaTeX, set to @code{t} (@code{nil})
 @end defvar
 
 @node Sample definitions, Hook variables, All customizable variables, Lisp variables
diff -r 48ac97a6b6ce -r 9e08ed569d80 docs/yatexj.tex
--- a/docs/yatexj.tex	Wed May 01 15:35:40 1996 +0000
+++ b/docs/yatexj.tex	Fri Jan 24 09:04:06 1997 +0000
@@ -22,7 +22,7 @@
 
 @menu
 * Intro::                       はじめに
-* Terminology::                  マニュアル参照上の注意
+* Terminology::                 マニュアル参照上の注意
 * Main features::               主な機能
 * Installation::                インストール
 * Invocation::                  プロセス起動
@@ -1524,8 +1524,8 @@
 @node Intelligent newline, Changing mode of YaTeX, What column, Top
 @comment  node-name,  next,  previous,  up
 @chapter おまかせ改行
-@cindex おまかせ改行[おまかせかいぎょう]
-@cindex &入力[&にゅうりょく]
+@cindex おまかせ改行[おまかせかいきよう]
+@cindex &入力[&にゆうりよく]
 @cindex prefix &
 
   tabular[*], array, itemize, enumerate, tabbing 環境をbegin型補完で入力し
@@ -1780,11 +1780,11 @@
 変数の詳細な説明を参照してください。
 
 @defvar YaTeX-prefix
-yatex-mode 中のプリフィクスキー(@kbd{C-c})
+yatex-mode 中のプリフィクスキー (@kbd{\C-c})
 @end defvar
 
 @defvar YaTeX-inhibit-prefix-letter
-prefix キーの直後のキーバインドで@kbd{英字}のものを@kbd{C-英字}に変更
+prefix キーの直後のキーバインドで @kbd{英字} のものを @kbd{C-英字} に変更 
 (@code{nil})
 @end defvar
 
@@ -1793,19 +1793,11 @@
 @end defvar
 
 @defvar YaTeX-user-completion-table
-学習したLa@TeX{}コマンド保存ファイル名(@code{"~/.yatexrc"})
+学習したLa@TeX{}コマンド保存ファイル名 (@code{"~/.yatexrc"})
 @end defvar
 
 @defvar YaTeX-kanji-code
-文書を作成する時の漢字コード1=Shift JIS, 2=JIS, 3=EUC(2 (MS-DOSでは1))
-@end defvar
-
-@defvar YaTeX-item-regexp
-itemの桁揃えの時に用いる、itemの正規表現(@code{"\\\\(sub\\)*item"})
-@end defvar
-
-@defvar YaTeX-verb-regexp
-verbコマンドの正規表現。先頭の\\\\はつけない(@code{"verb\\*?\\|path"})
+文書を作成する時の漢字コード 1=Shift JIS, 2=JIS, 3=EUC (2 (MS-DOSでは1))
 @end defvar
 
 @defvar tex-command
@@ -1813,53 +1805,53 @@
 @end defvar
 
 @defvar dvi2-command
-プレヴューアコマンド名(@code{"xdvi -geo +0+0 -s 4 -display (getenv"DISPLAY")"})
+プレヴューアコマンド名 (@code{"xdvi -geo +0+0 -s 4"})
 @end defvar
 
 @defvar dviprint-command-format
-dviファイルの印刷に使われるコマンド式(@code{"dvi2ps %f %t %s | lpr"})
+dviファイルの印刷に使われるコマンド式 (@code{"dvi2ps %f %t %s | lpr"})
 @end defvar
 
 @defvar dviprint-from-format
 上の@code{%f}に相当する開始ページ指定書式、@code{%b} が開始ページ番号に変
-わる(@code{"-f %b"})
+わる (@code{"-f %b"})
 @end defvar
 
 @defvar dviprint-to-format
-@code{%t} に相当する終了ページ指定書式、@code{%e}が終了ページ番号に変わる
+@code{%t} に相当する終了ページ指定書式、@code{%e}が終了ページ番号に変わる 
 (@code{"-t %e"})
 @end defvar
 
 @defvar makeindex-command
-makeindexコマンド(@code{"makeindex"} (MS-DOSでは@code{"makeind"}))
+makeindexコマンド (@code{"makeindex"} (MS-DOSでは@code{"makeind"}))
 @end defvar
 
 @defvar section-name
-最初のsection型補完の規定値(@code{"documentstyle"})
+最初のsection型補完の規定値 (@code{"documentstyle"})
 @end defvar
 
 @defvar env-name
-最初のbegin型補完の規定値(@code{"document"})
+最初のbegin型補完の規定値 (@code{"document"})
 @end defvar
 
 @defvar fontsize-name
-最初のlarge型補完の規定値(@code{"large"})
+最初のlarge型補完の規定値 (@code{"large"})
 @end defvar
 
 @defvar single-command
+最初のmaketitle型補完の規定値 (@code{"maketitle"})
 @end defvar
-最初のmaketitle型補完の規定値(@code{"maketitle"})
 
 @defvar YaTeX-need-nonstop
-@code{\nonstopmode@{@}}を自動的に付加するか(@code{nil})
+@code{\nonstopmode@{@}}を自動的に付加するか (@code{nil})
 @end defvar
 
 @defvar latex-warning-regexp
-latexコマンドの出力するウォーニング行の正規表現(@code{"line.* [0-9]*"})
+latexコマンドの出力するウォーニング行の正規表現 (@code{"line.* [0-9]*"})
 @end defvar
 
 @defvar latex-error-regexp
-同じくエラー行の正規表現(@code{"l\\.[1-9][0-9]*"})
+同じくエラー行の正規表現 (@code{"l\\.[1-9][0-9]*"})
 @end defvar
 
 @defvar latex-dos-emergency-message
@@ -1869,15 +1861,19 @@
 
 @defvar latex-message-kanji-code
 jlatex コマンドの出力するメッセージの漢字コード.タイプセットバッファ
-の出力が化ける時は、これを設定する(2, Nemacsでのみ有効)
+の出力が化ける時は、これを設定する (2, Nemacsでのみ有効)
 @end defvar
 
 @defvar NTT-jTeX
-NTT-j@TeX{}使用時@code{t}にする(@code{nil})
+NTT-j@TeX{}使用時は@code{t}にする (@code{nil})
 @end defvar
 
 @defvar YaTeX-item-regexp
-item化コマンドの正規表現(@code{"\\\\(sub\\)*item"})
+itemの桁揃えの時に用いる、itemの正規表現 (@code{"\\\\(sub\\)*item"})
+@end defvar
+
+@defvar YaTeX-verb-regexp
+verbコマンドの正規表現。先頭の\\\\はつけない (@code{"verb\\*?\\|path"})
 @end defvar
 
 @defvar YaTeX-nervous
@@ -1885,48 +1881,48 @@
 @end defvar
 
 @defvar YaTeX-sectioning-regexp
-セクション区切り設定コマンドの正規表現
-(@code{"part\\|chapter\\|\\(sub\\)*\\(section\\|paragraph\\)"})
+セクション区切り設定コマンドの正規表現 
+(@code{"\\(part\\|chapter\\*?\\|\\(sub\\)*\\(section\\|paragraph\\)\\*?\\)\\b"})
 @end defvar
 
 @defvar YaTeX-fill-inhibit-environments
-fill を抑止する環境名のリスト(@code{'("verbatim" "tabular")})
+fill を抑止する環境名のリスト 
+(@code{'("tabular" "tabular*" "array" "picture" "eqnarray" "eqnarray*" "equation" "math" "displaymath" "verbatim" "verbatim*")})
 @end defvar
 
 @defvar YaTeX-uncomment-once
-領域uncommentで行頭の複数の@code{%}を全て削除するか(@code{nil})
+領域uncommentで行頭の複数の@code{%}を全て削除するか (@code{nil})
 @end defvar
 
 @defvar YaTeX-close-paren-always
-開き括弧の入力で常に閉じ括弧を入力する(@code{t})
+開き括弧の入力で常に閉じ括弧を入力する (@code{t})
 @end defvar
 
 @defvar YaTeX-auto-math-mode
-数式モードの切り替えを自動的に行う。(@code{t})
+数式モードの切り替えを自動的に行う (@code{t})
 @end defvar
 
 @defvar YaTeX-math-key-list-private
-        数式イメージ補完で用いる (プリフィクスキー . 対応補完テーブル) の
-        alist(@code{nil})。補完テーブルの書き方については
-        @file{yatexmth.el}を参照。
+数式イメージ補完で用いる (プリフィクスキー . 対応補完テーブル) の
+alist (@code{nil})。補完テーブルの書き方については@file{yatexmth.el}を参照。
 @end defvar
 
 @defvar YaTeX-default-pop-window-height
 1画面の時にタイプセットバッファを初めて作成する時の高さ。数値で行数、数字
-文字列でEmacsウィンドウに対する百分率(10)。
+文字列でEmacsウィンドウに対する百分率 (10)
 @end defvar
 
 @defvar YaTeX-help-file
-共用ヘルプファイル(@file{$EMACS/etc/YATEXHLP.jp})
+共用ヘルプファイル (@file{$EMACS/etc/YATEXHLP.jp})
 @end defvar
 
 @defvar YaTeX-help-file-private
-個人用ヘルプファイル(@file{"~/YATEXHLP.jp"})
+個人用ヘルプファイル (@file{"~/YATEXHLP.jp"})
 @end defvar
 
 @defvar YaTeX-no-begend-shortcut
 @kbd{[prefix] b ??} のショートカットを使わず、@kbd{[prefix] b} だけで補完
-入力に入る(@kbd{nil})
+入力に入る (@code{nil})
 @end defvar
 
 @defvar YaTeX-hilit-pattern-adjustment-private
@@ -1950,20 +1946,20 @@
 
 @defvar YaTeX-skip-default-reader
 Non-nil に設定するとsection型コマンドの引数入力時、アドイン関数がなければ
-ミニバッファでの読み込みをせずに入力を完了させる。
+ミニバッファでの読み込みをせずに入力を完了させる (@code{nil})
 @end defvar
 
 @defvar YaTeX-create-file-prefix-g
 @code{\include}などで @kbd{prefix g}した時に、ジャンプ先が存在しないファイ
-ルであってもオープンする(@code{nil})。
+ルであってもオープンする (@code{nil})
 @end defvar
 
 @defvar YaTeX-simple-messages
-各種補完時のメッセージ出力を簡素化する(@code{nil})。
+各種補完時のメッセージ出力を簡素化する (@code{nil})
 @end defvar
 
 @defvar YaTeX-hilit-sectioning-face
-色付けが有効な時の @code{\part} の色
+色付けが有効な時の @code{\part} の色 
 (@code{'(yellow/dodgerblue yellow/slateblue)})。
 リストの第一要素は @code{hilit-background-mode} が @code{'light} の時の、
 第二要素は @code{'dark} の時の @code{\chapter} の色で、文字色/背景色 のよ
@@ -1972,12 +1968,12 @@
 
 @defvar YaTeX-hilit-sectioning-attenuation-rate
 色付けが有効な時の、@code{\subparagraph} の色を @code{\chapter} の濃度の何
-%薄くしたものにするか(@code{'(15 40)}。@code{YaTeX-hilit-sectioning-face}
+%薄くしたものにするか (@code{'(15 40)}) @code{YaTeX-hilit-sectioning-face}
 の項参照。
 @end defvar
 
 @defvar YaTeX-use-AMS-LaTeX
-AMS-LaTeX を使用する場合は @code{t} に設定する(@code{nil})。
+AMS-LaTeX を使用する場合は @code{t} に設定する (@code{nil})
 @end defvar
 
 @node Sample definitions, Hook variables, All customizable variables, Lisp variables
diff -r 48ac97a6b6ce -r 9e08ed569d80 help/YATEXHLP.jp
--- a/help/YATEXHLP.jp	Wed May 01 15:35:40 1996 +0000
+++ b/help/YATEXHLP.jp	Fri Jan 24 09:04:06 1997 +0000
@@ -687,6 +687,10 @@
 \sbox{\CMD}{テキスト}
 \saveboxと同じ。sboxはrobust, saveboxはfragile
 
+usebox
+\usebox{\CMD}
+\saveboxで\CMDに保存されたテキストを配置する。
+
 framebox
 \framebox{オブジェクト}
 「オブジェクト」に枠をつけて\makeboxと同様の処理をする。
@@ -1211,7 +1215,7 @@
 以下の方々の御協力を頂きました。ここに感謝申し上げます。
 
 (順不同/代表項目のみ)
-横田一也さん(マツダ)
+横田和也さん(マツダ)
 	転載を行って頂きました。
 
 北岸隆史さん(豊橋技術科学大)
@@ -1372,6 +1376,9 @@
 	label/ref補完で、labelやrefで始まる単語全てを候補にいれてしまう
 	バグを報告して頂きました。
 
+吉田尚志さん(NTT DATA)
+	Win32関連で多大なる貢献をして頂きました。
+
 上田佳明さん(豊橋技科大)
 	Emacs 19.29 以降で生じるYaTeX-indent-new-comment-lineの不具合を
 	指摘して頂きました。
@@ -1391,7 +1398,7 @@
 	YaTeX-default-pop-window-height の原案を頂きました。
 	$ \% $ のような場合の数式モード終了判定のミスを指摘して頂きました。
 
-安藤利和(金沢工大)
+安藤利和さん(金沢工大)
 	野鳥を使うTipsをまとめた「あなたもわたしも野鳥の…」というWWWペー
 	ジを作成して下さいました。
 
diff -r 48ac97a6b6ce -r 9e08ed569d80 yahtml.el
--- a/yahtml.el	Wed May 01 15:35:40 1996 +0000
+++ b/yahtml.el	Fri Jan 24 09:04:06 1997 +0000
@@ -1,7 +1,6 @@
 ;;; -*- Emacs-Lisp -*-
-;;; (c ) 1994 by HIROSE Yuuji [yuuji@ae.keio.ac.jp, pcs39334@asciinet.or.jp]
-;;; Last modified Tue Apr 23 23:13:12 1996 on inspire
-;;; This package is no longer tentative.
+;;; (c ) 1994-1997 by HIROSE Yuuji [yuuji@ae.keio.ac.jp]
+;;; Last modified Fri Jan 24 18:03:01 1997 on supra
 ;;; $Id$
 
 ;;;[Installation]
@@ -35,6 +34,8 @@
 ;;;			`<input name="var" ...>'
 ;;;  * [prefix] l	Complete typeface-changing commands such as
 ;;;			`<i> ... </i>' or `<samp> ... </samp>'
+;;; 			This completion can be used to make in-line
+;;; 			tags which is normally completed with [prefix] b.
 ;;;  * [prefix] m	Complete single commands such as
 ;;;			`<br>' or `<hr> or <li>...'
 ;;;  * M-RET		Intelligent newline; if current TAG is one of
@@ -50,7 +51,8 @@
 ;;;  * [prefix] c	Change html tags on the point.
 ;;;			When typeing [prefix] c on `href="xxx"', you can 
 ;;;			change the reference link with completion.
-;;;  * [prefix] t b	View current html with WWW browser
+;;;  * [prefix] t j	Call weblint on current file.
+;;;  * [prefix] t p	View current html with WWW browser
 ;;; 			(To activate this, never fail to set the lisp
 ;;; 			 variable yahtml-www-browser.  Recommended value
 ;;; 			 is "netscape")
@@ -60,8 +62,7 @@
 
 
 (require 'yatex)
-(defvar yahtml-prefix-map nil)
-(defvar yahtml-mode-map nil "Keymap used in yahtml-mode.")
+;;; --- customizable variable starts here ---
 (defvar yahtml-image-viewer "xv" "*Image viewer program")
 (defvar yahtml-www-browser "netscape"
   "*WWW Browser command")
@@ -77,18 +78,36 @@
   "*Directory index file name;
 Consult your site's WWW administrator.")
 
+(defvar yahtml-environment-indent YaTeX-environment-indent
+  "*Indentation depth of HTML's listing environment")
+
+(defvar yahtml-lint-program (if YaTeX-japan "jweblint" "weblint")
+  "*Program name to lint HTML file")
+(defvar yahtml-hate-too-deep-indentation nil
+  "*Non-nil for this variable suppress deep indentation in listing environments.")
+
+;;; --- customizable variable ends here ---
+
+(defvar yahtml-prefix-map nil)
+(defvar yahtml-mode-map nil "Keymap used in yahtml-mode.")
+(defvar yahtml-lint-buffer-map nil "Keymap used in lint buffer.")
+(defvar yahtml-shell-command-option
+  (or (and (boundp 'shell-command-option) shell-command-option)
+      (if (eq system-type 'ms-dos) "/c" "-c")))
+
+
 (defun yahtml-define-begend-key-normal (key env &optional map)
-  "Define short cut yahtml-insert-begin-end key."
+  "Define short cut yahtml-insert-begend key."
   (YaTeX-define-key
    key
    (list 'lambda '(arg) '(interactive "P")
-	 (list 'yahtml-insert-begin-end env 'arg))
+	 (list 'yahtml-insert-begend 'arg env))
    map))
 
 (defun yahtml-define-begend-region-key (key env &optional map)
-  "Define short cut yahtml-insert-begin-end-region key."
+  "Define short cut yahtml-insert-begend-region key."
   (YaTeX-define-key key (list 'lambda nil '(interactive)
-			      (list 'yahtml-insert-begin-end env t)) map))
+			      (list 'yahtml-insert-begend t env)) map))
 
 (defun yahtml-define-begend-key (key env &optional map)
   "Define short cut key for begin type completion both for
@@ -128,20 +147,22 @@
     (YaTeX-define-key "s" 'yahtml-insert-form map)
     (YaTeX-define-key "l" 'yahtml-insert-tag map)
     (YaTeX-define-key "m" 'yahtml-insert-single map)
-    (YaTeX-define-key "n" '(lambda () (interactive) (insert "<br>\n")) map)
+    (YaTeX-define-key "n" '(lambda () (interactive) (if yahtml-prefer-upcases (insert "<BR>")(insert "<br>"))) map)
     (if YaTeX-no-begend-shortcut
 	(progn
 	  (YaTeX-define-key "B" 'yahtml-insert-begend-region map)
 	  (YaTeX-define-key "b" 'yahtml-insert-begend map))
-      (yahtml-define-begend-key "bh" "HTML" map)
-      (yahtml-define-begend-key "bH" "HEAD" map)
-      (yahtml-define-begend-key "bt" "TITLE" map)
+      (yahtml-define-begend-key "bh" "html" map)
+      (yahtml-define-begend-key "bH" "head" map)
+      (yahtml-define-begend-key "bt" "title" map)
       (yahtml-define-begend-key "bT" "table" map)
-      (yahtml-define-begend-key "bb" "BODY" map)
-      (yahtml-define-begend-key "bd" "DL" map)
-      (yahtml-define-begend-key "b1" "H1" map)
-      (yahtml-define-begend-key "b2" "H2" map)
-      (yahtml-define-begend-key "b3" "H3" map)
+      (yahtml-define-begend-key "bb" "body" map)
+      (yahtml-define-begend-key "bc" "center" map)
+      (yahtml-define-begend-key "bd" "dl" map)
+      (yahtml-define-begend-key "bu" "ul" map)
+      (yahtml-define-begend-key "b1" "h1" map)
+      (yahtml-define-begend-key "b2" "h2" map)
+      (yahtml-define-begend-key "b3" "h3" map)
       (yahtml-define-begend-key "ba" "a" map)
       (yahtml-define-begend-key "bf" "form" map)
       (yahtml-define-begend-key "bs" "select" map)
@@ -156,17 +177,22 @@
     (YaTeX-define-key "c" 'yahtml-change-* map)
     (YaTeX-define-key "t" 'yahtml-browse-menu map)
     (YaTeX-define-key "a" 'yahtml-complete-mark map)
+    (YaTeX-define-key "'" 'yahtml-prev-error map)
     ;;;;;(YaTeX-define-key "i" 'yahtml-fill-item map)
-    )
-)
+    ))
+
+(if yahtml-lint-buffer-map nil
+  (setq yahtml-lint-buffer-map (make-keymap))
+  (define-key yahtml-lint-buffer-map " " 'yahtml-jump-to-error-line))
+
 
 (defvar yahtml-paragraph-start
   (concat
-   "^$\\|<[bh]r>\\|<p>\\|^[ \t]*</?\\(h[1-6]\\|p\\|d[ldt]\\|t[rdh]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\)>")
+   "^$\\|<!--\\|^[ \t]*</?\\(h[1-6]\\|p\\|d[ldt]\\|[bhtd][rdh]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\|table\\|center\\)\\b")
   "*Regexp of html paragraph separater")
 (defvar yahtml-paragraph-separate
   (concat
-   "^$\\|<[bh]r>\\|<p>\\|^[ \t]*</?\\(h[1-6]\\|p\\|d[ldt]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\)>")
+   "^$\\|<!--\\|^[ \t]*</?\\(h[1-6]\\|p\\|[bhtd][ldt]\\|li\\|body\\|html\\|head\\|title\\|ul\\|ol\\|dl\\|pre\\|table\\|center\\|!--\\)\\b")
   "*Regexp of html paragraph separater")
 (defvar yahtml-syntax-table nil
   "*Syntax table for typesetting buffer")
@@ -188,14 +214,14 @@
 (defvar yahtml-tmp-form-table nil)
 
 (defvar yahtml-env-table
-  '(("html") ("head") ("title") ("body") ("dl") ("a") ("form") ("select")
-    ("textarea")
+  '(("html") ("head") ("title") ("body") ("dl") ("ul") ("ol") ("pre")
+    ("a") ("form") ("select") ("center") ("textarea") ("blockquote")
     ("OrderedList" . "ol")
     ("UnorderedList" . "ul")
     ("DefinitionList" . "dl")
     ("Preformatted" . "pre")
     ("table") ("tr") ("th") ("td")
-    ("h1") ("h2") ("h3") ("h4") ("h5") ("h6") ("ul")))
+    ("h1") ("h2") ("h3") ("h4") ("h5") ("h6")))
 
 (defvar yahtml-itemizing-regexp
   "\\(ul\\|ul\\|dl\\)"
@@ -206,8 +232,10 @@
 
 ;;; Completion tables for typeface designator
 (defvar yahtml-typeface-table
-  '(("defn") ("em") ("cite") ("code") ("kbd") ("samp")
-    ("strong") ("var") ("b") ("i") ("tt") ("u") ("address"))
+  (append
+   '(("dfn") ("em") ("cite") ("code") ("kbd") ("samp")
+     ("strong") ("var") ("b") ("i") ("tt") ("u") ("address"))
+   yahtml-env-table)
   "Default completion table of typeface designator")
 (defvar yahtml-user-typeface-table nil)
 (defvar yahtml-tmp-typeface-table nil)
@@ -229,20 +257,9 @@
 (defvar yahtml-last-single-cmd nil)
 
 (defvar yahtml-prefer-upcases nil)
-(cond
- (yahtml-prefer-upcases
-  (setq yahtml-form-table
-	(mapcar (function (lambda (list) (list (upcase (car list)))))
-		yahtml-form-table))
-  (setq yahtml-env-table
-	(mapcar (function (lambda (list) (list (upcase (car list)))))
-		yahtml-env-table))
-  (setq yahtml-typeface-table
-	(mapcar (function (lambda (list) (list (upcase (car list)))))
-		yahtml-typeface-table))))
 
 (defvar yahtml-struct-name-regexp
-  "\\<\\(h[1-6]\\|[uod]l\\|body\\|title\\|head\\|table\\|t[rhd]\\|pre\\|a\\|form\\|select\\)\\b")
+  "\\<\\(h[1-6]\\|[uod]l\\|html\\|body\\|title\\|head\\|table\\|t[rhd]\\|pre\\|a\\|form\\|select\\)\\b")
 
 
 (defun yahtml-mode ()
@@ -257,9 +274,10 @@
     (setq kanji-fileio-code yahtml-kanji-code)))
   (setq major-mode 'yahtml-mode
 	mode-name "yahtml")
+  (make-local-variable 'YaTeX-kanji-code)
   (make-local-variable 'YaTeX-ec) (setq YaTeX-ec "")
   (make-local-variable 'YaTeX-struct-begin)
-  (setq YaTeX-struct-begin "<%1%2>")
+  (setq YaTeX-struct-begin "<%1%2")
   (make-local-variable 'YaTeX-struct-end) (setq YaTeX-struct-end "</%1>")
   (make-local-variable 'YaTeX-struct-name-regexp)
   (setq YaTeX-struct-name-regexp yahtml-struct-name-regexp)
@@ -282,6 +300,8 @@
   (setq indent-line-function 'yahtml-indent-line)
   (make-local-variable 'YaTeX-item-regexp)
   (setq YaTeX-item-regexp "<\\(li\\|d[td]\\)>")
+  (make-local-variable 'YaTeX-typesetting-mode-map)
+  (setq YaTeX-typesetting-mode-map yahtml-lint-buffer-map)
   (set-syntax-table yahtml-syntax-table)
   (use-local-map yahtml-mode-map)
   (run-hooks 'yahtml-mode-hook))
@@ -324,8 +344,8 @@
    (nreverse
     '((em	"Embolden" .
 	  (lambda () (interactive) (yahtml-insert-tag nil "EM")))
-      (defn	"Define a word" .
-	(lambda () (interactive) (yahtml-insert-tag nil "DEFN")))
+      (dfn	"Define a word" .
+	(lambda () (interactive) (yahtml-insert-tag nil "DFN")))
       (cite	"Citation" .
 	(lambda () (interactive) (yahtml-insert-tag nil "CITE")))
       (code	"Code" .
@@ -434,6 +454,7 @@
 	  (or (cdr (assoc yahtml-last-begend yahtml-env-table))
 	      yahtml-last-begend))
     (setq cmd yahtml-last-begend)
+    (if yahtml-prefer-upcases (setq cmd (upcase cmd)))
     (if region
 	(let ((beg (region-beginning))
 	      (end (region-end))
@@ -444,12 +465,10 @@
 	  (insert (format "<%s%s>%s" cmd addin (if bolp "\n" ""))))
       (insert (format "<%s%s>" cmd (yahtml-addin cmd)))
       (save-excursion
-	(if bolp (progn
-		   (insert "\n")
-		   (indent-to-column cc)
-		   (insert (format "</%s>" cmd)))
-	  (insert (format "</%s>" cmd))))
-      (if bolp (yahtml-intelligent-newline nil)))))
+	(insert "\n")
+	(indent-to-column cc)
+	(insert (format "</%s>" cmd)))
+      (yahtml-intelligent-newline nil))))
 
 (defun yahtml-insert-begend-region ()
   "Call yahtml-insert-begend in the region mode."
@@ -461,12 +480,14 @@
   "Insert <FORM option=\"argument\">."
    (interactive)
    (or form
-       (setq form
-	     (YaTeX-cplread-with-learning
-	      "Form: "
-	       'yahtml-form-table 'yahtml-user-form-table
-	       'yahtml-tmp-form-table)))
+       (let ((completion-ignore-case t))
+	 (setq form
+	       (YaTeX-cplread-with-learning
+		"Form: "
+		'yahtml-form-table 'yahtml-user-form-table
+		'yahtml-tmp-form-table))))
    (let ((p (point)) q)
+     (if yahtml-prefer-upcases (setq form (upcase form)))
      (insert (format "<%s%s>" form (yahtml-addin form)))
      ;;(indent-relative-maybe)
      (if (cdr (assoc form yahtml-form-table))
@@ -488,15 +509,20 @@
 (defun yahtml-collect-labels (&optional file)
   "Collect current buffers label (<a name=...>).
 If optional argument FILE is specified collect labels in FILE."
-  (let (list)
+  (let (list bound)
     (save-excursion
       (set-buffer yahtml-completing-buffer)
-      (if file (set-buffer (find-file-noselect file)))
+      (if file (let (hilit-auto-highlight)
+		 (set-buffer (find-file-noselect file))))
       (save-excursion
 	(goto-char (point-min))
 	(while (re-search-forward "<a\\b" nil t)
-	  (skip-chars-forward " \t\n")
-	  (if (looking-at "name\\s *=\\s *\"?#?\\([^\">]+\\)\"?>")
+	  (setq bound (match-end 0))
+	  (search-forward ">" nil t)
+	  (if (and (re-search-backward "\\(name\\|id\\)=" bound t)
+		   (goto-char (match-end 0))
+		   (skip-chars-forward " \t\n")
+		   (looking-at "\"?#?\\([^\">]+\\)\"?\\b"))
 	      (setq list (cons
 			  (list (concat "#" (YaTeX-match-string 1)))
 			  list))))
@@ -568,41 +594,67 @@
   
 (defun yahtml:a ()
   "Add-in function for <a>"
-  (or yahtml-urls (yahtml-collect-url-history))
-  (setq yahtml-completing-buffer (current-buffer))
-;  (concat "href=\""
-;	  (completing-read "href: " yahtml-urls)
-;	  "\"")
-  (message "(H)ref  (N)ame?")
-  (cond
-   ((string-match "[nN]" (char-to-string (read-char)))
-    (concat "name=\"" (read-string "name: ") "\""))
-   (t
-    (concat "href=\""
-	    (read-from-minibuffer "href: " "" yahtml-url-completion-map)
-	    "\""))))
+  (let ((l yahtml-prefer-upcases))
+    (or yahtml-urls (yahtml-collect-url-history))
+    (setq yahtml-completing-buffer (current-buffer))
+;   (concat "href=\""
+;	   (completing-read "href: " yahtml-urls)
+;	   "\"")
+    (message "(H)ref  (N)ame?")
+    (cond
+     ((string-match "[nN]" (char-to-string (read-char)))
+      (concat (if l "NAME" "name") "=\"" (read-string "name: ") "\""))
+     (t
+      (concat (if l "HREF" "href") "=\""
+	      (read-from-minibuffer "href: " "" yahtml-url-completion-map)
+	      "\"")))))
 
+(defvar yahtml-parameters-completion-alist
+  '(("align" ("top") ("middle") ("bottom"))
+    ("src" . file)
+    ("method" ("POST") ("GET"))))
+
+(defun yahtml-read-parameter (par)
+  (let* ((alist (cdr-safe (assoc (downcase par)
+				yahtml-parameters-completion-alist)))
+	 (prompt (concat par ": "))
+	 v)
+    (cond
+     ((eq alist 'file)
+      (read-file-name prompt "" nil nil ""))
+     (alist
+      (completing-read prompt alist))
+     (t 
+      (read-string prompt)))))
+      
+  
 (defun yahtml:img ()
   "Add-in function for <img>"
   (or yahtml-urls (yahtml-collect-url-history))
-  (let ((src (read-file-name "src: " "" nil nil ""))
-	(alg (completing-read "align: " '(("top") ("middle") ("bottom"))))
-	(alt (read-string "alt: ")))
-    (concat "src=\"" src "\""
-	    (if (string< "" alg) (concat " align=\"" alg "\""))
-	    (if (string< "" alt) (concat " alt=\"" alt "\"")))))
+  (let ((src (yahtml-read-parameter "src"))
+	(alg (yahtml-read-parameter "align"))
+	(alt (yahtml-read-parameter "alt"))
+	(l yahtml-prefer-upcases))
+    (concat (if l "SRC" "src") "=\"" src "\""
+	    (if (string< "" alg)
+		(concat " " (if l "ALIGN" "align") "=\"" alg "\""))
+	    (if (string< "" alt)
+		(concat " " (if l "ALT" "alt") "=\"" alt "\"")))))
 
 (defun yahtml:form ()
   "Add-in function `form' input format"
   (concat
-   " method=" (completing-read "Method: " '(("POST") ("GET")) nil t)
-   " action=\"" (read-string "Action: ") "\""
+   " " (if yahtml-prefer-upcases "METHOD" "method=")
+   (completing-read "Method: " '(("POST") ("GET")) nil t)
+   " " (if yahtml-prefer-upcases "ACTION" "action") "=\""
+   (read-string "Action: ") "\""
    ))
 
 (defun yahtml:select ()
   "Add-in function for `select' input format"
   (setq yahtml-last-single-cmd "option")
-  (concat " name=\"" (read-string "name: ") "\""))
+  (concat " " (if yahtml-prefer-upcases "NAME" "name") "=\""
+	  (read-string "name: ") "\""))
 
 (defun yahtml:ol ()
   (setq yahtml-last-single-cmd "li") "")
@@ -616,11 +668,12 @@
 
 (defvar yahtml-input-types
   '(("text") ("password") ("checkbox") ("radio") ("submit")
-    ("reset") ("image") ("hidden")))
+    ("reset") ("image") ("hidden") ("file")))
 
 (defun yahtml:input ()
   "Add-in function for `input' form"
-  (let (name type value checked (size "") (maxlength ""))
+  (let ((size "") name type value checked (maxlength "")
+	(l yahtml-prefer-upcases))
     (setq name (read-string "name: ")
 	  type (completing-read "type (default=text): "
 				yahtml-input-types nil t)
@@ -629,11 +682,15 @@
 	(setq size (read-string "size: ")
 	      maxlength (read-string "maxlength: ")))
     (concat
-     "name=\"" name "\""
-     (if (string< "" type) (concat " type=\"" type "\""))
-     (if (string< "" value) (concat " value=\"" value "\""))
-     (if (string< "" size) (concat " size=\"" size "\""))
-     (if (string< "" maxlength) (concat " maxlength=\"" maxlength "\""))
+     (if l "NAME" "name") "=\"" name "\""
+     (if (string< "" type)
+	 (concat " " (if l "TYPE" "type") "=\"" type "\""))
+     (if (string< "" value)
+	 (concat " " (if l "VALUE" "value") "=\"" value "\""))
+     (if (string< "" size)
+	 (concat " " (if l "SIZE" "size") "=\"" size "\""))
+     (if (string< "" maxlength)
+	 (concat " " (if l "MAXLENGTH" "maxlength") "=\"" maxlength "\""))
     )))
 
 (defun yahtml:textarea ()
@@ -641,8 +698,8 @@
   (interactive)
   (let (name rows cols)
     (setq name (read-string "Name: ")
-	  cols (read-string "Columns: "
-	  rows (read-string "Rows: ")))
+	  cols (read-string "Columns: ")
+	  rows (read-string "Rows: "))
     (concat
      (concat (if yahtml-prefer-upcases "NAME=" "name=")
 	     "\"" name "\"")
@@ -657,24 +714,26 @@
   "Insert <TAG> </TAG> and put cursor inside of them."
   (interactive "P")
   (or tag
-      (setq tag
-	    (YaTeX-cplread-with-learning
-	     (format "Tag %s(default %s): "
-		     (if region-mode "region: " "") yahtml-last-typeface-cmd)
-	     'yahtml-typeface-table 'yahtml-user-typeface-table
-	     'yahtml-tmp-typeface-table)))
+      (let ((completion-ignore-case t))
+	(setq tag
+	      (YaTeX-cplread-with-learning
+	       (format "Tag %s(default %s): "
+		       (if region-mode "region: " "") yahtml-last-typeface-cmd)
+	       'yahtml-typeface-table 'yahtml-user-typeface-table
+	       'yahtml-tmp-typeface-table))))
   (if (string= "" tag) (setq tag yahtml-last-typeface-cmd))
-  (setq tag (funcall (if yahtml-prefer-upcases 'upcase 'downcase) tag)
-	yahtml-last-typeface-cmd tag)
+  (setq tag (or (cdr (assoc tag yahtml-typeface-table)) tag))
+  (setq yahtml-last-typeface-cmd tag
+	tag (funcall (if yahtml-prefer-upcases 'upcase 'downcase) tag))
   (if region-mode
       (if (if (string< "19" emacs-version) (mark t) (mark))
 	  (save-excursion
 	    (if (> (point) (mark)) (exchange-point-and-mark))
-	    (insert "<" tag ">")
+	    (insert (format "<%s%s>" tag (yahtml-addin tag)))
 	    (exchange-point-and-mark)
 	    (insert "</" tag ">"))
 	(message "No mark set now"))
-    (insert (format "<%s> " tag))
+    (insert (format "<%s%s>" tag (yahtml-addin tag)))
     (save-excursion (insert (format "</%s>" tag)))))
 
 (defun yahtml-insert-single (cmd)
@@ -688,22 +747,30 @@
 		   (concat "(default " yahtml-last-single-cmd ")") ""))
        'yahtml-single-cmd-table 'yahtml-user-single-cmd-table
        'yahtml-tmp-single-cmd-table))))
-  (if (string< "" cmd) (setq yahtml-last-single-cmd cmd))
-  (setq cmd (funcall (if yahtml-prefer-upcases 'upcase 'downcase) cmd))
+  (if (string= "" cmd) (setq cmd yahtml-last-single-cmd))
   (setq yahtml-last-single-cmd
-	(or (cdr (assoc yahtml-last-single-cmd yahtml-single-cmd-table))
-	    yahtml-last-single-cmd))
-  (insert (format "<%s>" yahtml-last-single-cmd)))
+	(or (cdr (assoc cmd yahtml-single-cmd-table)) cmd))
+  (setq cmd (funcall (if yahtml-prefer-upcases 'upcase 'downcase)
+		     yahtml-last-single-cmd))
+  (insert (format "<%s>" cmd)))
 
 ;;; ---------- Jump ----------
 (defun yahtml-on-href-p ()
   "Check if point is on href clause."
-  (let ((p (point)) cmd)
+  (let ((p (point)) e cmd (case-fold-search t))
     (save-excursion
-      (or (bobp) (skip-chars-backward "^ \t\n"))
-      (and (looking-at "href\\s *=\\s *\"?\\([^\"> \t\n]+\\)\"?")
+      (and (string= (YaTeX-inner-environment t) "a")
+	   (save-excursion
+	     (search-forward "</a>" nil t)
+	     (setq e (point)))
+	   (goto-char (get 'YaTeX-inner-environment 'point))
+	   (search-forward "href" e t)
+	   (search-forward "=" e t)
+	   (skip-chars-forward " \t\n")
+	   (looking-at "\"?\\([^\"> \t\n]+\\)\"?")
 	   (< p (match-end 0))
-	   (YaTeX-match-string 1)))))
+	   (YaTeX-match-string 1)
+	   ))))
 
 (defun yahtml-netscape-sentinel (proc mes)
   (cond
@@ -717,8 +784,9 @@
 	  (progn
 	    (message "Starting netscape...")
 	    (start-process
-	     "browser" (process-buffer proc) shell-file-name "-c"
-	     (format "%s %s" yahtml-www-browser
+	     "browser" (process-buffer proc)
+	     shell-file-name yahtml-shell-command-option
+	     (format "%s \"%s\"" yahtml-www-browser
 		     (get 'yahtml-netscape-sentinel 'url)))
 	    (message "Starting netscape...Done")))
       (set-buffer cb)))))
@@ -729,25 +797,28 @@
   "Call WWW Browser to see HREF."
   (let ((pb "* WWW Browser *") (cb (current-buffer)))
     (cond
-     ((string-match "[Nn]etscape" yahtml-www-browser)
+     ((and (string-match "[Nn]etscape" yahtml-www-browser)
+	   (not (eq system-type 'windows-nt)))
       (if (get-buffer pb)
 	  (progn (set-buffer pb) (erase-buffer) (set-buffer cb)))
       (put 'yahtml-netscape-sentinel 'url href)
       (set-process-sentinel
        (setq yahtml-browser-process
 	     (start-process
-	      "browser" pb shell-file-name "-c"
-	      (format "%s -remote 'openURL(%s)'" yahtml-www-browser href)))
+	      "browser" pb shell-file-name yahtml-shell-command-option ;"-c"
+	      (format "%s -remote \"openURL(%s)\"" yahtml-www-browser href)))
        'yahtml-netscape-sentinel))
      ((and (string= "w3" yahtml-www-browser) (fboundp 'w3-fetch))
       (w3-fetch href))
      ((stringp yahtml-www-browser)
-      (if (eq (process-status yahtml-browser-process) 'run)
+      (if (and yahtml-browser-process
+	       (eq (process-status yahtml-browser-process) 'run))
 	  (message "%s is already running" yahtml-www-browser)
 	(setq yahtml-browser-process
 	      (start-process
-	       "browser" "* WWW Browser *" shell-file-name
-	       (format "%s %s" yahtml-www-browser href)))))
+	       "browser" "* WWW Browser *"
+	       shell-file-name yahtml-shell-command-option
+	       (format "%s \"%s\"" yahtml-www-browser href)))))
      (t
       (message "Sorry, jump across http is not supported.")))))
 
@@ -756,7 +827,7 @@
   (let ((href (yahtml-on-href-p)) file name)
     (if href
 	(cond
-	 ((string-match "^http:" href)
+	 ((string-match "^\\(ht\\|f\\)tp:" href)
 	  (yahtml-browse-html href))
 	 (t (setq file (substring href 0 (string-match "#" href)))
 	    (if (string-match "#" href)
@@ -782,13 +853,13 @@
 
 (defun yahtml-on-begend-p (&optional p)
   "Check if point is on begend clause."
-  (let ((p (point)) cmd (case-fold-search t))
+  (let ((p (or p (point))) cmd (case-fold-search t))
     (save-excursion
-      (if p (goto-char p))
+      (goto-char p)
       (if (equal (char-after (point)) ?<) (forward-char 1))
       (if (and (re-search-backward "<" nil t)
 	       (looking-at
-		(concat "<\\(/?" yahtml-command-regexp "\\)\\b"))
+		(concat "<\\(/?" yahtml-struct-name-regexp "\\)\\b"))
 	       (condition-case nil
 		   (forward-list 1)
 		 (error nil))
@@ -852,7 +923,8 @@
 	(progn
 	  (message "Invoking %s %s..." yahtml-image-viewer image)
 	  (start-process
-	   "Viewer" " * Image Viewer *" shell-file-name "-c"
+	   "Viewer" " * Image Viewer *"
+	   shell-file-name yahtml-shell-command-option ;"-c"
 	   (concat yahtml-image-viewer " " image))
 	  (message "Invoking %s %s...Done" yahtml-image-viewer image)))))
 
@@ -902,9 +974,25 @@
 
 
 ;;; ---------- changing ----------
+(defun yahtml-on-assignment-p ()
+  "Return if current point is on parameter assignment.
+If so, return parameter name, otherwise nil.
+This function should be able to treat white spaces in value, but not yet."
+  (let ((p (point)))
+    (save-excursion
+      (put 'yahtml-on-assignment-p 'region nil)
+      (skip-chars-backward "^ \t")
+      (and (looking-at "\\([A-Za-z0-9]+\\)\\s *=\\s *\"?\\([^ \t\"]+\\)\"?")
+	   (< p (match-end 0))
+	   (>= p (1- (match-beginning 2)))
+	   (put 'yahtml-on-assignment-p 'region
+		(cons (match-beginning 2) (match-end 2)))
+	   (YaTeX-match-string 1)))))
+
 (defun yahtml-change-begend ()
   (let ((tag (yahtml-on-begend-p))
 	(completion-ignore-case t)
+	(case-fold-search t)
 	(p (point)) (q (make-marker))
 	(default (append yahtml-env-table yahtml-typeface-table))
 	(user (append yahtml-user-env-table yahtml-user-typeface-table))
@@ -913,20 +1001,30 @@
     (cond
      (tag
       (cond
-       ((and (equal tag "a")
+       ((and (string-match "^a$" tag)
 	     (save-excursion
 	       (and
-		(re-search-backward "<a" nil t)
+		(re-search-backward "<a\\b" nil t)
 		(goto-char (match-end 0))
 		(skip-chars-forward " \t\n")
+		(setq b1 (point))
+		(search-forward ">" nil t)
+		(setq e1 (match-beginning 0))
+		(goto-char b1)
+		(re-search-forward "href\\s *=" e1 t)
 		(>= p (point))
-		(looking-at "href\\s *=\\s *\"?\\([^\"> \t\n]+\\)\"?")
+		(goto-char (match-end 0))
+		(skip-chars-forward " \t\n")
+		(looking-at "\"?\\([^\"> \t\n]+\\)\"?")
 		(< p (match-end 0)))))
 	(setq b1 (match-beginning 1) e1 (match-end 1)
+	      yahtml-completing-buffer (current-buffer)
 	      href (read-from-minibuffer
 		    "Change href to: " "" yahtml-url-completion-map))
 	(if (string< "" href)
 	    (progn
+	      ;;(setq href  ;??
+		;;    (if yahtml-prefer-upcases (upcase href) (downcase href)))
 	      (delete-region b1 e1)
 	      (goto-char b1)
 	      (insert href))))
@@ -945,25 +1043,64 @@
 	      (progn
 		(set-marker q (point))
 		(goto-char p)))
-	  (setq tag (YaTeX-cplread-with-learning
-		     (format "Change `%s' to(default %s): "
-			     tag yahtml-last-begend)
-		     'default 'user 'tmp))
+	  (setq tag (let ((completion-ignore-case t))
+		      (YaTeX-cplread-with-learning
+		       (format "Change `%s' to(default %s): "
+			       tag yahtml-last-begend)
+		       'default 'user 'tmp)))
 	  (delete-region (point) (progn (skip-chars-forward "^>") (point)))
 	  (if (string= "" tag) (setq tag yahtml-last-begend))
 	  (setq yahtml-last-begend
 		(or (cdr (assoc tag yahtml-env-table)) tag)
 		tag yahtml-last-begend)
+	  (setq tag (if yahtml-prefer-upcases (upcase tag) (downcase tag)))
 	  (insert (format "%s%s" tag (yahtml-addin tag)))
 	  (goto-char q)
 	  (delete-region (point) (progn (skip-chars-forward "^>") (point)))
-	  (insert tag))))))))
+	  (insert tag))))
+      t))))
+
+(defun yahtml-change-command ()
+  (let ((p (point)) (case-fold-search t) cmd par new
+	(beg (make-marker)) (end (make-marker)))
+    (skip-chars-backward "^<")
+    (if (and
+	 (looking-at yahtml-command-regexp)
+	 (progn
+	   (set-marker beg (match-beginning 0))
+	   (set-marker end (match-end 0))
+	   t)				;for further work
+	 (progn
+	   (forward-char -1)
+	   (condition-case nil
+	       (forward-list 1)
+	     (error nil))
+	   (< p (point))))
+	(progn
+	  (goto-char p)
+	  (if (setq par (yahtml-on-assignment-p))
+	      (progn
+		(setq new (yahtml-read-parameter par))
+		(set-marker beg (car (get 'yahtml-on-assignment-p 'region)))
+		(set-marker end (cdr (get 'yahtml-on-assignment-p 'region))))
+	    (setq new
+		  (YaTeX-cplread-with-learning
+		   "Change form to: "
+		   'yahtml-form-table 'yahtml-user-form-table
+		   'yahtml-tmp-form-table)))
+	  (delete-region beg end)
+	  (goto-char beg)
+	  (insert new)
+	  t)
+      (goto-char p)
+      nil)))
 
 (defun yahtml-change-* ()
   "Change current position's HTML tag (set)."
   (interactive)
   (cond
    ((yahtml-change-begend))
+   ((yahtml-change-command))
   ))
 
 ;;; ---------- commenting ----------
@@ -977,34 +1114,93 @@
 
 
 
+(defun yahtml-inner-environment-but (exclude &optional quick)
+  "Return the inner environment but matches with EXCLUDE tag."
+  (let (e)
+    (save-excursion
+      (while (and (setq e (YaTeX-inner-environment quick))
+		  (string-match exclude e))
+	(goto-char (get 'YaTeX-inner-environment 'point))))
+    e))
+
 ;;; ---------- filling ----------
+
+(defvar yahtml-saved-move-to-column (symbol-function 'move-to-column))
+(defun yahtml-move-to-column (col &optional force)
+  (beginning-of-line)
+  (let ((ccol 0))
+  (while (and (> col ccol) (not (eolp)))
+    (if (eq (following-char) ?\<)
+	(progn
+	  (while (and (not (eq (following-char) ?\>))
+		      (not (eolp)))
+		   (forward-char))
+	  (or (eolp) (forward-char)))
+      (or (eolp) (forward-char))
+      (if (eq (preceding-char) ?\t)
+	  (let ((wd (- 8 (% (+ ccol 8) 8))))
+	    (if (and force (< col (+ ccol wd)))
+		(progn
+		  (backward-char 1)
+		  (insert-char ?\  (- col ccol))
+		  (setq ccol col))
+	      (setq ccol (+ ccol wd))))
+	(setq ccol (1+ ccol)))
+      (if (and YaTeX-japan
+	       (string-match "[chj]" (char-category (preceding-char))))
+	  (setq ccol (1+ ccol)))))
+  (if (and force (> col ccol))
+      (progn
+	(insert-char ?\  (- col ccol))
+	col)
+    ccol)))
+
 (defun yahtml-fill-paragraph (arg)
   (interactive "P")
-  (let ((case-fold-search t) (p (point)))
+  (let*((case-fold-search t) (p (point))
+	(e (or (yahtml-inner-environment-but "^a\\b" t) "html"))
+	(prep (string-match "^pre$" e))
+	(ps1 (if prep (default-value 'paragraph-start)
+	       paragraph-start))
+	(ps2 (if prep (concat (default-value 'paragraph-start)
+			      "\\|^\\s *</?pre>")
+	       paragraph-start)))
     (save-excursion
-      (fill-region-as-paragraph
-       (progn (re-search-backward paragraph-start nil t)
-	      (or (save-excursion
-		    (goto-char (match-end 0))
-		    (if (looking-at "[ \t]*$")
-			(progn (forward-line 1) (point))))
-		  (point)))
-       (progn (goto-char p)
-	      (re-search-forward paragraph-start nil t)
-	      (match-beginning 0))))))
+      (unwind-protect
+	  (progn
+	    (if prep
+		(fset 'move-to-column 'yahtml-move-to-column))
+	    (fill-region-as-paragraph
+	     (progn (re-search-backward paragraph-start nil t)
+		    (or (save-excursion
+			  (goto-char (match-end 0))
+			  (skip-chars-forward " \t>")
+			  (if (looking-at "[ \t]*$")
+			      (progn (forward-line 1) (point))))
+			(point)))
+	     (progn (goto-char p)
+		    (re-search-forward ps2 nil t)
+		    (match-beginning 0))))
+	(fset 'move-to-column yahtml-saved-move-to-column)))))
+
+;(defun yahtml-indent-new-commnet-line ()
+;  (unwind-protect
+;      (progn
+;	(fset 'move-to-column 'yahtml-move-to-column)
+;	(apply 'YaTeX-saved-indent-new-comment-line (if soft (list soft))))
+;    (fset 'move-to-column yahtml-saved-move-to-column)))
 
 ;;; 
 ;;; ---------- indentation ----------
 ;;; 
-(defvar yahtml-hate-too-deep-indentation nil)
 (defun yahtml-indent-line ()
   (interactive)
-  (let ((envs "[uod]l\\|table\\|t[rhd]\\|select\\|a\\b")
+  (let ((envs "[uod]l\\|table\\|t[rhd]\\|select")
 	(itms "<\\(dt\\|dd\\|li\\|t[rdh]\\|option\\)>")
 	inenv p col peol (case-fold-search t))
     (save-excursion
       (beginning-of-line)
-      (setq inenv (or (YaTeX-inner-environment) "html")
+      (setq inenv (or (yahtml-inner-environment-but "^a\\b" t) "html")
 	    col (get 'YaTeX-inner-environment 'indent)
 	    p (get 'YaTeX-inner-environment 'point)
 	    op))
@@ -1020,7 +1216,7 @@
 	   ((or (looking-at itms)
 		(and yahtml-hate-too-deep-indentation
 		     (looking-at (concat "<" envs))))
-	    (YaTeX-reindent (+ col YaTeX-environment-indent)))
+	    (YaTeX-reindent (+ col yahtml-environment-indent)))
 	   ((and (< p (point))
 		 (save-excursion
 		   (and
@@ -1033,7 +1229,7 @@
 		    (setq col (current-column)))))
 	    (YaTeX-reindent col))
 	   (t
-	    (YaTeX-reindent (+ col YaTeX-environment-indent)))))))
+	    (YaTeX-reindent (+ col yahtml-environment-indent)))))))
       (and (bolp) (skip-chars-forward " \t"))
       (if (and (setq inenv (yahtml-on-begend-p))
 	       (string-match (concat "^\\(" envs "\\)") inenv))
@@ -1075,19 +1271,33 @@
 ;     (t nil))))
 
 ;;; 
-;;; ---------- Browsing ----------
+;;; ---------- Lint and Browsing ----------
 ;;; 
 (defun yahtml-browse-menu ()
   "Browsing menu"
   (interactive)
-  (message "B)rowse R)eload...")
+  (message "J)weblint p)Browse R)eload...")
   (let ((c (char-to-string (read-char))))
     (cond
-     ((string-match "[bj]" c)
+     ((string-match "j" c)
+      (yahtml-lint-buffer (current-buffer)))
+     ((string-match "[bp]" c)
       (yahtml-browse-current-file))
      ((string-match "r" c)
       (yahtml-browse-reload)))))
 
+(defvar yahtml-lint-buffer "*weblint*")
+
+(defun yahtml-lint-buffer (buf)
+  "Call lint on buffer BUF."
+  (interactive "bCall lint on buffer: ")
+  (setq buf (get-buffer buf))
+  (YaTeX-save-buffers)
+  (YaTeX-typeset
+   (concat yahtml-lint-program " "
+	   (file-name-nondirectory (buffer-file-name buf)))
+   yahtml-lint-buffer  "lint" "lint"))
+
 (defun yahtml-file-to-url (file)
   "Convert local unix file name to URL.
 If no matches found in yahtml-path-url-alist, return raw file name."
@@ -1095,6 +1305,10 @@
     (if (file-directory-p file)
 	(setq file (expand-file-name yahtml-directory-index file))
       (setq file (expand-file-name file)))
+    (if (string-match "^[A-Za-z]:/" file)
+	(progn
+	  ;; (aset file 1 ?|) ;$B$3$l$OMW$i$J$$$i$7$$!D(B
+	  (setq file (concat "///" file))))
     (while list
       (if (string-match (concat "^" (regexp-quote (car (car list)))) file)
 	  (setq url (cdr (car list))
@@ -1158,7 +1372,7 @@
       (set-process-sentinel
        (setq yahtml-browser-process
 	     (start-process
-	      "browser" pb shell-file-name "-c"
+	      "browser" pb shell-file-name yahtml-shell-command-option ;"-c"
 	      (format "%s -remote 'reload'" yahtml-www-browser)))
        'yahtml-netscape-sentinel))
      (t
@@ -1168,9 +1382,10 @@
 (defun yahtml-intelligent-newline (arg)
   "Intelligent newline for HTML"
   (interactive "P")
-  (let ((env (downcase (or (YaTeX-inner-environment) "html"))) func)
+  (let (env func)
+    (end-of-line)
+    (setq env (downcase (or (YaTeX-inner-environment) "html")))
     (setq func (intern-soft (concat "yahtml-intelligent-newline-" env)))
-    (end-of-line)
     (newline)
     (if (and env func (fboundp func))
 	(funcall func))))
@@ -1219,7 +1434,7 @@
 
 ;;; ---------- complete marks ----------
 (defun yahtml-complete-mark ()
-  "Complete &gt, &lt, &asterisk, and &quote."
+  "Complete &gt, &lt, &ampersand, and &quote."
   (interactive)
   (message "1:< 2:> 3:& 4:\"")
   (let ((c (read-char)))
@@ -1231,7 +1446,30 @@
       (insert (format "&%s;" (nth c '("lt" "gt" "amp" "quot")))))))
 
 
-;;; ---------- ----------
+;;; ---------- jump to error line ----------
+(defvar yahtml-error-line-regexp
+  "^\\(.*\\)(\\([0-9]+\\)):"
+  "*Regexp of error position which is produced by lint program.")
+(defun yahtml-prev-error ()
+  "Jump to previous error seeing lint buffer."
+  (interactive)
+  (or (get-buffer yahtml-lint-buffer)
+      (error "No lint program ran."))
+  (YaTeX-showup-buffer yahtml-lint-buffer nil t)
+  (yahtml-jump-to-error-line))
+
+(defun yahtml-jump-to-error-line ()
+  (interactive)
+  (let ((p (point)) (e (point-end-of-line)))
+    (end-of-line)
+    (if (re-search-backward yahtml-error-line-regexp nil t)
+	(let ((f (YaTeX-match-string 1))
+	      (l (string-to-int (YaTeX-match-string 2))))
+	  (forward-line -1)
+	  (YaTeX-showup-buffer f nil t)
+	  (goto-line l))
+      (message "No line number usage"))))
+    
 ;;; ---------- ----------
 
 ;;;
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatex.el
--- a/yatex.el	Wed May 01 15:35:40 1996 +0000
+++ b/yatex.el	Fri Jan 24 09:04:06 1997 +0000
@@ -1,8 +1,8 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; Yet Another tex-mode for emacs.
-;;; yatex.el rev. 1.62
-;;; (c )1991-1995 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Thu May  2 00:13:21 1996 on supra
+;;; yatex.el rev. 1.63
+;;; (c )1991-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
+;;; Last modified Fri Jan 24 17:57:14 1997 on supra
 ;;; $Id$
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 (require 'comment)
-(defconst YaTeX-revision-number "1.62"
+(defconst YaTeX-revision-number "1.63"
   "Revision number of running yatex.el"
 )
 
@@ -258,7 +258,7 @@
     ("setcounter" 2) ("addtocounter" 2) ("stepcounter" 2)
     ("newcommand" 2) ("renewcommand" 2)
     ("setcounter" 2) ("newenvironment" 3) ("newtheorem" 2)
-    ("cline") ("framebox") ("savebox") ("date") ("put") ("ref")
+    ("cline") ("framebox") ("savebox" 2) ("date") ("put") ("ref")
     ("frac" 2) ("multicolumn" 3) ("shortstack")
     )
   "Default completion table for section-type completion."
@@ -634,12 +634,14 @@
 	paragraph-separate YaTeX-paragraph-separate
 	indent-line-function 'YaTeX-indent-line
 	comment-start YaTeX-comment-prefix
+	comment-end ""
 	;;comment-start-skip "[^\\\\]%+[ \t]*"
 	)
   (use-local-map YaTeX-mode-map)
   (if YaTeX-dos (setq YaTeX-saved-screen-height (screen-height)))
   (YaTeX-read-user-completion-table)
   (and (fboundp 'YaTeX-19-collect-macros) (YaTeX-19-collect-macros))
+  (turn-on-auto-fill)			;1.63
   (run-hooks 'text-mode-hook 'yatex-mode-hook)
 )
 
@@ -694,6 +696,7 @@
 (autoload 'YaTeX-main-file-p "yatexprc" "Check if the file is main." t)
 (autoload 'YaTeX-get-builtin "yatexprc" "Get %# built-in." t)
 (autoload 'YaTeX-system "yatexprc" "Call system command" t)
+(autoload 'YaTeX-save-buffers "yatexprc" "Save buffers of same major mode" t)
 
 ;;autoload from yatexmth.el
 (autoload 'YaTeX-math-insert-sequence "yatexmth" "Image input." t)
@@ -723,6 +726,9 @@
 (autoload 'YaTeX-display-hierarchy "yatexhie"
   "YaTeX document hierarchy browser" t)
 
+;; autoload from yahtml.el
+(autoload 'yahtml-inner-environment-but "yahtml" "yahtml internal func." t)
+
 ;;;
 ;; YaTeX-mode functions
 ;;;
@@ -822,7 +828,8 @@
 	(open
 	 (concat "^" (or (cdr (assq major-mode '((yahtml-mode . "<")))) "{")))
 	(close
-	 (concat "^" (or (cdr(assq major-mode '((yahtml-mode . " >")))) "}"))))
+	 (concat "^"
+		 (or (cdr(assq major-mode '((yahtml-mode . "\n\t >")))) "}"))))
     (save-excursion
       (if quick
 	  (setq bound
@@ -855,10 +862,7 @@
 (defun YaTeX-end-environment ()
   "Close opening environment"
   (interactive)
-  (let ((curp (point))
-	(env (YaTeX-inner-environment))
-	(md (match-data)))
-
+  (let ((env (YaTeX-inner-environment)))
     (if (not env) (error "No premature environment")
       (save-excursion
 	(if (YaTeX-search-active-forward
@@ -870,18 +874,14 @@
 		nil
 	      (error "end environment aborted."))))
       (message "")			;Erase (y or n) message.
-      ;(insert "\\end{" env "}")
       (YaTeX-insert-struc 'end env)
-      (store-match-data md)
-      (setq curp (point))
-      (goto-char (match-end 0))
-      (if (pos-visible-in-window-p)
-	  (sit-for (if YaTeX-dos 2 1))
-	(message "Matches with %s at line %d"
-		 (YaTeX-replace-format-args YaTeX-struct-begin env "" "")
-		 (count-lines (point-min) (point))))
-      (goto-char curp))
-    )
+      (save-excursion
+	(goto-char (or (get 'YaTeX-inner-environment 'point) (match-end 0)))
+	(if (pos-visible-in-window-p)
+	    (sit-for (if YaTeX-dos 2 1))
+	  (message "Matches with %s at line %d"
+		   (YaTeX-replace-format-args YaTeX-struct-begin env "" "")
+		   (count-lines (point-min) (point)))))))
 )
 
 ;;;VER2
@@ -1210,7 +1210,11 @@
       (insert (or open "{") env (or close "}")))
      (t
       (insert (or open "{") (or close "}"))
-      (forward-char -1))))
+      (forward-char -1)
+      (if (and (eq (char-after (point)) ?\})
+	       (eq (char-after (- (point) 2)) ?\\ ))
+	  (progn (insert "\\") (forward-char -1)))
+      )))
 )
 
 (defun YaTeX-jmode ()
@@ -1224,7 +1228,8 @@
     (canna-toggle-japanese-mode))
    ((and (boundp 'egg:*mode-on*) egg:*mode-on* egg:*input-mode*)
     (egg:toggle-egg-mode-on-off))
-   ((and (fboundp 'skk-mode)) (skk-mode -1))
+   ((and (fboundp 'skk-mode) (boundp 'skk-mode) skk-mode)
+    (if (fboundp 'skk-mode-off) (skk-mode-off) (j-mode-off)))
    ((and (fboundp 'fep-force-off) (fep-force-off))))
 )
 
@@ -1556,28 +1561,28 @@
 	      nil)))))
 )
 
-;(defun YaTeX-goto-corresponding-file (&optional other)
-;  "Visit or switch buffer of corresponding file,
-;looking at \\input or \\include or \includeonly on current line."
-;  (if (not (YaTeX-on-includes-p)) nil
-;    (let ((parent buffer-file-name) input-file)
-;      (save-excursion
-;	(if (search-forward "{" (point-end-of-line) t)
-;	    nil
-;	  (skip-chars-backward "^,{"))
-;	(setq input-file
-;	      (buffer-substring
-;	       (point) (progn (skip-chars-forward "^ ,}") (point))))
-;	(if (not (string-match "\\.\\(tex\\|sty\\)$" input-file))
-;	    (setq input-file (concat input-file ".tex"))))
-;      (cond
-;       (other (YaTeX-switch-to-buffer-other-window input-file))
-;       ((get-file-buffer input-file) (goto-buffer-window input-file))
-;       (t (YaTeX-switch-to-buffer input-file)))
-;      (or (YaTeX-get-builtin "!")
-;	  YaTeX-parent-file
-;	  (setq YaTeX-parent-file parent))))
-;)
+(defun YaTeX-goto-corresponding-file (&optional other)
+  "Visit or switch buffer of corresponding file,
+looking at \\input or \\include or \includeonly on current line."
+  (if (not (YaTeX-on-includes-p)) nil
+    (let ((parent buffer-file-name) input-file)
+      (save-excursion
+	(if (search-forward "{" (point-end-of-line) t)
+	    nil
+	  (skip-chars-backward "^,{"))
+	(setq input-file
+	      (buffer-substring
+	       (point) (progn (skip-chars-forward "^ ,}") (point))))
+	(if (not (string-match "\\.\\(tex\\|sty\\)$" input-file))
+	    (setq input-file (concat input-file ".tex"))))
+      (cond
+       (other (YaTeX-switch-to-buffer-other-window input-file))
+       ((get-file-buffer input-file) (goto-buffer-window input-file))
+       (t (YaTeX-switch-to-buffer input-file)))
+      (or (YaTeX-get-builtin "!")
+	  YaTeX-parent-file
+	  (setq YaTeX-parent-file parent))))
+)
 
 (defun YaTeX-goto-corresponding-BEGIN-END ()
   (if (not (YaTeX-on-BEGIN-END-p)) nil
@@ -1619,11 +1624,11 @@
 ")
 
 (defvar YaTeX-processed-file-regexp-alist-default
-  '(("\\\\epsfile{[^},]*file=\\([^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 1)
-    ("\\\\epsfig{[^},]*fi\\(le\\|gure\\)=\\([^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 2)
-    ("\\\\postscriptbox{[^}]*}{[^}]*}{\\([^} ]+\\)\\(\\.e?ps\\)?}" 1)
-    ("\\\\\\(epsfbox\\|includegraphics\\){\\([^} ]+\\)\\(\\.e?ps\\)?}" 2)
-    ("\\\\\\(include\\|input\\){\\([^},.]+\\)\\(\\.\\(tex\\|sty\\)\\)?}" 2 t)
+  '(("\\\\epsfile{[^},]*file=\\(\\([^,} ]*/\\)?[^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 1)
+    ("\\\\epsfig{[^},]*fi\\(le\\|gure\\)=\\(\\([^,} ]*/\\)?[^,}. ]+\\)\\(\\.e?ps\\)?[^}]*}" 2)
+    ("\\\\postscriptbox{[^}]*}{[^}]*}{\\(\\([^,} ]*/\\)?[^}. ]+\\)\\(\\.e?ps\\)?}" 1)
+    ("\\\\\\(epsfbox\\|includegraphics\\){\\(\\([^,} ]*/\\)?[^} ]+\\)\\(\\.e?ps\\)?}" 2)
+    ("\\\\\\(psbox\\)\\(\\[[^]]+\\]\\)?{\\(\\([^,} ]*/\\)?[^} ]+\\)\\(\\.e?ps\\)}" 3) ;\psbox[options...]{hoge.eps} (97/1/11)
     )
   "See the documentation of YaTeX-processed-file-regexp-alist."
 )
@@ -1674,7 +1679,8 @@
 			      (cdr (assoc cmd YaTeX-file-processor-alist))))
 	      (while plist		;if processor is not specified
 		(setq ext (cdr (car plist)))
-		(if (file-exists-p (concat file ext))
+		(if (and (string< "" (concat file ext))
+			 (file-exists-p (concat file ext)))
 		      (setq cmd (car (car plist))
 			    src (concat file ext) plist nil))
 		(setq plist (cdr plist)))
@@ -1702,7 +1708,7 @@
 		 ((symbolp cmd)
 		  (cond
 		   ((symbol-function cmd)
-		    (funcall cmd src)))
+		    (funcall cmd src other)))
 		  t)))))))
 )
 
@@ -1729,7 +1735,8 @@
       (if (and
 	   (looking-at (concat YaTeX-ec-regexp "\\(" command "\\)"
 			       "\\(\\(\\[[^]]+\\]\\)*\\)"	;optional arg
-			       "[ \t\n\r]*{[^}]+}")) ;arg braces
+			       ;"[ \t\n\r]*{[^}]+}")) ;arg braces
+			       "[ \t\n\r]*{[^}]*}")) ;arg braces
 	   (not (YaTeX-lookup-table
 		 (setq word (YaTeX-match-string 1)) 'singlecmd)))
 	  (progn
@@ -1813,8 +1820,8 @@
   (cond
    ((YaTeX-goto-corresponding-label arg))
    ((YaTeX-goto-corresponding-environment))
+   ((YaTeX-goto-corresponding-file arg))
    ((YaTeX-goto-corresponding-file-processor arg))
-   ;;((YaTeX-goto-corresponding-file))
    ((YaTeX-goto-corresponding-BEGIN-END))
    ((and (string-match
 	  YaTeX-equation-env-regexp	;to delay loading
@@ -2368,11 +2375,11 @@
 (defun YaTeX-remove-trailing-comment (start end)
   "Remove trailing comment from START to end."
   (save-excursion
-    (let ((trcom (concat YaTeX-comment-prefix "+$")))
+    (let ((trcom (concat YaTeX-comment-prefix "$")))
       (goto-char start)
       (while (re-search-forward trcom end t)
 	(if (/= (char-after (1- (match-beginning 0))) ?\\ )
-	    (replace-match "")))))
+	    (replace-match "\\1")))))
 )
 
 (defun YaTeX-get-item-info (&optional recent thisenv)
@@ -2539,14 +2546,20 @@
   "Tuned `indent-new-comment-line' function for yatex.
 See the documentation of `YaTeX-saved-indent-new-comment-line'."
   (cond
-   ((or (not (eq major-mode 'yatex-mode))
+   ((or (not (memq major-mode '(yatex-mode yahtml-mode)))
 	(string-match
 	 "document"
 	 (or (and (boundp 'inenv) inenv)
 	     (or (YaTeX-inner-environment t) "document"))))
     (apply 'YaTeX-saved-indent-new-comment-line (if soft (list soft))))
+;   ((and (eq major-mode 'yahtml-mode)
+;	 (string-match
+;	  "^[Pp][Rr][Ee]" (yahtml-inner-environment-but "^[Aa]\\b" t)))
+;    (yahtml-indent-new-commnet-line))
+   ((YaTeX-in-math-mode-p) nil)		;1996/12/30
    (t (let (fill-prefix)
-	(apply 'YaTeX-saved-indent-new-comment-line (if soft (list soft)))))))
+	(apply 'YaTeX-saved-indent-new-comment-line (if soft (list soft))))))
+)
 
 (defun YaTeX-fill-* ()
   "Fill paragraph according to its condition."
@@ -2750,7 +2763,7 @@
     (if YaTeX-user-table-is-read nil
       (message "Loading user completion table")
       (if (file-exists-p user-table) (load-file user-table)
-	(message "Personal completion table not found.")))
+	(message "Welcome to the field of YaTeX.  I'm glad to see you!")))
     (setq YaTeX-user-table-is-read t)
     (cond
      ((file-exists-p local-table)
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatex.new
--- a/yatex.new	Wed May 01 15:35:40 1996 +0000
+++ b/yatex.new	Fri Jan 24 09:04:06 1997 +0000
@@ -1,6 +1,18 @@
 	What's new in YaTeX
 	野鳥/yahtml - 各バージョンの変更点について
 
+1.63	数式モードに入ったら漢字モードをOFFにするようにした(本来1.62)
+	yahtmlで [prefix] t j で(j)weblintを呼ぶようにした。
+	yahtmlのブラウザ起動は、[prefix] t p に変更。
+	yahtmlで、<pre>の中でfillした場合、<a>タグなどを文字数にカウント
+	せずにfillするようにした。
+	LaTeX2eのフォント設定マクロを正しくhilitするようにした。
+	yahtmlで src="??" や align="???" などのchangeができるようにした。
+	yahtmlのNAME補完のときにauto-hilightが効かないようにした。
+	数式モードのときはauto-fillが効かないようにした。
+	\のあとに{を入れたときは\}を入れるようにした。
+	yahtmlでブラウザにIEを指定したときの不具合を修正。
+
 1.62	\ref の引数が二行に渡る時行末に%を付けるようにした
 	yahtmlでおまかせ改行が不必要に起動するのを修正
 	href の補完文字列に # が含まれる時は name を補完
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatex19.el
--- a/yatex19.el	Wed May 01 15:35:40 1996 +0000
+++ b/yatex19.el	Fri Jan 24 09:04:06 1997 +0000
@@ -1,7 +1,7 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; YaTeX facilities for Emacs 19
-;;; (c )1994-1995 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Thu Mar 14 10:51:00 1996 on supra
+;;; (c )1994-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
+;;; Last modified Fri Jan 24 18:00:49 1997 on supra
 ;;; $Id$
 
 ;;; とりあえず hilit19 を使っている時に色が付くようにして
@@ -270,9 +270,10 @@
 
     ;; (re-)define new commands/environments/counters
     (YaTeX-19-region-section-type
-     "\\\\\\(re\\)?new\\(environment\\|command\\|theorem\\){" defun)
+     "\\\\\\(re\\)?new\\(environment\\|command\\|theorem\\|length\\|counter\\){"
+     defun)
     (YaTeX-19-region-section-type
-     "\\\\\\(re\\)?new\\(length\\|counter\\){" define)
+     "\\\\textbf{" bold)
 
     ;; various declarations/definitions
     (YaTeX-19-region-section-type
@@ -342,6 +343,9 @@
 ;;; セクションコマンドを、構造レベルの高さに応じて色の濃度を変える
 ;;; 背景が黒でないと何が嬉しいのか分からないに違いない.
 ;;; もしかして白地の時は構造レベルに応じて色を明るくしたほうが良いのか?
+;(if (fboundp 'win32-color-values)
+;    (fset 'x-color-values 'win32-color-values))
+
 (cond
  ((and (featurep 'hilit19) (fboundp 'x-color-values))
   (let*((sectface
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatexadd.el
--- a/yatexadd.el	Wed May 01 15:35:40 1996 +0000
+++ b/yatexadd.el	Fri Jan 24 09:04:06 1997 +0000
@@ -1,8 +1,8 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; YaTeX add-in functions.
 ;;; yatexadd.el rev.13
-;;; (c )1991-1995 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Sat Apr 27 21:38:36 1996 on NSR
+;;; (c )1991-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
+;;; Last modified Fri Jan 24 18:00:45 1997 on supra
 ;;; $Id$
 
 ;;;
@@ -91,6 +91,7 @@
 
 (defun YaTeX:table ()
   "YaTeX add-in function for table environment."
+  (setq env-name "tabular")
   (YaTeX:read-position "htbp")
 )
 
@@ -388,16 +389,25 @@
 (defun YaTeX::ref (argp &optional labelcmd refcmd)
   (cond
    ((= argp 1)
-    (save-excursion
-      (let ((lnum 0) e0 label label-list (buf (current-buffer))
-	    (labelcmd (or labelcmd "label")) (refcmd (or refcmd "ref"))
-	    (p (point)) initl line)
-	(goto-char (point-min))
-	(message "Collecting labels...")
-	(save-window-excursion
-	  (YaTeX-showup-buffer
-	   YaTeX-label-buffer (function (lambda (x) (window-width x))))
+    (let ((lnum 0) e0 label label-list (buf (current-buffer))
+	  (labelcmd (or labelcmd "label")) (refcmd (or refcmd "ref"))
+	  (p (point)) initl line cf)
+      (message "Collecting labels...")
+      (save-window-excursion
+	(YaTeX-showup-buffer
+	 YaTeX-label-buffer (function (lambda (x) (window-width x))))
+	(if (fboundp 'select-frame) (setq cf (selected-frame)))
+	(if (eq (window-buffer (minibuffer-window)) buf)
+	    (progn
+	      (other-window 1)
+	      (setq buf (current-buffer))
+	      (set-buffer buf)
+	      ;(message "cb=%s" buf)(sit-for 3)
+	      ))
+	(save-excursion
+	  (goto-char (point-min))
 	  (with-output-to-temp-buffer YaTeX-label-buffer
+	    (princ (format "=== LABELS in [%s] ===\n" (buffer-name buf)))
 	    (while (YaTeX-re-search-active-forward
 		    (concat "\\\\" labelcmd "\\b")
 		    (regexp-quote YaTeX-comment-prefix) nil t)
@@ -422,21 +432,24 @@
 	    (princ YaTeX-label-menu-any)
 	    );with
 	  (goto-char p)
+	  (or initl (setq initl lnum))
 	  (message "Collecting %s...Done" labelcmd)
+	  (if (fboundp 'select-frame) (select-frame cf))
 	  (YaTeX-showup-buffer YaTeX-label-buffer nil t)
 	  (YaTeX::label-setup-key-map)
 	  (setq truncate-lines t)
 	  (setq buffer-read-only t)
 	  (use-local-map YaTeX-label-select-map)
 	  (message YaTeX-label-guide-msg)
-	  (goto-line (or initl lnum))	;goto recently defined label line
+	  (goto-line (1+ initl)) ;goto recently defined label line
 	  (unwind-protect
 	      (progn
 		(recursive-edit)
 		(set-buffer (get-buffer YaTeX-label-buffer)) ;assertion
 		(beginning-of-line)
-		(setq line (count-lines (point-min)(point)))
+		(setq line (1- (count-lines (point-min)(point))))
 		(cond
+		 ((= line -1) (setq label ""))
 		 ((= line lnum) (setq label (YaTeX-label-other)))
 		 ((= line (1+ lnum))
 		  (save-excursion
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatexenv.el
--- a/yatexenv.el	Wed May 01 15:35:40 1996 +0000
+++ b/yatexenv.el	Fri Jan 24 09:04:06 1997 +0000
@@ -1,8 +1,8 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; YaTeX environment-specific functions.
 ;;; yatexenv.el
-;;; (c ) 1994, 1995 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Mon Apr 15 16:24:00 1996 on supra
+;;; (c ) 1994-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
+;;; Last modified Fri Jan 24 18:00:38 1997 on supra
 ;;; $Id$
 
 ;;;
@@ -74,7 +74,7 @@
   (cond
    ((YaTeX-quick-in-environment-p '("tabular" "tabular*" "array" "array*"))
     (YaTeX-array-what-column))
-   (t (message "Not in array/tabuar environment.")))
+   (t (message "Not in array/tabular environment.")))
 )
 
 (defun YaTeX-tabular-parse-format (&optional tabular*)
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatexhks.el
--- a/yatexhks.el	Wed May 01 15:35:40 1996 +0000
+++ b/yatexhks.el	Fri Jan 24 09:04:06 1997 +0000
@@ -32,6 +32,8 @@
   '(lambda () (interactive) (YaTeX-make-singlecmd "leftarrow")))
 (define-key YaTeX-user-extensional-map "l"
   '(lambda () (interactive) (YaTeX-make-section nil nil nil "label")))
+(define-key YaTeX-user-extensional-map "f"
+  '(lambda () (interactive) (YaTeX-make-section nil nil nil "frac")))
 (define-key YaTeX-user-extensional-map "S"
   '(lambda () (interactive) (YaTeX-make-section nil nil nil "setlength")))
 (define-key YaTeX-user-extensional-map "b"
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatexmth.el
--- a/yatexmth.el	Wed May 01 15:35:40 1996 +0000
+++ b/yatexmth.el	Fri Jan 24 09:04:06 1997 +0000
@@ -1,8 +1,8 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; YaTeX math-mode-specific functions.
 ;;; yatexmth.el rev.4
-;;; (c )1993-1995 by HIROSE Yuuji [yuuji@ae.keio.ac.jp]
-;;; Last modified Tue Apr 23 23:17:24 1996 on inspire
+;;; (c )1993-1997 by HIROSE Yuuji [yuuji@ae.keio.ac.jp]
+;;; Last modified Fri Jan 24 18:00:08 1997 on supra
 ;;; $Id$
 
 ;;; [Customization guide]
@@ -541,6 +541,7 @@
 	(setq list (cdr list)))
       (goto-line 4)
       (use-local-map YaTeX-math-menu-map)
+      (setq buffer-read-only t)
       (unwind-protect
 	  (recursive-edit)
 	(skip-chars-backward "^ \t\n")
@@ -597,9 +598,14 @@
   (let*((key (or initial "")) regkey str  last-char list i
 	(case-fold-search nil) match sign
 	(this-key (char-to-string last-command-char))
-	(alist (symbol-value (cdr (assoc this-key YaTeX-math-key-list))))
+	(alistsym (cdr (assoc this-key YaTeX-math-key-list)))
+	(alistname (symbol-name alistsym))
+	(alist (symbol-value alistsym))
 	(n (length alist)) (beg (point)) result)
     (if initial (insert YaTeX-ec (car (cdr (assoc initial alist)))))
+    (if (string-match "^YaTeX-" alistname)
+	(setq alistname (substring alistname (length "YaTeX-"))))
+    (setq alistname (substring alistname 0 (string-match "-" alistname)))
     (setq result
 	  (catch 'complete
 	    (if (and (not force)
@@ -608,7 +614,8 @@
 		       (not YaTeX-math-mode)))
 		(throw 'complete 'escape));this tag should be exit, but...
 	    (while t
-	      (message "Sequence%s: %s"
+	      (message "%ssequence%s: %s"
+		       (if YaTeX-simple-messages "" (concat alistname " "))
 		       (if YaTeX-simple-messages "" "(TAB for menu)") key)
 	      (setq last-char (read-char)
 		    key (concat key (char-to-string last-char))
diff -r 48ac97a6b6ce -r 9e08ed569d80 yatexprc.el
--- a/yatexprc.el	Wed May 01 15:35:40 1996 +0000
+++ b/yatexprc.el	Fri Jan 24 09:04:06 1997 +0000
@@ -1,8 +1,8 @@
 ;;; -*- Emacs-Lisp -*-
 ;;; YaTeX process handler.
 ;;; yatexprc.el
-;;; (c )1993-1995 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
-;;; Last modified Fri Mar 29 00:15:35 1996 on inspire
+;;; (c )1993-1997 by HIROSE Yuuji.[yuuji@ae.keio.ac.jp]
+;;; Last modified Fri Jan 24 17:59:44 1997 on supra
 ;;; $Id$
 
 (require 'yatex)
@@ -33,16 +33,20 @@
   (modify-syntax-entry ?\] "w" YaTeX-typeset-buffer-syntax)
 )
 
-(defun YaTeX-typeset (command buffer)
+(defun YaTeX-typeset (command buffer &optional prcname modename)
   "Execute jlatex (or other) to LaTeX typeset."
   (interactive)
   (save-excursion
-    (let ((p (point)) (window (selected-window)) execdir (cb (current-buffer)))
+    (let ((p (point)) (window (selected-window)) execdir (cb (current-buffer))
+	  (map YaTeX-typesetting-mode-map))
       (if (and YaTeX-typeset-process
 	       (eq (process-status YaTeX-typeset-process) 'run))
 	  ;; if tex command is halting.
 	  (YaTeX-kill-typeset-process YaTeX-typeset-process))
-      (YaTeX-visit-main t) ;;execution directory
+      (YaTeX-put-nonstopmode)
+      (setq prcname (or prcname "LaTeX")
+	    modename (or modename "typeset"))
+      (if (eq major-mode 'yatex-mode) (YaTeX-visit-main t)) ;;execution dir
       (setq execdir default-directory)
       ;;Select lower-most window if there are more than 2 windows and
       ;;typeset buffer not seen.
@@ -54,23 +58,24 @@
       (erase-buffer)
       (cond
        (YaTeX-dos			;if MS-DOS
-	(YaTeX-put-nonstopmode)
+	;(YaTeX-put-nonstopmode)
 	(call-process
 	 shell-file-name nil buffer nil YaTeX-shell-command-option command)
-	(YaTeX-remove-nonstopmode))
+	;(YaTeX-remove-nonstopmode)
+	)
        (t				;if UNIX
 	(set-process-buffer
 	 (setq YaTeX-typeset-process
-	       (start-process "LaTeX" buffer shell-file-name
+	       (start-process prcname buffer shell-file-name
 			      YaTeX-shell-command-option command))
 	 (get-buffer buffer))
 	(set-process-sentinel YaTeX-typeset-process 'YaTeX-typeset-sentinel)))
       (message (format "Calling `%s'..." command))
       (setq YaTeX-current-TeX-buffer (buffer-name))
-      (use-local-map YaTeX-typesetting-mode-map)
+      (use-local-map map)		;map may be localized
       (set-syntax-table YaTeX-typeset-buffer-syntax)
-      (setq mode-name "typeset")
-      (if YaTeX-typeset-process		; if process is running (maybe on UNIX)
+      (setq mode-name modename)
+      (if YaTeX-typeset-process		;if process is running (maybe on UNIX)
 	  (cond ((boundp 'MULE)
 		 (set-current-process-coding-system
 		  YaTeX-latex-message-code YaTeX-coding-system))
@@ -92,7 +97,8 @@
 	(goto-char (point-max))
 	(recenter -1))
       (select-window window)
-      (switch-to-buffer cb)))
+      (switch-to-buffer cb)
+      (YaTeX-remove-nonstopmode)))
 )
 
 (defun YaTeX-typeset-sentinel (proc mes)
@@ -114,14 +120,14 @@
 		 ;;(YaTeX-showup-buffer pbuf nil t)
                  (goto-char (point-max))
 		 (if pwin (recenter -3))
-                 (insert ?\n "latex typesetting " mes)
+                 (insert ?\n mode-name " " mes)
                  (forward-char -1)
                  (insert " at " (substring (current-time-string) 0 -5) "\n")
                  (forward-char 1)
                  (setq mode-line-process
                        (concat ": "
                                (symbol-name (process-status proc))))
-		 (message "latex typesetting %s."
+		 (message mode-name " %s."
 			  (if (eq (process-status proc) 'exit)
 			      "done" "ceased"))
                  ;; If buffer and mode line shows that the process
@@ -226,7 +232,8 @@
 )
 
 (defun YaTeX-typeset-buffer ()
-  "Typeset whole buffer.  If %#! usage says other buffer is main text,
+  "Typeset whole buffer.
+If %#! usage says other buffer is main text,
 visit main buffer to confirm if its includeonly list contains current
 buffer's file.  And if it doesn't contain editing text, ask user which
 action wants to be done, A:Add list, R:Replace list, %:comment-out list."
@@ -382,7 +389,8 @@
        (YaTeX-dos			;if MS-DOS
 	(send-string-to-terminal "\e[2J\e[>5h") ;CLS & hide cursor
 	(call-process shell-file-name "con" "*dvi-preview*" nil
-		      YaTeX-shell-command-option preview-command preview-file)
+		      YaTeX-shell-command-option
+		      (concat preview-command preview-file))
 	(send-string-to-terminal "\e[>5l") ;show cursor
 	(redraw-display))
        (t				;if UNIX
@@ -478,7 +486,7 @@
     (select-window typeset-win)
     (skip-chars-backward "0-9")
     (recenter (/ (window-height) 2))
-    (sit-for 3)
+    (sit-for 1)
     (goto-char (match-beginning 0))
     (select-window error-win))
 )
@@ -565,18 +573,19 @@
 )
       
 (defun YaTeX-put-nonstopmode ()
-  (if YaTeX-need-nonstop
+  (if (and YaTeX-need-nonstop (eq major-mode 'yatex-mode))
       (if (re-search-backward "\\\\nonstopmode{}" (point-min) t)
 	  nil                    ;if already written in text then do nothing
 	(save-excursion
 	  (YaTeX-visit-main t)
 	  (goto-char (point-min))
-	  (insert "\\nonstopmode{}%_YaTeX_%\n")))
+	  (insert "\\nonstopmode{}%_YaTeX_%\n")
+	  (if (buffer-file-name) (basic-save-buffer))))
     )
 )
 
 (defun YaTeX-remove-nonstopmode ()
-  (if YaTeX-need-nonstop ;for speed
+  (if (and YaTeX-need-nonstop (eq major-mode 'yatex-mode)) ;for speed
       (save-excursion
 	(YaTeX-visit-main t)
 	(goto-char (point-min))
@@ -776,17 +785,18 @@
 )
 
 (defun YaTeX-save-buffers ()
-  "Save buffers which is in yatex-mode."
+  "Save buffers whose major-mode is equal to current major-mode."
   (basic-save-buffer)
-  (save-excursion
-    (mapcar '(lambda (buf)
-	       (set-buffer buf)
-	       (if (and (buffer-file-name buf)
-			(eq major-mode 'yatex-mode)
-			(buffer-modified-p buf)
-			(y-or-n-p (format "Save %s" (buffer-name buf))))
-		   (save-buffer buf)))
-	    (buffer-list)))
+  (let ((cmm major-mode))
+    (save-excursion
+      (mapcar '(lambda (buf)
+		 (set-buffer buf)
+		 (if (and (buffer-file-name buf)
+			  (eq major-mode cmm)
+			  (buffer-modified-p buf)
+			  (y-or-n-p (format "Save %s" (buffer-name buf))))
+		     (save-buffer buf)))
+	      (buffer-list))))
 )
 
 (provide 'yatexprc)