Description: fix texi to pass makeinfo.
Origin:      vendor
Author:      KURASHIKI Satoru <lurdan@gmail.com>

Index: yatex/docs/yatexe.tex
===================================================================
--- yatex.orig/docs/yatexe.tex	2012-02-13 20:32:57.117687724 +0900
+++ yatex/docs/yatexe.tex	2012-02-13 20:33:00.429704158 +0900
@@ -51,7 +51,7 @@
 * Customizations::              How to breed `Wild Bird'
 * Etcetera::                    YaTeX is acquisitive.
 * Copying::                     Redistribution
-
+@end menu
 
 @node What is YaTeX?, Main features, Top, Top
 @comment  node-name,  next,  previous,  up
@@ -94,7 +94,7 @@
 @item Document files hierarchy browser (@kbd{C-c d})
 @item Adding automatically \usepackage corresponding to inputting LaTeX
       macro with completion
-@item Allow you to forget creating \label{}s, \ref or \cite completion
+@item Allow you to forget creating \label@{@}s, \ref or \cite completion
       automatically generate labels.
 @end itemize
 
@@ -204,7 +204,7 @@
 by @code{%#BEGIN} and @code{%#END} marks.  Selected region will be
 copied to the temporary file @file{texput.tex} with the same preamble
 as the main file of current editing sources.  Be sure to put
-all local macro settings in preamble, not after @code{\begin{document}}.
+all local macro settings in preamble, not after @code{\begin@{document@}}.
   The method of specification of the region is shown in the
 section @xref{%#notation}.
 
@@ -1828,7 +1828,7 @@
 
 @defvar YaTeX-singlecmd-suffix
 Suffix which is always inserted after maketitle-type macros.
-@code{"{}"} is recommended.
+@code{"@{@}"} is recommended.
 @end defvar
 
 @defvar YaTeX-package-alist-private
@@ -1874,7 +1874,7 @@
 @end defvar
 
 @defvar YaTeX-ref-generate-label-function
-Function to generate default label string for unnamed \\label{}s.
+Function to generate default label string for unnamed \\label@{@}s.
 The function pointed to this value should take two arguments.
 First argument is LaTeX macro's name, second is macro's argument.
 Here is an example for using this value.
@@ -1882,7 +1882,7 @@
   (setq YaTeX-ref-generate-label-function 'my-yatex-generate-label)
   (defun my-yatex-generate-label (command value)
     (and (string= command "caption")
-         (re-search-backward "\\\\begin{\\(figure\\|table\\)}" nil t)
+         (re-search-backward "\\\\begin@{\\(figure\\|table\\)@}" nil t)
          (setq command (match-string 1)))
     (let ((alist '(("chapter" . "chap")
                    ("section" . "sec")
@@ -2031,7 +2031,7 @@
 will be enclosed by section-type commands via @kbd{[prefix] S}.  An
 enclosing add-in function will be called with two arguments, beginning of
 the enclosed region and end of the region.  Suppose you want to enclose
-the existing text @code{(a+b)/c} by @code{\frac{}}.
+the existing text @code{(a+b)/c} by @code{\frac@{@}}.
 
 @display
 a/c
@@ -2043,7 +2043,7 @@
 @kbd{[prefix] S} and input @code{frac} enclose the region like this;
 
 @display
-\frac{a/c}
+\frac@{a/c@}
 @end display
 
 Normally, the expression @code{a/c} is translated to
@@ -2124,8 +2124,8 @@
   (catch 'done
     (while (search-forward "/" end t)
       (goto-char (match-beginning 0))
-      (if (y-or-n-p "Replace this slash(/) with `}{'")
-	  (throw 'done (replace-match "}{")))
+      (if (y-or-n-p "Replace this slash(/) with `@}@{'")
+	  (throw 'done (replace-match "@}@{")))
       (goto-char (match-end 0)))))
 @end lisp
 
Index: yatex/docs/yahtmle.tex
===================================================================
--- yatex.orig/docs/yahtmle.tex	2012-02-13 20:32:57.085687560 +0900
+++ yatex/docs/yahtmle.tex	2012-02-13 20:40:19.879883261 +0900
@@ -1,4 +1,4 @@
-\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
+\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1
 \input texinfo
 @setfilename yahtmle.info
 @settitle Yet Another html-mode for Emacs
@@ -57,9 +57,9 @@
 @comment  node-name,  next,  previous,  up
 @chapter Installing yahtml
 @menu
-* Setting up yahtml::           
-* Setting environments for weblint browsers and image viewers::  
-* Setting environment variables for WWW pages::  
+* Setting up yahtml::
+* Setting environments for weblint browsers and image viewers::
+* Setting environment variables for WWW pages::
 @end menu
 
 @node Setting up yahtml, Setting environments for weblint browsers and image viewers, Installation, Installation
@@ -83,12 +83,12 @@
 (setq load-path (cons (expand-file-name "~/src/emacs/yahtml") load-path))
 @end lisp
 
-@noindent 
+@noindent
 is what you add.
 
 By this, yahtml will be automatically loaded when editing files with .html
 extensions.  "yahtml" will be displayed on the mode line if no errors
-occurred. 
+occurred.
 
 @node Setting environments for weblint browsers and image viewers, Setting environment variables for WWW pages, Setting up yahtml, Installation
 @comment  node-name,  next,  previous,  up
@@ -119,7 +119,7 @@
 @item yahtml-directory-index
         @dots{} index file displayed when none is given in URL.  Usually
         @file{index.html} on NCSA type httpd and @file{Welcome.html} on
-        CERN types. 
+        CERN types.
 @end table
 
 Examples for  @code{yahtml-path-url-alist}.  If @file{/home/yuuji/http/}
@@ -183,7 +183,7 @@
 attributes.  Possible completions are, <img>, <input>.
 
 @item [prefix] l (YaTeX large-type completion)
-@dots{} 
+@dots{}
 
 @example
 <big> $B!A(B </big>
@@ -207,14 +207,14 @@
 @node Jump, Changing and Deleting, Completion, Top
 @comment  node-name,  next,  previous,  up
 @chapter Cursor Movement
-By using 
+By using
 
 @table @kbd
 @item [prefix] g
         @dots{} move to corresponding object
 @end table
 
-@noindent 
+@noindent
 the cursor will go to the corresponding object according to the context.
 Recognized contexts are
 
@@ -231,9 +231,10 @@
 @chapter Changing and Deleting
 
 @menu
-* Changing tags in pairs::      
-* Changing entities::           
-* URLencoding of strings within region::  
+* Changing tags in pairs::
+* Changing entities::
+* URLencoding of strings within region::
+* td-enclosure/tr-enclosure::
 @end menu
 
 @node Changing tags in pairs, Changing entities, Changing and Deleting, Changing and Deleting
@@ -246,7 +247,7 @@
         @dots{} change tags in matching pairs
 @end table
 
-@noindent 
+@noindent
 the content can be changed according to the context of the HTML document
 where the cursor is located.
 
@@ -290,7 +291,7 @@
 table element, td-enclosure or tr-enclosure is convenient.
 
 @table @kbd
- @item [prefix] }
+ @item [prefix] @}
 	@dots{} Enclose each field in a region into <td>...</td>'s.
  @item [prefix] ]
 	@dots{} Enclose each line in a region into <tr>...</tr>'s, with
@@ -311,8 +312,8 @@
 @chapter CSS(Style Sheets) Support
 
 @menu
-* CSS-class completion::        
-* Reread CSS definition::       
+* CSS-class completion::
+* Reread CSS definition::
 @end menu
 
 @node CSS-class completion, Reread CSS definition, CSS Support, CSS Support
@@ -328,7 +329,7 @@
 
 when you input h1(or h2) tag with completing-read by [prefix] b or
 [prefix] l, yahtml prompts you to input class name with completion from
-the words which are effective to h1 or h2.  And if you defined 
+the words which are effective to h1 or h2.  And if you defined
 global class like this;
 
 @display
Index: yatex/docs/yatexj.tex
===================================================================
--- yatex.orig/docs/yatexj.tex	2012-02-13 20:32:57.133687804 +0900
+++ yatex/docs/yatexj.tex	2012-02-13 20:37:25.515018634 +0900
@@ -1,4 +1,4 @@
-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
 \input texinfo
 @setfilename yatexj.info
 @settitle Yet Another tex-mode for Emacs
@@ -173,7 +173,7 @@
 (setq load-path (cons (expand-file-name "~/src/emacs/yatex") load-path))
 @end lisp
 
-@noindent 
+@noindent
 ȂǂƂ܂B
 
   ȏ̐ݒɂAgq .tex łt@CҏWƎIɖ쒹
@@ -279,7 +279,7 @@
 sɃWvĂ܂B
 
   ACɂȂG[sꍇ́A^CvZbgobt@ŁAG
-[̕\ĂsɃJ[\킹Xy[XL[ La@TeX{} 
+[̕\ĂsɃJ[\킹Xy[XL[ La@TeX{}
 \[X̑ΉsɃWv܂B
 
 @subsection ̈^CvZbg
@@ -289,12 +289,12 @@
 ł܂B̏ꍇCt@C̃vAuꎞt@C
 vAuƂĎg܂BăvAuɂȂ}N`
 ̈ɂƃG[ɂȂ܂B̈^CvZbggꍇA
-K}N`̓vAu(@code{\begin{document}}O)ɒu悤
+K}N`̓vAu(@code{\begin@{document@}}O)ɒu悤
 ɂĉBꎞt@C̓Ct@Ĉ
 fBNg@file{texput.tex}ƂOŏo͂̂ŁA
 ㏑ɂ͒ӂĂB
 
-@subsection{^CvZbg}
+@subsection ^CvZbg
 
   @kbd{[prefix] te} ƁA|Cgʒu̍ł̊A܂͐[
 h̏ꍇ͂̐[hŜIɗ̈IāÄ^CvZbg
@@ -371,7 +371,7 @@
 @comment  node-name,  next,  previous,  up
 @section ̓t@C
 
-܂A͖ɕʃt@C .tex 쐬ĂꍇŁA@file{main.tex} 
+܂A͖ɕʃt@C .tex 쐬ĂꍇŁA@file{main.tex}
 @file{sub.tex} @code{\include}Ă悤Ȏ́A@file{sub.tex}̔Cӂ
 ʒuɎ̂悤ȍs𖄂ߍ݂܂B
 
@@ -381,7 +381,7 @@
 
 @cindex ̓t@C[ɂ䂤悭ӂӂ񂩂]
 
-̗̂悤ɃR}hłȂꍇɂ́ASĂ̂܂ 
+̗̂悤ɃR}hłȂꍇɂ́ASĂ̂܂
 shell ɓn̂Ŏ̂悤ɏ΁Aghostview Ȃǂv[AɎgɕ
 łB
 
@@ -424,7 +424,7 @@
 @cindex %#BEGIN
 @cindex %#END
 
-  @kbd{[prefix] tr} ̗̈w̃^CvZbgł́AƂɎŵȂA 
+  @kbd{[prefix] tr} ̗̈w̃^CvZbgł́AƂɎŵȂA
 @kbd{C-SPC}Ń}[NʒuƁA|Cg(J[\ʒu)̊Ԃ̈Ƃ݂Ȃ
 AK܂̈^CvZbgꍇ́Ä̗
 
@@ -434,7 +434,7 @@
         %#END
 @end example
 
-@noindent 
+@noindent
 ̂悤@code{%#BEGIN}@code{%#END}ň͂݁AJ[\u@code{%#BEGIN}ȍ~v
 ɒuĂB̗̎̈挈K܂Ƃ߂Ǝ̂悤ɂȂ܂B
 
@@ -505,7 +505,7 @@
         %#LPR dvi2ps %f %t %s | 4up -page 4 | texfix | lpr -Plp2
 @end example
 
-@noindent 
+@noindent
 ̂悤ɏĉBvgAEgy[W͈͂Ȃ悤
 ɂ鎞
 
@@ -513,7 +513,7 @@
         %#LPR dvi2ps %s | lpr
 @end example
 
-@noindent 
+@noindent
 ȂǂƂ̂֗܂B
 
 @node Editing %# notation,  , lpr format, %#notation
@@ -528,18 +528,18 @@
         @dots{} @code{%#}@var{L@ҏWj[}
 @end table
 
-@noindent 
+@noindent
 ܂B
 
 @example
         !)Edit-%#! B)EGIN-END-region L)Edit-%#LPR
 @end example
 
-@noindent 
+@noindent
 Ƃj[oė̂ŁA@code{%#!}ɑR}hύXɂ
 @kbd{!}A@code{%#LPR} lpr tH[}bgς@kbd{l}A炩
 ߐݒ肵W @code{%#BEGIN} ` @code{%#END} Ŋ肽́A
-@kbd{b}܂B@kbd{b}I񂾎ɂ́A܂Ńobt@ɒuĂ 
+@kbd{b}܂B@kbd{b}I񂾎ɂ́A܂Ńobt@ɒuĂ
 @code{%#BEGIN}, @code{%#END} Iɏ܂B
 @cindex lprtH[}bg̕ύX[lprӂ܂Ƃ̂ւ񂱂]
 
@@ -551,12 +551,12 @@
 ł܂B
 
 @menu
-* begin^⊮::                 
-* section^⊮::               
-* large^⊮::                 
-* maketitle^⊮::             
+* begin^⊮::
+* section^⊮::
+* large^⊮::
+* maketitle^⊮::
 * Arbitrary completion::        ⊮
-* end⊮::                     
+* end⊮::
 * Accent mark completion::      ANZgL⊮
 * Image completion::            LC[W⊮
 * Greek letter completion::     MV⊮
@@ -577,7 +577,7 @@
         @dots{} begin ^⊮Jn(Wł @kbd{C-c b})
 @end table
 
-@noindent 
+@noindent
 Ŏn܂܂Bpɂɗp鎟 La@TeX{} ̕⊮́A[prefix] @kbd{b}
 ɑ1͂邾ŁA@code{\begin@{xxx@}...\end@{xxx@}}
 ܂B
@@ -630,7 +630,7 @@
 @kbd{[prefix] b @key{SPC}} Ɠ͂ƁAŉs̃~jobt@
 
 @example
-        Begin environment(default document): 
+        Begin environment(default document):
 @end example
 
 @noindent
@@ -685,14 +685,14 @@
         @dots{} section ^⊮
 @end table
 
-@noindent 
+@noindent
 Ŏs܂B@kbd{[prefix] s} ͂ƃ~jobt@ɁA
 
 @example
         (C-v for view-section) \???@{@} (default documentclass):
 @end example
 
-@noindent 
+@noindent
 ƂvvĝŁA @samp{section} ̂悤 La@TeX{} R}
 h͂܂Bł^[L[݂̂Ŋʓ̃ftHglI
 قA@samp{chapter}Ȃǂ̂悤ȕpx̍̓͂ɂ̓Xy[XL[ɂ
@@ -702,7 +702,7 @@
         \section@{???@}:
 @end example
 
-@noindent 
+@noindent
 ƂvvĝŁAZNṼ^CgȂǂ͂܂B
 Ƃ΁A
 
@@ -711,33 +711,33 @@
         \section@{???@}: ړI
 @end example
 
-@noindent 
+@noindent
 ̂悤ɓ͂ꍇ́A͒
 
 @example
         \section@{ړI@}
 @end example
 
-@noindent 
+@noindent
 }A
 
 @example
         (C-v for view-section) \???@{@} (default section): vspace*
-        \vspace*@{???@}: 
+        \vspace*@{???@}:
 @end example
 
-@noindent 
+@noindent
 ̂悤@{@}̒gȗƂ́A
 
 @example
         \vspace*@{@}
 @end example
 
-@noindent 
+@noindent
 }As͂J[\͎Iɒʂ̓Ɉړ܂B
 
 @menu
-* 2ȏ̈Ƃ section^R}h::  
+* 2ȏ̈Ƃ section^R}h::
 * Enclose section-type command::  ⊮
 * Recursive completion::        ċA⊮
 * view-sectioning::             ZNV؂̃AEgC\
@@ -751,14 +751,14 @@
 
   ƂŁA@samp{\addtolength@{\topmargin@}@{8mm@}} Ȃǂ̂悤ɁA
 ȏ La@TeX{} R}h܂B̂悤ȃR}h̕⊮͂ɂ́A
-section ^⊮ĂяoɈtĂBႦΏ@samp{addtolength} 
+section ^⊮ĂяoɈtĂBႦΏ@samp{addtolength}
 ̗ł΁A2w肵܂B܂A
 
 @example
         C-u 2 [prefix] s   (܂́AESC 2 [prefix] s)
 @end example
 
-@noindent 
+@noindent
  section ^⊮ĂяoA
 
 @example
@@ -767,12 +767,12 @@
         Argument 2: 8mm
 @end example
 
-@noindent 
-̂悤ɓ͂ĂBŏ addtolength ̕ƁAł 
+@noindent
+̂悤ɓ͂ĂBŏ addtolength ̕ƁAł
 \topmargin ͓̓͂RXy[Xɂ⊮͂\łB[Uɓo^
  La@TeX{} R}hɂ́Ä̐wK̂ŁAŏ̕⊮̎
 ̐w肵ċNĂ΁AȌ̕⊮ɂ́ALꂽ
-𕷂ė悤ɂȂ܂BƂň̌ς́AĂ @kbd{C-u} 
+𕷂ė悤ɂȂ܂BƂň̌ς́AĂ @kbd{C-u}
 pČw肵ƂŁAIɎ̈̌̕XV
 B
 @cindex ̌ς[Ђ̂]
@@ -852,7 +852,7 @@
 @subsection x
 @cindex x[ւ邵Ƃ]
 
-  @code{\ref@{@}}  @code{\cite{@@}} }Nsection^⊮œꂽꍇ
+  @code{\ref@{@}}  @code{\cite@{@@@}} }Nsection^⊮œꂽꍇ
 QƐƂȂ蓾̂SĒTăj[ɂđIł܂BQƐɂ
 @code{\label@{@}}ĂKv͂܂B΁Ãx
 gAȂ΂̏ŎQƐ@code{\label@{@}}点Ă܂B
@@ -873,14 +873,14 @@
         @dots{} large ^⊮Jn
 @end table
 
-@noindent 
+@noindent
 large^⊮̊JnłB@kbd{[prefix] l} ƁA~jobt@
 
 @example
-        @{\??? @} (default large): 
+        @{\??? @} (default large):
 @end example
 
-@noindent 
+@noindent
 ƕ\̂ŁAL̂̂Ɠv̂ŕ⊮͂ĉB⊮ɗp
 Ă̂́A@samp{footnotesize}  @samp{huge} ̂悤ȕTCYw
 qƁA@samp{bf}@samp{dg}̂悤ȃtHgwqłB
@@ -892,7 +892,7 @@
 
   ܂Abegin^⊮̎ƓlAɏĂ܂A͂̃̕̕TCY
 ςƎv܂Â悤Ȏ́ATCY傫ς
-͈̔͂}[NĂAĂяoL[ @kbd{[prefix] L} ƁA啶 L 
+͈̔͂}[NĂAĂяoL[ @kbd{[prefix] L} ƁA啶 L
 ɕςČĂяo΁ÃWŜAu[Xň͂܂܂B
 
 @node maketitle^⊮, Arbitrary completion, large^⊮, Completion
@@ -908,7 +908,7 @@
         @dots{} maketitle ^⊮Jn
 @end table
 
-@noindent 
+@noindent
 ŁAmaketitle ^⊮Jn܂B⊮̗v͍̂܂ł̂̂Ƃ܂
 BLa@TeX{} p̃R}h⊮ƂėpӂĂ܂B
 
@@ -927,7 +927,7 @@
         @dots{} ⊮
 @end table
 
-@noindent 
+@noindent
 ͂΁ASĂ̕⊮̒v̂I΂J[\ʒuɑ}
 ܂B
 
@@ -938,7 +938,7 @@
 @cindex prefix e
 
   ݊J܂܂̊IɌoA@code{\end@{@}}}
-Bbegin ^⊮pΊ̕Y͂Ȃ̂łAɂ͂ 
+Bbegin ^⊮pΊ̕Y͂Ȃ̂łAɂ͂
 @code{\begin@{@}} Ă܂A߂v邱Ƃ܂B
 ̂悤Ȏɂ͋Cɂĕ͂͂Â
 
@@ -947,7 +947,7 @@
         @dots{} end ⊮
 @end table
 
-@noindent 
+@noindent
 Ƃ邱ƂŁA݊JĂ \end@{@} ܂B
 
 @node Accent mark completion, Image completion, end⊮, Completion
@@ -964,14 +964,14 @@
         @dots{} ANZgL
 @end table
 
-@noindent 
+@noindent
 ƁA~jobt@
 
 @example
         1:` 2:' 3:^ 4:" 5:~ 6:= 7:. u v H t c d b
 @end example
 
-@noindent 
+@noindent
 Ƃj[oė̂ŁAA܂͑ΉL/p
 ĉBƕҏWobt@ɁA
 
@@ -979,14 +979,14 @@
         \`@{@}
 @end example
 
-@noindent 
+@noindent
 AJ[\@{@}ɈʒûŁAɈꕶ͂鎖ŁA
 
 @example
         \`@{o@}
 @end example
 
-@noindent 
+@noindent
 AJ[\@{@}̊Oɖ߂܂B
 
 @node Image completion, Greek letter completion, Accent mark completion, Completion
@@ -1007,7 +1007,7 @@
 @kbd{:}ɓȋ@\܂B
 
   āAႦ΁A(leftarrow)ASCIIŕ\ꍇAʓIɂ́u<-v
-̂悤ɂ܂A𗘗pāALC[W̓[h 
+̂悤ɂ܂A𗘗pāALC[W̓[h
 @code{\leftarrow}͂ɂ́A@kbd{;}(Z~R)łĂ@kbd{<-}
 ͂܂BlɁA-(long-leftarrow) ASCIIŕ\
 ꍇu<--vƂ̂ŁA@code{\longleftarrow}͂邽߂ɂ́A@kbd{;<--}
@@ -1026,7 +1026,7 @@
 @end example
 
 
-@noindent 
+@noindent
   ̏ꍇAC[W͂sĂrŖ]݂̂̂obt@
 ɕ\ꂽȂAŃC[W͂~߂Ď̕ҏWɈڂĂ
 \܂B
@@ -1052,11 +1052,11 @@
 [̓L[]A[Ή La@TeX{} R}h]A[([)L}]A
 Ńj[oė̂ŁA悭ĝoĂƗǂł
 B̂ɂĂASCIIŕ\邱ƂȂ̂ŁA܂o
-₷L[тł͂Ȃ̂ł傤Â悤ȏꍇ 
+₷L[тł͂Ȃ̂ł傤Â悤ȏꍇ
 \maketitle ^⊮œ͂邩AȉɏqׂΉ\̐ݒsĒP
 ȃL[т̂̂ݒ肷Ɨǂł傤B
 
-  ̓L[    La@TeX{} R}hAL̑Ή\lIɐݒ肵ꍇ 
+  ̓L[    La@TeX{} R}hAL̑Ή\lIɐݒ肵ꍇ
 Emacs-Lisp ϐ @code{YaTeX-math-sign-alist-private}  ɒ`ĂB
 ̓eƃftHĝ̂킹̂Ή\ƂĎgp܂(private
 ̕D悳)BȂA̕ϐ̍\ɂĂ @file{yatexmth.el}  Q
@@ -1070,7 +1070,7 @@
 @cindex :
 
   A@kbd{:}ƃMV̓[hɓ܂B
-@kbd{:}@kbd{a}@code{\alpha}A@kbd{g}  
+@kbd{:}@kbd{a}@code{\alpha}A@kbd{g} 
 @code{\gamma}AȂǃAt@xbgɑΉMV}܂B
 @;̐L⊮Ƃ܂łB܂@kbd{:}̒
 TABĂǂ̃At@xbgɂǂ̃MVΉĂ邩ׂĂ݂
@@ -1099,7 +1099,7 @@
   `foo' is not in table. Register into: U)serDic L)ocalDic N)one D)iscard
 @end example
 
-@noindent 
+@noindent
 Ƃvvgɑ΂A@kbd{u}ƓƁu[UvA@kbd{l}Ɠ
 ƃ[JXVA@kbd{n}ƓƎt@C͍XV݂Emacs
 ZbV̂ݗLȒPƂA@kbd{d}ƓƐVȒPwKɎ̂
@@ -1113,7 +1113,7 @@
         (setq YaTeX-nervous nil)
 @end lisp
 
-@noindent 
+@noindent
 ƂĉB
 
 @node Commenting out, Cursor jump, Local dictionary, Top
@@ -1136,7 +1136,7 @@
         @dots{} W % ̃RgO
 @end table
 
-@noindent 
+@noindent
 ́A炩ߐݒ肵Wɑ΂Ă̑A
 
 @table @kbd
@@ -1146,7 +1146,7 @@
         @dots{} ݂̃pOt̃RgO
 @end table
 
-@noindent 
+@noindent
 ́AJ[\̈ʒupOtŜɑ΂Ă̑łBȂAł
 upOtv (@code{mark-paragraph}) ֐ɂ}[N͈͂w
 ܂(Wݒ@kbd{ESC h}ɃoChĂ)BȂA@code{%}ŃR
@@ -1164,7 +1164,7 @@
         @dots{} @code{\begin@{@}}`@code{\end@{@}} SăRgO
 @end table
 
-@noindent 
+@noindent
 Ƃ邱ƂŁA@code{\begin`\end}ň͂܂SĂɑ΂ăRg삵A
 
 @table @kbd
@@ -1188,11 +1188,11 @@
 
 
 @menu
-* ΉIuWFNgւ̃Wv::  
-* G`c[N::          
-* Ct@Cւ̃Wv::  
-* PʂƂWv::    
-* Ō̕⊮ʒuւ̃Wv::  
+* ΉIuWFNgւ̃Wv::
+* G`c[N::
+* Ct@Cւ̃Wv::
+* PʂƂWv::
+* Ō̕⊮ʒuւ̃Wv::
 @end menu
 
 @node ΉIuWFNgւ̃Wv, G`c[N, Cursor jump, Cursor jump
@@ -1206,7 +1206,7 @@
         @dots{} ΉIuWFNgɃWv
 @end table
 
-@noindent 
+@noindent
 ƂɂAJ[\ʒuLa@TeX{}R}hɑΉꏊɃWv
 ܂BΉ֌W݂Ɖ߂R}hɂ͈ȉ̂̂܂B
 
@@ -1221,7 +1221,7 @@
 
   @code{\begin@{@}}  @code{\end@{@}} ̍s@kbd{[prefix] g}Ƃ
 AΉ@code{end/begin}̍sɃWv܂BΉ̂
-Ȃꍇ̓G[ɂȂ܂B܂́ÄŒ̂߂ @code{%#BEGIN}  
+Ȃꍇ̓G[ɂȂ܂B܂́ÄŒ̂߂ @code{%#BEGIN} 
 @code{%#END} ̃yAɑ΂Ălɓ삵܂BȂA@code{label/ref}
 @code{cite/bibitem}Ή̂ʃt@Cɂ鎞́AWvƂȂt@
 CI[vĂȂ΂Ȃ܂B@xref{%#notation}.
@@ -1245,7 +1245,7 @@
 @section G`c[N
 @cindex G`c[N[邫Ƃ]
 
-Ĺu摜t@C̎荞݃}NvƂ́AႦ 
+Ĺu摜t@C̎荞݃}NvƂ́AႦ
 @code{\epsfile@{file=foo@}} ̂悤ȑ}G荞݃R}ĥƂŁA̍s
 J[\킹@kbd{[prefix] g}Ƃ̉摜t@ČƂȂt@
 CΉ邨G`c[NăI[v܂BNc[̔
@@ -1254,7 +1254,7 @@
 @enumerate
 @item
 Jgsϐ @code{YaTeX-processed-file-regexp-alist} ɒ`
-Ă鐳K\̂ꂩƃ}b`At@Cɑ镔 
+Ă鐳K\̂ꂩƃ}b`At@Cɑ镔
 \\(\\)甲oĊoĂ(Ԗڂ\\(\\)͕ϐ̊eXg cdr 
 Ă)B}b`ȂΉȂB
 @item
@@ -1270,7 +1270,7 @@
 @end enumerate
 
 
-ϐ @code{YaTeX-file-processor-alist} ƕϐ 
+ϐ @code{YaTeX-file-processor-alist} ƕϐ
 @code{YaTeX-file-processor-alist} ̐ݒ@ɂĂ͂ꂼ̕ϐɂ
  describe-variable ĐǂŉB܂ݒ肷ƁA摜t@C
 ɂ炸ACӂ̌`̃t@CCӂ̃vZbTŏR}h
@@ -1289,7 +1289,7 @@
         @dots{} ʃEBhEŃCt@CɃWv
 @end table
 
-@noindent 
+@noindent
 ƁACt@C̕ҏWobt@ɐؑւ܂BACt@C
 I[vĂȂꍇ́AJgfBNgTĎIɃI[v
 ܂B
@@ -1344,7 +1344,7 @@
         @dots{} J[\ʒu La@TeX{} R}h̍폜
 @end table
 
-@noindent 
+@noindent
 ̃R}h́AR}hNꏊɂē肷̂Œӂ
 ĉB
 
@@ -1357,7 +1357,7 @@
 @comment  node-name,  next,  previous,  up
 @section La@TeX{} R}h̕ύX
 
-ύX La@TeX{} R}hɃJ[\킹 @kbd{[prefix] c} 
+ύX La@TeX{} R}hɃJ[\킹 @kbd{[prefix] c}
 Ƃ̃R}h⊮͂ȂǂpĎyɕς邱Ƃł܂B
 @kbd{[prefix] c} ŕύXłR}hɂ͈ȉ̂̂܂B
 
@@ -1394,7 +1394,7 @@
 ʂ̏                        ΂Ȃʂ̍폜
 @end example
 
-@noindent 
+@noindent
 @code{\begin, \end}  @code{%#BEGIN, %#END} 폜ꍇA
 @code{\begin, \end}  @code{%#BEGIN, %#END} ݂̑s
 ܂邲ƍ폜̂ŁÄs @code{\begin} ȂǂȏA˂
@@ -1433,7 +1433,7 @@
 @end table
 
 @cindex NTT-jTeX[ʂĂĂĂ]
-@noindent 
+@noindent
 ɂāA item ̃Cfg̐[ɉ fill ܂BȂAÂ
 NTT jTeX gpĂꍇɂ́ALisp ϐ@code{NTT-jTeX}@code{t}ɃZb
 gĉB
@@ -1449,7 +1449,7 @@
               "\\(\\\\\\(sub\\)*item\\)\\|\\(\\\\underlineitem\\)")
 @end lisp
 
-@noindent 
+@noindent
 ̕ϐ̎w̎d悭Ȃꍇ́AƎ̍ڗ񋓃R}h̖O
 @code{@code{"\item"}Ŏn܂̂ɂĉ(Ⴆ"\itembf"})B
 
@@ -1491,7 +1491,7 @@
         \includeonly@{ݕҏW̃t@C@}
 @end example
 
-@noindent 
+@noindent
 ̂悤ɏĂƂŁA^CvZbg̎Ԃߖł܂AƑ
 t@C蒼ɂ
 @cindex ̃t@C̎蒼[ق̂ӂ̂ĂȂ]
@@ -1500,7 +1500,7 @@
         \includeonly@{Ǝ蒼t@C@}
 @end example
 
-@noindent 
+@noindent
 ƏȂ΂Ȃ炸Ԃ܂B쒹ł͌ݕҏWĂt@C
 Ct@C@code{\includeonly}ɂȂꍇɂ͎IɂoA
 ̎w܂B
@@ -1509,7 +1509,7 @@
         A)dd R)eplace %)comment?
 @end example
 
-@noindent 
+@noindent
 ݕҏW̃t@C @code{\includeonly} ̃Xgɉɂ@kbd{a}
 AݕҏW̃t@C @code{\includeonly} ɂ@kbd{r}A
 @code{\includeonly} ̍sRgAEgĖɂ́A@kbd{%}
@@ -1537,7 +1537,7 @@
         \end@{tabular@}
 @end example
 
-@noindent 
+@noindent
 (???)̕ǂ̍ڂȂ̂ɔf͓̂ł傤BȎ́A
 
 @table @kbd
@@ -1565,7 +1565,7 @@
         @dots{} ܂s
 @end table
 
-@noindent 
+@noindent
 ƁÅɉsGg̍sɑ}܂(begin^⊮Ɏ
 }ꂽGgsvȏꍇ undo ɂďł܂)BႦ΁A
 tabularł́Å̃JɑΉ @code{&} ɉAs
@@ -1594,7 +1594,7 @@
 ܂B`֐́A݂̍sɉs}̍s̈ʒuŌĂ΂
 B֐ @code{YaTeX-indent-line} ĂԂƌ݂̊̃lXgɉ[
 CfĝŁAĂł牽}悤ȃR[hƂ
-ł傤B@file{yatexenv.el}̊֐ 
+ł傤B@file{yatexenv.el}̊֐
 @code{YaTeX-intelligent-newline-itemize} ̒`ȂǂQlɂĂB
 
 
@@ -1801,7 +1801,7 @@
   Ⴆ prefix L[ @kbd{C-c} ȊÕL[ɂꍇ́A
 @code{YaTeX-prefix} prefix L[ɂV{`ĂB
 ɁAu@kbd{C-c p}vƂL[oCh͓Ǝ̊֐蓖ĂĂ̂Ŏg
-ȂB̂悤Ȏ́A@code{YaTeX-inhibit-prefix-letter}  @code{t} 
+ȂB̂悤Ȏ́A@code{YaTeX-inhibit-prefix-letter}  @code{t}
 ɐݒ肷邱ƂɂA@kbd{C-c pc}̃oChSāAΉ@kbd{C-c
 C-pc}ɕς܂(Abegin^ large^⊮̑啶Nɂ郊W
 w͉\Ȃ܂܂łBɂꍇ@code{t}ł͂Ȃ 1 ɃZb
@@ -1819,7 +1819,7 @@
 @subsection JX^}CYϐꗗ
 @cindex JX^}CYϐꗗ[܂ւ񂷂]
 
-  yatex-mode ɂ鎟̕ϐJX^}CY\łB@file{~/.emacs}  
+  yatex-mode ɂ鎟̕ϐJX^}CY\łB@file{~/.emacs} 
 @code{setq} Ă΁A̒`D悳܂Bʂ̒̓ftHgl
 łBۂɕϐ̒lύXꍇ @kbd{M-x describe-variable} 
 ϐ̏ڍׂȐQƂĂB
@@ -1829,7 +1829,7 @@
 @end defvar
 
 @defvar YaTeX-inhibit-prefix-letter
-prefix L[̒̃L[oCh @kbd{p} ̂̂ @kbd{C-p} ɕύX 
+prefix L[̒̃L[oCh @kbd{p} ̂̂ @kbd{C-p} ɕύX
 (@code{nil})
 @end defvar
 
@@ -1865,7 +1865,7 @@
 @end defvar
 
 @defvar dviprint-to-format
-@code{%t} ɑIy[Ww菑A@code{%e}Iy[Wԍɕς 
+@code{%t} ɑIy[Ww菑A@code{%e}Iy[Wԍɕς
 (@code{"-t %e"})
 @end defvar
 
@@ -1918,12 +1918,12 @@
 @end defvar
 
 @defvar YaTeX-sectioning-regexp
-ZNV؂ݒR}h̐K\ 
+ZNV؂ݒR}h̐K\
 (@code{"\\(part\\|chapter\\*?\\|\\(sub\\)*\\(section\\|paragraph\\)\\*?\\)\\b"})
 @end defvar
 
 @defvar YaTeX-fill-inhibit-environments
-fill }~̃Xg 
+fill }~̃Xg
 (@code{'("tabular" "tabular*" "array" "picture" "eqnarray" "eqnarray*" "equation" "math" "displaymath" "verbatim" "verbatim*")})
 @end defvar
 
@@ -1965,7 +1965,7 @@
 @defvar YaTeX-hilit-pattern-adjustment-private
 K\ƂɃ}b`̘̂_IӖV{ł킵̂
 Xgc̃XgBhilit19 gݍł鎞̂ݗLB
-ڂ @code{(assq 'yatex-mode hilit-patterns-alist)} 
+ڂ @code{(assq 'yatex-mode hilit-patterns-alist)}
 ʂƁAϐ @code{YaTeX-hilit-pattern-adjustment-default} ̒l(Əꍇ
 ɂĂ hilit19 ̃hLg)QƂB
 @end defvar
@@ -1996,7 +1996,7 @@
 @end defvar
 
 @defvar YaTeX-hilit-sectioning-face
-FtLȎ @code{\part} ̐F 
+FtLȎ @code{\part} ̐F
 (@code{'(yellow/dodgerblue yellow/slateblue)})B
 Xg̑vf @code{hilit-background-mode}  @code{'light} ̎́A
 vf @code{'dark} ̎ @code{\chapter} ̐FŁAF/wiF ̂
@@ -2043,7 +2043,7 @@
 
 @defvar YaTeX-singlecmd-suffix
 SĂmaketitle^R}h̕⊮͒ɑ}镶B
-@code{"{}"} Ȃǂ߁B
+@code{"@{@}"} Ȃǂ߁B
 @end defvar
 
 @defvar YaTeX-package-alist-private
@@ -2051,7 +2051,7 @@
 K؂ɐݒ肵ĂƖ{͎Ƀ}N⊮͂
 ̃}NɕKvȃpbP[W usepackage 邩IɌĂB
 ĂȂ \usepackage ǉ邱ƂłB
-Xg 
+Xg
 @lisp
    '((pbP[W1
         (⊮^Cv }ÑXgcc)
@@ -2072,12 +2072,12 @@
 @end defvar
 
 @defvar YaTeX-noindent-env-regexp
-ʂ̊ɂĂ \begin{} sn܂ׂ̐K\B
+ʂ̊ɂĂ \begin@{@} sn܂ׂ̐K\B
 verbatimȂǂw肷B
 @end defvar
 
 @defvar YaTeX-ref-default-label-string
-\ref{} ̃x⊮Ńxݒ̂̂ɎIɐ
+\ref@{@} ̃x⊮Ńxݒ̂̂ɎIɐ
 x̏Bstrftime(3)֐Ɏtx[XŎw肷B
 pł鏑͈ȉ̂ƂB
 %y -> ,  %b -> ̉p,  %m -> (1`12)
@@ -2088,7 +2088,7 @@
 @end defvar
 
 @defvar YaTeX-ref-generate-label-function
-\ref{}̃x̂ƂɎg֐̃V{B
+\ref@{@}̃x̂ƂɎg֐̃V{B
 ftHg͕W YaTeX::ref-generate-label ֐蓖ĂĂB
 2֐`āA̕ϐɃZbgƂ̊֐Ă
 ʂftHg̃xƂBݒ:
@@ -2096,7 +2096,7 @@
   (setq YaTeX-ref-generate-label-function 'my-yatex-generate-label)
   (defun my-yatex-generate-label (command value)
     (and (string= command "caption")
-         (re-search-backward "\\\\begin{\\(figure\\|table\\)}" nil t)
+         (re-search-backward "\\\\begin@{\\(figure\\|table\\)@}" nil t)
          (setq command (match-string 1)))
     (let ((alist '(("chapter" . "chap")
                    ("section" . "sec")
@@ -2124,7 +2124,7 @@
               YaTeX-fill-prefix "       ")
 @end lisp
 
-@noindent 
+@noindent
  @file{~/.emacs} ɉ܂B
 
 @node Hook variables, Hook file, Sample definitions, Lisp variables
@@ -2138,7 +2138,7 @@
 ӂĂ܂BׂĂ yatex-mode ̃obt@ōp̂́A
 @code{yatex-mode-hook} ɋLqA@file{yatex.el} [h鎞p
 ̂@code{yatex-mode-load-hook} ɋLq܂BႦ΁A
-@code{outline-minor-mode} 𗘗pꍇAꂼ̃obt@ 
+@code{outline-minor-mode} 𗘗pꍇAꂼ̃obt@
 @code{outline-minor-mode} Lɂ̂ŁA@code{yatex-mode-hook} 
 ̂悤ɐݒ肵܂B
 
@@ -2147,7 +2147,7 @@
               '(lambda () (outline-minor-mode t)))
 @end lisp
 
-@noindent 
+@noindent
 tɁAƎ̃L[`sȂǂ́A@code{yatex-mode-load-hook} 𗘗p
 ܂BႦ΁Abegin ^⊮ɂāA document Aenumerate ȊO̊
 V[gJbgL[œꂽȂǂƂ́Â悤ɂ܂Bȉ̗́A
Index: yatex/docs/yahtmlj.tex
===================================================================
--- yatex.orig/docs/yahtmlj.tex	2012-02-13 20:32:57.101687648 +0900
+++ yatex/docs/yahtmlj.tex	2012-02-13 20:42:58.364669143 +0900
@@ -1,4 +1,4 @@
-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1
 \input texinfo
 @setfilename yahtmlj.info
 @settitle Yet Another html-mode for Emacs
@@ -59,9 +59,9 @@
 @comment  node-name,  next,  previous,  up
 @chapter CXg[
 @menu
-* yahtmlN̂߂̐ݒ::      
-* lintvO/uEU/C[W[A̐ݒ::  
-* WWWy[Wpϐ̐ݒ::   
+* yahtmlN̂߂̐ݒ::
+* lintvO/uEU/C[W[A̐ݒ::
+* WWWy[Wpϐ̐ݒ::
 @end menu
 
 @node yahtmlN̂߂̐ݒ, lintvO/uEU/C[W[A̐ݒ, Installation, Installation
@@ -77,14 +77,14 @@
 @end lisp
 
 yahtmlɕKvȃt@C(@file{yahtml.el}, @file{yatexlib.el},
-@file{yatexprc.el}) ufBNg load-path ɉ܂BƂ΁A 
+@file{yatexprc.el}) ufBNg load-path ɉ܂BƂ΁A
 @file{~/src/emacs/yahtml}ɒûł΁A
 
 @lisp
 (setq load-path (cons (expand-file-name "~/src/emacs/yahtml") load-path))
 @end lisp
 
-@noindent 
+@noindent
 ȂǂƂ܂B
 
   ȏ̐ݒɂAgq .html łt@CҏWƎI
@@ -122,7 +122,7 @@
 
 ϐ @code{yahtml-path-url-alist} ̐ݒ܂BႦ΁Ał́A
 @file{/home/yuuji/http/}  @code{http://localhost/~yuuji} ŎQƂłAE
-ł @file{/usr/home/yuuji/www/} @code{http://www.keio.ac.jp/~yuuji/} 
+ł @file{/usr/home/yuuji/www/} @code{http://www.keio.ac.jp/~yuuji/}
 ŎQƂł悤ɂȂĂꍇ͈ȉ̂悤ɐݒ肵܂B
 
 @lisp
@@ -194,7 +194,7 @@
 ̂悤ɈsɊJn/I^OꂽƂɗp܂B
 
 @item [prefix] m (쒹maketitle^⊮ɑΉ)
-@dots{} vflȂ^O⊮͂܂B<br> 
+@dots{} vflȂ^O⊮͂܂B<br>
 Ȃǂ⊮ɑ܂B
 
 @item [prefix] a (쒹̃ANZg⊮ɑΉ)
@@ -213,7 +213,7 @@
         @dots{} ΉIuWFNgɃWv
 @end table
 
-@noindent 
+@noindent
 ƂɂAJ[\ʒuHTML\ɑΉꏊɃWv
 ܂BΉ֌W݂Ɖ߂R}hɂ͈ȉ̂̂܂B
 
@@ -230,10 +230,10 @@
 @chapter ύX/폜
 
 @menu
-* ΃^O̕ύX::                
-* QƂւ̕ύX::            
-* WURLencode::   
-* td/tr::               
+* ΃^O̕ύX::
+* QƂւ̕ύX::
+* WURLencode::
+* td/tr::
 @end menu
 
 @node ΃^O̕ύX, QƂւ̕ύX, Changing and Deleting, Changing and Deleting
@@ -246,7 +246,7 @@
         @dots{} Ή^OύX
 @end table
 
-@noindent 
+@noindent
 ƂɂAJ[\ʒuHTML\ɉ
 Lqe̕ύXs܂BJ[\ʒuƕύXe
 Ή͈ȉ̒ʂłB
@@ -258,7 +258,7 @@
 @dots{} l̕ύX
 @end itemize
 
-@node QƂւ̕ύX,  , ΃^O̕ύX, Changing and Deleting
+@node QƂւ̕ύX, WURLencode, ΃^O̕ύX, Changing and Deleting
 @comment  node-name,  next,  previous,  up
 @section QƂւ̕ύX
 ƂĂ <  > \Ƃ́AQƂp
@@ -278,7 +278,7 @@
 @node WURLencode, td/tr, QƂւ̕ύX, Changing and Deleting
 @comment  node-name,  next,  previous,  up
 @section WURLencode
-@table
+@table @kbd
  @item [prefix] #
 	@dots{} w肵̈ URLencode ׂ΂
         GR[h\LɒuB
@@ -290,7 +290,7 @@
 󔒋؂ŏ\`̍sR[h <td> ̕сC
 邢͂ <tr> Ŋsтɕϊł܂B
 @table @kbd
- @item [prefix] }
+ @item [prefix] @}
 	@dots{} ݂̃Wɂf[^󔒋؂育Ƃ
         <td>...</td> Ŋ
  @item [prefix] ]
@@ -312,8 +312,8 @@
 @chapter CSS(X^CV[g)T|[g
 
 @menu
-* CSS-class completion::        
-* Reread CSS file::             
+* CSS-class completion::
+* Reread CSS file::
 @end menu
 
 @node CSS-class completion, Reread CSS file, CSS Support, CSS Support
@@ -472,7 +472,7 @@
 @defvar yahtml-entity-reference-chars-alist
 GeBeBQ(Entity Reference)ŋLqׂQ
  @code{'(? . "GeBeB\L")}  Ƃ`񋓂
-alistŕׂBftHg @code{<}, @code{>}, @code{&}, @code{'}, 
+alistŕׂBftHg @code{<}, @code{>}, @code{&}, @code{'},
 @code{"} ɑ΂alistݒ肳Ă̂ŁAǉLqΗ
 Bcdr @code{"GeBeB\L"} ́A擪 @code{&}  @code{;}
 ͊܂߂ɏB
